From ee3c90168f81ce19529904d80f9c9de4fed23bb8 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 30 Apr 2024 16:30:45 +0800
Subject: [PATCH] 继续完善

---
 Soft/sizhu_ctrl_word.h |  133 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 128 insertions(+), 5 deletions(-)

diff --git a/Soft/sizhu_ctrl_word.h b/Soft/sizhu_ctrl_word.h
index 53f70ee..422da03 100644
--- a/Soft/sizhu_ctrl_word.h
+++ b/Soft/sizhu_ctrl_word.h
@@ -2,6 +2,42 @@
 #define _SIZHU_CTRL_WORD_H
 #include "define_all.h"
 
+
+
+#define __SYS_STATUS_BYTES_GET(__HANDLE__) (system_status_word_g.status_word.__HANDLE__)
+
+
+#define __SYS_STATUS_BYTES_STATUS(__HANDLE__, __FLAG__, __ID__)      \
+  do                                                                 \
+  {                                                                  \
+    if (__SYS_STATUS_BYTES_GET(__HANDLE__) != __FLAG__)              \
+    {                                                                \
+      (system_status_word_g.status_word.__HANDLE__ = __FLAG__);      \
+			if(__FLAG__ == RESET)																				   \
+				Alarm_List_Node_Deleted(&pList_head,__ID__);									\
+    }                                                                \
+  } while (0)
+
+
+#define __SYS_ALARM_BYTES_SET(__HANDLE__, __FLAG__) (system_alarm_word_g.alarm_word.__HANDLE__ = __FLAG__)
+
+
+#define __SYS_STATUS_ALARM_BYTES_SET(__HANDLE__)                  \
+  do                                                              \
+  {                                                               \
+    if (__SYS_STATUS_BYTES_GET(__HANDLE__) != SET)                \
+      system_status_word_g.status_word.__HANDLE__ =               \
+          system_alarm_word_g.alarm_word.__HANDLE__ = SET;        \
+  } while (0)
+	
+
+#define __SYS_FUNC_CFG_BYTES_GET(__HANDLE__) (system_function_ctrl_word_g.fun_ctrl_word.__HANDLE__)
+	
+#define __SYS_ALARM_CTL_BYTES_GET(__HANDLE__)	(system_alarm_ctrl_word_g.alarm_ctl_word.__HANDLE__)	
+	
+#define __SYS_ALARM_REPORT_CTL_BYTES_GET(__HANDLE__)	(system_alarm_report_ctrl_word_g.alarm_report_ctrl_word.__HANDLE__)	
+	
+
 #define   SYSTEM_SINGLE_BIT_SET1                     0x0001
 #define   SYSTEM_SINGLE_BIT_SET0                     0x0000
 
@@ -52,8 +88,93 @@
 #define   SFCW_BILLING_TYPE_NONE                   0x0000
 #define   SFCW_BILLING_TYPE_TERMINAL               0x0001
 #define   SFCW_BILLING_TYPE_CENTER                 0x0002
-/*******************************˼����ϵͳ���ܿ�����******************************/
 
+
+
+/*******************************����ID******************************/
+typedef enum
+{
+  ALARM_ID_NORMAL = 0x0U,
+  ALARM_ID_SYSTEM_START, // ��λ �����DZ������Ͳ������ط�
+  ALARM_ID_EX_POWER_STATUS_CHANGE,
+	ALARM_ID_COVER_OPEN,//����1�ǿ���
+	ALARM_ID_MAINBOARD_REMOVAL,//����2�������Ƴ�
+	ALARM_ID_GPRS_FAILED,
+  ALARM_ID_LCD_NUMBER_OVERRUN,
+	
+	
+  ALARM_ID_LITH_BAT_LOW = 0x10, // ﮵�͵籨��/�ط�
+  ALARM_ID_LITH_BAT_DOWN,
+  ALARM_ID_LITH_BAT_REMOVAL,
+  ALARM_ID_ALKA_BAT_LOW,
+  ALARM_ID_ALKA_BAT_DOWN,
+  ALARM_ID_ALKA_BAT_REMOVAL,
+	ALARM_ID_VALVE_BAT_LOW,
+	ALARM_ID_VALVE_BAT_DOWN,
+	ALARM_ID_RTC_BAT_LOW,
+
+  ALARM_ID_TEM_TRANSMITTER_FAILURE = 0x20, // �¶��쳣����/�ط�
+  ALARM_ID_TEM_EXCEED_UP_LIMIT,
+  ALARM_ID_TEM_EXCEED_UP_UP_LIMIT,
+  ALARM_ID_TEM_EXCEED_LOW_LIMIT,
+  ALARM_ID_TEM_EXCEED_LOW_LOW_LIMIT,
+  ALARM_ID_PRE_TRANSMITTER_FAILURE,
+  ALARM_ID_PRE_EXCEED_UP_LIMIT,
+  ALARM_ID_PRE_EXCEED_UP_UP_LIMIT,
+  ALARM_ID_PRE_EXCEED_LOW_LIMIT,
+  ALARM_ID_PRE_EXCEED_LOW_LOW_LIMIT,
+  ALARM_ID_AMBIENT_TEM_EXCEED_UP_LIMIT = 0x30,
+  ALARM_ID_AMBIENT_TEM_EXCEED_LOW_LIMIT,
+	ALARM_ID_AMBIENT_TEM_SUDDEN_CHANGE,//���¾��
+	ALARM_ID_LCD_AMBIENT_TEM_EXCEED_LOW_LIMIT,//Һ�Ե���
+
+  ALARM_ID_MEASURE_SONIC_SENSOR_LOSS = 0x40, // ̽ͷ��ʧ����/�ط�
+  ALARM_ID_MEASURE_FLOW_VELOCITY_ABNORMAL,//�����쳣
+  ALARM_ID_MEASURE_TIME_DIFF_ABNORMAL,//ʱ����쳣
+  ALARM_ID_MEASURE_SOUND_VELOCITY_ABNORMAL,//�����쳣
+  ALARM_ID_MEASURE_SNR_ABNORMAL,//������쳣
+  ALARM_ID_MEASURE_SIHNAL_OVERFLOW_ABNORMAL,//�ź�����쳣
+  ALARM_ID_MEASURE_THRESHOLD_ABNORMAL,//�ź���ֵ�쳣
+  ALARM_ID_MEASURE_GAIN_ABNORMAL,//�ź������쳣
+	ALARM_ID_MEDIUM_WATER,//��ˮ
+  ALARM_ID_MEDIUM_ABNORMAL,//�����쳣
+  ALARM_ID_DISMANTLE_METER_ABNORMAL = 0x50,//����쳣
+  ALARM_ID_METERING_UNIT_ABNORMAL , // ������Ԫ�쳣
+	ALARM_ID_MEASURE_CHANNEL_REMOVAL,//�����г�
+	
+	ALARM_ID_FLOW_EXCEED_UP_LIMIT = 0x60,//��������1
+	ALARM_ID_FLOW_EXCEED_UP_UP_LIMIT,//��������2
+	ALARM_ID_FLOW_EXCEED_UP_UP_LIMIT2,//��������3
+	ALARM_ID_FLOW_BIDIRECTIONAL,//��������
+	ALARM_ID_FLOW_CONSTANT,//����
+	ALARM_ID_FLOW_SMALL,//����
+	ALARM_ID_GAS_LEAK,//����й©
+	
+	ALARM_ID_VALVE_ABNORMAL = 0x70,//�����쳣����
+	ALARM_ID_VALVE_CLOSE_GAS_RUNNING_ABNORMAL,//�ط�����
+	
+	ALARM_ID_FLOW_BAT_LOW = 0x80,//�Խ��豸�͵�
+	ALARM_ID_FLOW_BAT_DOWN,//�Խ��豸����
+	ALARM_ID_PULSE_BROKEN,//�����߶���
+	ALARM_ID_E2P_W_ABNORMAL,//eepromд�쳣
+	ALARM_ID_E2P_R_ABNORMAL,//eeprom���쳣
+	ALARM_ID_READ_485_ABNORMAL,//��485�쳣
+	ALARM_ID_485_READING_SMALLER_ABNORMAL,//485�����쳣��С
+	
+	ALARM_ID_BALANCE_SMALLER1 = 0x90,//����ٶ�
+  ALARM_ID_BALANCE_SMALLER2, // ����ٶ�1����/�ط�
+  ALARM_ID_BALANCE_SMALLER3,
+  ALARM_ID_BALANCE_SMALLER4,
+  ALARM_ID_BALANCE_SMALLER5,
+  ALARM_ID_CUMULATIVE_GAS_ARRIVE,//�ۻ�������
+  ALARM_ID_N_DAYS_NO_GAS_ARRIVE,//����������
+  ALARM_ID_N_DAYS_NO_REPORT_ARRIVE,//�������ϱ�
+
+  ALARM_ID_OP_VALVE_KEY = 0x996, // �����ǹط����Ͳ���������
+  ALARM_ID_CL_VALVE_KEY,
+  ALARM_ID_OP_VALVE_CMD,
+  ALARM_ID_CL_VALVE_CMD,
+} SYS_ALARM_VALVE_T; // �����͹ط�����ID
 
 #pragma pack(1)
 /*********************************ϵͳ״̬�����**************************************/
@@ -96,7 +217,8 @@
   uint16_t : 3;
   uint16_t valve_bat_low: 1;
   uint16_t valve_bat_down: 1;
-  uint16_t : 2;
+	uint16_t rtc_err: 1;
+  uint16_t : 1;
 
   uint16_t temp_err : 1;
   uint16_t temp_up : 1;
@@ -240,7 +362,8 @@
   uint16_t : 3;
 	uint16_t valve_bat_low:1;
 	uint16_t valve_bat_down:1;
-  uint16_t : 2;
+	uint16_t rtc_err: 1;
+  uint16_t : 1;
 
   uint16_t temp_err : 1;
   uint16_t temp_up : 1;
@@ -315,8 +438,8 @@
 typedef union
 {
   uint16_t alarm_ctl_send_union[SYSTEM_ALARM_WORD_INF_LENGTH >> 1];
-  SYS_ALARM_T alarm_ctl_send_word;
-} SYSTEM_ALARM_REPORT_CTRL_WORD_T; // �����ϱ���
+  SYS_ALARM_T alarm_report_ctrl_word;
+} SYSTEM_ALARM_REPORT_CTRL_WORD_T; // �����ϱ�����
 /*********************************�������������**************************************/
 
 

--
Gitblit v1.9.3