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_flash_mem_manage.h |   54 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/Function/STORAGE/system_flash_mem_manage.h b/Function/STORAGE/system_flash_mem_manage.h
index 6d55376..8f994ac 100644
--- a/Function/STORAGE/system_flash_mem_manage.h
+++ b/Function/STORAGE/system_flash_mem_manage.h
@@ -4,39 +4,63 @@
 #include "off_chip_flash.h"
 
 
+#define	STORAGE_SPACE 			OUT_FLASH_ALL_SIZE     
+
 /************�ⲿflash�洢�滮******************
 *1���������洢����������512KB�ռ䣬һ�����ڽ��ո��³���һ�����ڻ�ԭ�³�����ʱ�洢����
-*2������ʷ��
-*3������¼��
-*4�����޸ļ�¼��
-*5�¼���¼��
-*6������ϵͳ�洢��������������ʷ��������¼���¼���¼�ȣ����ݵ�����ϵͳҪ���������嶨�壬�˴���������
+*2˼����־�洢��������������ʷ��¼������¼���¼���¼�������޸ļ�¼��
+*3������ϵͳ�洢��������������ʷ��������¼���¼���¼�ȣ����ݵ�����ϵͳҪ���������嶨�壬�˴���������
 */
 
 
-//���������洢��
+/*���������洢��*/
 #define PROGRAM_UPDATE_STORAGE_START_ADDR		0
 #define PROGRAM_UPDATE_STORAGE_LENGTH		   (1024*1024)
 
+/*˼����־�洢��*/
 //������ʷ��¼
 #define HISTORY_RECORD_STORAGE_START_ADDR	  		PROGRAM_UPDATE_STORAGE_START_ADDR + PROGRAM_UPDATE_STORAGE_LENGTH
 #define HISTORY_RECORD_STORAGE_LENGTH				(1024*1024)
-
-//������¼
+//������¼��Ԥ��1����
 #define	SYSTEM_ALARM_STORAGE_START_ADDR					HISTORY_RECORD_STORAGE_START_ADDR + HISTORY_RECORD_STORAGE_LENGTH
 #define	SYSTEM_ALARM_STORAGE_LENGTH					(30*1024)	
-
-//�����޸ļ�¼
-#define	SYSTEM_PARA_MODIFY_STORAGE_START_ADDR					SYSTEM_ALARM_STORAGE_START_ADDR + SYSTEM_ALARM_STORAGE_LENGTH
+//�¼���¼��Ԥ��2����
+#define	SYSTEM_EVENT_STORAGE_START_ADDR					SYSTEM_ALARM_STORAGE_START_ADDR + SYSTEM_ALARM_STORAGE_LENGTH
+#define	SYSTEM_EVENT_STORAGE_LENGTH							(20*1024)	
+//�����޸ļ�¼��Ԥ��2����
+#define	SYSTEM_PARA_MODIFY_STORAGE_START_ADDR					SYSTEM_EVENT_STORAGE_START_ADDR + SYSTEM_EVENT_STORAGE_LENGTH
 #define	SYSTEM_PARA_MODIFY_STORAGE_LENGTH				(30*1024)	
 
-//�¼���¼
-#define	SYSTEM_EVENT_STORAGE_START_ADDR					SYSTEM_PARA_MODIFY_STORAGE_START_ADDR + SYSTEM_PARA_MODIFY_STORAGE_LENGTH
-#define	SYSTEM_EVENT_STORAGE_LENGTH							(30*1024)	
+//˼����־�洢��ϸ��
+//������ʷ��¼-�¼�¼
+#define MONTH_HISTORY_RECORD_STORAGE_START_ADDR			HISTORY_RECORD_STORAGE_START_ADDR
+#define	MONTH_HISTORY_RECORD_STORAGE_ADDR_LENGTH		8*1024
+//������ʷ��¼-�ռ�¼
+#define DAY_HISTORY_RECORD_STORAGE_START_ADDR			MONTH_HISTORY_RECORD_STORAGE_START_ADDR + MONTH_HISTORY_RECORD_STORAGE_ADDR_LENGTH
+#define	DAY_HISTORY_RECORD_STORAGE_ADDR_LENGTH		40*1024
+//������ʷ��¼-Сʱ��¼
+#define HOUR_HISTORY_RECORD_STORAGE_START_ADDR			DAY_HISTORY_RECORD_STORAGE_START_ADDR + DAY_HISTORY_RECORD_STORAGE_ADDR_LENGTH
+#define	HOUR_HISTORY_RECORD_STORAGE_ADDR_LENGTH		230*1024
+//������ʷ��¼-��������¼
+#define INTERVAL_HISTORY_RECORD_STORAGE_START_ADDR			HOUR_HISTORY_RECORD_STORAGE_START_ADDR + HOUR_HISTORY_RECORD_STORAGE_ADDR_LENGTH
+#define	INTERVAL_HISTORY_RECORD_STORAGE_ADDR_LENGTH		100*1024
+
+//������¼,��ʱֻ��һ�֣��Ȳ�ϸ��
+
+
+//�¼���¼-���ؼ�¼
+#define	VALVE_OPERATION_EVENT_STORAGE_START_ADDR	SYSTEM_EVENT_STORAGE_START_ADDR
+#define	VALVE_OPERATION_EVENT_STORAGE_ADDR_LENGTH		4*1024
+//�¼���¼-�ָ�������¼
+#define	FACTORY_RESET_EVENT_STORAGE_START_ADDR	VALVE_OPERATION_EVENT_STORAGE_START_ADDR + VALVE_OPERATION_EVENT_STORAGE_ADDR_LENGTH
+#define	FACTORY_RESET_EVENT_STORAGE_ADDR_LENGTH		1*1024
+//�¼���¼-Уʱ��¼
+#define	SET_TIME_EVENT_STORAGE_START_ADDR	FACTORY_RESET_EVENT_STORAGE_START_ADDR + FACTORY_RESET_EVENT_STORAGE_ADDR_LENGTH
+#define	SET_TIME_EVENT_STORAGE_ADDR_LENGTH		1*1024
 
 
 //������ϵͳ�洢��
-#define	THIRS_SYSTEM_RECORD_STORAGE_START_ADDR					SYSTEM_EVENT_STORAGE_START_ADDR + SYSTEM_EVENT_STORAGE_LENGTH
+#define	THIRS_SYSTEM_RECORD_STORAGE_START_ADDR					3*1024*1024
 #define	THIRS_SYSTEM_RECORD_STORAGE_LENGTH		(1024*1024)	
 
 

--
Gitblit v1.9.3