From 2b614e340f0db4a6d1688a44b719298a8cdfef8f Mon Sep 17 00:00:00 2001
From: stark1898y <1658608470@qq.com>
Date: Thu, 29 May 2025 18:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98,=E5=B1=8F=E8=94=BD=E8=9C=82?=
 =?UTF-8?q?=E9=B8=A3=E5=99=A8=EF=BC=8C1.9V=20OK=EF=BC=8C=E4=BD=8E=E5=8E=8B?=
 =?UTF-8?q?=E9=98=88=E5=80=BC=E8=AE=BE=E7=BD=AE=E4=BA=862V?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APP/peripheral.c           |  8 ++------
 BSP/inc/bsp_valve.h        |  5 +++--
 BSP/src/bsp_beep_led_emv.c | 14 ++++++++------
 BSP/src/bsp_valve.c        |  4 +++-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/APP/peripheral.c b/APP/peripheral.c
index be03c1f..1ecc1a8 100644
--- a/APP/peripheral.c
+++ b/APP/peripheral.c
@@ -667,12 +667,6 @@ static void peripheralStateNotificationCB(gapRole_States_t newState, gapRoleEven
                 };
                 GATT_ExchangeMTU(peripheralConnList.connHandle, &req, Peripheral_TaskID);
                 // Peripheral_SetMacName();
-                // BSP_BlockSleep();
-                // BSP_RequestBoost();
-                // DelayMs(1);
-                // // ShowLed();
-                // BEEP_ON;
-                // DelayMs(500);
             }
             break;
 
@@ -792,6 +786,8 @@ static void performPeriodicTask(void)
     BSP_VALVE_Generate_UploadData(&RawData);
 
     peripheralChar4Notify(&RawData.buf[0], RawData.len);
+
+    tmos_set_event(led_task_id, LED_SHOW_START_EVT);
 }
 
 /*********************************************************************
diff --git a/BSP/inc/bsp_valve.h b/BSP/inc/bsp_valve.h
index ada14e0..5c56e0f 100644
--- a/BSP/inc/bsp_valve.h
+++ b/BSP/inc/bsp_valve.h
@@ -2,7 +2,7 @@
  * @Author       : stark1898y 1658608470@qq.com
  * @Date         : 2024-12-12 15:55:38
  * @LastEditors  : stark1898y 1658608470@qq.com
- * @LastEditTime : 2025-05-29 17:28:34
+ * @LastEditTime : 2025-05-29 18:34:19
  * @FilePath     : \BLE_TYQ_CH584M\BSP\inc\bsp_valve.h
  * @Description  :
  *
@@ -41,13 +41,14 @@ extern tmosTaskID vavle_task_id;
 #define VALVE_DECT_PERIOD_MS      (1000 * 60 * 10)
 
 
-#define CHARGE_TIME_MS (1500)
+#define CHARGE_TIME_MS (2000)
 
 // 2.2V
 #define LOW_VABAT_ALARM_VALUE  23
 
 #define LOW_VABAT_CLOSE_VALUE  2000
 
+#define LOW_VABAT_ALARM_MV  2050
 #define LOW_VABAT_CLOSE_MV  2000
 
 
diff --git a/BSP/src/bsp_beep_led_emv.c b/BSP/src/bsp_beep_led_emv.c
index 60e970b..5656c7c 100644
--- a/BSP/src/bsp_beep_led_emv.c
+++ b/BSP/src/bsp_beep_led_emv.c
@@ -27,7 +27,8 @@ void ShowLed()
     // BSP_RequestBoost();
 
     // 电压过低就关阀
-    if (gValveData.bat <= LOW_VABAT_ALARM_VALUE)
+    // if (gValveData.bat <= LOW_VABAT_ALARM_VALUE)
+    if (bat_mv <= LOW_VABAT_CLOSE_MV)
     {
         LED_ALL_OFF_DEINIT;
         LED_Y_ON;
@@ -60,10 +61,11 @@ static tmosEvents LED_Task_ProcessEvent(tmosTaskID taskID, tmosEvents event)
         logDebug("LED_SHOW_START_EVT");
         BSP_BlockSleep();
         BSP_RequestBoost();
-        DelayMs(3);
+        // DelayMs(3);
         ShowLed();
-        tmos_stop_task(led_task_id, LED_SHOW_ONCE_EVT);
-        tmos_start_task(led_task_id, LED_SHOW_ONCE_EVT, MS1_TO_SYSTEM_TIME(1000));
+        tmos_stop_task(led_task_id, LED_SHOW_END_EVT);
+        // tmos_start_task(led_task_id, LED_SHOW_ONCE_EVT, MS1_TO_SYSTEM_TIME(10));
+        tmos_start_task(led_task_id, LED_SHOW_END_EVT, MS1_TO_SYSTEM_TIME(10));
         return (event ^ LED_SHOW_START_EVT);
     }
     if (event & LED_SHOW_ONCE_EVT)
@@ -102,12 +104,12 @@ static tmosEvents LED_Task_ProcessEvent(tmosTaskID taskID, tmosEvents event)
     if (event & CONNECT_BEEP_START_EVT)
     {
         logDebug("CONNECT_BEEP_START_EVT");
-        // LED_G_ON;
         BSP_BlockSleep();
         BSP_RequestBoost();
         // BEEP_ON;
+        LED_G_ON;
 
-        tmos_start_task(led_task_id, CONNECT_BEEP_END_EVT, MS1_TO_SYSTEM_TIME(20));
+        tmos_start_task(led_task_id, CONNECT_BEEP_END_EVT, MS1_TO_SYSTEM_TIME(50));
 
         return (event ^ CONNECT_BEEP_START_EVT);
     }
diff --git a/BSP/src/bsp_valve.c b/BSP/src/bsp_valve.c
index e550650..f739b90 100644
--- a/BSP/src/bsp_valve.c
+++ b/BSP/src/bsp_valve.c
@@ -2,7 +2,7 @@
  * @Author       : stark1898y 1658608470@qq.com
  * @Date         : 2024-12-15 15:01:15
  * @LastEditors  : stark1898y 1658608470@qq.com
- * @LastEditTime : 2025-05-29 17:25:55
+ * @LastEditTime : 2025-05-29 18:42:42
  * @FilePath     : \BLE_TYQ_CH584M\BSP\src\bsp_valve.c
  * @Description  :
  *
@@ -353,6 +353,7 @@ static void VAVLE_Task_ProcessTmosMsg(uint8_t *p_rev_msg)
             logError("数据帧解析失败");
         }
         tmos_msg_deallocate((uint8_t *)HostFrameData);
+        // tmos_set_event(led_task_id, LED_SHOW_START_EVT);
         HostFrameData = NULL;
 #endif
     }
@@ -419,6 +420,7 @@ static uint16_t VAVLE_Task_ProcessEvent(uint8_t task_id, uint16_t events)
         EMV_CHARGE_OFF_DEINIT;
 
         // BEEP_ON;
+        LED_R_ON;
 
         logDebug("EMV_CHARGE_OFF_DEINIT");