Add libuv to GitHub Actions

Allows anyone to test the PR

.github/ISSUE_TEMPLATE/Bug Report.yml

@@ -72,15 +72,6 @@ body:
     validations:
       required: true
 
-  - type: checkboxes
-    id: mui
-    attributes:
-      label: Is this bug report about any UI component firmware like InkHUD or Meshtatic UI (MUI)?
-      options:
-        - label: Meshtastic UI aka MUI colorTFT
-        - label: InkHUD ePaper
-        - label: OLED slide UI on any display
-
   - type: input
     id: version
     attributes:

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

@@ -43,13 +43,6 @@ runs:
       id: base
       uses: ./.github/actions/setup-base
 
-    - name: Get web ui version
-      if: inputs.include-web-ui == 'true'
-      id: webver
-      shell: bash
-      run: |
-        echo "ver=$(cat bin/web.version)" >> $GITHUB_OUTPUT
-
     - name: Pull web ui
       if: inputs.include-web-ui == 'true'
       uses: dsaltares/fetch-gh-release-asset@master
@@ -58,7 +51,7 @@ runs:
         file: build.tar
         target: build.tar
         token: ${{ inputs.github_token }}
-        version: tags/v${{ steps.webver.outputs.ver }}
+        version: tags/v2.5.3
 
     - name: Unpack web ui
       if: inputs.include-web-ui == 'true'

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

@@ -20,7 +20,7 @@ runs:
       shell: bash
       run: |
         sudo apt-get -y update --fix-missing
-        sudo apt-get install -y cppcheck libbluetooth-dev libgpiod-dev libyaml-cpp-dev lsb-release
+        sudo apt-get install -y cppcheck libbluetooth-dev libgpiod-dev libyaml-cpp-dev libuv1-dev lsb-release
 
     - name: Setup Python
       uses: actions/setup-python@v5

.github/dependabot.yml

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

.github/pull_request_template.md

@@ -1,6 +1,7 @@
-## 🙏 Thank you for sending in a pull request, here's some tips to get started!
-
 ### ❌ (Please delete all these tips and replace them with your text) ❌
+
+## Thank you for sending in a pull request, here's some tips to get started!
+
 - Before starting on some new big chunk of code, it it is optional but highly recommended to open an issue first
   to say "Hey, I think this idea X should be implemented and I'm starting work on it. My general plan is Y, any feedback
   is appreciated." This will allow other devs to potentially save you time by not accidentially duplicating work etc...
@@ -11,17 +12,4 @@
 - If your PR fixes a bug, mention "fixes #bugnum" somewhere in your pull request description.
 - If your other co-developers have comments on your PR please tweak as needed.
 - Please also enable "Allow edits by maintainers".
-- Please do not submit untested code.
-- If you do not have the affected hardware to test your code changes adequately against regressions, please indicate this, so that contributors and commnunity members can help test your changes.
 - If your PR gets accepted you can request a "Contributor" role in the Meshtastic Discord
-
-
-## 🤝 Attestations
-- [ ] I have tested that my proposed changes behave as described.
-- [ ] I have tested that my proposed changes do not cause any obvious regressions on the following devices:
-  - [ ] Heltec (Lora32) V3
-  - [ ] LilyGo T-Deck 
-  - [ ] LilyGo T-Beam
-  - [ ] RAK WisBlock 4631
-  - [ ] Seeed Studio T-1000E tracker card
-  - [ ] Other (please specify below)

.github/workflows/docker_build.yml

@@ -26,11 +26,6 @@ on:
         required: false
         type: boolean
         default: false
-      pio_env:
-        description: PlatformIO environment to build
-        required: false
-        type: string
-        default: native
     outputs:
       digest:
         description: Digest of built image
@@ -95,5 +90,3 @@ jobs:
           push: ${{ inputs.push }}
           tags: ${{ steps.meta.outputs.tags }} # Tag is only meant to be consumed by the "manifest" job
           platforms: ${{ inputs.platform }}
-          build-args: |
-            PIO_ENV=${{ inputs.pio_env }}

.github/workflows/main_matrix.yml

@@ -5,20 +5,14 @@ concurrency:
 on:
   # # Triggers the workflow on push but only for the master branch
   push:
-    branches:
+    branches: [master, develop]
-      - master
-      - develop
-      - event/*
     paths-ignore:
       - "**.md"
       - version.properties
 
   # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
   pull_request_target:
-    branches:
+    branches: [master, develop]
-      - master
-      - develop
-      - event/*
     paths-ignore:
       - "**.md"
       #- "**.yml"
@@ -38,12 +32,12 @@ jobs:
         name: Checkout base
       - id: jsonStep
         run: |
-          if [[ "$GITHUB_HEAD_REF" == "" ]]; then
+          if [[ "${{ github.head_ref }}" == "" ]]; then
             TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
           else  
             TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} quick)
           fi
-          echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF Targets: $TARGETS"
+          echo "Name: ${{ github.ref_name }} Base: ${{ github.base_ref }} } Ref: ${{ github.ref }} Targets: $TARGETS"
           echo "${{matrix.arch}}=$(jq -cn --argjson environments "$TARGETS" '{board: $environments}')" >> $GITHUB_OUTPUT
     outputs:
       esp32: ${{ steps.jsonStep.outputs.esp32 }}
@@ -151,7 +145,7 @@ jobs:
   test-native:
     uses: ./.github/workflows/test_native.yml
 
-  docker-deb-amd64:
+  docker-debian-amd64:
     uses: ./.github/workflows/docker_build.yml
     with:
       distro: debian
@@ -159,16 +153,7 @@ jobs:
       runs-on: ubuntu-24.04
       push: false
 
-  docker-deb-amd64-tft:
+  docker-alpine-amd64:
-    uses: ./.github/workflows/docker_build.yml
-    with:
-      distro: debian
-      platform: linux/amd64
-      runs-on: ubuntu-24.04
-      push: false
-      pio_env: native-tft
-
-  docker-alp-amd64:
     uses: ./.github/workflows/docker_build.yml
     with:
       distro: alpine
@@ -176,16 +161,7 @@ jobs:
       runs-on: ubuntu-24.04
       push: false
 
-  docker-alp-amd64-tft:
+  docker-debian-arm64:
-    uses: ./.github/workflows/docker_build.yml
-    with:
-      distro: alpine
-      platform: linux/amd64
-      runs-on: ubuntu-24.04
-      push: false
-      pio_env: native-tft
-
-  docker-deb-arm64:
     uses: ./.github/workflows/docker_build.yml
     with:
       distro: debian
@@ -193,7 +169,7 @@ jobs:
       runs-on: ubuntu-24.04-arm
       push: false
 
-  docker-deb-armv7:
+  docker-debian-armv7:
     uses: ./.github/workflows/docker_build.yml
     with:
       distro: debian
@@ -201,6 +177,17 @@ jobs:
       runs-on: ubuntu-24.04-arm
       push: false
 
+  after-checks:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    needs: [check]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
   gather-artifacts:
     permissions:
       contents: write
@@ -345,7 +332,7 @@ jobs:
           merge-multiple: true
           path: ./output/pio-deps-native-tft
 
-      - name: Zip Linux sources
+      - name: Zip linux sources
         working-directory: output
         run: |
           zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
@@ -355,9 +342,7 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -lR
 
-      - name: Add Linux sources to GtiHub Release
+      - name: Add linux sources to release
-        # Only run when targeting master branch with workflow_dispatch
-        if: ${{ github.ref_name == 'master' }}
         run: |
           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-tft-${{ steps.version.outputs.long }}.zip
@@ -415,53 +400,9 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -lR
 
-      - name: Add bins and debug elfs to GitHub Release
+      - name: Add bins and debug elfs to release
-        # Only run when targeting master branch with workflow_dispatch
-        if: ${{ github.ref_name == 'master' }}
         run: |
           gh release upload v${{ steps.version.outputs.long }} ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
           gh release upload v${{ steps.version.outputs.long }} ./debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  publish-firmware:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'workflow_dispatch' }}
-    needs: [release-firmware]
-    env:
-      targets: esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,stm32
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-
-      - name: Get release version string
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: firmware-{${{ env.targets }}}-${{ steps.version.outputs.long }}
-          merge-multiple: true
-          path: ./publish
-
-      - name: Publish firmware to meshtastic.github.io
-        uses: peaceiris/actions-gh-pages@v4
-        env:
-          # On event/* branches, use the event name as the destination prefix
-          DEST_PREFIX: ${{ contains(github.ref_name, 'event/') && format('{0}/', github.ref_name) || '' }}
-        with:
-          deploy_key: ${{ secrets.DIST_PAGES_DEPLOY_KEY }}
-          external_repository: meshtastic/meshtastic.github.io
-          publish_branch: master
-          publish_dir: ./publish
-          destination_dir: ${{ env.DEST_PREFIX }}firmware-${{ steps.version.outputs.long }}
-          keep_files: true
-          user_name: github-actions[bot]
-          user_email: github-actions[bot]@users.noreply.github.com
-          commit_message: ${{ steps.version.outputs.long }}
-          enable_jekyll: true

.github/workflows/release_channels.yml

@@ -46,14 +46,11 @@ jobs:
 
   # Create a PR to bump version when a release is Published
   bump-version:
-    if: github.event.action == 'published'
+    if: ${{ github.event.release.published }}
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
       contents: write
-    defaults:
-      run:
-        shell: bash
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -66,45 +63,29 @@ jobs:
       - name: Get release version string
         run: |
           echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-          echo "short=$(./bin/buildinfo.py short)" >> $GITHUB_OUTPUT
           echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT
         id: version
         env:
           BUILD_LOCATION: local
 
       - name: Bump version.properties
-        run: |
+        run: >-
-          # Bump version.properties
+          bin/bump_version.py
-          chmod +x ./bin/bump_version.py
-          ./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: |
+        run: >-
-          # Update debian changelog
+          debian/ci_changelog.sh
-          chmod +x ./debian/ci_changelog.sh
-          ./debian/ci_changelog.sh
 
-      - name: Bump org.meshtastic.meshtasticd.metainfo.xml
+      - name: Create version.properties pull request
-        run: |
-          # Bump org.meshtastic.meshtasticd.metainfo.xml
-          pip install -r bin/bump_metainfo/requirements.txt -q
-          chmod +x ./bin/bump_metainfo/bump_metainfo.py
-          ./bin/bump_metainfo/bump_metainfo.py --file bin/org.meshtastic.meshtasticd.metainfo.xml "${{ steps.version.outputs.short }}"
-        env:
-          PIP_DISABLE_PIP_VERSION_CHECK: 1
-
-      - name: Create Bumps pull request
         uses: peter-evans/create-pull-request@v7
         with:
-          base: ${{ github.event.repository.default_branch }}
+          title: Bump version.properties
-          title: Bump release version
-          commit-message: automated bumps
           add-paths: |
             version.properties
             debian/changelog
-            bin/org.meshtastic.meshtasticd.metainfo.xml

.github/workflows/sec_sast_semgrep_cron.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   semgrep-full:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     container:
       image: semgrep/semgrep
 

.github/workflows/sec_sast_semgrep_pull.yml

@@ -6,7 +6,7 @@ permissions: read-all
 
 jobs:
   semgrep-diff:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     container:
       image: semgrep/semgrep
 

.trunk/trunk.yaml

@@ -1,34 +1,34 @@
 version: 0.1
 cli:
-  version: 1.22.15
+  version: 1.22.11
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.8
+      ref: v1.6.7
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - renovate@40.0.6
     - prettier@3.5.3
-    - trufflehog@3.88.26
+    - trufflehog@3.88.17
-    - yamllint@1.37.0
+    - yamllint@1.36.0
     - bandit@1.8.3
+    - checkov@3.2.386
     - terrascan@1.19.9
-    - trivy@0.61.1
+    - trivy@0.60.0
     - taplo@0.9.3
-    - ruff@0.11.8
+    - ruff@0.10.0
     - isort@6.0.1
     - markdownlint@0.44.0
-    - oxipng@9.1.5
+    - oxipng@9.1.4
     - svgo@3.3.2
     - actionlint@1.7.7
-    - flake8@7.2.0
+    - flake8@7.1.2
     - hadolint@2.12.1-beta
     - shfmt@3.6.0
     - shellcheck@0.10.0
     - black@25.1.0
     - git-diff-check
-    - gitleaks@8.25.1
+    - gitleaks@8.24.0
     - clang-format@16.0.3
   ignore:
     - linters: [ALL]

Dockerfile

@@ -1,21 +1,20 @@
 # trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
 # 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
-ARG PIO_ENV=native
 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 \
-        curl wget g++ zip git ca-certificates pkg-config \
+        wget g++ zip git ca-certificates \
         libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
-        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
+        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config \
-        libx11-dev libinput-dev libxkbcommon-x11-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && pip install --no-cache-dir -U platformio \
     && mkdir /tmp/firmware
@@ -25,15 +24,9 @@ WORKDIR /tmp/firmware
 COPY . /tmp/firmware
 
 # Build
-RUN bash ./bin/build-native.sh "$PIO_ENV" && \
+RUN bash ./bin/build-native.sh && \
     cp "/tmp/firmware/release/meshtasticd_linux_$(uname -m)" "/tmp/firmware/release/meshtasticd"
 
-# Fetch web assets
-RUN curl -L "https://github.com/meshtastic/web/releases/download/v$(cat /tmp/firmware/bin/web.version)/build.tar" -o /tmp/web.tar \
-    && mkdir -p /tmp/web \
-    && tar -xf /tmp/web.tar -C /tmp/web/ \
-    && gzip -dr /tmp/web \
-    && rm /tmp/web.tar
 
 ##### PRODUCTION BUILD #############
 
@@ -45,9 +38,7 @@ ENV TZ=Etc/UTC
 USER root
 
 RUN apt-get update && apt-get --no-install-recommends -y install \
-        libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libuv1 libusb-1.0-0-dev \
+        libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libuv1 libusb-1.0-0-dev liborcania2.3 libulfius2.7 libssl3 \
-        liborcania2.3 libulfius2.7 libssl3 \
-        libx11-6 libinput10 libxkbcommon-x11-0 \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \
@@ -55,7 +46,6 @@ RUN apt-get update && apt-get --no-install-recommends -y install \
 
 # Fetch compiled binary from the builder
 COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/
-COPY --from=builder /tmp/web /usr/share/meshtasticd/
 # Copy config templates
 COPY ./bin/config.d /etc/meshtasticd/available.d
 
@@ -64,9 +54,7 @@ VOLUME /var/lib/meshtasticd
 
 # Expose Meshtastic TCP API port from the host
 EXPOSE 4403
-# Expose Meshtastic Web UI port from the host
-EXPOSE 443
 
 CMD [ "sh", "-cx", "meshtasticd -d /var/lib/meshtasticd" ]
 
-HEALTHCHECK NONE
+HEALTHCHECK NONE

alpine.Dockerfile

@@ -1,16 +1,15 @@
 # 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
-ARG PIO_ENV=native
-ENV PIP_ROOT_USER_ACTION=ignore
 
+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 libuv-dev openssl-dev pkgconf argp-standalone \
-        libx11-dev libinput-dev libxkbcommon-dev \
     && rm -rf /var/cache/apk/* \
     && pip install --no-cache-dir -U platformio \
     && mkdir /tmp/firmware
@@ -22,7 +21,7 @@ COPY . /tmp/firmware
 # Add `argp` for musl
 ENV PLATFORMIO_BUILD_FLAGS="-Os -ffunction-sections -fdata-sections -Wl,--gc-sections -largp"
 
-RUN bash ./bin/build-native.sh "$PIO_ENV" && \
+RUN bash ./bin/build-native.sh && \
     cp "/tmp/firmware/release/meshtasticd_linux_$(uname -m)" "/tmp/firmware/release/meshtasticd"
 
 # ##### PRODUCTION BUILD #############
@@ -34,16 +33,11 @@ USER root
 
 RUN apk --no-cache add \
         libstdc++ libgpiod yaml-cpp libusb i2c-tools libuv \
-        libx11 libinput libxkbcommon \
     && rm -rf /var/cache/apk/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \
     && mkdir -p /etc/meshtasticd/ssl
-
-# Fetch compiled binary from the builder
 COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/
-# Copy config templates
-COPY ./bin/config.d /etc/meshtasticd/available.d
 
 WORKDIR /var/lib/meshtasticd
 VOLUME /var/lib/meshtasticd

arch/esp32/esp32.ini

@@ -2,9 +2,7 @@
 [esp32_base]
 extends = arduino_base
 custom_esp32_kind = esp32
-platform =
+platform = platformio/espressif32@6.10.0
-  # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.10.0
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
@@ -46,20 +44,13 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
-  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
+  https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
-  https://github.com/meshtastic/esp32_https_server/archive/896f1771ceb5979987a0b41028bf1b4e7aad419b.zip
-  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
   h2zero/NimBLE-Arduino@^1.4.3
-  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
+  https://github.com/dbinfrago/libpax.git#3cdc0371c375676a97967547f4065607d4c53fd1
-  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
-  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
   lewisxhe/XPowersLib@^0.2.7
-  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
+  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
-  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
+  rweather/Crypto@^0.4.0
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
 
 lib_ignore = 
   segger_rtt

arch/esp32/esp32c6.ini

@@ -1,8 +1,6 @@
 [esp32c6_base]
 extends = esp32_base
-platform =
+platform = https://github.com/Jason2866/platform-espressif32.git#22faa566df8c789000f8136cd8d0aca49617af55
-  # Do not renovate until we have switched to pioarduino tagged builds
-  https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.zip
 build_flags =
   ${arduino_base.build_flags}
   -Wall
@@ -25,14 +23,10 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
-  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
   lewisxhe/XPowersLib@^0.2.7
-  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
+  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
-  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
+  rweather/Crypto@^0.4.0
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
 
 build_src_filter = 
  ${esp32_base.build_src_filter} -<mesh/http> 

arch/esp32/esp32s2.ini

@@ -16,4 +16,4 @@ build_flags =
 lib_ignore = 
   ${esp32_base.lib_ignore} 
   NimBLE-Arduino
-  libpax
+  libpax

arch/esp32/esp32s3.ini

@@ -3,3 +3,4 @@ extends = esp32_base
 custom_esp32_kind = esp32s3
 
 monitor_speed = 115200
+

arch/nrf52/nrf52.ini

@@ -1,14 +1,10 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-platform =
+platform = platformio/nordicnrf52@^10.7.0
-  # renovate: datasource=custom.pio depName=platformio/nordicnrf52 packageName=platformio/platform/nordicnrf52
-  platformio/nordicnrf52@^10.8.0
 extends = arduino_base
 platform_packages =
   ; our custom Git version until they merge our PR
-  # TODO renovate
+  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
-  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#e13f5820002a4fb2a5e6754b42ace185277e5adf
-  ; Don't renovate toolchain-gccarmnoneeabi
   platformio/toolchain-gccarmnoneeabi@~1.90301.0
 
 build_type = debug
@@ -21,6 +17,7 @@ build_flags =
   -DLFS_NO_ASSERT                      ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
   -DMESHTASTIC_EXCLUDE_AUDIO=1
   -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
+  -DMAX_NUM_NODES=80
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
@@ -28,9 +25,8 @@ build_src_filter =
 lib_deps=
   ${arduino_base.lib_deps}
   ${radiolib_base.lib_deps}
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
+  rweather/Crypto@^0.4.0
-  rweather/Crypto@0.4.0
 
 lib_ignore =
   BluetoothOTA
-  lvgl
+  lvgl

arch/nrf52/nrf52840.ini

@@ -6,9 +6,7 @@ build_flags = ${nrf52_base.build_flags}
 lib_deps =
   ${nrf52_base.lib_deps}
   ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
+  https://github.com/Kongduino/Adafruit_nRFCrypto.git#e31a8825ea3300b163a0a3c1ddd5de34e10e1371
-  # renovate: datasource=git-refs depName=Kongduino-Adafruit_nRFCrypto packageName=https://github.com/Kongduino/Adafruit_nRFCrypto gitBranch=master
-  https://github.com/Kongduino/Adafruit_nRFCrypto/archive/5f838d2709461a2c981f642917aa50254a25c14c.zip
 
 ; Common NRF52 debugging settings follow.  See the Meshtastic developer docs for how to connect SWD debugging probes to your board.
 

arch/portduino/portduino.ini

@@ -1,8 +1,6 @@
 ; The Portduino based 'native' environment. Currently supported on Linux targets with real LoRa hardware (or simulated).
 [portduino_base]
-platform =
+platform = https://github.com/Jorropo/platform-native.git#17fa89daec4402af491512f75278a7fec8a5818c
-  # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop
-  https://github.com/meshtastic/platform-native/archive/622341c6de8a239704318b10c3dbb00c21a3eab3.zip
 framework = arduino
 
 build_src_filter = 
@@ -17,19 +15,18 @@ build_src_filter =
   +<mesh/raspihttp/>
   -<mesh/eth/>
   -<modules/esp32>
+  -<modules/Telemetry/EnvironmentTelemetry.cpp>
+  -<modules/Telemetry/AirQualityTelemetry.cpp>
+  -<modules/Telemetry/Sensor>
   +<../variants/portduino>
 
 lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
   ${radiolib_base.lib_deps}
-  ${environmental_base.lib_deps}
+  rweather/Crypto@^0.4.0
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@^1.2.0
-  # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
+  https://github.com/pine64/libch341-spi-userspace#a9b17e3452f7fb747000d9b4ad4409155b39f6ef
-  https://github.com/pine64/libch341-spi-userspace/archive/af9bc27c9c30fa90772279925b7c5913dff789b4.zip
 
 build_flags =
   ${arduino_base.build_flags}
@@ -45,7 +42,4 @@ build_flags =
   -lyaml-cpp
   -li2c
   -luv
-  -std=gnu17
   -std=c++17
-
-lib_ignore = Adafruit NeoPixel

arch/rp2xx0/rp2040.ini

@@ -1,13 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform =
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3
-  # TODO renovate
-  https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5
-  ; For arduino-pico >= 4.4.3
 extends = arduino_base
-platform_packages =
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.4.3
-  # TODO renovate
-  framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -28,7 +23,5 @@ lib_ignore =
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
+  rweather/Crypto
-  rweather/Crypto@0.4.0

arch/rp2xx0/rp2350.ini

@@ -1,13 +1,8 @@
-; Common settings for rp2350 Processor based targets
+; Common settings for rp2040 Processor based targets
 [rp2350_base]
-platform =
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3
-  # TODO renovate
-  https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5
-  ; For arduino-pico >= 4.4.3
 extends = arduino_base
-platform_packages =
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.4.3
-  # TODO renovate
-  framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -25,7 +20,5 @@ lib_ignore =
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
+  rweather/Crypto
-  rweather/Crypto@0.4.0

arch/stm32/stm32.ini

@@ -1,18 +1,13 @@
 [stm32_base]
 extends = arduino_base
-platform =
+platform = platformio/ststm32
-  # renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32
+platform_packages = platformio/framework-arduinoststm32@^4.20900.0
-  platformio/ststm32@19.1.0
-platform_packages =
-  # TODO renovate
-  platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
-extra_scripts =
-  ${env.extra_scripts}
-  post:extra_scripts/extra_stm32.py
 
 build_type = release
 
-build_flags =
+;board_build.flash_offset = 0x08000000
+
+build_flags = 
   ${arduino_base.build_flags}
   -flto
   -Isrc/platform/stm32wl -g
@@ -23,25 +18,27 @@ build_flags =
   -DMESHTASTIC_EXCLUDE_SCREEN
   -DMESHTASTIC_EXCLUDE_MQTT
   -DMESHTASTIC_EXCLUDE_BLUETOOTH
+  -DMESHTASTIC_EXCLUDE_PKI
   -DMESHTASTIC_EXCLUDE_GPS
-  ;-DDEBUG_MUTE
+;  -DVECT_TAB_OFFSET=0x08000000
+  -DconfigUSE_CMSIS_RTOS_V2=1
+;  -DSPI_MODE_0=SPI_MODE0
   -fmerge-all-constants
   -ffunction-sections
   -fdata-sections
-
+  
-build_src_filter =
+build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/RemoteHardwareModule.cpp> -<platform/nrf52> -<platform/portduino> -<platform/rp2xx0> -<mesh/raspihttp>
 
 board_upload.offset_address = 0x08000000
 upload_protocol = stlink
-debug_tool = stlink
 
 lib_deps =
   ${env.lib_deps}
-  ${radiolib_base.lib_deps}
+  charlesbaynham/OSFS@^1.2.3
-  # renovate: datasource=git-refs depName=caveman99-stm32-Crypto packageName=https://github.com/caveman99/Crypto gitBranch=main
+  jgromes/RadioLib@7.0.2
-  https://github.com/caveman99/Crypto/archive/eae9c768054118a9399690f8af202853d1ae8516.zip
+  https://github.com/caveman99/Crypto.git#f61ae26a53f7a2d0ba5511625b8bf8eff3a35d5e
 
 lib_ignore =
   mathertel/OneButton@2.6.1
-  Wire
+  Wire

bin/build-native.sh

@@ -15,7 +15,6 @@ platformioFailed() {
 
 VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
-PIO_ENV=${1:-native}
 
 OUTDIR=release/
 
@@ -25,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 "$PIO_ENV" || platformioFailed
+pio pkg update --environment native || platformioFailed
-pio run --environment "$PIO_ENV" || platformioFailed
+pio run --environment native || platformioFailed
-cp ".pio/build/$PIO_ENV/program" "$OUTDIR/meshtasticd_linux_$(uname -m)"
+cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(uname -m)"
 cp bin/native-install.* $OUTDIR

bin/bump_metainfo/bump_metainfo.py

@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-import argparse
-import xml.etree.ElementTree as ET
-from defusedxml.ElementTree import parse
-from datetime import datetime, timezone
-
-
-# Indent by 2 spaces to align with xml formatting.
-def indent(elem, level=0):
-    i = "\n" + level * "  "
-    if len(elem):
-        if not elem.text or not elem.text.strip():
-            elem.text = i + "  "
-        for child in elem:
-            indent(child, level + 1)
-        if not child.tail or not child.tail.strip():
-            child.tail = i
-    if level and (not elem.tail or not elem.tail.strip()):
-        elem.tail = i
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Prepend new release entry to metainfo.xml file.")
-    parser.add_argument("--file", help="Path to the metainfo.xml file",
-                        default="org.meshtastic.meshtasticd.metainfo.xml")
-    parser.add_argument("version", help="Version string (e.g. 2.6.4)")
-    parser.add_argument("--date", help="Release date (YYYY-MM-DD), defaults to today",
-                        default=datetime.now(timezone.utc).date().isoformat())
-
-    args = parser.parse_args()
-
-    tree = parse(args.file)
-    root = tree.getroot()
-
-    releases = root.find('releases')
-    if releases is None:
-        raise RuntimeError("<releases> element not found in XML.")
-
-    existing_versions = {
-        release.get('version'): release
-        for release in releases.findall('release')
-    }
-    existing_release = existing_versions.get(args.version)
-
-    if existing_release is not None:
-        if not existing_release.get('date'):
-            print(f"Version {args.version} found without date. Adding date...")
-            existing_release.set('date', args.date)
-        else:
-            print(
-                f"Version {args.version} is already present with date, skipping insertion.")
-    else:
-        new_release = ET.Element('release', {
-            'version': args.version,
-            'date': args.date
-        })
-        url = ET.SubElement(new_release, 'url', {'type': 'details'})
-        url.text = f"https://github.com/meshtastic/firmware/releases?q=tag%3Av{args.version}"
-
-        releases.insert(0, new_release)
-
-        indent(releases, level=1)
-        releases.tail = "\n"
-
-        print(f"Inserted new release: {args.version}")
-
-    tree.write(args.file, encoding='UTF-8', xml_declaration=True)
-
-
-if __name__ == "__main__":
-    main()

bin/bump_metainfo/requirements.txt

@@ -1 +0,0 @@
-defusedxml==0.7.1

bin/config-dist.yaml

@@ -6,12 +6,6 @@
 ### Including the "Module:" line!
 ---
 Lora:
-  # Default to auto-detecting the module type
-  # This will be overridden by configs from config.d
-  Module: auto
-
-#  # Uncomment to enable Simulation mode, or use --sim
-#  Module: sim
 
 #  Module: sx1262  # Waveshare SX1302 LISTEN ONLY AT THIS TIME!
 #  CS: 7
@@ -197,6 +191,5 @@ General:
   MaxNodes: 200
   MaxMessageQueue: 100
   ConfigDirectory: /etc/meshtasticd/config.d/
-  AvailableDirectory: /etc/meshtasticd/available.d/
 #  MACAddress: AA:BB:CC:DD:EE:FF
-#  MACAddressSource: eth0
+#  MACAddressSource: eth0

bin/config.d/lora-Adafruit-RFM9x

@@ -0,0 +1,5 @@
+#  Module: RF95  # Adafruit RFM9x
+#  Reset: 25
+#  CS: 7
+#  IRQ: 22
+#  Busy: 23

bin/config.d/lora-Adafruit-RFM9x.yaml

@@ -1,6 +0,0 @@
-Lora:
-  Module: RF95  # Adafruit RFM9x
-  Reset: 25
-  CS: 7
-  IRQ: 22
-#  Busy: 23

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

@@ -1,5 +1,3 @@
-# MeshAdv-Pi E22-900M30S
-# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
 Lora:
   Module: sx1262
   CS: 21
@@ -11,4 +9,4 @@ Lora:
   DIO3_TCXO_VOLTAGE: true
   # Only for E22-900M33S:
   # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8
+  # SX126X_MAX_POWER: 8

bin/config.d/lora-MeshAdv-Mini-900M22S.yaml

@@ -1,11 +0,0 @@
-# MeshAdv Mini E22-900M22S
-# https://github.com/chrismyers2000/MeshAdv-Mini
-Lora:
-  Module: sx1262  # Ebyte E22-900M22S 
-  CS: 8
-  IRQ: 16
-  Busy: 20
-  Reset: 24
-  TXen: 13
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true

bin/config.d/lora-piggystick-lr1121.yaml

@@ -1,11 +0,0 @@
-Lora:
-  Module: lr1121
-  CS: 0
-  IRQ: 6
-  Reset: 2
-  Busy: 4
-  spidev: ch341
-  DIO3_TCXO_VOLTAGE: 1.8
-#  USB_Serialnum: 12345678
-  USB_PID: 0x5512
-  USB_VID: 0x1A86

bin/config.d/lora-usb-meshtoad-e22.yaml

@@ -1,17 +0,0 @@
-Lora:
-  Module: sx1262
-  CS: 0
-  IRQ: 6
-  Reset: 2
-  Busy: 4
-  RXen: 1
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: ch341
-  USB_PID: 0x5512
-  USB_VID: 0x1A86
-  # Optional: Reduce power to 10 dBm to
-  # avoid over-drawing the USB port
-  # SX126X_MAX_POWER: 10
-  # Optional: Set the serial number for multi-radio support
-  # USB_Serialnum: 13374201

bin/device-install.bat

@@ -7,19 +7,12 @@ SET "DEBUG=0"
 SET "PYTHON="
 SET "WEB_APP=0"
 SET "TFT_BUILD=0"
-SET "BIGDB8=0"
+SET "TFT8=0"
-SET "BIGDB16=0"
+SET "TFT16=0"
 SET "ESPTOOL_BAUD=115200"
 SET "ESPTOOL_CMD="
 SET "LOGCOUNTER=0"
 
-@REM FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
-SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
-SET "C3=esp32c3"
-@REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
-SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger"
-SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite t-watch-s3"
-
 GOTO getopts
 :help
 ECHO Flash image file to device, but first erasing and writing system information.
@@ -41,7 +34,7 @@ ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11 --web
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.6.1]
+ECHO %SCRIPT_NAME% [Version 2.6.0]
 ECHO Meshtastic
 GOTO eof
 
@@ -113,7 +106,7 @@ IF NOT "__%PYTHON%__"=="____" (
 
 CALL :LOG_MESSAGE DEBUG "Checking esptool command !ESPTOOL_CMD!..."
 !ESPTOOL_CMD! >nul 2>&1
-IF %ERRORLEVEL% GEQ 2 (
+IF %ERRORLEVEL% GTR 2 (
     @REM esptool exits with code 1 if help is displayed.
     CALL :LOG_MESSAGE ERROR "esptool not found: !ESPTOOL_CMD!"
     EXIT /B 1
@@ -128,7 +121,6 @@ CALL :LOG_MESSAGE DEBUG "Using esptool command: !ESPTOOL_CMD!"
 IF "__!ESPTOOL_PORT!__" == "____" (
     CALL :LOG_MESSAGE WARN "Using esptool port: UNSET."
 ) ELSE (
-    SET "ESPTOOL_CMD=!ESPTOOL_CMD! --port !ESPTOOL_PORT!"
     CALL :LOG_MESSAGE INFO "Using esptool port: !ESPTOOL_PORT!."
 )
 CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
@@ -141,36 +133,44 @@ IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
         CALL :LOG_MESSAGE ERROR "Cannot enable WebUI (--web) and MUI." & GOTO eof
     )
     SET "TFT_BUILD=1"
+    GOTO tft
 ) ELSE (
     CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
+    GOTO no_tft
 )
 
-FOR %%a IN (%BIGDB_8MB%) DO (
+:tft
+SET "TFT8MB=picomputer-s3 unphone seeed-sensecap-indicator"
+FOR %%a IN (%TFT8MB%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
-        @REM We are working with any of %BIGDB_8MB%.
+        @REM We are working with any of %TFT8MB%.
-        SET "BIGDB8=1"
+        SET "TFT8=1"
-        GOTO end_loop_bigdb_8mb
+        GOTO end_loop_tft8mb
     )
 )
-:end_loop_bigdb_8mb
+:end_loop_tft8mb
 
-FOR %%a IN (%BIGDB_16MB%) DO (
+SET "TFT16MB=t-deck"
+FOR %%a IN (%TFT16MB%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
-        @REM We are working with any of %BIGDB_16MB%.
+        @REM We are working with any of %TFT16MB%.
-        SET "BIGDB16=1"
+        SET "TFT16=1"
-        GOTO end_loop_bigdb_16mb
+        GOTO end_loop_tft16mb
     )
 )
-:end_loop_bigdb_16mb
+:end_loop_tft16mb
 
-IF %BIGDB8% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 8mb partition selected."
+IF %TFT8% EQU 1 CALL :LOG_MESSAGE INFO "tft and MUI 8mb selected."
-IF %BIGDB16% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 16mb partition selected."
+IF %TFT16% EQU 1 CALL :LOG_MESSAGE INFO "tft and MUI 16mb selected."
+
+:no_tft
 
 @REM Extract BASENAME from %FILENAME% for later use.
 SET "BASENAME=!FILENAME:firmware-=!"
 CALL :LOG_MESSAGE DEBUG "Computed firmware basename: !BASENAME!"
 
 @REM Account for S3 and C3 board's different OTA partition.
+SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
 FOR %%a IN (%S3%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
         @REM We are working with any of %S3%.
@@ -179,6 +179,7 @@ FOR %%a IN (%S3%) DO (
     )
 )
 
+SET "C3=esp32c3"
 FOR %%a IN (%C3%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
         @REM We are working with any of %C3%.
@@ -207,14 +208,14 @@ CALL :LOG_MESSAGE DEBUG "Set SPIFFS_FILENAME to: !SPIFFS_FILENAME!"
 SET "OTA_OFFSET=0x260000"
 SET "SPIFFS_OFFSET=0x300000"
 
-@REM Offsets for BigDB 8mb.
+@REM Offsets for MUI 8mb.
-IF %BIGDB8% EQU 1 (
+IF %TFT8% EQU 1 IF %TFT_BUILD% EQU 1 (
     SET "OTA_OFFSET=0x340000"
     SET "SPIFFS_OFFSET=0x670000"
 )
 
-@REM Offsets for BigDB 16mb.
+@REM Offsets for MUI 16mb.
-IF %BIGDB16% EQU 1 (
+IF %TFT16% EQU 1 IF %TFT_BUILD% EQU 1 (
     SET "OTA_OFFSET=0x650000"
     SET "SPIFFS_OFFSET=0xc90000"
 )

bin/device-install.sh

@@ -2,48 +2,9 @@
 
 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
 WEB_APP=false
+TFT8=false
+TFT16=false
 TFT_BUILD=false
-MCU=""
-
-# Variant groups
-BIGDB_8MB=(
-	"picomputer-s3"
-	"unphone"
-	"seeed-sensecap-indicator"
-	"crowpanel-esp32s3"
-	"heltec_capsule_sensor_v3"
-	"heltec-v3"
-	"heltec-vision-master-e213"
-	"heltec-vision-master-e290"
-	"heltec-vision-master-t190"
-	"heltec-wireless-paper"
-	"heltec-wireless-tracker"
-	"heltec-wsl-v3"
-	"icarus"
-	"seeed-xiao-s3"
-	"tbeam-s3-core"
-	"tracksenger"
-)
-BIGDB_16MB=(
-	"t-deck"
-	"mesh-tab"
-	"t-energy-s3"
-	"dreamcatcher"
-	"ESP32-S3-Pico"
-	"m5stack-cores3"
-	"station-g2"
-	"t-eth-elite"
-	"t-watch-s3"
-)
-S3_VARIANTS=(
-	"s3"
-	"-v3"
-	"t-deck"
-	"wireless-paper"
-	"wireless-tracker"
-	"station-g2"
-	"unphone"
-)
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
@@ -81,8 +42,8 @@ while [ $# -gt 0 ]; do
 		exit 0
 		;;
 	-p)
-		ESPTOOL_CMD="$ESPTOOL_CMD --port $2"
+		ESPTOOL_PORT="$2"
-		shift
+		shift # Shift past the option argument
 		;;
 	-P)
 		PYTHON="$2"
@@ -117,13 +78,21 @@ if [[ $FILENAME != firmware-* ]]; then
   exit 1
 fi
 
-# Check if FILENAME contains "-tft-" and prevent web/mui comingling.
+# Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
 if [[ ${FILENAME//-tft-/} != "$FILENAME" ]]; then
 	TFT_BUILD=true
 	if [[ $WEB_APP == true ]] && [[ $TFT_BUILD == true ]]; then
 		echo "Cannot enable WebUI (--web) and MUI."
 		exit 1
 	fi
+
+	if [[ $FILENAME == *"picomputer-s3"* || $FILENAME == *"unphone"* || $FILENAME == *"seeed-sensecap-indicator"* ]]; then
+		TFT8=true
+	fi
+
+	if [[ $FILENAME == *"t-deck"* ]]; then
+		TFT16=true
+	fi
 fi
 
 # Extract BASENAME from %FILENAME% for later use.
@@ -136,31 +105,20 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
 	# Default OTA Offset
 	OTA_OFFSET=0x260000
 
-	# littlefs* offset for BigDB 8mb and OTA OFFSET.
+	# littlefs* offset for MUI 8mb and OTA OFFSET.
-	for variant in "${BIGDB_8MB[@]}"; do
+	if [ "$TFT8" = true ] && [ "$TFT_BUILD" = true ]; then
-		if [ -z "${FILENAME##*"$variant"*}" ]; then
+		OFFSET=0x670000
-			OFFSET=0x670000
+		OTA_OFFSET=0x340000
-			OTA_OFFSET=0x340000
+	fi
-		fi
-	done
 
-	# littlefs* offset for BigDB 16mb and OTA OFFSET.
+	# littlefs* offset for MUI 16mb and OTA OFFSET.
-	for variant in "${BIGDB_16MB[@]}"; do
+	if [ "$TFT16" = true ] && [ "$TFT_BUILD" = true ]; then
-		if [ -z "${FILENAME##*"$variant"*}" ]; then
+		OFFSET=0xc90000
-			OFFSET=0xc90000
+		OTA_OFFSET=0x650000
-			OTA_OFFSET=0x650000
+	fi
-		fi
-	done
 
 	# Account for S3 board's different OTA partition
-	# FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
+	if [ -n "${FILENAME##*"s3"*}" ] && [ -n "${FILENAME##*"-v3"*}" ] && [ -n "${FILENAME##*"t-deck"*}" ] && [ -n "${FILENAME##*"wireless-paper"*}" ] && [ -n "${FILENAME##*"wireless-tracker"*}" ] && [ -n "${FILENAME##*"station-g2"*}" ] && [ -n "${FILENAME##*"unphone"*}" ]; then
-	for variant in "${S3_VARIANTS[@]}"; do
-		if [ -z "${FILENAME##*"$variant"*}" ]; then
-			MCU="esp32s3"
-		fi
-	done
-
-	if [ "$MCU" != "esp32s3" ]; then
 		if [ -n "${FILENAME##*"esp32c3"*}" ]; then
 			OTAFILE=bleota.bin
 		else

bin/device-update.bat

@@ -16,7 +16,7 @@ ECHO.
 ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python]
 ECHO.
 ECHO Options:
-ECHO     -f filename      The update .bin file to flash.  Custom to your device type and region. (required)
+ECHO     -f filename      The .bin file to flash.  Custom to your device type and region. (required)
 ECHO                      The file must be located in this current directory.
 ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
 ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
@@ -28,7 +28,7 @@ ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4-update.bin -p C
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.6.1]
+ECHO %SCRIPT_NAME% [Version 2.6.0]
 ECHO Meshtastic
 GOTO eof
 
@@ -53,7 +53,6 @@ IF "__!FILENAME!__"=="____" (
     CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
     GOTO help
 ) ELSE (
-    CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
     IF NOT "__!FILENAME: =!__"=="__!FILENAME!__" (
         CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
         GOTO help
@@ -63,6 +62,7 @@ IF "__!FILENAME!__"=="____" (
     SET "FILENAME=!FILENAME:./=!"
 )
 
+CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
 CALL :LOG_MESSAGE DEBUG "Checking if !FILENAME! exists..."
 IF NOT EXIST !FILENAME! (
     CALL :LOG_MESSAGE ERROR "File does not exist: !FILENAME!. Terminating."
@@ -71,7 +71,7 @@ IF NOT EXIST !FILENAME! (
 
 IF "!FILENAME:update=!"=="!FILENAME!" (
     CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
-    CALL :LOG_MESSAGE INFO "Use script device-install.bat to flash !FILENAME!."
+    CALL :LOG_MESSAGE INFO "Use script device-install.bat to flash update !FILENAME!."
     GOTO eof
 ) ELSE (
     CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
@@ -95,7 +95,7 @@ IF NOT "__%PYTHON%__"=="____" (
 
 CALL :LOG_MESSAGE DEBUG "Checking esptool command !ESPTOOL_CMD!..."
 !ESPTOOL_CMD! >nul 2>&1
-IF %ERRORLEVEL% GEQ 2 (
+IF %ERRORLEVEL% GTR 2 (
     @REM esptool exits with code 1 if help is displayed.
     CALL :LOG_MESSAGE ERROR "esptool not found: !ESPTOOL_CMD!"
     EXIT /B 1
@@ -110,7 +110,6 @@ CALL :LOG_MESSAGE DEBUG "Using esptool command: !ESPTOOL_CMD!"
 IF "__!ESPTOOL_PORT!__" == "____" (
     CALL :LOG_MESSAGE WARN "Using esptool port: UNSET."
 ) ELSE (
-    SET "ESPTOOL_CMD=!ESPTOOL_CMD! --port !ESPTOOL_PORT!"
     CALL :LOG_MESSAGE INFO "Using esptool port: !ESPTOOL_PORT!."
 )
 CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."

bin/device-update.sh

@@ -35,8 +35,8 @@ while getopts ":hp:P:f:" opt; do
             show_help
             exit 0
             ;;
-        p)  ESPTOOL_CMD="$ESPTOOL_CMD --port ${OPTARG}"
+        p)  export ESPTOOL_PORT=${OPTARG}
-	        ;;
+	    ;;
         P)  PYTHON=${OPTARG}
             ;;
         f)  FILENAME=${OPTARG}

bin/org.meshtastic.meshtasticd.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Meshtastic
-Comment=Meshtastic App
-Exec=meshtasticd
-Icon=org.meshtastic.meshtasticd
-Terminal=true
-Type=Application
-Categories=Network;Chat;HamRadio;

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<component type="desktop-application">
-  <id>org.meshtastic.meshtasticd</id>
-
-  <name>Meshtastic</name>
-  <summary>Decentralized mesh communication</summary>
-
-  <metadata_license>CC-BY-4.0</metadata_license>
-  <project_license>GPL-3.0-or-later</project_license>
-
-  <developer id="org.meshtastic">
-    <name>Meshtastic</name>
-  </developer>
-
-  <description>
-    <p>
-      Meshtastic is an open source project for creating off-grid, affordable, and resilient communication with LoRa mesh networks.
-    </p>
-  </description>
-
-  <launchable type="desktop-id">org.meshtastic.meshtasticd.desktop</launchable>
-
-  <categories>
-    <category>Network</category>
-    <category>Chat</category>
-    <category>HamRadio</category>
-  </categories>
-  <keywords>
-    <keyword>mesh</keyword>
-    <keyword>LoRa</keyword>
-  </keywords>
-
-  <recommends>
-    <control>keyboard</control>
-    <control>pointing</control>
-    <control>touch</control>
-  </recommends>
-  <requires>
-    <display_length compare="ge">360</display_length>
-  </requires>
-
-  <branding>
-    <color type="primary" scheme_preference="light">#97be89</color>
-    <color type="primary" scheme_preference="dark">#206538</color>
-  </branding>
-
-  <content_rating type="oars-1.1">
-    <content_attribute id="social-chat">intense</content_attribute>
-    <content_attribute id="social-location">intense</content_attribute>
-  </content_rating>
-
-  <url type="bugtracker">https://github.com/meshtastic/firmware/issues</url>
-  <url type="homepage">https://meshtastic.org/</url>
-  <url type="donation">https://opencollective.com/meshtastic</url>
-  <url type="faq">https://meshtastic.org/docs/software/linux/usage/</url>
-  <url type="vcs-browser">https://github.com/meshtastic/firmware/</url>
-
-  <screenshots>
-    <screenshot type="default">
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_home_dashboard_dark.webp</image>
-      <caption>Home Dashboard</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_initial_boot.webp</image>
-      <caption>Setup</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_node_list_dark.webp</image>
-      <caption>Nodes List</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_chat_list_dark.webp</image>
-      <caption>Chats List</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_chat_message_dark.webp</image>
-      <caption>Messages</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_map_dark.webp</image>
-      <caption>Map</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_settings_dark.webp</image>
-      <caption>Settings</caption>
-    </screenshot>
-  </screenshots>
-
-  <releases>
-    <release version="2.6.7" date="2025-04-28">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.7</url>
-    </release>
-    <release version="2.6.6" date="2025-04-15">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.6</url>
-    </release>
-    <release version="2.6.5" date="2025-03-30">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.5</url>
-    </release>
-    <release version="2.6.4" date="2025-03-28">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.4</url>
-    </release>
-  </releases>
-</component>

bin/org.meshtastic.meshtasticd.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="512" height="512" viewBox="0 0 512 512" xml:space="preserve">
-<desc>Created with Fabric.js 4.6.0</desc>
-<defs>
-</defs>
-<g transform="matrix(1 0 0 1 256 256)" id="xYQ9Gk9Jwpgj_HMOXB3F_"  >
-<path style="stroke: rgb(213,130,139); stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(103,234,148); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-256, -256)" d="M 0 0 L 512 0 L 512 512 L 0 512 z" stroke-linecap="round" />
-</g>
-<g transform="matrix(1.79 0 0 1.79 313.74 258.36)" id="1xBsk2n9FZp60Rz1O-ceJ"  >
-<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: round; stroke-miterlimit: 2; fill: rgb(44,45,60); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-250.97, -362.41)" d="M 250.908 330.267 L 193.126 415.005 L 180.938 406.694 L 244.802 313.037 C 246.174 311.024 248.453 309.819 250.889 309.816 C 253.326 309.814 255.606 311.015 256.982 313.026 L 320.994 406.536 L 308.821 414.869 L 250.908 330.267 Z" stroke-linecap="round" />
-</g>
-<g transform="matrix(1.81 0 0 1.81 145 256.15)" id="KxN7E9YpbyPgz0S4z4Cl6"  >
-<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: round; stroke-miterlimit: 2; fill: rgb(44,45,60); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-115.14, -528.06)" d="M 87.642 581.398 L 154.757 482.977 L 142.638 474.713 L 75.523 573.134 L 87.642 581.398 Z" stroke-linecap="round" />
-</g>
-</svg>

bin/platformio-custom.py

@@ -83,7 +83,7 @@ if platform.name == "espressif32":
 
 if platform.name == "nordicnrf52":
     env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex",
-                      env.VerboseAction(f"\"{sys.executable}\" ./bin/uf2conv.py $BUILD_DIR/firmware.hex -c -f 0xADA52840 -o $BUILD_DIR/firmware.uf2",
+                      env.VerboseAction(f"{sys.executable} ./bin/uf2conv.py $BUILD_DIR/firmware.hex -c -f 0xADA52840 -o $BUILD_DIR/firmware.uf2",
                                         "Generating UF2 file"))
 
 Import("projenv")

bin/rpkg.macros

@@ -2,10 +2,6 @@ function meshtastic_version {
     meshtastic_version=$(python3 bin/buildinfo.py short)
     echo -n "$meshtastic_version"
 }
-function web_version {
-    web_version=$(cat bin/web.version)
-    echo -n "$web_version"
-}
 function git_commits_num {
     total_commits=$(git rev-list --all --count)
     echo -n "$total_commits"

bin/web.version

@@ -1 +0,0 @@
-2.5.3

boards/Seeed_Solar_Node.json

@@ -1,54 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v7.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [["0x2886", "0x0059"]],
-    "usb_product": "XIAO-BOOT",
-    "mcu": "nrf52840",
-    "variant": "Seeed_Solar_Node",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "7.3.0",
-      "sd_fwid": "0x0123"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "Seeed_Solar_Node",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": [
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink",
-      "cmsis-dap",
-      "blackmagic"
-    ],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://www.seeedstudio.com/Seeed-XIAO-BLE-Sense-nRF52840-p-5253.html",
-  "vendor": "Seeed Studio"
-}

boards/ThinkNode-M1.json

@@ -1,53 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_TTGO_EINK -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x4405"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"]
-    ],
-    "usb_product": "elecrow_eink",
-    "mcu": "nrf52840",
-    "variant": "ELECROW-ThinkNode-M1",
-    "variants_dir": "variants",
-    "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",
-    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "elecrow eink",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "FIXME",
-  "vendor": "ELECROW"
-}

boards/crowpanel.json

@@ -1,43 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_opi",
-      "partitions": "default_16MB.csv"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=0"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "ESP32-S3-WROOM-1-N16R8"
-  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
-  "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "ESP32-S3-WROOM-1-N16R8 (16 MB Flash, 8 MB PSRAM)",
-  "upload": {
-    "flash_size": "16MB",
-    "maximum_ram_size": 524288,
-    "maximum_size": 16777216,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "monitor": {
-    "speed": 115200
-  },
-  "url": "https://www.espressif.com/sites/default/files/documentation/esp32-s3-wroom-1_wroom-1u_datasheet_en.pdf",
-  "vendor": "Espressif"
-}

boards/heltec_mesh_pocket.json

@@ -1,53 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x4405"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"]
-    ],
-    "usb_product": "HT-n5262",
-    "mcu": "nrf52840",
-    "variant": "heltec_mesh_pocket",
-    "variants_dir": "variants",
-    "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",
-    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "Heltec nrf (Adafruit BSP)",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://heltec.org/project/meshpocket/",
-  "vendor": "Heltec"
-}

boards/heltec_vision_master_e213.json

@@ -2,8 +2,7 @@
   "build": {
     "arduino": {
       "ldscript": "esp32s3_out.ld",
-      "partitions": "default_8MB.csv",
+      "partitions": "default_8MB.csv"
-      "memory_type": "qio_opi"
     },
     "core": "esp32",
     "extra_flags": [
@@ -16,7 +15,6 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
-    "psram_type": "opi",
     "hwids": [
       ["0x303A", "0x1001"],
       ["0x303A", "0x0002"]

boards/heltec_vision_master_e290.json

@@ -2,8 +2,7 @@
   "build": {
     "arduino": {
       "ldscript": "esp32s3_out.ld",
-      "partitions": "default_8MB.csv",
+      "partitions": "default_8MB.csv"
-      "memory_type": "qio_opi"
     },
     "core": "esp32",
     "extra_flags": [
@@ -16,7 +15,6 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
-    "psram_type": "opi",
     "hwids": [
       ["0x303A", "0x1001"],
       ["0x303A", "0x0002"]

boards/heltec_vision_master_t190.json

@@ -2,8 +2,7 @@
   "build": {
     "arduino": {
       "ldscript": "esp32s3_out.ld",
-      "partitions": "default_8MB.csv",
+      "partitions": "default_8MB.csv"
-      "memory_type": "qio_opi"
     },
     "core": "esp32",
     "extra_flags": [
@@ -16,7 +15,6 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
-    "psram_type": "opi",
     "hwids": [
       ["0x303A", "0x1001"],
       ["0x303A", "0x0002"]

boards/seeed-sensecap-indicator.json

@@ -18,7 +18,6 @@
     "f_boot": "120000000L",
     "boot": "qio",
     "flash_mode": "qio",
-    "psram_type": "opi",
     "hwids": [["0x1A86", "0x7523"]],
     "mcu": "esp32s3",
     "variant": "esp32s3"

boards/seeed-xiao-s3.json

@@ -15,7 +15,6 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
-    "psram_type": "opi",
     "hwids": [["0x2886", "0x0059"]],
     "mcu": "esp32s3",
     "variant": "seeed-xiao-s3"

boards/t-watch-s3.json

@@ -16,7 +16,6 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
-    "psram_type": "opi",
     "hwids": [
       ["0x303A", "0x1001"],
       ["0x303A", "0x0002"]
@@ -24,16 +23,16 @@
     "mcu": "esp32s3",
     "variant": "t-watch-s3"
   },
-  "connectivity": ["wifi", "bluetooth", "lora"],
+  "connectivity": ["wifi"],
   "debug": {
     "openocd_target": "esp32s3.cfg"
   },
   "frameworks": ["arduino"],
   "name": "LilyGo T-Watch 2020 V3",
   "upload": {
-    "flash_size": "16MB",
+    "flash_size": "8MB",
     "maximum_ram_size": 327680,
-    "maximum_size": 16777216,
+    "maximum_size": 8388608,
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true,

debian/ci_pack_sdeb.sh

@@ -5,14 +5,13 @@ export PLATFORMIO_PACKAGES_DIR=pio/packages
 export PLATFORMIO_CORE_DIR=pio/core
 
 # Download libraries to `pio`
-platformio pkg install -e native-tft
+platformio pkg install -e native
-platformio pkg install -e native-tft -t platformio/tool-scons@4.40502.0
+platformio pkg install -e native -t platformio/tool-scons@4.40502.0
 # Compress `pio` directory to prevent dh_clean from sanitizing it
 tar -cf pio.tar pio/
 rm -rf pio
-# Download the meshtastic/web release build.tar to `web.tar`
+# Download the latest meshtastic/web release build.tar to `web.tar`
-web_ver=$(cat bin/web.version)
+curl -L https://github.com/meshtastic/web/releases/latest/download/build.tar -o web.tar
-curl -L "https://github.com/meshtastic/web/releases/download/v$web_ver/build.tar" -o web.tar
 
 package=$(dpkg-parsechangelog --show-field Source)
 

debian/control

@@ -21,10 +21,7 @@ Build-Depends: debhelper-compat (= 13),
                openssl,
                libssl-dev,
                libulfius-dev,
-               liborcania-dev,
+               liborcania-dev
-               libx11-dev,
-               libinput-dev,
-               libxkbcommon-x11-dev
 Standards-Version: 4.6.2
 Homepage: https://github.com/meshtastic/firmware
 Rules-Requires-Root: no

debian/meshtasticd.install

@@ -1,8 +1,8 @@
-.pio/build/native-tft/meshtasticd  usr/sbin
+.pio/build/native/meshtasticd  usr/sbin
 
-bin/config.yaml                    etc/meshtasticd
+bin/config.yaml                etc/meshtasticd
-bin/config.d/*                     etc/meshtasticd/available.d
+bin/config.d/*                 etc/meshtasticd/available.d
 
-bin/meshtasticd.service            lib/systemd/system
+bin/meshtasticd.service        lib/systemd/system
 
-web/*                              usr/share/meshtasticd/web
+web/*                          usr/share/meshtasticd/web

debian/rules

@@ -26,7 +26,7 @@ override_dh_auto_build:
 	mkdir -p web && tar -xf web.tar -C web
 	gunzip web/ -r
 	# Build with platformio
-	$(PIO_ENV) platformio run -e native-tft
+	$(PIO_ENV) platformio run -e native
 	# Move the binary and default config to the correct name
-	mv .pio/build/native-tft/program .pio/build/native-tft/meshtasticd
+	mv .pio/build/native/program .pio/build/native/meshtasticd
 	cp bin/config-dist.yaml bin/config.yaml

extra_scripts/extra_stm32.py

@@ -1,22 +0,0 @@
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-
-Import("env")
-# Custom HEX from ELF
-env.AddPostAction(
-    "$BUILD_DIR/${PROGNAME}.elf",
-    env.VerboseAction(
-        " ".join(
-            [
-                "$OBJCOPY",
-                "-O",
-                "ihex",
-                "-R",
-                ".eeprom",
-                "$BUILD_DIR/${PROGNAME}.elf",
-                "$BUILD_DIR/${PROGNAME}.hex",
-            ]
-        ),
-        "Building $BUILD_DIR/${PROGNAME}.hex",
-    ),
-)

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/download/v{{{ web_version }}}/build.tar
+Source1:        https://github.com/meshtastic/web/releases/latest/download/build.tar
 
 BuildRequires: systemd-rpm-macros
 BuildRequires: python3-devel
@@ -42,10 +42,6 @@ BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(liborcania)
 BuildRequires: pkgconfig(libyder)
 BuildRequires: pkgconfig(libulfius)
-# TFT components:
-BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(libinput)
-BuildRequires: pkgconfig(xkbcommon-x11)
 
 %description
 Meshtastic daemon for controlling Meshtastic devices. Meshtastic is an off-grid
@@ -59,12 +55,12 @@ tar -xf %{SOURCE1} -C web
 gzip -dr web
 
 %build
-# Use the “native-tft” environment from platformio to build a Linux binary
+# Use the “native” environment from platformio to build a Linux binary
-platformio run -e native-tft
+platformio run -e native
 
 %install
 mkdir -p %{buildroot}%{_sbindir}
-install -m 0755 .pio/build/native-tft/program %{buildroot}%{_sbindir}/meshtasticd
+install -m 0755 .pio/build/native/program %{buildroot}%{_sbindir}/meshtasticd
 
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd
 install -m 0644 bin/config-dist.yaml %{buildroot}%{_sysconfdir}/meshtasticd/config.yaml

platformio.ini

@@ -50,26 +50,18 @@ build_flags = -Wno-missing-field-initializers
 	-DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
 	-DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1
   	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
-	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
         #-DBUILD_EPOCH=$UNIX_TIME
         #-D OLED_PL=1
 
 monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
-	# renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master
+	https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95
-	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/0119501e9983bd894830b02f545c377ee08d66fe.zip
-	# renovate: datasource=custom.pio depName=OneButton packageName=mathertel/library/OneButton
 	mathertel/OneButton@2.6.1
-	# renovate: datasource=git-refs depName=meshtastic-arduino-fsm packageName=https://github.com/meshtastic/arduino-fsm gitBranch=master
+	https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
-	https://github.com/meshtastic/arduino-fsm/archive/7db3702bf0cfe97b783d6c72595e3f38e0b19159.zip
+	https://github.com/meshtastic/TinyGPSPlus.git#71a82db35f3b973440044c476d4bcdc673b104f4
-	# renovate: datasource=git-refs depName=meshtastic-TinyGPSPlus packageName=https://github.com/meshtastic/TinyGPSPlus gitBranch=master
+	https://github.com/meshtastic/ArduinoThread.git#7c3ee9e1951551b949763b1f5280f8db1fa4068d
-	https://github.com/meshtastic/TinyGPSPlus/archive/71a82db35f3b973440044c476d4bcdc673b104f4.zip
-	# renovate: datasource=git-refs depName=meshtastic-ArduinoThread packageName=https://github.com/meshtastic/ArduinoThread gitBranch=master
-	https://github.com/meshtastic/ArduinoThread/archive/7c3ee9e1951551b949763b1f5280f8db1fa4068d.zip
-	# renovate: datasource=custom.pio depName=Nanopb packageName=nanopb/library/Nanopb
 	nanopb/Nanopb@0.4.91
-	# renovate: datasource=custom.pio depName=ErriezCRC32 packageName=erriez/library/ErriezCRC32
 	erriez/ErriezCRC32@1.0.1
 
 ; Used for the code analysis in PIO Home / Inspect
@@ -85,7 +77,6 @@ check_flags =
 framework = arduino
 lib_deps =
 	${env.lib_deps}
-	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
 	end2endzone/NonBlockingRTTTL@1.3.0
 build_flags = ${env.build_flags} -Os
 build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>
@@ -93,99 +84,57 @@ build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/nic
 ; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
 lib_deps =
-	# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
+	knolleary/PubSubClient@2.8
-	thingsboard/TBPubSubClient@2.12.1
+	arduino-libraries/NTPClient@3.1.0
-	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
-	arduino-libraries/NTPClient@3.2.1
-	# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
 	arcao/Syslog@2.0.0
 
 [radiolib_base]
 lib_deps =
-	# renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib
 	jgromes/RadioLib@7.1.2
 
 [device-ui_base]
 lib_deps =
-	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
+	https://github.com/meshtastic/device-ui.git#74e739ed4532ca10393df9fc89ae5a22f0bab2b1
-	https://github.com/meshtastic/device-ui/archive/b9e2ad1222db9f5a5080248b2f018c250f0efae5.zip
 
 ; Common libs for environmental measurements in telemetry module
+; (not included in native / portduino)
 [environmental_base]
 lib_deps =
-	# renovate: datasource=custom.pio depName=Adafruit BusIO packageName=adafruit/library/Adafruit BusIO
+	adafruit/Adafruit BusIO@1.16.2
-	adafruit/Adafruit BusIO@1.17.1
+	adafruit/Adafruit Unified Sensor@1.1.14
-	# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
-	adafruit/Adafruit Unified Sensor@1.1.15
-	# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library
 	adafruit/Adafruit BMP280 Library@2.6.8
-	# renovate: datasource=custom.pio depName=Adafruit BMP085 packageName=adafruit/library/Adafruit BMP085 Library
 	adafruit/Adafruit BMP085 Library@1.2.4
-	# renovate: datasource=custom.pio depName=Adafruit BME280 packageName=adafruit/library/Adafruit BME280 Library
 	adafruit/Adafruit BME280 Library@2.2.4
-	# renovate: datasource=custom.pio depName=Adafruit DPS310 packageName=adafruit/library/Adafruit DPS310
+	adafruit/Adafruit BMP3XX Library@2.1.5
 	adafruit/Adafruit DPS310@1.1.5
-	# renovate: datasource=custom.pio depName=Adafruit MCP9808 packageName=adafruit/library/Adafruit MCP9808 Library
 	adafruit/Adafruit MCP9808 Library@2.0.2
-	# renovate: datasource=custom.pio depName=Adafruit INA260 packageName=adafruit/library/Adafruit INA260 Library
 	adafruit/Adafruit INA260 Library@1.5.2
-	# renovate: datasource=custom.pio depName=Adafruit INA219 packageName=adafruit/library/Adafruit INA219
 	adafruit/Adafruit INA219@1.2.3
-	# renovate: datasource=custom.pio depName=Adafruit PM25 AQI Sensor packageName=adafruit/library/Adafruit PM25 AQI Sensor
-	adafruit/Adafruit PM25 AQI Sensor@1.2.0
-	# renovate: datasource=custom.pio depName=Adafruit MPU6050 packageName=adafruit/library/Adafruit MPU6050
-	adafruit/Adafruit MPU6050@2.2.6
-	# renovate: datasource=custom.pio depName=Adafruit LIS3DH packageName=adafruit/library/Adafruit LIS3DH
-	adafruit/Adafruit LIS3DH@1.3.0
-	# renovate: datasource=custom.pio depName=Adafruit AHTX0 packageName=adafruit/library/Adafruit AHTX0
-	adafruit/Adafruit AHTX0@2.0.5
-	# renovate: datasource=custom.pio depName=Adafruit LSM6DS packageName=adafruit/library/Adafruit LSM6DS
-	adafruit/Adafruit LSM6DS@4.7.4
-	# renovate: datasource=custom.pio depName=Adafruit TSL2591 packageName=adafruit/library/Adafruit TSL2591 Library
-	adafruit/Adafruit TSL2591 Library@1.4.5
-	# renovate: datasource=custom.pio depName=EmotiBit MLX90632 packageName=emotibit/library/EmotiBit MLX90632
-	emotibit/EmotiBit MLX90632@1.0.8
-	# renovate: datasource=custom.pio depName=Adafruit MLX90614 packageName=adafruit/library/Adafruit MLX90614 Library
-	adafruit/Adafruit MLX90614 Library@2.1.5
-	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
-	boschsensortec/BME68x Sensor Library@1.2.40408
-	# renovate: datasource=github-tags depName=INA3221 packageName=KodinLanewave/INA3221
-	https://github.com/KodinLanewave/INA3221/archive/1.0.1.zip
-	# renovate: datasource=custom.pio depName=QMC5883L Compass packageName=mprograms/library/QMC5883LCompass
-	mprograms/QMC5883LCompass@1.2.3
-	# renovate: datasource=custom.pio depName=DFRobot_RTU packageName=dfrobot/library/DFRobot_RTU
-	dfrobot/DFRobot_RTU@1.0.3
-	# renovate: datasource=git-refs depName=DFRobot_RainfallSensor packageName=https://github.com/DFRobot/DFRobot_RainfallSensor gitBranch=master
-	https://github.com/DFRobot/DFRobot_RainfallSensor/archive/38fea5e02b40a5430be6dab39a99a6f6347d667e.zip
-	# renovate: datasource=custom.pio depName=INA226 packageName=robtillaart/library/INA226
-	robtillaart/INA226@0.6.4
-	# renovate: datasource=custom.pio depName=SparkFun MAX3010x packageName=sparkfun/library/SparkFun MAX3010x Pulse and Proximity Sensor Library
-	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2
-
-; (not included in native / portduino)
-[environmental_extra]
-lib_deps =
-	# renovate: datasource=custom.pio depName=Adafruit BMP3XX packageName=adafruit/library/Adafruit BMP3XX Library
-	adafruit/Adafruit BMP3XX Library@2.1.6
-	# renovate: datasource=custom.pio depName=Adafruit MAX1704X packageName=adafruit/library/Adafruit MAX1704X
 	adafruit/Adafruit MAX1704X@1.0.3
-	# renovate: datasource=custom.pio depName=Adafruit SHTC3 packageName=adafruit/library/Adafruit SHTC3 Library
 	adafruit/Adafruit SHTC3 Library@1.0.1
-	# renovate: datasource=custom.pio depName=Adafruit LPS2X packageName=adafruit/library/Adafruit LPS2X
 	adafruit/Adafruit LPS2X@2.0.6
-	# renovate: datasource=custom.pio depName=Adafruit SHT31 packageName=adafruit/library/Adafruit SHT31 Library
 	adafruit/Adafruit SHT31 Library@2.2.2
-	# renovate: datasource=custom.pio depName=Adafruit VEML7700 packageName=adafruit/library/Adafruit VEML7700 Library
+	adafruit/Adafruit PM25 AQI Sensor@1.1.1
+	adafruit/Adafruit MPU6050@2.2.6
+	adafruit/Adafruit LIS3DH@1.3.0
+	adafruit/Adafruit AHTX0@2.0.5
+	adafruit/Adafruit LSM6DS@4.7.3
 	adafruit/Adafruit VEML7700 Library@2.1.6
-	# renovate: datasource=custom.pio depName=Adafruit SHT4x packageName=adafruit/library/Adafruit SHT4x Library
 	adafruit/Adafruit SHT4x Library@1.0.5
-	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
+	adafruit/Adafruit TSL2591 Library@1.4.5
 	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
-	# renovate: datasource=custom.pio depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/library/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library
+	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.2.13
-	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.3.0
-	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
 	ClosedCube OPT3001@1.1.2
-	# renovate: datasource=git-refs depName=Bosch BSEC2 packageName=https://github.com/meshtastic/Bosch-BSEC2-Library gitBranch=extra_script
+	emotibit/EmotiBit MLX90632@1.0.8
-	https://github.com/meshtastic/Bosch-BSEC2-Library/archive/e16952dfe5addd4287e1eb8c4f6ecac0fa3dd3de.zip
+	adafruit/Adafruit MLX90614 Library@2.1.5
-	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
+	https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
-	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
+	boschsensortec/BME68x Sensor Library@1.1.40407
+	https://github.com/KodinLanewave/INA3221@1.0.1
+	mprograms/QMC5883LCompass@1.2.3
+	dfrobot/DFRobot_RTU@1.0.3
+	https://github.com/meshtastic/DFRobot_LarkWeatherStation#4de3a9cadef0f6a5220a8a906cf9775b02b0040d
+	https://github.com/DFRobot/DFRobot_RainfallSensor#38fea5e02b40a5430be6dab39a99a6f6347d667e
+	robtillaart/INA226@0.6.0
+
+	; Health Sensor Libraries
+	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2

renovate.json

@@ -1,79 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    ":dependencyDashboard",
-    ":semanticCommitTypeAll(chore)",
-    ":ignoreModulesAndTests",
-    "group:recommended",
-    "replacements:all",
-    "workarounds:all"
-  ],
-  "forkProcessing": "enabled",
-  "ignoreDeps": ["protobufs"],
-  "git-submodules": {
-    "enabled": true
-  },
-  "pip_requirements": {
-    "fileMatch": ["bin/bump_metainfo/requirements.txt"]
-  },
-  "commitMessageTopic": "{{depName}}",
-  "labels": ["dependencies"],
-  "customDatasources": {
-    "pio": {
-      "description": "PlatformIO Registry",
-      "defaultRegistryUrlTemplate": "https://api.registry.platformio.org/v3/packages/{{packageName}}",
-      "format": "json",
-      "transformTemplates": [
-        "{\"releases\": [$map($.versions, function($v) { { \"version\": $v.name, \"releaseTimestamp\": $v.released_at } })], \"homepage\": $encodeUrl($join([\"https://registry.platformio.org/\",$.type,\"/\",$.owner.username,\"/\",$.name])) }"
-      ]
-    }
-  },
-  "customManagers": [
-    {
-      "customType": "regex",
-      "description": "Match meshtastic/web version",
-      "fileMatch": ["bin/web.version"],
-      "matchStrings": ["(?<currentValue>.+)$"],
-      "datasourceTemplate": "github-releases",
-      "depNameTemplate": "meshtastic/web",
-      "versioningTemplate": "semver-coerced"
-    },
-    {
-      "customType": "regex",
-      "description": "Match normal PIO dependencies",
-      "fileMatch": [".*\\.ini$"],
-      "matchStrings": [
-        "# renovate: datasource=(?<datasource>.*?)(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s+?.+?@(?<currentValue>.+?)\\s"
-      ],
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}"
-    },
-    {
-      "customType": "regex",
-      "description": "Match PIO zipped dependencies with github tag ref",
-      "fileMatch": [".*\\.ini$"],
-      "matchStrings": [
-        "# renovate: datasource=github-tags(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s+?https:\/\/.+?archive\/(?<currentValue>.+?).zip\\s"
-      ],
-      "datasourceTemplate": "github-tags",
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}"
-    },
-    {
-      "customType": "regex",
-      "description": "Match PIO zipped dependencies with git commit ref",
-      "fileMatch": [".*\\.ini$"],
-      "matchStrings": [
-        "# renovate: datasource=git-refs(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\sgitBranch=(?<gitBranch>.+?)\\s+?https:\/\/.+?archive\/(?<currentDigest>.+?).zip\\s"
-      ],
-      "datasourceTemplate": "git-refs",
-      "currentValueTemplate": "{{{gitBranch}}}",
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}git{{/if}}"
-    }
-  ],
-  "packageRules": [
-    {
-      "matchPackageNames": ["meshtastic/device-ui"],
-      "reviewers": ["mverch67"],
-      "changelogUrl": "https://github.com/meshtastic/device-ui/compare/{{currentDigest}}...{{newDigest}}"
-    }
-  ]
-}

src/AmbientLightingThread.h

@@ -6,11 +6,6 @@
 NCP5623 rgb;
 #endif
 
-#ifdef HAS_LP5562
-#include <graphics/NomadStarLED.h>
-LP5562 rgbw;
-#endif
-
 #ifdef HAS_NEOPIXEL
 #include <graphics/NeoPixel.h>
 Adafruit_NeoPixel pixels(NEOPIXEL_COUNT, NEOPIXEL_DATA, NEOPIXEL_TYPE);
@@ -31,7 +26,7 @@ class AmbientLightingThread : public concurrency::OSThread
         notifyDeepSleepObserver.observe(&notifyDeepSleep); // Let us know when shutdown() is issued.
 
 // Enables Ambient Lighting by default if conditions are meet.
-#ifdef HAS_RGB_LED
+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
 #ifdef ENABLE_AMBIENTLIGHTING
         moduleConfig.ambient_lighting.led_state = true;
 #endif
@@ -44,7 +39,7 @@ class AmbientLightingThread : public concurrency::OSThread
         // moduleConfig.ambient_lighting.green = (myNodeInfo.my_node_num & 0x00FF00) >> 8;
         // moduleConfig.ambient_lighting.blue = myNodeInfo.my_node_num & 0x0000FF;
 
-#if defined(HAS_NCP5623) || defined(HAS_LP5562)
+#ifdef HAS_NCP5623
         _type = type;
         if (_type == ScanI2C::DeviceType::NONE) {
             LOG_DEBUG("AmbientLighting Disable due to no RGB leds found on I2C bus");
@@ -52,21 +47,17 @@ class AmbientLightingThread : public concurrency::OSThread
             return;
         }
 #endif
-#ifdef HAS_RGB_LED
+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
         if (!moduleConfig.ambient_lighting.led_state) {
             LOG_DEBUG("AmbientLighting Disable due to moduleConfig.ambient_lighting.led_state OFF");
             disable();
             return;
         }
         LOG_DEBUG("AmbientLighting init");
-#if defined(HAS_NCP5623) || defined(HAS_LP5562)
+#ifdef HAS_NCP5623
         if (_type == ScanI2C::NCP5623) {
             rgb.begin();
 #endif
-#ifdef HAS_LP5562
-        } else if (_type == ScanI2C::LP5562) {
-            rgbw.begin();
-#endif
 #ifdef RGBLED_RED
             pinMode(RGBLED_RED, OUTPUT);
             pinMode(RGBLED_GREEN, OUTPUT);
@@ -79,7 +70,7 @@ class AmbientLightingThread : public concurrency::OSThread
 #endif
             setLighting();
 #endif
-#if defined(HAS_NCP5623) || defined(HAS_LP5562)
+#ifdef HAS_NCP5623
         }
 #endif
     }
@@ -87,13 +78,13 @@ class AmbientLightingThread : public concurrency::OSThread
   protected:
     int32_t runOnce() override
     {
-#ifdef HAS_RGB_LED
+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
-#if defined(HAS_NCP5623) || defined(HAS_LP5562)
+#ifdef HAS_NCP5623
-        if ((_type == ScanI2C::NCP5623 || _type == ScanI2C::LP5562) && moduleConfig.ambient_lighting.led_state) {
+        if (_type == ScanI2C::NCP5623 && moduleConfig.ambient_lighting.led_state) {
 #endif
             setLighting();
             return 30000; // 30 seconds to reset from any animations that may have been running from Ext. Notification
-#if defined(HAS_NCP5623) || defined(HAS_LP5562)
+#ifdef HAS_NCP5623
         }
 #endif
 #endif
@@ -117,14 +108,6 @@ class AmbientLightingThread : public concurrency::OSThread
         rgb.setBlue(0);
         LOG_INFO("OFF: NCP5623 Ambient lighting");
 #endif
-#ifdef HAS_LP5562
-        rgbw.setCurrent(0);
-        rgbw.setRed(0);
-        rgbw.setGreen(0);
-        rgbw.setBlue(0);
-        rgbw.setWhite(0);
-        LOG_INFO("OFF: LP5562 Ambient lighting");
-#endif
 #ifdef HAS_NEOPIXEL
         pixels.clear();
         pixels.show();
@@ -158,14 +141,6 @@ class AmbientLightingThread : public concurrency::OSThread
         LOG_DEBUG("Init NCP5623 Ambient light w/ current=%d, red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.current,
                   moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
-#ifdef HAS_LP5562
-        rgbw.setCurrent(moduleConfig.ambient_lighting.current);
-        rgbw.setRed(moduleConfig.ambient_lighting.red);
-        rgbw.setGreen(moduleConfig.ambient_lighting.green);
-        rgbw.setBlue(moduleConfig.ambient_lighting.blue);
-        LOG_DEBUG("Init LP5562 Ambient light w/ current=%d, red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.current,
-                  moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
-#endif
 #ifdef HAS_NEOPIXEL
         pixels.fill(pixels.Color(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
                                  moduleConfig.ambient_lighting.blue),

src/AudioThread.h

@@ -41,8 +41,10 @@ class AudioThread : public concurrency::OSThread
             delete i2sRtttl;
             i2sRtttl = nullptr;
         }
-        delete rtttlFile;
+        if (rtttlFile != nullptr) {
-        rtttlFile = nullptr;
+            delete rtttlFile;
+            rtttlFile = nullptr;
+        }
 
         setCPUFast(false);
     }

src/ButtonThread.cpp

@@ -47,7 +47,7 @@ ButtonThread::ButtonThread() : OSThread("Button")
 #ifdef USERPREFS_BUTTON_PIN
     int pin = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN; // Resolved button pin
 #endif
-#if defined(HELTEC_CAPSULE_SENSOR_V3) || defined(HELTEC_SENSOR_HUB)
+#if defined(HELTEC_CAPSULE_SENSOR_V3)
     this->userButton = OneButton(pin, false, false);
 #elif defined(BUTTON_ACTIVE_LOW)
     this->userButton = OneButton(pin, BUTTON_ACTIVE_LOW, BUTTON_ACTIVE_PULLUP);
@@ -73,28 +73,23 @@ ButtonThread::ButtonThread() : OSThread("Button")
     userButton.setDebounceMs(1);
     userButton.attachDoubleClick(userButtonDoublePressed);
     userButton.attachMultiClick(userButtonMultiPressed, this); // Reference to instance: get click count from non-static OneButton
-#if !defined(T_DECK) &&                                                                                                          \
+#ifndef T_DECK // T-Deck immediately wakes up after shutdown, so disable this function
-    !defined(                                                                                                                    \
-        ELECROW_ThinkNode_M2) // T-Deck immediately wakes up after shutdown, Thinknode M2 has this on the smaller ALT button
     userButton.attachLongPressStart(userButtonPressedLongStart);
     userButton.attachLongPressStop(userButtonPressedLongStop);
 #endif
 #endif
 
 #ifdef BUTTON_PIN_ALT
-#if defined(ELECROW_ThinkNode_M2)
+    userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
-    this->userButtonAlt = OneButton(BUTTON_PIN_ALT, false, false);
-#else
-    this->userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
-#endif
 #ifdef INPUT_PULLUP_SENSE
     // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
     pinMode(BUTTON_PIN_ALT, INPUT_PULLUP_SENSE);
 #endif
-    userButtonAlt.attachClick(userButtonPressedScreen);
+    userButtonAlt.attachClick(userButtonPressed);
     userButtonAlt.setClickMs(BUTTON_CLICK_MS);
     userButtonAlt.setPressMs(BUTTON_LONGPRESS_MS);
     userButtonAlt.setDebounceMs(1);
+    userButtonAlt.attachDoubleClick(userButtonDoublePressed);
     userButtonAlt.attachLongPressStart(userButtonPressedLongStart);
     userButtonAlt.attachLongPressStop(userButtonPressedLongStop);
 #endif
@@ -116,49 +111,6 @@ ButtonThread::ButtonThread() : OSThread("Button")
 #endif
 }
 
-void ButtonThread::switchPage()
-{
-#ifdef BUTTON_PIN
-#if !defined(USERPREFS_BUTTON_PIN)
-    if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
-         moduleConfig.canned_message.inputbroker_pin_press) ||
-        !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
-        !moduleConfig.canned_message.enabled) {
-        powerFSM.trigger(EVENT_PRESS);
-    }
-#endif
-#if defined(USERPREFS_BUTTON_PIN)
-    if (((config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN) !=
-         moduleConfig.canned_message.inputbroker_pin_press) ||
-        !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
-        !moduleConfig.canned_message.enabled) {
-        powerFSM.trigger(EVENT_PRESS);
-    }
-#endif
-
-#endif
-#if defined(ARCH_PORTDUINO)
-    if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) &&
-            (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) ||
-        !moduleConfig.canned_message.enabled) {
-        powerFSM.trigger(EVENT_PRESS);
-    }
-#endif
-}
-
-void ButtonThread::sendAdHocPosition()
-{
-    service->refreshLocalMeshNode();
-    auto sentPosition = service->trySendPosition(NODENUM_BROADCAST, true);
-    if (screen) {
-        if (sentPosition)
-            screen->print("Sent ad-hoc position\n");
-        else
-            screen->print("Sent ad-hoc nodeinfo\n");
-        screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
-    }
-}
-
 int32_t ButtonThread::runOnce()
 {
     // If the button is pressed we suppress CPU sleep until release
@@ -189,48 +141,49 @@ int32_t ButtonThread::runOnce()
             // If a nag notification is running, stop it and prevent other actions
             if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
                 externalNotificationModule->stopNow();
-                break;
+                return 50;
             }
-#ifdef ELECROW_ThinkNode_M1
+#ifdef BUTTON_PIN
-            sendAdHocPosition();
+#if !defined(USERPREFS_BUTTON_PIN)
-            break;
+            if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
 #endif
-            switchPage();
+#if defined(USERPREFS_BUTTON_PIN)
-            break;
+            if (((config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN) !=
-        }
+#endif
-
+                 moduleConfig.canned_message.inputbroker_pin_press) ||
-        case BUTTON_EVENT_PRESSED_SCREEN: {
+                !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
-            LOG_BUTTON("AltPress!");
+                !moduleConfig.canned_message.enabled) {
-#ifdef ELECROW_ThinkNode_M1
+                powerFSM.trigger(EVENT_PRESS);
-            // If a nag notification is running, stop it and prevent other actions
+            }
-            if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
+#endif
-                externalNotificationModule->stopNow();
+#if defined(ARCH_PORTDUINO)
-                break;
+            if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) &&
+                    (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) ||
+                !moduleConfig.canned_message.enabled) {
+                powerFSM.trigger(EVENT_PRESS);
             }
-            switchPage();
-            break;
 #endif
-            // turn screen on or off
-            screen_flag = !screen_flag;
-            if (screen)
-                screen->setOn(screen_flag);
             break;
         }
 
         case BUTTON_EVENT_DOUBLE_PRESSED: {
             LOG_BUTTON("Double press!");
-#ifdef ELECROW_ThinkNode_M1
+            service->refreshLocalMeshNode();
-            digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
+            auto sentPosition = service->trySendPosition(NODENUM_BROADCAST, true);
-            break;
+            if (screen) {
-#endif
+                if (sentPosition)
-            sendAdHocPosition();
+                    screen->print("Sent ad-hoc position\n");
+                else
+                    screen->print("Sent ad-hoc nodeinfo\n");
+                screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
+            }
             break;
         }
 
         case BUTTON_EVENT_MULTI_PRESSED: {
             LOG_BUTTON("Mulitipress! %hux", multipressClickCount);
             switch (multipressClickCount) {
-#if HAS_GPS && !defined(ELECROW_ThinkNode_M1)
+#if HAS_GPS
             // 3 clicks: toggle GPS
             case 3:
                 if (!config.device.disable_triple_click && (gps != nullptr)) {
@@ -239,17 +192,8 @@ int32_t ButtonThread::runOnce()
                         screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
                 }
                 break;
-#elif defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
-            case 3:
-                LOG_INFO("3 clicks: toggle buzzer");
-                buzzer_flag = !buzzer_flag;
-                if (!buzzer_flag)
-                    noTone(PIN_BUZZER);
-                break;
-
 #endif
-
+#if defined(USE_EINK) && defined(PIN_EINK_EN) // i.e. T-Echo
-#if defined(USE_EINK) && defined(PIN_EINK_EN) && !defined(ELECROW_ThinkNode_M1) // i.e. T-Echo
             // 4 clicks: toggle backlight
             case 4:
                 digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
@@ -349,12 +293,8 @@ void ButtonThread::attachButtonInterrupts()
 #endif
 
 #ifdef BUTTON_PIN_ALT
-#ifdef ELECROW_ThinkNode_M2
-    wakeOnIrq(BUTTON_PIN_ALT, RISING);
-#else
     wakeOnIrq(BUTTON_PIN_ALT, FALLING);
 #endif
-#endif
 
 #ifdef BUTTON_PIN_TOUCH
     wakeOnIrq(BUTTON_PIN_TOUCH, FALLING);

src/ButtonThread.h

@@ -24,7 +24,6 @@ class ButtonThread : public concurrency::OSThread
     enum ButtonEventType {
         BUTTON_EVENT_NONE,
         BUTTON_EVENT_PRESSED,
-        BUTTON_EVENT_PRESSED_SCREEN,
         BUTTON_EVENT_DOUBLE_PRESSED,
         BUTTON_EVENT_MULTI_PRESSED,
         BUTTON_EVENT_LONG_PRESSED,
@@ -37,15 +36,13 @@ class ButtonThread : public concurrency::OSThread
     void attachButtonInterrupts();
     void detachButtonInterrupts();
     void storeClickCount();
-    bool isBuzzing() { return buzzer_flag; }
-    void setScreenFlag(bool flag) { screen_flag = flag; }
-    bool getScreenFlag() { return screen_flag; }
 
     // 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
@@ -67,20 +64,14 @@ class ButtonThread : public concurrency::OSThread
 
     // set during IRQ
     static volatile ButtonEventType btnEvent;
-    bool buzzer_flag = false;
-    bool screen_flag = true;
 
     // Store click count during callback, for later use
     volatile int multipressClickCount = 0;
 
     static void wakeOnIrq(int irq, int mode);
 
-    static void sendAdHocPosition();
-    static void switchPage();
-
     // IRQ callbacks
     static void userButtonPressed() { btnEvent = BUTTON_EVENT_PRESSED; }
-    static void userButtonPressedScreen() { btnEvent = BUTTON_EVENT_PRESSED_SCREEN; }
     static void userButtonDoublePressed() { btnEvent = BUTTON_EVENT_DOUBLE_PRESSED; }
     static void userButtonMultiPressed(void *callerThread); // Retrieve click count from non-static Onebutton while still valid
     static void userButtonPressedLongStart();

src/DisplayFormatters.cpp

@@ -27,6 +27,9 @@ const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaC
     case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
         return useShortName ? "LongM" : "LongMod";
         break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
+        return useShortName ? "VeryL" : "VLongSlow";
+        break;
     default:
         return useShortName ? "Custom" : "Invalid";
         break;

src/FSCommon.cpp

@@ -12,14 +12,13 @@
 #include "SPILock.h"
 #include "configuration.h"
 
-// Software SPI is used by MUI so disable SD card here until it's also implemented
+#ifdef HAS_SDCARD
-#if defined(HAS_SDCARD) && !defined(SDCARD_USE_SOFT_SPI)
 #include <SD.h>
 #include <SPI.h>
 
 #ifdef SDCARD_USE_SPI1
-SPIClass SPI_HSPI(HSPI);
+SPIClass SPI1(HSPI);
-#define SDHandler SPI_HSPI
+#define SDHandler SPI1
 #else
 #define SDHandler SPI
 #endif
@@ -30,6 +29,30 @@ SPIClass SPI_HSPI(HSPI);
 
 #endif // HAS_SDCARD
 
+#if defined(ARCH_STM32WL)
+
+uint16_t OSFS::startOfEEPROM = 1;
+uint16_t OSFS::endOfEEPROM = 2048;
+
+// 3) How do I read from the medium?
+void OSFS::readNBytes(uint16_t address, unsigned int num, byte *output)
+{
+    for (uint16_t i = address; i < address + num; i++) {
+        *output = EEPROM.read(i);
+        output++;
+    }
+}
+
+// 4) How to I write to the medium?
+void OSFS::writeNBytes(uint16_t address, unsigned int num, const byte *input)
+{
+    for (uint16_t i = address; i < address + num; i++) {
+        EEPROM.update(i, *input);
+        input++;
+    }
+}
+#endif
+
 /**
  * @brief Copies a file from one location to another.
  *
@@ -39,7 +62,33 @@ SPIClass SPI_HSPI(HSPI);
  */
 bool copyFile(const char *from, const char *to)
 {
-#ifdef FSCom
+#ifdef ARCH_STM32WL
+    unsigned char cbuffer[2048];
+
+    // Var to hold the result of actions
+    OSFS::result r;
+
+    r = OSFS::getFile(from, cbuffer);
+
+    if (r == notfound) {
+        LOG_ERROR("Failed to open source file %s", from);
+        return false;
+    } else if (r == noerr) {
+        r = OSFS::newFile(to, cbuffer, true);
+        if (r == noerr) {
+            return true;
+        } else {
+            LOG_ERROR("OSFS Error %d", r);
+            return false;
+        }
+
+    } else {
+        LOG_ERROR("OSFS Error %d", r);
+        return false;
+    }
+    return true;
+
+#elif defined(FSCom)
     // take SPI Lock
     concurrency::LockGuard g(spiLock);
     unsigned char cbuffer[16];
@@ -78,7 +127,13 @@ bool copyFile(const char *from, const char *to)
  */
 bool renameFile(const char *pathFrom, const char *pathTo)
 {
-#ifdef FSCom
+#ifdef ARCH_STM32WL
+    if (copyFile(pathFrom, pathTo) && (OSFS::deleteFile(pathFrom) == OSFS::result::NO_ERROR)) {
+        return true;
+    } else {
+        return false;
+    }
+#elif defined(FSCom)
 
 #ifdef ARCH_ESP32
     // take SPI Lock
@@ -307,7 +362,7 @@ void fsInit()
  */
 void setupSDCard()
 {
-#if defined(HAS_SDCARD) && !defined(SDCARD_USE_SOFT_SPI)
+#ifdef HAS_SDCARD
     concurrency::LockGuard g(spiLock);
     SDHandler.begin(SPI_SCK, SPI_MISO, SPI_MOSI);
     if (!SD.begin(SDCARD_CS, SDHandler, SD_SPI_FREQUENCY)) {

src/FSCommon.h

@@ -15,11 +15,13 @@
 #endif
 
 #if defined(ARCH_STM32WL)
-// STM32WL
+// STM32WL series 2 Kbytes (8 rows of 256 bytes)
-#include "LittleFS.h"
+#include <EEPROM.h>
-#define FSCom InternalFS
+#include <OSFS.h>
-#define FSBegin() FSCom.begin()
+
-using namespace STM32_LittleFS_Namespace;
+// Useful consts
+const OSFS::result noerr = OSFS::result::NO_ERROR;
+const OSFS::result notfound = OSFS::result::FILE_NOT_FOUND;
 #endif
 
 #if defined(ARCH_RP2040)

src/Power.cpp

@@ -76,47 +76,23 @@ static const uint8_t ext_chrg_detect_value = EXT_CHRG_DETECT_VALUE;
 #endif
 #endif
 
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_PORTDUINO)
-#if __has_include(<Adafruit_INA219.h>)
 INA219Sensor ina219Sensor;
-#else
-NullSensor ina219Sensor;
-#endif
-
-#if __has_include(<INA226.h>)
 INA226Sensor ina226Sensor;
-#else
-NullSensor ina226Sensor;
-#endif
-
-#if __has_include(<Adafruit_INA260.h>)
 INA260Sensor ina260Sensor;
-#else
-NullSensor ina260Sensor;
-#endif
-
-#if __has_include(<INA3221.h>)
 INA3221Sensor ina3221Sensor;
-#else
-NullSensor ina3221Sensor;
 #endif
 
-#endif
+#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
-
-#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_STM32WL)
 #include "modules/Telemetry/Sensor/MAX17048Sensor.h"
 #include <utility>
 extern std::pair<uint8_t, TwoWire *> nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1];
 #if HAS_TELEMETRY && (!MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR || !MESHTASTIC_EXCLUDE_POWER_TELEMETRY)
-#if __has_include(<Adafruit_MAX1704X.h>)
 MAX17048Sensor max17048Sensor;
-#else
-NullSensor max17048Sensor;
-#endif
 #endif
 #endif
 
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && HAS_RAKPROT
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && HAS_RAKPROT && !defined(ARCH_PORTDUINO)
 RAK9154Sensor rak9154Sensor;
 #endif
 
@@ -227,7 +203,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
      */
     virtual int getBatteryPercent() override
     {
-#if defined(HAS_RAKPROT) && !defined(HAS_PMU)
+#if defined(HAS_RAKPROT) && !defined(ARCH_PORTDUINO) && !defined(HAS_PMU)
         if (hasRAK()) {
             return rak9154Sensor.getBusBatteryPercent();
         }
@@ -272,13 +248,15 @@ class AnalogBatteryLevel : public HasBatteryLevel
     virtual uint16_t getBattVoltage() override
     {
 
-#if HAS_TELEMETRY && defined(HAS_RAKPROT) && !defined(HAS_PMU) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+#if HAS_TELEMETRY && defined(HAS_RAKPROT) && !defined(ARCH_PORTDUINO) && !defined(HAS_PMU) &&                                    \
+    !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
         if (hasRAK()) {
             return getRAKVoltage();
         }
 #endif
 
-#if HAS_TELEMETRY && !defined(ARCH_STM32WL) && !defined(HAS_PMU) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(HAS_PMU) &&                                  \
+    !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
         if (hasINA()) {
             return getINAVoltage();
         }
@@ -402,20 +380,6 @@ class AnalogBatteryLevel : public HasBatteryLevel
     // if we have a integrated device with a battery, we can assume that the battery is always connected
 #ifdef BATTERY_IMMUTABLE
     virtual bool isBatteryConnect() override { return true; }
-#elif defined(ADC_V)
-    virtual bool isBatteryConnect() override
-    {
-        int lastReading = digitalRead(ADC_V);
-        // 判断值是否变化
-        for (int i = 2; i < 500; i++) {
-            int reading = digitalRead(ADC_V);
-            if (reading != lastReading) {
-                return false; // 有变化，USB供电, 没接电池
-            }
-        }
-
-        return true;
-    }
 #else
     virtual bool isBatteryConnect() override { return getBatteryPercent() != -1; }
 #endif
@@ -427,7 +391,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
     virtual bool isVbusIn() override
     {
 #ifdef EXT_PWR_DETECT
-#if defined(HELTEC_CAPSULE_SENSOR_V3) || defined(HELTEC_SENSOR_HUB)
+#ifdef HELTEC_CAPSULE_SENSOR_V3
         // if external powered that pin will be pulled down
         if (digitalRead(EXT_PWR_DETECT) == LOW) {
             return true;
@@ -448,7 +412,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
     /// we can't be smart enough to say 'full'?
     virtual bool isCharging() override
     {
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && defined(HAS_RAKPROT) && !defined(HAS_PMU)
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && defined(HAS_RAKPROT) && !defined(ARCH_PORTDUINO) &&             \
+    !defined(HAS_PMU)
         if (hasRAK()) {
             return (rak9154Sensor.isCharging()) ? OptTrue : OptFalse;
         }
@@ -456,7 +421,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
 #ifdef EXT_CHRG_DETECT
         return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
 #else
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_STM32WL) &&                                       \
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) &&           \
     !defined(DISABLE_INA_CHARGING_DETECTION)
         if (hasINA()) {
             // get current flow from INA sensor - negative value means power flowing into the battery
@@ -471,8 +436,6 @@ class AnalogBatteryLevel : public HasBatteryLevel
         return isBatteryConnect() && isVbusIn();
 #endif
 #endif
-        // by default, we check the battery voltage only
-        return isVbusIn();
     }
 
   private:
@@ -503,7 +466,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
     }
 #endif
 
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_STM32WL)
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
     uint16_t getINAVoltage()
     {
         if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
@@ -578,7 +541,7 @@ Power::Power() : OSThread("Power")
 bool Power::analogInit()
 {
 #ifdef EXT_PWR_DETECT
-#if defined(HELTEC_CAPSULE_SENSOR_V3) || defined(HELTEC_SENSOR_HUB)
+#ifdef HELTEC_CAPSULE_SENSOR_V3
     pinMode(EXT_PWR_DETECT, INPUT_PULLUP);
 #else
     pinMode(EXT_PWR_DETECT, INPUT);
@@ -705,12 +668,12 @@ void Power::readPowerStatus()
     int8_t batteryChargePercent = -1;
     OptionalBool usbPowered = OptUnknown;
     OptionalBool hasBattery = OptUnknown; // These must be static because NRF_APM code doesn't run every time
-    OptionalBool isChargingNow = OptUnknown;
+    OptionalBool isCharging = OptUnknown;
 
     if (batteryLevel) {
         hasBattery = batteryLevel->isBatteryConnect() ? OptTrue : OptFalse;
         usbPowered = batteryLevel->isVbusIn() ? OptTrue : OptFalse;
-        isChargingNow = batteryLevel->isCharging() ? OptTrue : OptFalse;
+        isCharging = batteryLevel->isCharging() ? OptTrue : OptFalse;
         if (hasBattery) {
             batteryVoltageMv = batteryLevel->getBattVoltage();
             // If the AXP192 returns a valid battery percentage, use it
@@ -739,15 +702,15 @@ void Power::readPowerStatus()
 
     // If changed to DISCONNECTED
     if (nrf_usb_state == NRFX_POWER_USB_STATE_DISCONNECTED)
-        isChargingNow = usbPowered = OptFalse;
+        isCharging = usbPowered = OptFalse;
     // If changed to CONNECTED / READY
     else
-        isChargingNow = usbPowered = OptTrue;
+        isCharging = usbPowered = OptTrue;
 
 #endif
 
     // Notify any status instances that are observing us
-    const PowerStatus powerStatus2 = PowerStatus(hasBattery, usbPowered, isChargingNow, batteryVoltageMv, batteryChargePercent);
+    const PowerStatus powerStatus2 = PowerStatus(hasBattery, usbPowered, isCharging, batteryVoltageMv, batteryChargePercent);
     LOG_DEBUG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d", powerStatus2.getHasUSB(), powerStatus2.getIsCharging(),
               powerStatus2.getBatteryVoltageMv(), powerStatus2.getBatteryChargePercent());
     newStatus.notifyObservers(&powerStatus2);
@@ -793,7 +756,6 @@ void Power::readPowerStatus()
     // If we have a battery at all and it is less than 0%, force deep sleep if we have more than 10 low readings in
     // a row. NOTE: min LiIon/LiPo voltage is 2.0 to 2.5V, current OCV min is set to 3100 that is large enough.
     //
-
     if (batteryLevel && powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
         if (batteryLevel->getBattVoltage() < OCV[NUM_OCV_POINTS - 1]) {
             low_voltage_counter++;

src/PowerFSM.cpp

@@ -19,7 +19,7 @@
 #include "sleep.h"
 #include "target_specific.h"
 
-#if HAS_WIFI && !defined(ARCH_PORTDUINO) || defined(MESHTASTIC_EXCLUDE_WIFI)
+#if HAS_WIFI && !defined(ARCH_PORTDUINO)
 #include "mesh/wifi/WiFiAPClient.h"
 #endif
 
@@ -269,6 +269,9 @@ Fsm powerFSM(&stateBOOT);
 void PowerFSM_setup()
 {
     bool isRouter = (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER ? 1 : 0);
+    bool isTrackerOrSensor = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
+                             config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
+                             config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR;
     bool hasPower = isPowered();
 
     LOG_INFO("PowerFSM init, USB power=%d", hasPower ? 1 : 0);
@@ -380,12 +383,6 @@ void PowerFSM_setup()
     // See: https://github.com/meshtastic/firmware/issues/1071
     // Don't add power saving transitions if we are a power saving tracker or sensor or have Wifi enabled. Sleep will be initiated
     // through the modules
-
-#if HAS_WIFI || !defined(MESHTASTIC_EXCLUDE_WIFI)
-    bool isTrackerOrSensor = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
-                             config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
-                             config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR;
-
     if ((isRouter || config.power.is_power_saving) && !isWifiAvailable() && !isTrackerOrSensor) {
         powerFSM.add_timed_transition(&stateNB, &stateLS,
                                       Default::getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL,
@@ -403,9 +400,7 @@ void PowerFSM_setup()
                                       Default::getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs),
                                       NULL, "Screen-on timeout");
     }
-#endif // HAS_WIFI || !defined(MESHTASTIC_EXCLUDE_WIFI)
+#else
-
-#else // (not) ARCH_ESP32
     // If not ESP32, light-sleep not used. Check periodically if config has drifted out of stateDark
     powerFSM.add_timed_transition(&stateDARK, &stateDARK,
                                   Default::getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL,
@@ -414,4 +409,4 @@ void PowerFSM_setup()
 
     powerFSM.run_machine(); // run one iteration of the state machine, so we run our on enter tasks for the initial DARK state
 }
-#endif
+#endif

src/buzz/buzz.cpp

@@ -30,11 +30,8 @@ struct ToneDuration {
 #define NOTE_B3 247
 #define NOTE_CS4 277
 
-const int DURATION_1_8 = 125;  // 1/8 note
+const int DURATION_1_8 = 125; // 1/8 note
-const int DURATION_1_4 = 250;  // 1/4 note
+const int DURATION_1_4 = 250; // 1/4 note
-const int DURATION_1_2 = 500;  // 1/2 note
-const int DURATION_3_4 = 750;  // 1/4 note
-const int DURATION_1_1 = 1000; // 1/1 note
 
 void playTones(const ToneDuration *tone_durations, int size)
 {
@@ -58,12 +55,6 @@ void playBeep()
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
-void playLongBeep()
-{
-    ToneDuration melody[] = {{NOTE_B3, DURATION_1_1}};
-    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
-}
-
 void playGPSEnableBeep()
 {
     ToneDuration melody[] = {{NOTE_C3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_CS4, DURATION_1_4}};

src/buzz/buzz.h

@@ -1,7 +1,6 @@
 #pragma once
 
 void playBeep();
-void playLongBeep();
 void playStartMelody();
 void playShutdownMelody();
 void playGPSEnableBeep();

src/configuration.h

@@ -152,7 +152,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MLX90614_ADDR_DEF 0x5A
 #define CGRADSENS_ADDR 0x66
 #define LTR390UV_ADDR 0x53
-#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34 // same adress as TCA8418
 
 // -----------------------------------------------------------------------------
 // ACCELEROMETER
@@ -171,7 +170,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // LED
 // -----------------------------------------------------------------------------
 #define NCP5623_ADDR 0x38
-#define LP5562_ADDR 0x30
 
 // -----------------------------------------------------------------------------
 // Security
@@ -297,11 +295,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #error HW_VENDOR must be defined
 #endif
 
-// Support multiple RGB LED configuration
-#if defined(HAS_NCP5623) || defined(HAS_LP5562) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
-#define HAS_RGB_LED
-#endif
-
 // -----------------------------------------------------------------------------
 // Global switches to turn off features for a minimized build
 // -----------------------------------------------------------------------------

src/detect/ScanI2C.cpp

@@ -31,8 +31,8 @@ ScanI2C::FoundDevice ScanI2C::firstRTC() const
 
 ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
 {
-    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB, TCA8418KB};
+    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB};
-    return firstOfOrNONE(6, types);
+    return firstOfOrNONE(5, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
@@ -41,12 +41,6 @@ ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
     return firstOfOrNONE(8, types);
 }
 
-ScanI2C::FoundDevice ScanI2C::firstRGBLED() const
-{
-    ScanI2C::DeviceType types[] = {NCP5623, LP5562};
-    return firstOfOrNONE(2, types);
-}
-
 ScanI2C::FoundDevice ScanI2C::find(ScanI2C::DeviceType) const
 {
     return DEVICE_NONE;

src/detect/ScanI2C.h

@@ -18,7 +18,7 @@ class ScanI2C
         TDECKKB,
         BBQ10KB,
         RAK14004,
-        PMU_AXP192_AXP2101, // has the same adress as the TCA8418KB
+        PMU_AXP192_AXP2101,
         BME_680,
         BME_280,
         BMP_280,
@@ -49,7 +49,6 @@ class ScanI2C
         VEML7700,
         RCWL9620,
         NCP5623,
-        LP5562,
         TSL2591,
         OPT3001,
         MLX90632,
@@ -70,7 +69,6 @@ class ScanI2C
         DFROBOT_RAIN,
         DPS310,
         LTR390UV,
-        TCA8418KB,
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;
@@ -123,8 +121,6 @@ class ScanI2C
 
     FoundDevice firstAccelerometer() const;
 
-    FoundDevice firstRGBLED() const;
-
     virtual FoundDevice find(DeviceType) const;
 
     virtual bool exists(DeviceType) const;

src/detect/ScanI2CTwoWire.cpp

@@ -10,6 +10,11 @@
 #include "meshUtils.h" // vformat
 #endif
 
+// AXP192 and AXP2101 have the same device address, we just need to identify it in Power.cpp
+#ifndef XPOWERS_AXP192_AXP2101_ADDRESS
+#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34
+#endif
+
 bool in_array(uint8_t *array, int size, uint8_t lookfor)
 {
     int i;
@@ -213,20 +218,9 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #ifdef HAS_NCP5623
                 SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623", (uint8_t)addr.address);
 #endif
-#ifdef HAS_LP5562
+#ifdef HAS_PMU
-                SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address);
+                SCAN_SIMPLE_CASE(XPOWERS_AXP192_AXP2101_ADDRESS, PMU_AXP192_AXP2101, "AXP192/AXP2101", (uint8_t)addr.address)
 #endif
-            case XPOWERS_AXP192_AXP2101_ADDRESS:
-                // Do we have the axp2101/192 or the TCA8418
-                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x90), 1);
-                if (registerValue == 0x0) {
-                    logFoundDevice("TCA8418", (uint8_t)addr.address);
-                    type = TCA8418KB;
-                } else {
-                    logFoundDevice("AXP192/AXP2101", (uint8_t)addr.address);
-                    type = PMU_AXP192_AXP2101;
-                }
-                break;
             case BME_ADDR:
             case BME_ADDR_ALTERNATE:
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xD0), 1); // GET_ID

src/gps/GPS.cpp

@@ -12,7 +12,6 @@
 #include "RTC.h"
 #include "Throttle.h"
 #include "buzz.h"
-#include "concurrency/Periodic.h"
 #include "meshUtils.h"
 
 #include "main.h" // pmu_found
@@ -90,45 +89,6 @@ static const char *getGPSPowerStateString(GPSPowerState state)
     }
 }
 
-#ifdef PIN_GPS_SWITCH
-// If we have a hardware switch, define a periodic watcher outside of the GPS runOnce thread, since this can be sleeping
-// idefinitely
-
-int lastState = LOW;
-bool firstrun = true;
-
-static int32_t gpsSwitch()
-{
-    if (gps) {
-        int currentState = digitalRead(PIN_GPS_SWITCH);
-
-        // if the switch is set to zero, disable the GPS Thread
-        if (firstrun)
-            if (currentState == LOW)
-                lastState = HIGH;
-
-        if (currentState != lastState) {
-            if (currentState == LOW) {
-                config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED;
-                if (!firstrun)
-                    playGPSDisableBeep();
-                gps->disable();
-            } else {
-                config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
-                if (!firstrun)
-                    playGPSEnableBeep();
-                gps->enable();
-            }
-            lastState = currentState;
-        }
-        firstrun = false;
-    }
-    return 1000;
-}
-
-static concurrency::Periodic *gpsPeriodic;
-#endif
-
 static void UBXChecksum(uint8_t *message, size_t length)
 {
     uint8_t CK_A = 0, CK_B = 0;
@@ -570,19 +530,6 @@ bool GPS::setup()
             // Switch to Fitness Mode, for running and walking purpose with low speed (<5 m/s)
             _serial_gps->write("$PMTK886,1*29\r\n");
             delay(250);
-        } else if (gnssModel == GNSS_MODEL_MTK_PA1010D) {
-            // PA1010D is used in the Pimoroni GPS board.
-
-            // Enable all constellations.
-            _serial_gps->write("$PMTK353,1,1,1,1,1*2A\r\n");
-            // Above command will reset the GPS and takes longer before it will accept new commands
-            delay(1000);
-            // Only ask for RMC and GGA (GNRMC and GNGGA)
-            _serial_gps->write("$PMTK314,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0*28\r\n");
-            delay(250);
-            // Enable SBAS / WAAS
-            _serial_gps->write("$PMTK301,2*2E\r\n");
-            delay(250);
         } else if (gnssModel == GNSS_MODEL_MTK_PA1616S) {
             // PA1616S is used in some GPS breakout boards from Adafruit
             // PA1616S does not have GLONASS capability. PA1616D does, but is not implemented here.
@@ -823,6 +770,13 @@ void GPS::setPowerState(GPSPowerState newState, uint32_t sleepTime)
     powerState = newState;
     LOG_INFO("GPS power state move from %s to %s", getGPSPowerStateString(oldState), getGPSPowerStateString(newState));
 
+#ifdef HELTEC_MESH_NODE_T114
+    if ((oldState == GPS_OFF || oldState == GPS_HARDSLEEP) && (newState != GPS_OFF && newState != GPS_HARDSLEEP)) {
+        _serial_gps->begin(serialSpeeds[speedSelect]);
+    } else if ((newState == GPS_OFF || newState == GPS_HARDSLEEP) && (oldState != GPS_OFF && oldState != GPS_HARDSLEEP)) {
+        _serial_gps->end();
+    }
+#endif
     switch (newState) {
     case GPS_ACTIVE:
     case GPS_IDLE:
@@ -1027,16 +981,15 @@ void GPS::down()
         setPowerState(GPS_IDLE);
 
     else {
-// Check whether the GPS hardware is capable of GPS_SOFTSLEEP
+        // Check whether the GPS hardware is capable of GPS_SOFTSLEEP
-// If not, fallback to GPS_HARDSLEEP instead
+        // If not, fallback to GPS_HARDSLEEP instead
-#ifdef PIN_GPS_STANDBY // L76B, L76K and clones have a standby pin
-        bool softsleepSupported = true;
-#else
         bool softsleepSupported = false;
-#endif
         // U-blox is supported via PMREQ
         if (IS_ONE_OF(gnssModel, GNSS_MODEL_UBLOX6, GNSS_MODEL_UBLOX7, GNSS_MODEL_UBLOX8, GNSS_MODEL_UBLOX9, GNSS_MODEL_UBLOX10))
             softsleepSupported = true;
+#ifdef PIN_GPS_STANDBY // L76B, L76K and clones have a standby pin
+        softsleepSupported = true;
+#endif
 
         if (softsleepSupported) {
             // How long does gps_update_interval need to be, for GPS_HARDSLEEP to become more efficient than
@@ -1247,15 +1200,12 @@ GnssModel_t GPS::probe(int serialSpeed)
     PROBE_SIMPLE("LC86", "$PQTMVERNO*58", "$PQTMVERNO,LC86", GNSS_MODEL_AG3352, 500);
     PROBE_SIMPLE("L76K", "$PCAS06,0*1B", "$GPTXT,01,01,02,SW=", GNSS_MODEL_MTK, 500);
 
-    // Close all NMEA sentences, valid for MTK3333 and MTK3339 platforms
+    // Close all NMEA sentences, valid for L76B MTK platform (Waveshare Pico GPS)
     _serial_gps->write("$PMTK514,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0*2E\r\n");
     delay(20);
     std::vector<ChipInfo> mtk = {{"L76B", "Quectel-L76B", GNSS_MODEL_MTK_L76B},
-                                 {"PA1010D", "1010D", GNSS_MODEL_MTK_PA1010D},
                                  {"PA1616S", "1616S", GNSS_MODEL_MTK_PA1616S},
-                                 {"LS20031", "MC-1513", GNSS_MODEL_MTK_L76B},
+                                 {"LS20031", "MC-1513", GNSS_MODEL_LS20031}};
-                                 {"L96", "Quectel-L96", GNSS_MODEL_MTK_L76B}};
-
     PROBE_FAMILY("MTK Family", "$PMTK605*31", mtk, 500);
 
     uint8_t cfg_rate[] = {0xB5, 0x62, 0x06, 0x08, 0x00, 0x00, 0x00, 0x00};
@@ -1438,12 +1388,6 @@ GPS *GPS::createGps()
     pinMode(PIN_GPS_PPS, INPUT);
 #endif
 
-#ifdef PIN_GPS_SWITCH
-    // toggle GPS via external GPIO switch
-    pinMode(PIN_GPS_SWITCH, INPUT);
-    gpsPeriodic = new concurrency::Periodic("GPSSwitch", gpsSwitch);
-#endif
-
 // Currently disabled per issue #525 (TinyGPS++ crash bug)
 // when fixed upstream, can be un-disabled to enable 3D FixType and PDOP
 #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS

src/gps/GPS.h

@@ -27,7 +27,6 @@ typedef enum {
     GNSS_MODEL_UC6580,
     GNSS_MODEL_UNKNOWN,
     GNSS_MODEL_MTK_L76B,
-    GNSS_MODEL_MTK_PA1010D,
     GNSS_MODEL_MTK_PA1616S,
     GNSS_MODEL_AG3335,
     GNSS_MODEL_AG3352,

src/gps/ubx.h

@@ -224,7 +224,7 @@ static const uint8_t _message_GSA[] = {
     0x00,       // Rate for DDC
     0x00,       // Rate for UART1
     0x00,       // Rate for UART2
-    0x00,       // Rate for USB useful for native linux
+    0x00,       // Rate for USB usefull for native linux
     0x00,       // Rate for SPI
     0x00        // Reserved
 };
@@ -258,7 +258,7 @@ static const uint8_t _message_RMC[] = {
     0x00,       // Rate for DDC
     0x01,       // Rate for UART1
     0x00,       // Rate for UART2
-    0x01,       // Rate for USB useful for native linux
+    0x01,       // Rate for USB usefull for native linux
     0x00,       // Rate for SPI
     0x00        // Reserved
 };
@@ -269,7 +269,7 @@ static const uint8_t _message_GGA[] = {
     0x00,       // Rate for DDC
     0x01,       // Rate for UART1
     0x00,       // Rate for UART2
-    0x01,       // Rate for USB, useful for native linux
+    0x01,       // Rate for USB, usefull for native linux
     0x00,       // Rate for SPI
     0x00        // Reserved
 };

src/graphics/EInkDisplay2.cpp

@@ -128,25 +128,16 @@ bool EInkDisplay::connect()
 #ifdef PIN_EINK_EN
     // backlight power, HIGH is backlight on, LOW is off
     pinMode(PIN_EINK_EN, OUTPUT);
-#ifdef ELECROW_ThinkNode_M1
-    // ThinkNode M1 has a hardware dimmable backlight. Start enabled
-    digitalWrite(PIN_EINK_EN, HIGH);
-#else
     digitalWrite(PIN_EINK_EN, LOW);
 #endif
-#endif
 
-#if defined(TTGO_T_ECHO) || defined(ELECROW_ThinkNode_M1)
+#if defined(TTGO_T_ECHO)
     {
         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();
-#ifdef ELECROW_ThinkNode_M1
-        adafruitDisplay->setRotation(4);
-#else
         adafruitDisplay->setRotation(3);
-#endif
         adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
     }
 #elif defined(MESHLINK)
@@ -175,12 +166,12 @@ bool EInkDisplay::connect()
     }
 
 #elif defined(HELTEC_WIRELESS_PAPER_V1_0) || defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_VISION_MASTER_E213) ||             \
-    defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER) || defined(CROWPANEL_ESP32S3_5_EPAPER) ||                   \
+    defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER) || defined(CROWPANEL_ESP32S3_5_EPAPER)
-    defined(CROWPANEL_ESP32S3_4_EPAPER) || defined(CROWPANEL_ESP32S3_2_EPAPER)
     {
         // Start HSPI
         hspi = new SPIClass(HSPI);
         hspi->begin(PIN_EINK_SCLK, -1, PIN_EINK_MOSI, PIN_EINK_CS); // SCLK, MISO, MOSI, SS
+
         // VExt already enabled in setup()
         // RTC GPIO hold disabled in setup()
 
@@ -191,7 +182,7 @@ bool EInkDisplay::connect()
         // Init GxEPD2
         adafruitDisplay->init();
         adafruitDisplay->setRotation(3);
-#if defined(CROWPANEL_ESP32S3_5_EPAPER) || defined(CROWPANEL_ESP32S3_4_EPAPER)
+#if defined(CROWPANEL_ESP32S3_5_EPAPER)
         adafruitDisplay->setRotation(0);
 #endif
     }
@@ -217,21 +208,6 @@ bool EInkDisplay::connect()
         adafruitDisplay->setRotation(1);
         adafruitDisplay->setPartialWindow(0, 0, EINK_WIDTH, EINK_HEIGHT);
     }
-#elif defined(HELTEC_MESH_POCKET)
-    {
-        spi1 = &SPI1;
-        spi1->begin();
-        // VExt already enabled in setup()
-        // RTC GPIO hold disabled in setup()
-
-        // Create GxEPD2 objects
-        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);
-
-        // Init GxEPD2
-        adafruitDisplay->init();
-        adafruitDisplay->setRotation(3);
-    }
 #endif
 
     return true;

src/graphics/EInkDisplay2.h

@@ -68,15 +68,10 @@ class EInkDisplay : public OLEDDisplay
 
     // If display uses HSPI
 #if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0) || defined(HELTEC_VISION_MASTER_E213) ||               \
-    defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER) || defined(CROWPANEL_ESP32S3_5_EPAPER) ||                   \
+    defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER) || defined(CROWPANEL_ESP32S3_5_EPAPER)
-    defined(CROWPANEL_ESP32S3_4_EPAPER) || defined(CROWPANEL_ESP32S3_2_EPAPER)
     SPIClass *hspi = NULL;
 #endif
 
-#if defined(HELTEC_MESH_POCKET)
-    SPIClass *spi1 = NULL;
-#endif
-
   private:
     // FIXME quick hack to limit drawing to a very slow rate
     uint32_t lastDrawMsec = 0;

src/graphics/NomadStarLED.h

@@ -1,5 +0,0 @@
-#ifdef HAS_LP5562
-#include <LP5562.h>
-extern LP5562 rgbw;
-
-#endif

src/graphics/Screen.cpp

@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if !MESHTASTIC_EXCLUDE_GPS
 #include "GPS.h"
 #endif
-#include "ButtonThread.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "error.h"
@@ -1104,7 +1103,7 @@ static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const NodeStat
     char usersString[20];
     snprintf(usersString, sizeof(usersString), "%d/%d", nodeStatus->getNumOnline(), nodeStatus->getNumTotal());
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS)) &&                                  \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) &&                                                         \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
     display->drawFastImage(x, y + 3, 8, 8, imgUser);
 #else
@@ -1545,7 +1544,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
     dispdev = new SSD1306Wire(address.address, -1, -1, geometry,
                               (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
 #elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7789_CS) ||    \
-    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS)
+    defined(RAK14014) || defined(HX8357_CS)
     dispdev = new TFTDisplay(address.address, -1, -1, geometry,
                              (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
 #elif defined(USE_EINK) && !defined(USE_EINK_DYNAMICDISPLAY)
@@ -1607,7 +1606,6 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
     if (on != screenOn) {
         if (on) {
             LOG_INFO("Turn on screen");
-            buttonThread->setScreenFlag(true);
             powerMon->setState(meshtastic_PowerMon_State_Screen_On);
 #ifdef T_WATCH_S3
             PMU->enablePowerOutput(XPOWERS_ALDO2);
@@ -1643,12 +1641,6 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
             setScreensaverFrames(einkScreensaver);
 #endif
             LOG_INFO("Turn off screen");
-            buttonThread->setScreenFlag(false);
-#ifdef ELECROW_ThinkNode_M1
-            if (digitalRead(PIN_EINK_EN) == HIGH) {
-                digitalWrite(PIN_EINK_EN, LOW);
-            }
-#endif
             dispdev->displayOff();
 #ifdef USE_ST7789
             SPI1.end();
@@ -1751,7 +1743,7 @@ void Screen::setup()
     // flip it. If you have a headache now, you're welcome.
     if (!config.display.flip_screen) {
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) ||      \
-    defined(ST7789_CS) || defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS)
+    defined(ST7789_CS) || defined(RAK14014) || defined(HX8357_CS)
         static_cast<TFTDisplay *>(dispdev)->flipScreenVertically();
 #elif defined(USE_ST7789)
         static_cast<ST7789Spi *>(dispdev)->flipScreenVertically();
@@ -1796,9 +1788,7 @@ void Screen::setup()
     powerStatusObserver.observe(&powerStatus->onNewStatus);
     gpsStatusObserver.observe(&gpsStatus->onNewStatus);
     nodeStatusObserver.observe(&nodeStatus->onNewStatus);
-#if !MESHTASTIC_EXCLUDE_ADMIN
     adminMessageObserver.observe(adminModule);
-#endif
     if (textMessageModule)
         textMessageObserver.observe(textMessageModule);
     if (inputBroker)
@@ -2492,7 +2482,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
         if (!Throttle::isWithinTimespanMs(storeForwardModule->lastHeartbeat,
                                           (storeForwardModule->heartbeatInterval * 1200))) { // no heartbeat, overlap a bit
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || ARCH_PORTDUINO) &&                \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || ARCH_PORTDUINO) &&                                       \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
             display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                                    imgQuestionL1);
@@ -2504,7 +2494,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 #endif
         } else {
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS)) &&                                  \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) &&                                                         \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
             display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8,
                                    imgSFL1);
@@ -2519,7 +2509,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     } else {
         // TODO: Raspberry Pi supports more than just the one screen size
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || ARCH_PORTDUINO) &&                \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || ARCH_PORTDUINO) &&                                       \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
         display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                                imgInfoL1);
@@ -2674,19 +2664,14 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     // minutes %= 60;
     // hours %= 24;
 
-    // Show uptime as days, hours, minutes OR seconds
-    std::string uptime = screen->drawTimeDelta(days, hours, minutes, seconds);
-
-    // Line 1 (Still)
-    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(uptime.c_str()), y, uptime.c_str());
-    if (config.display.heading_bold)
-        display->drawString(x - 1 + SCREEN_WIDTH - display->getStringWidth(uptime.c_str()), y, uptime.c_str());
-
     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);
+
     uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice, true); // Display local timezone
     if (rtc_sec > 0) {
         long hms = rtc_sec % SEC_PER_DAY;
@@ -2719,6 +2704,9 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
         analogClock += 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());
 
@@ -2740,7 +2728,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
         drawGPSpowerstat(display, x, y + FONT_HEIGHT_SMALL * 2, gpsStatus);
     }
 #endif
-/* Display a heartbeat pixel that blinks every time the frame is redrawn */
+    /* Display a heartbeat pixel that blinks every time the frame is redrawn */
 #ifdef SHOW_REDRAWS
     if (heartbeat)
         display->setPixel(0, 0);
@@ -2840,6 +2828,9 @@ int Screen::handleInputEvent(const InputEvent *event)
 
 int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
 {
+    // Note: only selected admin messages notify this observer
+    // If you wish to handle a new type of message, you should modify AdminModule.cpp first
+
     switch (arg->which_payload_variant) {
     // Node removed manually (i.e. via app)
     case meshtastic_AdminMessage_remove_by_nodenum_tag:
@@ -2856,4 +2847,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
 } // namespace graphics
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
-#endif // HAS_SCREEN
+#endif // HAS_SCREEN

src/graphics/ScreenFonts.h

@@ -16,10 +16,6 @@
 #include "graphics/fonts/OLEDDisplayFontsCS.h"
 #endif
 
-#ifdef CROWPANEL_ESP32S3_5_EPAPER
-#include "graphics/fonts/EinkDisplayFonts.h"
-#endif
-
 #ifdef OLED_PL
 #define FONT_SMALL_LOCAL ArialMT_Plain_10_PL
 #else
@@ -65,8 +61,8 @@
 #endif
 
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) ||                                                         \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) &&                                                         \
-    defined(ILI9488_CS) && !defined(DISPLAY_FORCE_SMALL_FONTS)
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL FONT_MEDIUM_LOCAL // Height: 19
 #define FONT_MEDIUM FONT_LARGE_LOCAL // Height: 28
@@ -78,12 +74,13 @@
 #endif
 
 #if defined(CROWPANEL_ESP32S3_5_EPAPER)
+#include "graphics/fonts/EinkDisplayFonts.h"
 #undef FONT_SMALL
 #undef FONT_MEDIUM
 #undef FONT_LARGE
-#define FONT_SMALL Monospaced_plain_30
+#define FONT_SMALL FONT_LARGE_LOCAL  // Height: 30
-#define FONT_MEDIUM Monospaced_plain_30
+#define FONT_MEDIUM FONT_LARGE_LOCAL // Height: 30
-#define FONT_LARGE Monospaced_plain_30
+#define FONT_LARGE FONT_LARGE_LOCAL  // Height: 30
 #endif
 
 #define _fontHeight(font) ((font)[1] + 1) // height is position 1

src/graphics/TFTDisplay.cpp

@@ -120,303 +120,6 @@ static void rak14014_tpIntHandle(void)
     _rak14014_touch_int = true;
 }
 
-#elif defined(ST72xx_DE)
-#include <LovyanGFX.hpp>
-#include <TCA9534.h>
-#include <lgfx/v1/platforms/esp32s3/Bus_RGB.hpp>
-#include <lgfx/v1/platforms/esp32s3/Panel_RGB.hpp>
-TCA9534 ioex;
-
-class LGFX : public lgfx::LGFX_Device
-{
-    lgfx::Bus_RGB _bus_instance;
-    lgfx::Panel_RGB _panel_instance;
-    lgfx::Touch_GT911 _touch_instance;
-
-  public:
-    const uint16_t screenWidth = TFT_WIDTH;
-    const uint16_t screenHeight = TFT_HEIGHT;
-
-    bool init_impl(bool use_reset, bool use_clear) override
-    {
-        ioex.attach(Wire);
-        ioex.setDeviceAddress(0x18);
-        ioex.config(1, TCA9534::Config::OUT);
-        ioex.config(2, TCA9534::Config::OUT);
-        ioex.config(3, TCA9534::Config::OUT);
-        ioex.config(4, TCA9534::Config::OUT);
-
-        ioex.output(1, TCA9534::Level::H);
-        ioex.output(3, TCA9534::Level::L);
-        ioex.output(4, TCA9534::Level::H);
-
-        pinMode(1, OUTPUT);
-        digitalWrite(1, LOW);
-        ioex.output(2, TCA9534::Level::L);
-        delay(20);
-        ioex.output(2, TCA9534::Level::H);
-        delay(100);
-        pinMode(1, INPUT);
-
-        return LGFX_Device::init_impl(use_reset, use_clear);
-    }
-
-    LGFX(void)
-    {
-        {
-            auto cfg = _panel_instance.config();
-
-            cfg.memory_width = screenWidth;
-            cfg.memory_height = screenHeight;
-            cfg.panel_width = screenWidth;
-            cfg.panel_height = screenHeight;
-            cfg.offset_x = 0;
-            cfg.offset_y = 0;
-            cfg.offset_rotation = 0;
-            _panel_instance.config(cfg);
-        }
-
-        {
-            auto cfg = _panel_instance.config_detail();
-            cfg.use_psram = 0;
-            _panel_instance.config_detail(cfg);
-        }
-
-        {
-            auto cfg = _bus_instance.config();
-            cfg.panel = &_panel_instance;
-            cfg.pin_d0 = ST72xx_B0;  // B0
-            cfg.pin_d1 = ST72xx_B1;  // B1
-            cfg.pin_d2 = ST72xx_B2;  // B2
-            cfg.pin_d3 = ST72xx_B3;  // B3
-            cfg.pin_d4 = ST72xx_B4;  // B4
-            cfg.pin_d5 = ST72xx_G0;  // G0
-            cfg.pin_d6 = ST72xx_G1;  // G1
-            cfg.pin_d7 = ST72xx_G2;  // G2
-            cfg.pin_d8 = ST72xx_G3;  // G3
-            cfg.pin_d9 = ST72xx_G4;  // G4
-            cfg.pin_d10 = ST72xx_G5; // G5
-            cfg.pin_d11 = ST72xx_R0; // R0
-            cfg.pin_d12 = ST72xx_R1; // R1
-            cfg.pin_d13 = ST72xx_R2; // R2
-            cfg.pin_d14 = ST72xx_R3; // R3
-            cfg.pin_d15 = ST72xx_R4; // R4
-
-            cfg.pin_henable = ST72xx_DE;
-            cfg.pin_vsync = ST72xx_VSYNC;
-            cfg.pin_hsync = ST72xx_HSYNC;
-            cfg.pin_pclk = ST72xx_PCLK;
-            cfg.freq_write = 13000000;
-
-#ifdef ST7265_HSYNC_POLARITY
-            cfg.hsync_polarity = ST7265_HSYNC_POLARITY;
-            cfg.hsync_front_porch = ST7265_HSYNC_FRONT_PORCH; // 8;
-            cfg.hsync_pulse_width = ST7265_HSYNC_PULSE_WIDTH; // 4;
-            cfg.hsync_back_porch = ST7265_HSYNC_BACK_PORCH;   // 8;
-
-            cfg.vsync_polarity = ST7265_VSYNC_POLARITY;       // 0;
-            cfg.vsync_front_porch = ST7265_VSYNC_FRONT_PORCH; // 8;
-            cfg.vsync_pulse_width = ST7265_VSYNC_PULSE_WIDTH; // 4;
-            cfg.vsync_back_porch = ST7265_VSYNC_BACK_PORCH;   // 8;
-
-            cfg.pclk_idle_high = 1;
-            cfg.pclk_active_neg = ST7265_PCLK_ACTIVE_NEG; // 0;
-            // cfg.pclk_idle_high = 0;
-            // cfg.de_idle_high = 1;
-#endif
-
-#ifdef ST7262_HSYNC_POLARITY
-            cfg.hsync_polarity = ST7262_HSYNC_POLARITY;
-            cfg.hsync_front_porch = ST7262_HSYNC_FRONT_PORCH; // 8;
-            cfg.hsync_pulse_width = ST7262_HSYNC_PULSE_WIDTH; // 4;
-            cfg.hsync_back_porch = ST7262_HSYNC_BACK_PORCH;   // 8;
-
-            cfg.vsync_polarity = ST7262_VSYNC_POLARITY;       // 0;
-            cfg.vsync_front_porch = ST7262_VSYNC_FRONT_PORCH; // 8;
-            cfg.vsync_pulse_width = ST7262_VSYNC_PULSE_WIDTH; // 4;
-            cfg.vsync_back_porch = ST7262_VSYNC_BACK_PORCH;   // 8;
-
-            cfg.pclk_idle_high = 1;
-            cfg.pclk_active_neg = ST7262_PCLK_ACTIVE_NEG; // 0;
-            // cfg.pclk_idle_high = 0;
-            // cfg.de_idle_high = 1;
-#endif
-
-#ifdef SC7277_HSYNC_POLARITY
-            cfg.hsync_polarity = SC7277_HSYNC_POLARITY;
-            cfg.hsync_front_porch = SC7277_HSYNC_FRONT_PORCH; // 8;
-            cfg.hsync_pulse_width = SC7277_HSYNC_PULSE_WIDTH; // 4;
-            cfg.hsync_back_porch = SC7277_HSYNC_BACK_PORCH;   // 8;
-
-            cfg.vsync_polarity = SC7277_VSYNC_POLARITY;       // 0;
-            cfg.vsync_front_porch = SC7277_VSYNC_FRONT_PORCH; // 8;
-            cfg.vsync_pulse_width = SC7277_VSYNC_PULSE_WIDTH; // 4;
-            cfg.vsync_back_porch = SC7277_VSYNC_BACK_PORCH;   // 8;
-
-            cfg.pclk_idle_high = 1;
-            cfg.pclk_active_neg = SC7277_PCLK_ACTIVE_NEG; // 0;
-            // cfg.pclk_idle_high = 0;
-            // cfg.de_idle_high = 1;
-#endif
-
-            _bus_instance.config(cfg);
-        }
-        _panel_instance.setBus(&_bus_instance);
-
-        {
-            auto cfg = _touch_instance.config();
-            cfg.x_min = 0;
-            cfg.x_max = TFT_WIDTH;
-            cfg.y_min = 0;
-            cfg.y_max = TFT_HEIGHT;
-            cfg.pin_int = -1;
-            cfg.pin_rst = -1;
-            cfg.bus_shared = true;
-            cfg.offset_rotation = 0;
-
-            cfg.i2c_port = 0;
-            cfg.i2c_addr = 0x5D;
-            cfg.pin_sda = I2C_SDA;
-            cfg.pin_scl = I2C_SCL;
-            cfg.freq = 400000;
-            _touch_instance.config(cfg);
-            _panel_instance.setTouch(&_touch_instance);
-        }
-
-        setPanel(&_panel_instance);
-    }
-};
-
-static LGFX *tft = nullptr;
-
-#elif defined(ILI9488_CS)
-#include <LovyanGFX.hpp> // Graphics and font library for ILI9488 driver chip
-
-class LGFX : public lgfx::LGFX_Device
-{
-    lgfx::Panel_ILI9488 _panel_instance;
-    lgfx::Bus_SPI _bus_instance;
-    lgfx::Light_PWM _light_instance;
-    lgfx::Touch_GT911 _touch_instance;
-
-  public:
-    LGFX(void)
-    {
-        {
-            auto cfg = _bus_instance.config();
-
-            // configure SPI
-            cfg.spi_host = ILI9488_SPI_HOST; // ESP32-S2,S3,C3 : SPI2_HOST or SPI3_HOST / ESP32 : VSPI_HOST or HSPI_HOST
-            cfg.spi_mode = 0;
-            cfg.freq_write = SPI_FREQUENCY; // SPI clock for transmission (up to 80MHz, rounded to the value obtained by dividing
-                                            // 80MHz by an integer)
-            cfg.freq_read = SPI_READ_FREQUENCY; // SPI clock when receiving
-            cfg.spi_3wire = false;              // Set to true if reception is done on the MOSI pin
-            cfg.use_lock = true;                // Set to true to use transaction locking
-            cfg.dma_channel = SPI_DMA_CH_AUTO;  // SPI_DMA_CH_AUTO; // Set DMA channel to use (0=not use DMA / 1=1ch / 2=ch /
-                                                // SPI_DMA_CH_AUTO=auto setting)
-            cfg.pin_sclk = ILI9488_SCK;         // Set SPI SCLK pin number
-            cfg.pin_mosi = ILI9488_SDA;         // Set SPI MOSI pin number
-            cfg.pin_miso = ILI9488_MISO;        // Set SPI MISO pin number (-1 = disable)
-            cfg.pin_dc = ILI9488_RS;            // Set SPI DC pin number (-1 = disable)
-
-            _bus_instance.config(cfg);              // applies the set value to the bus.
-            _panel_instance.setBus(&_bus_instance); // set the bus on the panel.
-        }
-
-        {                                        // Set the display panel control.
-            auto cfg = _panel_instance.config(); // Gets a structure for display panel settings.
-
-            cfg.pin_cs = ILI9488_CS; // Pin number where CS is connected (-1 = disable)
-            cfg.pin_rst = -1;        // Pin number where RST is connected  (-1 = disable)
-            cfg.pin_busy = -1;       // Pin number where BUSY is connected (-1 = disable)
-
-            // The following setting values ​​are general initial values ​​for each panel, so please comment out any
-            // unknown items and try them.
-
-            cfg.memory_width = TFT_WIDTH;                 // Maximum width supported by the driver IC
-            cfg.memory_height = TFT_HEIGHT;               // Maximum height supported by the driver IC
-            cfg.panel_width = TFT_WIDTH;                  // actual displayable width
-            cfg.panel_height = TFT_HEIGHT;                // actual displayable height
-            cfg.offset_x = TFT_OFFSET_X;                  // Panel offset amount in X direction
-            cfg.offset_y = TFT_OFFSET_Y;                  // Panel offset amount in Y direction
-            cfg.offset_rotation = TFT_OFFSET_ROTATION;    // Rotation direction value offset 0~7 (4~7 is mirrored)
-#ifdef TFT_DUMMY_READ_PIXELS
-            cfg.dummy_read_pixel = TFT_DUMMY_READ_PIXELS; // Number of bits for dummy read before pixel readout
-#else
-            cfg.dummy_read_pixel = 9; // Number of bits for dummy read before pixel readout
-#endif
-            cfg.dummy_read_bits = 1;                      // Number of bits for dummy read before non-pixel data read
-            cfg.readable = true;                          // Set to true if data can be read
-            cfg.invert = true;                            // Set to true if the light/darkness of the panel is reversed
-            cfg.rgb_order = false;                        // Set to true if the panel's red and blue are swapped
-            cfg.dlen_16bit =
-                false;             // Set to true for panels that transmit data length in 16-bit units with 16-bit parallel or SPI
-            cfg.bus_shared = true; // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.)
-
-            // Set the following only when the display is shifted with a driver with a variable number of pixels, such as the
-            // ST7735 or ILI9163.
-            // cfg.memory_width = TFT_WIDTH;   // Maximum width supported by the driver IC
-            // cfg.memory_height = TFT_HEIGHT; // Maximum height supported by the driver IC
-            _panel_instance.config(cfg);
-        }
-
-#ifdef ILI9488_BL
-        // Set the backlight control
-        {
-            auto cfg = _light_instance.config(); // Gets a structure for backlight settings.
-
-            cfg.pin_bl = ILI9488_BL; // Pin number to which the backlight is connected
-            cfg.invert = false;      // true to invert the brightness of the backlight
-            // cfg.freq = 44100;    // PWM frequency of backlight
-            // cfg.pwm_channel = 1; // PWM channel number to use
-
-            _light_instance.config(cfg);
-            _panel_instance.setLight(&_light_instance); // Set the backlight on the panel.
-        }
-#endif
-
-#if HAS_TOUCHSCREEN
-        // Configure settings for touch screen control.
-        {
-            auto cfg = _touch_instance.config();
-
-            cfg.pin_cs = -1;
-            cfg.x_min = 0;
-            cfg.x_max = TFT_HEIGHT - 1;
-            cfg.y_min = 0;
-            cfg.y_max = TFT_WIDTH - 1;
-            cfg.pin_int = SCREEN_TOUCH_INT;
-#ifdef SCREEN_TOUCH_RST
-            cfg.pin_rst = SCREEN_TOUCH_RST;
-#endif
-            cfg.bus_shared = true;
-            cfg.offset_rotation = TFT_OFFSET_ROTATION;
-            // cfg.freq = 2500000;
-
-            // I2C
-            cfg.i2c_port = TOUCH_I2C_PORT;
-            cfg.i2c_addr = TOUCH_SLAVE_ADDRESS;
-#ifdef SCREEN_TOUCH_USE_I2C1
-            cfg.pin_sda = I2C_SDA1;
-            cfg.pin_scl = I2C_SCL1;
-#else
-            cfg.pin_sda = I2C_SDA;
-            cfg.pin_scl = I2C_SCL;
-#endif
-            // cfg.freq = 400000;
-
-            _touch_instance.config(cfg);
-            _panel_instance.setTouch(&_touch_instance);
-        }
-#endif
-
-        setPanel(&_panel_instance);
-    }
-};
-
-static LGFX *tft = nullptr;
-
 #elif defined(ST7789_CS)
 #include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip
 
@@ -426,7 +129,7 @@ class LGFX : public lgfx::LGFX_Device
     lgfx::Bus_SPI _bus_instance;
     lgfx::Light_PWM _light_instance;
 #if HAS_TOUCHSCREEN
-#if defined(T_WATCH_S3) || defined(ELECROW)
+#ifdef T_WATCH_S3
     lgfx::Touch_FT5x06 _touch_instance;
 #else
     lgfx::Touch_GT911 _touch_instance;
@@ -468,22 +171,16 @@ class LGFX : public lgfx::LGFX_Device
             // The following setting values ​​are general initial values ​​for each panel, so please comment out any
             // unknown items and try them.
 
-            cfg.memory_width = TFT_WIDTH;                 // Maximum width supported by the driver IC
+            cfg.panel_width = TFT_WIDTH;               // actual displayable width
-            cfg.memory_height = TFT_HEIGHT;               // Maximum height supported by the driver IC
+            cfg.panel_height = TFT_HEIGHT;             // actual displayable height
-            cfg.panel_width = TFT_WIDTH;                  // actual displayable width
+            cfg.offset_x = TFT_OFFSET_X;               // Panel offset amount in X direction
-            cfg.panel_height = TFT_HEIGHT;                // actual displayable height
+            cfg.offset_y = TFT_OFFSET_Y;               // Panel offset amount in Y direction
-            cfg.offset_x = TFT_OFFSET_X;                  // Panel offset amount in X direction
+            cfg.offset_rotation = TFT_OFFSET_ROTATION; // Rotation direction value offset 0~7 (4~7 is mirrored)
-            cfg.offset_y = TFT_OFFSET_Y;                  // Panel offset amount in Y direction
+            cfg.dummy_read_pixel = 9;                  // Number of bits for dummy read before pixel readout
-            cfg.offset_rotation = TFT_OFFSET_ROTATION;    // Rotation direction value offset 0~7 (4~7 is mirrored)
+            cfg.dummy_read_bits = 1;                   // Number of bits for dummy read before non-pixel data read
-#ifdef TFT_DUMMY_READ_PIXELS
+            cfg.readable = true;                       // Set to true if data can be read
-            cfg.dummy_read_pixel = TFT_DUMMY_READ_PIXELS; // Number of bits for dummy read before pixel readout
+            cfg.invert = true;                         // Set to true if the light/darkness of the panel is reversed
-#else
+            cfg.rgb_order = false;                     // Set to true if the panel's red and blue are swapped
-            cfg.dummy_read_pixel = 9; // Number of bits for dummy read before pixel readout
-#endif
-            cfg.dummy_read_bits = 1;                      // Number of bits for dummy read before non-pixel data read
-            cfg.readable = true;                          // Set to true if data can be read
-            cfg.invert = true;                            // Set to true if the light/darkness of the panel is reversed
-            cfg.rgb_order = false;                        // Set to true if the panel's red and blue are swapped
             cfg.dlen_16bit =
                 false;             // Set to true for panels that transmit data length in 16-bit units with 16-bit parallel or SPI
             cfg.bus_shared = true; // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.)
@@ -520,9 +217,6 @@ class LGFX : public lgfx::LGFX_Device
             cfg.y_min = 0;
             cfg.y_max = TFT_WIDTH - 1;
             cfg.pin_int = SCREEN_TOUCH_INT;
-#ifdef SCREEN_TOUCH_RST
-            cfg.pin_rst = SCREEN_TOUCH_RST;
-#endif
             cfg.bus_shared = true;
             cfg.offset_rotation = TFT_OFFSET_ROTATION;
             // cfg.freq = 2500000;
@@ -946,7 +640,7 @@ static LGFX *tft = nullptr;
 #endif
 
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||      \
-    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST72xx_DE) || (ARCH_PORTDUINO && HAS_SCREEN != 0)
+    defined(RAK14014) || defined(HX8357_CS) || (ARCH_PORTDUINO && HAS_SCREEN != 0)
 #include "SPILock.h"
 #include "TFTDisplay.h"
 #include <SPI.h>

src/graphics/images.h

@@ -21,7 +21,7 @@ const uint8_t bluetoothConnectedIcon[36] PROGMEM = {0xfe, 0x01, 0xff, 0x03, 0x03
 #endif
 
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || ARCH_PORTDUINO) &&                \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || ARCH_PORTDUINO) &&                                       \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
 const uint8_t imgQuestionL1[] PROGMEM = {0xff, 0x01, 0x01, 0x32, 0x7b, 0x49, 0x49, 0x6f, 0x26, 0x01, 0x01, 0xff};
 const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};

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

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

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

@@ -0,0 +1,34 @@
+/*
+
+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/DEPG0213BNS800.cpp

@@ -1,132 +0,0 @@
-#include "./DEPG0213BNS800.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-using namespace NicheGraphics::Drivers;
-
-// Describes the operation performed when a "fast refresh" is performed
-// Source: Modified from GxEPD2 (GxEPD2_213_BN)
-static const uint8_t LUT_FAST[] = {
-    // 1     2     3
-    0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // B2B (Existing black pixels)
-    0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // B2W (New white pixels)
-    0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // W2B (New black pixels)
-    0x00, 0x80, 0x00, 0x00, 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
-
-    0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,             // 1. Any pixels changing W2B or B2W. Two medium taps.
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,             // 2. All pixels. One short tap.
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,             // 3. 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,             //
-    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 DEPG0213BNS800::configVoltages()
-{
-    switch (updateType) {
-    case FAST:
-        // Reference: display datasheet, GxEPD1
-        sendCommand(0x03); // Gate voltage
-        sendData(0x17);    // VGH: 20V
-
-        // Reference: display datasheet, GxEPD1
-        sendCommand(0x04); // Source voltage
-        sendData(0x41);    // VSH1: 15V
-        sendData(0x00);    // VSH2: NA
-        sendData(0x32);    // VSL: -15V
-
-        // GxEPD1 sets this at -1.2V, but that seems to be drive the pixels very hard
-        sendCommand(0x2C); // VCOM voltage
-        sendData(0x08);    // VCOM: -0.2V
-        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 DEPG0213BNS800::configWaveform()
-{
-    switch (updateType) {
-    case FAST:
-        sendCommand(0x3C); // Border waveform:
-        sendData(0x80);    // VSS
-
-        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 DEPG0213BNS800::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 DEPG0213BNS800::detachFromUpdate()
-{
-    switch (updateType) {
-    case FAST:
-        return beginPolling(50, 500); // At least 500ms, then poll every 50ms
-    case FULL:
-    default:
-        return beginPolling(100, 3500); // At least 3500ms, then poll every 100ms
-    }
-}
-
-// 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 DEPG0213BNS800::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();
-    }
-
-    // Enter deep-sleep to save a few µA
-    // Waking from this requires that display's reset pin is broken out
-    if (pin_rst != 0xFF)
-        deepSleep();
-}
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

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

@@ -1,44 +0,0 @@
-/*
-
-E-Ink display driver
-    - DEPG0213BNS800
-    - Manufacturer: DKE
-    - Size: 2.13 inch
-    - Resolution: 122px x 250px
-    - Flex connector marking: FPC-7528B
-
-    Note: this is from an older generation of DKE panels, which still used Solomon Systech controller ICs.
-    DKE's website suggests that the latest DEPG0213BN displays may use Fitipower controllers instead.
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "configuration.h"
-
-#include "./SSD16XX.h"
-
-namespace NicheGraphics::Drivers
-{
-class DEPG0213BNS800 : public SSD16XX
-{
-    // Display properties
-  private:
-    static constexpr uint32_t width = 122;
-    static constexpr uint32_t height = 250;
-    static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
-
-  public:
-    DEPG0213BNS800() : 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/DEPG0290BNS800.cpp

@@ -116,10 +116,5 @@ void DEPG0290BNS800::finalizeUpdate()
         sendCommand(0x7F); // Terminate image write without update
         wait();
     }
-
-    // Enter deep-sleep to save a few µA
-    // Waking from this requires that display's reset pin is broken out
-    if (pin_rst != 0xFF)
-        deepSleep();
 }
 #endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

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

@@ -6,7 +6,7 @@ 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("EInkDriver"), width(width), height(height), supportedUpdateTypes(supported)
+    : concurrency::OSThread("E-Ink Driver"), width(width), height(height), supportedUpdateTypes(supported)
 {
     OSThread::disable();
 }
@@ -31,8 +31,8 @@ bool EInk::supports(UpdateTypes type)
 void EInk::beginPolling(uint32_t interval, uint32_t expectedDuration)
 {
     updateRunning = true;
+    updateBegunAt = millis();
     pollingInterval = interval;
-    pollingBegunAt = millis();
 
     // 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
@@ -45,26 +45,10 @@ void EInk::beginPolling(uint32_t interval, uint32_t expectedDuration)
 // This is what allows us to update the display asynchronously
 int32_t EInk::runOnce()
 {
-    // Check for polling timeout
-    // Manually set at 10 seconds, in case some big task holds up the firmware's cooperative multitasking
-    if (millis() - pollingBegunAt > 10000)
-        failed = true;
-
-    // Handle failure
-    // - polling timeout
-    // - other error (derived classes)
-    if (failed) {
-        LOG_WARN("Display update failed. Check wiring & power supply.");
-        updateRunning = false;
-        failed = false;
-        return disable();
-    }
-
-    // If update not yet done
     if (!isUpdateDone())
         return pollingInterval; // Poll again in a few ms
 
-    // If update done
+    // 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

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

@@ -24,7 +24,7 @@ class EInk : private concurrency::OSThread
     enum UpdateTypes : uint8_t {
         UNSPECIFIED = 0,
         FULL = 1 << 0,
-        FAST = 1 << 1, // "Partial Refresh"
+        FAST = 1 << 1,
     };
 
     EInk(uint16_t width, uint16_t height, UpdateTypes supported);
@@ -41,15 +41,14 @@ class EInk : private concurrency::OSThread
     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
-    bool failed = false;                                             // If an error occurred during update
 
   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 = 0;             // For initial pause before polling for update completion
     uint32_t pollingInterval = 0;           // How often to check if update complete (ms)
-    uint32_t pollingBegunAt = 0;            // To timeout during polling
 };
 
 } // namespace NicheGraphics::Drivers

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

@@ -1,58 +0,0 @@
-#include "./HINK_E042A87.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-using namespace NicheGraphics::Drivers;
-
-// 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 HINK_E042A87::configWaveform()
-{
-    sendCommand(0x3C); // Border waveform:
-    sendData(0x01);    // Follow LUT for VSH1
-
-    sendCommand(0x18); // Temperature sensor:
-    sendData(0x80);    // Use internal temperature sensor to select an appropriate refresh waveform
-}
-
-// 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 HINK_E042A87::configUpdateSequence()
-{
-    switch (updateType) {
-    case FAST:
-        sendCommand(0x21); // Use both "old" and "new" image memory (differential)
-        sendData(0x00);
-        sendData(0x00);
-
-        sendCommand(0x22); // Set "update sequence"
-        sendData(0xFF);    // Differential, load waveform from OTP
-        break;
-
-    case FULL:
-    default:
-        sendCommand(0x21); // Bypass "old" image memory (non-differential)
-        sendData(0x40);
-        sendData(0x00);
-
-        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 HINK_E042A87::detachFromUpdate()
-{
-    switch (updateType) {
-    case FAST:
-        return beginPolling(50, 1000); // At least 1 second, then check every 50ms
-    case FULL:
-    default:
-        return beginPolling(100, 3500); // At least 3.5 seconds, then check every 100ms
-    }
-}
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

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

@@ -1,43 +0,0 @@
-/*
-
-E-Ink display driver
-    - HINK-E042A87
-    - Manufacturer: Holitech
-    - Size: 4.2 inch
-    - Resolution: 400px x 300px
-    - Flex connector marking: HINK-E042A07-FPC-A1
-    - Silver sticker with QR code, marked: HE042A87
-
-    Note: as of Feb. 2025, these panels are used for "WeActStudio 4.2in B&W" display modules
-
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "configuration.h"
-
-#include "./SSD16XX.h"
-
-namespace NicheGraphics::Drivers
-{
-class HINK_E042A87 : public SSD16XX
-{
-    // Display properties
-  private:
-    static constexpr uint32_t width = 400;
-    static constexpr uint32_t height = 300;
-    static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
-
-  public:
-    HINK_E042A87() : SSD16XX(width, height, supported) {}
-
-  protected:
-    void configWaveform() override;
-    void configUpdateSequence() override;
-    void detachFromUpdate() override;
-};
-
-} // namespace NicheGraphics::Drivers
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

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

@@ -1,68 +0,0 @@
-#include "./LCMEN2R13ECC1.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-using namespace NicheGraphics::Drivers;
-
-// Map the display controller IC's output to the connected panel
-void LCMEN2R13ECC1::configScanning()
-{
-    // "Driver output control"
-    sendCommand(0x01);
-    sendData(0xF9);
-    sendData(0x00);
-    sendData(0x00);
-
-    // To-do: delete this method?
-    // Values set here might be redundant: F9, 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 LCMEN2R13ECC1::configWaveform()
-{
-    switch (updateType) {
-    case FAST:
-        sendCommand(0x3C); // Border waveform:
-        sendData(0x85);
-        break;
-
-    case FULL:
-    default:
-        // From OTP memory
-        break;
-    }
-}
-
-void LCMEN2R13ECC1::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 LCMEN2R13ECC1::detachFromUpdate()
-{
-    switch (updateType) {
-    case FAST:
-        return beginPolling(50, 800); // At least 500ms for fast refresh
-    case FULL:
-    default:
-        return beginPolling(100, 2500); // At least 2 seconds for full refresh
-    }
-}
-
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

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

@@ -1,41 +0,0 @@
-/*
-
-E-Ink display driver
-    - SSD1680
-    - Manufacturer: WISEVAST
-    - Size: 2.13 inch
-    - Resolution: 122px x 255px
-    - Flex connector marking: Soldering connector, no connector is needed
-
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "configuration.h"
-
-#include "./SSD16XX.h"
-
-namespace NicheGraphics::Drivers
-{
-class LCMEN2R13ECC1 : public SSD16XX
-{
-    // Display properties
-  private:
-    static constexpr uint32_t width = 122;
-    static constexpr uint32_t height = 250;
-    static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
-
-  public:
-    LCMEN2R13ECC1() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte
-
-  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,10 +1,8 @@
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
 #include "./LCMEN2R13EFC1.h"
 
-#include <assert.h>
+#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
 
-#include "SPILock.h"
+#include <assert.h>
 
 using namespace NicheGraphics::Drivers;
 
@@ -44,10 +42,11 @@ static const uint8_t LUT_FAST_BW[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
 };
 
-// Look up table: fast refresh, pixels which change from white to black
+// Look up table: fash refresh, pixels which change from white to black
 static const uint8_t LUT_FAST_WB[] = {
-    0x01, 0x46, 0x43, 0x02, 0x01, 0x01, 0x01, //
     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, //
@@ -56,7 +55,7 @@ static const uint8_t LUT_FAST_WB[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
 };
 
-// Look up table: fast refresh, pixels which remain black
+// 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, //
@@ -152,9 +151,6 @@ void LCMEN213EFC1::reset()
 
 void LCMEN213EFC1::sendCommand(const uint8_t command)
 {
-    // Take firmware's SPI lock
-    spiLock->lock();
-
     spi->beginTransaction(spiSettings);
     digitalWrite(pin_dc, LOW); // DC pin low indicates command
     digitalWrite(pin_cs, LOW);
@@ -162,8 +158,6 @@ void LCMEN213EFC1::sendCommand(const uint8_t command)
     digitalWrite(pin_cs, HIGH);
     digitalWrite(pin_dc, HIGH);
     spi->endTransaction();
-
-    spiLock->unlock();
 }
 
 void LCMEN213EFC1::sendData(uint8_t data)
@@ -173,9 +167,6 @@ void LCMEN213EFC1::sendData(uint8_t data)
 
 void LCMEN213EFC1::sendData(const uint8_t *data, uint32_t size)
 {
-    // Take firmware's SPI lock
-    spiLock->lock();
-
     spi->beginTransaction(spiSettings);
     digitalWrite(pin_dc, HIGH); // DC pin HIGH indicates data, instead of command
     digitalWrite(pin_cs, LOW);
@@ -193,8 +184,6 @@ void LCMEN213EFC1::sendData(const uint8_t *data, uint32_t size)
     digitalWrite(pin_cs, HIGH);
     digitalWrite(pin_dc, HIGH);
     spi->endTransaction();
-
-    spiLock->unlock();
 }
 
 void LCMEN213EFC1::configFull()

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

@@ -28,17 +28,6 @@ void setupNicheGraphics()
 }
 ```
 
-- [Methods](#methods)
-  - [`update(uint8_t *imageData, UpdateTypes type)`](#updateuint8_t-imagedata-updatetypes-type)
-  - [`await()`](#await)
-  - [`supports(UpdateTypes type)`](#supportsupdatetypes-type)
-  - [`busy()`](#busy)
-  - [`width()`](#width)
-  - [`height()`](#height)
-- [Supporting New Displays](#supporting-new-displays)
-  - [Controller IC](#controller-ic)
-  - [Finding Information](#finding-information)
-
 ## Methods
 
 ### `update(uint8_t *imageData, UpdateTypes type)`
@@ -48,7 +37,7 @@ Update the image on the display
 - _`imageData`_ to draw to the display.
 - _`type`_ which type of update to perform.
   - `FULL`
-  - `FAST` (partial refresh)
+  - `FAST`
   - (Other custom types may be possible)
 
 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.
@@ -94,39 +83,3 @@ Width of the display, in pixels. Note: most displays are portrait. Your UI will
 ### `height()`
 
 Height of the display, in pixels. Note: most displays are portrait. Your UI will need to implement rotation in software.
-
-## Supporting New Displays
-
-_This topic is not covered in depth, but these notes may be helpful._
-
-The `InkHUD::Drivers::EInk` class contains only the mechanism for implementing an E-Ink driver on-top of Meshtastic's `OSThread`. A driver for a specific display needs to extend this class.
-
-### Controller IC
-
-If your display uses a controller IC from Solomon Systech, you can probably extend the existing `Drivers::SSD16XX` class, making only minor modifications.
-
-At this stage, displays using controller ICS from other manufacturers (UltraChip, Fitipower, etc) need to manually implemented. See `Drivers::LCMEN2R13EFC1` for an example.
-
-Generic base classes for manufacturers other than Solomon Systech might be added here in future.
-
-### Finding Information
-
-#### Flex-Connector Labels
-
-The orange flex-connector attached to E-Ink displays is often printed with an identifying label. This is not a _totally_ unique identifier, but does give a very strong clue as to the true model of the display, which can be used to search out further information.
-
-#### Datasheets
-
-The manufacturer of a DIY display module may publish a datasheet. These are often incomplete, but might reveal the true model of the display, or the controller IC.
-
-If you can determine the true model name of the display, you can likely find a more complete datasheet on the display manufacturer's website. This will often provide a "typical operating sequence"; a general overview of the code used to drive the display
-
-#### Example Code
-
-The manufacturer of a DIY module may publish example code. You may have more luck finding example code published by the display manufacturer themselves, if you can determine the true model of the panel. These examples are a very valuable reference.
-
-#### Other E-Ink drivers
-
-Libraries like ZinggJM's GxEPD2 can be valuable sources of information, although your panel may not be _specifically_ supported, and only _compatible_ with a driver there, so some caution is advised.
-
-The display selection file in GxEPD2's Hello World example is also a useful resource for matching "flex connector labels" with display models, but the flex connector label is _not_ a unique identifier, so this is only another clue.