From 6e3f1f560d618b37ee1a47fa2b0f682b70c3ef1c Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 19 Jun 2024 17:25:45 +0800
Subject: [PATCH] 增加OTA协议
---
Function/VALVE/valve_control.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Function/VALVE/valve_control.c b/Function/VALVE/valve_control.c
index 0685746..c06e231 100644
--- a/Function/VALVE/valve_control.c
+++ b/Function/VALVE/valve_control.c
@@ -180,7 +180,7 @@
valve_ctrl_para_g.valve_ctrl_order = VC_NONE;
}else{
- if(sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag==SET||sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag==SET){ //?Զ����485�ɼ���������ӳ�ִ�з��Ŷ���
+ if(sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag==SET||sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag==SET){ //Զ����485�ɼ���������ӳ�ִ�з��Ŷ���
;
}else{
valve_ctrl_para_g.open_time_cnt = GetValveRunMaxTime(caliber_type_l);
@@ -208,7 +208,7 @@
}else{
- if(sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag==SET||sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag==SET){ //?Զ����485�ɼ���������ӳ�ִ�з��Ŷ���
+ if(sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag==SET||sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag==SET){ //Զ����485�ɼ���������ӳ�ִ�з��Ŷ���
;
}else{
@@ -248,13 +248,13 @@
}
- //?�жϿ��ط��Ƿ�λ
+ //�жϿ��ط��Ƿ�λ
if(save_valve_para_g.valve_status==VALVE_OPENING){
if(Read_OP_CL_VALVE_Status(0) ==VALVE_OPEN){
ValveMotorStop();//�ر�����
save_valve_para_g.valve_status = VALVE_OPEN;
}else if(valve_ctrl_para_g.open_time_cnt==0){
- //?��ʱ����
+ //��ʱ����
ValveMotorStop();
save_valve_para_g.valve_status = VALVE_ERROR;
@@ -271,7 +271,7 @@
ValveMotorStop();//�ر�����
save_valve_para_g.valve_status = VALVE_CLOSE;
}else if(valve_ctrl_para_g.close_time_cnt==0){
- //?��ʱ����
+ //��ʱ����
ValveMotorStop();
save_valve_para_g.valve_status = VALVE_ERROR;
@@ -402,10 +402,10 @@
}
-void valveCtrlPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p) //? ���Ҫ������������ú���ValveCtrlOrder��VC_OPEN��;��δ����������
+void valveCtrlPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p) //���Ҫ������������ú���ValveCtrlOrder��VC_OPEN��;��δ����������
{
- ValveForceOpenSignalCheck();//?ǿ���жϴ���
+ ValveForceOpenSignalCheck();//ǿ���жϴ���
ValveCtrlHade(equipment_basic_inf_g.caliber_type,sys_fun_run_ctrl_p);//���·��Ų���������
--
Gitblit v1.9.3