src/W800_SDK_v1.00.10/app/ble/ble_modem.c

@@ -75,9 +75,6 @@ bool ble_modem_off(void)
         }
     };
 
-    // Don't forget to set the rf bt mode to it's default config 
-    tls_rf_bt_mode(false);
-    
     status = tls_bt_deinit();
 
     if((status != BLE_HS_ENOERR) && (status != BLE_HS_EALREADY)) {
@@ -86,8 +83,8 @@ bool ble_modem_off(void)
 
     if(status != BLE_HS_EALREADY)
     {
-        // Starting a wifi scan really stops the BT modem ?? Why ? I don't know
+        //Starting a wifi scan really stops the BT modem ?? Why ? I don't know
-        tls_wifi_passive_scan();
+        tls_wifi_scan();
     }
 
     return ((status == BLE_HS_ENOERR || status == BLE_HS_EALREADY) && serviceStopSuccess) ? true : false;

src/W800_SDK_v1.00.10/src/bt/blehost/porting/w800/include/nimble/nimble_npl_os.h

@@ -96,7 +96,6 @@ ble_npl_eventq_deinit(struct ble_npl_eventq *evq)
 {
     if(evq && evq->q) {
         tls_os_queue_delete(evq->q);
-        evq->q = NULL;
     }
 }
 

src/W800_SDK_v1.00.10/src/bt/blehost/porting/w800/src/npl_os_freertos.c

@@ -248,12 +248,8 @@ os_callout_timer_cb(void *ptmr, void *parg)
     struct ble_npl_callout *co;
     co = (struct ble_npl_callout *)parg;
 
-    if(co->evq)
+    if(co->evq) {
-    {
+        ble_npl_eventq_put(co->evq, &co->ev);
-        /* In some cases, the event queue g_eventq_dflt is already
-           deleted when this callback is called raising an issue ! */
-        if(co->evq->q)
-            ble_npl_eventq_put(co->evq, &co->ev);
     } else {
         co->ev.fn(&co->ev);
     }