From 66ea95dcb8fd91d29465c2f11ced4dd6153a2504 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 22 May 2024 17:15:02 +0800
Subject: [PATCH] 继续完善远传
---
Soft/sizhu_ctrl_word.h | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/Soft/sizhu_ctrl_word.h b/Soft/sizhu_ctrl_word.h
index adce85b..61fc803 100644
--- a/Soft/sizhu_ctrl_word.h
+++ b/Soft/sizhu_ctrl_word.h
@@ -6,6 +6,7 @@
#define __SYS_STATUS_BYTES_GET(__HANDLE__) (system_status_word_g.status_word.__HANDLE__)
+//����״̬��λ�ʺϵ�bit״̬��λ�����ʺ϶�bit״̬�����緧��״̬ռ���bit��������
#define __SYS_STATUS_BYTES_STATUS(__HANDLE__, __FLAG__, __ID__) \
do \
{ \
@@ -14,19 +15,25 @@
(system_status_word_g.status_word.__HANDLE__ = __FLAG__); \
if(__FLAG__ == RESET) \
Alarm_List_Node_Deleted(&pList_head,__ID__); \
+ else if(__FLAG__ == SET) \
+ Alarm_List_Node_PushBack(&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__) \
+//����״̬��λ�ʺϵ�bit״̬��λ�����ʺ϶�bit״̬�����緧��״̬ռ���bit��������
+#define __SYS_STATUS_ALARM_BYTES_SET(__HANDLE__,__ID__) \
do \
{ \
- if (__SYS_STATUS_BYTES_GET(__HANDLE__) != SET) \
- system_status_word_g.status_word.__HANDLE__ = \
- system_alarm_word_g.alarm_word.__HANDLE__ = SET; \
+ if (__SYS_STATUS_BYTES_GET(__HANDLE__) != SET){ \
+ system_status_word_g.status_word.__HANDLE__ = \
+ system_alarm_word_for_valve_g.alarm_word.__HANDLE__ = SET; \
+ if(__SYS_ALARM_REPORT_CTL_BYTES_GET(__HANDLE__) ==SET){ \
+ system_alarm_word_g.alarm_word.__HANDLE__ = SET; } \
+ Alarm_List_Node_PushBack(&pList_head,__ID__); \
+ } \
} while (0)
@@ -111,6 +118,7 @@
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,
@@ -154,11 +162,12 @@
ALARM_ID_FLOW_BAT_LOW = 0x80,//�Խ��豸�͵�
ALARM_ID_FLOW_BAT_DOWN,//�Խ��豸����
- ALARM_ID_PULSE_BROKEN,//�����߶���
+ ALARM_ID_BROKEN_LINE,//���߱���
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_EX_TRIGGER_CLOSE_VALVE, //�ⲿ�����ط�
ALARM_ID_BALANCE_SMALLER1 = 0x90,//����ٶ�
ALARM_ID_BALANCE_SMALLER2, // ����ٶ�1����/�ط�
@@ -714,6 +723,7 @@
extern SYSTEM_STATUS_WORD_T system_status_word_g;
extern SYSTEM_FUNCTION_CTRL_WORD_T system_function_ctrl_word_g;
extern SYSTEM_ALARM_WORD_T system_alarm_word_g;
+extern SYSTEM_ALARM_WORD_T system_alarm_word_for_valve_g; //���ڷ��أ��ϱ������
extern SYSTEM_ALARM_CTRL_WORD_T system_alarm_ctrl_word_g;
extern SYSTEM_ALARM_REPORT_CTRL_WORD_T system_alarm_report_ctrl_word_g;
extern VALVE_CTL_BYTES_T valve_ctl_bytes_g;
--
Gitblit v1.9.3