继续测试修改

jinlicong

2024-06-04 deaf3df8a987f5cff0ac85c9f6ee12589c2c93ce

 Function/STORAGE/system_mem_para.h

@@ -6,18 +6,19 @@
#include "valve_control.h"
#include "wireless_remote_comm.h"
#include "sizhu_ctrl_word.h"
#include "rs485_read_data.h"

#define SOFT_SERIAL_NUMBER1   0x05
#define SOFT_SERIAL_NUMBER2   0x00
#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     

/****************************************************/
 
@@ -48,7 +49,7 @@
   uint8_t       serial_number[10];//³ö³§±àºÅ£¬BCDÄ¿Ç°Ö»ÓÃÇ°8×Ö½Ú£¬16룬ºó2×Ö½Ú²¹FFH¡£
   uint8_t      manufactuer_code[2];//³§¼Ò´úÂë,×ÔÓã¬ÓÃÓÚʶ±ðÉ豸ÓÃ;£¬±ÈÈçÊÇаÂÌùÅÆ£¬Ôò³§¼Ò´úÂë±íʾΪа£¬¸Ä´úÂë¿ÉÓÃÓÚÉÏλ»úʶ±ð£¬ÉÏλ»úʹÓÃÕßҲΪа£¬Ôò¿É½øÐвÙ×÷¡£
   VALVE_TYPE    valve_type;//·§ÃÅÐͺÅ0:ÎÞ·§ÃÅ£»1£ºÅôÊ¢·§Ì壻2:¹þµÂ·§Ì壻ÆäËû£¬Ä¬ÈϹþµÂ·§Ìå
   EQUIPMENT_TYPE      equipment_type;//É豸ÀàÐÍ,10H±íʾ¡°Ò»ÌåʽÁ÷Á¿Ô¶´«ÖÕ¶Ë
   EQUIPMENT_TYPE      equipment_type;//É豸ÀàÐÍ
   uint8_t   reserve[32];
}EQUIPMENT_BASIC_INF_T;
#define   EQUIPMENT_BASIC_INF_LENGTH        sizeof(EQUIPMENT_BASIC_INF_T)
@@ -144,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;
@@ -158,7 +159,7 @@
   uint16_t   pulse_width;
   BAUDRATE_CODE   baudrate_code;
   PARITY_BIT   parity_bit;
   uint8_t output_voltage_code;
   RS485_PWR_OUTPUT_SELECT output_voltage_code;
   uint8_t   slave_address;
   
   uint8_t   broken_line_multiplex; //¶ÏÏ߸´ÓÃ
@@ -215,6 +216,16 @@
//   uint8_t            APP_manage_user_password[2];
}LOGIN_PASSWORD_T;

//ÉÏλ»ú´®¿ÚÅäÖÃÐÅÏ¢
typedef struct 
{
   uint8_t   slave_address;
   BAUDRATE_CODE   baudrate_code;
   PARITY_BIT   parity_bit;

}UP_COMM_PARA_T;


//ÎÞÏßÔ¶³ÌͨѶÅäÖòÎÊý
typedef struct 
{
@@ -242,9 +253,20 @@
   
}WRC_PARA_SIZHU_T;

typedef struct 
{
   uint16_t   report_data_save_num;
   uint16_t   report_data_left_num;
	
}WRC_DATA_NUM_CTRL_PARA_SIZHU_T;  //´Ë²ÎÊý±ä»¯»á±È½ÏƵ·±£¬ÐèÒª¿¼ÂÇ´æ´¢´ÎÊýµÄÎÊÌ⣡£¡£¡


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


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


//Óà¶î/Ìõ¼þ¹Ø·§ÅäÖòÎÊý
typedef struct
{
@@ -266,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()
@@ -281,8 +355,11 @@
extern FLOW_METER_PARA_T   flow_meter_para_g;
extern MEASURE_FREEZE_PARA_T measure_freeze_para_g;
extern BAT_PARA_T bat_para_g;
extern LOGIN_PASSWORD_T login_passeord_g;
extern UP_COMM_PARA_T   up_comm_para_g;
extern WRC_PARA_SIZHU_T wrc_para_sizhu_g;

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;


void allParaDefaultInit(void);