From 6b0d1f644233b2984d2a87553de598879cf05caf Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 28 May 2024 17:24:59 +0800
Subject: [PATCH] 继续完善

---
 Function/STORAGE/system_mem_para.h |   68 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/Function/STORAGE/system_mem_para.h b/Function/STORAGE/system_mem_para.h
index d2b7f72..7af8bb1 100644
--- a/Function/STORAGE/system_mem_para.h
+++ b/Function/STORAGE/system_mem_para.h
@@ -49,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)
@@ -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;
@@ -253,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
 {
@@ -277,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()
@@ -295,6 +358,7 @@
 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;
 
 

--
Gitblit v1.9.3