继续测试优化

jinlicong

2024-06-11 e4424eb6b50d0300583c422dfb71d58e040f4b9e

 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;                  \
@@ -59,7 +62,7 @@
   
#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 __SYS_ALARM_REPORT_CTL_BYTES_GET(__HANDLE__)   (system_alarm_report_ctrl_word_g.alarm_ctl_word.__HANDLE__)	
   

#define   SYSTEM_SINGLE_BIT_SET1                     0x0001
@@ -335,9 +338,9 @@
   uint16_t calibration_mode: 1;
   uint16_t account_open: 1;
   uint16_t  : 2;
   uint16_t show_balance : 1;
   uint16_t show_price: 1;
   uint16_t show_logo : 1;
   uint16_t no_show_balance : 1;
   uint16_t no_show_price: 1;
   uint16_t no_show_logo : 1;
   uint16_t : 3;
   uint16_t billing_type: 2;   
   
@@ -467,15 +470,21 @@
  SYS_ALARM_T alarm_ctl_word;
}SYSTEM_ALARM_CTRL_WORD_T; // ±¨¾¯¿ØÖÆ×Ö

typedef union
{
  uint16_t alarm_ctl_send_union[SYSTEM_ALARM_WORD_INF_LENGTH >> 1];
  SYS_ALARM_T alarm_report_ctrl_word;
} SYSTEM_ALARM_REPORT_CTRL_WORD_T; // ±¨¾¯Éϱ¨¿ØÖÆ
//typedef union
//{
//  uint16_t alarm_ctl_send_union[SYSTEM_ALARM_WORD_INF_LENGTH >> 1];
//  SYS_ALARM_T alarm_report_ctrl_word;
//} SYSTEM_ALARM_REPORT_CTRL_WORD_T; // ±¨¾¯Éϱ¨¿ØÖÆ   ¸ñʽ¸ú±¨¾¯¿ØÖÆ×ÖÒ»Ñù£¬ËùÒÔ²»ÓÃÔÙ¶¨ÒåÒ»¸ö½á¹¹ÌåÁË
/*********************************±¨¾¯¿ØÖÆ×ÖÏà¹Ø**************************************/


/*********************************¹Ø·§¿ØÖÆ×ÖÏà¹Ø**************************************/
//¹Ø·§¿ØÖÆ×Ö2λ±ê־붨Òå
#define      VALVE_CTRL_FLAG_NONE                  0x00
#define      VALVE_CTRL_FLAG_ONLY_CLSOSE         0x01
#define      VALVE_CTRL_FLAG_LOCK_AND_CLSOSE   0x03

//¹Ø·§¿ØÖÆ×ֽṹÌ嶨Òå
typedef struct
{
  uint16_t gprs_cmd_need_close_valve_flag : 1; // Ô¶´«ÃüÁî
@@ -774,9 +783,9 @@
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_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 SYSTEM_ALARM_CTRL_WORD_T     system_alarm_report_ctrl_word_g;
extern VALVE_CTL_BYTES_UNION_T valve_ctl_bytes_g;