Various position fixes (#3297 )

* Guard against no movement * Add newlines * Fix printfs
SDA and SCL remap
2026-01-14 22:07:25 +00:00 · 2024-02-26 20:24:36 -06:00 · 2024-02-26 19:49:43 -06:00 · 2024-02-26 19:32:58 -06:00 · 2024-02-26 10:38:16 -06:00 · 2024-02-26 10:20:33 +01:00
119 changed files with 3618 additions and 911 deletions
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -32,7 +32,7 @@ jobs:
          - board: meshtastic-diy-v1
          - board: rak4631
          - board: t-echo
-          - board: station-g1
+          - board: station-g2
          - board: m5stack-coreink
          - board: tbeam-s3-core
          - board: tlora-t3s3-v1
@@ -68,7 +68,6 @@ jobs:
          - board: tlora-v2-1-1_8
          - board: tbeam
          - board: heltec-ht62-esp32c3-sx1262
-          - board: heltec-v1
          - board: heltec-v2_0
          - board: heltec-v2_1
          - board: tbeam0_7
@@ -93,12 +92,14 @@ jobs:
          - board: heltec-v3
          - board: heltec-wsl-v3
          - board: heltec-wireless-tracker
+          - board: heltec-wireless-tracker-V1-0
          - board: heltec-wireless-paper
          - board: tbeam-s3-core
          - board: tlora-t3s3-v1
          - board: t-watch-s3
          - board: t-deck
          - board: picomputer-s3
+          - board: station-g2
    uses: ./.github/workflows/build_esp32_s3.yml
    with:
      board: ${{ matrix.board }}
@@ -112,6 +113,7 @@ jobs:
          - board: rak4631_eink
          - board: monteops_hw1
          - board: t-echo
+          - board: canaryone
          - board: pca10059_diy_eink
          - board: feather_diy
          - board: nano-g2-ultra
@@ -128,6 +130,7 @@ jobs:
          - board: picow
          - board: rak11310
          - board: senselora_rp2040
+          - board: rp2040-lora
    uses: ./.github/workflows/build_rpi2040.yml
    with:
      board: ${{ matrix.board }}
--- a/.trunk/.gitignore
+++ b/.trunk/.gitignore
@@ -6,3 +6,4 @@
 plugins
 user_trunk.yaml
 user.yaml
+tmp
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -1,34 +1,36 @@
 version: 0.1
 cli:
-  version: 1.17.2
+  version: 1.20.1
 plugins:
  sources:
    - id: trunk
-      ref: v1.3.0
+      ref: v1.4.3
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - bandit@1.7.5
-    - checkov@3.1.9
-    - terrascan@1.18.5
-    - trivy@0.47.0
+    - trufflehog@3.68.2
+    - yamllint@1.35.1
+    - bandit@1.7.7
+    - checkov@3.2.26
+    - terrascan@1.18.11
+    - trivy@0.49.1
    #- trufflehog@3.63.2-rc0
    - taplo@0.8.1
-    - ruff@0.1.6
-    - isort@5.12.0
-    - markdownlint@0.37.0
+    - ruff@0.2.2
+    - isort@5.13.2
+    - markdownlint@0.39.0
    - oxipng@9.0.0
-    - svgo@3.0.5
-    - actionlint@1.6.26
-    - flake8@6.1.0
+    - svgo@3.2.0
+    - actionlint@1.6.27
+    - flake8@7.0.0
    - hadolint@2.12.0
    - shfmt@3.6.0
    - shellcheck@0.9.0
-    - black@23.9.1
+    - black@24.2.0
    - git-diff-check
-    - gitleaks@8.18.1
+    - gitleaks@8.18.2
    - clang-format@16.0.3
-    - prettier@3.1.0
+    - prettier@3.2.5
 runtimes:
  enabled:
    - python@3.10.8
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -6,4 +6,4 @@
        "platformio.platformio-ide",
        "trunk.io"
    ],
-}
+}
--- a/bin/check-all.sh
+++ b/bin/check-all.sh
@@ -13,7 +13,7 @@ if [[ $# -gt 0 ]]; then
 	# 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-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 rak4631 rak4631_eink rak11200 t-echo canaryone pca10059_diy_eink"
 fi

 echo "BOARDS:${BOARDS}"
--- a/bin/check-dependencies.sh
+++ b/bin/check-dependencies.sh
@@ -5,17 +5,17 @@
 set -e

 if [[ $# -gt 0 ]]; then
-    # can override which environment by passing arg
-    BOARDS="$@"
+	# can override which environment by passing arg
+	BOARDS="$@"
 else
-    BOARDS="rak4631 rak4631_eink t-echo pca10059_diy_eink pico rak11200 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 nano-g1 station-g1 m5stack-core m5stack-coreink tbeam-s3-core"
+	BOARDS="rak4631 rak4631_eink t-echo canaryone pca10059_diy_eink pico rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1 station-g1 m5stack-core m5stack-coreink tbeam-s3-core"
 fi

 echo "BOARDS:${BOARDS}"

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

 echo $CHECK
--- a/bin/config-dist.yaml
+++ b/bin/config-dist.yaml
@@ -91,7 +91,19 @@ Display:
 #  OffsetX: 0
 #  OffsetY: 0

+### Adafruit PiTFT 2.8 TFT+Touchscreen
+#  Panel: ILI9341
+#  CS: 8
+#  DC: 25
+#  Backlight: 2
+#  Width: 320
+#  Height: 240
+
 Touchscreen:
+#  Module: STMPE610
+#  CS: 7
+#  IRQ: 24
+
 #  Module: XPT2046
 #  CS: 7
 #  IRQ: 17
--- a/bin/lilygo_techo_bootloader-0.6.1.zip
+++ b/bin/lilygo_techo_bootloader-0.6.1.zip
--- a/bin/update-lilygo_techo_bootloader-0.6.1_nosd.uf2
+++ b/bin/update-lilygo_techo_bootloader-0.6.1_nosd.uf2
--- a/boards/canaryone.json
+++ b/boards/canaryone.json
@@ -0,0 +1,49 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_CANARY -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [["0x239A", "0x4405"]],
+    "usb_product": "CanaryOne",
+    "mcu": "nrf52840",
+    "variant": "canaryone",
+    "variants_dir": "variants",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "onboard_tools": ["jlink"],
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
+  },
+  "frameworks": ["arduino"],
+  "name": "Canary (Adafruit BSP)",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://canaryradio.io/",
+  "vendor": "Canary Radio Company"
+}
--- a/boards/eink0.1.json
+++ b/boards/eink0.1.json
@@ -29,7 +29,8 @@
  "debug": {
    "jlink_device": "nRF52840_xxAA",
    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd"
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "TTGO eink (Adafruit BSP)",
--- a/boards/esp32-s3-pico.json
+++ b/boards/esp32-s3-pico.json
@@ -0,0 +1,40 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "partitions": "default_16MB.csv"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_ESP32S3_DEV",
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "esp32s3"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "Waveshare ESP32-S3-Pico (16 MB FLASH, 2 MB PSRAM)",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.waveshare.com/esp32-s3-pico.htm",
+  "vendor": "Waveshare"
+}
--- a/boards/lora-relay-v1.json
+++ b/boards/lora-relay-v1.json
@@ -29,7 +29,8 @@
  "debug": {
    "jlink_device": "nRF52840_xxAA",
    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd"
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "Meshtastic Lora Relay V1 (Adafruit BSP)",
--- a/boards/lora-relay-v2.json
+++ b/boards/lora-relay-v2.json
@@ -29,7 +29,8 @@
  "debug": {
    "jlink_device": "nRF52840_xxAA",
    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd"
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "Meshtastic Lora Relay V1 (Adafruit BSP)",
--- a/boards/lora_isp4520.json
+++ b/boards/lora_isp4520.json
@@ -22,7 +22,8 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52832_xxAA",
-    "svd_path": "nrf52.svd"
+    "svd_path": "nrf52.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "lora ISP4520",
--- a/boards/nordic_pca10059.json
+++ b/boards/nordic_pca10059.json
@@ -32,7 +32,8 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd"
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "nRF52840 Dongle",
--- a/boards/nrf52840_dk.json
+++ b/boards/nrf52840_dk.json
@@ -29,7 +29,8 @@
  "debug": {
    "jlink_device": "nRF52840_xxAA",
    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd"
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "A modified NRF52840-DK devboard (Adafruit BSP)",
--- a/boards/nrf52840_dk_modified.json
+++ b/boards/nrf52840_dk_modified.json
@@ -29,7 +29,8 @@
  "debug": {
    "jlink_device": "nRF52840_xxAA",
    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd"
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "A modified NRF52840-DK devboard (Adafruit BSP)",
--- a/boards/ppr.json
+++ b/boards/ppr.json
@@ -29,7 +29,8 @@
  "debug": {
    "jlink_device": "nRF52840_xxAA",
    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd"
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "Meshtastic PPR (Adafruit BSP)",
--- a/boards/ppr1.json
+++ b/boards/ppr1.json
@@ -29,7 +29,8 @@
  "debug": {
    "jlink_device": "nRF52833_xxAA",
    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52833.svd"
+    "svd_path": "nrf52833.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "Meshtastic PPR1 (Adafruit BSP)",
--- a/boards/station-g2.json
+++ b/boards/station-g2.json
@@ -0,0 +1,41 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=0"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "station-g2"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "BQ Station G2",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://wiki.uniteng.com/en/meshtastic/station-g2",
+  "vendor": "BQ Consulting"
+}
--- a/boards/t-echo.json
+++ b/boards/t-echo.json
@@ -9,6 +9,7 @@
    "f_cpu": "64000000L",
    "hwids": [
      ["0x239A", "0x4405"],
+      ["0x239A", "0x0029"],
      ["0x239A", "0x002A"]
    ],
    "usb_product": "TTGO_eink",
@@ -32,7 +33,8 @@
  "debug": {
    "jlink_device": "nRF52840_xxAA",
    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd"
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "TTGO eink (Adafruit BSP)",
--- a/boards/wiscore_rak4600.json
+++ b/boards/wiscore_rak4600.json
@@ -32,7 +32,8 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52832_xxAA",
-    "svd_path": "nrf52.svd"
+    "svd_path": "nrf52.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino", "zephyr"],
  "name": "Adafruit Bluefruit nRF52832 Feather",
--- a/boards/wiscore_rak4631.json
+++ b/boards/wiscore_rak4631.json
@@ -32,7 +32,8 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd"
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "WisCore RAK4631 Board",
--- a/boards/xiao_ble_sense.json
+++ b/boards/xiao_ble_sense.json
@@ -31,7 +31,8 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd"
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
  "name": "Seeed Xiao BLE Sense",
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,6 +19,7 @@ default_envs = tbeam
 ;default_envs = tlora-t3s3-v1
 ;default_envs = lora-relay-v1 # nrf board
 ;default_envs = t-echo
+;default_envs = canaryone
 ;default_envs = nrf52840dk-geeksville
 ;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
 ;default_envs = nano-g1
@@ -57,6 +58,7 @@ build_flags = -Wno-missing-field-initializers
  -DRADIOLIB_EXCLUDE_SI443X
  -DRADIOLIB_EXCLUDE_RFM2X
  -DRADIOLIB_EXCLUDE_AFSK
+  -DRADIOLIB_EXCLUDE_BELL
  -DRADIOLIB_EXCLUDE_HELLSCHREIBER
  -DRADIOLIB_EXCLUDE_MORSE
  -DRADIOLIB_EXCLUDE_RTTY
--- a/2
+++ b/2
--- a/src/ButtonThread.cpp
+++ b/src/ButtonThread.cpp
@@ -0,0 +1,219 @@
+#include "ButtonThread.h"
+#include "GPS.h"
+#include "MeshService.h"
+#include "PowerFSM.h"
+#include "RadioLibInterface.h"
+#include "buzz.h"
+#include "graphics/Screen.h"
+#include "main.h"
+#include "modules/ExternalNotificationModule.h"
+#include "power.h"
+#ifdef ARCH_PORTDUINO
+#include "platform/portduino/PortduinoGlue.h"
+#endif
+
+#define DEBUG_BUTTONS 0
+#if DEBUG_BUTTONS
+#define LOG_BUTTON(...) LOG_DEBUG(__VA_ARGS__)
+#else
+#define LOG_BUTTON(...)
+#endif
+
+using namespace concurrency;
+
+volatile ButtonThread::ButtonEventType ButtonThread::btnEvent = ButtonThread::BUTTON_EVENT_NONE;
+
+ButtonThread::ButtonThread() : OSThread("Button")
+{
+#if defined(ARCH_PORTDUINO) || defined(BUTTON_PIN)
+#if defined(ARCH_PORTDUINO)
+    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) {
+        userButton = OneButton(settingsMap[user], true, true);
+        LOG_DEBUG("Using GPIO%02d for button\n", settingsMap[user]);
+    }
+#elif defined(BUTTON_PIN)
+    int pin = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN;
+    this->userButton = OneButton(pin, true, true);
+    LOG_DEBUG("Using GPIO%02d for button\n", pin);
+#endif
+
+#ifdef INPUT_PULLUP_SENSE
+    // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
+    pinMode(pin, INPUT_PULLUP_SENSE);
+#endif
+    userButton.attachClick(userButtonPressed);
+    userButton.setClickMs(250);
+    userButton.setPressMs(c_longPressTime);
+    userButton.setDebounceMs(1);
+    userButton.attachDoubleClick(userButtonDoublePressed);
+    userButton.attachMultiClick(userButtonMultiPressed);
+#ifndef T_DECK // T-Deck immediately wakes up after shutdown, so disable this function
+    userButton.attachLongPressStart(userButtonPressedLongStart);
+    userButton.attachLongPressStop(userButtonPressedLongStop);
+#endif
+#if defined(ARCH_PORTDUINO)
+    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC)
+        wakeOnIrq(settingsMap[user], FALLING);
+#else
+    static OneButton *pBtn = &userButton; // only one instance of ButtonThread is created, so static is safe
+    attachInterrupt(
+        pin,
+        []() {
+            BaseType_t higherWake = 0;
+            mainDelay.interruptFromISR(&higherWake);
+            pBtn->tick();
+        },
+        CHANGE);
+#endif
+#endif
+#ifdef BUTTON_PIN_ALT
+    userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
+#ifdef INPUT_PULLUP_SENSE
+    // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
+    pinMode(BUTTON_PIN_ALT, INPUT_PULLUP_SENSE);
+#endif
+    userButtonAlt.attachClick(userButtonPressed);
+    userButtonAlt.setClickMs(250);
+    userButtonAlt.setPressMs(c_longPressTime);
+    userButtonAlt.setDebounceMs(1);
+    userButtonAlt.attachDoubleClick(userButtonDoublePressed);
+    userButtonAlt.attachLongPressStart(userButtonPressedLongStart);
+    userButtonAlt.attachLongPressStop(userButtonPressedLongStop);
+    wakeOnIrq(BUTTON_PIN_ALT, FALLING);
+#endif
+
+#ifdef BUTTON_PIN_TOUCH
+    userButtonTouch = OneButton(BUTTON_PIN_TOUCH, true, true);
+    userButtonTouch.attachClick(touchPressed);
+    wakeOnIrq(BUTTON_PIN_TOUCH, FALLING);
+#endif
+}
+
+int32_t ButtonThread::runOnce()
+{
+    // If the button is pressed we suppress CPU sleep until release
+    canSleep = true; // Assume we should not keep the board awake
+
+#if defined(BUTTON_PIN)
+    userButton.tick();
+    canSleep &= userButton.isIdle();
+#elif defined(ARCH_PORTDUINO)
+    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) {
+        userButton.tick();
+        canSleep &= userButton.isIdle();
+    }
+#endif
+#ifdef BUTTON_PIN_ALT
+    userButtonAlt.tick();
+    canSleep &= userButtonAlt.isIdle();
+#endif
+#ifdef BUTTON_PIN_TOUCH
+    userButtonTouch.tick();
+    canSleep &= userButtonTouch.isIdle();
+#endif
+
+    if (btnEvent != BUTTON_EVENT_NONE) {
+        switch (btnEvent) {
+        case BUTTON_EVENT_PRESSED: {
+            LOG_BUTTON("press!\n");
+#ifdef BUTTON_PIN
+            if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
+                 moduleConfig.canned_message.inputbroker_pin_press) ||
+                !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
+                !moduleConfig.canned_message.enabled) {
+                powerFSM.trigger(EVENT_PRESS);
+            }
+#endif
+#if defined(ARCH_PORTDUINO)
+            if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) &&
+                    (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) ||
+                !moduleConfig.canned_message.enabled) {
+                powerFSM.trigger(EVENT_PRESS);
+            }
+#endif
+            break;
+        }
+
+        case BUTTON_EVENT_DOUBLE_PRESSED: {
+            LOG_BUTTON("Double press!\n");
+#if defined(USE_EINK) && defined(PIN_EINK_EN)
+            digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
+#endif
+            service.refreshLocalMeshNode();
+            service.sendNetworkPing(NODENUM_BROADCAST, true);
+            if (screen)
+                screen->print("Sent ad-hoc ping\n");
+            break;
+        }
+
+        case BUTTON_EVENT_MULTI_PRESSED: {
+            LOG_BUTTON("Multi press!\n");
+            if (!config.device.disable_triple_click && (gps != nullptr)) {
+                gps->toggleGpsMode();
+                if (screen)
+                    screen->forceDisplay();
+            }
+            break;
+        }
+
+        case BUTTON_EVENT_LONG_PRESSED: {
+            LOG_BUTTON("Long press!\n");
+            powerFSM.trigger(EVENT_PRESS);
+            if (screen)
+                screen->startShutdownScreen();
+            playBeep();
+            break;
+        }
+
+        // Do actual shutdown when button released, otherwise the button release
+        // may wake the board immediatedly.
+        case BUTTON_EVENT_LONG_RELEASED: {
+            LOG_INFO("Shutdown from long press\n");
+            playShutdownMelody();
+            delay(3000);
+            power->shutdown();
+            break;
+        }
+        case BUTTON_EVENT_TOUCH_PRESSED: {
+            LOG_BUTTON("Touch press!\n");
+            if (screen)
+                screen->forceDisplay();
+            break;
+        }
+        default:
+            break;
+        }
+        btnEvent = BUTTON_EVENT_NONE;
+    }
+
+    return 50;
+}
+
+/**
+ * Watch a GPIO and if we get an IRQ, wake the main thread.
+ * Use to add wake on button press
+ */
+void ButtonThread::wakeOnIrq(int irq, int mode)
+{
+    attachInterrupt(
+        irq,
+        [] {
+            BaseType_t higherWake = 0;
+            mainDelay.interruptFromISR(&higherWake);
+        },
+        FALLING);
+}
+
+void ButtonThread::userButtonPressedLongStart()
+{
+    if (millis() > c_holdOffTime) {
+        btnEvent = BUTTON_EVENT_LONG_PRESSED;
+    }
+}
+
+void ButtonThread::userButtonPressedLongStop()
+{
+    if (millis() > c_holdOffTime) {
+        btnEvent = BUTTON_EVENT_LONG_RELEASED;
+    }
+}
--- a/src/ButtonThread.h
+++ b/src/ButtonThread.h
@@ -1,34 +1,29 @@
-#include "PowerFSM.h"
-#include "RadioLibInterface.h"
-#include "buzz.h"
+#pragma once
+
+#include "OneButton.h"
 #include "concurrency/OSThread.h"
 #include "configuration.h"
-#include "graphics/Screen.h"
-#include "main.h"
-#include "modules/ExternalNotificationModule.h"
-#include "power.h"
-#include <OneButton.h>
-
-namespace concurrency
-{
-/**
- * Watch a GPIO and if we get an IRQ, wake the main thread.
- * Use to add wake on button press
- */
-void wakeOnIrq(int irq, int mode)
-{
-    attachInterrupt(
-        irq,
-        [] {
-            BaseType_t higherWake = 0;
-            mainDelay.interruptFromISR(&higherWake);
-        },
-        FALLING);
-}

 class ButtonThread : public concurrency::OSThread
 {
-// Prepare for button presses
+  public:
+    static const uint32_t c_longPressTime = 5000; // shutdown after 5s
+    static const uint32_t c_holdOffTime = 30000;  // hold off 30s after boot
+
+    enum ButtonEventType {
+        BUTTON_EVENT_NONE,
+        BUTTON_EVENT_PRESSED,
+        BUTTON_EVENT_DOUBLE_PRESSED,
+        BUTTON_EVENT_MULTI_PRESSED,
+        BUTTON_EVENT_LONG_PRESSED,
+        BUTTON_EVENT_LONG_RELEASED,
+        BUTTON_EVENT_TOUCH_PRESSED
+    };
+
+    ButtonThread();
+    int32_t runOnce() override;
+
+  private:
 #ifdef BUTTON_PIN
    OneButton userButton;
 #endif
@@ -41,196 +36,17 @@ class ButtonThread : public concurrency::OSThread
 #if defined(ARCH_PORTDUINO)
    OneButton userButton;
 #endif
-    static bool shutdown_on_long_stop;

-  public:
-    static uint32_t longPressTime;
+    // set during IRQ
+    static volatile ButtonEventType btnEvent;

-    // callback returns the period for the next callback invocation (or 0 if we should no longer be called)
-    ButtonThread() : OSThread("Button")
-    {
-#if defined(ARCH_PORTDUINO) || defined(BUTTON_PIN)
-#if defined(ARCH_PORTDUINO)
-        if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC)
-            userButton = OneButton(settingsMap[user], true, true);
-#elif defined(BUTTON_PIN)
+    static void wakeOnIrq(int irq, int mode);

-        userButton = OneButton(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, true, true);
-#endif
-#ifdef INPUT_PULLUP_SENSE
-        // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
-        pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT_PULLUP_SENSE);
-#endif
-        userButton.attachClick(userButtonPressed);
-        userButton.setClickMs(300);
-        userButton.attachDuringLongPress(userButtonPressedLong);
-        userButton.attachDoubleClick(userButtonDoublePressed);
-        userButton.attachMultiClick(userButtonMultiPressed);
-        userButton.attachLongPressStart(userButtonPressedLongStart);
-        userButton.attachLongPressStop(userButtonPressedLongStop);
-#if defined(ARCH_PORTDUINO)
-        if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC)
-            wakeOnIrq(settingsMap[user], FALLING);
-#else
-        wakeOnIrq(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, FALLING);
-#endif
-#endif
-#ifdef BUTTON_PIN_ALT
-        userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
-#ifdef INPUT_PULLUP_SENSE
-        // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
-        pinMode(BUTTON_PIN_ALT, INPUT_PULLUP_SENSE);
-#endif
-        userButtonAlt.attachClick(userButtonPressed);
-        userButtonAlt.attachDuringLongPress(userButtonPressedLong);
-        userButtonAlt.attachDoubleClick(userButtonDoublePressed);
-        userButtonAlt.attachLongPressStart(userButtonPressedLongStart);
-        userButtonAlt.attachLongPressStop(userButtonPressedLongStop);
-        wakeOnIrq(BUTTON_PIN_ALT, FALLING);
-#endif
-
-#ifdef BUTTON_PIN_TOUCH
-        userButtonTouch = OneButton(BUTTON_PIN_TOUCH, true, true);
-        userButtonTouch.attachClick(touchPressed);
-        wakeOnIrq(BUTTON_PIN_TOUCH, FALLING);
-#endif
-    }
-
-  protected:
-    /// If the button is pressed we suppress CPU sleep until release
-    int32_t runOnce() override
-    {
-        canSleep = true; // Assume we should not keep the board awake
-
-#if defined(BUTTON_PIN)
-        userButton.tick();
-        canSleep &= userButton.isIdle();
-#elif defined(ARCH_PORTDUINO)
-        if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) {
-            userButton.tick();
-            canSleep &= userButton.isIdle();
-        }
-#endif
-#ifdef BUTTON_PIN_ALT
-        userButtonAlt.tick();
-        canSleep &= userButtonAlt.isIdle();
-#endif
-#ifdef BUTTON_PIN_TOUCH
-        userButtonTouch.tick();
-        canSleep &= userButtonTouch.isIdle();
-#endif
-        // if (!canSleep) LOG_DEBUG("Suppressing sleep!\n");
-        // else LOG_DEBUG("sleep ok\n");
-
-        return 50;
-    }
-
-  private:
-    static void touchPressed()
-    {
-        screen->forceDisplay();
-        LOG_DEBUG("touch press!\n");
-    }
-
-    static void userButtonPressed()
-    {
-        // LOG_DEBUG("press!\n");
-#ifdef BUTTON_PIN
-        if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
-             moduleConfig.canned_message.inputbroker_pin_press) ||
-            !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
-            !moduleConfig.canned_message.enabled) {
-            powerFSM.trigger(EVENT_PRESS);
-        }
-#endif
-#if defined(ARCH_PORTDUINO)
-        if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) &&
-                (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) ||
-            !moduleConfig.canned_message.enabled) {
-            powerFSM.trigger(EVENT_PRESS);
-        }
-#endif
-    }
-    static void userButtonPressedLong()
-    {
-        // LOG_DEBUG("Long press!\n");
-        // If user button is held down for 5 seconds, shutdown the device.
-        if ((millis() - longPressTime > 5000) && (longPressTime > 0)) {
-#if defined(ARCH_NRF52) || defined(ARCH_ESP32)
-            // Do actual shutdown when button released, otherwise the button release
-            // may wake the board immediatedly.
-            if ((!shutdown_on_long_stop) && (millis() > 30 * 1000)) {
-                screen->startShutdownScreen();
-                LOG_INFO("Shutdown from long press");
-                playBeep();
-#ifdef PIN_LED1
-                ledOff(PIN_LED1);
-#endif
-#ifdef PIN_LED2
-                ledOff(PIN_LED2);
-#endif
-#ifdef PIN_LED3
-                ledOff(PIN_LED3);
-#endif
-                shutdown_on_long_stop = true;
-            }
-#endif
-        } else {
-            // LOG_DEBUG("Long press %u\n", (millis() - longPressTime));
-        }
-    }
-
-    static void userButtonDoublePressed()
-    {
-#if defined(USE_EINK) && defined(PIN_EINK_EN)
-        digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
-#endif
-        screen->print("Sent ad-hoc ping\n");
-        service.refreshLocalMeshNode();
-        service.sendNetworkPing(NODENUM_BROADCAST, true);
-    }
-
-    static void userButtonMultiPressed()
-    {
-        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();
-            }
-        }
-    }
-
-    static void userButtonPressedLongStart()
-    {
-#ifdef T_DECK
-        // False positive long-press triggered on T-Deck with i2s audio, so short circuit
-        if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
-            return;
-        }
-#endif
-        if (millis() > 30 * 1000) {
-            LOG_DEBUG("Long press start!\n");
-            longPressTime = millis();
-        }
-    }
-
-    static void userButtonPressedLongStop()
-    {
-        if (millis() > 30 * 1000) {
-            LOG_DEBUG("Long press stop!\n");
-            longPressTime = 0;
-            if (shutdown_on_long_stop) {
-                playShutdownMelody();
-                delay(3000);
-                power->shutdown();
-            }
-        }
-    }
+    // IRQ callbacks
+    static void touchPressed() { btnEvent = BUTTON_EVENT_TOUCH_PRESSED; }
+    static void userButtonPressed() { btnEvent = BUTTON_EVENT_PRESSED; }
+    static void userButtonDoublePressed() { btnEvent = BUTTON_EVENT_DOUBLE_PRESSED; }
+    static void userButtonMultiPressed() { btnEvent = BUTTON_EVENT_MULTI_PRESSED; }
+    static void userButtonPressedLongStart();
+    static void userButtonPressedLongStop();
 };
-
-} // namespace concurrency
--- a/src/DebugConfiguration.h
+++ b/src/DebugConfiguration.h
@@ -28,7 +28,7 @@
 #define DEBUG_PORT (*console) // Serial debug port

 #ifdef USE_SEGGER
-#define DEBUG_PORT
+// #undef DEBUG_PORT
 #define LOG_DEBUG(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #define LOG_INFO(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #define LOG_WARN(...) SEGGER_RTT_printf(0, __VA_ARGS__)
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -127,8 +127,6 @@ class AnalogBatteryLevel : public HasBatteryLevel
 {
    /**
     * Battery state of charge, from 0 to 100 or -1 for unknown
-     *
-     * FIXME - use a lipo lookup table, the current % full is super wrong
     */
    virtual int getBatteryPercent() override
    {
@@ -137,13 +135,32 @@ class AnalogBatteryLevel : public HasBatteryLevel
        if (v < noBatVolt)
            return -1; // If voltage is super low assume no battery installed

-#ifdef ARCH_ESP32
+#ifdef NO_BATTERY_LEVEL_ON_CHARGE
        // This does not work on a RAK4631 with battery connected
        if (v > chargingVolt)
            return 0; // While charging we can't report % full on the battery
 #endif
-
-        return clamp((int)(100 * (v - emptyVolt) / (fullVolt - emptyVolt)), 0, 100);
+        /**
+         * @brief   Battery voltage lookup table interpolation to obtain a more
+         * precise percentage rather than the old proportional one.
+         * @author  Gabriele Russo
+         * @date    06/02/2024
+         */
+        float battery_SOC = 0.0;
+        uint16_t voltage = v / NUM_CELLS; // single cell voltage (average)
+        for (int i = 0; i < NUM_OCV_POINTS; i++) {
+            if (OCV[i] <= voltage) {
+                if (i == 0) {
+                    battery_SOC = 100.0; // 100% full
+                } else {
+                    // interpolate between OCV[i] and OCV[i-1]
+                    battery_SOC = (float)100.0 / (NUM_OCV_POINTS - 1.0) *
+                                  (NUM_OCV_POINTS - 1.0 - i + ((float)voltage - OCV[i]) / (OCV[i - 1] - OCV[i]));
+                }
+                break;
+            }
+        }
+        return clamp((int)(battery_SOC), 0, 100);
    }

    /**
@@ -165,7 +182,7 @@ class AnalogBatteryLevel : public HasBatteryLevel

 #ifndef BATTERY_SENSE_SAMPLES
 #define BATTERY_SENSE_SAMPLES                                                                                                    \
-    30 // Set the number of samples, it has an effect of increasing sensitivity in complex electromagnetic environment.
+    15 // Set the number of samples, it has an effect of increasing sensitivity in complex electromagnetic environment.
 #endif

 #ifdef BATTERY_PIN
@@ -191,12 +208,11 @@ class AnalogBatteryLevel : public HasBatteryLevel
            raw = raw / BATTERY_SENSE_SAMPLES;
            scaled = operativeAdcMultiplier * ((1000 * AREF_VOLTAGE) / pow(2, BATTERY_SENSE_RESOLUTION_BITS)) * raw;
 #endif
-            // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
-            last_read_value = scaled;
-            return scaled;
-        } else {
-            return last_read_value;
+            last_read_value += (scaled - last_read_value) * 0.5; // Virtual LPF
+            // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u filtered=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled), (uint32_t)
+            // (last_read_value));
        }
+        return last_read_value;
 #endif // BATTERY_PIN
        return 0;
    }
@@ -209,24 +225,56 @@ class AnalogBatteryLevel : public HasBatteryLevel
    {

        uint32_t raw = 0;
+        uint8_t raw_c = 0; // raw reading counter

 #ifndef BAT_MEASURE_ADC_UNIT // ADC1
-#ifdef ADC_CTRL
-        if (heltec_version == 5) {
-            pinMode(ADC_CTRL, OUTPUT);
-            digitalWrite(ADC_CTRL, HIGH);
-            delay(10);
-        }
+#ifdef ADC_CTRL              // enable adc voltage divider when we need to read
+        pinMode(ADC_CTRL, OUTPUT);
+        digitalWrite(ADC_CTRL, ADC_CTRL_ENABLED);
+        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);
+            int val_ = adc1_get_raw(adc_channel);
+            if (val_ >= 0) { // save only valid readings
+                raw += val_;
+                raw_c++;
+            }
+            // delayMicroseconds(100);
        }
+#ifdef ADC_CTRL // disable adc voltage divider when we need to read
+        digitalWrite(ADC_CTRL, !ADC_CTRL_ENABLED);
 #endif
-#else  // ADC2
+#else // ADC2
+#ifdef ADC_CTRL
+#if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0)
+        pinMode(ADC_CTRL, OUTPUT);
+        digitalWrite(ADC_CTRL, LOW); // ACTIVE LOW
+        delay(10);
+#endif
+#endif // End ADC_CTRL
+
+#ifdef CONFIG_IDF_TARGET_ESP32S3 // ESP32S3
+        // ADC2 wifi bug workaround not required, breaks compile
+        // On ESP32S3, ADC2 can take turns with Wifi (?)
+
+        int32_t adc_buf;
+        esp_err_t read_result;
+
+        // Multiple samples
+        for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
+            adc_buf = 0;
+            read_result = -1;
+
+            read_result = adc2_get_raw(adc_channel, ADC_WIDTH_BIT_12, &adc_buf);
+            if (read_result == ESP_OK) {
+                raw += adc_buf;
+                raw_c++; // Count valid samples
+            } else {
+                LOG_DEBUG("An attempt to sample ADC2 failed\n");
+            }
+        }
+
+#else  // Other ESP32
        int32_t adc_buf = 0;
        for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
            // ADC2 wifi bug workaround, see
@@ -235,10 +283,18 @@ class AnalogBatteryLevel : public HasBatteryLevel
            SET_PERI_REG_MASK(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_DATA_INV);
            adc2_get_raw(adc_channel, ADC_WIDTH_BIT_12, &adc_buf);
            raw += adc_buf;
+            raw_c++;
        }
 #endif // BAT_MEASURE_ADC_UNIT
-        raw = raw / BATTERY_SENSE_SAMPLES;
-        return raw;
+
+#ifdef ADC_CTRL
+#if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0)
+        digitalWrite(ADC_CTRL, HIGH);
+#endif
+#endif // End ADC_CTRL
+
+#endif // End BAT_MEASURE_ADC_UNIT
+        return (raw / (raw_c < 1 ? 1 : raw_c));
    }
 #endif

@@ -272,22 +328,14 @@ class AnalogBatteryLevel : public HasBatteryLevel
    /// If we see a battery voltage higher than physics allows - assume charger is pumping
    /// in power

-#ifndef BAT_FULLVOLT
-#define BAT_FULLVOLT 4200
-#endif
-#ifndef BAT_EMPTYVOLT
-#define BAT_EMPTYVOLT 3270
-#endif
-#ifndef BAT_CHARGINGVOLT
-#define BAT_CHARGINGVOLT 4210
-#endif
-#ifndef BAT_NOBATVOLT
-#define BAT_NOBATVOLT 2230
-#endif
-
-    /// For heltecs with no battery connected, the measured voltage is 2204, so raising to 2230 from 2100
-    const float fullVolt = BAT_FULLVOLT, emptyVolt = BAT_EMPTYVOLT, chargingVolt = BAT_CHARGINGVOLT, noBatVolt = BAT_NOBATVOLT;
-    float last_read_value = 0.0;
+    /// For heltecs with no battery connected, the measured voltage is 2204, so
+    // need to be higher than that, in this case is 2500mV (3000-500)
+    const uint16_t OCV[NUM_OCV_POINTS] = {OCV_ARRAY};
+    const float chargingVolt = (OCV[0] + 10) * NUM_CELLS;
+    const float noBatVolt = (OCV[NUM_OCV_POINTS - 1] - 500) * NUM_CELLS;
+    // Start value from minimum voltage for the filter to not start from 0
+    // that could trigger some events.
+    float last_read_value = (OCV[NUM_OCV_POINTS - 1] * NUM_CELLS);
    uint32_t last_read_time_ms = 0;

 #if defined(HAS_TELEMETRY) && !defined(ARCH_PORTDUINO)
@@ -364,8 +412,11 @@ bool Power::analogInit()
    adc1_config_channel_atten(adc_channel, atten);
 #else // ADC2
    adc2_config_channel_atten(adc_channel, atten);
+#ifndef CONFIG_IDF_TARGET_ESP32S3
    // ADC2 wifi bug workaround
+    // Not required with ESP32S3, breaks compile
    RTC_reg_b = READ_PERI_REG(SENS_SAR_READ_CTRL2_REG);
+#endif
 #endif
    // calibrate ADC
    esp_adc_cal_value_t val_type = esp_adc_cal_characterize(unit, atten, width, DEFAULT_VREF, adc_characs);
@@ -374,13 +425,16 @@ bool Power::analogInit()
        LOG_INFO("ADCmod: ADC characterization based on Two Point values stored in eFuse\n");
    } else if (val_type == ESP_ADC_CAL_VAL_EFUSE_VREF) {
        LOG_INFO("ADCmod: ADC characterization based on reference voltage stored in eFuse\n");
-    } else {
+    }
+#ifdef CONFIG_IDF_TARGET_ESP32S3
+    // ESP32S3
+    else if (val_type == ESP_ADC_CAL_VAL_EFUSE_TP_FIT) {
+        LOG_INFO("ADCmod: ADC Characterization based on Two Point values and fitting curve coefficients stored in eFuse\n");
+    }
+#endif
+    else {
        LOG_INFO("ADCmod: ADC characterization based on default reference voltage\n");
    }
-#if defined(HELTEC_V3) || defined(HELTEC_WSL_V3)
-    pinMode(37, OUTPUT); // needed for P channel mosfet to work
-    digitalWrite(37, LOW);
-#endif
 #endif // ARCH_ESP32

 #ifdef ARCH_NRF52
@@ -389,11 +443,12 @@ bool Power::analogInit()
 #else
    analogReference(AR_INTERNAL); // 3.6V
 #endif
-    analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS); // Default of 12 is not very linear. Recommended to use 10 or 11
-                                                         // depending on needed resolution.
-
 #endif // ARCH_NRF52

+#ifndef ARCH_ESP32
+    analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS);
+#endif
+
    batteryLevel = &analogLevel;
    return true;
 #else
@@ -460,11 +515,11 @@ void Power::readPowerStatus()
                batteryChargePercent = batteryLevel->getBatteryPercent();
            } else {
                // If the AXP192 returns a percentage less than 0, the feature is either not supported or there is an error
-                // In that case, we compute an estimate of the charge percent based on maximum and minimum voltages defined in
-                // power.h
-                batteryChargePercent =
-                    clamp((int)(((batteryVoltageMv - BAT_MILLIVOLTS_EMPTY) * 1e2) / (BAT_MILLIVOLTS_FULL - BAT_MILLIVOLTS_EMPTY)),
-                          0, 100);
+                // In that case, we compute an estimate of the charge percent based on open circuite voltage table defined
+                // in power.h
+                batteryChargePercent = clamp((int)(((batteryVoltageMv - (OCV[NUM_OCV_POINTS - 1] * NUM_CELLS)) * 1e2) /
+                                                   ((OCV[0] * NUM_CELLS) - (OCV[NUM_OCV_POINTS - 1] * NUM_CELLS))),
+                                             0, 100);
            }
        }

@@ -529,10 +584,11 @@ void Power::readPowerStatus()

 #endif

-        // If we have a battery at all and it is less than 10% full, force deep sleep if we have more than 10 low readings in
-        // a row
+        // If we have a battery at all and it is less than 0%, force deep sleep if we have more than 10 low readings in
+        // a row. NOTE: min LiIon/LiPo voltage is 2.0 to 2.5V, current OCV min is set to 3100 that is large enough.
+        //
        if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
-            if (batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS) {
+            if (batteryLevel->getBattVoltage() < OCV[NUM_OCV_POINTS - 1]) {
                low_voltage_counter++;
                LOG_DEBUG("Low voltage counter: %d/10\n", low_voltage_counter);
                if (low_voltage_counter > 10) {
@@ -900,4 +956,4 @@ bool Power::axpChipInit()
 #else
    return false;
 #endif
-}
+}
--- a/src/PowerFSM.cpp
+++ b/src/PowerFSM.cpp
@@ -245,7 +245,9 @@ Fsm powerFSM(&stateBOOT);
 void PowerFSM_setup()
 {
    bool isRouter = (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER ? 1 : 0);
+    bool isInfrastructureRole = isRouter || config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER;
    bool isTrackerOrSensor = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
+                             config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
                             config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR;
    bool hasPower = isPowered();

@@ -356,10 +358,10 @@ void PowerFSM_setup()
    // 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,
+        powerFSM.add_timed_transition(&stateNB, isInfrastructureRole ? &stateSDS : &stateLS,
                                      getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL,
                                      "Min wake timeout");
-        powerFSM.add_timed_transition(&stateDARK, &stateLS,
+        powerFSM.add_timed_transition(&stateDARK, isInfrastructureRole ? &stateSDS : &stateLS,
                                      getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs),
                                      NULL, "Bluetooth timeout");
    }
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -142,8 +142,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 // GPS
 // -----------------------------------------------------------------------------
-
+#ifndef GPS_BAUDRATE
 #define GPS_BAUDRATE 9600
+#endif

 #ifndef GPS_THREAD_INTERVAL
 #define GPS_THREAD_INTERVAL 200
@@ -161,6 +162,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* Step #3: mop up with disabled values for HAS_ options not handled by the above two */

+// -----------------------------------------------------------------------------
+// GPS
+// -----------------------------------------------------------------------------
+
+#ifndef GPS_BAUDRATE
+#define GPS_BAUDRATE 9600
+#endif
+#ifndef GPS_THREAD_INTERVAL
+#define GPS_THREAD_INTERVAL 100
+#endif
+
 #ifndef HAS_WIFI
 #define HAS_WIFI 0
 #endif
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -319,133 +319,274 @@ bool GPS::setup()
            delay(250);
            _serial_gps->write("$CFGMSG,6,1,0\r\n");
            delay(250);
-
        } else if (gnssModel == GNSS_MODEL_UBLOX) {
            // Configure GNSS system to GPS+SBAS+GLONASS (Module may restart after this command)
            // We need set it because by default it is GPS only, and we want to use GLONASS too
            // Also we need SBAS for better accuracy and extra features
            // ToDo: Dynamic configure GNSS systems depending of LoRa region

-            if (strncmp(info.hwVersion, "00040007", 8) !=
-                0) { // The original ublox 6 is GPS only and doesn't support the UBX-CFG-GNSS message
-                if (strncmp(info.hwVersion, "00070000", 8) == 0) { // Max7 seems to only support GPS *or* GLONASS
-                    LOG_DEBUG("Setting GPS+SBAS\n");
-                    msglen = makeUBXPacket(0x06, 0x3e, sizeof(_message_GNSS_7), _message_GNSS_7);
-                    _serial_gps->write(UBXscratch, msglen);
-                } else {
-                    msglen = makeUBXPacket(0x06, 0x3e, sizeof(_message_GNSS), _message_GNSS);
-                    _serial_gps->write(UBXscratch, msglen);
-                }
+            if (strncmp(info.hwVersion, "000A0000", 8) != 0) {
+                if (strncmp(info.hwVersion, "00040007", 8) != 0) {
+                    // The original ublox Neo-6 is GPS only and doesn't support the UBX-CFG-GNSS message
+                    // Max7 seems to only support GPS *or* GLONASS
+                    // Neo-7 is supposed to support GPS *and* GLONASS but NAKs the CFG-GNSS command to do it
+                    // So treat all the u-blox 7 series as GPS only
+                    // M8 can support 3 constallations at once so turn on GPS, GLONASS and Galileo (or BeiDou)

-                if (getACK(0x06, 0x3e, 800) == GNSS_RESPONSE_NAK) {
-                    // It's not critical if the module doesn't acknowledge this configuration.
-                    LOG_INFO("Unable to reconfigure GNSS - defaults maintained. Is this module GPS-only?\n");
-                } else {
                    if (strncmp(info.hwVersion, "00070000", 8) == 0) {
-                        LOG_INFO("GNSS configured for GPS+SBAS. Pause for 0.75s before sending next command.\n");
+                        LOG_DEBUG("Setting GPS+SBAS\n");
+                        msglen = makeUBXPacket(0x06, 0x3e, sizeof(_message_GNSS_7), _message_GNSS_7);
+                        _serial_gps->write(UBXscratch, msglen);
                    } else {
-                        LOG_INFO("GNSS configured for GPS+SBAS+GLONASS. Pause for 0.75s before sending next command.\n");
+                        msglen = makeUBXPacket(0x06, 0x3e, sizeof(_message_GNSS_8), _message_GNSS_8);
+                        _serial_gps->write(UBXscratch, msglen);
+                    }
+
+                    if (getACK(0x06, 0x3e, 800) == GNSS_RESPONSE_NAK) {
+                        // It's not critical if the module doesn't acknowledge this configuration.
+                        LOG_INFO("Unable to reconfigure GNSS - defaults maintained. Is this module GPS-only?\n");
+                    } else {
+                        if (strncmp(info.hwVersion, "00070000", 8) == 0) {
+                            LOG_INFO("GNSS configured for GPS+SBAS. Pause for 0.75s before sending next command.\n");
+                        } else {
+                            LOG_INFO(
+                                "GNSS configured for GPS+SBAS+GLONASS+Galileo. Pause for 0.75s before sending next command.\n");
+                        }
+                        // Documentation say, we need wait atleast 0.5s after reconfiguration of GNSS module, before sending next
+                        // commands for the M8 it tends to be more... 1 sec should be enough ;>)
+                        delay(1000);
                    }
-                    // Documentation say, we need wait atleast 0.5s after reconfiguration of GNSS module, before sending next
-                    // commands
-                    delay(750);
                }
-            }
-
-            msglen = makeUBXPacket(0x06, 0x39, sizeof(_message_JAM), _message_JAM);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x39, 300) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to enable interference resistance.\n");
-            }
-
-            msglen = makeUBXPacket(0x06, 0x23, sizeof(_message_NAVX5), _message_NAVX5);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x23, 300) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to configure extra settings.\n");
-            }
-
-            // ublox-M10S can be compatible with UBLOX traditional protocol, so the following sentence settings are also valid
-
-            msglen = makeUBXPacket(0x06, 0x08, sizeof(_message_1HZ), _message_1HZ);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x08, 300) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to set GPS update rate.\n");
-            }
-
-            msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GLL), _message_GLL);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x01, 300) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to disable NMEA GGL.\n");
-            }
-
-            msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GSA), _message_GSA);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x01, 300) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to Enable NMEA GSA.\n");
-            }
-
-            msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GSV), _message_GSV);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x01, 300) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to disable NMEA GSV.\n");
-            }
-
-            msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_VTG), _message_VTG);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x01, 300) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to disable NMEA VTG.\n");
-            }
-
-            msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_RMC), _message_RMC);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x01, 300) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to enable NMEA RMC.\n");
-            }
-
-            msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GGA), _message_GGA);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x01, 300) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to enable NMEA GGA.\n");
-            }
-
-            msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_AID), _message_AID);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x01, 300) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to disable UBX-AID.\n");
-            }
-
-            if (uBloxProtocolVersion >= 18) {
-                msglen = makeUBXPacket(0x06, 0x86, sizeof(_message_PMS), _message_PMS);
+                // Disable Text Info messages
+                msglen = makeUBXPacket(0x06, 0x02, sizeof(_message_DISABLE_TXT_INFO), _message_DISABLE_TXT_INFO);
+                clearBuffer();
                _serial_gps->write(UBXscratch, msglen);
-                if (getACK(0x06, 0x86, 300) != GNSS_RESPONSE_OK) {
-                    LOG_WARN("Unable to enable powersaving for GPS.\n");
+                if (getACK(0x06, 0x02, 500) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to disable text info messages.\n");
                }
-            } else {
-                if (strncmp(info.hwVersion, "00040007", 8) == 0) { // This PSM mode is only for Neo-6
-                    msglen = makeUBXPacket(0x06, 0x11, 0x2, _message_CFG_RXM_ECO);
+                // ToDo add M10 tests for below
+                if (strncmp(info.hwVersion, "00080000", 8) == 0) {
+                    msglen = makeUBXPacket(0x06, 0x39, sizeof(_message_JAM_8), _message_JAM_8);
+                    clearBuffer();
                    _serial_gps->write(UBXscratch, msglen);
-                    if (getACK(0x06, 0x11, 300) != GNSS_RESPONSE_OK) {
-                        LOG_WARN("Unable to enable powersaving ECO mode for Neo-6.\n");
+                    if (getACK(0x06, 0x39, 500) != GNSS_RESPONSE_OK) {
+                        LOG_WARN("Unable to enable interference resistance.\n");
                    }
-                    msglen = makeUBXPacket(0x06, 0x3B, 44, _message_CFG_PM2);
+
+                    msglen = makeUBXPacket(0x06, 0x23, sizeof(_message_NAVX5_8), _message_NAVX5_8);
+                    clearBuffer();
                    _serial_gps->write(UBXscratch, msglen);
-                    if (getACK(0x06, 0x3B, 300) != GNSS_RESPONSE_OK) {
+                    if (getACK(0x06, 0x23, 500) != GNSS_RESPONSE_OK) {
+                        LOG_WARN("Unable to configure NAVX5_8 settings.\n");
+                    }
+                } else {
+                    msglen = makeUBXPacket(0x06, 0x39, sizeof(_message_JAM_6_7), _message_JAM_6_7);
+                    _serial_gps->write(UBXscratch, msglen);
+                    if (getACK(0x06, 0x39, 500) != GNSS_RESPONSE_OK) {
+                        LOG_WARN("Unable to enable interference resistance.\n");
+                    }
+
+                    msglen = makeUBXPacket(0x06, 0x23, sizeof(_message_NAVX5), _message_NAVX5);
+                    _serial_gps->write(UBXscratch, msglen);
+                    if (getACK(0x06, 0x23, 500) != GNSS_RESPONSE_OK) {
+                        LOG_WARN("Unable to configure NAVX5 settings.\n");
+                    }
+                }
+                // Turn off unwanted NMEA messages, set update rate
+
+                msglen = makeUBXPacket(0x06, 0x08, sizeof(_message_1HZ), _message_1HZ);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x08, 500) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to set GPS update rate.\n");
+                }
+
+                msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GLL), _message_GLL);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to disable NMEA GLL.\n");
+                }
+
+                msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GSA), _message_GSA);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to Enable NMEA GSA.\n");
+                }
+
+                msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GSV), _message_GSV);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to disable NMEA GSV.\n");
+                }
+
+                msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_VTG), _message_VTG);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to disable NMEA VTG.\n");
+                }
+
+                msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_RMC), _message_RMC);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to enable NMEA RMC.\n");
+                }
+
+                msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GGA), _message_GGA);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to enable NMEA GGA.\n");
+                }
+
+                if (uBloxProtocolVersion >= 18) {
+                    msglen = makeUBXPacket(0x06, 0x86, sizeof(_message_PMS), _message_PMS);
+                    clearBuffer();
+                    _serial_gps->write(UBXscratch, msglen);
+                    if (getACK(0x06, 0x86, 500) != GNSS_RESPONSE_OK) {
+                        LOG_WARN("Unable to enable powersaving for GPS.\n");
+                    }
+                    msglen = makeUBXPacket(0x06, 0x3B, sizeof(_message_CFG_PM2), _message_CFG_PM2);
+                    _serial_gps->write(UBXscratch, msglen);
+                    if (getACK(0x06, 0x3B, 500) != GNSS_RESPONSE_OK) {
                        LOG_WARN("Unable to enable powersaving details for GPS.\n");
                    }
+                    // For M8 we want to enable NMEA vserion 4.10 so we can see the additional sats.
+                    if (strncmp(info.hwVersion, "00080000", 8) == 0) {
+                        msglen = makeUBXPacket(0x06, 0x17, sizeof(_message_NMEA), _message_NMEA);
+                        clearBuffer();
+                        _serial_gps->write(UBXscratch, msglen);
+                        if (getACK(0x06, 0x17, 500) != GNSS_RESPONSE_OK) {
+                            LOG_WARN("Unable to enable NMEA 4.10.\n");
+                        }
+                    }
                } else {
-                    msglen = makeUBXPacket(0x06, 0x11, 0x2, _message_CFG_RXM_PSM);
-                    _serial_gps->write(UBXscratch, msglen);
-                    if (getACK(0x06, 0x11, 300) != GNSS_RESPONSE_OK) {
-                        LOG_WARN("Unable to enable powersaving mode for GPS.\n");
+                    if (strncmp(info.hwVersion, "00040007", 8) == 0) { // This PSM mode is only for Neo-6
+                        msglen = makeUBXPacket(0x06, 0x11, 0x2, _message_CFG_RXM_ECO);
+                        _serial_gps->write(UBXscratch, msglen);
+                        if (getACK(0x06, 0x11, 500) != GNSS_RESPONSE_OK) {
+                            LOG_WARN("Unable to enable powersaving ECO mode for Neo-6.\n");
+                        }
+                        msglen = makeUBXPacket(0x06, 0x3B, sizeof(_message_CFG_PM2), _message_CFG_PM2);
+                        _serial_gps->write(UBXscratch, msglen);
+                        if (getACK(0x06, 0x3B, 500) != GNSS_RESPONSE_OK) {
+                            LOG_WARN("Unable to enable powersaving details for GPS.\n");
+                        }
+                        msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_AID), _message_AID);
+                        _serial_gps->write(UBXscratch, msglen);
+                        if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
+                            LOG_WARN("Unable to disable UBX-AID.\n");
+                        }
+                    } else {
+                        msglen = makeUBXPacket(0x06, 0x11, 0x2, _message_CFG_RXM_PSM);
+                        _serial_gps->write(UBXscratch, msglen);
+                        if (getACK(0x06, 0x11, 500) != GNSS_RESPONSE_OK) {
+                            LOG_WARN("Unable to enable powersaving mode for GPS.\n");
+                        }
+
+                        msglen = makeUBXPacket(0x06, 0x3B, sizeof(_message_CFG_PM2), _message_CFG_PM2);
+                        _serial_gps->write(UBXscratch, msglen);
+                        if (getACK(0x06, 0x3B, 500) != GNSS_RESPONSE_OK) {
+                            LOG_WARN("Unable to enable powersaving details for GPS.\n");
+                        }
                    }
                }
-            }
-            msglen = makeUBXPacket(0x06, 0x09, sizeof(_message_SAVE), _message_SAVE);
-            _serial_gps->write(UBXscratch, msglen);
-            if (getACK(0x06, 0x09, 2000) != GNSS_RESPONSE_OK) {
-                LOG_WARN("Unable to save GNSS module configuration.\n");
+
+                msglen = makeUBXPacket(0x06, 0x09, sizeof(_message_SAVE), _message_SAVE);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x09, 2000) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to save GNSS module configuration.\n");
+                } else {
+                    LOG_INFO("GNSS module configuration saved!\n");
+                }
            } else {
-                LOG_INFO("GNSS module configuration saved!\n");
+                // LOG_INFO("u-blox M10 hardware found.\n");
+                delay(1000);
+                // First disable all NMEA messages in RAM layer
+                msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_NMEA_RAM), _message_VALSET_DISABLE_NMEA_RAM);
+                clearBuffer();
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to disable NMEA messages for M10 GPS RAM.\n");
+                }
+                delay(250);
+                // Next disable unwanted NMEA messages in BBR layer
+                msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_NMEA_BBR), _message_VALSET_DISABLE_NMEA_BBR);
+                clearBuffer();
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to disable NMEA messages for M10 GPS BBR.\n");
+                }
+                delay(250);
+                // Disable Info txt messages in RAM layer
+                msglen =
+                    makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_TXT_INFO_RAM), _message_VALSET_DISABLE_TXT_INFO_RAM);
+                clearBuffer();
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to disable Info messages for M10 GPS RAM.\n");
+                }
+                delay(250);
+                // Next disable Info txt messages in BBR layer
+                msglen =
+                    makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_TXT_INFO_BBR), _message_VALSET_DISABLE_TXT_INFO_BBR);
+                clearBuffer();
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to disable Info messages for M10 GPS BBR.\n");
+                }
+                // Do M10 configuration for Power Management.
+
+                msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_PM_RAM), _message_VALSET_PM_RAM);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to enable powersaving for M10 GPS RAM.\n");
+                }
+                msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_PM_BBR), _message_VALSET_PM_BBR);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to enable powersaving for M10 GPS BBR.\n");
+                }
+
+                delay(250);
+                msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_ITFM_RAM), _message_VALSET_ITFM_RAM);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to enable Jamming detection M10 GPS RAM.\n");
+                }
+                msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_ITFM_BBR), _message_VALSET_ITFM_BBR);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to enable Jamming detection M10 GPS BBR.\n");
+                }
+
+                // Here is where the init commands should go to do further M10 initialization.
+                delay(250);
+                msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_SBAS_RAM), _message_VALSET_DISABLE_SBAS_RAM);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to disable SBAS M10 GPS RAM.\n");
+                }
+                delay(750); // will cause a receiver restart so wait a bit
+                msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_SBAS_BBR), _message_VALSET_DISABLE_SBAS_BBR);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to disable SBAS M10 GPS BBR.\n");
+                }
+                delay(750); // will cause a receiver restart so wait a bit
+                // Done with initialization, Now enable wanted NMEA messages in BBR layer so they will survive a periodic sleep.
+                msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_ENABLE_NMEA_BBR), _message_VALSET_ENABLE_NMEA_BBR);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to enable messages for M10 GPS BBR.\n");
+                }
+                delay(250);
+                // Next enable wanted NMEA messages in RAM layer
+                msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_ENABLE_NMEA_RAM), _message_VALSET_ENABLE_NMEA_RAM);
+                _serial_gps->write(UBXscratch, msglen);
+                if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
+                    LOG_WARN("Unable to enable messages for M10 GPS RAM.\n");
+                }
+                // As the M10 has no flash, the best we can do to preserve the config is to set it in RAM and BBR.
+                // BBR will survive a restart, and power off for a while, but modules with small backup
+                // batteries or super caps will not retain the config for a long power off time.
            }
        }
        didSerialInit = true;
@@ -499,12 +640,12 @@ void GPS::setGPSPower(bool on, bool standbyOnly, uint32_t sleepTime)
 #endif
 #ifdef PIN_GPS_STANDBY // Specifically the standby pin for L76K and clones
    if (on) {
-        LOG_INFO("Waking GPS");
+        LOG_INFO("Waking GPS\n");
        pinMode(PIN_GPS_STANDBY, OUTPUT);
        digitalWrite(PIN_GPS_STANDBY, 1);
        return;
    } else {
-        LOG_INFO("GPS entering sleep");
+        LOG_INFO("GPS entering sleep\n");
        // notifyGPSSleep.notifyObservers(NULL);
        pinMode(PIN_GPS_STANDBY, OUTPUT);
        digitalWrite(PIN_GPS_STANDBY, 0);
@@ -515,10 +656,17 @@ void GPS::setGPSPower(bool on, bool standbyOnly, uint32_t sleepTime)
        if (gnssModel == GNSS_MODEL_UBLOX) {
            uint8_t msglen;
            LOG_DEBUG("Sleep Time: %i\n", sleepTime);
-            for (int i = 0; i < 4; i++) {
-                gps->_message_PMREQ[0 + i] = sleepTime >> (i * 8); // Encode the sleep time in millis into the packet
+            if (strncmp(info.hwVersion, "000A0000", 8) != 0) {
+                for (int i = 0; i < 4; i++) {
+                    gps->_message_PMREQ[0 + i] = sleepTime >> (i * 8); // Encode the sleep time in millis into the packet
+                }
+                msglen = gps->makeUBXPacket(0x02, 0x41, sizeof(_message_PMREQ), gps->_message_PMREQ);
+            } else {
+                for (int i = 0; i < 4; i++) {
+                    gps->_message_PMREQ_10[4 + i] = sleepTime >> (i * 8); // Encode the sleep time in millis into the packet
+                }
+                msglen = gps->makeUBXPacket(0x02, 0x41, sizeof(_message_PMREQ_10), gps->_message_PMREQ_10);
            }
-            msglen = gps->makeUBXPacket(0x02, 0x41, 0x08, gps->_message_PMREQ);
            gps->_serial_gps->write(gps->UBXscratch, msglen);
        }
    } else {
@@ -604,7 +752,7 @@ uint32_t GPS::getSleepTime() const
    uint32_t t = config.position.gps_update_interval;

    // We'll not need the GPS thread to wake up again after first acq. with fixed position.
-    if (!config.position.gps_enabled || config.position.fixed_position)
+    if (config.position.gps_mode != meshtastic_Config_PositionConfig_GpsMode_ENABLED || config.position.fixed_position)
        t = UINT32_MAX; // Sleep forever now

    if (t == UINT32_MAX)
@@ -625,21 +773,24 @@ void GPS::publishUpdate()
        // Notify any status instances that are observing us
        const meshtastic::GPSStatus status = meshtastic::GPSStatus(hasValidLocation, isConnected(), isPowerSaving(), p);
        newStatus.notifyObservers(&status);
-        if (config.position.gps_enabled)
+        if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) {
            positionModule->handleNewPosition();
+        }
    }
 }

 int32_t GPS::runOnce()
 {
    if (!GPSInitFinished) {
-        if (!_serial_gps)
+        if (!_serial_gps || config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT) {
+            LOG_INFO("GPS set to not-present. Skipping probe.\n");
            return disable();
+        }
        if (!setup())
            return 2000; // Setup failed, re-run in two seconds

        // We have now loaded our saved preferences from flash
-        if (config.position.gps_enabled == false) {
+        if (config.position.gps_mode != meshtastic_Config_PositionConfig_GpsMode_ENABLED) {
            return disable();
        }
        // ONCE we will factory reset the GPS for bug #327
@@ -662,7 +813,7 @@ int32_t GPS::runOnce()
        // if we have received valid NMEA claim we are connected
        setConnected();
    } else {
-        if ((config.position.gps_enabled == 1) && (gnssModel == GNSS_MODEL_UBLOX)) {
+        if ((config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) && (gnssModel == GNSS_MODEL_UBLOX)) {
            // reset the GPS on next bootup
            if (devicestate.did_gps_reset && (millis() - lastWakeStartMsec > 60000) && !hasFlow()) {
                LOG_DEBUG("GPS is not communicating, trying factory reset on next bootup.\n");
@@ -875,9 +1026,9 @@ GnssModel_t GPS::probe(int serialSpeed)
                strncpy((char *)buffer, &(info.extension[i][4]), sizeof(buffer));
                // LOG_DEBUG("GetModel:%s\n", (char *)buffer);
                if (strlen((char *)buffer)) {
-                    LOG_INFO("UBlox GNSS init succeeded, using UBlox %s GNSS Module\n", (char *)buffer);
+                    LOG_INFO("UBlox GNSS probe succeeded, using UBlox %s GNSS Module\n", (char *)buffer);
                } else {
-                    LOG_INFO("UBlox GNSS init succeeded, using UBlox GNSS Module\n");
+                    LOG_INFO("UBlox GNSS probe succeeded, using UBlox GNSS Module\n");
                }
            } else if (!strncmp(info.extension[i], "PROTVER", 7)) {
                char *ptr = nullptr;
@@ -902,7 +1053,7 @@ GPS *GPS::createGps()
    int8_t _rx_gpio = config.position.rx_gpio;
    int8_t _tx_gpio = config.position.tx_gpio;
    int8_t _en_gpio = config.position.gps_en_gpio;
-#if defined(HAS_GPS) && !defined(ARCH_ESP32)
+#if HAS_GPS && !defined(ARCH_ESP32)
    _rx_gpio = 1; // We only specify GPS serial ports on ESP32. Otherwise, these are just flags.
    _tx_gpio = 1;
 #endif
@@ -1098,7 +1249,7 @@ bool GPS::lookForLocation()

 #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);
+                                        // LOG_DEBUG("FIX QUAL=%d, TYPE=%d\n", fixQual, fixType);
 #endif

    // check if GPS has an acceptable lock
@@ -1280,4 +1431,17 @@ int32_t GPS::disable()
    setAwake(false);

    return INT32_MAX;
+}
+
+void GPS::toggleGpsMode()
+{
+    if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) {
+        config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED;
+        LOG_DEBUG("Flag set to false for gps power. GpsMode: DISABLED\n");
+        disable();
+    } else if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_DISABLED) {
+        config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
+        LOG_DEBUG("Flag set to true to restore power. GpsMode: ENABLED\n");
+        enable();
+    }
 }
--- a/src/gps/GPS.h
+++ b/src/gps/GPS.h
@@ -95,13 +95,18 @@ class GPS : private concurrency::OSThread
    static HardwareSerial *_serial_gps;

    static uint8_t _message_PMREQ[];
+    static uint8_t _message_PMREQ_10[];
    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_GNSS_8[];
+    static const uint8_t _message_JAM_6_7[];
+    static const uint8_t _message_JAM_8[];
    static const uint8_t _message_NAVX5[];
+    static const uint8_t _message_NAVX5_8[];
+    static const uint8_t _message_NMEA[];
+    static const uint8_t _message_DISABLE_TXT_INFO[];
    static const uint8_t _message_1HZ[];
    static const uint8_t _message_GLL[];
    static const uint8_t _message_GSA[];
@@ -113,6 +118,21 @@ class GPS : private concurrency::OSThread
    static const uint8_t _message_PMS[];
    static const uint8_t _message_SAVE[];

+    // VALSET Commands for M10
+    static const uint8_t _message_VALSET_PM[];
+    static const uint8_t _message_VALSET_PM_RAM[];
+    static const uint8_t _message_VALSET_PM_BBR[];
+    static const uint8_t _message_VALSET_ITFM_RAM[];
+    static const uint8_t _message_VALSET_ITFM_BBR[];
+    static const uint8_t _message_VALSET_DISABLE_NMEA_RAM[];
+    static const uint8_t _message_VALSET_DISABLE_NMEA_BBR[];
+    static const uint8_t _message_VALSET_DISABLE_TXT_INFO_RAM[];
+    static const uint8_t _message_VALSET_DISABLE_TXT_INFO_BBR[];
+    static const uint8_t _message_VALSET_ENABLE_NMEA_RAM[];
+    static const uint8_t _message_VALSET_ENABLE_NMEA_BBR[];
+    static const uint8_t _message_VALSET_DISABLE_SBAS_RAM[];
+    static const uint8_t _message_VALSET_DISABLE_SBAS_BBR[];
+
    meshtastic_Position p = meshtastic_Position_init_default;

    GPS() : concurrency::OSThread("GPS") {}
@@ -133,6 +153,9 @@ class GPS : private concurrency::OSThread
    // Disable the thread
    int32_t disable() override;

+    // toggle between enabled/disabled
+    void toggleGpsMode();
+
    void setGPSPower(bool on, bool standbyOnly, uint32_t sleepTime);

    /// Returns true if we have acquired GPS lock.
@@ -144,7 +167,7 @@ class GPS : private concurrency::OSThread
    /// Return true if we are connected to a GPS
    bool isConnected() const { return hasGPS; }

-    bool isPowerSaving() const { return !config.position.gps_enabled; }
+    bool isPowerSaving() const { return config.position.gps_mode != meshtastic_Config_PositionConfig_GpsMode_ENABLED; }

    // Empty the input buffer as quickly as possible
    void clearBuffer();
--- a/src/gps/GeoCoord.cpp
+++ b/src/gps/GeoCoord.cpp
@@ -376,14 +376,17 @@ void GeoCoord::convertWGS84ToOSGB36(const double lat, const double lon, double &
 }

 /// Ported from my old java code, returns distance in meters along the globe
-/// surface (by magic?)
+/// surface (by Haversine formula)
 float GeoCoord::latLongToMeter(double lat_a, double lng_a, double lat_b, double lng_b)
 {
-    double pk = (180 / 3.14169);
-    double a1 = lat_a / pk;
-    double a2 = lng_a / pk;
-    double b1 = lat_b / pk;
-    double b2 = lng_b / pk;
+    // Don't do math if the points are the same
+    if (lat_a == lat_b && lng_a == lng_b)
+        return 0.0;
+
+    double a1 = lat_a / DEG_CONVERT;
+    double a2 = lng_a / DEG_CONVERT;
+    double b1 = lat_b / DEG_CONVERT;
+    double b2 = lng_b / DEG_CONVERT;
    double cos_b1 = cos(b1);
    double cos_a1 = cos(a1);
    double t1 = cos_a1 * cos(a2) * cos_b1 * cos(b2);
--- a/src/gps/GeoCoord.h
+++ b/src/gps/GeoCoord.h
@@ -11,6 +11,7 @@

 #define PI 3.1415926535897932384626433832795
 #define OLC_CODE_LEN 11
+#define DEG_CONVERT 180 / PI

 // Helper functions
 // Raises a number to an exponent, handling negative exponents.
--- a/src/gps/ubx.h
+++ b/src/gps/ubx.h
@@ -1,8 +1,16 @@
+// Power Management
+
 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
+    0x00, 0x00, 0x00, 0x00, // 4 bytes duration of request task (milliseconds)
+    0x02, 0x00, 0x00, 0x00  // Bitfield, set backup = 1
+};
+
+uint8_t GPS::_message_PMREQ_10[] PROGMEM = {
+    0x00,                   // version (0 for this version)
+    0x00, 0x00, 0x00,       // Reserved 1
+    0x00, 0x00, 0x00, 0x00, // 4 bytes duration of request task (milliseconds)
+    0x06, 0x00, 0x00, 0x00, // Bitfield, set backup =1 and force =1
+    0x08, 0x00, 0x00, 0x00  // wakeupSources Wake on uartrx
 };

 const uint8_t GPS::_message_CFG_RXM_PSM[] PROGMEM = {
@@ -21,8 +29,8 @@ const uint8_t GPS::_message_CFG_PM2[] PROGMEM = {
    0x00,                   // Reserved 1, set to 0x06 by u-Center
    0x00,                   // Reserved 2
    0x00,                   // Reserved 1
-    0x00, 0x11, 0x03, 0x00, // flags-> cyclic mode, wait for normal fix ok, do not wake to update RTC or EPH, doNotEnterOff,
-                            //    LimitPeakCurrent
+    0x00, 0x11, 0x03, 0x00, // flags-> cyclic mode, wait for normal fix ok, do not wake to update RTC, doNotEnterOff,
+                            // LimitPeakCurrent
    0xE8, 0x03, 0x00, 0x00, // update period 1000 ms
    0x10, 0x27, 0x00, 0x00, // search period 10s
    0x00, 0x00, 0x00, 0x00, // Grid offset 0
@@ -38,6 +46,9 @@ const uint8_t GPS::_message_CFG_PM2[] PROGMEM = {
    0x00, 0x00, 0x00, 0x00  // 0x64, 0x40, 0x01, 0x00  // reserved 11
 };

+// Constallation setup, none required for Neo-6
+
+// For Neo-7 GPS & SBAS
 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)
@@ -54,36 +65,63 @@ const uint8_t GPS::_message_GNSS_7[] = {
 // 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
+
+// For M8 GPS, GLONASS, Galileo, SBAS, QZSS
+const uint8_t GPS::_message_GNSS_8[] = {
+    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)
+    0x05,                                           // numConfigBlocks (number of 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
+    0x02, 0x04, 0x08, 0x00, 0x01, 0x00, 0x01, 0x01, // Galileo
+    0x05, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01, 0x01, // QZSS
+    0x06, 0x08, 0x0E, 0x00, 0x01, 0x00, 0x01, 0x01  // GLONASS
+};
+/*
+// For M8 GPS, GLONASS, BeiDou, SBAS, QZSS
+const uint8_t GPS::_message_GNSS_8_B[] = {
+ 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) read only for protocol >23
+ 0x05, // numConfigBlocks (number of 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
+ 0x03, 0x08, 0x10, 0x00, 0x01, 0x00, 0x01, 0x01, // BeiDou
+ 0x05, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01, 0x01, // QZSS
+ 0x06, 0x08, 0x0E, 0x00, 0x01, 0x00, 0x01, 0x01  // GLONASS
+};
+*/
+
+// For M8 we want to enable NMEA version 4.10 messages to allow for Galileo and or BeiDou
+const uint8_t GPS::_message_NMEA[]{
+    0x00,                              // filter flags
+    0x41,                              // NMEA Version
+    0x00,                              // Max number of SVs to report per TaklerId
+    0x02,                              // flags
+    0x00, 0x00, 0x00, 0x00,            // gnssToFilter
+    0x00,                              // svNumbering
+    0x00,                              // mainTalkerId
+    0x00,                              // gsvTalkerId
+    0x01,                              // Message version
+    0x00, 0x00,                        // bdsTalkerId 2 chars 0=default
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // Reserved
 };
 // Enable jamming/interference monitor

-// For Neo-6
-const uint8_t GPS::_message_JAM[] = {
-    0xf3, 0xac, 0x62, 0xad, // config1 bbThreshold = 3, cwThreshold = 15, enable = 1, reserved bits 0x16B156
-    0x1e, 0x03, 0x00, 0x00  // config2 antennaSetting Unknown = 0, reserved 3, = 0x00,0x00, reserved 2 = 0x31E
-};
-/* // WIP GPS reconfig
 // For Neo-6, Max-7 and Neo-7
 const uint8_t GPS::_message_JAM_6_7[] = {
-    0xf3, 0xac, 0x62, 0xad,  // config1 bbThreshold = 3, cwThreshold = 15, enable = 1, reserved bits 0x16B156
-    0x1e, 0x03, 0x00, 0x00   // config2 antennaSetting Unknown = 0, reserved 3, = 0x00,0x00, reserved 2 = 0x31E
+    0xf3, 0xac, 0x62, 0xad, // config1 bbThreshold = 3, cwThreshold = 15, enable = 1, reserved bits 0x16B156
+    0x1e, 0x03, 0x00, 0x00  // config2 antennaSetting Unknown = 0, reserved 3, = 0x00,0x00, reserved 2 = 0x31E
 };

 // For M8
 const uint8_t GPS::_message_JAM_8[] = {
-    0xf3, 0xac, 0x62, 0xad,  // config1 bbThreshold = 3, cwThreshold = 15, enable1 = 1, reserved bits 0x16B156
-    0x1e, 0x43, 0x00, 0x00   // config2 antennaSetting Unknown = 0, enable2 = 1, generalBits = 0x31E
+    0xf3, 0xac, 0x62, 0xad, // config1 bbThreshold = 3, cwThreshold = 15, enable1 = 1, reserved bits 0x16B156
+    0x1e, 0x43, 0x00, 0x00  // config2 antennaSetting Unknown = 0, enable2 = 1, generalBits = 0x31E
 };
-*/

 // Configure navigation engine expert settings:
 // there are many variations of what were Reserved fields for the Neo-6 in later versions
@@ -118,11 +156,38 @@ const uint8_t GPS::_message_NAVX5[] = {
    0x00, 0x00,             // Reserved 3
    0x00, 0x00, 0x00, 0x00  // Reserved 4
 };
+// For the M8
+const uint8_t GPS::_message_NAVX5_8[] = {
+    0x02, 0x00,             // msgVer (2 for this version)
+    0x4c, 0x66,             // mask1
+    0x00, 0x00, 0x00, 0x00, // mask2
+    0x00, 0x00,             // Reserved 1
+    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 2
+    0x00,                   // iniFix3D (Initial fix must be 3D) (0 = false 1 = true)
+    0x00, 0x00,             // Reserved 3
+    0x00,                   // ackAiding
+    0x00, 0x00,             // wknRollover 0 = firmware default
+    0x00,                   // sigAttenCompMode
+    0x00,                   // Reserved 4
+    0x00, 0x00,             // Reserved 5
+    0x00, 0x00,             // Reserved 6
+    0x00,                   // usePPP (Precice Point Positioning) (0 = false, 1 = true)
+    0x01,                   // aopCfg  (AssistNow Autonomous configuration) = 1 (enabled)
+    0x00, 0x00,             // Reserved 7
+    0x00, 0x00,             // aopOrbMaxErr = 0 to reset to firmware default
+    0x00, 0x00, 0x00, 0x00, // Reserved 8
+    0x00, 0x00, 0x00,       // Reserved 9
+    0x00                    // useAdr
+};

 // 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.
+// The module defaults for M8, M9, M10 are the same as we use here so no update is necessary
 const uint8_t GPS::_message_1HZ[] = {
    0xE8, 0x03, // Measurement Rate (1000ms for 1Hz)
    0x01, 0x00, // Navigation rate, always 1 in GPS mode
@@ -148,7 +213,7 @@ const uint8_t GPS::_message_GSA[] = {
    0x00,       // Rate for DDC
    0x01,       // Rate for UART1
    0x00,       // Rate for UART2
-    0x00,       // Rate for USB
+    0x01,       // Rate for USB usefull for native linux
    0x00,       // Rate for SPI
    0x00        // Reserved
 };
@@ -182,7 +247,7 @@ const uint8_t GPS::_message_RMC[] = {
    0x00,       // Rate for DDC
    0x01,       // Rate for UART1
    0x00,       // Rate for UART2
-    0x00,       // Rate for USB
+    0x01,       // Rate for USB usefull for native linux
    0x00,       // Rate for SPI
    0x00        // Reserved
 };
@@ -193,7 +258,7 @@ const uint8_t GPS::_message_GGA[] = {
    0x00,       // Rate for DDC
    0x01,       // Rate for UART1
    0x00,       // Rate for UART2
-    0x00,       // Rate for USB
+    0x01,       // Rate for USB, usefull for native linux
    0x00,       // Rate for SPI
    0x00        // Reserved
 };
@@ -210,6 +275,20 @@ const uint8_t GPS::_message_AID[] = {
    0x00        // Reserved
 };

+// Turn off TEXT INFO Messages for all but M10 series
+
+// B5 62 06 02 0A 00 01 00 00 00 03 03 00 03 03 00 1F 20
+const uint8_t GPS::_message_DISABLE_TXT_INFO[] = {
+    0x01,             // Protocol ID for NMEA
+    0x00, 0x00, 0x00, // Reserved
+    0x03,             // I2C
+    0x03,             // I/O Port 1
+    0x00,             // I/O Port 2
+    0x03,             // USB
+    0x03,             // SPI
+    0x00              // 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.
@@ -221,7 +300,7 @@ const uint8_t GPS::_message_AID[] = {
 // 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'.
-// This command applies to M8 and higher products
+// This command applies to M8 products
 const uint8_t GPS::_message_PMS[] = {
    0x00,       // Version (0)
    0x03,       // Power setup value 3 = Agresssive 1Hz
@@ -235,4 +314,140 @@ const uint8_t GPS::_message_SAVE[] = {
    0xFF, 0xFF, 0x00, 0x00, // saveMask: save all sections
    0x00, 0x00, 0x00, 0x00, // loadMask: no sections loaded
    0x17                    // deviceMask: BBR, Flash, EEPROM, and SPI Flash
-};
+};
+
+// As the M10 has no flash, the best we can do to preserve the config is to set it in RAM and BBR.
+// BBR will survive a restart, and power off for a while, but modules with small backup
+// batteries or super caps will not retain the config for a long power off time.
+
+// VALSET Commands for M10
+// Please refer to the M10 Protocol Specification:
+// https://content.u-blox.com/sites/default/files/u-blox-M10-SPG-5.10_InterfaceDescription_UBX-21035062.pdf
+// Where the VALSET/VALGET/VALDEL commands are described in detail.
+// and:
+// https://content.u-blox.com/sites/default/files/u-blox-M10-ROM-5.10_ReleaseNotes_UBX-22001426.pdf
+// for interesting insights.
+/*
+CFG-PM2 has been replaced by many CFG-PM commands
+OPERATEMODE E1 2 (0 | 1 | 2)
+POSUPDATEPERIOD U4 1000ms for M10 must be >= 5s try 5
+ACQPERIOD U4 10 seems ok for M10 def ok
+GRIDOFFSET U4 0 seems ok for M10 def ok
+ONTIME U2 1 will try 1
+MINACQTIME U1 0 will try 0 def ok
+MAXACQTIME U1 stick with default of 0 def ok
+DONOTENTEROFF L 1 stay at 1
+WAITTIMEFIX  L 1 stay with 1
+UPDATEEPH L 1 changed to 1 for gps rework default is 1
+EXTINTWAKE L 0 no ext ints
+EXTINTBACKUP L 0 no ext ints
+EXTINTINACTIVE L 0 no ext ints
+EXTINTACTIVITY U4 0 no ext ints
+LIMITPEAKCURRENT L 1 stay with 1
+*/
+// CFG-PMS has been removed
+
+// Ram layer config message:
+// b5 62 06 8a 26 00 00 01 00 00 01 00 d0 20 02 02 00 d0 40 05 00 00 00 05 00 d0 30 01 00 08 00 d0 10 01 09 00 d0 10 01 10 00 d0
+// 10 01 8b de
+
+// BBR layer config message:
+// b5 62 06 8a 26 00 00 02 00 00 01 00 d0 20 02 02 00 d0 40 05 00 00 00 05 00 d0 30 01 00 08 00 d0 10 01 09 00 d0 10 01 10 00 d0
+// 10 01 8c 03
+
+const uint8_t GPS::_message_VALSET_PM_RAM[] = {0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0xd0, 0x20, 0x02, 0x02, 0x00, 0xd0, 0x40,
+                                               0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0xd0, 0x30, 0x01, 0x00, 0x08, 0x00, 0xd0,
+                                               0x10, 0x01, 0x09, 0x00, 0xd0, 0x10, 0x01, 0x10, 0x00, 0xd0, 0x10, 0x01};
+const uint8_t GPS::_message_VALSET_PM_BBR[] = {0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0xd0, 0x20, 0x02, 0x02, 0x00, 0xd0, 0x40,
+                                               0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0xd0, 0x30, 0x01, 0x00, 0x08, 0x00, 0xd0,
+                                               0x10, 0x01, 0x09, 0x00, 0xd0, 0x10, 0x01, 0x10, 0x00, 0xd0, 0x10, 0x01};
+
+/*
+CFG-ITFM replaced by 5 valset messages which can be combined into one for RAM and one for BBR
+
+20410001 bbthreshold U1 3
+20410002 cwthreshold U1 15
+1041000d enable L        0 -> 1
+20410010 ant E1          0
+10410013 enable aux L    0 -> 1
+
+
+b5 62 06 8a 0e 00 00 01 00 00 0d 00 41 10 01 13 00 41 10 01 63 c6
+*/
+const uint8_t GPS::_message_VALSET_ITFM_RAM[] = {0x00, 0x01, 0x00, 0x00, 0x0d, 0x00, 0x41,
+                                                 0x10, 0x01, 0x13, 0x00, 0x41, 0x10, 0x01};
+const uint8_t GPS::_message_VALSET_ITFM_BBR[] = {0x00, 0x02, 0x00, 0x00, 0x0d, 0x00, 0x41,
+                                                 0x10, 0x01, 0x13, 0x00, 0x41, 0x10, 0x01};
+
+// Turn off all NMEA messages:
+// Ram layer config message:
+// b5 62 06 8a 22 00 00 01 00 00 c0 00 91 20 00 ca 00 91 20 00 c5 00 91 20 00 ac 00 91 20 00 b1 00 91 20 00 bb 00 91 20 00 40 8f
+
+// Disable GLL, GSV, VTG messages in BBR layer
+// BBR layer config message:
+// b5 62 06 8a 13 00 00 02 00 00 ca 00 91 20 00 c5 00 91 20 00 b1 00 91 20 00 f8 4e
+
+const uint8_t GPS::_message_VALSET_DISABLE_NMEA_RAM[] = {
+    /*0x00, 0x01, 0x00, 0x00, 0xca, 0x00, 0x91, 0x20, 0x00, 0xc5, 0x00, 0x91, 0x20, 0x00, 0xb1, 0x00, 0x91, 0x20, 0x00 */
+    0x00, 0x01, 0x00, 0x00, 0xc0, 0x00, 0x91, 0x20, 0x00, 0xca, 0x00, 0x91, 0x20, 0x00, 0xc5, 0x00, 0x91,
+    0x20, 0x00, 0xac, 0x00, 0x91, 0x20, 0x00, 0xb1, 0x00, 0x91, 0x20, 0x00, 0xbb, 0x00, 0x91, 0x20, 0x00};
+
+const uint8_t GPS::_message_VALSET_DISABLE_NMEA_BBR[] = {0x00, 0x02, 0x00, 0x00, 0xca, 0x00, 0x91, 0x20, 0x00, 0xc5,
+                                                         0x00, 0x91, 0x20, 0x00, 0xb1, 0x00, 0x91, 0x20, 0x00};
+
+// Turn off text info messages:
+// Ram layer config message:
+// b5 62 06 8a 09 00 00 01 00 00 07 00 92 20 06 59 50
+
+// BBR layer config message:
+// b5 62 06 8a 09 00 00 02 00 00 07 00 92 20 06 5a 58
+
+// Turn NMEA GSA, GGA, RMC messages on:
+// Ram layer config message:
+// b5 62 06 8a 13 00 00 01 00 00 c0 00 91 20 01 bb 00 91 20 01 ac 00 91 20 01 e1 3b
+
+// BBR layer config message:
+// b5 62 06 8a 13 00 00 02 00 00 c0 00 91 20 01 bb 00 91 20 01 ac 00 91 20 01 e2 4d
+
+const uint8_t GPS::_message_VALSET_DISABLE_TXT_INFO_RAM[] = {0x00, 0x01, 0x00, 0x00, 0x07, 0x00, 0x92, 0x20, 0x03};
+const uint8_t GPS::_message_VALSET_DISABLE_TXT_INFO_BBR[] = {0x00, 0x02, 0x00, 0x00, 0x07, 0x00, 0x92, 0x20, 0x03};
+const uint8_t GPS::_message_VALSET_ENABLE_NMEA_RAM[] = {0x00, 0x01, 0x00, 0x00, 0xc0, 0x00, 0x91, 0x20, 0x01, 0xbb,
+                                                        0x00, 0x91, 0x20, 0x01, 0xac, 0x00, 0x91, 0x20, 0x01};
+const uint8_t GPS::_message_VALSET_ENABLE_NMEA_BBR[] = {0x00, 0x02, 0x00, 0x00, 0xc0, 0x00, 0x91, 0x20, 0x01, 0xbb,
+                                                        0x00, 0x91, 0x20, 0x01, 0xac, 0x00, 0x91, 0x20, 0x01};
+const uint8_t GPS::_message_VALSET_DISABLE_SBAS_RAM[] = {0x00, 0x01, 0x00, 0x00, 0x20, 0x00, 0x31,
+                                                         0x10, 0x00, 0x05, 0x00, 0x31, 0x10, 0x00};
+const uint8_t GPS::_message_VALSET_DISABLE_SBAS_BBR[] = {0x00, 0x02, 0x00, 0x00, 0x20, 0x00, 0x31,
+                                                         0x10, 0x00, 0x05, 0x00, 0x31, 0x10, 0x00};
+/*
+Operational issues with the M10:
+
+PowerSave doesn't work with SBAS, seems like you can have SBAS enabled, but it will never lock
+onto the SBAS sats.
+PowerSave doesn't work with BDS B1C, u-blox says use B1l instead.
+BDS B1l cannot be enabled with BDS B1C or GLONASS L1OF, so GLONASS will work with B1C, but not B1l
+So no powersave with GLONASS and BDS B1l enabled.
+So disable GLONASS and use BDS B1l, which is part of the default M10 config.
+
+GNSS configuration:
+
+Default GNSS configuration is: GPS, Galileo, BDS B1l, with QZSS and SBAS enabled.
+The PMREQ puts the receiver to sleep and wakeup re-acquires really fast and seems to not need
+the PM config. Lets try without it.
+PMREQ sort of works with SBAS, but the awake time is too short to re-acquire any SBAS sats.
+The defination of "Got Fix" doesn't seem to include SBAS. Much more too this...
+Even if it was, it can take minutes (up to 12.5),
+even under good sat visability conditions to re-acquire the SBAS data.
+
+Another effect fo the quick transition to sleep is that no other sats will be acquired so the
+sat count will tend to remain at what the initial fix was.
+*/
+
+// GNSS disable SBAS as recommended by u-blox if using GNSS defaults and power save mode
+/*
+Ram layer config message:
+b5 62 06 8a 0e 00 00 01 00 00 20 00 31 10 00 05 00 31 10 00 46 87
+
+BBR layer config message:
+b5 62 06 8a 0e 00 00 02 00 00 20 00 31 10 00 05 00 31 10 00 47 94
+*/
--- a/src/graphics/EInkDisplay2.cpp
+++ b/src/graphics/EInkDisplay2.cpp
@@ -7,7 +7,7 @@
 #include "main.h"
 #include <SPI.h>

-#ifdef HELTEC_WIRELESS_PAPER
+#if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0)
 SPIClass *hspi = NULL;
 #endif

@@ -18,7 +18,7 @@ SPIClass *hspi = NULL;
 #define TECHO_DISPLAY_MODEL GxEPD2_154_D67
 #elif defined(RAK4630)

-// GxEPD2_213_BN - RAK14000 2.13 inch b/w 250x122 - changed from GxEPD2_213_B74 - which was not going to give partial update
+// GxEPD2_213_BN - RAK14000 2.13 inch b/w 250x122 - changed from GxEPD2_213_B74 - which was not going to give fast refresh
 // support
 #define TECHO_DISPLAY_MODEL GxEPD2_213_BN

@@ -48,6 +48,11 @@ SPIClass *hspi = NULL;
 #elif defined(HELTEC_WIRELESS_PAPER)
 // #define TECHO_DISPLAY_MODEL GxEPD2_213_T5D
 #define TECHO_DISPLAY_MODEL GxEPD2_213_FC1
+
+#elif defined(HELTEC_WIRELESS_PAPER_V1_0)
+// 2.13" 122x250 - DEPG0213BNS800
+#define TECHO_DISPLAY_MODEL GxEPD2_213_BN
+
 #endif

 GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT> *adafruitDisplay;
@@ -60,7 +65,7 @@ EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl, OLEDDISPLAY_GEOMETRY

    // GxEPD2_213_BN - RAK14000 2.13 inch b/w 250x122
    setGeometry(GEOMETRY_RAWMODE, 250, 122);
-
+    this->displayBufferSize = 250 * (128 / 8);
    // GxEPD2_420_M01
    // setGeometry(GEOMETRY_RAWMODE, 300, 400);

@@ -70,6 +75,17 @@ EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl, OLEDDISPLAY_GEOMETRY
    // GxEPD2_154_M09
    // setGeometry(GEOMETRY_RAWMODE, 200, 200);

+#elif defined(HELTEC_WIRELESS_PAPER_V1_0)
+
+    // The display's memory is actually 128px x 250px
+    // Setting the buffersize manually prevents 122/8 truncating to a 15 byte width
+    // (Or something like that..)
+
+    this->geometry = GEOMETRY_RAWMODE;
+    this->displayWidth = 250;
+    this->displayHeight = 122;
+    this->displayBufferSize = 250 * (128 / 8);
+
 #elif defined(HELTEC_WIRELESS_PAPER)
    // GxEPD2_213_BN - 2.13 inch b/w 250x122
    setGeometry(GEOMETRY_RAWMODE, 250, 122);
@@ -93,6 +109,12 @@ EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl, OLEDDISPLAY_GEOMETRY
    setGeometry(GEOMETRY_RAWMODE, 296, 128);
    LOG_DEBUG("GEOMETRY_RAWMODE, 296, 128\n");

+#elif defined(ESP32_S3_PICO)
+
+    // GxEPD2_290_T94_V2
+    setGeometry(GEOMETRY_RAWMODE, EPD_WIDTH, EPD_HEIGHT);
+    LOG_DEBUG("GEOMETRY_RAWMODE, 296, 128\n");
+
 #endif
    // setGeometry(GEOMETRY_RAWMODE, 128, 64); // old resolution
    // setGeometry(GEOMETRY_128_64); // We originally used this because I wasn't sure if rawmode worked - it does
@@ -109,59 +131,69 @@ bool EInkDisplay::forceDisplay(uint32_t msecLimit)
    // No need to grab this lock because we are on our own SPI bus
    // concurrency::LockGuard g(spiLock);

+#if defined(USE_EINK_DYNAMIC_REFRESH)
+    // Decide between full refresh, fast refresh, or skipping the update
+    bool continueUpdate = determineRefreshMode();
+    if (!continueUpdate)
+        return false;
+#else
+
    uint32_t now = millis();
    uint32_t sinceLast = now - lastDrawMsec;

-    if (adafruitDisplay && (sinceLast > msecLimit || lastDrawMsec == 0)) {
+    if (adafruitDisplay && (sinceLast > msecLimit || lastDrawMsec == 0))
        lastDrawMsec = now;
-
-        // FIXME - only draw bits have changed (use backbuf similar to the other displays)
-        // tft.drawBitmap(0, 0, buffer, 128, 64, TFT_YELLOW, TFT_BLACK);
-        for (uint32_t y = 0; y < displayHeight; y++) {
-            for (uint32_t x = 0; x < displayWidth; x++) {
-                // get src pixel in the page based ordering the OLED lib uses FIXME, super inefficient
-                auto b = buffer[x + (y / 8) * displayWidth];
-                auto isset = b & (1 << (y & 7));
-                adafruitDisplay->drawPixel(x, y, isset ? COLORED : UNCOLORED);
-            }
-        }
-
-        LOG_DEBUG("Updating E-Paper... ");
-
-#if defined(TTGO_T_ECHO)
-        adafruitDisplay->nextPage();
-#elif defined(RAK4630) || defined(MAKERPYTHON)
-
-        // RAK14000 2.13 inch b/w 250x122 actually now does support partial updates
-
-        // Full update mode (slow)
-        // adafruitDisplay->display(false); // FIXME, use partial update mode
-
-        // Only enable for e-Paper with support for partial updates and comment out above adafruitDisplay->display(false);
-        //  1.54 inch 200x200 - GxEPD2_154_M09
-        //  2.13 inch 250x122 - GxEPD2_213_BN
-        //  2.9 inch 296x128 - GxEPD2_290_T5D
-        //  4.2 inch 300x400 - GxEPD2_420_M01
-        adafruitDisplay->nextPage();
-
-#elif defined(PCA10059) || defined(M5_COREINK)
-        adafruitDisplay->nextPage();
-#elif defined(HELTEC_WIRELESS_PAPER)
-        adafruitDisplay->nextPage();
-#elif defined(PRIVATE_HW) || defined(my)
-        adafruitDisplay->nextPage();
+    else
+        return false;

 #endif

-        // Put screen to sleep to save power (possibly not necessary because we already did poweroff inside of display)
-        adafruitDisplay->hibernate();
-        LOG_DEBUG("done\n");
-
-        return true;
-    } else {
-        // LOG_DEBUG("Skipping eink display\n");
-        return false;
+    // FIXME - only draw bits have changed (use backbuf similar to the other displays)
+    // tft.drawBitmap(0, 0, buffer, 128, 64, TFT_YELLOW, TFT_BLACK);
+    for (uint32_t y = 0; y < displayHeight; y++) {
+        for (uint32_t x = 0; x < displayWidth; x++) {
+            // get src pixel in the page based ordering the OLED lib uses FIXME, super inefficient
+            auto b = buffer[x + (y / 8) * displayWidth];
+            auto isset = b & (1 << (y & 7));
+            adafruitDisplay->drawPixel(x, y, isset ? COLORED : UNCOLORED);
+        }
    }
+
+    LOG_DEBUG("Updating E-Paper... ");
+
+#if defined(TTGO_T_ECHO)
+    adafruitDisplay->nextPage();
+#elif defined(RAK4630) || defined(MAKERPYTHON)
+
+    // RAK14000 2.13 inch b/w 250x122 actually now does support fast refresh
+
+    // Full update mode (slow)
+    // adafruitDisplay->display(false); // FIXME, use fast refresh mode
+
+    // Only enable for e-Paper with support for fast updates and comment out above adafruitDisplay->display(false);
+    //  1.54 inch 200x200 - GxEPD2_154_M09
+    //  2.13 inch 250x122 - GxEPD2_213_BN
+    //  2.9 inch 296x128 - GxEPD2_290_T5D
+    //  4.2 inch 300x400 - GxEPD2_420_M01
+    adafruitDisplay->nextPage();
+
+#elif defined(PCA10059) || defined(M5_COREINK)
+    adafruitDisplay->nextPage();
+#elif defined(HELTEC_WIRELESS_PAPER_V1_0)
+    adafruitDisplay->nextPage();
+#elif defined(HELTEC_WIRELESS_PAPER)
+    adafruitDisplay->nextPage();
+#elif defined(ESP32_S3_PICO)
+    adafruitDisplay->nextPage();
+#elif defined(PRIVATE_HW) || defined(my)
+    adafruitDisplay->nextPage();
+#endif
+
+    // Put screen to sleep to save power (possibly not necessary because we already did poweroff inside of display)
+    adafruitDisplay->hibernate();
+    LOG_DEBUG("done\n");
+
+    return true;
 }

 // Write the buffer to the display memory
@@ -170,8 +202,16 @@ void EInkDisplay::display(void)
    // We don't allow regular 'dumb' display() calls to draw on eink until we've shown
    // at least one forceDisplay() keyframe.  This prevents flashing when we should the critical
    // bootscreen (that we want to look nice)
-    if (lastDrawMsec)
+
+#ifdef USE_EINK_DYNAMIC_REFRESH
+    lowPriority();
+    forceDisplay();
+    highPriority();
+#else
+    if (lastDrawMsec) {
        forceDisplay(slowUpdateMsec); // Show the first screen a few seconds after boot, then slower
+    }
+#endif
 }

 // Send a command to the display (low level function)
@@ -215,20 +255,54 @@ bool EInkDisplay::connect()
    {
        if (eink_found) {
            auto lowLevel = new TECHO_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY);
-
            adafruitDisplay = new GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT>(*lowLevel);
-
            adafruitDisplay->init(115200, true, 10, false, SPI1, SPISettings(4000000, MSBFIRST, SPI_MODE0));
-
-            // RAK14000 2.13 inch b/w 250x122 does actually now support partial updates
+            // RAK14000 2.13 inch b/w 250x122 does actually now support fast refresh
            adafruitDisplay->setRotation(3);
-            // Partial update support for  1.54, 2.13 RAK14000 b/w , 2.9 and 4.2
+            // Fast refresh support for  1.54, 2.13 RAK14000 b/w , 2.9 and 4.2
            // adafruitDisplay->setRotation(1);
            adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
        } else {
            (void)adafruitDisplay;
        }
    }
+
+#elif defined(HELTEC_WIRELESS_PAPER_V1_0)
+    {
+        // Is this a normal boot, or a wake from deep sleep?
+        esp_sleep_wakeup_cause_t wakeReason = esp_sleep_get_wakeup_cause();
+
+        // If waking from sleep, need to reverse rtc_gpio_isolate(), called in cpuDeepSleep()
+        // Otherwise, SPI won't work
+        if (wakeReason != ESP_SLEEP_WAKEUP_UNDEFINED) {
+            // HSPI + other display pins
+            rtc_gpio_hold_dis((gpio_num_t)PIN_EINK_SCLK);
+            rtc_gpio_hold_dis((gpio_num_t)PIN_EINK_DC);
+            rtc_gpio_hold_dis((gpio_num_t)PIN_EINK_RES);
+            rtc_gpio_hold_dis((gpio_num_t)PIN_EINK_BUSY);
+            rtc_gpio_hold_dis((gpio_num_t)PIN_EINK_CS);
+            rtc_gpio_hold_dis((gpio_num_t)PIN_EINK_MOSI);
+        }
+
+        // Start HSPI
+        hspi = new SPIClass(HSPI);
+        hspi->begin(PIN_EINK_SCLK, -1, PIN_EINK_MOSI, PIN_EINK_CS); // SCLK, MISO, MOSI, SS
+
+        // Enable VExt (ACTIVE LOW)
+        // Unsure if called elsewhere first?
+        delay(100);
+        pinMode(Vext, OUTPUT);
+        digitalWrite(Vext, LOW);
+        delay(100);
+
+        // Create GxEPD2 objects
+        auto lowLevel = new TECHO_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY, *hspi);
+        adafruitDisplay = new GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT>(*lowLevel);
+
+        // Init GxEPD2
+        adafruitDisplay->init();
+        adafruitDisplay->setRotation(3);
+    }
 #elif defined(HELTEC_WIRELESS_PAPER)
    {
        hspi = new SPIClass(HSPI);
@@ -256,7 +330,7 @@ bool EInkDisplay::connect()
    adafruitDisplay->init(115200, true, 40, false, SPI, SPISettings(4000000, MSBFIRST, SPI_MODE0));
    adafruitDisplay->setRotation(0);
    adafruitDisplay->setPartialWindow(0, 0, EPD_WIDTH, EPD_HEIGHT);
-#elif defined(my)
+#elif defined(my) || defined(ESP32_S3_PICO)
    {
        auto lowLevel = new TECHO_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY);
        adafruitDisplay = new GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT>(*lowLevel);
@@ -270,8 +344,195 @@ bool EInkDisplay::connect()
    // adafruitDisplay->fillScreen(UNCOLORED);
    // adafruitDisplay->drawCircle(100, 100, 20, COLORED);
    // adafruitDisplay->display(false);
-
    return true;
 }

-#endif
+// Use a mix of full refresh, fast refresh, and update skipping, to balance urgency and display health
+#if defined(USE_EINK_DYNAMIC_REFRESH)
+
+// Suggest that subsequent updates should use fast-refresh
+void EInkDisplay::highPriority()
+{
+    isHighPriority = true;
+}
+
+// Suggest that subsequent updates should use full-refresh
+void EInkDisplay::lowPriority()
+{
+    isHighPriority = false;
+}
+
+// Full-refresh is explicitly requested for next one update - no skipping please
+void EInkDisplay::demandFullRefresh()
+{
+    demandingFull = true;
+}
+
+// configure display for fast-refresh
+void EInkDisplay::configForFastRefresh()
+{
+    // Display-specific code can go here
+#if defined(PRIVATE_HW)
+#else
+    // Otherwise:
+    adafruitDisplay->setPartialWindow(0, 0, adafruitDisplay->width(), adafruitDisplay->height());
+#endif
+}
+
+// Configure display for full-refresh
+void EInkDisplay::configForFullRefresh()
+{
+    // Display-specific code can go here
+#if defined(PRIVATE_HW)
+#else
+    // Otherwise:
+    adafruitDisplay->setFullWindow();
+#endif
+}
+
+#ifdef EINK_FASTREFRESH_ERASURE_LIMIT
+// Count black pixels in an image. Used for "erasure tracking"
+int32_t EInkDisplay::countBlackPixels()
+{
+    int32_t blackCount = 0; // Signed, to avoid underflow when comparing
+    for (uint16_t b = 0; b < (displayWidth / 8) * displayHeight; b++) {
+        for (uint8_t i = 0; i < 7; i++) {
+            // Check if each bit is black or white
+            blackCount += (buffer[b] >> i) & 1;
+        }
+    }
+    return blackCount;
+}
+
+// Evaluate the (rough) amount of black->white pixel change since last full refresh
+bool EInkDisplay::tooManyErasures()
+{
+    // Ideally, we would compare the new and old buffers, to count *actual* white-to-black pixel changes
+    // but that would require substantially more "code tampering"
+
+    // Get the black pixel stats for this image
+    int32_t blackCount = countBlackPixels();
+    int32_t blackDifference = blackCount - prevBlackCount;
+
+    // Update the running total of "erasures" - black pixels which have become white, since last full-refresh
+    if (blackDifference < 0)
+        erasedSinceFull -= blackDifference;
+
+    // Store black pixel count for next time
+    prevBlackCount = blackCount;
+
+    // Log the running total - help devs setup new boards
+    LOG_DEBUG("Dynamic Refresh: erasedSinceFull=%hu, EINK_FASTREFRESH_ERASURE_LIMIT=%hu\n", erasedSinceFull,
+              EINK_FASTREFRESH_ERASURE_LIMIT);
+
+    // Check if too many pixels have been erased
+    if (erasedSinceFull > EINK_FASTREFRESH_ERASURE_LIMIT)
+        return true; // Too many
+    else
+        return false; // Still okay
+}
+#endif // ifdef EINK_FASTREFRESH_ERASURE_LIMIT
+
+bool EInkDisplay::newImageMatchesOld()
+{
+    uint32_t newImageHash = 0;
+
+    // Generate hash: sum all bytes in the image buffer
+    for (uint16_t b = 0; b < (displayWidth / 8) * displayHeight; b++) {
+        newImageHash += buffer[b];
+    }
+
+    // Compare hashes
+    bool hashMatches = (newImageHash == prevImageHash);
+
+    // Update the cached hash
+    prevImageHash = newImageHash;
+
+    // Return the comparison result
+    return hashMatches;
+}
+
+// Choose between, full-refresh, fast refresh, and update skipping, to balance urgency and display health.
+bool EInkDisplay::determineRefreshMode()
+{
+    uint32_t now = millis();
+    uint32_t sinceLast = now - lastUpdateMsec;
+
+    // If rate-limiting dropped a high-priority update:
+    // promote this update, so it runs ASAP
+    if (missedHighPriorityUpdate) {
+        isHighPriority = true;
+        missedHighPriorityUpdate = false;
+    }
+
+    // Abort: if too soon for a new frame (unless demanding full)
+    if (!demandingFull && isHighPriority && fastRefreshCount > 0 && sinceLast < highPriorityLimitMsec) {
+        LOG_DEBUG("Dynamic Refresh: update skipped. Exceeded EINK_HIGHPRIORITY_LIMIT_SECONDS\n");
+        missedHighPriorityUpdate = true;
+        return false;
+    }
+    if (!demandingFull && !isHighPriority && !demandingFull && sinceLast < lowPriorityLimitMsec) {
+        return false;
+    }
+
+    // If demanded full refresh: give it to them
+    if (demandingFull)
+        needsFull = true;
+
+    // Check if old image (fast-refresh) should be redrawn (as full), for image quality
+    if (fastRefreshCount > 0 && !isHighPriority)
+        needsFull = true;
+
+    // If too many fast updates, require a full-refresh (display health)
+    if (fastRefreshCount >= fastRefreshLimit)
+        needsFull = true;
+
+#ifdef EINK_FASTREFRESH_ERASURE_LIMIT
+    // Some displays struggle with erasing black pixels to white, during fast-refresh
+    if (tooManyErasures())
+        needsFull = true;
+#endif
+
+    // If image matches
+    // (Block must run, even if full already selected, to store hash for next time)
+    if (newImageMatchesOld()) {
+        // If low priority: limit rate
+        // otherwise, every loop() will run the hash method
+        if (!isHighPriority)
+            lastUpdateMsec = now;
+
+        // If update is *not* for display health or image quality, skip it
+        if (!needsFull)
+            return false;
+    }
+
+    // Conditions assessed - not skipping - load the appropriate config
+
+    // If options require a full refresh
+    if (!isHighPriority || needsFull) {
+        if (fastRefreshCount > 0)
+            configForFullRefresh();
+
+        LOG_DEBUG("Dynamic Refresh: conditions met for full-refresh\n");
+        fastRefreshCount = 0;
+        needsFull = false;
+        demandingFull = false;
+        erasedSinceFull = 0; // Reset the count for EINK_FASTREFRESH_ERASURE_LIMIT - tracks ghosting buildup
+    }
+
+    // If options allow a fast-refresh
+    else {
+        if (fastRefreshCount == 0)
+            configForFastRefresh();
+
+        LOG_DEBUG("Dynamic Refresh: conditions met for fast-refresh\n");
+        fastRefreshCount++;
+    }
+
+    lastUpdateMsec = now; // Mark time for rate limiting
+    return true;          // Instruct calling method to continue with update
+}
+
+#endif // End USE_EINK_DYNAMIC_REFRESH
+
+#endif
--- a/src/graphics/EInkDisplay2.h
+++ b/src/graphics/EInkDisplay2.h
@@ -2,6 +2,11 @@

 #include <OLEDDisplay.h>

+#if defined(HELTEC_WIRELESS_PAPER_V1_0)
+// Re-enable SPI after deep sleep: rtc_gpio_hold_dis()
+#include "driver/rtc_io.h"
+#endif
+
 /**
 * An adapter class that allows using the GxEPD2 library as if it was an OLEDDisplay implementation.
 *
@@ -49,4 +54,81 @@ class EInkDisplay : public OLEDDisplay

    // Connect to the display
    virtual bool connect() override;
+
+#if defined(USE_EINK_DYNAMIC_REFRESH)
+    // Full, fast, or skip: balance urgency with display health
+
+    // Use fast refresh if EITHER:
+    // * highPriority() was set
+    // * a highPriority() update was previously skipped, for rate-limiting - (EINK_HIGHPRIORITY_LIMIT_SECONDS)
+
+    // Use full refresh if EITHER:
+    // * lowPriority() was set
+    // * demandFullRefresh() was called - (single shot)
+    // * too many fast updates in a row: protect display - (EINK_FASTREFRESH_REPEAT_LIMIT)
+    // * no recent updates, and last update was fast: redraw for image quality (EINK_LOWPRIORITY_LIMIT_SECONDS)
+    // * (optional) too many "erasures" since full-refresh (black pixels cleared to white)
+
+    // Rate limit if:
+    // * lowPriority() - (EINK_LOWPRIORITY_LIMIT_SECONDS)
+    // * highPriority(), if multiple fast updates have run back-to-back - (EINK_HIGHPRIORITY_LIMIT_SECONDS)
+
+    // Skip update entirely if ALL criteria met:
+    // * new image matches old image
+    // * lowPriority()
+    // * no call to demandFullRefresh()
+    // * not redrawing for image quality
+    // * not refreshing for display health
+
+    // ------------------------------------
+
+    // To implement for your E-Ink display:
+    // * edit configForFastRefresh()
+    // * edit configForFullRefresh()
+    // * add macros to variant.h, and adjust to taste:
+
+    /*
+        #define USE_EINK_DYNAMIC_REFRESH
+        #define EINK_LOWPRIORITY_LIMIT_SECONDS 30
+        #define EINK_HIGHPRIORITY_LIMIT_SECONDS 1
+        #define EINK_FASTREFRESH_REPEAT_LIMIT 5
+        #define EINK_FASTREFRESH_ERASURE_LIMIT 300     // optional
+    */
+
+  public:
+    void highPriority();      // Suggest fast refresh
+    void lowPriority();       // Suggest full refresh
+    void demandFullRefresh(); // For next update: explicitly request full refresh
+
+  protected:
+    void configForFastRefresh(); // Display specific code to select fast refresh mode
+    void configForFullRefresh(); // Display specific code to return to full refresh mode
+    bool newImageMatchesOld();   // Is the new update actually different to the last image?
+    bool determineRefreshMode(); // Called immediately before data written to display - choose refresh mode, or abort update
+#ifdef EINK_FASTREFRESH_ERASURE_LIMIT
+    int32_t countBlackPixels(); // Calculate the number of black pixels in the new image
+    bool tooManyErasures();     // Has too much "ghosting" (black pixels erased to white) accumulated since last full-refresh?
+#endif
+
+    bool isHighPriority = true;            // Does the method calling update believe that this is urgent?
+    bool needsFull = false;                // Is a full refresh forced? (display health)
+    bool demandingFull = false;            // Was full refresh specifically requested? (splash screens, etc)
+    bool missedHighPriorityUpdate = false; // Was a high priority update skipped for rate-limiting?
+    uint16_t fastRefreshCount = 0;         // How many fast updates have occurred since last full refresh?
+    uint32_t lastUpdateMsec = 0;           // When did the last update occur?
+    uint32_t prevImageHash = 0;            // Used to check if update will change screen image (skippable or not)
+    int32_t prevBlackCount = 0;            // How many black pixels were in the previous image
+    uint32_t erasedSinceFull = 0;          // How many black pixels have been set back to white since last full-refresh? (roughly)
+
+    // Set in variant.h
+    const uint32_t lowPriorityLimitMsec = (uint32_t)1000 * EINK_LOWPRIORITY_LIMIT_SECONDS;   // Max rate for fast refreshes
+    const uint32_t highPriorityLimitMsec = (uint32_t)1000 * EINK_HIGHPRIORITY_LIMIT_SECONDS; // Max rate for full refreshes
+    const uint32_t fastRefreshLimit = EINK_FASTREFRESH_REPEAT_LIMIT; // Max consecutive fast updates, before full is triggered
+
+#else // !USE_EINK_DYNAMIC_REFRESH
+    // Tolerate calls to these methods anywhere, just to be safe
+    void highPriority() {}
+    void lowPriority() {}
+    void demandFullRefresh() {}
+#endif
 };
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -150,7 +150,7 @@ static void drawIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDispl

    // draw centered icon left to right and centered above the one line of app text
    display->drawXbm(x + (SCREEN_WIDTH - icon_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - icon_height) / 2 + 2,
-                     icon_width, icon_height, (const uint8_t *)icon_bits);
+                     icon_width, icon_height, icon_bits);

    display->setFont(FONT_MEDIUM);
    display->setTextAlignment(TEXT_ALIGN_LEFT);
@@ -274,7 +274,7 @@ static void drawWelcomeScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
    if ((millis() / 10000) % 2) {
        display->drawString(x, y + FONT_HEIGHT_SMALL * 2 - 3, "Set the region using the");
        display->drawString(x, y + FONT_HEIGHT_SMALL * 3 - 3, "Meshtastic Android, iOS,");
-        display->drawString(x, y + FONT_HEIGHT_SMALL * 4 - 3, "Flasher or CLI client.");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 4 - 3, "Web or CLI clients.");
    } else {
        display->drawString(x, y + FONT_HEIGHT_SMALL * 2 - 3, "Visit meshtastic.org");
        display->drawString(x, y + FONT_HEIGHT_SMALL * 3 - 3, "for more information.");
@@ -558,15 +558,20 @@ static void drawGPS(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus
    }
 }

-// Draw status when gps is disabled by PMU
+// Draw status when GPS is disabled or not present
 static void drawGPSpowerstat(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps)
 {
-    String displayLine = "GPS disabled";
-    int16_t xPos = display->getStringWidth(displayLine);
-
-    if (!config.position.gps_enabled) {
-        display->drawString(x + xPos, y, displayLine);
+    String displayLine;
+    int pos;
+    if (y < FONT_HEIGHT_SMALL) { // Line 1: use short string
+        displayLine = config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT ? "No GPS" : "GPS off";
+        pos = SCREEN_WIDTH - display->getStringWidth(displayLine);
+    } else {
+        displayLine = config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT ? "GPS not present"
+                                                                                                       : "GPS is disabled";
+        pos = (SCREEN_WIDTH - display->getStringWidth(displayLine)) / 2;
    }
+    display->drawString(x + pos, y, displayLine);
 }

 static void drawGPSAltitude(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps)
@@ -594,7 +599,7 @@ static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const
    String displayLine = "";

    if (!gps->getIsConnected() && !config.position.fixed_position) {
-        displayLine = "No GPS Module";
+        displayLine = "No GPS present";
        display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(displayLine))) / 2, y, displayLine);
    } else if (!gps->getHasLock() && !config.position.fixed_position) {
        displayLine = "No GPS Lock";
@@ -1549,7 +1554,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
        drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 3, nodeStatus);
    }
    // Display GPS status
-    if (!config.position.gps_enabled) {
+    if (config.position.gps_mode != meshtastic_Config_PositionConfig_GpsMode_ENABLED) {
        drawGPSpowerstat(display, x, y + 2, gpsStatus);
    } else {
        if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
@@ -1777,7 +1782,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
    char chUtil[13];
    snprintf(chUtil, sizeof(chUtil), "ChUtil %2.0f%%", airTime->channelUtilizationPercent());
    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(chUtil), y + FONT_HEIGHT_SMALL * 1, chUtil);
-    if (config.position.gps_enabled) {
+    if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) {
        // Line 3
        if (config.display.gps_format !=
            meshtastic_Config_DisplayConfig_GpsCoordinateFormat_DMS) // if DMS then don't draw altitude
@@ -1786,10 +1791,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
        // Line 4
        drawGPScoordinates(display, x, y + FONT_HEIGHT_SMALL * 3, gpsStatus);
    } else {
-        drawGPSpowerstat(display, x - (SCREEN_WIDTH / 4), y + FONT_HEIGHT_SMALL * 2, gpsStatus);
-#ifdef GPS_POWER_TOGGLE
-        display->drawString(x + 30, (y + FONT_HEIGHT_SMALL * 3), " by button");
-#endif
+        drawGPSpowerstat(display, x, y + FONT_HEIGHT_SMALL * 2, gpsStatus);
    }
    /* Display a heartbeat pixel that blinks every time the frame is redrawn */
 #ifdef SHOW_REDRAWS
--- a/src/graphics/TFTDisplay.cpp
+++ b/src/graphics/TFTDisplay.cpp
@@ -90,11 +90,9 @@ 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;
-            }
+            cfg.pin_bl = ST7735_BL_V03;
+#elif defined(ST7735_BL_V05)
+            cfg.pin_bl = ST7735_BL_V05;
 #else
            cfg.pin_bl = ST7735_BL; // Pin number to which the backlight is connected
 #endif
@@ -354,6 +352,8 @@ class LGFX : public lgfx::LGFX_Device
            _panel_instance = new lgfx::Panel_ST7735;
        else if (settingsMap[displayPanel] == st7735s)
            _panel_instance = new lgfx::Panel_ST7735S;
+        else if (settingsMap[displayPanel] == ili9341)
+            _panel_instance = new lgfx::Panel_ILI9341;
        auto buscfg = _bus_instance.config();
        buscfg.spi_mode = 0;

@@ -379,6 +379,8 @@ class LGFX : public lgfx::LGFX_Device
        if (settingsMap[touchscreenModule]) {
            if (settingsMap[touchscreenModule] == xpt2046) {
                _touch_instance = new lgfx::Touch_XPT2046;
+            } else if (settingsMap[touchscreenModule] == stmpe610) {
+                _touch_instance = new lgfx::Touch_STMPE610;
            }
            auto touch_cfg = _touch_instance->config();

@@ -467,30 +469,27 @@ void TFTDisplay::sendCommand(uint8_t com)
        display(true);
        if (settingsMap[displayBacklight] > 0)
            digitalWrite(settingsMap[displayBacklight], TFT_BACKLIGHT_ON);
-#elif 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);
-        }
+#elif defined(ST7735_BL_V03)
+        digitalWrite(ST7735_BL_V03, TFT_BACKLIGHT_ON);
+#elif defined(ST7735_BL_V05)
+        pinMode(ST7735_BL_V05, OUTPUT);
+        digitalWrite(ST7735_BL_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);
-        }
+        digitalWrite(VTFT_CTRL_V03, LOW);
 #endif
+
 #ifdef VTFT_CTRL
        digitalWrite(VTFT_CTRL, LOW);
 #endif

 #ifdef RAK14014
 #elif !defined(M5STACK)
-        tft->setBrightness(128);
+        tft->setBrightness(172);
 #endif
        break;
    }
@@ -499,22 +498,17 @@ void TFTDisplay::sendCommand(uint8_t com)
        tft->clear();
        if (settingsMap[displayBacklight] > 0)
            digitalWrite(settingsMap[displayBacklight], !TFT_BACKLIGHT_ON);
-#elif 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);
-        }
+#elif defined(ST7735_BL_V03)
+        digitalWrite(ST7735_BL_V03, !TFT_BACKLIGHT_ON);
+#elif defined(ST7735_BL_V05)
+        pinMode(ST7735_BL_V05, OUTPUT);
+        digitalWrite(ST7735_BL_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);
-        }
+        digitalWrite(VTFT_CTRL_V03, HIGH);
 #endif
 #ifdef VTFT_CTRL
        digitalWrite(VTFT_CTRL, HIGH);
@@ -584,14 +578,11 @@ bool TFTDisplay::connect()
    LOG_INFO("Power to TFT Backlight\n");
 #endif

-#ifdef ST7735_BACKLIGHT_EN_V03
-    if (heltec_version == 3) {
-        pinMode(ST7735_BACKLIGHT_EN_V03, OUTPUT);
-        digitalWrite(ST7735_BACKLIGHT_EN_V03, TFT_BACKLIGHT_ON);
-    } else {
-        pinMode(ST7735_BACKLIGHT_EN_V05, OUTPUT);
-        digitalWrite(ST7735_BACKLIGHT_EN_V05, TFT_BACKLIGHT_ON);
-    }
+#ifdef ST7735_BL_V03
+    digitalWrite(ST7735_BL_V03, TFT_BACKLIGHT_ON);
+#elif defined(ST7735_BL_V05)
+    pinMode(ST7735_BL_V05, OUTPUT);
+    digitalWrite(ST7735_BL_V05, TFT_BACKLIGHT_ON);
 #endif

    tft->init();
--- a/src/graphics/img/icon.xbm
+++ b/src/graphics/img/icon.xbm
@@ -1,6 +1,6 @@
 #define icon_width 50
 #define icon_height 28
-static char icon_bits[] = {
+static uint8_t icon_bits[] = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x03, 
  0x00, 0x00, 0x00, 0x80, 0x07, 0xC0, 0x07, 0x00, 0x00, 0x00, 0xC0, 0x1F, 
  0xC0, 0x0F, 0x00, 0x00, 0x00, 0xE0, 0x0F, 0xE0, 0x0F, 0x00, 0x00, 0x00, 
@@ -17,4 +17,4 @@ static char icon_bits[] = {
  0xFE, 0x00, 0x00, 0xFC, 0x01, 0x7E, 0x00, 0x7F, 0x00, 0x00, 0xF8, 0x01, 
  0x7E, 0x00, 0x3E, 0x00, 0x00, 0xF8, 0x01, 0x38, 0x00, 0x3C, 0x00, 0x00, 
  0x70, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, };
+  0x00, 0x00, 0x00, 0x00, };
--- a/src/input/RotaryEncoderInterruptBase.cpp
+++ b/src/input/RotaryEncoderInterruptBase.cpp
@@ -104,7 +104,6 @@ RotaryEncoderInterruptBaseStateType RotaryEncoderInterruptBase::intHandler(bool
            newState = ROTARY_EVENT_OCCURRED;
            if ((this->action != ROTARY_ACTION_PRESSED) && (this->action != action)) {
                this->action = action;
-                LOG_DEBUG("Rotary action\n");
            }
        }
    } else if (!actualPinRaising && (otherPinLevel == HIGH)) {
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -159,25 +159,6 @@ 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;
@@ -191,15 +172,10 @@ static int32_t ledBlinker()

 uint32_t timeLastPowered = 0;

-#if HAS_BUTTON || defined(ARCH_PORTDUINO)
-bool ButtonThread::shutdown_on_long_stop = false;
-#endif
-
 static Periodic *ledPeriodic;
 static OSThread *powerFSMthread;
 #if HAS_BUTTON || defined(ARCH_PORTDUINO)
 static OSThread *buttonThread;
-uint32_t ButtonThread::longPressTime = 0;
 #endif
 static OSThread *accelerometerThread;
 static OSThread *ambientLightingThread;
@@ -248,61 +224,31 @@ void setup()
    digitalWrite(PIN_EINK_PWR_ON, HIGH);
 #endif

-#if defined(LORA_TCXO_GPIO)
-    pinMode(LORA_TCXO_GPIO, OUTPUT);
-    digitalWrite(LORA_TCXO_GPIO, HIGH);
-#endif
-
-#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");
-    }
+    pinMode(VEXT_ENABLE_V03, OUTPUT);
+    pinMode(ST7735_BL_V03, OUTPUT);
+    digitalWrite(VEXT_ENABLE_V03, 0); // turn on the display power and antenna boost
+    digitalWrite(ST7735_BL_V03, 1);   // display backligth on
+    LOG_DEBUG("HELTEC Detect Tracker V1.0\n");
+#elif defined(VEXT_ENABLE_V05)
+    pinMode(VEXT_ENABLE_V05, OUTPUT);
+    pinMode(ST7735_BL_V05, OUTPUT);
+    digitalWrite(VEXT_ENABLE_V05, 1); // turn on the lora antenna boost
+    digitalWrite(ST7735_BL_V05, 1);   // turn on display backligth
+    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

 #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);
-    }
+    pinMode(VGNSS_CTRL_V03, OUTPUT);
+    digitalWrite(VGNSS_CTRL_V03, 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);
-    }
+    pinMode(VTFT_CTRL_V03, OUTPUT);
+    digitalWrite(VTFT_CTRL_V03, LOW);
 #endif

 #if defined(VGNSS_CTRL)
@@ -685,7 +631,8 @@ void setup()
    readFromRTC(); // read the main CPU RTC at first (in case we can't get GPS time)

    // If we're taking on the repeater role, ignore GPS
-    if (config.device.role != meshtastic_Config_DeviceConfig_Role_REPEATER) {
+    if (config.device.role != meshtastic_Config_DeviceConfig_Role_REPEATER &&
+        config.position.gps_mode != meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT) {
        gps = GPS::createGps();
    }
    if (gps) {
--- a/src/main.h
+++ b/src/main.h
@@ -70,8 +70,6 @@ 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;
--- a/src/mesh/Channels.cpp
+++ b/src/mesh/Channels.cpp
@@ -87,6 +87,8 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
    channelSettings.psk.bytes[0] = defaultpskIndex;
    channelSettings.psk.size = 1;
    strncpy(channelSettings.name, "", sizeof(channelSettings.name));
+    channelSettings.module_settings.position_precision = 32; // default to sending location on the primary channel
+    channelSettings.has_module_settings = true;

    ch.has_settings = true;
    ch.role = meshtastic_Channel_Role_PRIMARY;
--- a/src/mesh/FloodingRouter.cpp
+++ b/src/mesh/FloodingRouter.cpp
@@ -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 (!moduleConfig.mqtt.enabled && config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER &&
+        if (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!
--- a/src/mesh/MeshModule.cpp
+++ b/src/mesh/MeshModule.cpp
@@ -67,7 +67,7 @@ meshtastic_MeshPacket *MeshModule::allocErrorResponse(meshtastic_Routing_Error e
    return r;
 }

-void MeshModule::callPlugins(const meshtastic_MeshPacket &mp, RxSource src)
+void MeshModule::callPlugins(meshtastic_MeshPacket &mp, RxSource src)
 {
    // LOG_DEBUG("In call modules\n");
    bool moduleFound = false;
@@ -124,9 +124,10 @@ void MeshModule::callPlugins(const meshtastic_MeshPacket &mp, RxSource src)
                } else
                    printPacket("packet on wrong channel, but can't respond", &mp);
            } else {
-
                ProcessMessage handled = pi.handleReceived(mp);

+                pi.alterReceived(mp);
+
                // Possibly send replies (but only if the message was directed to us specifically, i.e. not for promiscious
                // sniffing) also: we only let the one module send a reply, once that happens, remaining modules are not
                // considered
--- a/src/mesh/MeshModule.h
+++ b/src/mesh/MeshModule.h
@@ -64,7 +64,7 @@ class MeshModule

    /** For use only by MeshService
     */
-    static void callPlugins(const meshtastic_MeshPacket &mp, RxSource src = RX_SRC_RADIO);
+    static void callPlugins(meshtastic_MeshPacket &mp, RxSource src = RX_SRC_RADIO);

    static std::vector<MeshModule *> GetMeshModulesWithUIFrames();
    static void observeUIEvents(Observer<const UIFrameEvent *> *observer);
@@ -72,10 +72,7 @@ class MeshModule
                                                                    meshtastic_AdminMessage *request,
                                                                    meshtastic_AdminMessage *response);
 #if HAS_SCREEN
-    virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-    {
-        return;
-    }
+    virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) { return; }
 #endif
  protected:
    const char *name;
@@ -135,10 +132,12 @@ class MeshModule
    @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for
    it
    */
-    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp)
-    {
-        return ProcessMessage::CONTINUE;
-    }
+    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) { return ProcessMessage::CONTINUE; }
+
+    /** Called to change a particular incoming message
+        This allows the module to change the message before it is passed through the rest of the call-chain.
+    */
+    virtual void alterReceived(meshtastic_MeshPacket &mp) {}

    /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
     * so that subclasses can (optionally) send a response back to the original sender.
@@ -151,14 +150,8 @@ class MeshModule
    /***
     * @return true if you want to be alloced a UI screen frame
     */
-    virtual bool wantUIFrame()
-    {
-        return false;
-    }
-    virtual Observable<const UIFrameEvent *> *getUIFrameObservable()
-    {
-        return NULL;
-    }
+    virtual bool wantUIFrame() { return false; }
+    virtual Observable<const UIFrameEvent *> *getUIFrameObservable() { return NULL; }

    meshtastic_MeshPacket *allocAckNak(meshtastic_Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex);

--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -182,7 +182,16 @@ void NodeDB::installDefaultConfig()
 #else
    config.device.disable_triple_click = true;
 #endif
-    config.position.gps_enabled = true;
+#if !HAS_GPS || defined(T_DECK)
+    config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT;
+#elif !defined(GPS_RX_PIN)
+    if (config.position.rx_gpio == 0)
+        config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT;
+    else
+        config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED;
+#else
+    config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
+#endif
    config.position.position_broadcast_smart_enabled = true;
    config.position.broadcast_smart_minimum_distance = 100;
    config.position.broadcast_smart_minimum_interval_secs = 30;
@@ -316,6 +325,17 @@ void NodeDB::installRoleDefaults(meshtastic_Config_DeviceConfig_Role role)
            (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;
+    } else if (role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER) {
+        config.device.node_info_broadcast_secs = ONE_DAY;
+        config.position.position_broadcast_smart_enabled = true;
+        config.position.position_broadcast_secs = 3 * 60; // Every 3 minutes
+        config.position.broadcast_smart_minimum_distance = 20;
+        config.position.broadcast_smart_minimum_interval_secs = 15;
+        // 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;
    } else if (role == meshtastic_Config_DeviceConfig_Role_CLIENT_HIDDEN) {
        config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_LOCAL_ONLY;
        config.device.node_info_broadcast_secs = UINT32_MAX;
@@ -454,6 +474,11 @@ void NodeDB::init()
        memcpy(devicestate.node_remote_hardware_pins, empty, sizeof(empty));
    }

+    if (config.position.gps_enabled) {
+        config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
+        config.position.gps_enabled = 0;
+    }
+
    saveToDisk(saveWhat);
 }

@@ -878,8 +903,8 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
    if (!lite) {
        if ((*numMeshNodes >= MAX_NUM_NODES) || (memGet.getFreeHeap() < meshtastic_NodeInfoLite_size * 3)) {
            if (screen)
-                screen->print("warning: node_db_lite full! erasing oldest entry\n");
-            LOG_INFO("warning: node_db_lite full! erasing oldest entry\n");
+                screen->print("Warn: node database full!\nErasing oldest entry\n");
+            LOG_INFO("Warn: node database full!\nErasing oldest entry\n");
            // look for oldest node and erase it
            uint32_t oldest = UINT32_MAX;
            int oldestIndex = -1;
--- a/src/mesh/ProtobufModule.h
+++ b/src/mesh/ProtobufModule.h
@@ -30,6 +30,10 @@ template <class T> class ProtobufModule : protected SinglePortModule
     */
    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, T *decoded) = 0;

+    /** Called to make changes to a particular incoming message
+     */
+    virtual void alterReceivedProtobuf(meshtastic_MeshPacket &mp, T *decoded){};
+
    /**
     * Return a mesh packet which has been preinited with a particular protobuf data payload and port number.
     * You can then send this packet (after customizing any of the payload fields you might need) with
@@ -86,4 +90,26 @@ template <class T> class ProtobufModule : protected SinglePortModule

        return handleReceivedProtobuf(mp, decoded) ? ProcessMessage::STOP : ProcessMessage::CONTINUE;
    }
+
+    /** Called to alter a particular incoming message
+     */
+    virtual void alterReceived(meshtastic_MeshPacket &mp) override
+    {
+        auto &p = mp.decoded;
+
+        T scratch;
+        T *decoded = NULL;
+        if (mp.which_payload_variant == meshtastic_MeshPacket_decoded_tag && mp.decoded.portnum == ourPortNum) {
+            memset(&scratch, 0, sizeof(scratch));
+            if (pb_decode_from_bytes(p.payload.bytes, p.payload.size, fields, &scratch)) {
+                decoded = &scratch;
+            } else {
+                LOG_ERROR("Error decoding protobuf module!\n");
+                // if we can't decode it, nobody can process it!
+                return;
+            }
+        }
+
+        return alterReceivedProtobuf(mp, decoded);
+    }
 };
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -123,6 +123,13 @@ const RegionInfo regions[] = {
    */
    RDEF(MY_919, 919.0f, 924.0f, 100, 0, 27, true, true, false),

+    /*
+        Singapore
+        SG_923 Band 30d: 917 - 925 MHz at 100mW, no restrictions.
+        https://www.imda.gov.sg/-/media/imda/files/regulation-licensing-and-consultations/ict-standards/telecommunication-standards/radio-comms/imdatssrd.pdf
+    */
+    RDEF(SG_923, 917.0f, 925.0f, 100, 0, 20, true, false, false),
+
    /*
       2.4 GHZ WLAN Band equivalent. Only for SX128x chips.
    */
--- a/src/mesh/ReliableRouter.cpp
+++ b/src/mesh/ReliableRouter.cpp
@@ -168,10 +168,14 @@ bool ReliableRouter::stopRetransmission(GlobalPacketId key)
        auto p = old->packet;
        auto numErased = pending.erase(key);
        assert(numErased == 1);
-        // remove the 'original' (identified by originator and packet->id) from the txqueue and free it
-        cancelSending(getFrom(p), p->id);
-        // now free the pooled copy for retransmission too
-        packetPool.release(p);
+        /* Only when we already transmitted a packet via LoRa, we will cancel the packet in the Tx queue
+          to avoid canceling a transmission if it was ACKed super fast via MQTT */
+        if (old->numRetransmissions < NUM_RETRANSMISSIONS - 1) {
+            // remove the 'original' (identified by originator and packet->id) from the txqueue and free it
+            cancelSending(getFrom(p), p->id);
+            // now free the pooled copy for retransmission too
+            packetPool.release(p);
+        }
        return true;
    } else
        return false;
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -257,10 +257,9 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
            return encodeResult; // FIXME - this isn't a valid ErrorCode
        }

-        if (moduleConfig.mqtt.enabled) {
-            LOG_INFO("Should encrypt MQTT?: %d\n", moduleConfig.mqtt.encryption_enabled);
-            if (mqtt)
-                mqtt->onSend(*p, *p_decoded, chIndex);
+        // Only publish to MQTT if we're the original transmitter of the packet
+        if (moduleConfig.mqtt.enabled && p->from == nodeDB.getNodeNum() && mqtt) {
+            mqtt->onSend(*p, *p_decoded, chIndex);
        }
        packetPool.release(p_decoded);
    }
@@ -438,6 +437,8 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
 {
    // Also, we should set the time from the ISR and it should have msec level resolution
    p->rx_time = getValidTime(RTCQualityFromNet); // store the arrival timestamp for the phone
+    // Store a copy of encrypted packet for MQTT
+    meshtastic_MeshPacket *p_encrypted = packetPool.allocCopy(*p);

    // Take those raw bytes and convert them back into a well structured protobuf we can understand
    bool decoded = perhapsDecode(p);
@@ -449,10 +450,16 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
            printPacket("handleReceived(USER)", p);
        else
            printPacket("handleReceived(REMOTE)", p);
+
+        // Publish received message to MQTT if we're not the original transmitter of the packet
+        if (moduleConfig.mqtt.enabled && getFrom(p) != nodeDB.getNodeNum() && mqtt)
+            mqtt->onSend(*p_encrypted, *p, p->channel);
    } else {
        printPacket("packet decoding failed or skipped (no PSK?)", p);
    }

+    packetPool.release(p_encrypted); // Release the encrypted packet
+
    // call modules here
    MeshModule::callPlugins(*p, src);
 }
@@ -474,4 +481,4 @@ void Router::perhapsHandleReceived(meshtastic_MeshPacket *p)
        handleReceived(p);

    packetPool.release(p);
-}
+}
--- a/src/mesh/generated/meshtastic/apponly.pb.h
+++ b/src/mesh/generated/meshtastic/apponly.pb.h
@@ -54,7 +54,7 @@ extern const pb_msgdesc_t meshtastic_ChannelSet_msg;
 #define meshtastic_ChannelSet_fields &meshtastic_ChannelSet_msg

 /* Maximum encoded size of messages (where known) */
-#define meshtastic_ChannelSet_size               594
+#define meshtastic_ChannelSet_size               658

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/meshtastic/atak.pb.c
+++ b/src/mesh/generated/meshtastic/atak.pb.c
@@ -0,0 +1,29 @@
+/* Automatically generated nanopb constant definitions */
+/* Generated by nanopb-0.4.7 */
+
+#include "meshtastic/atak.pb.h"
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+PB_BIND(meshtastic_TAKPacket, meshtastic_TAKPacket, 2)
+
+
+PB_BIND(meshtastic_GeoChat, meshtastic_GeoChat, 2)
+
+
+PB_BIND(meshtastic_Group, meshtastic_Group, AUTO)
+
+
+PB_BIND(meshtastic_Status, meshtastic_Status, AUTO)
+
+
+PB_BIND(meshtastic_Contact, meshtastic_Contact, AUTO)
+
+
+PB_BIND(meshtastic_PLI, meshtastic_PLI, AUTO)
+
+
+
+
+
--- a/src/mesh/generated/meshtastic/atak.pb.h
+++ b/src/mesh/generated/meshtastic/atak.pb.h
@@ -0,0 +1,274 @@
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.4.7 */
+
+#ifndef PB_MESHTASTIC_MESHTASTIC_ATAK_PB_H_INCLUDED
+#define PB_MESHTASTIC_MESHTASTIC_ATAK_PB_H_INCLUDED
+#include <pb.h>
+
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+/* Enum definitions */
+typedef enum _meshtastic_Team {
+    /* Unspecifed */
+    meshtastic_Team_Unspecifed_Color = 0,
+    /* White */
+    meshtastic_Team_White = 1,
+    /* Yellow */
+    meshtastic_Team_Yellow = 2,
+    /* Orange */
+    meshtastic_Team_Orange = 3,
+    /* Magenta */
+    meshtastic_Team_Magenta = 4,
+    /* Red */
+    meshtastic_Team_Red = 5,
+    /* Maroon */
+    meshtastic_Team_Maroon = 6,
+    /* Purple */
+    meshtastic_Team_Purple = 7,
+    /* Dark Blue */
+    meshtastic_Team_Dark_Blue = 8,
+    /* Blue */
+    meshtastic_Team_Blue = 9,
+    /* Cyan */
+    meshtastic_Team_Cyan = 10,
+    /* Teal */
+    meshtastic_Team_Teal = 11,
+    /* Green */
+    meshtastic_Team_Green = 12,
+    /* Dark Green */
+    meshtastic_Team_Dark_Green = 13,
+    /* Brown */
+    meshtastic_Team_Brown = 14
+} meshtastic_Team;
+
+/* Role of the group member */
+typedef enum _meshtastic_MemberRole {
+    /* Unspecifed */
+    meshtastic_MemberRole_Unspecifed = 0,
+    /* Team Member */
+    meshtastic_MemberRole_TeamMember = 1,
+    /* Team Lead */
+    meshtastic_MemberRole_TeamLead = 2,
+    /* Headquarters */
+    meshtastic_MemberRole_HQ = 3,
+    /* Airsoft enthusiast */
+    meshtastic_MemberRole_Sniper = 4,
+    /* Medic */
+    meshtastic_MemberRole_Medic = 5,
+    /* ForwardObserver */
+    meshtastic_MemberRole_ForwardObserver = 6,
+    /* Radio Telephone Operator */
+    meshtastic_MemberRole_RTO = 7,
+    /* Doggo */
+    meshtastic_MemberRole_K9 = 8
+} meshtastic_MemberRole;
+
+/* Struct definitions */
+/* ATAK GeoChat message */
+typedef struct _meshtastic_GeoChat {
+    /* The text message */
+    char message[200];
+    /* Uid recipient of the message */
+    bool has_to;
+    char to[120];
+} meshtastic_GeoChat;
+
+/* ATAK Group
+ <__group role='Team Member' name='Cyan'/> */
+typedef struct _meshtastic_Group {
+    /* Role of the group member */
+    meshtastic_MemberRole role;
+    /* Team (color)
+ Default Cyan */
+    meshtastic_Team team;
+} meshtastic_Group;
+
+/* ATAK EUD Status
+ <status battery='100' /> */
+typedef struct _meshtastic_Status {
+    /* Battery level */
+    uint8_t battery;
+} meshtastic_Status;
+
+/* ATAK Contact
+ <contact endpoint='0.0.0.0:4242:tcp' phone='+12345678' callsign='FALKE'/> */
+typedef struct _meshtastic_Contact {
+    /* Callsign */
+    char callsign[120];
+    /* Device callsign */
+    char device_callsign[120]; /* IP address of endpoint in integer form (0.0.0.0 default) */
+} meshtastic_Contact;
+
+/* Position Location Information from ATAK */
+typedef struct _meshtastic_PLI {
+    /* The new preferred location encoding, multiply by 1e-7 to get degrees
+ in floating point */
+    int32_t latitude_i;
+    /* The new preferred location encoding, multiply by 1e-7 to get degrees
+ in floating point */
+    int32_t longitude_i;
+    /* Altitude (ATAK prefers HAE) */
+    int32_t altitude;
+    /* Speed */
+    uint32_t speed;
+    /* Course in degrees */
+    uint16_t course;
+} meshtastic_PLI;
+
+/* Packets for the official ATAK Plugin */
+typedef struct _meshtastic_TAKPacket {
+    /* Are the payloads strings compressed for LoRA transport? */
+    bool is_compressed;
+    /* The contact / callsign for ATAK user */
+    bool has_contact;
+    meshtastic_Contact contact;
+    /* The group for ATAK user */
+    bool has_group;
+    meshtastic_Group group;
+    /* The status of the ATAK EUD */
+    bool has_status;
+    meshtastic_Status status;
+    pb_size_t which_payload_variant;
+    union {
+        /* TAK position report */
+        meshtastic_PLI pli;
+        /* ATAK GeoChat message */
+        meshtastic_GeoChat chat;
+    } payload_variant;
+} meshtastic_TAKPacket;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Helper constants for enums */
+#define _meshtastic_Team_MIN meshtastic_Team_Unspecifed_Color
+#define _meshtastic_Team_MAX meshtastic_Team_Brown
+#define _meshtastic_Team_ARRAYSIZE ((meshtastic_Team)(meshtastic_Team_Brown+1))
+
+#define _meshtastic_MemberRole_MIN meshtastic_MemberRole_Unspecifed
+#define _meshtastic_MemberRole_MAX meshtastic_MemberRole_K9
+#define _meshtastic_MemberRole_ARRAYSIZE ((meshtastic_MemberRole)(meshtastic_MemberRole_K9+1))
+
+
+
+#define meshtastic_Group_role_ENUMTYPE meshtastic_MemberRole
+#define meshtastic_Group_team_ENUMTYPE meshtastic_Team
+
+
+
+
+
+/* Initializer values for message structs */
+#define meshtastic_TAKPacket_init_default        {0, false, meshtastic_Contact_init_default, false, meshtastic_Group_init_default, false, meshtastic_Status_init_default, 0, {meshtastic_PLI_init_default}}
+#define meshtastic_GeoChat_init_default          {"", false, ""}
+#define meshtastic_Group_init_default            {_meshtastic_MemberRole_MIN, _meshtastic_Team_MIN}
+#define meshtastic_Status_init_default           {0}
+#define meshtastic_Contact_init_default          {"", ""}
+#define meshtastic_PLI_init_default              {0, 0, 0, 0, 0}
+#define meshtastic_TAKPacket_init_zero           {0, false, meshtastic_Contact_init_zero, false, meshtastic_Group_init_zero, false, meshtastic_Status_init_zero, 0, {meshtastic_PLI_init_zero}}
+#define meshtastic_GeoChat_init_zero             {"", false, ""}
+#define meshtastic_Group_init_zero               {_meshtastic_MemberRole_MIN, _meshtastic_Team_MIN}
+#define meshtastic_Status_init_zero              {0}
+#define meshtastic_Contact_init_zero             {"", ""}
+#define meshtastic_PLI_init_zero                 {0, 0, 0, 0, 0}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define meshtastic_GeoChat_message_tag           1
+#define meshtastic_GeoChat_to_tag                2
+#define meshtastic_Group_role_tag                1
+#define meshtastic_Group_team_tag                2
+#define meshtastic_Status_battery_tag            1
+#define meshtastic_Contact_callsign_tag          1
+#define meshtastic_Contact_device_callsign_tag   2
+#define meshtastic_PLI_latitude_i_tag            1
+#define meshtastic_PLI_longitude_i_tag           2
+#define meshtastic_PLI_altitude_tag              3
+#define meshtastic_PLI_speed_tag                 4
+#define meshtastic_PLI_course_tag                5
+#define meshtastic_TAKPacket_is_compressed_tag   1
+#define meshtastic_TAKPacket_contact_tag         2
+#define meshtastic_TAKPacket_group_tag           3
+#define meshtastic_TAKPacket_status_tag          4
+#define meshtastic_TAKPacket_pli_tag             5
+#define meshtastic_TAKPacket_chat_tag            6
+
+/* Struct field encoding specification for nanopb */
+#define meshtastic_TAKPacket_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, BOOL,     is_compressed,     1) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  contact,           2) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  group,             3) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  status,            4) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,pli,payload_variant.pli),   5) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,chat,payload_variant.chat),   6)
+#define meshtastic_TAKPacket_CALLBACK NULL
+#define meshtastic_TAKPacket_DEFAULT NULL
+#define meshtastic_TAKPacket_contact_MSGTYPE meshtastic_Contact
+#define meshtastic_TAKPacket_group_MSGTYPE meshtastic_Group
+#define meshtastic_TAKPacket_status_MSGTYPE meshtastic_Status
+#define meshtastic_TAKPacket_payload_variant_pli_MSGTYPE meshtastic_PLI
+#define meshtastic_TAKPacket_payload_variant_chat_MSGTYPE meshtastic_GeoChat
+
+#define meshtastic_GeoChat_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, STRING,   message,           1) \
+X(a, STATIC,   OPTIONAL, STRING,   to,                2)
+#define meshtastic_GeoChat_CALLBACK NULL
+#define meshtastic_GeoChat_DEFAULT NULL
+
+#define meshtastic_Group_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UENUM,    role,              1) \
+X(a, STATIC,   SINGULAR, UENUM,    team,              2)
+#define meshtastic_Group_CALLBACK NULL
+#define meshtastic_Group_DEFAULT NULL
+
+#define meshtastic_Status_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   battery,           1)
+#define meshtastic_Status_CALLBACK NULL
+#define meshtastic_Status_DEFAULT NULL
+
+#define meshtastic_Contact_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, STRING,   callsign,          1) \
+X(a, STATIC,   SINGULAR, STRING,   device_callsign,   2)
+#define meshtastic_Contact_CALLBACK NULL
+#define meshtastic_Contact_DEFAULT NULL
+
+#define meshtastic_PLI_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, SFIXED32, latitude_i,        1) \
+X(a, STATIC,   SINGULAR, SFIXED32, longitude_i,       2) \
+X(a, STATIC,   SINGULAR, INT32,    altitude,          3) \
+X(a, STATIC,   SINGULAR, UINT32,   speed,             4) \
+X(a, STATIC,   SINGULAR, UINT32,   course,            5)
+#define meshtastic_PLI_CALLBACK NULL
+#define meshtastic_PLI_DEFAULT NULL
+
+extern const pb_msgdesc_t meshtastic_TAKPacket_msg;
+extern const pb_msgdesc_t meshtastic_GeoChat_msg;
+extern const pb_msgdesc_t meshtastic_Group_msg;
+extern const pb_msgdesc_t meshtastic_Status_msg;
+extern const pb_msgdesc_t meshtastic_Contact_msg;
+extern const pb_msgdesc_t meshtastic_PLI_msg;
+
+/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
+#define meshtastic_TAKPacket_fields &meshtastic_TAKPacket_msg
+#define meshtastic_GeoChat_fields &meshtastic_GeoChat_msg
+#define meshtastic_Group_fields &meshtastic_Group_msg
+#define meshtastic_Status_fields &meshtastic_Status_msg
+#define meshtastic_Contact_fields &meshtastic_Contact_msg
+#define meshtastic_PLI_fields &meshtastic_PLI_msg
+
+/* Maximum encoded size of messages (where known) */
+#define meshtastic_Contact_size                  242
+#define meshtastic_GeoChat_size                  323
+#define meshtastic_Group_size                    4
+#define meshtastic_PLI_size                      31
+#define meshtastic_Status_size                   3
+#define meshtastic_TAKPacket_size                584
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
--- a/src/mesh/generated/meshtastic/channel.pb.c
+++ b/src/mesh/generated/meshtastic/channel.pb.c
@@ -9,6 +9,9 @@
 PB_BIND(meshtastic_ChannelSettings, meshtastic_ChannelSettings, AUTO)


+PB_BIND(meshtastic_ModuleSettings, meshtastic_ModuleSettings, AUTO)
+
+
 PB_BIND(meshtastic_Channel, meshtastic_Channel, AUTO)


--- a/src/mesh/generated/meshtastic/channel.pb.h
+++ b/src/mesh/generated/meshtastic/channel.pb.h
@@ -30,6 +30,12 @@ typedef enum _meshtastic_Channel_Role {
 } meshtastic_Channel_Role;

 /* Struct definitions */
+/* This message is specifically for modules to store per-channel configuration data. */
+typedef struct _meshtastic_ModuleSettings {
+    /* Bits of precision for the location sent in position packets. */
+    uint32_t position_precision;
+} meshtastic_ModuleSettings;
+
 typedef PB_BYTES_ARRAY_T(32) meshtastic_ChannelSettings_psk_t;
 /* This information can be encoded as a QRcode/url so that other users can configure
 their radio to join the same channel.
@@ -85,6 +91,9 @@ typedef struct _meshtastic_ChannelSettings {
    bool uplink_enabled;
    /* If true, messages seen on the internet will be forwarded to the local mesh. */
    bool downlink_enabled;
+    /* Per-channel module settings. */
+    bool has_module_settings;
+    meshtastic_ModuleSettings module_settings;
 } meshtastic_ChannelSettings;

 /* A pair of a channel number, mode and the (sharable) settings for that channel */
@@ -111,22 +120,27 @@ extern "C" {
 #define _meshtastic_Channel_Role_ARRAYSIZE ((meshtastic_Channel_Role)(meshtastic_Channel_Role_SECONDARY+1))


+
 #define meshtastic_Channel_role_ENUMTYPE meshtastic_Channel_Role


 /* Initializer values for message structs */
-#define meshtastic_ChannelSettings_init_default  {0, {0, {0}}, "", 0, 0, 0}
+#define meshtastic_ChannelSettings_init_default  {0, {0, {0}}, "", 0, 0, 0, false, meshtastic_ModuleSettings_init_default}
+#define meshtastic_ModuleSettings_init_default   {0}
 #define meshtastic_Channel_init_default          {0, false, meshtastic_ChannelSettings_init_default, _meshtastic_Channel_Role_MIN}
-#define meshtastic_ChannelSettings_init_zero     {0, {0, {0}}, "", 0, 0, 0}
+#define meshtastic_ChannelSettings_init_zero     {0, {0, {0}}, "", 0, 0, 0, false, meshtastic_ModuleSettings_init_zero}
+#define meshtastic_ModuleSettings_init_zero      {0}
 #define meshtastic_Channel_init_zero             {0, false, meshtastic_ChannelSettings_init_zero, _meshtastic_Channel_Role_MIN}

 /* Field tags (for use in manual encoding/decoding) */
+#define meshtastic_ModuleSettings_position_precision_tag 1
 #define meshtastic_ChannelSettings_channel_num_tag 1
 #define meshtastic_ChannelSettings_psk_tag       2
 #define meshtastic_ChannelSettings_name_tag      3
 #define meshtastic_ChannelSettings_id_tag        4
 #define meshtastic_ChannelSettings_uplink_enabled_tag 5
 #define meshtastic_ChannelSettings_downlink_enabled_tag 6
+#define meshtastic_ChannelSettings_module_settings_tag 7
 #define meshtastic_Channel_index_tag             1
 #define meshtastic_Channel_settings_tag          2
 #define meshtastic_Channel_role_tag              3
@@ -138,9 +152,16 @@ X(a, STATIC,   SINGULAR, BYTES,    psk,               2) \
 X(a, STATIC,   SINGULAR, STRING,   name,              3) \
 X(a, STATIC,   SINGULAR, FIXED32,  id,                4) \
 X(a, STATIC,   SINGULAR, BOOL,     uplink_enabled,    5) \
-X(a, STATIC,   SINGULAR, BOOL,     downlink_enabled,   6)
+X(a, STATIC,   SINGULAR, BOOL,     downlink_enabled,   6) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  module_settings,   7)
 #define meshtastic_ChannelSettings_CALLBACK NULL
 #define meshtastic_ChannelSettings_DEFAULT NULL
+#define meshtastic_ChannelSettings_module_settings_MSGTYPE meshtastic_ModuleSettings
+
+#define meshtastic_ModuleSettings_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   position_precision,   1)
+#define meshtastic_ModuleSettings_CALLBACK NULL
+#define meshtastic_ModuleSettings_DEFAULT NULL

 #define meshtastic_Channel_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, INT32,    index,             1) \
@@ -151,15 +172,18 @@ X(a, STATIC,   SINGULAR, UENUM,    role,              3)
 #define meshtastic_Channel_settings_MSGTYPE meshtastic_ChannelSettings

 extern const pb_msgdesc_t meshtastic_ChannelSettings_msg;
+extern const pb_msgdesc_t meshtastic_ModuleSettings_msg;
 extern const pb_msgdesc_t meshtastic_Channel_msg;

 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_ChannelSettings_fields &meshtastic_ChannelSettings_msg
+#define meshtastic_ModuleSettings_fields &meshtastic_ModuleSettings_msg
 #define meshtastic_Channel_fields &meshtastic_Channel_msg

 /* Maximum encoded size of messages (where known) */
-#define meshtastic_ChannelSettings_size          62
-#define meshtastic_Channel_size                  77
+#define meshtastic_ChannelSettings_size          70
+#define meshtastic_Channel_size                  85
+#define meshtastic_ModuleSettings_size           6

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/meshtastic/config.pb.c
+++ b/src/mesh/generated/meshtastic/config.pb.c
@@ -45,3 +45,4 @@ PB_BIND(meshtastic_Config_BluetoothConfig, meshtastic_Config_BluetoothConfig, AU



+
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -12,49 +12,53 @@
 /* Enum definitions */
 /* Defines the device's role on the Mesh network */
 typedef enum _meshtastic_Config_DeviceConfig_Role {
-    /* Client device role */
+    /* Description: App connected or stand alone messaging device.
+ Technical Details: Default Role */
    meshtastic_Config_DeviceConfig_Role_CLIENT = 0,
-    /* Client Mute device role
-   Same as a client except packets will not hop over this node, does not contribute to routing packets for mesh. */
+    /* Description: Device that does not forward packets from other devices. */
    meshtastic_Config_DeviceConfig_Role_CLIENT_MUTE = 1,
-    /* Router device role.
-   Mesh packets will prefer to be routed over this node. This node will not be used by client apps.
-   The wifi/ble radios and the oled screen will be put to sleep.
+    /* Description: Infrastructure node for extending network coverage by relaying messages. Visible in Nodes list.
+ Technical Details: Mesh packets will prefer to be routed over this node. This node will not be used by client apps.
+   The wifi radio and the oled screen will be put to sleep.
   This mode may still potentially have higher power usage due to it's preference in message rebroadcasting on the mesh. */
    meshtastic_Config_DeviceConfig_Role_ROUTER = 2,
-    /* Router Client device role
-   Mesh packets will prefer to be routed over this node. The Router Client can be used as both a Router and an app connected Client. */
+    /* Description: Combination of both ROUTER and CLIENT. Not for mobile devices. */
    meshtastic_Config_DeviceConfig_Role_ROUTER_CLIENT = 3,
-    /* Repeater device role
-   Mesh packets will simply be rebroadcasted over this node. Nodes configured with this role will not originate NodeInfo, Position, Telemetry
+    /* Description: Infrastructure node for extending network coverage by relaying messages with minimal overhead. Not visible in Nodes list.
+ Technical Details: Mesh packets will simply be rebroadcasted over this node. Nodes configured with this role will not originate NodeInfo, Position, Telemetry
   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.
+    /* Description: Broadcasts GPS position packets as priority.
+ Technical Details: 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.
+    /* Description: Broadcasts telemetry packets as priority.
+ Technical Details: 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.
+    /* Description: Optimized for ATAK system communication and reduces routine broadcasts.
+ Technical Details: 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,
-    /* Client Hidden device role
-    Used for nodes that "only speak when spoken to"
+    /* Description: Device that only broadcasts as needed for stealth or power savings.
+ Technical Details: Used for nodes that "only speak when spoken to"
    Turns all of the routine broadcasts but allows for ad-hoc communication
    Still rebroadcasts, but with local only rebroadcast mode (known meshes only)
    Can be used for clandestine operation or to dramatically reduce airtime / power consumption */
    meshtastic_Config_DeviceConfig_Role_CLIENT_HIDDEN = 8,
-    /* Lost and Found device role
-    Used to automatically send a text message to the mesh 
+    /* Description: Broadcasts location as message to default channel regularly for to assist with device recovery.
+ Technical Details: Used to automatically send a text message to the mesh 
    with the current position of the device on a frequent interval:
    "I'm lost! Position: lat / long" */
-    meshtastic_Config_DeviceConfig_Role_LOST_AND_FOUND = 9
+    meshtastic_Config_DeviceConfig_Role_LOST_AND_FOUND = 9,
+    /* Description: Enables automatic TAK PLI broadcasts and reduces routine broadcasts.
+ Technical Details: Turns off many of the routine broadcasts to favor ATAK CoT packet stream
+    and automatic TAK PLI (position location information) broadcasts.
+    Uses position module configuration to determine TAK PLI broadcast interval. */
+    meshtastic_Config_DeviceConfig_Role_TAK_TRACKER = 10
 } meshtastic_Config_DeviceConfig_Role;

 /* Defines the device's behavior for how messages are rebroadcast */
@@ -108,6 +112,15 @@ typedef enum _meshtastic_Config_PositionConfig_PositionFlags {
    meshtastic_Config_PositionConfig_PositionFlags_SPEED = 512
 } meshtastic_Config_PositionConfig_PositionFlags;

+typedef enum _meshtastic_Config_PositionConfig_GpsMode {
+    /* GPS is present but disabled */
+    meshtastic_Config_PositionConfig_GpsMode_DISABLED = 0,
+    /* GPS is present and enabled */
+    meshtastic_Config_PositionConfig_GpsMode_ENABLED = 1,
+    /* GPS is not present on the device */
+    meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT = 2
+} meshtastic_Config_PositionConfig_GpsMode;
+
 typedef enum _meshtastic_Config_NetworkConfig_AddressMode {
    /* obtain ip address via DHCP */
    meshtastic_Config_NetworkConfig_AddressMode_DHCP = 0,
@@ -205,7 +218,9 @@ typedef enum _meshtastic_Config_LoRaConfig_RegionCode {
    /* Malaysia 433mhz */
    meshtastic_Config_LoRaConfig_RegionCode_MY_433 = 16,
    /* Malaysia 919mhz */
-    meshtastic_Config_LoRaConfig_RegionCode_MY_919 = 17
+    meshtastic_Config_LoRaConfig_RegionCode_MY_919 = 17,
+    /* Singapore 923mhz */
+    meshtastic_Config_LoRaConfig_RegionCode_SG_923 = 18
 } meshtastic_Config_LoRaConfig_RegionCode;

 /* Standard predefined channel settings
@@ -300,6 +315,8 @@ typedef struct _meshtastic_Config_PositionConfig {
    uint32_t broadcast_smart_minimum_interval_secs;
    /* (Re)define PIN_GPS_EN for your board. */
    uint32_t gps_en_gpio;
+    /* Set where GPS is enabled, disabled, or not present */
+    meshtastic_Config_PositionConfig_GpsMode gps_mode;
 } meshtastic_Config_PositionConfig;

 /* Power Config\
@@ -496,8 +513,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_LOST_AND_FOUND
-#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_LOST_AND_FOUND+1))
+#define _meshtastic_Config_DeviceConfig_Role_MAX meshtastic_Config_DeviceConfig_Role_TAK_TRACKER
+#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_TAK_TRACKER+1))

 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN meshtastic_Config_DeviceConfig_RebroadcastMode_ALL
 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_MAX meshtastic_Config_DeviceConfig_RebroadcastMode_KNOWN_ONLY
@@ -507,6 +524,10 @@ extern "C" {
 #define _meshtastic_Config_PositionConfig_PositionFlags_MAX meshtastic_Config_PositionConfig_PositionFlags_SPEED
 #define _meshtastic_Config_PositionConfig_PositionFlags_ARRAYSIZE ((meshtastic_Config_PositionConfig_PositionFlags)(meshtastic_Config_PositionConfig_PositionFlags_SPEED+1))

+#define _meshtastic_Config_PositionConfig_GpsMode_MIN meshtastic_Config_PositionConfig_GpsMode_DISABLED
+#define _meshtastic_Config_PositionConfig_GpsMode_MAX meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT
+#define _meshtastic_Config_PositionConfig_GpsMode_ARRAYSIZE ((meshtastic_Config_PositionConfig_GpsMode)(meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT+1))
+
 #define _meshtastic_Config_NetworkConfig_AddressMode_MIN meshtastic_Config_NetworkConfig_AddressMode_DHCP
 #define _meshtastic_Config_NetworkConfig_AddressMode_MAX meshtastic_Config_NetworkConfig_AddressMode_STATIC
 #define _meshtastic_Config_NetworkConfig_AddressMode_ARRAYSIZE ((meshtastic_Config_NetworkConfig_AddressMode)(meshtastic_Config_NetworkConfig_AddressMode_STATIC+1))
@@ -528,8 +549,8 @@ extern "C" {
 #define _meshtastic_Config_DisplayConfig_DisplayMode_ARRAYSIZE ((meshtastic_Config_DisplayConfig_DisplayMode)(meshtastic_Config_DisplayConfig_DisplayMode_COLOR+1))

 #define _meshtastic_Config_LoRaConfig_RegionCode_MIN meshtastic_Config_LoRaConfig_RegionCode_UNSET
-#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_MY_919
-#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_MY_919+1))
+#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_SG_923
+#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_SG_923+1))

 #define _meshtastic_Config_LoRaConfig_ModemPreset_MIN meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST
 #define _meshtastic_Config_LoRaConfig_ModemPreset_MAX meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE
@@ -543,6 +564,7 @@ extern "C" {
 #define meshtastic_Config_DeviceConfig_role_ENUMTYPE meshtastic_Config_DeviceConfig_Role
 #define meshtastic_Config_DeviceConfig_rebroadcast_mode_ENUMTYPE meshtastic_Config_DeviceConfig_RebroadcastMode

+#define meshtastic_Config_PositionConfig_gps_mode_ENUMTYPE meshtastic_Config_PositionConfig_GpsMode


 #define meshtastic_Config_NetworkConfig_address_mode_ENUMTYPE meshtastic_Config_NetworkConfig_AddressMode
@@ -562,7 +584,7 @@ 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, 0}
-#define meshtastic_Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _meshtastic_Config_PositionConfig_GpsMode_MIN}
 #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}
@@ -571,7 +593,7 @@ extern "C" {
 #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, 0}
-#define meshtastic_Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _meshtastic_Config_PositionConfig_GpsMode_MIN}
 #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}
@@ -602,6 +624,7 @@ extern "C" {
 #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_PositionConfig_gps_mode_tag 13
 #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
@@ -704,7 +727,8 @@ 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,   gps_en_gpio,      12)
+X(a, STATIC,   SINGULAR, UINT32,   gps_en_gpio,      12) \
+X(a, STATIC,   SINGULAR, UENUM,    gps_mode,         13)
 #define meshtastic_Config_PositionConfig_CALLBACK NULL
 #define meshtastic_Config_PositionConfig_DEFAULT NULL

@@ -810,7 +834,7 @@ extern const pb_msgdesc_t meshtastic_Config_BluetoothConfig_msg;
 #define meshtastic_Config_LoRaConfig_size        80
 #define meshtastic_Config_NetworkConfig_IpV4Config_size 20
 #define meshtastic_Config_NetworkConfig_size     196
-#define meshtastic_Config_PositionConfig_size    60
+#define meshtastic_Config_PositionConfig_size    62
 #define meshtastic_Config_PowerConfig_size       40
 #define meshtastic_Config_size                   199

--- a/src/mesh/generated/meshtastic/deviceonly.pb.h
+++ b/src/mesh/generated/meshtastic/deviceonly.pb.h
@@ -312,11 +312,11 @@ extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePin_msg;
 #define meshtastic_NodeRemoteHardwarePin_fields &meshtastic_NodeRemoteHardwarePin_msg

 /* Maximum encoded size of messages (where known) */
-#define meshtastic_ChannelFile_size              638
+#define meshtastic_ChannelFile_size              702
 #define meshtastic_DeviceState_size              17062
 #define meshtastic_NodeInfoLite_size             153
 #define meshtastic_NodeRemoteHardwarePin_size    29
-#define meshtastic_OEMStore_size                 3244
+#define meshtastic_OEMStore_size                 3246
 #define meshtastic_PositionLite_size             28

 #ifdef __cplusplus
--- a/src/mesh/generated/meshtastic/localonly.pb.h
+++ b/src/mesh/generated/meshtastic/localonly.pb.h
@@ -180,7 +180,7 @@ 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              467
+#define meshtastic_LocalConfig_size              469
 #define meshtastic_LocalModuleConfig_size        631

 #ifdef __cplusplus
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -71,6 +71,12 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_SENSELORA_RP2040 = 27,
    /* Makerfabs SenseLoRA Industrial Monitor (ESP32-S3 + RFM96) */
    meshtastic_HardwareModel_SENSELORA_S3 = 28,
+    /* Canary Radio Company - CanaryOne: https://canaryradio.io/products/canaryone */
+    meshtastic_HardwareModel_CANARYONE = 29,
+    /* Waveshare RP2040 LoRa - https://www.waveshare.com/rp2040-lora.htm */
+    meshtastic_HardwareModel_RP2040_LORA = 30,
+    /* B&Q Consulting Station G2: https://wiki.uniteng.com/en/meshtastic/station-g2 */
+    meshtastic_HardwareModel_STATION_G2 = 31,
    /* ---------------------------------------------------------------------------
 Less common/prototype boards listed here (needs one more byte over the air)
 --------------------------------------------------------------------------- */
@@ -105,7 +111,8 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_BETAFPV_900_NANO_TX = 46,
    /* Raspberry Pi Pico (W) with Waveshare SX1262 LoRa Node Module */
    meshtastic_HardwareModel_RPI_PICO = 47,
-    /* Heltec Wireless Tracker with ESP32-S3 CPU, built-in GPS, and TFT */
+    /* Heltec Wireless Tracker with ESP32-S3 CPU, built-in GPS, and TFT
+ Newer V1.1, version is written on the PCB near the display. */
    meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER = 48,
    /* Heltec Wireless Paper with ESP32-S3 CPU and E-Ink display */
    meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER = 49,
@@ -125,6 +132,15 @@ typedef enum _meshtastic_HardwareModel {
 Lora module can be swapped out for a Heltec RA-62 which is "almost" pin compatible
 with one cut and one jumper Meshtastic works */
    meshtastic_HardwareModel_CHATTER_2 = 56,
+    /* Heltec Wireless Paper, With ESP32-S3 CPU and E-Ink display
+ Older "V1.0" Variant, has no "version sticker"
+ E-Ink model is DEPG0213BNS800
+ Tab on the screen protector is RED
+ Flex connector marking is FPC-7528B */
+    meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER_V1_0 = 57,
+    /* Heltec Wireless Tracker with ESP32-S3 CPU, built-in GPS, and TFT
+ Older "V1.0" Variant */
+    meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER_V1_0 = 58,
    /* ------------------------------------------------------------------------------------------------------------------------------------------
 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.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -366,6 +382,8 @@ typedef struct _meshtastic_Position {
    /* A sequence number, incremented with each Position message to help
   detect lost updates if needed */
    uint32_t seq_number;
+    /* Indicates the bits of precision set by the sending node */
+    uint32_t precision_bits;
 } meshtastic_Position;

 /* Broadcast when a newly powered mesh node wants to find a node num it can use
@@ -514,8 +532,7 @@ typedef PB_BYTES_ARRAY_T(256) meshtastic_MeshPacket_encrypted_t;
 typedef struct _meshtastic_MeshPacket {
    /* The sending node number.
 Note: Our crypto implementation uses this field as well.
- See [crypto](/docs/overview/encryption) for details.
- FIXME - really should be fixed32 instead, this encoding only hurts the ble link though. */
+ See [crypto](/docs/overview/encryption) for details. */
    uint32_t from;
    /* The (immediatSee Priority description for more details.y should be fixed32 instead, this encoding only
 hurts the ble link though. */
@@ -542,9 +559,7 @@ typedef struct _meshtastic_MeshPacket {
 needs to be unique for a few minutes (long enough to last for the length of
 any ACK or the completion of a mesh broadcast flood).
 Note: Our crypto implementation uses this id as well.
- See [crypto](/docs/overview/encryption) for details.
- FIXME - really should be fixed32 instead, this encoding only
- hurts the ble link though. */
+ See [crypto](/docs/overview/encryption) for details. */
    uint32_t id;
    /* The time this message was received by the esp32 (secs since 1970).
 Note: this field is _never_ sent on the radio link itself (to save space) Times
@@ -868,7 +883,7 @@ extern "C" {


 /* Initializer values for message structs */
-#define meshtastic_Position_init_default         {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_Position_init_default         {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, 0}
 #define meshtastic_User_init_default             {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN}
 #define meshtastic_RouteDiscovery_init_default   {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define meshtastic_Routing_init_default          {0, {meshtastic_RouteDiscovery_init_default}}
@@ -886,7 +901,7 @@ extern "C" {
 #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_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, 0}
 #define meshtastic_User_init_zero                {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN}
 #define meshtastic_RouteDiscovery_init_zero      {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define meshtastic_Routing_init_zero             {0, {meshtastic_RouteDiscovery_init_zero}}
@@ -928,6 +943,7 @@ extern "C" {
 #define meshtastic_Position_sensor_id_tag        20
 #define meshtastic_Position_next_update_tag      21
 #define meshtastic_Position_seq_number_tag       22
+#define meshtastic_Position_precision_bits_tag   23
 #define meshtastic_User_id_tag                   1
 #define meshtastic_User_long_name_tag            2
 #define meshtastic_User_short_name_tag           3
@@ -1054,7 +1070,8 @@ X(a, STATIC,   SINGULAR, UINT32,   fix_type,         18) \
 X(a, STATIC,   SINGULAR, UINT32,   sats_in_view,     19) \
 X(a, STATIC,   SINGULAR, UINT32,   sensor_id,        20) \
 X(a, STATIC,   SINGULAR, UINT32,   next_update,      21) \
-X(a, STATIC,   SINGULAR, UINT32,   seq_number,       22)
+X(a, STATIC,   SINGULAR, UINT32,   seq_number,       22) \
+X(a, STATIC,   SINGULAR, UINT32,   precision_bits,   23)
 #define meshtastic_Position_CALLBACK NULL
 #define meshtastic_Position_DEFAULT NULL

@@ -1299,8 +1316,8 @@ extern const pb_msgdesc_t meshtastic_DeviceMetadata_msg;
 #define meshtastic_MyNodeInfo_size               18
 #define meshtastic_NeighborInfo_size             258
 #define meshtastic_Neighbor_size                 22
-#define meshtastic_NodeInfo_size                 263
-#define meshtastic_Position_size                 137
+#define meshtastic_NodeInfo_size                 270
+#define meshtastic_Position_size                 144
 #define meshtastic_QueueStatus_size              23
 #define meshtastic_RouteDiscovery_size           40
 #define meshtastic_Routing_size                  42
--- a/src/mesh/generated/meshtastic/portnums.pb.h
+++ b/src/mesh/generated/meshtastic/portnums.pb.h
@@ -119,6 +119,9 @@ typedef enum _meshtastic_PortNum {
    /* Aggregates edge info for the network by sending out a list of each node's neighbors
 ENCODING: Protobuf */
    meshtastic_PortNum_NEIGHBORINFO_APP = 71,
+    /* ATAK Plugin
+ Portnum for payloads from the official Meshtastic ATAK plugin */
+    meshtastic_PortNum_ATAK_PLUGIN = 72,
    /* Private applications should use portnums >= 256.
 To simplify initial development and testing you can use "PRIVATE_APP"
 in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh)) */
--- a/src/mesh/generated/meshtastic/storeforward.pb.h
+++ b/src/mesh/generated/meshtastic/storeforward.pb.h
@@ -30,6 +30,10 @@ typedef enum _meshtastic_StoreAndForward_RequestResponse {
    meshtastic_StoreAndForward_RequestResponse_ROUTER_HISTORY = 6,
    /* Router is responding to a request for stats. */
    meshtastic_StoreAndForward_RequestResponse_ROUTER_STATS = 7,
+    /* Router sends a text message from its history that was a direct message. */
+    meshtastic_StoreAndForward_RequestResponse_ROUTER_TEXT_DIRECT = 8,
+    /* Router sends a text message from its history that was a broadcast. */
+    meshtastic_StoreAndForward_RequestResponse_ROUTER_TEXT_BROADCAST = 9,
    /* Client is an in error state. */
    meshtastic_StoreAndForward_RequestResponse_CLIENT_ERROR = 64,
    /* Client has requested a replay from the router. */
@@ -62,9 +66,9 @@ typedef struct _meshtastic_StoreAndForward_Statistics {
    uint32_t requests_history;
    /* Is the heartbeat enabled on the server? */
    bool heartbeat;
-    /* Is the heartbeat enabled on the server? */
+    /* Maximum number of messages the server will return. */
    uint32_t return_max;
-    /* Is the heartbeat enabled on the server? */
+    /* Maximum history window in minutes the server will return messages from. */
    uint32_t return_window;
 } meshtastic_StoreAndForward_Statistics;

@@ -74,18 +78,20 @@ typedef struct _meshtastic_StoreAndForward_History {
    uint32_t history_messages;
    /* The window of messages that was used to filter the history client requested */
    uint32_t window;
-    /* The window of messages that was used to filter the history client requested */
+    /* Index in the packet history of the last message sent in a previous request to the server.
+ Will be sent to the client before sending the history and can be set in a subsequent request to avoid getting packets the server already sent to the client. */
    uint32_t last_request;
 } meshtastic_StoreAndForward_History;

 /* TODO: REPLACE */
 typedef struct _meshtastic_StoreAndForward_Heartbeat {
-    /* Number of that will be sent to the client */
+    /* Period in seconds that the heartbeat is sent out that will be sent to the client */
    uint32_t period;
    /* If set, this is not the primary Store & Forward router on the mesh */
    uint32_t secondary;
 } meshtastic_StoreAndForward_Heartbeat;

+typedef PB_BYTES_ARRAY_T(237) meshtastic_StoreAndForward_text_t;
 /* TODO: REPLACE */
 typedef struct _meshtastic_StoreAndForward {
    /* TODO: REPLACE */
@@ -98,8 +104,8 @@ typedef struct _meshtastic_StoreAndForward {
        meshtastic_StoreAndForward_History history;
        /* TODO: REPLACE */
        meshtastic_StoreAndForward_Heartbeat heartbeat;
-        /* Empty Payload */
-        bool empty;
+        /* Text from history message. */
+        meshtastic_StoreAndForward_text_t text;
    } variant;
 } meshtastic_StoreAndForward;

@@ -148,7 +154,7 @@ extern "C" {
 #define meshtastic_StoreAndForward_stats_tag     2
 #define meshtastic_StoreAndForward_history_tag   3
 #define meshtastic_StoreAndForward_heartbeat_tag 4
-#define meshtastic_StoreAndForward_empty_tag     5
+#define meshtastic_StoreAndForward_text_tag      5

 /* Struct field encoding specification for nanopb */
 #define meshtastic_StoreAndForward_FIELDLIST(X, a) \
@@ -156,7 +162,7 @@ X(a, STATIC,   SINGULAR, UENUM,    rr,                1) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,stats,variant.stats),   2) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,history,variant.history),   3) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,heartbeat,variant.heartbeat),   4) \
-X(a, STATIC,   ONEOF,    BOOL,     (variant,empty,variant.empty),   5)
+X(a, STATIC,   ONEOF,    BYTES,    (variant,text,variant.text),   5)
 #define meshtastic_StoreAndForward_CALLBACK NULL
 #define meshtastic_StoreAndForward_DEFAULT NULL
 #define meshtastic_StoreAndForward_variant_stats_MSGTYPE meshtastic_StoreAndForward_Statistics
@@ -204,7 +210,7 @@ extern const pb_msgdesc_t meshtastic_StoreAndForward_Heartbeat_msg;
 #define meshtastic_StoreAndForward_Heartbeat_size 12
 #define meshtastic_StoreAndForward_History_size  18
 #define meshtastic_StoreAndForward_Statistics_size 50
-#define meshtastic_StoreAndForward_size          54
+#define meshtastic_StoreAndForward_size          242

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/http/ContentHandler.cpp
+++ b/src/mesh/http/ContentHandler.cpp
@@ -398,7 +398,7 @@ void handleStatic(HTTPRequest *req, HTTPResponse *res)
            if (!file.available()) {
                LOG_WARN("File not available - %s\n", filenameGzip.c_str());
                res->println("Web server is running.<br><br>The content you are looking for can't be found. Please see: <a "
-                             "href=https://meshtastic.org/docs/getting-started/faq#wifi--web-browser>FAQ</a>.<br><br><a "
+                             "href=https://meshtastic.org/docs/software/web-client/>FAQ</a>.<br><br><a "
                             "href=/admin>admin</a>");

                return;
@@ -854,4 +854,4 @@ void handleScanNetworks(HTTPRequest *req, HTTPResponse *res)
    JSONValue *value = new JSONValue(jsonObjOuter);
    res->print(value->Stringify().c_str());
    delete value;
-}
+}
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -332,6 +332,9 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
        if (isRegionUnset && config.lora.region > meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
            config.lora.tx_enabled = true;
            initRegion();
+            if (myRegion->dutyCycle < 100) {
+                config.lora.ignore_mqtt = true; // Ignore MQTT by default if region has a duty cycle limit
+            }
            if (strcmp(moduleConfig.mqtt.root, default_mqtt_root) == 0) {
                sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
                changes = SEGMENT_CONFIG | SEGMENT_MODULECONFIG;
--- a/src/modules/AtakPluginModule.cpp
+++ b/src/modules/AtakPluginModule.cpp
@@ -0,0 +1,145 @@
+#include "AtakPluginModule.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "PowerFSM.h"
+#include "configuration.h"
+#include "main.h"
+#include "meshtastic/atak.pb.h"
+
+extern "C" {
+#include "mesh/compression/unishox2.h"
+}
+
+AtakPluginModule *atakPluginModule;
+
+AtakPluginModule::AtakPluginModule()
+    : ProtobufModule("atak", meshtastic_PortNum_ATAK_PLUGIN, &meshtastic_TAKPacket_msg), concurrency::OSThread("AtakPluginModule")
+{
+    ourPortNum = meshtastic_PortNum_ATAK_PLUGIN;
+}
+
+/*
+Encompasses the full construction and sending packet to mesh
+Will be used for broadcast.
+*/
+int32_t AtakPluginModule::runOnce()
+{
+    return default_broadcast_interval_secs;
+}
+
+bool AtakPluginModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_TAKPacket *r)
+{
+    return false;
+}
+
+meshtastic_TAKPacket AtakPluginModule::cloneTAKPacketData(meshtastic_TAKPacket *t)
+{
+    meshtastic_TAKPacket clone = meshtastic_TAKPacket_init_zero;
+    if (t->has_group) {
+        clone.has_group = true;
+        clone.group = t->group;
+    }
+    if (t->has_status) {
+        clone.has_status = true;
+        clone.status = t->status;
+    }
+    if (t->has_contact) {
+        clone.has_contact = true;
+        clone.contact = {0};
+    }
+
+    if (t->which_payload_variant == meshtastic_TAKPacket_pli_tag) {
+        clone.which_payload_variant = meshtastic_TAKPacket_pli_tag;
+        clone.payload_variant.pli = t->payload_variant.pli;
+    } else if (t->which_payload_variant == meshtastic_TAKPacket_chat_tag) {
+        clone.which_payload_variant = meshtastic_TAKPacket_chat_tag;
+        clone.payload_variant.chat = {0};
+    }
+
+    return clone;
+}
+
+void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t)
+{
+    // From Phone (EUD)
+    if (mp.from == 0) {
+        LOG_DEBUG("Received uncompressed TAK payload from phone with %d bytes\n", mp.decoded.payload.size);
+        // Compress for LoRA transport
+        auto compressed = cloneTAKPacketData(t);
+        compressed.is_compressed = true;
+        if (t->has_contact) {
+            auto length = unishox2_compress_simple(t->contact.callsign, strlen(t->contact.callsign), compressed.contact.callsign);
+            LOG_DEBUG("Uncompressed callsign '%s' - %d bytes\n", t->contact.callsign, strlen(t->contact.callsign));
+            LOG_DEBUG("Compressed callsign '%s' - %d bytes\n", t->contact.callsign, length);
+
+            length = unishox2_compress_simple(t->contact.device_callsign, strlen(t->contact.device_callsign),
+                                              compressed.contact.device_callsign);
+            LOG_DEBUG("Uncompressed device_callsign '%s' - %d bytes\n", t->contact.device_callsign,
+                      strlen(t->contact.device_callsign));
+            LOG_DEBUG("Compressed device_callsign '%s' - %d bytes\n", compressed.contact.device_callsign, length);
+        }
+        if (t->which_payload_variant == meshtastic_TAKPacket_chat_tag) {
+            auto length = unishox2_compress_simple(t->payload_variant.chat.message, strlen(t->payload_variant.chat.message),
+                                                   compressed.payload_variant.chat.message);
+            LOG_DEBUG("Uncompressed chat message '%s' - %d bytes\n", t->payload_variant.chat.message,
+                      strlen(t->payload_variant.chat.message));
+            LOG_DEBUG("Compressed chat message '%s' - %d bytes\n", compressed.payload_variant.chat.message, length);
+
+            if (t->payload_variant.chat.has_to) {
+                compressed.payload_variant.chat.has_to = true;
+                length = unishox2_compress_simple(t->payload_variant.chat.to, strlen(t->payload_variant.chat.to),
+                                                  compressed.payload_variant.chat.to);
+                LOG_DEBUG("Uncompressed chat to '%s' - %d bytes\n", t->payload_variant.chat.to,
+                          strlen(t->payload_variant.chat.to));
+                LOG_DEBUG("Compressed chat to '%s' - %d bytes\n", compressed.payload_variant.chat.to, length);
+            }
+        }
+        mp.decoded.payload.size = pb_encode_to_bytes(mp.decoded.payload.bytes, sizeof(mp.decoded.payload.bytes),
+                                                     meshtastic_TAKPacket_fields, &compressed);
+        LOG_DEBUG("Final payload size of %d bytes\n", mp.decoded.payload.size);
+    } else {
+        if (!t->is_compressed) {
+            // Not compressed. Something is wrong
+            LOG_ERROR("Received uncompressed TAKPacket over radio!\n");
+            return;
+        }
+
+        // Decompress for Phone (EUD)
+        auto decompressedCopy = packetPool.allocCopy(mp);
+        auto uncompressed = cloneTAKPacketData(t);
+        uncompressed.is_compressed = false;
+        if (t->has_contact) {
+            auto length =
+                unishox2_decompress_simple(t->contact.callsign, strlen(t->contact.callsign), uncompressed.contact.callsign);
+
+            LOG_DEBUG("Compressed callsign: %d bytes\n", strlen(t->contact.callsign));
+            LOG_DEBUG("Decompressed callsign: '%s' @ %d bytes\n", uncompressed.contact.callsign, length);
+
+            length = unishox2_decompress_simple(t->contact.device_callsign, strlen(t->contact.device_callsign),
+                                                uncompressed.contact.device_callsign);
+
+            LOG_DEBUG("Compressed device_callsign: %d bytes\n", strlen(t->contact.device_callsign));
+            LOG_DEBUG("Decompressed device_callsign: '%s' @ %d bytes\n", uncompressed.contact.device_callsign, length);
+        }
+        if (uncompressed.which_payload_variant == meshtastic_TAKPacket_chat_tag) {
+            auto length = unishox2_decompress_simple(t->payload_variant.chat.message, strlen(t->payload_variant.chat.message),
+                                                     uncompressed.payload_variant.chat.message);
+            LOG_DEBUG("Compressed chat message: %d bytes\n", strlen(t->payload_variant.chat.message));
+            LOG_DEBUG("Decompressed chat message: '%s' @ %d bytes\n", uncompressed.payload_variant.chat.message, length);
+
+            if (t->payload_variant.chat.has_to) {
+                uncompressed.payload_variant.chat.has_to = true;
+                length = unishox2_decompress_simple(t->payload_variant.chat.to, strlen(t->payload_variant.chat.to),
+                                                    uncompressed.payload_variant.chat.to);
+                LOG_DEBUG("Compressed chat to: %d bytes\n", strlen(t->payload_variant.chat.to));
+                LOG_DEBUG("Decompressed chat to: '%s' @ %d bytes\n", uncompressed.payload_variant.chat.to, length);
+            }
+        }
+        decompressedCopy->decoded.payload.size =
+            pb_encode_to_bytes(decompressedCopy->decoded.payload.bytes, sizeof(decompressedCopy->decoded.payload),
+                               meshtastic_TAKPacket_fields, &uncompressed);
+
+        service.sendToPhone(decompressedCopy);
+    }
+    return;
+}
--- a/src/modules/AtakPluginModule.h
+++ b/src/modules/AtakPluginModule.h
@@ -0,0 +1,26 @@
+#pragma once
+#include "ProtobufModule.h"
+#include "meshtastic/atak.pb.h"
+
+/**
+ * Waypoint message handling for meshtastic
+ */
+class AtakPluginModule : public ProtobufModule<meshtastic_TAKPacket>, private concurrency::OSThread
+{
+  public:
+    /** Constructor
+     * name is for debugging output
+     */
+    AtakPluginModule();
+
+  protected:
+    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t) override;
+    virtual void alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t) override;
+    /* Does our periodic broadcast */
+    int32_t runOnce() override;
+
+  private:
+    meshtastic_TAKPacket cloneTAKPacketData(meshtastic_TAKPacket *t);
+};
+
+extern AtakPluginModule *atakPluginModule;
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -6,6 +6,7 @@
 #include "input/cardKbI2cImpl.h"
 #include "input/kbMatrixImpl.h"
 #include "modules/AdminModule.h"
+#include "modules/AtakPluginModule.h"
 #include "modules/CannedMessageModule.h"
 #include "modules/DetectionSensorModule.h"
 #include "modules/NeighborInfoModule.h"
@@ -61,7 +62,7 @@ void setupModules()
        traceRouteModule = new TraceRouteModule();
        neighborInfoModule = new NeighborInfoModule();
        detectionSensorModule = new DetectionSensorModule();
-
+        atakPluginModule = new AtakPluginModule();
        // Note: if the rest of meshtastic doesn't need to explicitly use your module, you do not need to assign the instance
        // to a global variable.

--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@@ -8,21 +8,31 @@
 #include "airtime.h"
 #include "configuration.h"
 #include "gps/GeoCoord.h"
+#include "main.h"
+#include "meshtastic/atak.pb.h"
 #include "sleep.h"
 #include "target_specific.h"

+extern "C" {
+#include "mesh/compression/unishox2.h"
+}
+
 PositionModule *positionModule;

 PositionModule::PositionModule()
    : ProtobufModule("position", meshtastic_PortNum_POSITION_APP, &meshtastic_Position_msg),
      concurrency::OSThread("PositionModule")
 {
+    precision = 0;        // safe starting value
    isPromiscuous = true; // We always want to update our nodedb, even if we are sniffing on others
-    if (config.device.role != meshtastic_Config_DeviceConfig_Role_TRACKER)
+    if (config.device.role != meshtastic_Config_DeviceConfig_Role_TRACKER &&
+        config.device.role != meshtastic_Config_DeviceConfig_Role_TAK_TRACKER)
        setIntervalFromNow(60 * 1000);

    // Power saving trackers should clear their position on startup to avoid waking up and sending a stale position
-    if (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER && config.power.is_power_saving) {
+    if ((config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
+         config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER) &&
+        config.power.is_power_saving) {
        clearPosition();
    }
 }
@@ -73,12 +83,12 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
    }

    nodeDB.updatePosition(getFrom(&mp), p);
-
-    // Only respond to location requests on the channel where we broadcast location.
-    if (channels.getByIndex(mp.channel).role == meshtastic_Channel_Role_PRIMARY) {
-        ignoreRequest = false;
+    if (channels.getByIndex(mp.channel).settings.has_module_settings) {
+        precision = channels.getByIndex(mp.channel).settings.module_settings.position_precision;
+    } else if (channels.getByIndex(mp.channel).role == meshtastic_Channel_Role_PRIMARY) {
+        precision = 32;
    } else {
-        ignoreRequest = true;
+        precision = 0;
    }

    return false; // Let others look at this message also if they want
@@ -86,8 +96,8 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes

 meshtastic_MeshPacket *PositionModule::allocReply()
 {
-    if (ignoreRequest) {
-        ignoreRequest = false; // Reset for next request
+    if (precision == 0) {
+        LOG_DEBUG("Skipping location send because precision is set to 0!\n");
        return nullptr;
    }

@@ -107,8 +117,19 @@ meshtastic_MeshPacket *PositionModule::allocReply()
    localPosition.seq_number++;

    // lat/lon are unconditionally included - IF AVAILABLE!
-    p.latitude_i = localPosition.latitude_i;
-    p.longitude_i = localPosition.longitude_i;
+    LOG_DEBUG("Sending location with precision %i\n", precision);
+    if (precision < 32 && precision > 0) {
+        p.latitude_i = localPosition.latitude_i & (UINT32_MAX << (32 - precision));
+        p.longitude_i = localPosition.longitude_i & (UINT32_MAX << (32 - precision));
+
+        // We want the imprecise position to be the middle of the possible location, not
+        p.latitude_i += (1 << (31 - precision));
+        p.longitude_i += (1 << (31 - precision));
+    } else {
+        p.latitude_i = localPosition.latitude_i;
+        p.longitude_i = localPosition.longitude_i;
+    }
+    p.precision_bits = precision;
    p.time = localPosition.time;

    if (pos_flags & meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE) {
@@ -155,26 +176,74 @@ meshtastic_MeshPacket *PositionModule::allocReply()
        LOG_INFO("Providing time to mesh %u\n", p.time);
    }

-    LOG_INFO("Position reply: time=%i, latI=%i, lonI=-%i\n", p.time, p.latitude_i, p.longitude_i);
+    LOG_INFO("Position reply: time=%i, latI=%i, lonI=%i\n", p.time, p.latitude_i, p.longitude_i);
+
+    // TAK Tracker devices should send their position in a TAK packet over the ATAK port
+    if (config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER)
+        return allocAtakPli();

    return allocDataProtobuf(p);
 }

+meshtastic_MeshPacket *PositionModule::allocAtakPli()
+{
+    LOG_INFO("Sending TAK PLI packet\n");
+    meshtastic_MeshPacket *mp = allocDataPacket();
+    mp->decoded.portnum = meshtastic_PortNum_ATAK_PLUGIN;
+
+    meshtastic_TAKPacket takPacket = {.is_compressed = true,
+                                      .has_contact = true,
+                                      .contact = {0},
+                                      .has_group = true,
+                                      .group = {meshtastic_MemberRole_TeamMember, meshtastic_Team_Cyan},
+                                      .has_status = true,
+                                      .status =
+                                          {
+                                              .battery = powerStatus->getBatteryChargePercent(),
+                                          },
+                                      .which_payload_variant = meshtastic_TAKPacket_pli_tag,
+                                      {.pli = {
+                                           .latitude_i = localPosition.latitude_i,
+                                           .longitude_i = localPosition.longitude_i,
+                                           .altitude = localPosition.altitude_hae,
+                                           .speed = localPosition.ground_speed,
+                                           .course = static_cast<uint16_t>(localPosition.ground_track),
+                                       }}};
+
+    auto length = unishox2_compress_simple(owner.long_name, strlen(owner.long_name), takPacket.contact.device_callsign);
+    LOG_DEBUG("Uncompressed device_callsign '%s' - %d bytes\n", owner.long_name, strlen(owner.long_name));
+    LOG_DEBUG("Compressed device_callsign '%s' - %d bytes\n", takPacket.contact.device_callsign, length);
+    length = unishox2_compress_simple(owner.long_name, strlen(owner.long_name), takPacket.contact.callsign);
+    mp->decoded.payload.size =
+        pb_encode_to_bytes(mp->decoded.payload.bytes, sizeof(mp->decoded.payload.bytes), &meshtastic_TAKPacket_msg, &takPacket);
+    return mp;
+}
+
 void PositionModule::sendOurPosition(NodeNum dest, bool wantReplies, uint8_t channel)
 {
    // cancel any not yet sent (now stale) position packets
    if (prevPacketId) // if we wrap around to zero, we'll simply fail to cancel in that rare case (no big deal)
        service.cancelSending(prevPacketId);

+    // Set's the class precision value for this particular packet
+    if (channels.getByIndex(channel).settings.has_module_settings) {
+        precision = channels.getByIndex(channel).settings.module_settings.position_precision;
+    } else if (channels.getByIndex(channel).role == meshtastic_Channel_Role_PRIMARY) {
+        precision = 32;
+    } else {
+        precision = 0;
+    }
+
    meshtastic_MeshPacket *p = allocReply();
    if (p == nullptr) {
-        LOG_WARN("allocReply returned a nullptr\n");
+        LOG_DEBUG("allocReply returned a nullptr\n");
        return;
    }

    p->to = dest;
    p->decoded.want_response = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ? false : wantReplies;
-    if (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER)
+    if (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
+        config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER)
        p->priority = meshtastic_MeshPacket_Priority_RELIABLE;
    else
        p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
@@ -185,7 +254,9 @@ void PositionModule::sendOurPosition(NodeNum dest, bool wantReplies, uint8_t cha

    service.sendToMesh(p, RX_SRC_LOCAL, true);

-    if (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER && config.power.is_power_saving) {
+    if ((config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
+         config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER) &&
+        config.power.is_power_saving) {
        LOG_DEBUG("Starting next execution in 5 seconds and then going to sleep.\n");
        sleepOnNextExecution = true;
        setIntervalFromNow(5000);
@@ -212,7 +283,8 @@ int32_t PositionModule::runOnce()
    uint32_t intervalMs = getConfiguredOrDefaultMs(config.position.position_broadcast_secs, default_broadcast_interval_secs);
    uint32_t msSinceLastSend = now - lastGpsSend;
    // Only send packets if the channel util. is less than 25% utilized or we're a tracker with less than 40% utilized.
-    if (!airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_TRACKER)) {
+    if (!airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_TRACKER &&
+                                         config.device.role != meshtastic_Config_DeviceConfig_Role_TAK_TRACKER)) {
        return RUNONCE_INTERVAL;
    }

@@ -300,7 +372,7 @@ struct SmartPosition PositionModule::getDistanceTraveledSinceLastSend(meshtastic
    LOG_DEBUG("currentPosition.latitude_i=%i, currentPosition.longitude_i=%i\n", lastGpsLatitude, lastGpsLongitude);

    LOG_DEBUG("--------SMART POSITION-----------------------------------\n");
-    LOG_DEBUG("hasTraveledOverThreshold=%i, distanceTraveled=%d, distanceThreshold=% u\n",
+    LOG_DEBUG("hasTraveledOverThreshold=%i, distanceTraveled=%f, distanceThreshold=%f\n",
              abs(distanceTraveledSinceLastSend) >= distanceTravelThreshold, abs(distanceTraveledSinceLastSend),
              distanceTravelThreshold);

--- a/src/modules/PositionModule.h
+++ b/src/modules/PositionModule.h
@@ -49,6 +49,8 @@ class PositionModule : public ProtobufModule<meshtastic_Position>, private concu

  private:
    struct SmartPosition getDistanceTraveledSinceLastSend(meshtastic_PositionLite currentPosition);
+    meshtastic_MeshPacket *allocAtakPli();
+    uint32_t precision;

    /** Only used in power saving trackers for now */
    void clearPosition();
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -58,7 +58,7 @@
 SerialModule *serialModule;
 SerialModuleRadio *serialModuleRadio;

-#ifdef TTGO_T_ECHO
+#if defined(TTGO_T_ECHO) || defined(CANARYONE)
 SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("SerialModule") {}
 static Print *serialPrint = &Serial;
 #else
@@ -140,7 +140,7 @@ int32_t SerialModule::runOnce()
                Serial.begin(baud);
                Serial.setTimeout(moduleConfig.serial.timeout > 0 ? moduleConfig.serial.timeout : TIMEOUT);
            }
-#elif !defined(TTGO_T_ECHO)
+#elif !defined(TTGO_T_ECHO) && !defined(CANARYONE)
            if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
 #ifdef ARCH_RP2040
                Serial2.setFIFOSize(RX_BUFFER);
@@ -188,7 +188,7 @@ int32_t SerialModule::runOnce()
                    }
                }
            }
-#if !defined(TTGO_T_ECHO)
+#if !defined(TTGO_T_ECHO) && !defined(CANARYONE)
            else {
                while (Serial2.available()) {
                    serialPayloadSize = Serial2.readBytes(serialBytes, meshtastic_Constants_DATA_PAYLOAD_LEN);
--- a/src/modules/esp32/PaxcounterModule.cpp
+++ b/src/modules/esp32/PaxcounterModule.cpp
@@ -57,7 +57,7 @@ meshtastic_MeshPacket *PaxcounterModule::allocReply()

 int32_t PaxcounterModule::runOnce()
 {
-    if (moduleConfig.paxcounter.enabled && !config.bluetooth.enabled && !config.network.wifi_enabled) {
+    if (isActive()) {
        if (firstTime) {
            firstTime = false;
            LOG_DEBUG(
@@ -87,4 +87,55 @@ int32_t PaxcounterModule::runOnce()
    }
 }

+#if HAS_SCREEN
+
+#ifdef OLED_RU
+#include "graphics/fonts/OLEDDisplayFontsRU.h"
+#endif
+
+#ifdef OLED_UA
+#include "graphics/fonts/OLEDDisplayFontsUA.h"
+#endif
+
+// TODO / FIXME: This code is copied from src/graphics/Screen.cpp
+//               It appears (in slightly variants) also in other modules like
+//               src/modules/Telemetry/PowerTelemetry.cpp, src/modules/Telemetry/EnvironmentTelemetry.cpp
+//               and src/modules/CannedMessageModule.cpp
+//               It probably should go to a common header file for consistency
+#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
+#define FONT_LARGE ArialMT_Plain_24  // Height: 28
+#else
+#ifdef OLED_RU
+#define FONT_SMALL ArialMT_Plain_10_RU
+#else
+#ifdef OLED_UA
+#define FONT_SMALL ArialMT_Plain_10_UA
+#else
+#define FONT_SMALL ArialMT_Plain_10 // Height: 13
+#endif
+#endif
+#define FONT_MEDIUM ArialMT_Plain_16 // Height: 19
+#define FONT_LARGE ArialMT_Plain_24  // Height: 28
+#endif
+
+void PaxcounterModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    char buffer[50];
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
+    display->setFont(FONT_SMALL);
+    display->drawString(x + 0, y + 0, "PAX");
+
+    libpax_counter_count(&count_from_libpax);
+
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+    display->setFont(FONT_SMALL);
+    display->drawStringf(display->getWidth() / 2 + x, 0 + y + 12, buffer, "WiFi: %d\nBLE: %d\nuptime: %ds",
+                         count_from_libpax.wifi_count, count_from_libpax.ble_count, millis() / 1000);
+}
+#endif // HAS_SCREEN
+
 #endif
--- a/src/modules/esp32/PaxcounterModule.h
+++ b/src/modules/esp32/PaxcounterModule.h
@@ -23,6 +23,11 @@ class PaxcounterModule : private concurrency::OSThread, public ProtobufModule<me
    bool sendInfo(NodeNum dest = NODENUM_BROADCAST);
    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Paxcount *p) override;
    virtual meshtastic_MeshPacket *allocReply() override;
+    bool isActive() { return moduleConfig.paxcounter.enabled && !config.bluetooth.enabled && !config.network.wifi_enabled; }
+#if HAS_SCREEN
+    virtual bool wantUIFrame() override { return isActive(); }
+    virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) override;
+#endif
 };

 extern PaxcounterModule *paxcounterModule;
--- a/src/modules/esp32/StoreForwardModule.cpp
+++ b/src/modules/esp32/StoreForwardModule.cpp
@@ -38,25 +38,21 @@ int32_t StoreForwardModule::runOnce()
            // Only send packets if the channel is less than 25% utilized.
            if (airTime->isTxAllowedChannelUtil(true)) {
                storeForwardModule->sendPayload(this->busyTo, this->packetHistoryTXQueue_index);
-                if (this->packetHistoryTXQueue_index == packetHistoryTXQueue_size) {
-                    // Tell the client we're done sending
-                    meshtastic_StoreAndForward sf = meshtastic_StoreAndForward_init_zero;
-                    sf.rr = meshtastic_StoreAndForward_RequestResponse_ROUTER_PING;
-                    storeForwardModule->sendMessage(this->busyTo, sf);
-                    LOG_INFO("*** S&F - Done. (ROUTER_PING)\n");
+                if (this->packetHistoryTXQueue_index < packetHistoryTXQueue_size - 1) {
+                    this->packetHistoryTXQueue_index++;
+                } else {
                    this->packetHistoryTXQueue_index = 0;
                    this->busy = false;
-                } else {
-                    this->packetHistoryTXQueue_index++;
                }
            }
-        } else if ((millis() - lastHeartbeat > (heartbeatInterval * 1000)) && airTime->isTxAllowedChannelUtil(true)) {
+        } else if (this->heartbeat && (millis() - lastHeartbeat > (heartbeatInterval * 1000)) &&
+                   airTime->isTxAllowedChannelUtil(true)) {
            lastHeartbeat = millis();
            LOG_INFO("*** Sending heartbeat\n");
            meshtastic_StoreAndForward sf = meshtastic_StoreAndForward_init_zero;
            sf.rr = meshtastic_StoreAndForward_RequestResponse_ROUTER_HEARTBEAT;
            sf.which_variant = meshtastic_StoreAndForward_heartbeat_tag;
-            sf.variant.heartbeat.period = 300;
+            sf.variant.heartbeat.period = heartbeatInterval;
            sf.variant.heartbeat.secondary = 0; // TODO we always have one primary router for now
            storeForwardModule->sendMessage(NODENUM_BROADCAST, sf);
        }
@@ -104,7 +100,8 @@ void StoreForwardModule::populatePSRAM()
 */
 void StoreForwardModule::historySend(uint32_t msAgo, uint32_t to)
 {
-    uint32_t queueSize = storeForwardModule->historyQueueCreate(msAgo, to);
+    uint32_t lastIndex = lastRequest.find(to) != lastRequest.end() ? lastRequest[to] : 0;
+    uint32_t queueSize = storeForwardModule->historyQueueCreate(msAgo, to, &lastIndex);

    if (queueSize) {
        LOG_INFO("*** S&F - Sending %u message(s)\n", queueSize);
@@ -118,6 +115,8 @@ void StoreForwardModule::historySend(uint32_t msAgo, uint32_t to)
    sf.which_variant = meshtastic_StoreAndForward_history_tag;
    sf.variant.history.history_messages = queueSize;
    sf.variant.history.window = msAgo;
+    sf.variant.history.last_request = lastIndex;
+    lastRequest[to] = lastIndex;
    storeForwardModule->sendMessage(to, sf);
 }

@@ -125,44 +124,49 @@ void StoreForwardModule::historySend(uint32_t msAgo, uint32_t to)
 * Creates a new history queue with messages that were received within the specified time frame.
 *
 * @param msAgo The number of milliseconds ago to start the history queue.
- * @param to The maximum number of messages to include in the history queue.
+ * @param to The NodeNum of the recipient.
+ * @param last_request_index The index in the packet history of the last request from this node.
 * @return The ID of the newly created history queue.
 */
-uint32_t StoreForwardModule::historyQueueCreate(uint32_t msAgo, uint32_t to)
+uint32_t StoreForwardModule::historyQueueCreate(uint32_t msAgo, uint32_t to, uint32_t *last_request_index)
 {

    this->packetHistoryTXQueue_size = 0;
+    // If our history was cleared, ignore the last request index
+    uint32_t last_index = *last_request_index > this->packetHistoryCurrent ? 0 : *last_request_index;

-    for (int i = 0; i < this->packetHistoryCurrent; i++) {
+    for (uint32_t i = last_index; i < this->packetHistoryCurrent; i++) {
        /*
            LOG_DEBUG("SF historyQueueCreate\n");
            LOG_DEBUG("SF historyQueueCreate - time %d\n", this->packetHistory[i].time);
            LOG_DEBUG("SF historyQueueCreate - millis %d\n", millis());
            LOG_DEBUG("SF historyQueueCreate - math %d\n", (millis() - msAgo));
        */
-        if (this->packetHistory[i].time && (this->packetHistory[i].time < (millis() - msAgo))) {
-            LOG_DEBUG("*** SF historyQueueCreate - Time matches - ok\n");
-            /*
-                Copy the messages that were received by the router in the last msAgo
-                to the packetHistoryTXQueue structure.
+        if (this->packetHistoryTXQueue_size < this->historyReturnMax) {
+            if (this->packetHistory[i].time && (this->packetHistory[i].time < (millis() - msAgo))) {
+                /*  Copy the messages that were received by the router in the last msAgo
+                    to the packetHistoryTXQueue structure.
+                    Client not interested in packets from itself and only in broadcast packets or packets towards it. */
+                if (this->packetHistory[i].from != to &&
+                    (this->packetHistory[i].to == NODENUM_BROADCAST || this->packetHistory[i].to == to)) {
+                    this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].time = this->packetHistory[i].time;
+                    this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].to = this->packetHistory[i].to;
+                    this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].from = this->packetHistory[i].from;
+                    this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].channel = this->packetHistory[i].channel;
+                    this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].payload_size =
+                        this->packetHistory[i].payload_size;
+                    memcpy(this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].payload, this->packetHistory[i].payload,
+                           meshtastic_Constants_DATA_PAYLOAD_LEN);
+                    this->packetHistoryTXQueue_size++;
+                    *last_request_index = i + 1; // Set to one higher such that we don't send the same message again

-                TODO: The condition (this->packetHistory[i].to & NODENUM_BROADCAST) == to) is not tested since
-                I don't have an easy way to target a specific user. Will need to do this soon.
-            */
-            if ((this->packetHistory[i].to & NODENUM_BROADCAST) == NODENUM_BROADCAST ||
-                ((this->packetHistory[i].to & NODENUM_BROADCAST) == to)) {
-                this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].time = this->packetHistory[i].time;
-                this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].to = this->packetHistory[i].to;
-                this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].from = this->packetHistory[i].from;
-                this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].channel = this->packetHistory[i].channel;
-                this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].payload_size = this->packetHistory[i].payload_size;
-                memcpy(this->packetHistoryTXQueue[this->packetHistoryTXQueue_size].payload, this->packetHistory[i].payload,
-                       meshtastic_Constants_DATA_PAYLOAD_LEN);
-                this->packetHistoryTXQueue_size++;
-
-                LOG_DEBUG("*** PacketHistoryStruct time=%d\n", this->packetHistory[i].time);
-                LOG_DEBUG("*** PacketHistoryStruct msg=%s\n", this->packetHistory[i].payload);
+                    LOG_DEBUG("*** PacketHistoryStruct time=%d, msg=%s\n", this->packetHistory[i].time,
+                              this->packetHistory[i].payload);
+                }
            }
+        } else {
+            LOG_WARN("*** S&F - Maximum history return reached.\n");
+            return this->packetHistoryTXQueue_size;
        }
    }
    return this->packetHistoryTXQueue_size;
@@ -177,6 +181,15 @@ void StoreForwardModule::historyAdd(const meshtastic_MeshPacket &mp)
 {
    const auto &p = mp.decoded;

+    if (this->packetHistoryCurrent == this->records) {
+        LOG_WARN("*** S&F - PSRAM Full. Starting overwrite now.\n");
+        this->packetHistoryCurrent = 0;
+        this->packetHistoryMax = 0;
+        for (auto &i : lastRequest) {
+            i.second = 0; // Clear the last request index for each client device
+        }
+    }
+
    this->packetHistory[this->packetHistoryCurrent].time = millis();
    this->packetHistory[this->packetHistoryCurrent].to = mp.to;
    this->packetHistory[this->packetHistoryCurrent].channel = mp.channel;
@@ -213,10 +226,19 @@ void StoreForwardModule::sendPayload(NodeNum dest, uint32_t packetHistory_index)
    //   TODO: Make this configurable.
    p->want_ack = false;

-    p->decoded.payload.size =
-        this->packetHistoryTXQueue[packetHistory_index].payload_size; // You must specify how many bytes are in the reply
-    memcpy(p->decoded.payload.bytes, this->packetHistoryTXQueue[packetHistory_index].payload,
+    meshtastic_StoreAndForward sf = meshtastic_StoreAndForward_init_zero;
+    sf.which_variant = meshtastic_StoreAndForward_text_tag;
+    sf.variant.text.size = this->packetHistoryTXQueue[packetHistory_index].payload_size;
+    memcpy(sf.variant.text.bytes, this->packetHistoryTXQueue[packetHistory_index].payload,
           this->packetHistoryTXQueue[packetHistory_index].payload_size);
+    if (this->packetHistoryTXQueue[packetHistory_index].to == NODENUM_BROADCAST) {
+        sf.rr = meshtastic_StoreAndForward_RequestResponse_ROUTER_TEXT_BROADCAST;
+    } else {
+        sf.rr = meshtastic_StoreAndForward_RequestResponse_ROUTER_TEXT_DIRECT;
+    }
+
+    p->decoded.payload.size =
+        pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), &meshtastic_StoreAndForward_msg, &sf);

    service.sendToMesh(p);
 }
@@ -302,7 +324,8 @@ ProcessMessage StoreForwardModule::handleReceived(const meshtastic_MeshPacket &m

            if ((mp.decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP) && is_server) {
                auto &p = mp.decoded;
-                if ((p.payload.bytes[0] == 'S') && (p.payload.bytes[1] == 'F') && (p.payload.bytes[2] == 0x00)) {
+                if (mp.to == nodeDB.getNodeNum() && (p.payload.bytes[0] == 'S') && (p.payload.bytes[1] == 'F') &&
+                    (p.payload.bytes[2] == 0x00)) {
                    LOG_DEBUG("*** Legacy Request to send\n");

                    // Send the last 60 minutes of messages.
@@ -387,7 +410,8 @@ bool StoreForwardModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp,
                LOG_INFO("*** S&F - Busy. Try again shortly.\n");
            } else {
                if ((p->which_variant == meshtastic_StoreAndForward_history_tag) && (p->variant.history.window > 0)) {
-                    storeForwardModule->historySend(p->variant.history.window * 60000, getFrom(&mp)); // window is in minutes
+                    // window is in minutes
+                    storeForwardModule->historySend(p->variant.history.window * 60000, getFrom(&mp));
                } else {
                    storeForwardModule->historySend(historyReturnWindow * 60000, getFrom(&mp)); // defaults to 4 hours
                }
@@ -406,8 +430,7 @@ bool StoreForwardModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp,
    case meshtastic_StoreAndForward_RequestResponse_CLIENT_PONG:
        if (is_server) {
            LOG_INFO("*** StoreAndForward_RequestResponse_CLIENT_PONG\n");
-            // The Client is alive, update NodeDB
-            nodeDB.updateFrom(mp);
+            // NodeDB is already updated
        }
        break;

@@ -532,6 +555,8 @@ StoreForwardModule::StoreForwardModule()
                    // send heartbeat advertising?
                    if (moduleConfig.store_forward.heartbeat)
                        this->heartbeat = moduleConfig.store_forward.heartbeat;
+                    else
+                        this->heartbeat = false;

                    // Popupate PSRAM with our data structures.
                    this->populatePSRAM();
@@ -546,9 +571,7 @@ StoreForwardModule::StoreForwardModule()
            }

            // Client
-        }
-        if ((config.device.role == meshtastic_Config_DeviceConfig_Role_CLIENT) ||
-            (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER_CLIENT)) {
+        } else {
            is_client = true;
            LOG_INFO("*** Initializing Store & Forward Module in Client mode\n");
        }
--- a/src/modules/esp32/StoreForwardModule.h
+++ b/src/modules/esp32/StoreForwardModule.h
@@ -7,13 +7,13 @@
 #include "configuration.h"
 #include <Arduino.h>
 #include <functional>
+#include <unordered_map>

 struct PacketHistoryStruct {
    uint32_t time;
    uint32_t to;
    uint32_t from;
    uint8_t channel;
-    bool ack;
    uint8_t payload[meshtastic_Constants_DATA_PAYLOAD_LEN];
    pb_size_t payload_size;
 };
@@ -32,16 +32,19 @@ class StoreForwardModule : private concurrency::OSThread, public ProtobufModule<
    uint32_t packetHistoryTXQueue_size = 0;
    uint32_t packetHistoryTXQueue_index = 0;

-    uint32_t packetTimeMax = 5000;
+    uint32_t packetTimeMax = 5000; // Interval between sending history packets as a server.

    bool is_client = false;
    bool is_server = false;

+    // Unordered_map stores the last request for each nodeNum (`to` field)
+    std::unordered_map<NodeNum, uint32_t> lastRequest;
+
  public:
    StoreForwardModule();

    unsigned long lastHeartbeat = 0;
-    uint32_t heartbeatInterval = 300;
+    uint32_t heartbeatInterval = 900;

    /**
     Update our local reference of when we last saw that node.
@@ -51,7 +54,7 @@ class StoreForwardModule : private concurrency::OSThread, public ProtobufModule<
    void statsSend(uint32_t to);
    void historySend(uint32_t msAgo, uint32_t to);

-    uint32_t historyQueueCreate(uint32_t msAgo, uint32_t to);
+    uint32_t historyQueueCreate(uint32_t msAgo, uint32_t to, uint32_t *last_request_index);

    /**
     * Send our payload into the mesh
@@ -79,16 +82,16 @@ class StoreForwardModule : private concurrency::OSThread, public ProtobufModule<
    void populatePSRAM();

    // S&F Defaults
-    uint32_t historyReturnMax = 250;    // 250 records
-    uint32_t historyReturnWindow = 240; // 4 hours
+    uint32_t historyReturnMax = 25;     // Return maximum of 25 records by default.
+    uint32_t historyReturnWindow = 240; // Return history of last 4 hours by default.
    uint32_t records = 0;               // Calculated
    bool heartbeat = false;             // No heartbeat.

    // stats
-    uint32_t requests = 0;
-    uint32_t requests_history = 0;
+    uint32_t requests = 0;         // Number of times any client sent a request to the S&F.
+    uint32_t requests_history = 0; // Number of times the history was requested.

-    uint32_t retry_delay = 0;
+    uint32_t retry_delay = 0; // If server is busy, retry after this delay (in ms).

  protected:
    virtual int32_t runOnce() override;
@@ -102,4 +105,4 @@ class StoreForwardModule : private concurrency::OSThread, public ProtobufModule<
    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_StoreAndForward *p);
 };

-extern StoreForwardModule *storeForwardModule;
+extern StoreForwardModule *storeForwardModule;
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -52,11 +52,10 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
            JSONObject json;
            json = json_value->AsObject();

-            // parse the channel name from the topic string
-            char *ptr = strtok(topic, "/");
-            for (int i = 0; i < 3; i++) {
-                ptr = strtok(NULL, "/");
-            }
+            // parse the channel name from the topic string by looking for "json/"
+            const char *jsonSlash = "json/";
+            char *ptr = strstr(topic, jsonSlash) + sizeof(jsonSlash) + 1; // set pointer to after "json/"
+            ptr = strtok(ptr, "/") ? strtok(ptr, "/") : ptr; // if another "/" was added, parse string up to that character
            meshtastic_Channel sendChannel = channels.getByName(ptr);
            // We allow downlink JSON packets only on a channel named "mqtt"
            if (strncasecmp(channels.getGlobalId(sendChannel.index), Channels::mqttChannel, strlen(Channels::mqttChannel)) == 0 &&
@@ -70,7 +69,9 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
                        // construct protobuf data packet using TEXT_MESSAGE, send it to the mesh
                        meshtastic_MeshPacket *p = router->allocForSending();
                        p->decoded.portnum = meshtastic_PortNum_TEXT_MESSAGE_APP;
-                        p->channel = sendChannel.index;
+                        if (json.find("channel") != json.end() && json["channel"]->IsNumber() &&
+                            (json["channel"]->AsNumber() < channels.getNumChannels()))
+                            p->channel = json["channel"]->AsNumber();
                        if (json.find("to") != json.end() && json["to"]->IsNumber())
                            p->to = json["to"]->AsNumber();
                        if (jsonPayloadStr.length() <= sizeof(p->decoded.payload.bytes)) {
@@ -98,7 +99,9 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
                        // construct protobuf data packet using POSITION, send it to the mesh
                        meshtastic_MeshPacket *p = router->allocForSending();
                        p->decoded.portnum = meshtastic_PortNum_POSITION_APP;
-                        p->channel = sendChannel.index;
+                        if (json.find("channel") != json.end() && json["channel"]->IsNumber() &&
+                            (json["channel"]->AsNumber() < channels.getNumChannels()))
+                            p->channel = json["channel"]->AsNumber();
                        if (json.find("to") != json.end() && json["to"]->IsNumber())
                            p->to = json["to"]->AsNumber();
                        p->decoded.payload.size =
@@ -127,11 +130,17 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
            LOG_ERROR("Invalid MQTT service envelope, topic %s, len %u!\n", topic, length);
            return;
        } else {
-            if (strcmp(e.gateway_id, owner.id) == 0)
-                LOG_INFO("Ignoring downlink message we originally sent.\n");
-            else {
+            meshtastic_Channel ch = channels.getByName(e.channel_id);
+            if (strcmp(e.gateway_id, owner.id) == 0) {
+                // Generate an implicit ACK towards ourselves (handled and processed only locally!) for this message.
+                // We do this because packets are not rebroadcasted back into MQTT anymore and we assume that at least one node
+                // receives it when we get our own packet back. Then we'll stop our retransmissions.
+                if (e.packet && getFrom(e.packet) == nodeDB.getNodeNum())
+                    routingModule->sendAckNak(meshtastic_Routing_Error_NONE, getFrom(e.packet), e.packet->id, ch.index);
+                else
+                    LOG_INFO("Ignoring downlink message we originally sent.\n");
+            } else {
                // Find channel by channel_id and check downlink_enabled
-                meshtastic_Channel ch = channels.getByName(e.channel_id);
                if (strcmp(e.channel_id, channels.getGlobalId(ch.index)) == 0 && e.packet && ch.settings.downlink_enabled) {
                    LOG_INFO("Received MQTT topic %s, len=%u\n", topic, length);
                    meshtastic_MeshPacket *p = packetPool.allocCopy(*e.packet);
@@ -342,11 +351,13 @@ void MQTT::sendSubscriptions()
            std::string topic = cryptTopic + channels.getGlobalId(i) + "/#";
            LOG_INFO("Subscribing to %s\n", topic.c_str());
            pubSub.subscribe(topic.c_str(), 1); // FIXME, is QOS 1 right?
+#ifndef ARCH_NRF52                              // JSON is not supported on nRF52, see issue #2804
            if (moduleConfig.mqtt.json_enabled == true) {
                std::string topicDecoded = jsonTopic + channels.getGlobalId(i) + "/#";
                LOG_INFO("Subscribing to %s\n", topicDecoded.c_str());
                pubSub.subscribe(topicDecoded.c_str(), 1); // FIXME, is QOS 1 right?
            }
+#endif // ARCH_NRF52
        }
    }
 #endif
@@ -441,6 +452,7 @@ void MQTT::publishQueuedMessages()

        publish(topic.c_str(), bytes, numBytes, false);

+#ifndef ARCH_NRF52 // JSON is not supported on nRF52, see issue #2804
        if (moduleConfig.mqtt.json_enabled) {
            // handle json topic
            auto jsonString = this->meshPacketToJson(env->packet);
@@ -451,6 +463,7 @@ void MQTT::publishQueuedMessages()
                publish(topicJson.c_str(), jsonString.c_str(), false);
            }
        }
+#endif // ARCH_NRF52
        mqttPool.release(env);
    }
 }
@@ -476,14 +489,15 @@ void MQTT::onSend(const meshtastic_MeshPacket &mp, const meshtastic_MeshPacket &
        env->channel_id = (char *)channelId;
        env->gateway_id = owner.id;

+        LOG_DEBUG("MQTT onSend - Publishing ");
        if (moduleConfig.mqtt.encryption_enabled) {
            env->packet = (meshtastic_MeshPacket *)&mp;
+            LOG_DEBUG("encrypted message\n");
        } else {
            env->packet = (meshtastic_MeshPacket *)&mp_decoded;
+            LOG_DEBUG("portnum %i message\n", env->packet->decoded.portnum);
        }

-        LOG_DEBUG("MQTT onSend - Publishing portnum %i message\n", env->packet->decoded.portnum);
-
        if (moduleConfig.mqtt.proxy_to_client_enabled || this->isConnectedDirectly()) {
            // FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
            static uint8_t bytes[meshtastic_MeshPacket_size + 64];
@@ -494,6 +508,7 @@ void MQTT::onSend(const meshtastic_MeshPacket &mp, const meshtastic_MeshPacket &

            publish(topic.c_str(), bytes, numBytes, false);

+#ifndef ARCH_NRF52 // JSON is not supported on nRF52, see issue #2804
            if (moduleConfig.mqtt.json_enabled) {
                // handle json topic
                auto jsonString = this->meshPacketToJson((meshtastic_MeshPacket *)&mp_decoded);
@@ -504,12 +519,7 @@ void MQTT::onSend(const meshtastic_MeshPacket &mp, const meshtastic_MeshPacket &
                    publish(topicJson.c_str(), jsonString.c_str(), false);
                }
            }
-
-            // Generate an implicit ACK towards ourselves (handled and processed only locally!) for this message.
-            // We do this because packets are not rebroadcasted back into MQTT anymore and we assume that at least one node
-            // receives it when we're connected to the broker. Then we'll stop our retransmissions.
-            if (getFrom(&mp) == nodeDB.getNodeNum())
-                routingModule->sendAckNak(meshtastic_Routing_Error_NONE, getFrom(&mp), mp.id, chIndex);
+#endif // ARCH_NRF52
        } else {
            LOG_INFO("MQTT not connected, queueing packet\n");
            if (mqttQueue.numFree() == 0) {
--- a/src/mqtt/MQTT.h
+++ b/src/mqtt/MQTT.h
@@ -50,7 +50,8 @@ class MQTT : private concurrency::OSThread

    /**
     * Publish a packet on the global MQTT server.
-     * This hook must be called **after** the packet is encrypted (including the channel being changed to a hash).
+     * @param mp the encrypted packet to publish
+     * @param mp_decoded the decrypted packet to publish
     * @param chIndex the index of the channel for this message
     *
     * Note: for messages we are forwarding on the mesh that we can't find the channel for (because we don't have the keys), we
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -106,7 +106,13 @@
 #elif defined(HELTEC_WSL_V3)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WSL_V3
 #elif defined(HELTEC_WIRELESS_TRACKER)
+#ifdef HELTEC_TRACKER_V1_0
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER_V1_0
+#else
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER
+#endif
+#elif defined(HELTEC_WIRELESS_PAPER_V1_0)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER_V1_0
 #elif defined(HELTEC_WIRELESS_PAPER)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER
 #elif defined(TLORA_T3S3_V1)
@@ -119,14 +125,16 @@
 #define HW_VENDOR meshtastic_HardwareModel_BETAFPV_900_NANO_TX
 #elif defined(PICOMPUTER_S3)
 #define HW_VENDOR meshtastic_HardwareModel_PICOMPUTER_S3
-#elif defined(HELTEC_HT62)
-#define HW_VENDOR meshtastic_HardwareModel_HELTEC_HT62
+#elif defined(ESP32_S3_PICO)
+#define HW_VENDOR meshtastic_HardwareModel_ESP32_S3_PICO
 #elif defined(SENSELORA_S3)
 #define HW_VENDOR meshtastic_HardwareModel_SENSELORA_S3
 #elif defined(HELTEC_HT62)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_HT62
 #elif defined(CHATTER_2)
 #define HW_VENDOR meshtastic_HardwareModel_CHATTER_2
+#elif defined(STATION_G2)
+#define HW_VENDOR meshtastic_HardwareModel_STATION_G2
 #endif

 // -----------------------------------------------------------------------------
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -48,6 +48,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_T_ECHO
 #elif defined(NANO_G2_ULTRA)
 #define HW_VENDOR meshtastic_HardwareModel_NANO_G2_ULTRA
+#elif defined(CANARYONE)
+#define HW_VENDOR meshtastic_HardwareModel_CANARYONE
 #elif defined(NORDIC_PCA10059)
 #define HW_VENDOR meshtastic_HardwareModel_NRF52840_PCA10059
 #elif defined(PRIVATE_HW) || defined(FEATHER_DIY)
--- a/src/platform/nrf52/main-nrf52.cpp
+++ b/src/platform/nrf52/main-nrf52.cpp
@@ -185,6 +185,7 @@ void cpuDeepSleep(uint32_t msecToWake)
    // Don't enter this if we're sleeping portMAX_DELAY, since that's a shutdown event
    if (msecToWake != portMAX_DELAY &&
        (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
+         config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
         config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR) &&
        config.power.is_power_saving == true) {
        sd_power_mode_set(NRF_POWER_MODE_LOWPWR);
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/src/platform/portduino/PortduinoGlue.cpp
@@ -169,6 +169,8 @@ void portduinoSetup()
                settingsMap[displayPanel] = st7735;
            else if (yamlConfig["Display"]["Panel"].as<std::string>("") == "ST7735S")
                settingsMap[displayPanel] = st7735s;
+            else if (yamlConfig["Display"]["Panel"].as<std::string>("") == "ILI9341")
+                settingsMap[displayPanel] = ili9341;
            settingsMap[displayHeight] = yamlConfig["Display"]["Height"].as<int>(0);
            settingsMap[displayWidth] = yamlConfig["Display"]["Width"].as<int>(0);
            settingsMap[displayDC] = yamlConfig["Display"]["DC"].as<int>(-1);
@@ -184,6 +186,8 @@ void portduinoSetup()
        if (yamlConfig["Touchscreen"]) {
            if (yamlConfig["Touchscreen"]["Module"].as<std::string>("") == "XPT2046")
                settingsMap[touchscreenModule] = xpt2046;
+            else if (yamlConfig["Touchscreen"]["Module"].as<std::string>("") == "STMPE610")
+                settingsMap[touchscreenModule] = stmpe610;
            settingsMap[touchscreenCS] = yamlConfig["Touchscreen"]["CS"].as<int>(-1);
            settingsMap[touchscreenIRQ] = yamlConfig["Touchscreen"]["IRQ"].as<int>(-1);
        }
--- a/src/platform/portduino/PortduinoGlue.h
+++ b/src/platform/portduino/PortduinoGlue.h
@@ -35,8 +35,8 @@ enum configNames {
    keyboardDevice,
    logoutputlevel
 };
-enum { no_screen, st7789, st7735, st7735s };
-enum { no_touchscreen, xpt2046 };
+enum { no_screen, st7789, st7735, st7735s, ili9341 };
+enum { no_touchscreen, xpt2046, stmpe610 };
 enum { level_error, level_warn, level_info, level_debug };

 extern std::map<configNames, int> settingsMap;
--- a/src/platform/rp2040/architecture.h
+++ b/src/platform/rp2040/architecture.h
@@ -27,4 +27,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_RAK11310
 #elif defined(SENSELORA_RP2040)
 #define HW_VENDOR meshtastic_HardwareModel_SENSELORA_RP2040
+#elif defined(RP2040_LORA)
+#define HW_VENDOR meshtastic_HardwareModel_RP2040_LORA
 #endif
--- a/src/power.h
+++ b/src/power.h
@@ -5,18 +5,39 @@
 #include <esp_adc_cal.h>
 #include <soc/adc_channel.h>
 #endif
-/**
- * Per @spattinson
- * MIN_BAT_MILLIVOLTS seems high. Typical 18650 are different chemistry to LiPo, even for LiPos that chart seems a bit off, other
- * charts put 3690mV at about 30% for a lipo, for 18650 i think 10% remaining iis in the region of 3.2-3.3V. Reference 1st graph
- * in [this test report](https://lygte-info.dk/review/batteries2012/Samsung%20INR18650-30Q%203000mAh%20%28Pink%29%20UK.html)
- * looking at the red line - discharge at 0.2A - he gets a capacity of 2900mah, 90% of 2900 = 2610, that point in the graph looks
- * to be a shade above 3.2V
- */
-#define MIN_BAT_MILLIVOLTS 3250 // millivolts. 10% per https://blog.ampow.com/lipo-voltage-chart/

-#define BAT_MILLIVOLTS_FULL 4100
-#define BAT_MILLIVOLTS_EMPTY 3500
+#ifndef NUM_OCV_POINTS
+#define NUM_OCV_POINTS 11
+#endif
+
+// 3400,3350,3320,3290,3270,3260,3250,3230,3200,3120,3000 //3.4 to 3.0 LiFePO4
+// 2120,2090,2070,2050,2030,2010,1990,1980,1970,1960,1950 //2.12 to 1.95 Lead Acid
+// 4200,4050,3990,3890,3790,3700,3650,3550,3450,3300,3200 //4.2 to 3.2 LiIon/LiPo
+// 4200,4050,3990,3890,3790,3700,3650,3550,3400,3300,3000 //4.2 to 3.0 LiIon/LiPo
+// 4150,4050,3990,3890,3790,3690,3620,3520,3420,3300,3100 //4.15 to 3.1 LiIon/LiPo
+// 2770,2650,2540,2420,2300,2180,2060,1940,1800,1680,1550 //2.8 to 1.5 Lithium Titanate
+
+#ifndef OCV_ARRAY
+#ifdef CELL_TYPE_LIFEPO4
+#define OCV_ARRAY 3400, 3350, 3320, 3290, 3270, 3260, 3250, 3230, 3200, 3120, 3000
+#elif defined(CELL_TYPE_LEADACID)
+#define OCV_ARRAY 2120, 2090, 2070, 2050, 2030, 2010, 1990, 1980, 1970, 1960, 1950
+#elif defined(CELL_TYPE_ALKALINE)
+#define OCV_ARRAY 1580, 1400, 1350, 1300, 1280, 1250, 1230, 1190, 1150, 1100, 1000
+#elif defined(CELL_TYPE_NIMH)
+#define OCV_ARRAY 1400, 1300, 1280, 1270, 1260, 1250, 1240, 1230, 1210, 1150, 1000
+#elif defined(CELL_TYPE_LTO)
+#define OCV_ARRAY 2770, 2650, 2540, 2420, 2300, 2180, 2060, 1940, 1800, 1680, 1550
+#else // LiIon
+#define OCV_ARRAY 4190, 4050, 3990, 3890, 3800, 3720, 3630, 3530, 3420, 3300, 3100
+#endif
+#endif
+
+/*Note: 12V lead acid is 6 cells, most board accept only 1 cell LiIon/LiPo*/
+#ifndef NUM_CELLS
+#define NUM_CELLS 1
+#endif
+
 #ifdef BAT_MEASURE_ADC_UNIT
 extern RTC_NOINIT_ATTR uint64_t RTC_reg_b;
 #include "soc/sens_reg.h" // needed for adc pin reset
@@ -44,6 +65,7 @@ class Power : private concurrency::OSThread
    virtual bool setup();
    virtual int32_t runOnce() override;
    void setStatusHandler(meshtastic::PowerStatus *handler) { statusHandler = handler; }
+    const uint16_t OCV[11] = {OCV_ARRAY};

  protected:
    meshtastic::PowerStatus *statusHandler;
@@ -54,6 +76,7 @@ class Power : private concurrency::OSThread
    bool analogInit();

  private:
+    // open circuit voltage lookup table
    uint8_t low_voltage_counter;
 #ifdef DEBUG_HEAP
    uint32_t lastheap;
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -186,7 +186,15 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
    // not using wifi yet, but once we are this is needed to shutoff the radio hw
    // esp_wifi_stop();
    waitEnterSleep(skipPreflight);
+#ifdef ARCH_ESP32
+    if (shouldLoraWake(msecToWake)) {
+        notifySleep.notifyObservers(NULL);
+    } else {
+        notifyDeepSleep.notifyObservers(NULL);
+    }
+#else
    notifyDeepSleep.notifyObservers(NULL);
+#endif

    screen->doDeepSleep(); // datasheet says this will draw only 10ua

@@ -203,11 +211,10 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
 #endif

 #if defined(VEXT_ENABLE_V03)
-    if (heltec_version == 3) {
-        digitalWrite(VEXT_ENABLE_V03, 1); // turn off the display power
-    } else {
-        digitalWrite(VEXT_ENABLE_V05, 0); // turn off the display power
-    }
+    digitalWrite(VEXT_ENABLE_V03, 1); // turn off the display power
+#elif defined(VEXT_ENABLE_V05)
+    digitalWrite(VEXT_ENABLE_V05, 0); // turn off the lora amplifier power
+    digitalWrite(ST7735_BL_V05, 0);   // turn off the display power
 #elif defined(VEXT_ENABLE)
    digitalWrite(VEXT_ENABLE, 1); // turn off the display power
 #endif
@@ -241,6 +248,11 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
    }
 #endif

+#ifdef ARCH_ESP32
+    if (shouldLoraWake(msecToWake)) {
+        enableLoraInterrupt();
+    }
+#endif
    cpuDeepSleep(msecToWake);
 }

@@ -295,12 +307,7 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
    gpio_wakeup_enable((gpio_num_t)BUTTON_PIN, GPIO_INTR_LOW_LEVEL);
 #endif
 #endif
-#if defined(LORA_DIO1) && (LORA_DIO1 != RADIOLIB_NC)
-    gpio_wakeup_enable((gpio_num_t)LORA_DIO1, GPIO_INTR_HIGH_LEVEL); // SX126x/SX128x interrupt, active high
-#endif
-#ifdef RF95_IRQ
-    gpio_wakeup_enable((gpio_num_t)RF95_IRQ, GPIO_INTR_HIGH_LEVEL); // RF95 interrupt, active high
-#endif
+    enableLoraInterrupt();
 #ifdef PMU_IRQ
    // wake due to PMU can happen repeatedly if there is no battery installed or the battery fills
    if (pmu_found)
@@ -360,4 +367,30 @@ void enableModemSleep()
    int rv = esp_pm_configure(&esp32_config);
    LOG_DEBUG("Sleep request result %x\n", rv);
 }
+
+bool shouldLoraWake(uint32_t msecToWake)
+{
+    return msecToWake < portMAX_DELAY && (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER ||
+                                          config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER);
+}
+
+void enableLoraInterrupt()
+{
+#if SOC_PM_SUPPORT_EXT_WAKEUP && defined(LORA_DIO1) && (LORA_DIO1 != RADIOLIB_NC)
+    rtc_gpio_pulldown_en((gpio_num_t)LORA_DIO1);
+#if defined(LORA_RESET) && (LORA_RESET != RADIOLIB_NC)
+    rtc_gpio_pullup_en((gpio_num_t)LORA_RESET);
+#endif
+#if defined(LORA_CS) && (LORA_CS != RADIOLIB_NC)
+    rtc_gpio_pullup_en((gpio_num_t)LORA_CS);
+#endif
+    // Setup deep sleep with wakeup by external source
+    esp_sleep_enable_ext0_wakeup((gpio_num_t)LORA_DIO1, RISING);
+#elif defined(LORA_DIO1) && (LORA_DIO1 != RADIOLIB_NC)
+    gpio_wakeup_enable((gpio_num_t)LORA_DIO1, GPIO_INTR_HIGH_LEVEL); // SX126x/SX128x interrupt, active high
+#endif
+#ifdef RF95_IRQ
+    gpio_wakeup_enable((gpio_num_t)RF95_IRQ, GPIO_INTR_HIGH_LEVEL); // RF95 interrupt, active high
+#endif
+}
 #endif
--- a/src/sleep.h
+++ b/src/sleep.h
@@ -43,4 +43,8 @@ extern Observable<void *> notifyDeepSleep;

 /// Called to tell GPS thread to enter deep sleep independently of LoRa/MCU sleep, prior to full poweroff. Must return 0
 extern Observable<void *> notifyGPSSleep;
-void enableModemSleep();
+void enableModemSleep();
+#ifdef ARCH_ESP32
+void enableLoraInterrupt();
+bool shouldLoraWake(uint32_t msecToWake);
+#endif
--- a/variants/canaryone/platformio.ini
+++ b/variants/canaryone/platformio.ini
@@ -0,0 +1,15 @@
+; Public Beta oled/nrf52840/sx1262 device
+[env:canaryone]
+extends = nrf52840_base
+board = canaryone
+debug_tool = jlink
+
+# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
+build_flags = ${nrf52840_base.build_flags} -Ivariants/canaryone
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/canaryone>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+  adafruit/Adafruit BusIO@^1.13.2
+  lewisxhe/PCF8563_Library@^1.0.1
+;upload_protocol = fs
--- a/variants/canaryone/variant.cpp
+++ b/variants/canaryone/variant.cpp
@@ -0,0 +1,56 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+    // P0 - pins 0 and 1 are hardwired for xtal and should never be enabled
+    0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+    // P1
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant()
+{
+    // LEDs
+    pinMode(PIN_LED1, OUTPUT);
+    ledOff(PIN_LED1);
+
+    pinMode(PIN_LED2, OUTPUT);
+    ledOff(PIN_LED2);
+
+    pinMode(PIN_LED3, OUTPUT);
+    ledOff(PIN_LED3);
+
+    // Turn on power to the GPS and LoRa
+    pinMode(PIN_PWR_EN, OUTPUT);
+    digitalWrite(PIN_PWR_EN, HIGH);
+
+    // Pull the GPS out of reset
+    pinMode(GPS_RESET_PIN, OUTPUT);
+    digitalWrite(GPS_RESET_PIN, HIGH);
+
+    // Pull the LoRa out of reset
+    pinMode(LORA_RF_PWR, OUTPUT);
+    digitalWrite(LORA_RF_PWR, HIGH);
+}
--- a/variants/canaryone/variant.h
+++ b/variants/canaryone/variant.h
@@ -0,0 +1,188 @@
+/*
+ Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+ Copyright (c) 2016 Sandeep Mistry All right reserved.
+ Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_CANARYONE
+#define _VARIANT_CANARYONE
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#define CANARYONE
+
+#define GPIO_PORT0 0
+#define GPIO_PORT1 32
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (1)
+#define NUM_ANALOG_OUTPUTS (0)
+
+// LEDs
+#define PIN_LED1 (GPIO_PORT1 + 1)  // blue P1.01
+#define PIN_LED2 (GPIO_PORT0 + 14) // yellow P0.14
+#define PIN_LED3 (GPIO_PORT1 + 3)  // green P1.03
+
+#define LED_BLUE PIN_LED1
+
+#define LED_BUILTIN PIN_LED1
+#define LED_CONN PIN_LED3
+
+#define LED_STATE_ON 0 // State when LED is lit
+#define LED_INVERTED 1
+
+/*
+ * Buttons
+ */
+#define PIN_BUTTON1 (GPIO_PORT0 + 15) // BTN0 on schematic
+#define PIN_BUTTON2 (GPIO_PORT0 + 16) // BTN1 on schematic
+
+/*
+ * Analog pins
+ */
+#define PIN_A0 (4) // Battery ADC P0.04
+
+#define BATTERY_PIN PIN_A0
+
+static const uint8_t A0 = PIN_A0;
+
+#define ADC_RESOLUTION 14
+
+/**
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (GPIO_PORT0 + 26)
+// #define I2C_SDA  (GPIO_PORT0 + 26)
+#define PIN_WIRE_SCL (GPIO_PORT0 + 27)
+// #define I2C_SCL (GPIO_PORT0 + 27)
+
+#define PIN_LCD_RESET (GPIO_PORT0 + 2)
+
+/*
+ * External serial flash WP25R1635FZUIL0
+ */
+
+// QSPI Pins
+#define PIN_QSPI_SCK (GPIO_PORT1 + 14)
+#define PIN_QSPI_CS (GPIO_PORT1 + 15)
+#define PIN_QSPI_IO0 (GPIO_PORT1 + 12) // MOSI if using two bit interface
+#define PIN_QSPI_IO1 (GPIO_PORT1 + 13) // MISO if using two bit interface
+#define PIN_QSPI_IO2 (GPIO_PORT0 + 7)  // WP if using two bit interface (i.e. not used)
+#define PIN_QSPI_IO3 (GPIO_PORT0 + 5)  // HOLD if using two bit interface (i.e. not used)
+
+// On-board QSPI Flash
+#define EXTERNAL_FLASH_DEVICES MX25R1635F
+#define EXTERNAL_FLASH_USE_QSPI
+
+/*
+ * Lora radio
+ */
+#define RADIOLIB_DEBUG 1
+#define USE_SX1262
+#define SX126X_CS (GPIO_PORT0 + 24)
+#define SX126X_DIO1 (GPIO_PORT1 + 11)
+// #define SX126X_DIO3 (GPIO_PORT0 + 21)
+// #define SX126X_DIO2 () // LORA_BUSY // LoRa RX/TX
+#define SX126X_BUSY (GPIO_PORT0 + 17)
+#define SX126X_RESET (GPIO_PORT0 + 25)
+#define LORA_RF_PWR (GPIO_PORT0 + 28) // LORA_RF_SWITCH
+
+/*
+ * GPS pins
+ */
+#define HAS_GPS 1
+#define GPS_UBLOX
+#define GPS_BAUDRATE 38400
+
+// #define PIN_GPS_WAKE (GPIO_PORT1 + 2) // An output to wake GPS, low means allow sleep, high means force wake
+// Seems to be missing on this new board
+#define PIN_GPS_PPS (GPIO_PORT1 + 4) // Pulse per second input from the GPS
+#define GPS_TX_PIN (GPIO_PORT1 + 9)  // This is for bits going TOWARDS the CPU
+#define GPS_RX_PIN (GPIO_PORT1 + 8)  // This is for bits going TOWARDS the GPS
+
+#define GPS_THREAD_INTERVAL 50
+
+#define PIN_SERIAL1_RX GPS_TX_PIN
+#define PIN_SERIAL1_TX GPS_RX_PIN
+
+#define GPS_RESET_PIN (GPIO_PORT1 + 5) // GPS reset pin
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+
+// For LORA, spi 0
+#define PIN_SPI_MISO (GPIO_PORT0 + 23)
+#define PIN_SPI_MOSI (GPIO_PORT0 + 22)
+#define PIN_SPI_SCK (GPIO_PORT0 + 19)
+
+// #define PIN_SPI1_MISO (GPIO_PORT1 + 6) // FIXME not really needed, but for now the SPI code requires something to be defined,
+//  pick an used GPIO #define PIN_SPI1_MOSI (GPIO_PORT1 + 8) #define PIN_SPI1_SCK (GPIO_PORT1 + 9)
+
+#define PIN_PWR_EN (GPIO_PORT0 + 12)
+
+// To debug via the segger JLINK console rather than the CDC-ACM serial device
+#define USE_SEGGER 1
+
+// #define LORA_DISABLE_SENDING 1
+#define SX126X_DIO2_AS_RF_SWITCH 1
+
+// Battery
+// The battery sense is hooked to pin A0 (4)
+// it is defined in the anlaolgue pin section of this file
+// and has 12 bit resolution
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+// Definition of milliVolt per LSB => 3.0V ADC range and 12-bit ADC resolution = 3000mV/4096
+#define VBAT_MV_PER_LSB (0.73242188F)
+// Voltage divider value => 100K + 100K voltage divider on VBAT = (100K / (100K + 100K))
+#define VBAT_DIVIDER (0.5F)
+// Compensation factor for the VBAT divider
+#define VBAT_DIVIDER_COMP (2.0)
+// Fixed calculation of milliVolt from compensation value
+#define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER VBAT_DIVIDER_COMP
+#define VBAT_RAW_TO_SCALED(x) (REAL_VBAT_MV_PER_LSB * x)
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif
--- a/variants/chatter2/variant.h
+++ b/variants/chatter2/variant.h
@@ -72,14 +72,13 @@
 #define BATTERY_PIN 34 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_CHANNEL ADC1_GPIO34_CHANNEL
 #define ADC_ATTENUATION                                                                                                          \
-    ADC_ATTEN_DB_2_5 // 2_5-> 100mv-1250mv, 11-> 150mv-3100mv for ESP32
-                     // ESP32-S2/C3/S3 are different
-                     // lower dB for lower voltage rnage
-#define ADC_MULTIPLIER                                                                                                           \
-    5.0                   // VBATT---10k--pin34---2.5K---GND
-                          // Chatter2 uses 3 AAA cells
-#define BAT_FULLVOLT 4800 // with the 5.0 divider, input to BATTERY_PIN is 900mv
-#define BAT_EMPTYVOLT 3300
+    ADC_ATTEN_DB_2_5       // 2_5-> 100mv-1250mv, 11-> 150mv-3100mv for ESP32
+                           // ESP32-S2/C3/S3 are different
+                           // lower dB for lower voltage rnage
+#define ADC_MULTIPLIER 5.0 // VBATT---10k--pin34---2.5K---GND
+// Chatter2 uses 3 AAA cells
+#define CELL_TYPE_ALKALINE
+#define NUM_CELLS 3
 #undef EXT_PWR_DETECT

 // GPS
--- a/variants/esp32-s3-pico/pins_arduino.h
+++ b/variants/esp32-s3-pico/pins_arduino.h
@@ -0,0 +1,36 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS 48
+#define NUM_ANALOG_INPUTS 20
+
+#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
+#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
+#define digitalPinHasPWM(p) (p < 46)
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SDA = 15;
+static const uint8_t SCL = 16;
+
+// Default SPI will be mapped to Radio
+static const uint8_t MISO = 37;
+static const uint8_t SCK = 35;
+static const uint8_t MOSI = 36;
+static const uint8_t SS = 14;
+
+static const uint8_t BAT_ADC_PIN = 26;
+
+// #define SPI_MOSI                    (11)
+// #define SPI_SCK                     (14)
+// #define SPI_MISO                    (2)
+// #define SPI_CS                      (13)
+
+// #define SDCARD_CS                   SPI_CS
+
+#endif /* Pins_Arduino_h */
--- a/variants/esp32-s3-pico/platformio.ini
+++ b/variants/esp32-s3-pico/platformio.ini
@@ -0,0 +1,25 @@
+[env:ESP32-S3-Pico]
+
+board_level = extra
+extends = esp32s3_base
+upload_protocol = esptool
+board = esp32-s3-pico
+
+board_upload.use_1200bps_touch = yes
+board_upload.wait_for_upload_port = yes
+board_upload.require_upload_port = yes
+
+;upload_port = /dev/ttyACM0
+
+build_flags = ${esp32_base.build_flags}
+  -DESP32_S3_PICO
+  ;-DPRIVATE_HW
+  -Ivariants/esp32-s3-pico
+  -DBOARD_HAS_PSRAM
+  -DTECHO_DISPLAY_MODEL=GxEPD2_290_T94_V2
+  -DEPD_HEIGHT=128
+  -DEPD_WIDTH=296
+
+lib_deps = ${esp32s3_base.lib_deps}
+  zinggjm/GxEPD2@^1.5.3
+  ;adafruit/Adafruit NeoPixel@^1.10.7
--- a/variants/esp32-s3-pico/variant.h
+++ b/variants/esp32-s3-pico/variant.h
@@ -0,0 +1,77 @@
+/*
+
+*/
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define EXT_NOTIFY_OUT 22
+#define BUTTON_PIN 0 // 17
+
+// #define LED_PIN PIN_LED
+// Board has RGB LED 21
+
+// The usbPower state is revered ?
+// DEBUG | ??:??:?? 365 [Power] Battery: usbPower=0, isCharging=0, batMv=4116, batPct=90
+// DEBUG | ??:??:?? 385 [Power] Battery: usbPower=1, isCharging=1, batMv=4243, batPct=0
+
+// https://www.waveshare.com/img/devkit/ESP32-S3-Pico/ESP32-S3-Pico-details-inter-1.jpg
+// digram is incorrect labeled as battery pin is getting readings on GPIO7_CH1?
+#define BATTERY_PIN 7
+#define ADC_CHANNEL ADC1_GPIO7_CHANNEL
+// #define ADC_CHANNEL ADC1_GPIO6_CHANNEL
+//   ratio of voltage divider = 3.0 (R17=200k, R18=100k)
+#define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic
+
+#define I2C_SDA 15
+#define I2C_SCL 16
+
+// Enable secondary bus for external periherals
+// https://www.waveshare.com/wiki/Pico-OLED-1.3
+// #define USE_SH1107_128_64
+// Not working
+#define I2C_SDA1 17
+#define I2C_SCL1 18
+
+#define BUTTON_PIN 0 // This is the BOOT button
+#define BUTTON_NEED_PULLUP
+
+// #define USE_RF95 // RFM95/SX127x
+#define USE_SX1262
+// #define USE_SX1280
+
+#define LORA_MISO 37
+#define LORA_SCK 35
+#define LORA_MOSI 36
+#define LORA_CS 14
+
+#define LORA_RESET 40
+#define LORA_DIO1 4
+#define LORA_DIO2 13
+
+#ifdef USE_SX1262
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#endif
+
+#ifdef USE_SX1280
+#define SX128X_CS LORA_CS
+#define SX128X_DIO1 LORA_DIO1
+#define SX128X_BUSY 9
+#define SX128X_RESET LORA_RESET
+#endif
+
+#define USE_EINK
+/*
+ * eink display pins
+ */
+#define PIN_EINK_CS 34
+#define PIN_EINK_BUSY 38
+#define PIN_EINK_DC 33
+#define PIN_EINK_RES 42 // 37 //(-1) // cant be MISO Waveshare ??)
+#define PIN_EINK_SCLK 35
+#define PIN_EINK_MOSI 36
--- a/variants/heltec_v2.1/variant.h
+++ b/variants/heltec_v2.1/variant.h
@@ -29,7 +29,8 @@
 #define LORA_DIO1 35 // https://www.thethingsnetwork.org/forum/t/big-esp32-sx127x-topic-part-3/18436
 #define LORA_DIO2 34 // Not really used

-#define ADC_MULTIPLIER 3.8
+#define ADC_MULTIPLIER 3.2 // 220k + 100k (320k/100k=3.2)
+// #define ADC_WIDTH ADC_WIDTH_BIT_10

 #define BATTERY_PIN 37 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_CHANNEL ADC1_GPIO37_CHANNEL
--- a/variants/heltec_v3/variant.h
+++ b/variants/heltec_v3/variant.h
@@ -11,6 +11,8 @@
 #define VEXT_ENABLE Vext // active low, powers the oled display and the lora antenna boost
 #define BUTTON_PIN 0

+#define ADC_CTRL 37
+#define ADC_CTRL_ENABLED LOW
 #define BATTERY_PIN 1 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_CHANNEL ADC1_GPIO1_CHANNEL
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
--- a/variants/heltec_wireless_paper/variant.h
+++ b/variants/heltec_wireless_paper/variant.h
@@ -27,10 +27,12 @@
 #define VEXT_ENABLE 45 // active low, powers the oled display and the lora antenna boost
 #define BUTTON_PIN 0

-#define BATTERY_PIN 1 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
-#define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
-#define ADC_MULTIPLIER 4.9
+#define ADC_CTRL 19
+#define BATTERY_PIN 20
+#define ADC_CHANNEL ADC2_GPIO20_CHANNEL
+#define ADC_MULTIPLIER 2                // Voltage divider is roughly 1:1
+#define BAT_MEASURE_ADC_UNIT 2          // Use ADC2
+#define ADC_ATTENUATION ADC_ATTEN_DB_11 // Voltage divider output is quite high

 #define USE_SX1262

--- a/Show More
+++ b/Show More
				`@@ -45,3 +45,4 @@ PB_BIND(meshtastic_Config_BluetoothConfig, meshtastic_Config_BluetoothConfig, AU`