From d352b1982dc9b4fb2135c64cd909bb9cecc62139 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 14 Jun 2024 15:58:03 +0800
Subject: [PATCH] 添加.gitignore
---
Function/VALVE/valve_control.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Function/VALVE/valve_control.c b/Function/VALVE/valve_control.c
index 008bab3..0685746 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);
+ }
}
}
@@ -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);
}
--
Gitblit v1.9.3