add rssi and snr to json output (#2894 )

* add rssi and snr to json output * explicitly cast to int and float
refactor: simplify MQTT defaults (#2893 )
2026-10-13 07:01:18 +10:00 · 2023-10-17 06:50:36 -05:00 · 2023-10-15 18:56:47 -05:00 · 2023-10-15 06:41:40 -05:00 · 2023-10-14 19:33:45 -05:00 · 2023-10-14 06:49:38 -05:00
243 changed files with 6049 additions and 2547 deletions
@@ -37,7 +37,9 @@ body:
        - T-Lora v1
        - T-Lora v1.3
        - T-Lora v2 1.6
+        - T-Deck
        - T-Echo
+        - T-Watch
        - Rak4631
        - Rak11200
        - Rak11310
@@ -45,6 +47,8 @@ body:
        - Heltec v2
        - Heltec v2.1
        - Heltec V3
+        - Heltec Wireless Paper
+        - Heltec Wireless Tracker
        - Raspberry Pi Pico (W)
        - Relay v1
        - Relay v2
@@ -7,7 +7,7 @@
  is appreciated." This will allow other devs to potentially save you time by not accidentially duplicating work etc...
 - Please do not check in files that don't have real changes
 - Please do not reformat lines that you didn't have to change the code on
- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor along with the ['Trunk Check' extension](https://marketplace.visualstudio.com/items?itemName=trunk.io) (WSL2 is required on windows),
+- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor along with the ['Trunk Check' extension](https://marketplace.visualstudio.com/items?itemName=trunk.io) (In beta for windows, WSL2 for the linux version),
  because it automatically follows our indentation rules and its auto reformatting will not cause spurious changes to lines.
 - If your PR fixes a bug, mention "fixes #bugnum" somewhere in your pull request description.
 - If your other co-developers have comments on your PR please tweak as needed.
@@ -17,11 +17,11 @@ jobs:
        uses: ./.github/actions/setup-base

      - name: Pull web ui
-        uses: dsaltares/fetch-gh-release-asset@master
+        uses: dsaltares/fetch-gh-release-asset@a40c8b4a0471f9ab81bdf73a010f74cc51476ad4
        with:
-          repo: "meshtastic/web"
-          file: "build.tar"
-          target: "build.tar"
+          repo: meshtastic/web
+          file: build.tar
+          target: build.tar
          token: ${{ secrets.GITHUB_TOKEN }}

      - name: Unpack web ui
@@ -40,11 +40,11 @@ jobs:
        run: bin/build-esp32.sh ${{ inputs.board }}

      - name: Pull OTA Firmware
-        uses: dsaltares/fetch-gh-release-asset@master
+        uses: dsaltares/fetch-gh-release-asset@a40c8b4a0471f9ab81bdf73a010f74cc51476ad4
        with:
-          repo: "meshtastic/firmware-ota"
-          file: "firmware.bin"
-          target: "release/bleota.bin"
+          repo: meshtastic/firmware-ota
+          file: firmware.bin
+          target: release/bleota.bin
          token: ${{ secrets.GITHUB_TOKEN }}

      - name: Get release version string
@@ -17,11 +17,11 @@ jobs:
        uses: ./.github/actions/setup-base

      - name: Pull web ui
-        uses: dsaltares/fetch-gh-release-asset@master
+        uses: dsaltares/fetch-gh-release-asset@a40c8b4a0471f9ab81bdf73a010f74cc51476ad4
        with:
-          repo: "meshtastic/web"
-          file: "build.tar"
-          target: "build.tar"
+          repo: meshtastic/web
+          file: build.tar
+          target: build.tar
          token: ${{ secrets.GITHUB_TOKEN }}

      - name: Unpack web ui
@@ -38,11 +38,11 @@ jobs:
        run: bin/build-esp32.sh ${{ inputs.board }}

      - name: Pull OTA Firmware
-        uses: dsaltares/fetch-gh-release-asset@master
+        uses: dsaltares/fetch-gh-release-asset@a40c8b4a0471f9ab81bdf73a010f74cc51476ad4
        with:
-          repo: "meshtastic/firmware-ota"
-          file: "firmware-s3.bin"
-          target: "release/bleota-s3.bin"
+          repo: meshtastic/firmware-ota
+          file: firmware-s3.bin
+          target: release/bleota-s3.bin
          token: ${{ secrets.GITHUB_TOKEN }}

      - name: Get release version string
@@ -1,4 +1,7 @@
 name: CI
+#concurrency:
+#  group: ${{ github.ref }}
+#  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 on:
  # # Triggers the workflow on push but only for the master branch
  push:
@@ -46,7 +49,7 @@ jobs:

      - name: Trunk Check
        if: ${{ github.event_name != 'workflow_dispatch' }}
-        uses: trunk-io/trunk-action@v1
+        uses: trunk-io/trunk-action@782e83f803ca6e369f035d64c6ba2768174ba61b

      - name: Check ${{ matrix.board }}
        run: bin/check-all.sh ${{ matrix.board }}
@@ -92,6 +95,7 @@ jobs:
          - board: tlora-t3s3-v1
          - board: t-watch-s3
          - board: t-deck
+          - board: picomputer-s3
    uses: ./.github/workflows/build_esp32_s3.yml
    with:
      board: ${{ matrix.board }}
@@ -108,6 +112,7 @@ jobs:
          - board: t-echo
          - board: pca10059_diy_eink
          - board: feather_diy
+          - board: nano-g2-ultra
    uses: ./.github/workflows/build_nrf52.yml
    with:
      board: ${{ matrix.board }}
@@ -255,6 +260,7 @@ jobs:
          retention-days: 30

      - name: Create request artifacts
+        continue-on-error: true # FIXME: Why are we getting 502, but things still work?
        if: ${{ github.event_name == 'pull_request_target' || github.event_name == 'pull_request' }}
        uses: gavv/pull-request-artifacts@v1.1.0
        with:
@@ -14,6 +14,6 @@ jobs:
        uses: actions/checkout@v3

      - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
+        uses: trunk-io/trunk-action@782e83f803ca6e369f035d64c6ba2768174ba61b
        with:
          trunk-token: ${{ secrets.TRUNK_TOKEN }}
@@ -0,0 +1,22 @@
+name: Pull Request
+on: [pull_request]
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions: read-all
+
+jobs:
+  trunk_check:
+    name: Trunk Check Runner
+    runs-on: ubuntu-latest
+    permissions:
+      checks: write # For trunk to post annotations
+      contents: read # For repo checkout
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Trunk Check
+        uses: trunk-io/trunk-action@v1
@@ -2,7 +2,7 @@
 *logs
 *actions
 *notifications
+*tools
 plugins
 user_trunk.yaml
 user.yaml
-shims
@@ -1,48 +1,53 @@
 version: 0.1
 cli:
-  version: 1.9.1
+  version: 1.17.0
 plugins:
  sources:
    - id: trunk
-      ref: v0.0.17
+      ref: v1.2.5
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - taplo@0.7.0
-    - ruff@0.0.265
-    - yamllint@1.31.0
+    - bandit@1.7.5
+    - checkov@2.5.0
+    - terrascan@1.18.3
+    - trivy@0.45.1
+    - trufflehog@3.59.0
+    - taplo@0.8.1
+    - ruff@0.0.292
+    - yamllint@1.32.0
    - isort@5.12.0
-    - markdownlint@0.34.0
+    - markdownlint@0.37.0
    - oxipng@8.0.0
    - svgo@3.0.2
-    - actionlint@1.6.24
-    - flake8@6.0.0
+    - actionlint@1.6.26
+    - flake8@6.1.0
    - hadolint@2.12.0
-    - shfmt@3.5.0
+    - shfmt@3.6.0
    - shellcheck@0.9.0
-    - black@23.3.0
+    - black@23.9.1
    - git-diff-check
-    - gitleaks@8.16.3
-    - clang-format@14.0.0
-    - prettier@2.8.8
+    - gitleaks@8.18.0
+    - clang-format@16.0.3
+    - prettier@3.0.3
  disabled:
-    - taplo@0.7.0
+    - taplo@0.8.1
    - shellcheck@0.9.0
-    - shfmt@3.5.0
+    - shfmt@3.6.0
    - oxipng@8.0.0
    - actionlint@1.6.22
-    - markdownlint@0.34.0
+    - markdownlint@0.37.0
    - hadolint@2.12.0
    - svgo@3.0.2
 runtimes:
  enabled:
    - python@3.10.8
-    - go@1.19.5
+    - go@1.21.0
    - node@18.12.1
 actions:
  disabled:
    - trunk-announce
-    - trunk-check-pre-push
-    - trunk-fmt-pre-commit
  enabled:
+    - trunk-fmt-pre-commit
+    - trunk-check-pre-push
    - trunk-upgrade-available
@@ -6,4 +6,4 @@
        "platformio.platformio-ide",
        "trunk.io"
    ],
-}
+}
@@ -1,4 +1,5 @@
 {
  "editor.formatOnSave": true,
-  "editor.defaultFormatter": "trunk.io"
+  "editor.defaultFormatter": "trunk.io",
+  "trunk.enableWindows": true
 }
@@ -10,8 +10,8 @@

 This repository contains the device firmware for the Meshtastic project.

-**[Building Instructions](https://meshtastic.org/docs/development/firmware/build)**
-**[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)**
+- **[Building Instructions](https://meshtastic.org/docs/development/firmware/build)**
+- **[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)**

 ## Stats

@@ -1,7 +1,7 @@
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
 extends = arduino_base
-platform = platformio/espressif32@^6.3.2
+platform = platformio/espressif32@6.3.2 # This is a temporary fix to the S3-based devices bluetooth issues until we can determine what within ESP-IDF changed and can develop a suitable patch. 

 build_src_filter = 
  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
@@ -30,6 +30,7 @@ build_flags =
  -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
  -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=5120
  -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
+  -DSERIAL_BUFFER_SIZE=4096
  ;-DDEBUG_HEAP

 lib_deps =
@@ -37,7 +38,7 @@ lib_deps =
  ${networking_base.lib_deps}
  ${environmental_base.lib_deps}
  https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
-  h2zero/NimBLE-Arduino@^1.4.0
+  h2zero/NimBLE-Arduino@^1.4.1
  jgromes/RadioLib@^6.1.0
  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
@@ -56,4 +57,4 @@ lib_ignore =

 ; customize the partition table
 ; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
-board_build.partitions = partition-table.csv
+board_build.partitions = partition-table.csv
@@ -1,11 +1,13 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-platform = platformio/nordicnrf52@^10.0.0
+platform = platformio/nordicnrf52@^10.1.0
 extends = arduino_base

 build_type = debug ; I'm debugging with ICE a lot now
 build_flags = 
-  ${arduino_base.build_flags} -Wno-unused-variable 
+  ${arduino_base.build_flags}
+  -DSERIAL_BUFFER_SIZE=1024
+  -Wno-unused-variable
  -Isrc/platform/nrf52

 build_src_filter = 
@@ -4,23 +4,23 @@

 set -e

-VERSION=`bin/buildinfo.py long`
+VERSION=$(bin/buildinfo.py long)

 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION

 if [[ $# -gt 0 ]]; then
-    # can override which environment by passing arg
-    BOARDS="$@"
+	# can override which environment by passing arg
+	BOARDS="$@"
 else
-    BOARDS="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 rak4631 rak4631_eink rak11200 t-echo pca10059_diy_eink"
+	BOARDS="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 rak4631 rak4631_eink rak11200 t-echo pca10059_diy_eink"
 fi

 echo "BOARDS:${BOARDS}"

 CHECK=""
 for BOARD in $BOARDS; do
-     CHECK="${CHECK} -e ${BOARD}"
+	CHECK="${CHECK} -e ${BOARD}"
 done

-pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt" $CHECK --skip-packages --pattern="src/" --fail-on-defect=low --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
@@ -32,7 +32,7 @@ IF EXIST %FILENAME% IF x%FILENAME:update=%==x%FILENAME% (
 	%PYTHON% -m esptool --baud 115200 write_flash 0x00 %FILENAME%
    
    @REM Account for S3 board's different OTA partition
-    IF x%FILENAME:s3=%==x%FILENAME% IF x%FILENAME:v3=%==x%FILENAME% (
+    IF x%FILENAME:s3=%==x%FILENAME% IF x%FILENAME:v3=%==x%FILENAME% IF x%FILENAME:t-deck=%==x%FILENAME% IF x%FILENAME:wireless-paper=%==x%FILENAME% IF x%FILENAME:wireless-tracker=%==x%FILENAME% (
        %PYTHON% -m esptool --baud 115200 write_flash 0x260000 bleota.bin
 	) else (
        %PYTHON% -m esptool --baud 115200 write_flash 0x260000 bleota-s3.bin
@@ -50,7 +50,7 @@ if [ -f "${FILENAME}" ] && [ ! -z "${FILENAME##*"update"*}" ]; then
 	"$PYTHON" -m esptool  erase_flash
 	"$PYTHON" -m esptool  write_flash 0x00 ${FILENAME}
 	# Account for S3 board's different OTA partition
-	if [ ! -z "${FILENAME##*"s3"*}" ] && [ ! -z "${FILENAME##*"-v3"*}" ]; then
+	if [ ! -z "${FILENAME##*"s3"*}" ] && [ ! -z "${FILENAME##*"-v3"*}" ] && [ ! -z "${FILENAME##*"t-deck"*}" ] && [ ! -z "${FILENAME##*"wireless-paper"*}" ] && [ ! -z "${FILENAME##*"wireless-tracker"*}" ]; then
 		"$PYTHON" -m esptool  write_flash 0x260000 bleota.bin
 	else
 	    "$PYTHON" -m esptool  write_flash 0x260000 bleota-s3.bin
@@ -28,8 +28,6 @@
    "flash_size": "8MB",
    "maximum_ram_size": 327680,
    "maximum_size": 8388608,
-    "use_1200bps_touch": true,
-    "wait_for_upload_port": true,
    "require_upload_port": true,
    "speed": 921600
  },
@@ -0,0 +1,51 @@
+{
+  "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": "BQ nRF52840",
+    "mcu": "nrf52840",
+    "variant": "nano-g2-ultra",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": ["arduino"],
+  "name": "BQ nRF52840",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra",
+  "vendor": "BQ Consulting"
+}
@@ -1,7 +1,8 @@
 {
  "build": {
    "arduino": {
-      "ldscript": "esp32s3_out.ld"
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi"
    },
    "core": "esp32",
    "extra_flags": [
@@ -13,7 +14,7 @@
    ],
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
-    "flash_mode": "dio",
+    "flash_mode": "qio",
    "hwids": [["0x303A", "0x1001"]],
    "mcu": "esp32s3",
    "variant": "t-deck"
@@ -1,7 +1,8 @@
 {
  "build": {
    "arduino": {
-      "ldscript": "esp32s3_out.ld"
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi"
    },
    "core": "esp32",
    "extra_flags": [
@@ -14,8 +15,8 @@
    ],
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
-    "flash_mode": "dio",
-    "hwids": [["0X303A", "0x1001"]],
+    "flash_mode": "qio",
+    "hwids": [["0x303A", "0x1001"]],
    "mcu": "esp32s3",
    "variant": "t-watch-s3"
  },
@@ -31,8 +32,9 @@
    "maximum_size": 8388608,
    "require_upload_port": true,
    "use_1200bps_touch": true,
-    "wait_for_upload_port": true
+    "wait_for_upload_port": true,
+    "speed": 921600
  },
-  "url": "http://www.lilygo.cn/",
+  "url": "https://www.lilygo.cc/en-pl/products/t-watch-s3",
  "vendor": "LilyGo"
 }
@@ -15,7 +15,7 @@
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
    "flash_mode": "dio",
-    "hwids": [["0X303A", "0x1001"]],
+    "hwids": [["0x303A", "0x1001"]],
    "mcu": "esp32s3",
    "variant": "tbeam-s3-core"
  },
@@ -70,7 +70,7 @@ lib_deps =
  https://github.com/meshtastic/esp8266-oled-ssd1306.git#b38094e03dfa964fbc0e799bc374e91a605c1223 ; ESP8266_SSD1306
  https://github.com/mathertel/OneButton#2.1.0 ; OneButton library for non-blocking button debounce
  https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
-  https://github.com/meshtastic/TinyGPSPlus.git#127ad674ef85f0201cb68a065879653ed94792c4
+  https://github.com/meshtastic/TinyGPSPlus.git#076e8d2c8fb702d9be5b08c55b93ff76f8af7e61
  https://github.com/meshtastic/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
  nanopb/Nanopb@^0.4.7
  erriez/ErriezCRC32@^1.0.1
@@ -88,7 +88,7 @@ check_flags =
 framework = arduino
 lib_deps =
  ${env.lib_deps}
-  mprograms/QMC5883LCompass@^1.1.1
+  mprograms/QMC5883LCompass@^1.2.0
  end2endzone/NonBlockingRTTTL@^1.3.0
  https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#5cf62b36c6f30bc72a07bdb2c11fc9a22d1e31da

@@ -107,8 +107,8 @@ lib_deps =
 [environmental_base]
 lib_deps =
  adafruit/Adafruit BusIO@^1.11.4
-  adafruit/Adafruit Unified Sensor@^1.1.9
-  adafruit/Adafruit BMP280 Library@^2.6.6
+  adafruit/Adafruit Unified Sensor@^1.1.11
+  adafruit/Adafruit BMP280 Library@^2.6.8
  adafruit/Adafruit BME280 Library@^2.2.2
  https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.5.2400
  boschsensortec/BME68x Sensor Library@^1.1.40407
@@ -117,7 +117,7 @@ lib_deps =
  adafruit/Adafruit INA219@^1.2.0
  adafruit/Adafruit SHTC3 Library@^1.0.0
  adafruit/Adafruit LPS2X@^2.0.4
-  adafruit/Adafruit SHT31 Library@^2.2.0
+  adafruit/Adafruit SHT31 Library@^2.2.2
  adafruit/Adafruit PM25 AQI Sensor@^1.0.6
  adafruit/Adafruit MPU6050@^2.2.4
  adafruit/Adafruit LIS3DH@^1.2.4
@@ -0,0 +1,75 @@
+#include "configuration.h"
+
+#ifdef HAS_NCP5623
+#include <graphics/RAKled.h>
+NCP5623 rgb;
+#endif
+
+namespace concurrency
+{
+class AmbientLightingThread : public concurrency::OSThread
+{
+  public:
+    AmbientLightingThread(ScanI2C::DeviceType type) : OSThread("AmbientLightingThread")
+    {
+        // Uncomment to test module
+        // moduleConfig.ambient_lighting.led_state = true;
+        // moduleConfig.ambient_lighting.current = 10;
+        // // Default to a color based on our node number
+        // moduleConfig.ambient_lighting.red = (myNodeInfo.my_node_num & 0xFF0000) >> 16;
+        // moduleConfig.ambient_lighting.green = (myNodeInfo.my_node_num & 0x00FF00) >> 8;
+        // moduleConfig.ambient_lighting.blue = myNodeInfo.my_node_num & 0x0000FF;
+
+#ifdef HAS_NCP5623
+        _type = type;
+        if (_type == ScanI2C::DeviceType::NONE) {
+            LOG_DEBUG("AmbientLightingThread disabling due to no RGB leds found on I2C bus\n");
+            disable();
+            return;
+        }
+        if (!moduleConfig.ambient_lighting.led_state) {
+            LOG_DEBUG("AmbientLightingThread disabling due to moduleConfig.ambient_lighting.led_state OFF\n");
+            disable();
+            return;
+        }
+        LOG_DEBUG("AmbientLightingThread initializing\n");
+        if (_type == ScanI2C::NCP5623) {
+            rgb.begin();
+            setLighting();
+        }
+#endif
+    }
+
+  protected:
+    int32_t runOnce() override
+    {
+#ifdef HAS_NCP5623
+        if (_type == ScanI2C::NCP5623 && moduleConfig.ambient_lighting.led_state) {
+            setLighting();
+            return 30000; // 30 seconds to reset from any animations that may have been running from Ext. Notification
+        } else {
+            return disable();
+        }
+#else
+        return disable();
+#endif
+    }
+
+  private:
+    ScanI2C::DeviceType _type = ScanI2C::DeviceType::NONE;
+
+    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("Initializing Ambient lighting w/ current=%d, red=%d, green=%d, blue=%d\n",
+                  moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
+                  moduleConfig.ambient_lighting.blue);
+#endif
+    }
+};
+
+} // namespace concurrency
@@ -101,23 +101,8 @@ class ButtonThread : public concurrency::OSThread
 #endif
        // if (!canSleep) LOG_DEBUG("Suppressing sleep!\n");
        // else LOG_DEBUG("sleep ok\n");
-#if defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS)
-        int x, y = 0;
-        screen->getTouch(&x, &y);
-        if (x > 0 && y > 0) {
-#ifdef T_WATCH_S3
-            drv.setWaveform(0, 75);
-            drv.setWaveform(1, 0); // end waveform
-            drv.go();
-#endif
-            LOG_DEBUG("touch %d %d\n", x, y);
-            powerFSM.trigger(EVENT_PRESS);
-            return 150; // Check for next touch every in 150ms
-        }

-#endif
-
-        return 5;
+        return 50;
    }

  private:
@@ -179,15 +164,17 @@ class ButtonThread : public concurrency::OSThread

    static void userButtonMultiPressed()
    {
-#if defined(GPS_POWER_TOGGLE)
-        if (config.position.gps_enabled) {
-            LOG_DEBUG("Flag set to false for gps power\n");
-        } else {
-            LOG_DEBUG("Flag set to true to restore power\n");
+        if (!config.device.disable_triple_click && (gps != nullptr)) {
+            config.position.gps_enabled = !(config.position.gps_enabled);
+            if (config.position.gps_enabled) {
+                LOG_DEBUG("Flag set to true to restore power\n");
+                gps->enable();
+
+            } else {
+                LOG_DEBUG("Flag set to false for gps power\n");
+                gps->disable();
+            }
        }
-        config.position.gps_enabled = !(config.position.gps_enabled);
-        doGPSpowersave(config.position.gps_enabled);
-#endif
    }

    static void userButtonPressedLongStart()
@@ -0,0 +1,34 @@
+#include "DisplayFormatters.h"
+
+const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaConfig_ModemPreset preset, bool useShortName)
+{
+    switch (preset) {
+    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
+        return useShortName ? "ShortS" : "ShortSlow";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
+        return useShortName ? "ShortF" : "ShortFast";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
+        return useShortName ? "MedS" : "MediumSlow";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
+        return useShortName ? "MedF" : "MediumFast";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
+        return useShortName ? "LongS" : "LongSlow";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
+        return useShortName ? "LongF" : "LongFast";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
+        return useShortName ? "LongM" : "LongMod";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
+        return useShortName ? "VeryL" : "VLongSlow";
+        break;
+    default:
+        return useShortName ? "Custom" : "Invalid";
+        break;
+    }
+}
@@ -0,0 +1,8 @@
+#pragma once
+#include "NodeDB.h"
+
+class DisplayFormatters
+{
+  public:
+    static const char *getModemPresetDisplayName(meshtastic_Config_LoRaConfig_ModemPreset preset, bool useShortName);
+};
@@ -1,3 +1,13 @@
+/**
+ * @file FSCommon.cpp
+ * @brief This file contains functions for common filesystem operations such as copying, renaming, listing and deleting files and
+ * directories.
+ *
+ * The functions in this file are used to perform common filesystem operations such as copying, renaming, listing and deleting
+ * files and directories. These functions are used in the Meshtastic-device project to manage files and directories on the
+ * device's filesystem.
+ *
+ */
 #include "FSCommon.h"
 #include "configuration.h"

@@ -14,6 +24,13 @@ SPIClass SPI1(HSPI);

 #endif // HAS_SDCARD

+/**
+ * @brief Copies a file from one location to another.
+ *
+ * @param from The path of the source file.
+ * @param to The path of the destination file.
+ * @return true if the file was successfully copied, false otherwise.
+ */
 bool copyFile(const char *from, const char *to)
 {
 #ifdef FSCom
@@ -43,6 +60,14 @@ bool copyFile(const char *from, const char *to)
 #endif
 }

+/**
+ * Renames a file from pathFrom to pathTo.
+ *
+ * @param pathFrom The original path of the file.
+ * @param pathTo The new path of the file.
+ *
+ * @return True if the file was successfully renamed, false otherwise.
+ */
 bool renameFile(const char *pathFrom, const char *pathTo)
 {
 #ifdef FSCom
@@ -59,6 +84,13 @@ bool renameFile(const char *pathFrom, const char *pathTo)
 #endif
 }

+/**
+ * Lists the contents of a directory.
+ *
+ * @param dirname The name of the directory to list.
+ * @param levels The number of levels of subdirectories to list.
+ * @param del Whether or not to delete the contents of the directory after listing.
+ */
 void listDir(const char *dirname, uint8_t levels, bool del = false)
 {
 #ifdef FSCom
@@ -154,6 +186,13 @@ void listDir(const char *dirname, uint8_t levels, bool del = false)
 #endif
 }

+/**
+ * @brief Removes a directory and all its contents.
+ *
+ * This function recursively removes a directory and all its contents, including subdirectories and files.
+ *
+ * @param dirname The name of the directory to remove.
+ */
 void rmDir(const char *dirname)
 {
 #ifdef FSCom
@@ -182,6 +221,9 @@ void fsInit()
 #endif
 }

+/**
+ * Initializes the SD card and mounts the file system.
+ */
 void setupSDCard()
 {
 #ifdef HAS_SDCARD
@@ -212,4 +254,4 @@ void setupSDCard()
    LOG_DEBUG("Total space: %llu MB\n", SD.totalBytes() / (1024 * 1024));
    LOG_DEBUG("Used space: %llu MB\n", SD.usedBytes() / (1024 * 1024));
 #endif
-}
+}
@@ -29,6 +29,16 @@ static void IRAM_ATTR onTimer()
    (*tCallback)(tParam1, tParam2);
 }

+/**
+ * Schedules a hardware callback function to be executed after a specified delay.
+ *
+ * @param callback The function to be executed.
+ * @param param1 The first parameter to be passed to the function.
+ * @param param2 The second parameter to be passed to the function.
+ * @param delayMsec The delay time in milliseconds before the function is executed.
+ *
+ * @return True if the function was successfully scheduled, false otherwise.
+ */
 bool scheduleHWCallback(PendableFunction callback, void *param1, uint32_t param2, uint32_t delayMsec)
 {
    if (!timer) {
@@ -1,11 +1,23 @@
+/**
+ * @file Power.cpp
+ * @brief This file contains the implementation of the Power class, which is responsible for managing power-related functionality
+ * of the device. It includes battery level sensing, power management unit (PMU) control, and power state machine management. The
+ * Power class is used by the main device class to manage power-related functionality.
+ *
+ * The file also includes implementations of various battery level sensors, such as the AnalogBatteryLevel class, which assumes
+ * the battery voltage is attached via a voltage-divider to an analog input.
+ *
+ * This file is part of the Meshtastic project.
+ * For more information, see: https://meshtastic.org/
+ */
 #include "power.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
 #include "buzz/buzz.h"
 #include "configuration.h"
 #include "main.h"
+#include "meshUtils.h"
 #include "sleep.h"
-#include "utils.h"

 #ifdef DEBUG_HEAP_MQTT
 #include "mqtt/MQTT.h"
@@ -163,9 +175,21 @@ class AnalogBatteryLevel : public HasBatteryLevel
            uint32_t raw = 0;
 #ifdef ARCH_ESP32
 #ifndef BAT_MEASURE_ADC_UNIT // ADC1
+#ifdef ADC_CTRL
+            if (heltec_version == 5) {
+                pinMode(ADC_CTRL, OUTPUT);
+                digitalWrite(ADC_CTRL, HIGH);
+                delay(10);
+            }
+#endif
            for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
                raw += adc1_get_raw(adc_channel);
            }
+#ifdef ADC_CTRL
+            if (heltec_version == 5) {
+                digitalWrite(ADC_CTRL, LOW);
+            }
+#endif
 #else  // ADC2
            int32_t adc_buf = 0;
            for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
@@ -209,10 +233,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
    /**
     * return true if there is a battery installed in this unit
     */
-    virtual bool isBatteryConnect() override
-    {
-        return getBatteryPercent() != -1;
-    }
+    virtual bool isBatteryConnect() override { return getBatteryPercent() != -1; }

    /// If we see a battery voltage higher than physics allows - assume charger is pumping
    /// in power
@@ -233,10 +254,7 @@ class AnalogBatteryLevel : public HasBatteryLevel

    /// Assume charging if we have a battery and external power is connected.
    /// we can't be smart enough to say 'full'?
-    virtual bool isCharging() override
-    {
-        return isBatteryConnect() && isVbusIn();
-    }
+    virtual bool isCharging() override { return isBatteryConnect() && isVbusIn(); }

  private:
    /// If we see a battery voltage higher than physics allows - assume charger is pumping
@@ -263,9 +281,10 @@ class AnalogBatteryLevel : public HasBatteryLevel
 #if defined(HAS_TELEMETRY) && !defined(ARCH_PORTDUINO)
    uint16_t getINAVoltage()
    {
-        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219] == config.power.device_battery_ina_address) {
+        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
            return ina219Sensor.getBusVoltageMv();
-        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260] == config.power.device_battery_ina_address) {
+        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260].first ==
+                   config.power.device_battery_ina_address) {
            return ina260Sensor.getBusVoltageMv();
        }
        return 0;
@@ -276,11 +295,12 @@ class AnalogBatteryLevel : public HasBatteryLevel
        if (!config.power.device_battery_ina_address) {
            return false;
        }
-        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219] == config.power.device_battery_ina_address) {
+        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
            if (!ina219Sensor.isInitialized())
                return ina219Sensor.runOnce() > 0;
            return ina219Sensor.isRunning();
-        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260] == config.power.device_battery_ina_address) {
+        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260].first ==
+                   config.power.device_battery_ina_address) {
            if (!ina260Sensor.isInitialized())
                return ina260Sensor.runOnce() > 0;
            return ina260Sensor.isRunning();
@@ -366,6 +386,11 @@ bool Power::analogInit()
 #endif
 }

+/**
+ * Initializes the Power class.
+ *
+ * @return true if the setup was successful, false otherwise.
+ */
 bool Power::setup()
 {
    bool found = axpChipInit();
@@ -403,7 +428,7 @@ void Power::shutdown()
 #ifdef PIN_LED3
    ledOff(PIN_LED2);
 #endif
-    doDeepSleep(DELAY_FOREVER);
+    doDeepSleep(DELAY_FOREVER, false);
 #endif
 }

@@ -1,5 +1,13 @@
+/**
+ * @file PowerFSM.cpp
+ * @brief Implements the finite state machine for power management.
+ *
+ * This file contains the implementation of the finite state machine (FSM) for power management.
+ * The FSM controls the power states of the device, including SDS (shallow deep sleep), LS (light sleep),
+ * NB (normal mode), and POWER (powered mode). The FSM also handles transitions between states and
+ * actions to be taken upon entering or exiting each state.
+ */
 #include "PowerFSM.h"
-#include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "configuration.h"
@@ -37,7 +45,7 @@ static void sdsEnter()
 {
    LOG_DEBUG("Enter state: SDS\n");
    // FIXME - make sure GPS and LORA radio are off first - because we want close to zero current draw
-    doDeepSleep(getConfiguredOrDefaultMs(config.power.sds_secs));
+    doDeepSleep(getConfiguredOrDefaultMs(config.power.sds_secs), false);
 }

 extern Power *power;
@@ -128,16 +136,16 @@ static void lsIdle()
 static void lsExit()
 {
    LOG_INFO("Exit state: LS\n");
-    // setGPSPower(true); // restore GPS power
-    if (gps)
-        gps->forceWake(true);
 }

 static void nbEnter()
 {
    LOG_DEBUG("Enter state: NB\n");
    screen->setOn(false);
+#ifdef ARCH_ESP32
+    // Only ESP32 should turn off bluetooth
    setBluetoothEnable(false);
+#endif

    // FIXME - check if we already have packets for phone and immediately trigger EVENT_PACKETS_FOR_PHONE
 }
@@ -158,12 +166,14 @@ static void serialEnter()

 static void serialExit()
 {
+    // Turn bluetooth back on when we leave serial stream API
+    setBluetoothEnable(true);
    screen->print("Serial disconnected\n");
 }

 static void powerEnter()
 {
-    LOG_DEBUG("Enter state: POWER\n");
+    // LOG_DEBUG("Enter state: POWER\n");
    if (!isPowered()) {
        // If we got here, we are in the wrong state - we should be in powered, let that state ahndle things
        LOG_INFO("Loss of power in Powered\n");
@@ -235,6 +245,8 @@ Fsm powerFSM(&stateBOOT);
 void PowerFSM_setup()
 {
    bool isRouter = (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER ? 1 : 0);
+    bool isTrackerOrSensor = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
+                             config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR;
    bool hasPower = isPowered();

    LOG_INFO("PowerFSM init, USB power=%d\n", hasPower ? 1 : 0);
@@ -242,7 +254,11 @@ void PowerFSM_setup()

    // wake timer expired or a packet arrived
    // if we are a router node, we go to NB (no need for bluetooth) otherwise we go to DARK (so we can send message to phone)
+#ifdef ARCH_ESP32
    powerFSM.add_transition(&stateLS, isRouter ? &stateNB : &stateDARK, EVENT_WAKE_TIMER, NULL, "Wake timer");
+#else // Don't go into a no-bluetooth state on low power platforms
+    powerFSM.add_transition(&stateLS, &stateDARK, EVENT_WAKE_TIMER, NULL, "Wake timer");
+#endif

    // We need this transition, because we might not transition if we were waiting to enter light-sleep, because when we wake from
    // light sleep we _always_ transition to NB or dark and
@@ -279,7 +295,8 @@ void PowerFSM_setup()
    powerFSM.add_transition(&stateLS, &stateON, EVENT_INPUT, NULL, "Input Device");
    powerFSM.add_transition(&stateNB, &stateON, EVENT_INPUT, NULL, "Input Device");
    powerFSM.add_transition(&stateDARK, &stateON, EVENT_INPUT, NULL, "Input Device");
-    powerFSM.add_transition(&stateON, &stateON, EVENT_INPUT, NULL, "Input Device"); // restarts the sleep timer
+    powerFSM.add_transition(&stateON, &stateON, EVENT_INPUT, NULL, "Input Device");       // restarts the sleep timer
+    powerFSM.add_transition(&statePOWER, &statePOWER, EVENT_INPUT, NULL, "Input Device"); // restarts the sleep timer

    powerFSM.add_transition(&stateDARK, &stateON, EVENT_BLUETOOTH_PAIR, NULL, "Bluetooth pairing");
    powerFSM.add_transition(&stateON, &stateON, EVENT_BLUETOOTH_PAIR, NULL, "Bluetooth pairing");
@@ -333,12 +350,12 @@ void PowerFSM_setup()
                                  getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL,
                                  "Screen-on timeout");

+// We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally)
 #ifdef ARCH_ESP32
-    State *lowPowerState = &stateLS;
-    // We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally)
-
    // See: https://github.com/meshtastic/firmware/issues/1071
-    if (isRouter || config.power.is_power_saving) {
+    // Don't add power saving transitions if we are a power saving tracker or sensor. Sleep will be initiatiated through the
+    // modules
+    if ((isRouter || config.power.is_power_saving) && !isTrackerOrSensor) {
        powerFSM.add_timed_transition(&stateNB, &stateLS,
                                      getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL,
                                      "Min wake timeout");
@@ -346,10 +363,6 @@ void PowerFSM_setup()
                                      getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs),
                                      NULL, "Bluetooth timeout");
    }
-
-    if (config.power.sds_secs != UINT32_MAX)
-        powerFSM.add_timed_transition(lowPowerState, &stateSDS, getConfiguredOrDefaultMs(config.power.sds_secs), NULL,
-                                      "mesh timeout");
 #endif

    powerFSM.run_machine(); // run one iteration of the state machine, so we run our on enter tasks for the initial DARK state
@@ -21,7 +21,7 @@ class PowerFSMThread : public OSThread

        /// If we are in power state we force the CPU to wake every 10ms to check for serial characters (we don't yet wake
        /// cpu for serial rx - FIXME)
-        auto state = powerFSM.getState();
+        const auto state = powerFSM.getState();
        canSleep = (state != &statePOWER) && (state != &stateSERIAL);

        if (powerStatus->getHasUSB()) {
@@ -18,6 +18,12 @@ NoopPrint noopPrint;
 #if HAS_WIFI || HAS_ETHERNET
 extern Syslog syslog;
 #endif
+void RedirectablePrint::rpInit()
+{
+#ifdef HAS_FREE_RTOS
+    inDebugPrint = xSemaphoreCreateMutexStatic(&this->_MutexStorageSpace);
+#endif
+}

 void RedirectablePrint::setDestination(Print *_dest)
 {
@@ -66,9 +72,12 @@ size_t RedirectablePrint::log(const char *logLevel, const char *format, ...)
        return 0;
    }
    size_t r = 0;
-
+#ifdef HAS_FREE_RTOS
+    if (inDebugPrint != nullptr && xSemaphoreTake(inDebugPrint, portMAX_DELAY) == pdTRUE) {
+#else
    if (!inDebugPrint) {
        inDebugPrint = true;
+#endif

        va_list arg;
        va_start(arg, format);
@@ -141,7 +150,11 @@ size_t RedirectablePrint::log(const char *logLevel, const char *format, ...)
        va_end(arg);

        isContinuationMessage = !hasNewline;
+#ifdef HAS_FREE_RTOS
+        xSemaphoreGive(inDebugPrint);
+#else
        inDebugPrint = false;
+#endif
    }

    return r;
@@ -1,5 +1,6 @@
 #pragma once

+#include "../freertosinc.h"
 #include <Print.h>
 #include <stdarg.h>
 #include <string>
@@ -16,14 +17,19 @@ class RedirectablePrint : public Print
    /// Used to allow multiple logDebug messages to appear on a single log line
    bool isContinuationMessage = false;

+#ifdef HAS_FREE_RTOS
+    SemaphoreHandle_t inDebugPrint = nullptr;
+    StaticSemaphore_t _MutexStorageSpace;
+#else
    volatile bool inDebugPrint = false;
-
+#endif
  public:
    explicit RedirectablePrint(Print *_dest) : dest(_dest) {}

    /**
     * Set a new destination
     */
+    void rpInit();
    void setDestination(Print *dest);

    virtual size_t write(uint8_t c);
@@ -54,4 +60,4 @@ class NoopPrint : public Print
 /**
 * A printer that doesn't go anywhere
 */
-extern NoopPrint noopPrint;
+extern NoopPrint noopPrint;
@@ -12,6 +12,7 @@ SerialConsole *console;
 void consoleInit()
 {
    new SerialConsole(); // Must be dynamically allocated because we are now inheriting from thread
+    DEBUG_PORT.rpInit(); // Simply sets up semaphore
 }

 void consolePrintf(const char *format, ...)
@@ -15,4 +15,6 @@ enum class Cmd {
    PRINT,
    START_SHUTDOWN_SCREEN,
    START_REBOOT_SCREEN,
+    SHOW_PREV_FRAME,
+    SHOW_NEXT_FRAME
 };
@@ -53,7 +53,7 @@ class OSThread : public Thread

    static void setup();

-    int32_t disable();
+    virtual int32_t disable();

    /**
     * Wait a specified number msecs starting from the current time (rather than the last time we were run)
@@ -67,6 +67,7 @@ class OSThread : public Thread
     * Returns desired period for next invocation (or RUN_SAME for no change)
     */
    virtual int32_t runOnce() = 0;
+    bool sleepOnNextExecution = false;

    // Do not override this
    virtual void run();
@@ -87,4 +88,4 @@ extern bool hasBeenSetup;

 void assertIsSetup();

-} // namespace concurrency
+} // namespace concurrency
@@ -98,8 +98,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Define if screen should be mirrored left to right
 // #define SCREEN_MIRROR

-// The m5stack I2C Keyboard (also RAK14004)
+// I2C Keyboards (M5Stack, RAK14004, T-Deck)
 #define CARDKB_ADDR 0x5F
+#define TDECK_KB_ADDR 0x55
+#define BBQ10_KB_ADDR 0x1F

 // -----------------------------------------------------------------------------
 // SENSOR
@@ -143,9 +145,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define GPS_BAUDRATE 9600

 #ifndef GPS_THREAD_INTERVAL
-#define GPS_THREAD_INTERVAL 100
+#define GPS_THREAD_INTERVAL 200
 #endif

+// convert 24-bit color to 16-bit (56K)
+#define COLOR565(r, g, b) (((r & 0xF8) << 8) | ((g & 0xFC) << 3) | ((b & 0xF8) >> 3))
+
 /* Step #1: offer chance for variant-specific defines */
 #include "variant.h"

@@ -173,6 +178,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef HAS_BUTTON
 #define HAS_BUTTON 0
 #endif
+#ifndef HAS_TRACKBALL
+#define HAS_TRACKBALL 0
+#endif
+#ifndef HAS_TOUCHSCREEN
+#define HAS_TOUCHSCREEN 0
+#endif
 #ifndef HAS_TELEMETRY
 #define HAS_TELEMETRY 0
 #endif
@@ -30,8 +30,8 @@ ScanI2C::FoundDevice ScanI2C::firstRTC() const

 ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
 {
-    ScanI2C::DeviceType types[] = {CARDKB, RAK14004};
-    return firstOfOrNONE(2, types);
+    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004};
+    return firstOfOrNONE(4, types);
 }

 ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
@@ -16,6 +16,8 @@ class ScanI2C
        RTC_RV3028,
        RTC_PCF8563,
        CARDKB,
+        TDECKKB,
+        BBQ10KB,
        RAK14004,
        PMU_AXP192_AXP2101,
        BME_680,
@@ -212,6 +212,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port)
                }
                break;

+                SCAN_SIMPLE_CASE(TDECK_KB_ADDR, TDECKKB, "T-Deck keyboard found\n");
+                SCAN_SIMPLE_CASE(BBQ10_KB_ADDR, BBQ10KB, "BB Q10 keyboard found\n");
                SCAN_SIMPLE_CASE(ST7567_ADDRESS, SCREEN_ST7567, "st7567 display found\n");
 #ifdef HAS_NCP5623
                SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623 RGB LED found\n");
@@ -18,6 +18,8 @@ class ScanI2CTwoWire : public ScanI2C

    ScanI2C::FoundDevice find(ScanI2C::DeviceType) const override;

+    TwoWire *fetchI2CBus(ScanI2C::DeviceAddress) const;
+
    bool exists(ScanI2C::DeviceType) const override;

    size_t countDevices() const override;
@@ -51,6 +53,4 @@ class ScanI2CTwoWire : public ScanI2C
    uint16_t getRegisterValue(const RegisterLocation &, ResponseWidth) const;

    DeviceType probeOLED(ScanI2C::DeviceAddress) const;
-
-    TwoWire *fetchI2CBus(ScanI2C::DeviceAddress) const;
 };
@@ -2,7 +2,16 @@

 #include "GPSStatus.h"
 #include "Observer.h"
+#include "TinyGPS++.h"
 #include "concurrency/OSThread.h"
+#include "input/RotaryEncoderInterruptImpl1.h"
+#include "input/UpDownInterruptImpl1.h"
+#include "modules/PositionModule.h"
+
+// Allow defining the polarity of the ENABLE output.  default is active high
+#ifndef GPS_EN_ACTIVE
+#define GPS_EN_ACTIVE 1
+#endif

 struct uBloxGnssModelInfo {
    char swVersion[30];
@@ -18,6 +27,13 @@ typedef enum {
    GNSS_MODEL_UNKNOWN,
 } GnssModel_t;

+typedef enum {
+    GNSS_RESPONSE_NONE,
+    GNSS_RESPONSE_NAK,
+    GNSS_RESPONSE_FRAME_ERRORS,
+    GNSS_RESPONSE_OK,
+} GPS_RESPONSE;
+
 // Generate a string representation of DOP
 const char *getDOPString(uint32_t dop);

@@ -28,8 +44,29 @@ const char *getDOPString(uint32_t dop);
 */
 class GPS : private concurrency::OSThread
 {
+    TinyGPSPlus reader;
+    uint8_t fixQual = 0; // fix quality from GPGGA
+    uint32_t lastChecksumFailCount = 0;
+
+#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
+    // (20210908) TinyGps++ can only read the GPGSA "FIX TYPE" field
+    // via optional feature "custom fields", currently disabled (bug #525)
+    TinyGPSCustom gsafixtype; // custom extract fix type from GPGSA
+    TinyGPSCustom gsapdop;    // custom extract PDOP from GPGSA
+    uint8_t fixType = 0;      // fix type from GPGSA
+#endif
  private:
-    uint32_t lastWakeStartMsec = 0, lastSleepStartMsec = 0, lastWhileActiveMsec = 0;
+    uint32_t lastWakeStartMsec = 0, lastSleepStartMsec = 0;
+    const int serialSpeeds[6] = {9600, 4800, 38400, 57600, 115200, 9600};
+
+    uint32_t rx_gpio = 0;
+    uint32_t tx_gpio = 0;
+    uint32_t en_gpio = 0;
+    int32_t averageLockTime = 0;
+    uint32_t GPSCycles = 0;
+
+    int speedSelect = 0;
+    int probeTries = 2;

    /**
     * hasValidLocation - indicates that the position variables contain a complete
@@ -39,15 +76,17 @@ class GPS : private concurrency::OSThread

    bool isAwake = false; // true if we want a location right now

-    bool wakeAllowed = true; // false if gps must be forced to sleep regardless of what time it is
+    bool isInPowersave = false;

    bool shouldPublish = false; // If we've changed GPS state, this will force a publish the next loop()

    bool hasGPS = false; // Do we have a GPS we are talking to

+    bool GPSInitFinished = false; // Init thread finished?
+    bool GPSInitStarted = false;  // Init thread finished?
+
    uint8_t numSatellites = 0;

-    CallbackObserver<GPS, void *> notifySleepObserver = CallbackObserver<GPS, void *>(this, &GPS::prepareSleep);
    CallbackObserver<GPS, void *> notifyDeepSleepObserver = CallbackObserver<GPS, void *>(this, &GPS::prepareDeepSleep);
    CallbackObserver<GPS, void *> notifyGPSSleepObserver = CallbackObserver<GPS, void *>(this, &GPS::prepareDeepSleep);

@@ -55,6 +94,24 @@ class GPS : private concurrency::OSThread
    /** If !NULL we will use this serial port to construct our GPS */
    static HardwareSerial *_serial_gps;

+    static uint8_t _message_PMREQ[];
+    static const uint8_t _message_CFG_RXM_PSM[];
+    static const uint8_t _message_CFG_RXM_ECO[];
+    static const uint8_t _message_CFG_PM2[];
+    static const uint8_t _message_GNSS_7[];
+    static const uint8_t _message_GNSS[];
+    static const uint8_t _message_JAM[];
+    static const uint8_t _message_NAVX5[];
+    static const uint8_t _message_1HZ[];
+    static const uint8_t _message_GGL[];
+    static const uint8_t _message_GSA[];
+    static const uint8_t _message_GSV[];
+    static const uint8_t _message_VTG[];
+    static const uint8_t _message_RMC[];
+    static const uint8_t _message_GGA[];
+    static const uint8_t _message_PMS[];
+    static const uint8_t _message_SAVE[];
+
    meshtastic_Position p = meshtastic_Position_init_default;

    GPS() : concurrency::OSThread("GPS") {}
@@ -69,6 +126,14 @@ class GPS : private concurrency::OSThread
     */
    virtual bool setup();

+    // re-enable the thread
+    void enable();
+
+    // Disable the thread
+    int32_t disable() override;
+
+    void setGPSPower(bool on, bool standbyOnly, uint32_t sleepTime);
+
    /// Returns true if we have acquired GPS lock.
    virtual bool hasLock();

@@ -80,68 +145,20 @@ class GPS : private concurrency::OSThread

    bool isPowerSaving() const { return !config.position.gps_enabled; }

-    /**
-     * Restart our lock attempt - try to get and broadcast a GPS reading ASAP
-     * called after the CPU wakes from light-sleep state
-     *
-     * Or set to false, to disallow any sort of waking
-     * */
-    void forceWake(bool on);
+    // Empty the input buffer as quickly as possible
+    void clearBuffer();

-    // Some GPS modules (ublock) require factory reset
-    virtual bool factoryReset() { return true; }
+    // Create a ublox packet for editing in memory
+    uint8_t makeUBXPacket(uint8_t class_id, uint8_t msg_id, uint8_t payload_size, const uint8_t *msg);

-  protected:
-    /// Do gps chipset specific init, return true for success
-    virtual bool setupGPS();
+    // scratch space for creating ublox packets
+    uint8_t UBXscratch[250] = {0};

-    /// If possible force the GPS into sleep/low power mode
-    virtual void sleep();
+    int rebootsSeen = 0;

-    /// wake the GPS into normal operation mode
-    virtual void wake();
-
-    /** Subclasses should look for serial rx characters here and feed it to their GPS parser
-     *
-     * Return true if we received a valid message from the GPS
-     */
-    virtual bool whileIdle() = 0;
-
-    /** Idle processing while GPS is looking for lock, called once per secondish */
-    virtual void whileActive() {}
-
-    /**
-     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
-     * Override this method to check for new locations
-     *
-     * @return true if we've acquired a time
-     */
-    virtual bool lookForTime() = 0;
-
-    /**
-     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
-     * Override this method to check for new locations
-     *
-     * @return true if we've acquired a new location
-     */
-    virtual bool lookForLocation() = 0;
-
-    /// Record that we have a GPS
-    void setConnected();
-
-    void setNumSatellites(uint8_t n);
-
-  private:
-    /// Prepare the GPS for the cpu entering deep or light sleep, expect to be gone for at least 100s of msecs
-    /// always returns 0 to indicate okay to sleep
-    int prepareSleep(void *unused);
-
-    /// Prepare the GPS for the cpu entering deep sleep, expect to be gone for at least 100s of msecs
-    /// always returns 0 to indicate okay to sleep
-    int prepareDeepSleep(void *unused);
-
-    // Calculate checksum
-    void UBXChecksum(byte *message, size_t length);
+    int getACK(uint8_t *buffer, uint16_t size, uint8_t requestedClass, uint8_t requestedID, uint32_t waitMillis);
+    GPS_RESPONSE getACK(uint8_t c, uint8_t i, uint32_t waitMillis);
+    GPS_RESPONSE getACK(const char *message, uint32_t waitMillis);

    /**
     * Switch the GPS into a mode where we are actively looking for a lock, or alternatively switch GPS into a low power mode
@@ -149,6 +166,59 @@ class GPS : private concurrency::OSThread
     * calls sleep/wake
     */
    void setAwake(bool on);
+    virtual bool factoryReset();
+
+    // Creates an instance of the GPS class.
+    // Returns the new instance or null if the GPS is not present.
+    static GPS *createGps();
+
+  protected:
+    /**
+     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
+     * Override this method to check for new locations
+     *
+     * @return true if we've acquired a time
+     */
+
+    /**
+     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
+     * Override this method to check for new locations
+     *
+     * @return true if we've acquired a new location
+     */
+
+    /// Record that we have a GPS
+    void setConnected();
+
+    /** Subclasses should look for serial rx characters here and feed it to their GPS parser
+     *
+     * Return true if we received a valid message from the GPS
+     */
+    virtual bool whileIdle();
+
+    /**
+     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
+     * Override this method to check for new locations
+     *
+     * @return true if we've acquired a time
+     */
+    virtual bool lookForTime();
+
+    /**
+     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
+     * Override this method to check for new locations
+     *
+     * @return true if we've acquired a new location
+     */
+    virtual bool lookForLocation();
+
+  private:
+    /// Prepare the GPS for the cpu entering deep sleep, expect to be gone for at least 100s of msecs
+    /// always returns 0 to indicate okay to sleep
+    int prepareDeepSleep(void *unused);
+
+    // Calculate checksum
+    void UBXChecksum(uint8_t *message, size_t length);

    /** Get how long we should stay looking for each aquisition
     */
@@ -158,8 +228,6 @@ class GPS : private concurrency::OSThread
     */
    uint32_t getSleepTime() const;

-    bool getACK(uint8_t c, uint8_t i);
-
    /**
     * Tell users we have new GPS readings
     */
@@ -169,9 +237,7 @@ class GPS : private concurrency::OSThread

    // Get GNSS model
    String getNMEA();
-    GnssModel_t probe();
-
-    int getAck(uint8_t *buffer, uint16_t size, uint8_t requestedClass, uint8_t requestedID);
+    GnssModel_t probe(int serialSpeed);

    // delay counter to allow more sats before fixed position stops GPS thread
    uint8_t fixeddelayCtr = 0;
@@ -180,8 +246,4 @@ class GPS : private concurrency::OSThread
    GnssModel_t gnssModel = GNSS_MODEL_UNKNOWN;
 };

-// Creates an instance of the GPS class.
-// Returns the new instance or null if the GPS is not present.
-GPS *createGps();
-
 extern GPS *gps;
@@ -1,255 +0,0 @@
-#include "NMEAGPS.h"
-#include "RTC.h"
-#include "configuration.h"
-
-#include <TinyGPS++.h>
-
-// GPS solutions older than this will be rejected - see TinyGPSDatum::age()
-#define GPS_SOL_EXPIRY_MS 5000 // in millis. give 1 second time to combine different sentences. NMEA Frequency isn't higher anyway
-#define NMEA_MSG_GXGSA "GNGSA" // GSA message (GPGSA, GNGSA etc)
-
-static int32_t toDegInt(RawDegrees d)
-{
-    int32_t degMult = 10000000; // 1e7
-    int32_t r = d.deg * degMult + d.billionths / 100;
-    if (d.negative)
-        r *= -1;
-    return r;
-}
-
-bool NMEAGPS::factoryReset()
-{
-#ifdef PIN_GPS_REINIT
-    // The L76K GNSS on the T-Echo requires the RESET pin to be pulled LOW
-    digitalWrite(PIN_GPS_REINIT, 0);
-    pinMode(PIN_GPS_REINIT, OUTPUT);
-    delay(150); // The L76K datasheet calls for at least 100MS delay
-    digitalWrite(PIN_GPS_REINIT, 1);
-#endif
-
-    // send the UBLOX Factory Reset Command regardless of detect state, something is very wrong, just assume it's UBLOX.
-    // Factory Reset
-    byte _message_reset[] = {0xB5, 0x62, 0x06, 0x09, 0x0D, 0x00, 0xFF, 0xFB, 0x00, 0x00, 0x00,
-                             0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x17, 0x2B, 0x7E};
-    _serial_gps->write(_message_reset, sizeof(_message_reset));
-    delay(1000);
-    return true;
-}
-
-bool NMEAGPS::setupGPS()
-{
-    GPS::setupGPS();
-
-#ifdef PIN_GPS_PPS
-    // pulse per second
-    // FIXME - move into shared GPS code
-    pinMode(PIN_GPS_PPS, INPUT);
-#endif
-
-// Currently disabled per issue #525 (TinyGPS++ crash bug)
-// when fixed upstream, can be un-disabled to enable 3D FixType and PDOP
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-    // see NMEAGPS.h
-    gsafixtype.begin(reader, NMEA_MSG_GXGSA, 2);
-    gsapdop.begin(reader, NMEA_MSG_GXGSA, 15);
-    LOG_DEBUG("Using " NMEA_MSG_GXGSA " for 3DFIX and PDOP\n");
-#else
-    LOG_DEBUG("GxGSA NOT available\n");
-#endif
-
-    return true;
-}
-
-/**
- * Perform any processing that should be done only while the GPS is awake and looking for a fix.
- * Override this method to check for new locations
- *
- * @return true if we've acquired a new location
- */
-bool NMEAGPS::lookForTime()
-{
-    auto ti = reader.time;
-    auto d = reader.date;
-    if (ti.isValid() && d.isValid()) { // Note: we don't check for updated, because we'll only be called if needed
-        /* 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
-(midnight UTC/GMT), not counting leap seconds (in ISO 8601: 1970-01-01T00:00:00Z).
-*/
-        struct tm t;
-        t.tm_sec = ti.second();
-        t.tm_min = ti.minute();
-        t.tm_hour = ti.hour();
-        t.tm_mday = d.day();
-        t.tm_mon = d.month() - 1;
-        t.tm_year = d.year() - 1900;
-        t.tm_isdst = false;
-        if (t.tm_mon > -1) {
-            LOG_DEBUG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min,
-                      t.tm_sec);
-            perhapsSetRTC(RTCQualityGPS, t);
-            return true;
-        } else
-            return false;
-    } else
-        return false;
-}
-
-/**
- * Perform any processing that should be done only while the GPS is awake and looking for a fix.
- * Override this method to check for new locations
- *
- * @return true if we've acquired a new location
- */
-bool NMEAGPS::lookForLocation()
-{
-    // By default, TinyGPS++ does not parse GPGSA lines, which give us
-    //   the 2D/3D fixType (see NMEAGPS.h)
-    // At a minimum, use the fixQuality indicator in GPGGA (FIXME?)
-    fixQual = reader.fixQuality();
-
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-    fixType = atoi(gsafixtype.value()); // will set to zero if no data
-    // LOG_DEBUG("FIX QUAL=%d, TYPE=%d\n", fixQual, fixType);
-#endif
-
-    // check if GPS has an acceptable lock
-    if (!hasLock())
-        return false;
-
-#ifdef GPS_EXTRAVERBOSE
-    LOG_DEBUG("AGE: LOC=%d FIX=%d DATE=%d TIME=%d\n", reader.location.age(),
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-              gsafixtype.age(),
-#else
-              0,
-#endif
-              reader.date.age(), reader.time.age());
-#endif // GPS_EXTRAVERBOSE
-
-    // check if a complete GPS solution set is available for reading
-    //   tinyGPSDatum::age() also includes isValid() test
-    // FIXME
-    if (!((reader.location.age() < GPS_SOL_EXPIRY_MS) &&
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-          (gsafixtype.age() < GPS_SOL_EXPIRY_MS) &&
-#endif
-          (reader.time.age() < GPS_SOL_EXPIRY_MS) && (reader.date.age() < GPS_SOL_EXPIRY_MS))) {
-        LOG_WARN("SOME data is TOO OLD: LOC %u, TIME %u, DATE %u\n", reader.location.age(), reader.time.age(), reader.date.age());
-        return false;
-    }
-
-    // Is this a new point or are we re-reading the previous one?
-    if (!reader.location.isUpdated())
-        return false;
-
-    // We know the solution is fresh and valid, so just read the data
-    auto loc = reader.location.value();
-
-    // Bail out EARLY to avoid overwriting previous good data (like #857)
-    if (toDegInt(loc.lat) > 900000000) {
-#ifdef GPS_EXTRAVERBOSE
-        LOG_DEBUG("Bail out EARLY on LAT %i\n", toDegInt(loc.lat));
-#endif
-        return false;
-    }
-    if (toDegInt(loc.lng) > 1800000000) {
-#ifdef GPS_EXTRAVERBOSE
-        LOG_DEBUG("Bail out EARLY on LNG %i\n", toDegInt(loc.lng));
-#endif
-        return false;
-    }
-
-    p.location_source = meshtastic_Position_LocSource_LOC_INTERNAL;
-
-    // Dilution of precision (an accuracy metric) is reported in 10^2 units, so we need to scale down when we use it
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-    p.HDOP = reader.hdop.value();
-    p.PDOP = TinyGPSPlus::parseDecimal(gsapdop.value());
-    // LOG_DEBUG("PDOP=%d, HDOP=%d\n", p.PDOP, p.HDOP);
-#else
-    // FIXME! naive PDOP emulation (assumes VDOP==HDOP)
-    // correct formula is PDOP = SQRT(HDOP^2 + VDOP^2)
-    p.HDOP = reader.hdop.value();
-    p.PDOP = 1.41 * reader.hdop.value();
-#endif
-
-    // Discard incomplete or erroneous readings
-    if (reader.hdop.value() == 0)
-        return false;
-
-    p.latitude_i = toDegInt(loc.lat);
-    p.longitude_i = toDegInt(loc.lng);
-
-    p.altitude_geoidal_separation = reader.geoidHeight.meters();
-    p.altitude_hae = reader.altitude.meters() + p.altitude_geoidal_separation;
-    p.altitude = reader.altitude.meters();
-
-    p.fix_quality = fixQual;
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-    p.fix_type = fixType;
-#endif
-
-    // positional timestamp
-    struct tm t;
-    t.tm_sec = reader.time.second();
-    t.tm_min = reader.time.minute();
-    t.tm_hour = reader.time.hour();
-    t.tm_mday = reader.date.day();
-    t.tm_mon = reader.date.month() - 1;
-    t.tm_year = reader.date.year() - 1900;
-    t.tm_isdst = false;
-    p.timestamp = mktime(&t);
-
-    // Nice to have, if available
-    if (reader.satellites.isUpdated()) {
-        p.sats_in_view = reader.satellites.value();
-    }
-
-    if (reader.course.isUpdated() && reader.course.isValid()) {
-        if (reader.course.value() < 36000) { // sanity check
-            p.ground_track =
-                reader.course.value() * 1e3; // Scale the heading (in degrees * 10^-2) to match the expected degrees * 10^-5
-        } else {
-            LOG_WARN("BOGUS course.value() REJECTED: %d\n", reader.course.value());
-        }
-    }
-
-    if (reader.speed.isUpdated() && reader.speed.isValid()) {
-        p.ground_speed = reader.speed.kmph();
-    }
-
-    return true;
-}
-
-bool NMEAGPS::hasLock()
-{
-    // Using GPGGA fix quality indicator
-    if (fixQual >= 1 && fixQual <= 5) {
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-        // Use GPGSA fix type 2D/3D (better) if available
-        if (fixType == 3 || fixType == 0) // zero means "no data received"
-#endif
-            return true;
-    }
-
-    return false;
-}
-
-bool NMEAGPS::hasFlow()
-{
-    return reader.passedChecksum() > 0;
-}
-
-bool NMEAGPS::whileIdle()
-{
-    bool isValid = false;
-
-    // First consume any chars that have piled up at the receiver
-    while (_serial_gps->available() > 0) {
-        int c = _serial_gps->read();
-        // LOG_DEBUG("%c", c);
-        isValid |= reader.encode(c);
-    }
-
-    return isValid;
-}
@@ -1,56 +0,0 @@
-#pragma once
-
-#include "GPS.h"
-#include "Observer.h"
-#include "TinyGPS++.h"
-
-/**
- * A gps class thatreads from a NMEA GPS stream (and FIXME - eventually keeps the gps powered down except when reading)
- *
- * When new data is available it will notify observers.
- */
-class NMEAGPS : public GPS
-{
-    TinyGPSPlus reader;
-    uint8_t fixQual = 0; // fix quality from GPGGA
-
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-    // (20210908) TinyGps++ can only read the GPGSA "FIX TYPE" field
-    // via optional feature "custom fields", currently disabled (bug #525)
-    TinyGPSCustom gsafixtype; // custom extract fix type from GPGSA
-    TinyGPSCustom gsapdop;    // custom extract PDOP from GPGSA
-    uint8_t fixType = 0;      // fix type from GPGSA
-#endif
-
-  public:
-    virtual bool setupGPS() override;
-
-    virtual bool factoryReset() override;
-
-  protected:
-    /** Subclasses should look for serial rx characters here and feed it to their GPS parser
-     *
-     * Return true if we received a valid message from the GPS
-     */
-    virtual bool whileIdle() override;
-
-    /**
-     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
-     * Override this method to check for new locations
-     *
-     * @return true if we've acquired a time
-     */
-    virtual bool lookForTime() override;
-
-    /**
-     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
-     * Override this method to check for new locations
-     *
-     * @return true if we've acquired a new location
-     */
-    virtual bool lookForLocation() override;
-
-    virtual bool hasLock() override;
-
-    virtual bool hasFlow() override;
-};
@@ -17,6 +17,10 @@ static uint32_t
    timeStartMsec; // Once we have a GPS lock, this is where we hold the initial msec clock that corresponds to that time
 static uint64_t zeroOffsetSecs; // GPS based time in secs since 1970 - only updated once on initial lock

+/**
+ * Reads the current date and time from the RTC module and updates the system time.
+ * @return True if the RTC was successfully read and the system time was updated, false otherwise.
+ */
 void readFromRTC()
 {
    struct timeval tv; /* btw settimeofday() is helpful here too*/
@@ -83,7 +87,15 @@ void readFromRTC()
 #endif
 }

-/// If we haven't yet set our RTC this boot, set it from a GPS derived time
+/**
+ * Sets the RTC (Real-Time Clock) if the provided time is of higher quality than the current RTC time.
+ *
+ * @param q The quality of the provided time.
+ * @param tv A pointer to a timeval struct containing the time to potentially set the RTC to.
+ * @return True if the RTC was set, false otherwise.
+ *
+ * If we haven't yet set our RTC this boot, set it from a GPS derived time
+ */
 bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
 {
    static uint32_t lastSetMsec = 0;
@@ -91,9 +103,8 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)

    bool shouldSet;
    if (q > currentQuality) {
-        currentQuality = q;
        shouldSet = true;
-        LOG_DEBUG("Upgrading time to RTC %ld secs (quality %d)\n", tv->tv_sec, q);
+        LOG_DEBUG("Upgrading time to quality %d\n", q);
    } else if (q == RTCQualityGPS && (now - lastSetMsec) > (12 * 60 * 60 * 1000UL)) {
        // Every 12 hrs we will slam in a new GPS time, to correct for local RTC clock drift
        shouldSet = true;
@@ -102,12 +113,12 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
        shouldSet = false;

    if (shouldSet) {
+        currentQuality = q;
        lastSetMsec = now;

        // This delta value works on all platforms
        timeStartMsec = now;
        zeroOffsetSecs = tv->tv_sec;
-
        // If this platform has a setable RTC, set it
 #ifdef RV3028_RTC
        if (rtc_found.address == RV3028_RTC) {
@@ -151,6 +162,13 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
    }
 }

+/**
+ * Sets the RTC time if the provided time is of higher quality than the current RTC time.
+ *
+ * @param q The quality of the provided time.
+ * @param t The time to potentially set the RTC to.
+ * @return True if the RTC was set to the provided time, false otherwise.
+ */
 bool perhapsSetRTC(RTCQuality q, struct tm &t)
 {
    /* Convert to unix time
@@ -171,12 +189,23 @@ bool perhapsSetRTC(RTCQuality q, struct tm &t)
    }
 }

+/**
+ * Returns the current time in seconds since the Unix epoch (January 1, 1970).
+ *
+ * @return The current time in seconds since the Unix epoch.
+ */
 uint32_t getTime()
 {
    return (((uint32_t)millis() - timeStartMsec) / 1000) + zeroOffsetSecs;
 }

+/**
+ * Returns the current time from the RTC if the quality of the time is at least minQuality.
+ *
+ * @param minQuality The minimum quality of the RTC time required for it to be considered valid.
+ * @return The current time from the RTC if it meets the minimum quality requirement, or 0 if the time is not valid.
+ */
 uint32_t getValidTime(RTCQuality minQuality)
 {
    return (currentQuality >= minQuality) ? getTime() : 0;
-}
+}
@@ -0,0 +1,192 @@
+uint8_t GPS::_message_PMREQ[] PROGMEM = {
+    0x00, 0x00, // 4 bytes duration of request task
+    0x00, 0x00, // (milliseconds)
+    0x02, 0x00, // Task flag bitfield
+    0x00, 0x00  // byte index 1 = sleep mode
+};
+
+const uint8_t GPS::_message_CFG_RXM_PSM[] PROGMEM = {
+    0x08, // Reserved
+    0x01  // Power save mode
+};
+
+const uint8_t GPS::_message_CFG_RXM_ECO[] PROGMEM = {
+    0x08, // Reserved
+    0x04  // eco mode
+};
+
+const uint8_t GPS::_message_CFG_PM2[] PROGMEM = {
+    0x01, 0x06, 0x00, 0x00, // version, Reserved
+    0x0E, 0x81, 0x43, 0x01, // flags
+    0xE8, 0x03, 0x00, 0x00, // update period 1000 ms
+    0x10, 0x27, 0x00, 0x00, // search period 10s
+    0x00, 0x00, 0x00, 0x00, // Grod offset 0
+    0x01, 0x00,             // onTime 1 second
+    0x00, 0x00,             // min search time 0
+    0x2C, 0x01,             // reserved
+    0x00, 0x00, 0x4F, 0xC1, // reserved
+    0x03, 0x00, 0x87, 0x02, // reserved
+    0x00, 0x00, 0xFF, 0x00, // reserved
+    0x01, 0x00, 0xD6, 0x4D  // reserved
+};
+
+const uint8_t GPS::_message_GNSS_7[] = {
+    0x00, // msgVer (0 for this version)
+    0x00, // numTrkChHw (max number of hardware channels, read only, so it's always 0)
+    0xff, // numTrkChUse (max number of channels to use, 0xff = max available)
+    0x02, // numConfigBlocks (number of GNSS systems), most modules support maximum 3 GNSS systems
+    // GNSS config format: gnssId, resTrkCh, maxTrkCh, reserved1, flags
+    0x00, 0x08, 0x10, 0x00, 0x01, 0x00, 0x00, 0x01, // GPS
+    0x01, 0x01, 0x03, 0x00, 0x01, 0x00, 0x00, 0x01  // SBAS
+};
+
+// It's not critical if the module doesn't acknowledge this configuration.
+// The module should operate adequately with its factory or previously saved settings.
+// It appears that there is a firmware bug in some GPS modules: When an attempt is made
+// to overwrite a saved state with identical values, no ACK/NAK is received, contrary to
+// what is specified in the Ublox documentation.
+// There is also a possibility that the module may be GPS-only.
+const uint8_t GPS::_message_GNSS[] = {
+    0x00, // msgVer (0 for this version)
+    0x00, // numTrkChHw (max number of hardware channels, read only, so it's always 0)
+    0xff, // numTrkChUse (max number of channels to use, 0xff = max available)
+    0x03, // numConfigBlocks (number of GNSS systems), most modules support maximum 3 GNSS systems
+    // GNSS config format: gnssId, resTrkCh, maxTrkCh, reserved1, flags
+    0x00, 0x08, 0x10, 0x00, 0x01, 0x00, 0x01, 0x01, // GPS
+    0x01, 0x01, 0x03, 0x00, 0x01, 0x00, 0x01, 0x01, // SBAS
+    0x06, 0x08, 0x0e, 0x00, 0x01, 0x00, 0x01, 0x01  // GLONASS
+};
+
+// Enable interference resistance, because we are using LoRa, WiFi and Bluetooth on same board,
+// and we need to reduce interference from them
+const uint8_t GPS::_message_JAM[] = {
+    // bbThreshold (Broadband jamming detection threshold) is set to 0x3F (63 in decimal)
+    // cwThreshold (CW jamming detection threshold) is set to 0x10 (16 in decimal)
+    // algorithmBits (Reserved algorithm settings) is set to 0x16B156 as recommended
+    // enable (Enable interference detection) is set to 1 (enabled)
+    0x3F, 0x10, 0xB1, 0x56, // config: Interference config word
+    // generalBits (General settings) is set to 0x31E as recommended
+    // antSetting (Antenna setting, 0=unknown, 1=passive, 2=active) is set to 0 (unknown)
+    // ToDo: Set to 1 (passive) or 2 (active) if known, for example from UBX-MON-HW, or from board info
+    // enable2 (Set to 1 to scan auxiliary bands, u-blox 8 / u-blox M8 only, otherwise ignored) is set to 1
+    // (enabled)
+    0x1E, 0x03, 0x00, 0x01 // config2: Extra settings for jamming/interference monitor
+};
+
+// Configure navigation engine expert settings:
+const uint8_t GPS::_message_NAVX5[] = {
+    0x00, 0x00, // msgVer (0 for this version)
+    // minMax flag = 1: apply min/max SVs settings
+    // minCno flag = 1: apply minimum C/N0 setting
+    // initial3dfix flag = 0: apply initial 3D fix settings
+    // aop flag = 1: apply aopCfg (useAOP flag) settings (AssistNow Autonomous)
+    0x1B, 0x00, // mask1 (First parameters bitmask)
+    // adr flag = 0: apply ADR sensor fusion on/off setting (useAdr flag)
+    // If firmware is not ADR/UDR, enabling this flag will fail configuration
+    // ToDo: check this with UBX-MON-VER
+    0x00, 0x00, 0x00, 0x00,             // mask2 (Second parameters bitmask)
+    0x00, 0x00,                         // Reserved
+    0x03,                               // minSVs (Minimum number of satellites for navigation) = 3
+    0x10,                               // maxSVs (Maximum number of satellites for navigation) = 16
+    0x06,                               // minCNO (Minimum satellite signal level for navigation) = 6 dBHz
+    0x00,                               // Reserved
+    0x00,                               // iniFix3D (Initial fix must be 3D) = 0 (disabled)
+    0x00, 0x00,                         // Reserved
+    0x00,                               // ackAiding (Issue acknowledgements for assistance message input) = 0 (disabled)
+    0x00, 0x00,                         // Reserved
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Reserved
+    0x00,                               // Reserved
+    0x01,                               // aopCfg (AssistNow Autonomous configuration) = 1 (enabled)
+    0x00, 0x00,                         // Reserved
+    0x00, 0x00,                         // Reserved
+    0x00, 0x00, 0x00, 0x00,             // Reserved
+    0x00, 0x00, 0x00,                   // Reserved
+    0x01,                               // useAdr (Enable/disable ADR sensor fusion) = 1 (enabled)
+};
+
+// Set GPS update rate to 1Hz
+// Lowering the update rate helps to save power.
+// Additionally, for some new modules like the M9/M10, an update rate lower than 5Hz
+// is recommended to avoid a known issue with satellites disappearing.
+const uint8_t GPS::_message_1HZ[] = {
+    0xE8, 0x03, // Measurement Rate (1000ms for 1Hz)
+    0x01, 0x00, // Navigation rate, always 1 in GPS mode
+    0x01, 0x00, // Time reference
+};
+
+// Disable GGL. GGL - Geographic position (latitude and longitude), which provides the current geographical
+// coordinates.
+const uint8_t GPS::_message_GGL[] = {
+    0xF0, 0x01,            // NMEA ID for GLL
+    0x01,                  // I/O Target 0=I/O, 1=UART1, 2=UART2, 3=USB, 4=SPI
+    0x00,                  // Disable
+    0x01, 0x01, 0x01, 0x01 // Reserved
+};
+
+// Enable GSA. GSA - GPS DOP and active satellites, used for detailing the satellites used in the positioning and
+// the DOP (Dilution of Precision)
+const uint8_t GPS::_message_GSA[] = {
+    0xF0, 0x02,            // NMEA ID for GSA
+    0x01,                  // I/O Target 0=I/O, 1=UART1, 2=UART2, 3=USB, 4=SPI
+    0x01,                  // Enable
+    0x01, 0x01, 0x01, 0x01 // Reserved
+};
+
+// Disable GSV. GSV - Satellites in view, details the number and location of satellites in view.
+const uint8_t GPS::_message_GSV[] = {
+    0xF0, 0x03,            // NMEA ID for GSV
+    0x01,                  // I/O Target 0=I/O, 1=UART1, 2=UART2, 3=USB, 4=SPI
+    0x00,                  // Disable
+    0x01, 0x01, 0x01, 0x01 // Reserved
+};
+
+// Disable VTG. VTG - Track made good and ground speed, which provides course and speed information relative to
+// the ground.
+const uint8_t GPS::_message_VTG[] = {
+    0xF0, 0x05,            // NMEA ID for VTG
+    0x01,                  // I/O Target 0=I/O, 1=UART1, 2=UART2, 3=USB, 4=SPI
+    0x00,                  // Disable
+    0x01, 0x01, 0x01, 0x01 // Reserved
+};
+
+// Enable RMC. RMC - Recommended Minimum data, the essential gps pvt (position, velocity, time) data.
+const uint8_t GPS::_message_RMC[] = {
+    0xF0, 0x04,            // NMEA ID for RMC
+    0x01,                  // I/O Target 0=I/O, 1=UART1, 2=UART2, 3=USB, 4=SPI
+    0x01,                  // Enable
+    0x01, 0x01, 0x01, 0x01 // Reserved
+};
+
+// Enable GGA. GGA - Global Positioning System Fix Data, which provides 3D location and accuracy data.
+const uint8_t GPS::_message_GGA[] = {
+    0xF0, 0x00,            // NMEA ID for GGA
+    0x01,                  // I/O Target 0=I/O, 1=UART1, 2=UART2, 3=USB, 4=SPI
+    0x01,                  // Enable
+    0x01, 0x01, 0x01, 0x01 // Reserved
+};
+
+// The Power Management configuration allows the GPS module to operate in different power modes for optimized
+// power consumption. The modes supported are: 0x00 = Full power: The module operates at full power with no power
+// saving. 0x01 = Balanced: The module dynamically adjusts the tracking behavior to balance power consumption.
+// 0x02 = Interval: The module operates in a periodic mode, cycling between tracking and power saving states.
+// 0x03 = Aggressive with 1 Hz: The module operates in a power saving mode with a 1 Hz update rate.
+// 0x04 = Aggressive with 2 Hz: The module operates in a power saving mode with a 2 Hz update rate.
+// 0x05 = Aggressive with 4 Hz: The module operates in a power saving mode with a 4 Hz update rate.
+// The 'period' field specifies the position update and search period. It is only valid when the powerSetupValue
+// is set to Interval; otherwise, it must be set to '0'. The 'onTime' field specifies the duration of the ON phase
+// and must be smaller than the period. It is only valid when the powerSetupValue is set to Interval; otherwise,
+// it must be set to '0'.
+const uint8_t GPS::_message_PMS[] = {
+    0x00,       // Version (0)
+    0x03,       // Power setup value
+    0x00, 0x00, // period: not applicable, set to 0
+    0x00, 0x00, // onTime: not applicable, set to 0
+    0x97, 0x6F  // reserved, generated by u-center
+};
+
+const uint8_t GPS::_message_SAVE[] = {
+    0x00, 0x00, 0x00, 0x00, // clearMask: no sections cleared
+    0xFF, 0xFF, 0x00, 0x00, // saveMask: save all sections
+    0x00, 0x00, 0x00, 0x00, // loadMask: no sections loaded
+    0x0F                    // deviceMask: BBR, Flash, EEPROM, and SPI Flash
+};
@@ -3,7 +3,7 @@
 #include <OLEDDisplay.h>

 /**
- * An adapter class that allows using the TFT_eSPI library as if it was an OLEDDisplay implementation.
+ * An adapter class that allows using the GxEPD2 library as if it was an OLEDDisplay implementation.
 *
 * Remaining TODO:
 * optimize display() to only draw changed pixels (see other OLED subclasses for examples)
@@ -1,5 +1,3 @@
-#include "main.h"
-
 #ifdef HAS_NCP5623
 #include <NCP5623.h>
 extern NCP5623 rgb;
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if HAS_SCREEN
 #include <OLEDDisplay.h>

+#include "DisplayFormatters.h"
 #include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
@@ -31,15 +32,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "gps/GeoCoord.h"
 #include "gps/RTC.h"
 #include "graphics/images.h"
+#include "input/TouchScreenImpl1.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "mesh/Channels.h"
 #include "mesh/generated/meshtastic/deviceonly.pb.h"
+#include "meshUtils.h"
 #include "modules/ExternalNotificationModule.h"
 #include "modules/TextMessageModule.h"
 #include "sleep.h"
 #include "target_specific.h"
-#include "utils.h"

 #ifdef ARCH_ESP32
 #include "esp_task_wdt.h"
@@ -102,7 +104,8 @@ static uint16_t displayWidth, displayHeight;
 #define SCREEN_WIDTH displayWidth
 #define SCREEN_HEIGHT displayHeight

-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16  // Height: 19
 #define FONT_MEDIUM ArialMT_Plain_24 // Height: 28
@@ -158,17 +161,9 @@ static void drawIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDispl
             xstr(APP_VERSION_SHORT)); // Note: we don't bother printing region or now, it makes the string too long
    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(buf), y + 0, buf);
    screen->forceDisplay();
-
    // FIXME - draw serial # somewhere?
 }

-static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    // Draw region in upper left
-    const char *region = myRegion ? myRegion->name : NULL;
-    drawIconScreen(region, display, state, x, y);
-}
-
 static void drawOEMIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
    // draw an xbm image.
@@ -218,6 +213,28 @@ static void drawOEMBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
    drawOEMIconScreen(region, display, state, x, y);
 }

+static void drawFrameText(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *message)
+{
+    uint16_t x_offset = display->width() / 2;
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+    display->setFont(FONT_MEDIUM);
+    display->drawString(x_offset + x, 26 + y, message);
+}
+
+static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+#ifdef ARCH_ESP32
+    if (wakeCause == ESP_SLEEP_WAKEUP_TIMER || wakeCause == ESP_SLEEP_WAKEUP_EXT1) {
+        drawFrameText(display, state, x, y, "Resuming...");
+    } else
+#endif
+    {
+        // Draw region in upper left
+        const char *region = myRegion ? myRegion->name : NULL;
+        drawIconScreen(region, display, state, x, y);
+    }
+}
+
 // Used on boot when a certificate is being created
 static void drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
@@ -318,22 +335,6 @@ static void drawFrameBluetooth(OLEDDisplay *display, OLEDDisplayUiState *state,
    display->drawString(x_offset + x, y_offset + y, deviceName);
 }

-static void drawFrameShutdown(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    uint16_t x_offset = display->width() / 2;
-    display->setTextAlignment(TEXT_ALIGN_CENTER);
-    display->setFont(FONT_MEDIUM);
-    display->drawString(x_offset + x, 26 + y, "Shutting down...");
-}
-
-static void drawFrameReboot(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    uint16_t x_offset = display->width() / 2;
-    display->setTextAlignment(TEXT_ALIGN_CENTER);
-    display->setFont(FONT_MEDIUM);
-    display->drawString(x_offset + x, 26 + y, "Rebooting...");
-}
-
 static void drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
    display->setTextAlignment(TEXT_ALIGN_CENTER);
@@ -363,7 +364,7 @@ static void drawCriticalFaultFrame(OLEDDisplay *display, OLEDDisplayUiState *sta
 // Ignore messages originating from phone (from the current node 0x0) unless range test or store and forward module are enabled
 static bool shouldDrawMessage(const meshtastic_MeshPacket *packet)
 {
-    return packet->from != 0 && !moduleConfig.range_test.enabled && !moduleConfig.store_forward.enabled;
+    return packet->from != 0 && !moduleConfig.store_forward.enabled;
 }

 /// Draw the last text message we received
@@ -372,7 +373,7 @@ static void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state
    // the max length of this buffer is much longer than we can possibly print
    static char tempBuf[237];

-    meshtastic_MeshPacket &mp = devicestate.rx_text_message;
+    const meshtastic_MeshPacket &mp = devicestate.rx_text_message;
    meshtastic_NodeInfoLite *node = nodeDB.getMeshNode(getFrom(&mp));
    // LOG_DEBUG("drawing text message from 0x%x: %s\n", mp.from,
    // mp.decoded.variant.data.decoded.bytes);
@@ -488,11 +489,12 @@ static void drawBattery(OLEDDisplay *display, int16_t x, int16_t y, uint8_t *img
 }

 // Draw nodes status
-static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, NodeStatus *nodeStatus)
+static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const NodeStatus *nodeStatus)
 {
    char usersString[20];
    snprintf(usersString, sizeof(usersString), "%d/%d", nodeStatus->getNumOnline(), nodeStatus->getNumTotal());
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
    display->drawFastImage(x, y + 3, 8, 8, imgUser);
 #else
    display->drawFastImage(x, y, 8, 8, imgUser);
@@ -835,7 +837,11 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
    }

    static char distStr[20];
-    strncpy(distStr, "? km", sizeof(distStr)); // might not have location data
+    if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL) {
+        strncpy(distStr, "? mi", sizeof(distStr)); // might not have location data
+    } else {
+        strncpy(distStr, "? km", sizeof(distStr));
+    }
    meshtastic_NodeInfoLite *ourNode = nodeDB.getMeshNode(nodeDB.getNodeNum());
    const char *fields[] = {username, distStr, signalStr, lastStr, NULL};
    int16_t compassX = 0, compassY = 0;
@@ -851,14 +857,14 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
    bool hasNodeHeading = false;

    if (ourNode && hasValidPosition(ourNode)) {
-        meshtastic_PositionLite &op = ourNode->position;
+        const meshtastic_PositionLite &op = ourNode->position;
        float myHeading = estimatedHeading(DegD(op.latitude_i), DegD(op.longitude_i));
        drawCompassNorth(display, compassX, compassY, myHeading);

        if (hasValidPosition(node)) {
            // display direction toward node
            hasNodeHeading = true;
-            meshtastic_PositionLite &p = node->position;
+            const meshtastic_PositionLite &p = node->position;
            float d =
                GeoCoord::latLongToMeter(DegD(p.latitude_i), DegD(p.longitude_i), DegD(op.latitude_i), DegD(op.longitude_i));

@@ -899,20 +905,6 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
    drawColumns(display, x, y, fields);
 }

-// #ifdef RAK4630
-// Screen::Screen(uint8_t address, int sda, int scl) : OSThread("Screen"), cmdQueue(32), dispdev(address, sda, scl),
-// dispdev_oled(address, sda, scl), ui(&dispdev)
-// {
-//     address_found = address;
-//     cmdQueue.setReader(this);
-//     if (screen_found) {
-//         (void)dispdev;
-//         AutoOLEDWire dispdev = dispdev_oled;
-//         (void)ui;
-//         OLEDDisplayUi ui(&dispdev);
-//     }
-// }
-// #else
 Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_OledType screenType, OLEDDISPLAY_GEOMETRY geometry)
    : concurrency::OSThread("Screen"), address_found(address), model(screenType), geometry(geometry), cmdQueue(32),
      dispdev(address.address, -1, -1, geometry, (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE),
@@ -920,7 +912,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
 {
    cmdQueue.setReader(this);
 }
-// #endif
+
 /**
 * Prepare the display for the unit going to the lowest power mode possible.  Most screens will just
 * poweroff, but eink screens will show a "I'm sleeping" graphic, possibly with a QR code
@@ -1040,12 +1032,19 @@ void Screen::setup()
 #endif
    serialSinceMsec = millis();

+#if HAS_TOUCHSCREEN
+    touchScreenImpl1 = new TouchScreenImpl1(dispdev.getWidth(), dispdev.getHeight(), dispdev.getTouch);
+    touchScreenImpl1->init();
+#endif
+
    // Subscribe to status updates
    powerStatusObserver.observe(&powerStatus->onNewStatus);
    gpsStatusObserver.observe(&gpsStatus->onNewStatus);
    nodeStatusObserver.observe(&nodeStatus->onNewStatus);
    if (textMessageModule)
        textMessageObserver.observe(textMessageModule);
+    if (inputBroker)
+        inputObserver.observe(inputBroker);

    // Modules can notify screen about refresh
    MeshModule::observeUIEvents(&uiFrameEventObserver);
@@ -1123,6 +1122,12 @@ int32_t Screen::runOnce()
                handleOnPress();
            }
            break;
+        case Cmd::SHOW_PREV_FRAME:
+            handleShowPrevFrame();
+            break;
+        case Cmd::SHOW_NEXT_FRAME:
+            handleShowNextFrame();
+            break;
        case Cmd::START_BLUETOOTH_PIN_SCREEN:
            handleStartBluetoothPinScreen(cmd.bluetooth_pin);
            break;
@@ -1224,11 +1229,8 @@ void Screen::setWelcomeFrames()
 {
    if (address_found.address) {
        // LOG_DEBUG("showing Welcome frames\n");
-        ui.disableAllIndicators();
-
-        static FrameCallback welcomeFrames[] = {drawWelcomeScreen};
-        ui.setFrames(welcomeFrames, 1);
-        ui.update();
+        static FrameCallback frames[] = {drawWelcomeScreen};
+        setFrameImmediateDraw(frames);
    }
 }

@@ -1315,12 +1317,15 @@ void Screen::handleStartBluetoothPinScreen(uint32_t pin)
    LOG_DEBUG("showing bluetooth screen\n");
    showingNormalScreen = false;

-    static FrameCallback btFrames[] = {drawFrameBluetooth};
-
+    static FrameCallback frames[] = {drawFrameBluetooth};
    snprintf(btPIN, sizeof(btPIN), "%06u", pin);
+    setFrameImmediateDraw(frames);
+}

+void Screen::setFrameImmediateDraw(FrameCallback *drawFrames)
+{
    ui.disableAllIndicators();
-    ui.setFrames(btFrames, 1);
+    ui.setFrames(drawFrames, 1);
    setFastFramerate();
 }

@@ -1329,11 +1334,12 @@ void Screen::handleShutdownScreen()
    LOG_DEBUG("showing shutdown screen\n");
    showingNormalScreen = false;

-    static FrameCallback shutdownFrames[] = {drawFrameShutdown};
+    auto frame = [](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
+        drawFrameText(display, state, x, y, "Shutting down...");
+    };
+    static FrameCallback frames[] = {frame};

-    ui.disableAllIndicators();
-    ui.setFrames(shutdownFrames, 1);
-    setFastFramerate();
+    setFrameImmediateDraw(frames);
 }

 void Screen::handleRebootScreen()
@@ -1341,11 +1347,11 @@ void Screen::handleRebootScreen()
    LOG_DEBUG("showing reboot screen\n");
    showingNormalScreen = false;

-    static FrameCallback rebootFrames[] = {drawFrameReboot};
-
-    ui.disableAllIndicators();
-    ui.setFrames(rebootFrames, 1);
-    setFastFramerate();
+    auto frame = [](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
+        drawFrameText(display, state, x, y, "Rebooting...");
+    };
+    static FrameCallback frames[] = {frame};
+    setFrameImmediateDraw(frames);
 }

 void Screen::handleStartFirmwareUpdateScreen()
@@ -1353,11 +1359,8 @@ void Screen::handleStartFirmwareUpdateScreen()
    LOG_DEBUG("showing firmware screen\n");
    showingNormalScreen = false;

-    static FrameCallback btFrames[] = {drawFrameFirmware};
-
-    ui.disableAllIndicators();
-    ui.setFrames(btFrames, 1);
-    setFastFramerate();
+    static FrameCallback frames[] = {drawFrameFirmware};
+    setFrameImmediateDraw(frames);
 }

 void Screen::blink()
@@ -1416,6 +1419,28 @@ void Screen::handleOnPress()
    }
 }

+void Screen::handleShowPrevFrame()
+{
+    // If screen was off, just wake it, otherwise go back to previous frame
+    // If we are in a transition, the press must have bounced, drop it.
+    if (ui.getUiState()->frameState == FIXED) {
+        ui.previousFrame();
+        lastScreenTransition = millis();
+        setFastFramerate();
+    }
+}
+
+void Screen::handleShowNextFrame()
+{
+    // If screen was off, just wake it, otherwise advance to next frame
+    // If we are in a transition, the press must have bounced, drop it.
+    if (ui.getUiState()->frameState == FIXED) {
+        ui.nextFrame();
+        lastScreenTransition = millis();
+        setFastFramerate();
+    }
+}
+
 #ifndef SCREEN_TRANSITION_FRAMERATE
 #define SCREEN_TRANSITION_FRAMERATE 30 // fps
 #endif
@@ -1488,7 +1513,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 #ifdef ARCH_ESP32
        if (millis() - storeForwardModule->lastHeartbeat >
            (storeForwardModule->heartbeatInterval * 1200)) { // no heartbeat, overlap a bit
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
            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,
@@ -1498,7 +1524,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                                   imgQuestion);
 #endif
        } else {
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
            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,
@@ -1510,7 +1537,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
        }
 #endif
    } else {
-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
        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(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8,
@@ -1593,65 +1621,8 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
    } else {
        // Codes:
        // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/wifi.html#wi-fi-reason-code
-        if (getWifiDisconnectReason() == 2) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Authentication Invalid");
-        } else if (getWifiDisconnectReason() == 3) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "De-authenticated");
-        } else if (getWifiDisconnectReason() == 4) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Disassociated Expired");
-        } else if (getWifiDisconnectReason() == 5) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "AP - Too Many Clients");
-        } else if (getWifiDisconnectReason() == 6) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "NOT_AUTHED");
-        } else if (getWifiDisconnectReason() == 7) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "NOT_ASSOCED");
-        } else if (getWifiDisconnectReason() == 8) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Disassociated");
-        } else if (getWifiDisconnectReason() == 9) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "ASSOC_NOT_AUTHED");
-        } else if (getWifiDisconnectReason() == 10) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "DISASSOC_PWRCAP_BAD");
-        } else if (getWifiDisconnectReason() == 11) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "DISASSOC_SUPCHAN_BAD");
-        } else if (getWifiDisconnectReason() == 13) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "IE_INVALID");
-        } else if (getWifiDisconnectReason() == 14) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "MIC_FAILURE");
-        } else if (getWifiDisconnectReason() == 15) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "AP Handshake Timeout");
-        } else if (getWifiDisconnectReason() == 16) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "GROUP_KEY_UPDATE_TIMEOUT");
-        } else if (getWifiDisconnectReason() == 17) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "IE_IN_4WAY_DIFFERS");
-        } else if (getWifiDisconnectReason() == 18) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Invalid Group Cipher");
-        } else if (getWifiDisconnectReason() == 19) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Invalid Pairwise Cipher");
-        } else if (getWifiDisconnectReason() == 20) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "AKMP_INVALID");
-        } else if (getWifiDisconnectReason() == 21) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "UNSUPP_RSN_IE_VERSION");
-        } else if (getWifiDisconnectReason() == 22) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "INVALID_RSN_IE_CAP");
-        } else if (getWifiDisconnectReason() == 23) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "802_1X_AUTH_FAILED");
-        } else if (getWifiDisconnectReason() == 24) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "CIPHER_SUITE_REJECTED");
-        } else if (getWifiDisconnectReason() == 200) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "BEACON_TIMEOUT");
-        } else if (getWifiDisconnectReason() == 201) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "AP Not Found");
-        } else if (getWifiDisconnectReason() == 202) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "AUTH_FAIL");
-        } else if (getWifiDisconnectReason() == 203) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "ASSOC_FAIL");
-        } else if (getWifiDisconnectReason() == 204) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "HANDSHAKE_TIMEOUT");
-        } else if (getWifiDisconnectReason() == 205) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Connection Failed");
-        } else {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Unknown Status");
-        }
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 1,
+                            WiFi.disconnectReasonName(static_cast<wifi_err_reason_t>(getWifiDisconnectReason())));
    }

    display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "SSID: " + String(wifiName));
@@ -1698,37 +1669,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
            display->drawString(x + 1, y, String("USB"));
    }

-    auto mode = "";
-
-    switch (config.lora.modem_preset) {
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
-        mode = "ShortS";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
-        mode = "ShortF";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
-        mode = "MedS";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
-        mode = "MedF";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
-        mode = "LongS";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
-        mode = "LongF";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
-        mode = "LongM";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
-        mode = "VeryL";
-        break;
-    default:
-        mode = "Custom";
-        break;
-    }
+    auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, true);

    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);
    if (config.display.heading_bold)
@@ -1795,23 +1736,6 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
    heartbeat = !heartbeat;
 #endif
 }
-// adjust Brightness cycle through 1 to 254 as long as attachDuringLongPress is true
-void Screen::adjustBrightness()
-{
-    if (!useDisplay)
-        return;
-
-    if (brightness == 254) {
-        brightness = 0;
-    } else {
-        brightness++;
-    }
-    int width = brightness / (254.00 / SCREEN_WIDTH);
-    dispdev.drawRect(0, 30, SCREEN_WIDTH, 4);
-    dispdev.fillRect(0, 31, width, 2);
-    dispdev.display();
-    dispdev.setBrightness(brightness);
-}

 int Screen::handleStatusUpdate(const meshtastic::Status *arg)
 {
@@ -1853,6 +1777,20 @@ int Screen::handleUIFrameEvent(const UIFrameEvent *event)
    return 0;
 }

+int Screen::handleInputEvent(const InputEvent *event)
+{
+    if (showingNormalScreen && moduleFrames.size() == 0) {
+        // LOG_DEBUG("Screen::handleInputEvent from %s\n", event->source);
+        if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) {
+            showPrevFrame();
+        } else if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT)) {
+            showNextFrame();
+        }
+    }
+
+    return 0;
+}
+
 } // namespace graphics
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
@@ -19,7 +19,6 @@ class Screen
    void setup() {}
    void setOn(bool) {}
    void print(const char *) {}
-    void adjustBrightness() {}
    void doDeepSleep() {}
    void forceDisplay() {}
    void startBluetoothPinScreen(uint32_t pin) {}
@@ -53,6 +52,7 @@ class Screen
 #include "commands.h"
 #include "concurrency/LockGuard.h"
 #include "concurrency/OSThread.h"
+#include "input/InputBroker.h"
 #include "mesh/MeshModule.h"
 #include "power.h"
 #include <string>
@@ -118,6 +118,8 @@ class Screen : public concurrency::OSThread
        CallbackObserver<Screen, const meshtastic_MeshPacket *>(this, &Screen::handleTextMessage);
    CallbackObserver<Screen, const UIFrameEvent *> uiFrameEventObserver =
        CallbackObserver<Screen, const UIFrameEvent *>(this, &Screen::handleUIFrameEvent);
+    CallbackObserver<Screen, const InputEvent *> inputObserver =
+        CallbackObserver<Screen, const InputEvent *>(this, &Screen::handleInputEvent);

  public:
    explicit Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY);
@@ -152,11 +154,12 @@ class Screen : public concurrency::OSThread

    void blink();

-    /// Handles a button press.
+    /// Handle button press, trackball or swipe action)
    void onPress() { enqueueCmd(ScreenCmd{.cmd = Cmd::ON_PRESS}); }
+    void showPrevFrame() { enqueueCmd(ScreenCmd{.cmd = Cmd::SHOW_PREV_FRAME}); }
+    void showNextFrame() { enqueueCmd(ScreenCmd{.cmd = Cmd::SHOW_NEXT_FRAME}); }

    // Implementation to Adjust Brightness
-    void adjustBrightness();
    uint8_t brightness = BRIGHTNESS_DEFAULT;

    /// Starts showing the Bluetooth PIN screen.
@@ -301,9 +304,11 @@ class Screen : public concurrency::OSThread
    // Use this handle to set things like battery status, user count, GPS status, etc.
    DebugInfo *debug_info() { return &debugInfo; }

+    // Handle observer events
    int handleStatusUpdate(const meshtastic::Status *arg);
    int handleTextMessage(const meshtastic_MeshPacket *arg);
    int handleUIFrameEvent(const UIFrameEvent *arg);
+    int handleInputEvent(const InputEvent *arg);

    /// Used to force (super slow) eink displays to draw critical frames
    void forceDisplay();
@@ -313,13 +318,6 @@ class Screen : public concurrency::OSThread

    void setWelcomeFrames();

-    void getTouch(int *x, int *y)
-    {
-#if defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS)
-        dispdev.getTouch(x, y);
-#endif
-    };
-
  protected:
    /// Updates the UI.
    //
@@ -350,6 +348,8 @@ class Screen : public concurrency::OSThread
    // Implementations of various commands, called from doTask().
    void handleSetOn(bool on);
    void handleOnPress();
+    void handleShowNextFrame();
+    void handleShowPrevFrame();
    void handleStartBluetoothPinScreen(uint32_t pin);
    void handlePrint(const char *text);
    void handleStartFirmwareUpdateScreen();
@@ -361,6 +361,9 @@ class Screen : public concurrency::OSThread
    /// Try to start drawing ASAP
    void setFastFramerate();

+    // Sets frame up for immediate drawing
+    void setFrameImmediateDraw(FrameCallback *drawFrames);
+
    /// Called when debug screen is to be drawn, calls through to debugInfo.drawFrame.
    static void drawDebugInfoTrampoline(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);

@@ -1,12 +1,13 @@
 #include "configuration.h"
+#include "main.h"

 #ifndef TFT_BACKLIGHT_ON
 #define TFT_BACKLIGHT_ON HIGH
 #endif

-// convert 24-bit color to 16-bit (56K)
-#define COLOR565(r, g, b) (((r & 0xF8) << 8) | ((g & 0xFC) << 3) | ((b & 0xF8) >> 3))
+#ifndef TFT_MESH
 #define TFT_MESH COLOR565(0x67, 0xEA, 0x94)
+#endif

 #if defined(ST7735S)
 #include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip
@@ -81,8 +82,16 @@ class LGFX : public lgfx::LGFX_Device
        {
            auto cfg = _light_instance.config(); // Gets a structure for backlight settings.

+#ifdef ST7735_BL_V03
+            if (heltec_version == 3) {
+                cfg.pin_bl = ST7735_BL_V03;
+            } else {
+                cfg.pin_bl = ST7735_BL_V05;
+            }
+#else
            cfg.pin_bl = ST7735_BL; // Pin number to which the backlight is connected
-            cfg.invert = true;      // true to invert the brightness of the backlight
+#endif
+            cfg.invert = true; // true to invert the brightness of the backlight
            // cfg.freq = 44100;    // PWM frequency of backlight
            // cfg.pwm_channel = 1; // PWM channel number to use

@@ -108,10 +117,12 @@ class LGFX : public lgfx::LGFX_Device
    lgfx::Panel_ST7789 _panel_instance;
    lgfx::Bus_SPI _bus_instance;
    lgfx::Light_PWM _light_instance;
+#if HAS_TOUCHSCREEN
 #ifdef T_WATCH_S3
    lgfx::Touch_FT5x06 _touch_instance;
 #else
    lgfx::Touch_GT911 _touch_instance;
+#endif
 #endif

  public:
@@ -126,13 +137,14 @@ class LGFX : public lgfx::LGFX_Device
            cfg.freq_write = SPI_FREQUENCY; // SPI clock for transmission (up to 80MHz, rounded to the value obtained by dividing
                                            // 80MHz by an integer)
            cfg.freq_read = SPI_READ_FREQUENCY; // SPI clock when receiving
-            cfg.spi_3wire = false;              // Set to true if reception is done on the MOSI pin
-            cfg.use_lock = true;                // Set to true to use transaction locking
-            cfg.dma_channel = SPI_DMA_CH_AUTO;  // SPI_DMA_CH_AUTO; // Set DMA channel to use (0=not use DMA / 1=1ch / 2=ch /
-            cfg.pin_sclk = ST7789_SCK;          // Set SPI SCLK pin number
-            cfg.pin_mosi = ST7789_SDA;          // Set SPI MOSI pin number
-            cfg.pin_miso = ST7789_MISO;         // Set SPI MISO pin number (-1 = disable)
-            cfg.pin_dc = ST7789_RS;             // Set SPI DC pin number (-1 = disable)
+            cfg.spi_3wire = false;
+            cfg.use_lock = true;               // Set to true to use transaction locking
+            cfg.dma_channel = SPI_DMA_CH_AUTO; // SPI_DMA_CH_AUTO; // Set DMA channel to use (0=not use DMA / 1=1ch / 2=ch /
+                                               // SPI_DMA_CH_AUTO=auto setting)
+            cfg.pin_sclk = ST7789_SCK;         // Set SPI SCLK pin number
+            cfg.pin_mosi = ST7789_SDA;         // Set SPI MOSI pin number
+            cfg.pin_miso = ST7789_MISO;        // Set SPI MISO pin number (-1 = disable)
+            cfg.pin_dc = ST7789_RS;            // Set SPI DC pin number (-1 = disable)

            _bus_instance.config(cfg);              // applies the set value to the bus.
            _panel_instance.setBus(&_bus_instance); // set the bus on the panel.
@@ -148,16 +160,16 @@ class LGFX : public lgfx::LGFX_Device
            // The following setting values are general initial values for each panel, so please comment out any
            // unknown items and try them.

-            cfg.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 = 0;       // Rotation direction value offset 0~7 (4~7 is mirrored)
-            cfg.dummy_read_pixel = 9;      // Number of bits for dummy read before pixel readout
-            cfg.dummy_read_bits = 1;       // Number of bits for dummy read before non-pixel data read
-            cfg.readable = true;           // Set to true if data can be read
-            cfg.invert = true;             // Set to true if the light/darkness of the panel is reversed
-            cfg.rgb_order = false;         // Set to true if the panel's red and blue are swapped
+            cfg.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)
+            cfg.dummy_read_pixel = 9;                  // Number of bits for dummy read before pixel readout
+            cfg.dummy_read_bits = 1;                   // Number of bits for dummy read before non-pixel data read
+            cfg.readable = true;                       // Set to true if data can be read
+            cfg.invert = true;                         // Set to true if the light/darkness of the panel is reversed
+            cfg.rgb_order = false;                     // Set to true if the panel's red and blue are swapped
            cfg.dlen_16bit =
                false;             // Set to true for panels that transmit data length in 16-bit units with 16-bit parallel or SPI
            cfg.bus_shared = true; // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.)
@@ -174,13 +186,14 @@ class LGFX : public lgfx::LGFX_Device
            auto cfg = _light_instance.config(); // Gets a structure for backlight settings.

            cfg.pin_bl = ST7789_BL; // Pin number to which the backlight is connected
-            cfg.invert = true;      // true to invert the brightness of the backlight
+            cfg.invert = false;     // true to invert the brightness of the backlight
            // cfg.pwm_channel = 0;

            _light_instance.config(cfg);
            _panel_instance.setLight(&_light_instance); // Set the backlight on the panel.
        }

+#if HAS_TOUCHSCREEN
        // Configure settings for touch screen control.
        {
            auto cfg = _touch_instance.config();
@@ -192,11 +205,11 @@ class LGFX : public lgfx::LGFX_Device
            cfg.y_max = TFT_WIDTH - 1;
            cfg.pin_int = SCREEN_TOUCH_INT;
            cfg.bus_shared = true;
-            cfg.offset_rotation = 0;
+            cfg.offset_rotation = TFT_OFFSET_ROTATION;
            // cfg.freq = 2500000;

            // I2C
-            cfg.i2c_port = 1;
+            cfg.i2c_port = TOUCH_I2C_PORT;
            cfg.i2c_addr = TOUCH_SLAVE_ADDRESS;
 #ifdef SCREEN_TOUCH_USE_I2C1
            cfg.pin_sda = I2C_SDA1;
@@ -205,11 +218,12 @@ class LGFX : public lgfx::LGFX_Device
            cfg.pin_sda = I2C_SDA;
            cfg.pin_scl = I2C_SCL;
 #endif
-            cfg.freq = 400000;
+            // cfg.freq = 400000;

            _touch_instance.config(cfg);
            _panel_instance.setTouch(&_touch_instance);
        }
+#endif

        setPanel(&_panel_instance); // Sets the panel to use.
    }
@@ -217,7 +231,96 @@ class LGFX : public lgfx::LGFX_Device

 static LGFX tft;

-#elif defined(ST7735_CS) || defined(ILI9341_DRIVER)
+#elif defined(ILI9341_DRIVER)
+
+#include <LovyanGFX.hpp> // Graphics and font library for ILI9341 driver chip
+
+#if defined(ILI9341_BACKLIGHT_EN) && !defined(TFT_BL)
+#define TFT_BL ILI9341_BACKLIGHT_EN
+#endif
+
+class LGFX : public lgfx::LGFX_Device
+{
+    lgfx::Panel_ILI9341 _panel_instance;
+    lgfx::Bus_SPI _bus_instance;
+    lgfx::Light_PWM _light_instance;
+
+  public:
+    LGFX(void)
+    {
+        {
+            auto cfg = _bus_instance.config();
+
+            // configure SPI
+            cfg.spi_host = ILI9341_SPI_HOST; // ESP32-S2,S3,C3 : SPI2_HOST or SPI3_HOST / ESP32 : VSPI_HOST or HSPI_HOST
+            cfg.spi_mode = 0;
+            cfg.freq_write = SPI_FREQUENCY; // SPI clock for transmission (up to 80MHz, rounded to the value obtained by dividing
+                                            // 80MHz by an integer)
+            cfg.freq_read = SPI_READ_FREQUENCY; // SPI clock when receiving
+            cfg.spi_3wire = false;              // Set to true if reception is done on the MOSI pin
+            cfg.use_lock = true;                // Set to true to use transaction locking
+            cfg.dma_channel = SPI_DMA_CH_AUTO;  // SPI_DMA_CH_AUTO; // Set DMA channel to use (0=not use DMA / 1=1ch / 2=ch /
+                                                // SPI_DMA_CH_AUTO=auto setting)
+            cfg.pin_sclk = TFT_SCLK;            // Set SPI SCLK pin number
+            cfg.pin_mosi = TFT_MOSI;            // Set SPI MOSI pin number
+            cfg.pin_miso = TFT_MISO;            // Set SPI MISO pin number (-1 = disable)
+            cfg.pin_dc = TFT_DC;                // Set SPI DC pin number (-1 = disable)
+
+            _bus_instance.config(cfg);              // applies the set value to the bus.
+            _panel_instance.setBus(&_bus_instance); // set the bus on the panel.
+        }
+
+        {                                        // Set the display panel control.
+            auto cfg = _panel_instance.config(); // Gets a structure for display panel settings.
+
+            cfg.pin_cs = TFT_CS;     // Pin number where CS is connected (-1 = disable)
+            cfg.pin_rst = TFT_RST;   // Pin number where RST is connected  (-1 = disable)
+            cfg.pin_busy = TFT_BUSY; // Pin number where BUSY is connected (-1 = disable)
+
+            // The following setting values are general initial values for each panel, so please comment out any
+            // unknown items and try them.
+
+            cfg.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 = 0;       // Rotation direction value offset 0~7 (4~7 is upside down)
+            cfg.dummy_read_pixel = 8;      // Number of bits for dummy read before pixel readout
+            cfg.dummy_read_bits = 1;       // Number of bits for dummy read before non-pixel data read
+            cfg.readable = true;           // Set to true if data can be read
+            cfg.invert = false;            // Set to true if the light/darkness of the panel is reversed
+            cfg.rgb_order = false;         // Set to true if the panel's red and blue are swapped
+            cfg.dlen_16bit =
+                false;             // Set to true for panels that transmit data length in 16-bit units with 16-bit parallel or SPI
+            cfg.bus_shared = true; // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.)
+
+            // Set the following only when the display is shifted with a driver with a variable number of pixels, such as the
+            // ST7735 or ILI9163.
+            cfg.memory_width = TFT_WIDTH;   // Maximum width supported by the driver IC
+            cfg.memory_height = TFT_HEIGHT; // Maximum height supported by the driver IC
+            _panel_instance.config(cfg);
+        }
+
+        // Set the backlight control
+        {
+            auto cfg = _light_instance.config(); // Gets a structure for backlight settings.
+
+            cfg.pin_bl = TFT_BL; // Pin number to which the backlight is connected
+            cfg.invert = false;  // true to invert the brightness of the backlight
+            // cfg.freq = 44100;    // PWM frequency of backlight
+            // cfg.pwm_channel = 1; // PWM channel number to use
+
+            _light_instance.config(cfg);
+            _panel_instance.setLight(&_light_instance); // Set the backlight on the panel.
+        }
+
+        setPanel(&_panel_instance);
+    }
+};
+
+static LGFX tft;
+
+#elif defined(ST7735_CS)
 #include <TFT_eSPI.h> // Graphics and font library for ILI9341 driver chip

 static TFT_eSPI tft = TFT_eSPI(); // Invoke library, pins defined in User_Setup.h
@@ -270,20 +373,54 @@ void TFTDisplay::sendCommand(uint8_t com)
    // handle display on/off directly
    switch (com) {
    case DISPLAYON: {
+#if defined(ST7735_BACKLIGHT_EN_V03) && defined(TFT_BACKLIGHT_ON)
+        if (heltec_version == 3) {
+            digitalWrite(ST7735_BACKLIGHT_EN_V03, TFT_BACKLIGHT_ON);
+        } else {
+            digitalWrite(ST7735_BACKLIGHT_EN_V05, TFT_BACKLIGHT_ON);
+        }
+#endif
 #if defined(TFT_BL) && defined(TFT_BACKLIGHT_ON)
        digitalWrite(TFT_BL, TFT_BACKLIGHT_ON);
 #endif
+#ifdef VTFT_CTRL_V03
+        if (heltec_version == 3) {
+            digitalWrite(VTFT_CTRL_V03, LOW);
+        } else {
+            digitalWrite(VTFT_CTRL_V05, LOW);
+        }
+#endif
 #ifdef VTFT_CTRL
        digitalWrite(VTFT_CTRL, LOW);
+#endif
+#ifndef M5STACK
+        tft.setBrightness(128);
 #endif
        break;
    }
    case DISPLAYOFF: {
+#if defined(ST7735_BACKLIGHT_EN_V03) && defined(TFT_BACKLIGHT_ON)
+        if (heltec_version == 3) {
+            digitalWrite(ST7735_BACKLIGHT_EN_V03, !TFT_BACKLIGHT_ON);
+        } else {
+            digitalWrite(ST7735_BACKLIGHT_EN_V05, !TFT_BACKLIGHT_ON);
+        }
+#endif
 #if defined(TFT_BL) && defined(TFT_BACKLIGHT_ON)
        digitalWrite(TFT_BL, !TFT_BACKLIGHT_ON);
 #endif
+#ifdef VTFT_CTRL_V03
+        if (heltec_version == 3) {
+            digitalWrite(VTFT_CTRL_V03, HIGH);
+        } else {
+            digitalWrite(VTFT_CTRL_V05, HIGH);
+        }
+#endif
 #ifdef VTFT_CTRL
        digitalWrite(VTFT_CTRL, HIGH);
+#endif
+#ifndef M5STACK
+        tft.setBrightness(0);
 #endif
        break;
    }
@@ -294,6 +431,32 @@ void TFTDisplay::sendCommand(uint8_t com)
    // Drop all other commands to device (we just update the buffer)
 }

+void TFTDisplay::flipScreenVertically()
+{
+#if defined(T_WATCH_S3)
+    LOG_DEBUG("Flip TFT vertically\n"); // T-Watch S3 right-handed orientation
+    tft.setRotation(0);
+#endif
+}
+
+bool TFTDisplay::hasTouch(void)
+{
+#ifndef M5STACK
+    return tft.touch() != nullptr;
+#else
+    return false;
+#endif
+}
+
+bool TFTDisplay::getTouch(int16_t *x, int16_t *y)
+{
+#ifndef M5STACK
+    return tft.getTouch(x, y);
+#else
+    return false;
+#endif
+}
+
 void TFTDisplay::setDetected(uint8_t detected)
 {
    (void)detected;
@@ -310,11 +473,23 @@ bool TFTDisplay::connect()
    pinMode(TFT_BL, OUTPUT);
 #endif

+#ifdef ST7735_BACKLIGHT_EN_V03
+    if (heltec_version == 3) {
+        digitalWrite(ST7735_BACKLIGHT_EN_V03, TFT_BACKLIGHT_ON);
+        pinMode(ST7735_BACKLIGHT_EN_V03, OUTPUT);
+    } else {
+        digitalWrite(ST7735_BACKLIGHT_EN_V05, TFT_BACKLIGHT_ON);
+        pinMode(ST7735_BACKLIGHT_EN_V05, OUTPUT);
+    }
+#endif
+
    tft.init();
-#if defined(M5STACK) || defined(T_DECK)
-    tft.setRotation(1); // M5Stack/T-Deck have the TFT in landscape
+#if defined(M5STACK)
+    tft.setRotation(0);
+#elif defined(T_DECK) || defined(PICOMPUTER_S3)
+    tft.setRotation(1); // T-Deck has the TFT in landscape
 #elif defined(T_WATCH_S3)
-    tft.setRotation(0); // T-Watch S3 has the TFT in portrait
+    tft.setRotation(2); // T-Watch S3 left-handed orientation
 #else
    tft.setRotation(3); // Orient horizontal and wide underneath the silkscreen name label
 #endif
@@ -322,12 +497,4 @@ bool TFTDisplay::connect()
    return true;
 }

-// Get touch coords from the display
-void TFTDisplay::getTouch(int *x, int *y)
-{
-#ifndef M5STACK
-    tft.getTouch(x, y);
-#endif
-}
-
 #endif
@@ -3,7 +3,7 @@
 #include <OLEDDisplay.h>

 /**
- * An adapter class that allows using the TFT_eSPI library as if it was an OLEDDisplay implementation.
+ * An adapter class that allows using the LovyanGFX library as if it was an OLEDDisplay implementation.
 *
 * Remaining TODO:
 * optimize display() to only draw changed pixels (see other OLED subclasses for examples)
@@ -22,14 +22,19 @@ class TFTDisplay : public OLEDDisplay
    // Write the buffer to the display memory
    virtual void display(void) override;

+    // Turn the display upside down
+    virtual void flipScreenVertically();
+
+    // Touch screen (static handlers)
+    static bool hasTouch(void);
+    static bool getTouch(int16_t *x, int16_t *y);
+
    /**
     * shim to make the abstraction happy
     *
     */
    void setDetected(uint8_t detected);

-    void getTouch(int *x, int *y);
-
  protected:
    // the header size of the buffer used, e.g. for the SPI command header
    virtual int getBufferOffset(void) override { return 0; }
@@ -14,7 +14,8 @@ const uint8_t imgUser[] PROGMEM = {0x3C, 0x42, 0x99, 0xA5, 0xA5, 0x99, 0x42, 0x3
 const uint8_t imgPositionEmpty[] PROGMEM = {0x20, 0x30, 0x28, 0x24, 0x42, 0xFF};
 const uint8_t imgPositionSolid[] PROGMEM = {0x20, 0x30, 0x38, 0x3C, 0x7E, 0xFF};

-#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
 const uint8_t imgQuestionL1[] PROGMEM = {0xff, 0x01, 0x01, 0x32, 0x7b, 0x49, 0x49, 0x6f, 0x26, 0x01, 0x01, 0xff};
 const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};
 const uint8_t imgInfoL1[] PROGMEM = {0xff, 0x01, 0x01, 0x01, 0x1e, 0x7f, 0x1e, 0x01, 0x01, 0x01, 0x01, 0xff};
@@ -0,0 +1,181 @@
+// Based on arturo182 arduino_bbq10kbd library https://github.com/arturo182/arduino_bbq10kbd
+
+#include <Arduino.h>
+
+#include "BBQ10Keyboard.h"
+
+#define _REG_VER 1
+#define _REG_CFG 2
+#define _REG_INT 3
+#define _REG_KEY 4
+#define _REG_BKL 5
+#define _REG_DEB 6
+#define _REG_FRQ 7
+#define _REG_RST 8
+#define _REG_FIF 9
+
+#define _WRITE_MASK (1 << 7)
+
+#define CFG_OVERFLOW_ON (1 << 0)
+#define CFG_OVERFLOW_INT (1 << 1)
+#define CFG_CAPSLOCK_INT (1 << 2)
+#define CFG_NUMLOCK_INT (1 << 3)
+#define CFG_KEY_INT (1 << 4)
+#define CFG_PANIC_INT (1 << 5)
+#define CFG_REPORT_MODS (1 << 6)
+#define CFG_USE_MODS (1 << 7)
+
+#define INT_OVERFLOW (1 << 0)
+#define INT_CAPSLOCK (1 << 1)
+#define INT_NUMLOCK (1 << 2)
+#define INT_KEY (1 << 3)
+#define INT_PANIC (1 << 4)
+
+#define KEY_CAPSLOCK (1 << 5)
+#define KEY_NUMLOCK (1 << 6)
+#define KEY_COUNT_MASK (0x1F)
+
+BBQ10Keyboard::BBQ10Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr) {}
+
+void BBQ10Keyboard::begin(uint8_t addr, TwoWire *wire)
+{
+    m_addr = addr;
+    m_wire = wire;
+
+    m_wire->begin();
+
+    reset();
+}
+
+void BBQ10Keyboard::begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr)
+{
+    m_addr = addr;
+    m_wire = nullptr;
+    writeCallback = w;
+    readCallback = r;
+    reset();
+}
+
+void BBQ10Keyboard::reset()
+{
+    if (m_wire) {
+        m_wire->beginTransmission(m_addr);
+        m_wire->write(_REG_RST);
+        m_wire->endTransmission();
+    }
+    if (writeCallback) {
+        uint8_t data = 0;
+        writeCallback(m_addr, _REG_RST, &data, 0);
+    }
+    delay(100);
+    writeRegister(_REG_CFG, readRegister8(_REG_CFG) | CFG_REPORT_MODS);
+    delay(100);
+}
+
+void BBQ10Keyboard::attachInterrupt(uint8_t pin, void (*func)(void)) const
+{
+    pinMode(pin, INPUT_PULLUP);
+    ::attachInterrupt(digitalPinToInterrupt(pin), func, RISING);
+}
+
+void BBQ10Keyboard::detachInterrupt(uint8_t pin) const
+{
+    ::detachInterrupt(pin);
+}
+
+void BBQ10Keyboard::clearInterruptStatus()
+{
+    writeRegister(_REG_INT, 0x00);
+}
+
+uint8_t BBQ10Keyboard::status() const
+{
+    return readRegister8(_REG_KEY);
+}
+
+uint8_t BBQ10Keyboard::keyCount() const
+{
+    return status() & KEY_COUNT_MASK;
+}
+
+BBQ10Keyboard::KeyEvent BBQ10Keyboard::keyEvent() const
+{
+    KeyEvent event = {.key = '\0', .state = StateIdle};
+
+    if (keyCount() == 0)
+        return event;
+
+    const uint16_t buf = readRegister16(_REG_FIF);
+    event.key = buf >> 8;
+    event.state = KeyState(buf & 0xFF);
+
+    return event;
+}
+
+float BBQ10Keyboard::backlight() const
+{
+    return readRegister8(_REG_BKL) / 255.0f;
+}
+
+void BBQ10Keyboard::setBacklight(float value)
+{
+    writeRegister(_REG_BKL, value * 255);
+}
+
+uint8_t BBQ10Keyboard::readRegister8(uint8_t reg) const
+{
+    if (m_wire) {
+        m_wire->beginTransmission(m_addr);
+        m_wire->write(reg);
+        m_wire->endTransmission();
+
+        m_wire->requestFrom(m_addr, (uint8_t)1);
+        if (m_wire->available() < 1)
+            return 0;
+
+        return m_wire->read();
+    }
+    if (readCallback) {
+        uint8_t data;
+        readCallback(m_addr, reg, &data, 1);
+        return data;
+    }
+    return 0;
+}
+
+uint16_t BBQ10Keyboard::readRegister16(uint8_t reg) const
+{
+    uint8_t data[2] = {0};
+    // uint8_t low = 0, high = 0;
+    if (m_wire) {
+        m_wire->beginTransmission(m_addr);
+        m_wire->write(reg);
+        m_wire->endTransmission();
+
+        m_wire->requestFrom(m_addr, (uint8_t)2);
+        if (m_wire->available() < 2)
+            return 0;
+        data[0] = m_wire->read();
+        data[1] = m_wire->read();
+    }
+    if (readCallback) {
+        readCallback(m_addr, reg, data, 2);
+    }
+    return (data[1] << 8) | data[0];
+}
+
+void BBQ10Keyboard::writeRegister(uint8_t reg, uint8_t value)
+{
+    uint8_t data[2];
+    data[0] = reg | _WRITE_MASK;
+    data[1] = value;
+
+    if (m_wire) {
+        m_wire->beginTransmission(m_addr);
+        m_wire->write(data, sizeof(uint8_t) * 2);
+        m_wire->endTransmission();
+    }
+    if (writeCallback) {
+        writeCallback(m_addr, data[0], &(data[1]), 1);
+    }
+}
@@ -0,0 +1,51 @@
+// Based on arturo182 arduino_bbq10kbd library https://github.com/arturo182/arduino_bbq10kbd
+
+#include "configuration.h"
+#include <Wire.h>
+
+#define KEY_MOD_ALT (0x1A)
+#define KEY_MOD_SHL (0x1B)
+#define KEY_MOD_SHR (0x1C)
+#define KEY_MOD_SYM (0x1D)
+
+class BBQ10Keyboard
+{
+  public:
+    typedef uint8_t (*i2c_com_fptr_t)(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t len);
+
+    enum KeyState { StateIdle = 0, StatePress, StateLongPress, StateRelease };
+
+    struct KeyEvent {
+        char key;
+        KeyState state;
+    };
+
+    BBQ10Keyboard();
+
+    void begin(uint8_t addr = BBQ10_KB_ADDR, TwoWire *wire = &Wire);
+
+    void begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr = BBQ10_KB_ADDR);
+
+    void reset(void);
+
+    void attachInterrupt(uint8_t pin, void (*func)(void)) const;
+    void detachInterrupt(uint8_t pin) const;
+    void clearInterruptStatus(void);
+
+    uint8_t status(void) const;
+    uint8_t keyCount(void) const;
+    KeyEvent keyEvent(void) const;
+
+    float backlight() const;
+    void setBacklight(float value);
+
+    uint8_t readRegister8(uint8_t reg) const;
+    uint16_t readRegister16(uint8_t reg) const;
+    void writeRegister(uint8_t reg, uint8_t value);
+
+  private:
+    TwoWire *m_wire;
+    uint8_t m_addr;
+    i2c_com_fptr_t readCallback;
+    i2c_com_fptr_t writeCallback;
+};
@@ -5,12 +5,12 @@ RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;

 RotaryEncoderInterruptImpl1::RotaryEncoderInterruptImpl1() : RotaryEncoderInterruptBase("rotEnc1") {}

-void RotaryEncoderInterruptImpl1::init()
+bool RotaryEncoderInterruptImpl1::init()
 {
    if (!moduleConfig.canned_message.rotary1_enabled) {
        // Input device is disabled.
        disable();
-        return;
+        return false;
    }

    uint8_t pinA = moduleConfig.canned_message.inputbroker_pin_a;
@@ -25,6 +25,7 @@ void RotaryEncoderInterruptImpl1::init()
                                     RotaryEncoderInterruptImpl1::handleIntA, RotaryEncoderInterruptImpl1::handleIntB,
                                     RotaryEncoderInterruptImpl1::handleIntPressed);
    inputBroker->registerSource(this);
+    return true;
 }

 void RotaryEncoderInterruptImpl1::handleIntA()
@@ -38,4 +39,4 @@ void RotaryEncoderInterruptImpl1::handleIntB()
 void RotaryEncoderInterruptImpl1::handleIntPressed()
 {
    rotaryEncoderInterruptImpl1->intPressHandler();
-}
+}
@@ -12,7 +12,7 @@ class RotaryEncoderInterruptImpl1 : public RotaryEncoderInterruptBase
 {
  public:
    RotaryEncoderInterruptImpl1();
-    void init();
+    bool init();
    static void handleIntA();
    static void handleIntB();
    static void handleIntPressed();
@@ -0,0 +1,137 @@
+#include "TouchScreenBase.h"
+#include "main.h"
+
+#ifndef TIME_LONG_PRESS
+#define TIME_LONG_PRESS 400
+#endif
+
+// move a minimum distance over the screen to detect a "swipe"
+#ifndef TOUCH_THRESHOLD_X
+#define TOUCH_THRESHOLD_X 30
+#endif
+
+#ifndef TOUCH_THRESHOLD_Y
+#define TOUCH_THRESHOLD_Y 20
+#endif
+
+TouchScreenBase::TouchScreenBase(const char *name, uint16_t width, uint16_t height)
+    : concurrency::OSThread(name), _display_width(width), _display_height(height), _first_x(0), _last_x(0), _first_y(0),
+      _last_y(0), _start(0), _tapped(false), _originName(name)
+{
+}
+
+void TouchScreenBase::init(bool hasTouch)
+{
+    if (hasTouch) {
+        LOG_INFO("TouchScreen initialized %d %d\n", TOUCH_THRESHOLD_X, TOUCH_THRESHOLD_Y);
+        this->setInterval(100);
+    } else {
+        disable();
+        this->setInterval(UINT_MAX);
+    }
+}
+
+int32_t TouchScreenBase::runOnce()
+{
+    TouchEvent e;
+    e.touchEvent = static_cast<char>(TOUCH_ACTION_NONE);
+
+    // process touch events
+    int16_t x, y;
+    bool touched = getTouch(x, y);
+    if (touched) {
+        this->setInterval(20);
+        _last_x = x;
+        _last_y = y;
+    }
+    if (touched != _touchedOld) {
+        if (touched) {
+            hapticFeedback();
+            _state = TOUCH_EVENT_OCCURRED;
+            _start = millis();
+            _first_x = x;
+            _first_y = y;
+        } else {
+            _state = TOUCH_EVENT_CLEARED;
+            time_t duration = millis() - _start;
+            x = _last_x;
+            y = _last_y;
+            this->setInterval(50);
+
+            // compute distance
+            int16_t dx = x - _first_x;
+            int16_t dy = y - _first_y;
+            uint16_t adx = abs(dx);
+            uint16_t ady = abs(dy);
+
+            // swipe horizontal
+            if (adx > ady && adx > TOUCH_THRESHOLD_X) {
+                if (0 > dx) { // swipe right to left
+                    e.touchEvent = static_cast<char>(TOUCH_ACTION_LEFT);
+                    LOG_DEBUG("action SWIPE: right to left\n");
+                } else { // swipe left to right
+                    e.touchEvent = static_cast<char>(TOUCH_ACTION_RIGHT);
+                    LOG_DEBUG("action SWIPE: left to right\n");
+                }
+            }
+            // swipe vertical
+            else if (ady > adx && ady > TOUCH_THRESHOLD_Y) {
+                if (0 > dy) { // swipe bottom to top
+                    e.touchEvent = static_cast<char>(TOUCH_ACTION_UP);
+                    LOG_DEBUG("action SWIPE: bottom to top\n");
+                } else { // swipe top to bottom
+                    e.touchEvent = static_cast<char>(TOUCH_ACTION_DOWN);
+                    LOG_DEBUG("action SWIPE: top to bottom\n");
+                }
+            }
+            // tap
+            else {
+                if (duration > 0 && duration < TIME_LONG_PRESS) {
+                    if (_tapped) {
+                        _tapped = false;
+                        e.touchEvent = static_cast<char>(TOUCH_ACTION_DOUBLE_TAP);
+                        LOG_DEBUG("action DOUBLE TAP(%d/%d)\n", x, y);
+                    } else {
+                        _tapped = true;
+                    }
+                } else {
+                    _tapped = false;
+                }
+            }
+        }
+    }
+    _touchedOld = touched;
+
+    // fire TAP event when no 2nd tap occured within time
+    if (_tapped && (time_t(millis()) - _start) > TIME_LONG_PRESS - 50) {
+        _tapped = false;
+        e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP);
+        LOG_DEBUG("action TAP(%d/%d)\n", _last_x, _last_y);
+    }
+
+    // fire LONG_PRESS event without the need for release
+    if (touched && (time_t(millis()) - _start) > TIME_LONG_PRESS) {
+        // tricky: prevent reoccurring events and another touch event when releasing
+        _start = millis() + 30000;
+        e.touchEvent = static_cast<char>(TOUCH_ACTION_LONG_PRESS);
+        LOG_DEBUG("action LONG PRESS(%d/%d)\n", _last_x, _last_y);
+    }
+
+    if (e.touchEvent != TOUCH_ACTION_NONE) {
+        e.source = this->_originName;
+        e.x = _last_x;
+        e.y = _last_y;
+        onEvent(e);
+    }
+
+    return interval;
+}
+
+void TouchScreenBase::hapticFeedback()
+{
+#ifdef T_WATCH_S3
+    drv.setWaveform(0, 75);
+    drv.setWaveform(1, 0); // end waveform
+    drv.go();
+#endif
+}
@@ -0,0 +1,55 @@
+#pragma once
+
+#include "InputBroker.h"
+#include "concurrency/OSThread.h"
+#include "mesh/NodeDB.h"
+
+typedef struct _TouchEvent {
+    const char *source;
+    char touchEvent;
+    uint16_t x;
+    uint16_t y;
+} TouchEvent;
+
+class TouchScreenBase : public Observable<const InputEvent *>, public concurrency::OSThread
+{
+  public:
+    explicit TouchScreenBase(const char *name, uint16_t width, uint16_t height);
+    void init(bool hasTouch);
+
+  protected:
+    enum TouchScreenBaseStateType { TOUCH_EVENT_OCCURRED, TOUCH_EVENT_CLEARED };
+
+    enum TouchScreenBaseEventType {
+        TOUCH_ACTION_NONE,
+        TOUCH_ACTION_UP,
+        TOUCH_ACTION_DOWN,
+        TOUCH_ACTION_LEFT,
+        TOUCH_ACTION_RIGHT,
+        TOUCH_ACTION_TAP,
+        TOUCH_ACTION_DOUBLE_TAP,
+        TOUCH_ACTION_LONG_PRESS
+    };
+
+    virtual int32_t runOnce() override;
+
+    virtual bool getTouch(int16_t &x, int16_t &y) = 0;
+    virtual void onEvent(const TouchEvent &event) = 0;
+
+    volatile TouchScreenBaseStateType _state = TOUCH_EVENT_CLEARED;
+    volatile TouchScreenBaseEventType _action = TOUCH_ACTION_NONE;
+    void hapticFeedback();
+
+  protected:
+    uint16_t _display_width;
+    uint16_t _display_height;
+
+  private:
+    bool _touchedOld = false;  // previous touch state
+    int16_t _first_x, _last_x; // horizontal swipe direction
+    int16_t _first_y, _last_y; // vertical swipe direction
+    time_t _start;             // for LONG_PRESS
+    bool _tapped;              // for DOUBLE_TAP
+
+    const char *_originName;
+};
@@ -0,0 +1,73 @@
+#include "TouchScreenImpl1.h"
+#include "InputBroker.h"
+#include "PowerFSM.h"
+#include "configuration.h"
+
+TouchScreenImpl1 *touchScreenImpl1;
+
+TouchScreenImpl1::TouchScreenImpl1(uint16_t width, uint16_t height, bool (*getTouch)(int16_t *, int16_t *))
+    : TouchScreenBase("touchscreen1", width, height), _getTouch(getTouch)
+{
+}
+
+void TouchScreenImpl1::init()
+{
+#if !HAS_TOUCHSCREEN
+    TouchScreenBase::init(false);
+    return;
+#else
+    TouchScreenBase::init(true);
+    inputBroker->registerSource(this);
+#endif
+}
+
+bool TouchScreenImpl1::getTouch(int16_t &x, int16_t &y)
+{
+    return _getTouch(&x, &y);
+}
+
+/**
+ * @brief forward touchscreen event
+ *
+ * @param event
+ *
+ * The touchscreen events are translated to input events and reversed
+ */
+void TouchScreenImpl1::onEvent(const TouchEvent &event)
+{
+    InputEvent e;
+    e.source = event.source;
+    switch (event.touchEvent) {
+    case TOUCH_ACTION_LEFT: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT);
+        break;
+    }
+    case TOUCH_ACTION_RIGHT: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT);
+        break;
+    }
+    case TOUCH_ACTION_UP: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP);
+        break;
+    }
+    case TOUCH_ACTION_DOWN: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN);
+        break;
+    }
+    case TOUCH_ACTION_DOUBLE_TAP: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT);
+        break;
+    }
+    case TOUCH_ACTION_LONG_PRESS: {
+        e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL);
+        break;
+    }
+    case TOUCH_ACTION_TAP: {
+        powerFSM.trigger(EVENT_INPUT);
+        break;
+    }
+    default:
+        return;
+    }
+    this->notifyObservers(&e);
+}
@@ -0,0 +1,17 @@
+#pragma once
+#include "TouchScreenBase.h"
+
+class TouchScreenImpl1 : public TouchScreenBase
+{
+  public:
+    TouchScreenImpl1(uint16_t width, uint16_t height, bool (*getTouch)(int16_t *, int16_t *));
+    void init(void);
+
+  protected:
+    virtual bool getTouch(int16_t &x, int16_t &y);
+    virtual void onEvent(const TouchEvent &event);
+
+    bool (*_getTouch)(int16_t *, int16_t *);
+};
+
+extern TouchScreenImpl1 *touchScreenImpl1;
@@ -0,0 +1,95 @@
+#include "TrackballInterruptBase.h"
+#include "configuration.h"
+
+TrackballInterruptBase::TrackballInterruptBase(const char *name) : concurrency::OSThread(name), _originName(name) {}
+
+void TrackballInterruptBase::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinLeft, uint8_t pinRight, uint8_t pinPress,
+                                  char eventDown, char eventUp, char eventLeft, char eventRight, char eventPressed,
+                                  void (*onIntDown)(), void (*onIntUp)(), void (*onIntLeft)(), void (*onIntRight)(),
+                                  void (*onIntPress)())
+{
+    this->_pinDown = pinDown;
+    this->_pinUp = pinUp;
+    this->_pinLeft = pinLeft;
+    this->_pinRight = pinRight;
+    this->_eventDown = eventDown;
+    this->_eventUp = eventUp;
+    this->_eventLeft = eventLeft;
+    this->_eventRight = eventRight;
+    this->_eventPressed = eventPressed;
+
+    pinMode(pinPress, INPUT_PULLUP);
+    pinMode(this->_pinDown, INPUT_PULLUP);
+    pinMode(this->_pinUp, INPUT_PULLUP);
+    pinMode(this->_pinLeft, INPUT_PULLUP);
+    pinMode(this->_pinRight, INPUT_PULLUP);
+
+    attachInterrupt(pinPress, onIntPress, RISING);
+    attachInterrupt(this->_pinDown, onIntDown, RISING);
+    attachInterrupt(this->_pinUp, onIntUp, RISING);
+    attachInterrupt(this->_pinLeft, onIntLeft, RISING);
+    attachInterrupt(this->_pinRight, onIntRight, RISING);
+
+    LOG_DEBUG("Trackball GPIO initialized (%d, %d, %d, %d, %d)\n", this->_pinUp, this->_pinDown, this->_pinLeft, this->_pinRight,
+              pinPress);
+
+    this->setInterval(100);
+}
+
+int32_t TrackballInterruptBase::runOnce()
+{
+    InputEvent e;
+    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+
+    if (this->action == TB_ACTION_PRESSED) {
+        // LOG_DEBUG("Trackball event Press\n");
+        e.inputEvent = this->_eventPressed;
+    } else if (this->action == TB_ACTION_UP) {
+        // LOG_DEBUG("Trackball event UP\n");
+        e.inputEvent = this->_eventUp;
+    } else if (this->action == TB_ACTION_DOWN) {
+        // LOG_DEBUG("Trackball event DOWN\n");
+        e.inputEvent = this->_eventDown;
+    } else if (this->action == TB_ACTION_LEFT) {
+        // LOG_DEBUG("Trackball event LEFT\n");
+        e.inputEvent = this->_eventLeft;
+    } else if (this->action == TB_ACTION_RIGHT) {
+        // LOG_DEBUG("Trackball event RIGHT\n");
+        e.inputEvent = this->_eventRight;
+    }
+
+    if (e.inputEvent != meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
+        e.source = this->_originName;
+        e.kbchar = 0x00;
+        this->notifyObservers(&e);
+    }
+
+    this->action = TB_ACTION_NONE;
+
+    return 100;
+}
+
+void TrackballInterruptBase::intPressHandler()
+{
+    this->action = TB_ACTION_PRESSED;
+}
+
+void TrackballInterruptBase::intDownHandler()
+{
+    this->action = TB_ACTION_DOWN;
+}
+
+void TrackballInterruptBase::intUpHandler()
+{
+    this->action = TB_ACTION_UP;
+}
+
+void TrackballInterruptBase::intLeftHandler()
+{
+    this->action = TB_ACTION_LEFT;
+}
+
+void TrackballInterruptBase::intRightHandler()
+{
+    this->action = TB_ACTION_RIGHT;
+}
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "InputBroker.h"
+#include "mesh/NodeDB.h"
+
+class TrackballInterruptBase : public Observable<const InputEvent *>, public concurrency::OSThread
+{
+  public:
+    explicit TrackballInterruptBase(const char *name);
+    void init(uint8_t pinDown, uint8_t pinUp, uint8_t pinLeft, uint8_t pinRight, uint8_t pinPress, char eventDown, char eventUp,
+              char eventLeft, char eventRight, char eventPressed, void (*onIntDown)(), void (*onIntUp)(), void (*onIntLeft)(),
+              void (*onIntRight)(), void (*onIntPress)());
+    void intPressHandler();
+    void intDownHandler();
+    void intUpHandler();
+    void intLeftHandler();
+    void intRightHandler();
+
+    virtual int32_t runOnce() override;
+
+  protected:
+    enum TrackballInterruptBaseActionType {
+        TB_ACTION_NONE,
+        TB_ACTION_PRESSED,
+        TB_ACTION_UP,
+        TB_ACTION_DOWN,
+        TB_ACTION_LEFT,
+        TB_ACTION_RIGHT
+    };
+
+    volatile TrackballInterruptBaseActionType action = TB_ACTION_NONE;
+
+  private:
+    uint8_t _pinDown = 0;
+    uint8_t _pinUp = 0;
+    uint8_t _pinLeft = 0;
+    uint8_t _pinRight = 0;
+    char _eventDown = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventUp = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventLeft = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventRight = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventPressed = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    const char *_originName;
+};
@@ -0,0 +1,54 @@
+#include "TrackballInterruptImpl1.h"
+#include "InputBroker.h"
+#include "configuration.h"
+
+TrackballInterruptImpl1 *trackballInterruptImpl1;
+
+TrackballInterruptImpl1::TrackballInterruptImpl1() : TrackballInterruptBase("trackball1") {}
+
+void TrackballInterruptImpl1::init()
+{
+#if !HAS_TRACKBALL
+    // Input device is disabled.
+    return;
+#else
+    uint8_t pinUp = TB_UP;
+    uint8_t pinDown = TB_DOWN;
+    uint8_t pinLeft = TB_LEFT;
+    uint8_t pinRight = TB_RIGHT;
+    uint8_t pinPress = TB_PRESS;
+
+    char eventDown = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN);
+    char eventUp = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP);
+    char eventLeft = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT);
+    char eventRight = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT);
+    char eventPressed = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT);
+
+    TrackballInterruptBase::init(pinDown, pinUp, pinLeft, pinRight, pinPress, eventDown, eventUp, eventLeft, eventRight,
+                                 eventPressed, TrackballInterruptImpl1::handleIntDown, TrackballInterruptImpl1::handleIntUp,
+                                 TrackballInterruptImpl1::handleIntLeft, TrackballInterruptImpl1::handleIntRight,
+                                 TrackballInterruptImpl1::handleIntPressed);
+    inputBroker->registerSource(this);
+#endif
+}
+
+void TrackballInterruptImpl1::handleIntDown()
+{
+    trackballInterruptImpl1->intDownHandler();
+}
+void TrackballInterruptImpl1::handleIntUp()
+{
+    trackballInterruptImpl1->intUpHandler();
+}
+void TrackballInterruptImpl1::handleIntLeft()
+{
+    trackballInterruptImpl1->intLeftHandler();
+}
+void TrackballInterruptImpl1::handleIntRight()
+{
+    trackballInterruptImpl1->intRightHandler();
+}
+void TrackballInterruptImpl1::handleIntPressed()
+{
+    trackballInterruptImpl1->intPressHandler();
+}
@@ -0,0 +1,16 @@
+#pragma once
+#include "TrackballInterruptBase.h"
+
+class TrackballInterruptImpl1 : public TrackballInterruptBase
+{
+  public:
+    TrackballInterruptImpl1();
+    void init();
+    static void handleIntDown();
+    static void handleIntUp();
+    static void handleIntLeft();
+    static void handleIntRight();
+    static void handleIntPressed();
+};
+
+extern TrackballInterruptImpl1 *trackballInterruptImpl1;
@@ -23,7 +23,7 @@ void UpDownInterruptBase::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinPress,
    attachInterrupt(this->_pinDown, onIntDown, RISING);
    attachInterrupt(this->_pinUp, onIntUp, RISING);

-    LOG_DEBUG("GPIO initialized (%d, %d, %d)\n", this->_pinDown, this->_pinUp, pinPress);
+    LOG_DEBUG("Up/down/press GPIO initialized (%d, %d, %d)\n", this->_pinUp, this->_pinDown, pinPress);
 }

 void UpDownInterruptBase::intPressHandler()
@@ -5,12 +5,12 @@ UpDownInterruptImpl1 *upDownInterruptImpl1;

 UpDownInterruptImpl1::UpDownInterruptImpl1() : UpDownInterruptBase("upDown1") {}

-void UpDownInterruptImpl1::init()
+bool UpDownInterruptImpl1::init()
 {

    if (!moduleConfig.canned_message.updown1_enabled) {
        // Input device is disabled.
-        return;
+        return false;
    }

    uint8_t pinUp = moduleConfig.canned_message.inputbroker_pin_a;
@@ -24,6 +24,7 @@ void UpDownInterruptImpl1::init()
    UpDownInterruptBase::init(pinDown, pinUp, pinPress, eventDown, eventUp, eventPressed, UpDownInterruptImpl1::handleIntDown,
                              UpDownInterruptImpl1::handleIntUp, UpDownInterruptImpl1::handleIntPressed);
    inputBroker->registerSource(this);
+    return true;
 }

 void UpDownInterruptImpl1::handleIntDown()
@@ -37,4 +38,4 @@ void UpDownInterruptImpl1::handleIntUp()
 void UpDownInterruptImpl1::handleIntPressed()
 {
    upDownInterruptImpl1->intPressHandler();
-}
+}
@@ -5,10 +5,10 @@ class UpDownInterruptImpl1 : public UpDownInterruptBase
 {
  public:
    UpDownInterruptImpl1();
-    void init();
+    bool init();
    static void handleIntDown();
    static void handleIntUp();
    static void handleIntPressed();
 };

-extern UpDownInterruptImpl1 *upDownInterruptImpl1;
+extern UpDownInterruptImpl1 *upDownInterruptImpl1;
@@ -7,7 +7,7 @@ CardKbI2cImpl::CardKbI2cImpl() : KbI2cBase("cardKB") {}

 void CardKbI2cImpl::init()
 {
-    if (cardkb_found.address != CARDKB_ADDR) {
+    if (cardkb_found.address == 0x00) {
        disable();
        return;
    }
@@ -28,20 +28,9 @@ uint8_t read_from_14004(TwoWire *i2cBus, uint8_t reg, uint8_t *data, uint8_t len
    return readflag;
 }

-// Unused for now - flagging it off
-#if 0
-void write_to_14004(const TwoWire * i2cBus, uint8_t reg, uint8_t data)
-{
-    i2cBus->beginTransmission(CARDKB_ADDR);
-    i2cBus->write(reg);
-    i2cBus->write(data);
-    i2cBus->endTransmission(); // stop transmitting
-}
-#endif
-
 int32_t KbI2cBase::runOnce()
 {
-    if (cardkb_found.address != CARDKB_ADDR) {
+    if (cardkb_found.address == 0x00) {
        // Input device is not detected.
        return INT32_MAX;
    }
@@ -52,11 +41,19 @@ int32_t KbI2cBase::runOnce()
 #ifdef I2C_SDA1
            LOG_DEBUG("Using I2C Bus 1 (the second one)\n");
            i2cBus = &Wire1;
+            if (cardkb_found.address == BBQ10_KB_ADDR) {
+                Q10keyboard.begin(BBQ10_KB_ADDR, &Wire1);
+                Q10keyboard.setBacklight(0);
+            }
            break;
 #endif
        case ScanI2C::WIRE:
            LOG_DEBUG("Using I2C Bus 0 (the first one)\n");
            i2cBus = &Wire;
+            if (cardkb_found.address == BBQ10_KB_ADDR) {
+                Q10keyboard.begin(BBQ10_KB_ADDR, &Wire);
+                Q10keyboard.setBacklight(0);
+            }
            break;
        case ScanI2C::NO_I2C:
        default:
@@ -64,7 +61,105 @@ int32_t KbI2cBase::runOnce()
        }
    }

-    if (kb_model == 0x02) {
+    switch (kb_model) {
+    case 0x11: { // BB Q10
+        int keyCount = Q10keyboard.keyCount();
+        while (keyCount--) {
+            const BBQ10Keyboard::KeyEvent key = Q10keyboard.keyEvent();
+            if ((key.key != 0x00) && (key.state == BBQ10Keyboard::StateRelease)) {
+                InputEvent e;
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+                e.source = this->_originName;
+                switch (key.key) {
+                case 'p': // TAB
+                case 't': // TAB as well
+                    if (is_sym) {
+                        e.inputEvent = ANYKEY;
+                        e.kbchar = 0x09; // TAB Scancode
+                        is_sym = false;  // reset sym state after second keypress
+                    } else {
+                        e.inputEvent = ANYKEY;
+                        e.kbchar = key.key;
+                    }
+                    break;
+                case 'q': // ESC
+                    if (is_sym) {
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL;
+                        e.kbchar = 0x1b;
+                        is_sym = false; // reset sym state after second keypress
+                    } else {
+                        e.inputEvent = ANYKEY;
+                        e.kbchar = key.key;
+                    }
+                    break;
+                case 0x08: // Back
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK;
+                    e.kbchar = key.key;
+                    break;
+                case 'e': // sym e
+                    if (is_sym) {
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
+                        e.kbchar = 0xb5;
+                        is_sym = false; // reset sym state after second keypress
+                    } else {
+                        e.inputEvent = ANYKEY;
+                        e.kbchar = key.key;
+                    }
+                    break;
+                case 'x': // sym x
+                    if (is_sym) {
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
+                        e.kbchar = 0xb6;
+                        is_sym = false; // reset sym state after second keypress
+                    } else {
+                        e.inputEvent = ANYKEY;
+                        e.kbchar = key.key;
+                    }
+                    break;
+                case 's': // sym s
+                    if (is_sym) {
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
+                        e.kbchar = 0x00; // tweak for destSelect
+                        is_sym = false;  // reset sym state after second keypress
+                    } else {
+                        e.inputEvent = ANYKEY;
+                        e.kbchar = key.key;
+                    }
+                    break;
+                case 'f': // sym f
+                    if (is_sym) {
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
+                        e.kbchar = 0x00; // tweak for destSelect
+                        is_sym = false;  // reset sym state after second keypress
+                    } else {
+                        e.inputEvent = ANYKEY;
+                        e.kbchar = key.key;
+                    }
+                    break;
+                case 0x13: // Code scanner says the SYM key is 0x13
+                    is_sym = !is_sym;
+                    break;
+                case 0x0a: // apparently Enter on Q10 is a line feed instead of carriage return
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
+                    break;
+                case 0x00: // nopress
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+                    break;
+                default: // all other keys
+                    e.inputEvent = ANYKEY;
+                    e.kbchar = key.key;
+                    is_sym = false; // reset sym state after second keypress
+                    break;
+                }
+
+                if (e.inputEvent != meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
+                    this->notifyObservers(&e);
+                }
+            }
+        }
+        break;
+    }
+    case 0x02: {
        // RAK14004
        uint8_t rDataBuf[8] = {0};
        uint8_t PrintDataBuf = 0;
@@ -85,9 +180,12 @@ int32_t KbI2cBase::runOnce()
            e.kbchar = PrintDataBuf;
            this->notifyObservers(&e);
        }
-    } else {
-        // m5 cardkb
-        i2cBus->requestFrom(CARDKB_ADDR, 1);
+        break;
+    }
+    case 0x00:   // CARDKB
+    case 0x10: { // T-DECK
+
+        i2cBus->requestFrom((int)cardkb_found.address, 1);

        while (i2cBus->available()) {
            char c = i2cBus->read();
@@ -104,17 +202,19 @@ int32_t KbI2cBase::runOnce()
                break;
            case 0xb5: // Up
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
+                e.kbchar = 0xb5;
                break;
            case 0xb6: // Down
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
+                e.kbchar = 0xb6;
                break;
            case 0xb4: // Left
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
-                e.kbchar = c;
+                e.kbchar = 0xb4;
                break;
            case 0xb7: // Right
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
-                e.kbchar = c;
+                e.kbchar = 0xb7;
                break;
            case 0x0d: // Enter
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
@@ -132,6 +232,10 @@ int32_t KbI2cBase::runOnce()
                this->notifyObservers(&e);
            }
        }
+        break;
    }
-    return 500;
+    default:
+        LOG_WARN("Unknown kb_model 0x%02x\n", kb_model);
+    }
+    return 300;
 }
@@ -1,5 +1,6 @@
 #pragma once

+#include "BBQ10Keyboard.h"
 #include "InputBroker.h"
 #include "Wire.h"
 #include "concurrency/OSThread.h"
@@ -16,4 +17,7 @@ class KbI2cBase : public Observable<const InputEvent *>, public concurrency::OST
    const char *_originName;

    TwoWire *i2cBus = 0;
+
+    BBQ10Keyboard Q10keyboard;
+    bool is_sym = false;
 };
@@ -0,0 +1,131 @@
+#include "kbMatrixBase.h"
+#include "configuration.h"
+
+#ifdef INPUTBROKER_MATRIX_TYPE
+
+const byte keys_cols[] = KEYS_COLS;
+const byte keys_rows[] = KEYS_ROWS;
+
+#if INPUTBROKER_MATRIX_TYPE == 1
+
+unsigned char KeyMap[3][sizeof(keys_rows)][sizeof(keys_cols)] = {{{' ', '.', 'm', 'n', 'b', 0xb6},
+                                                                  {0x0d, 'l', 'k', 'j', 'h', 0xb4},
+                                                                  {'p', 'o', 'i', 'u', 'y', 0xb5},
+                                                                  {0x08, 'z', 'x', 'c', 'v', 0xb7},
+                                                                  {'a', 's', 'd', 'f', 'g', 0x09},
+                                                                  {'q', 'w', 'e', 'r', 't', 0x1a}},
+                                                                 {// SHIFT
+                                                                  {':', ';', 'M', 'N', 'B', 0xb6},
+                                                                  {0x0d, 'L', 'K', 'J', 'H', 0xb4},
+                                                                  {'P', 'O', 'I', 'U', 'Y', 0xb5},
+                                                                  {0x08, 'Z', 'X', 'C', 'V', 0xb7},
+                                                                  {'A', 'S', 'D', 'F', 'G', 0x09},
+                                                                  {'Q', 'W', 'E', 'R', 'T', 0x1a}},
+                                                                 {// SHIFT-SHIFT
+                                                                  {'_', ',', '>', '<', '"', '{'},
+                                                                  {'~', '-', '*', '&', '+', '['},
+                                                                  {'0', '9', '8', '7', '6', '}'},
+                                                                  {'=', '(', ')', '?', '/', ']'},
+                                                                  {'!', '@', '#', '$', '%', '\\'},
+                                                                  {'1', '2', '3', '4', '5', 0x1a}}};
+#endif
+
+KbMatrixBase::KbMatrixBase(const char *name) : concurrency::OSThread(name)
+{
+    this->_originName = name;
+}
+
+int32_t KbMatrixBase::runOnce()
+{
+    if (!INPUTBROKER_MATRIX_TYPE) {
+        // Input device is not requested.
+        return disable();
+    }
+
+    if (firstTime) {
+        // This is the first time the OSThread library has called this function, so do port setup
+        firstTime = 0;
+        for (byte i = 0; i < sizeof(keys_rows); i++) {
+            pinMode(keys_rows[i], OUTPUT);
+            digitalWrite(keys_rows[i], HIGH);
+        }
+        for (byte i = 0; i < sizeof(keys_cols); i++) {
+            pinMode(keys_cols[i], INPUT_PULLUP);
+        }
+    }
+
+    key = 0;
+
+    if (INPUTBROKER_MATRIX_TYPE == 1) {
+        // scan for keypresses
+        for (byte i = 0; i < sizeof(keys_rows); i++) {
+            digitalWrite(keys_rows[i], LOW);
+            for (byte j = 0; j < sizeof(keys_cols); j++) {
+                if (digitalRead(keys_cols[j]) == LOW) {
+                    key = KeyMap[shift][i][j];
+                }
+            }
+            digitalWrite(keys_rows[i], HIGH);
+        }
+        // debounce
+        if (key != prevkey) {
+            if (key != 0) {
+                LOG_DEBUG("Key 0x%x pressed\n", key);
+                // reset shift now that we have a keypress
+                InputEvent e;
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+                e.source = this->_originName;
+                switch (key) {
+                case 0x1b: // ESC
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL;
+                    break;
+                case 0x08: // Back
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK;
+                    e.kbchar = key;
+                    break;
+                case 0xb5: // Up
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
+                    break;
+                case 0xb6: // Down
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
+                    break;
+                case 0xb4: // Left
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
+                    e.kbchar = key;
+                    break;
+                case 0xb7: // Right
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
+                    e.kbchar = key;
+                    break;
+                case 0x0d: // Enter
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
+                    break;
+                case 0x00: // nopress
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+                    break;
+                case 0x1a: // Shift
+                    shift++;
+                    if (shift > 2) {
+                        shift = 0;
+                    }
+                    break;
+                default: // all other keys
+                    e.inputEvent = ANYKEY;
+                    e.kbchar = key;
+                    break;
+                }
+                if (e.inputEvent != meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
+                    this->notifyObservers(&e);
+                }
+            }
+            prevkey = key;
+        }
+
+    } else {
+        LOG_WARN("Unknown kb_model 0x%02x\n", INPUTBROKER_MATRIX_TYPE);
+        return disable();
+    }
+    return 50; // Keyscan every 50msec to avoid key bounce
+}
+
+#endif // INPUTBROKER_MATRIX_TYPE
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "InputBroker.h"
+#include "concurrency/OSThread.h"
+
+class KbMatrixBase : public Observable<const InputEvent *>, public concurrency::OSThread
+{
+  public:
+    explicit KbMatrixBase(const char *name);
+
+  protected:
+    virtual int32_t runOnce() override;
+
+  private:
+    const char *_originName;
+    bool firstTime = 1;
+    int shift = 0;
+    char key = 0;
+    char prevkey = 0;
+};
@@ -0,0 +1,20 @@
+#include "kbMatrixImpl.h"
+#include "InputBroker.h"
+
+#ifdef INPUTBROKER_MATRIX_TYPE
+
+KbMatrixImpl *kbMatrixImpl;
+
+KbMatrixImpl::KbMatrixImpl() : KbMatrixBase("matrixKB") {}
+
+void KbMatrixImpl::init()
+{
+    if (!INPUTBROKER_MATRIX_TYPE) {
+        disable();
+        return;
+    }
+
+    inputBroker->registerSource(this);
+}
+
+#endif // INPUTBROKER_MATRIX_TYPE
@@ -0,0 +1,19 @@
+#pragma once
+#include "kbMatrixBase.h"
+#include "main.h"
+
+/**
+ * @brief The idea behind this class to have static methods for the event handlers.
+ *      Check attachInterrupt() at RotaryEncoderInteruptBase.cpp
+ *      Technically you can have as many rotary encoders hardver attached
+ *      to your device as you wish, but you always need to have separate event
+ *      handlers, thus you need to have a RotaryEncoderInterrupt implementation.
+ */
+class KbMatrixImpl : public KbMatrixBase
+{
+  public:
+    KbMatrixImpl();
+    void init();
+};
+
+extern KbMatrixImpl *kbMatrixImpl;
@@ -29,6 +29,7 @@
 #include "target_specific.h"
 #include <Wire.h>
 #include <memory>
+#include <utility>
 // #include <driver/rtc_io.h>

 #include "mesh/eth/ethClient.h"
@@ -73,6 +74,7 @@ NRF52Bluetooth *nrf52Bluetooth;

 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
 #include "AccelerometerThread.h"
+#include "AmbientLightingThread.h"
 #endif

 using namespace concurrency;
@@ -96,7 +98,7 @@ ScanI2C::DeviceAddress screen_found = ScanI2C::ADDRESS_NONE;

 // The I2C address of the cardkb or RAK14004 (if found)
 ScanI2C::DeviceAddress cardkb_found = ScanI2C::ADDRESS_NONE;
-// 0x02 for RAK14004 and 0x00 for cardkb
+// 0x02 for RAK14004, 0x00 for cardkb, 0x10 for T-Deck
 uint8_t kb_model;

 // The I2C address of the RTC Module (if found)
@@ -121,9 +123,8 @@ uint32_t serialSinceMsec;

 bool pmu_found;

-// Array map of sensor types (as array index) and i2c address as value we'll find in the i2c scan
-uint8_t nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1] = {
-    0}; // one is enough, missing elements will be initialized to 0 anyway.
+// Array map of sensor types with i2c address and wire as we'll find in the i2c scan
+std::pair<uint8_t, TwoWire *> nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1] = {};

 Router *router = NULL; // Users of router don't care what sort of subclass implements that API

@@ -145,6 +146,25 @@ const char *getDeviceName()
    return name;
 }

+#ifdef VEXT_ENABLE_V03
+
+#include <soc/rtc.h>
+
+static uint32_t calibrate_one(rtc_cal_sel_t cal_clk, const char *name)
+{
+    const uint32_t cal_count = 1000;
+    uint32_t cali_val;
+    for (int i = 0; i < 5; ++i) {
+        cali_val = rtc_clk_cal(cal_clk, cal_count);
+    }
+    return cali_val;
+}
+
+int heltec_version = 3;
+
+#define CALIBRATE_ONE(cali_clk) calibrate_one(cali_clk, #cali_clk)
+#endif
+
 static int32_t ledBlinker()
 {
    static bool ledOn;
@@ -169,6 +189,7 @@ static OSThread *buttonThread;
 uint32_t ButtonThread::longPressTime = 0;
 #endif
 static OSThread *accelerometerThread;
+static OSThread *ambientLightingThread;
 SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);

 RadioInterface *rIf = NULL;
@@ -214,12 +235,59 @@ void setup()
    digitalWrite(PIN_EINK_PWR_ON, HIGH);
 #endif

-#ifdef VEXT_ENABLE
+#ifdef ST7735_BL_V03 // Heltec Wireless Tracker PCB Change Detect/Hack
+
+    rtc_clk_32k_enable(true);
+    CALIBRATE_ONE(RTC_CAL_RTC_MUX);
+    if (CALIBRATE_ONE(RTC_CAL_32K_XTAL) != 0) {
+        rtc_clk_slow_freq_set(RTC_SLOW_FREQ_32K_XTAL);
+        CALIBRATE_ONE(RTC_CAL_RTC_MUX);
+        CALIBRATE_ONE(RTC_CAL_32K_XTAL);
+    }
+
+    if (rtc_clk_slow_freq_get() != RTC_SLOW_FREQ_32K_XTAL) {
+        heltec_version = 3;
+    } else {
+        heltec_version = 5;
+    }
+#endif
+
+#if defined(VEXT_ENABLE_V03)
+    if (heltec_version == 3) {
+        pinMode(VEXT_ENABLE_V03, OUTPUT);
+        digitalWrite(VEXT_ENABLE_V03, 0); // turn on the display power
+        LOG_DEBUG("HELTEC Detect Tracker V1.0\n");
+    } else {
+        pinMode(VEXT_ENABLE_V05, OUTPUT);
+        digitalWrite(VEXT_ENABLE_V05, 1); // turn on the display power
+        LOG_DEBUG("HELTEC Detect Tracker V1.1\n");
+    }
+#elif defined(VEXT_ENABLE)
    pinMode(VEXT_ENABLE, OUTPUT);
    digitalWrite(VEXT_ENABLE, 0); // turn on the display power
 #endif

-#ifdef VGNSS_CTRL
+#if defined(VGNSS_CTRL_V03)
+    if (heltec_version == 3) {
+        pinMode(VGNSS_CTRL_V03, OUTPUT);
+        digitalWrite(VGNSS_CTRL_V03, LOW);
+    } else {
+        pinMode(VGNSS_CTRL_V05, OUTPUT);
+        digitalWrite(VGNSS_CTRL_V05, LOW);
+    }
+#endif
+
+#if defined(VTFT_CTRL_V03)
+    if (heltec_version == 3) {
+        pinMode(VTFT_CTRL_V03, OUTPUT);
+        digitalWrite(VTFT_CTRL_V03, LOW);
+    } else {
+        pinMode(VTFT_CTRL_V05, OUTPUT);
+        digitalWrite(VTFT_CTRL_V05, LOW);
+    }
+#endif
+
+#if defined(VGNSS_CTRL)
    pinMode(VGNSS_CTRL, OUTPUT);
    digitalWrite(VGNSS_CTRL, LOW);
 #endif
@@ -300,6 +368,15 @@ void setup()
 #endif
 #endif

+#ifdef T_DECK
+    // enable keyboard
+    pinMode(KB_POWERON, OUTPUT);
+    digitalWrite(KB_POWERON, HIGH);
+    // There needs to be a delay after power on, give LILYGO-KEYBOARD some startup time
+    // otherwise keyboard and touch screen will not work
+    delay(800);
+#endif
+
    // Currently only the tbeam has a PMU
    // PMU initialization needs to be placed before i2c scanning
    power = new Power();
@@ -372,8 +449,19 @@ void setup()
            kb_model = 0x02;
            break;
        case ScanI2C::DeviceType::CARDKB:
+            kb_model = 0x00;
+            break;
+        case ScanI2C::DeviceType::TDECKKB:
+            // assign an arbitrary value to distinguish from other models
+            kb_model = 0x10;
+            break;
+        case ScanI2C::DeviceType::BBQ10KB:
+            // assign an arbitrary value to distinguish from other models
+            kb_model = 0x11;
+            break;
        default:
            // use this as default since it's also just zero
+            LOG_WARN("kb_info.type is unknown(0x%02x), setting kb_model=0x00\n", kb_info.type);
            kb_model = 0x00;
        }
    }
@@ -389,14 +477,6 @@ void setup()
 // Only one supported RGB LED currently
 #ifdef HAS_NCP5623
    rgb_found = i2cScanner->find(ScanI2C::DeviceType::NCP5623);
-
-    // Start the RGB LED at 50%
-
-    if (rgb_found.type == ScanI2C::NCP5623) {
-        rgb.begin();
-        rgb.setCurrent(10);
-        rgb.setColor(128, 128, 128);
-    }
 #endif

 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
@@ -411,7 +491,8 @@ void setup()
    {                                                                                                                            \
        auto found = i2cScanner->find(SCANNER_T);                                                                                \
        if (found.type != ScanI2C::DeviceType::NONE) {                                                                           \
-            nodeTelemetrySensorsMap[PB_T] = found.address.address;                                                               \
+            nodeTelemetrySensorsMap[PB_T].first = found.address.address;                                                         \
+            nodeTelemetrySensorsMap[PB_T].second = i2cScanner->fetchI2CBus(found.address);                                       \
            LOG_DEBUG("found i2c sensor %s\n", STRING(PB_T));                                                                    \
        }                                                                                                                        \
    }
@@ -458,8 +539,13 @@ void setup()
 #ifdef ARCH_NRF52
    nrf52Setup();
 #endif
+
+#ifdef ARCH_RP2040
+    rp2040Setup();
+#endif
+
    // We do this as early as possible because this loads preferences from flash
-    // but we need to do this after main cpu iniot (esp32setup), because we need the random seed set
+    // but we need to do this after main cpu init (esp32setup), because we need the random seed set
    nodeDB.init();

    // If we're taking on the repeater role, use flood router
@@ -496,6 +582,12 @@ void setup()
    }
 #endif

+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+    if (rgb_found.type != ScanI2C::DeviceType::NONE) {
+        ambientLightingThread = new AmbientLightingThread(rgb_found.type);
+    }
+#endif
+
 #ifdef T_WATCH_S3
    drv.begin();
    drv.selectLibrary(1);
@@ -524,6 +616,7 @@ void setup()
 #else
    // ESP32
    SPI.begin(RF95_SCK, RF95_MISO, RF95_MOSI, RF95_NSS);
+    LOG_WARN("SPI.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)\n", RF95_SCK, RF95_MISO, RF95_MOSI, RF95_NSS);
    SPI.setFrequency(4000000);
 #endif

@@ -532,14 +625,12 @@ void setup()

    readFromRTC(); // read the main CPU RTC at first (in case we can't get GPS time)

-    gps = createGps();
-
+    gps = GPS::createGps();
    if (gps) {
        gpsStatus->observe(&gps->newStatus);
    } else {
-        LOG_WARN("No GPS found - running without GPS\n");
+        LOG_DEBUG("Running without GPS.\n");
    }
-
    nodeStatus->observe(&nodeDB.newStatus);

    service.init();
@@ -564,17 +655,6 @@ void setup()

    screen->print("Started...\n");

-    // We have now loaded our saved preferences from flash
-
-    // ONCE we will factory reset the GPS for bug #327
-    if (gps && !devicestate.did_gps_reset) {
-        LOG_WARN("GPS FactoryReset requested\n");
-        if (gps->factoryReset()) { // If we don't succeed try again next time
-            devicestate.did_gps_reset = true;
-            nodeDB.saveToDisk(SEGMENT_DEVICESTATE);
-        }
-    }
-
 #ifdef SX126X_ANT_SW
    // make analog PA vs not PA switch on SX126x eval board work properly
    pinMode(SX126X_ANT_SW, OUTPUT);
@@ -729,7 +809,6 @@ void setup()
    PowerFSM_setup(); // we will transition to ON in a couple of seconds, FIXME, only do this for cold boots, not waking from SDS
    powerFSMthread = new PowerFSMThread();

-    // setBluetoothEnable(false); we now don't start bluetooth until we enter the proper state
    setCPUFast(false); // 80MHz is fine for our slow peripherals
 }

@@ -64,11 +64,13 @@ extern uint32_t shutdownAtMsec;

 extern uint32_t serialSinceMsec;

+extern int heltec_version;
+
 // If a thread does something that might need for it to be rescheduled ASAP it can set this flag
 // This will suppress the current delay and instead try to run ASAP.
 extern bool runASAP;

-void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop(), clearBonds();
+void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop(), rp2040Setup(), clearBonds();

 meshtastic_DeviceMetadata getDeviceMetadata();

@@ -1,8 +1,21 @@
+/**
+ * @file memGet.cpp
+ * @brief Implementation of MemGet class that provides functions to get memory information.
+ *
+ * This file contains the implementation of MemGet class that provides functions to get
+ * information about free heap, heap size, free psram and psram size. The functions are
+ * implemented for ESP32 and NRF52 architectures. If the platform does not have heap
+ * management function implemented, the functions return UINT32_MAX or 0.
+ */
 #include "memGet.h"
 #include "configuration.h"

 MemGet memGet;

+/**
+ * Returns the amount of free heap memory in bytes.
+ * @return uint32_t The amount of free heap memory in bytes.
+ */
 uint32_t MemGet::getFreeHeap()
 {
 #ifdef ARCH_ESP32
@@ -15,6 +28,10 @@ uint32_t MemGet::getFreeHeap()
 #endif
 }

+/**
+ * Returns the size of the heap memory in bytes.
+ * @return uint32_t The size of the heap memory in bytes.
+ */
 uint32_t MemGet::getHeapSize()
 {
 #ifdef ARCH_ESP32
@@ -27,6 +44,11 @@ uint32_t MemGet::getHeapSize()
 #endif
 }

+/**
+ * Returns the amount of free psram memory in bytes.
+ *
+ * @return The amount of free psram memory in bytes.
+ */
 uint32_t MemGet::getFreePsram()
 {
 #ifdef ARCH_ESP32
@@ -36,6 +58,11 @@ uint32_t MemGet::getFreePsram()
 #endif
 }

+/**
+ * @brief Returns the size of the PSRAM memory.
+ *
+ * @return uint32_t The size of the PSRAM memory.
+ */
 uint32_t MemGet::getPsramSize()
 {
 #ifdef ARCH_ESP32
@@ -43,4 +70,4 @@ uint32_t MemGet::getPsramSize()
 #else
    return 0;
 #endif
-}
+}
@@ -1,5 +1,6 @@
 #include "Channels.h"
 #include "CryptoEngine.h"
+#include "DisplayFormatters.h"
 #include "NodeDB.h"
 #include "configuration.h"

@@ -239,38 +240,9 @@ const char *Channels::getName(size_t chIndex)
    const char *channelName = channelSettings.name;
    if (!*channelName) { // emptystring
        // Per mesh.proto spec, if bandwidth is specified we must ignore modemPreset enum, we assume that in that case
-        // the app fucked up and forgot to set channelSettings.name
-
+        // the app effed up and forgot to set channelSettings.name
        if (config.lora.use_preset) {
-            switch (config.lora.modem_preset) {
-            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
-                channelName = "ShortSlow";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
-                channelName = "ShortFast";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
-                channelName = "MediumSlow";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
-                channelName = "MediumFast";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
-                channelName = "LongSlow";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
-                channelName = "LongFast";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
-                channelName = "LongMod";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
-                channelName = "VLongSlow";
-                break;
-            default:
-                channelName = "Invalid";
-                break;
-            }
+            channelName = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false);
        } else {
            channelName = "Custom";
        }
@@ -21,7 +21,7 @@ bool FloodingRouter::shouldFilterReceived(const meshtastic_MeshPacket *p)
 {
    if (wasSeenRecently(p)) { // Note: this will also add a recent packet record
        printPacket("Ignoring incoming msg, because we've already seen it", p);
-        if (config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER &&
+        if (!moduleConfig.mqtt.enabled && config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER &&
            config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER_CLIENT &&
            config.device.role != meshtastic_Config_DeviceConfig_Role_REPEATER) {
            // cancel rebroadcast of this message *if* there was already one, unless we're a router/repeater!
@@ -49,10 +49,13 @@ void FloodingRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas

                tosend->hop_limit--; // bump down the hop count

-                // If it is a traceRoute request, update the route that it went via me
-                if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag && traceRouteModule &&
-                    traceRouteModule->wantPacket(p)) {
-                    traceRouteModule->updateRoute(tosend);
+                if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
+                    // If it is a traceRoute request, update the route that it went via me
+                    if (traceRouteModule && traceRouteModule->wantPacket(p))
+                        traceRouteModule->updateRoute(tosend);
+                    // If it is a neighborInfo packet, update last_sent_by_id
+                    if (neighborInfoModule && neighborInfoModule->wantPacket(p))
+                        neighborInfoModule->updateLastSentById(tosend);
                }

                LOG_INFO("Rebroadcasting received floodmsg to neighbors\n");
@@ -2,6 +2,7 @@

 #include "PacketHistory.h"
 #include "Router.h"
+#include "modules/NeighborInfoModule.h"
 #include "modules/TraceRouteModule.h"

 /**
@@ -57,4 +58,4 @@ class FloodingRouter : public Router, protected PacketHistory
     * Look for broadcasts we need to rebroadcast
     */
    virtual void sniffReceived(const meshtastic_MeshPacket *p, const meshtastic_Routing *c) override;
-};
+};
@@ -82,8 +82,13 @@ int MeshService::handleFromRadio(const meshtastic_MeshPacket *mp)
    powerFSM.trigger(EVENT_PACKET_FOR_PHONE); // Possibly keep the node from sleeping

    nodeDB.updateFrom(*mp); // update our DB state based off sniffing every RX packet from the radio
-    if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag && !nodeDB.getMeshNode(mp->from)->has_user &&
-        nodeInfoModule) {
+    if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag &&
+        mp->decoded.portnum == meshtastic_PortNum_TELEMETRY_APP && mp->decoded.request_id > 0) {
+        LOG_DEBUG(
+            "Received telemetry response. Skip sending our NodeInfo because this potentially a Repeater which will ignore our "
+            "request for its NodeInfo.\n");
+    } else if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag && !nodeDB.getMeshNode(mp->from)->has_user &&
+               nodeInfoModule) {
        LOG_INFO("Heard a node on channel %d we don't know, sending NodeInfo and asking for a response.\n", mp->channel);
        nodeInfoModule->sendOurNodeInfo(mp->from, true, mp->channel);
    }
@@ -315,28 +320,26 @@ meshtastic_NodeInfoLite *MeshService::refreshLocalMeshNode()
 int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
 {
    // Update our local node info with our position (even if we don't decide to update anyone else)
-    meshtastic_NodeInfoLite *node = refreshLocalMeshNode();
+    const meshtastic_NodeInfoLite *node = refreshLocalMeshNode();
    meshtastic_Position pos = meshtastic_Position_init_default;

    if (newStatus->getHasLock()) {
        // load data from GPS object, will add timestamp + battery further down
        pos = gps->p;
    } else {
-        // The GPS has lost lock, if we are fixed position we should just keep using
-        // the old position
+        // The GPS has lost lock
 #ifdef GPS_EXTRAVERBOSE
        LOG_DEBUG("onGPSchanged() - lost validLocation\n");
 #endif
-        if (config.position.fixed_position) {
-            LOG_WARN("Using fixed position\n");
-            pos = ConvertToPosition(node->position);
-        }
+    }
+    // Used fixed position if configured regalrdless of GPS lock
+    if (config.position.fixed_position) {
+        LOG_WARN("Using fixed position\n");
+        pos = TypeConversions::ConvertToPosition(node->position);
    }

-    // Finally add a fresh timestamp and battery level reading
-    // I KNOW this is redundant with refreshLocalMeshNode() above, but these are
-    //   inexpensive nonblocking calls and can be refactored in due course
-    pos.time = getValidTime(RTCQualityGPS);
+    // Add a fresh timestamp
+    pos.time = getValidTime(RTCQualityFromNet);

    // In debug logs, identify position by @timestamp:stage (stage 4 = nodeDB)
    LOG_DEBUG("onGPSChanged() pos@%x, time=%u, lat=%d, lon=%d, alt=%d\n", pos.timestamp, pos.time, pos.latitude_i,
@@ -48,6 +48,14 @@ class MeshService
    uint32_t oldFromNum = 0;

  public:
+    static bool isTextPayload(const meshtastic_MeshPacket *p)
+    {
+        if (moduleConfig.range_test.enabled && p->decoded.portnum == meshtastic_PortNum_RANGE_TEST_APP) {
+            return true;
+        }
+        return p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP ||
+               p->decoded.portnum == meshtastic_PortNum_DETECTION_SENSOR_APP;
+    }
    /// Called when some new packets have arrived from one of the radios
    Observable<uint32_t> fromNumChanged;

@@ -15,6 +15,7 @@
 #include "error.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
+#include "modules/NeighborInfoModule.h"
 #include <ErriezCRC32.h>
 #include <pb_decode.h>
 #include <pb_encode.h>
@@ -63,11 +64,7 @@ uint32_t error_address = 0;

 static uint8_t ourMacAddr[6];

-NodeDB::NodeDB()
-    : nodes(devicestate.node_db), numNodes(&devicestate.node_db_count), meshNodes(devicestate.node_db_lite),
-      numMeshNodes(&devicestate.node_db_lite_count)
-{
-}
+NodeDB::NodeDB() : meshNodes(devicestate.node_db_lite), numMeshNodes(&devicestate.node_db_lite_count) {}

 /**
 * Most (but not always) of the time we want to treat packets 'from' the local phone (where from == 0), as if they originated on
@@ -109,7 +106,6 @@ bool NodeDB::resetRadioConfig(bool factory_reset)
        config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_TW;

        // Enter super deep sleep soon and stay there not very long
-        // radioConfig.preferences.mesh_sds_timeout_secs = 10;
        // radioConfig.preferences.sds_secs = 60;
    }

@@ -166,13 +162,21 @@ void NodeDB::installDefaultConfig()
    config.has_bluetooth = true;
    config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_ALL;

-    config.lora.sx126x_rx_boosted_gain = false;
+    config.lora.sx126x_rx_boosted_gain = true;
    config.lora.tx_enabled =
        true; // FIXME: maybe false in the future, and setting region to enable it. (unset region forces it off)
    config.lora.override_duty_cycle = false;
    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
    config.lora.hop_limit = HOP_RELIABLE;
+#ifdef PIN_GPS_EN
+    config.position.gps_en_gpio = PIN_GPS_EN;
+#endif
+#ifdef GPS_POWER_TOGGLE
+    config.device.disable_triple_click = false;
+#else
+    config.device.disable_triple_click = true;
+#endif
    config.position.gps_enabled = true;
    config.position.position_broadcast_smart_enabled = true;
    config.position.broadcast_smart_minimum_distance = 100;
@@ -194,7 +198,9 @@ void NodeDB::installDefaultConfig()
                                      : meshtastic_Config_BluetoothConfig_PairingMode_FIXED_PIN;
    // for backward compat, default position flags are ALT+MSL
    config.position.position_flags =
-        (meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE | meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE_MSL);
+        (meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE | meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE_MSL |
+         meshtastic_Config_PositionConfig_PositionFlags_SPEED | meshtastic_Config_PositionConfig_PositionFlags_HEADING |
+         meshtastic_Config_PositionConfig_PositionFlags_DOP);

 #ifdef T_WATCH_S3
    config.display.screen_on_secs = 30;
@@ -211,7 +217,6 @@ void NodeDB::initConfigIntervals()
    config.position.position_broadcast_secs = default_broadcast_interval_secs;

    config.power.ls_secs = default_ls_secs;
-    config.power.mesh_sds_timeout_secs = default_mesh_sds_timeout_secs;
    config.power.min_wake_secs = default_min_wake_secs;
    config.power.sds_secs = default_sds_secs;
    config.power.wait_bluetooth_secs = default_wait_bluetooth_secs;
@@ -249,6 +254,23 @@ void NodeDB::installDefaultModuleConfig()
    strncpy(moduleConfig.mqtt.address, default_mqtt_address, sizeof(moduleConfig.mqtt.address));
    strncpy(moduleConfig.mqtt.username, default_mqtt_username, sizeof(moduleConfig.mqtt.username));
    strncpy(moduleConfig.mqtt.password, default_mqtt_password, sizeof(moduleConfig.mqtt.password));
+    strncpy(moduleConfig.mqtt.root, default_mqtt_root, sizeof(moduleConfig.mqtt.root));
+    moduleConfig.mqtt.encryption_enabled = true;
+
+    moduleConfig.has_neighbor_info = true;
+    moduleConfig.neighbor_info.enabled = false;
+
+    moduleConfig.has_detection_sensor = true;
+    moduleConfig.detection_sensor.enabled = false;
+    moduleConfig.detection_sensor.detection_triggered_high = true;
+    moduleConfig.detection_sensor.minimum_broadcast_secs = 45;
+
+    moduleConfig.has_ambient_lighting = true;
+    moduleConfig.ambient_lighting.current = 10;
+    // Default to a color based on our node number
+    moduleConfig.ambient_lighting.red = (myNodeInfo.my_node_num & 0xFF0000) >> 16;
+    moduleConfig.ambient_lighting.green = (myNodeInfo.my_node_num & 0x00FF00) >> 8;
+    moduleConfig.ambient_lighting.blue = myNodeInfo.my_node_num & 0x0000FF;

    initModuleConfigIntervals();
 }
@@ -265,6 +287,15 @@ void NodeDB::installRoleDefaults(meshtastic_Config_DeviceConfig_Role role)
    } else if (role == meshtastic_Config_DeviceConfig_Role_SENSOR) {
        moduleConfig.telemetry.environment_measurement_enabled = true;
        moduleConfig.telemetry.environment_update_interval = 300;
+    } else if (role == meshtastic_Config_DeviceConfig_Role_TAK) {
+        config.device.node_info_broadcast_secs = ONE_DAY;
+        config.position.position_broadcast_smart_enabled = false;
+        config.position.position_broadcast_secs = ONE_DAY;
+        // Remove Altitude MSL from flags since CoTs use HAE (height above ellipsoid)
+        config.position.position_flags =
+            (meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE | meshtastic_Config_PositionConfig_PositionFlags_SPEED |
+             meshtastic_Config_PositionConfig_PositionFlags_HEADING | meshtastic_Config_PositionConfig_PositionFlags_DOP);
+        moduleConfig.telemetry.device_update_interval = ONE_DAY;
    }
 }

@@ -273,6 +304,7 @@ void NodeDB::initModuleConfigIntervals()
    moduleConfig.telemetry.device_update_interval = default_broadcast_interval_secs;
    moduleConfig.telemetry.environment_update_interval = default_broadcast_interval_secs;
    moduleConfig.telemetry.air_quality_interval = default_broadcast_interval_secs;
+    moduleConfig.neighbor_info.update_interval = default_broadcast_interval_secs;
 }

 void NodeDB::installDefaultChannels()
@@ -284,12 +316,24 @@ void NodeDB::installDefaultChannels()

 void NodeDB::resetNodes()
 {
-    devicestate.node_db_count = 0;
-    memset(devicestate.node_db, 0, sizeof(devicestate.node_db));
-
    devicestate.node_db_lite_count = 0;
    memset(devicestate.node_db_lite, 0, sizeof(devicestate.node_db_lite));
    saveDeviceStateToDisk();
+    if (neighborInfoModule && moduleConfig.neighbor_info.enabled)
+        neighborInfoModule->resetNeighbors();
+}
+
+void NodeDB::cleanupMeshDB()
+{
+    int newPos = 0, removed = 0;
+    for (int i = 0; i < *numMeshNodes; i++) {
+        if (meshNodes[i].has_user)
+            meshNodes[newPos++] = meshNodes[i];
+        else
+            removed++;
+    }
+    *numMeshNodes -= removed;
+    LOG_DEBUG("cleanupMeshDB purged %d entries\n", removed);
 }

 void NodeDB::installDefaultDeviceState()
@@ -297,12 +341,11 @@ void NodeDB::installDefaultDeviceState()
    LOG_INFO("Installing default DeviceState\n");
    memset(&devicestate, 0, sizeof(meshtastic_DeviceState));

-    *numNodes = 0;
+    *numMeshNodes = 0;

    // init our devicestate with valid flags so protobuf writing/reading will work
    devicestate.has_my_node = true;
    devicestate.has_owner = true;
-    devicestate.node_db_count = 0;
    devicestate.node_db_lite_count = 0;
    devicestate.version = DEVICESTATE_CUR_VER;
    devicestate.receive_queue_count = 0; // Not yet implemented FIXME
@@ -322,6 +365,7 @@ void NodeDB::init()
 {
    LOG_INFO("Initializing NodeDB\n");
    loadFromDisk();
+    cleanupMeshDB();

    uint32_t devicestateCRC = crc32Buffer(&devicestate, sizeof(devicestate));
    uint32_t configCRC = crc32Buffer(&config, sizeof(config));
@@ -330,11 +374,9 @@ void NodeDB::init()
    int saveWhat = 0;

    // likewise - we always want the app requirements to come from the running appload
-    myNodeInfo.min_app_version = 20300;         // format is Mmmss (where M is 1+the numeric major number. i.e. 20120 means 1.1.20
-    myNodeInfo.max_channels = MAX_NUM_CHANNELS; // tell others the max # of channels we can understand
+    myNodeInfo.min_app_version = 30200; // format is Mmmss (where M is 1+the numeric major number. i.e. 30200 means 2.2.00
    // Note! We do this after loading saved settings, so that if somehow an invalid nodenum was stored in preferences we won't
    // keep using that nodenum forever. Crummy guess at our nodenum (but we will check against the nodedb to avoid conflicts)
-    strncpy(myNodeInfo.firmware_version, optstr(APP_VERSION), sizeof(myNodeInfo.firmware_version));
    pickNewNodeNum();

    // Set our board type so we can share it with others
@@ -345,19 +387,6 @@ void NodeDB::init()
    info->user = owner;
    info->has_user = true;

-    if (*numNodes > 0) {
-        LOG_DEBUG("Legacy NodeDB detected... Migrating to NodeDBLite\n");
-        uint32_t readIndex = 0;
-        const meshtastic_NodeInfo *oldNodeInfo = nodeDB.readNextNodeInfo(readIndex);
-        while (oldNodeInfo != NULL) {
-            migrateToNodeInfoLite(oldNodeInfo);
-            oldNodeInfo = nodeDB.readNextNodeInfo(readIndex);
-        }
-        LOG_DEBUG("Migration complete! Clearing out legacy NodeDB...\n");
-        devicestate.node_db_count = 0;
-        memset(devicestate.node_db, 0, sizeof(devicestate.node_db));
-    }
-
 #ifdef ARCH_ESP32
    Preferences preferences;
    preferences.begin("meshtastic", false);
@@ -367,7 +396,7 @@ void NodeDB::init()
 #endif

    resetRadioConfig(); // If bogus settings got saved, then fix them
-    LOG_DEBUG("region=%d, NODENUM=0x%x, dbsize=%d\n", config.lora.region, myNodeInfo.my_node_num, *numNodes);
+    LOG_DEBUG("region=%d, NODENUM=0x%x, dbsize=%d\n", config.lora.region, myNodeInfo.my_node_num, *numMeshNodes);

    if (devicestateCRC != crc32Buffer(&devicestate, sizeof(devicestate)))
        saveWhat |= SEGMENT_DEVICESTATE;
@@ -392,25 +421,20 @@ void NodeDB::init()
 */
 void NodeDB::pickNewNodeNum()
 {
-    NodeNum r = myNodeInfo.my_node_num;
-
    getMacAddr(ourMacAddr); // Make sure ourMacAddr is set

    // Pick an initial nodenum based on the macaddr
-    r = (ourMacAddr[2] << 24) | (ourMacAddr[3] << 16) | (ourMacAddr[4] << 8) | ourMacAddr[5];
-
-    if (r == NODENUM_BROADCAST || r < NUM_RESERVED)
-        r = NUM_RESERVED; // don't pick a reserved node number
+    NodeNum nodeNum = (ourMacAddr[2] << 24) | (ourMacAddr[3] << 16) | (ourMacAddr[4] << 8) | ourMacAddr[5];

    meshtastic_NodeInfoLite *found;
-    while ((found = getMeshNode(r)) && memcmp(found->user.macaddr, owner.macaddr, sizeof(owner.macaddr))) {
-        // FIXME: input for random() is int, so NODENUM_BROADCAST becomes -1
-        NodeNum n = random(NUM_RESERVED, NODENUM_BROADCAST); // try a new random choice
-        LOG_WARN("NOTE! Our desired nodenum 0x%x is in use, so trying for 0x%x\n", r, n);
-        r = n;
+    while ((nodeNum == NODENUM_BROADCAST || nodeNum < NUM_RESERVED) ||
+           ((found = getMeshNode(nodeNum)) && memcmp(found->user.macaddr, owner.macaddr, sizeof(owner.macaddr)) != 0)) {
+        NodeNum candidate = random(NUM_RESERVED, LONG_MAX); // try a new random choice
+        LOG_WARN("NOTE! Our desired nodenum 0x%x is invalid or in use, so trying for 0x%x\n", nodeNum, candidate);
+        nodeNum = candidate;
    }

-    myNodeInfo.my_node_num = r;
+    myNodeInfo.my_node_num = nodeNum;
 }

 static const char *prefFileName = "/prefs/db.proto";
@@ -613,14 +637,6 @@ void NodeDB::saveToDisk(int saveWhat)
    }
 }

-const meshtastic_NodeInfo *NodeDB::readNextNodeInfo(uint32_t &readIndex)
-{
-    if (readIndex < *numNodes)
-        return &nodes[readIndex++];
-    else
-        return NULL;
-}
-
 const meshtastic_NodeInfoLite *NodeDB::readNextMeshNode(uint32_t &readIndex)
 {
    if (readIndex < *numMeshNodes)
@@ -682,8 +698,8 @@ void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSou
        LOG_INFO("updatePosition LOCAL pos@%x, time=%u, latI=%d, lonI=%d, alt=%d\n", p.timestamp, p.time, p.latitude_i,
                 p.longitude_i, p.altitude);

-        info->position = ConvertToPositionLite(p);
-        localPosition = p;
+        setLocalPosition(p);
+        info->position = TypeConversions::ConvertToPositionLite(p);
    } else if ((p.time > 0) && !p.latitude_i && !p.longitude_i && !p.timestamp && !p.location_source) {
        // FIXME SPECIAL TIME SETTING PACKET FROM EUD TO RADIO
        // (stop-gap fix for issue #900)
@@ -701,7 +717,7 @@ void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSou
        uint32_t tmp_time = info->position.time;

        // Next, update atomically
-        info->position = ConvertToPositionLite(p);
+        info->position = TypeConversions::ConvertToPositionLite(p);

        // Last, restore any fields that may have been overwritten
        if (!info->position.time)
@@ -791,24 +807,13 @@ void NodeDB::updateFrom(const meshtastic_MeshPacket &mp)

 uint8_t NodeDB::getMeshNodeChannel(NodeNum n)
 {
-    meshtastic_NodeInfoLite *info = getMeshNode(n);
+    const meshtastic_NodeInfoLite *info = getMeshNode(n);
    if (!info) {
        return 0; // defaults to PRIMARY
    }
    return info->channel;
 }

-/// Find a node in our DB, return null for missing
-/// NOTE: This function might be called from an ISR
-meshtastic_NodeInfo *NodeDB::getNodeInfo(NodeNum n)
-{
-    for (int i = 0; i < *numNodes; i++)
-        if (nodes[i].num == n)
-            return &nodes[i];
-
-    return NULL;
-}
-
 /// Find a node in our DB, return null for missing
 /// NOTE: This function might be called from an ISR
 meshtastic_NodeInfoLite *NodeDB::getMeshNode(NodeNum n)
@@ -827,7 +832,8 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)

    if (!lite) {
        if ((*numMeshNodes >= MAX_NUM_NODES) || (memGet.getFreeHeap() < meshtastic_NodeInfoLite_size * 3)) {
-            screen->print("warning: node_db_lite full! erasing oldest entry\n");
+            if (screen)
+                screen->print("warning: node_db_lite full! erasing oldest entry\n");
            // look for oldest node and erase it
            uint32_t oldest = UINT32_MAX;
            int oldestIndex = -1;
@@ -854,57 +860,6 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
    return lite;
 }

-void NodeDB::migrateToNodeInfoLite(const meshtastic_NodeInfo *node)
-{
-    meshtastic_NodeInfoLite *lite = getMeshNode(node->num);
-
-    if (!lite) {
-        if ((*numMeshNodes >= MAX_NUM_NODES) || (memGet.getFreeHeap() < meshtastic_NodeInfoLite_size * 3)) {
-            screen->print("warning: node_db_lite full! erasing oldest entry\n");
-            // look for oldest node and erase it
-            uint32_t oldest = UINT32_MAX;
-            int oldestIndex = -1;
-            for (int i = 0; i < *numMeshNodes; i++) {
-                if (meshNodes[i].last_heard < oldest) {
-                    oldest = meshNodes[i].last_heard;
-                    oldestIndex = i;
-                }
-            }
-            // Shove the remaining nodes down the chain
-            for (int i = oldestIndex; i < *numMeshNodes - 1; i++) {
-                meshNodes[i] = meshNodes[i + 1];
-            }
-            (*numMeshNodes)--;
-        }
-        // add the node at the end
-        lite = &meshNodes[(*numMeshNodes)++];
-
-        // everything is missing except the nodenum
-        memset(lite, 0, sizeof(*lite));
-        lite->num = node->num;
-        lite->snr = node->snr;
-        lite->last_heard = node->last_heard;
-        lite->channel = node->channel;
-
-        if (node->has_position) {
-            lite->has_position = true;
-            lite->position.latitude_i = node->position.latitude_i;
-            lite->position.longitude_i = node->position.longitude_i;
-            lite->position.altitude = node->position.altitude;
-            lite->position.location_source = node->position.location_source;
-            lite->position.time = node->position.time;
-        }
-        if (node->has_user) {
-            lite->has_user = true;
-            lite->user = node->user;
-        }
-        if (node->has_device_metrics) {
-            lite->has_device_metrics = true;
-            lite->device_metrics = node->device_metrics;
-        }
-    }
-}
-
 /// Record an error that should be reported via analytics
 void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, const char *filename)
 {
@@ -19,7 +19,7 @@ DeviceState versions used to be defined in the .proto file but really only this
 #define SEGMENT_DEVICESTATE 4
 #define SEGMENT_CHANNELS 8

-#define DEVICESTATE_CUR_VER 20
+#define DEVICESTATE_CUR_VER 22
 #define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER

 extern meshtastic_DeviceState devicestate;
@@ -45,9 +45,6 @@ class NodeDB
    // Eventually use a smarter datastructure
    // HashMap<NodeNum, NodeInfo> nodes;
    // Note: these two references just point into our static array we serialize to/from disk
-    meshtastic_NodeInfo *nodes;
-    pb_size_t *numNodes;
-
    meshtastic_NodeInfoLite *meshNodes;
    pb_size_t *numMeshNodes;

@@ -134,21 +131,16 @@ class NodeDB
    meshtastic_NodeInfoLite *getMeshNode(NodeNum n);
    size_t getNumMeshNodes() { return *numMeshNodes; }

+    void setLocalPosition(meshtastic_Position position)
+    {
+        LOG_DEBUG("Setting local position: latitude=%i, longitude=%i, time=%i\n", position.latitude_i, position.longitude_i,
+                  position.time);
+        localPosition = position;
+    }
+
  private:
    /// Find a node in our DB, create an empty NodeInfoLite if missing
    meshtastic_NodeInfoLite *getOrCreateMeshNode(NodeNum n);
-    void migrateToNodeInfoLite(const meshtastic_NodeInfo *node);
-    /// Find a node in our DB, return null for missing
-    meshtastic_NodeInfo *getNodeInfo(NodeNum n);
-    /// Allow the bluetooth layer to read our next nodeinfo record, or NULL if done reading
-    const meshtastic_NodeInfo *readNextNodeInfo(uint32_t &readIndex);
-    size_t getNumNodes() { return *numNodes; }
-
-    meshtastic_NodeInfo *getNodeByIndex(size_t x)
-    {
-        assert(x < *numNodes);
-        return &nodes[x];
-    }

    /// Notify observers of changes to the DB
    void notifyObservers(bool forceUpdate = false)
@@ -161,6 +153,9 @@ class NodeDB
    /// read our db from flash
    void loadFromDisk();

+    /// purge db entries without user info
+    void cleanupMeshDB();
+
    /// Reinit device state from scratch (not loading from disk)
    void installDefaultDeviceState(), installDefaultChannels(), installDefaultConfig(), installDefaultModuleConfig();
 };
@@ -174,7 +169,6 @@ extern NodeDB nodeDB;

        # prefs.position_broadcast_secs = FIXME possibly broadcast only once an hr
        prefs.wait_bluetooth_secs = 1  # Don't stay in bluetooth mode
-        prefs.mesh_sds_timeout_secs = never
        # try to stay in light sleep one full day, then briefly wake and sleep again

        prefs.ls_secs = oneday
@@ -202,15 +196,15 @@ extern NodeDB nodeDB;
 #define default_gps_update_interval IF_ROUTER(ONE_DAY, 2 * 60)
 #define default_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 15 * 60)
 #define default_wait_bluetooth_secs IF_ROUTER(1, 60)
-#define default_mesh_sds_timeout_secs IF_ROUTER(NODE_DELAY_FOREVER, 2 * 60 * 60)
 #define default_sds_secs IF_ROUTER(ONE_DAY, UINT32_MAX) // Default to forever super deep sleep
 #define default_ls_secs IF_ROUTER(ONE_DAY, 5 * 60)
 #define default_min_wake_secs 10
-#define default_screen_on_secs 60 * 10
+#define default_screen_on_secs IF_ROUTER(1, 60 * 10)

 #define default_mqtt_address "mqtt.meshtastic.org"
 #define default_mqtt_username "meshdev"
 #define default_mqtt_password "large4cats"
+#define default_mqtt_root "msh"

 inline uint32_t getConfiguredOrDefaultMs(uint32_t configuredInterval)
 {
@@ -226,12 +220,16 @@ inline uint32_t getConfiguredOrDefaultMs(uint32_t configuredInterval, uint32_t d
    return defaultInterval * 1000;
 }

+inline uint32_t getConfiguredOrDefault(uint32_t configured, uint32_t defaultValue)
+{
+    if (configured > 0)
+        return configured;
+
+    return defaultValue;
+}
+
 /// Sometimes we will have Position objects that only have a time, so check for
 /// valid lat/lon
-static inline bool hasValidPosition(const meshtastic_NodeInfo *n)
-{
-    return n->has_position && (n->position.latitude_i != 0 || n->position.longitude_i != 0);
-}
 static inline bool hasValidPosition(const meshtastic_NodeInfoLite *n)
 {
    return n->has_position && (n->position.latitude_i != 0 || n->position.longitude_i != 0);
@@ -155,11 +155,18 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
        // app not to send locations on our behalf.
        fromRadioScratch.which_payload_variant = meshtastic_FromRadio_my_info_tag;
        fromRadioScratch.my_info = myNodeInfo;
-        state = STATE_SEND_NODEINFO;
+        state = STATE_SEND_METADATA;

        service.refreshLocalMeshNode(); // Update my NodeInfo because the client will be asking for it soon.
        break;

+    case STATE_SEND_METADATA:
+        LOG_INFO("getFromRadio=STATE_SEND_METADATA\n");
+        fromRadioScratch.which_payload_variant = meshtastic_FromRadio_metadata_tag;
+        fromRadioScratch.metadata = getDeviceMetadata();
+        state = STATE_SEND_NODEINFO;
+        break;
+
    case STATE_SEND_NODEINFO: {
        LOG_INFO("getFromRadio=STATE_SEND_NODEINFO\n");

@@ -279,6 +286,14 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
            fromRadioScratch.moduleConfig.which_payload_variant = meshtastic_ModuleConfig_remote_hardware_tag;
            fromRadioScratch.moduleConfig.payload_variant.remote_hardware = moduleConfig.remote_hardware;
            break;
+        case meshtastic_ModuleConfig_neighbor_info_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = meshtastic_ModuleConfig_neighbor_info_tag;
+            fromRadioScratch.moduleConfig.payload_variant.neighbor_info = moduleConfig.neighbor_info;
+            break;
+        case meshtastic_ModuleConfig_detection_sensor_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = meshtastic_ModuleConfig_detection_sensor_tag;
+            fromRadioScratch.moduleConfig.payload_variant.detection_sensor = moduleConfig.detection_sensor;
+            break;
        default:
            LOG_ERROR("Unknown module config type %d\n", config_state);
        }
@@ -286,15 +301,11 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
        config_state++;
        // Advance when we have sent all of our ModuleConfig objects
        if (config_state > (_meshtastic_AdminMessage_ModuleConfigType_MAX + 1)) {
-            state = STATE_SEND_METADATA;
+            state = STATE_SEND_COMPLETE_ID;
            config_state = 0;
        }
        break;
-    case STATE_SEND_METADATA:
-        fromRadioScratch.which_payload_variant = meshtastic_FromRadio_metadata_tag;
-        fromRadioScratch.metadata = getDeviceMetadata();
-        state = STATE_SEND_COMPLETE_ID;
-        break;
+
    case STATE_SEND_COMPLETE_ID:
        LOG_INFO("getFromRadio=STATE_SEND_COMPLETE_ID\n");
        fromRadioScratch.which_payload_variant = meshtastic_FromRadio_config_complete_id_tag;
@@ -394,7 +405,7 @@ bool PhoneAPI::available()
        if (nodeInfoForPhone.num == 0) {
            auto nextNode = nodeDB.readNextMeshNode(readIndex);
            if (nextNode) {
-                nodeInfoForPhone = ConvertToNodeInfo(nextNode);
+                nodeInfoForPhone = TypeConversions::ConvertToNodeInfo(nextNode);
            }
        }
        return true; // Always say we have something, because we might need to advance our state machine
@@ -534,8 +534,8 @@ size_t RadioInterface::beginSending(meshtastic_MeshPacket *p)
    h->id = p->id;
    h->channel = p->channel;
    if (p->hop_limit > HOP_MAX) {
-        LOG_WARN("hop limit %d is too high, setting to %d\n", p->hop_limit, HOP_MAX);
-        p->hop_limit = HOP_MAX;
+        LOG_WARN("hop limit %d is too high, setting to %d\n", p->hop_limit, HOP_RELIABLE);
+        p->hop_limit = HOP_RELIABLE;
    }
    h->flags = p->hop_limit | (p->want_ack ? PACKET_FLAGS_WANT_ACK_MASK : 0);

@@ -153,7 +153,12 @@ void Router::setReceivedMessage()

 meshtastic_QueueStatus Router::getQueueStatus()
 {
-    return iface->getQueueStatus();
+    if (!iface) {
+        meshtastic_QueueStatus qs;
+        qs.res = qs.mesh_packet_id = qs.free = qs.maxlen = 0;
+        return qs;
+    } else
+        return iface->getQueueStatus();
 }

 ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
@@ -244,29 +249,12 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
    if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
        ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it

-        bool shouldActuallyEncrypt = true;
-
        if (moduleConfig.mqtt.enabled) {
-            // check if we should send decrypted packets to mqtt

-            // truth table:
-            /* mqtt_server  mqtt_encryption_enabled should_encrypt
-             *    not set                        0              1
-             *    not set                        1              1
-             *        set                        0              0
-             *        set                        1              1
-             *
-             * => so we only decrypt mqtt if they have a custom mqtt server AND mqtt_encryption_enabled is FALSE
-             */
-
-            if (*moduleConfig.mqtt.address && !moduleConfig.mqtt.encryption_enabled) {
-                shouldActuallyEncrypt = false;
-            }
-
-            LOG_INFO("Should encrypt MQTT?: %d\n", shouldActuallyEncrypt);
+            LOG_INFO("Should encrypt MQTT?: %d\n", moduleConfig.mqtt.encryption_enabled);

            // the packet is currently in a decrypted state.  send it now if they want decrypted packets
-            if (mqtt && !shouldActuallyEncrypt)
+            if (mqtt && !moduleConfig.mqtt.encryption_enabled)
                mqtt->onSend(*p, chIndex);
        }

@@ -279,7 +267,7 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
        if (moduleConfig.mqtt.enabled) {
            // the packet is now encrypted.
            // check if we should send encrypted packets to mqtt
-            if (mqtt && shouldActuallyEncrypt)
+            if (mqtt && moduleConfig.mqtt.encryption_enabled)
                mqtt->onSend(*p, chIndex);
        }
    }
@@ -3,7 +3,8 @@
 #include "error.h"
 #include "mesh/NodeDB.h"

-// Particular boards might define a different max power based on what their hardware can do
+// Particular boards might define a different max power based on what their hardware can do, default to max power output if not
+// specified (may be dangerous if using external PA and SX126x power config forgotten)
 #ifndef SX126X_MAX_POWER
 #define SX126X_MAX_POWER 22
 #endif
@@ -26,20 +27,23 @@ template <typename T> bool SX126xInterface<T>::init()
    pinMode(SX126X_POWER_EN, OUTPUT);
 #endif

-#ifndef SX126X_E22
-    float tcxoVoltage = 0; // None - we use an XTAL
+// FIXME: correct logic to default to not using TCXO if no voltage is specified for SX126X_DIO3_TCXO_VOLTAGE
+#if !defined(SX126X_DIO3_TCXO_VOLTAGE)
+    float tcxoVoltage =
+        0; // "TCXO reference voltage to be set on DIO3. Defaults to 1.6 V, set to 0 to skip." per
+           // https://github.com/jgromes/RadioLib/blob/690a050ebb46e6097c5d00c371e961c1caa3b52e/src/modules/SX126x/SX126x.h#L471C26-L471C104
+    // (DIO3 is free to be used as an IRQ)
+    LOG_DEBUG("SX126X_DIO3_TCXO_VOLTAGE not defined, not using DIO3 as TCXO reference voltage\n");
 #else
-    // Use DIO3 to power tcxo per https://github.com/jgromes/RadioLib/issues/12#issuecomment-520695575
-    float tcxoVoltage = 1.8;
+    float tcxoVoltage = SX126X_DIO3_TCXO_VOLTAGE;
+    LOG_DEBUG("SX126X_DIO3_TCXO_VOLTAGE defined, using DIO3 as TCXO reference voltage at %f V\n", SX126X_DIO3_TCXO_VOLTAGE);
+    // (DIO3 is not free to be used as an IRQ)
 #endif
+    // FIXME: May want to set depending on a definition, currently all SX126x variant files use the DC-DC regulator option
    bool useRegulatorLDO = false; // Seems to depend on the connection to pin 9/DCC_SW - if an inductor DCDC?

    RadioLibInterface::init();
-
-    if (power == 0)
-        power = SX126X_MAX_POWER;
-
-    if (power > SX126X_MAX_POWER) // This chip has lower power limits than some
+    if (power > SX126X_MAX_POWER) // Clamp power to maximum defined level
        power = SX126X_MAX_POWER;

    limitPower();
@@ -54,49 +58,50 @@ template <typename T> bool SX126xInterface<T>::init()
    LOG_INFO("Bandwidth set to %f\n", bw);
    LOG_INFO("Power output set to %d\n", power);

-    // current limit was removed from module' ctor
-    // override default value (60 mA)
+    // Overriding current limit
+    // (https://github.com/jgromes/RadioLib/blob/690a050ebb46e6097c5d00c371e961c1caa3b52e/src/modules/SX126x/SX126x.cpp#L85) using
+    // value in SX126xInterface.h (currently 140 mA) It may or may not be neccessary, depending on how RadioLib functions, from
+    // SX1261/2 datasheet: OCP after setting DeviceSel with SetPaConfig(): SX1261 - 60 mA, SX1262 - 140 mA For the SX1268 the IC
+    // defaults to 140mA no matter the set power level, but RadioLib set it lower, this would need further checking Default values
+    // are: SX1262, SX1268: 0x38 (140 mA), SX1261: 0x18 (60 mA)
+    // FIXME: Not ideal to increase SX1261 current limit above 60mA as it can only transmit max 15dBm, should probably only do it
+    // if using SX1262 or SX1268
    res = lora.setCurrentLimit(currentLimit);
    LOG_DEBUG("Current limit set to %f\n", currentLimit);
    LOG_DEBUG("Current limit set result %d\n", res);

-#if defined(SX126X_E22)
-    // E22 Emulation explicitly requires DIO2 as RF switch, so set it to TRUE again for good measure. In case somebody defines
-    // SX126X_TX for an E22 Module
-    if (res == RADIOLIB_ERR_NONE) {
-        LOG_DEBUG("SX126X_E22 mode enabled. Setting DIO2 as RF Switch\n");
-        res = lora.setDio2AsRfSwitch(true);
-    }
+#ifdef SX126X_DIO2_AS_RF_SWITCH
+    LOG_DEBUG("Setting DIO2 as RF switch\n");
+    bool dio2AsRfSwitch = true;
+#else
+    LOG_DEBUG("Setting DIO2 as not RF switch\n");
+    bool dio2AsRfSwitch = false;
 #endif
+    if (res == RADIOLIB_ERR_NONE) {
+        res = lora.setDio2AsRfSwitch(dio2AsRfSwitch);
+    }

-#if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC)
-    // If SX126X_TXEN is connected to the MCU, we are manually controlling RX and TX.
-    // But lora.begin (called above) sets Dio2 as RF switch control, which is not true here, so set it back to false.
-    if (res == RADIOLIB_ERR_NONE) {
-        LOG_DEBUG("SX126X_TXEN pin defined. Setting RF Switch: RXEN=%i, TXEN=%i\n", SX126X_RXEN, SX126X_TXEN);
-        res = lora.setDio2AsRfSwitch(false);
-        lora.setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
-    }
-#elif defined(SX126X_RXEN) && (SX126X_RXEN != RADIOLIB_NC && defined(E22_TXEN_CONNECTED_TO_DIO2))
-    // Otherwise, if SX126X_RXEN is connected to the MCU, and E22_TXEN_CONNECTED_TO_DIO2 is defined, we are letting the
-    // E22 control RX and TX via DIO2. In this configuration, the E22's TXEN and DIO2 pins are connected to each other,
-    // but not to the MCU.
-    // However, we must still connect the E22's RXEN pin to the MCU, define SX126X_RXEN accordingly, and then call
-    // setRfSwitchPins, otherwise RX sensitivity (observed via RSSI) is greatly diminished.
-    LOG_DEBUG("SX126X_RXEN and E22_TXEN_CONNECTED_TO_DIO2 are defined; value of res: %d", res);
-    if (res == RADIOLIB_ERR_NONE) {
-        LOG_DEBUG("SX126X_TXEN is RADIOLIB_NC, but SX126X_RXEN and E22_TXEN_CONNECTED_TO_DIO2 are both defined; calling "
-                  "lora.setRfSwitchPins.");
-        lora.setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
-    }
+    // If a pin isn't defined, we set it to RADIOLIB_NC, it is safe to always do external RF switching with RADIOLIB_NC as it has
+    // no effect
+#ifndef SX126X_RXEN
+#define SX126X_RXEN RADIOLIB_NC
+    LOG_DEBUG("SX126X_RXEN not defined, defaulting to RADIOLIB_NC\n");
 #endif
+#ifndef SX126X_TXEN
+#define SX126X_TXEN RADIOLIB_NC
+    LOG_DEBUG("SX126X_TXEN not defined, defaulting to RADIOLIB_NC\n");
+#endif
+    if (res == RADIOLIB_ERR_NONE) {
+        LOG_DEBUG("Using MCU pin %i as RXEN and pin %i as TXEN to control RF switching\n", SX126X_RXEN, SX126X_TXEN);
+        lora.setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
+    }

    if (config.lora.sx126x_rx_boosted_gain) {
        uint16_t result = lora.setRxBoostedGainMode(true);
-        LOG_INFO("Set Rx Boosted Gain mode; result: %d\n", result);
+        LOG_INFO("Set RX gain to boosted mode; result: %d\n", result);
    } else {
        uint16_t result = lora.setRxBoostedGainMode(false);
-        LOG_INFO("Set Rx Power Saving Gain mode; result: %d\n", result);
+        LOG_INFO("Set RX gain to power saving mode (boosted mode off); result: %d\n", result);
    }

 #if 0
@@ -265,7 +270,7 @@ template <typename T> bool SX126xInterface<T>::isChannelActive()
 /** Could we send right now (i.e. either not actively receiving or transmitting)? */
 template <typename T> bool SX126xInterface<T>::isActivelyReceiving()
 {
-    // The IRQ status will be cleared when we start our read operation.  Check if we've started a header, but haven't yet
+    // The IRQ status will be cleared when we start our read operation. Check if we've started a header, but haven't yet
    // received and handled the interrupt for reading the packet/handling errors.

    uint16_t irq = lora.getIrqStatus();
@@ -296,7 +301,7 @@ template <typename T> bool SX126xInterface<T>::sleep()
 {
    // Not keeping config is busted - next time nrf52 board boots lora sending fails  tcxo related? - see datasheet
    // \todo Display actual typename of the adapter, not just `SX126x`
-    LOG_DEBUG("sx126x entering sleep mode (FIXME, don't keep config)\n");
+    LOG_DEBUG("SX126x entering sleep mode (FIXME, don't keep config)\n");
    setStandby(); // Stop any pending operations

    // turn off TCXO if it was powered
@@ -312,4 +317,4 @@ template <typename T> bool SX126xInterface<T>::sleep()
 #endif

    return true;
-}
+}
@@ -0,0 +1,55 @@
+#include "TypeConversions.h"
+#include "mesh/generated/meshtastic/deviceonly.pb.h"
+#include "mesh/generated/meshtastic/mesh.pb.h"
+
+meshtastic_NodeInfo TypeConversions::ConvertToNodeInfo(const meshtastic_NodeInfoLite *lite)
+{
+    meshtastic_NodeInfo info = meshtastic_NodeInfo_init_default;
+
+    info.num = lite->num;
+    info.snr = lite->snr;
+    info.last_heard = lite->last_heard;
+    info.channel = lite->channel;
+
+    if (lite->has_position) {
+        info.has_position = true;
+        info.position.latitude_i = lite->position.latitude_i;
+        info.position.longitude_i = lite->position.longitude_i;
+        info.position.altitude = lite->position.altitude;
+        info.position.location_source = lite->position.location_source;
+        info.position.time = lite->position.time;
+    }
+    if (lite->has_user) {
+        info.has_user = true;
+        info.user = lite->user;
+    }
+    if (lite->has_device_metrics) {
+        info.has_device_metrics = true;
+        info.device_metrics = lite->device_metrics;
+    }
+    return info;
+}
+
+meshtastic_PositionLite TypeConversions::ConvertToPositionLite(meshtastic_Position position)
+{
+    meshtastic_PositionLite lite = meshtastic_PositionLite_init_default;
+    lite.latitude_i = position.latitude_i;
+    lite.longitude_i = position.longitude_i;
+    lite.altitude = position.altitude;
+    lite.location_source = position.location_source;
+    lite.time = position.time;
+
+    return lite;
+}
+
+meshtastic_Position TypeConversions::ConvertToPosition(meshtastic_PositionLite lite)
+{
+    meshtastic_Position position = meshtastic_Position_init_default;
+    position.latitude_i = lite.latitude_i;
+    position.longitude_i = lite.longitude_i;
+    position.altitude = lite.altitude;
+    position.location_source = lite.location_source;
+    position.time = lite.time;
+
+    return position;
+}
@@ -1,54 +1,13 @@
 #include "mesh/generated/meshtastic/deviceonly.pb.h"
 #include "mesh/generated/meshtastic/mesh.pb.h"

-inline static meshtastic_NodeInfo ConvertToNodeInfo(const meshtastic_NodeInfoLite *lite)
+#pragma once
+#include "NodeDB.h"
+
+class TypeConversions
 {
-    meshtastic_NodeInfo info = meshtastic_NodeInfo_init_default;
-
-    info.num = lite->num;
-    info.snr = lite->snr;
-    info.last_heard = lite->last_heard;
-    info.channel = lite->channel;
-
-    if (lite->has_position) {
-        info.has_position = true;
-        info.position.latitude_i = lite->position.latitude_i;
-        info.position.longitude_i = lite->position.longitude_i;
-        info.position.altitude = lite->position.altitude;
-        info.position.location_source = lite->position.location_source;
-        info.position.time = lite->position.time;
-    }
-    if (lite->has_user) {
-        info.has_user = true;
-        info.user = lite->user;
-    }
-    if (lite->has_device_metrics) {
-        info.has_device_metrics = true;
-        info.device_metrics = lite->device_metrics;
-    }
-    return info;
-}
-
-inline static meshtastic_PositionLite ConvertToPositionLite(meshtastic_Position position)
-{
-    meshtastic_PositionLite lite = meshtastic_PositionLite_init_default;
-    lite.latitude_i = position.latitude_i;
-    lite.longitude_i = position.longitude_i;
-    lite.altitude = position.altitude;
-    lite.location_source = position.location_source;
-    lite.time = position.time;
-
-    return lite;
-}
-
-inline static meshtastic_Position ConvertToPosition(meshtastic_PositionLite lite)
-{
-    meshtastic_Position position = meshtastic_Position_init_default;
-    position.latitude_i = lite.latitude_i;
-    position.longitude_i = lite.longitude_i;
-    position.altitude = lite.altitude;
-    position.location_source = lite.location_source;
-    position.time = lite.time;
-
-    return position;
-}
+  public:
+    static meshtastic_NodeInfo ConvertToNodeInfo(const meshtastic_NodeInfoLite *lite);
+    static meshtastic_PositionLite ConvertToPositionLite(meshtastic_Position position);
+    static meshtastic_Position ConvertToPosition(meshtastic_PositionLite lite);
+};
@@ -53,7 +53,13 @@ typedef enum _meshtastic_AdminMessage_ModuleConfigType {
    /* TODO: REPLACE */
    meshtastic_AdminMessage_ModuleConfigType_AUDIO_CONFIG = 7,
    /* TODO: REPLACE */
-    meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG = 8
+    meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG = 8,
+    /* TODO: REPLACE */
+    meshtastic_AdminMessage_ModuleConfigType_NEIGHBORINFO_CONFIG = 9,
+    /* TODO: REPLACE */
+    meshtastic_AdminMessage_ModuleConfigType_AMBIENTLIGHTING_CONFIG = 10,
+    /* TODO: REPLACE */
+    meshtastic_AdminMessage_ModuleConfigType_DETECTIONSENSOR_CONFIG = 11
 } meshtastic_AdminMessage_ModuleConfigType;

 /* Struct definitions */
@@ -172,8 +178,8 @@ extern "C" {
 #define _meshtastic_AdminMessage_ConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ConfigType)(meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG+1))

 #define _meshtastic_AdminMessage_ModuleConfigType_MIN meshtastic_AdminMessage_ModuleConfigType_MQTT_CONFIG
-#define _meshtastic_AdminMessage_ModuleConfigType_MAX meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG
-#define _meshtastic_AdminMessage_ModuleConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ModuleConfigType)(meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG+1))
+#define _meshtastic_AdminMessage_ModuleConfigType_MAX meshtastic_AdminMessage_ModuleConfigType_DETECTIONSENSOR_CONFIG
+#define _meshtastic_AdminMessage_ModuleConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ModuleConfigType)(meshtastic_AdminMessage_ModuleConfigType_DETECTIONSENSOR_CONFIG+1))

 #define meshtastic_AdminMessage_payload_variant_get_config_request_ENUMTYPE meshtastic_AdminMessage_ConfigType
 #define meshtastic_AdminMessage_payload_variant_get_module_config_request_ENUMTYPE meshtastic_AdminMessage_ModuleConfigType
@@ -30,11 +30,20 @@ typedef enum _meshtastic_Config_DeviceConfig_Role {
   or any other packet type. They will simply rebroadcast any mesh packets on the same frequency, channel num, spread factor, and coding rate. */
    meshtastic_Config_DeviceConfig_Role_REPEATER = 4,
    /* Tracker device role
-   Position Mesh packets will be prioritized higher and sent more frequently by default. */
+   Position Mesh packets will be prioritized higher and sent more frequently by default.
+   When used in conjunction with power.is_power_saving = true, nodes will wake up, 
+   send position, and then sleep for position.position_broadcast_secs seconds. */
    meshtastic_Config_DeviceConfig_Role_TRACKER = 5,
    /* Sensor device role
-   Telemetry Mesh packets will be prioritized higher and sent more frequently by default. */
-    meshtastic_Config_DeviceConfig_Role_SENSOR = 6
+   Telemetry Mesh packets will be prioritized higher and sent more frequently by default.
+   When used in conjunction with power.is_power_saving = true, nodes will wake up, 
+   send environment telemetry, and then sleep for telemetry.environment_update_interval seconds. */
+    meshtastic_Config_DeviceConfig_Role_SENSOR = 6,
+    /* TAK device role
+    Used for nodes dedicated for connection to an ATAK EUD.
+    Turns off many of the routine broadcasts to favor CoT packet stream
+    from the Meshtastic ATAK plugin -> IMeshService -> Node */
+    meshtastic_Config_DeviceConfig_Role_TAK = 7
 } meshtastic_Config_DeviceConfig_Role;

 /* Defines the device's behavior for how messages are rebroadcast */
@@ -51,8 +60,9 @@ typedef enum _meshtastic_Config_DeviceConfig_RebroadcastMode {
 } meshtastic_Config_DeviceConfig_RebroadcastMode;

 /* Bit field of boolean configuration options, indicating which optional
-   fields to include when assembling POSITION messages
- Longitude and latitude are always included (also time if GPS-synced)
+ fields to include when assembling POSITION messages.
+ Longitude, latitude, altitude, speed, heading, and DOP
+ are always included (also time if GPS-synced)
 NOTE: the more fields are included, the larger the message will be -
   leading to longer airtime and a higher risk of packet loss */
 typedef enum _meshtastic_Config_PositionConfig_PositionFlags {
@@ -236,6 +246,8 @@ typedef struct _meshtastic_Config_DeviceConfig {
    /* If true, device is considered to be "managed" by a mesh administrator
 Clients should then limit available configuration and administrative options inside the user interface */
    bool is_managed;
+    /* Disables the triple-press of user button to enable or disable GPS */
+    bool disable_triple_click;
 } meshtastic_Config_DeviceConfig;

 /* Position Config */
@@ -269,8 +281,10 @@ typedef struct _meshtastic_Config_PositionConfig {
    uint32_t tx_gpio;
    /* The minimum distance in meters traveled (since the last send) before we can send a position to the mesh if position_broadcast_smart_enabled */
    uint32_t broadcast_smart_minimum_distance;
-    /* The minumum number of seconds (since the last send) before we can send a position to the mesh if position_broadcast_smart_enabled */
+    /* The minimum number of seconds (since the last send) before we can send a position to the mesh if position_broadcast_smart_enabled */
    uint32_t broadcast_smart_minimum_interval_secs;
+    /* (Re)define PIN_GPS_EN for your board. */
+    uint32_t gps_en_gpio;
 } meshtastic_Config_PositionConfig;

 /* Power Config\
@@ -292,11 +306,6 @@ typedef struct _meshtastic_Config_PowerConfig {
 The number of seconds for to wait before turning off BLE in No Bluetooth states
 0 for default of 1 minute */
    uint32_t wait_bluetooth_secs;
-    /* Mesh Super Deep Sleep Timeout Seconds
- While in Light Sleep if this value is exceeded we will lower into super deep sleep
- for sds_secs (default 1 year) or a button press
- 0 for default of two hours, MAXUINT for disabled */
-    uint32_t mesh_sds_timeout_secs;
    /* Super Deep Sleep Seconds
 While in Light Sleep if mesh_sds_timeout_secs is exceeded we will lower into super deep sleep
 for this value (default 1 year) or a button press
@@ -403,7 +412,8 @@ typedef struct _meshtastic_Config_LoRaConfig {
    /* The region code for the radio (US, CN, EU433, etc...) */
    meshtastic_Config_LoRaConfig_RegionCode region;
    /* Maximum number of hops. This can't be greater than 7.
- Default of 3 */
+ Default of 3
+ Attempting to set a value > 7 results in the default */
    uint32_t hop_limit;
    /* Disable TX from the LoRa radio. Useful for hot-swapping antennas and other tests.
 Defaults to false */
@@ -469,8 +479,8 @@ extern "C" {

 /* Helper constants for enums */
 #define _meshtastic_Config_DeviceConfig_Role_MIN meshtastic_Config_DeviceConfig_Role_CLIENT
-#define _meshtastic_Config_DeviceConfig_Role_MAX meshtastic_Config_DeviceConfig_Role_SENSOR
-#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_SENSOR+1))
+#define _meshtastic_Config_DeviceConfig_Role_MAX meshtastic_Config_DeviceConfig_Role_TAK
+#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_TAK+1))

 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN meshtastic_Config_DeviceConfig_RebroadcastMode_ALL
 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_MAX meshtastic_Config_DeviceConfig_RebroadcastMode_LOCAL_ONLY
@@ -534,18 +544,18 @@ extern "C" {

 /* Initializer values for message structs */
 #define meshtastic_Config_init_default           {0, {meshtastic_Config_DeviceConfig_init_default}}
-#define meshtastic_Config_DeviceConfig_init_default {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0}
-#define meshtastic_Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#define meshtastic_Config_PowerConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_Config_DeviceConfig_init_default {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0, 0}
+#define meshtastic_Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_Config_PowerConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_Config_NetworkConfig_init_default {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_default, ""}
 #define meshtastic_Config_NetworkConfig_IpV4Config_init_default {0, 0, 0, 0}
 #define meshtastic_Config_DisplayConfig_init_default {0, _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0}
 #define meshtastic_Config_LoRaConfig_init_default {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}}
 #define meshtastic_Config_BluetoothConfig_init_default {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0}
 #define meshtastic_Config_init_zero              {0, {meshtastic_Config_DeviceConfig_init_zero}}
-#define meshtastic_Config_DeviceConfig_init_zero {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0}
-#define meshtastic_Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-#define meshtastic_Config_PowerConfig_init_zero  {0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_Config_DeviceConfig_init_zero {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0, 0}
+#define meshtastic_Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_Config_PowerConfig_init_zero  {0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_Config_NetworkConfig_init_zero {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_zero, ""}
 #define meshtastic_Config_NetworkConfig_IpV4Config_init_zero {0, 0, 0, 0}
 #define meshtastic_Config_DisplayConfig_init_zero {0, _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0}
@@ -562,6 +572,7 @@ extern "C" {
 #define meshtastic_Config_DeviceConfig_node_info_broadcast_secs_tag 7
 #define meshtastic_Config_DeviceConfig_double_tap_as_button_press_tag 8
 #define meshtastic_Config_DeviceConfig_is_managed_tag 9
+#define meshtastic_Config_DeviceConfig_disable_triple_click_tag 10
 #define meshtastic_Config_PositionConfig_position_broadcast_secs_tag 1
 #define meshtastic_Config_PositionConfig_position_broadcast_smart_enabled_tag 2
 #define meshtastic_Config_PositionConfig_fixed_position_tag 3
@@ -573,11 +584,11 @@ extern "C" {
 #define meshtastic_Config_PositionConfig_tx_gpio_tag 9
 #define meshtastic_Config_PositionConfig_broadcast_smart_minimum_distance_tag 10
 #define meshtastic_Config_PositionConfig_broadcast_smart_minimum_interval_secs_tag 11
+#define meshtastic_Config_PositionConfig_gps_en_gpio_tag 12
 #define meshtastic_Config_PowerConfig_is_power_saving_tag 1
 #define meshtastic_Config_PowerConfig_on_battery_shutdown_after_secs_tag 2
 #define meshtastic_Config_PowerConfig_adc_multiplier_override_tag 3
 #define meshtastic_Config_PowerConfig_wait_bluetooth_secs_tag 4
-#define meshtastic_Config_PowerConfig_mesh_sds_timeout_secs_tag 5
 #define meshtastic_Config_PowerConfig_sds_secs_tag 6
 #define meshtastic_Config_PowerConfig_ls_secs_tag 7
 #define meshtastic_Config_PowerConfig_min_wake_secs_tag 8
@@ -658,7 +669,8 @@ X(a, STATIC,   SINGULAR, UINT32,   buzzer_gpio,       5) \
 X(a, STATIC,   SINGULAR, UENUM,    rebroadcast_mode,   6) \
 X(a, STATIC,   SINGULAR, UINT32,   node_info_broadcast_secs,   7) \
 X(a, STATIC,   SINGULAR, BOOL,     double_tap_as_button_press,   8) \
-X(a, STATIC,   SINGULAR, BOOL,     is_managed,        9)
+X(a, STATIC,   SINGULAR, BOOL,     is_managed,        9) \
+X(a, STATIC,   SINGULAR, BOOL,     disable_triple_click,  10)
 #define meshtastic_Config_DeviceConfig_CALLBACK NULL
 #define meshtastic_Config_DeviceConfig_DEFAULT NULL

@@ -673,7 +685,8 @@ X(a, STATIC,   SINGULAR, UINT32,   position_flags,    7) \
 X(a, STATIC,   SINGULAR, UINT32,   rx_gpio,           8) \
 X(a, STATIC,   SINGULAR, UINT32,   tx_gpio,           9) \
 X(a, STATIC,   SINGULAR, UINT32,   broadcast_smart_minimum_distance,  10) \
-X(a, STATIC,   SINGULAR, UINT32,   broadcast_smart_minimum_interval_secs,  11)
+X(a, STATIC,   SINGULAR, UINT32,   broadcast_smart_minimum_interval_secs,  11) \
+X(a, STATIC,   SINGULAR, UINT32,   gps_en_gpio,      12)
 #define meshtastic_Config_PositionConfig_CALLBACK NULL
 #define meshtastic_Config_PositionConfig_DEFAULT NULL

@@ -682,7 +695,6 @@ X(a, STATIC,   SINGULAR, BOOL,     is_power_saving,   1) \
 X(a, STATIC,   SINGULAR, UINT32,   on_battery_shutdown_after_secs,   2) \
 X(a, STATIC,   SINGULAR, FLOAT,    adc_multiplier_override,   3) \
 X(a, STATIC,   SINGULAR, UINT32,   wait_bluetooth_secs,   4) \
-X(a, STATIC,   SINGULAR, UINT32,   mesh_sds_timeout_secs,   5) \
 X(a, STATIC,   SINGULAR, UINT32,   sds_secs,          6) \
 X(a, STATIC,   SINGULAR, UINT32,   ls_secs,           7) \
 X(a, STATIC,   SINGULAR, UINT32,   min_wake_secs,     8) \
@@ -774,13 +786,13 @@ extern const pb_msgdesc_t meshtastic_Config_BluetoothConfig_msg;

 /* Maximum encoded size of messages (where known) */
 #define meshtastic_Config_BluetoothConfig_size   10
-#define meshtastic_Config_DeviceConfig_size      30
+#define meshtastic_Config_DeviceConfig_size      32
 #define meshtastic_Config_DisplayConfig_size     28
 #define meshtastic_Config_LoRaConfig_size        77
 #define meshtastic_Config_NetworkConfig_IpV4Config_size 20
 #define meshtastic_Config_NetworkConfig_size     195
-#define meshtastic_Config_PositionConfig_size    54
-#define meshtastic_Config_PowerConfig_size       46
+#define meshtastic_Config_PositionConfig_size    60
+#define meshtastic_Config_PowerConfig_size       40
 #define meshtastic_Config_size                   198

 #ifdef __cplusplus
@@ -75,6 +75,12 @@ typedef struct _meshtastic_LocalModuleConfig {
    /* The part of the config that is specific to the Neighbor Info module */
    bool has_neighbor_info;
    meshtastic_ModuleConfig_NeighborInfoConfig neighbor_info;
+    /* The part of the config that is specific to the Ambient Lighting module */
+    bool has_ambient_lighting;
+    meshtastic_ModuleConfig_AmbientLightingConfig ambient_lighting;
+    /* The part of the config that is specific to the Detection Sensor module */
+    bool has_detection_sensor;
+    meshtastic_ModuleConfig_DetectionSensorConfig detection_sensor;
 } meshtastic_LocalModuleConfig;


@@ -84,9 +90,9 @@ extern "C" {

 /* Initializer values for message structs */
 #define meshtastic_LocalConfig_init_default      {false, meshtastic_Config_DeviceConfig_init_default, false, meshtastic_Config_PositionConfig_init_default, false, meshtastic_Config_PowerConfig_init_default, false, meshtastic_Config_NetworkConfig_init_default, false, meshtastic_Config_DisplayConfig_init_default, false, meshtastic_Config_LoRaConfig_init_default, false, meshtastic_Config_BluetoothConfig_init_default, 0}
-#define meshtastic_LocalModuleConfig_init_default {false, meshtastic_ModuleConfig_MQTTConfig_init_default, false, meshtastic_ModuleConfig_SerialConfig_init_default, false, meshtastic_ModuleConfig_ExternalNotificationConfig_init_default, false, meshtastic_ModuleConfig_StoreForwardConfig_init_default, false, meshtastic_ModuleConfig_RangeTestConfig_init_default, false, meshtastic_ModuleConfig_TelemetryConfig_init_default, false, meshtastic_ModuleConfig_CannedMessageConfig_init_default, 0, false, meshtastic_ModuleConfig_AudioConfig_init_default, false, meshtastic_ModuleConfig_RemoteHardwareConfig_init_default, false, meshtastic_ModuleConfig_NeighborInfoConfig_init_default}
+#define meshtastic_LocalModuleConfig_init_default {false, meshtastic_ModuleConfig_MQTTConfig_init_default, false, meshtastic_ModuleConfig_SerialConfig_init_default, false, meshtastic_ModuleConfig_ExternalNotificationConfig_init_default, false, meshtastic_ModuleConfig_StoreForwardConfig_init_default, false, meshtastic_ModuleConfig_RangeTestConfig_init_default, false, meshtastic_ModuleConfig_TelemetryConfig_init_default, false, meshtastic_ModuleConfig_CannedMessageConfig_init_default, 0, false, meshtastic_ModuleConfig_AudioConfig_init_default, false, meshtastic_ModuleConfig_RemoteHardwareConfig_init_default, false, meshtastic_ModuleConfig_NeighborInfoConfig_init_default, false, meshtastic_ModuleConfig_AmbientLightingConfig_init_default, false, meshtastic_ModuleConfig_DetectionSensorConfig_init_default}
 #define meshtastic_LocalConfig_init_zero         {false, meshtastic_Config_DeviceConfig_init_zero, false, meshtastic_Config_PositionConfig_init_zero, false, meshtastic_Config_PowerConfig_init_zero, false, meshtastic_Config_NetworkConfig_init_zero, false, meshtastic_Config_DisplayConfig_init_zero, false, meshtastic_Config_LoRaConfig_init_zero, false, meshtastic_Config_BluetoothConfig_init_zero, 0}
-#define meshtastic_LocalModuleConfig_init_zero   {false, meshtastic_ModuleConfig_MQTTConfig_init_zero, false, meshtastic_ModuleConfig_SerialConfig_init_zero, false, meshtastic_ModuleConfig_ExternalNotificationConfig_init_zero, false, meshtastic_ModuleConfig_StoreForwardConfig_init_zero, false, meshtastic_ModuleConfig_RangeTestConfig_init_zero, false, meshtastic_ModuleConfig_TelemetryConfig_init_zero, false, meshtastic_ModuleConfig_CannedMessageConfig_init_zero, 0, false, meshtastic_ModuleConfig_AudioConfig_init_zero, false, meshtastic_ModuleConfig_RemoteHardwareConfig_init_zero, false, meshtastic_ModuleConfig_NeighborInfoConfig_init_zero}
+#define meshtastic_LocalModuleConfig_init_zero   {false, meshtastic_ModuleConfig_MQTTConfig_init_zero, false, meshtastic_ModuleConfig_SerialConfig_init_zero, false, meshtastic_ModuleConfig_ExternalNotificationConfig_init_zero, false, meshtastic_ModuleConfig_StoreForwardConfig_init_zero, false, meshtastic_ModuleConfig_RangeTestConfig_init_zero, false, meshtastic_ModuleConfig_TelemetryConfig_init_zero, false, meshtastic_ModuleConfig_CannedMessageConfig_init_zero, 0, false, meshtastic_ModuleConfig_AudioConfig_init_zero, false, meshtastic_ModuleConfig_RemoteHardwareConfig_init_zero, false, meshtastic_ModuleConfig_NeighborInfoConfig_init_zero, false, meshtastic_ModuleConfig_AmbientLightingConfig_init_zero, false, meshtastic_ModuleConfig_DetectionSensorConfig_init_zero}

 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_LocalConfig_device_tag        1
@@ -108,6 +114,8 @@ extern "C" {
 #define meshtastic_LocalModuleConfig_audio_tag   9
 #define meshtastic_LocalModuleConfig_remote_hardware_tag 10
 #define meshtastic_LocalModuleConfig_neighbor_info_tag 11
+#define meshtastic_LocalModuleConfig_ambient_lighting_tag 12
+#define meshtastic_LocalModuleConfig_detection_sensor_tag 13

 /* Struct field encoding specification for nanopb */
 #define meshtastic_LocalConfig_FIELDLIST(X, a) \
@@ -140,7 +148,9 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  canned_message,    7) \
 X(a, STATIC,   SINGULAR, UINT32,   version,           8) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  audio,             9) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  remote_hardware,  10) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  neighbor_info,    11)
+X(a, STATIC,   OPTIONAL, MESSAGE,  neighbor_info,    11) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  ambient_lighting,  12) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  detection_sensor,  13)
 #define meshtastic_LocalModuleConfig_CALLBACK NULL
 #define meshtastic_LocalModuleConfig_DEFAULT NULL
 #define meshtastic_LocalModuleConfig_mqtt_MSGTYPE meshtastic_ModuleConfig_MQTTConfig
@@ -153,6 +163,8 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  neighbor_info,    11)
 #define meshtastic_LocalModuleConfig_audio_MSGTYPE meshtastic_ModuleConfig_AudioConfig
 #define meshtastic_LocalModuleConfig_remote_hardware_MSGTYPE meshtastic_ModuleConfig_RemoteHardwareConfig
 #define meshtastic_LocalModuleConfig_neighbor_info_MSGTYPE meshtastic_ModuleConfig_NeighborInfoConfig
+#define meshtastic_LocalModuleConfig_ambient_lighting_MSGTYPE meshtastic_ModuleConfig_AmbientLightingConfig
+#define meshtastic_LocalModuleConfig_detection_sensor_MSGTYPE meshtastic_ModuleConfig_DetectionSensorConfig

 extern const pb_msgdesc_t meshtastic_LocalConfig_msg;
 extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
@@ -162,8 +174,8 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
 #define meshtastic_LocalModuleConfig_fields &meshtastic_LocalModuleConfig_msg

 /* Maximum encoded size of messages (where known) */
-#define meshtastic_LocalConfig_size              461
-#define meshtastic_LocalModuleConfig_size        547
+#define meshtastic_LocalConfig_size              463
+#define meshtastic_LocalModuleConfig_size        609

 #ifdef __cplusplus
 } /* extern "C" */
@@ -59,6 +59,10 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_TLORA_T3_S3 = 16,
    /* B&Q Consulting Nano G1 Explorer: https://wiki.uniteng.com/en/meshtastic/nano-g1-explorer */
    meshtastic_HardwareModel_NANO_G1_EXPLORER = 17,
+    /* B&Q Consulting Nano G2 Ultra: https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra */
+    meshtastic_HardwareModel_NANO_G2_ULTRA = 18,
+    /* LoRAType device: https://loratype.org/ */
+    meshtastic_HardwareModel_LORA_TYPE = 19,
    /* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */
    meshtastic_HardwareModel_STATION_G1 = 25,
    /* RAK11310 (RP2040 + SX1262) */
@@ -101,10 +105,16 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER = 48,
    /* Heltec Wireless Paper with ESP32-S3 CPU and E-Ink display */
    meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER = 49,
-    /* LilyGo T-Deck with ESP32-S3 CPU, Keyboard, and IPS display */
+    /* LilyGo T-Deck with ESP32-S3 CPU, Keyboard and IPS display */
    meshtastic_HardwareModel_T_DECK = 50,
    /* LilyGo T-Watch S3 with ESP32-S3 CPU and IPS display */
    meshtastic_HardwareModel_T_WATCH_S3 = 51,
+    /* Bobricius Picomputer with ESP32-S3 CPU, Keyboard and IPS display */
+    meshtastic_HardwareModel_PICOMPUTER_S3 = 52,
+    /* Heltec HT-CT62 with ESP32-C3 CPU and SX1262 LoRa */
+    meshtastic_HardwareModel_HELTEC_HT62 = 53,
+    /* EBYTE SPI LoRa module and ESP32-S3 */
+    meshtastic_HardwareModel_EBYTE_ESP32_S3 = 54,
    /* ------------------------------------------------------------------------------------------------------------------------------------------
 Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -147,7 +157,7 @@ typedef enum _meshtastic_CriticalErrorCode {
    /* Radio transmit hardware failure. We sent data to the radio chip, but it didn't
 reply with an interrupt. */
    meshtastic_CriticalErrorCode_TRANSMIT_FAILED = 8,
-    /* We detected that the main CPU voltage dropped below the minumum acceptable value */
+    /* We detected that the main CPU voltage dropped below the minimum acceptable value */
    meshtastic_CriticalErrorCode_BROWNOUT = 9,
    /* Selftest of SX1262 radio chip failed */
    meshtastic_CriticalErrorCode_SX1262_FAILURE = 10,
@@ -228,9 +238,9 @@ typedef enum _meshtastic_Routing_Error {
 to make sure that critical packets are sent ASAP.
 In the case of meshtastic that means we want to send protocol acks as soon as possible
 (to prevent unneeded retransmissions), we want routing messages to be sent next,
- then messages marked as reliable and finally ‘background’ packets like periodic position updates.
+ then messages marked as reliable and finally 'background' packets like periodic position updates.
 So I bit the bullet and implemented a new (internal - not sent over the air)
- field in MeshPacket called ‘priority’.
+ field in MeshPacket called 'priority'.
 And the transmission queue in the router object is now a priority queue. */
 typedef enum _meshtastic_MeshPacket_Priority {
    /* Treated as Priority.DEFAULT */
@@ -291,9 +301,8 @@ typedef struct _meshtastic_Position {
    /* In meters above MSL (but see issue #359) */
    int32_t altitude;
    /* This is usually not sent over the mesh (to save space), but it is sent
- from the phone so that the local device can set its RTC If it is sent over
- the mesh (because there are devices on the mesh without GPS), it will only
- be sent by devices which has a hardware GPS clock.
+ from the phone so that the local device can set its time if it is sent over
+ the mesh (because there are devices on the mesh without GPS or RTC).
 seconds since 1970 */
    uint32_t time;
    /* TODO: REPLACE */
@@ -603,60 +612,12 @@ typedef struct _meshtastic_MyNodeInfo {
    /* Tells the phone what our node number is, default starting value is
 lowbyte of macaddr, but it will be fixed if that is already in use */
    uint32_t my_node_num;
-    /* Deprecated in 2.1.x (Source from device_metadata)
- Note: This flag merely means we detected a hardware GPS in our node.
- Not the same as UserPreferences.location_sharing */
-    bool has_gps;
-    /* Deprecated in 2.1.x
- The maximum number of 'software' channels that can be set on this node. */
-    uint32_t max_channels;
-    /* Deprecated in 2.1.x (Source from device_metadata)
- 0.0.5 etc... */
-    char firmware_version[18];
-    /* An error message we'd like to report back to the mothership through analytics.
- It indicates a serious bug occurred on the device, the device coped with it,
- but we still want to tell the devs about the bug.
- This field will be cleared after the phone reads MyNodeInfo
- (i.e. it will only be reported once)
- a numeric error code to go with error message, zero means no error */
-    meshtastic_CriticalErrorCode error_code;
-    /* A numeric error address (nonzero if available) */
-    uint32_t error_address;
-    /* The total number of errors this node has ever encountered
- (well - since the last time we discarded preferences) */
-    uint32_t error_count;
    /* The total number of reboots this node has ever encountered
 (well - since the last time we discarded preferences) */
    uint32_t reboot_count;
-    /* Deprecated in 2.1.x
- Calculated bitrate of the current channel (in Bytes Per Second) */
-    float bitrate;
-    /* Deprecated in 2.1.x
- How long before we consider a message abandoned and we can clear our
- caches of any messages in flight Normally quite large to handle the worst case
- message delivery time, 5 minutes.
- Formerly called FLOOD_EXPIRE_TIME in the device code */
-    uint32_t message_timeout_msec;
    /* The minimum app version that can talk to this device.
 Phone/PC apps should compare this to their build number and if too low tell the user they must update their app */
    uint32_t min_app_version;
-    /* Deprecated in 2.1.x (Only used on device to keep track of utilization)
- 24 time windows of 1hr each with the airtime transmitted out of the device per hour. */
-    pb_size_t air_period_tx_count;
-    uint32_t air_period_tx[8];
-    /* Deprecated in 2.1.x (Only used on device to keep track of utilization)
- 24 time windows of 1hr each with the airtime of valid packets for your mesh. */
-    pb_size_t air_period_rx_count;
-    uint32_t air_period_rx[8];
-    /* Deprecated in 2.1.x (Source from DeviceMetadata instead)
- Is the device wifi capable? */
-    bool has_wifi;
-    /* Deprecated in 2.1.x (Source from DeviceMetrics telemetry payloads)
- Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise). */
-    float channel_utilization;
-    /* Deprecated in 2.1.x (Source from DeviceMetrics telemetry payloads)
- Percent of airtime for transmission used within the last hour. */
-    float air_util_tx;
 } meshtastic_MyNodeInfo;

 /* Debug output from the device.
@@ -727,6 +688,12 @@ typedef struct _meshtastic_Neighbor {
    uint32_t node_id;
    /* SNR of last heard message */
    float snr;
+    /* Reception time (in secs since 1970) of last message that was last sent by this ID.
+ Note: this is for local storage only and will not be sent out over the mesh. */
+    uint32_t last_rx_time;
+    /* Broadcast interval of this neighbor (in seconds).
+ Note: this is for local storage only and will not be sent out over the mesh. */
+    uint32_t node_broadcast_interval_secs;
 } meshtastic_Neighbor;

 /* Full info on edges for a single node */
@@ -735,6 +702,8 @@ typedef struct _meshtastic_NeighborInfo {
    uint32_t node_id;
    /* Field to pass neighbor info for the next sending cycle */
    uint32_t last_sent_by_id;
+    /* Broadcast interval of the represented node (in seconds) */
+    uint32_t node_broadcast_interval_secs;
    /* The list of out edges from this node */
    pb_size_t neighbors_count;
    meshtastic_Neighbor neighbors[10];
@@ -869,7 +838,6 @@ extern "C" {
 #define meshtastic_MeshPacket_delayed_ENUMTYPE meshtastic_MeshPacket_Delayed


-#define meshtastic_MyNodeInfo_error_code_ENUMTYPE meshtastic_CriticalErrorCode

 #define meshtastic_LogRecord_level_ENUMTYPE meshtastic_LogRecord_Level

@@ -894,14 +862,14 @@ extern "C" {
 #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN}
 #define meshtastic_NodeInfo_init_default         {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0}
-#define meshtastic_MyNodeInfo_init_default       {0, 0, 0, "", _meshtastic_CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0}
+#define meshtastic_MyNodeInfo_init_default       {0, 0, 0}
 #define meshtastic_LogRecord_init_default        {"", 0, "", _meshtastic_LogRecord_Level_MIN}
 #define meshtastic_QueueStatus_init_default      {0, 0, 0, 0}
 #define meshtastic_FromRadio_init_default        {0, 0, {meshtastic_MeshPacket_init_default}}
 #define meshtastic_ToRadio_init_default          {0, {meshtastic_MeshPacket_init_default}}
 #define meshtastic_Compressed_init_default       {_meshtastic_PortNum_MIN, {0, {0}}}
-#define meshtastic_NeighborInfo_init_default     {0, 0, 0, {meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default}}
-#define meshtastic_Neighbor_init_default         {0, 0}
+#define meshtastic_NeighborInfo_init_default     {0, 0, 0, 0, {meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default}}
+#define meshtastic_Neighbor_init_default         {0, 0, 0, 0}
 #define meshtastic_DeviceMetadata_init_default   {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0}
 #define meshtastic_Position_init_zero            {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN, _meshtastic_Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_User_init_zero                {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0}
@@ -912,14 +880,14 @@ extern "C" {
 #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN}
 #define meshtastic_NodeInfo_init_zero            {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0}
-#define meshtastic_MyNodeInfo_init_zero          {0, 0, 0, "", _meshtastic_CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0}
+#define meshtastic_MyNodeInfo_init_zero          {0, 0, 0}
 #define meshtastic_LogRecord_init_zero           {"", 0, "", _meshtastic_LogRecord_Level_MIN}
 #define meshtastic_QueueStatus_init_zero         {0, 0, 0, 0}
 #define meshtastic_FromRadio_init_zero           {0, 0, {meshtastic_MeshPacket_init_zero}}
 #define meshtastic_ToRadio_init_zero             {0, {meshtastic_MeshPacket_init_zero}}
 #define meshtastic_Compressed_init_zero          {_meshtastic_PortNum_MIN, {0, {0}}}
-#define meshtastic_NeighborInfo_init_zero        {0, 0, 0, {meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero}}
-#define meshtastic_Neighbor_init_zero            {0, 0}
+#define meshtastic_NeighborInfo_init_zero        {0, 0, 0, 0, {meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero}}
+#define meshtastic_Neighbor_init_zero            {0, 0, 0, 0}
 #define meshtastic_DeviceMetadata_init_zero      {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0}

 /* Field tags (for use in manual encoding/decoding) */
@@ -996,21 +964,8 @@ extern "C" {
 #define meshtastic_NodeInfo_device_metrics_tag   6
 #define meshtastic_NodeInfo_channel_tag          7
 #define meshtastic_MyNodeInfo_my_node_num_tag    1
-#define meshtastic_MyNodeInfo_has_gps_tag        2
-#define meshtastic_MyNodeInfo_max_channels_tag   3
-#define meshtastic_MyNodeInfo_firmware_version_tag 4
-#define meshtastic_MyNodeInfo_error_code_tag     5
-#define meshtastic_MyNodeInfo_error_address_tag  6
-#define meshtastic_MyNodeInfo_error_count_tag    7
 #define meshtastic_MyNodeInfo_reboot_count_tag   8
-#define meshtastic_MyNodeInfo_bitrate_tag        9
-#define meshtastic_MyNodeInfo_message_timeout_msec_tag 10
 #define meshtastic_MyNodeInfo_min_app_version_tag 11
-#define meshtastic_MyNodeInfo_air_period_tx_tag  12
-#define meshtastic_MyNodeInfo_air_period_rx_tag  13
-#define meshtastic_MyNodeInfo_has_wifi_tag       14
-#define meshtastic_MyNodeInfo_channel_utilization_tag 15
-#define meshtastic_MyNodeInfo_air_util_tx_tag    16
 #define meshtastic_LogRecord_message_tag         1
 #define meshtastic_LogRecord_time_tag            2
 #define meshtastic_LogRecord_source_tag          3
@@ -1028,9 +983,12 @@ extern "C" {
 #define meshtastic_Compressed_data_tag           2
 #define meshtastic_Neighbor_node_id_tag          1
 #define meshtastic_Neighbor_snr_tag              2
+#define meshtastic_Neighbor_last_rx_time_tag     3
+#define meshtastic_Neighbor_node_broadcast_interval_secs_tag 4
 #define meshtastic_NeighborInfo_node_id_tag      1
 #define meshtastic_NeighborInfo_last_sent_by_id_tag 2
-#define meshtastic_NeighborInfo_neighbors_tag    3
+#define meshtastic_NeighborInfo_node_broadcast_interval_secs_tag 3
+#define meshtastic_NeighborInfo_neighbors_tag    4
 #define meshtastic_DeviceMetadata_firmware_version_tag 1
 #define meshtastic_DeviceMetadata_device_state_version_tag 2
 #define meshtastic_DeviceMetadata_canShutdown_tag 3
@@ -1173,21 +1131,8 @@ X(a, STATIC,   SINGULAR, UINT32,   channel,           7)

 #define meshtastic_MyNodeInfo_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   my_node_num,       1) \
-X(a, STATIC,   SINGULAR, BOOL,     has_gps,           2) \
-X(a, STATIC,   SINGULAR, UINT32,   max_channels,      3) \
-X(a, STATIC,   SINGULAR, STRING,   firmware_version,   4) \
-X(a, STATIC,   SINGULAR, UENUM,    error_code,        5) \
-X(a, STATIC,   SINGULAR, UINT32,   error_address,     6) \
-X(a, STATIC,   SINGULAR, UINT32,   error_count,       7) \
 X(a, STATIC,   SINGULAR, UINT32,   reboot_count,      8) \
-X(a, STATIC,   SINGULAR, FLOAT,    bitrate,           9) \
-X(a, STATIC,   SINGULAR, UINT32,   message_timeout_msec,  10) \
-X(a, STATIC,   SINGULAR, UINT32,   min_app_version,  11) \
-X(a, STATIC,   REPEATED, UINT32,   air_period_tx,    12) \
-X(a, STATIC,   REPEATED, UINT32,   air_period_rx,    13) \
-X(a, STATIC,   SINGULAR, BOOL,     has_wifi,         14) \
-X(a, STATIC,   SINGULAR, FLOAT,    channel_utilization,  15) \
-X(a, STATIC,   SINGULAR, FLOAT,    air_util_tx,      16)
+X(a, STATIC,   SINGULAR, UINT32,   min_app_version,  11)
 #define meshtastic_MyNodeInfo_CALLBACK NULL
 #define meshtastic_MyNodeInfo_DEFAULT NULL

@@ -1257,14 +1202,17 @@ X(a, STATIC,   SINGULAR, BYTES,    data,              2)
 #define meshtastic_NeighborInfo_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   node_id,           1) \
 X(a, STATIC,   SINGULAR, UINT32,   last_sent_by_id,   2) \
-X(a, STATIC,   REPEATED, MESSAGE,  neighbors,         3)
+X(a, STATIC,   SINGULAR, UINT32,   node_broadcast_interval_secs,   3) \
+X(a, STATIC,   REPEATED, MESSAGE,  neighbors,         4)
 #define meshtastic_NeighborInfo_CALLBACK NULL
 #define meshtastic_NeighborInfo_DEFAULT NULL
 #define meshtastic_NeighborInfo_neighbors_MSGTYPE meshtastic_Neighbor

 #define meshtastic_Neighbor_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   node_id,           1) \
-X(a, STATIC,   SINGULAR, FLOAT,    snr,               2)
+X(a, STATIC,   SINGULAR, FLOAT,    snr,               2) \
+X(a, STATIC,   SINGULAR, FIXED32,  last_rx_time,      3) \
+X(a, STATIC,   SINGULAR, UINT32,   node_broadcast_interval_secs,   4)
 #define meshtastic_Neighbor_CALLBACK NULL
 #define meshtastic_Neighbor_DEFAULT NULL

@@ -1329,9 +1277,9 @@ extern const pb_msgdesc_t meshtastic_DeviceMetadata_msg;
 #define meshtastic_LogRecord_size                81
 #define meshtastic_MeshPacket_size               321
 #define meshtastic_MqttClientProxyMessage_size   501
-#define meshtastic_MyNodeInfo_size               179
-#define meshtastic_NeighborInfo_size             142
-#define meshtastic_Neighbor_size                 11
+#define meshtastic_MyNodeInfo_size               18
+#define meshtastic_NeighborInfo_size             258
+#define meshtastic_Neighbor_size                 22
 #define meshtastic_NodeInfo_size                 261
 #define meshtastic_Position_size                 137
 #define meshtastic_QueueStatus_size              23
@@ -18,6 +18,9 @@ PB_BIND(meshtastic_ModuleConfig_RemoteHardwareConfig, meshtastic_ModuleConfig_Re
 PB_BIND(meshtastic_ModuleConfig_NeighborInfoConfig, meshtastic_ModuleConfig_NeighborInfoConfig, AUTO)


+PB_BIND(meshtastic_ModuleConfig_DetectionSensorConfig, meshtastic_ModuleConfig_DetectionSensorConfig, AUTO)
+
+
 PB_BIND(meshtastic_ModuleConfig_AudioConfig, meshtastic_ModuleConfig_AudioConfig, AUTO)


--- a/Show More
+++ b/Show More