继续测试修改

jinlicong

2024-05-30 a1810b89e66f184c62a0588ae7d57c91d0c376e8

 HARDWARE/EXTI/exti.c

@@ -79,12 +79,23 @@
         {
            //¹Ø·§
            if(__SYS_STATUS_BYTES_GET(account_state) == RESET)
               ValveCtrlOrder(VC_OPEN);
               ValveCtrlOrder(VC_CLOSE);
         }else
         {
            //µ¥»÷µçÔ´
            if(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) ==0){
               //Ê״λ½ÐÑ£¬LCD°åÏÈÉϵ磬ʹµÄkey2ºÍkey3À­ÉÏÉúЧ£¬²¢ÇÒÊ״λ½ÐÑÐèÒª³õʼ»¯Òº¾§Çý¶¯£¬Öñê־λ
               lcd_first_wake_up_flag_g = SET;
               Lcd_GPIO_Init();
               LCD_PWR_ON;	
            }
				
            __SYS_DELAY_SEC_TIME_SET_(sys_active_time,SYS_WAKE_UP_TIME);
            lcd_wake_up_flag_g = 1;
            lcd_wake_up_flag_g = SET;
            Key_GPIO_Init();
				
            pwr_vol_g.lith_flag = LMS_KEY; //°´µçÔ´¼ü²É¼¯Ò»´Îµç³Øµçѹ
            pwr_vol_g.alka_flag = AMS_KEY;
         }
         
      }
@@ -95,7 +106,7 @@
      GPIO_EXTI_EXTIISR_ClrEx(KEY2_PORT, KEY2_PIN);
      if(KEY2_IO_READ==Bit_RESET)         
      {
         lcd_wake_up_flag_g = 1;
         lcd_wake_up_flag_g = SET;
         if(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0){ //¼¤»îºóÈÎÒâ°´¼üÖØÖü¤»îʱ¼ä
            __SYS_DELAY_SEC_TIME_SET_(sys_active_time,SYS_WAKE_UP_TIME);
         }
@@ -113,7 +124,7 @@
            start_rs485_g = RS485_START_REASON_KEY;
            start_wrc_g = WRC_MEANS_KEY;
         }else{
            lcd_wake_up_flag_g = 1;
            lcd_wake_up_flag_g = SET;
         }
         
         if(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0){ //¼¤»îºóÈÎÒâ°´¼üÖØÖü¤»îʱ¼ä