ESP32 native bootloader mode

.devcontainer/Dockerfile

@@ -1,10 +1,9 @@
-# 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 \
@@ -28,11 +27,9 @@ 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
+RUN pipx install platformio==6.1.15
 
 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

@@ -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
-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,27 +1,26 @@
-#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"
+      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_native.yml

@@ -0,0 +1,38 @@
+name: Build Native
+
+on: workflow_call
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-native:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Setup native build
+        id: base
+        uses: ./.github/actions/setup-native
+
+      - name: Build Native
+        run: bin/build-native.sh
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-native-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/meshtasticd_linux_x86_64
+            bin/config-dist.yaml

.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_raspbian.yml

@@ -0,0 +1,52 @@
+name: Build Raspbian
+
+on: workflow_call
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-raspbian:
+    runs-on: [self-hosted, linux, ARM64]
+    steps:
+      - name: Install libbluetooth
+        shell: bash
+        run: |
+          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 libusb-1.0-0-dev libi2c-dev
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Upgrade python tools
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio adafruit-nrfutil
+          pip install -U meshtastic --pre
+
+      - name: Upgrade platformio
+        shell: bash
+        run: |
+          pio upgrade
+
+      - name: Build Raspbian
+        run: bin/build-native.sh
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-raspbian-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/meshtasticd_linux_aarch64
+            bin/config-dist.yaml

.github/workflows/build_raspbian_armv7l.yml

@@ -0,0 +1,52 @@
+name: Build Raspbian Arm
+
+on: workflow_call
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-raspbian-armv7l:
+    runs-on: [self-hosted, linux, ARM]
+    steps:
+      - name: Install libbluetooth
+        shell: bash
+        run: |
+          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 libusb-1.0-0-dev libi2c-dev
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Upgrade python tools
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio adafruit-nrfutil
+          pip install -U meshtastic --pre
+
+      - name: Upgrade platformio
+        shell: bash
+        run: |
+          pio upgrade
+
+      - name: Build Raspbian
+        run: bin/build-native.sh
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-raspbian-armv7l-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/meshtasticd_linux_armv7l
+            bin/config-dist.yaml

.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/generate-userprefs.yml

@@ -0,0 +1,35 @@
+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

@@ -128,6 +128,15 @@ jobs:
     with:
       board: ${{ matrix.board }}
 
+  package-raspbian:
+    uses: ./.github/workflows/package_raspbian.yml
+
+  package-raspbian-armv7l:
+    uses: ./.github/workflows/package_raspbian_armv7l.yml
+
+  package-native:
+    uses: ./.github/workflows/package_amd64.yml
+
   build-debian-src:
     uses: ./.github/workflows/build_debian_src.yml
     with:
@@ -135,12 +144,6 @@ jobs:
       build_location: local
     secrets: inherit
 
-  package-pio-deps-native-tft:
-    uses: ./.github/workflows/package_pio_deps.yml
-    with:
-      pio_env: native-tft
-    secrets: inherit
-
   test-native:
     uses: ./.github/workflows/test_native.yml
 
@@ -155,7 +158,7 @@ jobs:
   docker-alpine-amd64:
     uses: ./.github/workflows/docker_build.yml
     with:
-      distro: alpine
+      distro: debian
       platform: linux/amd64
       runs-on: ubuntu-24.04
       push: false
@@ -286,9 +289,13 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     needs:
-      - gather-artifacts
-      - build-debian-src
-      - package-pio-deps-native-tft
+      [
+        gather-artifacts,
+        package-raspbian,
+        package-raspbian-armv7l,
+        package-native,
+        build-debian-src,
+      ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -317,6 +324,13 @@ jobs:
           body: |
             Autogenerated by github action, developer should edit as required before publishing...
 
+      - name: Download deb files
+        uses: actions/download-artifact@v4
+        with:
+          pattern: meshtasticd_${{ steps.version.outputs.long }}_*.deb
+          merge-multiple: true
+          path: ./output
+
       - name: Download source deb
         uses: actions/download-artifact@v4
         with:
@@ -324,27 +338,20 @@ jobs:
           merge-multiple: true
           path: ./output/debian-src
 
-      - name: Download `native-tft` pio deps
-        uses: actions/download-artifact@v4
-        with:
-          pattern: platformio-deps-native-tft-${{ steps.version.outputs.long }}
-          merge-multiple: true
-          path: ./output/pio-deps-native
-
-      - name: Zip linux sources
+      - name: Zip source deb
         working-directory: output
-        run: |
-          zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
-          zip -9 -r ./platformio-deps-native-${{ steps.version.outputs.long }}.zip ./pio-deps-native
+        run: zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
 
       # For diagnostics
       - name: Display structure of downloaded files
         run: ls -lR
 
-      - name: Add linux sources to release
+      - name: Add deb files to release
         run: |
+          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd_${{ steps.version.outputs.long }}_arm64.deb
+          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd_${{ steps.version.outputs.long }}_armhf.deb
+          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd_${{ steps.version.outputs.long }}_amd64.deb
           gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd-${{ steps.version.outputs.deb }}-src.zip
-          gh release upload v${{ steps.version.outputs.long }} ./output/platformio-deps-native-${{ steps.version.outputs.long }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -352,12 +359,6 @@ jobs:
         run: >-
           bin/bump_version.py
 
-      - name: Ensure debian deps are installed
-        shell: bash
-        run: |
-          sudo apt-get update -y --fix-missing
-          sudo apt-get install -y devscripts
-
       - name: Update debian changelog
         run: >-
           debian/ci_changelog.sh

.github/workflows/nightly.yml

@@ -4,34 +4,16 @@ on:
     - cron: 0 8 * * 1-5
   workflow_dispatch: {}
 
-permissions: read-all
-
 jobs:
   trunk_check:
-    name: Trunk Check and Upload
-    runs-on: ubuntu-24.04
+    name: Trunk Check Upload
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
+        uses: trunk-io/trunk-action@782e83f803ca6e369f035d64c6ba2768174ba61b
         with:
           trunk-token: ${{ secrets.TRUNK_TOKEN }}
-
-  trunk_upgrade:
-    # See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
-    name: Trunk Upgrade (PR)
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write # For trunk to create PRs
-      pull-requests: write # For trunk to create PRs
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Trunk Upgrade
-        uses: trunk-io/trunk-action/upgrade@v1
-        with:
-          base: master

.github/workflows/package_amd64.yml

@@ -0,0 +1,90 @@
+name: Package Native
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-native:
+    uses: ./.github/workflows/build_native.yml
+
+  package-native:
+    runs-on: ubuntu-22.04
+    needs: build-native
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Pull web ui
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: meshtastic/web
+          file: build.tar
+          target: build.tar
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: firmware-native-${{ steps.version.outputs.long }}.zip
+          merge-multiple: true
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: build .debpkg
+        run: |
+          mkdir -p .debpkg/DEBIAN
+          mkdir -p .debpkg/usr/share/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/meshtasticd/web
+          shopt -s dotglob nullglob
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then mv  .debpkg/usr/share/meshtasticd/web/build/* .debpkg/usr/share/meshtasticd/web/; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/meshtasticd/web/build; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/.DS_Store ]; then rm -f .debpkg/usr/share/meshtasticd/web/.DS_Store; fi
+          gunzip .debpkg/usr/share/meshtasticd/web/ -r
+          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/ -r
+          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
+          chmod +x .debpkg/DEBIAN/conffiles
+          # Transition /usr/share/doc/meshtasticd to /usr/share/meshtasticd
+          echo "rm -rf /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/preinst
+          chmod +x .debpkg/DEBIAN/preinst
+          echo "ln -sf /usr/share/meshtasticd /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/postinst
+          chmod +x .debpkg/DEBIAN/postinst
+
+      - uses: jiro4989/build-deb-action@v3
+        with:
+          package: meshtasticd
+          package_root: .debpkg
+          maintainer: Jonathan Bennett
+          version: ${{ steps.version.outputs.long }} # refs/tags/v*.*.*
+          arch: amd64
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
+          desc: Native Linux Meshtastic binary.
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: meshtasticd_${{ steps.version.outputs.long }}_amd64.deb
+          overwrite: true
+          path: |
+            ./*.deb

.github/workflows/package_pio_deps.yml

@@ -1,65 +0,0 @@
-name: Package PlatformIO Library Dependencies
-# trunk-ignore-all(checkov/CKV_GHA_7): Allow workflow_dispatch inputs for testing
-
-on:
-  workflow_call:
-    inputs:
-      pio_env:
-        description: PlatformIO environment to target
-        required: true
-        type: string
-  workflow_dispatch:
-    inputs:
-      pio_env:
-        description: PlatformIO environment to target
-        required: true
-        type: string
-
-permissions:
-  contents: write
-  packages: write
-
-jobs:
-  pkg-pio-libdeps:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-
-      - name: Install deps
-        shell: bash
-        run: |
-          pip install platformio
-
-      - name: Get release version string
-        run: |
-          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
-      - name: Fetch libdeps
-        shell: bash
-        run: |-
-          platformio pkg install -e ${{ inputs.pio_env }}
-          platformio pkg install -e ${{ inputs.pio_env }} -t platformio/tool-scons@4.40502.0
-        env:
-          PLATFORMIO_LIBDEPS_DIR: pio/libdeps
-          PLATFORMIO_PACKAGES_DIR: pio/packages
-          PLATFORMIO_CORE_DIR: pio/core
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: platformio-deps-${{ inputs.pio_env }}-${{ steps.version.outputs.long }}
-          overwrite: true
-          include-hidden-files: true
-          path: |
-            pio/*

.github/workflows/package_raspbian.yml

@@ -0,0 +1,90 @@
+name: Package Raspbian
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-raspbian:
+    uses: ./.github/workflows/build_raspbian.yml
+
+  package-raspbian:
+    runs-on: ubuntu-22.04
+    needs: build-raspbian
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Pull web ui
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: meshtastic/web
+          file: build.tar
+          target: build.tar
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: firmware-raspbian-${{ steps.version.outputs.long }}.zip
+          merge-multiple: true
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: build .debpkg
+        run: |
+          mkdir -p .debpkg/DEBIAN
+          mkdir -p .debpkg/usr/share/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/meshtasticd/web
+          shopt -s dotglob nullglob
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then mv  .debpkg/usr/share/meshtasticd/web/build/* .debpkg/usr/share/meshtasticd/web/; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/meshtasticd/web/build; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/.DS_Store ]; then rm -f .debpkg/usr/share/meshtasticd/web/.DS_Store; fi
+          gunzip .debpkg/usr/share/meshtasticd/web/ -r
+          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/ -r
+          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
+          chmod +x .debpkg/DEBIAN/conffiles
+          # Transition /usr/share/doc/meshtasticd to /usr/share/meshtasticd
+          echo "rm -rf /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/preinst
+          chmod +x .debpkg/DEBIAN/preinst
+          echo "ln -sf /usr/share/meshtasticd /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/postinst
+          chmod +x .debpkg/DEBIAN/postinst
+
+      - uses: jiro4989/build-deb-action@v3
+        with:
+          package: meshtasticd
+          package_root: .debpkg
+          maintainer: Jonathan Bennett
+          version: ${{ steps.version.outputs.long }} # refs/tags/v*.*.*
+          arch: arm64
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
+          desc: Native Linux Meshtastic binary.
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: meshtasticd_${{ steps.version.outputs.long }}_arm64.deb
+          overwrite: true
+          path: |
+            ./*.deb

.github/workflows/package_raspbian_armv7l.yml

@@ -0,0 +1,90 @@
+name: Package Raspbian
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-raspbian_armv7l:
+    uses: ./.github/workflows/build_raspbian_armv7l.yml
+
+  package-raspbian_armv7l:
+    runs-on: ubuntu-22.04
+    needs: build-raspbian_armv7l
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Pull web ui
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: meshtastic/web
+          file: build.tar
+          target: build.tar
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: firmware-raspbian-armv7l-${{ steps.version.outputs.long }}.zip
+          merge-multiple: true
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: build .debpkg
+        run: |
+          mkdir -p .debpkg/DEBIAN
+          mkdir -p .debpkg/usr/share/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/meshtasticd/web
+          shopt -s dotglob nullglob
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then mv  .debpkg/usr/share/meshtasticd/web/build/* .debpkg/usr/share/meshtasticd/web/; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/meshtasticd/web/build; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/.DS_Store ]; then rm -f .debpkg/usr/share/meshtasticd/web/.DS_Store; fi
+          gunzip .debpkg/usr/share/meshtasticd/web/ -r
+          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/ -r
+          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
+          chmod +x .debpkg/DEBIAN/conffiles
+          # Transition /usr/share/doc/meshtasticd to /usr/share/meshtasticd
+          echo "rm -rf /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/preinst
+          chmod +x .debpkg/DEBIAN/preinst
+          echo "ln -sf /usr/share/meshtasticd /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/postinst
+          chmod +x .debpkg/DEBIAN/postinst
+
+      - uses: jiro4989/build-deb-action@v3
+        with:
+          package: meshtasticd
+          package_root: .debpkg
+          maintainer: Jonathan Bennett
+          version: ${{ steps.version.outputs.long }} # refs/tags/v*.*.*
+          arch: armhf
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
+          desc: Native Linux Meshtastic binary.
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: meshtasticd_${{ steps.version.outputs.long }}_armhf.deb
+          overwrite: true
+          path: |
+            ./*.deb

.github/workflows/release_channels.yml

@@ -37,9 +37,9 @@ jobs:
         ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
     secrets: inherit
 
-  hook-copr:
-    uses: ./.github/workflows/hook_copr.yml
-    with:
-      copr_project: |-
-        ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
-    secrets: inherit
+  # hook-copr:
+  #   uses: ./.github/workflows/hook_copr.yml
+  #   with:
+  #     copr_project: |-
+  #       ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
+  #   secrets: inherit

.github/workflows/sec_sast_flawfinder.yml

@@ -0,0 +1,41 @@
+---
+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
-
-permissions: read-all
+    - cron: "0 1 * * 6"
 
 jobs:
   semgrep-full:

.github/workflows/sec_sast_semgrep_pull.yml

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

.github/workflows/stale_bot.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Stale PR+Issues
-        uses: actions/stale@v9.1.0
+        uses: actions/stale@v9.0.0
         with:
           exempt-issue-labels: pinned,3.0
           exempt-pr-labels: pinned,3.0

.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

.github/workflows/trunk-check.yml

@@ -9,7 +9,7 @@ permissions: read-all
 jobs:
   trunk_check:
     name: Trunk Check Runner
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     permissions:
       checks: write # For trunk to post annotations
       contents: read # For repo checkout
@@ -20,5 +20,3 @@ jobs:
 
       - name: Trunk Check
         uses: trunk-io/trunk-action@v1
-        with:
-          save-annotations: true

.github/workflows/trunk_annotate_pr.yml

@@ -1,26 +0,0 @@
-name: Annotate PR with trunk issues
-# See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#getting-inline-annotations-for-fork-prs
-
-on:
-  workflow_run:
-    workflows: [Pull Request] # Name from `trunk_check.yml`
-    types: [completed]
-
-permissions: read-all
-
-jobs:
-  trunk_check:
-    name: Trunk Code Quality Annotate
-    runs-on: ubuntu-24.04
-    permissions:
-      checks: write # For trunk to post annotations
-      contents: read # For repo checkout
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
-        with:
-          post-annotations: true

.github/workflows/trunk_format_pr.yml

@@ -4,15 +4,11 @@ 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,14 +1,10 @@
 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

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "protobufs"]
 	path = protobufs
 	url = https://github.com/meshtastic/protobufs.git
-[submodule "lib/device-ui"]
-	path = lib/device-ui
-	url = https://github.com/meshtastic/device-ui.git
 [submodule "meshtestic"]
 	path = meshtestic
 	url = https://github.com/meshtastic/meshTestic

.trunk/configs/.markdownlint.yaml

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

.trunk/configs/.prettierrc

@@ -1,10 +0,0 @@
-{
-  "overrides": [
-    {
-      "files": "userPrefs.jsonc",
-      "options": {
-        "trailingComma": "none"
-      }
-    }
-  ]
-}

.trunk/trunk.yaml

@@ -1,35 +1,37 @@
 version: 0.1
 cli:
-  version: 1.22.10
+  version: 1.22.8
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.7
+      ref: v1.6.6
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - prettier@3.5.2
-    - trufflehog@3.88.14
+    - prettier@3.4.2
+    - trufflehog@3.86.1
     - yamllint@1.35.1
-    - bandit@1.8.3
-    - checkov@3.2.378
+    - bandit@1.8.0
+    - checkov@3.2.334
     - terrascan@1.19.9
-    - trivy@0.59.1
+    - trivy@0.58.0
+    #- trufflehog@3.63.2-rc0
     - taplo@0.9.3
-    - ruff@0.9.7
-    - isort@6.0.1
-    - markdownlint@0.44.0
-    - oxipng@9.1.4
+    - ruff@0.8.3
+    - isort@5.13.2
+    - markdownlint@0.43.0
+    - oxipng@9.1.3
     - svgo@3.3.2
-    - actionlint@1.7.7
-    - flake8@7.1.2
+    - actionlint@1.7.4
+    - flake8@7.1.1
     - hadolint@2.12.1-beta
     - shfmt@3.6.0
     - shellcheck@0.10.0
-    - black@25.1.0
+    - black@24.10.0
     - git-diff-check
-    - gitleaks@8.24.0
+    - gitleaks@8.21.2
     - clang-format@16.0.3
+    #- prettier@3.3.3
   ignore:
     - linters: [ALL]
       paths:

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 \
-        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 \
-    && 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==6.1.16 && \
+    mkdir /tmp/firmware
 
 # Copy source code
 WORKDIR /tmp/firmware
@@ -37,12 +35,10 @@ 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
+    && mkdir -p /etc/meshtasticd/config.d
 
 # Fetch compiled binary from the builder
 COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/

README.md

@@ -1,7 +1,4 @@
-<div align="center" markdown="1">
-
-<img src=".github/meshtastic_logo.png" alt="Meshtastic Logo" width="80"/>
-<h1>Meshtastic Firmware</h1>
+# Meshtastic Firmware
 
 ![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/firmware/total)
 [![CI](https://img.shields.io/github/actions/workflow/status/meshtastic/firmware/main_matrix.yml?branch=master&label=actions&logo=github&color=yellow)](https://github.com/meshtastic/firmware/actions/workflows/ci.yml)
@@ -9,31 +6,13 @@
 [![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/)
 [![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)
 
-<a href="https://trendshift.io/repositories/5524" target="_blank"><img src="https://trendshift.io/api/badge/repositories/5524" alt="meshtastic%2Ffirmware | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-
-</div>
-
-</div>
-
-<div align="center">
-	<a href="https://meshtastic.org">Website</a>
-	-
-	<a href="https://meshtastic.org/docs/">Documentation</a>
-</div>
-
 ## Overview
 
-This repository contains the official device firmware for Meshtastic, an open-source LoRa mesh networking project designed for long-range, low-power communication without relying on internet or cellular infrastructure. The firmware supports various hardware platforms, including ESP32, nRF52, RP2040/RP2350, and Linux-based devices.
+This repository contains the device firmware for the Meshtastic project.
 
-Meshtastic enables text messaging, location sharing, and telemetry over a decentralized mesh network, making it ideal for outdoor adventures, emergency preparedness, and remote operations.
-
-### Get Started
-
-- 🔧 **[Building Instructions](https://meshtastic.org/docs/development/firmware/build)** – Learn how to compile the firmware from source.
-- ⚡ **[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)** – Install or update the firmware on your device.
-
-Join our community and help improve Meshtastic! 🚀
+- **[Building Instructions](https://meshtastic.org/docs/development/firmware/build)**
+- **[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)**
 
 ## Stats
 
-![Alt](https://repobeats.axiom.co/api/embed/8025e56c482ec63541593cc5bd322c19d5c0bdcf.svg "Repobeats analytics image")
+![Alt](https://repobeats.axiom.co/api/embed/a92f097d9197ae853e780ec53d7d126e545629ab.svg "Repobeats analytics image")

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 \
-        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
+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
 
 WORKDIR /tmp/firmware
 COPY . /tmp/firmware
@@ -31,12 +27,9 @@ FROM alpine:3.21
 # nosemgrep: dockerfile.security.last-user-is-root.last-user-is-root
 USER root
 
-RUN apk --no-cache add \
-        libstdc++ libgpiod yaml-cpp libusb i2c-tools \
-    && rm -rf /var/cache/apk/* \
+RUN apk add libstdc++ libgpiod yaml-cpp libusb i2c-tools \
     && mkdir -p /var/lib/meshtasticd \
-    && mkdir -p /etc/meshtasticd/config.d \
-    && mkdir -p /etc/meshtasticd/ssl
+    && mkdir -p /etc/meshtasticd/config.d
 COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/
 
 WORKDIR /var/lib/meshtasticd

arch/esp32/esp32.ini

@@ -2,7 +2,7 @@
 [esp32_base]
 extends = arduino_base
 custom_esp32_kind = esp32
-platform = platformio/espressif32@6.10.0
+platform = platformio/espressif32@6.9.0
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
@@ -37,7 +37,6 @@ build_flags =
   -DLIBPAX_ARDUINO
   -DLIBPAX_WIFI
   -DLIBPAX_BLE
-  -DHAS_UDP_MULTICAST=1
   ;-DDEBUG_HEAP
 
 lib_deps =
@@ -46,9 +45,9 @@ lib_deps =
   ${environmental_base.lib_deps}
   ${radiolib_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
-  h2zero/NimBLE-Arduino@^1.4.3
+  h2zero/NimBLE-Arduino@^1.4.2
   https://github.com/dbinfrago/libpax.git#3cdc0371c375676a97967547f4065607d4c53fd1
-  lewisxhe/XPowersLib@^0.2.7
+  lewisxhe/XPowersLib@^0.2.6
   https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
   rweather/Crypto@^0.4.0
 
@@ -66,4 +65,4 @@ lib_ignore =
 
 ; customize the partition table
 ; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
-board_build.partitions = partition-table.csv
+board_build.partitions = partition-table.csv

arch/esp32/esp32c6.ini

@@ -24,7 +24,7 @@ lib_deps =
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
   ${radiolib_base.lib_deps}
-  lewisxhe/XPowersLib@^0.2.7
+  lewisxhe/XPowersLib@^0.2.6
   https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
   rweather/Crypto@^0.4.0
 
@@ -38,4 +38,4 @@ lib_ignore =
   NonBlockingRTTTL
   NimBLE-Arduino
   libpax
-  
+  

arch/nrf52/nrf52.ini

@@ -4,8 +4,8 @@ platform = platformio/nordicnrf52@^10.7.0
 extends = arduino_base
 platform_packages =
   ; our custom Git version until they merge our PR
-  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
-  platformio/toolchain-gccarmnoneeabi@~1.90301.0
+  framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
+  toolchain-gccarmnoneeabi@~1.90301.0
 
 build_type = debug
 build_flags =

arch/rp2xx0/rp2040.ini

@@ -18,7 +18,6 @@ build_src_filter =
 
 lib_ignore =
   BluetoothOTA
-  lvgl
 
 lib_deps =
   ${arduino_base.lib_deps}

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#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3
+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.4.3
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#6024e9a7e82a72e38dd90f42029ba3748835eb2e ; 4.3.0 with fix MDNS
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -10,6 +10,7 @@ build_flags =
   ${arduino_base.build_flags} -Wno-unused-variable -Wcast-align
   -Isrc/platform/rp2xx0
   -D__PLAT_RP2350__
+#  -D _POSIX_THREADS
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/> -<mesh/raspihttp> -<platform/rp2xx0/pico_sleep> -<platform/rp2xx0/hardware_rosc>
 

arch/stm32/stm32.ini

@@ -1,7 +1,7 @@
 [stm32_base]
 extends = arduino_base
-platform = platformio/ststm32
-platform_packages = platformio/framework-arduinoststm32@^4.20900.0
+platform = ststm32
+platform_packages = platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32.git#ea74156acd823b6d14739f389e6cdc648f8ee36e
 
 build_type = release
 
@@ -11,15 +11,9 @@ build_flags =
   ${arduino_base.build_flags}
   -flto
   -Isrc/platform/stm32wl -g
-  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
-  -DMESHTASTIC_EXCLUDE_INPUTBROKER
-  -DMESHTASTIC_EXCLUDE_I2C
-  -DMESHTASTIC_EXCLUDE_POWERMON
-  -DMESHTASTIC_EXCLUDE_SCREEN
-  -DMESHTASTIC_EXCLUDE_MQTT
-  -DMESHTASTIC_EXCLUDE_BLUETOOTH
-  -DMESHTASTIC_EXCLUDE_PKI
+  -DMESHTASTIC_MINIMIZE_BUILD
   -DMESHTASTIC_EXCLUDE_GPS
+  -DDEBUG_MUTE
 ;  -DVECT_TAB_OFFSET=0x08000000
   -DconfigUSE_CMSIS_RTOS_V2=1
 ;  -DSPI_MODE_0=SPI_MODE0

bin/build-esp32.sh

@@ -35,11 +35,11 @@ cp $SRCBIN $OUTDIR/$basename-update.bin
 
 echo "Building Filesystem for ESP32 targets"
 pio run --environment $1 -t buildfs
-cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$1-$VERSION.bin
+cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$VERSION.bin
 # Remove webserver files from the filesystem and rebuild
 ls -l data/static # Diagnostic list of files
 rm -rf data/static
 pio run --environment $1 -t buildfs
-cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$1-$VERSION.bin
+cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$VERSION.bin
 cp bin/device-install.* $OUTDIR
-cp bin/device-update.* $OUTDIR
+cp bin/device-update.* $OUTDIR

bin/build-firmware.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-sed -i 's/#-DBUILD_EPOCH=$UNIX_TIME/-DBUILD_EPOCH=$UNIX_TIME/' platformio.ini
-
-export PIP_BREAK_SYSTEM_PACKAGES=1
-
-if (echo $2 | grep -q "esp32"); then
-  bin/build-esp32.sh $1
-elif (echo $2 | grep -q "nrf52"); then
-  bin/build-nrf52.sh $1
-elif (echo $2 | grep -q "stm32"); then
-  bin/build-stm32.sh $1
-elif (echo $2 | grep -q "rpi2040"); then
-  bin/build-rpi2040.sh $1
-else
-  echo "Unknown target $2"
-  exit 1
-fi

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
-pio pkg update --environment native || platformioFailed
+platformio 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-dist.yaml

@@ -78,8 +78,6 @@ Lora:
 #  TXen: x  # TX and RX enable pins
 #  RXen: x
 
-#  SX126X_MAX_POWER: 8  # Limit the output power to 8 dBm, useful for amped nodes
-
 #  spiSpeed: 2000000
 
 ### Set default/fallback gpio chip to use in /dev/. Defaults to 0.
@@ -184,12 +182,10 @@ Logging:
 Webserver:
 #  Port: 443 # Port for Webserver & Webservices
 #  RootPath: /usr/share/meshtasticd/web # Root Dir of WebServer
-#  SSLKey: /etc/meshtasticd/ssl/private_key.pem # Path to SSL Key, generated if not present
-#  SSLCert: /etc/meshtasticd/ssl/certificate.pem # Path to SSL Certificate, generated if not present
 
 General:
   MaxNodes: 200
   MaxMessageQueue: 100
   ConfigDirectory: /etc/meshtasticd/config.d/
 #  MACAddress: AA:BB:CC:DD:EE:FF
-#  MACAddressSource: eth0
+#  MACAddressSource: eth0

bin/config.d/MUI/X11_480x480.yaml

@@ -1,4 +0,0 @@
-Display:
-  Panel: X11
-  Width: 480
-  Height: 480

bin/config.d/lora-MeshAdv-900M30S.yaml

@@ -7,6 +7,3 @@ Lora:
   TXen: 13
   RXen: 12
   DIO3_TCXO_VOLTAGE: true
-  # Only for E22-900M33S:
-  # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8

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

@@ -1,49 +0,0 @@
-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

@@ -1,10 +0,0 @@
-# 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

@@ -1,10 +0,0 @@
-# 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

bin/generate_ci_matrix.py

@@ -35,11 +35,6 @@ for subdir, dirs, files in os.walk(rootdir):
                                     outlist.append(section)
                             else:
                                 outlist.append(section)
-                        # Add the TFT variants if the base variant is selected
-                        elif section.replace("-tft", "") in outlist and config[config[c].name].get("board_level") != "extra":
-                            outlist.append(section)
-                        elif section.replace("-inkhud", "") in outlist and config[config[c].name].get("board_level") != "extra":
-                            outlist.append(section)
                     if "board_check" in config[config[c].name]:
                         if (config[config[c].name]["board_check"] == "true") & (
                             "check" in options
@@ -48,4 +43,4 @@ for subdir, dirs, files in os.walk(rootdir):
 if ("quick" in options) & (len(outlist) > 3):
     print(json.dumps(random.sample(outlist, 3)))
 else:
-    print(json.dumps(outlist))
+    print(json.dumps(outlist))

bin/platformio-custom.py

@@ -102,7 +102,7 @@ pref_flags = []
 for pref in userPrefs:
     if userPrefs[pref].startswith("{"):
         pref_flags.append("-D" + pref + "=" + userPrefs[pref])
-    elif userPrefs[pref].lstrip("-").replace(".", "").isdigit():
+    elif userPrefs[pref].replace(".", "").isdigit():
         pref_flags.append("-D" + pref + "=" + userPrefs[pref])
     elif userPrefs[pref] == "true" or userPrefs[pref] == "false":
         pref_flags.append("-D" + pref + "=" + userPrefs[pref])

boards/meshlink.json

@@ -1,52 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DMESHLINK -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x00B3"],
-      ["0x239A", "0x8029"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"],
-      ["0x239A", "0x802A"]
-    ],
-    "usb_product": "MeshLink",
-    "mcu": "nrf52840",
-    "variant": "meshlink",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd"
-  },
-  "frameworks": ["arduino"],
-  "name": "MeshLink",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["nrfutil", "jlink", "nrfjprog", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://www.loraitalia.it",
-  "vendor": "LoraItalia"
-}

debian/changelog

@@ -1,9 +1,7 @@
-meshtasticd (2.5.22.0) UNRELEASED; urgency=medium
+meshtasticd (2.5.20.0) UNRELEASED; urgency=medium
 
   * Initial packaging
   * GitHub Actions Automatic version bump
   * GitHub Actions Automatic version bump
-  * GitHub Actions Automatic version bump
-  * GitHub Actions Automatic version bump
 
- -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Wed, 05 Feb 2025 01:10:33 +0000
+ -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Wed, 15 Jan 2025 14:08:54 +0000

debian/ci_pack_sdeb.sh

@@ -11,7 +11,7 @@ platformio pkg install -e native -t platformio/tool-scons@4.40502.0
 tar -cf pio.tar pio/
 rm -rf pio
 # Download the latest meshtastic/web release build.tar to `web.tar`
-curl -L https://github.com/meshtastic/web/releases/latest/download/build.tar -o web.tar
+curl -L https://github.com/meshtastic/web/releases/download/latest/build.tar -o web.tar
 
 package=$(dpkg-parsechangelog --show-field Source)
 

debian/control

@@ -3,7 +3,6 @@ Section: misc
 Priority: optional
 Maintainer: Austin Lane <vidplace7@gmail.com>
 Build-Depends: debhelper-compat (= 13),
-               lsb-release,
                tar,
                gzip,
                platformio,

debian/meshtasticd.dirs

@@ -1,5 +1,4 @@
 etc/meshtasticd
 etc/meshtasticd/config.d
 etc/meshtasticd/available.d
-usr/share/meshtasticd/web
-etc/meshtasticd/ssl
+usr/share/meshtasticd/web

debian/rules

@@ -11,15 +11,6 @@ PIO_ENV:=\
 	PLATFORMIO_LIBDEPS_DIR=pio/libdeps \
 	PLATFORMIO_PACKAGES_DIR=pio/packages
 
-# Raspbian armhf builds should be compatible with armv6-hardfloat
-# https://www.valvers.com/open-software/raspberry-pi/bare-metal-programming-in-c-part-1/#rpi1-compiler-flags
-ifneq (,$(findstring Raspbian,$(shell lsb_release -is)))
-ifeq ($(DEB_BUILD_ARCH),armhf)
-PIO_ENV+=\
-	PLATFORMIO_BUILD_FLAGS="-mfloat-abi=hard -mfpu=vfp -march=armv6zk"
-endif
-endif
-
 override_dh_auto_build:
 	# Extract tarballs within source deb
 	tar -xf pio.tar

meshtasticd.spec.rpkg

@@ -21,7 +21,7 @@ Summary:        Meshtastic daemon for communicating with Meshtastic devices
 License:        GPL-3.0
 URL:            https://github.com/meshtastic/firmware
 Source0:        {{{ git_dir_pack }}}
-Source1:        https://github.com/meshtastic/web/releases/latest/download/build.tar
+Source1:        https://github.com/meshtastic/web/releases/download/latest/build.tar
 
 BuildRequires: systemd-rpm-macros
 BuildRequires: python3-devel
@@ -72,8 +72,6 @@ install -D -m 0644 bin/meshtasticd.service %{buildroot}%{_unitdir}/meshtasticd.s
 # Install the web files under /usr/share/meshtasticd/web
 mkdir -p %{buildroot}%{_datadir}/meshtasticd/web
 cp -r web/* %{buildroot}%{_datadir}/meshtasticd/web
-# Install default SSL storage directory (for web)
-mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/ssl
 
 %files
 %license LICENSE
@@ -88,7 +86,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/ssl
 %dir %{_datadir}/meshtasticd
 %dir %{_datadir}/meshtasticd/web
 %{_datadir}/meshtasticd/web/*
-%dir %{_sysconfdir}/meshtasticd/ssl
 
 %changelog
 %autochangelog

monitor/filter_c3_exception_decoder.py

@@ -1,6 +1,3 @@
-# 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");

platformio.ini

@@ -59,7 +59,7 @@ lib_deps =
 	https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
 	https://github.com/meshtastic/TinyGPSPlus.git#71a82db35f3b973440044c476d4bcdc673b104f4
 	https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0
-	nanopb/Nanopb@0.4.91
+	nanopb/Nanopb@0.4.9
 	erriez/ErriezCRC32@1.0.1
 
 ; Used for the code analysis in PIO Home / Inspect

src/AmbientLightingThread.h

@@ -153,7 +153,7 @@ class AmbientLightingThread : public concurrency::OSThread
         pixels.fill(BUTTON1_COLOR, BUTTON1_COLOR_INDEX, 1);
 #endif
 #if defined(BUTTON2_COLOR) && defined(BUTTON2_COLOR_INDEX)
-        pixels.fill(BUTTON2_COLOR, BUTTON2_COLOR_INDEX, 1);
+        pixels.fill(BUTTON2_COLOR, BUTTON1_COLOR_INDEX, 1);
 #endif
 #endif
         pixels.show();

src/BluetoothStatus.h

@@ -1,105 +0,0 @@
-#pragma once
-#include "Status.h"
-#include "assert.h"
-#include "configuration.h"
-#include "meshUtils.h"
-#include <Arduino.h>
-
-namespace meshtastic
-{
-
-// Describes the state of the Bluetooth connection
-// Allows display to handle pairing events without each UI needing to explicitly hook the Bluefruit / NimBLE code
-class BluetoothStatus : public Status
-{
-  public:
-    enum class ConnectionState {
-        DISCONNECTED,
-        PAIRING,
-        CONNECTED,
-    };
-
-  private:
-    CallbackObserver<BluetoothStatus, const BluetoothStatus *> statusObserver =
-        CallbackObserver<BluetoothStatus, const BluetoothStatus *>(this, &BluetoothStatus::updateStatus);
-
-    ConnectionState state = ConnectionState::DISCONNECTED;
-    std::string passkey; // Stored as string, because Bluefruit allows passkeys with a leading zero
-
-  public:
-    BluetoothStatus() { statusType = STATUS_TYPE_BLUETOOTH; }
-
-    // New BluetoothStatus: connected or disconnected
-    BluetoothStatus(ConnectionState state)
-    {
-        assert(state != ConnectionState::PAIRING); // If pairing, use constructor which specifies passkey
-        statusType = STATUS_TYPE_BLUETOOTH;
-        this->state = state;
-    }
-
-    // New BluetoothStatus: pairing, with passkey
-    BluetoothStatus(std::string passkey) : Status()
-    {
-        statusType = STATUS_TYPE_BLUETOOTH;
-        this->state = ConnectionState::PAIRING;
-        this->passkey = passkey;
-    }
-
-    ConnectionState getConnectionState() const { return this->state; }
-
-    std::string getPasskey() const
-    {
-        assert(state == ConnectionState::PAIRING);
-        return this->passkey;
-    }
-
-    void observe(Observable<const BluetoothStatus *> *source) { statusObserver.observe(source); }
-
-    bool matches(const BluetoothStatus *newStatus) const
-    {
-        if (this->state == newStatus->getConnectionState()) {
-            // Same state: CONNECTED / DISCONNECTED
-            if (this->state != ConnectionState::PAIRING)
-                return true;
-            // Same state: PAIRING, and passkey matches
-            else if (this->getPasskey() == newStatus->getPasskey())
-                return true;
-        }
-
-        return false;
-    }
-
-    int updateStatus(const BluetoothStatus *newStatus)
-    {
-        // Has the status changed?
-        if (!matches(newStatus)) {
-            // Copy the members
-            state = newStatus->getConnectionState();
-            if (state == ConnectionState::PAIRING)
-                passkey = newStatus->getPasskey();
-
-            // Tell anyone interested that we have an update
-            onNewStatus.notifyObservers(this);
-
-            // Debug only:
-            switch (state) {
-            case ConnectionState::PAIRING:
-                LOG_DEBUG("BluetoothStatus PAIRING, key=%s", passkey.c_str());
-                break;
-            case ConnectionState::CONNECTED:
-                LOG_DEBUG("BluetoothStatus CONNECTED");
-                break;
-
-            case ConnectionState::DISCONNECTED:
-                LOG_DEBUG("BluetoothStatus DISCONNECTED");
-                break;
-            }
-        }
-
-        return 0;
-    }
-};
-
-} // namespace meshtastic
-
-extern meshtastic::BluetoothStatus *bluetoothStatus;

src/ButtonThread.cpp

@@ -11,7 +11,6 @@
 #include "main.h"
 #include "modules/ExternalNotificationModule.h"
 #include "power.h"
-#include "sleep.h"
 #ifdef ARCH_PORTDUINO
 #include "platform/portduino/PortduinoGlue.h"
 #endif
@@ -100,13 +99,6 @@ ButtonThread::ButtonThread() : OSThread("Button")
     userButtonTouch.attachLongPressStart(touchPressedLongStart); // Better handling with longpress than click?
 #endif
 
-#ifdef ARCH_ESP32
-    // Register callbacks for before and after lightsleep
-    // Used to detach and reattach interrupts
-    lsObserver.observe(&notifyLightSleep);
-    lsEndObserver.observe(&notifyLightSleepEnd);
-#endif
-
     attachButtonInterrupts();
 #endif
 }
@@ -328,26 +320,6 @@ void ButtonThread::detachButtonInterrupts()
 #endif
 }
 
-#ifdef ARCH_ESP32
-
-// Detach our class' interrupts before lightsleep
-// Allows sleep.cpp to configure its own interrupts, which wake the device on user-button press
-int ButtonThread::beforeLightSleep(void *unused)
-{
-    detachButtonInterrupts();
-    return 0; // Indicates success
-}
-
-// Reconfigure our interrupts
-// Our class' interrupts were disconnected during sleep, to allow the user button to wake the device from sleep
-int ButtonThread::afterLightSleep(esp_sleep_wakeup_cause_t cause)
-{
-    attachButtonInterrupts();
-    return 0; // Indicates success
-}
-
-#endif
-
 /**
  * Watch a GPIO and if we get an IRQ, wake the main thread.
  * Use to add wake on button press

src/ButtonThread.h

@@ -37,12 +37,6 @@ class ButtonThread : public concurrency::OSThread
     void detachButtonInterrupts();
     void storeClickCount();
 
-    // Disconnect and reconnect interrupts for light sleep
-#ifdef ARCH_ESP32
-    int beforeLightSleep(void *unused);
-    int afterLightSleep(esp_sleep_wakeup_cause_t cause);
-#endif
-
   private:
 #if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
     static OneButton userButton; // Static - accessed from an interrupt
@@ -54,14 +48,6 @@ class ButtonThread : public concurrency::OSThread
     OneButton userButtonTouch;
 #endif
 
-#ifdef ARCH_ESP32
-    // Get notified when lightsleep begins and ends
-    CallbackObserver<ButtonThread, void *> lsObserver =
-        CallbackObserver<ButtonThread, void *>(this, &ButtonThread::beforeLightSleep);
-    CallbackObserver<ButtonThread, esp_sleep_wakeup_cause_t> lsEndObserver =
-        CallbackObserver<ButtonThread, esp_sleep_wakeup_cause_t>(this, &ButtonThread::afterLightSleep);
-#endif
-
     // set during IRQ
     static volatile ButtonEventType btnEvent;
 

src/FSCommon.cpp

@@ -23,10 +23,6 @@ SPIClass SPI1(HSPI);
 #define SDHandler SPI
 #endif
 
-#ifndef SD_SPI_FREQUENCY
-#define SD_SPI_FREQUENCY 4000000U
-#endif
-
 #endif // HAS_SDCARD
 
 #if defined(ARCH_STM32WL)
@@ -365,7 +361,8 @@ void setupSDCard()
 #ifdef HAS_SDCARD
     concurrency::LockGuard g(spiLock);
     SDHandler.begin(SPI_SCK, SPI_MISO, SPI_MOSI);
-    if (!SD.begin(SDCARD_CS, SDHandler, SD_SPI_FREQUENCY)) {
+
+    if (!SD.begin(SDCARD_CS, SDHandler)) {
         LOG_DEBUG("No SD_MMC card detected");
         return;
     }

src/RedirectablePrint.cpp

@@ -79,17 +79,17 @@ size_t RedirectablePrint::vprintf(const char *logLevel, const char *format, va_l
     }
     if (color && logLevel != nullptr) {
         if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_DEBUG) == 0)
-            Print::write("\u001b[34m", 5);
+            Print::write("\u001b[34m", 6);
         if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_INFO) == 0)
-            Print::write("\u001b[32m", 5);
+            Print::write("\u001b[32m", 6);
         if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_WARN) == 0)
-            Print::write("\u001b[33m", 5);
+            Print::write("\u001b[33m", 6);
         if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_ERROR) == 0)
-            Print::write("\u001b[31m", 5);
+            Print::write("\u001b[31m", 6);
     }
     len = Print::write(printBuf, len);
     if (color && logLevel != nullptr) {
-        Print::write("\u001b[0m", 4);
+        Print::write("\u001b[0m", 5);
     }
     return len;
 }
@@ -107,15 +107,15 @@ void RedirectablePrint::log_to_serial(const char *logLevel, const char *format,
     // include the header
     if (color) {
         if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_DEBUG) == 0)
-            Print::write("\u001b[34m", 5);
+            Print::write("\u001b[34m", 6);
         if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_INFO) == 0)
-            Print::write("\u001b[32m", 5);
+            Print::write("\u001b[32m", 6);
         if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_WARN) == 0)
-            Print::write("\u001b[33m", 5);
+            Print::write("\u001b[33m", 6);
         if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_ERROR) == 0)
-            Print::write("\u001b[31m", 5);
+            Print::write("\u001b[31m", 6);
         if (strcmp(logLevel, MESHTASTIC_LOG_LEVEL_TRACE) == 0)
-            Print::write("\u001b[35m", 5);
+            Print::write("\u001b[35m", 6);
     }
 
     uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice, true); // display local time on logfile
@@ -393,4 +393,4 @@ std::string RedirectablePrint::mt_sprintf(const std::string fmt_str, ...)
             break;
     }
     return std::string(formatted.get());
-}
+}

src/SafeFile.cpp

@@ -7,23 +7,16 @@ 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/Status.h

@@ -7,7 +7,6 @@
 #define STATUS_TYPE_POWER 1
 #define STATUS_TYPE_GPS 2
 #define STATUS_TYPE_NODE 3
-#define STATUS_TYPE_BLUETOOTH 4
 
 namespace meshtastic
 {

src/detect/ScanI2CTwoWire.cpp

@@ -244,10 +244,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                         logFoundDevice("BMP-388", (uint8_t)addr.address);
                         type = BMP_3XX;
                         break;
-                    case 0x60: // BMP-390 should be 0x60
-                        logFoundDevice("BMP-390", (uint8_t)addr.address);
-                        type = BMP_3XX;
-                        break;
                     case 0x58: // BMP-280 should be 0x58
                     default:
                         logFoundDevice("BMP-280", (uint8_t)addr.address);
@@ -525,4 +521,4 @@ void ScanI2CTwoWire::logFoundDevice(const char *device, uint8_t address)
 {
     LOG_INFO("%s found at address 0x%x", device, address);
 }
-#endif
+#endif

src/gps/GPS.cpp

@@ -48,6 +48,8 @@ HardwareSerial *GPS::_serial_gps = nullptr;
 
 GPS *gps = nullptr;
 
+static const char *ACK_SUCCESS_MESSAGE = "Get ack success!";
+
 static GPSUpdateScheduling scheduling;
 
 /// Multiple GPS instances might use the same serial port (in sequence), but we can
@@ -435,10 +437,6 @@ static const int serialSpeeds[3] = {9600, 115200, 38400};
 static const int rareSerialSpeeds[3] = {4800, 57600, GPS_BAUDRATE};
 #endif
 
-#ifndef GPS_PROBETRIES
-#define GPS_PROBETRIES 2
-#endif
-
 /**
  * @brief  Setup the GPS based on the model detected.
  *  We detect the GPS by cycling through a set of baud rates, first common then rare.
@@ -451,18 +449,7 @@ bool GPS::setup()
     if (!didSerialInit) {
         int msglen = 0;
         if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) {
-#ifdef TRACKER_T1000_E
-            // add power up/down strategy, improve ag3335 detection success
-            digitalWrite(PIN_GPS_EN, LOW);
-            delay(500);
-            digitalWrite(GPS_VRTC_EN, LOW);
-            delay(1000);
-            digitalWrite(GPS_VRTC_EN, HIGH);
-            delay(500);
-            digitalWrite(PIN_GPS_EN, HIGH);
-            delay(1000);
-#endif
-            if (probeTries < GPS_PROBETRIES) {
+            if (probeTries < 2) {
                 LOG_DEBUG("Probe for GPS at %d", serialSpeeds[speedSelect]);
                 gnssModel = probe(serialSpeeds[speedSelect]);
                 if (gnssModel == GNSS_MODEL_UNKNOWN) {
@@ -473,7 +460,7 @@ bool GPS::setup()
                 }
             }
             // Rare Serial Speeds
-            if (probeTries == GPS_PROBETRIES) {
+            if (probeTries == 2) {
                 LOG_DEBUG("Probe for GPS at %d", rareSerialSpeeds[speedSelect]);
                 gnssModel = probe(rareSerialSpeeds[speedSelect]);
                 if (gnssModel == GNSS_MODEL_UNKNOWN) {
@@ -785,9 +772,6 @@ void GPS::setPowerState(GPSPowerState newState, uint32_t sleepTime)
         setPowerPMU(true);                                        // Power (PMU): on
         writePinStandby(false);                                   // Standby (pin): awake (not standby)
         setPowerUBLOX(true);                                      // Standby (UBLOX): awake
-#ifdef GNSS_AIROHA
-        lastFixStartMsec = 0;
-#endif
         break;
 
     case GPS_SOFTSLEEP:
@@ -1037,6 +1021,14 @@ int32_t GPS::runOnce()
         if (config.position.gps_mode != meshtastic_Config_PositionConfig_GpsMode_ENABLED) {
             return disable();
         }
+        // ONCE we will factory reset the GPS for bug #327
+        if (!devicestate.did_gps_reset) {
+            LOG_WARN("GPS FactoryReset requested");
+            if (gps->factoryReset()) { // If we don't succeed try again next time
+                devicestate.did_gps_reset = true;
+                nodeDB->saveToDisk(SEGMENT_DEVICESTATE);
+            }
+        }
         GPSInitFinished = true;
         publishUpdate();
     }
@@ -1049,6 +1041,24 @@ int32_t GPS::runOnce()
     if (whileActive()) {
         // if we have received valid NMEA claim we are connected
         setConnected();
+    } else {
+        if ((config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) &&
+            IS_ONE_OF(gnssModel, GNSS_MODEL_UBLOX6, GNSS_MODEL_UBLOX7, GNSS_MODEL_UBLOX8, GNSS_MODEL_UBLOX9,
+                      GNSS_MODEL_UBLOX10)) {
+            // reset the GPS on next bootup
+            if (devicestate.did_gps_reset && scheduling.elapsedSearchMs() > 60 * 1000UL && !hasFlow()) {
+                LOG_DEBUG("GPS is not found, try factory reset on next boot");
+                devicestate.did_gps_reset = false;
+                nodeDB->saveToDisk(SEGMENT_DEVICESTATE);
+                return disable(); // Stop the GPS thread as it can do nothing useful until next reboot.
+            }
+        }
+    }
+    // At least one GPS has a bad habit of losing its mind from time to time
+    if (rebootsSeen > 2) {
+        rebootsSeen = 0;
+        LOG_DEBUG("Would normally factoryReset()");
+        // gps->factoryReset();
     }
 
     // If we're due for an update, wake the GPS
@@ -1383,6 +1393,62 @@ static int32_t toDegInt(RawDegrees d)
     return r;
 }
 
+bool GPS::factoryReset()
+{
+#ifdef PIN_GPS_REINIT
+    // The L76K GNSS on the T-Echo requires the RESET pin to be pulled LOW
+    pinMode(PIN_GPS_REINIT, OUTPUT);
+    digitalWrite(PIN_GPS_REINIT, 0);
+    delay(150); // The L76K datasheet calls for at least 100MS delay
+    digitalWrite(PIN_GPS_REINIT, 1);
+#endif
+
+    if (HW_VENDOR == meshtastic_HardwareModel_TBEAM) {
+        byte _message_reset1[] = {0xB5, 0x62, 0x06, 0x09, 0x0D, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00,
+                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x1C, 0xA2};
+        _serial_gps->write(_message_reset1, sizeof(_message_reset1));
+        if (getACK(0x05, 0x01, 10000)) {
+            LOG_DEBUG(ACK_SUCCESS_MESSAGE);
+        }
+        delay(100);
+        byte _message_reset2[] = {0xB5, 0x62, 0x06, 0x09, 0x0D, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00,
+                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1B, 0xA1};
+        _serial_gps->write(_message_reset2, sizeof(_message_reset2));
+        if (getACK(0x05, 0x01, 10000)) {
+            LOG_DEBUG(ACK_SUCCESS_MESSAGE);
+        }
+        delay(100);
+        byte _message_reset3[] = {0xB5, 0x62, 0x06, 0x09, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                  0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x03, 0x1D, 0xB3};
+        _serial_gps->write(_message_reset3, sizeof(_message_reset3));
+        if (getACK(0x05, 0x01, 10000)) {
+            LOG_DEBUG(ACK_SUCCESS_MESSAGE);
+        }
+    } else if (gnssModel == GNSS_MODEL_MTK) {
+        // send the CAS10 to perform a factory restart of the device (and other device that support PCAS statements)
+        LOG_INFO("GNSS Factory Reset via PCAS10,3");
+        _serial_gps->write("$PCAS10,3*1F\r\n");
+        delay(100);
+    } else if (gnssModel == GNSS_MODEL_ATGM336H) {
+        LOG_INFO("Factory Reset via CAS-CFG-RST");
+        uint8_t msglen = makeCASPacket(0x06, 0x02, sizeof(_message_CAS_CFG_RST_FACTORY), _message_CAS_CFG_RST_FACTORY);
+        _serial_gps->write(UBXscratch, msglen);
+        delay(100);
+    } else {
+        // fire this for good measure, if we have an L76B - won't harm other devices.
+        _serial_gps->write("$PMTK104*37\r\n");
+        // No PMTK_ACK for this command.
+        delay(100);
+        // send the UBLOX Factory Reset Command regardless of detect state, something is very wrong, just assume it's
+        // UBLOX. Factory Reset
+        byte _message_reset[] = {0xB5, 0x62, 0x06, 0x09, 0x0D, 0x00, 0xFF, 0xFB, 0x00, 0x00, 0x00,
+                                 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x17, 0x2B, 0x7E};
+        _serial_gps->write(_message_reset, sizeof(_message_reset));
+    }
+    delay(1000);
+    return true;
+}
+
 /**
  * Perform any processing that should be done only while the GPS is awake and looking for a fix.
  * Override this method to check for new locations

src/gps/GPS.h

@@ -101,6 +101,8 @@ class GPS : private concurrency::OSThread
     // Empty the input buffer as quickly as possible
     void clearBuffer();
 
+    virtual bool factoryReset();
+
     // Creates an instance of the GPS class.
     // Returns the new instance or null if the GPS is not present.
     static GPS *createGps();

src/graphics/EInkDisplay2.cpp

@@ -140,15 +140,6 @@ bool EInkDisplay::connect()
         adafruitDisplay->setRotation(3);
         adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
     }
-#elif defined(MESHLINK)
-    {
-        auto lowLevel = new EINK_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY, SPI1);
-
-        adafruitDisplay = new GxEPD2_BW<EINK_DISPLAY_MODEL, EINK_DISPLAY_MODEL::HEIGHT>(*lowLevel);
-        adafruitDisplay->init();
-        adafruitDisplay->setRotation(3);
-        adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
-    }
 #elif defined(RAK4630) || defined(MAKERPYTHON)
     {
         if (eink_found) {

src/graphics/EInkDynamicDisplay.cpp

@@ -238,7 +238,7 @@ void EInkDynamicDisplay::checkRateLimiting()
 
     // Skip update: too soon for BACKGROUND
     if (frameFlags == BACKGROUND) {
-        if (Throttle::isWithinTimespanMs(previousRunMs, 30000)) {
+        if (Throttle::isWithinTimespanMs(previousRunMs, EINK_LIMIT_RATE_BACKGROUND_SEC * 1000)) {
             refresh = SKIPPED;
             reason = EXCEEDED_RATELIMIT_FULL;
             return;
@@ -251,7 +251,7 @@ void EInkDynamicDisplay::checkRateLimiting()
 
     // Skip update: too soon for RESPONSIVE
     if (frameFlags & RESPONSIVE) {
-        if (Throttle::isWithinTimespanMs(previousRunMs, 1000)) {
+        if (Throttle::isWithinTimespanMs(previousRunMs, EINK_LIMIT_RATE_RESPONSIVE_SEC * 1000)) {
             refresh = SKIPPED;
             reason = EXCEEDED_RATELIMIT_FAST;
             LOG_DEBUG("refresh=SKIPPED, reason=EXCEEDED_RATELIMIT_FAST, frameFlags=0x%x", frameFlags);

src/graphics/Screen.cpp

@@ -123,7 +123,7 @@ static bool heartbeat = false;
 
 #define getStringCenteredX(s) ((SCREEN_WIDTH - display->getStringWidth(s)) / 2)
 
-// Check if the display can render a string (detect special chars; emoji)
+/// Check if the display can render a string (detect special chars; emoji)
 static bool haveGlyphs(const char *str)
 {
 #if defined(OLED_PL) || defined(OLED_UA) || defined(OLED_RU) || defined(OLED_CS)
@@ -162,7 +162,11 @@ static void drawIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDispl
 
     display->setFont(FONT_MEDIUM);
     display->setTextAlignment(TEXT_ALIGN_LEFT);
+#ifdef USERPREFS_SPLASH_TITLE
+    const char *title = USERPREFS_SPLASH_TITLE;
+#else
     const char *title = "meshtastic.org";
+#endif
     display->drawString(x + getStringCenteredX(title), y + SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM, title);
     display->setFont(FONT_SMALL);
 
@@ -181,56 +185,6 @@ static void drawIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDispl
     display->setTextAlignment(TEXT_ALIGN_LEFT); // Restore left align, just to be kind to any other unsuspecting code
 }
 
-#ifdef USERPREFS_OEM_TEXT
-
-static void drawOEMIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    static const uint8_t xbm[] = USERPREFS_OEM_IMAGE_DATA;
-    display->drawXbm(x + (SCREEN_WIDTH - USERPREFS_OEM_IMAGE_WIDTH) / 2,
-                     y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - USERPREFS_OEM_IMAGE_HEIGHT) / 2 + 2, USERPREFS_OEM_IMAGE_WIDTH,
-                     USERPREFS_OEM_IMAGE_HEIGHT, xbm);
-
-    switch (USERPREFS_OEM_FONT_SIZE) {
-    case 0:
-        display->setFont(FONT_SMALL);
-        break;
-    case 2:
-        display->setFont(FONT_LARGE);
-        break;
-    default:
-        display->setFont(FONT_MEDIUM);
-        break;
-    }
-
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
-    const char *title = USERPREFS_OEM_TEXT;
-    display->drawString(x + getStringCenteredX(title), y + SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM, title);
-    display->setFont(FONT_SMALL);
-
-    // Draw region in upper left
-    if (upperMsg)
-        display->drawString(x + 0, y + 0, upperMsg);
-
-    // Draw version and shortname in upper right
-    char buf[25];
-    snprintf(buf, sizeof(buf), "%s\n%s", xstr(APP_VERSION_SHORT), haveGlyphs(owner.short_name) ? owner.short_name : "");
-
-    display->setTextAlignment(TEXT_ALIGN_RIGHT);
-    display->drawString(x + SCREEN_WIDTH, y + 0, buf);
-    screen->forceDisplay();
-
-    display->setTextAlignment(TEXT_ALIGN_LEFT); // Restore left align, just to be kind to any other unsuspecting code
-}
-
-static void drawOEMBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    // Draw region in upper left
-    const char *region = myRegion ? myRegion->name : NULL;
-    drawOEMIconScreen(region, display, state, x, y);
-}
-
-#endif
-
 void Screen::drawFrameText(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *message)
 {
     uint16_t x_offset = display->width() / 2;
@@ -1446,9 +1400,9 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
 
     static char distStr[20];
     if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL) {
-        strncpy(distStr, "? mi ?°", sizeof(distStr)); // might not have location data
+        strncpy(distStr, "? mi", sizeof(distStr)); // might not have location data
     } else {
-        strncpy(distStr, "? km ?°", sizeof(distStr));
+        strncpy(distStr, "? km", sizeof(distStr));
     }
     meshtastic_NodeInfoLite *ourNode = nodeDB->getMeshNode(nodeDB->getNodeNum());
     const char *fields[] = {username, lastStr, signalStr, distStr, NULL};
@@ -1481,6 +1435,18 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
             float d =
                 GeoCoord::latLongToMeter(DegD(p.latitude_i), DegD(p.longitude_i), DegD(op.latitude_i), DegD(op.longitude_i));
 
+            if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL) {
+                if (d < (2 * MILES_TO_FEET))
+                    snprintf(distStr, sizeof(distStr), "%.0f ft", d * METERS_TO_FEET);
+                else
+                    snprintf(distStr, sizeof(distStr), "%.1f mi", d * METERS_TO_FEET / MILES_TO_FEET);
+            } else {
+                if (d < 2000)
+                    snprintf(distStr, sizeof(distStr), "%.0f m", d);
+                else
+                    snprintf(distStr, sizeof(distStr), "%.1f km", d / 1000);
+            }
+
             float bearingToOther =
                 GeoCoord::bearing(DegD(op.latitude_i), DegD(op.longitude_i), DegD(p.latitude_i), DegD(p.longitude_i));
             // If the top of the compass is a static north then bearingToOther can be drawn on the compass directly
@@ -1488,22 +1454,6 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
             if (!config.display.compass_north_top)
                 bearingToOther -= myHeading;
             screen->drawNodeHeading(display, compassX, compassY, compassDiam, bearingToOther);
-
-            float bearingToOtherDegrees = (bearingToOther < 0) ? bearingToOther + 2 * PI : bearingToOther;
-            bearingToOtherDegrees = bearingToOtherDegrees * 180 / PI;
-
-            if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL) {
-                if (d < (2 * MILES_TO_FEET))
-                    snprintf(distStr, sizeof(distStr), "%.0fft   %.0f°", d * METERS_TO_FEET, bearingToOtherDegrees);
-                else
-                    snprintf(distStr, sizeof(distStr), "%.1fmi   %.0f°", d * METERS_TO_FEET / MILES_TO_FEET,
-                             bearingToOtherDegrees);
-            } else {
-                if (d < 2000)
-                    snprintf(distStr, sizeof(distStr), "%.0fm   %.0f°", d, bearingToOtherDegrees);
-                else
-                    snprintf(distStr, sizeof(distStr), "%.1fkm   %.0f°", d / 1000, bearingToOtherDegrees);
-            }
         }
     }
     if (!hasNodeHeading) {
@@ -1708,10 +1658,6 @@ void Screen::setup()
     // Set the utf8 conversion function
     dispdev->setFontTableLookupFunction(customFontTableLookup);
 
-#ifdef USERPREFS_OEM_TEXT
-    logo_timeout *= 2; // Double the time if we have a custom logo
-#endif
-
     // Add frames.
     EINK_ADD_FRAMEFLAG(dispdev, DEMAND_FAST);
     alertFrames[0] = [this](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
@@ -1857,22 +1803,6 @@ int32_t Screen::runOnce()
         showingBootScreen = false;
     }
 
-#ifdef USERPREFS_OEM_TEXT
-    static bool showingOEMBootScreen = true;
-    if (showingOEMBootScreen && (millis() > ((logo_timeout / 2) + serialSinceMsec))) {
-        LOG_INFO("Switch to OEM screen...");
-        // Change frames.
-        static FrameCallback bootOEMFrames[] = {drawOEMBootScreen};
-        static const int bootOEMFrameCount = sizeof(bootOEMFrames) / sizeof(bootOEMFrames[0]);
-        ui->setFrames(bootOEMFrames, bootOEMFrameCount);
-        ui->update();
-#ifndef USE_EINK
-        ui->update();
-#endif
-        showingOEMBootScreen = false;
-    }
-#endif
-
 #ifndef DISABLE_WELCOME_UNSET
     if (showingNormalScreen && config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
         setWelcomeFrames();
@@ -2648,12 +2578,13 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
             display->drawString(x + 1, y, String("USB"));
     }
 
-    //    auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, true);
+    auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, true);
 
-    //    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);
-    //    if (config.display.heading_bold)
-    //        display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode) - 1, y, mode);
+    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);
+    if (config.display.heading_bold)
+        display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode) - 1, y, mode);
 
+    // Line 2
     uint32_t currentMillis = millis();
     uint32_t seconds = currentMillis / 1000;
     uint32_t minutes = seconds / 60;
@@ -2666,9 +2597,6 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
 
     display->setColor(WHITE);
 
-    // Setup string to assemble analogClock string
-    std::string analogClock = "";
-
     // Show uptime as days, hours, minutes OR seconds
     std::string uptime = screen->drawTimeDelta(days, hours, minutes, seconds);
 
@@ -2685,36 +2613,17 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
         int min = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
         int sec = (hms % SEC_PER_HOUR) % SEC_PER_MIN; // or hms % SEC_PER_MIN
 
-        char timebuf[12];
-
-        if (config.display.use_12h_clock) {
-            std::string meridiem = "am";
-            if (hour >= 12) {
-                if (hour > 12)
-                    hour -= 12;
-                meridiem = "pm";
-            }
-            if (hour == 00) {
-                hour = 12;
-            }
-            snprintf(timebuf, sizeof(timebuf), "%d:%02d:%02d%s", hour, min, sec, meridiem.c_str());
-        } else {
-            snprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d", hour, min, sec);
-        }
-        analogClock += timebuf;
+        char timebuf[10];
+        snprintf(timebuf, sizeof(timebuf), " %02d:%02d:%02d", hour, min, sec);
+        uptime += timebuf;
     }
 
-    // Line 1
-    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(uptime.c_str()), y, uptime.c_str());
-
-    // Line 2
-    display->drawString(x, y + FONT_HEIGHT_SMALL * 1, analogClock.c_str());
+    display->drawString(x, y + FONT_HEIGHT_SMALL * 1, uptime.c_str());
 
     // Display Channel Utilization
     char chUtil[13];
     snprintf(chUtil, sizeof(chUtil), "ChUtil %2.0f%%", airTime->channelUtilizationPercent());
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(chUtil), y + FONT_HEIGHT_SMALL * 1, chUtil);
-
 #if HAS_GPS
     if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) {
         // Line 3
@@ -2753,14 +2662,13 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg)
 
 int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
 {
-    if (showingNormalScreen) {
-        // Outgoing message
-        if (packet->from == 0)
-            setFrames(FOCUS_PRESERVE); // Return to same frame (quietly hiding the rx text message frame)
+    // If auto carousel is disabled -> return 0 and skip new messages handling
+    if (config.display.auto_screen_carousel_secs == 0)
+        return 0;
 
-        // Incoming message
-        else
-            setFrames(FOCUS_TEXTMESSAGE); // Focus on the new message
+    // Handle focus change based on message type
+    if (showingNormalScreen) {
+        setFrames(packet->from == 0 ? FOCUS_PRESERVE : FOCUS_TEXTMESSAGE);
     }
 
     return 0;

src/graphics/niche/Drivers/Backlight/LatchingBacklight.cpp

@@ -1,110 +0,0 @@
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "./LatchingBacklight.h"
-
-#include "assert.h"
-
-#include "sleep.h"
-
-using namespace NicheGraphics::Drivers;
-
-// Private constructor
-// Called by getInstance
-LatchingBacklight::LatchingBacklight()
-{
-    // Attach the deep sleep callback
-    deepSleepObserver.observe(&notifyDeepSleep);
-}
-
-// Get access to (or create) the singleton instance of this class
-LatchingBacklight *LatchingBacklight::getInstance()
-{
-    // Instantiate the class the first time this method is called
-    static LatchingBacklight *const singletonInstance = new LatchingBacklight;
-
-    return singletonInstance;
-}
-
-// Which pin controls the backlight?
-// Is the light active HIGH (default) or active LOW?
-void LatchingBacklight::setPin(uint8_t pin, bool activeWhen)
-{
-    this->pin = pin;
-    this->logicActive = activeWhen;
-
-    pinMode(pin, OUTPUT);
-    off(); // Explicit off seem required by T-Echo?
-}
-
-// Called when device is shutting down
-// Ensures the backlight is off
-int LatchingBacklight::beforeDeepSleep(void *unused)
-{
-    // We shouldn't need to guard the block like this
-    // Contingency for:
-    // - settings corruption: settings.optionalMenuItems.backlight guards backlight code in MenuApplet
-    // - improper use in the future
-    if (pin != (uint8_t)-1) {
-        off();
-        pinMode(pin, INPUT); // High impedence - unnecessary?
-    } else
-        LOG_WARN("LatchingBacklight instantiated, but pin not set");
-    return 0; // Continue with deep sleep
-}
-
-// Turn the backlight on *temporarily*
-// This should be used for momentary illumination, such as while a button is held
-// The effect on the backlight is the same; peek and latch are separated to simplify short vs long press button handling
-void LatchingBacklight::peek()
-{
-    assert(pin != (uint8_t)-1);
-    digitalWrite(pin, logicActive); // On
-    on = true;
-    latched = false;
-}
-
-// Turn the backlight on, and keep it on
-// This should be used when the backlight should remain active, even after user input ends
-// e.g. when enabled via the menu
-// The effect on the backlight is the same; peek and latch are separated to simplify short vs long press button handling
-void LatchingBacklight::latch()
-{
-    assert(pin != (uint8_t)-1);
-
-    // Blink if moving from peek to latch
-    // Indicates to user that the transition has taken place
-    if (on && !latched) {
-        digitalWrite(pin, !logicActive); // Off
-        delay(25);
-        digitalWrite(pin, logicActive); // On
-        delay(25);
-        digitalWrite(pin, !logicActive); // Off
-        delay(25);
-    }
-
-    digitalWrite(pin, logicActive); // On
-    on = true;
-    latched = true;
-}
-
-// Turn the backlight off
-// Suitable for ending both peek and latch
-void LatchingBacklight::off()
-{
-    assert(pin != (uint8_t)-1);
-    digitalWrite(pin, !logicActive); // Off
-    on = false;
-    latched = false;
-}
-
-bool LatchingBacklight::isOn()
-{
-    return on;
-}
-
-bool LatchingBacklight::isLatched()
-{
-    return latched;
-}
-
-#endif

src/graphics/niche/Drivers/Backlight/LatchingBacklight.h

@@ -1,50 +0,0 @@
-/*
-
-    Singleton class
-    On-demand control of a display's backlight, connected to a GPIO
-    Initial use case is control of T-Echo's frontlight, via the capacitive touch button
-
-    - momentary on
-    - latched on
-
-*/
-
-#pragma once
-
-#include "configuration.h"
-
-#include "Observer.h"
-
-namespace NicheGraphics::Drivers
-{
-
-class LatchingBacklight
-{
-  public:
-    static LatchingBacklight *getInstance(); // Create or get the singleton instance
-    void setPin(uint8_t pin, bool activeWhen = HIGH);
-
-    int beforeDeepSleep(void *unused); // Callback for auto-shutoff
-
-    void peek();  // Backlight on temporarily, e.g. while button held
-    void latch(); // Backlight on permanently, e.g. toggled via menu
-    void off();   // Backlight off. Suitable for both peek and latch
-
-    bool isOn(); // Either peek or latch
-    bool isLatched();
-
-  private:
-    LatchingBacklight(); // Constructor made private: force use of getInstance
-
-    // Get notified when the system is shutting down
-    CallbackObserver<LatchingBacklight, void *> deepSleepObserver =
-        CallbackObserver<LatchingBacklight, void *>(this, &LatchingBacklight::beforeDeepSleep);
-
-    uint8_t pin = (uint8_t)-1;
-    bool logicActive = HIGH; // Is light active HIGH or active LOW
-
-    bool on = false;      // Is light on (either peek or latched)
-    bool latched = false; // Is light latched on
-};
-
-} // namespace NicheGraphics::Drivers

src/graphics/niche/Drivers/EInk/DEPG0154BNS800.cpp

@@ -1 +0,0 @@
-#include "./DEPG0154BNS800.h"

src/graphics/niche/Drivers/EInk/DEPG0154BNS800.h

@@ -1,34 +0,0 @@
-/*
-
-E-Ink display driver
-    - DEPG0154BNS800
-    - Manufacturer: DKE
-    - Size: 1.54 inch
-    - Resolution: 152px x 152px
-    - Flex connector marking: FPC7525
-
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-#include "configuration.h"
-
-#include "./SSD16XX.h"
-
-namespace NicheGraphics::Drivers
-{
-class DEPG0154BNS800 : public SSD16XX
-{
-    // Display properties
-  private:
-    static constexpr uint32_t width = 152;
-    static constexpr uint32_t height = 152;
-    static constexpr UpdateTypes supported = (UpdateTypes)(FULL);
-
-  public:
-    DEPG0154BNS800() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte
-};
-
-} // namespace NicheGraphics::Drivers
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/EInk/DEPG0290BNS800.cpp

@@ -1,120 +0,0 @@
-#include "./DEPG0290BNS800.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-using namespace NicheGraphics::Drivers;
-
-// Describes the operation performed when a "fast refresh" is performed
-// Source: custom, with DEPG0150BNS810 as a reference
-static const uint8_t LUT_FAST[] = {
-    // 1     2     3     4
-    0x40, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // B2B (Existing black pixels)
-    0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // B2W (New white pixels)
-    0x00, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // W2B (New black pixels)
-    0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // W2W (Existing white pixels)
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // VCOM
-
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1. Tap existing black pixels back into place
-    0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2. Move new pixels
-    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 3. New pixels, and also existing black pixels
-    0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, // 4. All pixels, then cooldown
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-
-    0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x00, 0x00, 0x00,
-};
-
-// How strongly the pixels are pulled and pushed
-void DEPG0290BNS800::configVoltages()
-{
-    switch (updateType) {
-    case FAST:
-        // Listed as "typical" in datasheet
-        sendCommand(0x04);
-        sendData(0x41); // VSH1 15V
-        sendData(0x00); // VSH2 NA
-        sendData(0x32); // VSL -15V
-        break;
-
-    case FULL:
-    default:
-        // From OTP memory
-        break;
-    }
-}
-
-// Load settings about how the pixels are moved from old state to new state during a refresh
-// - manually specified,
-// - or with stored values from displays OTP memory
-void DEPG0290BNS800::configWaveform()
-{
-    switch (updateType) {
-    case FAST:
-        sendCommand(0x3C); // Border waveform:
-        sendData(0x60);    // Actively hold screen border during update
-
-        sendCommand(0x32);                    // Write LUT register from MCU:
-        sendData(LUT_FAST, sizeof(LUT_FAST)); // (describes operation for a FAST refresh)
-        break;
-
-    case FULL:
-    default:
-        // From OTP memory
-        break;
-    }
-}
-
-// Describes the sequence of events performed by the displays controller IC during a refresh
-// Includes "power up", "load settings from memory", "update the pixels", etc
-void DEPG0290BNS800::configUpdateSequence()
-{
-    switch (updateType) {
-    case FAST:
-        sendCommand(0x22); // Set "update sequence"
-        sendData(0xCF);    // Differential, use manually loaded waveform
-        break;
-
-    case FULL:
-    default:
-        sendCommand(0x22); // Set "update sequence"
-        sendData(0xF7);    // Non-differential, load waveform from OTP
-        break;
-    }
-}
-
-// Once the refresh operation has been started,
-// begin periodically polling the display to check for completion, using the normal Meshtastic threading code
-// Only used when refresh is "async"
-void DEPG0290BNS800::detachFromUpdate()
-{
-    switch (updateType) {
-    case FAST:
-        return beginPolling(50, 450); // At least 450ms for fast refresh
-    case FULL:
-    default:
-        return beginPolling(100, 3000); // At least 3 seconds for full refresh
-    }
-}
-
-// For this display, we do not need to re-write the new image.
-// We're overriding SSD16XX::finalizeUpdate to make this small optimization.
-// The display does also work just fine with the generic SSD16XX method, though.
-void DEPG0290BNS800::finalizeUpdate()
-{
-    // Put a copy of the image into the "old memory".
-    // Used with differential refreshes (e.g. FAST update), to determine which px need to move, and which can remain in place
-    // We need to keep the "old memory" up to date, because don't know whether next refresh will be FULL or FAST etc.
-    if (updateType != FULL) {
-        // writeNewImage(); // Not required for this display
-        writeOldImage();
-        sendCommand(0x7F); // Terminate image write without update
-        wait();
-    }
-}
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/EInk/DEPG0290BNS800.h

@@ -1,42 +0,0 @@
-/*
-
-E-Ink display driver
-    - DEPG0290BNS800
-    - Manufacturer: DKE
-    - Size: 2.9 inch
-    - Resolution: 128px x 296px
-    - Flex connector marking: FPC-7519 rev.b
-
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "configuration.h"
-
-#include "./SSD16XX.h"
-
-namespace NicheGraphics::Drivers
-{
-class DEPG0290BNS800 : public SSD16XX
-{
-    // Display properties
-  private:
-    static constexpr uint32_t width = 128;
-    static constexpr uint32_t height = 296;
-    static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
-
-  public:
-    DEPG0290BNS800() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte
-
-  protected:
-    void configVoltages() override;
-    void configWaveform() override;
-    void configUpdateSequence() override;
-    void detachFromUpdate() override;
-    void finalizeUpdate() override; // Only overriden for a slight optimization
-};
-
-} // namespace NicheGraphics::Drivers
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/EInk/EInk.cpp

@@ -1,70 +0,0 @@
-#include "./EInk.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-using namespace NicheGraphics::Drivers;
-
-// Separate from EInk::begin method, as derived class constructors can probably supply these parameters as constants
-EInk::EInk(uint16_t width, uint16_t height, UpdateTypes supported)
-    : concurrency::OSThread("E-Ink Driver"), width(width), height(height), supportedUpdateTypes(supported)
-{
-    OSThread::disable();
-}
-
-// Used by NicheGraphics implementations to check if a display supports a specific refresh operation.
-// Whether or the update type is supported is specified in the constructor
-bool EInk::supports(UpdateTypes type)
-{
-    // The EInkUpdateTypes enum assigns each type a unique bit. We are checking if that bit is set.
-    if (supportedUpdateTypes & type)
-        return true;
-    else
-        return false;
-}
-
-// Begins using the OSThread to detect when a display update is complete
-// This allows the refresh operation to run "asynchronously".
-// Rather than blocking execution waiting for the update to complete, we are periodically checking the hardware's BUSY pin
-// The expectedDuration argument allows us to delay the start of this checking, if we know "roughly" how long an update takes.
-// Potentially, a display without hardware BUSY could rely entirely on "expectedDuration",
-// provided its isUpdateDone() override always returns true.
-void EInk::beginPolling(uint32_t interval, uint32_t expectedDuration)
-{
-    updateRunning = true;
-    updateBegunAt = millis();
-    pollingInterval = interval;
-
-    // To minimize load, we can choose to delay polling for a few seconds, if we know roughly how long the update will take
-    // By default, expectedDuration is 0, and we'll start polling immediately
-    OSThread::setIntervalFromNow(expectedDuration);
-    OSThread::enabled = true;
-}
-
-// Meshtastic's pseudo-threading layer
-// We're using this as a timer, to periodically check if an update is complete
-// This is what allows us to update the display asynchronously
-int32_t EInk::runOnce()
-{
-    if (!isUpdateDone())
-        return pollingInterval; // Poll again in a few ms
-
-    // If update done:
-    finalizeUpdate();      // Any post-update code: power down panel hardware, hibernate, etc
-    updateRunning = false; // Change what we report via EInk::busy()
-    return disable();      // Stop polling
-}
-
-// Wait for an in progress update to complete before continuing
-// Run a normal (async) update first, *then* call await
-void EInk::await()
-{
-    // Stop our concurrency thread
-    OSThread::disable();
-
-    // Sit and block until the update is complete
-    while (updateRunning) {
-        runOnce();
-        yield();
-    }
-}
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/EInk/EInk.h

@@ -1,56 +0,0 @@
-/*
-
-    Base class for E-Ink display drivers
-
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-#include "configuration.h"
-
-#include "concurrency/OSThread.h"
-#include <SPI.h>
-
-namespace NicheGraphics::Drivers
-{
-
-class EInk : private concurrency::OSThread
-{
-  public:
-    // Different possible operations used to update an E-Ink display
-    // Some displays will not support all operations
-    // Each value needs a unique bit. In some cases, we might set more than one bit (e.g. EInk::supportedUpdateType)
-    enum UpdateTypes : uint8_t {
-        UNSPECIFIED = 0,
-        FULL = 1 << 0,
-        FAST = 1 << 1,
-    };
-
-    EInk(uint16_t width, uint16_t height, UpdateTypes supported);
-    virtual void begin(SPIClass *spi, uint8_t pin_dc, uint8_t pin_cs, uint8_t pin_busy, uint8_t pin_rst = -1) = 0;
-    virtual void update(uint8_t *imageData, UpdateTypes type) = 0; // Change the display image
-    void await();                                                  // Wait for an in-progress update to complete before proceeding
-    bool supports(UpdateTypes type);                               // Can display perfom a certain update type
-    bool busy() { return updateRunning; }                          // Display able to update right now?
-
-    const uint16_t width; // Public so that NicheGraphics implementations can access. Safe because const.
-    const uint16_t height;
-
-  protected:
-    void beginPolling(uint32_t interval, uint32_t expectedDuration); // Begin checking repeatedly if update finished
-    virtual bool isUpdateDone() = 0;                                 // Check once if update finished
-    virtual void finalizeUpdate() {}                                 // Run any post-update code
-
-  private:
-    int32_t runOnce() override; // Repeated checking if update finished
-
-    const UpdateTypes supportedUpdateTypes; // Capabilities of a derived display class
-    bool updateRunning = false;             // see EInk::busy()
-    uint32_t updateBegunAt;                 // For initial pause before polling for update completion
-    uint32_t pollingInterval;               // How often to check if update complete (ms)
-};
-
-} // namespace NicheGraphics::Drivers
-
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/EInk/GDEY0154D67.cpp

@@ -1,61 +0,0 @@
-#include "./GDEY0154D67.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-using namespace NicheGraphics::Drivers;
-
-// Map the display controller IC's output to the conected panel
-void GDEY0154D67::configScanning()
-{
-    // "Driver output control"
-    sendCommand(0x01);
-    sendData(0xC7);
-    sendData(0x00);
-    sendData(0x00);
-
-    // To-do: delete this method?
-    // Values set here might be redundant: C7, 00, 00 seems to be default
-}
-
-// Specify which information is used to control the sequence of voltages applied to move the pixels
-// - For this display, configUpdateSequence() specifies that a suitable LUT will be loaded from
-//   the controller IC's OTP memory, when the update procedure begins.
-void GDEY0154D67::configWaveform()
-{
-    sendCommand(0x3C); // Border waveform:
-    sendData(0x05);    // Screen border should follow LUT1 waveform (actively drive pixels white)
-
-    sendCommand(0x18); // Temperature sensor:
-    sendData(0x80);    // Use internal temperature sensor to select an appropriate refresh waveform
-}
-
-void GDEY0154D67::configUpdateSequence()
-{
-    switch (updateType) {
-    case FAST:
-        sendCommand(0x22); // Set "update sequence"
-        sendData(0xFF);    // Will load LUT from OTP memory, Display mode 2 "differential refresh"
-        break;
-
-    case FULL:
-    default:
-        sendCommand(0x22); // Set "update sequence"
-        sendData(0xF7);    // Will load LUT from OTP memory
-        break;
-    }
-}
-
-// Once the refresh operation has been started,
-// begin periodically polling the display to check for completion, using the normal Meshtastic threading code
-// Only used when refresh is "async"
-void GDEY0154D67::detachFromUpdate()
-{
-    switch (updateType) {
-    case FAST:
-        return beginPolling(50, 500); // At least 500ms for fast refresh
-    case FULL:
-    default:
-        return beginPolling(100, 2000); // At least 2 seconds for full refresh
-    }
-}
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/EInk/GDEY0154D67.h

@@ -1,42 +0,0 @@
-/*
-
-E-Ink display driver
-    - GDEY0154D67
-    - Manufacturer: Goodisplay
-    - Size: 1.54 inch
-    - Resolution: 200px x 200px
-    - Flex connector marking: FPC-B001
-
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "configuration.h"
-
-#include "./SSD16XX.h"
-
-namespace NicheGraphics::Drivers
-{
-class GDEY0154D67 : public SSD16XX
-{
-    // Display properties
-  private:
-    static constexpr uint32_t width = 200;
-    static constexpr uint32_t height = 200;
-    static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
-
-  public:
-    GDEY0154D67() : SSD16XX(width, height, supported) {}
-
-  protected:
-    virtual void configScanning() override;
-    virtual void configWaveform() override;
-    virtual void configUpdateSequence() override;
-    void detachFromUpdate() override;
-};
-
-} // namespace NicheGraphics::Drivers
-
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/EInk/LCMEN2R13EFC1.cpp

@@ -1,301 +0,0 @@
-#include "./LCMEN2R13EFC1.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include <assert.h>
-
-using namespace NicheGraphics::Drivers;
-
-// Look up table: fast refresh, common electrode
-static const uint8_t LUT_FAST_VCOMDC[] = {
-    0x01, 0x06, 0x03, 0x02, 0x01, 0x01, 0x01, //
-    0x01, 0x06, 0x02, 0x01, 0x01, 0x01, 0x01, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-};
-
-// Look up table: fast refresh, pixels which remain white
-static const uint8_t LUT_FAST_WW[] = {
-    0x01, 0x06, 0x03, 0x02, 0x81, 0x01, 0x01, //
-    0x01, 0x06, 0x02, 0x01, 0x01, 0x01, 0x01, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-};
-
-// Look up table: fast refresh, pixel which change from black to white
-static const uint8_t LUT_FAST_BW[] = {
-    0x01, 0x86, 0x83, 0x82, 0x81, 0x01, 0x01, //
-    0x01, 0x86, 0x82, 0x01, 0x01, 0x01, 0x01, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-};
-
-// Look up table: fash refresh, pixels which change from white to black
-static const uint8_t LUT_FAST_WB[] = {
-    0x01, 0x46, 0x42, 0x01, 0x01, 0x01, 0x01, //
-    0x01, 0x46, 0x42, 0x01, 0x01, 0x01, 0x01, //
-    0x01, 0x46, 0x43, 0x02, 0x01, 0x01, 0x01, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-};
-
-// Look up table: fash refresh, pixels which remain black
-static const uint8_t LUT_FAST_BB[] = {
-    0x01, 0x06, 0x03, 0x42, 0x41, 0x01, 0x01, //
-    0x01, 0x06, 0x02, 0x01, 0x01, 0x01, 0x01, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
-};
-
-LCMEN213EFC1::LCMEN213EFC1() : EInk(width, height, supported)
-{
-    // Pre-calculate size of the image buffer, for convenience
-
-    // Determine the X dimension of the image buffer, in bytes.
-    // Along rows, pixels are stored 8 per byte.
-    // Not all display widths are divisible by 8. Need to make sure bytecount accommodates padding for these.
-    bufferRowSize = ((width - 1) / 8) + 1;
-
-    // Total size of image buffer, in bytes.
-    bufferSize = bufferRowSize * height;
-}
-
-void LCMEN213EFC1::begin(SPIClass *spi, uint8_t pin_dc, uint8_t pin_cs, uint8_t pin_busy, uint8_t pin_rst)
-{
-    this->spi = spi;
-    this->pin_dc = pin_dc;
-    this->pin_cs = pin_cs;
-    this->pin_busy = pin_busy;
-    this->pin_rst = pin_rst;
-
-    pinMode(pin_dc, OUTPUT);
-    pinMode(pin_cs, OUTPUT);
-    pinMode(pin_busy, INPUT);
-
-    // Reset is active low, hold high
-    pinMode(pin_rst, INPUT_PULLUP);
-
-    reset();
-}
-
-void LCMEN213EFC1::update(uint8_t *imageData, UpdateTypes type)
-{
-    this->updateType = type;
-    this->buffer = imageData;
-
-    reset();
-
-    // Config
-    if (updateType == FULL)
-        configFull();
-    else
-        configFast();
-
-    // Transfer image data
-    if (updateType == FULL) {
-        writeNewImage();
-        writeOldImage();
-    } else {
-        writeNewImage();
-    }
-
-    sendCommand(0x04); // Power on the panel voltage
-    wait();
-
-    sendCommand(0x12); // Begin executing the update
-
-    // Let the update run async, on display hardware. Base class will poll completion, then finalize.
-    // For a blocking update, call await after update
-    detachFromUpdate();
-}
-
-void LCMEN213EFC1::wait()
-{
-    // Busy when LOW
-    while (digitalRead(pin_busy) == LOW)
-        yield();
-}
-
-void LCMEN213EFC1::reset()
-{
-    pinMode(pin_rst, OUTPUT);
-    digitalWrite(pin_rst, LOW);
-    delay(10);
-    pinMode(pin_rst, INPUT_PULLUP);
-    wait();
-
-    sendCommand(0x12);
-    wait();
-}
-
-void LCMEN213EFC1::sendCommand(const uint8_t command)
-{
-    spi->beginTransaction(spiSettings);
-    digitalWrite(pin_dc, LOW); // DC pin low indicates command
-    digitalWrite(pin_cs, LOW);
-    spi->transfer(command);
-    digitalWrite(pin_cs, HIGH);
-    digitalWrite(pin_dc, HIGH);
-    spi->endTransaction();
-}
-
-void LCMEN213EFC1::sendData(uint8_t data)
-{
-    // spi->beginTransaction(spiSettings);
-    // digitalWrite(pin_dc, HIGH); // DC pin HIGH indicates data, instead of command
-    // digitalWrite(pin_cs, LOW);
-    // spi->transfer(data);
-    // digitalWrite(pin_cs, HIGH);
-    // digitalWrite(pin_dc, HIGH);
-    // spi->endTransaction();
-    sendData(&data, 1);
-}
-
-void LCMEN213EFC1::sendData(const uint8_t *data, uint32_t size)
-{
-    spi->beginTransaction(spiSettings);
-    digitalWrite(pin_dc, HIGH); // DC pin HIGH indicates data, instead of command
-    digitalWrite(pin_cs, LOW);
-
-    // Platform-specific SPI command
-    // Mothballing. This display model is only used by Heltec Wireless Paper (ESP32)
-#if defined(ARCH_ESP32)
-    spi->transferBytes(data, NULL, size); // NULL for a "write only" transfer
-#elif defined(ARCH_NRF52)
-    spi->transfer(data, NULL, size); // NULL for a "write only" transfer
-#else
-#error Not implemented yet? Feel free to add other platforms here.
-#endif
-
-    digitalWrite(pin_cs, HIGH);
-    digitalWrite(pin_dc, HIGH);
-    spi->endTransaction();
-}
-
-void LCMEN213EFC1::configFull()
-{
-    sendCommand(0x00); // Panel setting register
-    sendData(0b11 << 6 // Display resolution
-             | 1 << 4  // B&W only
-             | 1 << 3  // Vertical scan direction
-             | 1 << 2  // Horizontal scan direction
-             | 1 << 1  // Shutdown: no
-             | 1 << 0  // Reset: no
-    );
-
-    sendCommand(0x50);     // VCOM and data interval setting register
-    sendData(0b10 << 6     // Border driven white
-             | 0b11 << 4   // Invert image colors: no
-             | 0b0111 << 0 // Interval between VCOM on and image data (default)
-    );
-}
-
-void LCMEN213EFC1::configFast()
-{
-    sendCommand(0x00); // Panel setting register
-    sendData(0b11 << 6 // Display resolution
-             | 1 << 5  // LUT from registers (set below)
-             | 1 << 4  // B&W only
-             | 1 << 3  // Vertical scan direction
-             | 1 << 2  // Horizontal scan direction
-             | 1 << 1  // Shutdown: no
-             | 1 << 0  // Reset: no
-    );
-
-    sendCommand(0x50);     // VCOM and data interval setting register
-    sendData(0b11 << 6     // Border floating
-             | 0b01 << 4   // Invert image colors: no
-             | 0b0111 << 0 // Interval between VCOM on and image data (default)
-    );
-
-    // Load the various LUTs
-    sendCommand(0x20); // VCOM
-    sendData(LUT_FAST_VCOMDC, sizeof(LUT_FAST_VCOMDC));
-
-    sendCommand(0x21); // White -> White
-    sendData(LUT_FAST_WW, sizeof(LUT_FAST_WW));
-
-    sendCommand(0x22); // Black -> White
-    sendData(LUT_FAST_BW, sizeof(LUT_FAST_BW));
-
-    sendCommand(0x23); // White -> Black
-    sendData(LUT_FAST_WB, sizeof(LUT_FAST_WB));
-
-    sendCommand(0x24); // Black -> Black
-    sendData(LUT_FAST_BB, sizeof(LUT_FAST_BB));
-}
-
-void LCMEN213EFC1::writeNewImage()
-{
-    sendCommand(0x13);
-    sendData(buffer, bufferSize);
-}
-
-void LCMEN213EFC1::writeOldImage()
-{
-    sendCommand(0x10);
-    sendData(buffer, bufferSize);
-}
-
-void LCMEN213EFC1::detachFromUpdate()
-{
-    // To save power / cycles, displays can choose to specify an "expected duration" for various refresh types
-    // If we know a full-refresh takes at least 4 seconds, we can delay polling until 3 seconds have passed
-    // If not implemented, we'll just poll right from the get-go
-    switch (updateType) {
-    case FULL:
-        EInk::beginPolling(10, 3650);
-        break;
-    case FAST:
-        EInk::beginPolling(10, 720);
-        break;
-    default:
-        assert(false);
-    }
-}
-
-bool LCMEN213EFC1::isUpdateDone()
-{
-    // Busy when LOW
-    if (digitalRead(pin_busy) == LOW)
-        return false;
-    else
-        return true;
-}
-
-void LCMEN213EFC1::finalizeUpdate()
-{
-    // Power off the panel voltages
-    sendCommand(0x02);
-    wait();
-
-    // Put a copy of the image into the "old memory".
-    // Used with differential refreshes (e.g. FAST update), to determine which px need to move, and which can remain in place
-    // We need to keep the "old memory" up to date, because don't know whether next refresh will be FULL or FAST etc.
-    if (updateType != FULL) {
-        writeOldImage();
-        wait();
-    }
-}
-
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/EInk/LCMEN2R13EFC1.h

@@ -1,68 +0,0 @@
-/*
-
-E-Ink display driver
-    - LCMEN213EFC1
-    - Manufacturer: Wisevast
-    - Size: 2.13 inch
-    - Resolution: 122px x 250px
-    - Flex connector marking: HINK-E0213A162-FPC-A0 (Hidden, printed on back-side)
-
-Note: this display uses an uncommon controller IC, Fitipower JD79656.
-It is implemented as a "one-off", directly inheriting the EInk base class, unlike SSD16XX displays.
-
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "configuration.h"
-
-#include "./EInk.h"
-
-namespace NicheGraphics::Drivers
-{
-
-class LCMEN213EFC1 : public EInk
-{
-    // Display properties
-  private:
-    static constexpr uint32_t width = 122;
-    static constexpr uint32_t height = 250;
-    static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
-
-  public:
-    LCMEN213EFC1();
-    void begin(SPIClass *spi, uint8_t pin_dc, uint8_t pin_cs, uint8_t pin_busy, uint8_t pin_rst);
-    void update(uint8_t *imageData, UpdateTypes type) override;
-
-  protected:
-    void wait();
-    void reset();
-    void sendCommand(const uint8_t command);
-    void sendData(const uint8_t data);
-    void sendData(const uint8_t *data, uint32_t size);
-    void configFull(); // Configure display for FULL refresh
-    void configFast(); // Configure display for FAST refresh
-    void writeNewImage();
-    void writeOldImage();
-
-    void detachFromUpdate();
-    bool isUpdateDone();
-    void finalizeUpdate();
-
-  protected:
-    uint8_t bufferOffsetX; // In bytes. Panel x=0 does not always align with controller x=0. Quirky internal wiring?
-    uint8_t bufferRowSize; // In bytes. Rows store 8 pixels per byte. Rounded up to fit (e.g. 122px would require 16 bytes)
-    uint32_t bufferSize;   // In bytes. Rows * Columns
-    uint8_t *buffer;
-    UpdateTypes updateType;
-
-    uint8_t pin_dc, pin_cs, pin_busy, pin_rst;
-    SPIClass *spi;
-    SPISettings spiSettings = SPISettings(6000000, MSBFIRST, SPI_MODE0);
-};
-
-} // namespace NicheGraphics::Drivers
-
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/EInk/README.md

@@ -1,82 +0,0 @@
-# NicheGraphics - E-Ink Driver
-
-A driver for E-Ink SPI displays. Suitable for re-use by various NicheGraphics UIs.
-
-Your UI should use the class `NicheGraphics::Drivers::EInk` .
-When you set up a hardware variant, you will use one of specific display model classes, which extend the EInk class.
-
-An example setup might look like this:
-
-```cpp
-void setupNicheGraphics()
-{
-    using namespace NicheGraphics;
-
-    // An imaginary UI
-    YourCustomUI *yourUI = new YourCustomUI();
-
-    // Setup SPI
-    SPIClass *hspi = new SPIClass(HSPI);
-    hspi->begin(PIN_EINK_SCLK, -1, PIN_EINK_MOSI, PIN_EINK_CS);
-
-    // Setup Enk driver
-    Drivers::EInk *driver = new Drivers::DEPG0290BNS800;
-    driver->begin(hspi, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY);
-
-    // Pass the driver to your UI
-    YourUI::driver = driver;
-}
-```
-
-## Methods
-
-### `update(uint8_t *imageData, UpdateTypes type, bool async=true)`
-
-Update the image on the display
-
-- _`imageData`_ to draw to the display.
-- _`type`_ which type of update to perform.
-  - `FULL`
-  - `FAST`
-  - (Other custom types may be possible)
-- _`async`_ whether to wait for update to complete, or continue code execution
-
-The imageData is a 1-bit image. X-Pixels are 8-per byte, with the MSB being the leftmost pixel. This was not an InkHUD design decision; it is the raw format accepted by the E-Ink display controllers ICs.
-
-_To-do: add a helper method to `InkHUD::Drivers::EInk` to do this arithmetic for you._
-
-```cpp
-uint16_t w = driver::width();
-uint16_t h = driver::height();
-
-uint8_t image[ (w/8) * h ]; // X pixels are 8-per-byte
-
-image[0] |= (1 << 7); // Set pixel x=0, y=0
-image[0] |= (1 << 0); // Set pixel x=7, y=0
-image[1] |= (1 << 7); // Set pixel x=8, y=0
-
-uint8_t x = 12;
-uint8_t y = 2;
-uint8_t yBytes = y * (w/8);
-uint8_t xBytes = x / 8;
-uint8_t xBits = (7-x) % 8;
-image[yByte + xByte] |= (1 << xBits); // Set pixel x=12, y=2
-```
-
-### `supports(UpdateTypes type)`
-
-Check if display supports a specific update type. `true` if supported.
-
-- _`type`_ type to check
-
-### `busy()`
-
-Check if display is already performing an `update()`. `true` if already updating.
-
-### `width()`
-
-Width of the display, in pixels. Note: most displays are portait. Your UI will need to implement rotation in software.
-
-### `height()`
-
-Height of the display, in pixels. Note: most displays are portrait. Your UI will need to implement rotation in software.

src/graphics/niche/Drivers/EInk/SSD16XX.cpp

@@ -1,227 +0,0 @@
-#include "./SSD16XX.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-using namespace NicheGraphics::Drivers;
-
-SSD16XX::SSD16XX(uint16_t width, uint16_t height, UpdateTypes supported, uint8_t bufferOffsetX)
-    : EInk(width, height, supported), bufferOffsetX(bufferOffsetX)
-{
-    // Pre-calculate size of the image buffer, for convenience
-
-    // Determine the X dimension of the image buffer, in bytes.
-    // Along rows, pixels are stored 8 per byte.
-    // Not all display widths are divisible by 8. Need to make sure bytecount accommodates padding for these.
-    bufferRowSize = ((width - 1) / 8) + 1;
-
-    // Total size of image buffer, in bytes.
-    bufferSize = bufferRowSize * height;
-}
-
-void SSD16XX::begin(SPIClass *spi, uint8_t pin_dc, uint8_t pin_cs, uint8_t pin_busy, uint8_t pin_rst)
-{
-    this->spi = spi;
-    this->pin_dc = pin_dc;
-    this->pin_cs = pin_cs;
-    this->pin_busy = pin_busy;
-    this->pin_rst = pin_rst;
-
-    pinMode(pin_dc, OUTPUT);
-    pinMode(pin_cs, OUTPUT);
-    pinMode(pin_busy, INPUT);
-
-    // If using a reset pin, hold high
-    // Reset is active low for solmon systech ICs
-    if (pin_rst != 0xFF)
-        pinMode(pin_rst, INPUT_PULLUP);
-
-    reset();
-}
-
-void SSD16XX::wait()
-{
-    // Busy when HIGH
-    while (digitalRead(pin_busy) == HIGH)
-        yield();
-}
-
-void SSD16XX::reset()
-{
-    // Check if reset pin is defined
-    if (pin_rst != 0xFF) {
-        pinMode(pin_rst, OUTPUT);
-        digitalWrite(pin_rst, LOW);
-        delay(50);
-        pinMode(pin_rst, INPUT_PULLUP);
-        wait();
-    }
-
-    sendCommand(0x12);
-    wait();
-}
-
-void SSD16XX::sendCommand(const uint8_t command)
-{
-    spi->beginTransaction(spiSettings);
-    digitalWrite(pin_dc, LOW); // DC pin low indicates command
-    digitalWrite(pin_cs, LOW);
-    spi->transfer(command);
-    digitalWrite(pin_cs, HIGH);
-    digitalWrite(pin_dc, HIGH);
-    spi->endTransaction();
-}
-
-void SSD16XX::sendData(uint8_t data)
-{
-    // spi->beginTransaction(spiSettings);
-    // digitalWrite(pin_dc, HIGH); // DC pin HIGH indicates data, instead of command
-    // digitalWrite(pin_cs, LOW);
-    // spi->transfer(data);
-    // digitalWrite(pin_cs, HIGH);
-    // digitalWrite(pin_dc, HIGH);
-    // spi->endTransaction();
-    sendData(&data, 1);
-}
-
-void SSD16XX::sendData(const uint8_t *data, uint32_t size)
-{
-    spi->beginTransaction(spiSettings);
-    digitalWrite(pin_dc, HIGH); // DC pin HIGH indicates data, instead of command
-    digitalWrite(pin_cs, LOW);
-
-    // Platform-specific SPI command
-#if defined(ARCH_ESP32)
-    spi->transferBytes(data, NULL, size); // NULL for a "write only" transfer
-#elif defined(ARCH_NRF52)
-    spi->transfer(data, NULL, size); // NULL for a "write only" transfer
-#else
-#error Not implemented yet? Feel free to add other platforms here.
-#endif
-
-    digitalWrite(pin_cs, HIGH);
-    digitalWrite(pin_dc, HIGH);
-    spi->endTransaction();
-}
-
-void SSD16XX::configFullscreen()
-{
-    // Placing this code in a separate method because it's probably pretty consistent between displays
-    // Should make it tidier to override SSD16XX::configure
-
-    // Define the boundaries of the "fullscreen" region, for the controller IC
-    static const uint16_t sx = bufferOffsetX; // Notice the offset
-    static const uint16_t sy = 0;
-    static const uint16_t ex = bufferRowSize + bufferOffsetX - 1; // End is "max index", not "count". Minus 1 handles this
-    static const uint16_t ey = height;
-
-    // Split into bytes
-    static const uint8_t sy1 = sy & 0xFF;
-    static const uint8_t sy2 = (sy >> 8) & 0xFF;
-    static const uint8_t ey1 = ey & 0xFF;
-    static const uint8_t ey2 = (ey >> 8) & 0xFF;
-
-    // Data entry mode - Left to Right, Top to Bottom
-    sendCommand(0x11);
-    sendData(0x03);
-
-    // Select controller IC memory region to display a fullscreen image
-    sendCommand(0x44); // Memory X start - end
-    sendData(sx);
-    sendData(ex);
-    sendCommand(0x45); // Memory Y start - end
-    sendData(sy1);
-    sendData(sy2);
-    sendData(ey1);
-    sendData(ey2);
-
-    // Place the cursor at the start of this memory region, ready to send image data x=0 y=0
-    sendCommand(0x4E); // Memory cursor X
-    sendData(sx);
-    sendCommand(0x4F); // Memory cursor y
-    sendData(sy1);
-    sendData(sy2);
-}
-
-void SSD16XX::update(uint8_t *imageData, UpdateTypes type)
-{
-    this->updateType = type;
-    this->buffer = imageData;
-
-    reset();
-
-    configFullscreen();
-    configScanning(); // Virtual, unused by base class
-    configVoltages(); // Virtual, unused by base class
-    configWaveform(); // Virtual, unused by base class
-    wait();
-
-    if (updateType == FULL) {
-        writeNewImage();
-        writeOldImage();
-    } else {
-        writeNewImage();
-    }
-
-    configUpdateSequence();
-    sendCommand(0x20); // Begin executing the update
-
-    // Let the update run async, on display hardware. Base class will poll completion, then finalize.
-    // For a blocking update, call await after update
-    detachFromUpdate();
-}
-
-// Send SPI commands for controller IC to begin executing the refresh operation
-void SSD16XX::configUpdateSequence()
-{
-    switch (updateType) {
-    default:
-        sendCommand(0x22); // Set "update sequence"
-        sendData(0xF7);    // Non-differential, load waveform from OTP
-        break;
-    }
-}
-
-void SSD16XX::writeNewImage()
-{
-    sendCommand(0x24);
-    sendData(buffer, bufferSize);
-}
-
-void SSD16XX::writeOldImage()
-{
-    sendCommand(0x26);
-    sendData(buffer, bufferSize);
-}
-
-void SSD16XX::detachFromUpdate()
-{
-    // To save power / cycles, displays can choose to specify an "expected duration" for various refresh types
-    // If we know a full-refresh takes at least 4 seconds, we can delay polling until 3 seconds have passed
-    // If not implemented, we'll just poll right from the get-go
-    switch (updateType) {
-    default:
-        EInk::beginPolling(100, 0);
-    }
-}
-
-bool SSD16XX::isUpdateDone()
-{
-    // Busy when HIGH
-    if (digitalRead(pin_busy) == HIGH)
-        return false;
-    else
-        return true;
-}
-
-void SSD16XX::finalizeUpdate()
-{
-    // Put a copy of the image into the "old memory".
-    // Used with differential refreshes (e.g. FAST update), to determine which px need to move, and which can remain in place
-    // We need to keep the "old memory" up to date, because don't know whether next refresh will be FULL or FAST etc.
-    if (updateType != FULL) {
-        writeNewImage(); // Only required by some controller variants. Todo: Override just for GDEY0154D678?
-        writeOldImage();
-        sendCommand(0x7F); // Terminate image write without update
-        wait();
-    }
-}
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/EInk/SSD16XX.h

@@ -1,62 +0,0 @@
-/*
-
-E-Ink base class for displays based on SSD16XX
-
-Most (but not all) SPI E-Ink displays use this family of controller IC.
-Implementing new SSD16XX displays should be fairly painless.
-See DEPG0154BNS800 and DEPG0290BNS800 for examples.
-
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "configuration.h"
-
-#include "./EInk.h"
-
-namespace NicheGraphics::Drivers
-{
-
-class SSD16XX : public EInk
-{
-  public:
-    SSD16XX(uint16_t width, uint16_t height, UpdateTypes supported, uint8_t bufferOffsetX = 0);
-    virtual void begin(SPIClass *spi, uint8_t pin_dc, uint8_t pin_cs, uint8_t pin_busy, uint8_t pin_rst = -1);
-    virtual void update(uint8_t *imageData, UpdateTypes type) override;
-
-  protected:
-    virtual void wait();
-    virtual void reset();
-    virtual void sendCommand(const uint8_t command);
-    virtual void sendData(const uint8_t data);
-    virtual void sendData(const uint8_t *data, uint32_t size);
-    virtual void configFullscreen();     // Select memory region on controller IC
-    virtual void configScanning() {}     // Optional. First & last gates, scan direction, etc
-    virtual void configVoltages() {}     // Optional. Manual panel voltages, soft-start, etc
-    virtual void configWaveform() {}     // Optional. LUT, panel border, temperature sensor, etc
-    virtual void configUpdateSequence(); // Tell controller IC which operations to run
-
-    virtual void writeNewImage();
-    virtual void writeOldImage();
-
-    virtual void detachFromUpdate();
-    virtual bool isUpdateDone() override;
-    virtual void finalizeUpdate() override;
-
-  protected:
-    uint8_t bufferOffsetX; // In bytes. Panel x=0 does not always align with controller x=0. Quirky internal wiring?
-    uint8_t bufferRowSize; // In bytes. Rows store 8 pixels per byte. Rounded up to fit (e.g. 122px would require 16 bytes)
-    uint32_t bufferSize;   // In bytes. Rows * Columns
-    uint8_t *buffer;
-    UpdateTypes updateType;
-
-    uint8_t pin_dc, pin_cs, pin_busy, pin_rst;
-    SPIClass *spi;
-    SPISettings spiSettings = SPISettings(4000000, MSBFIRST, SPI_MODE0);
-};
-
-} // namespace NicheGraphics::Drivers
-
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

src/graphics/niche/Drivers/README.md

@@ -1,3 +0,0 @@
-# NicheGraphics - Drivers
-
-Common drivers which can be used by various NicheGrapihcs UIs

src/graphics/niche/FlashData.h

@@ -1,140 +0,0 @@
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-/*
-
-Re-usable NicheGraphics tool
-
-Save settings / data to flash, without use of the Meshtastic Protobufs
-Avoid bloating everyone's protobuf code for our one-off UI implementations
-
-*/
-
-#pragma once
-
-#include "configuration.h"
-
-#include "SafeFile.h"
-
-namespace NicheGraphics
-{
-
-template <typename T> class FlashData
-{
-  private:
-    static std::string getFilename(const char *label)
-    {
-        std::string filename;
-        filename += "/NicheGraphics";
-        filename += "/";
-        filename += label;
-        filename += ".data";
-
-        return filename;
-    }
-
-    static uint32_t getHash(T *data)
-    {
-        uint32_t hash = 0;
-
-        // Sum all bytes of the image buffer together
-        for (uint32_t i = 0; i < sizeof(T); i++)
-            hash ^= ((uint8_t *)data)[i] + 1;
-
-        return hash;
-    }
-
-  public:
-    static bool load(T *data, const char *label)
-    {
-        // Set false if we run into issues
-        bool okay = true;
-
-        // Get a filename based on the label
-        std::string filename = getFilename(label);
-
-#ifdef FSCom
-
-        // Check that the file *does* actually exist
-        if (!FSCom.exists(filename.c_str())) {
-            LOG_WARN("'%s' not found. Using default values", filename.c_str());
-            okay = false;
-            return okay;
-        }
-
-        // Open the file
-        auto f = FSCom.open(filename.c_str(), FILE_O_READ);
-
-        // If opened, start reading
-        if (f) {
-            LOG_INFO("Loading NicheGraphics data '%s'", filename.c_str());
-
-            // Create an object which will received data from flash
-            // We read here first, so we can verify the checksum, without committing to overwriting the *data object
-            // Allows us to retain any defaults that might be set after we declared *data, but before loading settings,
-            // in case the flash values are corrupt
-            T flashData;
-
-            // Read the actual data
-            f.readBytes((char *)&flashData, sizeof(T));
-
-            // Read the hash
-            uint32_t savedHash = 0;
-            f.readBytes((char *)&savedHash, sizeof(savedHash));
-
-            // Calculate hash of the loaded data, then compare with the saved hash
-            // If hash looks good, copy the values to the main data object
-            uint32_t calculatedHash = getHash(&flashData);
-            if (savedHash != calculatedHash) {
-                LOG_WARN("'%s' is corrupt (hash mismatch). Using default values", filename.c_str());
-                okay = false;
-            } else
-                *data = flashData;
-
-            f.close();
-        } else {
-            LOG_ERROR("Could not open / read %s", filename.c_str());
-            okay = false;
-        }
-#else
-        LOG_ERROR("Filesystem not implemented");
-        state = LoadFileState::NO_FILESYSTEM;
-        okay = false;
-#endif
-        return okay;
-    }
-
-    // Save module's custom data (settings?) to flash. Does use protobufs
-    static void save(T *data, const char *label)
-    {
-        // Get a filename based on the label
-        std::string filename = getFilename(label);
-
-#ifdef FSCom
-        FSCom.mkdir("/NicheGraphics");
-
-        auto f = SafeFile(filename.c_str(), true); // "true": full atomic. Write new data to temp file, then rename.
-
-        LOG_INFO("Saving %s", filename.c_str());
-
-        // Calculate a hash of the data
-        uint32_t hash = getHash(data);
-
-        f.write((uint8_t *)data, sizeof(T));     // Write the actualy data
-        f.write((uint8_t *)&hash, sizeof(hash)); // Append the hash
-
-        // f.flush();
-
-        bool writeSucceeded = f.close();
-
-        if (!writeSucceeded) {
-            LOG_ERROR("Can't write data!");
-        }
-#else
-        LOG_ERROR("ERROR: Filesystem not implemented\n");
-#endif
-    }
-};
-
-} // namespace NicheGraphics
-
-#endif

src/graphics/niche/Fonts/FreeSans6pt7b.h

@@ -1,129 +0,0 @@
-#pragma once
-
-const uint8_t FreeSans6pt7bBitmaps[] PROGMEM = {
-    0xAA, 0xA8, 0xC0, 0xF6, 0xA0, 0x24, 0x51, 0xF9, 0x42, 0x9F, 0x92, 0x28, 0x10, 0xE5, 0x55, 0x50, 0xE1, 0x65, 0x55, 0xE1, 0x00,
-    0x71, 0x24, 0x89, 0x22, 0x50, 0x74, 0x02, 0x70, 0xA4, 0x49, 0x11, 0xC0, 0x70, 0x91, 0x23, 0x86, 0x12, 0xA2, 0x4E, 0xF4, 0xE0,
-    0x5A, 0xAA, 0x94, 0x89, 0x12, 0x49, 0x29, 0x00, 0x27, 0x50, 0x21, 0x3E, 0x42, 0x00, 0xE0, 0xC0, 0x80, 0x24, 0xA4, 0xA4, 0x80,
-    0x74, 0xE3, 0x18, 0xC6, 0x33, 0x70, 0x27, 0x92, 0x49, 0x20, 0x79, 0x10, 0x41, 0x08, 0xC6, 0x10, 0xFC, 0x79, 0x30, 0x43, 0x18,
-    0x10, 0x71, 0x78, 0x08, 0x61, 0x8A, 0x49, 0x2F, 0xC2, 0x08, 0x7D, 0x04, 0x1E, 0x44, 0x10, 0x51, 0x78, 0x74, 0x61, 0xE8, 0xC6,
-    0x31, 0x70, 0xF8, 0x44, 0x22, 0x11, 0x08, 0x40, 0x39, 0x34, 0x53, 0x39, 0x1C, 0x51, 0x38, 0x39, 0x3C, 0x71, 0x4C, 0xF0, 0x53,
-    0x78, 0x82, 0x87, 0x01, 0xF1, 0x83, 0x04, 0xF8, 0x3E, 0x07, 0x06, 0x36, 0x40, 0x74, 0x42, 0x11, 0x10, 0x80, 0x20, 0x0F, 0x86,
-    0x19, 0x9A, 0xA4, 0xD9, 0x13, 0x22, 0x56, 0xDA, 0x6E, 0x60, 0x06, 0x00, 0x3C, 0x00, 0x18, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42,
-    0x42, 0xC3, 0xFA, 0x18, 0x61, 0xFA, 0x18, 0x61, 0xFC, 0x3E, 0x63, 0x40, 0x40, 0xC0, 0x40, 0x41, 0x63, 0x3E, 0xF9, 0x0A, 0x1C,
-    0x18, 0x30, 0x61, 0xC2, 0xF8, 0xFE, 0x08, 0x20, 0xFE, 0x08, 0x20, 0xFC, 0xFE, 0x08, 0x20, 0xFA, 0x08, 0x20, 0x80, 0x1E, 0x61,
-    0x40, 0x40, 0xC7, 0x41, 0x41, 0x63, 0x1D, 0x83, 0x06, 0x0C, 0x1F, 0xF0, 0x60, 0xC1, 0x82, 0xFF, 0x80, 0x08, 0x42, 0x10, 0x87,
-    0x29, 0x70, 0x85, 0x12, 0x45, 0x0D, 0x13, 0x22, 0x42, 0x86, 0x84, 0x21, 0x08, 0x42, 0x10, 0xF8, 0xC3, 0xC3, 0xC3, 0xA5, 0xA5,
-    0xA5, 0x99, 0x99, 0x99, 0x83, 0x86, 0x8D, 0x19, 0x33, 0x62, 0xC3, 0x86, 0x1E, 0x31, 0x90, 0x68, 0x1C, 0x0A, 0x05, 0x06, 0xC6,
-    0x1E, 0x00, 0xFA, 0x18, 0x61, 0xFA, 0x08, 0x20, 0x80, 0x1E, 0x31, 0x90, 0x68, 0x1C, 0x0A, 0x05, 0x06, 0xC6, 0x1F, 0x00, 0x00,
-    0xFD, 0x0E, 0x1C, 0x2F, 0x90, 0xA1, 0x42, 0x86, 0x7A, 0x18, 0x30, 0x78, 0x38, 0x61, 0x78, 0xFE, 0x20, 0x40, 0x81, 0x02, 0x04,
-    0x08, 0x10, 0x83, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xE2, 0x78, 0xC2, 0x42, 0x42, 0x64, 0x24, 0x24, 0x38, 0x18, 0x18, 0xC4, 0x28,
-    0xCD, 0x29, 0x25, 0x24, 0xA4, 0x52, 0x8C, 0x61, 0x8C, 0x31, 0x80, 0x42, 0x66, 0x24, 0x18, 0x18, 0x18, 0x24, 0x46, 0x42, 0xC3,
-    0x42, 0x24, 0x34, 0x18, 0x08, 0x08, 0x08, 0x08, 0x7E, 0x0C, 0x30, 0x41, 0x06, 0x18, 0x20, 0xFE, 0xEA, 0xAA, 0xAB, 0x92, 0x24,
-    0x89, 0x20, 0xE9, 0x24, 0x92, 0x49, 0x70, 0x46, 0xA9, 0x10, 0xFE, 0x40, 0x79, 0x20, 0x4F, 0xC6, 0x37, 0x40, 0x84, 0x3D, 0x18,
-    0xC6, 0x31, 0xF0, 0x39, 0x3C, 0x20, 0xC1, 0x33, 0x80, 0x04, 0x13, 0xD3, 0xC6, 0x1C, 0x53, 0x3C, 0x39, 0x38, 0x7F, 0x81, 0x13,
-    0x80, 0x6B, 0xA4, 0x92, 0x40, 0x35, 0x3C, 0x61, 0xC5, 0x33, 0x41, 0x4D, 0xE0, 0x84, 0x3D, 0x38, 0xC6, 0x31, 0x88, 0xBF, 0x80,
-    0x45, 0x55, 0x57, 0x84, 0x25, 0x4E, 0x52, 0xD2, 0x88, 0xFF, 0x80, 0xF7, 0x99, 0x91, 0x91, 0x91, 0x91, 0x91, 0xF4, 0x63, 0x18,
-    0xC6, 0x20, 0x39, 0x3C, 0x61, 0xC5, 0x33, 0x80, 0xF4, 0x63, 0x18, 0xC7, 0xD0, 0x80, 0x3D, 0x3C, 0x61, 0xC5, 0x37, 0x41, 0x04,
-    0xF2, 0x49, 0x20, 0x79, 0x24, 0x1C, 0x0B, 0x27, 0x80, 0x5D, 0x24, 0x93, 0x8C, 0x63, 0x18, 0xCF, 0xA0, 0x85, 0x24, 0x92, 0x30,
-    0xC3, 0x00, 0x89, 0x2C, 0x96, 0x4A, 0xA5, 0x61, 0x30, 0x98, 0x49, 0x23, 0x08, 0x31, 0x2C, 0x80, 0x89, 0x24, 0x94, 0x50, 0xC2,
-    0x08, 0x21, 0x00, 0x78, 0x44, 0x46, 0x23, 0xE0, 0x6A, 0xAA, 0xA9, 0xFF, 0xE0, 0x95, 0x55, 0x56, 0x66, 0x60};
-
-const GFXglyph FreeSans6pt7bGlyphs[] PROGMEM = {{0, 0, 0, 3, 0, 1},       // 0x20 ' '
-                                                {0, 2, 9, 4, 1, -8},      // 0x21 '!'
-                                                {3, 4, 3, 4, 0, -8},      // 0x22 '"'
-                                                {5, 7, 8, 7, 0, -7},      // 0x23 '#'
-                                                {12, 6, 11, 7, 0, -9},    // 0x24 '$'
-                                                {21, 10, 9, 11, 0, -8},   // 0x25 '%'
-                                                {33, 7, 9, 8, 1, -8},     // 0x26 '&'
-                                                {41, 1, 3, 2, 1, -8},     // 0x27 '''
-                                                {42, 2, 11, 4, 1, -8},    // 0x28 '('
-                                                {45, 3, 11, 4, 0, -8},    // 0x29 ')'
-                                                {50, 4, 3, 5, 0, -8},     // 0x2A '*'
-                                                {52, 5, 5, 7, 1, -4},     // 0x2B '+'
-                                                {56, 1, 3, 3, 1, 0},      // 0x2C ','
-                                                {57, 2, 1, 4, 1, -3},     // 0x2D '-'
-                                                {58, 1, 1, 3, 1, 0},      // 0x2E '.'
-                                                {59, 3, 9, 3, 0, -8},     // 0x2F '/'
-                                                {63, 5, 9, 7, 1, -8},     // 0x30 '0'
-                                                {69, 3, 9, 7, 1, -8},     // 0x31 '1'
-                                                {73, 6, 9, 7, 0, -8},     // 0x32 '2'
-                                                {80, 6, 9, 7, 0, -8},     // 0x33 '3'
-                                                {87, 6, 9, 7, 0, -8},     // 0x34 '4'
-                                                {94, 6, 9, 7, 0, -8},     // 0x35 '5'
-                                                {101, 5, 9, 7, 1, -8},    // 0x36 '6'
-                                                {107, 5, 9, 7, 1, -8},    // 0x37 '7'
-                                                {113, 6, 9, 7, 0, -8},    // 0x38 '8'
-                                                {120, 6, 9, 7, 0, -8},    // 0x39 '9'
-                                                {127, 1, 7, 3, 1, -6},    // 0x3A ':'
-                                                {128, 1, 8, 3, 1, -5},    // 0x3B ';'
-                                                {129, 5, 6, 7, 1, -5},    // 0x3C '<'
-                                                {133, 5, 3, 7, 1, -3},    // 0x3D '='
-                                                {135, 5, 6, 7, 1, -5},    // 0x3E '>'
-                                                {139, 5, 9, 7, 1, -8},    // 0x3F '?'
-                                                {145, 11, 11, 12, 0, -8}, // 0x40 '@'
-                                                {161, 8, 9, 8, 0, -8},    // 0x41 'A'
-                                                {170, 6, 9, 8, 1, -8},    // 0x42 'B'
-                                                {177, 8, 9, 9, 0, -8},    // 0x43 'C'
-                                                {186, 7, 9, 8, 1, -8},    // 0x44 'D'
-                                                {194, 6, 9, 8, 1, -8},    // 0x45 'E'
-                                                {201, 6, 9, 7, 1, -8},    // 0x46 'F'
-                                                {208, 8, 9, 9, 0, -8},    // 0x47 'G'
-                                                {217, 7, 9, 9, 1, -8},    // 0x48 'H'
-                                                {225, 1, 9, 3, 1, -8},    // 0x49 'I'
-                                                {227, 5, 9, 6, 0, -8},    // 0x4A 'J'
-                                                {233, 7, 9, 8, 1, -8},    // 0x4B 'K'
-                                                {241, 5, 9, 7, 1, -8},    // 0x4C 'L'
-                                                {247, 8, 9, 10, 1, -8},   // 0x4D 'M'
-                                                {256, 7, 9, 9, 1, -8},    // 0x4E 'N'
-                                                {264, 9, 9, 9, 0, -8},    // 0x4F 'O'
-                                                {275, 6, 9, 8, 1, -8},    // 0x50 'P'
-                                                {282, 9, 10, 9, 0, -8},   // 0x51 'Q'
-                                                {294, 7, 9, 9, 1, -8},    // 0x52 'R'
-                                                {302, 6, 9, 8, 1, -8},    // 0x53 'S'
-                                                {309, 7, 9, 8, 0, -8},    // 0x54 'T'
-                                                {317, 7, 9, 9, 1, -8},    // 0x55 'U'
-                                                {325, 8, 9, 8, 0, -8},    // 0x56 'V'
-                                                {334, 11, 9, 11, 0, -8},  // 0x57 'W'
-                                                {347, 8, 9, 8, 0, -8},    // 0x58 'X'
-                                                {356, 8, 9, 8, 0, -8},    // 0x59 'Y'
-                                                {365, 7, 9, 7, 0, -8},    // 0x5A 'Z'
-                                                {373, 2, 12, 3, 1, -8},   // 0x5B '['
-                                                {376, 3, 9, 3, 0, -8},    // 0x5C '\'
-                                                {380, 3, 12, 3, 0, -8},   // 0x5D ']'
-                                                {385, 4, 5, 6, 1, -8},    // 0x5E '^'
-                                                {388, 7, 1, 7, 0, 2},     // 0x5F '_'
-                                                {389, 3, 1, 3, 0, -8},    // 0x60 '`'
-                                                {390, 6, 7, 7, 0, -6},    // 0x61 'a'
-                                                {396, 5, 9, 7, 1, -8},    // 0x62 'b'
-                                                {402, 6, 7, 6, 0, -6},    // 0x63 'c'
-                                                {408, 6, 9, 7, 0, -8},    // 0x64 'd'
-                                                {415, 6, 7, 6, 0, -6},    // 0x65 'e'
-                                                {421, 3, 9, 3, 0, -8},    // 0x66 'f'
-                                                {425, 6, 10, 7, 0, -6},   // 0x67 'g'
-                                                {433, 5, 9, 6, 1, -8},    // 0x68 'h'
-                                                {439, 1, 9, 3, 1, -8},    // 0x69 'i'
-                                                {441, 2, 12, 3, 0, -8},   // 0x6A 'j'
-                                                {444, 5, 9, 6, 1, -8},    // 0x6B 'k'
-                                                {450, 1, 9, 3, 1, -8},    // 0x6C 'l'
-                                                {452, 8, 7, 10, 1, -6},   // 0x6D 'm'
-                                                {459, 5, 7, 6, 1, -6},    // 0x6E 'n'
-                                                {464, 6, 7, 6, 0, -6},    // 0x6F 'o'
-                                                {470, 5, 9, 7, 1, -6},    // 0x70 'p'
-                                                {476, 6, 9, 7, 0, -6},    // 0x71 'q'
-                                                {483, 3, 7, 4, 1, -6},    // 0x72 'r'
-                                                {486, 6, 7, 6, 0, -6},    // 0x73 's'
-                                                {492, 3, 8, 3, 0, -7},    // 0x74 't'
-                                                {495, 5, 7, 6, 1, -6},    // 0x75 'u'
-                                                {500, 6, 7, 6, 0, -6},    // 0x76 'v'
-                                                {506, 9, 7, 9, 0, -6},    // 0x77 'w'
-                                                {514, 6, 7, 6, 0, -6},    // 0x78 'x'
-                                                {520, 6, 10, 6, 0, -6},   // 0x79 'y'
-                                                {528, 5, 7, 6, 0, -6},    // 0x7A 'z'
-                                                {533, 2, 12, 4, 1, -8},   // 0x7B '{'
-                                                {536, 1, 11, 3, 1, -8},   // 0x7C '|'
-                                                {538, 2, 12, 4, 1, -8},   // 0x7D '}'
-                                                {541, 6, 2, 6, 0, -4}};   // 0x7E '~'
-
-const GFXfont FreeSans6pt7b PROGMEM = {(uint8_t *)FreeSans6pt7bBitmaps, (GFXglyph *)FreeSans6pt7bGlyphs, 0x20, 0x7E, 14};
-
-// Approx. 1215 bytes