From 5ac1d0febb8de5e91ce2463baea68ddac3f66091 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 16 May 2024 20:00:17 +0800
Subject: [PATCH] 完善脉冲计费和485采集处理

---
 Soft/sizhu_ctrl_word.h |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Soft/sizhu_ctrl_word.h b/Soft/sizhu_ctrl_word.h
index ba2da16..adce85b 100644
--- a/Soft/sizhu_ctrl_word.h
+++ b/Soft/sizhu_ctrl_word.h
@@ -211,13 +211,16 @@
   uint16_t alka_low : 1;
   uint16_t alka_down : 1;
   uint16_t alka_remove : 1;
-  uint16_t : 2;
+  uint16_t flow_meter_low_pwr: 1;
+	uint16_t flow_meter_under_pwr: 1;
   uint16_t gprs_status : 1;
-  uint16_t : 3;
+  uint16_t RS485_err : 1;				//RS485�쳣
+	uint16_t RS485_lessen : 1;  //RS485������С
+	uint16_t broken_line : 1;
   uint16_t valve_bat_low: 1;
   uint16_t valve_bat_down: 1;
 	uint16_t rtc_err: 1;
-  uint16_t : 1;
+  uint16_t ex_trigger_close_valve :1;
 
   uint16_t temp_err : 1;
   uint16_t temp_up : 1;
@@ -356,13 +359,16 @@
   uint16_t alka_low : 1;
   uint16_t alka_down : 1;
   uint16_t alka_remove : 1;
-  uint16_t : 2;
+  uint16_t flow_meter_low_pwr: 1;
+	uint16_t flow_meter_under_pwr: 1;
   uint16_t gprs_status : 1;
-  uint16_t : 3;
+	uint16_t RS485_err : 1;
+  uint16_t RS485_lessen : 1; //485�����С
+	uint16_t broken_line : 1;
 	uint16_t valve_bat_low:1;
 	uint16_t valve_bat_down:1;
 	uint16_t rtc_err: 1;
-  uint16_t : 1;
+  uint16_t ex_trigger_close_valve :1;
 
   uint16_t temp_err : 1;
   uint16_t temp_up : 1;

--
Gitblit v1.9.3