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_history_record.h | 76 +++++++++++++++----------------------
1 files changed, 31 insertions(+), 45 deletions(-)
diff --git a/Function/STORAGE/sizhu_history_record.h b/Function/STORAGE/sizhu_history_record.h
index 9e723fd..99ad7da 100644
--- a/Function/STORAGE/sizhu_history_record.h
+++ b/Function/STORAGE/sizhu_history_record.h
@@ -3,7 +3,7 @@
#include "sizhu_ctrl_word.h"
#include "system_general_para.h"
-
+#include "system_mem_para.h"
/*��־��������*/
@@ -15,34 +15,32 @@
#pragma pack(1)
+
+
+
+
//���������־����
typedef struct log_sizhu_log_save_period_t
{
- uint8_t sample_year;
- uint8_t sample_month;
- uint8_t sample_day;
- uint8_t sample_hour;
- uint8_t sample_min;
- uint8_t sample_sec;
+ sClockBCD record_time_BCD;
- double standardgasusagetotal;
- double workinggasusagetotal;
+ double forward_cumulate_sc; // �������ۻ���
+ double forward_cumulate_wc;
- float standardvec;
- float workingvec;
+ float instant_sc;
+ float instant_wc;
+ float temperature;
+ float pressure;
- float temperature;
- float pressure;
-
- u32 current_price;
- double residual_amount;
- double cumulative_gas_usage;
- double cumulative_fee_usage;
- uint8_t lith_bat_v;
- uint8_t lith_bat_per;
+ u32 current_price;
+ double residual_amount;
+ double cumulate_gas_usage;
+ double cumulate_fee_usage;
+ uint8_t lith_bat_v;
+ uint8_t lith_bat_per;
- uint8_t alka_bat_v;
- uint8_t alka_bat_per;
+ uint8_t alka_bat_v;
+ uint8_t alka_bat_per;
SYSTEM_STATUS_WORD_T status_word;
@@ -51,40 +49,28 @@
//�¡��ա�ʱ��־����
typedef struct log_sizhu_log_save_t
{
- uint8_t sample_year;
- uint8_t sample_month;
- uint8_t sample_day;
- uint8_t sample_hour;
- uint8_t sample_min;
- uint8_t sample_sec;
+ sClockBCD record_time_BCD;
- double standardgasusagetotal;
- double workinggasusagetotal;
+ double forward_cumulate_sc; // �������ۻ���
+ double forward_cumulate_wc;
- float standardvec;
- float workingvec;
-
- float temperature;
- float pressure;
+ float instant_sc;
+ float instant_wc;
+ float temperature;
+ float pressure;
- u32 unitprice;
- double residualamount;
+ u32 current_price;
+ double residual_amount;
uint8_t reverse[2];
}LOG_SIZHU_LOG_SAVE_T;
-typedef struct
-{
- LOG_SIZHU_RUN_T per_period_log;
- LOG_SIZHU_RUN_T per_hour_log;
- LOG_SIZHU_RUN_T per_day_log;
- LOG_SIZHU_RUN_T per_month_log;
-}LOG_SIZHU_HISTORY_RUN_T;
+
#pragma pack()
-extern LOG_SIZHU_HISTORY_RUN_T log_sizhu_history_run_g;
+extern LOG_SIZHU_HISTORY_CTRL_T log_sizhu_history_run_g;
uint8_t sizhu_historical_eeprom_default_init(void);
--
Gitblit v1.9.3