bt_app: code refactoring

Author: redchenjs

main/src/user/bt_app.c

@@ -79,6 +79,22 @@ 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();
 
+        if (strlen((const char *)last_remote_bda) != 0) {
+            ESP_LOGI(BT_APP_TAG, "attempting to reconnect [%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]);
+#ifdef CONFIG_ENABLE_AUDIO_PROMPT
+            xEventGroupWaitBits(
+                user_event_group,
+                AUDIO_PLAYER_IDLE_BIT,
+                pdFALSE,
+                pdFALSE,
+                portMAX_DELAY
+            );
+#endif
+            esp_a2d_sink_connect(last_remote_bda);
+        }
+
         /* set discoverable and connectable mode, wait to be connected */
         esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
 
@@ -92,9 +108,11 @@ static void bt_app_hdl_stack_evt(uint16_t event, void *p_param)
 
 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_SPP_IDLE_BIT);
     xEventGroupSetBits(user_event_group, BT_A2DP_IDLE_BIT);
-    xEventGroupSetBits(user_event_group, BLE_GATTS_IDLE_BIT);
 
     /* create application task */
     bt_app_task_start_up();
@@ -114,15 +132,5 @@ void bt_app_init(void)
     pin_code[3] = '4';
     esp_bt_gap_set_pin(pin_type, 4, pin_code);
 
-    size_t length = sizeof(esp_bd_addr_t);
-    app_getenv("LAST_REMOTE_BDA", &last_remote_bda, &length);
-
-    if (strlen((const char *)last_remote_bda) != 0) {
-        ESP_LOGI(BT_APP_TAG, "attempting to reconnect [%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);
-    }
-
     ESP_LOGI(BT_APP_TAG, "started.");
 }

main/src/user/bt_app_core.c

@@ -15,7 +15,6 @@
 #include "freertos/queue.h"
 #include "freertos/task.h"
 
-#include "core/os.h"
 #include "user/bt_app_core.h"
 
 #define BT_APP_CORE_TAG "bt_app_core"
@@ -99,13 +98,5 @@ void bt_app_task_start_up(void)
 {
     s_bt_app_task_queue = xQueueCreate(10, sizeof(bt_app_msg_t));
 
-    xEventGroupWaitBits(
-        user_event_group,
-        AUDIO_PLAYER_IDLE_BIT,
-        pdFALSE,
-        pdFALSE,
-        portMAX_DELAY
-    );
-
     xTaskCreatePinnedToCore(bt_app_task, "BtAppT", 2048, NULL, configMAX_PRIORITIES - 3, NULL, 0);
 }