From 1bf077c4ead37bb26a462b8d5587d7413dc23138 Mon Sep 17 00:00:00 2001
From: czq <860517298@qq.com>
Date: Wed, 14 May 2025 09:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98=20?=
 =?UTF-8?q?=E6=8C=89=E9=94=AE=E4=B8=AD=E6=96=AD=E4=BC=98=E5=8C=96=E5=8F=8A?=
 =?UTF-8?q?=E9=98=80=E9=97=A8=E6=97=B6=E9=97=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APP/peripheral_main.c |  2 +-
 bsp/inc/bsp_valve.h   |  2 +-
 bsp/src/bsp_bmp390.c  | 15 ++++++---------
 bsp/src/bsp_key.c     |  6 +++---
 bsp/src/bsp_valve.c   | 14 +++++++-------
 5 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/APP/peripheral_main.c b/APP/peripheral_main.c
index 0b96151..d7bf0a3 100644
--- a/APP/peripheral_main.c
+++ b/APP/peripheral_main.c
@@ -105,7 +105,7 @@ int main(void)
 
     BSP_MOTOR_Init();
     VALVE_OPEN();
-    DelayMs(2000);
+    DelayMs(1000);
     BSP_VAVLE_Init();
 
     BSP_LED_Init();
diff --git a/bsp/inc/bsp_valve.h b/bsp/inc/bsp_valve.h
index 335c6ee..bcbcfce 100644
--- a/bsp/inc/bsp_valve.h
+++ b/bsp/inc/bsp_valve.h
@@ -37,7 +37,7 @@ extern tmosTaskID vavle_task_id;
 
 
 
-#define CHARGE_TIME_MS (1500)
+#define CHARGE_TIME_MS (1000)
 
 // 2.2V
 #define LOW_VABAT_ALARM_VALUE  22
diff --git a/bsp/src/bsp_bmp390.c b/bsp/src/bsp_bmp390.c
index 3fc13c5..1a4badb 100644
--- a/bsp/src/bsp_bmp390.c
+++ b/bsp/src/bsp_bmp390.c
@@ -765,10 +765,10 @@ uint16_t Check_ProcessEvent(uint8_t task_id, uint16_t events)
             motor_flag = 0;
             LED_VALVE_OPEN;
             VALVE_OPEN();
-            DelayMs(1000);
+            // DelayMs(1000);
             IotFlag_t.Valve_Open_flag = 1;
             fault_state = 0;
-            logDebug("motor/LED open");
+            logDebug("motor/LED open!!!");
             tmos_start_task(check_task_id, MOTOR_STOP_EVT, MS1_TO_SYSTEM_TIME(1000));
         }
         else if(motor_flag == 2)
@@ -776,9 +776,9 @@ uint16_t Check_ProcessEvent(uint8_t task_id, uint16_t events)
             motor_flag = 0;
             LED_VALVE_CLOSE;
             VALVE_CLOSE();
-            DelayMs(1000);
+            // DelayMs(1000);
             fault_state = 4;
-            logDebug("motor/LED close");
+            logDebug("motor/LED close!!!");
             tmos_start_task(check_task_id, MOTOR_STOP_EVT, MS1_TO_SYSTEM_TIME(1000));
         }
         tmos_start_task(check_task_id, CHECK_EVT_START, MS1_TO_SYSTEM_TIME(200));  //100
@@ -821,13 +821,10 @@ void GPIOA_IRQHandler(void)
             // 关按键中断
             BSP_KEY_ExitLowpower();
 
-            printf("KEY IRQ");
+            printf("KEY IRQHandler !!!");
             key_wakeup_flag = 1;
         }
-    } else {
-        // 可能是电源波动导致的中断，忽略此次中断
-        // printf("Power Fluctuation - Ignored");
-    }
+    } 
 
 
     if (R16_PA_INT_IF & GPIO_Pin_9)
diff --git a/bsp/src/bsp_key.c b/bsp/src/bsp_key.c
index ab89226..3c41c0c 100644
--- a/bsp/src/bsp_key.c
+++ b/bsp/src/bsp_key.c
@@ -174,7 +174,7 @@ void BSP_KEY_EnterLowpower(void)
     PWR_PeriphWakeUpCfg(ENABLE, RB_GPIO_WAKE_MODE | RB_SLP_GPIO_WAKE, Long_Delay);
 
     // 寮�鍚疓PIOB涓柇
-    PFIC_EnableIRQ(GPIO_B_IRQn);
+    PFIC_EnableIRQ(GPIO_A_IRQn);
 }
 
 void BSP_KEY_ExitLowpower(void)
@@ -182,7 +182,7 @@ void BSP_KEY_ExitLowpower(void)
     BSP_BlockSleep();
 
     // 鍏抽棴GPIOB涓柇
-    PFIC_DisableIRQ(GPIO_B_IRQn);
+    PFIC_DisableIRQ(GPIO_A_IRQn);
     PWR_PeriphWakeUpCfg(DISABLE, RB_GPIO_WAKE_MODE | RB_SLP_GPIO_WAKE, Long_Delay);
 }
 
@@ -304,7 +304,7 @@ void BSP_KEY_Init(app_task_evt_handler_t handler)
     PWR_PeriphWakeUpCfg(ENABLE, RB_GPIO_WAKE_MODE | RB_SLP_GPIO_WAKE, Long_Delay);
 
     // 寮�鍚疓PIOB涓柇
-    PFIC_EnableIRQ(GPIO_B_IRQn);
+    PFIC_EnableIRQ(GPIO_A_IRQn);
 
     tmos_start_task(key_task_id, KEY_SCAN_EVT, MS1_TO_SYSTEM_TIME(KEY_SACN_MS));
 
diff --git a/bsp/src/bsp_valve.c b/bsp/src/bsp_valve.c
index 9e778d4..fa12ef2 100644
--- a/bsp/src/bsp_valve.c
+++ b/bsp/src/bsp_valve.c
@@ -255,14 +255,14 @@ static uint16_t VAVLE_Task_ProcessEvent(uint8_t task_id, uint16_t events) // 闃�
         logDebug("VAVLE_CLOSE_START_EVT");
 
         BSP_BlockSleep();
-        LED_VALVE_OPEN;
-        DelayUs(200);
+        LED_VALVE_CLOSE;
+        // DelayUs(200);
 
         VALVE_STOP();
 
         logDebug("MOTOR_INIT");
 
-        tmos_start_task(vavle_task_id, VAVLE_CLOSE_ACTION_EVT, MS1_TO_SYSTEM_TIME(CHARGE_TIME_MS));
+        tmos_start_task(vavle_task_id, VAVLE_CLOSE_ACTION_EVT, MS1_TO_SYSTEM_TIME(200));
 
         return (events ^ VAVLE_CLOSE_START_EVT);
     }
@@ -275,7 +275,7 @@ static uint16_t VAVLE_Task_ProcessEvent(uint8_t task_id, uint16_t events) // 闃�
 
         logDebug("VALVE_CLOSE");
 
-        tmos_start_task(vavle_task_id, VAVLE_CLOSE_END_EVT, MS1_TO_SYSTEM_TIME(1600));
+        tmos_start_task(vavle_task_id, VAVLE_CLOSE_END_EVT, MS1_TO_SYSTEM_TIME(CHARGE_TIME_MS));
 
         return (events ^ VAVLE_CLOSE_ACTION_EVT);
     }
@@ -303,13 +303,13 @@ static uint16_t VAVLE_Task_ProcessEvent(uint8_t task_id, uint16_t events) // 闃�
         
         BSP_BlockSleep();
         LED_VALVE_OPEN;
-        DelayUs(200);
+        // DelayUs(200);
         
         VALVE_STOP();
         
         logDebug("MOTOR_INIT");
         
-        tmos_start_task(vavle_task_id, VAVLE_OPEN_ACTION_EVT, MS1_TO_SYSTEM_TIME(CHARGE_TIME_MS));
+        tmos_start_task(vavle_task_id, VAVLE_OPEN_ACTION_EVT, MS1_TO_SYSTEM_TIME(200));
         
         return (events ^ VAVLE_OPEN_START_EVT);
     }
@@ -323,7 +323,7 @@ static uint16_t VAVLE_Task_ProcessEvent(uint8_t task_id, uint16_t events) // 闃�
         
         logDebug("VALVE_OPEN");
         
-        tmos_start_task(vavle_task_id, VAVLE_OPEN_END_EVT, MS1_TO_SYSTEM_TIME(1600));
+        tmos_start_task(vavle_task_id, VAVLE_OPEN_END_EVT, MS1_TO_SYSTEM_TIME(CHARGE_TIME_MS));
         
         return (events ^ VAVLE_OPEN_ACTION_EVT);
     }