From 3ed831b8a32b2e6189a6c535d94722302ae696dc Mon Sep 17 00:00:00 2001 From: "Daniel.Cao" <144674500+DanielCao0@users.noreply.github.com> Date: Tue, 4 Nov 2025 19:53:08 +0800 Subject: [PATCH 1/6] Add support for RAK_WISMESH_TAP_V2 and RAK3401 hardware models (#8537) --- src/platform/esp32/architecture.h | 2 ++ src/platform/nrf52/architecture.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h index 53b23124d..9b5abfba0 100644 --- a/src/platform/esp32/architecture.h +++ b/src/platform/esp32/architecture.h @@ -191,6 +191,8 @@ #define HW_VENDOR meshtastic_HardwareModel_CROWPANEL #elif defined(RAK3312) #define HW_VENDOR meshtastic_HardwareModel_RAK3312 +#elif defined(RAK_WISMESH_TAP_V2) +#define HW_VENDOR meshtastic_HardwareModel_WISMESH_TAP_V2 #elif defined(LINK_32) #define HW_VENDOR meshtastic_HardwareModel_LINK_32 #elif defined(T_DECK_PRO) diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h index cee0e5a10..c74f02c44 100644 --- a/src/platform/nrf52/architecture.h +++ b/src/platform/nrf52/architecture.h @@ -60,6 +60,8 @@ // MAke sure all custom RAK4630 boards are defined before the generic RAK4630 #elif defined(RAK4630) #define HW_VENDOR meshtastic_HardwareModel_RAK4631 +#elif defined(RAK3401) +#define HW_VENDOR meshtastic_HardwareModel_RAK3401 #elif defined(TTGO_T_ECHO) #define HW_VENDOR meshtastic_HardwareModel_T_ECHO #elif defined(T_ECHO_LITE) From 0a13bcaabfa20617ae514aa8b256d8d591602987 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Nov 2025 06:07:12 -0600 Subject: [PATCH 2/6] Upgrade trunk (#8437) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com> --- .trunk/trunk.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 0a43c3079..46916bf29 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -8,15 +8,15 @@ plugins: uri: https://github.com/trunk-io/plugins lint: enabled: - - checkov@3.2.486 - - renovate@41.157.0 + - checkov@3.2.489 + - renovate@41.169.1 - prettier@3.6.2 - - trufflehog@3.90.11 + - trufflehog@3.90.12 - yamllint@1.37.1 - bandit@1.8.6 - trivy@0.67.2 - taplo@0.10.0 - - ruff@0.14.1 + - ruff@0.14.3 - isort@7.0.0 - markdownlint@0.45.0 - oxipng@9.1.5 From f2400c9dc6013bc64c07de823f2afda8988b6405 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Tue, 4 Nov 2025 11:35:44 -0600 Subject: [PATCH 3/6] Update platform-native for WIFi lib fix (#8544) Updates the WiFi library way down in Portduino, to detect TCP connection drops --- arch/portduino/portduino.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini index f3fd00de7..bce06f907 100644 --- a/arch/portduino/portduino.ini +++ b/arch/portduino/portduino.ini @@ -2,7 +2,7 @@ [portduino_base] platform = # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop - https://github.com/meshtastic/platform-native/archive/d3f6e339534233c7217818867368767590ce549e.zip + https://github.com/meshtastic/platform-native/archive/f566d364204416cdbf298e349213f7d551f793d9.zip framework = arduino build_src_filter = From 6b55ec6603d80077585a86310006ca6a8b02420d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Nov 2025 11:36:05 -0600 Subject: [PATCH 4/6] chore(deps): update python to v3.14.0 (#8542) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bc660170c..e3f076ce0 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,7 +8,7 @@ "features": { "ghcr.io/devcontainers/features/python:1": { "installTools": true, - "version": "3.13" + "version": "3.14" } }, "customizations": { From a579a9d0116847f629dac6686a4289f611dc2739 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Nov 2025 15:35:14 -0600 Subject: [PATCH 5/6] chore(deps): update adafruit pct2075 to v1.0.6 (#8548) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 7c63ad7ad..405fb040b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -176,7 +176,7 @@ lib_deps = # renovate: datasource=custom.pio depName=Adafruit LTR390 Library packageName=adafruit/library/Adafruit LTR390 Library adafruit/Adafruit LTR390 Library@1.1.2 # renovate: datasource=custom.pio depName=Adafruit PCT2075 packageName=adafruit/library/Adafruit PCT2075 - adafruit/Adafruit PCT2075@1.0.5 + adafruit/Adafruit PCT2075@1.0.6 # renovate: datasource=custom.pio depName=DFRobot_BMM150 packageName=dfrobot/library/DFRobot_BMM150 dfrobot/DFRobot_BMM150@1.0.0 # renovate: datasource=custom.pio depName=Adafruit_TSL2561 packageName=adafruit/library/Adafruit TSL2561 From ce2e08e0d818cad7b729cd14227e46328cd0d4d2 Mon Sep 17 00:00:00 2001 From: Jason P Date: Wed, 5 Nov 2025 13:19:55 -0600 Subject: [PATCH 6/6] Don't Favorite Nodes if our Role is CLIENT_BASE (#8558) * Don't Favorite Nodes if our Role is CLIENT_BASE * Update CannedMessageModule.cpp --- src/modules/CannedMessageModule.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp index 9f95a9e20..f435f6060 100644 --- a/src/modules/CannedMessageModule.cpp +++ b/src/modules/CannedMessageModule.cpp @@ -973,8 +973,14 @@ void CannedMessageModule::sendText(NodeNum dest, ChannelIndex channel, const cha LOG_INFO("Send message id=%u, dest=%x, msg=%.*s", p->id, p->to, p->decoded.payload.size, p->decoded.payload.bytes); if (p->to != 0xffffffff) { - LOG_INFO("Proactively adding %x as favorite node", p->to); - nodeDB->set_favorite(true, p->to); + // Only add as favorite if our role is NOT CLIENT_BASE + if (config.device.role != 12) { + LOG_INFO("Proactively adding %x as favorite node", p->to); + nodeDB->set_favorite(true, p->to); + } else { + LOG_DEBUG("Not favoriting node %x as we are CLIENT_BASE role", p->to); + } + screen->setFrames(graphics::Screen::FOCUS_PRESERVE); p->pki_encrypted = true; p->channel = 0;