cec3fca4ad
* Update esp32-hal-bt.c
BluetoothSerial crash when restart: this is because the BT controller remains in state ESP_BT_CONTROLLER_STATUS_INITED instead of state ESP_BT_CONTROLLER_STATUS_IDLE after the end() method.
in file esp_bt.h it is specified
> @brief Enable BT controller.
> Due to a known issue, you cannot call esp_bt_controller_enable() a second time
> to change the controller mode dynamically. To change controller mode, call
> esp_bt_controller_disable() and then call esp_bt_controller_enable() with the new mode.
after **esp_bt_controller_disable()** the controller remains in state INITED so we do call the **esp_bt_controller_deinit()** function to put the controller into state IDLE.
i have modified the **esp32-hal-bt.c** file
line 57 and next
(i have insert the esp_bt_controller_deinit() function so the controller go into Idle state)
```c++
bool btStop(){
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE){
log_i("bt stopped");
return true;
}
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED){
log_i("bt enabled");
if (esp_bt_controller_disable()) {
log_e("BT Disable failed");
return false;
}
while(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED);
}
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED){
log_i("inited");
if (esp_bt_controller_deinit()) {
log_e("BT deint failed");
return false;
}
while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED);
return true;
}
log_e("BT Stop failed");
return false;
}
```
* Update esp32-hal-bt.c
remove while to avoid infinite loop
100 lines
2.6 KiB
C
100 lines
2.6 KiB
C
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "esp32-hal-bt.h"
|
|
|
|
#ifdef CONFIG_BT_ENABLED
|
|
|
|
bool btInUse(){ return true; }
|
|
|
|
#ifdef CONFIG_BLUEDROID_ENABLED
|
|
#include "esp_bt.h"
|
|
|
|
#ifdef CONFIG_CLASSIC_BT_ENABLED
|
|
#define BT_MODE ESP_BT_MODE_BTDM
|
|
#else
|
|
#define BT_MODE ESP_BT_MODE_BLE
|
|
#endif
|
|
|
|
bool btStarted(){
|
|
return (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED);
|
|
}
|
|
|
|
bool btStart(){
|
|
esp_bt_controller_config_t cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
|
|
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED){
|
|
return true;
|
|
}
|
|
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE){
|
|
esp_bt_controller_init(&cfg);
|
|
while(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE){}
|
|
}
|
|
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED){
|
|
if (esp_bt_controller_enable(BT_MODE)) {
|
|
log_e("BT Enable failed");
|
|
return false;
|
|
}
|
|
}
|
|
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED){
|
|
return true;
|
|
}
|
|
log_e("BT Start failed");
|
|
return false;
|
|
}
|
|
|
|
bool btStop(){
|
|
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE){
|
|
return true;
|
|
}
|
|
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED){
|
|
if (esp_bt_controller_disable()) {
|
|
log_e("BT Disable failed");
|
|
return false;
|
|
}
|
|
while(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED);
|
|
}
|
|
if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED){
|
|
if (esp_bt_controller_deinit()) {
|
|
log_e("BT deint failed");
|
|
return false;
|
|
}
|
|
vTaskDelay(1);
|
|
if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_IDLE) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
log_e("BT Stop failed");
|
|
return false;
|
|
}
|
|
|
|
#else
|
|
bool btStarted()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool btStart()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool btStop()
|
|
{
|
|
return false;
|
|
}
|
|
#endif
|
|
#endif
|
|
|