diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index e030763e4..04b0fa2db 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -21,7 +21,7 @@ lib_ignore = ESP32 Azure IoT Arduino ESP32 Async UDP ESP32 BLE Arduino - SimpleBLE +; SimpleBLE NetBIOS ESP32 Preferences diff --git a/tasmota/support.ino b/tasmota/support.ino index 32187beb0..e2478f11c 100644 --- a/tasmota/support.ino +++ b/tasmota/support.ino @@ -913,11 +913,11 @@ void SetSerialBegin(void) { TasmotaGlobal.baudrate = Settings.baudrate * 300; AddLog_P2(LOG_LEVEL_INFO, PSTR(D_LOG_SERIAL "Set to %s %d bit/s"), GetSerialConfig().c_str(), TasmotaGlobal.baudrate); Serial.flush(); - Serial.end(); - delay(10); // Allow time to cleanup queues - if not used hangs ESP32 #ifdef ESP8266 Serial.begin(TasmotaGlobal.baudrate, (SerialConfig)pgm_read_byte(kTasmotaSerialConfig + Settings.serial_config)); #else // ESP32 + Serial.end(); + delay(10); // Allow time to cleanup queues - if not used hangs ESP32 uint32_t config = pgm_read_dword(kTasmotaSerialConfig + Settings.serial_config); Serial.begin(TasmotaGlobal.baudrate, config); #endif diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino index 11654f3fe..3a9cf89aa 100644 --- a/tasmota/xdrv_01_webserver.ino +++ b/tasmota/xdrv_01_webserver.ino @@ -875,7 +875,11 @@ const WebServerDispatch_t WebServerDispatch[] PROGMEM = { }; void WebServer_on(const char * prefix, void (*func)(void), uint8_t method = HTTP_ANY) { +#ifdef ESP8266 Webserver->on((const __FlashStringHelper *) prefix, (HTTPMethod) method, func); +#else + Webserver->on(prefix, (HTTPMethod) method, func); +#endif } void StartWebserver(int type, IPAddress ipweb)