Merge pull request #940 from mc-hamster/StoreAndForward

Fix for: Wifi admin mode no longer works #939
This commit is contained in:
Jm Casler 2021-11-28 22:16:13 -08:00 committed by GitHub
commit 5f6d97151c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -57,7 +57,7 @@ static int32_t reconnectWiFi()
if (*wifiName) {
needReconnect = false;
DEBUG_MSG("... Reconnecting to WiFi access point");
DEBUG_MSG("... Reconnecting to WiFi access point\n");
WiFi.mode(WIFI_MODE_STA);
WiFi.begin(wifiName, wifiPsw);
}

View File

@ -557,7 +557,7 @@ void setBluetoothEnable(bool on)
bluetoothOn = on;
if (on) {
if (!initWifi(0)) // if we are using wifi, don't turn on bluetooth also
if (!initWifi(isSoftAPForced())) // 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) );