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_alarm_record.h |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/Function/STORAGE/sizhu_alarm_record.h b/Function/STORAGE/sizhu_alarm_record.h
index e47d29f..1c34fc2 100644
--- a/Function/STORAGE/sizhu_alarm_record.h
+++ b/Function/STORAGE/sizhu_alarm_record.h
@@ -5,25 +5,24 @@
 #include "system_eep_mem_manage.h"
 #include "sizhu_ctrl_word.h"
 #include "system_general_para.h"
+#include "system_mem_para.h"
 
-#define   SYSTEM_ALARM_LOG_FIRST_INIT_ADDR                        SYSTEM_ALARM_LOG_ADDR
+
 /****************************************************ϵͳ����************************************************************************/
-#define   SYSTEM_ALARM_LOG_STORAGE_LENGTH                    sizeof(LOG_SIZHU_SYS_ALARM_SAVE_T)   
+/*������¼�洢����*/
+#define	SYSTEM_ALARM_LOG_START_ADDR			SYSTEM_ALARM_STORAGE_START_ADDR
+#define	SYSTEM_ALARM_LOG_LENGTH					sizeof(LOG_SIZHU_SYS_ALARM_SAVE_T)
+#define	SYSTEM_ALARM_LOG_MAX_NUM						200U
+#define	SYSTEM_ALARM_LOG_END_ADDR				SYSTEM_ALARM_LOG_START_ADDR + SYSTEM_ALARM_LOG_LENGTH * (SYSTEM_ALARM_LOG_MAX_NUM -1)
 
-#define   SYSTEM_ALARM_LOG_NUM                       400
-
-#define   SYSTEM_ALARM_LOG_START_ADDR                        SYSTEM_ALARM_LOG_ADDR + 10//DEL
-
-
-#define   SYSTEM_ALARM_LOG_COUNT_ADDR                        SYSTEM_ALARM_LOG_START_ADDR
-#define   SYSTEM_ALARM_LOG_SAVE_ADDR                         SYSTEM_ALARM_LOG_COUNT_ADDR + 2
-#define   SYSTEM_ALARM_LOG_STORAGE_START_ADDR                SYSTEM_ALARM_LOG_START_ADDR + 100
-#define 	SYSTEM_ALARM_LOG_STORAGE_END_ADDR                  SYSTEM_ALARM_LOG_STORAGE_START_ADDR + (SYSTEM_ALARM_LOG_NUM -1) * SYSTEM_ALARM_LOG_STORAGE_LENGTH
-
-#pragma pack(1)
 
 #define		ALARM_HAPPEN											0x0000
 #define		ALARM_END											    0x1000
+
+
+
+
+
 
 
 //#define		WARNING_ID1											1
@@ -64,7 +63,7 @@
 //������ϸ��
 //������ϸ��
 
-
+#pragma pack(1)
 
 typedef struct log_sizhu_sys_alarm_save_t  //ϵͳ����
 {
@@ -92,16 +91,12 @@
 	
 }LOG_SIZHU_SYS_ALARM_SAVE_T;
 
-typedef struct
-{
-	LOG_SIZHU_RUN_T system_alarm_log;
-	
-}LOG_ALARM_PARA_T;
+
 
 #pragma pack()
 
 
-extern LOG_ALARM_PARA_T log_alarm_para_g;
+
 
 
 uint8_t system_alarm_log_eeprom_default_init(void);

--
Gitblit v1.9.3