rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 10:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable bluetooth while using wifi (esp32 drops networks otherwise)

Browse Source
This commit is contained in:
Kevin Hester
2021-08-17 16:58:21 -07:00
parent 0d758347af
commit 189889489b
6 changed files with 26 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/nimble/BluetoothUtil.cpp
View File

@@ -539,7 +539,6 @@ void reinitBluetooth()
}
bool bluetoothOn;
bool firstTime = 1;
// Enable/disable bluetooth.
void setBluetoothEnable(bool on)
@@ -549,32 +548,15 @@ void setBluetoothEnable(bool on)
bluetoothOn = on;
if (on) {
Serial.printf("Pre BT: %u heap size\n", ESP.getFreeHeap());
// ESP_ERROR_CHECK( heap_trace_start(HEAP_TRACE_LEAKS) );
reinitBluetooth();
// Don't try to reconnect wifi before bluetooth is configured.
// WiFi is initialized from main.cpp in setup() .
if (firstTime) {
firstTime = 0;
} else {
#ifndef NO_ESP32
initWifi(0);
#endif
if (!initWifi(0)) // if we are using wifi, don't turn on bluetooth also
{
Serial.printf("Pre BT: %u heap size\n", ESP.getFreeHeap());
// ESP_ERROR_CHECK( heap_trace_start(HEAP_TRACE_LEAKS) );
reinitBluetooth();
}
} else {
/*
// If WiFi is in use, disable shutting down the radio.
if (isWifiAvailable()) {
return;
}
*/
// shutdown wifi
#ifndef NO_ESP32
deinitWifi();
#endif
// We have to totally teardown our bluetooth objects to prevent leaks
deinitBLE();