继续测试修改

jinlicong

2024-06-05 cf4d12fd8322cbb350dd3bc5af8c748e8790ac64

 Function/STORAGE/system_mem_para.c

@@ -3,6 +3,9 @@
#include "eeprom.h"
#include "system_eep_mem_manage.h"
#include "rs485_data_analysis_pro.h"
#include "pulse_and_alarm_line.h"
#include "system_flash_mem_manage.h"


SYSTEM_EEP_IDENTIFICATION_T system_eep_id_g = {         \
   .eep_para_init_config_id = EEP_PARA_INIT_ID,       \
@@ -11,6 +14,7 @@
EQUIPMENT_BASIC_INF_T              equipment_basic_inf_g={ 
   .product_type= DM_SCM_SZV103,      \
   .caliber_type = DN50_TYPE,         \
   .serial_number = {0x07,0x10,0x50,0x82,0x40,0x69,0x00,0x01,0xff,0xff},           \
   .valve_type = VM_HADE,               \
   .equipment_type = EM_SIFRCT,};

@@ -25,13 +29,16 @@


FLOW_METER_PARA_T   flow_meter_para_g ={                \
   .flow_meter_conn_type = FLOW_METER_CONN_RS485, \
   .flow_meter_conn_type = FLOW_METER_CONN_RS485_AND_PULSE, \
   .flow_meter_code = SIZHUMODBUSV2_0,                 \
   .pulse_coe   = 1.0,                             \
   .pulse_width = 50,                                        \
   .baudrate_code =    BAUDRATE_9600,                       \
   .parity_bit = PARITY_NONE,                               \
   .output_voltage_code = RS485_V1_5V,           \
   .slave_address = 1, };
   .slave_address = 1,                                        \
   .broken_line_multiplex = BROKEN_LINE_MUTIPLEX_NONE,    \
};

TEM_PRE_PARA_T tem_pre_para_g = {    \
   .tem_up_limit = 70,                   \
@@ -74,7 +81,7 @@
};

WRC_PARA_SIZHU_T wrc_para_sizhu_g = {                     \
   .ip1 = {120,77,85,236},                                  \
   .ip1 = {39,108,81,105},                                  \
   .ip_port1 = 9692,                                            \
   .ip1_connect_type = LINK_TCP,                       \
   .ip2 = {120,77,85,236},                                \
@@ -107,6 +114,20 @@
  .no_use_gas_days = 0,                                 \
};


LOG_SIZHU_HISTORY_CTRL_T      log_sizhu_history_ctrl_g = {
   .per_month_log.log_addr_save = MONTH_HISTORY_RECORD_STORAGE_START_ADDR,    \
   .per_day_log.log_addr_save = DAY_HISTORY_RECORD_STORAGE_START_ADDR,    \
   .per_hour_log.log_addr_save = HOUR_HISTORY_RECORD_STORAGE_START_ADDR,    \
   .per_interval_log.log_addr_save = INTERVAL_HISTORY_RECORD_STORAGE_START_ADDR,    \
};
LOG_ALARM_CTRL_T log_alarm_ctrl_g ={
   .system_alarm_log.log_addr_save = SYSTEM_ALARM_STORAGE_START_ADDR,    \
};
LOG_EVENT_CTRL_T log_event_ctrl_g ={
	
};
LOG_PARA_MODIFY_CTRL_T   log_para_modify_ctrl_g;

//EEPROM²ÎÊýдÈëºÍ¶ÁÈ¡¼ì²é,Ö»Ö§³Ö1024¸ö×Ö½ÚµÄдÈëÓë¶ÁÈ¡¼ì²é
ErrorStatus   eepWriteAndReadCheck(uint8_t * write_data,uint32_t addr,uint16_t length)
@@ -269,6 +290,25 @@










//ÈÕÖ¾¿ØÖƲÎÊý³õʼ»¯Ð´Èë
ErrorStatus   LogCtrlParaDefaultInit(void)
{
   ErrorStatus return_flag = FAIL;
   log_sizhu_history_ctrl_g.per_day_log.log_count = 
	
   return_flag = paraCalcCrcAndWriteEepAB((uint8_t * )&equipment_basic_inf_g,BASIC_INFORMATION_OF_EQUIPMENT_ADDR,BASIC_INFORMATION_OF_EQUIPMENT_ADDR + PARA_EEP_B_OFFSET_ADDR,EQUIPMENT_BASIC_INF_LENGTH);
}




//?ËùÓвÎÊý³õʼ»¯ÎªÄ¬ÈÏÖµ²¢Ð´ÈëEEPROM
void allParaDefaultInit(void)
{