Update C6 Branch

.github/actions/build-variant/action.yml

@@ -51,6 +51,7 @@ runs:
         file: build.tar
         target: build.tar
         token: ${{ inputs.github_token }}
+        version: tags/v2.5.3
 
     - name: Unpack web ui
       if: inputs.include-web-ui == 'true'

.github/workflows/build_esp32.yml

@@ -7,6 +7,8 @@ on:
         required: true
         type: string
 
+permissions: read-all
+
 jobs:
   build-esp32:
     runs-on: ubuntu-latest
@@ -24,6 +26,7 @@ jobs:
             ./arch/esp32/esp32s2.ini
             ./arch/esp32/esp32s3.ini
             ./arch/esp32/esp32c3.ini
+            ./arch/esp32/esp32c6.ini
           build-script-path: bin/build-esp32.sh
           ota-firmware-source: firmware.bin
           ota-firmware-target: release/bleota.bin

.github/workflows/build_esp32_c3.yml

@@ -26,10 +26,12 @@ jobs:
             ./arch/esp32/esp32s2.ini
             ./arch/esp32/esp32s3.ini
             ./arch/esp32/esp32c3.ini
+            ./arch/esp32/esp32c6.ini
           build-script-path: bin/build-esp32.sh
           ota-firmware-source: firmware-c3.bin
           ota-firmware-target: release/bleota-c3.bin
           artifact-paths: |
             release/*.bin
             release/*.elf
+          include-web-ui: true
           arch: esp32c3

.github/workflows/build_esp32_c6.yml

@@ -33,4 +33,5 @@ jobs:
           artifact-paths: |
             release/*.bin
             release/*.elf
+          include-web-ui: true
           arch: esp32c6

.github/workflows/build_esp32_s3.yml

@@ -7,6 +7,8 @@ on:
         required: true
         type: string
 
+permissions: read-all
+
 jobs:
   build-esp32-s3:
     runs-on: ubuntu-latest
@@ -24,6 +26,7 @@ jobs:
             ./arch/esp32/esp32s2.ini
             ./arch/esp32/esp32s3.ini
             ./arch/esp32/esp32c3.ini
+            ./arch/esp32/esp32c6.ini
           build-script-path: bin/build-esp32.sh
           ota-firmware-source: firmware-s3.bin
           ota-firmware-target: release/bleota-s3.bin

.github/workflows/build_raspbian.yml

@@ -13,8 +13,8 @@ jobs:
       - name: Install libbluetooth
         shell: bash
         run: |
-          apt-get update -y --fix-missing
-          apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
+          sudo apt-get update -y --fix-missing
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
 
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/build_raspbian_armv7l.yml

@@ -13,8 +13,8 @@ jobs:
       - name: Install libbluetooth
         shell: bash
         run: |
-          apt-get update -y --fix-missing
-          apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
+          sudo apt-get update -y --fix-missing
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
 
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/main_matrix.yml

@@ -203,6 +203,7 @@ jobs:
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
+            ./littlefswebui-*.bin
             ./bleota*bin
             ./Meshtastic_nRF52_factory_erase*.uf2
           retention-days: 30
@@ -245,7 +246,8 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
-    needs: [
+    needs:
+      [
         gather-artifacts,
         package-raspbian,
         package-raspbian-armv7l,

.github/workflows/package_amd64.yml

@@ -50,11 +50,18 @@ jobs:
           mkdir -p .debpkg/usr/share/doc/meshtasticd/web
           mkdir -p .debpkg/usr/sbin
           mkdir -p .debpkg/etc/meshtasticd
+          mkdir -p .debpkg/etc/meshtasticd/config.d
+          mkdir -p .debpkg/etc/meshtasticd/available.d
           mkdir -p .debpkg/usr/lib/systemd/system/
           tar -xf build.tar -C .debpkg/usr/share/doc/meshtasticd/web
+          shopt -s dotglob nullglob
+          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then mv  .debpkg/usr/share/doc/meshtasticd/web/build/* .debpkg/usr/share/doc/meshtasticd/web/; fi
+          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/doc/meshtasticd/web/build; fi
+          if [ -d .debpkg/usr/share/doc/meshtasticd/web/.DS_Store]; then rm -f .debpkg/usr/share/doc/meshtasticd/web/.DS_Store; fi
           gunzip .debpkg/usr/share/doc/meshtasticd/web/*.gz
           cp release/meshtasticd_linux_x86_64 .debpkg/usr/sbin/meshtasticd
           cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml
+          cp bin/config.d/* .debpkg/etc/meshtasticd/available.d/
           chmod +x .debpkg/usr/sbin/meshtasticd
           cp bin/meshtasticd.service .debpkg/usr/lib/systemd/system/meshtasticd.service
           echo "/etc/meshtasticd/config.yaml" > .debpkg/DEBIAN/conffiles

.github/workflows/package_raspbian.yml

@@ -50,11 +50,18 @@ jobs:
           mkdir -p .debpkg/usr/share/doc/meshtasticd/web
           mkdir -p .debpkg/usr/sbin
           mkdir -p .debpkg/etc/meshtasticd
+          mkdir -p .debpkg/etc/meshtasticd/config.d
+          mkdir -p .debpkg/etc/meshtasticd/available.d
           mkdir -p .debpkg/usr/lib/systemd/system/
           tar -xf build.tar -C .debpkg/usr/share/doc/meshtasticd/web
+          shopt -s dotglob nullglob
+          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then mv  .debpkg/usr/share/doc/meshtasticd/web/build/* .debpkg/usr/share/doc/meshtasticd/web/; fi
+          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/doc/meshtasticd/web/build; fi
+          if [ -d .debpkg/usr/share/doc/meshtasticd/web/.DS_Store]; then rm -f .debpkg/usr/share/doc/meshtasticd/web/.DS_Store; fi
           gunzip .debpkg/usr/share/doc/meshtasticd/web/*.gz
           cp release/meshtasticd_linux_aarch64 .debpkg/usr/sbin/meshtasticd
           cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml
+          cp bin/config.d/* .debpkg/etc/meshtasticd/available.d/
           chmod +x .debpkg/usr/sbin/meshtasticd
           cp bin/meshtasticd.service .debpkg/usr/lib/systemd/system/meshtasticd.service
           echo "/etc/meshtasticd/config.yaml" > .debpkg/DEBIAN/conffiles

.github/workflows/package_raspbian_armv7l.yml

@@ -50,11 +50,18 @@ jobs:
           mkdir -p .debpkg/usr/share/doc/meshtasticd/web
           mkdir -p .debpkg/usr/sbin
           mkdir -p .debpkg/etc/meshtasticd
+          mkdir -p .debpkg/etc/meshtasticd/config.d
+          mkdir -p .debpkg/etc/meshtasticd/available.d
           mkdir -p .debpkg/usr/lib/systemd/system/
           tar -xf build.tar -C .debpkg/usr/share/doc/meshtasticd/web
+          shopt -s dotglob nullglob
+          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then mv  .debpkg/usr/share/doc/meshtasticd/web/build/* .debpkg/usr/share/doc/meshtasticd/web/; fi
+          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/doc/meshtasticd/web/build; fi
+          if [ -d .debpkg/usr/share/doc/meshtasticd/web/.DS_Store]; then rm -f .debpkg/usr/share/doc/meshtasticd/web/.DS_Store; fi
           gunzip .debpkg/usr/share/doc/meshtasticd/web/*.gz
           cp release/meshtasticd_linux_armv7l .debpkg/usr/sbin/meshtasticd
           cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml
+          cp bin/config.d/* .debpkg/etc/meshtasticd/available.d/
           chmod +x .debpkg/usr/sbin/meshtasticd
           cp bin/meshtasticd.service .debpkg/usr/lib/systemd/system/meshtasticd.service
           echo "/etc/meshtasticd/config.yaml" > .debpkg/DEBIAN/conffiles

.github/workflows/stale_bot.yml

@@ -0,0 +1,22 @@
+name: process stale Issues and PR's
+on:
+  schedule:
+    - cron: 0 6 * * *
+  workflow_dispatch: {}
+
+permissions:
+  issues: write
+  pull-requests: write
+  actions: write
+
+jobs:
+  stale_issues:
+    name: Close Stale Issues
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Stale PR+Issues
+        uses: actions/[email protected]
+        with:
+          exempt-issue-labels: pinned,3.0
+          exempt-pr-labels: pinned,3.0

.github/workflows/trunk_format_pr.yml

@@ -0,0 +1,43 @@
+name: Run Trunk Fmt on PR Comment
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  trunk-fmt:
+    if: github.event.issue.pull_request != null && contains(github.event.comment.body, 'trunk fmt')
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Install trunk
+        run: curl https://get.trunk.io -fsSL | bash
+
+      - name: Run Trunk Fmt
+        run: trunk fmt
+
+      - name: Commit and push changes
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git add .
+          git commit -m "Add firmware version ${{ steps.version.outputs.version }}"
+          git push
+
+      - name: Comment on PR
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '`trunk fmt` has been run on this PR.'
+            })

.trunk/trunk.yaml

@@ -1,34 +1,34 @@
 version: 0.1
 cli:
-  version: 1.22.6
+  version: 1.22.8
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.3
+      ref: v1.6.4
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - trufflehog@3.82.6
+    - trufflehog@3.83.6
     - [email protected]
     - [email protected]
-    - [email protected].256
-    - [email protected].1
-    - trivy@0.55.2
+    - [email protected].287
+    - [email protected].9
+    - trivy@0.56.2
     #- [email protected]
     - [email protected]
-    - ruff@0.6.8
+    - ruff@0.7.3
     - [email protected]
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].3
+    - [email protected].4
     - [email protected]
     - [email protected]
     - [email protected]
     - [email protected]
-    - black@24.8.0
+    - black@24.10.0
     - git-diff-check
-    - gitleaks@8.20.0
+    - gitleaks@8.21.1
     - [email protected]
     - [email protected]
   ignore:

CODE_OF_CONDUCT.md

@@ -0,0 +1,4 @@
+# Contributor Covenant Code of Conduct
+
+The Meshtastic Firmware project is subject to the code of conduct for the parent project, which can be found here: 
+https://meshtastic.org/docs/legal/conduct/

arch/esp32/esp32.ini

@@ -31,7 +31,7 @@ build_flags =
   -DCONFIG_BT_NIMBLE_ENABLED
   -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
   -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
-  -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=5120
+  -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
   -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
   -DSERIAL_BUFFER_SIZE=4096
   -DLIBPAX_ARDUINO
@@ -43,9 +43,10 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
   h2zero/NimBLE-Arduino@^1.4.2
-  https://github.com/dbSuS/libpax.git#7bcd3fcab75037505be9b122ab2b24cc5176b587
+  https://github.com/dbinfrago/libpax.git#3cdc0371c375676a97967547f4065607d4c53fd1
   lewisxhe/XPowersLib@^0.2.6
   https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
   rweather/Crypto@^0.4.0

arch/esp32/esp32c6.ini

@@ -23,6 +23,7 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   lewisxhe/XPowersLib@^0.2.6
   https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
   rweather/Crypto@^0.4.0

arch/nrf52/nrf52.ini

@@ -14,13 +14,18 @@ build_flags =
   -Wno-unused-variable
   -Isrc/platform/nrf52
   -DLFS_NO_ASSERT                      ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
+  -DMESHTASTIC_EXCLUDE_AUDIO=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
+  -DMAX_NUM_NODES=80
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
 
 lib_deps=
   ${arduino_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto@^0.4.0
 
 lib_ignore =
-  BluetoothOTA
+  BluetoothOTA
+  lvgl

arch/portduino/portduino.ini

@@ -1,6 +1,6 @@
 ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#6b3796d697481c8f6e3f4aa5c111bd9979f29e64
+platform = https://github.com/meshtastic/platform-native.git#bcd02436cfca91f7d28ad0f7dab977c6aaa781af
 framework = arduino
 
 build_src_filter = 
@@ -23,15 +23,17 @@ build_src_filter =
 lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto@^0.4.0
-  lovyan03/LovyanGFX@^1.1.16
+  https://github.com/lovyan03/LovyanGFX.git#1401c28a47646fe00538d487adcb2eb3c72de805
 
 build_flags =
   ${arduino_base.build_flags}
   -fPIC
   -Isrc/platform/portduino
   -DRADIOLIB_EEPROM_UNSUPPORTED
   -DPORTDUINO_LINUX_HARDWARE
+  -lstdc++fs
   -lbluetooth
   -lgpiod
   -lyaml-cpp

arch/rp2xx0/rp2040.ini

@@ -1,8 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#v1.2.0-gcc12
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#19e30129fb1428b823be585c787dcb4ac0d9014c ; For arduino-pico 4.2.1
 extends = arduino_base
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.0.3
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#996c3bfab9758f12c07aa20cc6d352e630c16987 ; 4.2.1 with fix for sporadic hangs
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -22,4 +22,5 @@ lib_ignore =
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto

arch/rp2xx0/rp2350.ini

@@ -1,8 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2350_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#9e55f6db5c56b9867c69fe473f388beea4546672
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#19e30129fb1428b823be585c787dcb4ac0d9014c ; For arduino-pico 4.2.1
 extends = arduino_base
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#a6ab6e1f95bc1428d667d55ea7173c0744acc03c ; 4.0.2+
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#96c3bfab9758f12c07aa20cc6d352e630c16987 ; 4.2.1 with fix for sporadic hangs
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -16,8 +16,10 @@ build_src_filter =
 
 lib_ignore =
   BluetoothOTA
+  lvgl
 
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto