Remove .tmp

This reverts commit 12fde696c1.

.devcontainer/Dockerfile

@@ -1,9 +1,10 @@
+# trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
+# trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
+# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
 FROM mcr.microsoft.com/devcontainers/cpp:1-debian-12
 
 USER root
 
-# trunk-ignore(terrascan/AC_DOCKER_0002): Known terrascan issue
-# trunk-ignore(hadolint/DL3008): Use latest version of packages
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
     ca-certificates \
@@ -27,9 +28,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     hwdata \
     gpg \
     gnupg2 \
+    libusb-1.0-0-dev \
+    libi2c-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN pipx install platformio==6.1.15
+RUN pipx install platformio
 
 COPY 99-platformio-udev.rules /etc/udev/rules.d/99-platformio-udev.rules
 

.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

@@ -0,0 +1,5 @@
+# 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"
-description: "Base build actions for Meshtastic Platform IO steps"
+name: Setup Build Base Composite Action
+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,26 +1,27 @@
+#trunk-ignore-all(yamllint/quoted-strings): required by dependabot syntax check
 version: 2
 updates:
   - package-ecosystem: docker
-    directory: devcontainer
+    directory: /.devcontainer
     schedule:
       interval: daily
-      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
+      time: "05:00"
       timezone: US/Pacific
   - package-ecosystem: docker
     directory: /
     schedule:
       interval: daily
-      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
+      time: "05:00"
       timezone: US/Pacific
   - package-ecosystem: gitsubmodule
     directory: /
     schedule:
       interval: daily
-      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
+      time: "05:00"
       timezone: US/Pacific
   - package-ecosystem: github-actions
     directory: /.github/workflows
     schedule:
       interval: daily
-      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
+      time: "05:00"
       timezone: US/Pacific

.github/workflows/build_nrf52.yml

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

.github/workflows/build_rpi2040.yml

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

.github/workflows/build_stm32.yml

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

.github/workflows/generate-userprefs.yml

@@ -1,35 +0,0 @@
-name: Generate UsersPrefs JSON manifest
-
-on:
-  push:
-    paths:
-      - userPrefs.h
-    branches:
-      - master
-
-jobs:
-  generate-userprefs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install Clang
-        run: sudo apt-get install -y clang
-
-      - name: Install trunk
-        run: curl https://get.trunk.io -fsSL | bash
-
-      - name: Generate userPrefs.jsom
-        run: python3 ./bin/build-userprefs-json.py
-
-      - name: Trunk format json
-        run: trunk format userPrefs.json
-
-      - name: Commit userPrefs.json
-        run: |
-          git config --global user.email "actions@github.com"
-          git config --global user.name "GitHub Actions"
-          git add userPrefs.json
-          git commit -m "Update userPrefs.json"
-          git push

.github/workflows/main_matrix.yml

@@ -135,10 +135,10 @@ jobs:
       build_location: local
     secrets: inherit
 
-  package-pio-deps-native:
+  package-pio-deps-native-tft:
     uses: ./.github/workflows/package_pio_deps.yml
     with:
-      pio_env: native
+      pio_env: native-tft
     secrets: inherit
 
   test-native:
@@ -288,7 +288,7 @@ jobs:
     needs:
       - gather-artifacts
       - build-debian-src
-      - package-pio-deps-native
+      - package-pio-deps-native-tft
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -324,10 +324,10 @@ jobs:
           merge-multiple: true
           path: ./output/debian-src
 
-      - name: Download native pio deps
+      - name: Download `native-tft` pio deps
         uses: actions/download-artifact@v4
         with:
-          pattern: platformio-deps-native-${{ steps.version.outputs.long }}
+          pattern: platformio-deps-native-tft-${{ steps.version.outputs.long }}
           merge-multiple: true
           path: ./output/pio-deps-native
 

.github/workflows/nightly.yml

@@ -9,7 +9,7 @@ permissions: read-all
 jobs:
   trunk_check:
     name: Trunk Check and Upload
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -23,7 +23,7 @@ jobs:
   trunk_upgrade:
     # See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
     name: Trunk Upgrade (PR)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: write # For trunk to create PRs
       pull-requests: write # For trunk to create PRs

.github/workflows/sec_sast_flawfinder.yml

@@ -1,41 +0,0 @@
----
-name: Flawfinder Scan
-
-on:
-  push:
-    branches: [master, develop]
-    paths-ignore:
-      - "**.md"
-      - "version.properties"
-
-jobs:
-  flawfinder:
-    runs-on: ubuntu-latest
-    name: Flawfinder
-
-    steps:
-      # step 1
-      - name: clone application source code
-        uses: actions/checkout@v4
-
-      # step 2
-      - name: flawfinder_scan
-        uses: david-a-wheeler/flawfinder@2.0.19
-        with:
-          arguments: "--sarif ./"
-          output: "flawfinder_report.sarif"
-
-      # step 3
-      - name: save report as pipeline artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: flawfinder_report.sarif
-          overwrite: true
-          path: flawfinder_report.sarif
-
-      # step 4
-      - name: publish code scanning alerts
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: flawfinder_report.sarif
-          category: flawfinder

.github/workflows/sec_sast_semgrep_cron.yml

@@ -3,10 +3,10 @@ name: Semgrep Full Scan
 
 on:
   workflow_dispatch:
-    branches:
-      - master
   schedule:
-    - cron: "0 1 * * 6"
+    - cron: 0 1 * * 6
+
+permissions: read-all
 
 jobs:
   semgrep-full:

.github/workflows/sec_sast_semgrep_pull.yml

@@ -2,6 +2,8 @@
 name: Semgrep Differential Scan
 on: pull_request
 
+permissions: read-all
+
 jobs:
   semgrep-diff:
     runs-on: ubuntu-22.04

.github/workflows/tests.yml

@@ -2,9 +2,11 @@ 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

.github/workflows/trunk_annotate_pr.yml

@@ -11,7 +11,7 @@ permissions: read-all
 jobs:
   trunk_check:
     name: Trunk Code Quality Annotate
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       checks: write # For trunk to post annotations
       contents: read # For repo checkout

.github/workflows/trunk_check.yml

@@ -9,7 +9,7 @@ permissions: read-all
 jobs:
   trunk_check:
     name: Trunk Check Runner
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       checks: write # For trunk to post annotations
       contents: read # For repo checkout

.github/workflows/trunk_format_pr.yml

@@ -4,11 +4,15 @@ on:
   issue_comment:
     types: [created]
 
+permissions: read-all
+
 jobs:
   trunk-fmt:
     if: github.event.issue.pull_request != null && contains(github.event.comment.body, 'trunk fmt')
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/update_protobufs.yml

@@ -1,10 +1,14 @@
 name: Update protobufs and regenerate classes
 on: workflow_dispatch
 
+permissions: read-all
+
 jobs:
   update-protobufs:
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.trunk/configs/.markdownlint.yaml

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

.trunk/trunk.yaml

@@ -8,16 +8,16 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - prettier@3.5.1
-    - trufflehog@3.88.12
+    - prettier@3.5.2
+    - trufflehog@3.88.14
     - yamllint@1.35.1
     - bandit@1.8.3
-    - checkov@3.2.372
+    - checkov@3.2.378
     - terrascan@1.19.9
     - trivy@0.59.1
     - taplo@0.9.3
     - ruff@0.9.7
-    - isort@6.0.0
+    - isort@6.0.1
     - markdownlint@0.44.0
     - oxipng@9.1.4
     - svgo@3.3.2

Dockerfile

@@ -1,21 +1,23 @@
 # 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.12-bookworm AS builder
+FROM python:3.13-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 wget g++ zip git ca-certificates \
+RUN apt-get update && apt-get install --no-install-recommends -y \
+        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 && \
-    apt-get clean && rm -rf /var/lib/apt/lists/* && \
-    pip install --no-cache-dir -U platformio==6.1.16 && \
-    mkdir /tmp/firmware
+        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* \
+    && pip install --no-cache-dir -U platformio \
+    && mkdir /tmp/firmware
 
 # Copy source code
 WORKDIR /tmp/firmware
@@ -35,8 +37,9 @@ 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 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/* \
+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 \
+    && 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,14 +1,18 @@
 # 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.12-alpine3.21 AS builder
+FROM python:3.13-alpine3.21 AS builder
 
 ENV PIP_ROOT_USER_ACTION=ignore
-RUN apk add 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 && \
-    pip install --no-cache-dir -U platformio==6.1.16 && \
-    mkdir /tmp/firmware
+RUN apk --no-cache add \
+        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 \
+    && rm -rf /var/cache/apk/* \
+    && pip install --no-cache-dir -U platformio \
+    && mkdir /tmp/firmware
 
 WORKDIR /tmp/firmware
 COPY . /tmp/firmware
@@ -27,7 +31,9 @@ FROM alpine:3.21
 # nosemgrep: dockerfile.security.last-user-is-root.last-user-is-root
 USER root
 
-RUN apk add libstdc++ libgpiod yaml-cpp libusb i2c-tools \
+RUN apk --no-cache add \
+        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

bin/build-native.sh

@@ -24,7 +24,7 @@ mkdir -p $OUTDIR/
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update --environment native || platformioFailed
+pio pkg update --environment native || platformioFailed
 pio run --environment native || platformioFailed
 cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(uname -m)"
 cp bin/native-install.* $OUTDIR

bin/config.d/lora-raxda-rock2f-starter-edition-hat.yaml

@@ -0,0 +1,49 @@
+Lora:
+
+### Raxda Rock 2F running Armbian Linux 6.1.99-vendor-rk35xx
+### https://github.com/markbirss/rock-2f
+### https://github.com/markbirss/lora-starter-edition-sx1262-i2c
+### https://github.com/radxa-pkg/radxa-overlays/blob/main/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-spidev.dts
+### Require install of https://github.com/radxa-pkg/radxa-overlays and rk3528-spi0-cs1-spidev.dtbo copied to /boot/dtb/rockchip/overlay and enabled 
+### in  /boot/armbianEnv.txt - overlays=rk3528-spi0-cs1-spidev
+### The Radxa Rock 2F employs multiple gpio chips.
+### Each gpio pin must be unique, but can be assigned to a specific gpio chip and line.
+### In case solely a no. is given, the default gpio chip and pin == line will be employed.
+###
+  Module: sx1262  # Radxa Rock 2F + Starter Edition SX1262 HAT by Mark Birss
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: 1.8
+  spidev: spidev0.1
+  CS:             # NSS     PIN_24 -> chip 4, line 14
+    pin: 24
+    gpiochip: 4
+    line: 14
+  SCK:            # SCK     PIN_23 -> chip 4, line 12
+    pin: 23
+    gpiochip: 4
+    line: 12
+  Busy:           # BUSY    PIN_7 -> chip 4, line 6
+    pin: 7
+    gpiochip: 4
+    line: 6
+  MOSI:           # MOSI    PIN_19 -> chip 4, line 10
+    pin: 19
+    gpiochip: 4
+    line: 10
+  MISO:           # MISO    PIN_21 -> chip 4, line 11
+    pin: 21
+    gpiochip: 4
+    line: 11
+  Reset:          # NRST    PIN_12 -> chip 1, line 13
+    pin: 12
+    gpiochip: 1
+    line: 13
+  IRQ:            # DIO1    PIN_15 -> chip 4, line 22
+    pin: 15
+    gpiochip: 4
+    line: 22
+#  RXen:           # RXEN    PIN_22 -> chip 3!, line 17
+#    pin: 22
+#    gpiochip: 3
+#    line: 17
+#  TXen: RADIOLIB_NC # TXEN   no PIN, no line, fallback to default gpio chip

bin/config.d/lora-starter-edition-sx1262-i2c.yaml

@@ -0,0 +1,10 @@
+# https://www.waveshare.com/core1262-868m.htm
+# https://github.com/markbirss/lora-starter-edition-sx1262-i2c
+Lora:
+  Module: sx1262  # Starter Edition SX1262 I2C Raspberry Pi HAT
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  CS: 8
+  IRQ: 22
+  Busy: 4
+  Reset: 18

bin/config.d/lora-ws-raspberry-pi-pico-to-rpi-adapter.yaml

@@ -0,0 +1,10 @@
+# https://www.waveshare.com/pico-lora-sx1262-868m.htm
+# https://github.com/markbirss/lora-ws-raspberry-pi-pico-to-rpi-adapter
+Lora:
+  Module: sx1262  # Waveshare Raspberry Pi Pico to Raspberry Pi HAT Adapter
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  CS: 21
+  IRQ: 16
+  Busy: 20
+  Reset: 18

lib/device-ui

@@ -1 +1 @@
-Subproject commit c77cdb50b4995420ed09c8c8b483da43c36b7d99
+Subproject commit cbe5c14e8ad9e6de9d287cc640b44c888fdd145d

monitor/filter_c3_exception_decoder.py

@@ -1,3 +1,6 @@
+# trunk-ignore-all(bandit/B404): subprocess is used to call addr2line
+# trunk-ignore-all(bandit/B603): subprocess is used to call addr2line
+
 # Copyright (c) 2014-present PlatformIO <contact@platformio.org>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

protobufs

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

src/SafeFile.cpp

@@ -7,16 +7,23 @@ static File openFile(const char *filename, bool fullAtomic)
 {
     concurrency::LockGuard g(spiLock);
     LOG_DEBUG("Opening %s, fullAtomic=%d", filename, fullAtomic);
+
 #ifdef ARCH_NRF52
     FSCom.remove(filename);
     return FSCom.open(filename, FILE_O_WRITE);
 #endif
-    if (!fullAtomic)
+    if (!fullAtomic) {
         FSCom.remove(filename); // Nuke the old file to make space (ignore if it !exists)
+    }
 
     String filenameTmp = filename;
     filenameTmp += ".tmp";
 
+    // If we are doing a full atomic write, remove the old tmp file now
+    if (fullAtomic) {
+        FSCom.remove(filename);
+    }
+
     // clear any previous LFS errors
     return FSCom.open(filenameTmp.c_str(), FILE_O_WRITE);
 }

src/main.cpp

@@ -135,7 +135,7 @@ void setupNicheGraphics();
 
 using namespace concurrency;
 
-volatile static const char slipstreamTZString[] = USERPREFS_TZ_STRING;
+volatile static const char slipstreamTZString[] = {USERPREFS_TZ_STRING};
 
 // We always create a screen object, but we only init it if we find the hardware
 graphics::Screen *screen = nullptr;

src/mesh/Channels.cpp

@@ -148,7 +148,7 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
         channelSettings.psk.size = sizeof(defaultpsk0);
 #endif
 #ifdef USERPREFS_CHANNEL_0_NAME
-        strcpy(channelSettings.name, USERPREFS_CHANNEL_0_NAME);
+        strcpy(channelSettings.name, (const char *)USERPREFS_CHANNEL_0_NAME);
 #endif
 #ifdef USERPREFS_CHANNEL_0_PRECISION
         channelSettings.module_settings.position_precision = USERPREFS_CHANNEL_0_PRECISION;
@@ -167,7 +167,7 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
         channelSettings.psk.size = sizeof(defaultpsk1);
 #endif
 #ifdef USERPREFS_CHANNEL_1_NAME
-        strcpy(channelSettings.name, USERPREFS_CHANNEL_1_NAME);
+        strcpy(channelSettings.name, (const char *)USERPREFS_CHANNEL_1_NAME);
 #endif
 #ifdef USERPREFS_CHANNEL_1_PRECISION
         channelSettings.module_settings.position_precision = USERPREFS_CHANNEL_1_PRECISION;
@@ -186,7 +186,7 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
         channelSettings.psk.size = sizeof(defaultpsk2);
 #endif
 #ifdef USERPREFS_CHANNEL_2_NAME
-        strcpy(channelSettings.name, USERPREFS_CHANNEL_2_NAME);
+        strcpy(channelSettings.name, (const char *)USERPREFS_CHANNEL_2_NAME);
 #endif
 #ifdef USERPREFS_CHANNEL_2_PRECISION
         channelSettings.module_settings.position_precision = USERPREFS_CHANNEL_2_PRECISION;

src/mesh/Default.h

@@ -7,9 +7,6 @@
 #define THIRTY_SECONDS_MS 30 * 1000
 #define FIVE_SECONDS_MS 5 * 1000
 
-// Backup after the first 5 minutes
-#define AUTOMATIC_BACKUP_MS 5 * 60 * 1000
-
 #define min_default_telemetry_interval_secs 30 * 60
 #define default_gps_update_interval IF_ROUTER(ONE_DAY, 2 * 60)
 #define default_telemetry_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 60 * 60)

src/mesh/NodeDB.cpp

@@ -400,9 +400,12 @@ bool isBroadcast(uint32_t dest)
     return dest == NODENUM_BROADCAST || dest == NODENUM_BROADCAST_NO_LORA;
 }
 
-void NodeDB::resetRadioConfig()
+void NodeDB::resetRadioConfig(bool is_fresh_install)
 {
-    radioGeneration++;
+    if (is_fresh_install) {
+        radioGeneration++;
+    }
+
     if (channelFile.channels_count != MAX_NUM_CHANNELS) {
         LOG_INFO("Set default channel and radio preferences!");
 
@@ -561,17 +564,22 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
 #else
     config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
 #endif
+#ifdef USERPREFS_CONFIG_SMART_POSITION_ENABLED
+    config.position.position_broadcast_smart_enabled = USERPREFS_CONFIG_SMART_POSITION_ENABLED;
+#else
     config.position.position_broadcast_smart_enabled = true;
+#endif
     config.position.broadcast_smart_minimum_distance = 100;
     config.position.broadcast_smart_minimum_interval_secs = 30;
     if (config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER)
         config.device.node_info_broadcast_secs = default_node_info_broadcast_secs;
     config.security.serial_enabled = true;
     config.security.admin_channel_enabled = false;
-    resetRadioConfig();
+    resetRadioConfig(true); // This also triggers NodeInfo/Position requests since we're fresh
     strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);
 
-#if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(INDICATOR)) && HAS_TFT
+#if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR)) &&     \
+    HAS_TFT
     // switch BT off by default; use TFT programming mode or hotkey to enable
     config.bluetooth.enabled = false;
 #else
@@ -630,8 +638,16 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
 
 void NodeDB::initConfigIntervals()
 {
+#ifdef USERPREFS_CONFIG_GPS_UPDATE_INTERVAL
+    config.position.gps_update_interval = USERPREFS_CONFIG_GPS_UPDATE_INTERVAL;
+#else
     config.position.gps_update_interval = default_gps_update_interval;
+#endif
+#ifdef USERPREFS_CONFIG_POSITION_BROADCAST_INTERVAL
+    config.position.position_broadcast_secs = USERPREFS_CONFIG_POSITION_BROADCAST_INTERVAL;
+#else
     config.position.position_broadcast_secs = default_broadcast_interval_secs;
+#endif
 
     config.power.ls_secs = default_ls_secs;
     config.power.min_wake_secs = default_min_wake_secs;
@@ -873,12 +889,12 @@ void NodeDB::installDefaultDeviceState()
     // Set default owner name
     pickNewNodeNum(); // based on macaddr now
 #ifdef USERPREFS_CONFIG_OWNER_LONG_NAME
-    snprintf(owner.long_name, sizeof(owner.long_name), USERPREFS_CONFIG_OWNER_LONG_NAME);
+    snprintf(owner.long_name, sizeof(owner.long_name), (const char *)USERPREFS_CONFIG_OWNER_LONG_NAME);
 #else
     snprintf(owner.long_name, sizeof(owner.long_name), "Meshtastic %04x", getNodeNum() & 0x0ffff);
 #endif
 #ifdef USERPREFS_CONFIG_OWNER_SHORT_NAME
-    snprintf(owner.short_name, sizeof(owner.short_name), USERPREFS_CONFIG_OWNER_SHORT_NAME);
+    snprintf(owner.short_name, sizeof(owner.short_name), (const char *)USERPREFS_CONFIG_OWNER_SHORT_NAME);
 #else
     snprintf(owner.short_name, sizeof(owner.short_name), "%04x", getNodeNum() & 0x0ffff);
 #endif
@@ -1031,7 +1047,6 @@ void NodeDB::loadFromDisk()
         if (config.version < DEVICESTATE_MIN_VER) {
             LOG_WARN("config %d is old, discard", config.version);
             installDefaultConfig(true);
-            restorePreferences(meshtastic_AdminMessage_BackupLocation_FLASH, SEGMENT_CONFIG);
         } else {
             LOG_INFO("Loaded saved config version %d", config.version);
         }
@@ -1227,8 +1242,18 @@ bool NodeDB::saveToDiskNoRetry(int saveWhat)
         config.has_network = true;
         config.has_bluetooth = true;
         config.has_security = true;
+        LOG_DEBUG("Saving config version %d", config.version);
 
-        success &= saveProto(configFileName, meshtastic_LocalConfig_size, &meshtastic_LocalConfig_msg, &config);
+#ifndef ARCH_NRF52
+        // First, remove the temp file if it exists
+        spiLock->lock();
+        std::string tempFileName = std::string(configFileName) + ".tmp";
+        FSCom.remove(tempFileName.c_str());
+        spiLock->unlock();
+#endif
+        size_t configSize;
+        pb_get_encoded_size(&configSize, meshtastic_LocalConfig_fields, &config);
+        success &= saveProto(configFileName, configSize, &meshtastic_LocalConfig_msg, &config);
     }
 
     if (saveWhat & SEGMENT_MODULECONFIG) {
@@ -1244,9 +1269,18 @@ bool NodeDB::saveToDiskNoRetry(int saveWhat)
         moduleConfig.has_ambient_lighting = true;
         moduleConfig.has_audio = true;
         moduleConfig.has_paxcounter = true;
+        LOG_DEBUG("Saving moduleConfig version %d", moduleConfig.version);
 
-        success &=
-            saveProto(moduleConfigFileName, meshtastic_LocalModuleConfig_size, &meshtastic_LocalModuleConfig_msg, &moduleConfig);
+#ifndef ARCH_NRF52
+        // First, remove the temp file if it exists
+        spiLock->lock();
+        std::string tempFileName = std::string(configFileName) + ".tmp";
+        FSCom.remove(tempFileName.c_str());
+        spiLock->unlock();
+#endif
+        size_t moduleConfigSize;
+        pb_get_encoded_size(&moduleConfigSize, meshtastic_LocalModuleConfig_fields, &moduleConfig);
+        success &= saveProto(moduleConfigFileName, moduleConfigSize, &meshtastic_LocalModuleConfig_msg, &moduleConfig);
     }
 
     if (saveWhat & SEGMENT_CHANNELS) {
@@ -1587,20 +1621,6 @@ UserLicenseStatus NodeDB::getLicenseStatus(uint32_t nodeNum)
     return info->user.is_licensed ? UserLicenseStatus::Licensed : UserLicenseStatus::NotLicensed;
 }
 
-// bool NodeDB::shouldAutoPerformBackup()
-// {
-//     // Already backed up
-//     if (lastBackupAttempt > 0)
-//         return false;
-//     // Not enough time has passed
-//     if (millis() - lastBackupAttempt < AUTOMATIC_BACKUP_MS) {
-//         return false;
-//     }
-
-//     // If a LoRa region is set, assume the device is setup
-//     return config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET;
-// }
-
 bool NodeDB::backupPreferences(meshtastic_AdminMessage_BackupLocation location)
 {
     bool success = false;
@@ -1647,7 +1667,7 @@ bool NodeDB::restorePreferences(meshtastic_AdminMessage_BackupLocation location,
         spiLock->lock();
         if (!FSCom.exists(backupFileName)) {
             spiLock->unlock();
-            LOG_ERROR("Could not restore. No backup file found");
+            LOG_WARN("Could not restore. No backup file found");
             return false;
         } else {
             spiLock->unlock();
@@ -1674,11 +1694,10 @@ bool NodeDB::restorePreferences(meshtastic_AdminMessage_BackupLocation location,
             }
 
             success = saveToDisk(restoreWhat);
-            if (!success) {
-                LOG_ERROR("Failed to save restored preferences to flash");
+            if (success) {
+                LOG_INFO("Restored preferences from backup");
             } else {
-                LOG_INFO("Restored preferences from backup... Rebooting");
-                rebootAtMsec = millis() + 1000;
+                LOG_ERROR("Failed to save restored preferences to flash");
             }
         } else {
             LOG_ERROR("Failed to restore preferences from backup file");
@@ -1712,4 +1731,4 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co
     LOG_ERROR("A critical failure occurred, portduino is exiting");
     exit(2);
 #endif
-}
+}

src/mesh/NodeDB.h

@@ -97,9 +97,12 @@ class NodeDB
                                    SEGMENT_NODEDATABASE);
 
     /** Reinit radio config if needed, because either:
-     * sometimes a buggy android app might send us bogus settings
+     * a) sometimes a buggy android app might send us bogus settings or
+     * b) the client set factory_reset
+     * @param is_fresh_install set to true after a fresh install, to trigger NodeInfo/Position requests
+     * @return true if the config was completely reset, in that case, we should send it back to the client
      */
-    void resetRadioConfig();
+    void resetRadioConfig(bool factory_reset = false);
 
     /// given a subpacket sniffed from the network, update our DB state
     /// we updateGUI and updateGUIforNode if we think our this change is big enough for a redraw

src/modules/AdminModule.cpp

@@ -387,6 +387,8 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
         if (nodeDB->restorePreferences(r->backup_preferences,
                                        SEGMENT_DEVICESTATE | SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_CHANNELS)) {
             myReply = allocErrorResponse(meshtastic_Routing_Error_NONE, &mp);
+            LOG_DEBUG("Rebooting after successful restore of preferences");
+            reboot(1000);
             disableBluetooth();
         } else {
             myReply = allocErrorResponse(meshtastic_Routing_Error_BAD_REQUEST, &mp);

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;
-            bearingToOtherDegrees = bearingToOtherDegrees * 180 / PI;
-        
+        float bearingToOtherDegrees = (bearingToOther < 0) ? bearingToOther + 2 * PI : bearingToOther;
+        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,7 +161,6 @@ 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,3 +1,4 @@
+// trunk-ignore-all(gitleaks): These are dummy values. Not real secrets.
 #include "CryptoEngine.h"
 
 #include "TestUtil.h"

userPrefs.jsonc

@@ -27,9 +27,11 @@
   // "USERPREFS_FIXED_GPS_ALT": "0",
   // "USERPREFS_FIXED_GPS_LAT": "48.85873920",
   // "USERPREFS_FIXED_GPS_LON": "2.294508368",
+  // "USERPREFS_CONFIG_SMART_POSITION_ENABLED": "false",
+  // "USERPREFS_CONFIG_GPS_UPDATE_INTERVAL": "600",
+  // "USERPREFS_CONFIG_POSITION_BROADCAST_INTERVAL": "1800",
   // "USERPREFS_LORACONFIG_CHANNEL_NUM": "31",
   // "USERPREFS_LORACONFIG_MODEM_PRESET": "meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST",
-  "USERPREFS_TZ_STRING": "tzplaceholder                                         "
   // "USERPREFS_USE_ADMIN_KEY_0": "{ 0xcd, 0xc0, 0xb4, 0x3c, 0x53, 0x24, 0xdf, 0x13, 0xca, 0x5a, 0xa6, 0x0c, 0x0d, 0xec, 0x85, 0x5a, 0x4c, 0xf6, 0x1a, 0x96, 0x04, 0x1a, 0x3e, 0xfc, 0xbb, 0x8e, 0x33, 0x71, 0xe5, 0xfc, 0xff, 0x3c }",
   // "USERPREFS_USE_ADMIN_KEY_1": "{}",
   // "USERPREFS_USE_ADMIN_KEY_2": "{}",
@@ -37,5 +39,6 @@
   // "USERPREFS_OEM_FONT_SIZE": "0",
   // "USERPREFS_OEM_IMAGE_WIDTH": "50",
   // "USERPREFS_OEM_IMAGE_HEIGHT": "28",
-  // "USERPREFS_OEM_IMAGE_DATA": "{ 0x00, 0x00, 0xF0, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0xC0, 0x07, 0x80, 0x0F, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0x61, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0x67, 0x00, 0x00, 0x00, 0x18, 0x1F, 0xF0, 0x67, 0x00, 0x00, 0x00, 0x30, 0x1F, 0xF8, 0x33, 0x00, 0x00, 0x00, 0x30, 0x00, 0xFC, 0x31, 0x00, 0x00, 0x00, 0x60, 0x00, 0xFE, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x7E, 0x18, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x3F, 0x0C, 0x00, 0x00, 0x00, 0xC0, 0x80, 0x1F, 0x0C, 0x00, 0x00, 0x00, 0x80, 0x81, 0x1F, 0x06, 0x00, 0x00, 0x00, 0x80, 0xC1, 0x0F, 0x06, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE6, 0x8F, 0x01, 0x00, 0x00, 0x00, 0x00, 0xEE, 0xC7, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x00}"
+  // "USERPREFS_OEM_IMAGE_DATA": "{ 0x00, 0x00, 0xF0, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0xC0, 0x07, 0x80, 0x0F, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0x61, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0x67, 0x00, 0x00, 0x00, 0x18, 0x1F, 0xF0, 0x67, 0x00, 0x00, 0x00, 0x30, 0x1F, 0xF8, 0x33, 0x00, 0x00, 0x00, 0x30, 0x00, 0xFC, 0x31, 0x00, 0x00, 0x00, 0x60, 0x00, 0xFE, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x7E, 0x18, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x3F, 0x0C, 0x00, 0x00, 0x00, 0xC0, 0x80, 0x1F, 0x0C, 0x00, 0x00, 0x00, 0x80, 0x81, 0x1F, 0x06, 0x00, 0x00, 0x00, 0x80, 0xC1, 0x0F, 0x06, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE6, 0x8F, 0x01, 0x00, 0x00, 0x00, 0x00, 0xEE, 0xC7, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x00}",
+  "USERPREFS_TZ_STRING": "tzplaceholder                                         "
 }

variants/rak11310/platformio.ini

@@ -4,7 +4,7 @@ board = wiscore_rak11300
 upload_protocol = picotool
 # keep an old SDK to use less memory.
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git#v1.2.0-gcc12
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#3.7.2
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.0.1
 
 # add our variants files to the include and src paths
 build_flags = ${rp2040_base.build_flags} 

variants/rak11310/variant.h

@@ -4,6 +4,12 @@
 
 #define ARDUINO_ARCH_AVR
 
+// Define I2C pins to ensure correct usage of both ports
+#define I2C_SDA 20
+#define I2C_SCL 21
+#define I2C_SDA1 2
+#define I2C_SCL1 3
+
 #define LED_CONN PIN_LED2
 #define LED_PIN LED_BUILTIN
 #define ledOff(pin) pinMode(pin, INPUT)

variants/wio-tracker-wm1110/variant.h

@@ -103,6 +103,11 @@ extern "C" {
 
 #define LR1110_GNSS_ANT_PIN (32 + 5) // P1.05 37
 
+#define GPS_RX_PIN PIN_SERIAL1_RX
+#define GPS_TX_PIN PIN_SERIAL1_TX
+
+#define HAS_GPS 1
+
 #ifdef __cplusplus
 }
 #endif

variants/xiao_ble/README.md

@@ -116,24 +116,26 @@ 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 |
-| :------------ | :---------------------------- | :-----------------| :------------------------------------------------------------------------------------------------------------------- |
-| D0 | SX126X_CS | 19 (NSS) | |
-| D1 | SX126X_DIO1 | 13 (DIO1) | |
-| D2 | SX126X_BUSY | 14 (BUSY) | |
-| 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. |
-| D8 | PIN_SPI_SCK | 18 (SCK) | |
-| D9 | PIN_SPI_MISO | 16 (MISO) | |
-| D10 | PIN_SPI_MOSI | 17 (MOSI) | |
+
+| Xiao BLE pin | variant.h definition | E22 pin   | Notes                                                                                                                |
+| :----------- | :------------------- | :-------- | :------------------------------------------------------------------------------------------------------------------- |
+| D0           | SX126X_CS            | 19 (NSS)  |                                                                                                                      |
+| D1           | SX126X_DIO1          | 13 (DIO1) |                                                                                                                      |
+| D2           | SX126X_BUSY          | 14 (BUSY) |                                                                                                                      |
+| 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. |
+| D8           | PIN_SPI_SCK          | 18 (SCK)  |                                                                                                                      |
+| D9           | PIN_SPI_MISO         | 16 (MISO) |                                                                                                                      |
+| D10          | PIN_SPI_MOSI         | 17 (MOSI) |                                                                                                                      |
 
 &nbsp;
 &nbsp;
 
 <strong>E22 -> E22 connections:</strong>
-| E22 pin | E22 pin | Notes |
-| :------------ | :---------------------------- | :------------------------------------------------------------------------ |
-| TXEN | DIO2 | These must be physically connected for automatic Tx/Rx switching to work. |
+
+| E22 pin | E22 pin | Notes                                                                     |
+| :------ | :------ | :------------------------------------------------------------------------ |
+| TXEN    | DIO2    | These must be physically connected for automatic Tx/Rx switching to work. |
 
 <h3>Note</h3>
 
@@ -148,17 +150,18 @@ 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 |
-| :------------ | :---------------------------- | :-----------------| :--------------------------- |
-| D0 | SX126X_CS | 19 (NSS) | |
-| D1 | SX126X_DIO1 | 13 (DIO1) | |
-| D2 | SX126X_BUSY | 14 (BUSY) | |
-| D3 | SX126X_RESET | 15 (NRST) | |
-| D6 | SX126X_TXEN | 7 (TXEN) | |
-| D7 | SX126X_RXEN | 6 (RXEN) | |
-| D8 | PIN_SPI_SCK | 18 (SCK) | |
-| D9 | PIN_SPI_MISO | 16 (MISO) | |
-| D10 | PIN_SPI_MOSI | 17 (MOSI) | |
+
+| Xiao BLE pin | variant.h definition | E22 pin   | Notes |
+| :----------- | :------------------- | :-------- | :---- |
+| D0           | SX126X_CS            | 19 (NSS)  |       |
+| D1           | SX126X_DIO1          | 13 (DIO1) |       |
+| D2           | SX126X_BUSY          | 14 (BUSY) |       |
+| D3           | SX126X_RESET         | 15 (NRST) |       |
+| D6           | SX126X_TXEN          | 7 (TXEN)  |       |
+| D7           | SX126X_RXEN          | 6 (RXEN)  |       |
+| D8           | PIN_SPI_SCK          | 18 (SCK)  |       |
+| D9           | PIN_SPI_MISO         | 16 (MISO) |       |
+| D10          | PIN_SPI_MOSI         | 17 (MOSI) |       |
 
 <strong>E22 -> E22 connections:</strong> (none)