Merge branch 'master' into crowpanelV2

2026-01-27 20:21:52 +00:00 · 2026-01-13 12:36:34 +01:00 · 2025-12-31 13:35:53 +01:00 · 2025-12-10 13:38:41 +01:00 · 2025-12-05 10:59:34 +01:00 · 2025-10-11 23:32:09 +02:00
176 changed files with 1327 additions and 4162 deletions
--- a/.clusterfuzzlite/Dockerfile
+++ b/.clusterfuzzlite/Dockerfile
@@ -20,7 +20,7 @@ ENV PIP_ROOT_USER_ACTION=ignore
 RUN apt-get update && apt-get install --no-install-recommends -y \
        cmake git zip libgpiod-dev libbluetooth-dev libi2c-dev \
        libunistring-dev libmicrohttpd-dev libgnutls28-dev libgcrypt20-dev \
-        libusb-1.0-0-dev libssl-dev pkg-config libsqlite3-dev && \
+        libusb-1.0-0-dev libssl-dev pkg-config && \
    apt-get clean && rm -rf /var/lib/apt/lists/* && \
    pip install --no-cache-dir -U \
        platformio==6.1.16 \
--- a/.github/workflows/build_firmware.yml
+++ b/.github/workflows/build_firmware.yml
@@ -91,8 +91,8 @@ jobs:
            if [[ -f "$manifest" ]]; then
              echo "Updating $manifest with $OTA_FILE (md5: $OTA_MD5, size: $OTA_SIZE)"
              # Add OTA entry to files array if not already present
-              jq --arg name "$OTA_FILE" --arg md5 "$OTA_MD5" --argjson bytes "$OTA_SIZE" --arg part "app1" \
-                'if .files | map(select(.name == $name)) | length == 0 then .files += [{"name": $name, "md5": $md5, "bytes": $bytes, "part_name": $part}] else . end' \
+              jq --arg name "$OTA_FILE" --arg md5 "$OTA_MD5" --argjson bytes "$OTA_SIZE" \
+                'if .files | map(select(.name == $name)) | length == 0 then .files += [{"name": $name, "md5": $md5, "bytes": $bytes}] else . end' \
                "$manifest" > "${manifest}.tmp" && mv "${manifest}.tmp" "$manifest"
            fi
          done
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,14 +9,14 @@ plugins:
 lint:
  enabled:
    - checkov@3.2.497
-    - renovate@42.84.2
-    - prettier@3.8.0
-    - trufflehog@3.92.5
-    - yamllint@1.38.0
-    - bandit@1.9.3
+    - renovate@42.78.2
+    - prettier@3.7.4
+    - trufflehog@3.92.4
+    - yamllint@1.37.1
+    - bandit@1.9.2
    - trivy@0.68.2
    - taplo@0.10.0
-    - ruff@0.14.13
+    - ruff@0.14.11
    - isort@7.0.0
    - markdownlint@0.47.0
    - oxipng@10.0.0
@@ -26,7 +26,7 @@ lint:
    - hadolint@2.14.0
    - shfmt@3.6.0
    - shellcheck@0.11.0
-    - black@26.1.0
+    - black@25.12.0
    - git-diff-check
    - gitleaks@8.30.0
    - clang-format@16.0.3
--- a/2
+++ b/2
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
        curl wget g++ zip git ca-certificates pkg-config \
        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
-        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev \
+        libx11-dev libinput-dev libxkbcommon-x11-dev \
    && apt-get clean && rm -rf /var/lib/apt/lists/* \
    && pip install --no-cache-dir -U platformio \
    && mkdir /tmp/firmware
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -11,7 +11,7 @@ RUN apk --no-cache add \
        bash g++ libstdc++-dev linux-headers zip git ca-certificates libbsd-dev \
        libgpiod-dev yaml-cpp-dev bluez-dev \
        libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
-        libx11-dev libinput-dev libxkbcommon-dev sqlite-dev \
+        libx11-dev libinput-dev libxkbcommon-dev \
    && rm -rf /var/cache/apk/* \
    && pip install --no-cache-dir -U platformio \
    && mkdir /tmp/firmware
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -32,19 +32,6 @@ if ! command -v jq >/dev/null 2>&1; then
    exit 1
 fi

-# esptool v5 supports commands with dashes and deprecates commands with
-# underscores. Prior versions only support commands with underscores
-if ${ESPTOOL_CMD} | grep --quiet write-flash
-then
-    ESPTOOL_WRITE_FLASH=write-flash
-    ESPTOOL_ERASE_FLASH=erase-flash
-    ESPTOOL_READ_FLASH_STATUS=read-flash-status
-else
-    ESPTOOL_WRITE_FLASH=write_flash
-    ESPTOOL_ERASE_FLASH=erase_flash
-    ESPTOOL_READ_FLASH_STATUS=read_flash_status
-fi
-
 set -e

 # Usage info
@@ -96,8 +83,8 @@ while [ $# -gt 0 ]; do
 done

 if [[ $BPS_RESET == true ]]; then
-    $ESPTOOL_CMD --baud $RESET_BAUD --after no_reset ${ESPTOOL_READ_FLASH_STATUS}
-    exit 0
+	$ESPTOOL_CMD --baud $RESET_BAUD --after no_reset read_flash_status
+	exit 0
 fi

 [ -z "$FILENAME" ] && [ -n "$1" ] && {
@@ -157,12 +144,12 @@ if [[ -f "$FILENAME" && "$FILENAME" == *.factory.bin ]]; then
    fi

    echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
-    $ESPTOOL_CMD ${ESPTOOL_ERASE_FLASH}
-    $ESPTOOL_CMD ${ESPTOOL_WRITE_FLASH} $FIRMWARE_OFFSET "${FILENAME}"
+    $ESPTOOL_CMD erase-flash
+    $ESPTOOL_CMD write-flash $FIRMWARE_OFFSET "${FILENAME}"
    echo "Trying to flash ${OTAFILE} at offset ${OTA_OFFSET}"
-    $ESPTOOL_CMD ${ESPTOOL_WRITE_FLASH} $OTA_OFFSET "${OTAFILE}"
+    $ESPTOOL_CMD write_flash $OTA_OFFSET "${OTAFILE}"
    echo "Trying to flash ${SPIFFSFILE}, at offset ${OFFSET}"
-    $ESPTOOL_CMD ${ESPTOOL_WRITE_FLASH} $OFFSET "${SPIFFSFILE}"
+    $ESPTOOL_CMD write_flash $OFFSET "${SPIFFSFILE}"

 else
    show_help
--- a/bin/device-update.sh
+++ b/bin/device-update.sh
@@ -20,17 +20,6 @@ else
    exit 1
 fi

-# esptool v5 supports commands with dashes and deprecates commands with
-# underscores. Prior versions only support commands with underscores
-if ${ESPTOOL_CMD} | grep --quiet write-flash
-then
-    ESPTOOL_WRITE_FLASH=write-flash
-    ESPTOOL_READ_FLASH_STATUS=read-flash-status
-else
-    ESPTOOL_WRITE_FLASH=write_flash
-    ESPTOOL_READ_FLASH_STATUS=read_flash_status
-fi
-
 # Usage info
 show_help() {
 cat << EOF
@@ -80,7 +69,7 @@ done
 shift "$((OPTIND-1))"

 if [ "$CHANGE_MODE" = true ]; then
-    $ESPTOOL_CMD --baud $RESET_BAUD --after no_reset ${ESPTOOL_READ_FLASH_STATUS}
+	$ESPTOOL_CMD --baud $RESET_BAUD --after no_reset read_flash_status
    exit 0
 fi

@@ -91,7 +80,7 @@ fi

 if [[ -f "$FILENAME" && "$FILENAME" != *.factory.bin ]]; then
    echo "Trying to flash update ${FILENAME}"
-    $ESPTOOL_CMD --baud $FLASH_BAUD ${ESPTOOL_WRITE_FLASH} $UPDATE_OFFSET "${FILENAME}"
+    $ESPTOOL_CMD --baud $FLASH_BAUD write-flash $UPDATE_OFFSET "${FILENAME}"
 else
    show_help
    echo "Invalid file: ${FILENAME}"
--- a/bin/org.meshtastic.meshtasticd.metainfo.xml
+++ b/bin/org.meshtastic.meshtasticd.metainfo.xml
@@ -87,9 +87,6 @@
  </screenshots>

  <releases>
-    <release version="2.7.19" date="2026-01-22">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.19</url>
-    </release>
    <release version="2.7.18" date="2026-01-02">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.18</url>
    </release>
--- a/bin/platformio-custom.py
+++ b/bin/platformio-custom.py
@@ -60,14 +60,6 @@ def manifest_gather(source, target, env):
    board_platform = env.BoardConfig().get("platform")
    board_mcu = env.BoardConfig().get("build.mcu").lower()
    needs_ota_suffix = board_platform == "nordicnrf52"
-    
-    # Mapping of bin files to their target partition names
-    # Maps the filename pattern to the partition name where it should be flashed
-    partition_map = {
-        f"{progname}.bin": "app0",              # primary application slot (app0 / OTA_0)
-        lfsbin: "spiffs",                        # filesystem image flashed to spiffs
-    }
-    
    check_paths = [
        progname,
        f"{progname}.elf",
@@ -93,9 +85,6 @@ def manifest_gather(source, target, env):
                "md5": f.get_content_hash(), # Returns MD5 hash
                "bytes": f.get_size() # Returns file size in bytes
            }
-            # Add part_name if this file represents a partition that should be flashed
-            if p in partition_map:
-                d["part_name"] = partition_map[p]
            out.append(d)
            print(d)
    manifest_write(out, env)
--- a/boards/CDEBYTE_EoRa-Hub.json
+++ b/boards/CDEBYTE_EoRa-Hub.json
@@ -1,38 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "partitions": "default.csv",
-      "memory_type": "qio_qspi"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=0",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "mcu": "esp32s3",
-    "variant": "esp32s3"
-  },
-  "connectivity": ["wifi"],
-  "debug": {
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "CDEBYTE_EoRa-Hub",
-  "upload": {
-    "flash_size": "4MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 4194304,
-    "use_1200bps_touch": true,
-    "wait_for_upload_port": true,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "url": "https://www.cdebyte.com/products/EoRa-HUB-900TB",
-  "vendor": "CDEBYTE"
-}
--- a/boards/ThinkNode-M4.json
+++ b/boards/ThinkNode-M4.json
@@ -1,53 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_ELECROW_M4 -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x4405"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"]
-    ],
-    "usb_product": "elecrow_thinknode_m4",
-    "mcu": "nrf52840",
-    "variant": "ELECROW-ThinkNode-M4",
-    "variants_dir": "variants",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "ELECROW ThinkNode m4",
-  "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://www.elecrow.com/thinknode-m4-power-bank-lora-device-with-meshtastic-lora-tracker-function-powered-by-nrf52840.html",
-  "vendor": "ELECROW"
-}
--- a/boards/minimesh_lite.json
+++ b/boards/minimesh_lite.json
@@ -1,50 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DMINIMESH_LITE -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x8029"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"]
-    ],
-    "usb_product": "Minimesh Lite",
-    "mcu": "nrf52840",
-    "variant": "dls_Minimesh_Lite",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd"
-  },
-  "frameworks": ["arduino"],
-  "name": "Minimesh Lite",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["nrfutil", "jlink", "nrfjprog", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://deeplabstudio.com",
-  "vendor": "Deeplab Studio"
-}
--- a/boards/t-watch-s3.json
+++ b/boards/t-watch-s3.json
@@ -9,7 +9,7 @@
      "-DBOARD_HAS_PSRAM",
      "-DT_WATCH_S3",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_MODE=0",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-meshtasticd (2.7.19.0) unstable; urgency=medium
-
-  * Version 2.7.19
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Thu, 22 Jan 2026 22:17:40 +0000
-
 meshtasticd (2.7.18.0) unstable; urgency=medium

  * Version 2.7.18
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,7 @@ Build-Depends: debhelper-compat (= 13),
               liborcania-dev,
               libx11-dev,
               libinput-dev,
-               libxkbcommon-x11-dev,
-               libsqlite3-dev
+               libxkbcommon-x11-dev
 Standards-Version: 4.6.2
 Homepage: https://github.com/meshtastic/firmware
 Rules-Requires-Root: no
--- a/meshtasticd.spec.rpkg
+++ b/meshtasticd.spec.rpkg
@@ -39,7 +39,6 @@ BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(libusb-1.0)
 BuildRequires: libi2c-devel
 BuildRequires: pkgconfig(libuv)
-BuildRequires: pkgconfig(sqlite3)
 # Web components:
 BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(liborcania)
--- a/monitor/filter_c3_exception_decoder.py
+++ b/monitor/filter_c3_exception_decoder.py
@@ -43,11 +43,13 @@ class Esp32C3ExceptionDecoder(DeviceMonitorFilterBase):
        self.enabled = self.setup_paths()

        if self.config.get("env:" + self.environment, "build_type") != "debug":
-            print("""
+            print(
+                """
 Please build project in debug configuration to get more details about an exception.
 See https://docs.platformio.org/page/projectconf/build_configurations.html

-""")
+"""
+            )

        return self

--- a/platformio.ini
+++ b/platformio.ini
@@ -119,7 +119,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/37ad715b76cd6ca4aa500a4a4d9740e3cdf3e3cb.zip
+	https://github.com/meshtastic/device-ui/archive/14dc991a4b57066e0a83599be1a87ff08e5e5308.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -129,7 +129,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
 	adafruit/Adafruit Unified Sensor@1.1.15
 	# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library
-	adafruit/Adafruit BMP280 Library@3.0.0
+	adafruit/Adafruit BMP280 Library@2.6.8
 	# renovate: datasource=custom.pio depName=Adafruit BMP085 packageName=adafruit/library/Adafruit BMP085 Library
 	adafruit/Adafruit BMP085 Library@1.2.4
 	# renovate: datasource=custom.pio depName=Adafruit BME280 packageName=adafruit/library/Adafruit BME280 Library
@@ -142,6 +142,8 @@ lib_deps =
 	adafruit/Adafruit INA260 Library@1.5.3
 	# renovate: datasource=custom.pio depName=Adafruit INA219 packageName=adafruit/library/Adafruit INA219
 	adafruit/Adafruit INA219@1.2.3
+	# renovate: datasource=custom.pio depName=Adafruit PM25 AQI Sensor packageName=adafruit/library/Adafruit PM25 AQI Sensor
+	adafruit/Adafruit PM25 AQI Sensor@2.0.0
 	# renovate: datasource=custom.pio depName=Adafruit MPU6050 packageName=adafruit/library/Adafruit MPU6050
 	adafruit/Adafruit MPU6050@2.2.6
 	# renovate: datasource=custom.pio depName=Adafruit LIS3DH packageName=adafruit/library/Adafruit LIS3DH
@@ -212,30 +214,3 @@ lib_deps =
 	sensirion/Sensirion Core@0.7.2
 	# renovate: datasource=custom.pio depName=Sensirion I2C SCD4x packageName=sensirion/library/Sensirion I2C SCD4x
 	sensirion/Sensirion I2C SCD4x@1.1.0
-; Same as environmental_extra but without BSEC (saves ~3.5KB DRAM for original ESP32 targets)
-[environmental_extra_no_bsec]
-lib_deps =
-	# renovate: datasource=custom.pio depName=Adafruit BMP3XX packageName=adafruit/library/Adafruit BMP3XX Library
-	adafruit/Adafruit BMP3XX Library@2.1.6
-	# renovate: datasource=custom.pio depName=Adafruit MAX1704X packageName=adafruit/library/Adafruit MAX1704X
-	adafruit/Adafruit MAX1704X@1.0.3
-	# renovate: datasource=custom.pio depName=Adafruit SHTC3 packageName=adafruit/library/Adafruit SHTC3 Library
-	adafruit/Adafruit SHTC3 Library@1.0.2
-	# renovate: datasource=custom.pio depName=Adafruit LPS2X packageName=adafruit/library/Adafruit LPS2X
-	adafruit/Adafruit LPS2X@2.0.6
-	# renovate: datasource=custom.pio depName=Adafruit SHT31 packageName=adafruit/library/Adafruit SHT31 Library
-	adafruit/Adafruit SHT31 Library@2.2.2
-	# renovate: datasource=custom.pio depName=Adafruit VEML7700 packageName=adafruit/library/Adafruit VEML7700 Library
-	adafruit/Adafruit VEML7700 Library@2.1.6
-	# renovate: datasource=custom.pio depName=Adafruit SHT4x packageName=adafruit/library/Adafruit SHT4x Library
-	adafruit/Adafruit SHT4x Library@1.0.5
-	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
-	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
-	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
-	closedcube/ClosedCube OPT3001@1.1.2
-	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
-	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
-	# renovate: datasource=custom.pio depName=Sensirion Core packageName=sensirion/library/Sensirion Core
-	sensirion/Sensirion Core@0.7.2
-	# renovate: datasource=custom.pio depName=Sensirion I2C SCD4x packageName=sensirion/library/Sensirion I2C SCD4x
-	sensirion/Sensirion I2C SCD4x@1.1.0
--- a/2
+++ b/2
--- a/src/MessageStore.cpp
+++ b/src/MessageStore.cpp
@@ -13,11 +13,6 @@
 #define MESSAGE_TEXT_POOL_SIZE (MAX_MESSAGES_SAVED * MAX_MESSAGE_SIZE)
 #endif

-// Default autosave interval 2 hours, override per device later with -DMESSAGE_AUTOSAVE_INTERVAL_SEC=300 (etc)
-#ifndef MESSAGE_AUTOSAVE_INTERVAL_SEC
-#define MESSAGE_AUTOSAVE_INTERVAL_SEC (2 * 60 * 60)
-#endif
-
 // Global message text pool and state
 static char *g_messagePool = nullptr;
 static size_t g_poolWritePos = 0;
@@ -107,60 +102,6 @@ void MessageStore::addLiveMessage(const StoredMessage &msg)
    pushWithLimit(liveMessages, msg);
 }

-#if ENABLE_MESSAGE_PERSISTENCE
-static bool g_messageStoreHasUnsavedChanges = false;
-static uint32_t g_lastAutoSaveMs = 0; // last time we actually saved
-
-static inline uint32_t autosaveIntervalMs()
-{
-    uint32_t sec = (uint32_t)MESSAGE_AUTOSAVE_INTERVAL_SEC;
-    if (sec < 60)
-        sec = 60;
-    return sec * 1000UL;
-}
-
-static inline bool reachedMs(uint32_t now, uint32_t target)
-{
-    return (int32_t)(now - target) >= 0;
-}
-
-// Mark new messages in RAM that need to be saved later
-static inline void markMessageStoreUnsaved()
-{
-    g_messageStoreHasUnsavedChanges = true;
-
-    if (g_lastAutoSaveMs == 0) {
-        g_lastAutoSaveMs = millis();
-    }
-}
-
-// Called periodically from the main loop in main.cpp
-static inline void autosaveTick(MessageStore *store)
-{
-    if (!store)
-        return;
-
-    uint32_t now = millis();
-
-    if (g_lastAutoSaveMs == 0) {
-        g_lastAutoSaveMs = now;
-        return;
-    }
-
-    if (!reachedMs(now, g_lastAutoSaveMs + autosaveIntervalMs()))
-        return;
-
-    // Autosave interval reached, only save if there are unsaved messages.
-    if (g_messageStoreHasUnsavedChanges) {
-        LOG_INFO("Autosaving MessageStore to flash");
-        store->saveToFlash();
-    } else {
-        LOG_INFO("Autosave skipped, no changes to save");
-        g_lastAutoSaveMs = now;
-    }
-}
-#endif
-
 // Add from incoming/outgoing packet
 const StoredMessage &MessageStore::addFromPacket(const meshtastic_MeshPacket &packet)
 {
@@ -190,11 +131,6 @@ const StoredMessage &MessageStore::addFromPacket(const meshtastic_MeshPacket &pa
    }

    addLiveMessage(sm);
-
-#if ENABLE_MESSAGE_PERSISTENCE
-    markMessageStoreUnsaved();
-#endif
-
    return liveMessages.back();
 }

@@ -219,10 +155,6 @@ void MessageStore::addFromString(uint32_t sender, uint8_t channelIndex, const st
    sm.ackStatus = AckStatus::NONE;

    addLiveMessage(sm);
-
-#if ENABLE_MESSAGE_PERSISTENCE
-    markMessageStoreUnsaved();
-#endif
 }

 #if ENABLE_MESSAGE_PERSISTENCE
@@ -307,10 +239,6 @@ void MessageStore::saveToFlash()

    f.close();
 #endif
-
-    // Reset autosave state after any save
-    g_messageStoreHasUnsavedChanges = false;
-    g_lastAutoSaveMs = millis();
 }

 void MessageStore::loadFromFlash()
@@ -342,9 +270,6 @@ void MessageStore::loadFromFlash()

    f.close();
 #endif
-    // Loading messages does not trigger an autosave
-    g_messageStoreHasUnsavedChanges = false;
-    g_lastAutoSaveMs = millis();
 }

 #else
@@ -365,11 +290,6 @@ void MessageStore::clearAllMessages()
    f.write(&count, 1); // write "0 messages"
    f.close();
 #endif
-
-#if ENABLE_MESSAGE_PERSISTENCE
-    g_messageStoreHasUnsavedChanges = false;
-    g_lastAutoSaveMs = millis();
-#endif
 }

 // Internal helper: erase first or last message matching a predicate
@@ -501,14 +421,6 @@ uint16_t MessageStore::storeText(const char *src, size_t len)
    return storeTextInPool(src, len);
 }

-#if ENABLE_MESSAGE_PERSISTENCE
-void messageStoreAutosaveTick()
-{
-    // Called from the main loop to check autosave timing
-    autosaveTick(&messageStore);
-}
-#endif
-
 // Global definition
 MessageStore messageStore("default");
-#endif
+#endif
--- a/src/MessageStore.h
+++ b/src/MessageStore.h
@@ -125,11 +125,6 @@ class MessageStore
    std::string filename;                   // Flash filename for persistence
 };

-#if ENABLE_MESSAGE_PERSISTENCE
-// Called periodically from main loop to trigger time based autosave
-void messageStoreAutosaveTick();
-#endif
-
 // Global instance (defined in MessageStore.cpp)
 extern MessageStore messageStore;

--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -1,14 +1,11 @@
 /**
 * @file Power.cpp
- * @brief This file contains the implementation of the Power class, which is
- * responsible for managing power-related functionality of the device. It
- * includes battery level sensing, power management unit (PMU) control, and
- * power state machine management. The Power class is used by the main device
- * class to manage power-related functionality.
+ * @brief This file contains the implementation of the Power class, which is responsible for managing power-related functionality
+ * of the device. It includes battery level sensing, power management unit (PMU) control, and power state machine management. The
+ * Power class is used by the main device class to manage power-related functionality.
 *
- * The file also includes implementations of various battery level sensors, such
- * as the AnalogBatteryLevel class, which assumes the battery voltage is
- * attached via a voltage-divider to an analog input.
+ * The file also includes implementations of various battery level sensors, such as the AnalogBatteryLevel class, which assumes
+ * the battery voltage is attached via a voltage-divider to an analog input.
 *
 * This file is part of the Meshtastic project.
 * For more information, see: https://meshtastic.org/
@@ -22,7 +19,6 @@
 #include "configuration.h"
 #include "main.h"
 #include "meshUtils.h"
-#include "power/PowerHAL.h"
 #include "sleep.h"

 #if defined(ARCH_PORTDUINO)
@@ -175,12 +171,22 @@ Power *power;

 using namespace meshtastic;

-// NRF52 has AREF_VOLTAGE defined in architecture.h but
-// make sure it's included. If something is wrong with NRF52
-// definition - compilation will fail on missing definition
-#if !defined(AREF_VOLTAGE) && !defined(ARCH_NRF52)
+#ifndef AREF_VOLTAGE
+#if defined(ARCH_NRF52)
+/*
+ * Internal Reference is +/-0.6V, with an adjustable gain of 1/6, 1/5, 1/4,
+ * 1/3, 1/2 or 1, meaning 3.6, 3.0, 2.4, 1.8, 1.2 or 0.6V for the ADC levels.
+ *
+ * External Reference is VDD/4, with an adjustable gain of 1, 2 or 4, meaning
+ * VDD/4, VDD/2 or VDD for the ADC levels.
+ *
+ * Default settings are internal reference with 1/6 gain (GND..3.6V ADC range)
+ */
+#define AREF_VOLTAGE 3.6
+#else
 #define AREF_VOLTAGE 3.3
 #endif
+#endif

 /**
 * If this board has a battery level sensor, set this to a valid implementation
@@ -227,8 +233,7 @@ static void battery_adcDisable()
 #endif

 /**
- * A simple battery level sensor that assumes the battery voltage is attached
- * via a voltage-divider to an analog input
+ * A simple battery level sensor that assumes the battery voltage is attached via a voltage-divider to an analog input
 */
 class AnalogBatteryLevel : public HasBatteryLevel
 {
@@ -306,8 +311,7 @@ class AnalogBatteryLevel : public HasBatteryLevel

 #ifndef BATTERY_SENSE_SAMPLES
 #define BATTERY_SENSE_SAMPLES                                                                                                    \
-    15 // 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
@@ -337,8 +341,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
            battery_adcDisable();

            if (!initial_read_done) {
-                // Flush the smoothing filter with an ADC reading, if the reading is
-                // plausibly correct
+                // Flush the smoothing filter with an ADC reading, if the reading is plausibly correct
                if (scaled > last_read_value)
                    last_read_value = scaled;
                initial_read_done = true;
@@ -347,8 +350,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
                last_read_value += (scaled - last_read_value) * 0.5; // Virtual LPF
            }

-            // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u filtered=%u",
-            // BATTERY_PIN, raw, (uint32_t)(scaled), (uint32_t) (last_read_value));
+            // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u filtered=%u", BATTERY_PIN, raw, (uint32_t)(scaled), (uint32_t)
+            // (last_read_value));
        }
        return last_read_value;
 #endif // BATTERY_PIN
@@ -417,8 +420,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
    /**
     * return true if there is a battery installed in this unit
     */
-    // if we have a integrated device with a battery, we can assume that the
-    // battery is always connected
+    // if we have a integrated device with a battery, we can assume that the battery is always connected
 #ifdef BATTERY_IMMUTABLE
    virtual bool isBatteryConnect() override { return true; }
 #elif defined(ADC_V)
@@ -439,10 +441,10 @@ class AnalogBatteryLevel : public HasBatteryLevel
    virtual bool isBatteryConnect() override { return getBatteryPercent() != -1; }
 #endif

-    /// If we see a battery voltage higher than physics allows - assume charger is
-    /// pumping in power On some boards we don't have the power management chip
-    /// (like AXPxxxx) so we use EXT_PWR_DETECT GPIO pin to detect external power
-    /// source
+    /// If we see a battery voltage higher than physics allows - assume charger is pumping
+    /// in power
+    /// On some boards we don't have the power management chip (like AXPxxxx)
+    /// so we use EXT_PWR_DETECT GPIO pin to detect external power source
    virtual bool isVbusIn() override
    {
 #ifdef EXT_PWR_DETECT
@@ -459,12 +461,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
        }
        // if it's not HIGH - check the battery
 #endif
-
-// technically speaking this should work for all(?) NRF52 boards
-// but needs testing across multiple devices. NRF52 USB would not even work if
-// VBUS was not properly connected and detected by the CPU
-#elif defined(MUZI_BASE) || defined(PROMICRO_DIY_TCXO)
-        return powerHAL_isVBUSConnected();
+#elif defined(MUZI_BASE)
+        return NRF_POWER->USBREGSTATUS & POWER_USBREGSTATUS_VBUSDETECT_Msk;
 #endif
        return getBattVoltage() > chargingVolt;
    }
@@ -478,18 +476,15 @@ class AnalogBatteryLevel : public HasBatteryLevel
            return (rak9154Sensor.isCharging()) ? OptTrue : OptFalse;
        }
 #endif
-#if defined(ELECROW_ThinkNode_M6)
-        return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value || isVbusIn();
-#elif EXT_CHRG_DETECT
+#ifdef EXT_CHRG_DETECT
        return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
 #elif defined(BATTERY_CHARGING_INV)
        return !digitalRead(BATTERY_CHARGING_INV);
 #else
 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(DISABLE_INA_CHARGING_DETECTION)
        if (hasINA()) {
-            // get current flow from INA sensor - negative value means power flowing
-            // into the battery default assuming  BATTERY+  <--> INA_VIN+ <--> SHUNT
-            // RESISTOR <--> INA_VIN- <--> LOAD
+            // get current flow from INA sensor - negative value means power flowing into the battery
+            // default assuming  BATTERY+  <--> INA_VIN+ <--> SHUNT RESISTOR <--> INA_VIN- <--> LOAD
            LOG_DEBUG("Using INA on I2C addr 0x%x for charging detection", config.power.device_battery_ina_address);
 #if defined(INA_CHARGING_DETECTION_INVERT)
            return getINACurrent() > 0;
@@ -505,8 +500,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
    }

  private:
-    /// If we see a battery voltage higher than physics allows - assume charger is
-    /// pumping in power
+    /// If we see a battery voltage higher than physics allows - assume charger is pumping
+    /// in power

    /// 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)
@@ -515,8 +510,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
    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.
-    // This value is over-written by the first ADC reading, it the voltage seems
-    // reasonable.
+    // This value is over-written by the first ADC reading, it the voltage seems reasonable.
    bool initial_read_done = false;
    float last_read_value = (OCV[NUM_OCV_POINTS - 1] * NUM_CELLS);
    uint32_t last_read_time_ms = 0;
@@ -658,8 +652,7 @@ bool Power::analogInit()
 #ifdef CONFIG_IDF_TARGET_ESP32S3
    // ESP32S3
    else if (val_type == ESP_ADC_CAL_VAL_EFUSE_TP_FIT) {
-        LOG_INFO("ADC config based on Two Point values and fitting curve "
-                 "coefficients stored in eFuse");
+        LOG_INFO("ADC config based on Two Point values and fitting curve coefficients stored in eFuse");
    }
 #endif
    else {
@@ -667,7 +660,13 @@ bool Power::analogInit()
    }
 #endif // ARCH_ESP32

-    // NRF52 ADC init moved to powerHAL_init in nrf52 platform
+#ifdef ARCH_NRF52
+#ifdef VBAT_AR_INTERNAL
+    analogReference(VBAT_AR_INTERNAL);
+#else
+    analogReference(AR_INTERNAL); // 3.6V
+#endif
+#endif // ARCH_NRF52

 #ifndef ARCH_ESP32
    analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS);
@@ -694,8 +693,6 @@ bool Power::setup()
        found = true;
    } else if (lipoChargerInit()) {
        found = true;
-    } else if (serialBatteryInit()) {
-        found = true;
    } else if (meshSolarInit()) {
        found = true;
    } else if (analogInit()) {
@@ -722,16 +719,6 @@ bool Power::setup()
            runASAP = true;
        },
        CHANGE);
-#endif
-#ifdef EXT_CHRG_DETECT
-    attachInterrupt(
-        EXT_CHRG_DETECT,
-        []() {
-            power->setIntervalFromNow(0);
-            runASAP = true;
-            BaseType_t higherWake = 0;
-        },
-        CHANGE);
 #endif
    enabled = found;
    low_voltage_counter = 0;
@@ -778,8 +765,7 @@ void Power::reboot()
    HAL_NVIC_SystemReset();
 #else
    rebootAtMsec = -1;
-    LOG_WARN("FIXME implement reboot for this platform. Note that some settings "
-             "require a restart to be applied");
+    LOG_WARN("FIXME implement reboot for this platform. Note that some settings require a restart to be applied");
 #endif
 }

@@ -789,12 +775,9 @@ void Power::shutdown()
 #if HAS_SCREEN
    if (screen) {
 #ifdef T_DECK_PRO
-        screen->showSimpleBanner("Device is powered off.\nConnect USB to start!",
-                                 0); // T-Deck Pro has no power button
+        screen->showSimpleBanner("Device is powered off.\nConnect USB to start!", 0); // T-Deck Pro has no power button
 #elif defined(USE_EINK)
-        screen->showSimpleBanner("Shutting Down...",
-                                 2250); // dismiss after 3 seconds to avoid the
-                                        // banner on the sleep screen
+        screen->showSimpleBanner("Shutting Down...", 2250); // dismiss after 3 seconds to avoid the banner on the sleep screen
 #else
        screen->showSimpleBanner("Shutting Down...", 0); // stays on screen
 #endif
@@ -833,8 +816,7 @@ void Power::readPowerStatus()
    int32_t batteryVoltageMv = -1; // Assume unknown
    int8_t batteryChargePercent = -1;
    OptionalBool usbPowered = OptUnknown;
-    OptionalBool hasBattery = OptUnknown; // These must be static because NRF_APM
-                                          // code doesn't run every time
+    OptionalBool hasBattery = OptUnknown; // These must be static because NRF_APM code doesn't run every time
    OptionalBool isChargingNow = OptUnknown;

    if (batteryLevel) {
@@ -847,10 +829,9 @@ void Power::readPowerStatus()
            if (batteryLevel->getBatteryPercent() >= 0) {
                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 open circuit voltage table
-                // defined in power.h
+                // 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 open circuit 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);
@@ -858,12 +839,12 @@ void Power::readPowerStatus()
        }
    }

-// FIXME: IMO we shouldn't be littering our code with all these ifdefs.  Way
-// better instead to make a Nrf52IsUsbPowered subclass (which shares a
-// superclass with the BatteryLevel stuff) that just provides a few methods. But
-// in the interest of fixing this bug I'm going to follow current practice.
-#ifdef NRF_APM // Section of code detects USB power on the RAK4631 and updates
-               // the power states.  Takes 20 seconds or so to detect changes.
+// FIXME: IMO we shouldn't be littering our code with all these ifdefs.  Way better instead to make a Nrf52IsUsbPowered subclass
+// (which shares a superclass with the BatteryLevel stuff)
+// that just provides a few methods.  But in the interest of fixing this bug I'm going to follow current
+// practice.
+#ifdef NRF_APM // Section of code detects USB power on the RAK4631 and updates the power states.  Takes 20 seconds or so to detect
+               // changes.

    nrfx_power_usb_state_t nrf_usb_state = nrfx_power_usbstatus_get();
    // LOG_DEBUG("NRF Power %d", nrf_usb_state);
@@ -937,9 +918,8 @@ void Power::readPowerStatus()

 #endif

-    // 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 we have a battery at all and it is less than 0%, force deep sleep if we have more than 10 low readings in
+    // a row. NOTE: min LiIon/LiPo voltage is 2.0 to 2.5V, current OCV min is set to 3100 that is large enough.
    //

    if (batteryLevel && powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
@@ -961,8 +941,8 @@ int32_t Power::runOnce()
    readPowerStatus();

 #ifdef HAS_PMU
-    // WE no longer use the IRQ line to wake the CPU (due to false wakes from
-    // sleep), but we do poll the IRQ status by reading the registers over I2C
+    // WE no longer use the IRQ line to wake the CPU (due to false wakes from sleep), but we do poll
+    // the IRQ status by reading the registers over I2C
    if (PMU) {

        PMU->getIrqStatus();
@@ -1004,8 +984,7 @@ int32_t Power::runOnce()
        PMU->clearIrqStatus();
    }
 #endif
-    // Only read once every 20 seconds once the power status for the app has been
-    // initialized
+    // Only read once every 20 seconds once the power status for the app has been initialized
    return (statusHandler && statusHandler->isInitialized()) ? (1000 * 20) : RUN_SAME;
 }

@@ -1013,12 +992,10 @@ int32_t Power::runOnce()
 * Init the power manager chip
 *
 * axp192 power
-    DCDC1 0.7-3.5V @ 1200mA max -> OLED // If you turn this off you'll lose
- comms to the axp192 because the OLED and the axp192 share the same i2c bus,
- instead use ssd1306 sleep mode DCDC2 -> unused DCDC3 0.7-3.5V @ 700mA max ->
- ESP32 (keep this on!) LDO1 30mA -> charges GPS backup battery // charges the
- tiny J13 battery by the GPS to power the GPS ram (for a couple of days), can
- not be turned off LDO2 200mA -> LORA LDO3 200mA -> GPS
+    DCDC1 0.7-3.5V @ 1200mA max -> OLED // If you turn this off you'll lose comms to the axp192 because the OLED and the
+ axp192 share the same i2c bus, instead use ssd1306 sleep mode DCDC2 -> unused DCDC3 0.7-3.5V @ 700mA max -> ESP32 (keep this
+ on!) LDO1 30mA -> charges GPS backup battery // charges the tiny J13 battery by the GPS to power the GPS ram (for a couple of
+ days), can not be turned off LDO2 200mA -> LORA LDO3 200mA -> GPS
 *
 */
 bool Power::axpChipInit()
@@ -1063,10 +1040,9 @@ bool Power::axpChipInit()

    if (!PMU) {
        /*
-         * In XPowersLib, if the XPowersAXPxxx object is released, Wire.end() will
-         * be called at the same time. In order not to affect other devices, if the
-         * initialization of the PMU fails, Wire needs to be re-initialized once, if
-         * there are multiple devices sharing the bus.
+         * In XPowersLib, if the XPowersAXPxxx object is released, Wire.end() will be called at the same time.
+         * In order not to affect other devices, if the initialization of the PMU fails, Wire needs to be re-initialized once,
+         * if there are multiple devices sharing the bus.
         * * */
 #ifndef PMU_USE_WIRE1
        w->begin(I2C_SDA, I2C_SCL);
@@ -1083,8 +1059,8 @@ bool Power::axpChipInit()
        PMU->enablePowerOutput(XPOWERS_LDO2);

        // oled module power channel,
-        // disable it will cause abnormal communication between boot and AXP power
-        // supply, do not turn it off
+        // disable it will cause abnormal communication between boot and AXP power supply,
+        // do not turn it off
        PMU->setPowerChannelVoltage(XPOWERS_DCDC1, 3300);
        // enable oled power
        PMU->enablePowerOutput(XPOWERS_DCDC1);
@@ -1111,8 +1087,7 @@ bool Power::axpChipInit()
        PMU->setChargeTargetVoltage(XPOWERS_AXP192_CHG_VOL_4V2);
    } else if (PMU->getChipModel() == XPOWERS_AXP2101) {

-        /*The alternative version of T-Beam 1.1 differs from T-Beam V1.1 in that it
-         * uses an AXP2101 power chip*/
+        /*The alternative version of T-Beam 1.1 differs from T-Beam V1.1 in that it uses an AXP2101 power chip*/
        if (HW_VENDOR == meshtastic_HardwareModel_TBEAM) {
            // Unuse power channel
            PMU->disablePowerOutput(XPOWERS_DCDC2);
@@ -1147,8 +1122,8 @@ bool Power::axpChipInit()
            // t-beam s3 core
            /**
             * gnss module power channel
-             * The default ALDO4 is off, you need to turn on the GNSS power first,
-             * otherwise it will be invalid during initialization
+             * The default ALDO4 is off, you need to turn on the GNSS power first, otherwise it will be invalid during
+             * initialization
             */
            PMU->setPowerChannelVoltage(XPOWERS_ALDO4, 3300);
            PMU->enablePowerOutput(XPOWERS_ALDO4);
@@ -1198,8 +1173,7 @@ bool Power::axpChipInit()
        // disable all axp chip interrupt
        PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);

-        // Set the constant current charging current of AXP2101, temporarily use
-        // 500mA by default
+        // Set the constant current charging current of AXP2101, temporarily use 500mA by default
        PMU->setChargerConstantCurr(XPOWERS_AXP2101_CHG_CUR_500MA);

        // Set up the charging voltage
@@ -1265,12 +1239,11 @@ bool Power::axpChipInit()
                  PMU->getPowerChannelVoltage(XPOWERS_BLDO2));
    }

-// We can safely ignore this approach for most (or all) boards because MCU
-// turned off earlier than battery discharged to 2.6V.
+// We can safely ignore this approach for most (or all) boards because MCU turned off
+// earlier than battery discharged to 2.6V.
 //
-// Unfortunately for now we can't use this killswitch for RAK4630-based boards
-// because they have a bug with battery voltage measurement. Probably it
-// sometimes drops to low values.
+// Unfortanly for now we can't use this killswitch for RAK4630-based boards because they have a bug with
+// battery voltage measurement. Probably it sometimes drops to low values.
 #ifndef RAK4630
    // Set PMU shutdown voltage at 2.6V to maximize battery utilization
    PMU->setSysPowerDownVoltage(2600);
@@ -1289,12 +1262,10 @@ bool Power::axpChipInit()
    attachInterrupt(
        PMU_IRQ, [] { pmu_irq = true; }, FALLING);

-    // we do not look for AXPXXX_CHARGING_FINISHED_IRQ & AXPXXX_CHARGING_IRQ
-    // because it occurs repeatedly while there is no battery also it could cause
-    // inadvertent waking from light sleep just because the battery filled we
-    // don't look for AXPXXX_BATT_REMOVED_IRQ because it occurs repeatedly while
-    // no battery installed we don't look at AXPXXX_VBUS_REMOVED_IRQ because we
-    // don't have anything hooked to vbus
+    // we do not look for AXPXXX_CHARGING_FINISHED_IRQ & AXPXXX_CHARGING_IRQ because it occurs repeatedly while there is
+    // no battery also it could cause inadvertent waking from light sleep just because the battery filled
+    // we don't look for AXPXXX_BATT_REMOVED_IRQ because it occurs repeatedly while no battery installed
+    // we don't look at AXPXXX_VBUS_REMOVED_IRQ because we don't have anything hooked to vbus
    PMU->enableIRQ(pmuIrqMask);

    PMU->clearIrqStatus();
@@ -1410,8 +1381,8 @@ class LipoCharger : public HasBatteryLevel
            bool result = PPM->init(Wire, I2C_SDA, I2C_SCL, BQ25896_ADDR);
            if (result) {
                LOG_INFO("PPM BQ25896 init succeeded");
-                // Set the minimum operating voltage. Below this voltage, the PPM will
-                // protect PPM->setSysPowerDownVoltage(3100);
+                // Set the minimum operating voltage. Below this voltage, the PPM will protect
+                // PPM->setSysPowerDownVoltage(3100);

                // Set input current limit, default is 500mA
                // PPM->setInputCurrentLimit(800);
@@ -1434,8 +1405,7 @@ class LipoCharger : public HasBatteryLevel
                PPM->enableMeasure();

                // Turn on charging function
-                // If there is no battery connected, do not turn on the charging
-                // function
+                // If there is no battery connected, do not turn on the charging function
                PPM->enableCharge();
            } else {
                LOG_WARN("PPM BQ25896 init failed");
@@ -1470,8 +1440,7 @@ class LipoCharger : public HasBatteryLevel
    virtual int getBatteryPercent() override
    {
        return -1;
-        // return bq->getChargePercent(); // don't use BQ27220 for battery percent,
-        // it is not calibrated
+        // return bq->getChargePercent(); // don't use BQ27220 for battery percent, it is not calibrated
    }

    /**
@@ -1593,143 +1562,10 @@ bool Power::meshSolarInit()

 #else
 /**
- * The meshSolar battery level sensor is unavailable - default to
- * AnalogBatteryLevel
+ * The meshSolar battery level sensor is unavailable - default to AnalogBatteryLevel
 */
 bool Power::meshSolarInit()
 {
    return false;
 }
 #endif
-
-#ifdef HAS_SERIAL_BATTERY_LEVEL
-#include <SoftwareSerial.h>
-
-/**
- * SerialBatteryLevel class for pulling battery information from a secondary MCU over serial.
- */
-class SerialBatteryLevel : public HasBatteryLevel
-{
-
-  public:
-    /**
-     * Init the I2C meshSolar battery level sensor
-     */
-    bool runOnce()
-    {
-        BatterySerial.begin(4800);
-
-        return true;
-    }
-
-    /**
-     * Battery state of charge, from 0 to 100 or -1 for unknown
-     */
-    virtual int getBatteryPercent() override { return v_percent; }
-
-    /**
-     * The raw voltage of the battery in millivolts, or NAN if unknown
-     */
-    virtual uint16_t getBattVoltage() override { return voltage * 1000; }
-
-    /**
-     * return true if there is a battery installed in this unit
-     */
-    virtual bool isBatteryConnect() override
-    {
-        // definitely need to gobble up more bytes at once
-        if (BatterySerial.available() > 5) {
-            // LOG_WARN("SerialBatteryLevel: %u bytes available", BatterySerial.available());
-            while (BatterySerial.available() > 11) {
-                BatterySerial.read(); // flush old data
-            }
-            // LOG_WARN("SerialBatteryLevel: %u bytes now available", BatterySerial.available());
-            int tries = 0;
-            while (BatterySerial.read() != 0xFE) {
-                tries++; // wait for start byte
-                if (tries > 10) {
-                    LOG_WARN("SerialBatteryLevel: no start byte found");
-                    return 1;
-                }
-            }
-
-            Data[1] = BatterySerial.read();
-            Data[2] = BatterySerial.read();
-            Data[3] = BatterySerial.read();
-            Data[4] = BatterySerial.read();
-            Data[5] = BatterySerial.read();
-            if (Data[5] != 0xFD) {
-                LOG_WARN("SerialBatteryLevel: invalid end byte %02x", Data[5]);
-                return true;
-            }
-            v_percent = Data[1];
-            voltage = Data[2] + (((float)Data[3]) / 100) + (((float)Data[4]) / 10000);
-            voltage *= 2;
-            // LOG_WARN("SerialBatteryLevel: received data %u, %f, %02x", v_percent, voltage, Data[5]);
-            return true;
-        }
-        // This function runs first, so use it to grab the latest data from the secondary MCU
-        return true;
-    }
-
-    /**
-     * return true if there is an external power source detected
-     */
-    virtual bool isVbusIn() override
-    {
-#if defined(EXT_CHRG_DETECT)
-
-        return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
-
-#endif
-        return false;
-    }
-
-    virtual bool isCharging() override
-    {
-#ifdef EXT_CHRG_DETECT
-        return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
-
-#endif
-        // by default, we check the battery voltage only
-        return isVbusIn();
-    }
-
-  private:
-    SoftwareSerial BatterySerial = SoftwareSerial(SERIAL_BATTERY_RX, SERIAL_BATTERY_TX);
-    uint8_t Data[6] = {0};
-    int v_percent = 0;
-    float voltage = 0.0;
-};
-
-SerialBatteryLevel serialBatteryLevel;
-
-/**
- * Init the serial battery level sensor
- */
-bool Power::serialBatteryInit()
-{
-#ifdef EXT_PWR_DETECT
-    pinMode(EXT_PWR_DETECT, INPUT);
-#endif
-#ifdef EXT_CHRG_DETECT
-    pinMode(EXT_CHRG_DETECT, ext_chrg_detect_mode);
-#endif
-
-    bool result = serialBatteryLevel.runOnce();
-    LOG_DEBUG("Power::serialBatteryInit serial battery sensor is %s", result ? "ready" : "not ready yet");
-    if (!result)
-        return false;
-    batteryLevel = &serialBatteryLevel;
-    return true;
-}
-
-#else
-/**
- * If this device has no serial battery level sensor, don't try to use it.
- */
-bool Power::serialBatteryInit()
-{
-    return false;
-}
-#endif
--- a/src/SafeFile.cpp
+++ b/src/SafeFile.cpp
@@ -54,7 +54,7 @@ size_t SafeFile::write(const uint8_t *buffer, size_t size)
 }

 /**
- * Atomically close the file (overwriting any old version) and readback the contents to confirm the hash matches
+ * Atomically close the file (deleting any old versions) and readback the contents to confirm the hash matches
 *
 * @return false for failure
 */
@@ -73,7 +73,15 @@ bool SafeFile::close()
    if (!testReadback())
        return false;

-    // Rename or overwrite (atomic operation)
+    { // Scope for lock
+        concurrency::LockGuard g(spiLock);
+        // brief window of risk here ;-)
+        if (fullAtomic && FSCom.exists(filename.c_str()) && !FSCom.remove(filename.c_str())) {
+            LOG_ERROR("Can't remove old pref file");
+            return false;
+        }
+    }
+
    String filenameTmp = filename;
    filenameTmp += ".tmp";
    if (!renameFile(filenameTmp.c_str(), filename.c_str())) {
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -155,10 +155,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif

 // Default system gain to 0 if not defined
-#ifndef NUM_PA_POINTS
-#define NUM_PA_POINTS 1
-#endif
-
 #ifndef TX_GAIN_LORA
 #define TX_GAIN_LORA 0
 #endif
@@ -176,12 +172,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 // OLED & Input
 // -----------------------------------------------------------------------------
-#define SSD1306_ADDRESS_L 0x3C // Addr = 0
-#define SSD1306_ADDRESS_H 0x3D // Addr = 1
-
 #if defined(SEEED_WIO_TRACKER_L1) && !defined(SEEED_WIO_TRACKER_L1_EINK)
-#define SSD1306_ADDRESS SSD1306_ADDRESS_H
+#define SSD1306_ADDRESS 0x3D
 #define USE_SH1106
+#else
+#define SSD1306_ADDRESS 0x3C
 #endif
 #define ST7567_ADDRESS 0x3F

@@ -210,7 +205,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define INA_ADDR_WAVESHARE_UPS 0x43
 #define INA3221_ADDR 0x42
 #define MAX1704X_ADDR 0x36
-#define QMC6310U_ADDR 0x1C
+#define QMC6310_ADDR 0x1C
 #define QMI8658_ADDR 0x6B
 #define QMC5883L_ADDR 0x0D
 #define HMC5883L_ADDR 0x1E
@@ -219,7 +214,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LPS22HB_ADDR_ALT 0x5D
 #define SHT31_4x_ADDR 0x44
 #define SHT31_4x_ADDR_ALT 0x45
-#define PMSA003I_ADDR 0x12
+#define PMSA0031_ADDR 0x12
 #define QMA6100P_ADDR 0x12
 #define AHT10_ADDR 0x38
 #define RCWL9620_ADDR 0x57
@@ -274,6 +269,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TCA9535_ADDR 0x20
 #define TCA9555_ADDR 0x26

+// used for display brightness control
+#define STC8H1K28_ADDR 0x30
+
 // -----------------------------------------------------------------------------
 // Touchscreen
 // -----------------------------------------------------------------------------
@@ -449,6 +447,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #endif

+// BME680 BSEC2 support detection
+#if !defined(MESHTASTIC_BME680_BSEC2_SUPPORTED)
+#if defined(RAK_4631) || defined(TBEAM_V10)
+
+#define MESHTASTIC_BME680_BSEC2_SUPPORTED 1
+#define MESHTASTIC_BME680_HEADER <bsec2.h>
+#else
+#define MESHTASTIC_BME680_BSEC2_SUPPORTED 0
+#define MESHTASTIC_BME680_HEADER <Adafruit_BME680.h>
+#endif // defined(RAK_4631)
+#endif // !defined(MESHTASTIC_BME680_BSEC2_SUPPORTED)
+
 // -----------------------------------------------------------------------------
 // Global switches to turn off features for a minimized build
 // -----------------------------------------------------------------------------
@@ -473,7 +483,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MESHTASTIC_EXCLUDE_AUDIO 1
 #define MESHTASTIC_EXCLUDE_DETECTIONSENSOR 1
 #define MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR 1
-#define MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR 1
 #define MESHTASTIC_EXCLUDE_HEALTH_TELEMETRY 1
 #define MESHTASTIC_EXCLUDE_EXTERNALNOTIFICATION 1
 #define MESHTASTIC_EXCLUDE_PAXCOUNTER 1
--- a/src/detect/ScanI2C.cpp
+++ b/src/detect/ScanI2C.cpp
@@ -43,7 +43,7 @@ ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const

 ScanI2C::FoundDevice ScanI2C::firstAQI() const
 {
-    ScanI2C::DeviceType types[] = {PMSA003I, SCD4X};
+    ScanI2C::DeviceType types[] = {PMSA0031, SCD4X};
    return firstOfOrNONE(2, types);
 }

--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -35,12 +35,11 @@ class ScanI2C
        SHT4X,
        SHTC3,
        LPS22HB,
-        QMC6310U,
-        QMC6310N,
+        QMC6310,
        QMI8658,
        QMC5883L,
        HMC5883L,
-        PMSA003I,
+        PMSA0031,
        QMA6100P,
        MPU6050,
        LIS3DH,
@@ -63,6 +62,7 @@ class ScanI2C
        NAU7802,
        FT6336U,
        STK8BAXX,
+        STC8H1K28,
        ICM20948,
        SCD4X,
        MAX30102,
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -63,10 +63,6 @@ ScanI2C::DeviceType ScanI2CTwoWire::probeOLED(ScanI2C::DeviceAddress addr) const
        if (i2cBus->available()) {
            r = i2cBus->read();
        }
-        if (r == 0x80) {
-            LOG_INFO("QMC6310N found at address 0x%02X", addr.address);
-            return ScanI2C::DeviceType::QMC6310N;
-        }
        r &= 0x0f;

        if (r == 0x08 || r == 0x00) {
@@ -110,7 +106,7 @@ uint16_t ScanI2CTwoWire::getRegisterValue(const ScanI2CTwoWire::RegisterLocation
        if (i2cBus->available())
            i2cBus->read();
    }
-    LOG_DEBUG("Register value from 0x%x: 0x%x", registerLocation.i2cAddress.address, value);
+    LOG_DEBUG("Register value: 0x%x", value);
    return value;
 }

@@ -179,8 +175,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
        type = NONE;
        if (err == 0) {
            switch (addr.address) {
-            case SSD1306_ADDRESS_H:
-            case SSD1306_ADDRESS_L:
+            case SSD1306_ADDRESS:
                type = probeOLED(addr);
                break;

@@ -243,6 +238,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #endif
 #ifdef HAS_LP5562
                SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address);
+#else
+                SCAN_SIMPLE_CASE(STC8H1K28_ADDR, LP5562, "STC8H1K28", (uint8_t)addr.address);
 #endif
            case XPOWERS_AXP192_AXP2101_ADDRESS:
                // Do we have the axp2101/192 or the TCA8418
@@ -387,11 +384,11 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                }
            case SHT31_4x_ADDR:     // same as OPT3001_ADDR_ALT
            case SHT31_4x_ADDR_ALT: // same as OPT3001_ADDR
-                if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2) == 0x5449) {
+                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2);
+                if (registerValue == 0x5449) {
                    type = OPT3001;
                    logFoundDevice("OPT3001", (uint8_t)addr.address);
-                } else if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 6) !=
-                           0) { // unique SHT4x serial number (6 bytes inc. CRC)
+                } else if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 2) != 0) { // unique SHT4x serial number
                    type = SHT4X;
                    logFoundDevice("SHT4X", (uint8_t)addr.address);
                } else {
@@ -417,7 +414,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)

            case LPS22HB_ADDR_ALT:
                SCAN_SIMPLE_CASE(LPS22HB_ADDR, LPS22HB, "LPS22HB", (uint8_t)addr.address)
-                SCAN_SIMPLE_CASE(QMC6310U_ADDR, QMC6310U, "QMC6310U", (uint8_t)addr.address)
+                SCAN_SIMPLE_CASE(QMC6310_ADDR, QMC6310, "QMC6310", (uint8_t)addr.address)

            case QMI8658_ADDR:
                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x0A), 1); // get ID
@@ -447,7 +444,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #ifdef HAS_QMA6100P
                SCAN_SIMPLE_CASE(QMA6100P_ADDR, QMA6100P, "QMA6100P", (uint8_t)addr.address)
 #else
-                SCAN_SIMPLE_CASE(PMSA003I_ADDR, PMSA003I, "PMSA003I", (uint8_t)addr.address)
+                SCAN_SIMPLE_CASE(PMSA0031_ADDR, PMSA0031, "PMSA0031", (uint8_t)addr.address)
 #endif
            case BMA423_ADDR: // this can also be LIS3DH_ADDR_ALT
                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x0F), 2);
--- a/src/detect/reClockI2C.h
+++ b/src/detect/reClockI2C.h
@@ -1,41 +0,0 @@
-#ifdef CAN_RECLOCK_I2C
-#include "ScanI2CTwoWire.h"
-
-uint32_t reClockI2C(uint32_t desiredClock, TwoWire *i2cBus)
-{
-
-    uint32_t currentClock;
-
-    /* See https://github.com/arduino/Arduino/issues/11457
-      Currently, only ESP32 can getClock()
-      While all cores can setClock()
-      https://github.com/sandeepmistry/arduino-nRF5/blob/master/libraries/Wire/Wire.h#L50
-      https://github.com/earlephilhower/arduino-pico/blob/master/libraries/Wire/src/Wire.h#L60
-      https://github.com/stm32duino/Arduino_Core_STM32/blob/main/libraries/Wire/src/Wire.h#L103
-      For cases when I2C speed is different to the ones defined by sensors (see defines in sensor classes)
-      we need to reclock I2C and set it back to the previous desired speed.
-      Only for cases where we can know OR predefine the speed, we can do this.
-    */
-
-#ifdef ARCH_ESP32
-    currentClock = i2cBus->getClock();
-#elif defined(ARCH_NRF52)
-    // TODO add getClock function or return a predefined clock speed per variant?
-    return 0;
-#elif defined(ARCH_RP2040)
-    // TODO add getClock function or return a predefined clock speed per variant
-    return 0;
-#elif defined(ARCH_STM32WL)
-    // TODO add getClock function or return a predefined clock speed per variant
-    return 0;
-#else
-    return 0;
-#endif
-
-    if (currentClock != desiredClock) {
-        LOG_DEBUG("Changing I2C clock to %u", desiredClock);
-        i2cBus->setClock(desiredClock);
-    }
-    return currentClock;
-}
-#endif
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -896,11 +896,14 @@ void GPS::writePinEN(bool on)
 void GPS::writePinStandby(bool standby)
 {
 #ifdef PIN_GPS_STANDBY // Specifically the standby pin for L76B, L76K and clones
-    bool val;
-    if (standby)
-        val = GPS_STANDBY_ACTIVE;
-    else
-        val = !GPS_STANDBY_ACTIVE;
+
+// Determine the new value for the pin
+// Normally: active HIGH for awake
+#ifdef PIN_GPS_STANDBY_INVERTED
+    bool val = standby;
+#else
+    bool val = !standby;
+#endif

    // Write and log
    pinMode(PIN_GPS_STANDBY, OUTPUT);
--- a/src/gps/GPS.h
+++ b/src/gps/GPS.h
@@ -16,11 +16,6 @@
 #define GPS_EN_ACTIVE 1
 #endif

-// Allow defining the polarity of the STANDBY output.  default is LOW for standby
-#ifndef GPS_STANDBY_ACTIVE
-#define GPS_STANDBY_ACTIVE LOW
-#endif
-
 static constexpr uint32_t GPS_UPDATE_ALWAYS_ON_THRESHOLD_MS = 10 * 1000UL;
 static constexpr uint32_t GPS_FIX_HOLD_MAX_MS = 20000;

--- a/src/gps/RTC.cpp
+++ b/src/gps/RTC.cpp
@@ -397,7 +397,7 @@ uint32_t getValidTime(RTCQuality minQuality, bool local)
    return (currentQuality >= minQuality) ? getTime(local) : 0;
 }

-time_t gm_mktime(const struct tm *tm)
+time_t gm_mktime(struct tm *tm)
 {
 #if !MESHTASTIC_EXCLUDE_TZ
    time_t result = 0;
@@ -413,8 +413,8 @@ time_t gm_mktime(const struct tm *tm)
    days_before_this_year -= 719162; // (1969 * 365 + 1969 / 4 - 1969 / 100 + 1969 / 400);

    // Now, within this tm->year, compute the days *before* this tm->month starts.
-    static const int days_before_month[12] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; // non-leap year
-    int days_this_year_before_this_month = days_before_month[tm->tm_mon];                             // tm->tm_mon is 0..11
+    int days_before_month[12] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; // non-leap year
+    int days_this_year_before_this_month = days_before_month[tm->tm_mon];                // tm->tm_mon is 0..11

    // If this is a leap year, and we're past February, add a day:
    if (tm->tm_mon >= 2 && (year % 4) == 0 && ((year % 100) != 0 || (year % 400) == 0)) {
@@ -435,7 +435,6 @@ time_t gm_mktime(const struct tm *tm)

    return result;
 #else
-    struct tm tmCopy = *tm;
-    return mktime(&tmCopy);
+    return mktime(tm);
 #endif
 }
--- a/src/gps/RTC.h
+++ b/src/gps/RTC.h
@@ -54,7 +54,7 @@ uint32_t getValidTime(RTCQuality minQuality, bool local = false);

 RTCSetResult readFromRTC();

-time_t gm_mktime(const struct tm *tm);
+time_t gm_mktime(struct tm *tm);

 #define SEC_PER_DAY 86400
 #define SEC_PER_HOUR 3600
--- a/src/graphics/EInkDisplay2.h
+++ b/src/graphics/EInkDisplay2.h
@@ -9,15 +9,6 @@
 #include "GxEPD2Multi.h"
 #endif

-// Limit how often we push a full E-Ink refresh. T-Deck Pro needs faster updates for typing.
-#ifndef EINK_FORCE_DISPLAY_THROTTLE_MS
-#if defined(T_DECK_PRO)
-#define EINK_FORCE_DISPLAY_THROTTLE_MS 200
-#else
-#define EINK_FORCE_DISPLAY_THROTTLE_MS 1000
-#endif
-#endif
-
 /**
 * An adapter class that allows using the GxEPD2 library as if it was an OLEDDisplay implementation.
 *
@@ -51,7 +42,7 @@ class EInkDisplay : public OLEDDisplay
     *
     * @return true if we did draw the screen
     */
-    virtual bool forceDisplay(uint32_t msecLimit = EINK_FORCE_DISPLAY_THROTTLE_MS);
+    virtual bool forceDisplay(uint32_t msecLimit = 1000);

    /**
     * Run any code needed to complete an update, after the physical refresh has completed.
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -825,7 +825,7 @@ int32_t Screen::runOnce()
 #endif
    }
 #endif
-    if (!NotificationRenderer::isOverlayBannerShowing() && rebootAtMsec != 0 && !suppressRebootBanner) {
+    if (!NotificationRenderer::isOverlayBannerShowing() && rebootAtMsec != 0) {
        showSimpleBanner("Rebooting...", 0);
    }

--- a/src/graphics/draw/DebugRenderer.cpp
+++ b/src/graphics/draw/DebugRenderer.cpp
@@ -438,7 +438,7 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
        if (currentResolution == ScreenResolution::UltraLow) {
            snprintf(frequencyslot, sizeof(frequencyslot), "%sMHz (%d)", freqStr, config.lora.channel_num);
        } else {
-            snprintf(frequencyslot, sizeof(frequencyslot), "Freq: %sMHz (%d)", freqStr, config.lora.channel_num);
+            snprintf(frequencyslot, sizeof(frequencyslot), "Freq/Ch: %sMHz (%d)", freqStr, config.lora.channel_num);
        }
    }
    size_t len = strlen(frequencyslot);
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -59,18 +59,17 @@ BannerOverlayOptions createStaticBannerOptions(const char *message, const MenuOp
 } // namespace

 menuHandler::screenMenus menuHandler::menuQueue = menu_none;
-uint32_t menuHandler::pickedNodeNum = 0;
 bool test_enabled = false;
 uint8_t test_count = 0;

 void menuHandler::loraMenu()
 {
-    static const char *optionsArray[] = {"Back", "Device Role", "Radio Preset", "Frequency Slot", "LoRa Region"};
-    enum optionsNumbers { Back = 0, device_role_picker = 1, radio_preset_picker = 2, frequency_slot = 3, lora_picker = 4 };
+    static const char *optionsArray[] = {"Back", "Device Role", "Radio Preset", "LoRa Region"};
+    enum optionsNumbers { Back = 0, device_role_picker = 1, radio_preset_picker = 2, lora_picker = 3 };
    BannerOverlayOptions bannerOptions;
    bannerOptions.message = "LoRa Actions";
    bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsCount = 5;
+    bannerOptions.optionsCount = 4;
    bannerOptions.bannerCallback = [](int selected) -> void {
        if (selected == Back) {
            // No action
@@ -78,8 +77,6 @@ void menuHandler::loraMenu()
            menuHandler::menuQueue = menuHandler::device_role_picker;
        } else if (selected == radio_preset_picker) {
            menuHandler::menuQueue = menuHandler::radio_preset_picker;
-        } else if (selected == frequency_slot) {
-            menuHandler::menuQueue = menuHandler::frequency_slot;
        } else if (selected == lora_picker) {
            menuHandler::menuQueue = menuHandler::lora_picker;
        }
@@ -250,69 +247,6 @@ void menuHandler::DeviceRolePicker()
    screen->showOverlayBanner(bannerOptions);
 }

-void menuHandler::FrequencySlotPicker()
-{
-
-    enum ReplyOptions : int { Back = -1 };
-    constexpr int MAX_CHANNEL_OPTIONS = 202;
-    static const char *optionsArray[MAX_CHANNEL_OPTIONS];
-    static int optionsEnumArray[MAX_CHANNEL_OPTIONS];
-    static char channelText[MAX_CHANNEL_OPTIONS - 1][12];
-    int options = 0;
-    optionsArray[options] = "Back";
-    optionsEnumArray[options++] = Back;
-    optionsArray[options] = "Slot 0 (Auto)";
-    optionsEnumArray[options++] = 0;
-
-    // Calculate number of channels (copied from RadioInterface::applyModemConfig())
-    meshtastic_Config_LoRaConfig &loraConfig = config.lora;
-    double bw = loraConfig.use_preset ? modemPresetToBwKHz(loraConfig.modem_preset, myRegion->wideLora)
-                                      : bwCodeToKHz(loraConfig.bandwidth);
-
-    uint32_t numChannels = 0;
-    if (myRegion) {
-        numChannels = (uint32_t)floor((myRegion->freqEnd - myRegion->freqStart) / (myRegion->spacing + (bw / 1000.0)));
-    } else {
-        LOG_WARN("Region not set, cannot calculate number of channels");
-        return;
-    }
-
-    if (numChannels > (uint32_t)(MAX_CHANNEL_OPTIONS - 2))
-        numChannels = (uint32_t)(MAX_CHANNEL_OPTIONS - 2);
-
-    for (uint32_t ch = 1; ch <= numChannels; ch++) {
-        snprintf(channelText[ch - 1], sizeof(channelText[ch - 1]), "Slot %lu", (unsigned long)ch);
-        optionsArray[options] = channelText[ch - 1];
-        optionsEnumArray[options++] = (int)ch;
-    }
-
-    BannerOverlayOptions bannerOptions;
-    bannerOptions.message = "Frequency Slot";
-    bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsEnumPtr = optionsEnumArray;
-    bannerOptions.optionsCount = options;
-
-    // Start highlight on current channel if possible, otherwise on "1"
-    int initial = (int)config.lora.channel_num + 1;
-    if (initial < 2 || initial > (int)numChannels + 1)
-        initial = 1;
-    bannerOptions.InitialSelected = initial;
-
-    bannerOptions.bannerCallback = [](int selected) -> void {
-        if (selected == Back) {
-            menuHandler::menuQueue = menuHandler::lora_Menu;
-            screen->runNow();
-            return;
-        }
-
-        config.lora.channel_num = selected;
-        service->reloadConfig(SEGMENT_CONFIG);
-        rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
-    };
-
-    screen->showOverlayBanner(bannerOptions);
-}
-
 void menuHandler::RadioPresetPicker()
 {
    static const RadioPresetOption presetOptions[] = {
@@ -343,8 +277,6 @@ void menuHandler::RadioPresetPicker()
            }

            config.lora.modem_preset = option.value;
-            config.lora.channel_num = 0;        // Reset to default channel for the preset
-            config.lora.override_frequency = 0; // Clear any custom frequency
            service->reloadConfig(SEGMENT_CONFIG);
            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
        });
@@ -517,7 +449,7 @@ void menuHandler::clockMenu()
 }
 void menuHandler::messageResponseMenu()
 {
-    enum optionsNumbers { Back = 0, ViewMode, DeleteMenu, ReplyMenu, MuteChannel, Aloud, enumEnd };
+    enum optionsNumbers { Back = 0, ViewMode, DeleteAll, DeleteOldest, ReplyMenu, MuteChannel, Aloud, enumEnd };

    static const char *optionsArray[enumEnd];
    static int optionsEnumArray[enumEnd];
@@ -547,7 +479,7 @@ void menuHandler::messageResponseMenu()

    // Delete submenu
    optionsArray[options] = "Delete";
-    optionsEnumArray[options++] = DeleteMenu;
+    optionsEnumArray[options++] = 900;

 #ifdef HAS_I2S
    optionsArray[options] = "Read Aloud";
@@ -588,10 +520,34 @@ void menuHandler::messageResponseMenu()
                nodeDB->saveToDisk();
            }

-        } else if (selected == DeleteMenu) {
+            // Delete submenu
+        } else if (selected == 900) {
            menuHandler::menuQueue = menuHandler::delete_messages_menu;
            screen->runNow();

+            // Delete oldest FIRST (only change)
+        } else if (selected == DeleteOldest) {
+            auto mode = graphics::MessageRenderer::getThreadMode();
+            int ch = graphics::MessageRenderer::getThreadChannel();
+            uint32_t peer = graphics::MessageRenderer::getThreadPeer();
+
+            if (mode == graphics::MessageRenderer::ThreadMode::ALL) {
+                // Global oldest
+                messageStore.deleteOldestMessage();
+            } else if (mode == graphics::MessageRenderer::ThreadMode::CHANNEL) {
+                // Oldest in current channel
+                messageStore.deleteOldestMessageInChannel(ch);
+            } else if (mode == graphics::MessageRenderer::ThreadMode::DIRECT) {
+                // Oldest in current DM
+                messageStore.deleteOldestMessageWithPeer(peer);
+            }
+
+            // Delete all messages
+        } else if (selected == DeleteAll) {
+            messageStore.clearAllMessages();
+            graphics::MessageRenderer::clearThreadRegistries();
+            graphics::MessageRenderer::clearMessageCache();
+
 #ifdef HAS_I2S
        } else if (selected == Aloud) {
            const meshtastic_MeshPacket &mp = devicestate.rx_text_message;
@@ -760,6 +716,7 @@ void menuHandler::deleteMessagesMenu()
            } else if (mode == graphics::MessageRenderer::ThreadMode::DIRECT) {
                messageStore.deleteOldestMessageWithPeer(peer);
            }
+
            return;
        }

@@ -772,6 +729,7 @@ void menuHandler::deleteMessagesMenu()
            } else if (mode == graphics::MessageRenderer::ThreadMode::DIRECT) {
                messageStore.deleteAllMessagesWithPeer(peer);
            }
+
            return;
        }
    };
@@ -1281,13 +1239,20 @@ void menuHandler::positionBaseMenu()

 void menuHandler::nodeListMenu()
 {
-    enum optionsNumbers { Back, NodePicker, TraceRoute, Verify, Reset, NodeNameLength, enumEnd };
+    enum optionsNumbers { Back, Favorite, TraceRoute, Verify, Reset, NodeNameLength, enumEnd };
    static const char *optionsArray[enumEnd] = {"Back"};
    static int optionsEnumArray[enumEnd] = {Back};
    int options = 1;

-    optionsArray[options] = "Node Actions / Settings";
-    optionsEnumArray[options++] = NodePicker;
+    optionsArray[options] = "Add Favorite";
+    optionsEnumArray[options++] = Favorite;
+    optionsArray[options] = "Trace Route";
+    optionsEnumArray[options++] = TraceRoute;
+
+    if (currentResolution != ScreenResolution::UltraLow) {
+        optionsArray[options] = "Key Verification";
+        optionsEnumArray[options++] = Verify;
+    }

    if (currentResolution != ScreenResolution::UltraLow) {
        optionsArray[options] = "Show Long/Short Name";
@@ -1302,12 +1267,18 @@ void menuHandler::nodeListMenu()
    bannerOptions.optionsCount = options;
    bannerOptions.optionsEnumPtr = optionsEnumArray;
    bannerOptions.bannerCallback = [](int selected) -> void {
-        if (selected == NodePicker) {
-            menuQueue = NodePicker_menu;
+        if (selected == Favorite) {
+            menuQueue = add_favorite;
+            screen->runNow();
+        } else if (selected == Verify) {
+            menuQueue = key_verification_init;
            screen->runNow();
        } else if (selected == Reset) {
            menuQueue = reset_node_db_menu;
            screen->runNow();
+        } else if (selected == TraceRoute) {
+            menuQueue = trace_route_menu;
+            screen->runNow();
        } else if (selected == NodeNameLength) {
            menuHandler::menuQueue = menuHandler::node_name_length_menu;
            screen->runNow();
@@ -1316,159 +1287,6 @@ void menuHandler::nodeListMenu()
    screen->showOverlayBanner(bannerOptions);
 }

-void menuHandler::NodePicker()
-{
-    const char *NODE_PICKER_TITLE;
-    if (currentResolution == ScreenResolution::UltraLow) {
-        NODE_PICKER_TITLE = "Pick Node";
-    } else {
-        NODE_PICKER_TITLE = "Pick A Node";
-    }
-    screen->showNodePicker(NODE_PICKER_TITLE, 30000, [](uint32_t nodenum) -> void {
-        LOG_INFO("Nodenum: %u", nodenum);
-        // Store the selection so the Manage Node menu knows which node to operate on
-        menuHandler::pickedNodeNum = nodenum;
-        // Keep UI favorite context in sync (used elsewhere for some node-based actions)
-        graphics::UIRenderer::currentFavoriteNodeNum = nodenum;
-        menuQueue = Manage_Node_menu;
-        screen->runNow();
-    });
-}
-
-void menuHandler::ManageNodeMenu()
-{
-    // If we don't have a node selected yet, go fast exit
-    auto node = nodeDB->getMeshNode(menuHandler::pickedNodeNum);
-    if (!node) {
-        return;
-    }
-    enum optionsNumbers { Back, Favorite, Mute, TraceRoute, KeyVerification, Ignore, enumEnd };
-    static const char *optionsArray[enumEnd] = {"Back"};
-    static int optionsEnumArray[enumEnd] = {Back};
-    int options = 1;
-
-    if (node->is_favorite) {
-        optionsArray[options] = "Unfavorite";
-    } else {
-        optionsArray[options] = "Favorite";
-    }
-    optionsEnumArray[options++] = Favorite;
-
-    bool isMuted = (node->bitfield & NODEINFO_BITFIELD_IS_MUTED_MASK) != 0;
-    if (isMuted) {
-        optionsArray[options] = "Unmute Notifications";
-    } else {
-        optionsArray[options] = "Mute Notifications";
-    }
-    optionsEnumArray[options++] = Mute;
-
-    optionsArray[options] = "Trace Route";
-    optionsEnumArray[options++] = TraceRoute;
-
-    optionsArray[options] = "Key Verification";
-    optionsEnumArray[options++] = KeyVerification;
-
-    if (node->is_ignored) {
-        optionsArray[options] = "Unignore Node";
-    } else {
-        optionsArray[options] = "Ignore Node";
-    }
-    optionsEnumArray[options++] = Ignore;
-
-    BannerOverlayOptions bannerOptions;
-
-    std::string title = "";
-    if (node->has_user && node->user.long_name && node->user.long_name[0]) {
-        title += sanitizeString(node->user.long_name).substr(0, 15);
-    } else {
-        char buf[20];
-        snprintf(buf, sizeof(buf), "%08X", (unsigned int)node->num);
-        title += buf;
-    }
-    bannerOptions.message = title.c_str();
-    bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsCount = options;
-    bannerOptions.optionsEnumPtr = optionsEnumArray;
-    bannerOptions.bannerCallback = [](int selected) -> void {
-        if (selected == Back) {
-            menuQueue = node_base_menu;
-            screen->runNow();
-            return;
-        }
-
-        if (selected == Favorite) {
-            auto n = nodeDB->getMeshNode(menuHandler::pickedNodeNum);
-            if (!n) {
-                return;
-            }
-            if (n->is_favorite) {
-                LOG_INFO("Removing node %08X from favorites", menuHandler::pickedNodeNum);
-                nodeDB->set_favorite(false, menuHandler::pickedNodeNum);
-            } else {
-                LOG_INFO("Adding node %08X to favorites", menuHandler::pickedNodeNum);
-                nodeDB->set_favorite(true, menuHandler::pickedNodeNum);
-            }
-            screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-            return;
-        }
-
-        if (selected == Mute) {
-            auto n = nodeDB->getMeshNode(menuHandler::pickedNodeNum);
-            if (!n) {
-                return;
-            }
-
-            if (n->bitfield & NODEINFO_BITFIELD_IS_MUTED_MASK) {
-                n->bitfield &= ~NODEINFO_BITFIELD_IS_MUTED_MASK;
-                LOG_INFO("Unmuted node %08X", menuHandler::pickedNodeNum);
-            } else {
-                n->bitfield |= NODEINFO_BITFIELD_IS_MUTED_MASK;
-                LOG_INFO("Muted node %08X", menuHandler::pickedNodeNum);
-            }
-            nodeDB->notifyObservers(true);
-            nodeDB->saveToDisk();
-            screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-            return;
-        }
-
-        if (selected == TraceRoute) {
-            LOG_INFO("Starting traceroute to %08X", menuHandler::pickedNodeNum);
-            if (traceRouteModule) {
-                traceRouteModule->startTraceRoute(menuHandler::pickedNodeNum);
-            }
-            return;
-        }
-
-        if (selected == KeyVerification) {
-            LOG_INFO("Initiating key verification with %08X", menuHandler::pickedNodeNum);
-            if (keyVerificationModule) {
-                keyVerificationModule->sendInitialRequest(menuHandler::pickedNodeNum);
-            }
-            return;
-        }
-
-        if (selected == Ignore) {
-            auto n = nodeDB->getMeshNode(menuHandler::pickedNodeNum);
-            if (!n) {
-                return;
-            }
-
-            if (n->is_ignored) {
-                n->is_ignored = false;
-                LOG_INFO("Unignoring node %08X", menuHandler::pickedNodeNum);
-            } else {
-                n->is_ignored = true;
-                LOG_INFO("Ignoring node %08X", menuHandler::pickedNodeNum);
-            }
-            nodeDB->notifyObservers(true);
-            nodeDB->saveToDisk();
-            screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-            return;
-        }
-    };
-    screen->showOverlayBanner(bannerOptions);
-}
-
 void menuHandler::nodeNameLengthMenu()
 {
    static const NodeNameOption nodeNameOptions[] = {
@@ -1497,7 +1315,6 @@ void menuHandler::nodeNameLengthMenu()
                                                       }

                                                       config.display.use_long_node_name = option.value;
-                                                       saveUIConfig();
                                                       LOG_INFO("Setting names to %s", option.value ? "long" : "short");
                                                   });

@@ -2167,6 +1984,21 @@ void menuHandler::shutdownMenu()
    screen->showOverlayBanner(bannerOptions);
 }

+void menuHandler::addFavoriteMenu()
+{
+    const char *NODE_PICKER_TITLE;
+    if (currentResolution == ScreenResolution::UltraLow) {
+        NODE_PICKER_TITLE = "Node Favorite";
+    } else {
+        NODE_PICKER_TITLE = "Node To Favorite";
+    }
+    screen->showNodePicker(NODE_PICKER_TITLE, 30000, [](uint32_t nodenum) -> void {
+        LOG_WARN("Nodenum: %u", nodenum);
+        nodeDB->set_favorite(true, nodenum);
+        screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
+    });
+}
+
 void menuHandler::removeFavoriteMenu()
 {

@@ -2441,8 +2273,7 @@ void menuHandler::FrameToggles_menu()
        lora,
        clock,
        show_favorites,
-        show_env_telemetry,
-        show_aq_telemetry,
+        show_telemetry,
        show_power,
        enumEnd
    };
@@ -2487,11 +2318,8 @@ void menuHandler::FrameToggles_menu()
    optionsArray[options] = screen->isFrameHidden("show_favorites") ? "Show Favorites" : "Hide Favorites";
    optionsEnumArray[options++] = show_favorites;

-    optionsArray[options] = moduleConfig.telemetry.environment_screen_enabled ? "Hide Env. Telemetry" : "Show Env. Telemetry";
-    optionsEnumArray[options++] = show_env_telemetry;
-
-    optionsArray[options] = moduleConfig.telemetry.air_quality_screen_enabled ? "Hide AQ Telemetry" : "Show AQ Telemetry";
-    optionsEnumArray[options++] = show_aq_telemetry;
+    optionsArray[options] = moduleConfig.telemetry.environment_screen_enabled ? "Hide Telemetry" : "Show Telemetry";
+    optionsEnumArray[options++] = show_telemetry;

    optionsArray[options] = moduleConfig.telemetry.power_screen_enabled ? "Hide Power" : "Show Power";
    optionsEnumArray[options++] = show_power;
@@ -2554,14 +2382,10 @@ void menuHandler::FrameToggles_menu()
            screen->toggleFrameVisibility("show_favorites");
            menuHandler::menuQueue = menuHandler::FrameToggles;
            screen->runNow();
-        } else if (selected == show_env_telemetry) {
+        } else if (selected == show_telemetry) {
            moduleConfig.telemetry.environment_screen_enabled = !moduleConfig.telemetry.environment_screen_enabled;
            menuHandler::menuQueue = menuHandler::FrameToggles;
            screen->runNow();
-        } else if (selected == show_aq_telemetry) {
-            moduleConfig.telemetry.air_quality_screen_enabled = !moduleConfig.telemetry.air_quality_screen_enabled;
-            menuHandler::menuQueue = menuHandler::FrameToggles;
-            screen->runNow();
        } else if (selected == show_power) {
            moduleConfig.telemetry.power_screen_enabled = !moduleConfig.telemetry.power_screen_enabled;
            menuHandler::menuQueue = menuHandler::FrameToggles;
@@ -2618,9 +2442,6 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
    case radio_preset_picker:
        RadioPresetPicker();
        break;
-    case frequency_slot:
-        FrequencySlotPicker();
-        break;
    case no_timeout_lora_picker:
        LoraRegionPicker(0);
        break;
@@ -2689,11 +2510,8 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
    case shutdown_menu:
        shutdownMenu();
        break;
-    case NodePicker_menu:
-        NodePicker();
-        break;
-    case Manage_Node_menu:
-        ManageNodeMenu();
+    case add_favorite:
+        addFavoriteMenu();
        break;
    case remove_favorite:
        removeFavoriteMenu();
--- a/src/graphics/draw/MenuHandler.h
+++ b/src/graphics/draw/MenuHandler.h
@@ -13,7 +13,6 @@ class menuHandler
        lora_picker,
        device_role_picker,
        radio_preset_picker,
-        frequency_slot,
        no_timeout_lora_picker,
        TZ_picker,
        twelve_hour_picker,
@@ -34,8 +33,7 @@ class menuHandler
        brightness_picker,
        reboot_menu,
        shutdown_menu,
-        NodePicker_menu,
-        Manage_Node_menu,
+        add_favorite,
        remove_favorite,
        test_menu,
        number_test,
@@ -57,14 +55,12 @@ class menuHandler
        DisplayUnits
    };
    static screenMenus menuQueue;
-    static uint32_t pickedNodeNum; // node selected by NodePicker for ManageNodeMenu

    static void OnboardMessage();
    static void LoraRegionPicker(uint32_t duration = 30000);
    static void loraMenu();
    static void DeviceRolePicker();
    static void RadioPresetPicker();
-    static void FrequencySlotPicker();
    static void handleMenuSwitch(OLEDDisplay *display);
    static void showConfirmationBanner(const char *message, std::function<void()> onConfirm);
    static void clockMenu();
@@ -94,8 +90,6 @@ class menuHandler
    static void BrightnessPickerMenu();
    static void rebootMenu();
    static void shutdownMenu();
-    static void NodePicker();
-    static void ManageNodeMenu();
    static void addFavoriteMenu();
    static void removeFavoriteMenu();
    static void traceRouteMenu();
@@ -140,7 +134,7 @@ struct ScreenColor {
    uint8_t b;
    bool useVariant;

-    explicit ScreenColor(uint8_t rIn = 0, uint8_t gIn = 0, uint8_t bIn = 0, bool variantIn = false)
+    ScreenColor(uint8_t rIn = 0, uint8_t gIn = 0, uint8_t bIn = 0, bool variantIn = false)
        : r(rIn), g(gIn), b(bIn), useVariant(variantIn)
    {
    }
@@ -155,7 +149,6 @@ using GPSToggleOption = MenuOption<meshtastic_Config_PositionConfig_GpsMode>;
 using GPSFormatOption = MenuOption<meshtastic_DeviceUIConfig_GpsCoordinateFormat>;
 using NodeNameOption = MenuOption<bool>;
 using PositionMenuOption = MenuOption<int>;
-using ManageNodeOption = MenuOption<int>;
 using ClockFaceOption = MenuOption<bool>;

 } // namespace graphics
--- a/src/graphics/draw/MessageRenderer.cpp
+++ b/src/graphics/draw/MessageRenderer.cpp
@@ -6,6 +6,7 @@
 #include "MessageStore.h"
 #include "NodeDB.h"
 #include "UIRenderer.h"
+#include "configuration.h"
 #include "gps/RTC.h"
 #include "graphics/Screen.h"
 #include "graphics/ScreenFonts.h"
@@ -19,6 +20,7 @@

 // External declarations
 extern bool hasUnreadMessage;
+extern meshtastic_DeviceState devicestate;
 extern graphics::Screen *screen;

 using graphics::Emote;
@@ -47,7 +49,7 @@ static inline size_t utf8CharLen(uint8_t c)
 }

 // Remove variation selectors (FE0F) and skin tone modifiers from emoji so they match your labels
-static std::string normalizeEmoji(const std::string &s)
+std::string normalizeEmoji(const std::string &s)
 {
    std::string out;
    for (size_t i = 0; i < s.size();) {
@@ -80,7 +82,6 @@ uint32_t pauseStart = 0;
 bool waitingToReset = false;
 bool scrollStarted = false;
 static bool didReset = false;
-static constexpr int MESSAGE_BLOCK_GAP = 6;

 void scrollUp()
 {
@@ -110,6 +111,22 @@ void scrollDown()

 void drawStringWithEmotes(OLEDDisplay *display, int x, int y, const std::string &line, const Emote *emotes, int emoteCount)
 {
+    std::string renderLine;
+    for (size_t i = 0; i < line.size();) {
+        uint8_t c = (uint8_t)line[i];
+        size_t len = utf8CharLen(c);
+        if (c == 0xEF && i + 2 < line.size() && (uint8_t)line[i + 1] == 0xB8 && (uint8_t)line[i + 2] == 0x8F) {
+            i += 3;
+            continue;
+        }
+        if (c == 0xF0 && i + 3 < line.size() && (uint8_t)line[i + 1] == 0x9F && (uint8_t)line[i + 2] == 0x8F &&
+            ((uint8_t)line[i + 3] >= 0xBB && (uint8_t)line[i + 3] <= 0xBF)) {
+            i += 4;
+            continue;
+        }
+        renderLine.append(line, i, len);
+        i += len;
+    }
    int cursorX = x;
    const int fontHeight = FONT_HEIGHT_SMALL;

@@ -186,7 +203,8 @@ void drawStringWithEmotes(OLEDDisplay *display, int x, int y, const std::string

        // Render the emote (if found)
        if (matchedEmote && i == nextEmotePos) {
-            int iconY = y + (lineHeight - matchedEmote->height) / 2;
+            // Vertically center emote relative to font baseline (not just midline)
+            int iconY = fontY + (fontHeight - matchedEmote->height) / 2;
            display->drawXbm(cursorX, iconY, matchedEmote->width, matchedEmote->height, matchedEmote->bitmap);
            cursorX += matchedEmote->width + 1;
            i += emojiLen;
@@ -405,102 +423,6 @@ static inline int getRenderedLineWidth(OLEDDisplay *display, const std::string &
    return totalWidth;
 }

-struct MessageBlock {
-    size_t start;
-    size_t end;
-    bool mine;
-};
-
-static int getDrawnLinePixelBottom(int lineTopY, const std::string &line, bool isHeaderLine)
-{
-    if (isHeaderLine) {
-        return lineTopY + (FONT_HEIGHT_SMALL - 1);
-    }
-
-    int tallest = FONT_HEIGHT_SMALL;
-    for (int e = 0; e < numEmotes; ++e) {
-        if (line.find(emotes[e].label) != std::string::npos) {
-            if (emotes[e].height > tallest)
-                tallest = emotes[e].height;
-        }
-    }
-
-    const int lineHeight = std::max(FONT_HEIGHT_SMALL, tallest);
-    const int iconTop = lineTopY + (lineHeight - tallest) / 2;
-
-    return iconTop + tallest - 1;
-}
-
-static void drawRoundedRectOutline(OLEDDisplay *display, int x, int y, int w, int h, int r)
-{
-    if (w <= 1 || h <= 1)
-        return;
-
-    if (r < 0)
-        r = 0;
-
-    int maxR = (std::min(w, h) / 2) - 1;
-    if (r > maxR)
-        r = maxR;
-
-    if (r == 0) {
-        display->drawRect(x, y, w, h);
-        return;
-    }
-
-    const int x0 = x;
-    const int y0 = y;
-    const int x1 = x + w - 1;
-    const int y1 = y + h - 1;
-
-    // sides
-    if (x0 + r <= x1 - r) {
-        display->drawLine(x0 + r, y0, x1 - r, y0); // top
-        display->drawLine(x0 + r, y1, x1 - r, y1); // bottom
-    }
-    if (y0 + r <= y1 - r) {
-        display->drawLine(x0, y0 + r, x0, y1 - r); // left
-        display->drawLine(x1, y0 + r, x1, y1 - r); // right
-    }
-
-    // corner arcs
-    display->drawCircleQuads(x0 + r, y0 + r, r, 2); // top left
-    display->drawCircleQuads(x1 - r, y0 + r, r, 1); // top right
-    display->drawCircleQuads(x1 - r, y1 - r, r, 8); // bottom right
-    display->drawCircleQuads(x0 + r, y1 - r, r, 4); // bottom left
-}
-
-static std::vector<MessageBlock> buildMessageBlocks(const std::vector<bool> &isHeaderVec, const std::vector<bool> &isMineVec)
-{
-    std::vector<MessageBlock> blocks;
-    if (isHeaderVec.empty())
-        return blocks;
-
-    size_t start = 0;
-    bool mine = isMineVec[0];
-
-    for (size_t i = 1; i < isHeaderVec.size(); ++i) {
-        if (isHeaderVec[i]) {
-            MessageBlock b;
-            b.start = start;
-            b.end = i - 1;
-            b.mine = mine;
-            blocks.push_back(b);
-
-            start = i;
-            mine = isMineVec[i];
-        }
-    }
-
-    MessageBlock last;
-    last.start = start;
-    last.end = isHeaderVec.size() - 1;
-    last.mine = mine;
-    blocks.push_back(last);
-
-    return blocks;
-}
-
 static void drawMessageScrollbar(OLEDDisplay *display, int visibleHeight, int totalHeight, int scrollOffset, int startY)
 {
    if (totalHeight <= visibleHeight)
@@ -560,14 +482,9 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
    constexpr int LEFT_MARGIN = 2;
    constexpr int RIGHT_MARGIN = 2;
    constexpr int SCROLLBAR_WIDTH = 3;
-    constexpr int BUBBLE_PAD_X = 3;
-    constexpr int BUBBLE_PAD_Y = 4;
-    constexpr int BUBBLE_RADIUS = 4;
-    constexpr int BUBBLE_MIN_W = 24;
-    constexpr int BUBBLE_TEXT_INDENT = 2;

-    // Derived widths
-    const int leftTextWidth = SCREEN_WIDTH - LEFT_MARGIN - RIGHT_MARGIN - (BUBBLE_PAD_X * 2);
+    const int leftTextWidth = SCREEN_WIDTH - LEFT_MARGIN - RIGHT_MARGIN;
+
    const int rightTextWidth = SCREEN_WIDTH - LEFT_MARGIN - RIGHT_MARGIN - SCROLLBAR_WIDTH;

    // Title string depending on mode
@@ -630,28 +547,7 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
        char chanType[32] = "";
        if (currentMode == ThreadMode::ALL) {
            if (m.dest == NODENUM_BROADCAST) {
-                const char *name = channels.getName(m.channelIndex);
-                if (currentResolution == ScreenResolution::Low || currentResolution == ScreenResolution::UltraLow) {
-                    if (strcmp(name, "ShortTurbo") == 0)
-                        name = "ShortT";
-                    else if (strcmp(name, "ShortSlow") == 0)
-                        name = "ShortS";
-                    else if (strcmp(name, "ShortFast") == 0)
-                        name = "ShortF";
-                    else if (strcmp(name, "MediumSlow") == 0)
-                        name = "MedS";
-                    else if (strcmp(name, "MediumFast") == 0)
-                        name = "MedF";
-                    else if (strcmp(name, "LongSlow") == 0)
-                        name = "LongS";
-                    else if (strcmp(name, "LongFast") == 0)
-                        name = "LongF";
-                    else if (strcmp(name, "LongTurbo") == 0)
-                        name = "LongT";
-                    else if (strcmp(name, "LongMod") == 0)
-                        name = "LongM";
-                }
-                snprintf(chanType, sizeof(chanType), "#%s", name);
+                snprintf(chanType, sizeof(chanType), "#%s", channels.getName(m.channelIndex));
            } else {
                snprintf(chanType, sizeof(chanType), "(DM)");
            }
@@ -718,8 +614,8 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
        }

        // Shrink Sender name if needed
-        int availWidth = (mine ? rightTextWidth : leftTextWidth) - display->getStringWidth(timeBuf) -
-                         display->getStringWidth(chanType) - display->getStringWidth("   @...");
+        int availWidth = SCREEN_WIDTH - display->getStringWidth(timeBuf) - display->getStringWidth(chanType) -
+                         display->getStringWidth(" @...") - 10;
        if (availWidth < 0)
            availWidth = 0;

@@ -771,8 +667,6 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
    cachedLines = allLines;
    cachedHeights = calculateLineHeights(cachedLines, emotes, isHeader);

-    std::vector<MessageBlock> blocks = buildMessageBlocks(isHeader, isMine);
-
    // Scrolling logic (unchanged)
    int totalHeight = 0;
    for (size_t i = 0; i < cachedHeights.size(); ++i)
@@ -820,123 +714,12 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16

    int finalScroll = (int)scrollY;
    int yOffset = -finalScroll + getTextPositions(display)[1];
-    const int contentTop = getTextPositions(display)[1];
-    const int contentBottom = scrollBottom; // already excludes nav line
-    const int rightEdge = SCREEN_WIDTH - SCROLLBAR_WIDTH - RIGHT_MARGIN;
-    const int bubbleGapY = std::max(1, MESSAGE_BLOCK_GAP / 2);
-
-    std::vector<int> lineTop;
-    lineTop.resize(cachedLines.size());
-    {
-        int acc = 0;
-        for (size_t i = 0; i < cachedLines.size(); ++i) {
-            lineTop[i] = yOffset + acc;
-            acc += cachedHeights[i];
-        }
-    }
-
-    // Draw bubbles
-    for (size_t bi = 0; bi < blocks.size(); ++bi) {
-        const auto &b = blocks[bi];
-        if (b.start >= cachedLines.size() || b.end >= cachedLines.size() || b.start > b.end)
-            continue;
-
-        int visualTop = lineTop[b.start];
-
-        int topY;
-        if (isHeader[b.start]) {
-            // Header start
-            constexpr int BUBBLE_PAD_TOP_HEADER = 1; // try 1 or 2
-            topY = visualTop - BUBBLE_PAD_TOP_HEADER;
-        } else {
-            // Body start
-            bool thisLineHasEmote = false;
-            for (int e = 0; e < numEmotes; ++e) {
-                if (cachedLines[b.start].find(emotes[e].label) != std::string::npos) {
-                    thisLineHasEmote = true;
-                    break;
-                }
-            }
-            if (thisLineHasEmote) {
-                constexpr int EMOTE_PADDING_ABOVE = 4;
-                visualTop -= EMOTE_PADDING_ABOVE;
-            }
-            topY = visualTop - BUBBLE_PAD_Y;
-        }
-        int visualBottom = getDrawnLinePixelBottom(lineTop[b.end], cachedLines[b.end], isHeader[b.end]);
-        int bottomY = visualBottom + BUBBLE_PAD_Y;
-
-        if (bi + 1 < blocks.size()) {
-            int nextHeaderIndex = (int)blocks[bi + 1].start;
-            int nextTop = lineTop[nextHeaderIndex];
-            int maxBottom = nextTop - 1 - bubbleGapY;
-            if (bottomY > maxBottom)
-                bottomY = maxBottom;
-        }
-
-        if (bottomY <= topY + 2)
-            continue;
-
-        if (bottomY < contentTop || topY > contentBottom - 1)
-            continue;
-
-        int maxLineW = 0;
-
-        for (size_t i = b.start; i <= b.end; ++i) {
-            int w = 0;
-            if (isHeader[i]) {
-                w = display->getStringWidth(cachedLines[i].c_str());
-                if (b.mine)
-                    w += 12; // room for ACK/NACK/relay mark
-            } else {
-                w = getRenderedLineWidth(display, cachedLines[i], emotes, numEmotes);
-            }
-            if (w > maxLineW)
-                maxLineW = w;
-        }
-
-        int bubbleW = std::max(BUBBLE_MIN_W, maxLineW + (BUBBLE_PAD_X * 2));
-        int bubbleH = (bottomY - topY) + 1;
-        int bubbleX = 0;
-        if (b.mine) {
-            bubbleX = rightEdge - bubbleW;
-        } else {
-            bubbleX = x;
-        }
-        if (bubbleX < x)
-            bubbleX = x;
-        if (bubbleX + bubbleW > rightEdge)
-            bubbleW = std::max(1, rightEdge - bubbleX);
-
-        if (bubbleW > 1 && bubbleH > 1) {
-            int r = BUBBLE_RADIUS;
-            int maxR = (std::min(bubbleW, bubbleH) / 2) - 1;
-            if (maxR < 0)
-                maxR = 0;
-            if (r > maxR)
-                r = maxR;
-
-            drawRoundedRectOutline(display, bubbleX, topY, bubbleW, bubbleH, r);
-            const int extra = 3;
-            const int rr = r + extra;
-            int x1 = bubbleX + bubbleW - 1;
-            int y1 = topY + bubbleH - 1;
-
-            if (!b.mine) {
-                // top-left corner square
-                display->drawLine(bubbleX, topY, bubbleX + rr, topY);
-                display->drawLine(bubbleX, topY, bubbleX, topY + rr);
-            } else {
-                // bottom-right corner square
-                display->drawLine(x1 - rr, y1, x1, y1);
-                display->drawLine(x1, y1 - rr, x1, y1);
-            }
-        }
-    }

    // Render visible lines
-    int lineY = yOffset;
    for (size_t i = 0; i < cachedLines.size(); ++i) {
+        int lineY = yOffset;
+        for (size_t j = 0; j < i; ++j)
+            lineY += cachedHeights[j];

        if (lineY > -cachedHeights[i] && lineY < scrollBottom) {
            if (isHeader[i]) {
@@ -945,28 +728,14 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                int headerX;
                if (isMine[i]) {
                    // push header left to avoid overlap with scrollbar
-                    headerX = (SCREEN_WIDTH - SCROLLBAR_WIDTH - RIGHT_MARGIN) - w - BUBBLE_TEXT_INDENT;
+                    headerX = SCREEN_WIDTH - w - SCROLLBAR_WIDTH - RIGHT_MARGIN;
                    if (headerX < LEFT_MARGIN)
                        headerX = LEFT_MARGIN;
                } else {
-                    headerX = x + BUBBLE_PAD_X + BUBBLE_TEXT_INDENT;
+                    headerX = x;
                }
                display->drawString(headerX, lineY, cachedLines[i].c_str());

-                // Draw underline just under header text
-                int underlineY = lineY + FONT_HEIGHT_SMALL;
-
-                int underlineW = w;
-                int maxW = rightEdge - headerX;
-                if (maxW < 0)
-                    maxW = 0;
-                if (underlineW > maxW)
-                    underlineW = maxW;
-
-                for (int px = 0; px < underlineW; ++px) {
-                    display->setPixel(headerX + px, underlineY);
-                }
-
                // Draw ACK/NACK mark for our own messages
                if (isMine[i]) {
                    int markX = headerX - 10;
@@ -984,28 +753,32 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                    // AckStatus::NONE → show nothing
                }

+                // Draw underline just under header text
+                int underlineY = lineY + FONT_HEIGHT_SMALL;
+                for (int px = 0; px < w; ++px) {
+                    display->setPixel(headerX + px, underlineY);
+                }
            } else {
                // Render message line
                if (isMine[i]) {
                    // Calculate actual rendered width including emotes
                    int renderedWidth = getRenderedLineWidth(display, cachedLines[i], emotes, numEmotes);
-                    int rightX = (SCREEN_WIDTH - SCROLLBAR_WIDTH - RIGHT_MARGIN) - renderedWidth - BUBBLE_TEXT_INDENT;
+                    int rightX = SCREEN_WIDTH - renderedWidth - SCROLLBAR_WIDTH - RIGHT_MARGIN;
                    if (rightX < LEFT_MARGIN)
                        rightX = LEFT_MARGIN;

                    drawStringWithEmotes(display, rightX, lineY, cachedLines[i], emotes, numEmotes);
                } else {
-                    drawStringWithEmotes(display, x + BUBBLE_PAD_X + BUBBLE_TEXT_INDENT, lineY, cachedLines[i], emotes,
-                                         numEmotes);
+                    drawStringWithEmotes(display, x, lineY, cachedLines[i], emotes, numEmotes);
                }
            }
        }
-
-        lineY += cachedHeights[i];
    }
+    int totalContentHeight = totalHeight;
+    int visibleHeight = usableHeight;

    // Draw scrollbar
-    drawMessageScrollbar(display, usableHeight, totalHeight, finalScroll, getTextPositions(display)[1]);
+    drawMessageScrollbar(display, visibleHeight, totalContentHeight, finalScroll, getTextPositions(display)[1]);
    graphics::drawCommonHeader(display, x, y, titleStr);
    graphics::drawCommonFooter(display, x, y);
 }
@@ -1068,6 +841,7 @@ std::vector<int> calculateLineHeights(const std::vector<std::string> &lines, con
    constexpr int HEADER_UNDERLINE_GAP = 0; // space between underline and first body line
    constexpr int HEADER_UNDERLINE_PIX = 1; // underline thickness (1px row drawn)
    constexpr int BODY_LINE_LEADING = -4;   // default vertical leading for normal body lines
+    constexpr int MESSAGE_BLOCK_GAP = 4;    // gap after a message block before a new header
    constexpr int EMOTE_PADDING_ABOVE = 4;  // space above emote line (added to line above)
    constexpr int EMOTE_PADDING_BELOW = 3;  // space below emote line (added to emote line)

@@ -1077,7 +851,6 @@ std::vector<int> calculateLineHeights(const std::vector<std::string> &lines, con
    for (size_t idx = 0; idx < lines.size(); ++idx) {
        const auto &line = lines[idx];
        const int baseHeight = FONT_HEIGHT_SMALL;
-        int lineHeight = baseHeight;

        // Detect if THIS line or NEXT line contains an emote
        bool hasEmote = false;
@@ -1099,6 +872,8 @@ std::vector<int> calculateLineHeights(const std::vector<std::string> &lines, con
            }
        }

+        int lineHeight = baseHeight;
+
        if (isHeaderVec[idx]) {
            // Header line spacing
            lineHeight = baseHeight + HEADER_UNDERLINE_PIX + HEADER_UNDERLINE_GAP;
@@ -1147,7 +922,7 @@ void handleNewMessage(OLEDDisplay *display, const StoredMessage &sm, const mesht

        // Banner logic
        const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet.from);
-        char longName[48] = "?";
+        char longName[48] = "???";
        if (node && node->user.long_name) {
            strncpy(longName, node->user.long_name, sizeof(longName) - 1);
            longName[sizeof(longName) - 1] = '\0';
--- a/src/graphics/draw/NodeListRenderer.cpp
+++ b/src/graphics/draw/NodeListRenderer.cpp
@@ -176,7 +176,6 @@ int calculateMaxScroll(int totalEntries, int visibleRows)

 void drawColumnSeparator(OLEDDisplay *display, int16_t x, int16_t yStart, int16_t yEnd)
 {
-    x = (currentResolution == ScreenResolution::High) ? x - 2 : (currentResolution == ScreenResolution::Low) ? x - 1 : x;
    for (int y = yStart; y <= yEnd; y += 2) {
        display->setPixel(x, y);
    }
@@ -206,11 +205,9 @@ void drawScrollbar(OLEDDisplay *display, int visibleNodeRows, int totalEntries,
 void drawEntryLastHeard(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16_t x, int16_t y, int columnWidth)
 {
    bool isLeftCol = (x < SCREEN_WIDTH / 2);
-    int nameMaxWidth = columnWidth - 25;
    int timeOffset = (currentResolution == ScreenResolution::High) ? (isLeftCol ? 7 : 10) : (isLeftCol ? 3 : 7);

    const char *nodeName = getSafeNodeName(display, node, columnWidth);
-    bool isMuted = (node->bitfield & NODEINFO_BITFIELD_IS_MUTED_MASK) != 0;

    char timeStr[10];
    uint32_t seconds = sinceLastSeen(node);
@@ -237,13 +234,6 @@ void drawEntryLastHeard(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int
            display->drawXbm(x, y + 5, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint);
        }
    }
-    if (node->is_ignored || isMuted) {
-        if (currentResolution == ScreenResolution::High) {
-            display->drawLine(x + 8, y + 8, (isLeftCol ? 0 : x - 4) + nameMaxWidth - 17, y + 8);
-        } else {
-            display->drawLine(x + 4, y + 6, (isLeftCol ? 0 : x - 3) + nameMaxWidth - 4, y + 6);
-        }
-    }

    int rightEdge = x + columnWidth - timeOffset;
    if (timeStr[strlen(timeStr) - 1] == 'm') // Fix the fact that our fonts don't line up well all the time
@@ -263,7 +253,6 @@ void drawEntryHopSignal(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int
    int barsXOffset = columnWidth - barsOffset;

    const char *nodeName = getSafeNodeName(display, node, columnWidth);
-    bool isMuted = (node->bitfield & NODEINFO_BITFIELD_IS_MUTED_MASK) != 0;

    display->setTextAlignment(TEXT_ALIGN_LEFT);
    display->setFont(FONT_SMALL);
@@ -276,13 +265,6 @@ void drawEntryHopSignal(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int
            display->drawXbm(x, y + 5, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint);
        }
    }
-    if (node->is_ignored || isMuted) {
-        if (currentResolution == ScreenResolution::High) {
-            display->drawLine(x + 8, y + 8, (isLeftCol ? 0 : x - 4) + nameMaxWidth - 17, y + 8);
-        } else {
-            display->drawLine(x + 4, y + 6, (isLeftCol ? 0 : x - 3) + nameMaxWidth - 4, y + 6);
-        }
-    }

    // Draw signal strength bars
    int bars = (node->snr > 5) ? 4 : (node->snr > 0) ? 3 : (node->snr > -5) ? 2 : (node->snr > -10) ? 1 : 0;
@@ -316,7 +298,6 @@ void drawNodeDistance(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
        columnWidth - ((currentResolution == ScreenResolution::High) ? (isLeftCol ? 25 : 28) : (isLeftCol ? 20 : 22));

    const char *nodeName = getSafeNodeName(display, node, columnWidth);
-    bool isMuted = (node->bitfield & NODEINFO_BITFIELD_IS_MUTED_MASK) != 0;
    char distStr[10] = "";

    meshtastic_NodeInfoLite *ourNode = nodeDB->getMeshNode(nodeDB->getNodeNum());
@@ -377,13 +358,6 @@ void drawNodeDistance(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
            display->drawXbm(x, y + 5, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint);
        }
    }
-    if (node->is_ignored || isMuted) {
-        if (currentResolution == ScreenResolution::High) {
-            display->drawLine(x + 8, y + 8, (isLeftCol ? 0 : x - 4) + nameMaxWidth - 17, y + 8);
-        } else {
-            display->drawLine(x + 4, y + 6, (isLeftCol ? 0 : x - 3) + nameMaxWidth - 4, y + 6);
-        }
-    }

    if (strlen(distStr) > 0) {
        int offset = (currentResolution == ScreenResolution::High)
@@ -418,7 +392,6 @@ void drawEntryCompass(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
        columnWidth - ((currentResolution == ScreenResolution::High) ? (isLeftCol ? 25 : 28) : (isLeftCol ? 20 : 22));

    const char *nodeName = getSafeNodeName(display, node, columnWidth);
-    bool isMuted = (node->bitfield & NODEINFO_BITFIELD_IS_MUTED_MASK) != 0;

    display->setTextAlignment(TEXT_ALIGN_LEFT);
    display->setFont(FONT_SMALL);
@@ -430,13 +403,6 @@ void drawEntryCompass(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
            display->drawXbm(x, y + 5, smallbulletpoint_width, smallbulletpoint_height, smallbulletpoint);
        }
    }
-    if (node->is_ignored || isMuted) {
-        if (currentResolution == ScreenResolution::High) {
-            display->drawLine(x + 8, y + 8, (isLeftCol ? 0 : x - 4) + nameMaxWidth - 17, y + 8);
-        } else {
-            display->drawLine(x + 4, y + 6, (isLeftCol ? 0 : x - 3) + nameMaxWidth - 4, y + 6);
-        }
-    }
 }

 void drawCompassArrow(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16_t x, int16_t y, int columnWidth, float myHeading,
--- a/src/input/RotaryEncoderInterruptBase.cpp
+++ b/src/input/RotaryEncoderInterruptBase.cpp
@@ -93,8 +93,6 @@ int32_t RotaryEncoderInterruptBase::runOnce()

    if (!pressDetected) {
        this->action = ROTARY_ACTION_NONE;
-    } else if (now - pressStartTime < LONG_PRESS_DURATION) {
-        return (20); // keep checking for long/short until time expires
    }

    return INT32_MAX;
--- a/src/input/TrackballInterruptBase.cpp
+++ b/src/input/TrackballInterruptBase.cpp
@@ -1,7 +1,5 @@
 #include "TrackballInterruptBase.h"
-#include "Throttle.h"
 #include "configuration.h"
-
 extern bool osk_found;

 TrackballInterruptBase::TrackballInterruptBase(const char *name) : concurrency::OSThread(name), _originName(name) {}
@@ -57,27 +55,17 @@ int32_t TrackballInterruptBase::runOnce()
 {
    InputEvent e = {};
    e.inputEvent = INPUT_BROKER_NONE;
-#if TB_THRESHOLD
-    if (lastInterruptTime && !Throttle::isWithinTimespanMs(lastInterruptTime, 1000)) {
-        left_counter = 0;
-        right_counter = 0;
-        up_counter = 0;
-        down_counter = 0;
-        lastInterruptTime = 0;
-    }
-#ifdef INPUT_DEBUG
-    if (left_counter > 0 || right_counter > 0 || up_counter > 0 || down_counter > 0) {
-        LOG_DEBUG("L %u R %u U %u D %u, time %u", left_counter, right_counter, up_counter, down_counter, millis());
-    }
-#endif
-#endif

    // Handle long press detection for press button
    if (pressDetected && pressStartTime > 0) {
        uint32_t pressDuration = millis() - pressStartTime;
        bool buttonStillPressed = false;

+#if defined(T_DECK)
+        buttonStillPressed = (this->action == TB_ACTION_PRESSED);
+#else
        buttonStillPressed = !digitalRead(_pinPress);
+#endif

        if (!buttonStillPressed) {
            // Button released
@@ -146,31 +134,23 @@ int32_t TrackballInterruptBase::runOnce()
        }
    }

-#if TB_THRESHOLD
-    if (this->action == TB_ACTION_PRESSED && (!pressDetected || pressStartTime == 0)) {
+#if defined(T_DECK) // T-deck gets a super-simple debounce on trackball
+    if (this->action == TB_ACTION_PRESSED && !pressDetected) {
        // Start long press detection
        pressDetected = true;
        pressStartTime = millis();
        // Don't send event yet, wait to see if it's a long press
-    } else if (up_counter >= TB_THRESHOLD) {
-#ifdef INPUT_DEBUG
-        LOG_DEBUG("Trackball event UP %u", millis());
-#endif
+    } else if (this->action == TB_ACTION_UP && lastEvent == TB_ACTION_UP) {
+        // LOG_DEBUG("Trackball event UP");
        e.inputEvent = this->_eventUp;
-    } else if (down_counter >= TB_THRESHOLD) {
-#ifdef INPUT_DEBUG
-        LOG_DEBUG("Trackball event DOWN %u", millis());
-#endif
+    } else if (this->action == TB_ACTION_DOWN && lastEvent == TB_ACTION_DOWN) {
+        // LOG_DEBUG("Trackball event DOWN");
        e.inputEvent = this->_eventDown;
-    } else if (left_counter >= TB_THRESHOLD) {
-#ifdef INPUT_DEBUG
-        LOG_DEBUG("Trackball event LEFT %u", millis());
-#endif
+    } else if (this->action == TB_ACTION_LEFT && lastEvent == TB_ACTION_LEFT) {
+        // LOG_DEBUG("Trackball event LEFT");
        e.inputEvent = this->_eventLeft;
-    } else if (right_counter >= TB_THRESHOLD) {
-#ifdef INPUT_DEBUG
-        LOG_DEBUG("Trackball event RIGHT %u", millis());
-#endif
+    } else if (this->action == TB_ACTION_RIGHT && lastEvent == TB_ACTION_RIGHT) {
+        // LOG_DEBUG("Trackball event RIGHT");
        e.inputEvent = this->_eventRight;
    }
 #else
@@ -203,12 +183,6 @@ int32_t TrackballInterruptBase::runOnce()
        e.source = this->_originName;
        e.kbchar = 0x00;
        this->notifyObservers(&e);
-#if TB_THRESHOLD
-        left_counter = 0;
-        right_counter = 0;
-        up_counter = 0;
-        down_counter = 0;
-#endif
    }

    // Only update lastEvent for non-press actions or completed press actions
@@ -224,49 +198,25 @@ int32_t TrackballInterruptBase::runOnce()

 void TrackballInterruptBase::intPressHandler()
 {
-    if (!Throttle::isWithinTimespanMs(lastInterruptTime, 10))
-        this->action = TB_ACTION_PRESSED;
-    lastInterruptTime = millis();
+    this->action = TB_ACTION_PRESSED;
 }

 void TrackballInterruptBase::intDownHandler()
 {
-    if (TB_THRESHOLD || !Throttle::isWithinTimespanMs(lastInterruptTime, 10))
-        this->action = TB_ACTION_DOWN;
-    lastInterruptTime = millis();
-
-#if TB_THRESHOLD
-    down_counter++;
-#endif
+    this->action = TB_ACTION_DOWN;
 }

 void TrackballInterruptBase::intUpHandler()
 {
-    if (TB_THRESHOLD || !Throttle::isWithinTimespanMs(lastInterruptTime, 10))
-        this->action = TB_ACTION_UP;
-    lastInterruptTime = millis();
-
-#if TB_THRESHOLD
-    up_counter++;
-#endif
+    this->action = TB_ACTION_UP;
 }

 void TrackballInterruptBase::intLeftHandler()
 {
-    if (TB_THRESHOLD || !Throttle::isWithinTimespanMs(lastInterruptTime, 10))
-        this->action = TB_ACTION_LEFT;
-    lastInterruptTime = millis();
-#if TB_THRESHOLD
-    left_counter++;
-#endif
+    this->action = TB_ACTION_LEFT;
 }

 void TrackballInterruptBase::intRightHandler()
 {
-    if (TB_THRESHOLD || !Throttle::isWithinTimespanMs(lastInterruptTime, 10))
-        this->action = TB_ACTION_RIGHT;
-    lastInterruptTime = millis();
-#if TB_THRESHOLD
-    right_counter++;
-#endif
+    this->action = TB_ACTION_RIGHT;
 }
--- a/src/input/TrackballInterruptBase.h
+++ b/src/input/TrackballInterruptBase.h
@@ -12,10 +12,6 @@
 #endif
 #endif

-#ifndef TB_THRESHOLD
-#define TB_THRESHOLD 0
-#endif
-
 class TrackballInterruptBase : public Observable<const InputEvent *>, public concurrency::OSThread
 {
  public:
@@ -29,6 +25,8 @@ class TrackballInterruptBase : public Observable<const InputEvent *>, public con
    void intUpHandler();
    void intLeftHandler();
    void intRightHandler();
+    uint32_t lastTime = 0;
+
    virtual int32_t runOnce() override;

  protected:
@@ -69,12 +67,4 @@ class TrackballInterruptBase : public Observable<const InputEvent *>, public con
    input_broker_event _eventPressedLong = INPUT_BROKER_NONE;
    const char *_originName;
    TrackballInterruptBaseActionType lastEvent = TB_ACTION_NONE;
-    volatile uint32_t lastInterruptTime = 0;
-
-#if TB_THRESHOLD
-    volatile uint8_t left_counter = 0;
-    volatile uint8_t right_counter = 0;
-    volatile uint8_t up_counter = 0;
-    volatile uint8_t down_counter = 0;
-#endif
 };
--- a/src/input/TrackballInterruptImpl1.cpp
+++ b/src/input/TrackballInterruptImpl1.cpp
@@ -24,26 +24,41 @@ void TrackballInterruptImpl1::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinLe

 void TrackballInterruptImpl1::handleIntDown()
 {
-    trackballInterruptImpl1->intDownHandler();
-    trackballInterruptImpl1->setIntervalFromNow(20);
+    if (TB_DIRECTION == RISING || millis() > trackballInterruptImpl1->lastTime + 10) {
+        trackballInterruptImpl1->lastTime = millis();
+        trackballInterruptImpl1->intDownHandler();
+        trackballInterruptImpl1->setIntervalFromNow(20);
+    }
 }
 void TrackballInterruptImpl1::handleIntUp()
 {
-    trackballInterruptImpl1->intUpHandler();
-    trackballInterruptImpl1->setIntervalFromNow(20);
+    if (TB_DIRECTION == RISING || millis() > trackballInterruptImpl1->lastTime + 10) {
+        trackballInterruptImpl1->lastTime = millis();
+        trackballInterruptImpl1->intUpHandler();
+        trackballInterruptImpl1->setIntervalFromNow(20);
+    }
 }
 void TrackballInterruptImpl1::handleIntLeft()
 {
-    trackballInterruptImpl1->intLeftHandler();
-    trackballInterruptImpl1->setIntervalFromNow(20);
+    if (TB_DIRECTION == RISING || millis() > trackballInterruptImpl1->lastTime + 10) {
+        trackballInterruptImpl1->lastTime = millis();
+        trackballInterruptImpl1->intLeftHandler();
+        trackballInterruptImpl1->setIntervalFromNow(20);
+    }
 }
 void TrackballInterruptImpl1::handleIntRight()
 {
-    trackballInterruptImpl1->intRightHandler();
-    trackballInterruptImpl1->setIntervalFromNow(20);
+    if (TB_DIRECTION == RISING || millis() > trackballInterruptImpl1->lastTime + 10) {
+        trackballInterruptImpl1->lastTime = millis();
+        trackballInterruptImpl1->intRightHandler();
+        trackballInterruptImpl1->setIntervalFromNow(20);
+    }
 }
 void TrackballInterruptImpl1::handleIntPressed()
 {
-    trackballInterruptImpl1->intPressHandler();
-    trackballInterruptImpl1->setIntervalFromNow(20);
+    if (TB_DIRECTION == RISING || millis() > trackballInterruptImpl1->lastTime + 10) {
+        trackballInterruptImpl1->lastTime = millis();
+        trackballInterruptImpl1->intPressHandler();
+        trackballInterruptImpl1->setIntervalFromNow(20);
+    }
 }
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,7 +10,6 @@
 #include "ReliableRouter.h"
 #include "airtime.h"
 #include "buzz.h"
-#include "power/PowerHAL.h"

 #include "FSCommon.h"
 #include "Led.h"
@@ -39,8 +38,9 @@
 #include "target_specific.h"
 #include <memory>
 #include <utility>
-#if HAS_SCREEN
-#include "MessageStore.h"
+
+#ifdef ELECROW_ThinkNode_M5
+PCA9557 io(0x18, &Wire);
 #endif

 #ifdef ARCH_ESP32
@@ -73,53 +73,35 @@ NRF52Bluetooth *nrf52Bluetooth = nullptr;
 #include "mqtt/MQTT.h"
 #endif

+#include "LLCC68Interface.h"
+#include "LR1110Interface.h"
+#include "LR1120Interface.h"
+#include "LR1121Interface.h"
+#include "RF95Interface.h"
+#include "SX1262Interface.h"
+#include "SX1268Interface.h"
+#include "SX1280Interface.h"
+#include "detect/LoRaRadioType.h"
+
+#ifdef ARCH_STM32WL
+#include "STM32WLE5JCInterface.h"
+#endif
+
+#if defined(ARCH_PORTDUINO)
+#include "platform/portduino/SimRadio.h"
+#endif
+
 #ifdef ARCH_PORTDUINO
 #include "linux/LinuxHardwareI2C.h"
 #include "mesh/raspihttp/PiWebServer.h"
 #include "platform/portduino/PortduinoGlue.h"
+#include "platform/portduino/USBHal.h"
 #include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <string>
 #endif

-#ifdef ARCH_ESP32
-#ifdef DEBUG_PARTITION_TABLE
-#include "esp_partition.h"
-
-void printPartitionTable()
-{
-    printf("\n--- Partition Table ---\n");
-    // Print Column Headers
-    printf("| %-16s | %-4s | %-7s | %-10s | %-10s |\n", "Label", "Type", "Subtype", "Offset", "Size");
-    printf("|------------------|------|---------|------------|------------|\n");
-
-    // Create an iterator to find ALL partitions (Type ANY, Subtype ANY)
-    esp_partition_iterator_t it = esp_partition_find(ESP_PARTITION_TYPE_ANY, ESP_PARTITION_SUBTYPE_ANY, NULL);
-
-    // Loop through the iterator
-    if (it != NULL) {
-        do {
-            const esp_partition_t *part = esp_partition_get(it);
-
-            // Print details: Label, Type (Hex), Subtype (Hex), Offset (Hex), Size (Hex)
-            printf("| %-16s | 0x%02x | 0x%02x    | 0x%08x | 0x%08x |\n", part->label, part->type, part->subtype, part->address,
-                   part->size);
-
-            // Move to next partition
-            it = esp_partition_next(it);
-        } while (it != NULL);
-
-        // Release the iterator memory
-        esp_partition_iterator_release(it);
-    } else {
-        printf("No partitions found.\n");
-    }
-    printf("-----------------------\n");
-}
-#endif // DEBUG_PARTITION_TABLE
-#endif // ARCH_ESP32
-
 #if HAS_BUTTON || defined(ARCH_PORTDUINO)
 #include "input/ButtonThread.h"

@@ -231,6 +213,9 @@ ScanI2C::DeviceAddress aqi_found = ScanI2C::ADDRESS_NONE;
 Adafruit_DRV2605 drv;
 #endif

+// Global LoRa radio type
+LoRaRadioType radioType = NO_RADIO;
+
 bool isVibrating = false;

 bool eink_found = true;
@@ -267,7 +252,6 @@ const char *getDeviceName()
    return name;
 }

-// TODO remove from main.cpp
 static int32_t ledBlinker()
 {
    // Still set up the blinking (heartbeat) interval but skip code path below, so LED will blink if
@@ -308,46 +292,6 @@ __attribute__((weak, noinline)) bool loopCanSleep()
 void lateInitVariant() __attribute__((weak));
 void lateInitVariant() {}

-void earlyInitVariant() __attribute__((weak));
-void earlyInitVariant() {}
-
-// NRF52 (and probably other platforms) can report when system is in power failure mode
-// (eg. too low battery voltage) and operating it is unsafe (data corruption, bootloops, etc).
-// For example NRF52 will prevent any flash writes in that case automatically
-// (but it causes issues we need to handle).
-// This detection is independent from whatever ADC or dividers used in Meshtastic
-// boards and is internal to chip.
-
-// we use powerHAL layer to get this info and delay booting until power level is safe
-
-// wait until power level is safe to continue booting (to avoid bootloops)
-// blink user led in 3 flashes sequence to indicate what is happening
-void waitUntilPowerLevelSafe()
-{
-
-#ifdef LED_PIN
-    pinMode(LED_PIN, OUTPUT);
-#endif
-
-    while (powerHAL_isPowerLevelSafe() == false) {
-
-#ifdef LED_PIN
-
-        // 3x: blink for 300 ms, pause for 300 ms
-
-        for (int i = 0; i < 3; i++) {
-            digitalWrite(LED_PIN, LED_STATE_ON);
-            delay(300);
-            digitalWrite(LED_PIN, LED_STATE_OFF);
-            delay(300);
-        }
-#endif
-
-        // sleep for 2s
-        delay(2000);
-    }
-}
-
 /**
 * Print info as a structured log message (for automated log processing)
 */
@@ -358,22 +302,26 @@ void printInfo()
 #ifndef PIO_UNIT_TESTING
 void setup()
 {
-
-    // initialize power HAL layer as early as possible
-    powerHAL_init();
-
-    // prevent booting if device is in power failure mode
-    // boot sequence will follow when battery level raises to safe mode
-    waitUntilPowerLevelSafe();
-
-    // Defined in variant.cpp for early init code
-    earlyInitVariant();
+#if defined(R1_NEO)
+    pinMode(DCDC_EN_HOLD, OUTPUT);
+    digitalWrite(DCDC_EN_HOLD, HIGH);
+    pinMode(NRF_ON, OUTPUT);
+    digitalWrite(NRF_ON, HIGH);
+#endif

 #if defined(PIN_POWER_EN)
    pinMode(PIN_POWER_EN, OUTPUT);
    digitalWrite(PIN_POWER_EN, HIGH);
 #endif

+#if defined(ELECROW_ThinkNode_M5)
+    Wire.begin(48, 47);
+    io.pinMode(PCA_PIN_EINK_EN, OUTPUT);
+    io.pinMode(PCA_PIN_POWER_EN, OUTPUT);
+    io.digitalWrite(PCA_PIN_POWER_EN, HIGH);
+    // io.pinMode(C2_PIN, OUTPUT);
+#endif
+
 #ifdef LED_POWER
    pinMode(LED_POWER, OUTPUT);
    digitalWrite(LED_POWER, LED_STATE_ON);
@@ -398,7 +346,68 @@ void setup()
 #endif
 #endif

+#if defined(T_DECK)
+    // GPIO10 manages all peripheral power supplies
+    // Turn on peripheral power immediately after MUC starts.
+    // If some boards are turned on late, ESP32 will reset due to low voltage.
+    // ESP32-C3(Keyboard) , MAX98357A(Audio Power Amplifier) ,
+    // TF Card , Display backlight(AW9364DNR) , AN48841B(Trackball) , ES7210(Decoder)
+    pinMode(KB_POWERON, OUTPUT);
+    digitalWrite(KB_POWERON, HIGH);
+    // T-Deck has all three SPI peripherals (TFT, SD, LoRa) attached to the same SPI bus
+    // We need to initialize all CS pins in advance otherwise there will be SPI communication issues
+    // e.g. when detecting the SD card
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(TFT_CS, OUTPUT);
+    digitalWrite(TFT_CS, HIGH);
+    delay(100);
+#elif defined(T_DECK_PRO)
+    pinMode(LORA_EN, OUTPUT);
+    digitalWrite(LORA_EN, HIGH);
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(PIN_EINK_CS, OUTPUT);
+    digitalWrite(PIN_EINK_CS, HIGH);
+#elif defined(T_LORA_PAGER)
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(TFT_CS, OUTPUT);
+    digitalWrite(TFT_CS, HIGH);
+    pinMode(KB_INT, INPUT_PULLUP);
+    // io expander
+    io.begin(Wire, XL9555_SLAVE_ADDRESS0, SDA, SCL);
+    io.pinMode(EXPANDS_DRV_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_DRV_EN, HIGH);
+    io.pinMode(EXPANDS_AMP_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_AMP_EN, LOW);
+    io.pinMode(EXPANDS_LORA_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_LORA_EN, HIGH);
+    io.pinMode(EXPANDS_GPS_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_GPS_EN, HIGH);
+    io.pinMode(EXPANDS_KB_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_KB_EN, HIGH);
+    io.pinMode(EXPANDS_SD_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_SD_EN, HIGH);
+    io.pinMode(EXPANDS_GPIO_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_GPIO_EN, HIGH);
+    io.pinMode(EXPANDS_SD_PULLEN, INPUT);
+#elif defined(HACKADAY_COMMUNICATOR)
+    pinMode(KB_INT, INPUT);
+#endif
+
    concurrency::hasBeenSetup = true;
+#if ARCH_PORTDUINO
+    SPISettings spiSettings(portduino_config.spiSpeed, MSBFIRST, SPI_MODE0);
+#else
+    SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
+#endif

    meshtastic_Config_DisplayConfig_OledType screen_model =
        meshtastic_Config_DisplayConfig_OledType::meshtastic_Config_DisplayConfig_OledType_OLED_AUTO;
@@ -537,7 +546,6 @@ void setup()

    OSThread::setup();

-    // TODO make this ifdef based on defined pins and move from main.cpp
 #if defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
    // The ThinkNodes have their own blink logic
    // ledPeriodic = new Periodic("Blink", elecrowLedBlinker);
@@ -563,7 +571,6 @@ void setup()
    Wire.setSCL(I2C_SCL);
    Wire.begin();
 #elif defined(I2C_SDA) && !defined(ARCH_RP2040)
-    LOG_INFO("Starting Bus with (SDA) %d and (SCL) %d: ", I2C_SDA, I2C_SCL);
    Wire.begin(I2C_SDA, I2C_SCL);
 #elif defined(ARCH_PORTDUINO)
    if (portduino_config.i2cdev != "") {
@@ -637,11 +644,7 @@ void setup()
        sensor_detected = true;
 #endif
    }
-#ifdef ARCH_ESP32
-#ifdef DEBUG_PARTITION_TABLE
-    printPartitionTable();
-#endif
-#endif // ARCH_ESP32
+
 #ifdef ARCH_ESP32
    // Don't init display if we don't have one or we are waking headless due to a timer event
    if (wakeCause == ESP_SLEEP_WAKEUP_TIMER) {
@@ -752,12 +755,11 @@ void setup()
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::INA219, meshtastic_TelemetrySensorType_INA219);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::INA3221, meshtastic_TelemetrySensorType_INA3221);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::MAX17048, meshtastic_TelemetrySensorType_MAX17048);
-    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::QMC6310U, meshtastic_TelemetrySensorType_QMC6310);
-    // TODO: Types need to be added meshtastic_TelemetrySensorType_QMC6310N
-    //  scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::QMC6310N, meshtastic_TelemetrySensorType_QMC6310N);
+    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::QMC6310, meshtastic_TelemetrySensorType_QMC6310);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::QMI8658, meshtastic_TelemetrySensorType_QMI8658);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::QMC5883L, meshtastic_TelemetrySensorType_QMC5883L);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::HMC5883L, meshtastic_TelemetrySensorType_QMC5883L);
+    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::PMSA0031, meshtastic_TelemetrySensorType_PMSA003I);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::MLX90614, meshtastic_TelemetrySensorType_MLX90614);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::ICM20948, meshtastic_TelemetrySensorType_ICM20948);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::MAX30102, meshtastic_TelemetrySensorType_MAX30102);
@@ -915,7 +917,6 @@ void setup()
    }
 #endif // HAS_SCREEN

-    // TODO Remove magic string
    // setup TZ prior to time actions.
 #if !MESHTASTIC_EXCLUDE_TZ
    LOG_DEBUG("Use compiled/slipstreamed %s", slipstreamTZString); // important, removing this clobbers our magic string
@@ -1211,7 +1212,252 @@ void setup()
 #endif
 #endif

-    initLoRa();
+#ifdef ARCH_PORTDUINO
+    // as one can't use a function pointer to the class constructor:
+    auto loraModuleInterface = [](LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                                  RADIOLIB_PIN_TYPE busy) {
+        switch (portduino_config.lora_module) {
+        case use_rf95:
+            return (RadioInterface *)new RF95Interface(hal, cs, irq, rst, busy);
+        case use_sx1262:
+            return (RadioInterface *)new SX1262Interface(hal, cs, irq, rst, busy);
+        case use_sx1268:
+            return (RadioInterface *)new SX1268Interface(hal, cs, irq, rst, busy);
+        case use_sx1280:
+            return (RadioInterface *)new SX1280Interface(hal, cs, irq, rst, busy);
+        case use_lr1110:
+            return (RadioInterface *)new LR1110Interface(hal, cs, irq, rst, busy);
+        case use_lr1120:
+            return (RadioInterface *)new LR1120Interface(hal, cs, irq, rst, busy);
+        case use_lr1121:
+            return (RadioInterface *)new LR1121Interface(hal, cs, irq, rst, busy);
+        case use_llcc68:
+            return (RadioInterface *)new LLCC68Interface(hal, cs, irq, rst, busy);
+        case use_simradio:
+            return (RadioInterface *)new SimRadio;
+        default:
+            assert(0); // shouldn't happen
+            return (RadioInterface *)nullptr;
+        }
+    };
+
+    LOG_DEBUG("Activate %s radio on SPI port %s", portduino_config.loraModules[portduino_config.lora_module].c_str(),
+              portduino_config.lora_spi_dev.c_str());
+    if (portduino_config.lora_spi_dev == "ch341") {
+        RadioLibHAL = ch341Hal;
+    } else {
+        RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
+    }
+    rIf =
+        loraModuleInterface((LockingArduinoHal *)RadioLibHAL, portduino_config.lora_cs_pin.pin, portduino_config.lora_irq_pin.pin,
+                            portduino_config.lora_reset_pin.pin, portduino_config.lora_busy_pin.pin);
+
+    if (!rIf->init()) {
+        LOG_WARN("No %s radio", portduino_config.loraModules[portduino_config.lora_module].c_str());
+        delete rIf;
+        rIf = NULL;
+        exit(EXIT_FAILURE);
+    } else {
+        LOG_INFO("%s init success", portduino_config.loraModules[portduino_config.lora_module].c_str());
+    }
+
+#elif defined(HW_SPI1_DEVICE)
+    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI1, spiSettings);
+#else // HW_SPI1_DEVICE
+    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
+#endif
+
+    // radio init MUST BE AFTER service.init, so we have our radio config settings (from nodedb init)
+#if defined(USE_STM32WLx)
+    if (!rIf) {
+        rIf = new STM32WLE5JCInterface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        if (!rIf->init()) {
+            LOG_WARN("No STM32WL radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("STM32WL init success");
+            radioType = STM32WLx_RADIO;
+        }
+    }
+#endif
+
+#if defined(RF95_IRQ) && RADIOLIB_EXCLUDE_SX127X != 1
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        rIf = new RF95Interface(RadioLibHAL, LORA_CS, RF95_IRQ, RF95_RESET, RF95_DIO1);
+        if (!rIf->init()) {
+            LOG_WARN("No RF95 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("RF95 init success");
+            radioType = RF95_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && !defined(TCXO_OPTIONAL) && RADIOLIB_EXCLUDE_SX126X != 1
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        auto *sxIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+#ifdef SX126X_DIO3_TCXO_VOLTAGE
+        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
+#endif
+        if (!sxIf->init()) {
+            LOG_WARN("No SX1262 radio");
+            delete sxIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1262 init success");
+            rIf = sxIf;
+            radioType = SX1262_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && defined(TCXO_OPTIONAL)
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        // try using the specified TCXO voltage
+        auto *sxIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
+        if (!sxIf->init()) {
+            LOG_WARN("No SX1262 radio with TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
+            delete sxIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1262 init success, TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
+            rIf = sxIf;
+            radioType = SX1262_RADIO;
+        }
+    }
+
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        // If specified TCXO voltage fails, attempt to use DIO3 as a reference instead
+        rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        if (!rIf->init()) {
+            LOG_WARN("No SX1262 radio with XTAL, Vref 0.0V");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1262 init success, XTAL, Vref 0.0V");
+            radioType = SX1262_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_SX1268)
+#if defined(SX126X_DIO3_TCXO_VOLTAGE) && defined(TCXO_OPTIONAL)
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        // try using the specified TCXO voltage
+        auto *sxIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
+        if (!sxIf->init()) {
+            LOG_WARN("No SX1268 radio with TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
+            delete sxIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1268 init success, TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
+            rIf = sxIf;
+            radioType = SX1268_RADIO;
+        }
+    }
+#endif
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        rIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        if (!rIf->init()) {
+            LOG_WARN("No SX1268 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1268 init success");
+            radioType = SX1268_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_LLCC68)
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        rIf = new LLCC68Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        if (!rIf->init()) {
+            LOG_WARN("No LLCC68 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("LLCC68 init success");
+            radioType = LLCC68_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_LR1110) && RADIOLIB_EXCLUDE_LR11X0 != 1
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        rIf = new LR1110Interface(RadioLibHAL, LR1110_SPI_NSS_PIN, LR1110_IRQ_PIN, LR1110_NRESET_PIN, LR1110_BUSY_PIN);
+        if (!rIf->init()) {
+            LOG_WARN("No LR1110 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("LR1110 init success");
+            radioType = LR1110_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_LR1120) && RADIOLIB_EXCLUDE_LR11X0 != 1
+    if (!rIf) {
+        rIf = new LR1120Interface(RadioLibHAL, LR1120_SPI_NSS_PIN, LR1120_IRQ_PIN, LR1120_NRESET_PIN, LR1120_BUSY_PIN);
+        if (!rIf->init()) {
+            LOG_WARN("No LR1120 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("LR1120 init success");
+            radioType = LR1120_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_LR1121) && RADIOLIB_EXCLUDE_LR11X0 != 1
+    if (!rIf) {
+        rIf = new LR1121Interface(RadioLibHAL, LR1121_SPI_NSS_PIN, LR1121_IRQ_PIN, LR1121_NRESET_PIN, LR1121_BUSY_PIN);
+        if (!rIf->init()) {
+            LOG_WARN("No LR1121 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("LR1121 init success");
+            radioType = LR1121_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_SX1280) && RADIOLIB_EXCLUDE_SX128X != 1
+    if (!rIf) {
+        rIf = new SX1280Interface(RadioLibHAL, SX128X_CS, SX128X_DIO1, SX128X_RESET, SX128X_BUSY);
+        if (!rIf->init()) {
+            LOG_WARN("No SX1280 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1280 init success");
+            radioType = SX1280_RADIO;
+        }
+    }
+#endif
+
+    // check if the radio chip matches the selected region
+    if ((config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) && rIf && (!rIf->wideLora())) {
+        LOG_WARN("LoRa chip does not support 2.4GHz. Revert to unset");
+        config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
+        nodeDB->saveToDisk(SEGMENT_CONFIG);
+
+        if (!rIf->reconfigure()) {
+            LOG_WARN("Reconfigure failed, rebooting");
+            if (screen) {
+                screen->showSimpleBanner("Rebooting...");
+            }
+            rebootAtMsec = millis() + 5000;
+        }
+    }

    lateInitVariant(); // Do board specific init (see extra_variants/README.md for documentation)

@@ -1292,15 +1538,13 @@ void setup()
 }

 #endif
-uint32_t rebootAtMsec;     // If not zero we will reboot at this time (used to reboot shortly after the update completes)
-uint32_t shutdownAtMsec;   // If not zero we will shutdown at this time (used to shutdown from python or mobile client)
-bool suppressRebootBanner; // If true, suppress "Rebooting..." overlay (used for OTA handoff)
+uint32_t rebootAtMsec;   // If not zero we will reboot at this time (used to reboot shortly after the update completes)
+uint32_t shutdownAtMsec; // If not zero we will shutdown at this time (used to shutdown from python or mobile client)

 // 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.
 bool runASAP;

-// TODO find better home than main.cpp
 extern meshtastic_DeviceMetadata getDeviceMetadata()
 {
    meshtastic_DeviceMetadata deviceMetadata;
@@ -1401,49 +1645,13 @@ void loop()
    if (inputBroker)
        inputBroker->processInputEventQueue();
 #endif
-#if ARCH_PORTDUINO
-    if (portduino_config.lora_spi_dev == "ch341" && ch341Hal != nullptr) {
-        ch341Hal->checkError();
-    }
-    if (portduino_status.LoRa_in_error && rebootAtMsec == 0) {
-        LOG_ERROR("LoRa in error detected, attempting to recover");
-        if (portduino_config.lora_spi_dev == "ch341") {
-            if (ch341Hal != nullptr) {
-                delete ch341Hal;
-                ch341Hal = nullptr;
-                sleep(3);
-            }
-            try {
-                ch341Hal = new Ch341Hal(0, portduino_config.lora_usb_serial_num, portduino_config.lora_usb_vid,
-                                        portduino_config.lora_usb_pid);
-            } catch (std::exception &e) {
-                std::cerr << e.what() << std::endl;
-                std::cerr << "Could not initialize CH341 device!" << std::endl;
-                exit(EXIT_FAILURE);
-            }
-        }
-        if (initLoRa()) {
-            router->addInterface(rIf);
-            portduino_status.LoRa_in_error = false;
-        } else {
-            LOG_WARN("Reconfigure failed, rebooting");
-            if (screen) {
-                screen->showSimpleBanner("Rebooting...");
-            }
-            rebootAtMsec = millis() + 25;
-        }
-    }
-#if HAS_TFT
+#if ARCH_PORTDUINO && HAS_TFT
    if (screen && portduino_config.displayPanel == x11 &&
        config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
        auto dispdev = screen->getDisplayDevice();
        if (dispdev)
            static_cast<TFTDisplay *>(dispdev)->sdlLoop();
    }
-#endif
-#endif
-#if HAS_SCREEN && ENABLE_MESSAGE_PERSISTENCE
-    messageStoreAutosaveTick();
 #endif
    long delayMsec = mainController.runOrDelay();

--- a/src/main.h
+++ b/src/main.h
@@ -26,8 +26,8 @@ extern NRF52Bluetooth *nrf52Bluetooth;
 #if ARCH_PORTDUINO
 extern HardwareSPI *DisplaySPI;
 extern HardwareSPI *LoraSPI;
-#endif

+#endif
 extern ScanI2C::DeviceAddress screen_found;
 extern ScanI2C::DeviceAddress cardkb_found;
 extern uint8_t kb_model;
@@ -47,16 +47,16 @@ extern bool isUSBPowered;
 extern Adafruit_DRV2605 drv;
 #endif

-#ifdef HAS_PCA9557
-#include <PCA9557.h>
-extern PCA9557 io;
-#endif
-
 #ifdef HAS_I2S
 #include "AudioThread.h"
 extern AudioThread *audioThread;
 #endif

+#ifdef ELECROW_ThinkNode_M5
+#include <PCA9557.h>
+extern PCA9557 io;
+#endif
+
 #ifdef HAS_UDP_MULTICAST
 #include "mesh/udp/UdpMulticastHandler.h"
 extern UdpMulticastHandler *udpHandler;
@@ -81,7 +81,6 @@ extern uint32_t timeLastPowered;

 extern uint32_t rebootAtMsec;
 extern uint32_t shutdownAtMsec;
-extern bool suppressRebootBanner;

 extern uint32_t serialSinceMsec;

--- a/src/mesh/CryptoEngine.cpp
+++ b/src/mesh/CryptoEngine.cpp
@@ -61,6 +61,11 @@ bool CryptoEngine::regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey)
    return true;
 }
 #endif
+void CryptoEngine::clearKeys()
+{
+    memset(public_key, 0, sizeof(public_key));
+    memset(private_key, 0, sizeof(private_key));
+}

 /**
 * Encrypt a packet's payload using a key generated with Curve25519 and SHA256
--- a/src/mesh/CryptoEngine.h
+++ b/src/mesh/CryptoEngine.h
@@ -37,6 +37,7 @@ class CryptoEngine
    virtual bool regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey);

 #endif
+    void clearKeys();
    void setDHPrivateKey(uint8_t *_private_key);
    virtual bool encryptCurve25519(uint32_t toNode, uint32_t fromNode, meshtastic_UserLite_public_key_t remotePublic,
                                   uint64_t packetNum, size_t numBytes, const uint8_t *bytes, uint8_t *bytesOut);
--- a/src/mesh/MeshRadio.h
+++ b/src/mesh/MeshRadio.h
@@ -22,99 +22,4 @@ struct RegionInfo {
 extern const RegionInfo regions[];
 extern const RegionInfo *myRegion;

-extern void initRegion();
-
-static inline float bwCodeToKHz(uint16_t bwCode)
-{
-    if (bwCode == 31)
-        return 31.25f;
-    if (bwCode == 62)
-        return 62.5f;
-    if (bwCode == 200)
-        return 203.125f;
-    if (bwCode == 400)
-        return 406.25f;
-    if (bwCode == 800)
-        return 812.5f;
-    if (bwCode == 1600)
-        return 1625.0f;
-    return (float)bwCode;
-}
-
-static inline uint16_t bwKHzToCode(float bwKHz)
-{
-    if (bwKHz > 31.24f && bwKHz < 31.26f)
-        return 31;
-    if (bwKHz > 62.49f && bwKHz < 62.51f)
-        return 62;
-    if (bwKHz > 203.12f && bwKHz < 203.13f)
-        return 200;
-    if (bwKHz > 406.24f && bwKHz < 406.26f)
-        return 400;
-    if (bwKHz > 812.49f && bwKHz < 812.51f)
-        return 800;
-    if (bwKHz > 1624.99f && bwKHz < 1625.01f)
-        return 1600;
-    return (uint16_t)(bwKHz + 0.5f);
-}
-
-static inline void modemPresetToParams(meshtastic_Config_LoRaConfig_ModemPreset preset, bool wideLora, float &bwKHz, uint8_t &sf,
-                                       uint8_t &cr)
-{
-    switch (preset) {
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO:
-        bwKHz = wideLora ? 1625.0f : 500.0f;
-        cr = 5;
-        sf = 7;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
-        bwKHz = wideLora ? 812.5f : 250.0f;
-        cr = 5;
-        sf = 7;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
-        bwKHz = wideLora ? 812.5f : 250.0f;
-        cr = 5;
-        sf = 8;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
-        bwKHz = wideLora ? 812.5f : 250.0f;
-        cr = 5;
-        sf = 9;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
-        bwKHz = wideLora ? 812.5f : 250.0f;
-        cr = 5;
-        sf = 10;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
-        bwKHz = wideLora ? 1625.0f : 500.0f;
-        cr = 8;
-        sf = 11;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
-        bwKHz = wideLora ? 406.25f : 125.0f;
-        cr = 8;
-        sf = 11;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
-        bwKHz = wideLora ? 406.25f : 125.0f;
-        cr = 8;
-        sf = 12;
-        break;
-    default: // LONG_FAST (or illegal)
-        bwKHz = wideLora ? 812.5f : 250.0f;
-        cr = 5;
-        sf = 11;
-        break;
-    }
-}
-
-static inline float modemPresetToBwKHz(meshtastic_Config_LoRaConfig_ModemPreset preset, bool wideLora)
-{
-    float bwKHz = 0;
-    uint8_t sf = 0;
-    uint8_t cr = 0;
-    modemPresetToParams(preset, wideLora, bwKHz, sf, cr);
-    return bwKHz;
-}
+extern void initRegion();
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -13,7 +13,6 @@
 #include "PacketHistory.h"
 #include "PowerFSM.h"
 #include "RTC.h"
-#include "RadioInterface.h"
 #include "Router.h"
 #include "SPILock.h"
 #include "SafeFile.h"
@@ -27,7 +26,6 @@
 #include <algorithm>
 #include <pb_decode.h>
 #include <pb_encode.h>
-#include <power/PowerHAL.h>
 #include <vector>

 #ifdef ARCH_ESP32
@@ -55,7 +53,7 @@
 #endif

 #if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WIFI
-#include <MeshtasticOTA.h>
+#include <WiFiOTA.h>
 #endif

 NodeDB *nodeDB = nullptr;
@@ -758,8 +756,8 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
    config.display.compass_orientation = COMPASS_ORIENTATION;
 #endif
 #if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WIFI
-    if (MeshtasticOTA::isUpdated()) {
-        MeshtasticOTA::recoverConfig(&config.network);
+    if (WiFiOTA::isUpdated()) {
+        WiFiOTA::recoverConfig(&config.network);
    }
 #endif

@@ -825,7 +823,7 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.external_notification.nag_timeout = 2;
 #endif
 #if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) || defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3) ||          \
-    defined(ELECROW_ThinkNode_M4) || defined(ELECROW_ThinkNode_M6)
+    defined(ELECROW_ThinkNode_M6)
    // Default to PIN_LED2 for external notification output (LED color depends on device variant)
    moduleConfig.external_notification.enabled = true;
    moduleConfig.external_notification.output = PIN_LED2;
@@ -1266,23 +1264,6 @@ void NodeDB::loadFromDisk()
    if ((state != LoadFileResult::LOAD_SUCCESS) || (devicestate.version < DEVICESTATE_MIN_VER)) {
        LOG_WARN("Devicestate %d is old or invalid, discard", devicestate.version);
        installDefaultDeviceState();
-
-        // Attempt recovery of owner fields from our own NodeDB entry if available.
-        meshtastic_NodeInfoLite *us = getMeshNode(getNodeNum());
-        if (us && us->has_user) {
-            LOG_WARN("Restoring owner fields (long_name/short_name/is_licensed/is_unmessagable) from NodeDB for our node 0x%08x",
-                     us->num);
-            memcpy(owner.long_name, us->user.long_name, sizeof(owner.long_name));
-            owner.long_name[sizeof(owner.long_name) - 1] = '\0';
-            memcpy(owner.short_name, us->user.short_name, sizeof(owner.short_name));
-            owner.short_name[sizeof(owner.short_name) - 1] = '\0';
-            owner.is_licensed = us->user.is_licensed;
-            owner.has_is_unmessagable = us->user.has_is_unmessagable;
-            owner.is_unmessagable = us->user.is_unmessagable;
-
-            // Save the recovered owner to device state on disk
-            saveToDisk(SEGMENT_DEVICESTATE);
-        }
    } else {
        LOG_INFO("Loaded saved devicestate version %d", devicestate.version);
    }
@@ -1299,13 +1280,6 @@ void NodeDB::loadFromDisk()
            LOG_INFO("Loaded saved config version %d", config.version);
        }
    }
-
-    // Coerce LoRa config fields derived from presets while bootstrapping.
-    // Some clients/UI components display bandwidth/spread_factor directly from config even in preset mode.
-    if (config.has_lora && config.lora.use_preset) {
-        RadioInterface::bootstrapLoRaConfigFromPreset(config.lora);
-    }
-
    if (backupSecurity.private_key.size > 0) {
        LOG_DEBUG("Restoring backup of security config");
        config.security = backupSecurity;
@@ -1427,14 +1401,6 @@ void NodeDB::loadFromDisk()
 bool NodeDB::saveProto(const char *filename, size_t protoSize, const pb_msgdesc_t *fields, const void *dest_struct,
                       bool fullAtomic)
 {
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway. Device should be sleeping at this point anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveProto() on unsafe device power level.");
-        return false;
-    }
-
    bool okay = false;
 #ifdef FSCom
    auto f = SafeFile(filename, fullAtomic);
@@ -1461,14 +1427,6 @@ bool NodeDB::saveProto(const char *filename, size_t protoSize, const pb_msgdesc_

 bool NodeDB::saveChannelsToDisk()
 {
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveChannelsToDisk() on unsafe device power level.");
-        return false;
-    }
-
 #ifdef FSCom
    spiLock->lock();
    FSCom.mkdir("/prefs");
@@ -1479,14 +1437,6 @@ bool NodeDB::saveChannelsToDisk()

 bool NodeDB::saveDeviceStateToDisk()
 {
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway. Device should be sleeping at this point anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveDeviceStateToDisk() on unsafe device power level.");
-        return false;
-    }
-
 #ifdef FSCom
    spiLock->lock();
    FSCom.mkdir("/prefs");
@@ -1499,14 +1449,6 @@ bool NodeDB::saveDeviceStateToDisk()

 bool NodeDB::saveNodeDatabaseToDisk()
 {
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway. Device should be sleeping at this point anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveNodeDatabaseToDisk() on unsafe device power level.");
-        return false;
-    }
-
 #ifdef FSCom
    spiLock->lock();
    FSCom.mkdir("/prefs");
@@ -1519,14 +1461,6 @@ bool NodeDB::saveNodeDatabaseToDisk()

 bool NodeDB::saveToDiskNoRetry(int saveWhat)
 {
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway. Device should be sleeping at this point anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveToDiskNoRetry() on unsafe device power level.");
-        return false;
-    }
-
    bool success = true;
 #ifdef FSCom
    spiLock->lock();
@@ -1582,14 +1516,6 @@ bool NodeDB::saveToDiskNoRetry(int saveWhat)
 bool NodeDB::saveToDisk(int saveWhat)
 {
    LOG_DEBUG("Save to disk %d", saveWhat);
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway. Device should be sleeping at this point anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveToDisk() on unsafe device power level.");
-        return false;
-    }
-
    bool success = saveToDiskNoRetry(saveWhat);

    if (!success) {
@@ -2247,10 +2173,7 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co

    // Currently portuino is mostly used for simulation.  Make sure the user notices something really bad happened
 #ifdef ARCH_PORTDUINO
-    LOG_ERROR("A critical failure occurred");
-    // TODO: Determine if other critical errors should also cause an immediate exit
-    if (code == meshtastic_CriticalErrorCode_FLASH_CORRUPTION_RECOVERABLE ||
-        code == meshtastic_CriticalErrorCode_FLASH_CORRUPTION_UNRECOVERABLE)
-        exit(2);
+    LOG_ERROR("A critical failure occurred, portduino is exiting");
+    exit(2);
 #endif
 }
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -1,36 +1,17 @@
 #include "RadioInterface.h"
 #include "Channels.h"
 #include "DisplayFormatters.h"
-#include "LLCC68Interface.h"
-#include "LR1110Interface.h"
-#include "LR1120Interface.h"
-#include "LR1121Interface.h"
 #include "MeshRadio.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "RF95Interface.h"
 #include "Router.h"
-#include "SX1262Interface.h"
-#include "SX1268Interface.h"
-#include "SX1280Interface.h"
 #include "configuration.h"
-#include "detect/LoRaRadioType.h"
 #include "main.h"
 #include "sleep.h"
 #include <assert.h>
 #include <pb_decode.h>
 #include <pb_encode.h>

-#ifdef ARCH_PORTDUINO
-#include "platform/portduino/PortduinoGlue.h"
-#include "platform/portduino/SimRadio.h"
-#include "platform/portduino/USBHal.h"
-#endif
-
-#ifdef ARCH_STM32WL>
-#include "STM32WLE5JCInterface.h"
-#endif
-
 // Calculate 2^n without calling pow()
 uint32_t pow_of_2(uint32_t n)
 {
@@ -224,281 +205,6 @@ bool RadioInterface::uses_default_frequency_slot = true;

 static uint8_t bytes[MAX_LORA_PAYLOAD_LEN + 1];

-// Global LoRa radio type
-LoRaRadioType radioType = NO_RADIO;
-
-extern RadioInterface *rIf;
-extern RadioLibHal *RadioLibHAL;
-#if defined(HW_SPI1_DEVICE) && defined(ARCH_ESP32)
-extern SPIClass SPI1;
-#endif
-
-bool initLoRa()
-{
-    if (rIf != nullptr) {
-        delete rIf;
-        rIf = nullptr;
-    }
-
-#if ARCH_PORTDUINO
-    SPISettings spiSettings(portduino_config.spiSpeed, MSBFIRST, SPI_MODE0);
-#else
-    SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
-#endif
-
-#ifdef ARCH_PORTDUINO
-    // as one can't use a function pointer to the class constructor:
-    auto loraModuleInterface = [](LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
-                                  RADIOLIB_PIN_TYPE busy) {
-        switch (portduino_config.lora_module) {
-        case use_rf95:
-            return (RadioInterface *)new RF95Interface(hal, cs, irq, rst, busy);
-        case use_sx1262:
-            return (RadioInterface *)new SX1262Interface(hal, cs, irq, rst, busy);
-        case use_sx1268:
-            return (RadioInterface *)new SX1268Interface(hal, cs, irq, rst, busy);
-        case use_sx1280:
-            return (RadioInterface *)new SX1280Interface(hal, cs, irq, rst, busy);
-        case use_lr1110:
-            return (RadioInterface *)new LR1110Interface(hal, cs, irq, rst, busy);
-        case use_lr1120:
-            return (RadioInterface *)new LR1120Interface(hal, cs, irq, rst, busy);
-        case use_lr1121:
-            return (RadioInterface *)new LR1121Interface(hal, cs, irq, rst, busy);
-        case use_llcc68:
-            return (RadioInterface *)new LLCC68Interface(hal, cs, irq, rst, busy);
-        case use_simradio:
-            return (RadioInterface *)new SimRadio;
-        default:
-            assert(0); // shouldn't happen
-            return (RadioInterface *)nullptr;
-        }
-    };
-
-    LOG_DEBUG("Activate %s radio on SPI port %s", portduino_config.loraModules[portduino_config.lora_module].c_str(),
-              portduino_config.lora_spi_dev.c_str());
-    if (portduino_config.lora_spi_dev == "ch341") {
-        RadioLibHAL = ch341Hal;
-    } else {
-        if (RadioLibHAL != nullptr) {
-            delete RadioLibHAL;
-            RadioLibHAL = nullptr;
-        }
-        RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
-    }
-    rIf =
-        loraModuleInterface((LockingArduinoHal *)RadioLibHAL, portduino_config.lora_cs_pin.pin, portduino_config.lora_irq_pin.pin,
-                            portduino_config.lora_reset_pin.pin, portduino_config.lora_busy_pin.pin);
-
-    if (!rIf->init()) {
-        LOG_WARN("No %s radio", portduino_config.loraModules[portduino_config.lora_module].c_str());
-        delete rIf;
-        rIf = NULL;
-        exit(EXIT_FAILURE);
-    } else {
-        LOG_INFO("%s init success", portduino_config.loraModules[portduino_config.lora_module].c_str());
-    }
-
-#elif defined(HW_SPI1_DEVICE)
-    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI1, spiSettings);
-#else // HW_SPI1_DEVICE
-    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
-#endif
-
-// radio init MUST BE AFTER service.init, so we have our radio config settings (from nodedb init)
-#if defined(USE_STM32WLx)
-    if (!rIf) {
-        rIf = new STM32WLE5JCInterface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("No STM32WL radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("STM32WL init success");
-            radioType = STM32WLx_RADIO;
-        }
-    }
-#endif
-
-#if defined(RF95_IRQ) && RADIOLIB_EXCLUDE_SX127X != 1
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        rIf = new RF95Interface(RadioLibHAL, LORA_CS, RF95_IRQ, RF95_RESET, RF95_DIO1);
-        if (!rIf->init()) {
-            LOG_WARN("No RF95 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("RF95 init success");
-            radioType = RF95_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && !defined(TCXO_OPTIONAL) && RADIOLIB_EXCLUDE_SX126X != 1
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        auto *sxIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-#ifdef SX126X_DIO3_TCXO_VOLTAGE
-        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
-#endif
-        if (!sxIf->init()) {
-            LOG_WARN("No SX1262 radio");
-            delete sxIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1262 init success");
-            rIf = sxIf;
-            radioType = SX1262_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && defined(TCXO_OPTIONAL)
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        // try using the specified TCXO voltage
-        auto *sxIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
-        if (!sxIf->init()) {
-            LOG_WARN("No SX1262 radio with TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
-            delete sxIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1262 init success, TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
-            rIf = sxIf;
-            radioType = SX1262_RADIO;
-        }
-    }
-
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        // If specified TCXO voltage fails, attempt to use DIO3 as a reference instead
-        rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("No SX1262 radio with XTAL, Vref 0.0V");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1262 init success, XTAL, Vref 0.0V");
-            radioType = SX1262_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_SX1268)
-#if defined(SX126X_DIO3_TCXO_VOLTAGE) && defined(TCXO_OPTIONAL)
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        // try using the specified TCXO voltage
-        auto *sxIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
-        if (!sxIf->init()) {
-            LOG_WARN("No SX1268 radio with TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
-            delete sxIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1268 init success, TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
-            rIf = sxIf;
-            radioType = SX1268_RADIO;
-        }
-    }
-#endif
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        rIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("No SX1268 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1268 init success");
-            radioType = SX1268_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_LLCC68)
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        rIf = new LLCC68Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("No LLCC68 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("LLCC68 init success");
-            radioType = LLCC68_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_LR1110) && RADIOLIB_EXCLUDE_LR11X0 != 1
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        rIf = new LR1110Interface(RadioLibHAL, LR1110_SPI_NSS_PIN, LR1110_IRQ_PIN, LR1110_NRESET_PIN, LR1110_BUSY_PIN);
-        if (!rIf->init()) {
-            LOG_WARN("No LR1110 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("LR1110 init success");
-            radioType = LR1110_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_LR1120) && RADIOLIB_EXCLUDE_LR11X0 != 1
-    if (!rIf) {
-        rIf = new LR1120Interface(RadioLibHAL, LR1120_SPI_NSS_PIN, LR1120_IRQ_PIN, LR1120_NRESET_PIN, LR1120_BUSY_PIN);
-        if (!rIf->init()) {
-            LOG_WARN("No LR1120 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("LR1120 init success");
-            radioType = LR1120_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_LR1121) && RADIOLIB_EXCLUDE_LR11X0 != 1
-    if (!rIf) {
-        rIf = new LR1121Interface(RadioLibHAL, LR1121_SPI_NSS_PIN, LR1121_IRQ_PIN, LR1121_NRESET_PIN, LR1121_BUSY_PIN);
-        if (!rIf->init()) {
-            LOG_WARN("No LR1121 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("LR1121 init success");
-            radioType = LR1121_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_SX1280) && RADIOLIB_EXCLUDE_SX128X != 1
-    if (!rIf) {
-        rIf = new SX1280Interface(RadioLibHAL, SX128X_CS, SX128X_DIO1, SX128X_RESET, SX128X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("No SX1280 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1280 init success");
-            radioType = SX1280_RADIO;
-        }
-    }
-#endif
-
-    // check if the radio chip matches the selected region
-    if ((config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) && rIf && (!rIf->wideLora())) {
-        LOG_WARN("LoRa chip does not support 2.4GHz. Revert to unset");
-        config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
-        nodeDB->saveToDisk(SEGMENT_CONFIG);
-
-        if (rIf && !rIf->reconfigure()) {
-            LOG_WARN("Reconfigure failed, rebooting");
-            if (screen) {
-                screen->showSimpleBanner("Rebooting...");
-            }
-            rebootAtMsec = millis() + 5000;
-        }
-    }
-    return rIf != nullptr;
-}
-
 void initRegion()
 {
    const RegionInfo *r = regions;
@@ -514,34 +220,6 @@ void initRegion()
    myRegion = r;
 }

-void RadioInterface::bootstrapLoRaConfigFromPreset(meshtastic_Config_LoRaConfig &loraConfig)
-{
-    if (!loraConfig.use_preset) {
-        return;
-    }
-
-    // Find region info to determine whether "wide" LoRa is permitted (2.4 GHz uses wider bandwidth codes).
-    const RegionInfo *r = regions;
-    for (; r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && r->code != loraConfig.region; r++)
-        ;
-
-    const bool regionWideLora = r->wideLora;
-
-    float bwKHz = 0;
-    uint8_t sf = 0;
-    uint8_t cr = 0;
-    modemPresetToParams(loraConfig.modem_preset, regionWideLora, bwKHz, sf, cr);
-
-    // If selected preset requests a bandwidth larger than the region span, fall back to LONG_FAST.
-    if (r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && (r->freqEnd - r->freqStart) < (bwKHz / 1000.0f)) {
-        loraConfig.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
-        modemPresetToParams(loraConfig.modem_preset, regionWideLora, bwKHz, sf, cr);
-    }
-
-    loraConfig.bandwidth = bwKHzToCode(bwKHz);
-    loraConfig.spread_factor = sf;
-}
-
 /**
 * ## LoRaWAN for North America

@@ -796,7 +474,54 @@ void RadioInterface::applyModemConfig()
    bool validConfig = false; // We need to check for a valid configuration
    while (!validConfig) {
        if (loraConfig.use_preset) {
-            modemPresetToParams(loraConfig.modem_preset, myRegion->wideLora, bw, sf, cr);
+
+            switch (loraConfig.modem_preset) {
+            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO:
+                bw = (myRegion->wideLora) ? 1625.0 : 500;
+                cr = 5;
+                sf = 7;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
+                bw = (myRegion->wideLora) ? 812.5 : 250;
+                cr = 5;
+                sf = 7;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
+                bw = (myRegion->wideLora) ? 812.5 : 250;
+                cr = 5;
+                sf = 8;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
+                bw = (myRegion->wideLora) ? 812.5 : 250;
+                cr = 5;
+                sf = 9;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
+                bw = (myRegion->wideLora) ? 812.5 : 250;
+                cr = 5;
+                sf = 10;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
+                bw = (myRegion->wideLora) ? 1625.0 : 500;
+                cr = 8;
+                sf = 11;
+                break;
+            default: // Config_LoRaConfig_ModemPreset_LONG_FAST is default. Gracefully use this is preset is something illegal.
+                bw = (myRegion->wideLora) ? 812.5 : 250;
+                cr = 5;
+                sf = 11;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
+                bw = (myRegion->wideLora) ? 406.25 : 125;
+                cr = 8;
+                sf = 11;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
+                bw = (myRegion->wideLora) ? 406.25 : 125;
+                cr = 8;
+                sf = 12;
+                break;
+            }
            if (loraConfig.coding_rate >= 5 && loraConfig.coding_rate <= 8 && loraConfig.coding_rate != cr) {
                cr = loraConfig.coding_rate;
                LOG_INFO("Using custom Coding Rate %u", cr);
@@ -804,7 +529,20 @@ void RadioInterface::applyModemConfig()
        } else {
            sf = loraConfig.spread_factor;
            cr = loraConfig.coding_rate;
-            bw = bwCodeToKHz(loraConfig.bandwidth);
+            bw = loraConfig.bandwidth;
+
+            if (bw == 31) // This parameter is not an integer
+                bw = 31.25;
+            if (bw == 62) // Fix for 62.5Khz bandwidth
+                bw = 62.5;
+            if (bw == 200)
+                bw = 203.125;
+            if (bw == 400)
+                bw = 406.25;
+            if (bw == 800)
+                bw = 812.5;
+            if (bw == 1600)
+                bw = 1625.0;
        }

        if ((myRegion->freqEnd - myRegion->freqStart) < bw / 1000) {
@@ -928,24 +666,18 @@ void RadioInterface::limitPower(int8_t loraMaxPower)
        power = maxPower;
    }

-#ifdef ARCH_PORTDUINO
-    size_t num_pa_points = portduino_config.num_pa_points;
-    const uint16_t *tx_gain = portduino_config.tx_gain_lora;
+#ifndef NUM_PA_POINTS
+    if (TX_GAIN_LORA > 0 && !devicestate.owner.is_licensed) {
+        LOG_INFO("Requested Tx power: %d dBm; Device LoRa Tx gain: %d dB", power, TX_GAIN_LORA);
+        power -= TX_GAIN_LORA;
+    }
 #else
-    size_t num_pa_points = NUM_PA_POINTS;
-    const uint16_t tx_gain[NUM_PA_POINTS] = {TX_GAIN_LORA};
-#endif
-
-    if (num_pa_points == 1) {
-        if (tx_gain[0] > 0 && !devicestate.owner.is_licensed) {
-            LOG_INFO("Requested Tx power: %d dBm; Device LoRa Tx gain: %d dB", power, tx_gain[0]);
-            power -= tx_gain[0];
-        }
-    } else if (!devicestate.owner.is_licensed) {
+    if (!devicestate.owner.is_licensed) {
        // we have an array of PA gain values.  Find the highest power setting that works.
-        for (int radio_dbm = 0; radio_dbm < num_pa_points; radio_dbm++) {
+        const uint16_t tx_gain[NUM_PA_POINTS] = {TX_GAIN_LORA};
+        for (int radio_dbm = 0; radio_dbm < NUM_PA_POINTS; radio_dbm++) {
            if (((radio_dbm + tx_gain[radio_dbm]) > power) ||
-                ((radio_dbm == (num_pa_points - 1)) && ((radio_dbm + tx_gain[radio_dbm]) <= power))) {
+                ((radio_dbm == (NUM_PA_POINTS - 1)) && ((radio_dbm + tx_gain[radio_dbm]) <= power))) {
                // we've exceeded the power limit, or hit the max we can do
                LOG_INFO("Requested Tx power: %d dBm; Device LoRa Tx gain: %d dB", power, tx_gain[radio_dbm]);
                power -= tx_gain[radio_dbm];
@@ -953,7 +685,7 @@ void RadioInterface::limitPower(int8_t loraMaxPower)
            }
        }
    }
-
+#endif
    if (power > loraMaxPower) // Clamp power to maximum defined level
        power = loraMaxPower;

--- a/src/mesh/RadioInterface.h
+++ b/src/mesh/RadioInterface.h
@@ -7,9 +7,6 @@
 #include "airtime.h"
 #include "error.h"

-// Forward decl to avoid a direct include of generated config headers / full LoRaConfig definition in this widely-included file.
-typedef struct _meshtastic_Config_LoRaConfig meshtastic_Config_LoRaConfig;
-
 #define MAX_TX_QUEUE 16 // max number of packets which can be waiting for transmission

 #define MAX_LORA_PAYLOAD_LEN 255 // max length of 255 per Semtech's datasheets on SX12xx
@@ -118,12 +115,6 @@ class RadioInterface

    virtual ~RadioInterface() {}

-    /**
-     * Coerce LoRa config fields (bandwidth/spread_factor) derived from presets.
-     * This is used during early bootstrapping so UIs that display these fields directly remain consistent.
-     */
-    static void bootstrapLoRaConfigFromPreset(meshtastic_Config_LoRaConfig &loraConfig);
-
    /**
     * Return true if we think the board can go to sleep (i.e. our tx queue is empty, we are not sending or receiving)
     *
@@ -279,7 +270,5 @@ class RadioInterface
    }
 };

-bool initLoRa();
-
 /// Debug printing for packets
 void printPacket(const char *prefix, const meshtastic_MeshPacket *p);
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -7,6 +7,7 @@
 #include "RTC.h"

 #include "configuration.h"
+#include "detect/LoRaRadioType.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "meshUtils.h"
--- a/src/mesh/SX126xInterface.cpp
+++ b/src/mesh/SX126xInterface.cpp
@@ -269,12 +269,8 @@ template <typename T> void SX126xInterface<T>::setStandby()

    if (err != RADIOLIB_ERR_NONE)
        LOG_DEBUG("SX126x standby %s%d", radioLibErr, err);
-#ifdef ARCH_PORTDUINO
-    if (err != RADIOLIB_ERR_NONE)
-        portduino_status.LoRa_in_error = true;
-#else
    assert(err == RADIOLIB_ERR_NONE);
-#endif
+
    isReceiving = false; // If we were receiving, not any more
    activeReceiveStart = 0;
    disableInterrupt();
@@ -317,12 +313,7 @@ template <typename T> void SX126xInterface<T>::startReceive()
    int err = lora.startReceiveDutyCycleAuto(preambleLength, 8, MESHTASTIC_RADIOLIB_IRQ_RX_FLAGS);
    if (err != RADIOLIB_ERR_NONE)
        LOG_ERROR("SX126X startReceiveDutyCycleAuto %s%d", radioLibErr, err);
-#ifdef ARCH_PORTDUINO
-    if (err != RADIOLIB_ERR_NONE)
-        portduino_status.LoRa_in_error = true;
-#else
    assert(err == RADIOLIB_ERR_NONE);
-#endif

    RadioLibInterface::startReceive();

@@ -350,12 +341,7 @@ template <typename T> bool SX126xInterface<T>::isChannelActive()
        return true;
    if (result != RADIOLIB_CHANNEL_FREE)
        LOG_ERROR("SX126X scanChannel %s%d", radioLibErr, result);
-#ifdef ARCH_PORTDUINO
-    if (result == RADIOLIB_ERR_WRONG_MODEM)
-        portduino_status.LoRa_in_error = true;
-#else
    assert(result != RADIOLIB_ERR_WRONG_MODEM);
-#endif

    return false;
 }
--- a/src/mesh/generated/meshtastic/admin.pb.h
+++ b/src/mesh/generated/meshtastic/admin.pb.h
@@ -77,9 +77,7 @@ typedef enum _meshtastic_AdminMessage_ModuleConfigType {
    /* TODO: REPLACE */
    meshtastic_AdminMessage_ModuleConfigType_DETECTIONSENSOR_CONFIG = 11,
    /* TODO: REPLACE */
-    meshtastic_AdminMessage_ModuleConfigType_PAXCOUNTER_CONFIG = 12,
-    /* TODO: REPLACE */
-    meshtastic_AdminMessage_ModuleConfigType_STATUSMESSAGE_CONFIG = 13
+    meshtastic_AdminMessage_ModuleConfigType_PAXCOUNTER_CONFIG = 12
 } meshtastic_AdminMessage_ModuleConfigType;

 typedef enum _meshtastic_AdminMessage_BackupLocation {
@@ -325,8 +323,8 @@ extern "C" {
 #define _meshtastic_AdminMessage_ConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ConfigType)(meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG+1))

 #define _meshtastic_AdminMessage_ModuleConfigType_MIN meshtastic_AdminMessage_ModuleConfigType_MQTT_CONFIG
-#define _meshtastic_AdminMessage_ModuleConfigType_MAX meshtastic_AdminMessage_ModuleConfigType_STATUSMESSAGE_CONFIG
-#define _meshtastic_AdminMessage_ModuleConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ModuleConfigType)(meshtastic_AdminMessage_ModuleConfigType_STATUSMESSAGE_CONFIG+1))
+#define _meshtastic_AdminMessage_ModuleConfigType_MAX meshtastic_AdminMessage_ModuleConfigType_PAXCOUNTER_CONFIG
+#define _meshtastic_AdminMessage_ModuleConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ModuleConfigType)(meshtastic_AdminMessage_ModuleConfigType_PAXCOUNTER_CONFIG+1))

 #define _meshtastic_AdminMessage_BackupLocation_MIN meshtastic_AdminMessage_BackupLocation_FLASH
 #define _meshtastic_AdminMessage_BackupLocation_MAX meshtastic_AdminMessage_BackupLocation_SD
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -66,7 +66,7 @@ typedef enum _meshtastic_Config_DeviceConfig_Role {
    but should not be given priority over other routers in order to avoid unnecessaraily
    consuming hops. */
    meshtastic_Config_DeviceConfig_Role_ROUTER_LATE = 11,
-    /* Description: Treats packets from or to favorited nodes as ROUTER_LATE, and all other packets as CLIENT.
+    /* Description: Treats packets from or to favorited nodes as ROUTER, and all other packets as CLIENT.
 Technical Details: Used for stronger attic/roof nodes to distribute messages more widely
    from weaker, indoor, or less-well-positioned nodes. Recommended for users with multiple nodes
    where one CLIENT_BASE acts as a more powerful base station, such as an attic/roof node. */
--- a/src/mesh/generated/meshtastic/deviceonly.pb.h
+++ b/src/mesh/generated/meshtastic/deviceonly.pb.h
@@ -361,7 +361,7 @@ extern const pb_msgdesc_t meshtastic_BackupPreferences_msg;
 /* Maximum encoded size of messages (where known) */
 /* meshtastic_NodeDatabase_size depends on runtime parameters */
 #define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_BackupPreferences_size
-#define meshtastic_BackupPreferences_size        2362
+#define meshtastic_BackupPreferences_size        2279
 #define meshtastic_ChannelFile_size              718
 #define meshtastic_DeviceState_size              1737
 #define meshtastic_NodeInfoLite_size             196
--- a/src/mesh/generated/meshtastic/localonly.pb.h
+++ b/src/mesh/generated/meshtastic/localonly.pb.h
@@ -87,9 +87,6 @@ typedef struct _meshtastic_LocalModuleConfig {
    /* Paxcounter Config */
    bool has_paxcounter;
    meshtastic_ModuleConfig_PaxcounterConfig paxcounter;
-    /* StatusMessage Config */
-    bool has_statusmessage;
-    meshtastic_ModuleConfig_StatusMessageConfig statusmessage;
 } meshtastic_LocalModuleConfig;


@@ -99,9 +96,9 @@ extern "C" {

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

 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_LocalConfig_device_tag        1
@@ -127,7 +124,6 @@ extern "C" {
 #define meshtastic_LocalModuleConfig_ambient_lighting_tag 12
 #define meshtastic_LocalModuleConfig_detection_sensor_tag 13
 #define meshtastic_LocalModuleConfig_paxcounter_tag 14
-#define meshtastic_LocalModuleConfig_statusmessage_tag 15

 /* Struct field encoding specification for nanopb */
 #define meshtastic_LocalConfig_FIELDLIST(X, a) \
@@ -165,8 +161,7 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  remote_hardware,  10) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  neighbor_info,    11) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  ambient_lighting,  12) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  detection_sensor,  13) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  paxcounter,       14) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  statusmessage,    15)
+X(a, STATIC,   OPTIONAL, MESSAGE,  paxcounter,       14)
 #define meshtastic_LocalModuleConfig_CALLBACK NULL
 #define meshtastic_LocalModuleConfig_DEFAULT NULL
 #define meshtastic_LocalModuleConfig_mqtt_MSGTYPE meshtastic_ModuleConfig_MQTTConfig
@@ -182,7 +177,6 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  statusmessage,    15)
 #define meshtastic_LocalModuleConfig_ambient_lighting_MSGTYPE meshtastic_ModuleConfig_AmbientLightingConfig
 #define meshtastic_LocalModuleConfig_detection_sensor_MSGTYPE meshtastic_ModuleConfig_DetectionSensorConfig
 #define meshtastic_LocalModuleConfig_paxcounter_MSGTYPE meshtastic_ModuleConfig_PaxcounterConfig
-#define meshtastic_LocalModuleConfig_statusmessage_MSGTYPE meshtastic_ModuleConfig_StatusMessageConfig

 extern const pb_msgdesc_t meshtastic_LocalConfig_msg;
 extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
@@ -192,9 +186,9 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
 #define meshtastic_LocalModuleConfig_fields &meshtastic_LocalModuleConfig_msg

 /* Maximum encoded size of messages (where known) */
-#define MESHTASTIC_MESHTASTIC_LOCALONLY_PB_H_MAX_SIZE meshtastic_LocalModuleConfig_size
+#define MESHTASTIC_MESHTASTIC_LOCALONLY_PB_H_MAX_SIZE meshtastic_LocalConfig_size
 #define meshtastic_LocalConfig_size              749
-#define meshtastic_LocalModuleConfig_size        758
+#define meshtastic_LocalModuleConfig_size        675

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/meshtastic/mesh.pb.cpp
+++ b/src/mesh/generated/meshtastic/mesh.pb.cpp
@@ -30,9 +30,6 @@ PB_BIND(meshtastic_StoreForwardPlusPlus, meshtastic_StoreForwardPlusPlus, 2)
 PB_BIND(meshtastic_Waypoint, meshtastic_Waypoint, AUTO)


-PB_BIND(meshtastic_StatusMessage, meshtastic_StatusMessage, AUTO)
-
-
 PB_BIND(meshtastic_MqttClientProxyMessage, meshtastic_MqttClientProxyMessage, 2)


--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -298,8 +298,6 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_MESHSTICK_1262 = 121,
    /* LilyGo T-Beam 1W */
    meshtastic_HardwareModel_TBEAM_1_WATT = 122,
-    /* LilyGo T5 S3 ePaper Pro (V1 and V2) */
-    meshtastic_HardwareModel_T5_S3_EPAPER_PRO = 123,
    /* ------------------------------------------------------------------------------------------------------------------------------------------
 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.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -858,11 +856,6 @@ typedef struct _meshtastic_Waypoint {
    uint32_t icon;
 } meshtastic_Waypoint;

-/* Message for node status */
-typedef struct _meshtastic_StatusMessage {
-    char status[80];
-} meshtastic_StatusMessage;
-
 typedef PB_BYTES_ARRAY_T(435) meshtastic_MqttClientProxyMessage_data_t;
 /* This message will be proxied over the PhoneAPI for the client to deliver to the MQTT server */
 typedef struct _meshtastic_MqttClientProxyMessage {
@@ -1407,7 +1400,6 @@ extern "C" {



-
 #define meshtastic_MeshPacket_priority_ENUMTYPE meshtastic_MeshPacket_Priority
 #define meshtastic_MeshPacket_delayed_ENUMTYPE meshtastic_MeshPacket_Delayed
 #define meshtastic_MeshPacket_transport_mechanism_ENUMTYPE meshtastic_MeshPacket_TransportMechanism
@@ -1450,7 +1442,6 @@ extern "C" {
 #define meshtastic_KeyVerification_init_default  {0, {0, {0}}, {0, {0}}}
 #define meshtastic_StoreForwardPlusPlus_init_default {_meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN, {0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}, 0, 0, 0, 0, 0}
 #define meshtastic_Waypoint_init_default         {0, false, 0, false, 0, 0, 0, "", "", 0}
-#define meshtastic_StatusMessage_init_default    {""}
 #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, _meshtastic_MeshPacket_TransportMechanism_MIN}
 #define meshtastic_NodeInfo_init_default         {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0, 0, 0}
@@ -1483,7 +1474,6 @@ extern "C" {
 #define meshtastic_KeyVerification_init_zero     {0, {0, {0}}, {0, {0}}}
 #define meshtastic_StoreForwardPlusPlus_init_zero {_meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN, {0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}, 0, 0, 0, 0, 0}
 #define meshtastic_Waypoint_init_zero            {0, false, 0, false, 0, 0, 0, "", "", 0}
-#define meshtastic_StatusMessage_init_zero       {""}
 #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, _meshtastic_MeshPacket_TransportMechanism_MIN}
 #define meshtastic_NodeInfo_init_zero            {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0, 0, 0}
@@ -1579,7 +1569,6 @@ extern "C" {
 #define meshtastic_Waypoint_name_tag             6
 #define meshtastic_Waypoint_description_tag      7
 #define meshtastic_Waypoint_icon_tag             8
-#define meshtastic_StatusMessage_status_tag      1
 #define meshtastic_MqttClientProxyMessage_topic_tag 1
 #define meshtastic_MqttClientProxyMessage_data_tag 2
 #define meshtastic_MqttClientProxyMessage_text_tag 3
@@ -1815,11 +1804,6 @@ X(a, STATIC,   SINGULAR, FIXED32,  icon,              8)
 #define meshtastic_Waypoint_CALLBACK NULL
 #define meshtastic_Waypoint_DEFAULT NULL

-#define meshtastic_StatusMessage_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, STRING,   status,            1)
-#define meshtastic_StatusMessage_CALLBACK NULL
-#define meshtastic_StatusMessage_DEFAULT NULL
-
 #define meshtastic_MqttClientProxyMessage_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, STRING,   topic,             1) \
 X(a, STATIC,   ONEOF,    BYTES,    (payload_variant,data,payload_variant.data),   2) \
@@ -2086,7 +2070,6 @@ extern const pb_msgdesc_t meshtastic_Data_msg;
 extern const pb_msgdesc_t meshtastic_KeyVerification_msg;
 extern const pb_msgdesc_t meshtastic_StoreForwardPlusPlus_msg;
 extern const pb_msgdesc_t meshtastic_Waypoint_msg;
-extern const pb_msgdesc_t meshtastic_StatusMessage_msg;
 extern const pb_msgdesc_t meshtastic_MqttClientProxyMessage_msg;
 extern const pb_msgdesc_t meshtastic_MeshPacket_msg;
 extern const pb_msgdesc_t meshtastic_NodeInfo_msg;
@@ -2121,7 +2104,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_KeyVerification_fields &meshtastic_KeyVerification_msg
 #define meshtastic_StoreForwardPlusPlus_fields &meshtastic_StoreForwardPlusPlus_msg
 #define meshtastic_Waypoint_fields &meshtastic_Waypoint_msg
-#define meshtastic_StatusMessage_fields &meshtastic_StatusMessage_msg
 #define meshtastic_MqttClientProxyMessage_fields &meshtastic_MqttClientProxyMessage_msg
 #define meshtastic_MeshPacket_fields &meshtastic_MeshPacket_msg
 #define meshtastic_NodeInfo_fields &meshtastic_NodeInfo_msg
@@ -2177,7 +2159,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_QueueStatus_size              23
 #define meshtastic_RouteDiscovery_size           256
 #define meshtastic_Routing_size                  259
-#define meshtastic_StatusMessage_size            81
 #define meshtastic_StoreForwardPlusPlus_size     377
 #define meshtastic_ToRadio_size                  504
 #define meshtastic_User_size                     115
--- a/src/mesh/generated/meshtastic/module_config.pb.cpp
+++ b/src/mesh/generated/meshtastic/module_config.pb.cpp
@@ -51,9 +51,6 @@ PB_BIND(meshtastic_ModuleConfig_CannedMessageConfig, meshtastic_ModuleConfig_Can
 PB_BIND(meshtastic_ModuleConfig_AmbientLightingConfig, meshtastic_ModuleConfig_AmbientLightingConfig, AUTO)


-PB_BIND(meshtastic_ModuleConfig_StatusMessageConfig, meshtastic_ModuleConfig_StatusMessageConfig, AUTO)
-
-
 PB_BIND(meshtastic_RemoteHardwarePin, meshtastic_RemoteHardwarePin, AUTO)


--- a/src/mesh/generated/meshtastic/module_config.pb.h
+++ b/src/mesh/generated/meshtastic/module_config.pb.h
@@ -409,12 +409,6 @@ typedef struct _meshtastic_ModuleConfig_AmbientLightingConfig {
    uint8_t blue;
 } meshtastic_ModuleConfig_AmbientLightingConfig;

-/* StatusMessage config - Allows setting a status message for a node to periodically rebroadcast */
-typedef struct _meshtastic_ModuleConfig_StatusMessageConfig {
-    /* The actual status string */
-    char node_status[80];
-} meshtastic_ModuleConfig_StatusMessageConfig;
-
 /* A GPIO pin definition for remote hardware module */
 typedef struct _meshtastic_RemoteHardwarePin {
    /* GPIO Pin number (must match Arduino) */
@@ -466,8 +460,6 @@ typedef struct _meshtastic_ModuleConfig {
        meshtastic_ModuleConfig_DetectionSensorConfig detection_sensor;
        /* TODO: REPLACE */
        meshtastic_ModuleConfig_PaxcounterConfig paxcounter;
-        /* TODO: REPLACE */
-        meshtastic_ModuleConfig_StatusMessageConfig statusmessage;
    } payload_variant;
 } meshtastic_ModuleConfig;

@@ -523,7 +515,6 @@ extern "C" {
 #define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_event_press_ENUMTYPE meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar


-
 #define meshtastic_RemoteHardwarePin_type_ENUMTYPE meshtastic_RemoteHardwarePinType


@@ -543,7 +534,6 @@ extern "C" {
 #define meshtastic_ModuleConfig_TelemetryConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_CannedMessageConfig_init_default {0, 0, 0, 0, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0}
 #define meshtastic_ModuleConfig_AmbientLightingConfig_init_default {0, 0, 0, 0, 0}
-#define meshtastic_ModuleConfig_StatusMessageConfig_init_default {""}
 #define meshtastic_RemoteHardwarePin_init_default {0, "", _meshtastic_RemoteHardwarePinType_MIN}
 #define meshtastic_ModuleConfig_init_zero        {0, {meshtastic_ModuleConfig_MQTTConfig_init_zero}}
 #define meshtastic_ModuleConfig_MQTTConfig_init_zero {0, "", "", "", 0, 0, 0, "", 0, 0, false, meshtastic_ModuleConfig_MapReportSettings_init_zero}
@@ -560,7 +550,6 @@ extern "C" {
 #define meshtastic_ModuleConfig_TelemetryConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_CannedMessageConfig_init_zero {0, 0, 0, 0, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0}
 #define meshtastic_ModuleConfig_AmbientLightingConfig_init_zero {0, 0, 0, 0, 0}
-#define meshtastic_ModuleConfig_StatusMessageConfig_init_zero {""}
 #define meshtastic_RemoteHardwarePin_init_zero   {0, "", _meshtastic_RemoteHardwarePinType_MIN}

 /* Field tags (for use in manual encoding/decoding) */
@@ -664,7 +653,6 @@ extern "C" {
 #define meshtastic_ModuleConfig_AmbientLightingConfig_red_tag 3
 #define meshtastic_ModuleConfig_AmbientLightingConfig_green_tag 4
 #define meshtastic_ModuleConfig_AmbientLightingConfig_blue_tag 5
-#define meshtastic_ModuleConfig_StatusMessageConfig_node_status_tag 1
 #define meshtastic_RemoteHardwarePin_gpio_pin_tag 1
 #define meshtastic_RemoteHardwarePin_name_tag    2
 #define meshtastic_RemoteHardwarePin_type_tag    3
@@ -684,7 +672,6 @@ extern "C" {
 #define meshtastic_ModuleConfig_ambient_lighting_tag 11
 #define meshtastic_ModuleConfig_detection_sensor_tag 12
 #define meshtastic_ModuleConfig_paxcounter_tag   13
-#define meshtastic_ModuleConfig_statusmessage_tag 14

 /* Struct field encoding specification for nanopb */
 #define meshtastic_ModuleConfig_FIELDLIST(X, a) \
@@ -700,8 +687,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,remote_hardware,payload_vari
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,neighbor_info,payload_variant.neighbor_info),  10) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,ambient_lighting,payload_variant.ambient_lighting),  11) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,detection_sensor,payload_variant.detection_sensor),  12) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,paxcounter,payload_variant.paxcounter),  13) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,statusmessage,payload_variant.statusmessage),  14)
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,paxcounter,payload_variant.paxcounter),  13)
 #define meshtastic_ModuleConfig_CALLBACK NULL
 #define meshtastic_ModuleConfig_DEFAULT NULL
 #define meshtastic_ModuleConfig_payload_variant_mqtt_MSGTYPE meshtastic_ModuleConfig_MQTTConfig
@@ -717,7 +703,6 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,statusmessage,payload_varian
 #define meshtastic_ModuleConfig_payload_variant_ambient_lighting_MSGTYPE meshtastic_ModuleConfig_AmbientLightingConfig
 #define meshtastic_ModuleConfig_payload_variant_detection_sensor_MSGTYPE meshtastic_ModuleConfig_DetectionSensorConfig
 #define meshtastic_ModuleConfig_payload_variant_paxcounter_MSGTYPE meshtastic_ModuleConfig_PaxcounterConfig
-#define meshtastic_ModuleConfig_payload_variant_statusmessage_MSGTYPE meshtastic_ModuleConfig_StatusMessageConfig

 #define meshtastic_ModuleConfig_MQTTConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, BOOL,     enabled,           1) \
@@ -880,11 +865,6 @@ X(a, STATIC,   SINGULAR, UINT32,   blue,              5)
 #define meshtastic_ModuleConfig_AmbientLightingConfig_CALLBACK NULL
 #define meshtastic_ModuleConfig_AmbientLightingConfig_DEFAULT NULL

-#define meshtastic_ModuleConfig_StatusMessageConfig_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, STRING,   node_status,       1)
-#define meshtastic_ModuleConfig_StatusMessageConfig_CALLBACK NULL
-#define meshtastic_ModuleConfig_StatusMessageConfig_DEFAULT NULL
-
 #define meshtastic_RemoteHardwarePin_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   gpio_pin,          1) \
 X(a, STATIC,   SINGULAR, STRING,   name,              2) \
@@ -907,7 +887,6 @@ extern const pb_msgdesc_t meshtastic_ModuleConfig_RangeTestConfig_msg;
 extern const pb_msgdesc_t meshtastic_ModuleConfig_TelemetryConfig_msg;
 extern const pb_msgdesc_t meshtastic_ModuleConfig_CannedMessageConfig_msg;
 extern const pb_msgdesc_t meshtastic_ModuleConfig_AmbientLightingConfig_msg;
-extern const pb_msgdesc_t meshtastic_ModuleConfig_StatusMessageConfig_msg;
 extern const pb_msgdesc_t meshtastic_RemoteHardwarePin_msg;

 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
@@ -926,7 +905,6 @@ extern const pb_msgdesc_t meshtastic_RemoteHardwarePin_msg;
 #define meshtastic_ModuleConfig_TelemetryConfig_fields &meshtastic_ModuleConfig_TelemetryConfig_msg
 #define meshtastic_ModuleConfig_CannedMessageConfig_fields &meshtastic_ModuleConfig_CannedMessageConfig_msg
 #define meshtastic_ModuleConfig_AmbientLightingConfig_fields &meshtastic_ModuleConfig_AmbientLightingConfig_msg
-#define meshtastic_ModuleConfig_StatusMessageConfig_fields &meshtastic_ModuleConfig_StatusMessageConfig_msg
 #define meshtastic_RemoteHardwarePin_fields &meshtastic_RemoteHardwarePin_msg

 /* Maximum encoded size of messages (where known) */
@@ -943,7 +921,6 @@ extern const pb_msgdesc_t meshtastic_RemoteHardwarePin_msg;
 #define meshtastic_ModuleConfig_RangeTestConfig_size 12
 #define meshtastic_ModuleConfig_RemoteHardwareConfig_size 96
 #define meshtastic_ModuleConfig_SerialConfig_size 28
-#define meshtastic_ModuleConfig_StatusMessageConfig_size 81
 #define meshtastic_ModuleConfig_StoreForwardConfig_size 24
 #define meshtastic_ModuleConfig_TelemetryConfig_size 50
 #define meshtastic_ModuleConfig_size             227
--- a/src/mesh/generated/meshtastic/portnums.pb.h
+++ b/src/mesh/generated/meshtastic/portnums.pb.h
@@ -91,11 +91,6 @@ typedef enum _meshtastic_PortNum {
 This module is specifically for Native Linux nodes, and provides a Git-style
 chain of messages. */
    meshtastic_PortNum_STORE_FORWARD_PLUSPLUS_APP = 35,
-    /* Node Status module
- ENCODING: protobuf
- This module allows setting an extra string of status for a node.
- Broadcasts on change and on a timer, possibly once a day. */
-    meshtastic_PortNum_NODE_STATUS_APP = 36,
    /* Provides a hardware serial interface to send and receive from the Meshtastic network.
 Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
 network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.
--- a/src/mesh/generated/meshtastic/telemetry.pb.h
+++ b/src/mesh/generated/meshtastic/telemetry.pb.h
@@ -361,8 +361,6 @@ typedef struct _meshtastic_LocalStats {
    uint32_t heap_free_bytes;
    /* Number of packets that were dropped because the transmit queue was full. */
    uint16_t num_tx_dropped;
-    /* Noise floor value measured in dBm */
-    int32_t noise_floor;
 } meshtastic_LocalStats;

 /* Health telemetry metrics */
@@ -460,7 +458,7 @@ extern "C" {
 #define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_default     {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_LocalStats_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_LocalStats_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_HealthMetrics_init_default    {false, 0, false, 0, false, 0}
 #define meshtastic_HostMetrics_init_default      {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
 #define meshtastic_Telemetry_init_default        {0, 0, {meshtastic_DeviceMetrics_init_default}}
@@ -469,7 +467,7 @@ extern "C" {
 #define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_AirQualityMetrics_init_zero   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_LocalStats_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_LocalStats_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_HealthMetrics_init_zero       {false, 0, false, 0, false, 0}
 #define meshtastic_HostMetrics_init_zero         {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
 #define meshtastic_Telemetry_init_zero           {0, 0, {meshtastic_DeviceMetrics_init_zero}}
@@ -558,7 +556,6 @@ extern "C" {
 #define meshtastic_LocalStats_heap_total_bytes_tag 12
 #define meshtastic_LocalStats_heap_free_bytes_tag 13
 #define meshtastic_LocalStats_num_tx_dropped_tag 14
-#define meshtastic_LocalStats_noise_floor_tag    15
 #define meshtastic_HealthMetrics_heart_bpm_tag   1
 #define meshtastic_HealthMetrics_spO2_tag        2
 #define meshtastic_HealthMetrics_temperature_tag 3
@@ -681,8 +678,7 @@ X(a, STATIC,   SINGULAR, UINT32,   num_tx_relay,     10) \
 X(a, STATIC,   SINGULAR, UINT32,   num_tx_relay_canceled,  11) \
 X(a, STATIC,   SINGULAR, UINT32,   heap_total_bytes,  12) \
 X(a, STATIC,   SINGULAR, UINT32,   heap_free_bytes,  13) \
-X(a, STATIC,   SINGULAR, UINT32,   num_tx_dropped,   14) \
-X(a, STATIC,   SINGULAR, INT32,    noise_floor,      15)
+X(a, STATIC,   SINGULAR, UINT32,   num_tx_dropped,   14)
 #define meshtastic_LocalStats_CALLBACK NULL
 #define meshtastic_LocalStats_DEFAULT NULL

@@ -759,7 +755,7 @@ extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
 #define meshtastic_EnvironmentMetrics_size       113
 #define meshtastic_HealthMetrics_size            11
 #define meshtastic_HostMetrics_size              264
-#define meshtastic_LocalStats_size               87
+#define meshtastic_LocalStats_size               76
 #define meshtastic_Nau7802Config_size            16
 #define meshtastic_PowerMetrics_size             81
 #define meshtastic_Telemetry_size                272
--- a/src/mesh/http/ContentHandler.cpp
+++ b/src/mesh/http/ContentHandler.cpp
@@ -173,7 +173,7 @@ void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res)

    if (req->getMethod() == "OPTIONS") {
        res->setStatusCode(204); // Success with no content
-        res->print("");
+        // res->print(""); @todo remove
        return;
    }

@@ -223,7 +223,7 @@ void handleAPIv1ToRadio(HTTPRequest *req, HTTPResponse *res)

    if (req->getMethod() == "OPTIONS") {
        res->setStatusCode(204); // Success with no content
-        res->print("");
+        // res->print(""); @todo remove
        return;
    }

--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -9,8 +9,11 @@
 #include "meshUtils.h"
 #include <FSCommon.h>
 #include <ctype.h> // for better whitespace handling
+#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_BLUETOOTH
+#include "BleOta.h"
+#endif
 #if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WIFI
-#include "MeshtasticOTA.h"
+#include "WiFiOTA.h"
 #endif
 #include "Router.h"
 #include "configuration.h"
@@ -233,51 +236,26 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
        reboot(r->reboot_seconds);
        break;
    }
-    case meshtastic_AdminMessage_ota_request_tag: {
+    case meshtastic_AdminMessage_reboot_ota_seconds_tag: {
+        int32_t s = r->reboot_ota_seconds;
 #if defined(ARCH_ESP32)
-        LOG_INFO("OTA Requested");
-
-        if (r->ota_request.ota_hash.size != 32) {
-            suppressRebootBanner = true;
-            sendWarningAndLog("Cannot start OTA: Invalid `ota_hash` provided.");
-            break;
-        }
-
-        meshtastic_OTAMode mode = r->ota_request.reboot_ota_mode;
-        const char *mode_name = (mode == METHOD_OTA_BLE ? "BLE" : "WiFi");
-
-        // Check that we have an OTA partition
-        const esp_partition_t *part = MeshtasticOTA::getAppPartition();
-        if (part == NULL) {
-            suppressRebootBanner = true;
-            sendWarningAndLog("Cannot start OTA: Cannot find OTA Loader partition.");
-            break;
-        }
-
-        static esp_app_desc_t app_desc;
-        if (!MeshtasticOTA::getAppDesc(part, &app_desc)) {
-            suppressRebootBanner = true;
-            sendWarningAndLog("Cannot start OTA: Device does have a valid OTA Loader.");
-            break;
-        }
-
-        if (!MeshtasticOTA::checkOTACapability(&app_desc, mode)) {
-            suppressRebootBanner = true;
-            sendWarningAndLog("OTA Loader does not support %s", mode_name);
-            break;
-        }
-
-        if (MeshtasticOTA::trySwitchToOTA()) {
-            suppressRebootBanner = true;
+#if !MESHTASTIC_EXCLUDE_BLUETOOTH
+        if (!BleOta::getOtaAppVersion().isEmpty()) {
            if (screen)
                screen->startFirmwareUpdateScreen();
-            MeshtasticOTA::saveConfig(&config.network, mode, r->ota_request.ota_hash.bytes);
-            sendWarningAndLog("Rebooting to %s OTA", mode_name);
-        } else {
-            sendWarningAndLog("Unable to switch to the OTA partition.");
+            BleOta::switchToOtaApp();
+            LOG_INFO("Rebooting to BLE OTA");
        }
 #endif
-        int s = 1; // Reboot in 1 second, hard coded
+#if !MESHTASTIC_EXCLUDE_WIFI
+        if (WiFiOTA::trySwitchToOTA()) {
+            if (screen)
+                screen->startFirmwareUpdateScreen();
+            WiFiOTA::saveConfig(&config.network);
+            LOG_INFO("Rebooting to WiFi OTA");
+        }
+#endif
+#endif
        LOG_INFO("Reboot in %d seconds", s);
        rebootAtMsec = (s < 0) ? 0 : (millis() + s * 1000);
        break;
@@ -1496,43 +1474,15 @@ void AdminModule::handleSendInputEvent(const meshtastic_AdminMessage_InputEvent
 #endif
 }

-void AdminModule::sendWarning(const char *format, ...)
+void AdminModule::sendWarning(const char *message)
 {
    meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
-    if (!cn)
-        return;
-
    cn->level = meshtastic_LogRecord_Level_WARNING;
    cn->time = getValidTime(RTCQualityFromNet);
-
-    va_list args;
-    va_start(args, format);
-    // Format the arguments directly into the notification object
-    vsnprintf(cn->message, sizeof(cn->message), format, args);
-    va_end(args);
-
+    strncpy(cn->message, message, sizeof(cn->message));
    service->sendClientNotification(cn);
 }

-void AdminModule::sendWarningAndLog(const char *format, ...)
-{
-    // We need a temporary buffer to hold the formatted text so we can log it
-    // Using 250 bytes as a safe upper limit for typical text notifications
-    char buf[250];
-
-    va_list args;
-    va_start(args, format);
-    vsnprintf(buf, sizeof(buf), format, args);
-    va_end(args);
-
-    LOG_WARN(buf);
-    // 2. Call sendWarning
-    // SECURITY NOTE: We pass "%s", buf instead of just 'buf'.
-    // If 'buf' contained a % symbol (e.g. "Battery 50%"), passing it directly
-    // would crash sendWarning. "%s" treats it purely as text.
-    sendWarning("%s", buf);
-}
-
 void disableBluetooth()
 {
 #if HAS_BLUETOOTH
--- a/src/modules/AdminModule.h
+++ b/src/modules/AdminModule.h
@@ -1,9 +1,7 @@
-#pragma once
-#ifdef ESP_PLATFORM
-#include <esp_ota_ops.h>
-#endif
-#include "ProtobufModule.h"
 #include <sys/types.h>
+
+#pragma once
+#include "ProtobufModule.h"
 #if HAS_WIFI
 #include "mesh/wifi/WiFiAPClient.h"
 #endif
@@ -73,8 +71,7 @@ class AdminModule : public ProtobufModule<meshtastic_AdminMessage>, public Obser

    bool messageIsResponse(const meshtastic_AdminMessage *r);
    bool messageIsRequest(const meshtastic_AdminMessage *r);
-    void sendWarning(const char *format, ...) __attribute__((format(printf, 2, 3)));
-    void sendWarningAndLog(const char *format, ...) __attribute__((format(printf, 2, 3)));
+    void sendWarning(const char *message);
 };

 static constexpr const char *licensedModeMessage =
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -460,15 +460,12 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
            }

            meshtastic_NodeInfoLite *sender = nodeDB->getMeshNode(mp.from);
+            bool mutedNode = false;
+            if (sender) {
+                mutedNode = (sender->bitfield & NODEINFO_BITFIELD_IS_MUTED_MASK);
+            }
            meshtastic_Channel ch = channels.getByIndex(mp.channel ? mp.channel : channels.getPrimaryIndex());

-            // If we receive a broadcast message, apply channel mute setting
-            // If we receive a direct message and the receipent is us, apply DM mute setting
-            // Else we just handle it as not muted.
-            const bool directToUs = !isBroadcast(mp.to) && isToUs(&mp);
-            bool is_muted = directToUs ? (sender && ((sender->bitfield & NODEINFO_BITFIELD_IS_MUTED_MASK) != 0))
-                                       : (ch.settings.has_module_settings && ch.settings.module_settings.is_muted);
-
            if (moduleConfig.external_notification.alert_bell) {
                if (containsBell) {
                    LOG_INFO("externalNotificationModule - Notification Bell");
@@ -519,7 +516,8 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
                }
            }

-            if (moduleConfig.external_notification.alert_message && !is_muted) {
+            if (moduleConfig.external_notification.alert_message && !mutedNode &&
+                (!ch.settings.has_module_settings || !ch.settings.module_settings.is_muted)) {
                LOG_INFO("externalNotificationModule - Notification Module");
                isNagging = true;
                setExternalState(0, true);
@@ -530,7 +528,8 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
                }
            }

-            if (moduleConfig.external_notification.alert_message_vibra && !is_muted) {
+            if (moduleConfig.external_notification.alert_message_vibra && !mutedNode &&
+                (!ch.settings.has_module_settings || !ch.settings.module_settings.is_muted)) {
                LOG_INFO("externalNotificationModule - Notification Module (Vibra)");
                isNagging = true;
                setExternalState(1, true);
@@ -541,7 +540,8 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
                }
            }

-            if (moduleConfig.external_notification.alert_message_buzzer && !is_muted) {
+            if (moduleConfig.external_notification.alert_message_buzzer && !mutedNode &&
+                (!ch.settings.has_module_settings || !ch.settings.module_settings.is_muted)) {
                LOG_INFO("externalNotificationModule - Notification Module (Buzzer)");
                if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY ||
                    (!isBroadcast(mp.to) && isToUs(&mp))) {
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -252,9 +252,9 @@ void setupModules()
        (moduleConfig.telemetry.environment_measurement_enabled || moduleConfig.telemetry.environment_screen_enabled)) {
        new EnvironmentTelemetryModule();
    }
-#if HAS_TELEMETRY && HAS_SENSOR && !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
-    if (moduleConfig.has_telemetry &&
-        (moduleConfig.telemetry.air_quality_enabled || moduleConfig.telemetry.air_quality_screen_enabled)) {
+#if __has_include("Adafruit_PM25AQI.h")
+    if (moduleConfig.has_telemetry && moduleConfig.telemetry.air_quality_enabled &&
+        nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_PMSA003I].first > 0) {
        new AirQualityTelemetryModule();
    }
 #endif
--- a/src/modules/NodeInfoModule.cpp
+++ b/src/modules/NodeInfoModule.cpp
@@ -2,7 +2,6 @@
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "NodeStatus.h"
 #include "RTC.h"
 #include "Router.h"
 #include "configuration.h"
@@ -130,17 +129,14 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
        LOG_DEBUG("Skip send NodeInfo > 40%% ch. util");
        return NULL;
    }
-
-    // Use graduated scaling based on active mesh size (10 minute base, scales with congestion coefficient)
-    uint32_t timeoutMs = Default::getConfiguredOrDefaultMsScaled(0, 10 * 60, nodeStatus->getNumOnline());
-    if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, timeoutMs)) {
-        LOG_DEBUG("Skip send NodeInfo since we sent it <%us ago", timeoutMs / 1000);
+    // If we sent our NodeInfo less than 5 min. ago, don't send it again as it may be still underway.
+    if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 5 * 60 * 1000)) {
+        LOG_DEBUG("Skip send NodeInfo since we sent it <5min ago");
        ignoreRequest = true; // Mark it as ignored for MeshModule
        return NULL;
    } else if (shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 60 * 1000)) {
-        // For interactive/urgent requests (e.g., user-triggered or implicit requests), use a shorter 60s timeout
        LOG_DEBUG("Skip send NodeInfo since we sent it <60s ago");
-        ignoreRequest = true;
+        ignoreRequest = true; // Mark it as ignored for MeshModule
        return NULL;
    } else {
        ignoreRequest = false; // Don't ignore requests anymore
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -64,9 +64,8 @@ SerialModule *serialModule;
 SerialModuleRadio *serialModuleRadio;

 #if defined(TTGO_T_ECHO) || defined(TTGO_T_ECHO_PLUS) || defined(CANARYONE) || defined(MESHLINK) ||                              \
-    defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M4) || defined(ELECROW_ThinkNode_M5) ||                           \
-    defined(HELTEC_MESH_SOLAR) || defined(T_ECHO_LITE) || defined(ELECROW_ThinkNode_M3) || defined(MUZI_BASE)
-
+    defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M5) || defined(HELTEC_MESH_SOLAR) || defined(T_ECHO_LITE) ||      \
+    defined(ELECROW_ThinkNode_M3) || defined(MUZI_BASE)
 SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("Serial")
 {
    api_type = TYPE_SERIAL;
@@ -206,9 +205,8 @@ int32_t SerialModule::runOnce()
                Serial.setTimeout(moduleConfig.serial.timeout > 0 ? moduleConfig.serial.timeout : TIMEOUT);
            }
 #elif !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) &&                     \
-    !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M4) &&  \
-    !defined(ELECROW_ThinkNode_M5) && !defined(MUZI_BASE)
-
+    !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) &&  \
+    !defined(MUZI_BASE)
            if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
 #ifdef ARCH_RP2040
                Serial2.setFIFOSize(RX_BUFFER);
@@ -265,8 +263,7 @@ int32_t SerialModule::runOnce()
            }

 #if !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(MESHLINK) && \
-    !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M4) &&                        \
-    !defined(ELECROW_ThinkNode_M5) && !defined(MUZI_BASE)
+    !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) && !defined(MUZI_BASE)
            else if ((moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_WS85)) {
                processWXSerial();

@@ -542,10 +539,7 @@ void SerialModule::processWXSerial()
 {
 #if !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) &&                       \
    !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) &&                               \
-    !defined(ELECROW_ThinkNode_M3) && \ 
-    !defined(ELECROW_ThinkNode_M4) &&                                                                                            \
-    !defined(ELECROW_ThinkNode_M5) && !defined(ARCH_STM32WL) && !defined(MUZI_BASE)
-
+    !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) && !defined(ARCH_STM32WL) && !defined(MUZI_BASE)
    static unsigned int lastAveraged = 0;
    static unsigned int averageIntervalMillis = 300000; // 5 minutes hard coded.
    static double dir_sum_sin = 0;
--- a/src/modules/StatusLEDModule.cpp
+++ b/src/modules/StatusLEDModule.cpp
@@ -13,8 +13,6 @@ StatusLEDModule::StatusLEDModule() : concurrency::OSThread("StatusLEDModule")
 {
    bluetoothStatusObserver.observe(&bluetoothStatus->onNewStatus);
    powerStatusObserver.observe(&powerStatus->onNewStatus);
-    if (inputBroker)
-        inputObserver.observe(inputBroker);
 }

 int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
@@ -50,10 +48,9 @@ int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
            break;
        }
        case meshtastic::BluetoothStatus::ConnectionState::CONNECTED: {
-            if (ble_state != connected) {
-                ble_state = connected;
-                PAIRING_LED_starttime = millis();
-            }
+            ble_state = connected;
+            PAIRING_LED_starttime = millis();
+            break;
        }
        }

@@ -63,12 +60,6 @@ int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
    return 0;
 };

-int StatusLEDModule::handleInputEvent(const InputEvent *event)
-{
-    lastUserbuttonTime = millis();
-    return 0;
-}
-
 int32_t StatusLEDModule::runOnce()
 {
    my_interval = 1000;
@@ -112,21 +103,6 @@ int32_t StatusLEDModule::runOnce()
        PAIRING_LED_state = LED_STATE_ON;
    }

-    bool chargeIndicatorLED1 = LED_STATE_OFF;
-    bool chargeIndicatorLED2 = LED_STATE_OFF;
-    bool chargeIndicatorLED3 = LED_STATE_OFF;
-    bool chargeIndicatorLED4 = LED_STATE_OFF;
-    if (lastUserbuttonTime + 10 * 1000 > millis() || CHARGE_LED_state == LED_STATE_ON) {
-        // should this be off at very low percentages?
-        chargeIndicatorLED1 = LED_STATE_ON;
-        if (powerStatus && powerStatus->getBatteryChargePercent() >= 25)
-            chargeIndicatorLED2 = LED_STATE_ON;
-        if (powerStatus && powerStatus->getBatteryChargePercent() >= 50)
-            chargeIndicatorLED3 = LED_STATE_ON;
-        if (powerStatus && powerStatus->getBatteryChargePercent() >= 75)
-            chargeIndicatorLED4 = LED_STATE_ON;
-    }
-
 #ifdef LED_CHARGE
    digitalWrite(LED_CHARGE, CHARGE_LED_state);
 #endif
@@ -135,18 +111,5 @@ int32_t StatusLEDModule::runOnce()
    digitalWrite(LED_PAIRING, PAIRING_LED_state);
 #endif

-#ifdef Battery_LED_1
-    digitalWrite(Battery_LED_1, chargeIndicatorLED1);
-#endif
-#ifdef Battery_LED_2
-    digitalWrite(Battery_LED_2, chargeIndicatorLED2);
-#endif
-#ifdef Battery_LED_3
-    digitalWrite(Battery_LED_3, chargeIndicatorLED3);
-#endif
-#ifdef Battery_LED_4
-    digitalWrite(Battery_LED_4, chargeIndicatorLED4);
-#endif
-
    return (my_interval);
 }
--- a/src/modules/StatusLEDModule.h
+++ b/src/modules/StatusLEDModule.h
@@ -5,7 +5,6 @@
 #include "PowerStatus.h"
 #include "concurrency/OSThread.h"
 #include "configuration.h"
-#include "input/InputBroker.h"
 #include <Arduino.h>
 #include <functional>

@@ -18,8 +17,6 @@ class StatusLEDModule : private concurrency::OSThread

    int handleStatusUpdate(const meshtastic::Status *);

-    int handleInputEvent(const InputEvent *arg);
-
  protected:
    unsigned int my_interval = 1000; // interval in millisconds
    virtual int32_t runOnce() override;
@@ -28,15 +25,12 @@ class StatusLEDModule : private concurrency::OSThread
        CallbackObserver<StatusLEDModule, const meshtastic::Status *>(this, &StatusLEDModule::handleStatusUpdate);
    CallbackObserver<StatusLEDModule, const meshtastic::Status *> powerStatusObserver =
        CallbackObserver<StatusLEDModule, const meshtastic::Status *>(this, &StatusLEDModule::handleStatusUpdate);
-    CallbackObserver<StatusLEDModule, const InputEvent *> inputObserver =
-        CallbackObserver<StatusLEDModule, const InputEvent *>(this, &StatusLEDModule::handleInputEvent);

  private:
    bool CHARGE_LED_state = LED_STATE_OFF;
    bool PAIRING_LED_state = LED_STATE_OFF;

    uint32_t PAIRING_LED_starttime = 0;
-    uint32_t lastUserbuttonTime = 0;
    uint32_t POWER_LED_starttime = 0;
    bool doing_fast_blink = false;

--- a/src/modules/Telemetry/AirQualityTelemetry.cpp
+++ b/src/modules/Telemetry/AirQualityTelemetry.cpp
@@ -1,6 +1,6 @@
 #include "configuration.h"

-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include("Adafruit_PM25AQI.h")

 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "AirQualityTelemetry.h"
@@ -10,54 +10,27 @@
 #include "PowerFSM.h"
 #include "RTC.h"
 #include "Router.h"
-#include "Sensor/AddI2CSensorTemplate.h"
-#include "UnitConversions.h"
-#include "graphics/ScreenFonts.h"
-#include "graphics/SharedUIDisplay.h"
-#include "graphics/images.h"
+#include "detect/ScanI2CTwoWire.h"
 #include "main.h"
-#include "sleep.h"
 #include <Throttle.h>

-// Sensors
-#include "Sensor/PMSA003ISensor.h"
-
-void AirQualityTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
-{
-    if (!moduleConfig.telemetry.air_quality_enabled && !AIR_QUALITY_TELEMETRY_MODULE_ENABLE) {
-        return;
-    }
-    LOG_INFO("Air Quality Telemetry adding I2C devices...");
-
-    /*
-        Uncomment the preferences below if you want to use the module
-        without having to configure it from the PythonAPI or WebUI.
-        Note: this was previously on runOnce, which didnt take effect
-        as other modules already had already been initialized (screen)
-    */
-
-    // moduleConfig.telemetry.air_quality_enabled = 1;
-    // moduleConfig.telemetry.air_quality_screen_enabled = 1;
-    // moduleConfig.telemetry.air_quality_interval = 15;
-
-    // order by priority of metrics/values (low top, high bottom)
-    addSensor<PMSA003ISensor>(i2cScanner, ScanI2C::DeviceType::PMSA003I);
-}
+#ifndef PMSA003I_WARMUP_MS
+// from the PMSA003I datasheet:
+// "Stable data should be got at least 30 seconds after the sensor wakeup
+// from the sleep mode because of the fan’s performance."
+#define PMSA003I_WARMUP_MS 30000
+#endif

 int32_t AirQualityTelemetryModule::runOnce()
 {
-    if (sleepOnNextExecution == true) {
-        sleepOnNextExecution = false;
-        uint32_t nightyNightMs = Default::getConfiguredOrDefaultMs(moduleConfig.telemetry.air_quality_interval,
-                                                                   default_telemetry_broadcast_interval_secs);
-        LOG_DEBUG("Sleeping for %ims, then awaking to send metrics again.", nightyNightMs);
-        doDeepSleep(nightyNightMs, true, false);
-    }
+    /*
+        Uncomment the preferences below if you want to use the module
+        without having to configure it from the PythonAPI or WebUI.
+    */

-    uint32_t result = UINT32_MAX;
+    // moduleConfig.telemetry.air_quality_enabled = 1;

-    if (!(moduleConfig.telemetry.air_quality_enabled || moduleConfig.telemetry.air_quality_screen_enabled ||
-          AIR_QUALITY_TELEMETRY_MODULE_ENABLE)) {
+    if (!(moduleConfig.telemetry.air_quality_enabled)) {
        // If this module is not enabled, and the user doesn't want the display screen don't waste any OSThread time on it
        return disable();
    }
@@ -69,152 +42,82 @@ int32_t AirQualityTelemetryModule::runOnce()
        if (moduleConfig.telemetry.air_quality_enabled) {
            LOG_INFO("Air quality Telemetry: init");

-            // check if we have at least one sensor
-            if (!sensors.empty()) {
-                result = DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
-            }
-        }
+#ifdef PMSA003I_ENABLE_PIN
+            // put the sensor to sleep on startup
+            pinMode(PMSA003I_ENABLE_PIN, OUTPUT);
+            digitalWrite(PMSA003I_ENABLE_PIN, LOW);
+#endif /* PMSA003I_ENABLE_PIN */

-        // it's possible to have this module enabled, only for displaying values on the screen.
-        // therefore, we should only enable the sensor loop if measurement is also enabled
-        return result == UINT32_MAX ? disable() : setStartDelay();
+            if (!aqi.begin_I2C()) {
+#ifndef I2C_NO_RESCAN
+                LOG_WARN("Could not establish i2c connection to AQI sensor. Rescan");
+                // rescan for late arriving sensors. AQI Module starts about 10 seconds into the boot so this is plenty.
+                uint8_t i2caddr_scan[] = {PMSA0031_ADDR};
+                uint8_t i2caddr_asize = 1;
+                auto i2cScanner = std::unique_ptr<ScanI2CTwoWire>(new ScanI2CTwoWire());
+#if defined(I2C_SDA1)
+                i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1, i2caddr_scan, i2caddr_asize);
+#endif
+                i2cScanner->scanPort(ScanI2C::I2CPort::WIRE, i2caddr_scan, i2caddr_asize);
+                auto found = i2cScanner->find(ScanI2C::DeviceType::PMSA0031);
+                if (found.type != ScanI2C::DeviceType::NONE) {
+                    nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_PMSA003I].first = found.address.address;
+                    nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_PMSA003I].second =
+                        i2cScanner->fetchI2CBus(found.address);
+                    return setStartDelay();
+                }
+#endif
+                return disable();
+            }
+            return setStartDelay();
+        }
+        return disable();
    } else {
        // if we somehow got to a second run of this module with measurement disabled, then just wait forever
-        if (!moduleConfig.telemetry.air_quality_enabled && !AIR_QUALITY_TELEMETRY_MODULE_ENABLE) {
+        if (!moduleConfig.telemetry.air_quality_enabled)
+            return disable();
+
+        switch (state) {
+#ifdef PMSA003I_ENABLE_PIN
+        case State::IDLE:
+            // sensor is in standby; fire it up and sleep
+            LOG_DEBUG("runOnce(): state = idle");
+            digitalWrite(PMSA003I_ENABLE_PIN, HIGH);
+            state = State::ACTIVE;
+
+            return PMSA003I_WARMUP_MS;
+#endif /* PMSA003I_ENABLE_PIN */
+        case State::ACTIVE:
+            // sensor is already warmed up; grab telemetry and send it
+            LOG_DEBUG("runOnce(): state = active");
+
+            if (((lastSentToMesh == 0) ||
+                 !Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
+                                                                   moduleConfig.telemetry.air_quality_interval,
+                                                                   default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
+                airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+                airTime->isTxAllowedAirUtil()) {
+                sendTelemetry();
+                lastSentToMesh = millis();
+            } else if (service->isToPhoneQueueEmpty()) {
+                // Just send to phone when it's not our time to send to mesh yet
+                // Only send while queue is empty (phone assumed connected)
+                sendTelemetry(NODENUM_BROADCAST, true);
+            }
+
+#ifdef PMSA003I_ENABLE_PIN
+            // put sensor back to sleep
+            digitalWrite(PMSA003I_ENABLE_PIN, LOW);
+            state = State::IDLE;
+#endif /* PMSA003I_ENABLE_PIN */
+
+            return sendToPhoneIntervalMs;
+        default:
            return disable();
        }
-
-        // Wake up the sensors that need it
-        LOG_INFO("Waking up sensors");
-        for (TelemetrySensor *sensor : sensors) {
-            if (!sensor->isActive()) {
-                return sensor->wakeUp();
-            }
-        }
-
-        if (((lastSentToMesh == 0) ||
-             !Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
-                                                               moduleConfig.telemetry.air_quality_interval,
-                                                               default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
-            airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
-            airTime->isTxAllowedAirUtil()) {
-            sendTelemetry();
-            lastSentToMesh = millis();
-        } else if (((lastSentToPhone == 0) || !Throttle::isWithinTimespanMs(lastSentToPhone, sendToPhoneIntervalMs)) &&
-                   (service->isToPhoneQueueEmpty())) {
-            // Just send to phone when it's not our time to send to mesh yet
-            // Only send while queue is empty (phone assumed connected)
-            sendTelemetry(NODENUM_BROADCAST, true);
-            lastSentToPhone = millis();
-        }
-
-        // Send to sleep sensors that consume power
-        LOG_INFO("Sending sensors to sleep");
-        for (TelemetrySensor *sensor : sensors) {
-            sensor->sleep();
-        }
    }
-    return min(sendToPhoneIntervalMs, result);
 }

-bool AirQualityTelemetryModule::wantUIFrame()
-{
-    return moduleConfig.telemetry.air_quality_screen_enabled;
-}
-
-#if HAS_SCREEN
-void AirQualityTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    // === Setup display ===
-    display->clear();
-    display->setFont(FONT_SMALL);
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
-    int line = 1;
-
-    // === Set Title
-    const char *titleStr = (graphics::currentResolution == graphics::ScreenResolution::High) ? "Air Quality" : "AQ.";
-
-    // === Header ===
-    graphics::drawCommonHeader(display, x, y, titleStr);
-
-    // === Row spacing setup ===
-    const int rowHeight = FONT_HEIGHT_SMALL - 4;
-    int currentY = graphics::getTextPositions(display)[line++];
-
-    // === Show "No Telemetry" if no data available ===
-    if (!lastMeasurementPacket) {
-        display->drawString(x, currentY, "No Telemetry");
-        return;
-    }
-
-    // Decode the telemetry message from the latest received packet
-    const meshtastic_Data &p = lastMeasurementPacket->decoded;
-    meshtastic_Telemetry telemetry;
-    if (!pb_decode_from_bytes(p.payload.bytes, p.payload.size, &meshtastic_Telemetry_msg, &telemetry)) {
-        display->drawString(x, currentY, "No Telemetry");
-        return;
-    }
-
-    const auto &m = telemetry.variant.air_quality_metrics;
-
-    // Check if any telemetry field has valid data
-    bool hasAny = m.has_pm10_standard || m.has_pm25_standard || m.has_pm100_standard || m.has_pm10_environmental ||
-                  m.has_pm25_environmental || m.has_pm100_environmental;
-
-    if (!hasAny) {
-        display->drawString(x, currentY, "No Telemetry");
-        return;
-    }
-
-    // === First line: Show sender name + time since received (left), and first metric (right) ===
-    const char *sender = getSenderShortName(*lastMeasurementPacket);
-    uint32_t agoSecs = service->GetTimeSinceMeshPacket(lastMeasurementPacket);
-    String agoStr = (agoSecs > 864000) ? "?"
-                    : (agoSecs > 3600) ? String(agoSecs / 3600) + "h"
-                    : (agoSecs > 60)   ? String(agoSecs / 60) + "m"
-                                       : String(agoSecs) + "s";
-
-    String leftStr = String(sender) + " (" + agoStr + ")";
-    display->drawString(x, currentY, leftStr); // Left side: who and when
-
-    // === Collect sensor readings as label strings (no icons) ===
-    std::vector<String> entries;
-
-    if (m.has_pm10_standard)
-        entries.push_back("PM1: " + String(m.pm10_standard) + "ug/m3");
-    if (m.has_pm25_standard)
-        entries.push_back("PM2.5: " + String(m.pm25_standard) + "ug/m3");
-    if (m.has_pm100_standard)
-        entries.push_back("PM10: " + String(m.pm100_standard) + "ug/m3");
-
-    // === Show first available metric on top-right of first line ===
-    if (!entries.empty()) {
-        String valueStr = entries.front();
-        int rightX = SCREEN_WIDTH - display->getStringWidth(valueStr);
-        display->drawString(rightX, currentY, valueStr);
-        entries.erase(entries.begin()); // Remove from queue
-    }
-
-    // === Advance to next line for remaining telemetry entries ===
-    currentY += rowHeight;
-
-    // === Draw remaining entries in 2-column format (left and right) ===
-    for (size_t i = 0; i < entries.size(); i += 2) {
-        // Left column
-        display->drawString(x, currentY, entries[i]);
-
-        // Right column if it exists
-        if (i + 1 < entries.size()) {
-            int rightX = SCREEN_WIDTH / 2;
-            display->drawString(rightX, currentY, entries[i + 1]);
-        }
-
-        currentY += rowHeight;
-    }
-    graphics::drawCommonFooter(display, x, y);
-}
-#endif
-
 bool AirQualityTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
 {
    if (t->which_variant == meshtastic_Telemetry_air_quality_metrics_tag) {
@@ -241,21 +144,35 @@ bool AirQualityTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPack

 bool AirQualityTelemetryModule::getAirQualityTelemetry(meshtastic_Telemetry *m)
 {
-    bool valid = true;
-    bool hasSensor = false;
-    m->time = getTime();
-    m->which_variant = meshtastic_Telemetry_air_quality_metrics_tag;
-    m->variant.air_quality_metrics = meshtastic_AirQualityMetrics_init_zero;
-
-    // TODO - Should we check for sensor state here?
-    // If a sensor is sleeping, we should know and check to wake it up
-    for (TelemetrySensor *sensor : sensors) {
-        LOG_INFO("Reading AQ sensors");
-        valid = valid && sensor->getMetrics(m);
-        hasSensor = true;
+    if (!aqi.read(&data)) {
+        LOG_WARN("Skip send measurements. Could not read AQIn");
+        return false;
    }

-    return valid && hasSensor;
+    m->time = getTime();
+    m->which_variant = meshtastic_Telemetry_air_quality_metrics_tag;
+    m->variant.air_quality_metrics.has_pm10_standard = true;
+    m->variant.air_quality_metrics.pm10_standard = data.pm10_standard;
+    m->variant.air_quality_metrics.has_pm25_standard = true;
+    m->variant.air_quality_metrics.pm25_standard = data.pm25_standard;
+    m->variant.air_quality_metrics.has_pm100_standard = true;
+    m->variant.air_quality_metrics.pm100_standard = data.pm100_standard;
+
+    m->variant.air_quality_metrics.has_pm10_environmental = true;
+    m->variant.air_quality_metrics.pm10_environmental = data.pm10_env;
+    m->variant.air_quality_metrics.has_pm25_environmental = true;
+    m->variant.air_quality_metrics.pm25_environmental = data.pm25_env;
+    m->variant.air_quality_metrics.has_pm100_environmental = true;
+    m->variant.air_quality_metrics.pm100_environmental = data.pm100_env;
+
+    LOG_INFO("Send: PM1.0(Standard)=%i, PM2.5(Standard)=%i, PM10.0(Standard)=%i", m->variant.air_quality_metrics.pm10_standard,
+             m->variant.air_quality_metrics.pm25_standard, m->variant.air_quality_metrics.pm100_standard);
+
+    LOG_INFO("         | PM1.0(Environmental)=%i, PM2.5(Environmental)=%i, PM10.0(Environmental)=%i",
+             m->variant.air_quality_metrics.pm10_environmental, m->variant.air_quality_metrics.pm25_environmental,
+             m->variant.air_quality_metrics.pm100_environmental);
+
+    return true;
 }

 meshtastic_MeshPacket *AirQualityTelemetryModule::allocReply()
@@ -289,15 +206,7 @@ meshtastic_MeshPacket *AirQualityTelemetryModule::allocReply()
 bool AirQualityTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
 {
    meshtastic_Telemetry m = meshtastic_Telemetry_init_zero;
-    m.which_variant = meshtastic_Telemetry_air_quality_metrics_tag;
-    m.time = getTime();
    if (getAirQualityTelemetry(&m)) {
-        LOG_INFO("Send: pm10_standard=%u, pm25_standard=%u, pm100_standard=%u, \
-                    pm10_environmental=%u, pm25_environmental=%u, pm100_environmental=%u",
-                 m.variant.air_quality_metrics.pm10_standard, m.variant.air_quality_metrics.pm25_standard,
-                 m.variant.air_quality_metrics.pm100_standard, m.variant.air_quality_metrics.pm10_environmental,
-                 m.variant.air_quality_metrics.pm25_environmental, m.variant.air_quality_metrics.pm100_environmental);
-
        meshtastic_MeshPacket *p = allocDataProtobuf(m);
        p->to = dest;
        p->decoded.want_response = false;
@@ -312,44 +221,16 @@ bool AirQualityTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)

        lastMeasurementPacket = packetPool.allocCopy(*p);
        if (phoneOnly) {
-            LOG_INFO("Sending packet to phone");
+            LOG_INFO("Send packet to phone");
            service->sendToPhone(p);
        } else {
-            LOG_INFO("Sending packet to mesh");
+            LOG_INFO("Send packet to mesh");
            service->sendToMesh(p, RX_SRC_LOCAL, true);
-
-            if (config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR && config.power.is_power_saving) {
-                meshtastic_ClientNotification *notification = clientNotificationPool.allocZeroed();
-                notification->level = meshtastic_LogRecord_Level_INFO;
-                notification->time = getValidTime(RTCQualityFromNet);
-                sprintf(notification->message, "Sending telemetry and sleeping for %us interval in a moment",
-                        Default::getConfiguredOrDefaultMs(moduleConfig.telemetry.air_quality_interval,
-                                                          default_telemetry_broadcast_interval_secs) /
-                            1000U);
-                service->sendClientNotification(notification);
-                sleepOnNextExecution = true;
-                LOG_DEBUG("Start next execution in 5s, then sleep");
-                setIntervalFromNow(FIVE_SECONDS_MS);
-            }
        }
        return true;
    }
+
    return false;
 }

-AdminMessageHandleResult AirQualityTelemetryModule::handleAdminMessageForModule(const meshtastic_MeshPacket &mp,
-                                                                                meshtastic_AdminMessage *request,
-                                                                                meshtastic_AdminMessage *response)
-{
-    AdminMessageHandleResult result = AdminMessageHandleResult::NOT_HANDLED;
-
-    for (TelemetrySensor *sensor : sensors) {
-        result = sensor->handleAdminMessage(mp, request, response);
-        if (result != AdminMessageHandleResult::NOT_HANDLED)
-            return result;
-    }
-
-    return result;
-}
-
 #endif
--- a/src/modules/Telemetry/AirQualityTelemetry.h
+++ b/src/modules/Telemetry/AirQualityTelemetry.h
@@ -1,23 +1,14 @@
 #include "configuration.h"

-#if !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include("Adafruit_PM25AQI.h")

 #pragma once
-
-#ifndef AIR_QUALITY_TELEMETRY_MODULE_ENABLE
-#define AIR_QUALITY_TELEMETRY_MODULE_ENABLE 0
-#endif
-
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "Adafruit_PM25AQI.h"
 #include "NodeDB.h"
 #include "ProtobufModule.h"
-#include "detect/ScanI2CConsumer.h"
-#include <OLEDDisplay.h>
-#include <OLEDDisplayUi.h>

-class AirQualityTelemetryModule : private concurrency::OSThread,
-                                  public ScanI2CConsumer,
-                                  public ProtobufModule<meshtastic_Telemetry>
+class AirQualityTelemetryModule : private concurrency::OSThread, public ProtobufModule<meshtastic_Telemetry>
 {
    CallbackObserver<AirQualityTelemetryModule, const meshtastic::Status *> nodeStatusObserver =
        CallbackObserver<AirQualityTelemetryModule, const meshtastic::Status *>(this,
@@ -25,19 +16,22 @@ class AirQualityTelemetryModule : private concurrency::OSThread,

  public:
    AirQualityTelemetryModule()
-        : concurrency::OSThread("AirQualityTelemetry"), ScanI2CConsumer(),
+        : concurrency::OSThread("AirQualityTelemetry"),
          ProtobufModule("AirQualityTelemetry", meshtastic_PortNum_TELEMETRY_APP, &meshtastic_Telemetry_msg)
    {
        lastMeasurementPacket = nullptr;
-        nodeStatusObserver.observe(&nodeStatus->onNewStatus);
        setIntervalFromNow(10 * 1000);
-    }
-    virtual bool wantUIFrame() override;
-#if !HAS_SCREEN
-    void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
+        aqi = Adafruit_PM25AQI();
+        nodeStatusObserver.observe(&nodeStatus->onNewStatus);
+
+#ifdef PMSA003I_ENABLE_PIN
+        // the PMSA003I sensor uses about 300mW on its own; support powering it off when it's not actively taking
+        // a reading
+        state = State::IDLE;
 #else
-    virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) override;
+        state = State::ACTIVE;
 #endif
+    }

  protected:
    /** Called to handle a particular incoming message
@@ -55,17 +49,19 @@ class AirQualityTelemetryModule : private concurrency::OSThread,
     */
    bool sendTelemetry(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);

-    virtual AdminMessageHandleResult handleAdminMessageForModule(const meshtastic_MeshPacket &mp,
-                                                                 meshtastic_AdminMessage *request,
-                                                                 meshtastic_AdminMessage *response) override;
-    void i2cScanFinished(ScanI2C *i2cScanner);
-
  private:
+    enum State {
+        IDLE = 0,
+        ACTIVE = 1,
+    };
+
+    State state;
+    Adafruit_PM25AQI aqi;
+    PM25_AQI_Data data = {0};
    bool firstTime = true;
    meshtastic_MeshPacket *lastMeasurementPacket;
    uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
    uint32_t lastSentToMesh = 0;
-    uint32_t lastSentToPhone = 0;
 };

 #endif
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -53,7 +53,7 @@ extern void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const c
 #include "Sensor/LTR390UVSensor.h"
 #endif

-#if __has_include(<bsec2.h>) || __has_include(<Adafruit_BME680.h>)
+#if __has_include(MESHTASTIC_BME680_HEADER)
 #include "Sensor/BME680Sensor.h"
 #endif

@@ -141,10 +141,37 @@ extern void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const c
 #define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
 #define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true

-#include "Sensor/AddI2CSensorTemplate.h"
 #include "graphics/ScreenFonts.h"
 #include <Throttle.h>

+#include <forward_list>
+
+static std::forward_list<TelemetrySensor *> sensors;
+
+template <typename T> void addSensor(ScanI2C *i2cScanner, ScanI2C::DeviceType type)
+{
+    ScanI2C::FoundDevice dev = i2cScanner->find(type);
+    if (dev.type != ScanI2C::DeviceType::NONE || type == ScanI2C::DeviceType::NONE) {
+        TelemetrySensor *sensor = new T();
+#if WIRE_INTERFACES_COUNT > 1
+        TwoWire *bus = ScanI2CTwoWire::fetchI2CBus(dev.address);
+        if (dev.address.port != ScanI2C::I2CPort::WIRE1 && sensor->onlyWire1()) {
+            // This sensor only works on Wire (Wire1 is not supported)
+            delete sensor;
+            return;
+        }
+#else
+        TwoWire *bus = &Wire;
+#endif
+        if (sensor->initDevice(bus, &dev)) {
+            sensors.push_front(sensor);
+            return;
+        }
+        // destroy sensor
+        delete sensor;
+    }
+}
+
 void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
 {
    if (!moduleConfig.telemetry.environment_measurement_enabled && !ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE) {
@@ -187,7 +214,7 @@ void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
 #if __has_include(<Adafruit_LTR390.h>)
    addSensor<LTR390UVSensor>(i2cScanner, ScanI2C::DeviceType::LTR390UV);
 #endif
-#if __has_include(<bsec2.h>) || __has_include(<Adafruit_BME680.h>)
+#if __has_include(MESHTASTIC_BME680_HEADER)
    addSensor<BME680Sensor>(i2cScanner, ScanI2C::DeviceType::BME_680);
 #endif
 #if __has_include(<Adafruit_BMP280.h>)
@@ -615,6 +642,8 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
        LOG_INFO("Send: soil_temperature=%f, soil_moisture=%u", m.variant.environment_metrics.soil_temperature,
                 m.variant.environment_metrics.soil_moisture);

+        sensor_read_error_count = 0;
+
        meshtastic_MeshPacket *p = allocDataProtobuf(m);
        p->to = dest;
        p->decoded.want_response = false;
--- a/src/modules/Telemetry/EnvironmentTelemetry.h
+++ b/src/modules/Telemetry/EnvironmentTelemetry.h
@@ -67,6 +67,7 @@ class EnvironmentTelemetryModule : private concurrency::OSThread,
    uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
    uint32_t lastSentToMesh = 0;
    uint32_t lastSentToPhone = 0;
+    uint32_t sensor_read_error_count = 0;
 };

 #endif
--- a/src/modules/Telemetry/Sensor/AddI2CSensorTemplate.h
+++ b/src/modules/Telemetry/Sensor/AddI2CSensorTemplate.h
@@ -1,34 +0,0 @@
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR || !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
-
-#include "TelemetrySensor.h"
-#include "detect/ScanI2C.h"
-#include "detect/ScanI2CTwoWire.h"
-#include <Wire.h>
-#include <forward_list>
-
-static std::forward_list<TelemetrySensor *> sensors;
-
-template <typename T> void addSensor(ScanI2C *i2cScanner, ScanI2C::DeviceType type)
-{
-    ScanI2C::FoundDevice dev = i2cScanner->find(type);
-    if (dev.type != ScanI2C::DeviceType::NONE || type == ScanI2C::DeviceType::NONE) {
-        TelemetrySensor *sensor = new T();
-#if WIRE_INTERFACES_COUNT > 1
-        TwoWire *bus = ScanI2CTwoWire::fetchI2CBus(dev.address);
-        if (dev.address.port != ScanI2C::I2CPort::WIRE1 && sensor->onlyWire1()) {
-            // This sensor only works on Wire (Wire1 is not supported)
-            delete sensor;
-            return;
-        }
-#else
-        TwoWire *bus = &Wire;
-#endif
-        if (sensor->initDevice(bus, &dev)) {
-            sensors.push_front(sensor);
-            return;
-        }
-        // destroy sensor
-        delete sensor;
-    }
-}
-#endif
--- a/src/modules/Telemetry/Sensor/BME680Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BME680Sensor.cpp
@@ -1,6 +1,6 @@
 #include "configuration.h"

-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && (__has_include(<bsec2.h>) || __has_include(<Adafruit_BME680.h>))
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(MESHTASTIC_BME680_HEADER)

 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "BME680Sensor.h"
@@ -10,7 +10,7 @@

 BME680Sensor::BME680Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_BME680, "BME680") {}

-#if __has_include(<bsec2.h>)
+#if MESHTASTIC_BME680_BSEC2_SUPPORTED == 1
 int32_t BME680Sensor::runOnce()
 {
    if (!bme680.run()) {
@@ -18,13 +18,13 @@ int32_t BME680Sensor::runOnce()
    }
    return 35;
 }
-#endif
+#endif // defined(MESHTASTIC_BME680_BSEC2_SUPPORTED)

 bool BME680Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
 {
    status = 0;

-#if __has_include(<bsec2.h>)
+#if MESHTASTIC_BME680_BSEC2_SUPPORTED == 1
    if (!bme680.begin(dev->address.address, *bus))
        checkStatus("begin");

@@ -56,7 +56,7 @@ bool BME680Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)

    status = 1;

-#endif
+#endif // MESHTASTIC_BME680_BSEC2_SUPPORTED

    initI2CSensor();
    return status;
@@ -64,7 +64,7 @@ bool BME680Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)

 bool BME680Sensor::getMetrics(meshtastic_Telemetry *measurement)
 {
-#if __has_include(<bsec2.h>)
+#if MESHTASTIC_BME680_BSEC2_SUPPORTED == 1
    if (bme680.getData(BSEC_OUTPUT_RAW_PRESSURE).signal == 0)
        return false;

@@ -98,11 +98,11 @@ bool BME680Sensor::getMetrics(meshtastic_Telemetry *measurement)
    measurement->variant.environment_metrics.barometric_pressure = bme680->readPressure() / 100.0F;
    measurement->variant.environment_metrics.gas_resistance = bme680->readGas() / 1000.0;

-#endif
+#endif // MESHTASTIC_BME680_BSEC2_SUPPORTED
    return true;
 }

-#if __has_include(<bsec2.h>)
+#if MESHTASTIC_BME680_BSEC2_SUPPORTED == 1
 void BME680Sensor::loadState()
 {
 #ifdef FSCom
@@ -179,6 +179,6 @@ void BME680Sensor::checkStatus(const char *functionName)
    else if (bme680.sensor.status > BME68X_OK)
        LOG_WARN("%s BME68X code: %d", functionName, bme680.sensor.status);
 }
-#endif
+#endif // MESHTASTIC_BME680_BSEC2_SUPPORTED

 #endif
--- a/src/modules/Telemetry/Sensor/BME680Sensor.h
+++ b/src/modules/Telemetry/Sensor/BME680Sensor.h
@@ -1,29 +1,29 @@
 #include "configuration.h"

-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && (__has_include(<bsec2.h>) || __has_include(<Adafruit_BME680.h>))
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(MESHTASTIC_BME680_HEADER)

 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"

-#if __has_include(<bsec2.h>)
+#if MESHTASTIC_BME680_BSEC2_SUPPORTED == 1
 #include <bme68xLibrary.h>
 #include <bsec2.h>
 #else
 #include <Adafruit_BME680.h>
 #include <memory>
-#endif
+#endif // MESHTASTIC_BME680_BSEC2_SUPPORTED

 #define STATE_SAVE_PERIOD UINT32_C(360 * 60 * 1000) // That's 6 hours worth of millis()

-#if __has_include(<bsec2.h>)
+#if MESHTASTIC_BME680_BSEC2_SUPPORTED == 1
 const uint8_t bsec_config[] = {
 #include "config/bme680/bme680_iaq_33v_3s_4d/bsec_iaq.txt"
 };
-#endif
+#endif // MESHTASTIC_BME680_BSEC2_SUPPORTED
 class BME680Sensor : public TelemetrySensor
 {
  private:
-#if __has_include(<bsec2.h>)
+#if MESHTASTIC_BME680_BSEC2_SUPPORTED == 1
    Bsec2 bme680;
 #else
    using BME680Ptr = std::unique_ptr<Adafruit_BME680>;
@@ -31,10 +31,10 @@ class BME680Sensor : public TelemetrySensor
    static BME680Ptr makeBME680(TwoWire *bus) { return std::make_unique<Adafruit_BME680>(bus); }

    BME680Ptr bme680;
-#endif
+#endif // MESHTASTIC_BME680_BSEC2_SUPPORTED

  protected:
-#if __has_include(<bsec2.h>)
+#if MESHTASTIC_BME680_BSEC2_SUPPORTED == 1
    const char *bsecConfigFileName = "/prefs/bsec.dat";
    uint8_t bsecState[BSEC_MAX_STATE_BLOB_SIZE] = {0};
    uint8_t accuracy = 0;
@@ -51,13 +51,13 @@ class BME680Sensor : public TelemetrySensor
    void loadState();
    void updateState();
    void checkStatus(const char *functionName);
-#endif
+#endif // MESHTASTIC_BME680_BSEC2_SUPPORTED

  public:
    BME680Sensor();
-#if __has_include(<bsec2.h>)
+#if MESHTASTIC_BME680_BSEC2_SUPPORTED == 1
    virtual int32_t runOnce() override;
-#endif
+#endif // MESHTASTIC_BME680_BSEC2_SUPPORTED
    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
 };
--- a/src/modules/Telemetry/Sensor/PMSA003ISensor.cpp
+++ b/src/modules/Telemetry/Sensor/PMSA003ISensor.cpp
@@ -1,158 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
-
-#include "../detect/reClockI2C.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "PMSA003ISensor.h"
-#include "TelemetrySensor.h"
-
-#include <Wire.h>
-
-PMSA003ISensor::PMSA003ISensor() : TelemetrySensor(meshtastic_TelemetrySensorType_PMSA003I, "PMSA003I") {}
-
-bool PMSA003ISensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
-{
-    LOG_INFO("Init sensor: %s", sensorName);
-#ifdef PMSA003I_ENABLE_PIN
-    pinMode(PMSA003I_ENABLE_PIN, OUTPUT);
-#endif
-
-    _bus = bus;
-    _address = dev->address.address;
-
-#if defined(PMSA003I_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
-    uint32_t currentClock = reClockI2C(PMSA003I_I2C_CLOCK_SPEED, _bus);
-    if (!currentClock) {
-        LOG_WARN("PMSA003I can't be used at this clock speed");
-        return false;
-    }
-#endif
-
-    _bus->beginTransmission(_address);
-    if (_bus->endTransmission() != 0) {
-        LOG_WARN("PMSA003I not found on I2C at 0x12");
-        return false;
-    }
-
-#if defined(PMSA003I_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
-    reClockI2C(currentClock, _bus);
-#endif
-
-    status = 1;
-    LOG_INFO("PMSA003I Enabled");
-
-    initI2CSensor();
-    return true;
-}
-
-bool PMSA003ISensor::getMetrics(meshtastic_Telemetry *measurement)
-{
-    if (!isActive()) {
-        LOG_WARN("PMSA003I is not active");
-        return false;
-    }
-
-#if defined(PMSA003I_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
-    uint32_t currentClock = reClockI2C(PMSA003I_I2C_CLOCK_SPEED, _bus);
-#endif
-
-    _bus->requestFrom(_address, PMSA003I_FRAME_LENGTH);
-    if (_bus->available() < PMSA003I_FRAME_LENGTH) {
-        LOG_WARN("PMSA003I read failed: incomplete data (%d bytes)", _bus->available());
-        return false;
-    }
-
-#if defined(PMSA003I_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
-    reClockI2C(currentClock, _bus);
-#endif
-
-    for (uint8_t i = 0; i < PMSA003I_FRAME_LENGTH; i++) {
-        buffer[i] = _bus->read();
-    }
-
-    if (buffer[0] != 0x42 || buffer[1] != 0x4D) {
-        LOG_WARN("PMSA003I frame header invalid: 0x%02X 0x%02X", buffer[0], buffer[1]);
-        return false;
-    }
-
-    auto read16 = [](uint8_t *data, uint8_t idx) -> uint16_t { return (data[idx] << 8) | data[idx + 1]; };
-
-    computedChecksum = 0;
-
-    for (uint8_t i = 0; i < PMSA003I_FRAME_LENGTH - 2; i++) {
-        computedChecksum += buffer[i];
-    }
-    receivedChecksum = read16(buffer, PMSA003I_FRAME_LENGTH - 2);
-
-    if (computedChecksum != receivedChecksum) {
-        LOG_WARN("PMSA003I checksum failed: computed 0x%04X, received 0x%04X", computedChecksum, receivedChecksum);
-        return false;
-    }
-
-    measurement->variant.air_quality_metrics.has_pm10_standard = true;
-    measurement->variant.air_quality_metrics.pm10_standard = read16(buffer, 4);
-
-    measurement->variant.air_quality_metrics.has_pm25_standard = true;
-    measurement->variant.air_quality_metrics.pm25_standard = read16(buffer, 6);
-
-    measurement->variant.air_quality_metrics.has_pm100_standard = true;
-    measurement->variant.air_quality_metrics.pm100_standard = read16(buffer, 8);
-
-    // TODO - Add admin command to remove environmental metrics to save protobuf space
-    measurement->variant.air_quality_metrics.has_pm10_environmental = true;
-    measurement->variant.air_quality_metrics.pm10_environmental = read16(buffer, 10);
-
-    measurement->variant.air_quality_metrics.has_pm25_environmental = true;
-    measurement->variant.air_quality_metrics.pm25_environmental = read16(buffer, 12);
-
-    measurement->variant.air_quality_metrics.has_pm100_environmental = true;
-    measurement->variant.air_quality_metrics.pm100_environmental = read16(buffer, 14);
-
-    // TODO - Add admin command to remove PN to save protobuf space
-    measurement->variant.air_quality_metrics.has_particles_03um = true;
-    measurement->variant.air_quality_metrics.particles_03um = read16(buffer, 16);
-
-    measurement->variant.air_quality_metrics.has_particles_05um = true;
-    measurement->variant.air_quality_metrics.particles_05um = read16(buffer, 18);
-
-    measurement->variant.air_quality_metrics.has_particles_10um = true;
-    measurement->variant.air_quality_metrics.particles_10um = read16(buffer, 20);
-
-    measurement->variant.air_quality_metrics.has_particles_25um = true;
-    measurement->variant.air_quality_metrics.particles_25um = read16(buffer, 22);
-
-    measurement->variant.air_quality_metrics.has_particles_50um = true;
-    measurement->variant.air_quality_metrics.particles_50um = read16(buffer, 24);
-
-    measurement->variant.air_quality_metrics.has_particles_100um = true;
-    measurement->variant.air_quality_metrics.particles_100um = read16(buffer, 26);
-
-    return true;
-}
-
-bool PMSA003ISensor::isActive()
-{
-    return state == State::ACTIVE;
-}
-
-void PMSA003ISensor::sleep()
-{
-#ifdef PMSA003I_ENABLE_PIN
-    digitalWrite(PMSA003I_ENABLE_PIN, LOW);
-    state = State::IDLE;
-#endif
-}
-
-uint32_t PMSA003ISensor::wakeUp()
-{
-#ifdef PMSA003I_ENABLE_PIN
-    LOG_INFO("Waking up PMSA003I");
-    digitalWrite(PMSA003I_ENABLE_PIN, HIGH);
-    state = State::ACTIVE;
-    return PMSA003I_WARMUP_MS;
-#endif
-    // No need to wait for warmup if already active
-    return 0;
-}
-#endif
--- a/src/modules/Telemetry/Sensor/PMSA003ISensor.h
+++ b/src/modules/Telemetry/Sensor/PMSA003ISensor.h
@@ -1,35 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
-
-#define PMSA003I_I2C_CLOCK_SPEED 100000
-#define PMSA003I_FRAME_LENGTH 32
-#define PMSA003I_WARMUP_MS 30000
-
-class PMSA003ISensor : public TelemetrySensor
-{
-  public:
-    PMSA003ISensor();
-    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
-
-    virtual bool isActive() override;
-    virtual void sleep() override;
-    virtual uint32_t wakeUp() override;
-
-  private:
-    enum class State { IDLE, ACTIVE };
-    State state = State::ACTIVE;
-
-    uint16_t computedChecksum = 0;
-    uint16_t receivedChecksum = 0;
-
-    uint8_t buffer[PMSA003I_FRAME_LENGTH]{};
-    TwoWire *_bus{};
-    uint8_t _address{};
-};
-
-#endif
--- a/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp
@@ -4,15 +4,6 @@
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "RAK12035Sensor.h"

-// The RAK12035 library's sensor_sleep() sets WB_IO2 (GPIO 34) LOW, which controls
-// the 3.3V switched power rail (PIN_3V3_EN). This turns off power to ALL peripherals
-// including GPS. We need to restore power after the library turns it off.
-#ifdef PIN_3V3_EN
-#define RESTORE_3V3_POWER() digitalWrite(PIN_3V3_EN, HIGH)
-#else
-#define RESTORE_3V3_POWER()
-#endif
-
 RAK12035Sensor::RAK12035Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_RAK12035, "RAK12035") {}

 bool RAK12035Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
@@ -22,6 +13,7 @@ bool RAK12035Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
    delay(100);
    sensor.begin(dev->address.address);

+    // Get sensor firmware version
    uint8_t data = 0;
    sensor.get_sensor_version(&data);
    if (data != 0) {
@@ -29,8 +21,8 @@ bool RAK12035Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
        LOG_INFO("RAK12035Sensor Init Succeed \nSensor1 Firmware version: %i, Sensor Name: %s", data, sensorName);
        status = true;
        sensor.sensor_sleep();
-        RESTORE_3V3_POWER();
    } else {
+        // If we reach here, it means the sensor did not initialize correctly.
        LOG_INFO("Init sensor: %s", sensorName);
        LOG_ERROR("RAK12035Sensor Init Failed");
        status = false;
@@ -46,6 +38,8 @@ bool RAK12035Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)

 void RAK12035Sensor::setup()
 {
+    // Set the calibration values
+    // Reading the saved calibration values from the sensor.
    // TODO:: Check for and run calibration check for up to 2 additional sensors if present.
    uint16_t zero_val = 0;
    uint16_t hundred_val = 0;
@@ -77,7 +71,6 @@ void RAK12035Sensor::setup()
        LOG_INFO("Wet calibration reset complete. New value is %d", hundred_val);
    }
    sensor.sensor_sleep();
-    RESTORE_3V3_POWER();
    delay(200);
    LOG_INFO("Dry calibration value is %d", zero_val);
    LOG_INFO("Wet calibration value is %d", hundred_val);
@@ -86,6 +79,10 @@ void RAK12035Sensor::setup()
 bool RAK12035Sensor::getMetrics(meshtastic_Telemetry *measurement)
 {
    // TODO:: read and send metrics for up to 2 additional soil monitors if present.
+    //  -- how to do this.. this could get a little complex..
+    //     ie - 1> we combine them into an average and send that, 2> we send them as separate metrics
+    //      ^-- these scenarios would require different handling of the metrics in the receiving end and maybe a setting in the
+    //      device ui and an additional proto for that?
    measurement->variant.environment_metrics.has_soil_temperature = true;
    measurement->variant.environment_metrics.has_soil_moisture = true;

@@ -100,7 +97,6 @@ bool RAK12035Sensor::getMetrics(meshtastic_Telemetry *measurement)
    success &= sensor.get_sensor_temperature(&temp);
    delay(200);
    sensor.sensor_sleep();
-    RESTORE_3V3_POWER();

    if (success == false) {
        LOG_ERROR("Failed to read sensor data");
--- a/src/modules/Telemetry/Sensor/TelemetrySensor.cpp
+++ b/src/modules/Telemetry/Sensor/TelemetrySensor.cpp
@@ -1,6 +1,6 @@
 #include "configuration.h"

-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR || !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR

 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
--- a/src/modules/Telemetry/Sensor/TelemetrySensor.h
+++ b/src/modules/Telemetry/Sensor/TelemetrySensor.h
@@ -58,11 +58,6 @@ class TelemetrySensor

    // TODO: delete after migration
    bool hasSensor() { return nodeTelemetrySensorsMap[sensorType].first > 0; }
-    // Functions to sleep / wakeup sensors that support it
-    virtual void sleep(){};
-    virtual uint32_t wakeUp() { return 0; }
-    // Return active by default, override per sensor
-    virtual bool isActive() { return true; }

 #if WIRE_INTERFACES_COUNT > 1
    // Set to true if Implementation only works first I2C port (Wire)
@@ -70,7 +65,6 @@ class TelemetrySensor
 #endif
    virtual int32_t runOnce() { return INT32_MAX; }
    virtual bool isInitialized() { return initialized; }
-    // TODO: is this used?
    virtual bool isRunning() { return status > 0; }

    virtual bool getMetrics(meshtastic_Telemetry *measurement) = 0;
--- a/src/motion/ICM20948Sensor.cpp
+++ b/src/motion/ICM20948Sensor.cpp
@@ -47,6 +47,7 @@ int32_t ICM20948Sensor::runOnce()
 int32_t ICM20948Sensor::runOnce()
 {
 #if !defined(MESHTASTIC_EXCLUDE_SCREEN) && HAS_SCREEN
+#if defined(MUZI_BASE) // temporarily gated to single device due to feature freeze
    if (screen && !screen->isScreenOn() && !config.display.wake_on_tap_or_motion && !config.device.double_tap_as_button_press) {
        if (!isAsleep) {
            LOG_DEBUG("sleeping IMU");
@@ -59,6 +60,7 @@ int32_t ICM20948Sensor::runOnce()
        sensor->sleep(false);
        isAsleep = false;
    }
+#endif

    float magX = 0, magY = 0, magZ = 0;
    if (sensor->dataReady()) {
--- a/src/motion/ICM20948Sensor.h
+++ b/src/motion/ICM20948Sensor.h
@@ -82,8 +82,8 @@ class ICM20948Sensor : public MotionSensor
  private:
    ICM20948Singleton *sensor = nullptr;
    bool showingScreen = false;
-    bool isAsleep = false;
 #ifdef MUZI_BASE
+    bool isAsleep = false;
    float highestX = 449.000000, lowestX = -140.000000, highestY = 422.000000, lowestY = -232.000000, highestZ = 749.000000,
          lowestZ = 98.000000;
 #else
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -475,10 +475,8 @@ bool MQTT::publish(const char *topic, const char *payload, bool retained)
    if (moduleConfig.mqtt.proxy_to_client_enabled) {
        meshtastic_MqttClientProxyMessage *msg = mqttClientProxyMessagePool.allocZeroed();
        msg->which_payload_variant = meshtastic_MqttClientProxyMessage_text_tag;
-        strncpy(msg->topic, topic, sizeof(msg->topic));
-        msg->topic[sizeof(msg->topic) - 1] = '\0';
-        strncpy(msg->payload_variant.text, payload, sizeof(msg->payload_variant.text));
-        msg->payload_variant.text[sizeof(msg->payload_variant.text) - 1] = '\0';
+        strcpy(msg->topic, topic);
+        strcpy(msg->payload_variant.text, payload);
        msg->retained = retained;
        service->sendMqttMessageToClientProxy(msg);
        return true;
--- a/src/platform/esp32/BleOta.cpp
+++ b/src/platform/esp32/BleOta.cpp
@@ -0,0 +1,46 @@
+#include "BleOta.h"
+#include "Arduino.h"
+#include <esp_ota_ops.h>
+
+static const String MESHTASTIC_OTA_APP_PROJECT_NAME("Meshtastic-OTA");
+
+const esp_partition_t *BleOta::findEspOtaAppPartition()
+{
+    const esp_partition_t *part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_0, nullptr);
+
+    esp_app_desc_t app_desc;
+    esp_err_t ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
+
+    if (ret != ESP_OK || MESHTASTIC_OTA_APP_PROJECT_NAME != app_desc.project_name) {
+        part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, nullptr);
+        ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
+    }
+
+    if (ret == ESP_OK && MESHTASTIC_OTA_APP_PROJECT_NAME == app_desc.project_name) {
+        return part;
+    } else {
+        return nullptr;
+    }
+}
+
+String BleOta::getOtaAppVersion()
+{
+    const esp_partition_t *part = findEspOtaAppPartition();
+    esp_app_desc_t app_desc;
+    esp_err_t ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
+    String version;
+    if (ret == ESP_OK) {
+        version = app_desc.version;
+    }
+    return version;
+}
+
+bool BleOta::switchToOtaApp()
+{
+    bool success = false;
+    const esp_partition_t *part = findEspOtaAppPartition();
+    if (part) {
+        success = (ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_set_boot_partition(part)) == ESP_OK);
+    }
+    return success;
+}
--- a/src/platform/esp32/BleOta.h
+++ b/src/platform/esp32/BleOta.h
@@ -0,0 +1,20 @@
+#ifndef BLEOTA_H
+#define BLEOTA_H
+
+#include <Arduino.h>
+#include <functional>
+
+class BleOta
+{
+  public:
+    explicit BleOta(){};
+
+    static String getOtaAppVersion();
+    static bool switchToOtaApp();
+
+  private:
+    String mUserAgent;
+    static const esp_partition_t *findEspOtaAppPartition();
+};
+
+#endif // BLEOTA_H
--- a/src/platform/esp32/MeshtasticOTA.h
+++ b/src/platform/esp32/MeshtasticOTA.h
@@ -1,26 +0,0 @@
-#ifndef MESHTASTICOTA_H
-#define MESHTASTICOTA_H
-
-#include "mesh-pb-constants.h"
-#include <Arduino.h>
-#ifdef ESP_PLATFORM
-#include <esp_ota_ops.h>
-#endif
-
-#define METHOD_OTA_BLE 1
-#define METHOD_OTA_WIFI 2
-
-namespace MeshtasticOTA
-{
-void initialize();
-bool isUpdated();
-const esp_partition_t *getAppPartition();
-bool getAppDesc(const esp_partition_t *part, esp_app_desc_t *app_desc);
-bool checkOTACapability(esp_app_desc_t *app_desc, uint8_t method);
-void recoverConfig(meshtastic_Config_NetworkConfig *network);
-void saveConfig(meshtastic_Config_NetworkConfig *network, meshtastic_OTAMode method, uint8_t *ota_hash);
-bool trySwitchToOTA();
-const char *getVersion();
-} // namespace MeshtasticOTA
-
-#endif // MESHTASTICOTA_H
--- a/src/platform/esp32/MeshtasticOTA.cpp
+++ b/src/platform/esp32/MeshtasticOTA.cpp
@@ -1,17 +1,13 @@
-#include "MeshtasticOTA.h"
+#include "WiFiOTA.h"
 #include "configuration.h"
-#ifdef ESP_PLATFORM
 #include <Preferences.h>
 #include <esp_ota_ops.h>
-#endif

-namespace MeshtasticOTA
+namespace WiFiOTA
 {

-static const char *nvsNamespace = "MeshtasticOTA";
-static const char *combinedAppProjectName = "MeshtasticOTA";
-static const char *bleOnlyAppProjectName = "MeshtasticOTA-BLE";
-static const char *wifiOnlyAppProjectName = "MeshtasticOTA-WiFi";
+static const char *nvsNamespace = "ota-wifi";
+static const char *appProjectName = "OTA-WiFi";

 static bool updated = false;

@@ -47,14 +43,12 @@ void recoverConfig(meshtastic_Config_NetworkConfig *network)
    strncpy(network->wifi_psk, psk.c_str(), sizeof(network->wifi_psk));
 }

-void saveConfig(meshtastic_Config_NetworkConfig *network, meshtastic_OTAMode method, uint8_t *ota_hash)
+void saveConfig(meshtastic_Config_NetworkConfig *network)
 {
    LOG_INFO("Saving WiFi settings for upcoming OTA update");

    Preferences prefs;
    prefs.begin(nvsNamespace);
-    prefs.putUChar("method", method);
-    prefs.putBytes("ota_hash", ota_hash, 32);
    prefs.putString("ssid", network->wifi_ssid);
    prefs.putString("psk", network->wifi_psk);
    prefs.putBool("updated", false);
@@ -68,48 +62,21 @@ const esp_partition_t *getAppPartition()

 bool getAppDesc(const esp_partition_t *part, esp_app_desc_t *app_desc)
 {
-    if (esp_ota_get_partition_description(part, app_desc) != ESP_OK) {
-        LOG_INFO("esp_ota_get_partition_description failed");
+    if (esp_ota_get_partition_description(part, app_desc) != ESP_OK)
+        return false;
+    if (strcmp(app_desc->project_name, appProjectName) != 0)
        return false;
-    }
    return true;
 }

-bool checkOTACapability(esp_app_desc_t *app_desc, uint8_t method)
-{
-    // Combined loader supports all (both) transports, BLE and WiFi
-    if (strcmp(app_desc->project_name, combinedAppProjectName) == 0) {
-        LOG_INFO("OTA partition contains combined BLE/WiFi OTA Loader");
-        return true;
-    }
-    if (method == METHOD_OTA_BLE && strcmp(app_desc->project_name, bleOnlyAppProjectName) == 0) {
-        LOG_INFO("OTA partition contains BLE-only OTA Loader");
-        return true;
-    }
-    if (method == METHOD_OTA_WIFI && strcmp(app_desc->project_name, wifiOnlyAppProjectName) == 0) {
-        LOG_INFO("OTA partition contains WiFi-only OTA Loader");
-        return true;
-    }
-    LOG_INFO("OTA partition does not contain a known OTA loader");
-    return false;
-}
-
 bool trySwitchToOTA()
 {
    const esp_partition_t *part = getAppPartition();
-
-    if (part == NULL) {
-        LOG_WARN("Unable to get app partition in preparation of OTA reboot");
+    esp_app_desc_t app_desc;
+    if (!getAppDesc(part, &app_desc))
        return false;
-    }
-
-    uint8_t result = esp_ota_set_boot_partition(part);
-    // Partition and app checks should now be done in the AdminModule before this is called
-    if (result != ESP_OK) {
-        LOG_WARN("Unable to switch to OTA partiton.  (Reason %d)", result);
+    if (esp_ota_set_boot_partition(part) != ESP_OK)
        return false;
-    }
-
    return true;
 }

@@ -122,4 +89,4 @@ const char *getVersion()
    return app_desc.version;
 }

-} // namespace MeshtasticOTA
+} // namespace WiFiOTA
--- a/src/platform/esp32/WiFiOTA.h
+++ b/src/platform/esp32/WiFiOTA.h
@@ -0,0 +1,18 @@
+#ifndef WIFIOTA_H
+#define WIFIOTA_H
+
+#include "mesh-pb-constants.h"
+#include <Arduino.h>
+
+namespace WiFiOTA
+{
+void initialize();
+bool isUpdated();
+
+void recoverConfig(meshtastic_Config_NetworkConfig *network);
+void saveConfig(meshtastic_Config_NetworkConfig *network);
+bool trySwitchToOTA();
+const char *getVersion();
+} // namespace WiFiOTA
+
+#endif // WIFIOTA_H
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -195,8 +195,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_LINK_32
 #elif defined(T_DECK_PRO)
 #define HW_VENDOR meshtastic_HardwareModel_T_DECK_PRO
-#elif defined(T_BEAM_1W)
-#define HW_VENDOR meshtastic_HardwareModel_TBEAM_1_WATT
 #elif defined(T_LORA_PAGER)
 #define HW_VENDOR meshtastic_HardwareModel_T_LORA_PAGER
 #elif defined(HELTEC_V4)
--- a/src/platform/esp32/main-esp32.cpp
+++ b/src/platform/esp32/main-esp32.cpp
@@ -5,10 +5,11 @@
 #include "main.h"

 #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !MESHTASTIC_EXCLUDE_BLUETOOTH
+#include "BleOta.h"
 #include "nimble/NimbleBluetooth.h"
 #endif

-#include <MeshtasticOTA.h>
+#include <WiFiOTA.h>

 #if HAS_WIFI
 #include "mesh/wifi/WiFiAPClient.h"
@@ -143,14 +144,22 @@ void esp32Setup()
        preferences.putUInt("hwVendor", HW_VENDOR);
    preferences.end();
    LOG_DEBUG("Number of Device Reboots: %d", rebootCounter);
-#if !MESHTASTIC_EXCLUDE_WIFI
-    String version = MeshtasticOTA::getVersion();
-    if (version.isEmpty()) {
-        LOG_INFO("MeshtasticOTA firmware not available");
+#if !MESHTASTIC_EXCLUDE_BLUETOOTH
+    String BLEOTA = BleOta::getOtaAppVersion();
+    if (BLEOTA.isEmpty()) {
+        LOG_INFO("No BLE OTA firmware available");
    } else {
-        LOG_INFO("MeshtasticOTA firmware version %s", version.c_str());
+        LOG_INFO("BLE OTA firmware version %s", BLEOTA.c_str());
    }
-    MeshtasticOTA::initialize();
+#endif
+#if !MESHTASTIC_EXCLUDE_WIFI
+    String version = WiFiOTA::getVersion();
+    if (version.isEmpty()) {
+        LOG_INFO("No WiFi OTA firmware available");
+    } else {
+        LOG_INFO("WiFi OTA firmware version %s", version.c_str());
+    }
+    WiFiOTA::initialize();
 #endif

    // enableModemSleep();
--- a/src/platform/extra_variants/README.md
+++ b/src/platform/extra_variants/README.md
@@ -5,7 +5,7 @@ This directory tree is designed to solve two problems.
 - The ESP32 arduino/platformio project doesn't support the nice "if initVariant() is found, call that after init" behavior of the nrf52 builds (they use initVariant() internally).
 - Over the years a lot of 'board specific' init code has been added to init() in main.cpp. It would be great to have a general/clean mechanism to allow developers to specify board specific/unique code in a clean fashion without mucking in main.

-So we are borrowing the initVariant() ideas here (by using weak gcc references). You can now define earlyInitVariant() and lateInitVariant() if your board needs them. earlyInitVariant() runs at the beginning of setup() directly after waitUntilPowerLevelSafe(); while lateInitVariant() runs after the LoRa radio is initialized.
+So we are borrowing the initVariant() ideas here (by using weak gcc references). You can now define lateInitVariant() if your board needs it.

 If you'd like a board specific variant to be run, add the variant.cpp file to an appropriately named
 subdirectory and check for \_VARIANT_boardname in the cpp file (so that your code is only built for your board).
--- a/src/platform/nrf52/NRF52Bluetooth.cpp
+++ b/src/platform/nrf52/NRF52Bluetooth.cpp
@@ -119,7 +119,7 @@ void startAdv(void)
    Bluefruit.Advertising.addService(meshBleService);
    /* Start Advertising
     * - Enable auto advertising if disconnected
-     * - Interval:  fast mode = 20 ms, slow mode = 417,5 ms
+     * - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
     * - Timeout for fast mode is 30 seconds
     * - Start(timeout) with timeout = 0 will advertise forever (until connected)
     *
@@ -127,7 +127,7 @@ void startAdv(void)
     * https://developer.apple.com/library/content/qa/qa1931/_index.html
     */
    Bluefruit.Advertising.restartOnDisconnect(true);
-    Bluefruit.Advertising.setInterval(32, 668); // in unit of 0.625 ms
+    Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
    Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
    Bluefruit.Advertising.start(0); // 0 = Don't stop advertising after n seconds.  FIXME, we should stop advertising after X
 }
@@ -240,12 +240,6 @@ int NRF52Bluetooth::getRssi()
 {
    return 0; // FIXME figure out where to source this
 }
-
-// Valid BLE TX power levels as per nRF52840 Product Specification are: "-20 to +8 dBm TX power, configurable in 4 dB steps".
-// See https://docs.nordicsemi.com/bundle/ps_nrf52840/page/keyfeatures_html5.html
-#define VALID_BLE_TX_POWER(x)                                                                                                    \
-    ((x) == -20 || (x) == -16 || (x) == -12 || (x) == -8 || (x) == -4 || (x) == 0 || (x) == 4 || (x) == 8)
-
 void NRF52Bluetooth::setup()
 {
    // Initialise the Bluefruit module
@@ -257,9 +251,6 @@ void NRF52Bluetooth::setup()
    Bluefruit.Advertising.stop();
    Bluefruit.Advertising.clearData();
    Bluefruit.ScanResponse.clearData();
-#if defined(NRF52_BLE_TX_POWER) && VALID_BLE_TX_POWER(NRF52_BLE_TX_POWER)
-    Bluefruit.setTxPower(NRF52_BLE_TX_POWER);
-#endif
    if (config.bluetooth.mode != meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN) {
        configuredPasskey = config.bluetooth.mode == meshtastic_Config_BluetoothConfig_PairingMode_FIXED_PIN
                                ? config.bluetooth.fixed_pin
@@ -281,29 +272,6 @@ void NRF52Bluetooth::setup()
    // Set the connect/disconnect callback handlers
    Bluefruit.Periph.setConnectCallback(onConnect);
    Bluefruit.Periph.setDisconnectCallback(onDisconnect);
-
-    // Do not change Slave Latency to value other than 0 !!!
-    // There is probably a bug in SoftDevice + certain Apple iOS versions being
-    // brain damaged causing connectivity problems.
-
-    // On one side it seems SoftDevice is using SlaveLatency value even
-    // if connection parameter negotation failed and phone sees it as connectivity errors.
-
-    // On the other hand Apple can randomly refuse any parameter negotiation and shutdown connection
-    // even if you meet Apple Developer Guidelines for BLE devices. Because f* you, that's why.
-
-    // While this API call sets preferred connection parameters (PPCP) - many phones ignore it (yeah) and it seems SoftDevice
-    // will try to renegotiate connection parameters based on those values after phone connection.
-    // So those are relatively safe values so Apple braindead firmware won't get angry and at least we may try
-    // to negotiate some longer connection interval to save battery.
-
-    // See https://github.com/meshtastic/firmware/pull/8858 for measurements.  We are dealing with microamp savings anyway so not
-    // worth dying on a hill here.
-
-    Bluefruit.Periph.setConnSlaveLatency(0);
-    // 1.25 ms units - so min, max is 15, 100 ms range.
-    Bluefruit.Periph.setConnInterval(12, 80);
-
 #ifndef BLE_DFU_SECURE
    bledfu.setPermission(SECMODE_ENC_WITH_MITM, SECMODE_ENC_WITH_MITM);
    bledfu.begin(); // Install the DFU helper
@@ -332,7 +300,7 @@ void NRF52Bluetooth::setup()
 void NRF52Bluetooth::resumeAdvertising()
 {
    Bluefruit.Advertising.restartOnDisconnect(true);
-    Bluefruit.Advertising.setInterval(32, 668); // in unit of 0.625 ms
+    Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
    Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
    Bluefruit.Advertising.start(0);
 }
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -5,25 +5,6 @@
 //
 // defaults for NRF52 architecture
 //
-
-/*
- * Internal Reference is +/-0.6V, with an adjustable gain of 1/6, 1/5, 1/4,
- * 1/3, 1/2 or 1, meaning 3.6, 3.0, 2.4, 1.8, 1.2 or 0.6V for the ADC levels.
- *
- * External Reference is VDD/4, with an adjustable gain of 1, 2 or 4, meaning
- * VDD/4, VDD/2 or VDD for the ADC levels.
- *
- * Default settings are internal reference with 1/6 gain (GND..3.6V ADC range)
- * Some variants overwrite it.
- */
-#ifndef AREF_VOLTAGE
-#define AREF_VOLTAGE 3.6
-#endif
-
-#ifndef BATTERY_SENSE_RESOLUTION_BITS
-#define BATTERY_SENSE_RESOLUTION_BITS 10
-#endif
-
 #ifndef HAS_BLUETOOTH
 #define HAS_BLUETOOTH 1
 #endif
@@ -93,8 +74,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M3
 #elif defined(ELECROW_ThinkNode_M6)
 #define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M6
-#elif defined(ELECROW_ThinkNode_M4)
-#define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M4
 #elif defined(NANO_G2_ULTRA)
 #define HW_VENDOR meshtastic_HardwareModel_NANO_G2_ULTRA
 #elif defined(CANARYONE)
--- a/src/platform/nrf52/main-nrf52.cpp
+++ b/src/platform/nrf52/main-nrf52.cpp
@@ -9,12 +9,12 @@
 #define NRFX_WDT_ENABLED 1
 #define NRFX_WDT0_ENABLED 1
 #define NRFX_WDT_CONFIG_NO_IRQ 1
-#include "nrfx_power.h"
+#include <nrfx_wdt.c>
+#include <nrfx_wdt.h>
+
 #include <assert.h>
 #include <ble_gap.h>
 #include <memory.h>
-#include <nrfx_wdt.c>
-#include <nrfx_wdt.h>
 #include <stdio.h>
 // #include <Adafruit_USBD_Device.h>
 #include "NodeDB.h"
@@ -23,7 +23,6 @@
 #include "main.h"
 #include "meshUtils.h"
 #include "power.h"
-#include <power/PowerHAL.h>

 #include <hal/nrf_lpcomp.h>

@@ -31,21 +30,6 @@
 #include "BQ25713.h"
 #endif

-// WARNING! THRESHOLD + HYSTERESIS should be less than regulated VDD voltage - which depends on board
-// and is 3.0 or 3.3V. Also VDD likes to read values like 2.9999 so make sure you account for that
-// otherwise board will not boot at all. Before you modify this part - please triple read NRF52840 power design
-// section in datasheet and you understand how REG0 and REG1 regulators work together.
-#ifndef SAFE_VDD_VOLTAGE_THRESHOLD
-#define SAFE_VDD_VOLTAGE_THRESHOLD 2.7
-#endif
-
-// hysteresis value
-#ifndef SAFE_VDD_VOLTAGE_THRESHOLD_HYST
-#define SAFE_VDD_VOLTAGE_THRESHOLD_HYST 0.2
-#endif
-
-uint16_t getVDDVoltage();
-
 // Weak empty variant initialization function.
 // May be redefined by variant files.
 void variant_shutdown() __attribute__((weak));
@@ -54,95 +38,12 @@ void variant_shutdown() {}
 static nrfx_wdt_t nrfx_wdt = NRFX_WDT_INSTANCE(0);
 static nrfx_wdt_channel_id nrfx_wdt_channel_id_nrf52_main;

-// This is a public global so that the debugger can set it to false automatically from our gdbinit
-// @phaseloop comment: most part of codebase, including filesystem flash driver depend on softdevice
-// methods so disabling it may actually crash thing. Proceed with caution.
-
-bool useSoftDevice = true; // Set to false for easier debugging
-
 static inline void debugger_break(void)
 {
    __asm volatile("bkpt #0x01\n\t"
                   "mov pc, lr\n\t");
 }

-// PowerHAL NRF52 specific function implementations
-bool powerHAL_isVBUSConnected()
-{
-    return NRF_POWER->USBREGSTATUS & POWER_USBREGSTATUS_VBUSDETECT_Msk;
-}
-
-bool powerHAL_isPowerLevelSafe()
-{
-
-    static bool powerLevelSafe = true;
-
-    uint16_t threshold = SAFE_VDD_VOLTAGE_THRESHOLD * 1000; // convert V to mV
-    uint16_t hysteresis = SAFE_VDD_VOLTAGE_THRESHOLD_HYST * 1000;
-
-    if (powerLevelSafe) {
-        if (getVDDVoltage() < threshold) {
-            powerLevelSafe = false;
-        }
-    } else {
-        // power level is only safe again when it raises above threshold + hysteresis
-        if (getVDDVoltage() >= (threshold + hysteresis)) {
-            powerLevelSafe = true;
-        }
-    }
-
-    return powerLevelSafe;
-}
-
-void powerHAL_platformInit()
-{
-
-    // Enable POF power failure comparator. It will prevent writing to NVMC flash when supply voltage is too low.
-    // Set to some low value as last resort - powerHAL_isPowerLevelSafe uses different method and should manage proper node
-    // behaviour on its own.
-
-    // POFWARN is pretty useless for node power management because it triggers only once and clearing this event will not
-    // re-trigger it again until voltage rises to safe level and drops again. So we will use SAADC routed to VDD to read safely
-    // voltage.
-
-    // @phaseloop: I disable POFCON for now because it seems to be unreliable or buggy. Even when set at 2.0V it
-    // triggers below 2.8V and corrupts data when pairing bluetooth - because it prevents filesystem writes and
-    // adafruit BLE library triggers lfs_assert which reboots node and formats filesystem.
-    // I did experiments with bench power supply and no matter what is set to POFCON, it always triggers right below
-    // 2.8V. I compared raw registry values with datasheet.
-
-    NRF_POWER->POFCON =
-        ((POWER_POFCON_THRESHOLD_V22 << POWER_POFCON_THRESHOLD_Pos) | (POWER_POFCON_POF_Enabled << POWER_POFCON_POF_Pos));
-
-    // remember to always match VBAT_AR_INTERNAL with AREF_VALUE in variant definition file
-#ifdef VBAT_AR_INTERNAL
-    analogReference(VBAT_AR_INTERNAL);
-#else
-    analogReference(AR_INTERNAL); // 3.6V
-#endif
-}
-
-// get VDD voltage (in millivolts)
-uint16_t getVDDVoltage()
-{
-    // we use the same values as regular battery read so there is no conflict on SAADC
-    analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS);
-
-    // VDD range on NRF52840 is 1.8-3.3V so we need to remap analog reference to 3.6V
-    // let's hope battery reading runs in same task and we don't have race condition
-    analogReference(AR_INTERNAL);
-
-    uint16_t vddADCRead = analogReadVDD();
-    float voltage = ((1000 * 3.6) / pow(2, BATTERY_SENSE_RESOLUTION_BITS)) * vddADCRead;
-
-// restore default battery reading reference
-#ifdef VBAT_AR_INTERNAL
-    analogReference(VBAT_AR_INTERNAL);
-#endif
-
-    return voltage;
-}
-
 bool loopCanSleep()
 {
    // turn off sleep only while connected via USB
@@ -171,6 +72,22 @@ void getMacAddr(uint8_t *dmac)
    dmac[0] = src[5] | 0xc0; // MSB high two bits get set elsewhere in the bluetooth stack
 }

+static void initBrownout()
+{
+    auto vccthresh = POWER_POFCON_THRESHOLD_V24;
+
+    auto err_code = sd_power_pof_enable(POWER_POFCON_POF_Enabled);
+    assert(err_code == NRF_SUCCESS);
+
+    err_code = sd_power_pof_threshold_set(vccthresh);
+    assert(err_code == NRF_SUCCESS);
+
+    // We don't bother with setting up brownout if soft device is disabled - because during production we always use softdevice
+}
+
+// This is a public global so that the debugger can set it to false automatically from our gdbinit
+bool useSoftDevice = true; // Set to false for easier debugging
+
 #if !MESHTASTIC_EXCLUDE_BLUETOOTH
 void setBluetoothEnable(bool enable)
 {
@@ -189,6 +106,7 @@ void setBluetoothEnable(bool enable)
        if (!initialized) {
            nrf52Bluetooth = new NRF52Bluetooth();
            nrf52Bluetooth->startDisabled();
+            initBrownout();
            initialized = true;
        }
        return;
@@ -202,6 +120,9 @@ void setBluetoothEnable(bool enable)
            LOG_DEBUG("Init NRF52 Bluetooth");
            nrf52Bluetooth = new NRF52Bluetooth();
            nrf52Bluetooth->setup();
+
+            // We delay brownout init until after BLE because BLE starts soft device
+            initBrownout();
        }
        // Already setup, apparently
        else
@@ -271,24 +192,9 @@ extern "C" void lfs_assert(const char *reason)
    delay(500); // Give the serial port a bit of time to output that last message.
    // Try setting GPREGRET with the SoftDevice first. If that fails (perhaps because the SD hasn't been initialize yet) then set
    // NRF_POWER->GPREGRET directly.
-
-    // TODO: this will/can crash CPU if bluetooth stack is not compiled in or bluetooth is not initialized
-    // (regardless if enabled or disabled) - as there is no live SoftDevice stack
-    // implement "safe" functions detecting softdevice stack state and using proper method to set registers
-
-    // do not set GPREGRET if POFWARN is triggered because it means lfs_assert reports flash undervoltage protection
-    // and not data corruption. Reboot is fine as boot procedure will wait until power level is safe again
-
-    if (!NRF_POWER->EVENTS_POFWARN) {
-        if (!(sd_power_gpregret_clr(0, 0xFF) == NRF_SUCCESS &&
-              sd_power_gpregret_set(0, NRF52_MAGIC_LFS_IS_CORRUPT) == NRF_SUCCESS)) {
-            NRF_POWER->GPREGRET = NRF52_MAGIC_LFS_IS_CORRUPT;
-        }
+    if (!(sd_power_gpregret_clr(0, 0xFF) == NRF_SUCCESS && sd_power_gpregret_set(0, NRF52_MAGIC_LFS_IS_CORRUPT) == NRF_SUCCESS)) {
+        NRF_POWER->GPREGRET = NRF52_MAGIC_LFS_IS_CORRUPT;
    }
-
-    // TODO: this should not be done when SoftDevice is enabled as device will not boot back on soft reset
-    // as some data is retained in RAM which will prevent re-enabling bluetooth stack
-    // Google what Nordic has to say about NVIC_* + SoftDevice
    NVIC_SystemReset();
 }

@@ -430,6 +336,15 @@ void cpuDeepSleep(uint32_t msecToWake)
        Serial1.end();
 #endif

+#ifdef TTGO_T_ECHO
+    // To power off the T-Echo, the display must be set
+    // as an input pin; otherwise, there will be leakage current.
+    pinMode(PIN_EINK_CS, INPUT);
+    pinMode(PIN_EINK_DC, INPUT);
+    pinMode(PIN_EINK_RES, INPUT);
+    pinMode(PIN_EINK_BUSY, INPUT);
+#endif
+
    setBluetoothEnable(false);

 #ifdef RAK4630
@@ -440,8 +355,57 @@ void cpuDeepSleep(uint32_t msecToWake)
    // RAK-12039 set pin for Air quality sensor
    digitalWrite(AQ_SET_PIN, LOW);
 #endif
+#ifdef RAK14014
+    // GPIO restores input status, otherwise there will be leakage current
+    nrf_gpio_cfg_default(TFT_BL);
+    nrf_gpio_cfg_default(TFT_DC);
+    nrf_gpio_cfg_default(TFT_CS);
+    nrf_gpio_cfg_default(TFT_SCLK);
+    nrf_gpio_cfg_default(TFT_MOSI);
+    nrf_gpio_cfg_default(TFT_MISO);
+    nrf_gpio_cfg_default(SCREEN_TOUCH_INT);
+    nrf_gpio_cfg_default(WB_I2C1_SCL);
+    nrf_gpio_cfg_default(WB_I2C1_SDA);
+
+    // nrf_gpio_cfg_default(WB_I2C2_SCL);
+    // nrf_gpio_cfg_default(WB_I2C2_SDA);
+#endif
+#endif
+#ifdef MESHLINK
+#ifdef PIN_WD_EN
+    digitalWrite(PIN_WD_EN, LOW);
+#endif
+#endif
+
+#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_MESH_SOLAR)
+    nrf_gpio_cfg_default(PIN_GPS_PPS);
+    detachInterrupt(PIN_GPS_PPS);
+    detachInterrupt(PIN_BUTTON1);
+#endif
+
+#ifdef ELECROW_ThinkNode_M1
+    for (int pin = 0; pin < 48; pin++) {
+        if (pin == 17 || pin == 19 || pin == 20 || pin == 22 || pin == 23 || pin == 24 || pin == 25 || pin == 9 || pin == 10 ||
+            pin == PIN_BUTTON1 || pin == PIN_BUTTON2) {
+            continue;
+        }
+        pinMode(pin, OUTPUT);
+    }
+    for (int pin = 0; pin < 48; pin++) {
+        if (pin == 17 || pin == 19 || pin == 20 || pin == 22 || pin == 23 || pin == 24 || pin == 25 || pin == 9 || pin == 10 ||
+            pin == PIN_BUTTON1 || pin == PIN_BUTTON2) {
+            continue;
+        }
+        digitalWrite(pin, LOW);
+    }
+    for (int pin = 0; pin < 48; pin++) {
+        if (pin == 17 || pin == 19 || pin == 20 || pin == 22 || pin == 23 || pin == 24 || pin == 25 || pin == 9 || pin == 10 ||
+            pin == PIN_BUTTON1 || pin == PIN_BUTTON2) {
+            continue;
+        }
+        NRF_GPIO->DIRCLR = (1 << pin);
+    }
 #endif
-    // Run shutdown code if specified in variant.cpp
    variant_shutdown();

    // Sleepy trackers or sensors can low power "sleep"
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/src/platform/portduino/PortduinoGlue.cpp
@@ -29,7 +29,6 @@
 #include "platform/portduino/USBHal.h"

 portduino_config_struct portduino_config;
-portduino_status_struct portduino_status;
 std::ofstream traceFile;
 std::ofstream JSONFile;
 Ch341Hal *ch341Hal = nullptr;
@@ -56,18 +55,15 @@ void cpuDeepSleep(uint32_t msecs)
 void updateBatteryLevel(uint8_t level) NOT_IMPLEMENTED("updateBatteryLevel");

 int TCPPort = SERVER_API_DEFAULT_PORT;
-bool checkConfigPort = true;

 static error_t parse_opt(int key, char *arg, struct argp_state *state)
 {
    switch (key) {
    case 'p':
-        if (sscanf(arg, "%d", &TCPPort) < 1) {
+        if (sscanf(arg, "%d", &TCPPort) < 1)
            return ARGP_ERR_UNKNOWN;
-        } else {
-            checkConfigPort = false;
+        else
            printf("Using config file %d\n", TCPPort);
-        }
        break;
    case 'c':
        configPath = arg;
@@ -401,10 +397,6 @@ void portduinoSetup()
                if (found_hat) {
                    product_config =
                        cleanupNameForAutoconf("lora-hat-" + std::string(hat_vendor) + "-" + autoconf_product + ".yaml");
-                    if (strncmp(hat_vendor, "RAK", 14) == 0 && strncmp(autoconf_product, "6421 Pi Hat", 14) == 0) {
-                        std::cout << "autoconf: Setting hardwareModel to RAK6421" << std::endl;
-                        portduino_status.hardwareModel = meshtastic_HardwareModel_RAK6421;
-                    }
                } else if (found_ch341) {
                    product_config = cleanupNameForAutoconf("lora-usb-" + std::string(autoconf_product) + ".yaml");
                    // look for more data after the null terminator
@@ -413,10 +405,6 @@ void portduinoSetup()
                        memcpy(portduino_config.device_id, autoconf_product + len + 1, 16);
                        if (!memfll(portduino_config.device_id, '\0', 16) && !memfll(portduino_config.device_id, 0xff, 16)) {
                            portduino_config.has_device_id = true;
-                            if (strncmp(autoconf_product, "MESHSTICK 1262", 14) == 0) {
-                                std::cout << "autoconf: Setting hardwareModel to Meshstick 1262" << std::endl;
-                                portduino_status.hardwareModel = meshtastic_HardwareModel_MESHSTICK_1262;
-                            }
                        }
                    }
                }
@@ -659,19 +647,6 @@ bool loadConfig(const char *configPath)
            if (yamlConfig["Lora"]["RF95_MAX_POWER"])
                portduino_config.rf95_max_power = yamlConfig["Lora"]["RF95_MAX_POWER"].as<int>(20);

-            if (yamlConfig["Lora"]["TX_GAIN_LORA"]) {
-                YAML::Node tx_gain_node = yamlConfig["Lora"]["TX_GAIN_LORA"];
-                if (tx_gain_node.IsSequence() && tx_gain_node.size() != 0) {
-                    portduino_config.num_pa_points = min(tx_gain_node.size(), std::size(portduino_config.tx_gain_lora));
-                    for (int i = 0; i < portduino_config.num_pa_points; i++) {
-                        portduino_config.tx_gain_lora[i] = tx_gain_node[i].as<int>();
-                    }
-                } else {
-                    portduino_config.num_pa_points = 1;
-                    portduino_config.tx_gain_lora[0] = tx_gain_node.as<int>(0);
-                }
-            }
-
            if (portduino_config.lora_module != use_autoconf && portduino_config.lora_module != use_simradio &&
                !portduino_config.force_simradio) {
                portduino_config.dio2_as_rf_switch = yamlConfig["Lora"]["DIO2_AS_RF_SWITCH"].as<bool>(false);
@@ -895,12 +870,6 @@ bool loadConfig(const char *configPath)
                std::cout << "Cannot set both MACAddress and MACAddressSource!" << std::endl;
                exit(EXIT_FAILURE);
            }
-            if (checkConfigPort) {
-                portduino_config.api_port = (yamlConfig["General"]["APIPort"]).as<int>(-1);
-                if (portduino_config.api_port != -1 && portduino_config.api_port > 1023 && portduino_config.api_port < 65536) {
-                    TCPPort = (portduino_config.api_port);
-                }
-            }
            portduino_config.mac_address = (yamlConfig["General"]["MACAddress"]).as<std::string>("");
            if (portduino_config.mac_address != "") {
                portduino_config.mac_address_explicit = true;
--- a/src/platform/portduino/PortduinoGlue.h
+++ b/src/platform/portduino/PortduinoGlue.h
@@ -1,21 +1,14 @@
 #pragma once
 #include <fstream>
 #include <map>
-#include <unistd.h>
 #include <unordered_map>
 #include <vector>

 #include "LR11x0Interface.h"
 #include "Module.h"
 #include "mesh/generated/meshtastic/mesh.pb.h"
-#include "yaml-cpp/yaml.h"
-
-extern struct portduino_status_struct {
-    bool LoRa_in_error = false;
-    _meshtastic_HardwareModel hardwareModel = meshtastic_HardwareModel_PORTDUINO;
-} portduino_status;
-
 #include "platform/portduino/USBHal.h"
+#include "yaml-cpp/yaml.h"

 // Product strings for auto-configuration
 // {"PRODUCT_STRING", "CONFIG.YAML"}
@@ -98,8 +91,6 @@ extern struct portduino_config_struct {
    int lora_usb_pid = 0x5512;
    int lora_usb_vid = 0x1A86;
    int spiSpeed = 2000000;
-    int num_pa_points = 1; // default to 1 point, with 0 gain
-    uint16_t tx_gain_lora[22] = {0};
    pinMapping lora_cs_pin = {"Lora", "CS"};
    pinMapping lora_irq_pin = {"Lora", "IRQ"};
    pinMapping lora_busy_pin = {"Lora", "Busy"};
@@ -184,7 +175,6 @@ extern struct portduino_config_struct {
    std::string mac_address = "";
    bool mac_address_explicit = false;
    std::string mac_address_source = "";
-    int api_port = -1;
    std::string config_directory = "";
    std::string available_directory = "/etc/meshtasticd/available.d/";
    int maxtophone = 100;
@@ -240,17 +230,6 @@ extern struct portduino_config_struct {
            out << YAML::Key << "LR1120_MAX_POWER" << YAML::Value << lr1120_max_power;
        if (rf95_max_power != 20)
            out << YAML::Key << "RF95_MAX_POWER" << YAML::Value << rf95_max_power;
-
-        if (num_pa_points > 1) {
-            out << YAML::Key << "TX_GAIN_LORA" << YAML::Value << YAML::Flow << YAML::BeginSeq;
-            for (int i = 0; i < num_pa_points; i++) {
-                out << YAML::Value << tx_gain_lora[i];
-            }
-            out << YAML::EndSeq;
-        } else if (tx_gain_lora[0] != 0) {
-            out << YAML::Key << "TX_GAIN_LORA" << YAML::Value << tx_gain_lora[0];
-        }
-
        out << YAML::Key << "DIO2_AS_RF_SWITCH" << YAML::Value << dio2_as_rf_switch;
        if (dio3_tcxo_voltage != 0)
            out << YAML::Key << "DIO3_TCXO_VOLTAGE" << YAML::Value << YAML::Precision(3) << (float)dio3_tcxo_voltage / 1000;
@@ -529,8 +508,6 @@ extern struct portduino_config_struct {
        out << YAML::Key << "General" << YAML::Value << YAML::BeginMap;
        if (config_directory != "")
            out << YAML::Key << "ConfigDirectory" << YAML::Value << config_directory;
-        if (api_port != -1)
-            out << YAML::Key << "TCPPort" << YAML::Value << api_port;
        if (mac_address_explicit)
            out << YAML::Key << "MACAddress" << YAML::Value << mac_address;
        if (mac_address_source != "")
@@ -542,4 +519,4 @@ extern struct portduino_config_struct {
        out << YAML::EndMap; // General
        return out.c_str();
    }
-} portduino_config;
+} portduino_config;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Manuel	86fa917362	Merge branch 'master' into crowpanelV2	2026-01-13 12:36:34 +01:00
Manuel	3575c48e36	Merge branch 'master' into crowpanelV2	2025-12-31 13:35:53 +01:00
Manuel	469abe8dec	Merge branch 'master' into crowpanelV2	2025-12-10 13:38:41 +01:00
Manuel	fefce15b1a	Merge branch 'master' into crowpanelV2	2025-12-05 10:59:34 +01:00
Manuel	50ea7ace98	Merge branch 'master' into crowpanelV2	2025-10-11 23:32:09 +02:00
Manuel	96f371eafd	Merge branch 'master' into crowpanelV2	2025-10-07 14:22:46 +02:00
Manuel	dbc52c7576	update device-ui commit	2025-10-07 14:21:55 +02:00
Manuel	232e0412ff	cosmetic print when STC8H1K28 is found	2025-10-07 14:19:45 +02:00
Manuel	b94659ff6a	Update device-ui commit reference	2025-10-05 22:32:08 +02:00
Manuel	059e17b3e2	Update device-ui commit reference	2025-10-05 11:12:25 +02:00
Manuel	b09f6db9e2	Merge branch 'master' into crowpanelV2	2025-10-05 11:00:02 +02:00
Manuel	64706153e0	Merge branch 'master' into crowpanelV2	2025-10-02 16:35:36 +02:00
Manuel	f94043e4f2	Merge branch 'master' into crowpanelV2	2025-10-01 18:06:45 +02:00
Manuel	bc82cd803c	Merge branch 'master' into crowpanelV2	2025-09-29 10:49:38 +02:00
Manuel	c15b6de138	Merge branch 'master' into crowpanelV2	2025-09-28 00:30:03 +02:00
Manuel	fbf32b93b6	fix lora radio detection	2025-09-22 22:23:03 +02:00
Manuel	b7289f7f2d	Merge branch 'master' into crowpanelV2	2025-09-22 10:40:10 +02:00
Manuel	d3d932ccee	Merge branch 'master' into crowpanelV2	2025-09-21 14:11:29 +02:00
Manuel	3a267b440d	Merge branch 'master' into crowpanelV2	2025-09-21 09:39:49 +02:00
Manuel	b1821bfd4f	CrowPanel Advanced V2 support	2025-09-18 16:00:49 +02:00