.github/ISSUE_TEMPLATE/Bug Report.yml

@@ -1,7 +1,7 @@
 name: Bug Report
 description: File a bug report
 title: "[Bug]: "
-labels: [bug, triage]
+labels: ["bug", "triage"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/New Board.yml

@@ -1,7 +1,7 @@
 name: New Board
 description: Request us to support new hardware
 title: "[Board]: "
-labels: [enhancement, triage]
+labels: ["enhancement", "triage"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,7 +1,7 @@
 name: Feature Request
 description: Request a new feature
 title: "[Feature Request]: "
-labels: [enhancement]
+labels: ["enhancement"]
 body:
   - type: markdown
     attributes:

.github/actionlint.yaml

@@ -1,5 +0,0 @@
-# Configuration related to self-hosted runner.
-self-hosted-runner:
-  # Labels of self-hosted runner in array of strings.
-  labels:
-    - test-runner

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

@@ -34,7 +34,7 @@ inputs:
   arch:
     description: Processor arch name
     required: true
-    default: esp32
+    default: "esp32"
 
 runs:
   using: composite

.github/actions/setup-base/action.yml

@@ -1,13 +1,13 @@
-name: Setup Build Base Composite Action
+name: "Setup Build Base Composite Action"
-description: Base build actions for Meshtastic Platform IO steps
+description: "Base build actions for Meshtastic Platform IO steps"
 
 runs:
-  using: composite
+  using: "composite"
   steps:
     - name: Checkout code
       uses: actions/checkout@v4
       with:
-        submodules: recursive
+        submodules: "recursive"
         ref: ${{github.event.pull_request.head.ref}}
         repository: ${{github.event.pull_request.head.repo.full_name}}
 

.github/dependabot.yml

@@ -1,27 +1,26 @@
-#trunk-ignore-all(yamllint/quoted-strings): required by dependabot syntax check
 version: 2
 updates:
   - package-ecosystem: docker
     directory: devcontainer
     schedule:
       interval: daily
-      time: "05:00"
+      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
       timezone: US/Pacific
   - package-ecosystem: docker
     directory: /
     schedule:
       interval: daily
-      time: "05:00"
+      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
       timezone: US/Pacific
   - package-ecosystem: gitsubmodule
     directory: /
     schedule:
       interval: daily
-      time: "05:00"
+      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
       timezone: US/Pacific
   - package-ecosystem: github-actions
     directory: /.github/workflows
     schedule:
       interval: daily
-      time: "05:00"
+      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
       timezone: US/Pacific

.github/workflows/build_nrf52.yml

@@ -7,8 +7,6 @@ on:
         required: true
         type: string
 
-permissions: read-all
-
 jobs:
   build-nrf52:
     runs-on: ubuntu-latest

.github/workflows/build_rpi2040.yml

@@ -7,8 +7,6 @@ on:
         required: true
         type: string
 
-permissions: read-all
-
 jobs:
   build-rpi2040:
     runs-on: ubuntu-latest

.github/workflows/build_stm32.yml

@@ -7,8 +7,6 @@ on:
         required: true
         type: string
 
-permissions: read-all
-
 jobs:
   build-stm32:
     runs-on: ubuntu-latest

.github/workflows/tests.yml

@@ -2,11 +2,9 @@ name: End to end tests
 
 on:
   schedule:
-    - cron: 0 0 * * * # Run every day at midnight
+    - cron: "0 0 * * *" # Run every day at midnight
   workflow_dispatch: {}
 
-permissions: read-all
-
 jobs:
   native-tests:
     uses: ./.github/workflows/test_native.yml

.trunk/configs/.markdownlint.yaml

@@ -8,4 +8,3 @@ line_length: false
 spaces: false
 url: false
 whitespace: false
-headings: false

.trunk/trunk.yaml

@@ -8,11 +8,11 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - prettier@3.5.2
+    - prettier@3.5.1
     - trufflehog@3.88.12
     - yamllint@1.35.1
     - bandit@1.8.3
-    - checkov@3.2.373
+    - checkov@3.2.372
     - terrascan@1.19.9
     - trivy@0.59.1
     - taplo@0.9.3

Dockerfile

@@ -1,23 +1,21 @@
 # trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
+# trunk-ignore-all(hadolint/DL3008): Use latest version of apt packages for buildchain
 # trunk-ignore-all(trivy/DS002): We must run as root for this container
 # trunk-ignore-all(checkov/CKV_DOCKER_8): We must run as root for this container
 # trunk-ignore-all(hadolint/DL3002): We must run as root for this container
-# trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
-# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
 
-FROM python:3.13-bookworm AS builder
+FROM python:3.12-bookworm AS builder
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
 
 # Install Dependencies
 ENV PIP_ROOT_USER_ACTION=ignore
-RUN apt-get update && apt-get install --no-install-recommends -y \
+RUN apt-get update && apt-get install --no-install-recommends -y wget g++ zip git ca-certificates \
-        wget g++ zip git ca-certificates \
         libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev \
-        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config \
+        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config && \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* \
+    apt-get clean && rm -rf /var/lib/apt/lists/* && \
-    && pip install --no-cache-dir -U platformio \
+    pip install --no-cache-dir -U platformio==6.1.16 && \
-    && mkdir /tmp/firmware
+    mkdir /tmp/firmware
 
 # Copy source code
 WORKDIR /tmp/firmware
@@ -37,9 +35,8 @@ ENV TZ=Etc/UTC
 # nosemgrep: dockerfile.security.last-user-is-root.last-user-is-root
 USER root
 
-RUN apt-get update && apt-get --no-install-recommends -y install \
+RUN apt-get update && apt-get --no-install-recommends -y install libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libulfius2.7 libusb-1.0-0-dev liborcania2.3 libssl3 && \
-        libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libulfius2.7 libusb-1.0-0-dev liborcania2.3 libssl3 \
+    apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \
     && mkdir -p /etc/meshtasticd/ssl

alpine.Dockerfile

@@ -1,18 +1,14 @@
 # trunk-ignore-all(trivy/DS002): We must run as root for this container
 # trunk-ignore-all(checkov/CKV_DOCKER_8): We must run as root for this container
 # trunk-ignore-all(hadolint/DL3002): We must run as root for this container
-# trunk-ignore-all(hadolint/DL3018): Do not pin apk package versions
-# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
 
-FROM python:3.13-alpine3.21 AS builder
+FROM python:3.12-alpine3.21 AS builder
 
 ENV PIP_ROOT_USER_ACTION=ignore
-RUN apk --no-cache add \
+RUN apk add bash g++ libstdc++-dev linux-headers zip git ca-certificates libgpiod-dev yaml-cpp-dev bluez-dev \
-        bash g++ libstdc++-dev linux-headers zip git ca-certificates libgpiod-dev yaml-cpp-dev bluez-dev \
+        libusb-dev i2c-tools-dev openssl-dev pkgconf argp-standalone && \
-        libusb-dev i2c-tools-dev openssl-dev pkgconf argp-standalone \
+    pip install --no-cache-dir -U platformio==6.1.16 && \
-    && rm -rf /var/cache/apk/* \
+    mkdir /tmp/firmware
-    && pip install --no-cache-dir -U platformio \
-    && mkdir /tmp/firmware
 
 WORKDIR /tmp/firmware
 COPY . /tmp/firmware
@@ -31,9 +27,7 @@ FROM alpine:3.21
 # nosemgrep: dockerfile.security.last-user-is-root.last-user-is-root
 USER root
 
-RUN apk --no-cache add \
+RUN apk add libstdc++ libgpiod yaml-cpp libusb i2c-tools \
-        libstdc++ libgpiod yaml-cpp libusb i2c-tools \
-    && rm -rf /var/cache/apk/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \
     && mkdir -p /etc/meshtasticd/ssl

lib/device-ui

@@ -1 +1 @@
-Subproject commit 5c6156d2aa10d62cca3e57ffc117b934ef2fbffe
+Subproject commit e5dbf9f73157def18dd2b831a86a8317574811ec

protobufs

@@ -1 +1 @@
-Subproject commit 2a3a67f0431926dc3f32a8b216d264daab09b9bf
+Subproject commit 79298fcdf04c1e680f5abd875233394f44ddaf7a

src/modules/WaypointModule.cpp

@@ -144,9 +144,9 @@ void WaypointModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state,
             bearingToOther -= myHeading;
         screen->drawNodeHeading(display, compassX, compassY, compassDiam, bearingToOther);
 
-        float bearingToOtherDegrees = (bearingToOther < 0) ? bearingToOther + 2 * PI : bearingToOther;
+        float bearingToOtherDegrees = (bearingToOther < 0) ? bearingToOther + 2*PI : bearingToOther;
-        bearingToOtherDegrees = bearingToOtherDegrees * 180 / PI;
+            bearingToOtherDegrees = bearingToOtherDegrees * 180 / PI;
-
+        
         // Distance to Waypoint
         float d = GeoCoord::latLongToMeter(DegD(wp.latitude_i), DegD(wp.longitude_i), DegD(op.latitude_i), DegD(op.longitude_i));
         if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL) {
@@ -161,6 +161,7 @@ void WaypointModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state,
                 snprintf(distStr, sizeof(distStr), "%.1fkm   %.0f°", d / 1000, bearingToOtherDegrees);
         }
 
+
     }
 
     // If our node doesn't have position

test/test_crypto/test_main.cpp

@@ -1,4 +1,3 @@
-// trunk-ignore-all(gitleaks): These are dummy values. Not real secrets.
 #include "CryptoEngine.h"
 
 #include "TestUtil.h"

variants/xiao_ble/README.md

@@ -116,26 +116,24 @@ The default pin mapping in `variant.h` uses 'automatic Tx/Rx switching' mode. If
  
 
 <strong>MCU -> E22 connections</strong>
-
+| Xiao BLE pin | variant.h definition | E22 pin | Notes |
-| Xiao BLE pin | variant.h definition | E22 pin   | Notes                                                                                                                |
+| :------------ | :---------------------------- | :-----------------| :------------------------------------------------------------------------------------------------------------------- |
-| :----------- | :------------------- | :-------- | :------------------------------------------------------------------------------------------------------------------- |
+| D0 | SX126X_CS | 19 (NSS) | |
-| D0           | SX126X_CS            | 19 (NSS)  |                                                                                                                      |
+| D1 | SX126X_DIO1 | 13 (DIO1) | |
-| D1           | SX126X_DIO1          | 13 (DIO1) |                                                                                                                      |
+| D2 | SX126X_BUSY | 14 (BUSY) | |
-| D2           | SX126X_BUSY          | 14 (BUSY) |                                                                                                                      |
+| D3 | SX126X_RESET | 15 (NRST) | |
-| D3           | SX126X_RESET         | 15 (NRST) |                                                                                                                      |
+| D7 | SX126X_RXEN | 6 (RXEN) | These pins must still be connected, and `SX126X_RXEN` defined in `variant.h`, otherwise Rx sensitivity will be poor. |
-| D7           | SX126X_RXEN          | 6 (RXEN)  | These pins must still be connected, and `SX126X_RXEN` defined in `variant.h`, otherwise Rx sensitivity will be poor. |
+| D8 | PIN_SPI_SCK | 18 (SCK) | |
-| D8           | PIN_SPI_SCK          | 18 (SCK)  |                                                                                                                      |
+| D9 | PIN_SPI_MISO | 16 (MISO) | |
-| D9           | PIN_SPI_MISO         | 16 (MISO) |                                                                                                                      |
+| D10 | PIN_SPI_MOSI | 17 (MOSI) | |
-| D10          | PIN_SPI_MOSI         | 17 (MOSI) |                                                                                                                      |
 
 &nbsp;
 &nbsp;
 
 <strong>E22 -> E22 connections:</strong>
-
+| E22 pin | E22 pin | Notes |
-| E22 pin | E22 pin | Notes                                                                     |
+| :------------ | :---------------------------- | :------------------------------------------------------------------------ |
-| :------ | :------ | :------------------------------------------------------------------------ |
+| TXEN | DIO2 | These must be physically connected for automatic Tx/Rx switching to work. |
-| TXEN    | DIO2    | These must be physically connected for automatic Tx/Rx switching to work. |
 
 <h3>Note</h3>
 
@@ -150,18 +148,17 @@ The schematic (`xiao-ble-e22-schematic.png`) in the `eagle-project` directory us
 <h3>Example wiring for "Manual Tx/Rx switching" mode:</h3>
 
 <strong>MCU -> E22 connections</strong>
-
+| Xiao BLE pin | variant.h definition | E22 pin | Notes |
-| Xiao BLE pin | variant.h definition | E22 pin   | Notes |
+| :------------ | :---------------------------- | :-----------------| :--------------------------- |
-| :----------- | :------------------- | :-------- | :---- |
+| D0 | SX126X_CS | 19 (NSS) | |
-| D0           | SX126X_CS            | 19 (NSS)  |       |
+| D1 | SX126X_DIO1 | 13 (DIO1) | |
-| D1           | SX126X_DIO1          | 13 (DIO1) |       |
+| D2 | SX126X_BUSY | 14 (BUSY) | |
-| D2           | SX126X_BUSY          | 14 (BUSY) |       |
+| D3 | SX126X_RESET | 15 (NRST) | |
-| D3           | SX126X_RESET         | 15 (NRST) |       |
+| D6 | SX126X_TXEN | 7 (TXEN) | |
-| D6           | SX126X_TXEN          | 7 (TXEN)  |       |
+| D7 | SX126X_RXEN | 6 (RXEN) | |
-| D7           | SX126X_RXEN          | 6 (RXEN)  |       |
+| D8 | PIN_SPI_SCK | 18 (SCK) | |
-| D8           | PIN_SPI_SCK          | 18 (SCK)  |       |
+| D9 | PIN_SPI_MISO | 16 (MISO) | |
-| D9           | PIN_SPI_MISO         | 16 (MISO) |       |
+| D10 | PIN_SPI_MOSI | 17 (MOSI) | |
-| D10          | PIN_SPI_MOSI         | 17 (MOSI) |       |
 
 <strong>E22 -> E22 connections:</strong> (none)