bt_app: update initialization sequence

Author: redchenjs

main/src/user/bt_app.c

@@ -66,8 +66,21 @@ static void bt_app_hdl_stack_evt(uint16_t event, void *p_param)
         esp_a2d_sink_register_data_callback(bt_app_a2d_data_cb);
         esp_a2d_sink_init();
 
-        /* set discoverable and connectable mode, wait to be connected */
-        esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
+        if (memcmp(last_remote_bda, "\x00\x00\x00\x00\x00\x00", 6) != 0) {
+            EventBits_t uxBits = xEventGroupGetBits(user_event_group);
+            if (!(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 {
+            xEventGroupSetBits(user_event_group, BT_A2DP_IDLE_BIT);
+
+            /* set discoverable and connectable mode, wait to be connected */
+            esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
+        }
 
         break;
     }
@@ -82,8 +95,6 @@ void bt_app_init(void)
     size_t length = sizeof(esp_bd_addr_t);
     app_getenv("LAST_REMOTE_BDA", &last_remote_bda, &length);
 
-    xEventGroupSetBits(user_event_group, BT_A2DP_IDLE_BIT);
-
     /* create application task */
     bt_app_task_start_up();
 
@@ -103,17 +114,4 @@ void bt_app_init(void)
     esp_bt_gap_set_pin(pin_type, 4, pin_code);
 
     ESP_LOGI(BT_APP_TAG, "started.");
-
-    if (memcmp(last_remote_bda, "\x00\x00\x00\x00\x00\x00", 6) != 0) {
-        vTaskDelay(2000 / portTICK_RATE_MS);
-
-        EventBits_t uxBits = xEventGroupGetBits(user_event_group);
-        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);
-        }
-    }
 }

main/src/user/bt_av.c

@@ -140,15 +140,13 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
                 esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
             }
 
-            if (!(uxBits & BT_A2DP_IDLE_BIT)) {
 #ifdef CONFIG_ENABLE_AUDIO_PROMPT
-                audio_player_play_file(MP3_FILE_IDX_DISCONNECTED);
+            audio_player_play_file(MP3_FILE_IDX_DISCONNECTED);
 #endif
 #ifdef CONFIG_ENABLE_LED
-                led_set_mode(LED_MODE_IDX_BLINK_M0);
+            led_set_mode(LED_MODE_IDX_BLINK_M0);
 #endif
-                xEventGroupSetBits(user_event_group, BT_A2DP_IDLE_BIT);
-            }
+            xEventGroupSetBits(user_event_group, BT_A2DP_IDLE_BIT);
         } else if (a2d->conn_stat.state == ESP_A2D_CONNECTION_STATE_CONNECTED) {
             xEventGroupClearBits(user_event_group, BT_A2DP_IDLE_BIT);