ota: allow update after a2dp is disconnected

Author: redchenjs

main/inc/core/os.h

@@ -15,11 +15,11 @@ typedef enum user_event_group_bits {
     OS_PWR_SLEEP_BIT      = BIT0,
     OS_PWR_RESTART_BIT    = BIT1,
 
-    BT_A2DP_IDLE_BIT      = BIT2,
-    BT_A2DP_DATA_BIT      = BIT3,
+    BT_SPP_IDLE_BIT       = BIT2,
+    BT_OTA_LOCK_BIT       = BIT3,
 
-    BT_SPP_IDLE_BIT       = BIT4,
-    BT_OTA_LOCKED_BIT     = BIT5,
+    BT_A2DP_IDLE_BIT      = BIT4,
+    BT_A2DP_DATA_BIT      = BIT5,
 
     BLE_GATTS_IDLE_BIT    = BIT6,
 

main/src/user/bt_av.c

@@ -144,9 +144,10 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
 #endif
 
             xEventGroupSetBits(user_event_group, BT_A2DP_IDLE_BIT);
+            xEventGroupClearBits(user_event_group, BT_OTA_LOCK_BIT);
         } else if (a2d->conn_stat.state == ESP_A2D_CONNECTION_STATE_CONNECTED) {
             xEventGroupClearBits(user_event_group, BT_A2DP_IDLE_BIT);
-            xEventGroupSetBits(user_event_group, BT_OTA_LOCKED_BIT);
+            xEventGroupSetBits(user_event_group, BT_OTA_LOCK_BIT);
 
             memcpy(&a2d_remote_bda, a2d->conn_stat.remote_bda, sizeof(esp_bd_addr_t));
 

main/src/user/ota.c

@@ -196,7 +196,7 @@ void ota_exec(esp_spp_cb_param_t *param)
                 ESP_LOGI(OTA_TAG, "GET command: "CMD_FMT_UPD, data_length);
 
                 EventBits_t uxBits = xEventGroupGetBits(user_event_group);
-                if (data_length != 0 && !(uxBits & BT_OTA_LOCKED_BIT)
+                if (data_length != 0 && !(uxBits & BT_OTA_LOCK_BIT)
 #ifdef CONFIG_ENABLE_BLE_CONTROL_IF
                     && (uxBits & BLE_GATTS_IDLE_BIT)
 #endif
@@ -259,7 +259,7 @@ void ota_exec(esp_spp_cb_param_t *param)
 
                         xTaskCreatePinnedToCore(ota_write_task, "otaWriteT", 1920, NULL, 9, NULL, 1);
                     }
-                } else if (uxBits & BT_OTA_LOCKED_BIT
+                } else if ((uxBits & BT_OTA_LOCK_BIT)
 #ifdef CONFIG_ENABLE_BLE_CONTROL_IF
                         || !(uxBits & BLE_GATTS_IDLE_BIT)
 #endif
@@ -274,7 +274,7 @@ void ota_exec(esp_spp_cb_param_t *param)
             case CMD_IDX_RST: {
                 ESP_LOGI(OTA_TAG, "GET command: "CMD_FMT_RST);
 
-                xEventGroupSetBits(user_event_group, BT_OTA_LOCKED_BIT);
+                xEventGroupSetBits(user_event_group, BT_OTA_LOCK_BIT);
 
                 memset(&last_remote_bda, 0x00, sizeof(esp_bd_addr_t));
                 app_setenv("LAST_REMOTE_BDA", &last_remote_bda, sizeof(esp_bd_addr_t));