继续测试优化

jinlicong

2024-06-11 e4424eb6b50d0300583c422dfb71d58e040f4b9e

 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){