From dd8cb1c7fb07be39b8b854b248ecb1d2ef92bf1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 19 Sep 2022 15:36:48 +0200 Subject: [PATCH 1/2] Small fixes for ESP Serial Init and Power FSM debug garble. --- src/PowerFSM.cpp | 2 +- src/gps/GPS.cpp | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp index 675507108..c16f52592 100644 --- a/src/PowerFSM.cpp +++ b/src/PowerFSM.cpp @@ -240,7 +240,7 @@ void PowerFSM_setup() bool isRouter = (config.device.role == Config_DeviceConfig_Role_ROUTER ? 1 : 0); bool hasPower = isPowered(); - DEBUG_MSG("PowerFSM init, USB power=%d\n", hasPower); + DEBUG_MSG("PowerFSM init, USB power=%d\n", hasPower ? 1 : 0); powerFSM.add_timed_transition(&stateBOOT, hasPower ? &statePOWER : &stateON, 3 * 1000, NULL, "boot timeout"); // wake timer expired or a packet arrived diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index 244534233..5099589fd 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -145,7 +145,7 @@ bool GPS::setupGPS() if (_serial_gps && !didSerialInit) { didSerialInit = true; -#if CONFIG_IDF_TARGET_ESP32S3 +#if ARCH_ESP32 // In esp32s3 framework, setRxBufferSize needs to be initialized before Serial _serial_gps->setRxBufferSize(2048); // the default is 256 #endif @@ -157,11 +157,6 @@ bool GPS::setupGPS() _serial_gps->begin(GPS_BAUDRATE); #endif -#if CONFIG_IDF_TARGET_ESP32 - _serial_gps->setRxBufferSize(2048); // the default is 256 -#endif - - #ifdef LILYGO_TBEAM_S3_CORE /* * T-Beam-S3-Core will be preset to use gps Probe here, and other boards will not be changed first From 207f701f0a1a2ae1ec8054a197ac0b2b3fdc6f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 19 Sep 2022 15:46:59 +0200 Subject: [PATCH 2/2] Update GPS.cpp --- src/gps/GPS.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index 5099589fd..c4cdb39b6 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -145,7 +145,7 @@ bool GPS::setupGPS() if (_serial_gps && !didSerialInit) { didSerialInit = true; -#if ARCH_ESP32 +#ifdef ARCH_ESP32 // In esp32s3 framework, setRxBufferSize needs to be initialized before Serial _serial_gps->setRxBufferSize(2048); // the default is 256 #endif