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 | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/Function/VALVE/valve_control.c b/Function/VALVE/valve_control.c
index 008bab3..c06e231 100644
--- a/Function/VALVE/valve_control.c
+++ b/Function/VALVE/valve_control.c
@@ -61,12 +61,14 @@
void ValveMotorCloseRun(void)
{
- //�ж��Ƿ���Ҫ���ط�,����磬����������Ƴ�״̬�½��
+ //�ж��Ƿ���Ҫ���ط�,����磬����������Ƴ�״̬�½�㣬﮵�Ҫ������״̬
if(__SYS_STATUS_BYTES_GET(alka_remove) == SET || __SYS_STATUS_BYTES_GET(alka_down) == SET){
- if(__SYS_STATUS_BYTES_GET(power_state) == RESET){
- borrow_Pwr_GPIO_Clk_Init();
- BORROW_PWR_ON;
- delay_ms(1);
+ if(__SYS_STATUS_BYTES_GET(lith_low) == RESET && __SYS_STATUS_BYTES_GET(lith_down) == RESET && __SYS_STATUS_BYTES_GET(lith_remove) == RESET){
+ if(__SYS_STATUS_BYTES_GET(power_state) == RESET){
+ borrow_Pwr_GPIO_Clk_Init();
+ BORROW_PWR_ON;
+ delay_ms(1);
+ }
}
}
@@ -178,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);
@@ -206,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{
@@ -246,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;
@@ -269,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;
@@ -378,7 +380,7 @@
if(valve_ctrl_para_g.force_open_status !=SET){
valve_ctrl_para_g.force_open_status =SET;
//��ʼ����ǿ��
-
+ sizhuValveActionLogHandle(VALVE_CTRL_FORCE_OPEN, VC_FORCE_OPEN,ALARM_ID_NORMAL);
}
@@ -400,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