From a12102b90bda2f409babc8c241bfc66118a8cb70 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 25 Apr 2024 20:01:19 +0800
Subject: [PATCH] 继续完善485采集
---
Function/STORAGE/system_mem_para.h | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Function/STORAGE/system_mem_para.h b/Function/STORAGE/system_mem_para.h
index 8620166..8e4c551 100644
--- a/Function/STORAGE/system_mem_para.h
+++ b/Function/STORAGE/system_mem_para.h
@@ -93,14 +93,15 @@
typedef struct{
uint16_t CRC16_MODBUS;
- sClockBCD record_time_bcd;
+ sClockBCD record_time_BCD;
struct realtime_flow_data
{
double forward_cumulate_sc; // �������ۻ���
double forward_cumulate_wc;
- double cal_cumulate_reserve[2]; // �궨�ۻ���_Ԥ��
- double err_forward_cumulate_reserve[2]; // �����ۻ���_Ԥ��
-
+ double cal_cumulate_sc; // �궨�ۻ���
+ double cal_cumulate_wc;
+ double err_forward_cumulate_sc; // �����ۻ���
+ double err_forward_cumulate_wc;
}realtime_flow_data_s;
struct realtime_billing_data
{
@@ -152,7 +153,7 @@
extern MAIN_EQUIPM_HARDWARE_SOFTWARE_INF_T main_equipment_hardware_software_inf_g;
extern LCD_EQUIPM_HARDWARE_SOFTWARE_INF_T lcd_equipment_hardware_software_inf_g;
extern WIRELESS_EQUIPM_HARDWARE_SOFTWARE_INF_T wireless_equipment_hardware_software_inf_g;
-
+extern SAVE_REALTIME_DATA_T save_realtime_data_g;
@@ -162,4 +163,6 @@
void allParaReadFromEep(void);
void allParaPatchPro(void);
-#endif
\ No newline at end of file
+#endif
+
+
--
Gitblit v1.9.3