diff --git a/platformio.ini b/platformio.ini index a3b792cb..c611b799 100644 --- a/platformio.ini +++ b/platformio.ini @@ -60,7 +60,6 @@ TFT_ROTATION = 0 ; 0=0, 1=90, 2=180 or 3=270 degree [env] framework = arduino -monitor_speed = 74880 upload_speed = 921600 ; -- Shared library dependencies in all environments lib_deps = @@ -91,6 +90,7 @@ platform = espressif32@1.11.1 board = esp32dev upload_port = COM3 ; Change to the correct port monitor_port = COM3 ; Change to the correct port +monitor_speed = 115200 debug_tool = esp-prog debug_init_break = tbreak setup @@ -130,6 +130,7 @@ platform = espressif32 board = wemos_d1_mini32 upload_port = COM8 ; Change to the correct port monitor_port = COM8 ; Change to the correct port +monitor_speed = 115200 board_build.partitions = default.csv build_flags = ${env.build_flags} @@ -160,6 +161,7 @@ platform = espressif32 board = lolin_d32_pro upload_port = COM8 ; Change to the correct port monitor_port = COM8 ; Change to the correct port +monitor_speed = 115200 board_build.partitions = default.csv build_flags = ${env.build_flags} @@ -190,6 +192,7 @@ platform = espressif8266@2.3.2 board = d1_mini upload_port = COM4 ; Change to the correct port monitor_port = COM4 ; Change to the correct port +monitor_speed = 74880 board_build.f_flash = 40000000L board_build.flash_mode = dout board_build.ldscript = eagle.flash.4m3m.ld ; 3Mb Spiffs @@ -222,8 +225,9 @@ build_flags = [env:esp12e-st7735] platform = espressif8266 ;@2.2.3 board = esp12e -monitor_port = COM5 upload_port = COM5 ; Change to the correct port +monitor_port = COM5 ; Change to the correct port +monitor_speed = 74880 board_build.f_flash = 40000000L board_build.flash_mode = dout board_build.ldscript = eagle.flash.4m3m.ld ; 3Mb Spiffs diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp index c6b6ea49..e554dcc7 100644 --- a/src/hasp_debug.cpp +++ b/src/hasp_debug.cpp @@ -46,13 +46,18 @@ Syslog syslog(syslogClient, debugSyslogHost.c_str(), debugSyslogPort, debugAppNa void debugSetup() { +#if defined(ARDUINO_ARCH_ESP32) + Serial.begin(115200); /* prepare for possible serial debug */ +#else Serial.begin(74880); /* prepare for possible serial debug */ +#endif + Serial.flush(); Serial.println(); - Serial.println(); - Serial.println(F("\n _____ _____ _____ _____\n | | | _ | __| _ |\n" - " | | |__ | __|\n |__|__|__|__|_____|__|\n" - " Home Automation Switch Plate\n Open Hardware edition\n\n")); + Serial.printf_P(PSTR(" _____ _____ _____ _____\n | | | _ | __| _ |\n" + " | | |__ | __|\n |__|__|__|__|_____|__|\n" + " Home Automation Switch Plate\n Open Hardware edition v%u.%u.%u\n\n"), + HASP_VERSION_MAJOR, HASP_VERSION_MINOR, HASP_VERSION_REVISION); Serial.flush(); // prepare syslog configuration here (can be anywhere before first call of