sforkowany z mirror/meshtastic-firmware
Merge branch 'master' into issue-919
commit
98d0907f4d
|
@ -57,7 +57,7 @@ static int32_t reconnectWiFi()
|
||||||
if (*wifiName) {
|
if (*wifiName) {
|
||||||
needReconnect = false;
|
needReconnect = false;
|
||||||
|
|
||||||
DEBUG_MSG("... Reconnecting to WiFi access point");
|
DEBUG_MSG("... Reconnecting to WiFi access point\n");
|
||||||
WiFi.mode(WIFI_MODE_STA);
|
WiFi.mode(WIFI_MODE_STA);
|
||||||
WiFi.begin(wifiName, wifiPsw);
|
WiFi.begin(wifiName, wifiPsw);
|
||||||
}
|
}
|
||||||
|
|
|
@ -557,7 +557,7 @@ void setBluetoothEnable(bool on)
|
||||||
|
|
||||||
bluetoothOn = on;
|
bluetoothOn = on;
|
||||||
if (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());
|
Serial.printf("Pre BT: %u heap size\n", ESP.getFreeHeap());
|
||||||
// ESP_ERROR_CHECK( heap_trace_start(HEAP_TRACE_LEAKS) );
|
// ESP_ERROR_CHECK( heap_trace_start(HEAP_TRACE_LEAKS) );
|
||||||
|
|
Ładowanie…
Reference in New Issue