继续测试修改

jinlicong

2024-05-30 a1810b89e66f184c62a0588ae7d57c91d0c376e8

 Function/STORAGE/system_mem_para.h

@@ -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;
@@ -258,11 +258,15 @@
   uint16_t   report_data_save_num;
   uint16_t   report_data_left_num;
   
}WRC_DATA_NUM_CTRL_PARA_SIZHU_T;
}WRC_DATA_NUM_CTRL_PARA_SIZHU_T;  //´Ë²ÎÊý±ä»¯»á±È½ÏƵ·±£¬ÐèÒª¿¼ÂÇ´æ´¢´ÎÊýµÄÎÊÌ⣡£¡£¡


//¼Û¸ñ·½°¸ÅäÖòÎÊý


//³äÖµÅäÖòÎÊý


//Óà¶î/Ìõ¼þ¹Ø·§ÅäÖòÎÊý
typedef struct
{
@@ -284,6 +288,58 @@
/***********************************************/


/*****************ÈÕÖ¾¿ØÖƲÎÊý******************************/
//ÈÕÖ¾¿ØÖƲÎÊý
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;

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

//±¨¾¯¼Ç¼
typedef struct
{
   LOG_SIZHU_RUN_T system_alarm_log;
	
}LOG_ALARM_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;

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

   LOG_SIZHU_RUN_T  factory_reset_log;	

   LOG_SIZHU_RUN_T  calibration_time_log;
	
}LOG_EVENT_CTRL_T;



#pragma pack()