增加阀控事件记录及修改阀控命令

jinlicong

2024-06-07 fa6053f85287163f6e2d5dba690bec05cbc95f4a

 Soft/sizhu_ctrl_word.h

@@ -2,11 +2,12 @@
#define _SIZHU_CTRL_WORD_H
#include "define_all.h"
#include "extern_rtc.h"
//#include "sizhu_alarm_record.h"

#define __SYS_STATUS_BYTES_GET(__HANDLE__) (system_status_word_g.status_word.__HANDLE__)


//ÒÔÏÂ״̬ÖÃλÊʺϵ¥bit״̬ÖÃ룬²»Êʺ϶àbit״̬£¬±ÈÈç·§ÃÅ״̬ռ¶à¸öbit£¬²»ÄÜÓÃ
//ÒÔÏÂ״̬ÖÃλÊʺϵ¥bit״̬ÖÃλ(Ò»°ãÓжÔÓ¦±¨¾¯)£¬²»Êʺ϶àbit״̬£¬±ÈÈç·§ÃÅ״̬ռ¶à¸öbit£¬²»ÄÜÓÃ
#define __SYS_STATUS_BYTES_STATUS(__HANDLE__, __FLAG__, __ID__)      \
  do                                                                 \
  {                                                                  \
@@ -27,6 +28,7 @@
  {                                                               \
    if(__SYS_ALARM_CTL_BYTES_GET(__HANDLE__)){                \
         system_alarm_word_for_valve_g.alarm_word.__HANDLE__ = SET;      \
         sizhuAlarmRecord(ALARM_HAPPEN,__ID__);                                       \
         if(__SYS_ALARM_REPORT_CTL_BYTES_GET(__HANDLE__) ==SET){             \
            if(AlarmCntIncrease(__ID__) ==SET){                                          \
               system_alarm_word_g.alarm_word.__HANDLE__ = SET;                  \
@@ -44,6 +46,7 @@
    if ((__SYS_STATUS_BYTES_GET(__HANDLE__) != SET)&&(__SYS_ALARM_CTL_BYTES_GET(__HANDLE__))){                \
      system_status_word_g.status_word.__HANDLE__  = SET;                           \
         system_alarm_word_for_valve_g.alarm_word.__HANDLE__ = SET;      \
         sizhuAlarmRecord(ALARM_HAPPEN,__ID__);                                                                                                \
         if(__SYS_ALARM_REPORT_CTL_BYTES_GET(__HANDLE__) ==SET){             \
            if(AlarmCntIncrease(__ID__) ==SET){                                          \
               system_alarm_word_g.alarm_word.__HANDLE__ = SET;                  \