diff --git a/bin/device-install.bat b/bin/device-install.bat index 88b24fc66..fe4a3870a 100644 --- a/bin/device-install.bat +++ b/bin/device-install.bat @@ -28,12 +28,12 @@ IF "__%FILENAME%__" == "____" ( ) IF EXIST %FILENAME% ( echo Trying to flash update %FILENAME%, but first erasing and writing system information" - %PYTHON% -m esptool --baud 921600 erase_flash - %PYTHON% -m esptool --baud 921600 write_flash 0x1000 system-info.bin + %PYTHON% -m esptool --baud 115200 erase_flash + %PYTHON% -m esptool --baud 115200 write_flash 0x1000 system-info.bin for %%f in (littlefs-*.bin) do ( - %PYTHON% -m esptool --baud 921600 write_flash 0x00390000 %%f + %PYTHON% -m esptool --baud 115200 write_flash 0x00390000 %%f ) - %PYTHON% -m esptool --baud 921600 write_flash 0x10000 %FILENAME% + %PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME% ) else ( echo "Invalid file: %FILENAME%" goto HELP diff --git a/bin/device-update.bat b/bin/device-update.bat index 4cede3db9..7e8dc329c 100644 --- a/bin/device-update.bat +++ b/bin/device-update.bat @@ -28,9 +28,9 @@ IF "__%FILENAME%__" == "____" ( ) IF EXIST %FILENAME% ( echo Trying to flash update %FILENAME% - %PYTHON% -m esptool --baud 921600 write_flash 0x10000 %FILENAME% + %PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME% echo Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used - %PYTHON% -m esptool --baud 921600 erase_region 0xe000 0x2000 + %PYTHON% -m esptool --baud 115200 erase_region 0xe000 0x2000 ) else ( echo "Invalid file: %FILENAME%" goto HELP diff --git a/bin/device-update.sh b/bin/device-update.sh index dda05f005..b4e054196 100755 --- a/bin/device-update.sh +++ b/bin/device-update.sh @@ -44,9 +44,9 @@ shift "$((OPTIND-1))" if [ -f "${FILENAME}" ]; then echo "Trying to flash update ${FILENAME}." - $PYTHON -m esptool --baud 921600 write_flash 0x10000 ${FILENAME} + $PYTHON -m esptool --baud 115200 write_flash 0x10000 ${FILENAME} echo "Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used" - $PYTHON -m esptool --baud 921600 erase_region 0xe000 0x2000 + $PYTHON -m esptool --baud 115200 erase_region 0xe000 0x2000 else echo "Invalid file: ${FILENAME}" show_help diff --git a/bin/read-system-info.sh b/bin/read-system-info.sh index f116087b2..b9e9c8072 100755 --- a/bin/read-system-info.sh +++ b/bin/read-system-info.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -esptool.py --baud 921600 read_flash 0x1000 0xf000 system-info.img +esptool.py --baud 115200 read_flash 0x1000 0xf000 system-info.img diff --git a/platformio.ini b/platformio.ini index 60e9fe68e..5a69e24ab 100644 --- a/platformio.ini +++ b/platformio.ini @@ -38,7 +38,7 @@ build_flags = -Wno-missing-field-initializers -DTINYGPS_OPTION_NO_CUSTOM_FIELDS -DPB_ENABLE_MALLOC=1 -monitor_speed = 921600 +monitor_speed = 115200 lib_deps = https://github.com/meshtastic/esp8266-oled-ssd1306.git#53580644255b48ebb7a737343c6b4e71c7e11cf2 ; ESP8266_SSD1306 @@ -93,7 +93,7 @@ extends = arduino_base platform = espressif32@3.5.0 build_src_filter = ${arduino_base.build_src_filter} - -upload_speed = 921600 +upload_speed = 115200 debug_init_break = tbreak setup # Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging. diff --git a/src/DebugConfiguration.h b/src/DebugConfiguration.h index 4397dfe0b..53ea303a2 100644 --- a/src/DebugConfiguration.h +++ b/src/DebugConfiguration.h @@ -10,7 +10,7 @@ #ifdef CONSOLE_MAX_BAUD #define SERIAL_BAUD CONSOLE_MAX_BAUD #else -#define SERIAL_BAUD 921600 // Serial debug baud rate +#define SERIAL_BAUD 115200 // Serial debug baud rate #endif #include "SerialConsole.h"