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/FLOW_METER_DATA_COLLECT/rs485_data_analysis_pro.h | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/Function/FLOW_METER_DATA_COLLECT/rs485_data_analysis_pro.h b/Function/FLOW_METER_DATA_COLLECT/rs485_data_analysis_pro.h
index 3487786..7e5f97f 100644
--- a/Function/FLOW_METER_DATA_COLLECT/rs485_data_analysis_pro.h
+++ b/Function/FLOW_METER_DATA_COLLECT/rs485_data_analysis_pro.h
@@ -2,6 +2,8 @@
#define _RS485_DATA_ANALYSIS_PRO_H_
#include "define_all.h"
+#include "extern_rtc.h"
+#include "system_mem_para.h"
//////////////////devive code////////////////////////////
#define SIZHUMODBUS1 0x0101 //˼����620modbus��������4�ֽ�������2�ֽ�С����ɣ���������ֻ��ȡ������
@@ -76,4 +78,23 @@
-#endif
\ No newline at end of file
+
+
+typedef struct
+{
+ sClockBCD time_BCD;
+ struct realtime_flow_data cumulate_s;
+ float instant_sc;
+ float instant_wc;
+ float temperature;
+ float pressure;
+ uint8_t Status[8]; // ���ܵ�������״̬��
+}FLOW_METER_DATA_T;
+
+
+extern FLOW_METER_DATA_T flow_meter_data_g;
+
+void sendModbusReadFrame(uint8_t slaveAddress,uint16_t dataAddress,uint8_t regNum);
+
+
+#endif
--
Gitblit v1.9.3