diff --git a/platformio.ini b/platformio.ini index b3ac038..2b0ca29 100644 --- a/platformio.ini +++ b/platformio.ini @@ -67,6 +67,8 @@ board_build.ldscript = eagle.flash.4m1m.ld [esp32_defaults] platform = espressif32@^6.6 +platform_packages = + platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/archive/refs/tags/2.0.15.zip board_build.partitions = esp32_partitions.csv lib_deps = ${env.lib_deps} @@ -131,13 +133,18 @@ build_flags = [env:s2_mini] platform = ${esp32_defaults.platform} +platform_packages = ${esp32_defaults.platform_packages} board = lolin_s2_mini board_build.partitions = ${esp32_defaults.board_build.partitions} lib_deps = ${esp32_defaults.lib_deps} lib_ignore = ${esp32_defaults.lib_ignore} extra_scripts = ${esp32_defaults.extra_scripts} +build_unflags = + -DARDUINO_USB_MODE=1 build_flags = ${esp32_defaults.build_flags} + -D ARDUINO_USB_MODE=0 + -D ARDUINO_USB_CDC_ON_BOOT=1 -D DEFAULT_OT_IN_GPIO=33 -D DEFAULT_OT_OUT_GPIO=35 -D DEFAULT_SENSOR_OUTDOOR_GPIO=9 @@ -147,6 +154,7 @@ build_flags = [env:s3_mini] platform = ${esp32_defaults.platform} +platform_packages = ${esp32_defaults.platform_packages} board = lolin_s3_mini board_build.partitions = ${esp32_defaults.board_build.partitions} lib_deps = @@ -154,8 +162,12 @@ lib_deps = h2zero/NimBLE-Arduino@^1.4.1 lib_ignore = ${esp32_defaults.lib_ignore} extra_scripts = ${esp32_defaults.extra_scripts} +build_unflags = + -DARDUINO_USB_MODE=1 build_flags = ${esp32_defaults.build_flags} + -D ARDUINO_USB_MODE=0 + -D ARDUINO_USB_CDC_ON_BOOT=1 -D USE_BLE=1 -D DEFAULT_OT_IN_GPIO=35 -D DEFAULT_OT_OUT_GPIO=36 @@ -166,6 +178,8 @@ build_flags = [env:c3_mini] platform = ${esp32_defaults.platform} +platform_packages = + platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/archive/refs/tags/2.0.15.zip board = lolin_c3_mini board_build.partitions = ${esp32_defaults.board_build.partitions} lib_deps = @@ -187,6 +201,7 @@ build_flags = [env:nodemcu_32s] platform = ${esp32_defaults.platform} +platform_packages = ${esp32_defaults.platform_packages} board = nodemcu-32s board_build.partitions = ${esp32_defaults.board_build.partitions} lib_deps = @@ -207,6 +222,7 @@ build_flags = [env:d1_mini32] platform = ${esp32_defaults.platform} +platform_packages = ${esp32_defaults.platform_packages} board = wemos_d1_mini32 board_build.partitions = ${esp32_defaults.board_build.partitions} lib_deps = diff --git a/src/main.cpp b/src/main.cpp index 4d736f4..2a4f053 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -59,7 +59,7 @@ void setup() { return tm{sec, min, hour}; }); - Serial.begin(settings.system.serial.baudrate); + Serial.begin(115200); Log.addStream(&Serial); Log.print("\n\n\r"); @@ -110,8 +110,15 @@ void setup() { // logs if (!settings.system.serial.enable) { - Log.clearStreams(); Serial.end(); + Log.clearStreams(); + + } else if (settings.system.serial.baudrate != 115200) { + Serial.end(); + Log.clearStreams(); + + Serial.begin(settings.system.serial.baudrate); + Log.addStream(&Serial); } if (settings.system.telnet.enable) {