From cf4d12fd8322cbb350dd3bc5af8c748e8790ac64 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 05 Jun 2024 17:38:06 +0800
Subject: [PATCH] 继续测试修改
---
Function/STORAGE/system_mem_para.h | 70 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 4 deletions(-)
diff --git a/Function/STORAGE/system_mem_para.h b/Function/STORAGE/system_mem_para.h
index 2cab594..ed6ac39 100644
--- a/Function/STORAGE/system_mem_para.h
+++ b/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;
@@ -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
{
@@ -282,6 +286,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;
+
@@ -305,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);
--
Gitblit v1.9.3