From 09a4844a6c3b4db61616b7f8becaf2f4f61e9a6e Mon Sep 17 00:00:00 2001 From: Jorropo Date: Thu, 22 Jan 2026 19:10:49 +0100 Subject: [PATCH 1/2] run trunk fmt -a --- monitor/filter_c3_exception_decoder.py | 6 ++---- src/platform/portduino/PortduinoGlue.cpp | 8 +++----- variants/esp32s3/CDEBYTE_EoRa-Hub/rfswitch.h | 3 ++- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/monitor/filter_c3_exception_decoder.py b/monitor/filter_c3_exception_decoder.py index 5e74dc2b9d4..fbc372bcfd8 100644 --- a/monitor/filter_c3_exception_decoder.py +++ b/monitor/filter_c3_exception_decoder.py @@ -43,13 +43,11 @@ def __call__(self): self.enabled = self.setup_paths() if self.config.get("env:" + self.environment, "build_type") != "debug": - print( - """ + print(""" Please build project in debug configuration to get more details about an exception. See https://docs.platformio.org/page/projectconf/build_configurations.html -""" - ) +""") return self diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp index 530cbe13e16..333cd827e01 100644 --- a/src/platform/portduino/PortduinoGlue.cpp +++ b/src/platform/portduino/PortduinoGlue.cpp @@ -65,7 +65,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) return ARGP_ERR_UNKNOWN; else checkConfigPort = false; - printf("Using config file %d\n", TCPPort); + printf("Using config file %d\n", TCPPort); break; case 'c': configPath = arg; @@ -887,10 +887,8 @@ bool loadConfig(const char *configPath) } if (checkConfigPort) { portduino_config.api_port = (yamlConfig["General"]["APIPort"]).as(-1); - if (portduino_config.api_port != -1 && - portduino_config.api_port > 1023 && - portduino_config.api_port < 65536) { - TCPPort = (portduino_config.api_port); + if (portduino_config.api_port != -1 && portduino_config.api_port > 1023 && portduino_config.api_port < 65536) { + TCPPort = (portduino_config.api_port); } } portduino_config.mac_address = (yamlConfig["General"]["MACAddress"]).as(""); diff --git a/variants/esp32s3/CDEBYTE_EoRa-Hub/rfswitch.h b/variants/esp32s3/CDEBYTE_EoRa-Hub/rfswitch.h index 1448b1d7473..9bb3af45a98 100644 --- a/variants/esp32s3/CDEBYTE_EoRa-Hub/rfswitch.h +++ b/variants/esp32s3/CDEBYTE_EoRa-Hub/rfswitch.h @@ -8,7 +8,8 @@ // DIO6 -> RFSW1_V2 // DIO7 -> not connected on E80 module - note that GNSS and Wifi scanning are not possible. -static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC, RADIOLIB_NC}; +static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC, + RADIOLIB_NC}; static const Module::RfSwitchMode_t rfswitch_table[] = { // mode DIO5 DIO6 DIO7 From d134bc3422cebcf0615a3a1746cfa97dcf5427d5 Mon Sep 17 00:00:00 2001 From: Jorropo Date: Thu, 22 Jan 2026 19:14:16 +0100 Subject: [PATCH 2/2] fix bracket bug This was introduced by @tedwardd and @thebentern in 021106dfe58a0b2b481c355ad318289aff592e7c. See this diff: else + checkConfigPort = false; printf("Using config file %d\n", TCPPort); --- src/platform/portduino/PortduinoGlue.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp index 333cd827e01..9159d5954d2 100644 --- a/src/platform/portduino/PortduinoGlue.cpp +++ b/src/platform/portduino/PortduinoGlue.cpp @@ -61,11 +61,12 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) { switch (key) { case 'p': - if (sscanf(arg, "%d", &TCPPort) < 1) + if (sscanf(arg, "%d", &TCPPort) < 1) { return ARGP_ERR_UNKNOWN; - else + } else { checkConfigPort = false; - printf("Using config file %d\n", TCPPort); + printf("Using config file %d\n", TCPPort); + } break; case 'c': configPath = arg;