From a05cacad5239ab3f35ffb58f443356b484e6cc1b Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 21 May 2024 19:17:22 +0800
Subject: [PATCH] 继续完善远传
---
Function/STORAGE/sizhu_history_record.h | 60 ++++++++++++++++++++++++------------------------------------
1 files changed, 24 insertions(+), 36 deletions(-)
diff --git a/Function/STORAGE/sizhu_history_record.h b/Function/STORAGE/sizhu_history_record.h
index 9e723fd..30123dc 100644
--- a/Function/STORAGE/sizhu_history_record.h
+++ b/Function/STORAGE/sizhu_history_record.h
@@ -18,31 +18,25 @@
//���������־����
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,24 +45,18 @@
//�¡��ա�ʱ��־����
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;
--
Gitblit v1.9.3