From 6b11991be048cff335044cccaaae21e22b52c1ac Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Dec 2025 06:03:52 -0600 Subject: [PATCH 1/6] Upgrade trunk (#8856) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com> --- .trunk/trunk.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 95e5b0dd2..80851e6d5 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -9,24 +9,24 @@ plugins: lint: enabled: - checkov@3.2.495 - - renovate@42.30.4 + - renovate@42.40.3 - prettier@3.7.4 - trufflehog@3.91.2 - yamllint@1.37.1 - bandit@1.9.2 - - trivy@0.67.2 + - trivy@0.68.1 - taplo@0.10.0 - - ruff@0.14.7 + - ruff@0.14.8 - isort@7.0.0 - markdownlint@0.46.0 - - oxipng@9.1.5 + - oxipng@10.0.0 - svgo@4.0.0 - actionlint@1.7.9 - flake8@7.3.0 - hadolint@2.14.0 - shfmt@3.6.0 - shellcheck@0.11.0 - - black@25.11.0 + - black@25.12.0 - git-diff-check - gitleaks@8.30.0 - clang-format@16.0.3 From 817f3b9ec89b43d2510fcb942386e01e7edba170 Mon Sep 17 00:00:00 2001 From: Austin Date: Tue, 9 Dec 2025 10:57:02 -0500 Subject: [PATCH 2/6] Update platformio/espressif32 to v6.12.0 (#7697) --- extra_scripts/esp32_extra.py | 6 ++++++ variants/esp32/esp32.ini | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/extra_scripts/esp32_extra.py b/extra_scripts/esp32_extra.py index 8841ad1dc..f7698561a 100755 --- a/extra_scripts/esp32_extra.py +++ b/extra_scripts/esp32_extra.py @@ -10,6 +10,12 @@ Import("env") platform = env.PioPlatform() sys.path.append(join(platform.get_package_dir("tool-esptoolpy"))) +# IntelHex workaround, remove after fixed upstream +# https://github.com/platformio/platform-espressif32/issues/1632 +try: + import intelhex +except ImportError: + env.Execute("$PYTHONEXE -m pip install intelhex") import esptool diff --git a/variants/esp32/esp32.ini b/variants/esp32/esp32.ini index 5171bc45c..4bc48cebb 100644 --- a/variants/esp32/esp32.ini +++ b/variants/esp32/esp32.ini @@ -5,7 +5,7 @@ custom_esp32_kind = esp32 custom_mtjson_part = platform = # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32 - platformio/espressif32@6.11.0 + platformio/espressif32@6.12.0 extra_scripts = ${env.extra_scripts} From ec0dfb73372238953a7a1f6bb01e850df9f4a867 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Dec 2025 15:56:27 -0600 Subject: [PATCH 3/6] Update peter-evans/create-pull-request action to v8 (#8919) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/release_channels.yml | 2 +- .github/workflows/update_protobufs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_channels.yml b/.github/workflows/release_channels.yml index f21b13ee1..badbb31d4 100644 --- a/.github/workflows/release_channels.yml +++ b/.github/workflows/release_channels.yml @@ -102,7 +102,7 @@ jobs: PIP_DISABLE_PIP_VERSION_CHECK: 1 - name: Create Bumps pull request - uses: peter-evans/create-pull-request@v7 + uses: peter-evans/create-pull-request@v8 with: base: ${{ github.event.repository.default_branch }} branch: create-pull-request/bump-version diff --git a/.github/workflows/update_protobufs.yml b/.github/workflows/update_protobufs.yml index af0557fda..d9ef98194 100644 --- a/.github/workflows/update_protobufs.yml +++ b/.github/workflows/update_protobufs.yml @@ -31,7 +31,7 @@ jobs: ./bin/regen-protos.sh - name: Create pull request - uses: peter-evans/create-pull-request@v7 + uses: peter-evans/create-pull-request@v8 with: branch: create-pull-request/update-protobufs labels: submodules From ee80ec7b687075c60a5f1dada33906c5207fda3f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Dec 2025 06:14:00 -0600 Subject: [PATCH 4/6] Upgrade trunk (#8922) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com> --- .trunk/trunk.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 80851e6d5..565433c38 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -9,9 +9,9 @@ plugins: lint: enabled: - checkov@3.2.495 - - renovate@42.40.3 + - renovate@42.42.2 - prettier@3.7.4 - - trufflehog@3.91.2 + - trufflehog@3.92.1 - yamllint@1.37.1 - bandit@1.9.2 - trivy@0.68.1 From 83b603827c85630883e49de605967fab5de3c7fd Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Wed, 10 Dec 2025 16:29:50 -0600 Subject: [PATCH 5/6] Enable Muzi-base LED notification (#8925) --- src/mesh/NodeDB.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index d3000c500..192f29553 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -805,11 +805,15 @@ void NodeDB::installDefaultModuleConfig() moduleConfig.external_notification.output_ms = 500; moduleConfig.external_notification.nag_timeout = 2; #endif -#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) +#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) || defined(MUZI_BASE) // Default to RAK led pin 2 (blue) moduleConfig.external_notification.enabled = true; moduleConfig.external_notification.output = PIN_LED2; +#if defined(MUZI_BASE) + moduleConfig.external_notification.active = false; +#else moduleConfig.external_notification.active = true; +#endif moduleConfig.external_notification.alert_message = true; moduleConfig.external_notification.output_ms = 1000; moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs; From fba92229a67d47123d0d2c36423b9605050da0ad Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Wed, 10 Dec 2025 18:01:52 -0600 Subject: [PATCH 6/6] Add I2C device check for seesaw device on native (#8927) It turns out the logic here was attempting to access i2c without being told to do so. Not good, especially on desktops. --- src/modules/Modules.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp index f918d630f..63392f7e4 100644 --- a/src/modules/Modules.cpp +++ b/src/modules/Modules.cpp @@ -217,7 +217,7 @@ void setupModules() } #endif // HAS_BUTTON #if ARCH_PORTDUINO - if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) { + if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR && portduino_config.i2cdev != "") { seesawRotary = new SeesawRotary("SeesawRotary"); if (!seesawRotary->init()) { delete seesawRotary;