From 1ef1ac80e7ef4ec42c5ca109ab246d81705b434a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=5F666?=
 <13089258+pony-six-hundred-and-sixty-six@user.noreply.gitee.com>
Date: Mon, 6 Jan 2025 13:53:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E5=85=B3=E9=98=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/main.c  |  5 ++++-
 bsp/src/bsp_button.c |  4 ++--
 bsp/src/bsp_led.c    | 31 ++++++++++++++++++++++---------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/applications/main.c b/applications/main.c
index 976e9b7..ec06d4a 100644
--- a/applications/main.c
+++ b/applications/main.c
@@ -345,7 +345,10 @@ int main(void)
                         Flash_Write_Record(kRecordAlarm); // 写入flash报警信息
                         if (Flash_Get_Valve_Num())
                         {
-                            Bt_Valve_Handler(kValveCmdCtr, 0, RT_NULL);
+                            // Bt_Valve_Handler(kValveCmdCtr, 0, RT_NULL);
+                            rt_uint8_t mac_addr[6];
+                            Flash_Get_Mac_Addr(mac_addr, 1);
+                            Bt_Valve_Handler(kValveCmdCtr, 1, mac_addr);
                             if (rt_sem_take(&bt_ctr_sem, 10000) == RT_EOK)
                             {
                                 LOG_D("电磁阀动作完成");
diff --git a/bsp/src/bsp_button.c b/bsp/src/bsp_button.c
index b021e21..f81a73c 100644
--- a/bsp/src/bsp_button.c
+++ b/bsp/src/bsp_button.c
@@ -56,7 +56,7 @@ static void _CommonBtnEvtCb(void *arg)
     {
         Send_Laser_Alarm_Event(kSelfCheckEvent);
     }
-    if ((flex_button_event_read(&user_button[USER_BUTTON_0]) == FLEX_BTN_PRESS_LONG_HOLD) || (flex_button_event_read(&user_button[USER_BUTTON_1]) == FLEX_BTN_PRESS_LONG_HOLD))
+    else if ((flex_button_event_read(&user_button[USER_BUTTON_0]) == FLEX_BTN_PRESS_LONG_HOLD) || (flex_button_event_read(&user_button[USER_BUTTON_1]) == FLEX_BTN_PRESS_LONG_HOLD))
     {
         LOG_I("本地清除阀门信息");
         rt_uint8_t mac_addr[6] = {0};
@@ -85,7 +85,7 @@ static void _CommonBtnEvtCb(void *arg)
             LOG_I("本地清除阀门信息成功");
         }
     }
-#if 1 // 测试LED灯状态用，测试完成后关闭
+#if 0 // 测试LED灯状态用，测试完成后关闭
     if ((flex_button_event_read(&user_button[USER_BUTTON_0]) == FLEX_BTN_PRESS_DOUBLE_CLICK) || (flex_button_event_read(&user_button[USER_BUTTON_1]) == FLEX_BTN_PRESS_DOUBLE_CLICK))
     {
         button_cnt++;
diff --git a/bsp/src/bsp_led.c b/bsp/src/bsp_led.c
index db3b934..14cc02f 100644
--- a/bsp/src/bsp_led.c
+++ b/bsp/src/bsp_led.c
@@ -4,9 +4,9 @@
  * @LastEditors: mbw && 1600520629@qq.com
  * @LastEditTime: 2025-01-05 13:12:43
  * @FilePath: \ble_bjq_ch303rct6_ml307\bsp\src\bsp_led.c
- * @Description: 
- * 
- * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. 
+ * @Description:
+ *
+ * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved.
  */
 #include "bsp_led.h"
 #include "rtthread.h"
@@ -22,7 +22,7 @@ ALIGN(4)
 static char user_led_thread_stack[512];
 static struct rt_thread user_led_thread;
 
-//用到了atoi
+// 用到了atoi
 #include <stdlib.h>
 
 agile_led_t *led_r = RT_NULL;
@@ -52,29 +52,42 @@ static void BSP_Led_thread_entry(void *param)
             }
         }
 #endif
-        if ((SysControl.status == kNormalDetectionEvents)||(SysControl.status == KMuteEvent))
+        if (SysControl.status == kNormalDetectionEvents)
         {
             if ((ml307_conncet_tcp_flag))
             {
                 LED_G_NORMAL;
             }
-            else 
+            else
             {
                 LED_G_INTERNET;
             }
         }
+        else if (SysControl.status == KMuteEvent)
+        {
+            if (SysControl.last_status == kNormalDetectionEvents)
+            {
+                if ((ml307_conncet_tcp_flag))
+                {
+                    LED_G_NORMAL;
+                }
+                else
+                {
+                    LED_G_INTERNET;
+                }
+            }
+        }
         rt_thread_mdelay(1000);
     }
 }
 
-
 int BSP_LED_Init(void)
 {
     led_r = agile_led_create(LED_R_PIN, PIN_LOW, "100,100", 0);
     led_g = agile_led_create(LED_G_PIN, PIN_LOW, "100,100", 0);
     led_y = agile_led_create(LED_Y_PIN, PIN_LOW, "100,100", 0);
 
-   rt_err_t ret = rt_thread_init(&user_led_thread,
+    rt_err_t ret = rt_thread_init(&user_led_thread,
                                   "user_led_thread",
                                   BSP_Led_thread_entry,
                                   RT_NULL,
@@ -98,7 +111,7 @@ static void TEST_LED(int argc, char **argv)
     if (argc == 4)
     {
         char led_name = argv[1][0];
-        int loop_cnt = atoi(argv[3]);
+        int loop_cnt  = atoi(argv[3]);
         switch (led_name)
         {
             case 'r':