测试和修改了一些功能bug

jinlicong

2024-05-31 08b3909c40a192778719c6262bbee4745682948d

 Soft/sizhu_ctrl_word.c

@@ -10,23 +10,83 @@
SYSTEM_FUNCTION_CTRL_WORD_T    system_function_ctrl_word_g = {        \
.fun_ctrl_word.billing_type = 0x02,                                       \
};

SYSTEM_ALARM_WORD_T            system_alarm_word_g; //ÓÃÓÚÉϱ¨£¬Éϱ¨ÍêÇå³ý
SYSTEM_ALARM_WORD_T            system_alarm_word_for_valve_g; //ÓÃÓÚ·§¿Ø£¬ÅжÏÍê·§¿ØÖ®ºóÇåÁã
SYSTEM_ALARM_CTRL_WORD_T       system_alarm_ctrl_word_g;
SYSTEM_ALARM_REPORT_CTRL_WORD_T     system_alarm_report_ctrl_word_g;
VALVE_CTL_BYTES_UNION_T valve_ctl_bytes_g = {.valve_ctrl_bytes = {

SYSTEM_ALARM_WORD_T            system_alarm_word_for_valve_g;  //ÓÃÓÚ·§¿Ø£¬ÅжÏÍê·§¿ØÖ®ºóÇåÁã


SYSTEM_ALARM_CTRL_WORD_T       system_alarm_ctrl_word_g= {.alarm_ctl_word={
.system_start = 1,
.power_state = 1,
.valve_error = 1,
.valve_state_change = 1,
.set_cumulate_up_to = 1,
.no_use_gas_date_up_to = 1,
.no_gprs_date_up_to = 1,
.balance_small_3 = 1,
.lith_low = 1,
.lith_down  = 1,
.lith_remove = 1,
.alka_low = 1,
.alka_down = 1,
.alka_remove = 1,
.gprs_status = 1,  //Ô¶´«Ê§°ÜÖ»±¨¾¯£¬²»Éϱ¨
.RS485_err = 1,
.RS485_lessen = 1, 
.broken_line = 1, 
.temp_err = 1,
.cpu_temp_up = 1,
.cpu_temp_down = 1,
.press_err = 1,
.lcd_up = 1,
.cl_have_flow = 1,
}
};
SYSTEM_ALARM_CTRL_WORD_T     system_alarm_report_ctrl_word_g= {.alarm_ctl_word={
.system_start = 1,
.power_state = 1,
.valve_error = 1,
.valve_state_change = 1,
.set_cumulate_up_to = 1,
.no_use_gas_date_up_to = 1,
.no_gprs_date_up_to = 1,
.balance_small_3 = 1,
.lith_low = 1,
.lith_down  = 1,
.lith_remove = 1,
.alka_low = 1,
.alka_down = 1,
.alka_remove = 1,
//.gprs_status = 1,  //Ô¶´«Ê§°ÜÖ»±¨¾¯£¬²»Éϱ¨
.RS485_err = 1,
.RS485_lessen = 1, 
.broken_line = 1, 
.temp_err = 1,
.cpu_temp_up = 1,
.cpu_temp_down = 1,
.press_err = 1,
.lcd_up = 1,
.cl_have_flow = 1,
}
};


VALVE_CTL_BYTES_UNION_T valve_ctl_bytes_g = {.valve_ctrl_bytes = {                
{0},
{0},
{0},
{1,0,1,1,1,1,0,0,0,0,0,0,0,0},
{0,0,0,1,1},
{.lith_down_need_close_valve_flag =1,.lith_down_close_valve_type = 1,.lith_remove_need_close_valve_flag =1,.lith_remove_close_valve_type =1,   
//.alka_down_need_close_valve_flag= 1,.alka_down_close_valve_type = 1,.alka_remove_need_close_valve_flag =1,.alka_remove_close_valve_type =1,    
},
{0},
{0},
{0},
{0},
{0},
{0},
{0},}
};
};  


#define   alarm_ctrl_para_array_g_NUM   (sizeof(alarm_ctrl_para_array_g) /sizeof(ALARM_CTRL_PARA_T)   )