From 71f8bdb7c63acc381d71105bb950411029f4250f Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 03 Jun 2024 20:00:58 +0800
Subject: [PATCH] 测试远传
---
Function/VALVE/valve_control.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Function/VALVE/valve_control.c b/Function/VALVE/valve_control.c
index c18bc1c..86d3edf 100644
--- a/Function/VALVE/valve_control.c
+++ b/Function/VALVE/valve_control.c
@@ -60,7 +60,7 @@
{
//�ж��Ƿ���Ҫ���ط�,����磬����������Ƴ�״̬�½��
- if(__SYS_STATUS_BYTES_GET(alka_remove) == SET && __SYS_STATUS_BYTES_GET(alka_down) == SET){
+ 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;
@@ -286,6 +286,10 @@
switch(valve_ctrl_order_l){
case VC_NONE:break;
case VC_OPEN:
+
+ if((__SYS_STATUS_BYTES_GET(alka_remove) == SET || __SYS_STATUS_BYTES_GET(alka_down) == SET)&&(__SYS_STATUS_BYTES_GET(power_state) ==RESET)){
+ return FAIL;//���û����û����磬��������
+ }
if((save_valve_para_g.valve_status == VALVE_CLOSE)&&(valve_ctrl_para_g.force_open_status==RESET)){
valve_ctrl_para_g.valve_ctrl_order = VC_OPEN;
pwr_vol_g.alka_flag = AMS_VALVE_CTRL_BEFORE;
--
Gitblit v1.9.3