From 267016d6cf472dd4c8d2a66dc9ed800b55997fea Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Sat, 11 May 2024 17:31:40 +0800
Subject: [PATCH] 继续完善电源管理
---
Function/STORAGE/sizhu_alarm_record.h | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/Function/STORAGE/sizhu_alarm_record.h b/Function/STORAGE/sizhu_alarm_record.h
index 730deba..e47d29f 100644
--- a/Function/STORAGE/sizhu_alarm_record.h
+++ b/Function/STORAGE/sizhu_alarm_record.h
@@ -70,27 +70,25 @@
{
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;
--
Gitblit v1.9.3