From d6ce00f6b68d3d1ecaf44c972909f311ac1d3bf8 Mon Sep 17 00:00:00 2001 From: jinlicong <493886250@qq.com> Date: Thu, 09 May 2024 19:54:54 +0800 Subject: [PATCH] 增加电源管理部分功能 --- Function/FLOW_METER_DATA_COLLECT/rs485_read_data.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.h b/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.h index bf02e05..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 @@ -58,8 +61,8 @@ 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_MODBUS_STEP_STATUS_T modbus_step_status; //����modbus��ַ�ֵıȽϿ�������һ���Զ�ȡ���������Ҫ�ֶ�ζ�ȡ + RS485_MODBUS_STEP_STATUS_T modbus_last_status; //����modbus��ַ�ֵıȽϿ�������һ���Զ�ȡ���������Ҫ�ֶ�ζ�ȡ }RS485_COM_CTRL_PARA_T; @@ -69,7 +72,7 @@ //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