From 6b0d1f644233b2984d2a87553de598879cf05caf Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 28 May 2024 17:24:59 +0800
Subject: [PATCH] 继续完善
---
Function/STORAGE/sizhu_alarm_record.h | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/Function/STORAGE/sizhu_alarm_record.h b/Function/STORAGE/sizhu_alarm_record.h
index 730deba..713e321 100644
--- a/Function/STORAGE/sizhu_alarm_record.h
+++ b/Function/STORAGE/sizhu_alarm_record.h
@@ -5,6 +5,7 @@
#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
/****************************************************ϵͳ����************************************************************************/
@@ -15,10 +16,10 @@
#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
+//#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)
@@ -70,40 +71,34 @@
{
u16 serial_number;
- uint8_t Sample_year;
- uint8_t Sample_month;
- uint8_t Sample_day;
- uint8_t Sample_hour;
- uint8_t Sample_min;
- uint8_t Sample_sec;
-
- uint16_t alarm_id;
+ sClockBCD record_time_BCD;
- double StandardGasUsageTotal;
- double WorkingGasUsageTotal;
- double ReverseStandardGasUsageTotal;
- double ReverseWorkingGasUsageTotal;
- float Standardvec;
- float Workingvec;
- float Temperature;
- float Pressure;
+ uint16_t alarm_id;
+
+ double forward_cumulate_sc; // �������ۻ���
+ double forward_cumulate_wc;
+
+ float instant_sc;
+ float instant_wc;
+ float temperature;
+ float pressure;
float ambient_tem; //�����¶�
uint8_t lith_bat_v;
uint8_t alka_bat_v;
- SYSTEM_STATUS_WORD_T status_word;
+
+ SYSTEM_STATUS_WORD_T status_word;
+
+ u32 current_price;
+ double residual_amount;
}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;
+extern LOG_ALARM_CTRL_T log_alarm_para_g;
uint8_t system_alarm_log_eeprom_default_init(void);
--
Gitblit v1.9.3