修改报警相关处理

jinlicong

2024-05-24 1360095f8d64cf607d333d2fc7fd1dcd81d1bd7b

 Function/STORAGE/system_mem_para.c

@@ -1,5 +1,5 @@
#include "system_mem_para.h"
#include "mbcrc.h"
#include "mbcrc1.h"
#include "eeprom.h"
#include "system_eep_mem_manage.h"
#include "rs485_data_analysis_pro.h"
@@ -27,6 +27,7 @@
   .pulse_width = 50,                                        \
   .baudrate_code =    BAUDRATE_9600,                       \
   .parity_bit = PARITY_NONE,                               \
   .output_voltage_code = RS485_V1_5V,           \
   .slave_address = 1, };

TEM_PRE_PARA_T tem_pre_para_g = { 
@@ -63,6 +64,12 @@
   .PC_manage_user_password = {0x75,0x97},            \
};

UP_COMM_PARA_T   up_comm_para_g = {
   .slave_address = 1,                                \
   .baudrate_code = BAUDRATE_115200,           \
   .parity_bit = PARITY_NONE,                       \
};

WRC_PARA_SIZHU_T wrc_para_sizhu_g = {
   
   .ip1 = {120,77,85,236},                                  \
@@ -84,13 +91,17 @@
   .comm_timeout_time =120,                                \
   .KVer_AES_128[0] ={8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0},  \
};
WRC_DATA_NUM_CTRL_PARA_SIZHU_T   wrc_data_num_ctrl_para_sizhu_g={
   .report_data_save_num = 0,
   .report_data_left_num = 0,
};

BILLING_VALVE_CTRL_PATA_T billing_valve_ctrl_para_g = {
   .balance_valve_ctrl_byte = {0},                 \
   .conditional_valve_ctrl_byte = {0},           \
  .balance_small_value = {500,100,0,0,0},       \
  .cumulate_flow_threshold = 0,                    \
  .no_wrc_days = 3,                                        \
  .no_wrc_days = 15,                                        \
  .no_use_gas_days = 0,                                 \
};

@@ -233,7 +244,7 @@
}


//ËùÓвÎÊý³õʼ»¯ÎªÄ¬ÈÏÖµ²¢Ð´ÈëEEPROM
//?ËùÓвÎÊý³õʼ»¯ÎªÄ¬ÈÏÖµ²¢Ð´ÈëEEPROM
void allParaDefaultInit(void)
{
   ErrorStatus   return_flag = PASS;
@@ -242,6 +253,9 @@
   
   
   //É豸»ù´¡ÐÅÏ¢³õʼ»¯Ð´Èë
	
	
   //?¼ÌÐø²¹³ä£¬°üÀ¨¿ØÖÆÈÕÖ¾´æ´¢µÄ²ÎÊý
   
   
   //ʵʱÊý¾Ý³õʼ»¯Ð´Èë
@@ -253,7 +267,7 @@



//ËùÓвÎÊýÖ±½Ó¶ÁÈ¡
//?ËùÓвÎÊýÖ±½Ó¶ÁÈ¡
void allParaReadFromEep(void)
{
   ErrorStatus   return_flag = PASS;
@@ -262,6 +276,8 @@
   
   //É豸»ù´¡ÐÅÏ¢¶ÁÈ¡
   
   //?¼ÌÐø²¹³ä£¬°üÀ¨¿ØÖÆÈÕÖ¾´æ´¢µÄ²ÎÊý
	
   //×îÖÕÅжÏreturn_flag==FAIL£¬Ôò±¨¾¯´æ´¢Òì³££¬Èç¹û»¹ÓÐÕâ¸ö±¨¾¯µÄ»°
   
}