From a1810b89e66f184c62a0588ae7d57c91d0c376e8 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 30 May 2024 20:06:09 +0800
Subject: [PATCH] 继续测试修改
---
Function/VALVE/valve_control.c | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/Function/VALVE/valve_control.c b/Function/VALVE/valve_control.c
index 70ff2b3..e1bb80c 100644
--- a/Function/VALVE/valve_control.c
+++ b/Function/VALVE/valve_control.c
@@ -60,6 +60,16 @@
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);
+ }
+ }
+
Motor_AB_GPIO_Init();
Motor_OP_CL_GPIO_Init();
Motor_A_LOW;
@@ -76,6 +86,10 @@
GPIO_EXTI_Init( Motor_CL_PORT, Motor_CL_PIN, EXTI_FALLING, DISABLE);
Motor_A_LOW;
Motor_B_LOW;
+
+ //���ر�
+ borrow_Pwr_GPIO_Clk_Init();
+ BORROW_PWR_OFF;
}
@@ -272,12 +286,12 @@
case VC_UNLOCK:
save_valve_para_g.valve_lock_state = VL_UNLOCK;
return PASS;
- break;
+// break;
case VC_LOCK:
save_valve_para_g.valve_lock_state = VL_LOCK;
return PASS;
- break;
+// break;
default: break;
}
--
Gitblit v1.9.3