Merge branch 'master' into no-arduino-strings

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-open_collective: meshtastic

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

@@ -27,10 +27,10 @@ inputs:
     description: A newline separated list of paths to store as artifacts
     required: false
     default: ""
-  # include-web-ui:
-  #   description: Include the web UI in the build
-  #   required: false
-  #   default: "false"
+  include-web-ui:
+    description: Include the web UI in the build
+    required: false
+    default: "false"
   arch:
     description: Processor arch name
     required: true
@@ -43,29 +43,29 @@ 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: 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
-    #   with:
-    #     repo: meshtastic/web
-    #     file: build.tar
-    #     target: build.tar
-    #     token: ${{ inputs.github_token }}
-    #     version: tags/v${{ steps.webver.outputs.ver }}
+    - name: Pull web ui
+      if: inputs.include-web-ui == 'true'
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: meshtastic/web
+        file: build.tar
+        target: build.tar
+        token: ${{ inputs.github_token }}
+        version: tags/v${{ steps.webver.outputs.ver }}
 
-    # - name: Unpack web ui
-    #   if: inputs.include-web-ui == 'true'
-    #   shell: bash
-    #   run: |
-    #     tar -xf build.tar -C data/static
-    #     rm build.tar
+    - name: Unpack web ui
+      if: inputs.include-web-ui == 'true'
+      shell: bash
+      run: |
+        tar -xf build.tar -C data/static
+        rm build.tar
 
     - name: Remove debug flags for release
       shell: bash

.github/pull_request_template.md

@@ -1,7 +1,6 @@
 ## 🙏 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) ❌
-
 - 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...
@@ -16,12 +15,12 @@
 - 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
 
+## 🤝 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-Deck 
   - [ ] LilyGo T-Beam
   - [ ] RAK WisBlock 4631
   - [ ] Seeed Studio T-1000E tracker card

.github/workflows/build_esp32.yml

@@ -11,30 +11,27 @@ permissions: read-all
 
 jobs:
   build-esp32:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get release version string
-        shell: bash
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
       - name: Build ESP32
         id: build
-        uses: meshtastic/gh-action-firmware@main
+        uses: ./.github/actions/build-variant
         with:
-          pio_platform: esp32
-          pio_env: ${{ inputs.board }}
-          pio_target: build
-          ota_firmware_source: firmware.bin
-          ota_firmware_target: release/bleota.bin
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-esp32-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
-          overwrite: true
-          path: |
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          board: ${{ inputs.board }}
+          remove-debug-flags: >-
+            ./arch/esp32/esp32.ini
+            ./arch/esp32/esp32s2.ini
+            ./arch/esp32/esp32s3.ini
+            ./arch/esp32/esp32c3.ini
+            ./arch/esp32/esp32c6.ini
+          build-script-path: bin/build-esp32.sh
+          ota-firmware-source: firmware.bin
+          ota-firmware-target: release/bleota.bin
+          artifact-paths: |
             release/*.bin
             release/*.elf
+          include-web-ui: true
+          arch: esp32

.github/workflows/build_esp32_c3.yml

@@ -11,30 +11,27 @@ permissions: read-all
 
 jobs:
   build-esp32-c3:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get release version string
-        shell: bash
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
       - name: Build ESP32-C3
         id: build
-        uses: meshtastic/gh-action-firmware@main
+        uses: ./.github/actions/build-variant
         with:
-          pio_platform: esp32
-          pio_env: ${{ inputs.board }}
-          pio_target: build
-          ota_firmware_source: firmware-c3.bin
-          ota_firmware_target: release/bleota-c3.bin
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-esp32c3-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
-          overwrite: true
-          path: |
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          board: ${{ inputs.board }}
+          remove-debug-flags: >-
+            ./arch/esp32/esp32.ini
+            ./arch/esp32/esp32s2.ini
+            ./arch/esp32/esp32s3.ini
+            ./arch/esp32/esp32c3.ini
+            ./arch/esp32/esp32c6.ini
+          build-script-path: bin/build-esp32.sh
+          ota-firmware-source: firmware-c3.bin
+          ota-firmware-target: release/bleota-c3.bin
+          artifact-paths: |
             release/*.bin
             release/*.elf
+          include-web-ui: true
+          arch: esp32c3

.github/workflows/build_esp32_c6.yml

@@ -11,30 +11,27 @@ permissions: read-all
 
 jobs:
   build-esp32-c6:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get release version string
-        shell: bash
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
       - name: Build ESP32-C6
         id: build
-        uses: meshtastic/gh-action-firmware@main
+        uses: ./.github/actions/build-variant
         with:
-          pio_platform: esp32
-          pio_env: ${{ inputs.board }}
-          pio_target: build
-          ota_firmware_source: firmware-c3.bin
-          ota_firmware_target: release/bleota-c3.bin
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-esp32c6-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
-          overwrite: true
-          path: |
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          board: ${{ inputs.board }}
+          remove-debug-flags: >-
+            ./arch/esp32/esp32.ini
+            ./arch/esp32/esp32s2.ini
+            ./arch/esp32/esp32s3.ini
+            ./arch/esp32/esp32c3.ini
+            ./arch/esp32/esp32c6.ini
+          build-script-path: bin/build-esp32.sh
+          ota-firmware-source: firmware-c3.bin
+          ota-firmware-target: release/bleota-c3.bin
+          artifact-paths: |
             release/*.bin
             release/*.elf
+          include-web-ui: true
+          arch: esp32c6

.github/workflows/build_esp32_s3.yml

@@ -11,30 +11,27 @@ permissions: read-all
 
 jobs:
   build-esp32-s3:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get release version string
-        shell: bash
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
       - name: Build ESP32-S3
         id: build
-        uses: meshtastic/gh-action-firmware@main
+        uses: ./.github/actions/build-variant
         with:
-          pio_platform: esp32
-          pio_env: ${{ inputs.board }}
-          pio_target: build
-          ota_firmware_source: firmware-s3.bin
-          ota_firmware_target: release/bleota-s3.bin
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-esp32s3-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
-          overwrite: true
-          path: |
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          board: ${{ inputs.board }}
+          remove-debug-flags: >-
+            ./arch/esp32/esp32.ini
+            ./arch/esp32/esp32s2.ini
+            ./arch/esp32/esp32s3.ini
+            ./arch/esp32/esp32c3.ini
+            ./arch/esp32/esp32c6.ini
+          build-script-path: bin/build-esp32.sh
+          ota-firmware-source: firmware-s3.bin
+          ota-firmware-target: release/bleota-s3.bin
+          artifact-paths: |
             release/*.bin
             release/*.elf
+          include-web-ui: true
+          arch: esp32s3

.github/workflows/build_nrf52.yml

@@ -11,30 +11,20 @@ permissions: read-all
 
 jobs:
   build-nrf52:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get release version string
-        shell: bash
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
       - name: Build NRF52
         id: build
-        uses: meshtastic/gh-action-firmware@main
+        uses: ./.github/actions/build-variant
         with:
-          pio_platform: nrf52
-          pio_env: ${{ inputs.board }}
-          pio_target: build
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-nrf52840-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
-          overwrite: true
-          path: |
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          board: ${{ inputs.board }}
+          build-script-path: bin/build-nrf52.sh
+          artifact-paths: |
+            release/*.hex
             release/*.uf2
             release/*.elf
-            release/*.hex
-            release/*-ota.zip
+            release/*.zip
+          arch: nrf52840

.github/workflows/build_rpi2040.yml

@@ -11,28 +11,18 @@ permissions: read-all
 
 jobs:
   build-rpi2040:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get release version string
-        shell: bash
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
       - name: Build Raspberry Pi 2040
         id: build
-        uses: meshtastic/gh-action-firmware@main
+        uses: ./.github/actions/build-variant
         with:
-          pio_platform: rp2xx0
-          pio_env: ${{ inputs.board }}
-          pio_target: build
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-rp2040-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
-          overwrite: true
-          path: |
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          board: ${{ inputs.board }}
+          build-script-path: bin/build-rpi2040.sh
+          artifact-paths: |
             release/*.uf2
             release/*.elf
+          arch: rp2040

.github/workflows/build_stm32.yml

@@ -11,29 +11,19 @@ permissions: read-all
 
 jobs:
   build-stm32:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get release version string
-        shell: bash
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
       - name: Build STM32WL
         id: build
-        uses: meshtastic/gh-action-firmware@main
+        uses: ./.github/actions/build-variant
         with:
-          pio_platform: stm32wl
-          pio_env: ${{ inputs.board }}
-          pio_target: build
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-stm32-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
-          overwrite: true
-          path: |
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          board: ${{ inputs.board }}
+          build-script-path: bin/build-stm32.sh
+          artifact-paths: |
             release/*.hex
             release/*.bin
             release/*.elf
+          arch: stm32

.github/workflows/daily_packaging.yml

@@ -1,7 +1,7 @@
 name: Daily Packaging
 on:
   schedule:
-    - cron: 0 2 * * *
+    - cron: 0 9 * * *
   workflow_dispatch:
   push:
     branches:

.github/workflows/main_matrix.yml

@@ -135,7 +135,6 @@ jobs:
       board: ${{ matrix.board }}
 
   build-debian-src:
-    if: github.repository == 'meshtastic/firmware'
     uses: ./.github/workflows/build_debian_src.yml
     with:
       series: UNRELEASED
@@ -258,6 +257,7 @@ jobs:
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
+            ./littlefswebui-*.bin
             ./bleota*bin
             ./Meshtastic_nRF52_factory_erase*.uf2
           retention-days: 30
@@ -426,7 +426,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-firmware:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     if: ${{ github.event_name == 'workflow_dispatch' }}
     needs: [release-firmware]
     env:

.github/workflows/nightly.yml

@@ -8,7 +8,6 @@ permissions: read-all
 
 jobs:
   trunk_check:
-    if: github.repository == 'meshtastic/firmware'
     name: Trunk Check and Upload
     runs-on: ubuntu-24.04
 
@@ -22,7 +21,6 @@ jobs:
           trunk-token: ${{ secrets.TRUNK_TOKEN }}
 
   trunk_upgrade:
-    if: github.repository == 'meshtastic/firmware'
     # See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
     name: Trunk Upgrade (PR)
     runs-on: ubuntu-24.04

.github/workflows/release_channels.yml

@@ -98,7 +98,6 @@ jobs:
         uses: peter-evans/create-pull-request@v7
         with:
           base: ${{ github.event.repository.default_branch }}
-          branch: create-pull-request/bump-version
           title: Bump release version
           commit-message: automated bumps
           add-paths: |

.github/workflows/sec_sast_semgrep_cron.yml

@@ -13,7 +13,6 @@ permissions:
 
 jobs:
   semgrep-full:
-    if: github.repository == 'meshtastic/firmware'
     runs-on: ubuntu-24.04
     container:
       image: semgrep/semgrep

.github/workflows/stale_bot.yml

@@ -11,7 +11,6 @@ permissions:
 
 jobs:
   stale_issues:
-    if: github.repository == 'meshtastic/firmware'
     name: Close Stale Issues
     runs-on: ubuntu-latest
 

.github/workflows/tests.yml

@@ -12,11 +12,9 @@ permissions:
 
 jobs:
   native-tests:
-    if: github.repository == 'meshtastic/firmware'
     uses: ./.github/workflows/test_native.yml
 
   hardware-tests:
-    if: github.repository == 'meshtastic/firmware'
     runs-on: test-runner
     steps:
       - name: Checkout code

.github/workflows/update_protobufs.yml

@@ -33,7 +33,6 @@ jobs:
       - name: Create pull request
         uses: peter-evans/create-pull-request@v7
         with:
-          branch: create-pull-request/update-protobufs
           title: Update protobufs and classes
           add-paths: |
             protobufs

.gitignore

@@ -37,7 +37,4 @@ release/
 .vscode/extensions.json
 /compile_commands.json
 src/mesh/raspihttp/certificate.pem
-src/mesh/raspihttp/private_key.pem
-
-# Ignore logo (set at build time with platformio-custom.py)
-data/boot/logo.*
+src/mesh/raspihttp/private_key.pem

.trunk/trunk.yaml

@@ -4,31 +4,31 @@ cli:
 plugins:
   sources:
     - id: trunk
-      ref: v1.7.1
+      ref: v1.7.0
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.447
-    - renovate@41.23.4
-    - prettier@3.6.2
-    - trufflehog@3.89.2
+    - checkov@3.2.435
+    - renovate@40.34.4
+    - prettier@3.5.3
+    - trufflehog@3.88.34
     - yamllint@1.37.1
-    - bandit@1.8.6
-    - trivy@0.64.1
+    - bandit@1.8.3
+    - trivy@0.62.1
     - taplo@0.9.3
-    - ruff@0.12.2
+    - ruff@0.11.11
     - isort@6.0.1
     - markdownlint@0.45.0
     - oxipng@9.1.5
-    - svgo@4.0.0
+    - svgo@3.3.2
     - actionlint@1.7.7
-    - flake8@7.3.0
+    - flake8@7.2.0
     - hadolint@2.12.1-beta
     - shfmt@3.6.0
     - shellcheck@0.10.0
     - black@25.1.0
     - git-diff-check
-    - gitleaks@8.27.2
+    - gitleaks@8.26.0
     - clang-format@16.0.3
   ignore:
     - linters: [ALL]

.vscode/settings.json

@@ -10,5 +10,59 @@
   },
   "[powershell]": {
     "editor.defaultFormatter": "ms-vscode.powershell"
+  },
+  "files.associations": {
+    "array": "cpp",
+    "atomic": "cpp",
+    "*.tcc": "cpp",
+    "cctype": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "csignal": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdint": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "deque": "cpp",
+    "list": "cpp",
+    "unordered_map": "cpp",
+    "unordered_set": "cpp",
+    "vector": "cpp",
+    "exception": "cpp",
+    "algorithm": "cpp",
+    "functional": "cpp",
+    "iterator": "cpp",
+    "map": "cpp",
+    "memory": "cpp",
+    "memory_resource": "cpp",
+    "numeric": "cpp",
+    "optional": "cpp",
+    "random": "cpp",
+    "string": "cpp",
+    "string_view": "cpp",
+    "system_error": "cpp",
+    "tuple": "cpp",
+    "type_traits": "cpp",
+    "utility": "cpp",
+    "fstream": "cpp",
+    "initializer_list": "cpp",
+    "iomanip": "cpp",
+    "iosfwd": "cpp",
+    "iostream": "cpp",
+    "istream": "cpp",
+    "limits": "cpp",
+    "new": "cpp",
+    "ostream": "cpp",
+    "sstream": "cpp",
+    "stdexcept": "cpp",
+    "streambuf": "cpp",
+    "cinttypes": "cpp",
+    "typeinfo": "cpp",
+    "*.xbm": "cpp"
   }
 }

README.md

@@ -37,4 +37,3 @@ Join our community and help improve Meshtastic! 🚀
 ## Stats
 
 ![Alt](https://repobeats.axiom.co/api/embed/8025e56c482ec63541593cc5bd322c19d5c0bdcf.svg "Repobeats analytics image")
-

alpine.Dockerfile

@@ -3,7 +3,7 @@
 # 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.22 AS builder
+FROM python:3.13-alpine3.21 AS builder
 ARG PIO_ENV=native
 ENV PIP_ROOT_USER_ACTION=ignore
 
@@ -27,7 +27,7 @@ RUN bash ./bin/build-native.sh "$PIO_ENV" && \
 
 # ##### PRODUCTION BUILD #############
 
-FROM alpine:3.22
+FROM alpine:3.21
 LABEL org.opencontainers.image.title="Meshtastic" \
       org.opencontainers.image.description="Alpine Meshtastic daemon" \
       org.opencontainers.image.url="https://meshtastic.org" \

arch/esp32/esp32.ini

@@ -4,7 +4,7 @@ extends = arduino_base
 custom_esp32_kind = esp32
 platform =
   # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.11.0
+  platformio/espressif32@6.10.0
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
@@ -49,13 +49,13 @@ 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/archive/3223704846752e6d545139204837bdb2a55459ca.zip
+  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/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
   # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@0.3.0
+  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/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto

arch/esp32/esp32c6.ini

@@ -28,7 +28,7 @@ lib_deps =
   ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
   # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@0.3.0
+  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/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto

arch/portduino/portduino.ini

@@ -2,7 +2,7 @@
 [portduino_base]
 platform =
   # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop
-  https://github.com/meshtastic/platform-native/archive/681ee029207e9fd040afa223df6e54074cbbe084.zip
+  https://github.com/meshtastic/platform-native/archive/622341c6de8a239704318b10c3dbb00c21a3eab3.zip
 framework = arduino
 
 build_src_filter = 

arch/stm32/stm32.ini

@@ -2,7 +2,7 @@
 extends = arduino_base
 platform =
   # renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32
-  platformio/ststm32@19.2.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
@@ -16,17 +16,14 @@ build_flags =
   ${arduino_base.build_flags}
   -flto
   -Isrc/platform/stm32wl -g
-  -DMESHTASTIC_EXCLUDE_AUDIO=1
-  -DMESHTASTIC_EXCLUDE_ATAK=1 ; ATAK is quite big, disable it for big flash savings.
-  -DMESHTASTIC_EXCLUDE_INPUTBROKER=1
-  -DMESHTASTIC_EXCLUDE_POWERMON=1
-  -DMESHTASTIC_EXCLUDE_SCREEN=1
-  -DMESHTASTIC_EXCLUDE_MQTT=1
-  -DMESHTASTIC_EXCLUDE_BLUETOOTH=1
-  -DMESHTASTIC_EXCLUDE_GPS=1
-  -DMESHTASTIC_EXCLUDE_WIFI=1
-  -DMESHTASTIC_EXCLUDE_TZ=1 ; Exclude TZ to save some flash space.
-  -DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF ; This is REQUIRED for at least traceroute debug prints - without it the length ends up uninitialized.
+  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+  -DMESHTASTIC_EXCLUDE_INPUTBROKER
+  -DMESHTASTIC_EXCLUDE_I2C
+  -DMESHTASTIC_EXCLUDE_POWERMON
+  -DMESHTASTIC_EXCLUDE_SCREEN
+  -DMESHTASTIC_EXCLUDE_MQTT
+  -DMESHTASTIC_EXCLUDE_BLUETOOTH
+  -DMESHTASTIC_EXCLUDE_GPS
   ;-DDEBUG_MUTE
   -fmerge-all-constants
   -ffunction-sections
@@ -42,9 +39,9 @@ debug_tool = stlink
 lib_deps =
   ${env.lib_deps}
   ${radiolib_base.lib_deps}
-
   # renovate: datasource=git-refs depName=caveman99-stm32-Crypto packageName=https://github.com/caveman99/Crypto gitBranch=main
   https://github.com/caveman99/Crypto/archive/eae9c768054118a9399690f8af202853d1ae8516.zip
 
 lib_ignore =
   mathertel/OneButton@2.6.1
+  Wire

bin/build-esp32.sh

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

bin/check-all.sh

@@ -23,4 +23,4 @@ for BOARD in $BOARDS; do
 	CHECK="${CHECK} -e ${BOARD}"
 done
 
-pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt --inline-suppr" $CHECK --skip-packages --pattern="src/" --fail-on-defect=medium --fail-on-defect=high
+pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt" $CHECK --skip-packages --pattern="src/" --fail-on-defect=medium --fail-on-defect=high

bin/config-dist.yaml

@@ -96,9 +96,9 @@ Lora:
 ### Some devices, like the pinedio, may require spidev0.1 as a workaround.
 #  spidev: spidev0.0
 
-### Deprecated location for User Button:
+### Define GPIO buttons here:
 
-#GPIO:
+GPIO:
 #  User: 6
 
 ### Define GPS
@@ -115,6 +115,17 @@ I2C:
 
 Display:
 
+### Waveshare 1.44inch LCD HAT
+#  Panel: ST7735S
+#  CS: 8         #Chip Select
+#  DC: 25        # Data/Command pin
+#  Backlight: 24
+#  Width: 128
+#  Height: 128
+#  Reset: 27
+#  OffsetX: 0
+#  OffsetY: 0
+
 ### Adafruit PiTFT 2.8 TFT+Touchscreen
 #  Panel: ILI9341
 #  CS: 8
@@ -169,16 +180,6 @@ Input:
 
 #  KeyboardDevice: /dev/input/by-id/usb-_Raspberry_Pi_Internal_Keyboard-event-kbd
 
-### Standard User Button Config
-#  UserButton: 6
-
-### Trackball/Joystick input
-#  TrackballUp: 6
-#  TrackballDown: 19
-#  TrackballLeft: 5
-#  TrackballRight: 26
-#  TrackballPress: 13
-
 ###
 
 Logging:

bin/config.d/display-waveshare-1-44.yaml

@@ -1,26 +0,0 @@
-### Waveshare 1.44inch LCD HAT
-Display:
-  Panel: ST7735S
-  spidev: spidev0.0  # Specify either the spidev here, or the CS below
-#  CS: 8         #Chip Select # Optional, as this is the default pin for spidev0.0
-  DC: 25        # Data/Command pin
-  Backlight: 24
-  Width: 128
-  Height: 128
-  Reset: 27
-  OffsetX: 2
-  OffsetY: 1
-
-
-#  OffsetY: 31  # These two options are used to properly flip the screen 180 degrees
-#  OffsetRotate: 3
-
-
-Input:
-  TrackballUp: 6
-  TrackballDown: 19
-  TrackballLeft: 5
-  TrackballRight: 26
-  TrackballPress: 13
-  TrackballDirection: FALLING
-#  User: 21

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

@@ -6,6 +6,6 @@ Lora:
   IRQ: 16
   Busy: 20
   Reset: 24
-  RXen: 12
+  TXen: 13
   DIO2_AS_RF_SWITCH: true
   DIO3_TCXO_VOLTAGE: true

bin/config.d/lora-RAK6421.yaml

@@ -1,21 +0,0 @@
-Lora:
-
-  ### RAK13300in Slot 1
-  Module: sx1262
-  IRQ: 22 #IO6
-  Reset: 16 # IO4
-  Busy: 24 # IO5
-  # Ant_sw: 13 # IO3 
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: 8
-
-
-  ### RAK13300in Slot 2 pins
-#  IRQ: 18 #IO6
-#  Reset: 24 # IO4
-#  Busy: 19 # IO5
-#  # Ant_sw: 23 # IO3 
-#  spidev: spidev0.1
-#  # CS: 7

bin/config.d/lora-lyra-picocalc-wio-sx1262.yaml

@@ -1,18 +0,0 @@
-Lora:
-  Module: sx1262
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  gpiochip: 0
-  MOSI: 12
-  MISO: 13
-  IRQ: 1
-  Busy: 23
-  Reset: 22
-  RXen: 0
-  gpiochip: 1
-  CS: 9
-  SCK: 11
-#  TXen: bridge to DIO2 on E22 module
-  SX126X_MAX_POWER: 22
-  spidev: spidev1.0
-  spiSpeed: 2000000

bin/device-install.bat

@@ -5,13 +5,13 @@ TITLE Meshtastic device-install
 SET "SCRIPT_NAME=%~nx0"
 SET "DEBUG=0"
 SET "PYTHON="
+SET "WEB_APP=0"
 SET "TFT_BUILD=0"
 SET "BIGDB8=0"
 SET "BIGDB16=0"
 SET "ESPTOOL_BAUD=115200"
 SET "ESPTOOL_CMD="
 SET "LOGCOUNTER=0"
-SET "BPS_RESET=0"
 
 @REM FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
 SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
@@ -24,7 +24,7 @@ GOTO getopts
 :help
 ECHO Flash image file to device, but first erasing and writing system information.
 ECHO.
-ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] [--1200bps-reset]
+ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] (--web)
 ECHO.
 ECHO Options:
 ECHO     -f filename      The firmware .bin file to flash.  Custom to your device type and region. (required)
@@ -34,16 +34,14 @@ ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
 ECHO     -P python        Specify alternate python interpreter to use to invoke esptool. (default: python)
 ECHO                      If supplied the script will use python.
 ECHO                      If not supplied the script will try to find esptool in Path.
-ECHO     --1200bps-reset  Attempt to place the device in correct mode. (1200bps Reset)
-ECHO                      Some hardware requires this twice.
+ECHO     --web            Enable WebUI. (default: false)
 ECHO.
-ECHO Example: %SCRIPT_NAME% -p COM17 --1200bps-reset
 ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
-ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11 --web
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.6.2]
+ECHO %SCRIPT_NAME% [Version 2.6.1]
 ECHO Meshtastic
 GOTO eof
 
@@ -59,13 +57,11 @@ IF /I "%~1"=="-f" SET "FILENAME=%~2" & SHIFT
 IF "%~1"=="-p" SET "ESPTOOL_PORT=%~2" & SHIFT
 IF /I "%~1"=="--port" SET "ESPTOOL_PORT=%~2" & SHIFT
 IF "%~1"=="-P" SET "PYTHON=%~2" & SHIFT
-IF /I "%~1"=="--1200bps-reset" SET "BPS_RESET=1"
+IF /I "%~1"=="--web" SET "WEB_APP=1"
 SHIFT
 GOTO getopts
 :endopts
 
-IF %BPS_RESET% EQU 1 GOTO skip-filename
-
 CALL :LOG_MESSAGE DEBUG "Checking FILENAME parameter..."
 IF "__!FILENAME!__"=="____" (
     CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
@@ -99,9 +95,6 @@ IF NOT "!FILENAME:update=!"=="!FILENAME!" (
     CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
 )
 
-:skip-filename
-SET "ESPTOOL_BAUD=1200"
-
 CALL :LOG_MESSAGE DEBUG "Determine the correct esptool command to use..."
 IF NOT "__%PYTHON%__"=="____" (
     SET "ESPTOOL_CMD=!PYTHON! -m esptool"
@@ -140,16 +133,13 @@ IF "__!ESPTOOL_PORT!__" == "____" (
 )
 CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
 
-IF %BPS_RESET% EQU 1 (
-    @REM Attempt to change mode via 1200bps Reset.
-    CALL :RUN_ESPTOOL !ESPTOOL_BAUD! --after no_reset read_flash_status
-    GOTO eof
-)
-
 @REM Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
 @REM https://github.com/meshtastic/web-flasher/blob/main/types/resources.ts#L3
 IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
     CALL :LOG_MESSAGE DEBUG "We are working with a *-tft-* file. !FILENAME!"
+    IF %WEB_APP% EQU 1 (
+        CALL :LOG_MESSAGE ERROR "Cannot enable WebUI (--web) and MUI." & GOTO eof
+    )
     SET "TFT_BUILD=1"
 ) ELSE (
     CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
@@ -203,8 +193,13 @@ SET "OTA_FILENAME=bleota.bin"
 :end_loop_c3
 CALL :LOG_MESSAGE DEBUG "Set OTA_FILENAME to: !OTA_FILENAME!"
 
-@REM Set SPIFFS filename with "littlefs-" prefix.
-SET "SPIFFS_FILENAME=littlefs-%BASENAME%"
+@REM Check if (--web) is enabled and prefix BASENAME with "littlefswebui-" else "littlefs-".
+IF %WEB_APP% EQU 1 (
+    CALL :LOG_MESSAGE INFO "WebUI selected."
+    SET "SPIFFS_FILENAME=littlefswebui-%BASENAME%"
+) ELSE (
+    SET "SPIFFS_FILENAME=littlefs-%BASENAME%"
+)
 CALL :LOG_MESSAGE DEBUG "Set SPIFFS_FILENAME to: !SPIFFS_FILENAME!"
 
 @REM Default offsets.
@@ -259,7 +254,6 @@ EXIT /B %ERRORLEVEL%
 IF %DEBUG% EQU 1 CALL :LOG_MESSAGE DEBUG "About to run command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
 CALL :RESET_ERROR
 !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4
-IF %BPS_RESET% EQU 1 GOTO :eof
 IF %ERRORLEVEL% NEQ 0 (
     CALL :LOG_MESSAGE ERROR "Error running command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
     EXIT /B %ERRORLEVEL%

bin/device-install.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
-BPS_RESET=false
+WEB_APP=false
 TFT_BUILD=false
 MCU=""
 
@@ -32,185 +32,185 @@ BIGDB_16MB=(
 	"ESP32-S3-Pico"
 	"m5stack-cores3"
 	"station-g2"
-    "t-eth-elite"
-    "t-watch-s3"
-    "elecrow-adv-35-tft"
-    "elecrow-adv-24-28-tft"
-    "elecrow-adv1-43-50-70-tft"
+	"t-eth-elite"
+	"t-watch-s3"
 )
 S3_VARIANTS=(
-    "s3"
-    "-v3"
-    "t-deck"
-    "wireless-paper"
-    "wireless-tracker"
-    "station-g2"
-    "unphone"
-    "t-eth-elite"
-    "mesh-tab"
-    "dreamcatcher"
-    "ESP32-S3-Pico"
-    "seeed-sensecap-indicator"
-    "heltec_capsule_sensor_v3"
-    "vision-master"
-    "icarus"
-    "tracksenger"
-    "elecrow-adv"
+	"s3"
+	"-v3"
+	"t-deck"
+	"wireless-paper"
+	"wireless-tracker"
+	"station-g2"
+	"unphone"
+	"t-eth-elite"
+ 	"mesh-tab"
+	"dreamcatcher"
+	"ESP32-S3-Pico"
+	"seeed-sensecap-indicator"
+	"heltec_capsule_sensor_v3"
+	"vision-master"
+	"icarus"
+	"tracksenger"
+	"elecrow-adv"
 )
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
-    ESPTOOL_CMD="$PYTHON -m esptool"
+	ESPTOOL_CMD="$PYTHON -m esptool"
 elif command -v esptool >/dev/null 2>&1; then
-    ESPTOOL_CMD="esptool"
+	ESPTOOL_CMD="esptool"
 elif command -v esptool.py >/dev/null 2>&1; then
-    ESPTOOL_CMD="esptool.py"
+	ESPTOOL_CMD="esptool.py"
 else
-    echo "Error: esptool not found"
-    exit 1
+	echo "Error: esptool not found"
+	exit 1
 fi
 
 set -e
 
 # Usage info
 show_help() {
-    cat <<EOF
-Usage: $(basename "$0") [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--1200bps-reset]
+	cat <<EOF
+Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--web]
 Flash image file to device, but first erasing and writing system information.
 
     -h               Display this help and exit.
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
     -f FILENAME      The firmware .bin file to flash.  Custom to your device type and region.
-    --1200bps-reset  Attempt to place the device in correct mode. Some hardware requires this twice. (1200bps Reset)
+    --web            Enable WebUI. (Default: false)
 
 EOF
 }
 # Parse arguments using a single while loop
 while [ $# -gt 0 ]; do
-    case "$1" in
-    -h | --help)
-        show_help
-        exit 0
-        ;;
-    -p)
-        ESPTOOL_CMD="$ESPTOOL_CMD --port $2"
-        shift
-        ;;
-    -P)
-        PYTHON="$2"
-        shift
-        ;;
-    -f)
-        FILENAME="$2"
-        shift
-        ;;
-    --1200bps-reset)
-		    BPS_RESET=true
-		    ;;
-    --) # Stop parsing options
-        shift
-        break
-        ;;
-    *)
-        echo "Unknown argument: $1" >&2
-        exit 1
-        ;;
-    esac
-    shift # Move to the next argument
+	case "$1" in
+	-h | --help)
+		show_help
+		exit 0
+		;;
+	-p)
+		ESPTOOL_CMD="$ESPTOOL_CMD --port $2"
+		shift
+		;;
+	-P)
+		PYTHON="$2"
+		shift
+		;;
+	-f)
+		FILENAME="$2"
+		shift
+		;;
+	--web)
+		WEB_APP=true
+		;;
+	--) # Stop parsing options
+		shift
+		break
+		;;
+	*)
+		echo "Unknown argument: $1" >&2
+		exit 1
+		;;
+	esac
+	shift # Move to the next argument
 done
 
-if [[ $BPS_RESET == true ]]; then
-	$ESPTOOL_CMD --baud 1200 --after no_reset read_flash_status
-	exit 0
-fi
-
-[ -z "$FILENAME" ] && [ -n "$1" ] && {
-    FILENAME="$1"
-    shift
+[ -z "$FILENAME" -a -n "$1" ] && {
+	FILENAME=$1
+	shift
 }
 
-if [[ "$FILENAME" != firmware-* ]]; then
+if [[ $FILENAME != firmware-* ]]; then
   echo "Filename must be a firmware-* file."
   exit 1
 fi
 
-# Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
-if [[ "${FILENAME//-tft-/}" != "$FILENAME" ]]; then
-    TFT_BUILD=true
+# Check if FILENAME contains "-tft-" and prevent web/mui comingling.
+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
 fi
 
 # Extract BASENAME from %FILENAME% for later use.
 BASENAME="${FILENAME/firmware-/}"
 
 if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
-    # Default littlefs* offset.
-    OFFSET=0x300000
+	# Default littlefs* offset (--web).
+	OFFSET=0x300000
 
-    # Default OTA Offset
-    OTA_OFFSET=0x260000
+	# Default OTA Offset
+	OTA_OFFSET=0x260000
 
-    # littlefs* offset for BigDB 8mb and OTA OFFSET.
-    for variant in "${BIGDB_8MB[@]}"; do
-        if [ -z "${FILENAME##*"$variant"*}" ]; then
-            OFFSET=0x670000
-            OTA_OFFSET=0x340000
-        fi
-    done
+	# littlefs* offset for BigDB 8mb and OTA OFFSET.
+	for variant in "${BIGDB_8MB[@]}"; do
+		if [ -z "${FILENAME##*"$variant"*}" ]; then
+			OFFSET=0x670000
+			OTA_OFFSET=0x340000
+		fi
+	done
 
-    # littlefs* offset for BigDB 16mb and OTA OFFSET.
-    for variant in "${BIGDB_16MB[@]}"; do
-        if [ -z "${FILENAME##*"$variant"*}" ]; then
-            OFFSET=0xc90000
-            OTA_OFFSET=0x650000
-        fi
-    done
+	# littlefs* offset for BigDB 16mb and OTA OFFSET.
+	for variant in "${BIGDB_16MB[@]}"; do
+		if [ -z "${FILENAME##*"$variant"*}" ]; then
+			OFFSET=0xc90000
+			OTA_OFFSET=0x650000
+		fi
+	done
 
-    # Account for S3 board's different OTA partition
-    # FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
-    for variant in "${S3_VARIANTS[@]}"; do
-        if [ -z "${FILENAME##*"$variant"*}" ]; then
-            MCU="esp32s3"
-        fi
-    done
+	# Account for S3 board's different OTA partition
+	# FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
+	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
-            OTAFILE=bleota-c3.bin
-        fi
-    else
-        OTAFILE=bleota-s3.bin
-    fi
+	if [ "$MCU" != "esp32s3" ]; then
+		if [ -n "${FILENAME##*"esp32c3"*}" ]; then
+			OTAFILE=bleota.bin
+		else
+			OTAFILE=bleota-c3.bin
+		fi
+	else
+		OTAFILE=bleota-s3.bin
+	fi
 
-    # Set SPIFFS filename with "littlefs-" prefix.
-    SPIFFSFILE=littlefs-${BASENAME}
+	# Check if WEB_APP (--web) is enabled and add "littlefswebui-" to BASENAME else "littlefs-".
+	if [ "$WEB_APP" = true ]; then
+		SPIFFSFILE=littlefswebui-${BASENAME}
+	else
+		SPIFFSFILE=littlefs-${BASENAME}
+	fi
 
-    if [[ ! -f "$FILENAME" ]]; then
-        echo "Error: file ${FILENAME} wasn't found. Terminating."
-        exit 1
-    fi
-    if [[ ! -f "$OTAFILE" ]]; then
-        echo "Error: file ${OTAFILE} wasn't found. Terminating."
-        exit 1
-    fi
-    if [[ ! -f "$SPIFFSFILE" ]]; then
-        echo "Error: file ${SPIFFSFILE} wasn't found. Terminating."
-        exit 1
-    fi
+	if [[ ! -f $FILENAME ]]; then
+		echo "Error: file ${FILENAME} wasn't found. Terminating."
+		exit 1
+	fi
+	if [[ ! -f $OTAFILE ]]; then
+		echo "Error: file ${OTAFILE} wasn't found. Terminating."
+		exit 1
+	fi
+	if [[ ! -f $SPIFFSFILE ]]; then
+		echo "Error: file ${SPIFFSFILE} wasn't found. Terminating."
+		exit 1
+	fi
 
-    echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
-    $ESPTOOL_CMD erase_flash
-    $ESPTOOL_CMD write_flash 0x00 "${FILENAME}"
-    echo "Trying to flash ${OTAFILE} at offset ${OTA_OFFSET}"
-    $ESPTOOL_CMD write_flash $OTA_OFFSET "${OTAFILE}"
-    echo "Trying to flash ${SPIFFSFILE}, at offset ${OFFSET}"
-    $ESPTOOL_CMD write_flash $OFFSET "${SPIFFSFILE}"
+	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
+	$ESPTOOL_CMD erase_flash
+	$ESPTOOL_CMD write_flash 0x00 "${FILENAME}"
+	echo "Trying to flash ${OTAFILE} at offset ${OTA_OFFSET}"
+	$ESPTOOL_CMD write_flash $OTA_OFFSET "${OTAFILE}"
+	echo "Trying to flash ${SPIFFSFILE}, at offset ${OFFSET}"
+	$ESPTOOL_CMD write_flash $OFFSET "${SPIFFSFILE}"
 
 else
-    show_help
-    echo "Invalid file: ${FILENAME}"
+	show_help
+	echo "Invalid file: ${FILENAME}"
 fi
 
 exit 0

bin/device-update.bat

@@ -8,13 +8,12 @@ SET "PYTHON="
 SET "ESPTOOL_BAUD=115200"
 SET "ESPTOOL_CMD="
 SET "LOGCOUNTER=0"
-SET "CHANGE_MODE=0"
 
 GOTO getopts
 :help
 ECHO Flash image file to device, but leave existing system intact.
 ECHO.
-ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] [--change-mode]
+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)
@@ -24,15 +23,12 @@ ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
 ECHO     -P python        Specify alternate python interpreter to use to invoke esptool. (default: python)
 ECHO                      If supplied the script will use python.
 ECHO                      If not supplied the script will try to find esptool in Path.
-ECHO     --change-mode    Attempt to place the device in correct mode. (1200bps Reset)
-ECHO                      Some hardware requires this twice.
 ECHO.
-ECHO Example: %SCRIPT_NAME% -p COM17 --change-mode
 ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4-update.bin -p COM11
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.6.2]
+ECHO %SCRIPT_NAME% [Version 2.6.1]
 ECHO Meshtastic
 GOTO eof
 
@@ -48,13 +44,10 @@ IF /I "%~1"=="-f" SET "FILENAME=%~2" & SHIFT
 IF "%~1"=="-p" SET "ESPTOOL_PORT=%~2" & SHIFT
 IF /I "%~1"=="--port" SET "ESPTOOL_PORT=%~2" & SHIFT
 IF "%~1"=="-P" SET "PYTHON=%~2" & SHIFT
-IF /I "%~1"=="--change-mode" SET "CHANGE_MODE=1"
 SHIFT
 GOTO getopts
 :endopts
 
-IF %CHANGE_MODE% EQU 1 GOTO skip-filename
-
 CALL :LOG_MESSAGE DEBUG "Checking FILENAME parameter..."
 IF "__!FILENAME!__"=="____" (
     CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
@@ -84,9 +77,6 @@ IF "!FILENAME:update=!"=="!FILENAME!" (
     CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
 )
 
-:skip-filename
-SET "ESPTOOL_BAUD=1200"
-
 CALL :LOG_MESSAGE DEBUG "Determine the correct esptool command to use..."
 IF NOT "__%PYTHON%__"=="____" (
     SET "ESPTOOL_CMD=!PYTHON! -m esptool"
@@ -125,12 +115,6 @@ IF "__!ESPTOOL_PORT!__" == "____" (
 )
 CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
 
-IF %CHANGE_MODE% EQU 1 (
-    @REM Attempt to change mode via 1200bps Reset.
-    CALL :RUN_ESPTOOL !ESPTOOL_BAUD! --after no_reset read_flash_status
-    GOTO eof
-)
-
 @REM Flashing operations.
 CALL :LOG_MESSAGE INFO "Trying to flash update "!FILENAME!" at OFFSET 0x10000..."
 CALL :RUN_ESPTOOL !ESPTOOL_BAUD! write_flash 0x10000 "!FILENAME!" || GOTO eof
@@ -151,7 +135,6 @@ EXIT /B %ERRORLEVEL%
 IF %DEBUG% EQU 1 CALL :LOG_MESSAGE DEBUG "About to run command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
 CALL :RESET_ERROR
 !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4
-IF %CHANGE_MODE% EQU 1 GOTO :eof
 IF %ERRORLEVEL% NEQ 0 (
     CALL :LOG_MESSAGE ERROR "Error running command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
     EXIT /B %ERRORLEVEL%

bin/device-update.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 PYTHON=${PYTHON:-$(which python3 python|head -n 1)}
-CHANGE_MODE=false
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
@@ -18,30 +17,17 @@ fi
 # Usage info
 show_help() {
 cat << EOF
-Usage: $(basename "$0") [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME] [--change-mode]
+Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME]
 Flash image file to device, leave existing system intact."
 
     -h               Display this help and exit
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
     -f FILENAME      The *update.bin file to flash.  Custom to your device type.
-    --change-mode    Attempt to place the device in correct mode. Some hardware requires this twice. (1200bps Reset)
-
+    
 EOF
 }
 
-# Check for --change-mode and remove it from arguments
-NEW_ARGS=""
-for arg in "$@"; do
-    if [ "$arg" = "--change-mode" ]; then
-        CHANGE_MODE=true
-    else
-        NEW_ARGS="$NEW_ARGS \"\$arg\""
-    fi
-done
-
-# Reset positional parameters to filtered list
-eval set -- $NEW_ARGS
 
 while getopts ":hp:P:f:" opt; do
     case "${opt}" in
@@ -50,13 +36,13 @@ while getopts ":hp:P:f:" opt; do
             exit 0
             ;;
         p)  ESPTOOL_CMD="$ESPTOOL_CMD --port ${OPTARG}"
-            ;;
+	        ;;
         P)  PYTHON=${OPTARG}
             ;;
         f)  FILENAME=${OPTARG}
             ;;
         *)
-            echo "Invalid flag."
+ 	        echo "Invalid flag."
             show_help >&2
             exit 1
             ;;
@@ -64,22 +50,17 @@ while getopts ":hp:P:f:" opt; do
 done
 shift "$((OPTIND-1))"
 
-if [ "$CHANGE_MODE" = true ]; then
-	$ESPTOOL_CMD --baud 1200 --after no_reset read_flash_status
-    exit 0
-fi
-
-[ -z "$FILENAME" ]  && [ -n "$1" ] && {
-    FILENAME="$1"
+[ -z "$FILENAME" -a -n "$1" ] && {
+    FILENAME=$1
     shift
 }
 
 if [ -f "${FILENAME}" ] && [ -z "${FILENAME##*"update"*}" ]; then
-    echo "Trying to flash update ${FILENAME}"
-    $ESPTOOL_CMD --baud 115200 write_flash 0x10000 "${FILENAME}"
+	printf "Trying to flash update ${FILENAME}"
+	$ESPTOOL_CMD --baud 115200 write_flash 0x10000 ${FILENAME}
 else
-    show_help
-    echo "Invalid file: ${FILENAME}"
+	show_help
+	echo "Invalid file: ${FILENAME}"
 fi
 
 exit 0

bin/generate_ci_matrix.py

@@ -27,7 +27,7 @@ for subdir, dirs, files in os.walk(rootdir):
                 if c.startswith("env:"):
                     section = config[c].name[4:]
                     if "extends" in config[config[c].name]:
-                        if options[0] + "_base" in config[config[c].name]["extends"]:
+                        if config[config[c].name]["extends"] == options[0] + "_base":
                             if "board_level" in config[config[c].name]:
                                 if (
                                     config[config[c].name]["board_level"] == "extra"

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,24 +87,6 @@
   </screenshots>
 
   <releases>
-    <release version="2.7.2" date="2025-07-04">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.2</url>
-    </release>
-    <release version="2.7.1" date="2025-06-27">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.1</url>
-    </release>
-    <release version="2.7.0" date="2025-06-20">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.0</url>
-    </release>
-    <release version="2.6.13" date="2025-06-16">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.13</url>
-    </release>
-    <release version="2.6.12" date="2025-06-15">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.12</url>
-    </release>
-    <release version="2.6.11" date="2025-06-02">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.11</url>
-    </release>
     <release version="2.6.10" date="2025-05-25">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.10</url>
     </release>

bin/platformio-custom.py

@@ -131,33 +131,3 @@ for lb in env.GetLibBuilders():
     if lb.name == "meshtastic-device-ui":
         lb.env.Append(CPPDEFINES=[("APP_VERSION", verObj["long"])])
         break
-
-# Get the display resolution from macros
-def get_display_resolution(build_flags):
-    # Check "DISPLAY_SIZE" to determine the screen resolution
-    for flag in build_flags:
-        if isinstance(flag, tuple) and flag[0] == "DISPLAY_SIZE":
-            screen_width, screen_height = map(int, flag[1].split("x"))
-            return screen_width, screen_height
-    print("No screen resolution defined in build_flags. Please define DISPLAY_SIZE.")
-    exit(1)
-
-def load_boot_logo(source, target, env):
-    build_flags = env.get("CPPDEFINES", [])
-    logo_w, logo_h = get_display_resolution(build_flags)
-    print(f"TFT build with {logo_w}x{logo_h} resolution detected")
-
-    # Load the boot logo from `branding/logo_<width>x<height>.png` if it exists
-    source_path = join(env["PROJECT_DIR"], "branding", f"logo_{logo_w}x{logo_h}.png")
-    dest_dir = join(env["PROJECT_DIR"], "data", "boot")
-    dest_path = join(dest_dir, "logo.png")
-    if env.File(source_path).exists():
-        print(f"Loading boot logo from {source_path}")
-        # Prepare the destination
-        env.Execute(f"mkdir -p {dest_dir} && rm -f {dest_path}")
-        # Copy the logo to the `data/boot` directory
-        env.Execute(f"cp {source_path} {dest_path}")
-
-# Load the boot logo on TFT builds
-if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
-    env.AddPreAction('$BUILD_DIR/littlefs.bin', load_boot_logo)

bin/web.version

@@ -1 +1 @@
-2.6.4
+2.5.3

boards/ThinkNode-M1.json

@@ -48,6 +48,6 @@
     "require_upload_port": true,
     "wait_for_upload_port": true
   },
-  "url": "https://www.elecrow.com/thinknode-m1-meshtastic-lora-signal-transceiver-powered-by-nrf52840-with-154-screen-support-gps.html",
+  "url": "FIXME",
   "vendor": "ELECROW"
 }

boards/gat562_mesh_trial_tracker.json

@@ -1,52 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x8029"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"],
-      ["0x239A", "0x802A"]
-    ],
-    "usb_product": "GAT562 Mesh Trial Tracker",
-    "mcu": "nrf52840",
-    "variant": "gat562_mesh_trial_tracker",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino", "freertos"],
-  "name": "GAT562 Mesh Trial Tracker",
-  "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": "http://www.gat-iot.com/",
-  "vendor": "GAT-IOT"
-}

boards/heltec_mesh_node_t114.json

@@ -10,8 +10,7 @@
     "hwids": [
       ["0x239A", "0x4405"],
       ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"],
-      ["0x2886", "0x1667"]
+      ["0x239A", "0x002A"]
     ],
     "usb_product": "HT-n5262",
     "mcu": "nrf52840",
@@ -49,6 +48,6 @@
     "require_upload_port": true,
     "wait_for_upload_port": true
   },
-  "url": "https://heltec.org/project/mesh-node-t114/",
+  "url": "FIXME",
   "vendor": "Heltec"
 }

boards/seeed_wio_tracker_L1.json

@@ -7,10 +7,7 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA",
     "f_cpu": "64000000L",
-    "hwids": [
-      ["0x2886", "0x1668"],
-      ["0x2886", "0x1667"]
-    ],
+    "hwids": [["0x2886", "0x1668"]],
     "usb_product": "TRACKER L1",
     "mcu": "nrf52840",
     "variant": "seeed_wio_tracker_L1",

boards/seeed_xiao_nrf52840_kit.json

@@ -7,7 +7,9 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA",
     "f_cpu": "64000000L",
-    "hwids": [["0x2886", "0x0166"]],
+    "hwids": [
+      ["0x2886", "0x0166"]
+    ],
     "usb_product": "XIAO-BOOT",
     "mcu": "nrf52840",
     "variant": "seeed_xiao_nrf52840_kit",

boards/tracker-t1000-e.json

@@ -11,8 +11,7 @@
       ["0x239A", "0x8029"],
       ["0x239A", "0x0029"],
       ["0x239A", "0x002A"],
-      ["0x239A", "0x802A"],
-      ["0x2886", "0x0057"]
+      ["0x239A", "0x802A"]
     ],
     "usb_product": "T1000-E-BOOT",
     "mcu": "nrf52840",

boards/wiscore_rak3312.json

@@ -1,41 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_opi",
-      "partitions": "default_16MB.csv"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DRAK3312",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1",
-      "-DBOARD_HAS_PSRAM"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "dio",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "rak3312"
-  },
-  "connectivity": ["wifi", "bluetooth"],
-  "debug": {
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "WisCore RAK3312 Board",
-  "upload": {
-    "flash_size": "16MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 16777216,
-    "use_1200bps_touch": true,
-    "wait_for_upload_port": true,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "url": "https://www.rakwireless.com/en-us",
-  "vendor": "rakwireless"
-}

branding/README.md

@@ -1,17 +0,0 @@
-# Meshtastic Branding / Whitelabeling
-
-This directory is consumed during the creation of **event** firmware.
-
-`bin/platformio-custom.py` determines the display resolution, and locates the corresponding `logo_<width>x<height>.png`.
-
-Ex:
-
-- `logo_800x480.png`
-- `logo_480x480.png`
-- `logo_480x320.png`
-- `logo_320x480.png`
-- `logo_320x240.png`
-
-This file is copied to `data/boot/logo.png` before filesytem image compilation.
-
-For additional examples see the [`event/defcon33` branch](https://github.com/meshtastic/firmware/tree/event/defcon33).

debian/changelog

@@ -1,4 +1,4 @@
-meshtasticd (2.7.2.0) UNRELEASED; urgency=medium
+meshtasticd (2.6.10.0) UNRELEASED; urgency=medium
 
   [ Austin Lane ]
   * Initial packaging
@@ -16,16 +16,4 @@ meshtasticd (2.7.2.0) UNRELEASED; urgency=medium
   [  ]
   * GitHub Actions Automatic version bump
 
-  [  ]
-  * GitHub Actions Automatic version bump
-
-  [  ]
-  * GitHub Actions Automatic version bump
-
-  [  ]
-  * GitHub Actions Automatic version bump
-
-  [  ]
-  * GitHub Actions Automatic version bump
-
- --  <github-actions[bot]@users.noreply.github.com>  Fri, 04 Jul 2025 11:58:01 +0000
+ --  <github-actions[bot]@users.noreply.github.com>  Sun, 25 May 2025 20:46:49 +0000

platformio.ini

@@ -49,11 +49,10 @@ build_flags = -Wno-missing-field-initializers
 	-DMESHTASTIC_EXCLUDE_DROPZONE=1
 	-DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
 	-DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1
-	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
+  	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
 	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
-	-D MAX_THREADS=40 ; As we've split modules, we have more threads to manage
-	#-DBUILD_EPOCH=$UNIX_TIME
-	#-D OLED_PL=1
+        #-DBUILD_EPOCH=$UNIX_TIME
+        #-D OLED_PL=1
 
 monitor_speed = 115200
 monitor_filters = direct
@@ -104,12 +103,12 @@ lib_deps =
 [radiolib_base]
 lib_deps =
 	# renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib
-	jgromes/RadioLib@7.2.0
+	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/archive/8c7092c73425adfda1aac8c6960df06cd85f6d92.zip
+	https://github.com/meshtastic/device-ui/archive/37e2fb84a8d1b7d8cc1e2ed00d34cfb1f284bd59.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -129,7 +128,7 @@ lib_deps =
 	# 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.3
+	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
@@ -166,10 +165,8 @@ lib_deps =
 	adafruit/Adafruit LTR390 Library@1.1.2
 	# renovate: datasource=custom.pio depName=Adafruit PCT2075 packageName=adafruit/library/Adafruit PCT2075
 	adafruit/Adafruit PCT2075@1.0.5
-	# renovate: datasource=custom.pio depName=DFRobot_BMM150 packageName=dfrobot/library/DFRobot_BMM150
-	dfrobot/DFRobot_BMM150@1.0.0
-
-; (not included in native / portduino)
+  
+  ; (not included in native / portduino)
 [environmental_extra]
 lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit BMP3XX packageName=adafruit/library/Adafruit BMP3XX Library
@@ -195,8 +192,4 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
 	boschsensortec/BME68x Sensor Library@1.3.40408
 	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
-	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
-	# renovate: datasource=custom.pio depName=Sensirion Core packageName=sensirion/library/Sensirion Core
-	sensirion/Sensirion Core@0.7.1
-	# renovate: datasource=custom.pio depName=Sensirion I2C SCD4x packageName=sensirion/library/Sensirion I2C SCD4x
-	sensirion/Sensirion I2C SCD4x@1.1.0
+	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip

src/AmbientLightingThread.h

@@ -59,82 +59,82 @@ class AmbientLightingThread : public concurrency::OSThread
             return;
         }
         LOG_DEBUG("AmbientLighting init");
-#ifdef HAS_NCP5623
+#if defined(HAS_NCP5623) || defined(HAS_LP5562)
         if (_type == ScanI2C::NCP5623) {
             rgb.begin();
 #endif
 #ifdef HAS_LP5562
-            if (_type == ScanI2C::LP5562) {
-                rgbw.begin();
+        } else if (_type == ScanI2C::LP5562) {
+            rgbw.begin();
 #endif
 #ifdef RGBLED_RED
-                pinMode(RGBLED_RED, OUTPUT);
-                pinMode(RGBLED_GREEN, OUTPUT);
-                pinMode(RGBLED_BLUE, OUTPUT);
+            pinMode(RGBLED_RED, OUTPUT);
+            pinMode(RGBLED_GREEN, OUTPUT);
+            pinMode(RGBLED_BLUE, OUTPUT);
 #endif
 #ifdef HAS_NEOPIXEL
-                pixels.begin(); // Initialise the pixel(s)
-                pixels.clear(); // Set all pixel colors to 'off'
-                pixels.setBrightness(moduleConfig.ambient_lighting.current);
+            pixels.begin(); // Initialise the pixel(s)
+            pixels.clear(); // Set all pixel colors to 'off'
+            pixels.setBrightness(moduleConfig.ambient_lighting.current);
 #endif
-                setLighting();
+            setLighting();
 #endif
 #if defined(HAS_NCP5623) || defined(HAS_LP5562)
-            }
-#endif
         }
+#endif
+    }
 
-      protected:
-        int32_t runOnce() override
-        {
+  protected:
+    int32_t runOnce() override
+    {
 #ifdef HAS_RGB_LED
 #if defined(HAS_NCP5623) || defined(HAS_LP5562)
-            if ((_type == ScanI2C::NCP5623 || _type == ScanI2C::LP5562) && moduleConfig.ambient_lighting.led_state) {
+        if ((_type == ScanI2C::NCP5623 || _type == ScanI2C::LP5562) && moduleConfig.ambient_lighting.led_state) {
 #endif
-                setLighting();
-                return 30000; // 30 seconds to reset from any animations that may have been running from Ext. Notification
+            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)
-            }
-#endif
-#endif
-            return disable();
         }
+#endif
+#endif
+        return disable();
+    }
 
-        // When shutdown() is issued, setLightingOff will be called.
-        CallbackObserver<AmbientLightingThread, void *> notifyDeepSleepObserver =
-            CallbackObserver<AmbientLightingThread, void *>(this, &AmbientLightingThread::setLightingOff);
+    // When shutdown() is issued, setLightingOff will be called.
+    CallbackObserver<AmbientLightingThread, void *> notifyDeepSleepObserver =
+        CallbackObserver<AmbientLightingThread, void *>(this, &AmbientLightingThread::setLightingOff);
 
-      private:
-        ScanI2C::DeviceType _type = ScanI2C::DeviceType::NONE;
+  private:
+    ScanI2C::DeviceType _type = ScanI2C::DeviceType::NONE;
 
-        // Turn RGB lighting off, is used in junction to shutdown()
-        int setLightingOff(void *unused)
-        {
+    // Turn RGB lighting off, is used in junction to shutdown()
+    int setLightingOff(void *unused)
+    {
 #ifdef HAS_NCP5623
-            rgb.setCurrent(0);
-            rgb.setRed(0);
-            rgb.setGreen(0);
-            rgb.setBlue(0);
-            LOG_INFO("OFF: NCP5623 Ambient lighting");
+        rgb.setCurrent(0);
+        rgb.setRed(0);
+        rgb.setGreen(0);
+        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");
+        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();
-            LOG_INFO("OFF: NeoPixel Ambient lighting");
+        pixels.clear();
+        pixels.show();
+        LOG_INFO("OFF: NeoPixel Ambient lighting");
 #endif
 #ifdef RGBLED_CA
-            analogWrite(RGBLED_RED, 255 - 0);
-            analogWrite(RGBLED_GREEN, 255 - 0);
-            analogWrite(RGBLED_BLUE, 255 - 0);
-            LOG_INFO("OFF: Ambient light RGB Common Anode");
+        analogWrite(RGBLED_RED, 255 - 0);
+        analogWrite(RGBLED_GREEN, 255 - 0);
+        analogWrite(RGBLED_BLUE, 255 - 0);
+        LOG_INFO("OFF: Ambient light RGB Common Anode");
 #elif defined(RGBLED_RED)
         analogWrite(RGBLED_RED, 0);
         analogWrite(RGBLED_GREEN, 0);
@@ -142,57 +142,56 @@ class AmbientLightingThread : public concurrency::OSThread
         LOG_INFO("OFF: Ambient light RGB Common Cathode");
 #endif
 #ifdef UNPHONE
-            unphone.rgb(0, 0, 0);
-            LOG_INFO("OFF: unPhone Ambient lighting");
+        unphone.rgb(0, 0, 0);
+        LOG_INFO("OFF: unPhone Ambient lighting");
 #endif
-            return 0;
-        }
+        return 0;
+    }
 
-        void setLighting()
-        {
+    void setLighting()
+    {
 #ifdef HAS_NCP5623
-            rgb.setCurrent(moduleConfig.ambient_lighting.current);
-            rgb.setRed(moduleConfig.ambient_lighting.red);
-            rgb.setGreen(moduleConfig.ambient_lighting.green);
-            rgb.setBlue(moduleConfig.ambient_lighting.blue);
-            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);
+        rgb.setCurrent(moduleConfig.ambient_lighting.current);
+        rgb.setRed(moduleConfig.ambient_lighting.red);
+        rgb.setGreen(moduleConfig.ambient_lighting.green);
+        rgb.setBlue(moduleConfig.ambient_lighting.blue);
+        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);
+        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),
-                        0, NEOPIXEL_COUNT);
+        pixels.fill(pixels.Color(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
+                                 moduleConfig.ambient_lighting.blue),
+                    0, NEOPIXEL_COUNT);
 
 // RadioMaster Bandit has addressable LED at the two buttons
 // this allow us to set different lighting for them in variant.h file.
 #ifdef RADIOMASTER_900_BANDIT
 #if defined(BUTTON1_COLOR) && defined(BUTTON1_COLOR_INDEX)
-            pixels.fill(BUTTON1_COLOR, BUTTON1_COLOR_INDEX, 1);
+        pixels.fill(BUTTON1_COLOR, BUTTON1_COLOR_INDEX, 1);
 #endif
 #if defined(BUTTON2_COLOR) && defined(BUTTON2_COLOR_INDEX)
-            pixels.fill(BUTTON2_COLOR, BUTTON2_COLOR_INDEX, 1);
+        pixels.fill(BUTTON2_COLOR, BUTTON2_COLOR_INDEX, 1);
 #endif
 #endif
-            pixels.show();
-            LOG_DEBUG("Init NeoPixel Ambient light w/ brightness(current)=%d, red=%d, green=%d, blue=%d",
-                      moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red,
-                      moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+        pixels.show();
+        LOG_DEBUG("Init NeoPixel Ambient light w/ brightness(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 RGBLED_CA
-            analogWrite(RGBLED_RED, 255 - moduleConfig.ambient_lighting.red);
-            analogWrite(RGBLED_GREEN, 255 - moduleConfig.ambient_lighting.green);
-            analogWrite(RGBLED_BLUE, 255 - moduleConfig.ambient_lighting.blue);
-            LOG_DEBUG("Init Ambient light RGB Common Anode w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
-                      moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+        analogWrite(RGBLED_RED, 255 - moduleConfig.ambient_lighting.red);
+        analogWrite(RGBLED_GREEN, 255 - moduleConfig.ambient_lighting.green);
+        analogWrite(RGBLED_BLUE, 255 - moduleConfig.ambient_lighting.blue);
+        LOG_DEBUG("Init Ambient light RGB Common Anode w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
+                  moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #elif defined(RGBLED_RED)
         analogWrite(RGBLED_RED, moduleConfig.ambient_lighting.red);
         analogWrite(RGBLED_GREEN, moduleConfig.ambient_lighting.green);
@@ -201,12 +200,11 @@ class AmbientLightingThread : public concurrency::OSThread
                   moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
 #ifdef UNPHONE
-            unphone.rgb(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
-                        moduleConfig.ambient_lighting.blue);
-            LOG_DEBUG("Init unPhone Ambient light w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
-                      moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+        unphone.rgb(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+        LOG_DEBUG("Init unPhone Ambient light w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
+                  moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
-        }
-    };
+    }
+};
 
 } // namespace concurrency

src/AudioThread.h

@@ -47,20 +47,6 @@ class AudioThread : public concurrency::OSThread
         setCPUFast(false);
     }
 
-    void readAloud(const char *text)
-    {
-        if (i2sRtttl != nullptr) {
-            i2sRtttl->stop();
-            delete i2sRtttl;
-            i2sRtttl = nullptr;
-        }
-
-        ESP8266SAM *sam = new ESP8266SAM;
-        sam->Say(audioOut, text);
-        delete sam;
-        setCPUFast(false);
-    }
-
   protected:
     int32_t runOnce() override
     {

src/BluetoothStatus.h

@@ -88,16 +88,10 @@ class BluetoothStatus : public Status
                 break;
             case ConnectionState::CONNECTED:
                 LOG_DEBUG("BluetoothStatus CONNECTED");
-#ifdef BLE_LED
-                digitalWrite(BLE_LED, HIGH);
-#endif
                 break;
 
             case ConnectionState::DISCONNECTED:
                 LOG_DEBUG("BluetoothStatus DISCONNECTED");
-#ifdef BLE_LED
-                digitalWrite(BLE_LED, LOW);
-#endif
                 break;
             }
         }
@@ -108,4 +102,4 @@ class BluetoothStatus : public Status
 
 } // namespace meshtastic
 
-extern meshtastic::BluetoothStatus *bluetoothStatus;
+extern meshtastic::BluetoothStatus *bluetoothStatus;

src/ButtonThread.cpp

@@ -0,0 +1,497 @@
+#include "ButtonThread.h"
+
+#include "configuration.h"
+#if !MESHTASTIC_EXCLUDE_GPS
+#include "GPS.h"
+#endif
+#include "MeshService.h"
+#include "PowerFSM.h"
+#include "RadioLibInterface.h"
+#include "buzz.h"
+#include "main.h"
+#include "modules/CannedMessageModule.h"
+#include "modules/ExternalNotificationModule.h"
+#include "power.h"
+#include "sleep.h"
+#ifdef ARCH_PORTDUINO
+#include "platform/portduino/PortduinoGlue.h"
+#endif
+
+#define DEBUG_BUTTONS 0
+#if DEBUG_BUTTONS
+#define LOG_BUTTON(...) LOG_DEBUG(__VA_ARGS__)
+#else
+#define LOG_BUTTON(...)
+#endif
+
+using namespace concurrency;
+
+ButtonThread *buttonThread; // Declared extern in header
+extern CannedMessageModule *cannedMessageModule;
+volatile ButtonThread::ButtonEventType ButtonThread::btnEvent = ButtonThread::BUTTON_EVENT_NONE;
+
+#if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
+OneButton ButtonThread::userButton; // Get reference to static member
+#endif
+ButtonThread::ButtonThread() : OSThread("Button")
+{
+#if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
+
+#if defined(ARCH_PORTDUINO)
+    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) {
+        this->userButton = OneButton(settingsMap[user], true, true);
+        LOG_DEBUG("Use GPIO%02d for button", settingsMap[user]);
+    }
+#elif defined(BUTTON_PIN)
+#if !defined(USERPREFS_BUTTON_PIN)
+    int pin = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN;           // Resolved button pin
+#endif
+#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)
+    this->userButton = OneButton(pin, false, false);
+#elif defined(BUTTON_ACTIVE_LOW)
+    this->userButton = OneButton(pin, BUTTON_ACTIVE_LOW, BUTTON_ACTIVE_PULLUP);
+#else
+    this->userButton = OneButton(pin, true, true);
+#endif
+    LOG_DEBUG("Use GPIO%02d for button", pin);
+#endif
+
+#ifdef INPUT_PULLUP_SENSE
+    // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
+#ifdef BUTTON_SENSE_TYPE
+    pinMode(pin, BUTTON_SENSE_TYPE);
+#else
+    pinMode(pin, INPUT_PULLUP_SENSE);
+#endif
+#endif
+
+#if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
+    userButton.attachClick(userButtonPressed);
+    userButton.setClickMs(BUTTON_CLICK_MS);
+    userButton.setPressMs(BUTTON_LONGPRESS_MS);
+    userButton.setDebounceMs(1);
+    userButton.attachDoubleClick(userButtonDoublePressed);
+    userButton.attachMultiClick(userButtonMultiPressed, this); // Reference to instance: get click count from non-static OneButton
+#if !defined(T_DECK) &&                                                                                                          \
+    !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)
+    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.setClickMs(BUTTON_CLICK_MS);
+    userButtonAlt.setPressMs(BUTTON_LONGPRESS_MS);
+    userButtonAlt.setDebounceMs(1);
+    userButtonAlt.attachLongPressStart(userButtonPressedLongStart);
+    userButtonAlt.attachLongPressStop(userButtonPressedLongStop);
+#endif
+
+#ifdef BUTTON_PIN_TOUCH
+    userButtonTouch = OneButton(BUTTON_PIN_TOUCH, true, true);
+    userButtonTouch.setPressMs(BUTTON_TOUCH_MS);
+    userButtonTouch.attachLongPressStart(touchPressedLongStart); // Better handling with longpress than click?
+#endif
+
+#ifdef ARCH_ESP32
+    // Register callbacks for before and after lightsleep
+    // Used to detach and reattach interrupts
+    lsObserver.observe(&notifyLightSleep);
+    lsEndObserver.observe(&notifyLightSleepEnd);
+#endif
+
+    attachButtonInterrupts();
+#endif
+}
+
+void ButtonThread::switchPage()
+{
+    // Prevent screen switch if CannedMessageModule is focused and intercepting input
+#if HAS_SCREEN
+    extern CannedMessageModule *cannedMessageModule;
+
+    if (cannedMessageModule && cannedMessageModule->isInterceptingAndFocused()) {
+        LOG_DEBUG("User button ignored during canned message input");
+        return; // Skip screen change
+    }
+#endif
+
+    // Default behavior if not blocked
+#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
+    canSleep = true; // Assume we should not keep the board awake
+
+#if defined(BUTTON_PIN) || defined(USERPREFS_BUTTON_PIN)
+    userButton.tick();
+    canSleep &= userButton.isIdle();
+#elif defined(ARCH_PORTDUINO)
+    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) {
+        userButton.tick();
+        canSleep &= userButton.isIdle();
+    }
+#endif
+#ifdef BUTTON_PIN_ALT
+    userButtonAlt.tick();
+    canSleep &= userButtonAlt.isIdle();
+#endif
+#ifdef BUTTON_PIN_TOUCH
+    userButtonTouch.tick();
+    canSleep &= userButtonTouch.isIdle();
+#endif
+
+    if (btnEvent != BUTTON_EVENT_NONE) {
+        switch (btnEvent) {
+        case BUTTON_EVENT_PRESSED: {
+            LOG_BUTTON("press!");
+            // If a nag notification is running, stop it and prevent other actions
+            if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
+                externalNotificationModule->stopNow();
+                break;
+            }
+#ifdef ELECROW_ThinkNode_M1
+            sendAdHocPosition();
+            break;
+#endif
+            switchPage();
+            break;
+        }
+
+        case BUTTON_EVENT_PRESSED_SCREEN: {
+            LOG_BUTTON("AltPress!");
+#ifdef ELECROW_ThinkNode_M1
+            // If a nag notification is running, stop it and prevent other actions
+            if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
+                externalNotificationModule->stopNow();
+                break;
+            }
+            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
+            digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
+            break;
+#endif
+
+            // Send GPS position immediately
+            sendAdHocPosition();
+
+            // Show temporary on-screen confirmation banner for 3 seconds
+            screen->showOverlayBanner("Ad-hoc Ping Sent", 3000);
+            break;
+        }
+
+        case BUTTON_EVENT_MULTI_PRESSED: {
+            LOG_BUTTON("Mulitipress! %hux", multipressClickCount);
+            switch (multipressClickCount) {
+#if HAS_GPS && !defined(ELECROW_ThinkNode_M1)
+            // 3 clicks: toggle GPS
+            case 3:
+                if (!config.device.disable_triple_click && (gps != nullptr)) {
+                    gps->toggleGpsMode();
+
+                    const char *statusMsg = (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED)
+                                                ? "GPS Enabled"
+                                                : "GPS Disabled";
+
+                    if (screen) {
+                        screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
+                        screen->showOverlayBanner(statusMsg, 3000);
+                    }
+                }
+                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) && !defined(ELECROW_ThinkNode_M1) // i.e. T-Echo
+            // 4 clicks: toggle backlight
+            case 4:
+                digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
+                break;
+#endif
+#if !MESHTASTIC_EXCLUDE_SCREEN && HAS_SCREEN
+            // 5 clicks: start accelerometer/magenetometer calibration for 30 seconds
+            case 5:
+                if (accelerometerThread) {
+                    accelerometerThread->calibrate(30);
+                }
+                break;
+            // 6 clicks: start accelerometer/magenetometer calibration for 60 seconds
+            case 6:
+                if (accelerometerThread) {
+                    accelerometerThread->calibrate(60);
+                }
+                break;
+#endif
+            // No valid multipress action
+            default:
+                break;
+            } // end switch: click count
+
+            break;
+        } // end multipress event
+
+        case BUTTON_EVENT_LONG_PRESSED: {
+            LOG_BUTTON("Long press!");
+            powerFSM.trigger(EVENT_PRESS);
+
+            if (screen) {
+                // Show shutdown message as a temporary overlay banner
+                screen->showOverlayBanner("Shutting Down..."); // Display for 3 seconds
+            }
+
+            playBeep();
+            break;
+        }
+
+        // Do actual shutdown when button released, otherwise the button release
+        // may wake the board immediatedly.
+        case BUTTON_EVENT_LONG_RELEASED: {
+            LOG_INFO("Shutdown from long press");
+            playShutdownMelody();
+            delay(3000);
+            power->shutdown();
+            nodeDB->saveToDisk();
+            break;
+        }
+
+#ifdef BUTTON_PIN_TOUCH
+        case BUTTON_EVENT_TOUCH_LONG_PRESSED: {
+            LOG_BUTTON("Touch press!");
+            // Ignore if: no screen
+            if (!screen)
+                break;
+
+#ifdef TTGO_T_ECHO
+            // Ignore if: TX in progress
+            // Uncommon T-Echo hardware bug, LoRa TX triggers touch button
+            if (!RadioLibInterface::instance || RadioLibInterface::instance->isSending())
+                break;
+#endif
+
+            // Wake if asleep
+            if (powerFSM.getState() == &stateDARK)
+                powerFSM.trigger(EVENT_PRESS);
+
+            // Update display (legacy behaviour)
+            screen->forceDisplay();
+            break;
+        }
+#endif // BUTTON_PIN_TOUCH
+
+        default:
+            break;
+        }
+        btnEvent = BUTTON_EVENT_NONE;
+    }
+
+    return 50;
+}
+
+/*
+ * Attach (or re-attach) hardware interrupts for buttons
+ * Public method. Used outside class when waking from MCU sleep
+ */
+void ButtonThread::attachButtonInterrupts()
+{
+#if defined(ARCH_PORTDUINO)
+    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC)
+        wakeOnIrq(settingsMap[user], FALLING);
+#elif defined(BUTTON_PIN)
+    // Interrupt for user button, during normal use. Improves responsiveness.
+    attachInterrupt(
+#if !defined(USERPREFS_BUTTON_PIN)
+        config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN,
+#endif
+#if defined(USERPREFS_BUTTON_PIN)
+        config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN,
+#endif
+        []() {
+            ButtonThread::userButton.tick();
+            runASAP = true;
+            BaseType_t higherWake = 0;
+            mainDelay.interruptFromISR(&higherWake);
+        },
+        CHANGE);
+#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);
+#endif
+}
+
+/*
+ * Detach the "normal" button interrupts.
+ * Public method. Used before attaching a "wake-on-button" interrupt for MCU sleep
+ */
+void ButtonThread::detachButtonInterrupts()
+{
+#if defined(ARCH_PORTDUINO)
+    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC)
+        detachInterrupt(settingsMap[user]);
+#elif defined(BUTTON_PIN)
+#if !defined(USERPREFS_BUTTON_PIN)
+    detachInterrupt(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN);
+#endif
+#if defined(USERPREFS_BUTTON_PIN)
+    detachInterrupt(config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN);
+#endif
+#endif
+
+#ifdef BUTTON_PIN_ALT
+    detachInterrupt(BUTTON_PIN_ALT);
+#endif
+
+#ifdef BUTTON_PIN_TOUCH
+    detachInterrupt(BUTTON_PIN_TOUCH);
+#endif
+}
+
+#ifdef ARCH_ESP32
+
+// Detach our class' interrupts before lightsleep
+// Allows sleep.cpp to configure its own interrupts, which wake the device on user-button press
+int ButtonThread::beforeLightSleep(void *unused)
+{
+    detachButtonInterrupts();
+    return 0; // Indicates success
+}
+
+// Reconfigure our interrupts
+// Our class' interrupts were disconnected during sleep, to allow the user button to wake the device from sleep
+int ButtonThread::afterLightSleep(esp_sleep_wakeup_cause_t cause)
+{
+    attachButtonInterrupts();
+    return 0; // Indicates success
+}
+
+#endif
+
+/**
+ * Watch a GPIO and if we get an IRQ, wake the main thread.
+ * Use to add wake on button press
+ */
+void ButtonThread::wakeOnIrq(int irq, int mode)
+{
+    attachInterrupt(
+        irq,
+        [] {
+            BaseType_t higherWake = 0;
+            mainDelay.interruptFromISR(&higherWake);
+            runASAP = true;
+        },
+        FALLING);
+}
+
+// Static callback
+void ButtonThread::userButtonMultiPressed(void *callerThread)
+{
+    // Grab click count from non-static button, while the info is still valid
+    ButtonThread *thread = (ButtonThread *)callerThread;
+    thread->storeClickCount();
+
+    // Then handle later, in the usual way
+    btnEvent = BUTTON_EVENT_MULTI_PRESSED;
+}
+
+// Non-static method, runs during callback. Grabs info while still valid
+void ButtonThread::storeClickCount()
+{
+#if defined(BUTTON_PIN) || defined(USERPREFS_BUTTON_PIN)
+    multipressClickCount = userButton.getNumberClicks();
+#endif
+}
+
+void ButtonThread::userButtonPressedLongStart()
+{
+    if (millis() > c_holdOffTime) {
+        btnEvent = BUTTON_EVENT_LONG_PRESSED;
+    }
+}
+
+void ButtonThread::userButtonPressedLongStop()
+{
+    if (millis() > c_holdOffTime) {
+        btnEvent = BUTTON_EVENT_LONG_RELEASED;
+    }
+}

src/ButtonThread.h

@@ -0,0 +1,92 @@
+#pragma once
+
+#include "OneButton.h"
+#include "concurrency/OSThread.h"
+#include "configuration.h"
+
+#ifndef BUTTON_CLICK_MS
+#define BUTTON_CLICK_MS 250
+#endif
+
+#ifndef BUTTON_LONGPRESS_MS
+#define BUTTON_LONGPRESS_MS 5000
+#endif
+
+#ifndef BUTTON_TOUCH_MS
+#define BUTTON_TOUCH_MS 400
+#endif
+
+class ButtonThread : public concurrency::OSThread
+{
+  public:
+    static const uint32_t c_holdOffTime = 30000; // hold off 30s after boot
+
+    enum ButtonEventType {
+        BUTTON_EVENT_NONE,
+        BUTTON_EVENT_PRESSED,
+        BUTTON_EVENT_PRESSED_SCREEN,
+        BUTTON_EVENT_DOUBLE_PRESSED,
+        BUTTON_EVENT_MULTI_PRESSED,
+        BUTTON_EVENT_LONG_PRESSED,
+        BUTTON_EVENT_LONG_RELEASED,
+        BUTTON_EVENT_TOUCH_LONG_PRESSED,
+    };
+
+    ButtonThread();
+    int32_t runOnce() override;
+    void attachButtonInterrupts();
+    void detachButtonInterrupts();
+    void storeClickCount();
+    bool isBuzzing() { return buzzer_flag; }
+    void setScreenFlag(bool flag) { screen_flag = flag; }
+    bool getScreenFlag() { return screen_flag; }
+    bool isInterceptingAndFocused();
+
+    // 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
+#endif
+#ifdef BUTTON_PIN_ALT
+    OneButton userButtonAlt;
+#endif
+#ifdef BUTTON_PIN_TOUCH
+    OneButton userButtonTouch;
+#endif
+
+#ifdef ARCH_ESP32
+    // Get notified when lightsleep begins and ends
+    CallbackObserver<ButtonThread, void *> lsObserver =
+        CallbackObserver<ButtonThread, void *>(this, &ButtonThread::beforeLightSleep);
+    CallbackObserver<ButtonThread, esp_sleep_wakeup_cause_t> lsEndObserver =
+        CallbackObserver<ButtonThread, esp_sleep_wakeup_cause_t>(this, &ButtonThread::afterLightSleep);
+#endif
+
+    // set during IRQ
+    static volatile ButtonEventType btnEvent;
+    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();
+    static void userButtonPressedLongStop();
+    static void touchPressedLongStart() { btnEvent = BUTTON_EVENT_TOUCH_LONG_PRESSED; }
+};
+
+extern ButtonThread *buttonThread;

src/Power.cpp

@@ -103,7 +103,7 @@ NullSensor ina3221Sensor;
 
 #endif
 
-#if !MESHTASTIC_EXCLUDE_I2C
+#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];
@@ -278,7 +278,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
         }
 #endif
 
-#if HAS_TELEMETRY && !defined(HAS_PMU) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+#if HAS_TELEMETRY && !defined(ARCH_STM32WL) && !defined(HAS_PMU) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
         if (hasINA()) {
             return getINAVoltage();
         }
@@ -456,7 +456,8 @@ 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(DISABLE_INA_CHARGING_DETECTION)
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_STM32WL) &&                                       \
+    !defined(DISABLE_INA_CHARGING_DETECTION)
         if (hasINA()) {
             // get current flow from INA sensor - negative value means power flowing into the battery
             // default assuming  BATTERY+  <--> INA_VIN+ <--> SHUNT RESISTOR <--> INA_VIN- <--> LOAD
@@ -502,7 +503,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
     }
 #endif
 
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_STM32WL)
     uint16_t getINAVoltage()
     {
         if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
@@ -660,14 +661,12 @@ bool Power::analogInit()
  */
 bool Power::setup()
 {
-    bool found = false;
-    if (axpChipInit()) {
-        found = true;
-    } else if (lipoInit()) {
-        found = true;
-    } else if (analogInit()) {
-        found = true;
-    }
+    // initialise one power sensor (only)
+    bool found = axpChipInit();
+    if (!found)
+        found = lipoInit();
+    if (!found)
+        found = analogInit();
 
 #ifdef NRF_APM
     found = true;
@@ -681,7 +680,7 @@ bool Power::setup()
 
 void Power::shutdown()
 {
-    LOG_INFO("Shutting Down");
+    LOG_INFO("Shutting down");
 
 #if defined(ARCH_NRF52) || defined(ARCH_ESP32) || defined(ARCH_RP2040)
 #ifdef PIN_LED1
@@ -1160,7 +1159,7 @@ bool Power::axpChipInit()
 #endif
 }
 
-#if !MESHTASTIC_EXCLUDE_I2C && __has_include(<Adafruit_MAX1704X.h>)
+#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
 
 /**
  * Wrapper class for an I2C MAX17048 Lipo battery sensor.

src/PowerFSM.cpp

@@ -26,7 +26,7 @@
 #ifndef SLEEP_TIME
 #define SLEEP_TIME 30
 #endif
-#if MESHTASTIC_EXCLUDE_POWER_FSM
+#if EXCLUDE_POWER_FSM
 FakeFsm powerFSM;
 void PowerFSM_setup(){};
 #else
@@ -184,6 +184,7 @@ static void serialEnter()
     setBluetoothEnable(false);
     if (screen) {
         screen->setOn(true);
+        screen->print("Serial connected\n");
     }
 }
 
@@ -191,6 +192,8 @@ static void serialExit()
 {
     // Turn bluetooth back on when we leave serial stream API
     setBluetoothEnable(true);
+    if (screen)
+        screen->print("Serial disconnected\n");
 }
 
 static void powerEnter()
@@ -205,6 +208,12 @@ static void powerEnter()
             screen->setOn(true);
         setBluetoothEnable(true);
         // within enter() the function getState() returns the state we came from
+
+        // Mothballed: print change of power-state to device screen
+        /* if (strcmp(powerFSM.getState()->name, "BOOT") != 0 && strcmp(powerFSM.getState()->name, "POWER") != 0 &&
+            strcmp(powerFSM.getState()->name, "DARK") != 0) {
+            screen->print("Powered...\n");
+        }*/
     }
 }
 
@@ -222,6 +231,10 @@ static void powerExit()
     if (screen)
         screen->setOn(true);
     setBluetoothEnable(true);
+
+    // Mothballed: print change of power-state to device screen
+    /*if (!isPowered())
+        screen->print("Unpowered...\n");*/
 }
 
 static void onEnter()
@@ -240,6 +253,12 @@ static void onIdle()
     }
 }
 
+static void screenPress()
+{
+    if (screen)
+        screen->onPress();
+}
+
 static void bootEnter()
 {
     LOG_DEBUG("State: BOOT");
@@ -283,9 +302,9 @@ void PowerFSM_setup()
     powerFSM.add_transition(&stateLS, &stateON, EVENT_PRESS, NULL, "Press");
     powerFSM.add_transition(&stateNB, &stateON, EVENT_PRESS, NULL, "Press");
     powerFSM.add_transition(&stateDARK, isPowered() ? &statePOWER : &stateON, EVENT_PRESS, NULL, "Press");
-    powerFSM.add_transition(&statePOWER, &statePOWER, EVENT_PRESS, NULL, "Press");
-    powerFSM.add_transition(&stateON, &stateON, EVENT_PRESS, NULL, "Press"); // reenter On to restart our timers
-    powerFSM.add_transition(&stateSERIAL, &stateSERIAL, EVENT_PRESS, NULL,
+    powerFSM.add_transition(&statePOWER, &statePOWER, EVENT_PRESS, screenPress, "Press");
+    powerFSM.add_transition(&stateON, &stateON, EVENT_PRESS, screenPress, "Press"); // reenter On to restart our timers
+    powerFSM.add_transition(&stateSERIAL, &stateSERIAL, EVENT_PRESS, screenPress,
                             "Press"); // Allow button to work while in serial API
 
     // Handle critically low power battery by forcing deep sleep
@@ -319,10 +338,10 @@ void PowerFSM_setup()
         // if any packet destined for phone arrives, turn on bluetooth at least
         powerFSM.add_transition(&stateNB, &stateDARK, EVENT_PACKET_FOR_PHONE, NULL, "Packet for phone");
 
-        // Removed 2.7: we don't show the nodes individually for every node on the screen anymore
-        // powerFSM.add_transition(&stateNB, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
-        // powerFSM.add_transition(&stateDARK, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
-        // powerFSM.add_transition(&stateON, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+        // show the latest node when we get a new node db update
+        powerFSM.add_transition(&stateNB, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+        powerFSM.add_transition(&stateDARK, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+        powerFSM.add_transition(&stateON, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
 
         // Show the received text message
         powerFSM.add_transition(&stateLS, &stateON, EVENT_RECEIVED_MSG, NULL, "Received text");

src/PowerFSM.h

@@ -11,7 +11,7 @@
 #define EVENT_RECEIVED_MSG 5
 // #define EVENT_BOOT 6 // now done with a timed transition
 #define EVENT_BLUETOOTH_PAIR 7
-// #define EVENT_NODEDB_UPDATED 8     // Now defunct: NodeDB has a big enough change that we think you should turn on the screen
+#define EVENT_NODEDB_UPDATED 8     // NodeDB has a big enough change that we think you should turn on the screen
 #define EVENT_CONTACT_FROM_PHONE 9 // the phone just talked to us over bluetooth
 #define EVENT_LOW_BATTERY 10       // Battery is critically low, go to sleep
 #define EVENT_SERIAL_CONNECTED 11
@@ -22,7 +22,7 @@
 #define EVENT_SHUTDOWN 16        // force a full shutdown now (not just sleep)
 #define EVENT_INPUT 17           // input broker wants something, we need to wake up and enable screen
 
-#if MESHTASTIC_EXCLUDE_POWER_FSM
+#if EXCLUDE_POWER_FSM
 class FakeFsm
 {
   public:

src/PowerFSMThread.h

@@ -18,7 +18,7 @@ class PowerFSMThread : public OSThread
   protected:
     int32_t runOnce() override
     {
-#if !MESHTASTIC_EXCLUDE_POWER_FSM
+#if !EXCLUDE_POWER_FSM
         powerFSM.run_machine();
 
         /// If we are in power state we force the CPU to wake every 10ms to check for serial characters (we don't yet wake

src/RedirectablePrint.cpp

@@ -352,8 +352,8 @@ void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16
     for (uint16_t i = 0; i < len; i += 16) {
         if (i % 128 == 0)
             log(logLevel, "    +------------------------------------------------+ +----------------+");
-        char s[] = "     |                                                | |                |\n";
-        uint8_t ix = 5, iy = 56;
+        char s[] = "|                                                | |                |\n";
+        uint8_t ix = 1, iy = 52;
         for (uint8_t j = 0; j < 16; j++) {
             if (i + j < len) {
                 uint8_t c = buf[i + j];
@@ -367,8 +367,10 @@ void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16
             }
         }
         uint8_t index = i / 16;
-        sprintf(s, "%03x", index);
-        s[3] = '.';
+        if (i < 256)
+            log(logLevel, " ");
+        log(logLevel, "%02x", index);
+        log(logLevel, ".");
         log(logLevel, s);
     }
     log(logLevel, "    +------------------------------------------------+ +----------------+");
@@ -391,4 +393,4 @@ std::string RedirectablePrint::mt_sprintf(const std::string fmt_str, ...)
             break;
     }
     return std::string(formatted.get());
-}
+}

src/buzz/BuzzerFeedbackThread.cpp

@@ -1,79 +0,0 @@
-#include "BuzzerFeedbackThread.h"
-#include "NodeDB.h"
-#include "buzz.h"
-#include "configuration.h"
-
-BuzzerFeedbackThread *buzzerFeedbackThread;
-
-BuzzerFeedbackThread::BuzzerFeedbackThread() : OSThread("BuzzerFeedback")
-{
-    if (inputBroker)
-        inputObserver.observe(inputBroker);
-}
-
-int BuzzerFeedbackThread::handleInputEvent(const InputEvent *event)
-{
-    // Only provide feedback if buzzer is enabled for notifications
-    if (config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_DISABLED ||
-        config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_NOTIFICATIONS_ONLY) {
-        return 0; // Let other handlers process the event
-    }
-
-    // Track last event time for potential future use
-    lastEventTime = millis();
-    needsUpdate = true;
-
-    // Handle different input events with appropriate buzzer feedback
-    switch (event->inputEvent) {
-    case INPUT_BROKER_USER_PRESS:
-    case INPUT_BROKER_ALT_PRESS:
-    case INPUT_BROKER_SELECT:
-        playBeep(); // Confirmation feedback
-        break;
-
-    case INPUT_BROKER_UP:
-    case INPUT_BROKER_DOWN:
-    case INPUT_BROKER_LEFT:
-    case INPUT_BROKER_RIGHT:
-        playChirp(); // Navigation feedback
-        break;
-
-    case INPUT_BROKER_CANCEL:
-    case INPUT_BROKER_BACK:
-        playBoop(); // Cancel/back feedback
-        break;
-
-    case INPUT_BROKER_SEND_PING:
-        playComboTune(); // Ping sent feedback
-        break;
-
-    case INPUT_BROKER_SHUTDOWN:
-        playShutdownMelody(); // Shutdown feedback
-        break;
-
-    default:
-        // For other events, check if it's a printable character
-        if (event->kbchar >= 32 && event->kbchar <= 126) {
-            // Typing feedback - very short boop
-            // Removing this for now, too chatty
-            // playChirp();
-        }
-        break;
-    }
-
-    return 0; // Allow other handlers to process the event
-}
-
-int32_t BuzzerFeedbackThread::runOnce()
-{
-    // This thread is primarily event-driven, but we can use runOnce
-    // for any periodic tasks if needed in the future
-
-    if (needsUpdate) {
-        needsUpdate = false;
-        // Could add any periodic processing here
-    }
-
-    // Run every 100ms when active, less frequently when idle
-    return needsUpdate ? 100 : 1000;
-}

src/buzz/BuzzerFeedbackThread.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include "Observer.h"
-#include "concurrency/OSThread.h"
-#include "input/InputBroker.h"
-
-class BuzzerFeedbackThread : public concurrency::OSThread
-{
-    CallbackObserver<BuzzerFeedbackThread, const InputEvent *> inputObserver =
-        CallbackObserver<BuzzerFeedbackThread, const InputEvent *>(this, &BuzzerFeedbackThread::handleInputEvent);
-
-  public:
-    BuzzerFeedbackThread();
-    int handleInputEvent(const InputEvent *event);
-
-  protected:
-    virtual int32_t runOnce() override;
-
-  private:
-    uint32_t lastEventTime = 0;
-    bool needsUpdate = false;
-};
-
-extern BuzzerFeedbackThread *buzzerFeedbackThread;

src/buzz/buzz.cpp

@@ -38,11 +38,6 @@ const int DURATION_1_1 = 1000; // 1/1 note
 
 void playTones(const ToneDuration *tone_durations, int size)
 {
-    if (config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_DISABLED ||
-        config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_NOTIFICATIONS_ONLY) {
-        // Buzzer is disabled or not set to system tones
-        return;
-    }
 #ifdef PIN_BUZZER
     if (!config.device.buzzer_gpio)
         config.device.buzzer_gpio = PIN_BUZZER;
@@ -59,7 +54,7 @@ void playTones(const ToneDuration *tone_durations, int size)
 
 void playBeep()
 {
-    ToneDuration melody[] = {{NOTE_B3, DURATION_1_8}};
+    ToneDuration melody[] = {{NOTE_B3, DURATION_1_4}};
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
@@ -92,72 +87,3 @@ void playShutdownMelody()
     ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8}, {NOTE_AS3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}};
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
-
-void playChirp()
-{
-    // A short, friendly "chirp" sound for key presses
-    ToneDuration melody[] = {{NOTE_AS3, 20}}; // Very short AS3 note
-    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
-}
-
-void playBoop()
-{
-    // A short, friendly "boop" sound for button presses
-    ToneDuration melody[] = {{NOTE_A3, 50}}; // Very short A3 note
-    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
-}
-
-void playLongPressLeadUp()
-{
-    // An ascending lead-up sequence for long press - builds anticipation
-    ToneDuration melody[] = {
-        {NOTE_C3, 100}, // Start low
-        {NOTE_E3, 100}, // Step up
-        {NOTE_G3, 100}, // Keep climbing
-        {NOTE_B3, 150}  // Peak with longer note for emphasis
-    };
-    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
-}
-
-// Static state for progressive lead-up notes
-static int leadUpNoteIndex = 0;
-static const ToneDuration leadUpNotes[] = {
-    {NOTE_C3, 100}, // Start low
-    {NOTE_E3, 100}, // Step up
-    {NOTE_G3, 100}, // Keep climbing
-    {NOTE_B3, 150}  // Peak with longer note for emphasis
-};
-static const int leadUpNotesCount = sizeof(leadUpNotes) / sizeof(ToneDuration);
-
-bool playNextLeadUpNote()
-{
-    if (leadUpNoteIndex >= leadUpNotesCount) {
-        return false; // All notes have been played
-    }
-
-    // Use playTones to handle buzzer logic consistently
-    const auto &note = leadUpNotes[leadUpNoteIndex];
-    playTones(&note, 1); // Play single note using existing playTones function
-
-    leadUpNoteIndex++;
-    return true; // Note was played (playTones handles buzzer availability internally)
-}
-
-void resetLeadUpSequence()
-{
-    leadUpNoteIndex = 0;
-}
-
-void playComboTune()
-{
-    // Quick high-pitched notes with trills
-    ToneDuration melody[] = {
-        {NOTE_G3, 80},  // Quick chirp
-        {NOTE_B3, 60},  // Higher chirp
-        {NOTE_CS4, 80}, // Even higher
-        {NOTE_G3, 60},  // Quick trill down
-        {NOTE_CS4, 60}, // Quick trill up
-        {NOTE_B3, 120}  // Ending chirp
-    };
-    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
-}

src/buzz/buzz.h

@@ -5,10 +5,4 @@ void playLongBeep();
 void playStartMelody();
 void playShutdownMelody();
 void playGPSEnableBeep();
-void playGPSDisableBeep();
-void playComboTune();
-void playBoop();
-void playChirp();
-void playLongPressLeadUp();
-bool playNextLeadUpNote();  // Play the next note in the lead-up sequence
-void resetLeadUpSequence(); // Reset the lead-up sequence to start from beginning
+void playGPSDisableBeep();

src/commands.h

@@ -12,7 +12,7 @@ enum class Cmd {
     STOP_ALERT_FRAME,
     START_FIRMWARE_UPDATE_SCREEN,
     STOP_BOOT_SCREEN,
+    PRINT,
     SHOW_PREV_FRAME,
-    SHOW_NEXT_FRAME,
-    NOOP
+    SHOW_NEXT_FRAME
 };

src/concurrency/Lock.cpp

@@ -9,23 +9,17 @@ namespace concurrency
 Lock::Lock() : handle(xSemaphoreCreateBinary())
 {
     assert(handle);
-    if (xSemaphoreGive(handle) == false) {
-        abort();
-    }
+    assert(xSemaphoreGive(handle));
 }
 
 void Lock::lock()
 {
-    if (xSemaphoreTake(handle, portMAX_DELAY) == false) {
-        abort();
-    }
+    assert(xSemaphoreTake(handle, portMAX_DELAY));
 }
 
 void Lock::unlock()
 {
-    if (xSemaphoreGive(handle) == false) {
-        abort();
-    }
+    assert(xSemaphoreGive(handle));
 }
 #else
 Lock::Lock() {}

src/configuration.h

@@ -81,43 +81,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define REGULATORY_LORA_REGIONCODE meshtastic_Config_LoRaConfig_RegionCode_SG_923
 
 // Total system gain in dBm to subtract from Tx power to remain within regulatory and Tx PA limits
-// The value consists of PA gain + antenna gain (if variant has a non-removable antenna)
-// TX_GAIN_LORA should be set with definitions below for common modules, or in variant.h.
-
-// Gain for common modules with transmit PAs
-#ifdef EBYTE_E22_900M30S
-// 10dB PA gain and 30dB rated output; based on measurements from
-// https://github.com/S5NC/EBYTE_ESP32-S3/blob/main/E22-900M30S%20power%20output%20testing.txt
-#define TX_GAIN_LORA 7
-#define SX126X_MAX_POWER 22
-#endif
-
-#ifdef EBYTE_E22_900M33S
-// 25dB PA gain and 33dB rated output; based on TX Power Curve from E22-900M33S_UserManual_EN_v1.0.pdf
-#define TX_GAIN_LORA 25
-#define SX126X_MAX_POWER 8
-#endif
-
-#ifdef NICERF_MINIF27
-// Note that datasheet power level of 9 corresponds with SX1262 at 22dBm
-// Maximum output power of 29dBm with VCC_PA = 5V
-#define TX_GAIN_LORA 7
-#define SX126X_MAX_POWER 22
-#endif
-
-#ifdef NICERF_F30_HF
-// Maximum output power of 29.6dBm with VCC = 5V and SX1262 at 22dBm
-#define TX_GAIN_LORA 8
-#define SX126X_MAX_POWER 22
-#endif
-
-#ifdef NICERF_F30_LF
-// Maximum output power of 32.0dBm with VCC = 5V and SX1262 at 22dBm
-#define TX_GAIN_LORA 10
-#define SX126X_MAX_POWER 22
-#endif
-
-// Default system gain to 0 if not defined
+// This value should be set in variant.h and is PA gain + antenna gain (if variant has a non-removable antenna)
 #ifndef TX_GAIN_LORA
 #define TX_GAIN_LORA 0
 #endif
@@ -189,7 +153,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DFROBOT_RAIN_ADDR 0x1d
 #define NAU7802_ADDR 0x2A
 #define MAX30102_ADDR 0x57
-#define SCD4X_ADDR 0x62
 #define MLX90614_ADDR_DEF 0x5A
 #define CGRADSENS_ADDR 0x66
 #define LTR390UV_ADDR 0x53
@@ -208,7 +171,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BMX160_ADDR 0x69
 #define ICM20948_ADDR 0x69
 #define ICM20948_ADDR_ALT 0x68
-#define BMM150_ADDR 0x13
 
 // -----------------------------------------------------------------------------
 // LED
@@ -231,15 +193,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 #define FT6336U_ADDR 0x48
 
-// -----------------------------------------------------------------------------
-// RAK12035VB Soil Monitor (using RAK12023 up to 3 RAK12035 monitors can be connected)
-// - the default i2c address for this sensor is 0x20, and users are instructed to
-// set 0x21 and 0x22 for the second and third sensor if present.
-// -----------------------------------------------------------------------------
-#define RAK120351_ADDR 0x20
-#define RAK120352_ADDR 0x21
-#define RAK120353_ADDR 0x22
-
 // -----------------------------------------------------------------------------
 // BIAS-T Generator
 // -----------------------------------------------------------------------------
@@ -349,41 +302,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #error HW_VENDOR must be defined
 #endif
 
-#ifndef TB_DOWN
-#define TB_DOWN 255
-#endif
-#ifndef TB_UP
-#define TB_UP 255
-#endif
-#ifndef TB_LEFT
-#define TB_LEFT 255
-#endif
-#ifndef TB_RIGHT
-#define TB_RIGHT 255
-#endif
-#ifndef TB_PRESS
-#define TB_PRESS 255
-#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
 
-// default mapping of pins
-#if defined(PIN_BUTTON2) && !defined(CANCEL_BUTTON_PIN)
-#define ALT_BUTTON_PIN PIN_BUTTON2
-#endif
-#if defined ALT_BUTTON_PIN
-
-#ifndef ALT_BUTTON_ACTIVE_LOW
-#define ALT_BUTTON_ACTIVE_LOW true
-#endif
-#ifndef ALT_BUTTON_ACTIVE_PULLUP
-#define ALT_BUTTON_ACTIVE_PULLUP true
-#endif
-#endif
-
 // -----------------------------------------------------------------------------
 // Global switches to turn off features for a minimized build
 // -----------------------------------------------------------------------------

src/detect/ScanI2C.cpp

@@ -37,14 +37,8 @@ ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
 
 ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
 {
-    ScanI2C::DeviceType types[] = {MPU6050, LIS3DH, BMA423, LSM6DS3, BMX160, STK8BAXX, ICM20948, QMA6100P, BMM150};
-    return firstOfOrNONE(9, types);
-}
-
-ScanI2C::FoundDevice ScanI2C::firstAQI() const
-{
-    ScanI2C::DeviceType types[] = {PMSA0031, SCD4X};
-    return firstOfOrNONE(2, types);
+    ScanI2C::DeviceType types[] = {MPU6050, LIS3DH, BMA423, LSM6DS3, BMX160, STK8BAXX, ICM20948, QMA6100P};
+    return firstOfOrNONE(8, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::firstRGBLED() const
@@ -86,4 +80,4 @@ bool ScanI2C::DeviceAddress::operator<(const ScanI2C::DeviceAddress &other) cons
         || (port != NO_I2C && other.port != NO_I2C && (address < other.address));
 }
 
-ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}
+ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}

src/detect/ScanI2C.h

@@ -61,7 +61,6 @@ class ScanI2C
         FT6336U,
         STK8BAXX,
         ICM20948,
-        SCD4X,
         MAX30102,
         TPS65233,
         MPR121KB,
@@ -71,10 +70,8 @@ class ScanI2C
         DFROBOT_RAIN,
         DPS310,
         LTR390UV,
-        RAK12035,
         TCA8418KB,
         PCT2075,
-        BMM150,
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;
@@ -127,8 +124,6 @@ class ScanI2C
 
     FoundDevice firstAccelerometer() const;
 
-    FoundDevice firstAQI() const;
-
     FoundDevice firstRGBLED() const;
 
     virtual FoundDevice find(DeviceType) const;

src/detect/ScanI2CTwoWire.cpp

@@ -358,7 +358,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
             case SHT31_4x_ADDR:     // same as OPT3001_ADDR_ALT
             case SHT31_4x_ADDR_ALT: // same as OPT3001_ADDR
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 2);
-                if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0xe9c || registerValue == 0xc8d) {
+                if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0xe9c) {
                     type = SHT4X;
                     logFoundDevice("SHT4X", (uint8_t)addr.address);
                 } else if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2) == 0x5449) {
@@ -423,21 +423,9 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                     logFoundDevice("BMA423", (uint8_t)addr.address);
                 }
                 break;
-            case TCA9535_ADDR:
-            case RAK120352_ADDR:
-            case RAK120353_ADDR:
-                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x02), 1);
-                if (registerValue == addr.address) { // RAK12035 returns its I2C address at 0x02 (eg 0x20)
-                    type = RAK12035;
-                    logFoundDevice("RAK12035", (uint8_t)addr.address);
-                } else {
-                    type = TCA9535;
-                    logFoundDevice("TCA9535", (uint8_t)addr.address);
-                }
-
-                break;
 
                 SCAN_SIMPLE_CASE(LSM6DS3_ADDR, LSM6DS3, "LSM6DS3", (uint8_t)addr.address);
+                SCAN_SIMPLE_CASE(TCA9535_ADDR, TCA9535, "TCA9535", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(TCA9555_ADDR, TCA9555, "TCA9555", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(VEML7700_ADDR, VEML7700, "VEML7700", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(TSL25911_ADDR, TSL2591, "TSL2591", (uint8_t)addr.address);
@@ -447,8 +435,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 SCAN_SIMPLE_CASE(DFROBOT_RAIN_ADDR, DFROBOT_RAIN, "DFRobot Rain Gauge", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(LTR390UV_ADDR, LTR390UV, "LTR390UV", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(PCT2075_ADDR, PCT2075, "PCT2075", (uint8_t)addr.address);
-                SCAN_SIMPLE_CASE(SCD4X_ADDR, SCD4X, "SCD4X", (uint8_t)addr.address);
-                SCAN_SIMPLE_CASE(BMM150_ADDR, BMM150, "BMM150", (uint8_t)addr.address);
 #ifdef HAS_TPS65233
                 SCAN_SIMPLE_CASE(TPS65233_ADDR, TPS65233, "TPS65233", (uint8_t)addr.address);
 #endif
@@ -557,4 +543,4 @@ void ScanI2CTwoWire::logFoundDevice(const char *device, uint8_t address)
 {
     LOG_INFO("%s found at address 0x%x", device, address);
 }
-#endif
+#endif

src/gps/GPS.cpp

@@ -1536,10 +1536,7 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
         if (t.tm_mon > -1) {
             LOG_DEBUG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d age %d", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min,
                       t.tm_sec, ti.age());
-            if (perhapsSetRTC(RTCQualityGPS, t) == RTCSetResultInvalidTime) {
-                // Clear the GPS buffer if we got an invalid time
-                clearBuffer();
-            }
+            perhapsSetRTC(RTCQualityGPS, t);
             return true;
         } else
             return false;

src/gps/RTC.cpp

@@ -105,7 +105,7 @@ void readFromRTC()
  *
  * If we haven't yet set our RTC this boot, set it from a GPS derived time
  */
-RTCSetResult perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate)
+bool perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate)
 {
     static uint32_t lastSetMsec = 0;
     uint32_t now = millis();
@@ -113,7 +113,7 @@ RTCSetResult perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpd
 #ifdef BUILD_EPOCH
     if (tv->tv_sec < BUILD_EPOCH) {
         LOG_WARN("Ignore time (%ld) before build epoch (%ld)!", printableEpoch, BUILD_EPOCH);
-        return RTCSetResultInvalidTime;
+        return false;
     }
 #endif
 
@@ -184,9 +184,9 @@ RTCSetResult perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpd
         readFromRTC();
 #endif
 
-        return RTCSetResultSuccess;
+        return true;
     } else {
-        return RTCSetResultNotSet; // RTC was already set with a higher quality time
+        return false;
     }
 }
 
@@ -215,7 +215,7 @@ const char *RtcName(RTCQuality quality)
  * @param t The time to potentially set the RTC to.
  * @return True if the RTC was set to the provided time, false otherwise.
  */
-RTCSetResult perhapsSetRTC(RTCQuality q, struct tm &t)
+bool perhapsSetRTC(RTCQuality q, struct tm &t)
 {
     /* Convert to unix time
     The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of seconds that have elapsed since January 1, 1970
@@ -231,7 +231,7 @@ RTCSetResult perhapsSetRTC(RTCQuality q, struct tm &t)
     // LOG_DEBUG("Got time from GPS month=%d, year=%d, unixtime=%ld", t.tm_mon, t.tm_year, tv.tv_sec);
     if (t.tm_year < 0 || t.tm_year >= 300) {
         // LOG_DEBUG("Ignore invalid GPS month=%d, year=%d, unixtime=%ld", t.tm_mon, t.tm_year, tv.tv_sec);
-        return RTCSetResultInvalidTime;
+        return false;
     } else {
         return perhapsSetRTC(q, &tv);
     }
@@ -244,15 +244,11 @@ RTCSetResult perhapsSetRTC(RTCQuality q, struct tm &t)
  */
 int32_t getTZOffset()
 {
-#if MESHTASTIC_EXCLUDE_TZ
-    return 0;
-#else
     time_t now = getTime(false);
     struct tm *gmt;
     gmt = gmtime(&now);
     gmt->tm_isdst = -1;
     return (int32_t)difftime(now, mktime(gmt));
-#endif
 }
 
 /**

src/gps/RTC.h

@@ -22,22 +22,13 @@ enum RTCQuality {
     RTCQualityGPS = 4
 };
 
-/// The RTC set result codes
-/// Used to indicate the result of an attempt to set the RTC.
-enum RTCSetResult {
-    RTCSetResultNotSet = 0,      ///< RTC was set successfully
-    RTCSetResultSuccess = 1,     ///< RTC was set successfully
-    RTCSetResultInvalidTime = 3, ///< The provided time was invalid (e.g., before the build epoch)
-    RTCSetResultError = 4        ///< An error occurred while setting the RTC
-};
-
 RTCQuality getRTCQuality();
 
 extern uint32_t lastSetFromPhoneNtpOrGps;
 
 /// If we haven't yet set our RTC this boot, set it from a GPS derived time
-RTCSetResult perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate = false);
-RTCSetResult perhapsSetRTC(RTCQuality q, struct tm &t);
+bool perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate = false);
+bool perhapsSetRTC(RTCQuality q, struct tm &t);
 
 /// Return a string name for the quality
 const char *RtcName(RTCQuality quality);

src/graphics/EInkDisplay2.cpp

@@ -6,10 +6,6 @@
 #include "main.h"
 #include <SPI.h>
 
-#ifdef GXEPD2_DRIVER_0
-#include "einkDetect.h"
-#endif
-
 /*
     The macros EINK_DISPLAY_MODEL, EINK_WIDTH, and EINK_HEIGHT are defined as build_flags in a variant's platformio.ini
     Previously, these macros were defined at the top of this file.
@@ -178,8 +174,9 @@ bool EInkDisplay::connect()
         }
     }
 
-#elif defined(HELTEC_WIRELESS_PAPER_V1_0) || defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER) ||                 \
-    defined(CROWPANEL_ESP32S3_5_EPAPER) || defined(CROWPANEL_ESP32S3_4_EPAPER) || defined(CROWPANEL_ESP32S3_2_EPAPER)
+#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(CROWPANEL_ESP32S3_4_EPAPER) || defined(CROWPANEL_ESP32S3_2_EPAPER)
     {
         // Start HSPI
         hspi = new SPIClass(HSPI);
@@ -235,23 +232,6 @@ bool EInkDisplay::connect()
         adafruitDisplay->init();
         adafruitDisplay->setRotation(3);
     }
-#elif defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_VISION_MASTER_E213)
-
-    // Detect display model, before starting SPI
-    EInkDetectionResult displayModel = detectEInk();
-
-    // Start HSPI
-    hspi = new SPIClass(HSPI);
-    hspi->begin(PIN_EINK_SCLK, -1, PIN_EINK_MOSI, PIN_EINK_CS); // SCLK, MISO, MOSI, SS
-
-    // Create GxEPD2 object
-    adafruitDisplay = new GxEPD2_Multi<GXEPD2_DRIVER_0, GXEPD2_DRIVER_1>((uint8_t)displayModel, PIN_EINK_CS, PIN_EINK_DC,
-                                                                         PIN_EINK_RES, PIN_EINK_BUSY, *hspi);
-
-    // Init GxEPD2
-    adafruitDisplay->init();
-    adafruitDisplay->setRotation(3);
-
 #endif
 
     return true;

src/graphics/EInkDisplay2.h

@@ -5,10 +5,6 @@
 #include "GxEPD2_BW.h"
 #include <OLEDDisplay.h>
 
-#ifdef GXEPD2_DRIVER_0 // If variant has multiple possible display models
-#include "GxEPD2Multi.h"
-#endif
-
 /**
  * An adapter class that allows using the GxEPD2 library as if it was an OLEDDisplay implementation.
  *
@@ -67,15 +63,8 @@ class EInkDisplay : public OLEDDisplay
     // Connect to the display
     virtual bool connect() override;
 
-#ifdef GXEPD2_DRIVER_0
-    // AdafruitGFX display object - wrapper for multiple drivers
-    // Allows runtime detection of multiple displays
-    // Avoid this situation if possible!
-    GxEPD2_Multi<GXEPD2_DRIVER_0, GXEPD2_DRIVER_1> *adafruitDisplay = NULL;
-#else
-    // AdafruitGFX display object (for single display model) - instantiated in connect(), variant specific
+    // AdafruitGFX display object - instantiated in connect(), variant specific
     GxEPD2_BW<EINK_DISPLAY_MODEL, EINK_DISPLAY_MODEL::HEIGHT> *adafruitDisplay = NULL;
-#endif
 
     // If display uses HSPI
 #if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0) || defined(HELTEC_VISION_MASTER_E213) ||               \

src/graphics/GxEPD2Multi.h

@@ -1,135 +0,0 @@
-// Wrapper class for GxEPD2_BW
-
-// Generic signature at build-time, so that we can detect display model at run-time
-// Workaround for issue of GxEPD2_BW objects not having a shared base class
-// Only exposes methods which we are actually using
-
-template <typename Driver0, typename Driver1> class GxEPD2_Multi
-{
-  public:
-    void drawPixel(int16_t x, int16_t y, uint16_t color)
-    {
-        if (which == 0)
-            driver0->drawPixel(x, y, color);
-        else
-            driver1->drawPixel(x, y, color);
-    }
-
-    bool nextPage()
-    {
-        if (which == 0)
-            return driver0->nextPage();
-        else
-            return driver1->nextPage();
-    }
-
-    void hibernate()
-    {
-        if (which == 0)
-            driver0->hibernate();
-        else
-            driver1->hibernate();
-    }
-
-    void init(uint32_t serial_diag_bitrate = 0)
-    {
-        if (which == 0)
-            driver0->init(serial_diag_bitrate);
-        else
-            driver1->init(serial_diag_bitrate);
-    }
-
-    void init(uint32_t serial_diag_bitrate, bool initial, uint16_t reset_duration = 20, bool pulldown_rst_mode = false)
-    {
-        if (which == 0)
-            driver0->init(serial_diag_bitrate, initial, reset_duration, pulldown_rst_mode);
-        else
-            driver1->init(serial_diag_bitrate, initial, reset_duration, pulldown_rst_mode);
-    }
-
-    void setRotation(uint8_t x)
-    {
-        if (which == 0)
-            driver0->setRotation(x);
-        else
-            driver1->setRotation(x);
-    }
-
-    void setPartialWindow(uint16_t x, uint16_t y, uint16_t w, uint16_t h)
-    {
-        if (which == 0)
-            driver0->setPartialWindow(x, y, w, h);
-        else
-            driver1->setPartialWindow(x, y, w, h);
-    }
-
-    void setFullWindow()
-    {
-        if (which == 0)
-            driver0->setFullWindow();
-        else
-            driver1->setFullWindow();
-    }
-
-    int16_t width()
-    {
-        if (which == 0)
-            return driver0->width();
-        else
-            return driver1->width();
-    }
-
-    int16_t height()
-    {
-        if (which == 0)
-            return driver0->height();
-        else
-            return driver1->height();
-    }
-
-    void clearScreen(uint8_t value = 0xFF)
-    {
-        if (which == 0)
-            driver0->clearScreen();
-        else
-            driver1->clearScreen();
-    }
-
-    void endAsyncFull()
-    {
-        if (which == 0)
-            driver0->endAsyncFull();
-        else
-            driver1->endAsyncFull();
-    }
-
-    // Exposes methods of the GxEPD2_EPD object which is usually available as GxEPD2_BW::epd
-    class Epd2Wrapper
-    {
-      public:
-        bool isBusy() { return m_epd2->isBusy(); }
-        GxEPD2_EPD *m_epd2;
-    } epd2;
-
-    // Constructor
-    // Select driver by passing whichDriver as 0 or 1
-    GxEPD2_Multi(uint8_t whichDriver, int16_t cs, int16_t dc, int16_t rst, int16_t busy, SPIClass &spi)
-    {
-        assert(whichDriver == 0 || whichDriver == 1);
-        which = whichDriver;
-        LOG_DEBUG("GxEPD2_Multi driver: %d", which);
-
-        if (which == 0) {
-            driver0 = new GxEPD2_BW<Driver0, Driver0::HEIGHT>(Driver0(cs, dc, rst, busy, spi));
-            epd2.m_epd2 = &(driver0->epd2);
-        } else if (which == 1) {
-            driver1 = new GxEPD2_BW<Driver1, Driver1::HEIGHT>(Driver1(cs, dc, rst, busy, spi));
-            epd2.m_epd2 = &(driver1->epd2);
-        }
-    }
-
-  private:
-    uint8_t which;
-    GxEPD2_BW<Driver0, Driver0::HEIGHT> *driver0;
-    GxEPD2_BW<Driver1, Driver1::HEIGHT> *driver1;
-};

src/graphics/Screen.h

@@ -5,26 +5,10 @@
 #include "detect/ScanI2C.h"
 #include "mesh/generated/meshtastic/config.pb.h"
 #include <OLEDDisplay.h>
-#include <functional>
 #include <string>
 #include <vector>
 
 #define getStringCenteredX(s) ((SCREEN_WIDTH - display->getStringWidth(s)) / 2)
-namespace graphics
-{
-enum notificationTypeEnum { none, text_banner, selection_picker, node_picker, number_picker };
-
-struct BannerOverlayOptions {
-    const char *message;
-    uint32_t durationMs = 30000;
-    const char **optionsArrayPtr = nullptr;
-    const int *optionsEnumPtr = nullptr;
-    uint8_t optionsCount = 0;
-    std::function<void(int)> bannerCallback = nullptr;
-    int8_t InitialSelected = 0;
-    notificationTypeEnum notificationType = notificationTypeEnum::text_banner;
-};
-} // namespace graphics
 
 #if !HAS_SCREEN
 #include "power.h"
@@ -34,20 +18,11 @@ namespace graphics
 class Screen
 {
   public:
-    enum FrameFocus : uint8_t {
-        FOCUS_DEFAULT,  // No specific frame
-        FOCUS_PRESERVE, // Return to the previous frame
-        FOCUS_FAULT,
-        FOCUS_TEXTMESSAGE,
-        FOCUS_MODULE, // Note: target module should call requestFocus(), otherwise no info about which module to focus
-        FOCUS_CLOCK,
-        FOCUS_SYSTEM,
-    };
-
     explicit Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY);
     void onPress() {}
     void setup() {}
     void setOn(bool) {}
+    void print(const char *) {}
     void doDeepSleep() {}
     void forceDisplay(bool forceUiUpdate = false) {}
     void startFirmwareUpdateScreen() {}
@@ -56,9 +31,6 @@ class Screen
     void setFunctionSymbol(std::string) {}
     void removeFunctionSymbol(std::string) {}
     void startAlert(const char *) {}
-    void showSimpleBanner(const char *message, uint32_t durationMs = 0) {}
-    void showOverlayBanner(BannerOverlayOptions) {}
-    void setFrames(FrameFocus focus) {}
     void endAlert() {}
 };
 } // namespace graphics
@@ -92,10 +64,8 @@ class Screen
 #include "commands.h"
 #include "concurrency/LockGuard.h"
 #include "concurrency/OSThread.h"
-#include "graphics/draw/MenuHandler.h"
 #include "input/InputBroker.h"
 #include "mesh/MeshModule.h"
-#include "modules/AdminModule.h"
 #include "power.h"
 #include <string>
 #include <vector>
@@ -211,11 +181,10 @@ class Screen : public concurrency::OSThread
         CallbackObserver<Screen, const UIFrameEvent *>(this, &Screen::handleUIFrameEvent); // Sent by Mesh Modules
     CallbackObserver<Screen, const InputEvent *> inputObserver =
         CallbackObserver<Screen, const InputEvent *>(this, &Screen::handleInputEvent);
-    CallbackObserver<Screen, AdminModule_ObserverData *> adminMessageObserver =
-        CallbackObserver<Screen, AdminModule_ObserverData *>(this, &Screen::handleAdminMessage);
+    CallbackObserver<Screen, const meshtastic_AdminMessage *> adminMessageObserver =
+        CallbackObserver<Screen, const meshtastic_AdminMessage *>(this, &Screen::handleAdminMessage);
 
   public:
-    OLEDDisplay *getDisplayDevice() { return dispdev; }
     explicit Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY);
     size_t frameCount = 0; // Total number of active frames
     ~Screen();
@@ -227,8 +196,6 @@ class Screen : public concurrency::OSThread
         FOCUS_FAULT,
         FOCUS_TEXTMESSAGE,
         FOCUS_MODULE, // Note: target module should call requestFocus(), otherwise no info about which module to focus
-        FOCUS_CLOCK,
-        FOCUS_SYSTEM,
     };
 
     // Regenerate the normal set of frames, focusing a specific frame if requested
@@ -243,12 +210,6 @@ class Screen : public concurrency::OSThread
     meshtastic_Config_DisplayConfig_OledType model;
     OLEDDISPLAY_GEOMETRY geometry;
 
-    bool isOverlayBannerShowing();
-
-    // Stores the last 4 of our hardware ID, to make finding the device for pairing easier
-    // FIXME: Needs refactoring and getMacAddr needs to be moved to a utility class
-    char ourId[5];
-
     /// Initializes the UI, turns on the display, starts showing boot screen.
     //
     // Not thread safe - must be called before any other methods are called.
@@ -272,6 +233,8 @@ class Screen : public concurrency::OSThread
 
     void blink();
 
+    void getTimeAgoStr(uint32_t agoSecs, char *timeStr, uint8_t maxLength);
+
     // Draw north
     float estimatedHeading(double lat, double lon);
 
@@ -306,17 +269,7 @@ class Screen : public concurrency::OSThread
         enqueueCmd(cmd);
     }
 
-    void showSimpleBanner(const char *message, uint32_t durationMs = 0);
-    void showOverlayBanner(BannerOverlayOptions);
-
-    void showNodePicker(const char *message, uint32_t durationMs, std::function<void(uint32_t)> bannerCallback);
-    void showNumberPicker(const char *message, uint32_t durationMs, uint8_t digits, std::function<void(uint32_t)> bannerCallback);
-
-    void requestMenu(graphics::menuHandler::screenMenus menuToShow)
-    {
-        graphics::menuHandler::menuQueue = menuToShow;
-        runNow();
-    }
+    void showOverlayBanner(const char *message, uint32_t durationMs = 3000);
 
     void startFirmwareUpdateScreen()
     {
@@ -330,7 +283,7 @@ class Screen : public concurrency::OSThread
     void setHeading(long _heading)
     {
         hasCompass = true;
-        compassHeading = fmod(_heading, 360);
+        compassHeading = _heading;
     }
 
     bool hasHeading() { return hasCompass; }
@@ -350,10 +303,18 @@ class Screen : public concurrency::OSThread
     /// Stops showing the boot screen.
     void stopBootScreen() { enqueueCmd(ScreenCmd{.cmd = Cmd::STOP_BOOT_SCREEN}); }
 
-    void runNow()
+    /// Writes a string to the screen.
+    void print(const char *text)
     {
-        setFastFramerate();
-        enqueueCmd(ScreenCmd{.cmd = Cmd::NOOP});
+        ScreenCmd cmd;
+        cmd.cmd = Cmd::PRINT;
+        // TODO(girts): strdup() here is scary, but we can't use std::string as
+        // FreeRTOS queue is just dumbly copying memory contents. It would be
+        // nice if we had a queue that could copy objects by value.
+        cmd.print_text = strdup(text);
+        if (!enqueueCmd(cmd)) {
+            free(cmd.print_text);
+        }
     }
 
     /// Overrides the default utf8 character conversion, to replace empty space with question marks
@@ -580,7 +541,7 @@ class Screen : public concurrency::OSThread
     int handleTextMessage(const meshtastic_MeshPacket *arg);
     int handleUIFrameEvent(const UIFrameEvent *arg);
     int handleInputEvent(const InputEvent *arg);
-    int handleAdminMessage(AdminModule_ObserverData *arg);
+    int handleAdminMessage(const meshtastic_AdminMessage *arg);
 
     /// Used to force (super slow) eink displays to draw critical frames
     void forceDisplay(bool forceUiUpdate = false);
@@ -588,6 +549,8 @@ class Screen : public concurrency::OSThread
     /// Draws our SSL cert screen during boot (called from WebServer)
     void setSSLFrames();
 
+    void setWelcomeFrames();
+
     // Dismiss the currently focussed frame, if possible (e.g. text message, waypoint)
     void dismissCurrentFrame();
 
@@ -636,6 +599,7 @@ class Screen : public concurrency::OSThread
     void handleOnPress();
     void handleShowNextFrame();
     void handleShowPrevFrame();
+    void handlePrint(const char *text);
     void handleStartFirmwareUpdateScreen();
 
     // Info collected by setFrames method.
@@ -645,6 +609,7 @@ class Screen : public concurrency::OSThread
     struct FramesetInfo {
         struct FramePositions {
             uint8_t fault = 255;
+            uint8_t textMessage = 255;
             uint8_t waypoint = 255;
             uint8_t focusedModule = 255;
             uint8_t log = 255;
@@ -652,18 +617,6 @@ class Screen : public concurrency::OSThread
             uint8_t wifi = 255;
             uint8_t deviceFocused = 255;
             uint8_t memory = 255;
-            uint8_t gps = 255;
-            uint8_t home = 255;
-            uint8_t textMessage = 255;
-            uint8_t nodelist = 255;
-            uint8_t nodelist_lastheard = 255;
-            uint8_t nodelist_hopsignal = 255;
-            uint8_t nodelist_distance = 255;
-            uint8_t nodelist_bearings = 255;
-            uint8_t clock = 255;
-            uint8_t firstFavorite = 255;
-            uint8_t lastFavorite = 255;
-            uint8_t lora = 255;
         } positions;
 
         uint8_t frameCount = 0;
@@ -682,6 +635,27 @@ class Screen : public concurrency::OSThread
     // Sets frame up for immediate drawing
     void setFrameImmediateDraw(FrameCallback *drawFrames);
 
+#if defined(DISPLAY_CLOCK_FRAME)
+    static void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
+
+    static void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
+
+    static void drawSegmentedDisplayCharacter(OLEDDisplay *display, int x, int y, uint8_t number, float scale = 1);
+
+    static void drawHorizontalSegment(OLEDDisplay *display, int x, int y, int width, int height);
+
+    static void drawVerticalSegment(OLEDDisplay *display, int x, int y, int width, int height);
+
+    static void drawSegmentedDisplayColon(OLEDDisplay *display, int x, int y, float scale = 1);
+
+    static void drawWatchFaceToggleButton(OLEDDisplay *display, int16_t x, int16_t y, bool digitalMode = true, float scale = 1);
+
+    static void drawBluetoothConnectedIcon(OLEDDisplay *display, int16_t x, int16_t y);
+
+    // Whether we are showing the digital watch face or the analog one
+    bool digitalWatchFace = true;
+#endif
+
     /// callback for current alert frame
     FrameCallback alertFrame;
 
@@ -714,9 +688,13 @@ class Screen : public concurrency::OSThread
 
 } // namespace graphics
 
+extern "C" {
+extern char *alertBannerMessage;
+extern uint32_t alertBannerUntil;
+}
+
 // Extern declarations for function symbols used in UIRenderer
 extern std::vector<std::string> functionSymbol;
 extern std::string functionSymbolString;
-extern graphics::Screen *screen;
 
 #endif

src/graphics/SharedUIDisplay.cpp

@@ -10,22 +10,9 @@
 namespace graphics
 {
 
-void determineResolution(int16_t screenheight, int16_t screenwidth)
-{
-    if (screenwidth > 128) {
-        isHighResolution = true;
-    }
-
-    // Special case for Heltec Wireless Tracker v1.1
-    if (screenwidth == 160 && screenheight == 80) {
-        isHighResolution = false;
-    }
-}
-
 // === Shared External State ===
 bool hasUnreadMessage = false;
 bool isMuted = false;
-bool isHighResolution = false;
 
 // === Internal State ===
 bool isBoltVisibleShared = true;
@@ -53,7 +40,7 @@ void drawRoundedHighlight(OLEDDisplay *display, int16_t x, int16_t y, int16_t w,
 // *************************
 // * Common Header Drawing *
 // *************************
-void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *titleStr, bool battery_only)
+void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
 {
     constexpr int HEADER_OFFSET_Y = 1;
     y += HEADER_OFFSET_Y;
@@ -69,47 +56,25 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *ti
     const int screenW = display->getWidth();
     const int screenH = display->getHeight();
 
-    if (!battery_only) {
-        // === Inverted Header Background ===
-        if (isInverted) {
-            display->setColor(BLACK);
-            display->fillRect(0, 0, screenW, highlightHeight + 2);
-            display->setColor(WHITE);
-            drawRoundedHighlight(display, x, y, screenW, highlightHeight, 2);
-            display->setColor(BLACK);
-        } else {
-            display->setColor(BLACK);
-            display->fillRect(0, 0, screenW, highlightHeight + 2);
-            display->setColor(WHITE);
-            if (isHighResolution) {
-                display->drawLine(0, 20, screenW, 20);
-            } else {
-                display->drawLine(0, 14, screenW, 14);
-            }
-        }
+    const bool useBigIcons = (screenW > 128);
 
-        // === Screen Title ===
-        display->setTextAlignment(TEXT_ALIGN_CENTER);
-        display->drawString(SCREEN_WIDTH / 2, y, titleStr);
-        if (config.display.heading_bold) {
-            display->drawString((SCREEN_WIDTH / 2) + 1, y, titleStr);
+    // === Inverted Header Background ===
+    if (isInverted) {
+        drawRoundedHighlight(display, x, y, screenW, highlightHeight, 2);
+        display->setColor(BLACK);
+    } else {
+        if (screenW > 128) {
+            display->drawLine(0, 20, screenW, 20);
+        } else {
+            display->drawLine(0, 14, screenW, 14);
         }
     }
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
 
     // === Battery State ===
     int chargePercent = powerStatus->getBatteryChargePercent();
-    bool isCharging = powerStatus->getIsCharging();
-    bool usbPowered = powerStatus->getHasUSB();
-
-    if (chargePercent >= 100) {
-        isCharging = false;
-    }
-    if (chargePercent == 101) {
-        usbPowered = true; // Forcing this flag on for the express purpose that some devices have no concept of having a USB cable
-                           // plugged in
-    }
-
+    bool isCharging = powerStatus->getIsCharging() == meshtastic::OptionalBool::OptTrue;
+    static uint32_t lastBlinkShared = 0;
+    static bool isBoltVisibleShared = true;
     uint32_t now = millis();
 
 #ifndef USE_EINK
@@ -119,66 +84,53 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *ti
     }
 #endif
 
-    bool useHorizontalBattery = (isHighResolution && screenW >= screenH);
+    bool useHorizontalBattery = (screenW > 128 && screenW >= screenH);
     const int textY = y + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
 
-    int batteryX = 1;
-    int batteryY = HEADER_OFFSET_Y + 1;
-
     // === Battery Icons ===
-    if (usbPowered && !isCharging) { // This is a basic check to determine USB Powered is flagged but not charging
-        batteryX += 1;
-        batteryY += 2;
-        if (isHighResolution) {
-            display->drawXbm(batteryX, batteryY, 19, 12, imgUSB_HighResolution);
-            batteryX += 20; // Icon + 1 pixel
-        } else {
-            display->drawXbm(batteryX, batteryY, 10, 8, imgUSB);
-            batteryX += 11; // Icon + 1 pixel
+    if (useHorizontalBattery) {
+        int batteryX = 2;
+        int batteryY = HEADER_OFFSET_Y + 2;
+        display->drawXbm(batteryX, batteryY, 29, 15, batteryBitmap_h);
+        if (isCharging && isBoltVisibleShared)
+            display->drawXbm(batteryX + 9, batteryY + 1, 9, 13, lightning_bolt_h);
+        else {
+            display->drawXbm(batteryX + 8, batteryY, 12, 15, batteryBitmap_sidegaps_h);
+            int fillWidth = 24 * chargePercent / 100;
+            display->fillRect(batteryX + 1, batteryY + 1, fillWidth, 13);
         }
     } else {
-        if (useHorizontalBattery) {
-            batteryX += 1;
-            batteryY += 2;
-            display->drawXbm(batteryX, batteryY, 9, 13, batteryBitmap_h_bottom);
-            display->drawXbm(batteryX + 9, batteryY, 9, 13, batteryBitmap_h_top);
-            if (isCharging && isBoltVisibleShared)
-                display->drawXbm(batteryX + 4, batteryY, 9, 13, lightning_bolt_h);
-            else {
-                display->drawLine(batteryX + 5, batteryY, batteryX + 10, batteryY);
-                display->drawLine(batteryX + 5, batteryY + 12, batteryX + 10, batteryY + 12);
-                int fillWidth = 14 * chargePercent / 100;
-                display->fillRect(batteryX + 1, batteryY + 1, fillWidth, 11);
-            }
-            batteryX += 18; // Icon + 2 pixels
-        } else {
+        int batteryX = 1;
+        int batteryY = HEADER_OFFSET_Y + 1;
 #ifdef USE_EINK
-            batteryY += 2;
+        batteryY += 2;
 #endif
-            display->drawXbm(batteryX, batteryY, 7, 11, batteryBitmap_v);
-            if (isCharging && isBoltVisibleShared)
-                display->drawXbm(batteryX + 1, batteryY + 3, 5, 5, lightning_bolt_v);
-            else {
-                display->drawXbm(batteryX - 1, batteryY + 4, 8, 3, batteryBitmap_sidegaps_v);
-                int fillHeight = 8 * chargePercent / 100;
-                int fillY = batteryY - fillHeight;
-                display->fillRect(batteryX + 1, fillY + 10, 5, fillHeight);
-            }
-            batteryX += 9; // Icon + 2 pixels
+        display->drawXbm(batteryX, batteryY, 7, 11, batteryBitmap_v);
+        if (isCharging && isBoltVisibleShared)
+            display->drawXbm(batteryX + 1, batteryY + 3, 5, 5, lightning_bolt_v);
+        else {
+            display->drawXbm(batteryX - 1, batteryY + 4, 8, 3, batteryBitmap_sidegaps_v);
+            int fillHeight = 8 * chargePercent / 100;
+            int fillY = batteryY - fillHeight;
+            display->fillRect(batteryX + 1, fillY + 10, 5, fillHeight);
         }
     }
 
-    if (chargePercent != 101) {
-        // === Battery % Display ===
-        char chargeStr[4];
-        snprintf(chargeStr, sizeof(chargeStr), "%d", chargePercent);
-        int chargeNumWidth = display->getStringWidth(chargeStr);
-        display->drawString(batteryX, textY, chargeStr);
-        display->drawString(batteryX + chargeNumWidth - 1, textY, "%");
-        if (isBold) {
-            display->drawString(batteryX + 1, textY, chargeStr);
-            display->drawString(batteryX + chargeNumWidth, textY, "%");
-        }
+    // === Battery % Display ===
+    char chargeStr[4];
+    snprintf(chargeStr, sizeof(chargeStr), "%d", chargePercent);
+    int chargeNumWidth = display->getStringWidth(chargeStr);
+    const int batteryOffset = useHorizontalBattery ? 28 : 6;
+#ifdef USE_EINK
+    const int percentX = x + xOffset + batteryOffset - 2;
+#else
+    const int percentX = x + xOffset + batteryOffset;
+#endif
+    display->drawString(percentX, textY, chargeStr);
+    display->drawString(percentX + chargeNumWidth - 1, textY, "%");
+    if (isBold) {
+        display->drawString(percentX + 1, textY, chargeStr);
+        display->drawString(percentX + chargeNumWidth, textY, "%");
     }
 
     // === Time and Right-aligned Icons ===
@@ -187,7 +139,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *ti
     int timeStrWidth = display->getStringWidth("12:34"); // Default alignment
     int timeX = screenW - xOffset - timeStrWidth + 4;
 
-    if (rtc_sec > 0 && !battery_only) {
+    if (rtc_sec > 0) {
         // === Build Time String ===
         long hms = (rtc_sec % SEC_PER_DAY + SEC_PER_DAY) % SEC_PER_DAY;
         int hour = hms / SEC_PER_HOUR;
@@ -203,99 +155,13 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *ti
         }
 
         timeStrWidth = display->getStringWidth(timeStr);
-        timeX = screenW - xOffset - timeStrWidth + 3;
+        timeX = screenW - xOffset - timeStrWidth + 4;
 
         // === Show Mail or Mute Icon to the Left of Time ===
-        int iconRightEdge = timeX - 1;
-
-        bool showMail = false;
-
-#ifndef USE_EINK
-        if (hasUnreadMessage) {
-            if (now - lastMailBlink > 500) {
-                isMailIconVisible = !isMailIconVisible;
-                lastMailBlink = now;
-            }
-            showMail = isMailIconVisible;
-        }
-#else
-        if (hasUnreadMessage) {
-            showMail = true;
-        }
-#endif
-
-        if (showMail) {
-            if (useHorizontalBattery) {
-                int iconW = 16, iconH = 12;
-                int iconX = iconRightEdge - iconW;
-                int iconY = textY + (FONT_HEIGHT_SMALL - iconH) / 2 - 1;
-                if (isInverted) {
-                    display->setColor(WHITE);
-                    display->fillRect(iconX - 1, iconY - 1, iconW + 3, iconH + 2);
-                    display->setColor(BLACK);
-                } else {
-                    display->setColor(BLACK);
-                    display->fillRect(iconX - 1, iconY - 1, iconW + 3, iconH + 2);
-                    display->setColor(WHITE);
-                }
-                display->drawRect(iconX, iconY, iconW + 1, iconH);
-                display->drawLine(iconX, iconY, iconX + iconW / 2, iconY + iconH - 4);
-                display->drawLine(iconX + iconW, iconY, iconX + iconW / 2, iconY + iconH - 4);
-            } else {
-                int iconX = iconRightEdge - (mail_width - 2);
-                int iconY = textY + (FONT_HEIGHT_SMALL - mail_height) / 2;
-                if (isInverted) {
-                    display->setColor(WHITE);
-                    display->fillRect(iconX - 1, iconY - 1, mail_width + 2, mail_height + 2);
-                    display->setColor(BLACK);
-                } else {
-                    display->setColor(BLACK);
-                    display->fillRect(iconX - 1, iconY - 1, mail_width + 2, mail_height + 2);
-                    display->setColor(WHITE);
-                }
-                display->drawXbm(iconX, iconY, mail_width, mail_height, mail);
-            }
-        } else if (isMuted) {
-            if (isHighResolution) {
-                int iconX = iconRightEdge - mute_symbol_big_width;
-                int iconY = textY + (FONT_HEIGHT_SMALL - mute_symbol_big_height) / 2;
-
-                if (isInverted) {
-                    display->setColor(WHITE);
-                    display->fillRect(iconX - 1, iconY - 1, mute_symbol_big_width + 2, mute_symbol_big_height + 2);
-                    display->setColor(BLACK);
-                } else {
-                    display->setColor(BLACK);
-                    display->fillRect(iconX - 1, iconY - 1, mute_symbol_big_width + 2, mute_symbol_big_height + 2);
-                    display->setColor(WHITE);
-                }
-                display->drawXbm(iconX, iconY, mute_symbol_big_width, mute_symbol_big_height, mute_symbol_big);
-            } else {
-                int iconX = iconRightEdge - mute_symbol_width;
-                int iconY = textY + (FONT_HEIGHT_SMALL - mail_height) / 2;
-
-                if (isInverted) {
-                    display->setColor(WHITE);
-                    display->fillRect(iconX - 1, iconY - 1, mute_symbol_width + 2, mute_symbol_height + 2);
-                    display->setColor(BLACK);
-                } else {
-                    display->setColor(BLACK);
-                    display->fillRect(iconX - 1, iconY - 1, mute_symbol_width + 2, mute_symbol_height + 2);
-                    display->setColor(WHITE);
-                }
-                display->drawXbm(iconX, iconY, mute_symbol_width, mute_symbol_height, mute_symbol);
-            }
-        }
-
-        // === Draw Time ===
-        display->drawString(timeX, textY, timeStr);
-        if (isBold)
-            display->drawString(timeX - 1, textY, timeStr);
-
-    } else {
-        // === No Time Available: Mail/Mute Icon Moves to Far Right ===
-        int iconRightEdge = screenW - xOffset;
+        int iconRightEdge = timeX - 2;
 
+        static bool isMailIconVisible = true;
+        static uint32_t lastMailBlink = 0;
         bool showMail = false;
 
 #ifndef USE_EINK
@@ -326,7 +192,53 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *ti
                 display->drawXbm(iconX, iconY, mail_width, mail_height, mail);
             }
         } else if (isMuted) {
-            if (isHighResolution) {
+            if (useBigIcons) {
+                int iconX = iconRightEdge - mute_symbol_big_width;
+                int iconY = textY + (FONT_HEIGHT_SMALL - mute_symbol_big_height) / 2;
+                display->drawXbm(iconX, iconY, mute_symbol_big_width, mute_symbol_big_height, mute_symbol_big);
+            } else {
+                int iconX = iconRightEdge - mute_symbol_width;
+                int iconY = textY + (FONT_HEIGHT_SMALL - mail_height) / 2;
+                display->drawXbm(iconX, iconY, mute_symbol_width, mute_symbol_height, mute_symbol);
+            }
+        }
+
+        // === Draw Time ===
+        display->drawString(timeX, textY, timeStr);
+        if (isBold)
+            display->drawString(timeX - 1, textY, timeStr);
+
+    } else {
+        // === No Time Available: Mail/Mute Icon Moves to Far Right ===
+        int iconRightEdge = screenW - xOffset;
+
+        static bool isMailIconVisible = true;
+        static uint32_t lastMailBlink = 0;
+        bool showMail = false;
+
+        if (hasUnreadMessage) {
+            if (now - lastMailBlink > 500) {
+                isMailIconVisible = !isMailIconVisible;
+                lastMailBlink = now;
+            }
+            showMail = isMailIconVisible;
+        }
+
+        if (showMail) {
+            if (useHorizontalBattery) {
+                int iconW = 16, iconH = 12;
+                int iconX = iconRightEdge - iconW;
+                int iconY = textY + (FONT_HEIGHT_SMALL - iconH) / 2 - 1;
+                display->drawRect(iconX, iconY, iconW + 1, iconH);
+                display->drawLine(iconX, iconY, iconX + iconW / 2, iconY + iconH - 4);
+                display->drawLine(iconX + iconW, iconY, iconX + iconW / 2, iconY + iconH - 4);
+            } else {
+                int iconX = iconRightEdge - mail_width;
+                int iconY = textY + (FONT_HEIGHT_SMALL - mail_height) / 2;
+                display->drawXbm(iconX, iconY, mail_width, mail_height, mail);
+            }
+        } else if (isMuted) {
+            if (useBigIcons) {
                 int iconX = iconRightEdge - mute_symbol_big_width;
                 int iconY = textY + (FONT_HEIGHT_SMALL - mute_symbol_big_height) / 2;
                 display->drawXbm(iconX, iconY, mute_symbol_big_width, mute_symbol_big_height, mute_symbol_big);
@@ -341,54 +253,4 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *ti
     display->setColor(WHITE); // Reset for other UI
 }
 
-const int *getTextPositions(OLEDDisplay *display)
-{
-    static int textPositions[7]; // Static array that persists beyond function scope
-
-    if (isHighResolution) {
-        textPositions[0] = textZeroLine;
-        textPositions[1] = textFirstLine_medium;
-        textPositions[2] = textSecondLine_medium;
-        textPositions[3] = textThirdLine_medium;
-        textPositions[4] = textFourthLine_medium;
-        textPositions[5] = textFifthLine_medium;
-        textPositions[6] = textSixthLine_medium;
-    } else {
-        textPositions[0] = textZeroLine;
-        textPositions[1] = textFirstLine;
-        textPositions[2] = textSecondLine;
-        textPositions[3] = textThirdLine;
-        textPositions[4] = textFourthLine;
-        textPositions[5] = textFifthLine;
-        textPositions[6] = textSixthLine;
-    }
-    return textPositions;
-}
-
-bool isAllowedPunctuation(char c)
-{
-    const std::string allowed = ".,!?;:-_()[]{}'\"@#$/\\&+=%~^ ";
-    return allowed.find(c) != std::string::npos;
-}
-
-std::string sanitizeString(const std::string &input)
-{
-    std::string output;
-    bool inReplacement = false;
-
-    for (char c : input) {
-        if (std::isalnum(static_cast<unsigned char>(c)) || isAllowedPunctuation(c)) {
-            output += c;
-            inReplacement = false;
-        } else {
-            if (!inReplacement) {
-                output += 0xbf; // ISO-8859-1 for inverted question mark
-                inReplacement = true;
-            }
-        }
-    }
-
-    return output;
-}
-
 } // namespace graphics

src/graphics/SharedUIDisplay.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <OLEDDisplay.h>
-#include <string>
 
 namespace graphics
 {
@@ -10,30 +9,25 @@ namespace graphics
 // Shared UI Helpers
 // =======================
 
-#define textZeroLine 0
-// Consistent Line Spacing - this is standard for all display and the fall-back spacing
-#define textFirstLine (FONT_HEIGHT_SMALL - 1)
-#define textSecondLine (textFirstLine + (FONT_HEIGHT_SMALL - 5))
-#define textThirdLine (textSecondLine + (FONT_HEIGHT_SMALL - 5))
-#define textFourthLine (textThirdLine + (FONT_HEIGHT_SMALL - 5))
-#define textFifthLine (textFourthLine + (FONT_HEIGHT_SMALL - 5))
-#define textSixthLine (textFifthLine + (FONT_HEIGHT_SMALL - 5))
+// Compact line layout
+#define compactFirstLine ((FONT_HEIGHT_SMALL - 1) * 1)
+#define compactSecondLine ((FONT_HEIGHT_SMALL - 1) * 2) - 2
+#define compactThirdLine ((FONT_HEIGHT_SMALL - 1) * 3) - 4
+#define compactFourthLine ((FONT_HEIGHT_SMALL - 1) * 4) - 6
+#define compactFifthLine ((FONT_HEIGHT_SMALL - 1) * 5) - 8
 
-// Consistent Line Spacing for devices like T114 and TEcho/ThinkNode M1 of devices
-#define textFirstLine_medium (FONT_HEIGHT_SMALL + 1)
-#define textSecondLine_medium (textFirstLine_medium + FONT_HEIGHT_SMALL)
-#define textThirdLine_medium (textSecondLine_medium + FONT_HEIGHT_SMALL)
-#define textFourthLine_medium (textThirdLine_medium + FONT_HEIGHT_SMALL)
-#define textFifthLine_medium (textFourthLine_medium + FONT_HEIGHT_SMALL)
-#define textSixthLine_medium (textFifthLine_medium + FONT_HEIGHT_SMALL)
+// Standard line layout
+#define standardFirstLine (FONT_HEIGHT_SMALL + 1) * 1
+#define standardSecondLine (FONT_HEIGHT_SMALL + 1) * 2
+#define standardThirdLine (FONT_HEIGHT_SMALL + 1) * 3
+#define standardFourthLine (FONT_HEIGHT_SMALL + 1) * 4
 
-// Consistent Line Spacing for devices like VisionMaster T190
-#define textFirstLine_large (FONT_HEIGHT_SMALL + 1)
-#define textSecondLine_large (textFirstLine_large + (FONT_HEIGHT_SMALL + 5))
-#define textThirdLine_large (textSecondLine_large + (FONT_HEIGHT_SMALL + 5))
-#define textFourthLine_large (textThirdLine_large + (FONT_HEIGHT_SMALL + 5))
-#define textFifthLine_large (textFourthLine_large + (FONT_HEIGHT_SMALL + 5))
-#define textSixthLine_large (textFifthLine_large + (FONT_HEIGHT_SMALL + 5))
+// More Compact line layout
+#define moreCompactFirstLine compactFirstLine
+#define moreCompactSecondLine (moreCompactFirstLine + (FONT_HEIGHT_SMALL - 5))
+#define moreCompactThirdLine (moreCompactSecondLine + (FONT_HEIGHT_SMALL - 5))
+#define moreCompactFourthLine (moreCompactThirdLine + (FONT_HEIGHT_SMALL - 5))
+#define moreCompactFifthLine (moreCompactFourthLine + (FONT_HEIGHT_SMALL - 5))
 
 // Quick screen access
 #define SCREEN_WIDTH display->getWidth()
@@ -42,19 +36,11 @@ namespace graphics
 // Shared state (declare inside namespace)
 extern bool hasUnreadMessage;
 extern bool isMuted;
-extern bool isHighResolution;
-void determineResolution(int16_t screenheight, int16_t screenwidth);
 
 // Rounded highlight (used for inverted headers)
 void drawRoundedHighlight(OLEDDisplay *display, int16_t x, int16_t y, int16_t w, int16_t h, int16_t r);
 
 // Shared battery/time/mail header
-void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *titleStr = "", bool battery_only = false);
-
-const int *getTextPositions(OLEDDisplay *display);
-
-bool isAllowedPunctuation(char c);
-
-std::string sanitizeString(const std::string &input);
+void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y);
 
 } // namespace graphics

src/graphics/TFTDisplay.cpp

@@ -1,6 +1,5 @@
 #include "configuration.h"
 #include "main.h"
-
 #if ARCH_PORTDUINO
 #include "platform/portduino/PortduinoGlue.h"
 #endif
@@ -15,10 +14,8 @@
 extern SX1509 gpioExtender;
 #endif
 
-#ifdef TFT_MESH_OVERRIDE
-uint16_t TFT_MESH = TFT_MESH_OVERRIDE;
-#else
-uint16_t TFT_MESH = COLOR565(0x67, 0xEA, 0x94);
+#ifndef TFT_MESH
+#define TFT_MESH COLOR565(0x67, 0xEA, 0x94)
 #endif
 
 #if defined(ST7735S)
@@ -470,27 +467,18 @@ 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.
-#if defined(T_WATCH_S3)
-            cfg.panel_width = 240;
-            cfg.panel_height = 240;
-            cfg.memory_width = 240;
-            cfg.memory_height = 320;
-            cfg.offset_x = 0;
-            cfg.offset_y = 0;                             // No vertical shift needed — panel is top-aligned
-            cfg.offset_rotation = 2;                      // Rotate 180° to correct upside-down layout
-#else
-            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)
-#endif
+
+            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
+            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
@@ -1187,7 +1175,7 @@ bool TFTDisplay::connect()
 #elif defined(T_WATCH_S3) || defined(SENSECAP_INDICATOR)
     tft->setRotation(2); // T-Watch S3 left-handed orientation
 #elif ARCH_PORTDUINO
-    tft->setRotation(0); // use config.yaml to set rotation
+    tft->setRotation(0);
 #else
     tft->setRotation(3); // Orient horizontal and wide underneath the silkscreen name label
 #endif

src/graphics/TimeFormatters.cpp

@@ -1,103 +0,0 @@
-#include "TimeFormatters.h"
-#include "configuration.h"
-#include "gps/RTC.h"
-#include "mesh/NodeDB.h"
-#include <cstring>
-
-bool deltaToTimestamp(uint32_t secondsAgo, uint8_t *hours, uint8_t *minutes, int32_t *daysAgo)
-{
-    // Cache the result - avoid frequent recalculation
-    static uint8_t hoursCached = 0, minutesCached = 0;
-    static uint32_t daysAgoCached = 0;
-    static uint32_t secondsAgoCached = 0;
-    static bool validCached = false;
-
-    // Abort: if timezone not set
-    if (strlen(config.device.tzdef) == 0) {
-        validCached = false;
-        return validCached;
-    }
-
-    // Abort: if invalid pointers passed
-    if (hours == nullptr || minutes == nullptr || daysAgo == nullptr) {
-        validCached = false;
-        return validCached;
-    }
-
-    // Abort: if time seems invalid.. (> 6 months ago, probably seen before RTC set)
-    if (secondsAgo > SEC_PER_DAY * 30UL * 6) {
-        validCached = false;
-        return validCached;
-    }
-
-    // If repeated request, don't bother recalculating
-    if (secondsAgo - secondsAgoCached < 60 && secondsAgoCached != 0) {
-        if (validCached) {
-            *hours = hoursCached;
-            *minutes = minutesCached;
-            *daysAgo = daysAgoCached;
-        }
-        return validCached;
-    }
-
-    // Get local time
-    uint32_t secondsRTC = getValidTime(RTCQuality::RTCQualityDevice, true); // Get local time
-
-    // Abort: if RTC not set
-    if (!secondsRTC) {
-        validCached = false;
-        return validCached;
-    }
-
-    // Get absolute time when last seen
-    uint32_t secondsSeenAt = secondsRTC - secondsAgo;
-
-    // Calculate daysAgo
-    *daysAgo = (secondsRTC / SEC_PER_DAY) - (secondsSeenAt / SEC_PER_DAY); // How many "midnights" have passed
-
-    // Get seconds since midnight
-    uint32_t hms = (secondsRTC - secondsAgo) % SEC_PER_DAY;
-    hms = (hms + SEC_PER_DAY) % SEC_PER_DAY;
-
-    // Tear apart hms into hours and minutes
-    *hours = hms / SEC_PER_HOUR;
-    *minutes = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
-
-    // Cache the result
-    daysAgoCached = *daysAgo;
-    hoursCached = *hours;
-    minutesCached = *minutes;
-    secondsAgoCached = secondsAgo;
-
-    validCached = true;
-    return validCached;
-}
-
-void getTimeAgoStr(uint32_t agoSecs, char *timeStr, uint8_t maxLength)
-{
-    // Use an absolute timestamp in some cases.
-    // Particularly useful with E-Ink displays. Static UI, fewer refreshes.
-    uint8_t timestampHours, timestampMinutes;
-    int32_t daysAgo;
-    bool useTimestamp = deltaToTimestamp(agoSecs, &timestampHours, &timestampMinutes, &daysAgo);
-
-    if (agoSecs < 120) // last 2 mins?
-        snprintf(timeStr, maxLength, "%u seconds ago", agoSecs);
-    // -- if suitable for timestamp --
-    else if (useTimestamp && agoSecs < 15 * SECONDS_IN_MINUTE) // Last 15 minutes
-        snprintf(timeStr, maxLength, "%u minutes ago", agoSecs / SECONDS_IN_MINUTE);
-    else if (useTimestamp && daysAgo == 0) // Today
-        snprintf(timeStr, maxLength, "Last seen: %02u:%02u", (unsigned int)timestampHours, (unsigned int)timestampMinutes);
-    else if (useTimestamp && daysAgo == 1) // Yesterday
-        snprintf(timeStr, maxLength, "Seen yesterday");
-    else if (useTimestamp && daysAgo > 1) // Last six months (capped by deltaToTimestamp method)
-        snprintf(timeStr, maxLength, "%li days ago", (long)daysAgo);
-    // -- if using time delta instead --
-    else if (agoSecs < 120 * 60) // last 2 hrs
-        snprintf(timeStr, maxLength, "%u minutes ago", agoSecs / 60);
-    // Only show hours ago if it's been less than 6 months. Otherwise, we may have bad data.
-    else if ((agoSecs / 60 / 60) < (730 * 6))
-        snprintf(timeStr, maxLength, "%u hours ago", agoSecs / 60 / 60);
-    else
-        snprintf(timeStr, maxLength, "unknown age");
-}

src/graphics/TimeFormatters.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include "configuration.h"
-#include "gps/RTC.h"
-#include <airtime.h>
-#include <cstdint>
-
-/**
- * Convert a delta in seconds ago to timestamp information (hours, minutes, days ago).
- *
- * @param secondsAgo Number of seconds ago to convert
- * @param hours Pointer to store the hours (0-23)
- * @param minutes Pointer to store the minutes (0-59)
- * @param daysAgo Pointer to store the number of days ago
- * @return true if conversion was successful, false if invalid input or time not available
- */
-bool deltaToTimestamp(uint32_t secondsAgo, uint8_t *hours, uint8_t *minutes, int32_t *daysAgo);
-
-/**
- * Get a human-readable string representing the time ago in a format like "2 days, 3 hours, 15 minutes".
- *
- * @param agoSecs Number of seconds ago to convert
- * @param timeStr Pointer to store the resulting string
- * @param maxLength Maximum length of the resulting string buffer
- */
-void getTimeAgoStr(uint32_t agoSecs, char *timeStr, uint8_t maxLength);

src/graphics/draw/ClockRenderer.cpp

@@ -1,516 +0,0 @@
-#include "configuration.h"
-#if HAS_SCREEN
-#include "ClockRenderer.h"
-#include "NodeDB.h"
-#include "UIRenderer.h"
-#include "configuration.h"
-#include "gps/GeoCoord.h"
-#include "gps/RTC.h"
-#include "graphics/ScreenFonts.h"
-#include "graphics/SharedUIDisplay.h"
-#include "graphics/emotes.h"
-#include "graphics/images.h"
-#include "main.h"
-
-#if !MESHTASTIC_EXCLUDE_BLUETOOTH
-#include "nimble/NimbleBluetooth.h"
-#endif
-
-namespace graphics
-{
-
-namespace ClockRenderer
-{
-
-void drawSegmentedDisplayColon(OLEDDisplay *display, int x, int y, float scale)
-{
-    uint16_t segmentWidth = SEGMENT_WIDTH * scale;
-    uint16_t segmentHeight = SEGMENT_HEIGHT * scale;
-
-    uint16_t cellHeight = (segmentWidth * 2) + (segmentHeight * 3) + 8;
-
-    uint16_t topAndBottomX = x + (4 * scale);
-
-    uint16_t quarterCellHeight = cellHeight / 4;
-
-    uint16_t topY = y + quarterCellHeight;
-    uint16_t bottomY = y + (quarterCellHeight * 3);
-
-    display->fillRect(topAndBottomX, topY, segmentHeight, segmentHeight);
-    display->fillRect(topAndBottomX, bottomY, segmentHeight, segmentHeight);
-}
-
-void drawSegmentedDisplayCharacter(OLEDDisplay *display, int x, int y, uint8_t number, float scale)
-{
-    // the numbers 0-9, each expressed as an array of seven boolean (0|1) values encoding the on/off state of
-    // segment {innerIndex + 1}
-    // e.g., to display the numeral '0', segments 1-6 are on, and segment 7 is off.
-    uint8_t numbers[10][7] = {
-        {1, 1, 1, 1, 1, 1, 0}, // 0          Display segment key
-        {0, 1, 1, 0, 0, 0, 0}, // 1                   1
-        {1, 1, 0, 1, 1, 0, 1}, // 2                  ___
-        {1, 1, 1, 1, 0, 0, 1}, // 3              6  |   | 2
-        {0, 1, 1, 0, 0, 1, 1}, // 4                 |_7̲_|
-        {1, 0, 1, 1, 0, 1, 1}, // 5              5  |   | 3
-        {1, 0, 1, 1, 1, 1, 1}, // 6                 |___|
-        {1, 1, 1, 0, 0, 1, 0}, // 7
-        {1, 1, 1, 1, 1, 1, 1}, // 8                   4
-        {1, 1, 1, 1, 0, 1, 1}, // 9
-    };
-
-    // the width and height of each segment's central rectangle:
-    //             _____________________
-    //           ⋰|  (only this part,  |⋱
-    //         ⋰  |   not including    |  ⋱
-    //         ⋱  |   the triangles    |  ⋰
-    //           ⋱|    on the ends)    |⋰
-    //             ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-
-    uint16_t segmentWidth = SEGMENT_WIDTH * scale;
-    uint16_t segmentHeight = SEGMENT_HEIGHT * scale;
-
-    // segment x and y coordinates
-    uint16_t segmentOneX = x + segmentHeight + 2;
-    uint16_t segmentOneY = y;
-
-    uint16_t segmentTwoX = segmentOneX + segmentWidth + 2;
-    uint16_t segmentTwoY = segmentOneY + segmentHeight + 2;
-
-    uint16_t segmentThreeX = segmentTwoX;
-    uint16_t segmentThreeY = segmentTwoY + segmentWidth + 2 + segmentHeight + 2;
-
-    uint16_t segmentFourX = segmentOneX;
-    uint16_t segmentFourY = segmentThreeY + segmentWidth + 2;
-
-    uint16_t segmentFiveX = x;
-    uint16_t segmentFiveY = segmentThreeY;
-
-    uint16_t segmentSixX = x;
-    uint16_t segmentSixY = segmentTwoY;
-
-    uint16_t segmentSevenX = segmentOneX;
-    uint16_t segmentSevenY = segmentTwoY + segmentWidth + 2;
-
-    if (numbers[number][0]) {
-        graphics::ClockRenderer::drawHorizontalSegment(display, segmentOneX, segmentOneY, segmentWidth, segmentHeight);
-    }
-
-    if (numbers[number][1]) {
-        graphics::ClockRenderer::drawVerticalSegment(display, segmentTwoX, segmentTwoY, segmentWidth, segmentHeight);
-    }
-
-    if (numbers[number][2]) {
-        graphics::ClockRenderer::drawVerticalSegment(display, segmentThreeX, segmentThreeY, segmentWidth, segmentHeight);
-    }
-
-    if (numbers[number][3]) {
-        graphics::ClockRenderer::drawHorizontalSegment(display, segmentFourX, segmentFourY, segmentWidth, segmentHeight);
-    }
-
-    if (numbers[number][4]) {
-        graphics::ClockRenderer::drawVerticalSegment(display, segmentFiveX, segmentFiveY, segmentWidth, segmentHeight);
-    }
-
-    if (numbers[number][5]) {
-        graphics::ClockRenderer::drawVerticalSegment(display, segmentSixX, segmentSixY, segmentWidth, segmentHeight);
-    }
-
-    if (numbers[number][6]) {
-        graphics::ClockRenderer::drawHorizontalSegment(display, segmentSevenX, segmentSevenY, segmentWidth, segmentHeight);
-    }
-}
-
-void drawHorizontalSegment(OLEDDisplay *display, int x, int y, int width, int height)
-{
-    int halfHeight = height / 2;
-
-    // draw central rectangle
-    display->fillRect(x, y, width, height);
-
-    // draw end triangles
-    display->fillTriangle(x, y, x, y + height - 1, x - halfHeight, y + halfHeight);
-
-    display->fillTriangle(x + width, y, x + width + halfHeight, y + halfHeight, x + width, y + height - 1);
-}
-
-void drawVerticalSegment(OLEDDisplay *display, int x, int y, int width, int height)
-{
-    int halfHeight = height / 2;
-
-    // draw central rectangle
-    display->fillRect(x, y, height, width);
-
-    // draw end triangles
-    display->fillTriangle(x + halfHeight, y - halfHeight, x + height - 1, y, x, y);
-
-    display->fillTriangle(x, y + width, x + height - 1, y + width, x + halfHeight, y + width + halfHeight);
-}
-
-/*
-void drawWatchFaceToggleButton(OLEDDisplay *display, int16_t x, int16_t y, bool digitalMode, float scale)
-{
-    uint16_t segmentWidth = SEGMENT_WIDTH * scale;
-    uint16_t segmentHeight = SEGMENT_HEIGHT * scale;
-
-    if (digitalMode) {
-        uint16_t radius = (segmentWidth + (segmentHeight * 2) + 4) / 2;
-        uint16_t centerX = (x + segmentHeight + 2) + (radius / 2);
-        uint16_t centerY = (y + segmentHeight + 2) + (radius / 2);
-
-        display->drawCircle(centerX, centerY, radius);
-        display->drawCircle(centerX, centerY, radius + 1);
-        display->drawLine(centerX, centerY, centerX, centerY - radius + 3);
-        display->drawLine(centerX, centerY, centerX + radius - 3, centerY);
-    } else {
-        uint16_t segmentOneX = x + segmentHeight + 2;
-        uint16_t segmentOneY = y;
-
-        uint16_t segmentTwoX = segmentOneX + segmentWidth + 2;
-        uint16_t segmentTwoY = segmentOneY + segmentHeight + 2;
-
-        uint16_t segmentThreeX = segmentOneX;
-        uint16_t segmentThreeY = segmentTwoY + segmentWidth + 2;
-
-        uint16_t segmentFourX = x;
-        uint16_t segmentFourY = y + segmentHeight + 2;
-
-        drawHorizontalSegment(display, segmentOneX, segmentOneY, segmentWidth, segmentHeight);
-        drawVerticalSegment(display, segmentTwoX, segmentTwoY, segmentWidth, segmentHeight);
-        drawHorizontalSegment(display, segmentThreeX, segmentThreeY, segmentWidth, segmentHeight);
-        drawVerticalSegment(display, segmentFourX, segmentFourY, segmentWidth, segmentHeight);
-    }
-}
-*/
-// Draw a digital clock
-void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    display->clear();
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
-    int line = 1;
-    // === Set Title, Blank for Clock
-    const char *titleStr = "";
-    // === Header ===
-    graphics::drawCommonHeader(display, x, y, titleStr, true);
-
-#ifdef T_WATCH_S3
-    if (nimbleBluetooth && nimbleBluetooth->isConnected()) {
-        graphics::ClockRenderer::drawBluetoothConnectedIcon(display, display->getWidth() - 18, display->getHeight() - 14);
-    }
-#endif
-
-    uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice, true); // Display local timezone
-    char timeString[16];
-    int hour = 0;
-    int minute = 0;
-    int second = 0;
-    if (rtc_sec > 0) {
-        long hms = rtc_sec % SEC_PER_DAY;
-        hms = (hms + SEC_PER_DAY) % SEC_PER_DAY;
-
-        hour = hms / SEC_PER_HOUR;
-        minute = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
-        second = (hms % SEC_PER_HOUR) % SEC_PER_MIN; // or hms % SEC_PER_MIN
-    }
-
-    bool isPM = hour >= 12;
-    // hour = hour > 12 ? hour - 12 : hour;
-    if (config.display.use_12h_clock) {
-        hour %= 12;
-        if (hour == 0)
-            hour = 12;
-        bool isPM = hour >= 12;
-        snprintf(timeString, sizeof(timeString), "%d:%02d", hour, minute);
-    } else {
-        snprintf(timeString, sizeof(timeString), "%02d:%02d", hour, minute);
-    }
-
-    // Format seconds string
-    char secondString[8];
-    snprintf(secondString, sizeof(secondString), "%02d", second);
-
-#ifdef T_WATCH_S3
-    float scale = 1.5;
-#else
-    float scale = 0.75;
-    if (isHighResolution) {
-        scale = 1.5;
-    }
-#endif
-
-    uint16_t segmentWidth = SEGMENT_WIDTH * scale;
-    uint16_t segmentHeight = SEGMENT_HEIGHT * scale;
-
-    // calculate hours:minutes string width
-    uint16_t timeStringWidth = strlen(timeString) * 5;
-
-    for (uint8_t i = 0; i < strlen(timeString); i++) {
-        char character = timeString[i];
-
-        if (character == ':') {
-            timeStringWidth += segmentHeight;
-        } else {
-            timeStringWidth += segmentWidth + (segmentHeight * 2) + 4;
-        }
-    }
-
-    uint16_t hourMinuteTextX = (display->getWidth() / 2) - (timeStringWidth / 2);
-
-    uint16_t startingHourMinuteTextX = hourMinuteTextX;
-
-    uint16_t hourMinuteTextY = (display->getHeight() / 2) - (((segmentWidth * 2) + (segmentHeight * 3) + 8) / 2);
-
-    // iterate over characters in hours:minutes string and draw segmented characters
-    for (uint8_t i = 0; i < strlen(timeString); i++) {
-        char character = timeString[i];
-
-        if (character == ':') {
-            drawSegmentedDisplayColon(display, hourMinuteTextX, hourMinuteTextY, scale);
-
-            hourMinuteTextX += segmentHeight + 6;
-        } else {
-            drawSegmentedDisplayCharacter(display, hourMinuteTextX, hourMinuteTextY, character - '0', scale);
-
-            hourMinuteTextX += segmentWidth + (segmentHeight * 2) + 4;
-        }
-
-        hourMinuteTextX += 5;
-    }
-
-    // draw seconds string
-    display->setFont(FONT_SMALL);
-    int xOffset = (isHighResolution) ? 0 : -1;
-    if (hour >= 10) {
-        xOffset += (isHighResolution) ? 32 : 18;
-    }
-    int yOffset = (isHighResolution) ? 3 : 1;
-#ifdef SENSECAP_INDICATOR
-    yOffset -= 3;
-#endif
-    if (config.display.use_12h_clock) {
-        display->drawString(startingHourMinuteTextX + xOffset, (display->getHeight() - hourMinuteTextY) - yOffset - 2,
-                            isPM ? "pm" : "am");
-    }
-#ifndef USE_EINK
-    xOffset = (isHighResolution) ? 18 : 10;
-    display->drawString(startingHourMinuteTextX + timeStringWidth - xOffset, (display->getHeight() - hourMinuteTextY) - yOffset,
-                        secondString);
-#endif
-}
-
-void drawBluetoothConnectedIcon(OLEDDisplay *display, int16_t x, int16_t y)
-{
-    display->drawFastImage(x, y, 18, 14, bluetoothConnectedIcon);
-}
-
-// Draw an analog clock
-void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
-    // === Set Title, Blank for Clock
-    const char *titleStr = "";
-    // === Header ===
-    graphics::drawCommonHeader(display, x, y, titleStr, true);
-
-#ifdef T_WATCH_S3
-    if (nimbleBluetooth && nimbleBluetooth->isConnected()) {
-        drawBluetoothConnectedIcon(display, display->getWidth() - 18, display->getHeight() - 14);
-    }
-#endif
-    // clock face center coordinates
-    int16_t centerX = display->getWidth() / 2;
-    int16_t centerY = display->getHeight() / 2;
-
-    // clock face radius
-    int16_t radius = 0;
-    if (display->getHeight() < display->getWidth()) {
-        radius = (display->getHeight() / 2) * 0.9;
-    } else {
-        radius = (display->getWidth() / 2) * 0.9;
-    }
-#ifdef T_WATCH_S3
-    radius = (display->getWidth() / 2) * 0.8;
-#endif
-
-    // noon (0 deg) coordinates (outermost circle)
-    int16_t noonX = centerX;
-    int16_t noonY = centerY - radius;
-
-    // second hand radius and y coordinate (outermost circle)
-    int16_t secondHandNoonY = noonY + 1;
-
-    // tick mark outer y coordinate; (first nested circle)
-    int16_t tickMarkOuterNoonY = secondHandNoonY;
-
-    // seconds tick mark inner y coordinate; (second nested circle)
-    double secondsTickMarkInnerNoonY = (double)noonY + 4;
-    if (isHighResolution) {
-        secondsTickMarkInnerNoonY = (double)noonY + 8;
-    }
-
-    // hours tick mark inner y coordinate; (third nested circle)
-    double hoursTickMarkInnerNoonY = (double)noonY + 6;
-    if (isHighResolution) {
-        hoursTickMarkInnerNoonY = (double)noonY + 16;
-    }
-
-    // minute hand y coordinate
-    int16_t minuteHandNoonY = secondsTickMarkInnerNoonY + 4;
-
-    // hour string y coordinate
-    int16_t hourStringNoonY = minuteHandNoonY + 18;
-
-    // hour hand radius and y coordinate
-    int16_t hourHandRadius = radius * 0.35;
-    if (isHighResolution) {
-        int16_t hourHandRadius = radius * 0.55;
-    }
-    int16_t hourHandNoonY = centerY - hourHandRadius;
-
-    display->setColor(OLEDDISPLAY_COLOR::WHITE);
-    display->drawCircle(centerX, centerY, radius);
-
-    uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice, true); // Display local timezone
-    if (rtc_sec > 0) {
-        long hms = rtc_sec % SEC_PER_DAY;
-        hms = (hms + SEC_PER_DAY) % SEC_PER_DAY;
-
-        // Tear apart hms into h:m:s
-        int hour = hms / SEC_PER_HOUR;
-        int minute = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
-        int second = (hms % SEC_PER_HOUR) % SEC_PER_MIN; // or hms % SEC_PER_MIN
-
-        bool isPM = hour >= 12;
-        if (config.display.use_12h_clock) {
-            bool isPM = hour >= 12;
-            display->setFont(FONT_SMALL);
-            int yOffset = isHighResolution ? 1 : 0;
-#ifdef USE_EINK
-            yOffset += 3;
-#endif
-            display->drawString(centerX - (display->getStringWidth(isPM ? "pm" : "am") / 2), centerY + yOffset,
-                                isPM ? "pm" : "am");
-        }
-        hour %= 12;
-        if (hour == 0)
-            hour = 12;
-
-        int16_t degreesPerHour = 30;
-        int16_t degreesPerMinuteOrSecond = 6;
-
-        double hourBaseAngle = hour * degreesPerHour;
-        double hourAngleOffset = ((double)minute / 60) * degreesPerHour;
-        double hourAngle = radians(hourBaseAngle + hourAngleOffset);
-
-        double minuteBaseAngle = minute * degreesPerMinuteOrSecond;
-        double minuteAngleOffset = ((double)second / 60) * degreesPerMinuteOrSecond;
-        double minuteAngle = radians(minuteBaseAngle + minuteAngleOffset);
-
-        double secondAngle = radians(second * degreesPerMinuteOrSecond);
-
-        double hourX = sin(-hourAngle) * (hourHandNoonY - centerY) + noonX;
-        double hourY = cos(-hourAngle) * (hourHandNoonY - centerY) + centerY;
-
-        double minuteX = sin(-minuteAngle) * (minuteHandNoonY - centerY) + noonX;
-        double minuteY = cos(-minuteAngle) * (minuteHandNoonY - centerY) + centerY;
-
-        double secondX = sin(-secondAngle) * (secondHandNoonY - centerY) + noonX;
-        double secondY = cos(-secondAngle) * (secondHandNoonY - centerY) + centerY;
-
-        display->setFont(FONT_MEDIUM);
-
-        // draw minute and hour tick marks and hour numbers
-        for (uint16_t angle = 0; angle < 360; angle += 6) {
-            double angleInRadians = radians(angle);
-
-            double sineAngleInRadians = sin(-angleInRadians);
-            double cosineAngleInRadians = cos(-angleInRadians);
-
-            double endX = sineAngleInRadians * (tickMarkOuterNoonY - centerY) + noonX;
-            double endY = cosineAngleInRadians * (tickMarkOuterNoonY - centerY) + centerY;
-
-            if (angle % degreesPerHour == 0) {
-                double startX = sineAngleInRadians * (hoursTickMarkInnerNoonY - centerY) + noonX;
-                double startY = cosineAngleInRadians * (hoursTickMarkInnerNoonY - centerY) + centerY;
-
-                // draw hour tick mark
-                display->drawLine(startX, startY, endX, endY);
-
-                static char buffer[2];
-
-                uint8_t hourInt = (angle / 30);
-
-                if (hourInt == 0) {
-                    hourInt = 12;
-                }
-
-                // hour number x offset needs to be adjusted for some cases
-                int8_t hourStringXOffset;
-                int8_t hourStringYOffset = 13;
-
-                switch (hourInt) {
-                case 3:
-                    hourStringXOffset = 5;
-                    break;
-                case 9:
-                    hourStringXOffset = 7;
-                    break;
-                case 10:
-                case 11:
-                    hourStringXOffset = 8;
-                    break;
-                case 12:
-                    hourStringXOffset = 13;
-                    break;
-                default:
-                    hourStringXOffset = 6;
-                    break;
-                }
-
-                double hourStringX = (sineAngleInRadians * (hourStringNoonY - centerY) + noonX) - hourStringXOffset;
-                double hourStringY = (cosineAngleInRadians * (hourStringNoonY - centerY) + centerY) - hourStringYOffset;
-
-#ifdef T_WATCH_S3
-                // draw hour number
-                display->drawStringf(hourStringX, hourStringY, buffer, "%d", hourInt);
-#else
-#ifdef USE_EINK
-                if (isHighResolution) {
-                    // draw hour number
-                    display->drawStringf(hourStringX, hourStringY, buffer, "%d", hourInt);
-                }
-#else
-                if (isHighResolution && (hourInt == 3 || hourInt == 6 || hourInt == 9 || hourInt == 12)) {
-                    // draw hour number
-                    display->drawStringf(hourStringX, hourStringY, buffer, "%d", hourInt);
-                }
-#endif
-#endif
-            }
-
-            if (angle % degreesPerMinuteOrSecond == 0) {
-                double startX = sineAngleInRadians * (secondsTickMarkInnerNoonY - centerY) + noonX;
-                double startY = cosineAngleInRadians * (secondsTickMarkInnerNoonY - centerY) + centerY;
-
-                if (isHighResolution) {
-                    // draw minute tick mark
-                    display->drawLine(startX, startY, endX, endY);
-                }
-            }
-        }
-
-        // draw hour hand
-        display->drawLine(centerX, centerY, hourX, hourY);
-
-        // draw minute hand
-        display->drawLine(centerX, centerY, minuteX, minuteY);
-#ifndef USE_EINK
-        // draw second hand
-        display->drawLine(centerX, centerY, secondX, secondY);
-#endif
-    }
-}
-
-} // namespace ClockRenderer
-
-} // namespace graphics
-#endif

src/graphics/draw/ClockRenderer.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "graphics/Screen.h"
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
 
@@ -9,9 +10,14 @@ namespace graphics
 /// Forward declarations
 class Screen;
 
+/**
+ * @brief Clock drawing functions
+ *
+ * Contains all functions related to drawing analog and digital clocks,
+ * segmented displays, and time-related UI elements.
+ */
 namespace ClockRenderer
 {
-
 // Clock frame functions
 void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
@@ -23,9 +29,12 @@ void drawHorizontalSegment(OLEDDisplay *display, int x, int y, int width, int he
 void drawVerticalSegment(OLEDDisplay *display, int x, int y, int width, int height);
 
 // UI elements for clock displays
-// void drawWatchFaceToggleButton(OLEDDisplay *display, int16_t x, int16_t y, bool digitalMode = true, float scale = 1);
+void drawWatchFaceToggleButton(OLEDDisplay *display, int16_t x, int16_t y, bool digitalMode = true, float scale = 1);
 void drawBluetoothConnectedIcon(OLEDDisplay *display, int16_t x, int16_t y);
 
+// Utility functions
+bool deltaToTimestamp(uint32_t secondsAgo, uint8_t *hours, uint8_t *minutes, int32_t *daysAgo);
+
 } // namespace ClockRenderer
 
 } // namespace graphics

src/graphics/draw/CompassRenderer.cpp

@@ -4,7 +4,6 @@
 #include "configuration.h"
 #include "gps/GeoCoord.h"
 #include "graphics/ScreenFonts.h"
-#include "graphics/SharedUIDisplay.h"
 #include <cmath>
 
 namespace graphics
@@ -40,37 +39,28 @@ struct Point {
     }
 };
 
-void drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading, int16_t radius)
+void drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading)
 {
     // Show the compass heading (not implemented in original)
     // This could draw a "N" indicator or north arrow
     // For now, we'll draw a simple north indicator
-    // const float radius = 17.0f;
-    if (isHighResolution) {
-        radius += 4;
-    }
+    const float radius = 8.0f;
     Point north(0, -radius);
-    if (uiconfig.compass_mode != meshtastic_CompassMode_FIXED_RING)
-        north.rotate(-myHeading);
+    north.rotate(-myHeading);
     north.translate(compassX, compassY);
 
+    // Draw a small "N" or north indicator
+    display->drawCircle(north.x, north.y, 2);
     display->setFont(FONT_SMALL);
     display->setTextAlignment(TEXT_ALIGN_CENTER);
-    display->setColor(BLACK);
-    if (isHighResolution) {
-        display->fillRect(north.x - 8, north.y - 1, display->getStringWidth("N") + 3, FONT_HEIGHT_SMALL - 6);
-    } else {
-        display->fillRect(north.x - 4, north.y - 1, display->getStringWidth("N") + 2, FONT_HEIGHT_SMALL - 6);
-    }
-    display->setColor(WHITE);
     display->drawString(north.x, north.y - 3, "N");
 }
 
 void drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t compassY, uint16_t compassDiam, float headingRadian)
 {
-    Point tip(0.0f, -0.5f), tail(0.0f, 0.35f); // pointing up initially
-    float arrowOffsetX = 0.14f, arrowOffsetY = 0.9f;
-    Point leftArrow(tip.x - arrowOffsetX, tip.y + arrowOffsetY), rightArrow(tip.x + arrowOffsetX, tip.y + arrowOffsetY);
+    Point tip(0.0f, 0.5f), tail(0.0f, -0.35f); // pointing up initially
+    float arrowOffsetX = 0.14f, arrowOffsetY = 1.0f;
+    Point leftArrow(tip.x - arrowOffsetX, tip.y - arrowOffsetY), rightArrow(tip.x + arrowOffsetX, tip.y - arrowOffsetY);
 
     Point *arrowPoints[] = {&tip, &tail, &leftArrow, &rightArrow};
 
@@ -93,22 +83,18 @@ void drawArrowToNode(OLEDDisplay *display, int16_t x, int16_t y, int16_t size, f
     float radians = bearing * DEG_TO_RAD;
 
     Point tip(0, -size / 2);
-    Point left(-size / 6, size / 4);
-    Point right(size / 6, size / 4);
-    Point tail(0, size / 4.5);
+    Point left(-size / 4, size / 4);
+    Point right(size / 4, size / 4);
 
     tip.rotate(radians);
     left.rotate(radians);
     right.rotate(radians);
-    tail.rotate(radians);
 
     tip.translate(x, y);
     left.translate(x, y);
     right.translate(x, y);
-    tail.translate(x, y);
 
-    display->fillTriangle(tip.x, tip.y, left.x, left.y, tail.x, tail.y);
-    display->fillTriangle(tip.x, tip.y, right.x, right.y, tail.x, tail.y);
+    display->drawTriangle(tip.x, tip.y, left.x, left.y, right.x, right.y);
 }
 
 float estimatedHeading(double lat, double lon)
@@ -133,5 +119,14 @@ uint16_t getCompassDiam(uint32_t displayWidth, uint32_t displayHeight)
     return maxDiam;
 }
 
+float calculateBearing(double lat1, double lon1, double lat2, double lon2)
+{
+    double dLon = (lon2 - lon1) * DEG_TO_RAD;
+    double y = sin(dLon) * cos(lat2 * DEG_TO_RAD);
+    double x = cos(lat1 * DEG_TO_RAD) * sin(lat2 * DEG_TO_RAD) - sin(lat1 * DEG_TO_RAD) * cos(lat2 * DEG_TO_RAD) * cos(dLon);
+    double bearing = atan2(y, x) * RAD_TO_DEG;
+    return fmod(bearing + 360.0, 360.0);
+}
+
 } // namespace CompassRenderer
 } // namespace graphics

src/graphics/draw/CompassRenderer.h

@@ -20,7 +20,7 @@ class Screen;
 namespace CompassRenderer
 {
 // Compass drawing functions
-void drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading, int16_t radius);
+void drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading);
 void drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t compassY, uint16_t compassDiam, float headingRadian);
 void drawArrowToNode(OLEDDisplay *display, int16_t x, int16_t y, int16_t size, float bearing);
 
@@ -28,6 +28,9 @@ void drawArrowToNode(OLEDDisplay *display, int16_t x, int16_t y, int16_t size, f
 float estimatedHeading(double lat, double lon);
 uint16_t getCompassDiam(uint32_t displayWidth, uint32_t displayHeight);
 
+// Utility functions for bearing calculations
+float calculateBearing(double lat1, double lon1, double lat2, double lon2);
+
 } // namespace CompassRenderer
 
 } // namespace graphics

src/graphics/draw/DebugRenderer.cpp

@@ -1,12 +1,11 @@
-#include "configuration.h"
-#if HAS_SCREEN
-#include "../Screen.h"
 #include "DebugRenderer.h"
+#include "../Screen.h"
 #include "FSCommon.h"
 #include "NodeDB.h"
 #include "Throttle.h"
 #include "UIRenderer.h"
 #include "airtime.h"
+#include "configuration.h"
 #include "gps/RTC.h"
 #include "graphics/ScreenFonts.h"
 #include "graphics/SharedUIDisplay.h"
@@ -33,12 +32,18 @@
 
 using namespace meshtastic;
 
+// Battery icon array
+static uint8_t imgBattery[16] = {0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xE7, 0x3C};
+
 // External variables
 extern graphics::Screen *screen;
 extern PowerStatus *powerStatus;
 extern NodeStatus *nodeStatus;
 extern GPSStatus *gpsStatus;
 extern Channels channels;
+extern "C" {
+extern char ourId[5];
+}
 extern AirTime *airTime;
 
 // External functions from Screen.cpp
@@ -67,6 +72,21 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
 
     char channelStr[20];
     snprintf(channelStr, sizeof(channelStr), "#%s", channels.getName(channels.getPrimaryIndex()));
+
+    // Display power status
+    if (powerStatus->getHasBattery()) {
+        if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
+            UIRenderer::drawBattery(display, x, y + 2, imgBattery, powerStatus);
+        } else {
+            UIRenderer::drawBattery(display, x + 1, y + 3, imgBattery, powerStatus);
+        }
+    } else if (powerStatus->knowsUSB()) {
+        if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
+            display->drawFastImage(x, y + 2, 16, 8, powerStatus->getHasUSB() ? imgUSB : imgPower);
+        } else {
+            display->drawFastImage(x + 1, y + 3, 16, 8, powerStatus->getHasUSB() ? imgUSB : imgPower);
+        }
+    }
     // Display nodes status
     if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
         UIRenderer::drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 2, nodeStatus);
@@ -96,25 +116,25 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
 #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) || ARCH_PORTDUINO) &&                \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
-            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 12,
-                                   8, imgQuestionL1);
-            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 11 + FONT_HEIGHT_SMALL, 12,
-                                   8, imgQuestionL2);
+            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
+                                   imgQuestionL1);
+            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8,
+                                   imgQuestionL2);
 #else
-            display->drawFastImage(x + SCREEN_WIDTH - 10 - display->getStringWidth(screen->ourId), y + 2 + FONT_HEIGHT_SMALL, 8,
-                                   8, imgQuestion);
+            display->drawFastImage(x + SCREEN_WIDTH - 10 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 8, 8,
+                                   imgQuestion);
 #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(DISPLAY_FORCE_SMALL_FONTS)
-            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 16,
-                                   8, imgSFL1);
-            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(screen->ourId), y + 11 + FONT_HEIGHT_SMALL, 16,
-                                   8, imgSFL2);
+            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8,
+                                   imgSFL1);
+            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 16, 8,
+                                   imgSFL2);
 #else
-            display->drawFastImage(x + SCREEN_WIDTH - 13 - display->getStringWidth(screen->ourId), y + 2 + FONT_HEIGHT_SMALL, 11,
-                                   8, imgSF);
+            display->drawFastImage(x + SCREEN_WIDTH - 13 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 11, 8,
+                                   imgSF);
 #endif
         }
 #endif
@@ -123,17 +143,16 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
 #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) || ARCH_PORTDUINO) &&                \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
-        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
+        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                                imgInfoL1);
-        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8,
+        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8,
                                imgInfoL2);
 #else
-        display->drawFastImage(x + SCREEN_WIDTH - 10 - display->getStringWidth(screen->ourId), y + 2 + FONT_HEIGHT_SMALL, 8, 8,
-                               imgInfo);
+        display->drawFastImage(x + SCREEN_WIDTH - 10 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 8, 8, imgInfo);
 #endif
     }
 
-    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(screen->ourId), y + FONT_HEIGHT_SMALL, screen->ourId);
+    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(ourId), y + FONT_HEIGHT_SMALL, ourId);
 
     // Draw any log messages
     display->drawLogBuffer(x, y + (FONT_HEIGHT_SMALL * 2));
@@ -146,35 +165,40 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
 #endif
 }
 
-// ****************************
-// * WiFi Screen              *
-// ****************************
 void drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
 #if HAS_WIFI && !defined(ARCH_PORTDUINO)
-    display->clear();
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
-    display->setFont(FONT_SMALL);
-    int line = 1;
-
-    // === Set Title
-    const char *titleStr = "WiFi";
-
-    // === Header ===
-    graphics::drawCommonHeader(display, x, y, titleStr);
-
     const char *wifiName = config.network.wifi_ssid;
 
+    display->setFont(FONT_SMALL);
+
+    // The coordinates define the left starting point of the text
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
+
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
+        display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
+        display->setColor(BLACK);
+    }
+
     if (WiFi.status() != WL_CONNECTED) {
-        display->drawString(x, getTextPositions(display)[line++], "WiFi: Not Connected");
+        display->drawString(x, y, "WiFi: Not Connected");
+        if (config.display.heading_bold)
+            display->drawString(x + 1, y, "WiFi: Not Connected");
     } else {
-        display->drawString(x, getTextPositions(display)[line++], "WiFi: Connected");
+        display->drawString(x, y, "WiFi: Connected");
+        if (config.display.heading_bold)
+            display->drawString(x + 1, y, "WiFi: Connected");
 
         char rssiStr[32];
-        snprintf(rssiStr, sizeof(rssiStr), "RSSI: %d", WiFi.RSSI());
-        display->drawString(x, getTextPositions(display)[line++], rssiStr);
+        snprintf(rssiStr, sizeof(rssiStr), "RSSI %d", WiFi.RSSI());
+        display->drawString(x + SCREEN_WIDTH - display->getStringWidth(rssiStr), y, rssiStr);
+        if (config.display.heading_bold) {
+            display->drawString(x + SCREEN_WIDTH - display->getStringWidth(rssiStr) - 1, y, rssiStr);
+        }
     }
 
+    display->setColor(WHITE);
+
     /*
     - WL_CONNECTED: assigned when connected to a WiFi network;
     - WL_NO_SSID_AVAIL: assigned when no SSID are available;
@@ -190,36 +214,36 @@ void drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, i
     if (WiFi.status() == WL_CONNECTED) {
         char ipStr[64];
         snprintf(ipStr, sizeof(ipStr), "IP: %s", WiFi.localIP().toString().c_str());
-        display->drawString(x, getTextPositions(display)[line++], ipStr);
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, ipStr);
     } else if (WiFi.status() == WL_NO_SSID_AVAIL) {
-        display->drawString(x, getTextPositions(display)[line++], "SSID Not Found");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "SSID Not Found");
     } else if (WiFi.status() == WL_CONNECTION_LOST) {
-        display->drawString(x, getTextPositions(display)[line++], "Connection Lost");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Connection Lost");
     } else if (WiFi.status() == WL_IDLE_STATUS) {
-        display->drawString(x, getTextPositions(display)[line++], "Idle ... Reconnecting");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Idle ... Reconnecting");
     } else if (WiFi.status() == WL_CONNECT_FAILED) {
-        display->drawString(x, getTextPositions(display)[line++], "Connection Failed");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Connection Failed");
     }
 #ifdef ARCH_ESP32
     else {
         // Codes:
         // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/wifi.html#wi-fi-reason-code
-        display->drawString(x, getTextPositions(display)[line++],
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 1,
                             WiFi.disconnectReasonName(static_cast<wifi_err_reason_t>(getWifiDisconnectReason())));
     }
 #else
     else {
         char statusStr[32];
         snprintf(statusStr, sizeof(statusStr), "Unknown status: %d", WiFi.status());
-        display->drawString(x, getTextPositions(display)[line++], statusStr);
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, statusStr);
     }
 #endif
 
     char ssidStr[64];
     snprintf(ssidStr, sizeof(ssidStr), "SSID: %s", wifiName);
-    display->drawString(x, getTextPositions(display)[line++], ssidStr);
+    display->drawString(x, y + FONT_HEIGHT_SMALL * 2, ssidStr);
 
-    display->drawString(x, getTextPositions(display)[line++], "URL: http://meshtastic.local");
+    display->drawString(x, y + FONT_HEIGHT_SMALL * 3, "http://meshtastic.local");
 
     /* Display a heartbeat pixel that blinks every time the frame is redrawn */
 #ifdef SHOW_REDRAWS
@@ -375,36 +399,48 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
     display->clear();
     display->setTextAlignment(TEXT_ALIGN_LEFT);
     display->setFont(FONT_SMALL);
-    int line = 1;
-
-    // === Set Title
-    const char *titleStr = (isHighResolution) ? "LoRa Info" : "LoRa";
 
     // === Header ===
-    graphics::drawCommonHeader(display, x, y, titleStr);
+    graphics::drawCommonHeader(display, x, y);
+
+    // === Draw title (aligned with header baseline) ===
+    const int highlightHeight = FONT_HEIGHT_SMALL - 1;
+    const int textY = y + 1 + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
+    const char *titleStr = (SCREEN_WIDTH > 128) ? "LoRa Info" : "LoRa";
+    const int centerX = x + SCREEN_WIDTH / 2;
+
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
+        display->setColor(BLACK);
+    }
+
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+    display->drawString(centerX, textY, titleStr);
+    if (config.display.heading_bold) {
+        display->drawString(centerX + 1, textY, titleStr);
+    }
+    display->setColor(WHITE);
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
 
     // === First Row: Region / BLE Name ===
-    graphics::UIRenderer::drawNodes(display, x, getTextPositions(display)[line] + 2, nodeStatus, 0, true, "");
+    graphics::UIRenderer::drawNodes(display, x, compactFirstLine + 3, nodeStatus, 0, true, "");
 
     uint8_t dmac[6];
     char shortnameble[35];
     getMacAddr(dmac);
-    snprintf(screen->ourId, sizeof(screen->ourId), "%02x%02x", dmac[4], dmac[5]);
-    snprintf(shortnameble, sizeof(shortnameble), "BLE: %s", screen->ourId);
+    snprintf(ourId, sizeof(ourId), "%02x%02x", dmac[4], dmac[5]);
+    snprintf(shortnameble, sizeof(shortnameble), "BLE: %s", ourId);
     int textWidth = display->getStringWidth(shortnameble);
     int nameX = (SCREEN_WIDTH - textWidth);
-    display->drawString(nameX, getTextPositions(display)[line++], shortnameble);
+    display->drawString(nameX, compactFirstLine, shortnameble);
 
     // === Second Row: Radio Preset ===
     auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false);
     char regionradiopreset[25];
     const char *region = myRegion ? myRegion->name : NULL;
-    if (region != nullptr) {
-        snprintf(regionradiopreset, sizeof(regionradiopreset), "%s/%s", region, mode);
-    }
+    snprintf(regionradiopreset, sizeof(regionradiopreset), "%s/%s", region, mode);
     textWidth = display->getStringWidth(regionradiopreset);
     nameX = (SCREEN_WIDTH - textWidth) / 2;
-    display->drawString(nameX, getTextPositions(display)[line++], regionradiopreset);
+    display->drawString(nameX, compactSecondLine, regionradiopreset);
 
     // === Third Row: Frequency / ChanNum ===
     char frequencyslot[35];
@@ -412,9 +448,9 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
     float freq = RadioLibInterface::instance->getFreq();
     snprintf(freqStr, sizeof(freqStr), "%.3f", freq);
     if (config.lora.channel_num == 0) {
-        snprintf(frequencyslot, sizeof(frequencyslot), "Freq: %smhz", freqStr);
+        snprintf(frequencyslot, sizeof(frequencyslot), "Freq: %s", freqStr);
     } else {
-        snprintf(frequencyslot, sizeof(frequencyslot), "Freq/Ch: %smhz (%d)", freqStr, config.lora.channel_num);
+        snprintf(frequencyslot, sizeof(frequencyslot), "Freq/Chan: %s (%d)", freqStr, config.lora.channel_num);
     }
     size_t len = strlen(frequencyslot);
     if (len >= 4 && strcmp(frequencyslot + len - 4, " (0)") == 0) {
@@ -422,26 +458,26 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
     }
     textWidth = display->getStringWidth(frequencyslot);
     nameX = (SCREEN_WIDTH - textWidth) / 2;
-    display->drawString(nameX, getTextPositions(display)[line++], frequencyslot);
+    display->drawString(nameX, compactThirdLine, frequencyslot);
 
     // === Fourth Row: Channel Utilization ===
     const char *chUtil = "ChUtil:";
     char chUtilPercentage[10];
     snprintf(chUtilPercentage, sizeof(chUtilPercentage), "%2.0f%%", airTime->channelUtilizationPercent());
 
-    int chUtil_x = (isHighResolution) ? display->getStringWidth(chUtil) + 10 : display->getStringWidth(chUtil) + 5;
-    int chUtil_y = getTextPositions(display)[line] + 3;
+    int chUtil_x = (SCREEN_WIDTH > 128) ? display->getStringWidth(chUtil) + 10 : display->getStringWidth(chUtil) + 5;
+    int chUtil_y = compactFourthLine + 3;
 
-    int chutil_bar_width = (isHighResolution) ? 100 : 50;
-    int chutil_bar_height = (isHighResolution) ? 12 : 7;
-    int extraoffset = (isHighResolution) ? 6 : 3;
+    int chutil_bar_width = (SCREEN_WIDTH > 128) ? 100 : 50;
+    int chutil_bar_height = (SCREEN_WIDTH > 128) ? 12 : 7;
+    int extraoffset = (SCREEN_WIDTH > 128) ? 6 : 3;
     int chutil_percent = airTime->channelUtilizationPercent();
 
     int centerofscreen = SCREEN_WIDTH / 2;
     int total_line_content_width = (chUtil_x + chutil_bar_width + display->getStringWidth(chUtilPercentage) + extraoffset) / 2;
     int starting_position = centerofscreen - total_line_content_width;
 
-    display->drawString(starting_position, getTextPositions(display)[line++], chUtil);
+    display->drawString(starting_position, compactFourthLine, chUtil);
 
     // Force 56% or higher to show a full 100% bar, text would still show related percent.
     if (chutil_percent >= 61) {
@@ -478,8 +514,7 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
         display->fillRect(starting_position + chUtil_x, chUtil_y, fillRight, chutil_bar_height);
     }
 
-    display->drawString(starting_position + chUtil_x + chutil_bar_width + extraoffset, getTextPositions(display)[4],
-                        chUtilPercentage);
+    display->drawString(starting_position + chUtil_x + chutil_bar_width + extraoffset, compactFourthLine, chUtilPercentage);
 }
 
 // ****************************
@@ -491,22 +526,43 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
     display->setFont(FONT_SMALL);
     display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-    // === Set Title
-    const char *titleStr = "System";
-
     // === Header ===
-    graphics::drawCommonHeader(display, x, y, titleStr);
+    graphics::drawCommonHeader(display, x, y);
+
+    // === Draw title ===
+    const int highlightHeight = FONT_HEIGHT_SMALL - 1;
+    const int textY = y + 1 + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
+    const char *titleStr = (SCREEN_WIDTH > 128) ? "Memory" : "Mem";
+    const int centerX = x + SCREEN_WIDTH / 2;
+
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
+        display->setColor(BLACK);
+    }
+
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+    display->drawString(centerX, textY, titleStr);
+    if (config.display.heading_bold) {
+        display->drawString(centerX + 1, textY, titleStr);
+    }
+    display->setColor(WHITE);
 
     // === Layout ===
-    int line = 1;
+    int contentY = y + FONT_HEIGHT_SMALL;
+    const int rowYOffset = FONT_HEIGHT_SMALL - 3;
     const int barHeight = 6;
     const int labelX = x;
-    int barsOffset = (isHighResolution) ? 24 : 0;
-#ifdef USE_EINK
-    barsOffset -= 12;
-#endif
+    const int barsOffset = (SCREEN_WIDTH > 128) ? 24 : 0;
     const int barX = x + 40 + barsOffset;
 
+    int rowY = contentY;
+
+    // === Heap delta tracking (disabled) ===
+    /*
+    static uint32_t previousHeapFree = 0;
+    static int32_t totalHeapDelta = 0;
+    static int deltaChangeCount = 0;
+    */
+
     auto drawUsageRow = [&](const char *label, uint32_t used, uint32_t total, bool isHeap = false) {
         if (total == 0)
             return;
@@ -514,8 +570,8 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
         int percent = (used * 100) / total;
 
         char combinedStr[24];
-        if (isHighResolution) {
-            snprintf(combinedStr, sizeof(combinedStr), "%s%3d%%  %u/%uKB", (percent > 80) ? "! " : "", percent, used / 1024,
+        if (SCREEN_WIDTH > 128) {
+            snprintf(combinedStr, sizeof(combinedStr), "%s%3d%%  %lu/%luKB", (percent > 80) ? "! " : "", percent, used / 1024,
                      total / 1024);
         } else {
             snprintf(combinedStr, sizeof(combinedStr), "%s%3d%%", (percent > 80) ? "! " : "", percent);
@@ -530,10 +586,10 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
 
         // Label
         display->setTextAlignment(TEXT_ALIGN_LEFT);
-        display->drawString(labelX, getTextPositions(display)[line], label);
+        display->drawString(labelX, rowY, label);
 
         // Bar
-        int barY = getTextPositions(display)[line] + (FONT_HEIGHT_SMALL - barHeight) / 2;
+        int barY = rowY + (FONT_HEIGHT_SMALL - barHeight) / 2;
         display->setColor(WHITE);
         display->drawRect(barX, barY, adjustedBarWidth, barHeight);
 
@@ -542,7 +598,45 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
 
         // Value string
         display->setTextAlignment(TEXT_ALIGN_RIGHT);
-        display->drawString(SCREEN_WIDTH - 2, getTextPositions(display)[line], combinedStr);
+        display->drawString(SCREEN_WIDTH - 2, rowY, combinedStr);
+
+        rowY += rowYOffset;
+
+        // === Heap delta display (disabled) ===
+        /*
+        if (isHeap && previousHeapFree > 0) {
+            int32_t delta = (int32_t)(memGet.getFreeHeap() - previousHeapFree);
+            if (delta != 0) {
+                totalHeapDelta += delta;
+                deltaChangeCount++;
+
+                char deltaStr[16];
+                snprintf(deltaStr, sizeof(deltaStr), "%ld", delta);
+
+                int deltaX = centerX - display->getStringWidth(deltaStr) / 2 - 8;
+                int deltaY = rowY + 1;
+
+                // Triangle
+                if (delta > 0) {
+                    display->drawLine(deltaX, deltaY + 6, deltaX + 3, deltaY);
+                    display->drawLine(deltaX + 3, deltaY, deltaX + 6, deltaY + 6);
+                    display->drawLine(deltaX, deltaY + 6, deltaX + 6, deltaY + 6);
+                } else {
+                    display->drawLine(deltaX, deltaY, deltaX + 3, deltaY + 6);
+                    display->drawLine(deltaX + 3, deltaY + 6, deltaX + 6, deltaY);
+                    display->drawLine(deltaX, deltaY, deltaX + 6, deltaY);
+                }
+
+                display->setTextAlignment(TEXT_ALIGN_CENTER);
+                display->drawString(centerX + 6, deltaY, deltaStr);
+                rowY += rowYOffset;
+            }
+        }
+
+        if (isHeap) {
+            previousHeapFree = memGet.getFreeHeap();
+        }
+        */
     };
 
     // === Memory values ===
@@ -571,52 +665,13 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
     */
     // === Draw memory rows
     drawUsageRow("Heap:", heapUsed, heapTotal, true);
+    drawUsageRow("PSRAM:", psramUsed, psramTotal);
 #ifdef ESP32
-    if (psramUsed > 0) {
-        line += 1;
-        drawUsageRow("PSRAM:", psramUsed, psramTotal);
-    }
-    if (flashTotal > 0) {
-        line += 1;
+    if (flashTotal > 0)
         drawUsageRow("Flash:", flashUsed, flashTotal);
-    }
 #endif
-    if (hasSD && sdTotal > 0) {
-        line += 1;
+    if (hasSD && sdTotal > 0)
         drawUsageRow("SD:", sdUsed, sdTotal);
-    }
-
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
-    // System Uptime
-    if (line < 2) {
-        line += 1;
-    }
-    line += 1;
-    char appversionstr[35];
-    snprintf(appversionstr, sizeof(appversionstr), "Ver.: %s", optstr(APP_VERSION));
-    int textWidth = display->getStringWidth(appversionstr);
-    int nameX = (SCREEN_WIDTH - textWidth) / 2;
-    display->drawString(nameX, getTextPositions(display)[line], appversionstr);
-
-    if (SCREEN_HEIGHT > 64 || (SCREEN_HEIGHT <= 64 && line < 4)) { // Only show uptime if the screen can show it
-        line += 1;
-        char uptimeStr[32] = "";
-        uint32_t uptime = millis() / 1000;
-        uint32_t days = uptime / 86400;
-        uint32_t hours = (uptime % 86400) / 3600;
-        uint32_t mins = (uptime % 3600) / 60;
-        // Show as "Up: 2d 3h", "Up: 5h 14m", or "Up: 37m"
-        if (days)
-            snprintf(uptimeStr, sizeof(uptimeStr), " Up: %ud %uh", days, hours);
-        else if (hours)
-            snprintf(uptimeStr, sizeof(uptimeStr), " Up: %uh %um", hours, mins);
-        else
-            snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %um", mins);
-        textWidth = display->getStringWidth(uptimeStr);
-        nameX = (SCREEN_WIDTH - textWidth) / 2;
-        display->drawString(nameX, getTextPositions(display)[line], uptimeStr);
-    }
 }
 } // namespace DebugRenderer
 } // namespace graphics
-#endif

src/graphics/draw/MenuHandler.h

@@ -1,70 +0,0 @@
-#pragma once
-#if HAS_SCREEN
-#include "configuration.h"
-namespace graphics
-{
-
-class menuHandler
-{
-  public:
-    enum screenMenus {
-        menu_none,
-        lora_picker,
-        TZ_picker,
-        twelve_hour_picker,
-        clock_face_picker,
-        clock_menu,
-        position_base_menu,
-        gps_toggle_menu,
-        compass_point_north_menu,
-        reset_node_db_menu,
-        buzzermodemenupicker,
-        mui_picker,
-        tftcolormenupicker,
-        brightness_picker,
-        reboot_menu,
-        add_favorite,
-        remove_favorite,
-        test_menu,
-        number_test,
-        wifi_toggle_menu,
-        key_verification_init,
-        key_verification_final_prompt,
-        bluetooth_toggle_menu,
-        throttle_message
-    };
-    static screenMenus menuQueue;
-
-    static void LoraRegionPicker(uint32_t duration = 30000);
-    static void handleMenuSwitch(OLEDDisplay *display);
-    static void clockMenu();
-    static void TZPicker();
-    static void TwelveHourPicker();
-    static void ClockFacePicker();
-    static void messageResponseMenu();
-    static void homeBaseMenu();
-    static void systemBaseMenu();
-    static void favoriteBaseMenu();
-    static void positionBaseMenu();
-    static void compassNorthMenu();
-    static void GPSToggleMenu();
-    static void BuzzerModeMenu();
-    static void switchToMUIMenu();
-    static void TFTColorPickerMenu(OLEDDisplay *display);
-    static void nodeListMenu();
-    static void resetNodeDBMenu();
-    static void BrightnessPickerMenu();
-    static void rebootMenu();
-    static void addFavoriteMenu();
-    static void removeFavoriteMenu();
-    static void testMenu();
-    static void numberTest();
-    static void wifiBaseMenu();
-    static void wifiToggleMenu();
-    static void keyVerificationInitMenu();
-    static void keyVerificationFinalPrompt();
-    static void BluetoothToggleMenu();
-};
-
-} // namespace graphics
-#endif

src/graphics/draw/MessageRenderer.cpp

@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "configuration.h"
-#if HAS_SCREEN
 #include "MessageRenderer.h"
 
 // Core includes
@@ -37,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Additional includes for UI rendering
 #include "UIRenderer.h"
-#include "graphics/TimeFormatters.h"
 
 // Additional includes for dependencies
 #include <string>
@@ -56,10 +53,76 @@ namespace graphics
 namespace MessageRenderer
 {
 
-// Simple cache based on text hash
-static size_t cachedKey = 0;
-static std::vector<std::string> cachedLines;
-static std::vector<int> cachedHeights;
+// Forward declaration from Screen.cpp - this function needs to be accessible
+// For now, we'll implement a local version that matches the Screen.cpp functionality
+bool deltaToTimestamp(uint32_t secondsAgo, uint8_t *hours, uint8_t *minutes, int32_t *daysAgo)
+{
+    // Cache the result - avoid frequent recalculation
+    static uint8_t hoursCached = 0, minutesCached = 0;
+    static uint32_t daysAgoCached = 0;
+    static uint32_t secondsAgoCached = 0;
+    static bool validCached = false;
+
+    // Abort: if timezone not set
+    if (strlen(config.device.tzdef) == 0) {
+        validCached = false;
+        return validCached;
+    }
+
+    // Abort: if invalid pointers passed
+    if (hours == nullptr || minutes == nullptr || daysAgo == nullptr) {
+        validCached = false;
+        return validCached;
+    }
+
+    // Abort: if time seems invalid.. (> 6 months ago, probably seen before RTC set)
+    if (secondsAgo > SEC_PER_DAY * 30UL * 6) {
+        validCached = false;
+        return validCached;
+    }
+
+    // If repeated request, don't bother recalculating
+    if (secondsAgo - secondsAgoCached < 60 && secondsAgoCached != 0) {
+        if (validCached) {
+            *hours = hoursCached;
+            *minutes = minutesCached;
+            *daysAgo = daysAgoCached;
+        }
+        return validCached;
+    }
+
+    // Get local time
+    uint32_t secondsRTC = getValidTime(RTCQuality::RTCQualityDevice, true); // Get local time
+
+    // Abort: if RTC not set
+    if (!secondsRTC) {
+        validCached = false;
+        return validCached;
+    }
+
+    // Get absolute time when last seen
+    uint32_t secondsSeenAt = secondsRTC - secondsAgo;
+
+    // Calculate daysAgo
+    *daysAgo = (secondsRTC / SEC_PER_DAY) - (secondsSeenAt / SEC_PER_DAY); // How many "midnights" have passed
+
+    // Get seconds since midnight
+    uint32_t hms = (secondsRTC - secondsAgo) % SEC_PER_DAY;
+    hms = (hms + SEC_PER_DAY) % SEC_PER_DAY;
+
+    // Tear apart hms into hours and minutes
+    *hours = hms / SEC_PER_HOUR;
+    *minutes = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
+
+    // Cache the result
+    daysAgoCached = *daysAgo;
+    hoursCached = *hours;
+    minutesCached = *minutes;
+    secondsAgoCached = secondsAgo;
+
+    validCached = true;
+    return validCached;
+}
 
 void drawStringWithEmotes(OLEDDisplay *display, int x, int y, const std::string &line, const Emote *emotes, int emoteCount)
 {
@@ -169,7 +232,6 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     const meshtastic_MeshPacket &mp = devicestate.rx_text_message;
     const char *msg = reinterpret_cast<const char *>(mp.decoded.payload.bytes);
 
-    display->clear();
     display->setTextAlignment(TEXT_ALIGN_LEFT);
     display->setFont(FONT_SMALL);
 
@@ -177,25 +239,11 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     const int scrollBottom = SCREEN_HEIGHT - navHeight;
     const int usableHeight = scrollBottom;
     const int textWidth = SCREEN_WIDTH;
+    const int cornerRadius = 2;
 
     bool isInverted = (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_INVERTED);
     bool isBold = config.display.heading_bold;
 
-    // === Set Title
-    const char *titleStr = "Messages";
-
-    // Check if we have more than an empty message to show
-    char messageBuf[237];
-    snprintf(messageBuf, sizeof(messageBuf), "%s", msg);
-    if (strlen(messageBuf) == 0) {
-        // === Header ===
-        graphics::drawCommonHeader(display, x, y, titleStr);
-        const char *messageString = "No messages";
-        int center_text = (SCREEN_WIDTH / 2) - (display->getStringWidth(messageString) / 2);
-        display->drawString(center_text, getTextPositions(display)[2], messageString);
-        return;
-    }
-
     // === Header Construction ===
     meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(getFrom(&mp));
     char headerStr[80];
@@ -230,14 +278,14 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                  sender);
     }
 
-    uint32_t now = millis();
 #ifndef EXCLUDE_EMOJI
     // === Bounce animation setup ===
     static uint32_t lastBounceTime = 0;
     static int bounceY = 0;
     const int bounceRange = 2;     // Max pixels to bounce up/down
-    const int bounceInterval = 10; // How quickly to change bounce direction (ms)
+    const int bounceInterval = 60; // How quickly to change bounce direction (ms)
 
+    uint32_t now = millis();
     if (now - lastBounceTime >= bounceInterval) {
         lastBounceTime = now;
         bounceY = (bounceY + 1) % (bounceRange * 2);
@@ -245,57 +293,88 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     for (int i = 0; i < numEmotes; ++i) {
         const Emote &e = emotes[i];
         if (strcmp(msg, e.label) == 0) {
-            int headerY = getTextPositions(display)[1]; // same as scrolling header line
-            display->drawString(x + 3, headerY, headerStr);
-            if (isInverted && isBold)
-                display->drawString(x + 4, headerY, headerStr);
-
-            // Draw separator (same as scroll version)
-            for (int separatorX = 1; separatorX <= (display->getStringWidth(headerStr) + 2); separatorX += 2) {
-                display->setPixel(separatorX, headerY + ((isHighResolution) ? 19 : 13));
+            // Draw the header
+            if (isInverted) {
+                drawRoundedHighlight(display, x, 0, SCREEN_WIDTH, FONT_HEIGHT_SMALL - 1, cornerRadius);
+                display->setColor(BLACK);
+                display->drawString(x + 3, 0, headerStr);
+                if (isBold)
+                    display->drawString(x + 4, 0, headerStr);
+                display->setColor(WHITE);
+            } else {
+                display->drawString(x, 0, headerStr);
+                if (SCREEN_WIDTH > 128) {
+                    display->drawLine(0, 20, SCREEN_WIDTH, 20);
+                } else {
+                    display->drawLine(0, 14, SCREEN_WIDTH, 14);
+                }
             }
 
-            // Center the emote below the header line + separator + nav
-            int remainingHeight = SCREEN_HEIGHT - (headerY + FONT_HEIGHT_SMALL) - navHeight;
-            int emoteY = headerY + 6 + FONT_HEIGHT_SMALL + (remainingHeight - e.height) / 2 + bounceY - bounceRange;
+            // Center the emote below header + apply bounce
+            int remainingHeight = SCREEN_HEIGHT - FONT_HEIGHT_SMALL - navHeight;
+            int emoteY = FONT_HEIGHT_SMALL + (remainingHeight - e.height) / 2 + bounceY - bounceRange;
             display->drawXbm((SCREEN_WIDTH - e.width) / 2, emoteY, e.width, e.height, e.bitmap);
-
-            // Draw header at the end to sort out overlapping elements
-            graphics::drawCommonHeader(display, x, y, titleStr);
             return;
         }
     }
 #endif
-    // === Generate the cache key ===
-    size_t currentKey = (size_t)mp.from;
-    currentKey ^= ((size_t)mp.to << 8);
-    currentKey ^= ((size_t)mp.rx_time << 16);
-    currentKey ^= ((size_t)mp.id << 24);
 
-    if (cachedKey != currentKey) {
-        LOG_INFO("Message cache key is misssed cachedKey=0x%0x, currentKey=0x%x", cachedKey, currentKey);
+    // === Word-wrap and build line list ===
+    char messageBuf[237];
+    snprintf(messageBuf, sizeof(messageBuf), "%s", msg);
 
-        // Cache miss - regenerate lines and heights
-        cachedLines = generateLines(display, headerStr, messageBuf, textWidth);
-        cachedHeights = calculateLineHeights(cachedLines, emotes);
-        cachedKey = currentKey;
-    } else {
-        // Cache hit but update the header line with current time information
-        cachedLines[0] = std::string(headerStr);
-        // The header always has a fixed height since it doesn't contain emotes
-        // As per calculateLineHeights logic for lines without emotes:
-        cachedHeights[0] = FONT_HEIGHT_SMALL - 2;
-        if (cachedHeights[0] < 8)
-            cachedHeights[0] = 8; // minimum safety
+    std::vector<std::string> lines;
+    lines.push_back(std::string(headerStr)); // Header line is always first
+
+    std::string line, word;
+    for (int i = 0; messageBuf[i]; ++i) {
+        char ch = messageBuf[i];
+        if (ch == '\n') {
+            if (!word.empty())
+                line += word;
+            if (!line.empty())
+                lines.push_back(line);
+            line.clear();
+            word.clear();
+        } else if (ch == ' ') {
+            line += word + ' ';
+            word.clear();
+        } else {
+            word += ch;
+            std::string test = line + word;
+            if (display->getStringWidth(test.c_str()) > textWidth + 4) {
+                if (!line.empty())
+                    lines.push_back(line);
+                line = word;
+                word.clear();
+            }
+        }
     }
+    if (!word.empty())
+        line += word;
+    if (!line.empty())
+        lines.push_back(line);
 
     // === Scrolling logic ===
-    int totalHeight = 0;
-    for (size_t i = 1; i < cachedHeights.size(); ++i) {
-        totalHeight += cachedHeights[i];
+    std::vector<int> rowHeights;
+
+    for (const auto &line : lines) {
+        int maxHeight = FONT_HEIGHT_SMALL;
+        for (int i = 0; i < numEmotes; ++i) {
+            const Emote &e = emotes[i];
+            if (line.find(e.label) != std::string::npos) {
+                if (e.height > maxHeight)
+                    maxHeight = e.height;
+            }
+        }
+        rowHeights.push_back(maxHeight);
     }
-    int usableScrollHeight = usableHeight - cachedHeights[0]; // remove header height
-    int scrollStop = std::max(0, totalHeight - usableScrollHeight + cachedHeights.back());
+    int totalHeight = 0;
+    for (size_t i = 1; i < rowHeights.size(); ++i) {
+        totalHeight += rowHeights[i];
+    }
+    int usableScrollHeight = usableHeight - rowHeights[0]; // remove header height
+    int scrollStop = std::max(0, totalHeight - usableScrollHeight);
 
     static float scrollY = 0.0f;
     static uint32_t lastTime = 0, scrollStartDelay = 0, pauseStart = 0;
@@ -315,7 +394,7 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     if (!scrollStarted && now - scrollStartDelay > 2000)
         scrollStarted = true;
 
-    if (totalHeight > usableScrollHeight) {
+    if (totalHeight > usableHeight) {
         if (scrollStarted) {
             if (!waitingToReset) {
                 scrollY += delta * scrollSpeed;
@@ -336,105 +415,28 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     }
 
     int scrollOffset = static_cast<int>(scrollY);
-    int yOffset = -scrollOffset + getTextPositions(display)[1];
-    for (int separatorX = 1; separatorX <= (display->getStringWidth(headerStr) + 2); separatorX += 2) {
-        display->setPixel(separatorX, yOffset + ((isHighResolution) ? 19 : 13));
+    int yOffset = -scrollOffset;
+    if (!isInverted) {
+        if (SCREEN_WIDTH > 128) {
+            display->drawLine(0, yOffset + 20, SCREEN_WIDTH, yOffset + 20);
+        } else {
+            display->drawLine(0, yOffset + 14, SCREEN_WIDTH, yOffset + 14);
+        }
     }
 
     // === Render visible lines ===
-    renderMessageContent(display, cachedLines, cachedHeights, x, yOffset, scrollBottom, emotes, numEmotes, isInverted, isBold);
-
-    // Draw header at the end to sort out overlapping elements
-    graphics::drawCommonHeader(display, x, y, titleStr);
-}
-
-std::vector<std::string> generateLines(OLEDDisplay *display, const char *headerStr, const char *messageBuf, int textWidth)
-{
-    std::vector<std::string> lines;
-    lines.push_back(std::string(headerStr)); // Header line is always first
-
-    std::string line, word;
-    for (int i = 0; messageBuf[i]; ++i) {
-        char ch = messageBuf[i];
-        if ((unsigned char)messageBuf[i] == 0xE2 && (unsigned char)messageBuf[i + 1] == 0x80 &&
-            (unsigned char)messageBuf[i + 2] == 0x99) {
-            ch = '\''; // plain apostrophe
-            i += 2;    // skip over the extra UTF-8 bytes
-        }
-        if (ch == '\n') {
-            if (!word.empty())
-                line += word;
-            if (!line.empty())
-                lines.push_back(line);
-            line.clear();
-            word.clear();
-        } else if (ch == ' ') {
-            line += word + ' ';
-            word.clear();
-        } else {
-            word += ch;
-            std::string test = line + word;
-            // Keep these lines for diagnostics
-            // LOG_INFO("Char: '%c' (0x%02X)", ch, (unsigned char)ch);
-            // LOG_INFO("Current String: %s", test.c_str());
-            if (display->getStringWidth(test.c_str()) > textWidth) {
-                if (!line.empty())
-                    lines.push_back(line);
-                line = word;
-                word.clear();
-            }
-        }
-    }
-
-    if (!word.empty())
-        line += word;
-    if (!line.empty())
-        lines.push_back(line);
-
-    return lines;
-}
-
-std::vector<int> calculateLineHeights(const std::vector<std::string> &lines, const Emote *emotes)
-{
-    std::vector<int> rowHeights;
-
-    for (const auto &_line : lines) {
-        int lineHeight = FONT_HEIGHT_SMALL;
-        bool hasEmote = false;
-
-        for (int i = 0; i < numEmotes; ++i) {
-            const Emote &e = emotes[i];
-            if (_line.find(e.label) != std::string::npos) {
-                lineHeight = std::max(lineHeight, e.height);
-                hasEmote = true;
-            }
-        }
-
-        // Apply tighter spacing if no emotes on this line
-        if (!hasEmote) {
-            lineHeight -= 2; // reduce by 2px for tighter spacing
-            if (lineHeight < 8)
-                lineHeight = 8; // minimum safety
-        }
-
-        rowHeights.push_back(lineHeight);
-    }
-
-    return rowHeights;
-}
-
-void renderMessageContent(OLEDDisplay *display, const std::vector<std::string> &lines, const std::vector<int> &rowHeights, int x,
-                          int yOffset, int scrollBottom, const Emote *emotes, int numEmotes, bool isInverted, bool isBold)
-{
     for (size_t i = 0; i < lines.size(); ++i) {
         int lineY = yOffset;
         for (size_t j = 0; j < i; ++j)
             lineY += rowHeights[j];
         if (lineY > -rowHeights[i] && lineY < scrollBottom) {
             if (i == 0 && isInverted) {
-                display->drawString(x, lineY, lines[i].c_str());
+                drawRoundedHighlight(display, x, lineY, SCREEN_WIDTH, FONT_HEIGHT_SMALL - 1, cornerRadius);
+                display->setColor(BLACK);
+                display->drawString(x + 3, lineY, lines[i].c_str());
                 if (isBold)
-                    display->drawString(x, lineY, lines[i].c_str());
+                    display->drawString(x + 4, lineY, lines[i].c_str());
+                display->setColor(WHITE);
             } else {
                 drawStringWithEmotes(display, x, lineY, lines[i], emotes, numEmotes);
             }
@@ -444,4 +446,3 @@ void renderMessageContent(OLEDDisplay *display, const std::vector<std::string> &
 
 } // namespace MessageRenderer
 } // namespace graphics
-#endif

src/graphics/draw/MessageRenderer.h

@@ -2,8 +2,6 @@
 #include "OLEDDisplay.h"
 #include "OLEDDisplayUi.h"
 #include "graphics/emotes.h"
-#include <string>
-#include <vector>
 
 namespace graphics
 {
@@ -16,15 +14,5 @@ void drawStringWithEmotes(OLEDDisplay *display, int x, int y, const std::string
 /// Draws the text message frame for displaying received messages
 void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 
-// Function to generate lines with word wrapping
-std::vector<std::string> generateLines(OLEDDisplay *display, const char *headerStr, const char *messageBuf, int textWidth);
-
-// Function to calculate heights for each line
-std::vector<int> calculateLineHeights(const std::vector<std::string> &lines, const Emote *emotes);
-
-// Function to render the message content
-void renderMessageContent(OLEDDisplay *display, const std::vector<std::string> &lines, const std::vector<int> &rowHeights, int x,
-                          int yOffset, int scrollBottom, const Emote *emotes, int numEmotes, bool isInverted, bool isBold);
-
 } // namespace MessageRenderer
 } // namespace graphics

src/graphics/draw/NodeListRenderer.cpp

@@ -1,15 +1,13 @@
-#include "configuration.h"
-#if HAS_SCREEN
+#include "NodeListRenderer.h"
 #include "CompassRenderer.h"
 #include "NodeDB.h"
-#include "NodeListRenderer.h"
 #include "UIRenderer.h"
+#include "configuration.h"
 #include "gps/GeoCoord.h"
 #include "gps/RTC.h" // for getTime() function
 #include "graphics/ScreenFonts.h"
 #include "graphics/SharedUIDisplay.h"
 #include "graphics/images.h"
-#include "meshUtils.h"
 #include <algorithm>
 
 // Forward declarations for functions defined in Screen.cpp
@@ -66,25 +64,31 @@ const char *getSafeNodeName(meshtastic_NodeInfoLite *node)
             strncpy(nodeName, name, sizeof(nodeName) - 1);
             nodeName[sizeof(nodeName) - 1] = '\0';
         } else {
-            snprintf(nodeName, sizeof(nodeName), "(%04X)", (uint16_t)(node->num & 0xFFFF));
+            snprintf(nodeName, sizeof(nodeName), "%04X", (uint16_t)(node->num & 0xFFFF));
         }
     } else {
-        snprintf(nodeName, sizeof(nodeName), "(%04X)", (uint16_t)(node->num & 0xFFFF));
+        strcpy(nodeName, "?");
     }
     return nodeName;
 }
 
+uint32_t sinceLastSeen(meshtastic_NodeInfoLite *node)
+{
+    uint32_t now = getTime();
+    uint32_t last_seen = node->last_heard;
+    if (last_seen == 0 || now < last_seen) {
+        return UINT32_MAX;
+    }
+    return now - last_seen;
+}
+
 const char *getCurrentModeTitle(int screenWidth)
 {
     switch (currentMode) {
     case MODE_LAST_HEARD:
-        return "Last Heard";
+        return "Node List";
     case MODE_HOP_SIGNAL:
-#ifdef USE_EINK
-        return "Hops/Sig";
-#else
-        return (isHighResolution) ? "Hops/Signal" : "Hops/Sig";
-#endif
+        return (screenWidth > 128) ? "Hops/Signal" : "Hops/Sig";
     case MODE_DISTANCE:
         return "Distance";
     default:
@@ -98,15 +102,54 @@ unsigned long getModeCycleIntervalMs()
     return 3000;
 }
 
+// Calculate bearing between two lat/lon points
+float calculateBearing(double lat1, double lon1, double lat2, double lon2)
+{
+    double dLon = (lon2 - lon1) * DEG_TO_RAD;
+    double y = sin(dLon) * cos(lat2 * DEG_TO_RAD);
+    double x = cos(lat1 * DEG_TO_RAD) * sin(lat2 * DEG_TO_RAD) - sin(lat1 * DEG_TO_RAD) * cos(lat2 * DEG_TO_RAD) * cos(dLon);
+    double bearing = atan2(y, x) * RAD_TO_DEG;
+    return fmod(bearing + 360.0, 360.0);
+}
+
 int calculateMaxScroll(int totalEntries, int visibleRows)
 {
     return std::max(0, (totalEntries - 1) / (visibleRows * 2));
 }
 
+void retrieveAndSortNodes(std::vector<NodeEntry> &nodeList)
+{
+    size_t numNodes = nodeDB->getNumMeshNodes();
+    for (size_t i = 0; i < numNodes; i++) {
+        meshtastic_NodeInfoLite *node = nodeDB->getMeshNodeByIndex(i);
+        if (!node || node->num == nodeDB->getNodeNum())
+            continue;
+
+        NodeEntry entry;
+        entry.node = node;
+        entry.sortValue = sinceLastSeen(node);
+
+        nodeList.push_back(entry);
+    }
+
+    // Sort nodes: favorites first, then by last heard (most recent first)
+    std::sort(nodeList.begin(), nodeList.end(), [](const NodeEntry &a, const NodeEntry &b) {
+        bool aFav = a.node->is_favorite;
+        bool bFav = b.node->is_favorite;
+        if (aFav != bFav)
+            return aFav > bFav;
+        if (a.sortValue == 0 || a.sortValue == UINT32_MAX)
+            return false;
+        if (b.sortValue == 0 || b.sortValue == UINT32_MAX)
+            return true;
+        return a.sortValue < b.sortValue;
+    });
+}
+
 void drawColumnSeparator(OLEDDisplay *display, int16_t x, int16_t yStart, int16_t yEnd)
 {
     int columnWidth = display->getWidth() / 2;
-    int separatorX = x + columnWidth - 2;
+    int separatorX = x + columnWidth - 1;
     for (int y = yStart; y <= yEnd; y += 2) {
         display->setPixel(separatorX, y);
     }
@@ -135,7 +178,7 @@ void drawScrollbar(OLEDDisplay *display, int visibleNodeRows, int totalEntries,
 void drawEntryLastHeard(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16_t x, int16_t y, int columnWidth)
 {
     bool isLeftCol = (x < SCREEN_WIDTH / 2);
-    int timeOffset = (isHighResolution) ? (isLeftCol ? 7 : 10) : (isLeftCol ? 3 : 7);
+    int timeOffset = (SCREEN_WIDTH > 128) ? (isLeftCol ? 7 : 10) : (isLeftCol ? 3 : 7);
 
     const char *nodeName = getSafeNodeName(node);
 
@@ -156,9 +199,9 @@ void drawEntryLastHeard(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int
 
     display->setTextAlignment(TEXT_ALIGN_LEFT);
     display->setFont(FONT_SMALL);
-    display->drawString(x + ((isHighResolution) ? 6 : 3), y, nodeName);
+    display->drawString(x + ((SCREEN_WIDTH > 128) ? 6 : 3), y, nodeName);
     if (node->is_favorite) {
-        if (isHighResolution) {
+        if (SCREEN_WIDTH > 128) {
             drawScaledXBitmap16x16(x, y + 6, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint, display);
         } else {
             display->drawXbm(x, y + 5, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint);
@@ -166,8 +209,6 @@ void drawEntryLastHeard(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int
     }
 
     int rightEdge = x + columnWidth - timeOffset;
-    if (timeStr[strlen(timeStr) - 1] == 'm') // Fix the fact that our fonts don't line up well all the time
-        rightEdge -= 1;
     int textWidth = display->getStringWidth(timeStr);
     display->drawString(rightEdge - textWidth, y, timeStr);
 }
@@ -177,8 +218,8 @@ void drawEntryHopSignal(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int
     bool isLeftCol = (x < SCREEN_WIDTH / 2);
 
     int nameMaxWidth = columnWidth - 25;
-    int barsOffset = (isHighResolution) ? (isLeftCol ? 20 : 24) : (isLeftCol ? 15 : 19);
-    int hopOffset = (isHighResolution) ? (isLeftCol ? 21 : 29) : (isLeftCol ? 13 : 17);
+    int barsOffset = (SCREEN_WIDTH > 128) ? (isLeftCol ? 16 : 20) : (isLeftCol ? 15 : 19);
+    int hopOffset = (SCREEN_WIDTH > 128) ? (isLeftCol ? 17 : 25) : (isLeftCol ? 13 : 17);
 
     int barsXOffset = columnWidth - barsOffset;
 
@@ -187,9 +228,9 @@ void drawEntryHopSignal(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int
     display->setTextAlignment(TEXT_ALIGN_LEFT);
     display->setFont(FONT_SMALL);
 
-    display->drawStringMaxWidth(x + ((isHighResolution) ? 6 : 3), y, nameMaxWidth, nodeName);
+    display->drawStringMaxWidth(x + ((SCREEN_WIDTH > 128) ? 6 : 3), y, nameMaxWidth, nodeName);
     if (node->is_favorite) {
-        if (isHighResolution) {
+        if (SCREEN_WIDTH > 128) {
             drawScaledXBitmap16x16(x, y + 6, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint, display);
         } else {
             display->drawXbm(x, y + 5, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint);
@@ -224,7 +265,7 @@ void drawEntryHopSignal(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int
 void drawNodeDistance(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16_t x, int16_t y, int columnWidth)
 {
     bool isLeftCol = (x < SCREEN_WIDTH / 2);
-    int nameMaxWidth = columnWidth - (isHighResolution ? (isLeftCol ? 25 : 28) : (isLeftCol ? 20 : 22));
+    int nameMaxWidth = columnWidth - (SCREEN_WIDTH > 128 ? (isLeftCol ? 25 : 28) : (isLeftCol ? 20 : 22));
 
     const char *nodeName = getSafeNodeName(node);
     char distStr[10] = "";
@@ -279,9 +320,9 @@ void drawNodeDistance(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
 
     display->setTextAlignment(TEXT_ALIGN_LEFT);
     display->setFont(FONT_SMALL);
-    display->drawStringMaxWidth(x + ((isHighResolution) ? 6 : 3), y, nameMaxWidth, nodeName);
+    display->drawStringMaxWidth(x + ((SCREEN_WIDTH > 128) ? 6 : 3), y, nameMaxWidth, nodeName);
     if (node->is_favorite) {
-        if (isHighResolution) {
+        if (SCREEN_WIDTH > 128) {
             drawScaledXBitmap16x16(x, y + 6, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint, display);
         } else {
             display->drawXbm(x, y + 5, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint);
@@ -289,8 +330,8 @@ void drawNodeDistance(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
     }
 
     if (strlen(distStr) > 0) {
-        int offset = (isHighResolution) ? (isLeftCol ? 7 : 10) // Offset for Wide Screens (Left Column:Right Column)
-                                        : (isLeftCol ? 4 : 7); // Offset for Narrow Screens (Left Column:Right Column)
+        int offset = (SCREEN_WIDTH > 128) ? (isLeftCol ? 7 : 10) // Offset for Wide Screens (Left Column:Right Column)
+                                          : (isLeftCol ? 5 : 8); // Offset for Narrow Screens (Left Column:Right Column)
         int rightEdge = x + columnWidth - offset;
         int textWidth = display->getStringWidth(distStr);
         display->drawString(rightEdge - textWidth, y, distStr);
@@ -319,15 +360,15 @@ void drawEntryCompass(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
     bool isLeftCol = (x < SCREEN_WIDTH / 2);
 
     // Adjust max text width depending on column and screen width
-    int nameMaxWidth = columnWidth - (isHighResolution ? (isLeftCol ? 25 : 28) : (isLeftCol ? 20 : 22));
+    int nameMaxWidth = columnWidth - (SCREEN_WIDTH > 128 ? (isLeftCol ? 25 : 28) : (isLeftCol ? 20 : 22));
 
     const char *nodeName = getSafeNodeName(node);
 
     display->setTextAlignment(TEXT_ALIGN_LEFT);
     display->setFont(FONT_SMALL);
-    display->drawStringMaxWidth(x + ((isHighResolution) ? 6 : 3), y, nameMaxWidth, nodeName);
+    display->drawStringMaxWidth(x + ((SCREEN_WIDTH > 128) ? 6 : 3), y, nameMaxWidth, nodeName);
     if (node->is_favorite) {
-        if (isHighResolution) {
+        if (SCREEN_WIDTH > 128) {
             drawScaledXBitmap16x16(x, y + 6, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint, display);
         } else {
             display->drawXbm(x, y + 5, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint);
@@ -342,21 +383,19 @@ void drawCompassArrow(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
         return;
 
     bool isLeftCol = (x < SCREEN_WIDTH / 2);
-    int arrowXOffset = (isHighResolution) ? (isLeftCol ? 22 : 24) : (isLeftCol ? 12 : 18);
+    int arrowXOffset = (SCREEN_WIDTH > 128) ? (isLeftCol ? 22 : 24) : (isLeftCol ? 12 : 18);
 
     int centerX = x + columnWidth - arrowXOffset;
     int centerY = y + FONT_HEIGHT_SMALL / 2;
 
     double nodeLat = node->position.latitude_i * 1e-7;
     double nodeLon = node->position.longitude_i * 1e-7;
-    float bearing = GeoCoord::bearing(userLat, userLon, nodeLat, nodeLon);
-    float bearingToNode = RAD_TO_DEG * bearing;
+    float bearingToNode = calculateBearing(userLat, userLon, nodeLat, nodeLon);
     float relativeBearing = fmod((bearingToNode - myHeading + 360), 360);
     float angle = relativeBearing * DEG_TO_RAD;
+
     // Shrink size by 2px
     int size = FONT_HEIGHT_SMALL - 5;
-    CompassRenderer::drawArrowToNode(display, centerX, centerY, size, relativeBearing);
-    /*
     float halfSize = size / 2.0;
 
     // Point of the arrow
@@ -381,7 +420,6 @@ void drawCompassArrow(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
     // Draw the chevron-style arrowhead
     display->fillTriangle(tipX, tipY, leftX, leftY, notchX, notchY);
     display->fillTriangle(tipX, tipY, notchX, notchY, rightX, rightY);
-    */
 }
 
 // =============================
@@ -399,21 +437,42 @@ void drawNodeListScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t
     display->clear();
 
     // Draw the battery/time header
-    graphics::drawCommonHeader(display, x, y, title);
+    graphics::drawCommonHeader(display, x, y);
+
+    // Draw the centered title within the header
+    const int highlightHeight = COMMON_HEADER_HEIGHT;
+    const int textY = y + 1 + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
+    const int centerX = x + SCREEN_WIDTH / 2;
+
+    display->setFont(FONT_SMALL);
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_INVERTED)
+        display->setColor(BLACK);
+
+    display->drawString(centerX, textY, title);
+    if (config.display.heading_bold)
+        display->drawString(centerX + 1, textY, title);
+
+    display->setColor(WHITE);
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
 
     // Space below header
     y += COMMON_HEADER_HEIGHT;
 
-    int totalEntries = nodeDB->getNumMeshNodes();
-    int totalRowsAvailable = (display->getHeight() - y) / rowYOffset;
+    // Fetch and display sorted node list
+    std::vector<NodeEntry> nodeList;
+    retrieveAndSortNodes(nodeList);
 
+    int totalEntries = nodeList.size();
+    int totalRowsAvailable = (display->getHeight() - y) / rowYOffset;
+#ifdef USE_EINK
+    totalRowsAvailable -= 1;
+#endif
     int visibleNodeRows = totalRowsAvailable;
     int totalColumns = 2;
 
     int startIndex = scrollIndex * visibleNodeRows * totalColumns;
-    if (nodeDB->getMeshNodeByIndex(startIndex)->num == nodeDB->getNodeNum()) {
-        startIndex++; // skip own node
-    }
     int endIndex = std::min(startIndex + visibleNodeRows * totalColumns, totalEntries);
 
     int yOffset = 0;
@@ -425,10 +484,10 @@ void drawNodeListScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t
     for (int i = startIndex; i < endIndex; ++i) {
         int xPos = x + (col * columnWidth);
         int yPos = y + yOffset;
-        renderer(display, nodeDB->getMeshNodeByIndex(i), xPos, yPos, columnWidth);
+        renderer(display, nodeList[i].node, xPos, yPos, columnWidth);
 
         if (extras) {
-            extras(display, nodeDB->getMeshNodeByIndex(i), xPos, yPos, columnWidth, heading, lat, lon);
+            extras(display, nodeList[i].node, xPos, yPos, columnWidth, heading, lat, lon);
         }
 
         lastNodeY = std::max(lastNodeY, yPos + FONT_HEIGHT_SMALL);
@@ -492,18 +551,13 @@ void drawDynamicNodeListScreen(OLEDDisplay *display, OLEDDisplayUiState *state,
 #ifdef USE_EINK
 void drawLastHeardScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
-    const char *title = "Last Heard";
+    const char *title = "Node List";
     drawNodeListScreen(display, state, x, y, title, drawEntryLastHeard);
 }
 
 void drawHopSignalScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
-#ifdef USE_EINK
-    const char *title = "Hops/Sig";
-#else
-
     const char *title = "Hops/Signal";
-#endif
     drawNodeListScreen(display, state, x, y, title, drawEntryHopSignal);
 }
 
@@ -518,27 +572,285 @@ void drawNodeListWithCompasses(OLEDDisplay *display, OLEDDisplayUiState *state,
 {
     float heading = 0;
     bool validHeading = false;
-    auto ourNode = nodeDB->getMeshNode(nodeDB->getNodeNum());
-    double lat = DegD(ourNode->position.latitude_i);
-    double lon = DegD(ourNode->position.longitude_i);
+    double lat = 0;
+    double lon = 0;
 
-    if (uiconfig.compass_mode != meshtastic_CompassMode_FREEZE_HEADING) {
 #if HAS_GPS
-        if (screen->hasHeading()) {
-            heading = screen->getHeading(); // degrees
-            validHeading = true;
-        } else {
-            heading = screen->estimatedHeading(lat, lon);
-            validHeading = !isnan(heading);
-        }
+    if (screen->hasHeading()) {
+        heading = screen->getHeading(); // degrees
+        validHeading = true;
+    } else {
+        heading = screen->estimatedHeading(lat, lon);
+        validHeading = !isnan(heading);
+    }
 #endif
 
-        if (!validHeading)
-            return;
-    }
+    if (!validHeading)
+        return;
+
     drawNodeListScreen(display, state, x, y, "Bearings", drawEntryCompass, drawCompassArrow, heading, lat, lon);
 }
 
+void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    // Cache favorite nodes for the current frame only, to save computation
+    static std::vector<meshtastic_NodeInfoLite *> favoritedNodes;
+    static int prevFrame = -1;
+
+    // Only rebuild favorites list if we're on a new frame
+    if (state->currentFrame != prevFrame) {
+        prevFrame = state->currentFrame;
+        favoritedNodes.clear();
+        size_t total = nodeDB->getNumMeshNodes();
+        for (size_t i = 0; i < total; i++) {
+            meshtastic_NodeInfoLite *n = nodeDB->getMeshNodeByIndex(i);
+            // Skip nulls and ourself
+            if (!n || n->num == nodeDB->getNodeNum())
+                continue;
+            if (n->is_favorite)
+                favoritedNodes.push_back(n);
+        }
+        // Keep a stable, consistent display order
+        std::sort(favoritedNodes.begin(), favoritedNodes.end(),
+                  [](meshtastic_NodeInfoLite *a, meshtastic_NodeInfoLite *b) { return a->num < b->num; });
+    }
+    if (favoritedNodes.empty())
+        return;
+
+    // Only display if index is valid
+    int nodeIndex = state->currentFrame - (screen->frameCount - favoritedNodes.size());
+    if (nodeIndex < 0 || nodeIndex >= (int)favoritedNodes.size())
+        return;
+
+    meshtastic_NodeInfoLite *node = favoritedNodes[nodeIndex];
+    if (!node || node->num == nodeDB->getNodeNum() || !node->is_favorite)
+        return;
+
+    display->clear();
+
+    // Draw battery/time/mail header (common across screens)
+    graphics::drawCommonHeader(display, x, y);
+
+    // Draw the short node name centered at the top, with bold shadow if set
+    const int highlightHeight = FONT_HEIGHT_SMALL - 1;
+    const int textY = y + 1 + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
+    const int centerX = x + SCREEN_WIDTH / 2;
+    const char *shortName = (node->has_user && haveGlyphs(node->user.short_name)) ? node->user.short_name : "Node";
+
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_INVERTED)
+        display->setColor(BLACK);
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+    display->setFont(FONT_SMALL);
+    display->drawString(centerX, textY, shortName);
+    if (config.display.heading_bold)
+        display->drawString(centerX + 1, textY, shortName);
+
+    display->setColor(WHITE);
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
+    display->setFont(FONT_SMALL);
+
+    // Dynamic row stacking with predefined Y positions
+    const int yPositions[5] = {moreCompactFirstLine, moreCompactSecondLine, moreCompactThirdLine, moreCompactFourthLine,
+                               moreCompactFifthLine};
+    int line = 0;
+
+    // 1. Long Name (always try to show first)
+    const char *username = (node->has_user && node->user.long_name[0]) ? node->user.long_name : nullptr;
+    if (username && line < 5) {
+        display->drawString(x, yPositions[line++], username);
+    }
+
+    // 2. Signal and Hops (combined on one line, if available)
+    char signalHopsStr[32] = "";
+    bool haveSignal = false;
+    int percentSignal = clamp((int)((node->snr + 10) * 5), 0, 100);
+    const char *signalLabel = " Sig";
+
+    // If SNR looks reasonable, show signal
+    if ((int)((node->snr + 10) * 5) >= 0 && node->snr > -100) {
+        snprintf(signalHopsStr, sizeof(signalHopsStr), "%s: %d%%", signalLabel, percentSignal);
+        haveSignal = true;
+    }
+    // If hops is valid (>0), show right after signal
+    if (node->hops_away > 0) {
+        size_t len = strlen(signalHopsStr);
+        if (haveSignal) {
+            snprintf(signalHopsStr + len, sizeof(signalHopsStr) - len, " [%d %s]", node->hops_away,
+                     (node->hops_away == 1 ? "Hop" : "Hops"));
+        } else {
+            snprintf(signalHopsStr, sizeof(signalHopsStr), "[%d %s]", node->hops_away, (node->hops_away == 1 ? "Hop" : "Hops"));
+        }
+    }
+    if (signalHopsStr[0] && line < 5) {
+        display->drawString(x, yPositions[line++], signalHopsStr);
+    }
+
+    // 3. Heard (last seen, skip if node never seen)
+    char seenStr[20] = "";
+    uint32_t seconds = sinceLastSeen(node);
+    if (seconds != 0 && seconds != UINT32_MAX) {
+        uint32_t minutes = seconds / 60, hours = minutes / 60, days = hours / 24;
+        snprintf(seenStr, sizeof(seenStr), (days > 365 ? " Heard: ?" : " Heard: %d%c ago"),
+                 (days    ? days
+                  : hours ? hours
+                          : minutes),
+                 (days    ? 'd'
+                  : hours ? 'h'
+                          : 'm'));
+    }
+    if (seenStr[0] && line < 5) {
+        display->drawString(x, yPositions[line++], seenStr);
+    }
+
+    // 4. Uptime (only show if metric is present)
+    char uptimeStr[32] = "";
+    if (node->has_device_metrics && node->device_metrics.has_uptime_seconds) {
+        uint32_t uptime = node->device_metrics.uptime_seconds;
+        uint32_t days = uptime / 86400;
+        uint32_t hours = (uptime % 86400) / 3600;
+        uint32_t mins = (uptime % 3600) / 60;
+
+        if (days > 0) {
+            snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %dd %dh", days, hours);
+        } else if (hours > 0) {
+            snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %dh %dm", hours, mins);
+        } else {
+            snprintf(uptimeStr, sizeof(uptimeStr), " Uptime: %dm", mins);
+        }
+    }
+    if (uptimeStr[0] && line < 5) {
+        display->drawString(x, yPositions[line++], uptimeStr);
+    }
+
+    // 5. Distance (only if both nodes have GPS position)
+    meshtastic_NodeInfoLite *ourNode = nodeDB->getMeshNode(nodeDB->getNodeNum());
+    char distStr[24] = "";
+    bool haveDistance = false;
+
+    if (nodeDB->hasValidPosition(ourNode) && nodeDB->hasValidPosition(node)) {
+        double lat1 = ourNode->position.latitude_i * 1e-7;
+        double lon1 = ourNode->position.longitude_i * 1e-7;
+        double lat2 = node->position.latitude_i * 1e-7;
+        double lon2 = node->position.longitude_i * 1e-7;
+
+        double earthRadiusKm = 6371.0;
+        double dLat = (lat2 - lat1) * DEG_TO_RAD;
+        double dLon = (lon2 - lon1) * DEG_TO_RAD;
+
+        double a =
+            sin(dLat / 2) * sin(dLat / 2) + cos(lat1 * DEG_TO_RAD) * cos(lat2 * DEG_TO_RAD) * sin(dLon / 2) * sin(dLon / 2);
+        double c = 2 * atan2(sqrt(a), sqrt(1 - a));
+        double distanceKm = earthRadiusKm * c;
+
+        // Format distance appropriately
+        if (distanceKm < 1.0) {
+            double miles = distanceKm * 0.621371;
+            if (miles < 0.1) {
+                int feet = (int)(miles * 5280);
+                if (feet > 0 && feet < 1000) {
+                    snprintf(distStr, sizeof(distStr), " Distance: %dft", feet);
+                    haveDistance = true;
+                } else if (feet >= 1000) {
+                    snprintf(distStr, sizeof(distStr), " Distance: ¼mi");
+                    haveDistance = true;
+                }
+            } else {
+                int roundedMiles = (int)(miles + 0.5);
+                if (roundedMiles > 0 && roundedMiles < 1000) {
+                    snprintf(distStr, sizeof(distStr), " Distance: %dmi", roundedMiles);
+                    haveDistance = true;
+                }
+            }
+        } else {
+            int km = (int)(distanceKm + 0.5);
+            if (km > 0 && km < 1000) {
+                snprintf(distStr, sizeof(distStr), " Distance: %dkm", km);
+                haveDistance = true;
+            }
+        }
+    }
+    // Only display if we actually have a value!
+    if (haveDistance && distStr[0] && line < 5) {
+        display->drawString(x, yPositions[line++], distStr);
+    }
+
+    // Compass rendering for different screen orientations
+    if (SCREEN_WIDTH > SCREEN_HEIGHT) {
+        // Landscape: side-aligned compass
+        bool showCompass = false;
+        if (ourNode && (nodeDB->hasValidPosition(ourNode) || screen->hasHeading()) && nodeDB->hasValidPosition(node)) {
+            showCompass = true;
+        }
+        if (showCompass) {
+            const int16_t topY = compactFirstLine;
+            const int16_t bottomY = SCREEN_HEIGHT - (FONT_HEIGHT_SMALL - 1);
+            const int16_t usableHeight = bottomY - topY - 5;
+            int16_t compassRadius = usableHeight / 2;
+            if (compassRadius < 8)
+                compassRadius = 8;
+            const int16_t compassDiam = compassRadius * 2;
+            const int16_t compassX = x + SCREEN_WIDTH - compassRadius - 8;
+            const int16_t compassY = topY + (usableHeight / 2) + ((FONT_HEIGHT_SMALL - 1) / 2) + 2;
+
+            const auto &op = ourNode->position;
+            float myHeading = screen->hasHeading() ? screen->getHeading() * PI / 180
+                                                   : screen->estimatedHeading(DegD(op.latitude_i), DegD(op.longitude_i));
+            CompassRenderer::drawCompassNorth(display, compassX, compassY, myHeading);
+
+            const auto &p = node->position;
+            float bearing = GeoCoord::bearing(DegD(op.latitude_i), DegD(op.longitude_i), DegD(p.latitude_i), DegD(p.longitude_i));
+            if (!config.display.compass_north_top)
+                bearing -= myHeading;
+            CompassRenderer::drawNodeHeading(display, compassX, compassY, compassDiam, bearing);
+
+            display->drawCircle(compassX, compassY, compassRadius);
+        }
+    } else {
+        // Portrait: bottom-centered compass
+        bool showCompass = false;
+        if (ourNode && (nodeDB->hasValidPosition(ourNode) || screen->hasHeading()) && nodeDB->hasValidPosition(node)) {
+            showCompass = true;
+        }
+        if (showCompass) {
+            int yBelowContent = (line > 0 && line <= 5) ? (yPositions[line - 1] + FONT_HEIGHT_SMALL + 2) : moreCompactFirstLine;
+
+            const int margin = 4;
+#if defined(USE_EINK)
+            const int iconSize = (SCREEN_WIDTH > 128) ? 16 : 8;
+            const int navBarHeight = iconSize + 6;
+#else
+            const int navBarHeight = 0;
+#endif
+            int availableHeight = SCREEN_HEIGHT - yBelowContent - navBarHeight - margin;
+
+            if (availableHeight < FONT_HEIGHT_SMALL * 2)
+                return;
+
+            int compassRadius = availableHeight / 2;
+            if (compassRadius < 8)
+                compassRadius = 8;
+            if (compassRadius * 2 > SCREEN_WIDTH - 16)
+                compassRadius = (SCREEN_WIDTH - 16) / 2;
+
+            int compassX = x + SCREEN_WIDTH / 2;
+            int compassY = yBelowContent + availableHeight / 2;
+
+            const auto &op = ourNode->position;
+            float myHeading = screen->hasHeading() ? screen->getHeading() * PI / 180
+                                                   : screen->estimatedHeading(DegD(op.latitude_i), DegD(op.longitude_i));
+            CompassRenderer::drawCompassNorth(display, compassX, compassY, myHeading);
+
+            const auto &p = node->position;
+            float bearing = GeoCoord::bearing(DegD(op.latitude_i), DegD(op.longitude_i), DegD(p.latitude_i), DegD(p.longitude_i));
+            if (!config.display.compass_north_top)
+                bearing -= myHeading;
+            CompassRenderer::drawNodeHeading(display, compassX, compassY, compassRadius * 2, bearing);
+
+            display->drawCircle(compassX, compassY, compassRadius);
+        }
+    }
+}
+
 /// Draw a series of fields in a column, wrapping to multiple columns if needed
 void drawColumns(OLEDDisplay *display, int16_t x, int16_t y, const char **fields)
 {
@@ -564,4 +876,3 @@ void drawColumns(OLEDDisplay *display, int16_t x, int16_t y, const char **fields
 
 } // namespace NodeListRenderer
 } // namespace graphics
-#endif

src/graphics/draw/NodeListRenderer.h

@@ -23,6 +23,12 @@ namespace NodeListRenderer
 typedef void (*EntryRenderer)(OLEDDisplay *, meshtastic_NodeInfoLite *, int16_t, int16_t, int);
 typedef void (*NodeExtrasRenderer)(OLEDDisplay *, meshtastic_NodeInfoLite *, int16_t, int16_t, int, float, double, double);
 
+// Node entry structure
+struct NodeEntry {
+    meshtastic_NodeInfoLite *node;
+    uint32_t sortValue;
+};
+
 // Node list mode enumeration
 enum NodeListMode { MODE_LAST_HEARD = 0, MODE_HOP_SIGNAL = 1, MODE_DISTANCE = 2, MODE_COUNT = 3 };
 
@@ -48,10 +54,13 @@ void drawHopSignalScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
 void drawDistanceScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 void drawDynamicNodeListScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 void drawNodeListWithCompasses(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
+void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 
 // Utility functions
 const char *getCurrentModeTitle(int screenWidth);
+void retrieveAndSortNodes(std::vector<NodeEntry> &nodeList);
 const char *getSafeNodeName(meshtastic_NodeInfoLite *node);
+uint32_t sinceLastSeen(meshtastic_NodeInfoLite *node);
 void drawColumns(OLEDDisplay *display, int16_t x, int16_t y, const char **fields);
 
 // Bitmap drawing function

src/graphics/draw/NotificationRenderer.cpp

@@ -1,9 +1,8 @@
-#include "configuration.h"
-#if HAS_SCREEN
-
+#include "NotificationRenderer.h"
 #include "DisplayFormatters.h"
 #include "NodeDB.h"
-#include "NotificationRenderer.h"
+#include "configuration.h"
+#include "graphics/Screen.h"
 #include "graphics/ScreenFonts.h"
 #include "graphics/SharedUIDisplay.h"
 #include "graphics/images.h"
@@ -26,27 +25,8 @@ extern bool hasUnreadMessage;
 namespace graphics
 {
 
-InputEvent NotificationRenderer::inEvent;
-int8_t NotificationRenderer::curSelected = 0;
-char NotificationRenderer::alertBannerMessage[256] = {0};
-uint32_t NotificationRenderer::alertBannerUntil = 0;  // 0 is a special case meaning forever
-uint8_t NotificationRenderer::alertBannerOptions = 0; // last x lines are seelctable options
-const char **NotificationRenderer::optionsArrayPtr = nullptr;
-const int *NotificationRenderer::optionsEnumPtr = nullptr;
-std::function<void(int)> NotificationRenderer::alertBannerCallback = NULL;
-bool NotificationRenderer::pauseBanner = false;
-notificationTypeEnum NotificationRenderer::current_notification_type = notificationTypeEnum::none;
-uint32_t NotificationRenderer::numDigits = 0;
-uint32_t NotificationRenderer::currentNumber = 0;
-
-uint32_t pow_of_10(uint32_t n)
+namespace NotificationRenderer
 {
-    uint32_t ret = 1;
-    for (uint32_t i = 0; i < n; i++) {
-        ret *= 10;
-    }
-    return ret;
-}
 
 // Used on boot when a certificate is being created
 void NotificationRenderer::drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
@@ -68,479 +48,109 @@ void NotificationRenderer::drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiStat
     }
 }
 
-void NotificationRenderer::resetBanner()
+// Used when booting without a region set
+void NotificationRenderer::drawWelcomeScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
-    alertBannerMessage[0] = '\0';
-    current_notification_type = notificationTypeEnum::none;
+    display->setFont(FONT_SMALL);
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+    display->drawString(64 + x, y, "//\\ E S H T /\\ S T / C");
+    display->drawString(64 + x, y + FONT_HEIGHT_SMALL, getDeviceName());
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-    inEvent.inputEvent = INPUT_BROKER_NONE;
-    inEvent.kbchar = 0;
-    curSelected = 0;
-    alertBannerOptions = 0; // last x lines are seelctable options
-    optionsArrayPtr = nullptr;
-    optionsEnumPtr = nullptr;
-    alertBannerCallback = NULL;
-    pauseBanner = false;
-    numDigits = 0;
-    currentNumber = 0;
-
-    nodeDB->pause_sort(false);
-}
-
-void NotificationRenderer::drawBannercallback(OLEDDisplay *display, OLEDDisplayUiState *state)
-{
-    if (!isOverlayBannerShowing() && alertBannerMessage[0] != '\0')
-        resetBanner();
-    if (!isOverlayBannerShowing() || pauseBanner)
-        return;
-    switch (current_notification_type) {
-    case notificationTypeEnum::none:
-        // Do nothing - no notification to display
-        break;
-    case notificationTypeEnum::text_banner:
-    case notificationTypeEnum::selection_picker:
-        drawAlertBannerOverlay(display, state);
-        break;
-    case notificationTypeEnum::node_picker:
-        drawNodePicker(display, state);
-        break;
-    case notificationTypeEnum::number_picker:
-        drawNumberPicker(display, state);
-        break;
-    }
-}
-
-void NotificationRenderer::drawNumberPicker(OLEDDisplay *display, OLEDDisplayUiState *state)
-{
-    const char *lineStarts[MAX_LINES + 1] = {0};
-    uint16_t lineCount = 0;
-
-    // Parse lines
-    char *alertEnd = alertBannerMessage + strnlen(alertBannerMessage, sizeof(alertBannerMessage));
-    lineStarts[lineCount] = alertBannerMessage;
-
-    // Find lines
-    while ((lineCount < MAX_LINES) && (lineStarts[lineCount] < alertEnd)) {
-        lineStarts[lineCount + 1] = std::find((char *)lineStarts[lineCount], alertEnd, '\n');
-        if (lineStarts[lineCount + 1][0] == '\n')
-            lineStarts[lineCount + 1] += 1;
-        lineCount++;
-    }
-    // modulo to extract
-    uint8_t this_digit = (currentNumber % (pow_of_10(numDigits - curSelected))) / (pow_of_10(numDigits - curSelected - 1));
-    // Handle input
-    if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
-        if (this_digit == 9) {
-            currentNumber -= 9 * (pow_of_10(numDigits - curSelected - 1));
-        } else {
-            currentNumber += (pow_of_10(numDigits - curSelected - 1));
-        }
-    } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
-        if (this_digit == 0) {
-            currentNumber += 9 * (pow_of_10(numDigits - curSelected - 1));
-        } else {
-            currentNumber -= (pow_of_10(numDigits - curSelected - 1));
-        }
-    } else if (inEvent.inputEvent == INPUT_BROKER_ANYKEY) {
-        if (inEvent.kbchar > 47 && inEvent.kbchar < 58) { // have a digit
-            currentNumber -= this_digit * (pow_of_10(numDigits - curSelected - 1));
-            currentNumber += (inEvent.kbchar - 48) * (pow_of_10(numDigits - curSelected - 1));
-            curSelected++;
-        }
-    } else if (inEvent.inputEvent == INPUT_BROKER_SELECT || inEvent.inputEvent == INPUT_BROKER_RIGHT) {
-        curSelected++;
-    } else if (inEvent.inputEvent == INPUT_BROKER_LEFT) {
-        curSelected--;
-    } else if ((inEvent.inputEvent == INPUT_BROKER_CANCEL || inEvent.inputEvent == INPUT_BROKER_ALT_LONG) &&
-               alertBannerUntil != 0) {
-        resetBanner();
-        return;
-    }
-    if (curSelected == numDigits) {
-        alertBannerCallback(currentNumber);
-        resetBanner();
-        return;
-    }
-
-    inEvent.inputEvent = INPUT_BROKER_NONE;
-    if (alertBannerMessage[0] == '\0')
-        return;
-
-    uint16_t totalLines = lineCount + 2;
-    const char *linePointers[totalLines + 1] = {0}; // this is sort of a dynamic allocation
-
-    // copy the linestarts to display to the linePointers holder
-    for (uint16_t i = 0; i < lineCount; i++) {
-        linePointers[i] = lineStarts[i];
-    }
-    std::string digits = " ";
-    std::string arrowPointer = " ";
-    for (uint16_t i = 0; i < numDigits; i++) {
-        // Modulo minus modulo to return just the current number
-        digits += std::to_string((currentNumber % (pow_of_10(numDigits - i))) / (pow_of_10(numDigits - i - 1))) + " ";
-        if (curSelected == i) {
-            arrowPointer += "^ ";
-        } else {
-            arrowPointer += "_ ";
-        }
-    }
-
-    linePointers[lineCount++] = digits.c_str();
-    linePointers[lineCount++] = arrowPointer.c_str();
-
-    drawNotificationBox(display, state, linePointers, totalLines, 0);
-}
-
-void NotificationRenderer::drawNodePicker(OLEDDisplay *display, OLEDDisplayUiState *state)
-{
-    static uint32_t selectedNodenum = 0;
-
-    // === Layout Configuration ===
-    constexpr uint16_t vPadding = 2;
-    alertBannerOptions = nodeDB->getNumMeshNodes() - 1;
-
-    // let the box drawing function calculate the widths?
-
-    const char *lineStarts[MAX_LINES + 1] = {0};
-    uint16_t lineCount = 0;
-
-    // Parse lines
-    char *alertEnd = alertBannerMessage + strnlen(alertBannerMessage, sizeof(alertBannerMessage));
-    lineStarts[lineCount] = alertBannerMessage;
-
-    while ((lineCount < MAX_LINES) && (lineStarts[lineCount] < alertEnd)) {
-        lineStarts[lineCount + 1] = std::find((char *)lineStarts[lineCount], alertEnd, '\n');
-        if (lineStarts[lineCount + 1][0] == '\n')
-            lineStarts[lineCount + 1] += 1;
-        lineCount++;
-    }
-
-    // Handle input
-    if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
-        curSelected--;
-    } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
-        curSelected++;
-    } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
-        alertBannerCallback(selectedNodenum);
-        resetBanner();
-        return;
-    } else if ((inEvent.inputEvent == INPUT_BROKER_CANCEL || inEvent.inputEvent == INPUT_BROKER_ALT_LONG) &&
-               alertBannerUntil != 0) {
-        resetBanner();
-        return;
-    }
-
-    if (curSelected == -1)
-        curSelected = alertBannerOptions - 1;
-    if (curSelected == alertBannerOptions)
-        curSelected = 0;
-
-    inEvent.inputEvent = INPUT_BROKER_NONE;
-    if (alertBannerMessage[0] == '\0')
-        return;
-
-    uint16_t totalLines = lineCount + alertBannerOptions;
-    uint16_t screenHeight = display->height();
-    uint8_t effectiveLineHeight = FONT_HEIGHT_SMALL - 3;
-    uint8_t visibleTotalLines = std::min<uint8_t>(totalLines, (screenHeight - vPadding * 2) / effectiveLineHeight);
-    uint8_t linesShown = lineCount;
-    const char *linePointers[visibleTotalLines + 1] = {0}; // this is sort of a dynamic allocation
-
-    // copy the linestarts to display to the linePointers holder
-    for (int i = 0; i < lineCount; i++) {
-        linePointers[i] = lineStarts[i];
-    }
-    char scratchLineBuffer[visibleTotalLines - lineCount][40];
-
-    uint8_t firstOptionToShow = 0;
-    if (curSelected > 1 && alertBannerOptions > visibleTotalLines - lineCount) {
-        if (curSelected > alertBannerOptions - visibleTotalLines + lineCount)
-            firstOptionToShow = alertBannerOptions - visibleTotalLines + lineCount;
-        else
-            firstOptionToShow = curSelected - 1;
+    if ((millis() / 10000) % 2) {
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 2 - 3, "Set the region using the");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 3 - 3, "Meshtastic Android, iOS,");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 4 - 3, "Web or CLI clients.");
     } else {
-        firstOptionToShow = 0;
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 2 - 3, "Visit meshtastic.org");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 3 - 3, "for more information.");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 4 - 3, "");
     }
-    int scratchLineNum = 0;
-    for (int i = firstOptionToShow; i < alertBannerOptions && linesShown < visibleTotalLines; i++, linesShown++) {
-        char temp_name[16] = {0};
-        if (nodeDB->getMeshNodeByIndex(i + 1)->has_user) {
-            std::string sanitized = sanitizeString(nodeDB->getMeshNodeByIndex(i + 1)->user.long_name);
-            strncpy(temp_name, sanitized.c_str(), sizeof(temp_name) - 1);
 
-        } else {
-            snprintf(temp_name, sizeof(temp_name), "(%04X)", (uint16_t)(nodeDB->getMeshNodeByIndex(i + 1)->num & 0xFFFF));
-        }
-        // make temp buffer for name
-        // fi
-        if (i == curSelected) {
-            selectedNodenum = nodeDB->getMeshNodeByIndex(i + 1)->num;
-            if (isHighResolution) {
-                strncpy(scratchLineBuffer[scratchLineNum], "> ", 3);
-                strncpy(scratchLineBuffer[scratchLineNum] + 2, temp_name, 36);
-                strncpy(scratchLineBuffer[scratchLineNum] + strlen(temp_name) + 2, " <", 3);
-            } else {
-                strncpy(scratchLineBuffer[scratchLineNum], ">", 2);
-                strncpy(scratchLineBuffer[scratchLineNum] + 1, temp_name, 37);
-                strncpy(scratchLineBuffer[scratchLineNum] + strlen(temp_name) + 1, "<", 2);
-            }
-            scratchLineBuffer[scratchLineNum][39] = '\0';
-        } else {
-            strncpy(scratchLineBuffer[scratchLineNum], temp_name, 36);
-        }
-        linePointers[linesShown] = scratchLineBuffer[scratchLineNum++];
-    }
-    drawNotificationBox(display, state, linePointers, totalLines, firstOptionToShow);
+#ifdef ARCH_ESP32
+    yield();
+    esp_task_wdt_reset();
+#endif
 }
 
 void NotificationRenderer::drawAlertBannerOverlay(OLEDDisplay *display, OLEDDisplayUiState *state)
 {
-    // === Layout Configuration ===
-    constexpr uint16_t vPadding = 2;
-
-    uint16_t optionWidths[alertBannerOptions] = {0};
-    uint16_t maxWidth = 0;
-    uint16_t arrowsWidth = display->getStringWidth(">  <", 4, true);
-    uint16_t lineWidths[MAX_LINES] = {0};
-    uint16_t lineLengths[MAX_LINES] = {0};
-    const char *lineStarts[MAX_LINES + 1] = {0};
-    uint16_t lineCount = 0;
-    char lineBuffer[40] = {0};
-
-    // Parse lines
-    char *alertEnd = alertBannerMessage + strnlen(alertBannerMessage, sizeof(alertBannerMessage));
-    lineStarts[lineCount] = alertBannerMessage;
-
-    while ((lineCount < MAX_LINES) && (lineStarts[lineCount] < alertEnd)) {
-        lineStarts[lineCount + 1] = std::find((char *)lineStarts[lineCount], alertEnd, '\n');
-        lineLengths[lineCount] = lineStarts[lineCount + 1] - lineStarts[lineCount];
-        if (lineStarts[lineCount + 1][0] == '\n')
-            lineStarts[lineCount + 1] += 1;
-        lineWidths[lineCount] = display->getStringWidth(lineStarts[lineCount], lineLengths[lineCount], true);
-        if (lineWidths[lineCount] > maxWidth)
-            maxWidth = lineWidths[lineCount];
-        lineCount++;
-    }
-
-    // Measure option widths
-    for (int i = 0; i < alertBannerOptions; i++) {
-        optionWidths[i] = display->getStringWidth(optionsArrayPtr[i], strlen(optionsArrayPtr[i]), true);
-        if (optionWidths[i] > maxWidth)
-            maxWidth = optionWidths[i];
-        if (optionWidths[i] + arrowsWidth > maxWidth)
-            maxWidth = optionWidths[i] + arrowsWidth;
-    }
-
-    // Handle input
-    if (alertBannerOptions > 0) {
-        if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
-            curSelected--;
-        } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
-            curSelected++;
-        } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
-            if (optionsEnumPtr != nullptr) {
-                alertBannerCallback(optionsEnumPtr[curSelected]);
-                optionsEnumPtr = nullptr;
-            } else {
-                alertBannerCallback(curSelected);
-            }
-            resetBanner();
-            return;
-        } else if ((inEvent.inputEvent == INPUT_BROKER_CANCEL || inEvent.inputEvent == INPUT_BROKER_ALT_LONG) &&
-                   alertBannerUntil != 0) {
-            resetBanner();
-            return;
-        }
-
-        if (curSelected == -1)
-            curSelected = alertBannerOptions - 1;
-        if (curSelected == alertBannerOptions)
-            curSelected = 0;
-    } else {
-        if (inEvent.inputEvent == INPUT_BROKER_SELECT || inEvent.inputEvent == INPUT_BROKER_ALT_LONG ||
-            inEvent.inputEvent == INPUT_BROKER_CANCEL) {
-            resetBanner();
-            return;
-        }
-    }
-
-    inEvent.inputEvent = INPUT_BROKER_NONE;
-    if (alertBannerMessage[0] == '\0')
+    // Exit if no message is active or duration has passed
+    if (strlen(alertBannerMessage) == 0 || (alertBannerUntil != 0 && millis() > alertBannerUntil))
         return;
 
-    uint16_t totalLines = lineCount + alertBannerOptions;
-
-    uint16_t screenHeight = display->height();
-    uint8_t effectiveLineHeight = FONT_HEIGHT_SMALL - 3;
-    uint8_t visibleTotalLines = std::min<uint8_t>(totalLines, (screenHeight - vPadding * 2) / effectiveLineHeight);
-    uint8_t linesShown = lineCount;
-    const char *linePointers[visibleTotalLines + 1] = {0}; // this is sort of a dynamic allocation
-
-    // copy the linestarts to display to the linePointers holder
-    for (int i = 0; i < lineCount; i++) {
-        linePointers[i] = lineStarts[i];
-    }
-
-    uint8_t firstOptionToShow = 0;
-    if (alertBannerOptions > 0) {
-        if (curSelected > 1 && alertBannerOptions > visibleTotalLines - lineCount) {
-            if (curSelected > alertBannerOptions - visibleTotalLines + lineCount)
-                firstOptionToShow = alertBannerOptions - visibleTotalLines + lineCount;
-            else
-                firstOptionToShow = curSelected - 1;
-        } else {
-            firstOptionToShow = 0;
-        }
-    }
-
-    for (int i = firstOptionToShow; i < alertBannerOptions && linesShown < visibleTotalLines; i++, linesShown++) {
-        if (i == curSelected) {
-            if (isHighResolution) {
-                strncpy(lineBuffer, "> ", 3);
-                strncpy(lineBuffer + 2, optionsArrayPtr[i], 36);
-                strncpy(lineBuffer + strlen(optionsArrayPtr[i]) + 2, " <", 3);
-            } else {
-                strncpy(lineBuffer, ">", 2);
-                strncpy(lineBuffer + 1, optionsArrayPtr[i], 37);
-                strncpy(lineBuffer + strlen(optionsArrayPtr[i]) + 1, "<", 2);
-            }
-            lineBuffer[39] = '\0';
-            linePointers[linesShown] = lineBuffer;
-        } else {
-            linePointers[linesShown] = optionsArrayPtr[i];
-        }
-    }
-    if (alertBannerOptions > 0) {
-        drawNotificationBox(display, state, linePointers, totalLines, firstOptionToShow, maxWidth);
-    } else {
-        drawNotificationBox(display, state, linePointers, totalLines, firstOptionToShow);
-    }
-}
-
-void NotificationRenderer::drawNotificationBox(OLEDDisplay *display, OLEDDisplayUiState *state, const char *lines[],
-                                               uint16_t totalLines, uint8_t firstOptionToShow, uint16_t maxWidth)
-{
-
-    bool is_picker = false;
-    uint16_t lineCount = 0;
     // === Layout Configuration ===
-    constexpr uint16_t hPadding = 5;
-    constexpr uint16_t vPadding = 2;
-    bool needs_bell = false;
-    uint16_t lineWidths[totalLines] = {0};
-    uint16_t lineLengths[totalLines] = {0};
+    constexpr uint16_t padding = 5;    // Padding around text inside the box
+    constexpr uint8_t lineSpacing = 1; // Extra space between lines
 
-    if (maxWidth != 0)
-        is_picker = true;
+    // Search the message to determine if we need the bell added
+    bool needs_bell = (strstr(alertBannerMessage, "Alert Received") != nullptr);
 
     // Setup font and alignment
     display->setFont(FONT_SMALL);
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
+    display->setTextAlignment(TEXT_ALIGN_LEFT); // We will manually center per line
 
-    while (lines[lineCount] != nullptr) {
-        auto newlinePointer = strchr(lines[lineCount], '\n');
-        if (newlinePointer)
-            lineLengths[lineCount] = (newlinePointer - lines[lineCount]); // Check for newlines first
-        else // if the newline wasn't found, then pull string length from strlen
-            lineLengths[lineCount] = strlen(lines[lineCount]);
-        lineWidths[lineCount] = display->getStringWidth(lines[lineCount], lineLengths[lineCount], true);
-        if (!is_picker) {
-            needs_bell |= (strstr(alertBannerMessage, "Alert Received") != nullptr);
-            if (lineWidths[lineCount] > maxWidth)
-                maxWidth = lineWidths[lineCount];
-        }
+    // === Split the message into lines (supports multi-line banners) ===
+    const int MAX_LINES = 10;
+    char lines[MAX_LINES][256];
+    int lineCount = 0;
+
+    // Create a working copy of the message to tokenize
+    char messageCopy[256];
+    strncpy(messageCopy, alertBannerMessage, sizeof(messageCopy) - 1);
+    messageCopy[sizeof(messageCopy) - 1] = '\0';
+
+    char *line = strtok(messageCopy, "\n");
+    while (line != nullptr && lineCount < MAX_LINES) {
+        strncpy(lines[lineCount], line, sizeof(lines[lineCount]) - 1);
+        lines[lineCount][sizeof(lines[lineCount]) - 1] = '\0';
         lineCount++;
-    }
-    // count lines
-
-    uint16_t boxWidth = hPadding * 2 + maxWidth;
-    if (needs_bell) {
-        if (isHighResolution && boxWidth <= 150)
-            boxWidth += 26;
-        if (!isHighResolution && boxWidth <= 100)
-            boxWidth += 20;
+        line = strtok(nullptr, "\n");
     }
 
-    uint16_t screenHeight = display->height();
-    uint8_t effectiveLineHeight = FONT_HEIGHT_SMALL - 3;
-    uint8_t visibleTotalLines = std::min<uint8_t>(lineCount, (screenHeight - vPadding * 2) / effectiveLineHeight);
-    uint16_t contentHeight = visibleTotalLines * effectiveLineHeight;
-    uint16_t boxHeight = contentHeight + vPadding * 2;
-    if (visibleTotalLines == 1) {
-        boxHeight += (isHighResolution) ? 4 : 3;
+    // === Measure text dimensions ===
+    uint16_t minWidth = (SCREEN_WIDTH > 128) ? 106 : 78;
+    uint16_t maxWidth = 0;
+    uint16_t lineWidths[MAX_LINES];
+    for (int i = 0; i < lineCount; i++) {
+        uint16_t w = display->getStringWidth(lines[i], strlen(lines[i]), true);
+        lineWidths[i] = w;
+        if (w > maxWidth)
+            maxWidth = w;
     }
 
+    uint16_t boxWidth = padding * 2 + maxWidth;
+    if (needs_bell && boxWidth < minWidth)
+        boxWidth += (SCREEN_WIDTH > 128) ? 26 : 20;
+
+    uint16_t boxHeight = padding * 2 + lineCount * FONT_HEIGHT_SMALL + (lineCount - 1) * lineSpacing;
+
     int16_t boxLeft = (display->width() / 2) - (boxWidth / 2);
-    if (totalLines > visibleTotalLines) {
-        boxWidth += (isHighResolution) ? 4 : 2;
-    }
     int16_t boxTop = (display->height() / 2) - (boxHeight / 2);
 
-    // === Draw Box ===
+    // === Draw background box ===
     display->setColor(BLACK);
-    display->fillRect(boxLeft - 1, boxTop - 1, boxWidth + 2, boxHeight + 2);
-    display->fillRect(boxLeft, boxTop - 2, boxWidth, 1);
-    display->fillRect(boxLeft, boxTop + boxHeight + 1, boxWidth, 1);
-    display->fillRect(boxLeft - 2, boxTop, 1, boxHeight);
-    display->fillRect(boxLeft + boxWidth + 1, boxTop, 1, boxHeight);
-    display->setColor(WHITE);
-    display->drawRect(boxLeft, boxTop, boxWidth, boxHeight);
-    display->setColor(BLACK);
-    display->fillRect(boxLeft, boxTop, 1, 1);
-    display->fillRect(boxLeft + boxWidth - 1, boxTop, 1, 1);
-    display->fillRect(boxLeft, boxTop + boxHeight - 1, 1, 1);
-    display->fillRect(boxLeft + boxWidth - 1, boxTop + boxHeight - 1, 1, 1);
+    display->fillRect(boxLeft - 1, boxTop - 1, boxWidth + 2, boxHeight + 2); // Slightly oversized box
     display->setColor(WHITE);
+    display->drawRect(boxLeft, boxTop, boxWidth, boxHeight); // Border
 
-    // === Draw Content ===
-    int16_t lineY = boxTop + vPadding;
+    // === Draw each line centered in the box ===
+    int16_t lineY = boxTop + padding;
     for (int i = 0; i < lineCount; i++) {
         int16_t textX = boxLeft + (boxWidth - lineWidths[i]) / 2;
+        uint16_t line_width = display->getStringWidth(lines[i], strlen(lines[i]), true);
+
         if (needs_bell && i == 0) {
             int bellY = lineY + (FONT_HEIGHT_SMALL - 8) / 2;
             display->drawXbm(textX - 10, bellY, 8, 8, bell_alert);
-            display->drawXbm(textX + lineWidths[i] + 2, bellY, 8, 8, bell_alert);
+            display->drawXbm(textX + line_width + 2, bellY, 8, 8, bell_alert);
         }
-        char lineBuffer[lineLengths[i] + 1];
-        strncpy(lineBuffer, lines[i], lineLengths[i]);
-        lineBuffer[lineLengths[i]] = '\0';
-        // Determine if this is a pop-up or a pick list
-        if (alertBannerOptions > 0 && i == 0) {
-            // Pick List
-            display->setColor(WHITE);
-            int background_yOffset = 1;
-            // Determine if we have low hanging characters
-            if (strchr(lineBuffer, 'p') || strchr(lineBuffer, 'g') || strchr(lineBuffer, 'y') || strchr(lineBuffer, 'j')) {
-                background_yOffset = -1;
-            }
-            display->fillRect(boxLeft, boxTop + 1, boxWidth, effectiveLineHeight - background_yOffset);
-            display->setColor(BLACK);
-            int yOffset = 3;
-            display->drawString(textX, lineY - yOffset, lineBuffer);
-            display->setColor(WHITE);
-            lineY += (effectiveLineHeight - 2 - background_yOffset);
-        } else {
-            // Pop-up
-            display->drawString(textX, lineY, lineBuffer);
-            lineY += (effectiveLineHeight);
-        }
-    }
 
-    // === Scroll Bar (Thicker, inside box, not over title) ===
-    if (totalLines > visibleTotalLines) {
-        const uint8_t scrollBarWidth = 5;
+        display->drawString(textX, lineY, lines[i]);
+        if (SCREEN_WIDTH > 128)
+            display->drawString(textX + 1, lineY, lines[i]); // Faux bold
 
-        int16_t scrollBarX = boxLeft + boxWidth - scrollBarWidth - 2;
-        int16_t scrollBarY = boxTop + vPadding + effectiveLineHeight; // start after title line
-        uint16_t scrollBarHeight = boxHeight - vPadding * 2 - effectiveLineHeight;
-
-        float ratio = (float)visibleTotalLines / totalLines;
-        uint16_t indicatorHeight = std::max((int)(scrollBarHeight * ratio), 4);
-        float scrollRatio = (float)(firstOptionToShow + lineCount - visibleTotalLines) / (totalLines - visibleTotalLines);
-        uint16_t indicatorY = scrollBarY + scrollRatio * (scrollBarHeight - indicatorHeight);
-
-        display->drawRect(scrollBarX, scrollBarY, scrollBarWidth, scrollBarHeight);
-        display->fillRect(scrollBarX + 1, indicatorY, scrollBarWidth - 2, indicatorHeight);
+        lineY += FONT_HEIGHT_SMALL + lineSpacing;
     }
 }
 
@@ -570,10 +180,6 @@ void NotificationRenderer::drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUi
                                 "Please be patient and do not power off.");
 }
 
-bool NotificationRenderer::isOverlayBannerShowing()
-{
-    return strlen(alertBannerMessage) > 0 && (alertBannerUntil == 0 || millis() <= alertBannerUntil);
-}
+} // namespace NotificationRenderer
 
 } // namespace graphics
-#endif