From ee3c90168f81ce19529904d80f9c9de4fed23bb8 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 30 Apr 2024 16:30:45 +0800
Subject: [PATCH] 继续完善
---
Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c b/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c
index 7958aa1..bf500c4 100644
--- a/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c
+++ b/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c
@@ -176,15 +176,17 @@
-void rs485ReadDataPro(void)
+void rs485ReadDataPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p)
{
- if(1)//?�ж�485�ɼ���ʶ
+ if((sys_fun_run_ctrl_p->rs485_ctrl_flag.start_flag ==SET)&&(sys_fun_run_ctrl_p->valve_ctrl_flag.running_flag == RESET)&&(sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag == RESET))//?�ж�485�ɼ���ʶ
{
+ sys_fun_run_ctrl_p->rs485_ctrl_flag.start_flag = RESET;
if(rs485_com_ctrl_pata_g.status == RS485_COM_IDLE)
{
rs485_com_ctrl_pata_g.status = RS485_COM_PWR_ON;
+ sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag = SET;
}
}
@@ -200,6 +202,8 @@
default:;
}
+ if(rs485_com_ctrl_pata_g.status == RS485_COM_IDLE)
+ sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag = RESET;
}
\ No newline at end of file
--
Gitblit v1.9.3