bt_ota: stop audio player task when doing ota

Author: redchenjs

main/inc/core/os.h

@@ -30,6 +30,7 @@ typedef enum user_event_group_bits {
 
     AUDIO_PLAYER_RUN_BIT  = BIT11,
     AUDIO_PLAYER_IDLE_BIT = BIT12,
+    AUDIO_PLAYER_EXIT_BIT = BIT13,
 } user_event_group_bits_t;
 
 extern EventGroupHandle_t user_event_group;

main/inc/user/audio_player.h

@@ -24,6 +24,7 @@ extern const char snd3_mp3_ptr[] asm("_binary_snd3_mp3_start");
 extern const char snd3_mp3_end[] asm("_binary_snd3_mp3_end");
 
 extern void audio_player_play_file(uint8_t idx);
+extern void audio_player_set_mode(uint8_t idx);
 
 extern void audio_player_init(void);
 

main/src/user/audio_player.c

@@ -44,7 +44,8 @@ static const char *mp3_file_ptr[][2] = {
 #endif
 };
 
-static uint8_t mp3_file_index   = 0;
+static uint8_t aplay_mode = 1;
+static uint8_t mp3_file_index = 0;
 static uint8_t playback_pending = 0;
 
 static void audio_player_task(void *pvParameters)
@@ -63,12 +64,26 @@ static void audio_player_task(void *pvParameters)
     while (1) {
         xEventGroupWaitBits(
             user_event_group,
-            AUDIO_PLAYER_RUN_BIT,
+            AUDIO_PLAYER_RUN_BIT | AUDIO_PLAYER_EXIT_BIT,
             pdFALSE,
             pdFALSE,
             portMAX_DELAY
         );
 
+        EventBits_t uxBits = xEventGroupGetBits(user_event_group);
+        if (uxBits & AUDIO_PLAYER_EXIT_BIT) {
+            xEventGroupSetBits(user_event_group, AUDIO_PLAYER_IDLE_BIT);
+            xEventGroupClearBits(user_event_group, AUDIO_PLAYER_RUN_BIT);
+
+            free(synth);
+            free(frame);
+            free(stream);
+
+            ESP_LOGI(TAG, "exited.");
+
+            vTaskDelete(NULL);
+        }
+
         // Initialize mp3 parts
         mad_stream_init(stream);
         mad_frame_init(frame);
@@ -108,7 +123,8 @@ static void audio_player_task(void *pvParameters)
     free(stream);
 
     ESP_LOGE(TAG, "unrecoverable error");
-    esp_restart();
+
+    vTaskDelete(NULL);
 }
 
 void audio_player_play_file(uint8_t idx)
@@ -123,6 +139,9 @@ void audio_player_play_file(uint8_t idx)
     }
     mp3_file_index = idx;
     EventBits_t uxBits = xEventGroupGetBits(user_event_group);
+    if (uxBits & AUDIO_PLAYER_EXIT_BIT) {
+        return;
+    }
     if (uxBits & AUDIO_PLAYER_RUN_BIT) {
         // Previous playback is still not complete
         playback_pending = 1;
@@ -133,6 +152,21 @@ void audio_player_play_file(uint8_t idx)
 #endif
 }
 
+void audio_player_set_mode(uint8_t idx)
+{
+#ifdef CONFIG_ENABLE_AUDIO_PROMPT
+    aplay_mode = idx;
+    ESP_LOGI(TAG, "mode: %u", aplay_mode);
+
+    if (aplay_mode) {
+        xEventGroupClearBits(user_event_group, AUDIO_PLAYER_EXIT_BIT);
+        audio_player_init();
+    } else {
+        xEventGroupSetBits(user_event_group, AUDIO_PLAYER_EXIT_BIT);
+    }
+#endif
+}
+
 void audio_player_init(void)
 {
     EventBits_t uxBits = xEventGroupGetBits(user_event_group);

main/src/user/bt_spp.c

@@ -30,6 +30,7 @@
 #include "user/ble_app.h"
 #include "user/ble_gatts.h"
 #include "user/audio_input.h"
+#include "user/audio_player.h"
 
 #define BT_SPP_TAG "bt_spp"
 #define BT_OTA_TAG "bt_ota"
@@ -104,6 +105,7 @@ void bt_app_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param)
             image_length = 0;
 
             i2s_output_init();
+            audio_player_set_mode(1);
 #ifndef CONFIG_AUDIO_INPUT_NONE
             audio_input_set_mode(ain_prev_mode);
 #endif
@@ -208,6 +210,7 @@ void bt_app_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param)
                     audio_input_set_mode(0);
 #endif
 #ifdef CONFIG_ENABLE_AUDIO_PROMPT
+                    audio_player_set_mode(0);
                     xEventGroupWaitBits(
                         user_event_group,
                         AUDIO_PLAYER_IDLE_BIT,
@@ -282,6 +285,7 @@ void bt_app_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param)
                 esp_spp_write(param->write.handle, strlen(rsp_str[2]), (uint8_t *)rsp_str[2]);
 
                 i2s_output_init();
+                audio_player_set_mode(1);
 #ifndef CONFIG_AUDIO_INPUT_NONE
                 audio_input_set_mode(ain_prev_mode);
 #endif

sdkconfig.defaults

@@ -27,6 +27,7 @@ CONFIG_BT_GATTS_ENABLE=y
 CONFIG_BT_GATTC_ENABLE=n
 CONFIG_BT_BLE_SMP_ENABLE=n
 CONFIG_BT_STACK_NO_LOG=y
+CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
 
 #
 # Compiler options