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/sizhu_alarm_record.c | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Function/STORAGE/sizhu_alarm_record.c b/Function/STORAGE/sizhu_alarm_record.c
index 07072bc..64da6d1 100644
--- a/Function/STORAGE/sizhu_alarm_record.c
+++ b/Function/STORAGE/sizhu_alarm_record.c
@@ -2,7 +2,7 @@
#include "sizhu_ctrl_word.h"
#include "eeprom.h"
-LOG_ALARM_CTRL_T log_alarm_para_g;
+
//ALARM_REPORT_PARA_T alarm_report_para_g;
@@ -15,20 +15,20 @@
*****************************************/
uint8_t system_alarm_log_eeprom_default_init(void)
{
-// log_alarm_para_g.system_alarm_log.log_count = 0;
-// log_alarm_para_g.system_alarm_log.log_addr_save = SYSTEM_ALARM_LOG_STORAGE_START_ADDR;
-// EEPROM_data_write_uint16 ( log_alarm_para_g.system_alarm_log.log_count, SYSTEM_ALARM_LOG_COUNT_ADDR );
-// EEPROM_data_write_uint32 ( log_alarm_para_g.system_alarm_log.log_addr_save, SYSTEM_ALARM_LOG_SAVE_ADDR );
+// log_alarm_ctrl_g.system_alarm_log.log_count = 0;
+// log_alarm_ctrl_g.system_alarm_log.log_addr_save = SYSTEM_ALARM_LOG_STORAGE_START_ADDR;
+// EEPROM_data_write_uint16 ( log_alarm_ctrl_g.system_alarm_log.log_count, SYSTEM_ALARM_LOG_COUNT_ADDR );
+// EEPROM_data_write_uint32 ( log_alarm_ctrl_g.system_alarm_log.log_addr_save, SYSTEM_ALARM_LOG_SAVE_ADDR );
//
-// log_alarm_para_g.class_measure_abn.log_count = 0;
-// log_alarm_para_g.class_measure_abn.log_addr_save = MEASURE_ALARM_LOG_STORAGE_START_ADDR;
-// EEPROM_data_write_uint16 ( log_alarm_para_g.class_measure_abn.log_count, MEASURE_ALARM_LOG_COUNT_ADDR );
-// EEPROM_data_write_uint32 ( log_alarm_para_g.class_measure_abn.log_addr_save, MEASURE_ALARM_LOG_SAVE_ADDR );
+// log_alarm_ctrl_g.class_measure_abn.log_count = 0;
+// log_alarm_ctrl_g.class_measure_abn.log_addr_save = MEASURE_ALARM_LOG_STORAGE_START_ADDR;
+// EEPROM_data_write_uint16 ( log_alarm_ctrl_g.class_measure_abn.log_count, MEASURE_ALARM_LOG_COUNT_ADDR );
+// EEPROM_data_write_uint32 ( log_alarm_ctrl_g.class_measure_abn.log_addr_save, MEASURE_ALARM_LOG_SAVE_ADDR );
-// log_alarm_para_g.valve_action_log.log_count = 0;
-// log_alarm_para_g.valve_action_log.log_addr_save = VALVE_ACTION_LOG_STORAGE_START_ADDR;
-// EEPROM_data_write_uint16 ( log_alarm_para_g.valve_action_log.log_count, VALVE_ACTION_LOG_COUNT_ADDR );
-// EEPROM_data_write_uint32 ( log_alarm_para_g.valve_action_log.log_addr_save, VALVE_ACTION_LOG_SAVE_ADDR );
+// log_alarm_ctrl_g.valve_operation_log.log_count = 0;
+// log_alarm_ctrl_g.valve_operation_log.log_addr_save = VALVE_ACTION_LOG_STORAGE_START_ADDR;
+// EEPROM_data_write_uint16 ( log_alarm_ctrl_g.valve_operation_log.log_count, VALVE_ACTION_LOG_COUNT_ADDR );
+// EEPROM_data_write_uint32 ( log_alarm_ctrl_g.valve_operation_log.log_addr_save, VALVE_ACTION_LOG_SAVE_ADDR );
return 0;
}
@@ -45,13 +45,13 @@
uint8_t system_alarm_log_record_only_read_init(void)
{
-// log_alarm_para_g.system_alarm_log.log_count = eeprom_data_read_uint16 ( SYSTEM_ALARM_LOG_COUNT_ADDR );
-// log_alarm_para_g.system_alarm_log.log_addr_save = eeprom_data_read_uint32 ( SYSTEM_ALARM_LOG_SAVE_ADDR );
+// log_alarm_ctrl_g.system_alarm_log.log_count = eeprom_data_read_uint16 ( SYSTEM_ALARM_LOG_COUNT_ADDR );
+// log_alarm_ctrl_g.system_alarm_log.log_addr_save = eeprom_data_read_uint32 ( SYSTEM_ALARM_LOG_SAVE_ADDR );
//
-// if((log_alarm_para_g.system_alarm_log.log_addr_save > SYSTEM_ALARM_LOG_STORAGE_END_ADDR)||(log_alarm_para_g.system_alarm_log.log_addr_save < SYSTEM_ALARM_LOG_STORAGE_START_ADDR))
+// if((log_alarm_ctrl_g.system_alarm_log.log_addr_save > SYSTEM_ALARM_LOG_STORAGE_END_ADDR)||(log_alarm_ctrl_g.system_alarm_log.log_addr_save < SYSTEM_ALARM_LOG_STORAGE_START_ADDR))
// {
-// log_alarm_para_g.system_alarm_log.log_count = 0;
-// log_alarm_para_g.system_alarm_log.log_addr_save = SYSTEM_ALARM_LOG_STORAGE_START_ADDR;
+// log_alarm_ctrl_g.system_alarm_log.log_count = 0;
+// log_alarm_ctrl_g.system_alarm_log.log_addr_save = SYSTEM_ALARM_LOG_STORAGE_START_ADDR;
// }
return 0;
}
@@ -68,26 +68,26 @@
{
// void *alarm_ptr;
//
-// eeprom_multiple_data_write( (uint8_t *)para_alarm_ptr, log_alarm_para_g.system_alarm_log.log_addr_save, SYSTEM_ALARM_LOG_STORAGE_LENGTH );
+// eeprom_multiple_data_write( (uint8_t *)para_alarm_ptr, log_alarm_ctrl_g.system_alarm_log.log_addr_save, SYSTEM_ALARM_LOG_STORAGE_LENGTH );
//
-// if((log_alarm_para_g.system_alarm_log.log_addr_save >= SYSTEM_ALARM_LOG_STORAGE_END_ADDR)||(log_alarm_para_g.system_alarm_log.log_addr_save < SYSTEM_ALARM_LOG_STORAGE_START_ADDR))
+// if((log_alarm_ctrl_g.system_alarm_log.log_addr_save >= SYSTEM_ALARM_LOG_STORAGE_END_ADDR)||(log_alarm_ctrl_g.system_alarm_log.log_addr_save < SYSTEM_ALARM_LOG_STORAGE_START_ADDR))
// {
-// log_alarm_para_g.system_alarm_log.log_addr_save = SYSTEM_ALARM_LOG_STORAGE_START_ADDR;
+// log_alarm_ctrl_g.system_alarm_log.log_addr_save = SYSTEM_ALARM_LOG_STORAGE_START_ADDR;
// }else
// {
-// log_alarm_para_g.system_alarm_log.log_addr_save = log_alarm_para_g.system_alarm_log.log_addr_save + SYSTEM_ALARM_LOG_STORAGE_LENGTH;
+// log_alarm_ctrl_g.system_alarm_log.log_addr_save = log_alarm_ctrl_g.system_alarm_log.log_addr_save + SYSTEM_ALARM_LOG_STORAGE_LENGTH;
// }
//
-// if(log_alarm_para_g.system_alarm_log.log_count >= SYSTEM_ALARM_LOG_NUM)
+// if(log_alarm_ctrl_g.system_alarm_log.log_count >= SYSTEM_ALARM_LOG_NUM)
// {
-// log_alarm_para_g.system_alarm_log.log_count = SYSTEM_ALARM_LOG_NUM;
+// log_alarm_ctrl_g.system_alarm_log.log_count = SYSTEM_ALARM_LOG_NUM;
// }else
// {
-// log_alarm_para_g.system_alarm_log.log_count ++;
+// log_alarm_ctrl_g.system_alarm_log.log_count ++;
// }
//
-// EEPROM_data_write_uint16 ( log_alarm_para_g.system_alarm_log.log_count, SYSTEM_ALARM_LOG_COUNT_ADDR );
-// EEPROM_data_write_uint32 ( log_alarm_para_g.system_alarm_log.log_addr_save, SYSTEM_ALARM_LOG_SAVE_ADDR );
+// EEPROM_data_write_uint16 ( log_alarm_ctrl_g.system_alarm_log.log_count, SYSTEM_ALARM_LOG_COUNT_ADDR );
+// EEPROM_data_write_uint32 ( log_alarm_ctrl_g.system_alarm_log.log_addr_save, SYSTEM_ALARM_LOG_SAVE_ADDR );
return 0;
}
--
Gitblit v1.9.3