From b39a40b0191e0a8b155db74e885ff66e17b91896 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 06 Jun 2024 19:25:15 +0800
Subject: [PATCH] 继续完善

---
 Function/STORAGE/sizhu_para_modify_record.h |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/Function/STORAGE/sizhu_para_modify_record.h b/Function/STORAGE/sizhu_para_modify_record.h
index abd7ea8..4a22d65 100644
--- a/Function/STORAGE/sizhu_para_modify_record.h
+++ b/Function/STORAGE/sizhu_para_modify_record.h
@@ -2,6 +2,57 @@
 #define _SIZHU_PARA_MODIFY_RECORD_H
 
 #include "sizhu_ctrl_word.h"
+#include "system_mem_para.h"
+
+
+
+/*�����޸ļ�¼�洢����*/
+//�豸������Ϣ�޸ļ�¼
+#define	BASIC_INFO_MODIFY_LOG_START_ADDR			BASIC_INFO_MODIFY_STORAGE_START_ADDR
+#define	BASIC_INFO_MODIFY_LOG_LENGTH					sizeof(0)
+#define	BASIC_INFO_MODIFY_LOG_MAX_NUM						10U
+#define	BASIC_INFO_MODIFY_LOG_END_ADDR				BASIC_INFO_MODIFY_LOG_START_ADDR + BASIC_INFO_MODIFY_LOG_LENGTH * (BASIC_INFO_MODIFY_LOG_MAX_NUM -1)
+//�����޸ļ�¼-�ۻ����޸ļ�¼
+#define	CUMULATE_MODIFY_LOG_START_ADDR			CUMULATE_MODIFY_STORAGE_START_ADDR
+#define	CUMULATE_MODIFY_LOG_LENGTH					sizeof(0)
+#define	CUMULATE_MODIFY_LOG_MAX_NUM						20U
+#define	CUMULATE_MODIFY_LOG_END_ADDR				CUMULATE_MODIFY_LOG_START_ADDR + CUMULATE_MODIFY_LOG_LENGTH * (CUMULATE_MODIFY_LOG_MAX_NUM -1)
+//�����޸ļ�¼-����޸�
+#define	BALANCE_MODIFY_LOG_START_ADDR			BALANCE_MODIFY_STORAGE_START_ADDR
+#define	BALANCE_MODIFY_LOG_LENGTH					sizeof(0)
+#define	BALANCE_MODIFY_LOG_MAX_NUM						20U
+#define	BALANCE_MODIFY_LOG_END_ADDR				BALANCE_MODIFY_LOG_START_ADDR + BALANCE_MODIFY_LOG_LENGTH * (BALANCE_MODIFY_LOG_MAX_NUM -1)
+//�����޸ļ�¼-�����Ʋ����޸ļ�¼
+#define	FLOWMETER_PARA_MODIFY_LOG_START_ADDR			FLOWMETER_PARA_MODIFY_STORAGE_START_ADDR
+#define	FLOWMETER_PARA_MODIFY_LOG_LENGTH					sizeof(0)
+#define	FLOWMETER_PARA_MODIFY_LOG_MAX_NUM						20U
+#define	FLOWMETER_PARA_MODIFY_LOG_END_ADDR				FLOWMETER_PARA_MODIFY_LOG_START_ADDR + FLOWMETER_PARA_MODIFY_LOG_LENGTH * (FLOWMETER_PARA_MODIFY_LOG_MAX_NUM -1)
+//�����޸ļ�¼-���/�����ط������޸ļ�¼
+#define	CONDITIONAL_CLOSE_VALVE_CTRL_MODIFY_LOG_START_ADDR			CONDITIONAL_CLOSE_VALVE_CTRL_MODIFY_STORAGE_START_ADDR
+#define	CONDITIONAL_CLOSE_VALVE_CTRL_MODIFY_LOG_LENGTH					sizeof(0)
+#define	CONDITIONAL_CLOSE_VALVE_CTRL_MODIFY_LOG_MAX_NUM						20U
+#define	CONDITIONAL_CLOSE_VALVE_CTRL_MODIFY_LOG_END_ADDR				CONDITIONAL_CLOSE_VALVE_CTRL_MODIFY_LOG_START_ADDR + CONDITIONAL_CLOSE_VALVE_CTRL_MODIFY_LOG_LENGTH * (CONDITIONAL_CLOSE_VALVE_CTRL_MODIFY_LOG_MAX_NUM -1)
+//�����޸ļ�¼-ϵͳ�����������޸ļ�¼
+#define	FUN_CTRL_MODIFY_LOG_START_ADDR			FUN_CTRL_MODIFY_STORAGE_START_ADDR
+#define	FUN_CTRL_MODIFY_LOG_LENGTH					sizeof(0)
+#define	FUN_CTRL_MODIFY_LOG_MAX_NUM						20U
+#define	FUN_CTRL_MODIFY_LOG_END_ADDR				FUN_CTRL_MODIFY_LOG_START_ADDR + FUN_CTRL_MODIFY_LOG_LENGTH * (FUN_CTRL_MODIFY_LOG_MAX_NUM -1)
+//�����޸ļ�¼-��������/�ϱ��������޸ļ�¼
+#define	ALARM_CTRL_MODIFY_LOG_START_ADDR			ALARM_CTRL_MODIFY_STORAGE_START_ADDR
+#define	ALARM_CTRL_MODIFY_LOG_LENGTH					sizeof(0)
+#define	ALARM_CTRL_MODIFY_LOG_MAX_NUM						20U
+#define	ALARM_CTRL_MODIFY_LOG_END_ADDR				ALARM_CTRL_MODIFY_LOG_START_ADDR + ALARM_CTRL_MODIFY_LOG_LENGTH * (ALARM_CTRL_MODIFY_LOG_MAX_NUM -1)
+//�����޸ļ�¼-�ط��������޸ļ�¼
+#define	VALVE_CTRL_BYTES_MODIFY_LOG_START_ADDR			VALVE_CTRL_BYTES_MODIFY_STORAGE_START_ADDR
+#define	VALVE_CTRL_BYTES_MODIFY_LOG_LENGTH					sizeof(0)
+#define	VALVE_CTRL_BYTES_MODIFY_LOG_MAX_NUM						20U
+#define	VALVE_CTRL_BYTES_MODIFY_LOG_END_ADDR				VALVE_CTRL_BYTES_MODIFY_LOG_START_ADDR + VALVE_CTRL_BYTES_MODIFY_LOG_LENGTH * (VALVE_CTRL_BYTES_MODIFY_LOG_MAX_NUM -1)
+
+
+
+
+
+
 
 #pragma pack(1)
 
@@ -274,8 +325,8 @@
 	uint8_t 	    modify_source;  //�޸���Դ��01��ʾ��λ��   02��ʾAPP	
 	uint8_t		  factory_id;
 	
-	VALVE_CTL_BYTES_T ctrl_word_before;
-	VALVE_CTL_BYTES_T ctrl_word_after;
+	VALVE_CTL_BYTES_UNION_T ctrl_word_before;
+	VALVE_CTL_BYTES_UNION_T ctrl_word_after;
 }LOG_SIZHU_VALVE_CLOSE_CONTROL_WORD_MODIFY_SAVE_T;
 
 

--
Gitblit v1.9.3