bt_app: optimize the "Auto Reconnect" feature

Author: redchenjs

main/inc/core/os.h

@@ -25,14 +25,15 @@ typedef enum user_event_group_bits {
     VFX_FFT_NULL_BIT      = BIT7,
 
     KEY_SCAN_RUN_BIT      = BIT8,
+    KEY_SCAN_CLR_BIT      = BIT9,
 
-    AUDIO_RENDER_CLR_BIT  = BIT9,
+    AUDIO_RENDER_CLR_BIT  = BIT10,
 
-    AUDIO_INPUT_RUN_BIT   = BIT10,
-    AUDIO_INPUT_FFT_BIT   = BIT11,
+    AUDIO_INPUT_RUN_BIT   = BIT11,
+    AUDIO_INPUT_FFT_BIT   = BIT12,
 
-    AUDIO_PLAYER_RUN_BIT  = BIT12,
-    AUDIO_PLAYER_IDLE_BIT = BIT13,
+    AUDIO_PLAYER_RUN_BIT  = BIT13,
+    AUDIO_PLAYER_IDLE_BIT = BIT14,
 } user_event_group_bits_t;
 
 extern EventGroupHandle_t user_event_group;

main/src/user/bt_app.c

@@ -105,26 +105,15 @@ void bt_app_init(void)
     ESP_LOGI(BT_APP_TAG, "started.");
 
     if (memcmp(last_remote_bda, "\x00\x00\x00\x00\x00\x00", 6) != 0) {
-        // Reconnection delay
-        vTaskDelay(1000 / portTICK_RATE_MS);
-#ifdef CONFIG_ENABLE_AUDIO_PROMPT
-        xEventGroupWaitBits(
-            user_event_group,
-            AUDIO_PLAYER_IDLE_BIT,
-            pdFALSE,
-            pdFALSE,
-            portMAX_DELAY
-        );
-#endif
+        vTaskDelay(2000 / portTICK_RATE_MS);
+
         EventBits_t uxBits = xEventGroupGetBits(user_event_group);
-        if (uxBits & BT_A2DP_IDLE_BIT) {
-            ESP_LOGI(BT_APP_TAG, "reconnect to [%02x:%02x:%02x:%02x:%02x:%02x]",
+        if (uxBits & BT_A2DP_IDLE_BIT && !(uxBits & OS_PWR_SLEEP_BIT) && !(uxBits & OS_PWR_RESET_BIT)) {
+            ESP_LOGW(BT_APP_TAG, "connecting to [%02x:%02x:%02x:%02x:%02x:%02x]",
                      last_remote_bda[0], last_remote_bda[1], last_remote_bda[2],
                      last_remote_bda[3], last_remote_bda[4], last_remote_bda[5]);
 
             esp_a2d_sink_connect(last_remote_bda);
-        } else {
-            ESP_LOGW(BT_APP_TAG, "reconnecting aborted");
         }
     }
 }

main/src/user/bt_av.c

@@ -138,6 +138,8 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
 
             EventBits_t uxBits = xEventGroupGetBits(user_event_group);
             if (!(uxBits & OS_PWR_SLEEP_BIT) && !(uxBits & OS_PWR_RESET_BIT)) {
+                xEventGroupSetBits(user_event_group, KEY_SCAN_RUN_BIT | KEY_SCAN_CLR_BIT);
+
                 esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
             }
 
@@ -152,6 +154,11 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
         } else if (a2d->conn_stat.state == ESP_A2D_CONNECTION_STATE_CONNECTED) {
             xEventGroupClearBits(user_event_group, BT_A2DP_IDLE_BIT);
 
+            EventBits_t uxBits = xEventGroupGetBits(user_event_group);
+            if (!(uxBits & OS_PWR_SLEEP_BIT) && !(uxBits & OS_PWR_RESET_BIT)) {
+                xEventGroupSetBits(user_event_group, KEY_SCAN_RUN_BIT | KEY_SCAN_CLR_BIT);
+            }
+
             memcpy(&a2d_remote_bda, a2d->conn_stat.remote_bda, sizeof(esp_bd_addr_t));
 
             if (memcmp(&last_remote_bda, &a2d_remote_bda, sizeof(esp_bd_addr_t)) != 0) {
@@ -168,7 +175,7 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
             led_set_mode(2);
 #endif
         } else {
-            xEventGroupClearBits(user_event_group, BT_A2DP_IDLE_BIT);
+            xEventGroupClearBits(user_event_group, BT_A2DP_IDLE_BIT | KEY_SCAN_RUN_BIT);
         }
         break;
     }

main/src/user/key.c

@@ -5,6 +5,8 @@
  *      Author: Jack Chen <[email protected]>
  */
 
+#include <string.h>
+
 #include "esp_log.h"
 
 #include "freertos/FreeRTOS.h"
@@ -73,14 +75,20 @@ static void key_task(void *pvParameter)
     vTaskDelay(2000 / portTICK_RATE_MS);
 
     while (1) {
-        xEventGroupWaitBits(
+        EventBits_t uxBits = xEventGroupWaitBits(
             user_event_group,
             KEY_SCAN_RUN_BIT,
             pdFALSE,
             pdFALSE,
             portMAX_DELAY
         );
 
+        if (uxBits & KEY_SCAN_CLR_BIT) {
+            memset(&count, 0x00, sizeof(count));
+
+            xEventGroupClearBits(user_event_group, KEY_SCAN_CLR_BIT);
+        }
+
         xLastWakeTime = xTaskGetTickCount();
 
         for (int i=0; i<sizeof(gpio_pin); i++) {

main/src/user/ota.c

@@ -363,6 +363,6 @@ void ota_end(void)
         led_set_mode(3);
 #endif
 
-        xEventGroupSetBits(user_event_group, KEY_SCAN_RUN_BIT);
+        xEventGroupSetBits(user_event_group, KEY_SCAN_RUN_BIT | KEY_SCAN_CLR_BIT);
     }
 }