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_read_data.h | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.h b/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.h
index e6d8ffd..299e77f 100644
--- a/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.h
+++ b/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.h
@@ -3,6 +3,8 @@
#include "define_all.h"
+#define RS485_SEND_NORMAL(__DATA__,__SIZE__) UARTx_SendData_Normal(UART5,__DATA__,__SIZE__)
+
#define RS485_REREAD_NUM 3
#define RS485_REREAD_WATI_TIME 3
@@ -18,6 +20,7 @@
// RS485_COM_PWR_WAIT,
RS485_COM_SEND,
RS485_COM_WAIT_ANSWER,
+// RS485_COM_PASS, //���ճɹ�״̬�����Խ��гɹ������������֮����ת��IDLE״̬
// RS485_COM_TIMEOUT,
// RS485_COM_OFF
@@ -34,6 +37,20 @@
}RS485_COM_UART_PARA_T;
+typedef enum
+{
+ STEP_NONE = 0U,
+ MODBUS_STEP1,
+ MODBUS_STEP2,
+ MODBUS_STEP3,
+ MODBUS_STEP4,
+ MODBUS_STEP5,
+ MODBUS_STEP6,
+
+} RS485_MODBUS_STEP_STATUS_T; //
+
+
+
typedef struct{
RS485_COM_STATUS_T status ; //
@@ -42,13 +59,17 @@
FlagStatus pwr_delay_status; //����ȴ�״̬
uint8_t pwr_delay_time_out_cnt; //����ȴ�����
+
+ RS485_MODBUS_STEP_STATUS_T modbus_step_status;
+ RS485_MODBUS_STEP_STATUS_T modbus_last_status;
+
}RS485_COM_CTRL_PARA_T;
//extern __IO RS485_COM_STATUS_T rs485_com_status_g;
//extern __IO FlagStatus rs485_pwr_delay_status_g; //����ʱ�䵽���־
-
+extern RS485_COM_UART_PARA_T rs485_com_uart_data_g;
extern __IO RS485_COM_CTRL_PARA_T rs485_com_ctrl_pata_g;
void rs485ReadDataPro(void);
--
Gitblit v1.9.3