继续测试修改

jinlicong

2024-05-30 a1810b89e66f184c62a0588ae7d57c91d0c376e8

 Soft/sizhu_ctrl_word.h

@@ -335,9 +335,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;   
   
@@ -476,6 +476,12 @@


/*********************************¹Ø·§¿ØÖÆ×ÖÏà¹Ø**************************************/
//¹Ø·§¿ØÖÆ×Ö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,7 +780,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_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_UNION_T valve_ctl_bytes_g;