From f03cf3ae7a36954e64fc014e6bb7afd20c5a5247 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 12 Jun 2024 17:22:08 +0800
Subject: [PATCH] 增加IAP功能，准备测试上位机升级
---
Soft/sizhu_ctrl_word.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Soft/sizhu_ctrl_word.c b/Soft/sizhu_ctrl_word.c
index eb1e542..a05239f 100644
--- a/Soft/sizhu_ctrl_word.c
+++ b/Soft/sizhu_ctrl_word.c
@@ -247,12 +247,8 @@
close_valve_flag = close_valve_flag & 0x03;
if(close_valve_flag == VALVE_CTRL_FLAG_LOCK_AND_CLSOSE){
//��������������ɣ�����ִ����Ҫһ��ʱ��
- if(save_valve_para_g.valve_lock_state != VL_UNLOCK){
- ValveCtrlOrder(VC_LOCK);
- //?�洢
- }
- system_status_word_g.status_word.valve_lock = (save_valve_para_g.valve_lock_state == VL_LOCK)?1:0;
- ValveCtrlOrder(VC_CLOSE);
+ ValveCtrlOrder(VC_CLOSE_AND_LOCK,VALVE_CTRL_SOURCE_AUTO);
+
//����ط�ԭ��ID������Ѿ���ǿ���Թط�������Ҫ�ж����ȼ����������Ա����ǣ�����ܱ����ǣ������ж��Ƿ����������ɵģ��������ɵ��ڳ�ֵ֮�����ֱ�ӿ���
if((save_valve_para_g.valve_close_ID & 0x8000)==0x8000){
@@ -265,7 +261,7 @@
}
}else if(close_valve_flag == VALVE_CTRL_FLAG_ONLY_CLSOSE){
- ValveCtrlOrder(VC_CLOSE);
+ ValveCtrlOrder(VC_CLOSE,VALVE_CTRL_SOURCE_AUTO);
//����ط�ԭ��ID������Ѿ���ǿ���Թط������ٸ���
if((save_valve_para_g.valve_close_ID & 0x8000)==0x8000){
--
Gitblit v1.9.3