From 6e797b7c8ce7e71b86d67464b96c4eaa0de1f670 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Sun, 28 Apr 2024 19:59:24 +0800
Subject: [PATCH] 继续完善，开始添加远传功能

---
 Function/FLOW_METER_DATA_COLLECT/rs485_data_analysis_pro.h |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 7e5f97f..ae0ba03 100644
--- a/Function/FLOW_METER_DATA_COLLECT/rs485_data_analysis_pro.h
+++ b/Function/FLOW_METER_DATA_COLLECT/rs485_data_analysis_pro.h
@@ -4,6 +4,14 @@
 #include "define_all.h"
 #include "extern_rtc.h"
 #include "system_mem_para.h"
+#include "rs485_read_data.h"
+
+#define	ZS_2XS_2_DOUBLE(__ZS__,__XS__)   (__ZS__+ 0.01*__XS__)
+
+
+
+
+
 
 //////////////////devive code////////////////////////////
 #define  SIZHUMODBUS1     0x0101  //˼����620modbus��������4�ֽ�������2�ֽ�С����ɣ���������ֻ��ȡ������
@@ -88,13 +96,18 @@
 	float instant_wc;   
 	float temperature;	
 	float pressure;
-	uint8_t	Status[8]; // ���ܵ�������״̬��
+	uint8_t	Status[12]; // ��˼�������״̬�֣���������Э���ȡ״̬��֮����ӳ�䵽˼��״̬�ֱ��ٸ���״̬�ֵı仯�ж�ʱ�Ƿ񴥷�����
+//	uint8_t	AlarmStatus[14]; // ��˼������ı����֣��˴�û�б����֣��������Ǹ���״̬�ֵ�ǰ��仯�ж��Ƿ񱨾�������״̬�ִ�����״̬ת��Ϊ�쳣״̬���򱨾�
+	float	C_coe;
+	float	K_coe;
+	float	comp_factor; //ѹ������
+	
 }FLOW_METER_DATA_T;
 
 
 extern FLOW_METER_DATA_T	flow_meter_data_g;
 
 void sendModbusReadFrame(uint8_t slaveAddress,uint16_t dataAddress,uint8_t regNum);
-
+ErrorStatus	rs485ComDataAnalysis(RS485_COM_UART_PARA_T  uart_para_p,uint16_t device_code,uint8_t slaveAddress,RS485_COM_CTRL_PARA_T rs485_com_ctrl_pata_l );
 
 #endif

--
Gitblit v1.9.3