From 64cf4a779ef5c16c79bbbee27370169dc8d69499 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 06 May 2024 20:08:30 +0800
Subject: [PATCH] 继续开发
---
Function/FLOW_METER_DATA_COLLECT/rs485_read_data.h | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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..0710ae7 100644
--- a/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.h
+++ b/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.h
@@ -2,6 +2,9 @@
#define _RS485_READ_DATA_H_
#include "define_all.h"
+#include "system_general_para.h"
+
+#define RS485_SEND_NORMAL(__DATA__,__SIZE__) UARTx_SendData_Normal(UART5,__DATA__,__SIZE__)
#define RS485_REREAD_NUM 3
@@ -18,6 +21,7 @@
// RS485_COM_PWR_WAIT,
RS485_COM_SEND,
RS485_COM_WAIT_ANSWER,
+// RS485_COM_PASS, //���ճɹ�״̬�����Խ��гɹ������������֮����ת��IDLE״̬
// RS485_COM_TIMEOUT,
// RS485_COM_OFF
@@ -34,6 +38,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,15 +60,19 @@
FlagStatus pwr_delay_status; //����ȴ�״̬
uint8_t pwr_delay_time_out_cnt; //����ȴ�����
+
+ RS485_MODBUS_STEP_STATUS_T modbus_step_status; //����modbus��ַ�ֵıȽϿ�������һ���Զ�ȡ���������Ҫ�ֶ�ζ�ȡ
+ RS485_MODBUS_STEP_STATUS_T modbus_last_status; //����modbus��ַ�ֵıȽϿ�������һ���Զ�ȡ���������Ҫ�ֶ�ζ�ȡ
+
}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);
+void rs485ReadDataPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p);
#endif
--
Gitblit v1.9.3