继续测试修改

jinlicong

2024-06-05 cf4d12fd8322cbb350dd3bc5af8c748e8790ac64

 Function/STORAGE/system_mem_para.h

@@ -13,12 +13,12 @@
#define SOFT_SERIAL_NUMBER3   0x05
#define SOFT_SERIAL_NUMBER4   0x07

#define   EEP_PARA_INIT_ID    0x24041601          //BCD¸ñʽYYMMDDXX£¬²»ÄܳöÏÖ×Öĸ
#define   EEP_PARA_INIT_ID    0x24060301          //BCD¸ñʽYYMMDDXX£¬²»ÄܳöÏÖ×Öĸ
#define LAST_PATCH_ID         EEP_PARA_PATCH_ID_1    //BCD¸ñʽYYMMDDXX£¬²»ÄܳöÏÖ×Öĸ£¬×¢Òâ´Ë´¦Ö¸Ïò×îºóÒ»¸ö²¹¶¡

/************²¹¶¡±êʶ¶¨ÒåÇø£¬³ÖÐøÔö¼Ó£¬BCD¸ñʽYYMMDDXX£¬²»ÄܳöÏÖ×Öĸ************/
/************ÿ´ÎÔö¼ÓºóLAST_PATCH_IDÖ¸Ïò×îºóÒ»¸ö²¹¶¡***************************/
#define   EEP_PARA_PATCH_ID_1    0x24041601     
#define   EEP_PARA_PATCH_ID_1    0x24060301     

/****************************************************/
 
@@ -145,7 +145,7 @@
   VALVE_LOCK_STATE_T      valve_lock_state;  //·§ÃÅËø¶¨×´Ì¬
   uint16_t      open_times;//¿ª·§´ÎÊý
   uint16_t      close_times;//¹Ø·§´ÎÊý   
   uint16_t      valve_close_ID ;//¹Ø·§Ô­Òò  µÈÓÚ±¨¾¯ID
   uint16_t      valve_close_ID ;//¹Ø·§Ô­Òò £¬×λΪ1´ú±íÇ¿Ö±ÐԹط§£¬ÆäÓàλµÈÓÚ±¨¾¯ID,·§ÃÅ´ò¿ªÖ®ºóÇåÁã¡£
   
   
}SAVE_VALVE_PARA_T;
@@ -288,6 +288,60 @@
/***********************************************/


/*****************ÈÕÖ¾¿ØÖƲÎÊý******************************/
//ÈÕÖ¾¿ØÖƲÎÊý
typedef struct log_sizhu_run_t
{
   uint16_t      log_count;
  uint32_t     log_addr_save;
//  uint32_t     log_addr_begin;
   uint8_t reserve[16];
	
}LOG_SIZHU_RUN_T;  //³¤¶ÈÕ¼22×Ö½Ú

//Êý¾ÝÀúÊ·¼Ç¼
typedef struct 
{
   LOG_SIZHU_RUN_T per_month_log;
   LOG_SIZHU_RUN_T per_day_log;
   LOG_SIZHU_RUN_T per_hour_log;
   LOG_SIZHU_RUN_T per_interval_log;
}LOG_SIZHU_HISTORY_CTRL_T;

//±¨¾¯¼Ç¼
typedef struct
{
   LOG_SIZHU_RUN_T system_alarm_log;
	
}LOG_ALARM_CTRL_T;

//ʼþ¼Ç¼
typedef struct LOG_EVENT_CTRL_T
{
   LOG_SIZHU_RUN_T  valve_operation_log;

   LOG_SIZHU_RUN_T  factory_reset_log;	

   LOG_SIZHU_RUN_T  set_time_log;
	
}LOG_EVENT_CTRL_T;

//²ÎÊýÐ޸ļǼ
typedef struct
{
   LOG_SIZHU_RUN_T basic_info_modify_log;
   LOG_SIZHU_RUN_T cumulate_modify_log;
   LOG_SIZHU_RUN_T balance_modify_log;
   LOG_SIZHU_RUN_T flow_meter_para_modify_log;
   LOG_SIZHU_RUN_T conditional_close_valve_para_modify_log;
   LOG_SIZHU_RUN_T fun_ctrl_word_modify_log;
   LOG_SIZHU_RUN_T alarm_ctrl_word_modify_log;
   LOG_SIZHU_RUN_T close_valve_ctrl_word_modify_log;
	
}LOG_PARA_MODIFY_CTRL_T;





#pragma pack()
@@ -309,6 +363,10 @@
extern WRC_DATA_NUM_CTRL_PARA_SIZHU_T   wrc_data_num_ctrl_para_sizhu_g;
extern BILLING_VALVE_CTRL_PATA_T billing_valve_ctrl_para_g;

extern LOG_SIZHU_HISTORY_CTRL_T      log_sizhu_history_ctrl_g;
extern LOG_ALARM_CTRL_T log_alarm_ctrl_g;
extern LOG_EVENT_CTRL_T log_event_ctrl_g;
extern LOG_PARA_MODIFY_CTRL_T   log_para_modify_ctrl_g;

void allParaDefaultInit(void);
void allParaReadFromEep(void);