[create-pull-request] automated change (#4506 )

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Milliseconds!
2025-12-15 15:22:34 +00:00 · 2024-08-19 17:21:03 -05:00 · 2024-08-19 06:55:58 -05:00
210 changed files with 1156 additions and 28090 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,25 +0,0 @@
-FROM mcr.microsoft.com/devcontainers/cpp:1-debian-12
-
-# [Optional] Uncomment this section to install additional packages.
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends \
-    ca-certificates \
-    g++ \
-    git \
-    libbluetooth-dev \
-    libgpiod-dev \
-    liborcania-dev \
-    libssl-dev \
-    libulfius-dev \
-    libyaml-cpp-dev \
-    pipx \
-    pkg-config \
-    python3 \
-    python3-pip \
-    python3-venv \
-    python3-wheel \
-    wget \
-    zip \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-RUN pipx install platformio==6.1.15
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,28 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/cpp
-{
-  "name": "Meshtastic Firmware Dev",
-  "build": {
-    "dockerfile": "Dockerfile"
-  },
-  "features": {
-    "ghcr.io/devcontainers/features/python:1": {
-      "installTools": true,
-      "version": "latest"
-    }
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "ms-vscode.cpptools",
-        "platformio.platformio-ide",
-      ]
-    }
-  },
-
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  "forwardPorts": [ 4403 ],
-
-  // Run commands to prepare the container for use
-  "postCreateCommand": ".devcontainer/setup.sh",
-}
--- a/.devcontainer/setup.sh
+++ b/.devcontainer/setup.sh
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-git submodule update --init
--- a/.github/actions/setup-base/action.yml
+++ b/.github/actions/setup-base/action.yml
@@ -35,7 +35,6 @@ runs:
        python -m pip install --upgrade pip
        pip install -U --no-build-isolation --no-cache-dir "setuptools<72"
        pip install -U platformio adafruit-nrfutil --no-build-isolation
-        pip install -U poetry --no-build-isolation
        pip install -U meshtastic --pre --no-build-isolation

    - name: Upgrade platformio
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,9 +1,9 @@
-### ❌ (Please delete all these tips and replace them with your text) ❌
-
 ## Thank you for sending in a pull request, here's some tips to get started!

+(Please delete all these tips and replace with your text)
+
 - Before starting on some new big chunk of code, it it is optional but highly recommended to open an issue first
-  to say "Hey, I think this idea X should be implemented and I'm starting work on it. My general plan is Y, any feedback
+  to say "hey, I think this idea X should be implemented and I'm starting work on it. My general plan is Y, any feedback
  is appreciated." This will allow other devs to potentially save you time by not accidentially duplicating work etc...
 - Please do not check in files that don't have real changes
 - Please do not reformat lines that you didn't have to change the code on
@@ -12,4 +12,3 @@
 - If your PR fixes a bug, mention "fixes #bugnum" somewhere in your pull request description.
 - If your other co-developers have comments on your PR please tweak as needed.
 - Please also enable "Allow edits by maintainers".
- If your PR gets accepted you can request a "Contributor" role in the Meshtastic Discord
--- a/.github/workflows/build_native.yml
+++ b/.github/workflows/build_native.yml
@@ -10,7 +10,7 @@ jobs:
  build-native:
    runs-on: ubuntu-latest
    steps:
-      - name: Install libs needed for native build
+      - name: Install libbluetooth
        shell: bash
        run: |
          sudo apt-get update --fix-missing
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,91 +0,0 @@
-name: End to end tests
-
-on:
-  schedule:
-    - cron: "0 0 * * *" # Run every day at midnight
-  workflow_dispatch: {}
-
-jobs:
-  test-simulator:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install libbluetooth
-        shell: bash
-        run: |
-          sudo apt-get update --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Upgrade python tools
-        shell: bash
-        run: |
-          python -m pip install --upgrade pip
-          pip install -U platformio adafruit-nrfutil
-          pip install -U meshtastic --pre
-
-      - name: Upgrade platformio
-        shell: bash
-        run: |
-          pio upgrade
-
-      - name: Build Native
-        run: bin/build-native.sh
-
-      # We now run integration test before other build steps (to quickly see runtime failures)
-      - name: Build for native
-        run: platformio run -e native
-
-      - name: Integration test
-        run: |
-          .pio/build/native/program & sleep 10 # 5 seconds was not enough
-          echo "Simulator started, launching python test..."
-          python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
-
-      - name: PlatformIO Tests
-        run: platformio test -e native --junit-output-path testreport.xml
-
-      - name: Test Report
-        uses: dorny/test-reporter@v1.9.1
-        if: success() || failure() # run this step even if previous step failed
-        with:
-          name: PlatformIO Tests
-          path: testreport.xml
-          reporter: java-junit
-
-  hardware-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Upgrade python tools
-        shell: bash
-        run: |
-          python -m pip install --upgrade pip
-          pip install -U --no-build-isolation --no-cache-dir "setuptools<72"
-          pip install -U platformio adafruit-nrfutil --no-build-isolation
-          pip install -U poetry --no-build-isolation
-          pip install -U meshtastic --pre --no-build-isolation
-
-      - name: Upgrade platformio
-        shell: bash
-        run: |
-          pio upgrade
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: latest
-
-      - name: Install Dependencies
-        run: pnpm install
-
-      - name: Setup devices
-        run: pnpm run setup
-
-      - name: Execute end to end tests on connected hardware
-        run: pnpm run test
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "protobufs"]
 	path = protobufs
 	url = https://github.com/meshtastic/protobufs.git
-[submodule "meshtestic"]
-	path = meshtestic
-	url = https://github.com/meshtastic/meshTestic
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,2 +0,0 @@
-tasks:
-  - init: pip install platformio && pip install --upgrade pip
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -1,36 +1,36 @@
 version: 0.1
 cli:
-  version: 1.22.3
+  version: 1.22.2
 plugins:
  sources:
    - id: trunk
-      ref: v1.6.2
+      ref: v1.5.0
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - trufflehog@3.81.9
+    - trufflehog@3.76.3
    - yamllint@1.35.1
-    - bandit@1.7.9
-    - checkov@3.2.238
+    - bandit@1.7.8
+    - checkov@3.2.95
    - terrascan@1.19.1
-    - trivy@0.54.1
+    - trivy@0.51.1
    #- trufflehog@3.63.2-rc0
-    - taplo@0.9.3
-    - ruff@0.6.2
+    - taplo@0.8.1
+    - ruff@0.4.4
    - isort@5.13.2
-    - markdownlint@0.41.0
-    - oxipng@9.1.2
+    - markdownlint@0.40.0
+    - oxipng@9.1.1
    - svgo@3.3.2
-    - actionlint@1.7.1
-    - flake8@7.1.1
+    - actionlint@1.7.0
+    - flake8@7.0.0
    - hadolint@2.12.0
    - shfmt@3.6.0
    - shellcheck@0.10.0
-    - black@24.8.0
+    - black@24.4.2
    - git-diff-check
-    - gitleaks@8.18.4
+    - gitleaks@8.18.2
    - clang-format@16.0.3
-    - prettier@3.3.3
+    - prettier@3.2.5
  ignore:
    - linters: [ALL]
      paths:
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -2,9 +2,8 @@
    // See http://go.microsoft.com/fwlink/?LinkId=827846
    // for the documentation about the extensions.json format
    "recommendations": [
-        "platformio.platformio-ide"
+		"ms-vscode.cpptools",
+        "platformio.platformio-ide",
+        "trunk.io"
    ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
-    ]
 }
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,47 +0,0 @@
-# Contributing to Meshtastic Firmware
-
-We're excited that you're interested in contributing to the Meshtastic firmware! This document provides a high-level overview of how you can get involved.
-
-## Important First Steps
-
-Before you begin, please:
-
-1. **Read our documentation**: Our [official documentation](https://meshtastic.org/docs/) is a crucial resource. It contains essential information about the project.
-
-2. **Check out the firmware build guide**: For specific instructions on setting up your development environment and building the firmware, refer to our [Firmware Build Guide](https://meshtastic.org/docs/development/firmware/build/).
-
-3. Read our [Code of Conduct](https://meshtastic.org/docs/legal/conduct/)
-
-4. Join our [Discord community](https://discord.com/invite/ktMAKGBnBs) to connect with developers and other contributors to get help.
-
-## Getting Help and Discussing Ideas
-
-We encourage open communication and discussion before diving into code changes:
-
-1. **Use GitHub Discussions**: For new ideas, questions, or to discuss potential changes, start a conversation in our [GitHub Discussions](https://github.com/meshtastic/firmware/discussions) first. This helps us collaborate and avoid duplicate work.
-
-2. **Join our Discord**: For real-time chat and quick questions, join our [Discord server](https://discord.com/invite/ktMAKGBnBs). It's a great place to get help and connect with other developers and the community.
-
-3. **Reporting Issues**: If you've identified a bug, please use our bug report template when creating a new issue in the [issue tracker](https://github.com/meshtastic/firmware/issues). Ensure you've searched existing issues to avoid duplicates.
-
-## Making Contributions
-
-> [!IMPORTANT]
-> Before making any contributions, you must sign our Contributor License Agreement (CLA). You can do this by visiting https://cla-assistant.io/meshtastic/firmware. Be sure to use the GitHub account you will use to submit your contributions when signing.
-
-1. Fork the repository
-2. Create a new branch for your feature or bug fix
-3. Make your changes
-4. Test your changes thoroughly
-5. Create a pull request with a clear description, using the provided template, of your changes. Be sure to enable "Allow edits from maintainers".
-
-## Coding Standards
-
-To ensure consistent code formatting across the project:
-
-1. Install the [Trunk](https://marketplace.visualstudio.com/items?itemName=Trunk.io) extension for Visual Studio Code.
-2. Before submitting your changes, run `trunk fmt` to automatically format your code according to our standards.
-
-Adhering to these formatting guidelines helps maintain code consistency and makes the review process smoother.
-
-Thank you for contributing to Meshtastic!
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -48,7 +48,6 @@ lib_deps =
  https://github.com/dbSuS/libpax.git#7bcd3fcab75037505be9b122ab2b24cc5176b587
  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
-  rweather/Crypto@^0.4.0

 lib_ignore = 
  segger_rtt
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -20,7 +20,6 @@ build_src_filter =

 lib_deps=
  ${arduino_base.lib_deps}
-  rweather/Crypto@^0.4.0

 lib_ignore =
  BluetoothOTA
--- a/bin/Meshtastic_nRF52_factory_erase_v2.uf2
+++ b/bin/Meshtastic_nRF52_factory_erase_v2.uf2
--- a/bin/Meshtastic_nRF52_factory_erase_v3_S140_6.1.0.uf2
+++ b/bin/Meshtastic_nRF52_factory_erase_v3_S140_6.1.0.uf2
--- a/bin/Meshtastic_nRF52_factory_erase_v3_S140_7.3.0.uf2
+++ b/bin/Meshtastic_nRF52_factory_erase_v3_S140_7.3.0.uf2
--- a/bin/build-nrf52.sh
+++ b/bin/build-nrf52.sh
@@ -46,8 +46,3 @@ else
 	cp bin/device-update.* $OUTDIR
 	cp bin/*.uf2 $OUTDIR
 fi
-
-if (echo $1 | grep -q "rak4631"); then
-	echo "Copying hex file"
-	cp .pio/build/$1/firmware.hex $OUTDIR/$basename.hex
-fi
--- a/bin/generic/Meshtastic_6.1.0_bootloader-0.9.2_s140_6.1.1.hex
+++ b/bin/generic/Meshtastic_6.1.0_bootloader-0.9.2_s140_6.1.1.hex
--- a/bin/generic/Meshtastic_6.1.0_bootloader-0.9.2_s140_6.1.1.zip
+++ b/bin/generic/Meshtastic_6.1.0_bootloader-0.9.2_s140_6.1.1.zip
--- a/bin/generic/Meshtastic_7.3.0_bootloader-0.9.2_s140_7.3.0.hex
+++ b/bin/generic/Meshtastic_7.3.0_bootloader-0.9.2_s140_7.3.0.hex
--- a/bin/generic/Meshtastic_7.3.0_bootloader-0.9.2_s140_7.3.0.zip
+++ b/bin/generic/Meshtastic_7.3.0_bootloader-0.9.2_s140_7.3.0.zip
--- a/bin/generic/update-Meshtastic_6.1.0_bootloader-0.9.2_nosd.uf2
+++ b/bin/generic/update-Meshtastic_6.1.0_bootloader-0.9.2_nosd.uf2
--- a/bin/generic/update-Meshtastic_7.3.0_bootloader-0.9.2_nosd.uf2
+++ b/bin/generic/update-Meshtastic_7.3.0_bootloader-0.9.2_nosd.uf2
--- a/bin/readprops.py
+++ b/bin/readprops.py
@@ -1,5 +1,9 @@
-import configparser
+
+
 import subprocess
+import configparser
+import traceback
+import sys


 def readProps(prefsLoc):
@@ -7,36 +11,27 @@ def readProps(prefsLoc):

    config = configparser.RawConfigParser()
    config.read(prefsLoc)
-    version = dict(config.items("VERSION"))
-    verObj = dict(
-        short="{}.{}.{}".format(version["major"], version["minor"], version["build"]),
-        long="unset",
-    )
+    version = dict(config.items('VERSION'))
+    verObj = dict(short = "{}.{}.{}".format(version["major"], version["minor"], version["build"]),
+        long = "unset")

    # Try to find current build SHA if if the workspace is clean.  This could fail if git is not installed
    try:
-        sha = (
-            subprocess.check_output(["git", "rev-parse", "--short", "HEAD"])
-            .decode("utf-8")
-            .strip()
-        )
-        isDirty = (
-            subprocess.check_output(["git", "diff", "HEAD"]).decode("utf-8").strip()
-        )
+        sha = subprocess.check_output(
+            ['git', 'rev-parse', '--short', 'HEAD']).decode("utf-8").strip()
+        isDirty = subprocess.check_output(
+            ['git', 'diff', 'HEAD']).decode("utf-8").strip()
        suffix = sha
        # if isDirty:
        #     # short for 'dirty', we want to keep our verstrings source for protobuf reasons
        #     suffix = sha + "-d"
-        verObj["long"] = "{}.{}.{}.{}".format(
-            version["major"], version["minor"], version["build"], suffix
-        )
+        verObj['long'] = "{}.{}.{}.{}".format(
+            version["major"], version["minor"], version["build"], suffix)
    except:
        # print("Unexpected error:", sys.exc_info()[0])
        # traceback.print_exc()
-        verObj["long"] = verObj["short"]
+        verObj['long'] = verObj['short']

    # print("firmware version " + verStr)
    return verObj
-
-
 # print("path is" + ','.join(sys.path))
--- a/boards/CDEBYTE_EoRa-S3.json
+++ b/boards/CDEBYTE_EoRa-S3.json
@@ -19,7 +19,7 @@
    "mcu": "esp32s3",
    "variant": "CDEBYTE_EoRa-S3"
  },
-  "connectivity": ["wifi", "bluetooth"],
+  "connectivity": ["wifi"],
  "debug": {
    "openocd_target": "esp32s3.cfg"
  },
--- a/boards/ESP32-S3-WROOM-1-N4.json
+++ b/boards/ESP32-S3-WROOM-1-N4.json
@@ -19,7 +19,7 @@
    "mcu": "esp32s3",
    "variant": "ESP32-S3-WROOM-1-N4"
  },
-  "connectivity": ["wifi", "bluetooth"],
+  "connectivity": ["wifi"],
  "debug": {
    "default_tool": "esp-builtin",
    "onboard_tools": ["esp-builtin"],
--- a/boards/ms24sf1.json
+++ b/boards/ms24sf1.json
@@ -1,58 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v7.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x8029"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"],
-      ["0x239A", "0x802A"]
-    ],
-    "usb_product": "MS24SF1-BOOT",
-    "mcu": "nrf52840",
-    "variant": "MINEWSEMI_MS24SF1_SX1262",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "7.3.0",
-      "sd_fwid": "0x0123"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd"
-  },
-  "frameworks": ["arduino"],
-  "name": "MINEWSEMI_MS24SF1_SX1262",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": [
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink",
-      "cmsis-dap",
-      "blackmagic"
-    ],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://en.minewsemi.com/lora-module/nrf52840-sx1262-ms24sf1",
-  "vendor": "Minesemi"
-}
--- a/boards/tlora-t3s3-v1.json
+++ b/boards/tlora-t3s3-v1.json
@@ -19,7 +19,7 @@
    "mcu": "esp32s3",
    "variant": "tlora-t3s3-v1"
  },
-  "connectivity": ["wifi", "bluetooth"],
+  "connectivity": ["wifi"],
  "debug": {
    "openocd_target": "esp32s3.cfg"
  },
--- a/1
+++ b/1
--- a/platformio.ini
+++ b/platformio.ini
@@ -34,7 +34,6 @@ default_envs = tbeam
 ;default_envs = wio-e5
 ;default_envs = radiomaster_900_bandit_nano
 ;default_envs = radiomaster_900_bandit_micro
-;default_envs = radiomaster_900_bandit
 ;default_envs = heltec_capsule_sensor_v3
 ;default_envs = heltec_vision_master_t190
 ;default_envs = heltec_vision_master_e213
@@ -46,7 +45,6 @@ extra_configs =
  variants/*/platformio.ini

 [env]
-test_build_src = true
 extra_scripts = bin/platformio-custom.py

 ; note: we add src to our include search path so that lmic_project_config can override
@@ -81,14 +79,12 @@ build_flags = -Wno-missing-field-initializers
  -DRADIOLIB_EXCLUDE_APRS
  -DRADIOLIB_EXCLUDE_LORAWAN
  -DMESHTASTIC_EXCLUDE_DROPZONE=1
-  ;-D OLED_PL

 monitor_speed = 115200
 monitor_filters = direct

 lib_deps =
-;  jgromes/RadioLib@~6.6.0
-  https://github.com/jgromes/RadioLib.git#3115fc2d6700a9aee05888791ac930a910f2628f
+  jgromes/RadioLib@~6.6.0
  https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95 ; ESP8266_SSD1306
  https://github.com/mathertel/OneButton@~2.6.1 ; OneButton library for non-blocking button debounce
  https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
@@ -132,7 +128,6 @@ lib_deps =
  adafruit/Adafruit BMP280 Library@^2.6.8
  adafruit/Adafruit BMP085 Library@^1.2.4
  adafruit/Adafruit BME280 Library@^2.2.2
-  adafruit/Adafruit BMP3XX Library@^2.1.5
  adafruit/Adafruit MCP9808 Library@^2.0.0
  adafruit/Adafruit INA260 Library@^1.5.0
  adafruit/Adafruit INA219@^1.2.0
@@ -151,10 +146,13 @@ lib_deps =
  ClosedCube OPT3001@^1.1.2
  emotibit/EmotiBit MLX90632@^1.0.8
  dfrobot/DFRobot_RTU@^1.0.3
+
+
  https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
  boschsensortec/BME68x Sensor Library@^1.1.40407
  https://github.com/KodinLanewave/INA3221@^1.0.0
  lewisxhe/SensorLib@^0.2.0
  mprograms/QMC5883LCompass@^1.2.0
+  
+
  https://github.com/meshtastic/DFRobot_LarkWeatherStation#dee914270dc7cb3e43fbf034edd85a63a16a12ee
-  https://github.com/meshtastic/i2c-sensor#8e97122268960593c8c279df1a84a29970136a8f
--- a/2
+++ b/2
--- a/src/AmbientLightingThread.h
+++ b/src/AmbientLightingThread.h
@@ -1,4 +1,3 @@
-#include "Observer.h"
 #include "configuration.h"

 #ifdef HAS_NCP5623
@@ -23,18 +22,10 @@ class AmbientLightingThread : public concurrency::OSThread
  public:
    explicit AmbientLightingThread(ScanI2C::DeviceType type) : OSThread("AmbientLightingThread")
    {
-        notifyDeepSleepObserver.observe(&notifyDeepSleep); // Let us know when shutdown() is issued.
-
-// Enables Ambient Lighting by default if conditions are meet.
-#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
-#ifdef ENABLE_AMBIENTLIGHTING
-        moduleConfig.ambient_lighting.led_state = true;
-#endif
-#endif
        // Uncomment to test module
        // moduleConfig.ambient_lighting.led_state = true;
        // moduleConfig.ambient_lighting.current = 10;
-        // Default to a color based on our node number
+        // // Default to a color based on our node number
        // moduleConfig.ambient_lighting.red = (myNodeInfo.my_node_num & 0xFF0000) >> 16;
        // moduleConfig.ambient_lighting.green = (myNodeInfo.my_node_num & 0x00FF00) >> 8;
        // moduleConfig.ambient_lighting.blue = myNodeInfo.my_node_num & 0x0000FF;
@@ -91,46 +82,9 @@ class AmbientLightingThread : public concurrency::OSThread
        return disable();
    }

-    // When shutdown() is issued, setLightingOff will be called.
-    CallbackObserver<AmbientLightingThread, void *> notifyDeepSleepObserver =
-        CallbackObserver<AmbientLightingThread, void *>(this, &AmbientLightingThread::setLightingOff);
-
  private:
    ScanI2C::DeviceType _type = ScanI2C::DeviceType::NONE;

-    // Turn RGB lighting off, is used in junction to shutdown()
-    int setLightingOff(void *unused)
-    {
-#ifdef HAS_NCP5623
-        rgb.setCurrent(0);
-        rgb.setRed(0);
-        rgb.setGreen(0);
-        rgb.setBlue(0);
-        LOG_INFO("Turn Off NCP5623 Ambient lighting.\n");
-#endif
-#ifdef HAS_NEOPIXEL
-        pixels.clear();
-        pixels.show();
-        LOG_INFO("Turn Off NeoPixel Ambient lighting.\n");
-#endif
-#ifdef RGBLED_CA
-        analogWrite(RGBLED_RED, 255 - 0);
-        analogWrite(RGBLED_GREEN, 255 - 0);
-        analogWrite(RGBLED_BLUE, 255 - 0);
-        LOG_INFO("Turn Off Ambient lighting RGB Common Anode.\n");
-#elif defined(RGBLED_RED)
-        analogWrite(RGBLED_RED, 0);
-        analogWrite(RGBLED_GREEN, 0);
-        analogWrite(RGBLED_BLUE, 0);
-        LOG_INFO("Turn Off Ambient lighting RGB Common Cathode.\n");
-#endif
-#ifdef UNPHONE
-        unphone.rgb(0, 0, 0);
-        LOG_INFO("Turn Off unPhone Ambient lighting.\n");
-#endif
-        return 0;
-    }
-
    void setLighting()
    {
 #ifdef HAS_NCP5623
@@ -146,17 +100,6 @@ class AmbientLightingThread : public concurrency::OSThread
        pixels.fill(pixels.Color(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
                                 moduleConfig.ambient_lighting.blue),
                    0, NEOPIXEL_COUNT);
-
-// RadioMaster Bandit has addressable LED at the two buttons
-// this allow us to set different lighting for them in variant.h file.
-#ifdef RADIOMASTER_900_BANDIT
-#if defined(BUTTON1_COLOR) && defined(BUTTON1_COLOR_INDEX)
-        pixels.fill(BUTTON1_COLOR, BUTTON1_COLOR_INDEX, 1);
-#endif
-#if defined(BUTTON2_COLOR) && defined(BUTTON2_COLOR_INDEX)
-        pixels.fill(BUTTON2_COLOR, BUTTON1_COLOR_INDEX, 1);
-#endif
-#endif
        pixels.show();
        LOG_DEBUG("Initializing NeoPixel Ambient lighting w/ brightness(current)=%d, red=%d, green=%d, blue=%d\n",
                  moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
--- a/src/DebugConfiguration.cpp
+++ b/src/DebugConfiguration.cpp
@@ -97,14 +97,12 @@ Syslog &Syslog::logMask(uint8_t priMask)

 void Syslog::enable()
 {
-    this->_client->begin(this->_port);
    this->_enabled = true;
 }

 void Syslog::disable()
 {
    this->_enabled = false;
-    this->_client->stop();
 }

 bool Syslog::isEnabled()
@@ -195,4 +193,4 @@ inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *mess
    return true;
 }

-#endif
+#endif
--- a/src/DebugConfiguration.h
+++ b/src/DebugConfiguration.h
@@ -45,7 +45,7 @@
 #define LOG_CRIT(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #define LOG_TRACE(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #else
-#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE) && !defined(PIO_UNIT_TESTING)
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
 #define LOG_DEBUG(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_DEBUG, __VA_ARGS__)
 #define LOG_INFO(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_INFO, __VA_ARGS__)
 #define LOG_WARN(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_WARN, __VA_ARGS__)
--- a/src/DisplayFormatters.cpp
+++ b/src/DisplayFormatters.cpp
@@ -3,9 +3,6 @@
 const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaConfig_ModemPreset preset, bool useShortName)
 {
    switch (preset) {
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO:
-        return useShortName ? "ShortT" : "ShortTurbo";
-        break;
    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
        return useShortName ? "ShortS" : "ShortSlow";
        break;
--- a/src/FSCommon.cpp
+++ b/src/FSCommon.cpp
@@ -249,7 +249,6 @@ void listDir(const char *dirname, uint8_t levels, bool del)
                    file.close();
                }
 #else
-                LOG_DEBUG(" %s (directory)\n", file.name());
                listDir(file.name(), levels - 1, del);
                file.close();
 #endif
@@ -276,7 +275,7 @@ void listDir(const char *dirname, uint8_t levels, bool del)
                file.close();
            }
 #else
-            LOG_DEBUG("   %s (%i Bytes)\n", file.name(), file.size());
+            LOG_DEBUG(" %s (%i Bytes)\n", file.name(), file.size());
            file.close();
 #endif
        }
--- a/src/GpioLogic.cpp
+++ b/src/GpioLogic.cpp
@@ -10,13 +10,6 @@ void GpioVirtPin::set(bool value)
    }
 }

-void GpioHwPin::set(bool value)
-{
-    // if (num == 3) LOG_DEBUG("Setting pin %d to %d\n", num, value);
-    pinMode(num, OUTPUT);
-    digitalWrite(num, value);
-}
-
 GpioTransformer::GpioTransformer(GpioPin *outPin) : outPin(outPin) {}

 void GpioTransformer::set(bool value)
@@ -24,7 +17,7 @@ void GpioTransformer::set(bool value)
    outPin->set(value);
 }

-GpioUnaryTransformer::GpioUnaryTransformer(GpioVirtPin *inPin, GpioPin *outPin) : GpioTransformer(outPin), inPin(inPin)
+GpioNotTransformer::GpioNotTransformer(GpioVirtPin *inPin, GpioPin *outPin) : GpioTransformer(outPin), inPin(inPin)
 {
    assert(!inPin->dependentPin); // We only allow one dependent pin
    inPin->dependentPin = this;
@@ -34,18 +27,6 @@ GpioUnaryTransformer::GpioUnaryTransformer(GpioVirtPin *inPin, GpioPin *outPin)
    // update();
 }

-/**
- * Update the output pin based on the current state of the input pin.
- */
-void GpioUnaryTransformer::update()
-{
-    auto p = inPin->get();
-    if (p == GpioVirtPin::PinState::Unset)
-        return; // Not yet fully initialized
-
-    set(p);
-}
-
 /**
 * Update the output pin based on the current state of the input pin.
 */
@@ -88,7 +69,6 @@ void GpioBinaryTransformer::update()
            newValue = (GpioVirtPin::PinState)(p1 && p2);
            break;
        case Or:
-            // LOG_DEBUG("Doing GPIO OR\n");
            newValue = (GpioVirtPin::PinState)(p1 || p2);
            break;
        case Xor:
--- a/src/GpioLogic.h
+++ b/src/GpioLogic.h
@@ -29,7 +29,7 @@ class GpioHwPin : public GpioPin
  public:
    explicit GpioHwPin(uint32_t num) : num(num) {}

-    void set(bool value);
+    void set(bool value) { digitalWrite(num, value); }
 };

 class GpioTransformer;
@@ -42,7 +42,7 @@ class GpioBinaryTransformer;
 class GpioVirtPin : public GpioPin
 {
    friend class GpioBinaryTransformer;
-    friend class GpioUnaryTransformer;
+    friend class GpioNotTransformer;

  public:
    enum PinState { On = true, Off = false, Unset = 2 };
@@ -78,32 +78,13 @@ class GpioTransformer
    GpioPin *outPin;
 };

-/**
- * A transformer that just drives a hw pin based on a virtual pin.
- */
-class GpioUnaryTransformer : public GpioTransformer
-{
-  public:
-    GpioUnaryTransformer(GpioVirtPin *inPin, GpioPin *outPin);
-
-  protected:
-    friend class GpioVirtPin;
-
-    /**
-     * Update the output pin based on the current state of the input pin.
-     */
-    virtual void update();
-
-    GpioVirtPin *inPin;
-};
-
 /**
 * A transformer that performs a unary NOT operation from an input.
 */
-class GpioNotTransformer : public GpioUnaryTransformer
+class GpioNotTransformer : public GpioTransformer
 {
  public:
-    GpioNotTransformer(GpioVirtPin *inPin, GpioPin *outPin) : GpioUnaryTransformer(inPin, outPin) {}
+    GpioNotTransformer(GpioVirtPin *inPin, GpioPin *outPin);

  protected:
    friend class GpioVirtPin;
@@ -112,6 +93,9 @@ class GpioNotTransformer : public GpioUnaryTransformer
     * Update the output pin based on the current state of the input pin.
     */
    void update();
+
+  private:
+    GpioVirtPin *inPin;
 };

 /**
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -136,30 +136,6 @@ using namespace meshtastic;
 */
 static HasBatteryLevel *batteryLevel; // Default to NULL for no battery level sensor

-static void adcEnable()
-{
-#ifdef ADC_CTRL // enable adc voltage divider when we need to read
-#ifdef ADC_USE_PULLUP
-    pinMode(ADC_CTRL, INPUT_PULLUP);
-#else
-    pinMode(ADC_CTRL, OUTPUT);
-    digitalWrite(ADC_CTRL, ADC_CTRL_ENABLED);
-#endif
-    delay(10);
-#endif
-}
-
-static void adcDisable()
-{
-#ifdef ADC_CTRL // disable adc voltage divider when we need to read
-#ifdef ADC_USE_PULLUP
-    pinMode(ADC_CTRL, INPUT_PULLDOWN);
-#else
-    digitalWrite(ADC_CTRL, !ADC_CTRL_ENABLED);
-#endif
-#endif
-}
-
 /**
 * A simple battery level sensor that assumes the battery voltage is attached via a voltage-divider to an analog input
 */
@@ -250,19 +226,25 @@ class AnalogBatteryLevel : public HasBatteryLevel
            uint32_t raw = 0;
            float scaled = 0;

-            adcEnable();
 #ifdef ARCH_ESP32 // ADC block for espressif platforms
            raw = espAdcRead();
            scaled = esp_adc_cal_raw_to_voltage(raw, adc_characs);
            scaled *= operativeAdcMultiplier;
-#else // block for all other platforms
+#else           // block for all other platforms
+#ifdef ADC_CTRL // enable adc voltage divider when we need to read
+            pinMode(ADC_CTRL, OUTPUT);
+            digitalWrite(ADC_CTRL, ADC_CTRL_ENABLED);
+            delay(10);
+#endif
            for (uint32_t i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
                raw += analogRead(BATTERY_PIN);
            }
            raw = raw / BATTERY_SENSE_SAMPLES;
            scaled = operativeAdcMultiplier * ((1000 * AREF_VOLTAGE) / pow(2, BATTERY_SENSE_RESOLUTION_BITS)) * raw;
+#ifdef ADC_CTRL // disable adc voltage divider when we need to read
+            digitalWrite(ADC_CTRL, !ADC_CTRL_ENABLED);
+#endif
 #endif
-            adcDisable();

            if (!initial_read_done) {
                // Flush the smoothing filter with an ADC reading, if the reading is plausibly correct
@@ -293,6 +275,11 @@ class AnalogBatteryLevel : public HasBatteryLevel
        uint8_t raw_c = 0; // raw reading counter

 #ifndef BAT_MEASURE_ADC_UNIT // ADC1
+#ifdef ADC_CTRL              // enable adc voltage divider when we need to read
+        pinMode(ADC_CTRL, OUTPUT);
+        digitalWrite(ADC_CTRL, ADC_CTRL_ENABLED);
+        delay(10);
+#endif
        for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
            int val_ = adc1_get_raw(adc_channel);
            if (val_ >= 0) { // save only valid readings
@@ -301,7 +288,18 @@ class AnalogBatteryLevel : public HasBatteryLevel
            }
            // delayMicroseconds(100);
        }
-#else                            // ADC2
+#ifdef ADC_CTRL // disable adc voltage divider when we need to read
+        digitalWrite(ADC_CTRL, !ADC_CTRL_ENABLED);
+#endif
+#else // ADC2
+#ifdef ADC_CTRL
+#if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0)
+        pinMode(ADC_CTRL, OUTPUT);
+        digitalWrite(ADC_CTRL, LOW); // ACTIVE LOW
+        delay(10);
+#endif
+#endif // End ADC_CTRL
+
 #ifdef CONFIG_IDF_TARGET_ESP32S3 // ESP32S3
        // ADC2 wifi bug workaround not required, breaks compile
        // On ESP32S3, ADC2 can take turns with Wifi (?)
@@ -336,6 +334,12 @@ class AnalogBatteryLevel : public HasBatteryLevel
        }
 #endif // BAT_MEASURE_ADC_UNIT

+#ifdef ADC_CTRL
+#if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0)
+        digitalWrite(ADC_CTRL, HIGH);
+#endif
+#endif // End ADC_CTRL
+
 #endif // End BAT_MEASURE_ADC_UNIT
        return (raw / (raw_c < 1 ? 1 : raw_c));
    }
--- a/src/RF95Configuration.h
+++ b/src/RF95Configuration.h
@@ -3,4 +3,5 @@
 #define RF95_RESET LORA_RESET
 #define RF95_IRQ LORA_DIO0  // on SX1262 version this is a no connect DIO0
 #define RF95_DIO1 LORA_DIO1 // Note: not really used for RF95, but used for pure SX127x
-#endif
+#define RF95_DIO2 LORA_DIO2 // Note: not really used for RF95
+#endif
--- a/src/RedirectablePrint.cpp
+++ b/src/RedirectablePrint.cpp
@@ -38,9 +38,8 @@ size_t RedirectablePrint::write(uint8_t c)
 #ifdef USE_SEGGER
    SEGGER_RTT_PutChar(SEGGER_STDOUT_CH, c);
 #endif
-    // Account for legacy config transition
-    bool serialEnabled = config.has_security ? config.security.serial_enabled : config.device.serial_enabled;
-    if (!config.has_lora || serialEnabled)
+
+    if (!config.has_lora || config.device.serial_enabled)
        dest->write(c);

    return 1; // We always claim one was written, rather than trusting what the
@@ -213,7 +212,7 @@ void RedirectablePrint::log_to_syslog(const char *logLevel, const char *format,
 void RedirectablePrint::log_to_ble(const char *logLevel, const char *format, va_list arg)
 {
 #if !MESHTASTIC_EXCLUDE_BLUETOOTH
-    if (config.security.debug_log_api_enabled && !pauseBluetoothLogging) {
+    if (config.bluetooth.device_logging_enabled && !pauseBluetoothLogging) {
        bool isBleConnected = false;
 #ifdef ARCH_ESP32
        isBleConnected = nimbleBluetooth && nimbleBluetooth->isActive() && nimbleBluetooth->isConnected();
--- a/src/SerialConsole.cpp
+++ b/src/SerialConsole.cpp
@@ -83,7 +83,7 @@ bool SerialConsole::checkIsConnected()
 bool SerialConsole::handleToRadio(const uint8_t *buf, size_t len)
 {
    // only talk to the API once the configuration has been loaded and we're sure the serial port is not disabled.
-    if (config.has_lora && config.security.serial_enabled) {
+    if (config.has_lora && config.device.serial_enabled) {
        // Switch to protobufs for log messages
        usingProtobufs = true;
        canWrite = true;
@@ -96,7 +96,7 @@ bool SerialConsole::handleToRadio(const uint8_t *buf, size_t len)

 void SerialConsole::log_to_serial(const char *logLevel, const char *format, va_list arg)
 {
-    if (usingProtobufs && config.security.debug_log_api_enabled) {
+    if (usingProtobufs && config.device.debug_log_enabled) {
        meshtastic_LogRecord_Level ll = meshtastic_LogRecord_Level_UNSET; // default to unset
        switch (logLevel[0]) {
        case 'D':
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -177,11 +177,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Step #1: offer chance for variant-specific defines */
 #include "variant.h"

-#if defined(VEXT_ENABLE) && !defined(VEXT_ON_VALUE)
-// Older variant.h files might not be defining this value, so stay with the old default
-#define VEXT_ON_VALUE LOW
-#endif
-
 #ifndef GPS_BAUDRATE
 #define GPS_BAUDRATE 9600
 #endif
@@ -198,10 +193,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEFAULT_SHUTDOWN_SECONDS 2
 #endif

-#ifndef MINIMUM_SAFE_FREE_HEAP
-#define MINIMUM_SAFE_FREE_HEAP 1500
-#endif
-
 /* Step #3: mop up with disabled values for HAS_ options not handled by the above two */

 #ifndef HAS_WIFI
@@ -265,7 +256,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MESHTASTIC_EXCLUDE_MQTT 1
 #define MESHTASTIC_EXCLUDE_POWERMON 1
 #define MESHTASTIC_EXCLUDE_I2C 1
-#define MESHTASTIC_EXCLUDE_PKI 1
 #define MESHTASTIC_EXCLUDE_POWER_FSM 1
 #define MESHTASTIC_EXCLUDE_TZ 1
 #endif
@@ -290,7 +280,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MESHTASTIC_EXCLUDE_INPUTBROKER 1
 #define MESHTASTIC_EXCLUDE_SERIAL 1
 #define MESHTASTIC_EXCLUDE_POWERSTRESS 1
-#define MESHTASTIC_EXCLUDE_ADMIN 1
 #endif

 // // Turn off wifi even if HW supports wifi (webserver relies on wifi and is also disabled)
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -24,7 +24,6 @@ class ScanI2C
        BME_280,
        BMP_280,
        BMP_085,
-        BMP_3XX,
        INA260,
        INA219,
        INA3221,
@@ -52,8 +51,7 @@ class ScanI2C
        AHT10,
        BMX160,
        DFROBOT_LARK,
-        NAU7802,
-        CUSTOM_SENSOR,
+        NAU7802
    } DeviceType;

    // typedef uint8_t DeviceAddress;
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -7,7 +7,6 @@
 #include "linux/LinuxHardwareI2C.h"
 #endif
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
-#include "I2CDefinitions.h"
 #include "main.h" // atecc
 #endif

@@ -268,19 +267,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                    type = BMP_085;
                    break;
                default:
-                    registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x00), 1); // GET_ID
-                    switch (registerValue) {
-                    case 0x50: // BMP-388 should be 0x50
-                        LOG_INFO("BMP-388 sensor found at address 0x%x\n", (uint8_t)addr.address);
-                        type = BMP_3XX;
-                        break;
-                    case 0x58: // BMP-280 should be 0x58
-                    default:
-                        LOG_INFO("BMP-280 sensor found at address 0x%x\n", (uint8_t)addr.address);
-                        type = BMP_280;
-                        break;
-                    }
-                    break;
+                    LOG_INFO("BMP-280 sensor found at address 0x%x\n", (uint8_t)addr.address);
+                    type = BMP_280;
                }
                break;
 #ifndef HAS_NCP5623
@@ -327,7 +315,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)

            case SHT31_4x_ADDR:
                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 2);
-                if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0xe9c) {
+                if (registerValue == 0x11a2 || registerValue == 0x11da) {
                    type = SHT4X;
                    LOG_INFO("SHT4X sensor found\n");
                } else if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2) == 0x5449) {
@@ -378,7 +366,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                SCAN_SIMPLE_CASE(OPT3001_ADDR, OPT3001, "OPT3001 light sensor found\n");
                SCAN_SIMPLE_CASE(MLX90632_ADDR, MLX90632, "MLX90632 IR temp sensor found\n");
                SCAN_SIMPLE_CASE(NAU7802_ADDR, NAU7802, "NAU7802 based scale found\n");
-                SCAN_SIMPLE_CASE(MT_I2C_ADDRESS, CUSTOM_SENSOR, "Meshtastic custom I2C sensor found\n");

            default:
                LOG_INFO("Device found at address 0x%x was not able to be enumerated\n", addr.address);
@@ -417,4 +404,4 @@ size_t ScanI2CTwoWire::countDevices() const
 {
    return foundDevices.size();
 }
-#endif
+#endif
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -2,7 +2,6 @@
 #if !MESHTASTIC_EXCLUDE_GPS
 #include "Default.h"
 #include "GPS.h"
-#include "GpioLogic.h"
 #include "NodeDB.h"
 #include "PowerMon.h"
 #include "RTC.h"
@@ -507,19 +506,19 @@ bool GPS::setup()
            delay(250);
        } else if (gnssModel == GNSS_MODEL_AG3335) {

-            _serial_gps->write("$PAIR066,1,0,1,0,0,1*3B\r\n"); // Enable GPS+GALILEO+NAVIC
+            _serial_gps->write("$PAIR066,1,0,1,0,0,1*3B"); // Enable GPS+GALILEO+NAVIC

            // Configure NMEA (sentences will output once per fix)
-            _serial_gps->write("$PAIR062,0,0*3F\r\n"); // GGA ON
-            _serial_gps->write("$PAIR062,1,0*3F\r\n"); // GLL OFF
-            _serial_gps->write("$PAIR062,2,1*3D\r\n"); // GSA ON
-            _serial_gps->write("$PAIR062,3,0*3D\r\n"); // GSV OFF
-            _serial_gps->write("$PAIR062,4,0*3B\r\n"); // RMC ON
-            _serial_gps->write("$PAIR062,5,0*3B\r\n"); // VTG OFF
-            _serial_gps->write("$PAIR062,6,1*39\r\n"); // ZDA ON
+            _serial_gps->write("$PAIR062,0,0*3F"); // GGA ON
+            _serial_gps->write("$PAIR062,1,0*3F"); // GLL OFF
+            _serial_gps->write("$PAIR062,2,1*3D"); // GSA ON
+            _serial_gps->write("$PAIR062,3,0*3D"); // GSV OFF
+            _serial_gps->write("$PAIR062,4,0*3B"); // RMC ON
+            _serial_gps->write("$PAIR062,5,0*3B"); // VTG OFF
+            _serial_gps->write("$PAIR062,6,1*39"); // ZDA ON

            delay(250);
-            _serial_gps->write("$PAIR513*3D\r\n"); // save configuration
+            _serial_gps->write("$PAIR513*3D"); // save configuration

        } else if (gnssModel == GNSS_MODEL_UBLOX) {
            // Configure GNSS system to GPS+SBAS+GLONASS (Module may restart after this command)
@@ -876,8 +875,16 @@ void GPS::writePinEN(bool on)
    if (HW_VENDOR == meshtastic_HardwareModel_RAK4631 && (rotaryEncoderInterruptImpl1 || upDownInterruptImpl1))
        return;

+    // Abort: if pin unset
+    if (!en_gpio)
+        return;
+
+    // Determine new value for the pin
+    bool val = GPS_EN_ACTIVE ? on : !on;
+
    // Write and log
-    enablePin->set(on);
+    pinMode(en_gpio, OUTPUT);
+    digitalWrite(en_gpio, val);
 #ifdef GPS_EXTRAVERBOSE
    LOG_DEBUG("Pin EN %s\n", val == HIGH ? "HIGH" : "LOW");
 #endif
@@ -1019,7 +1026,7 @@ void GPS::down()
    LOG_DEBUG("%us until next search\n", sleepTime / 1000);

    // If update interval less than 10 seconds, no attempt to sleep
-    if (updateInterval <= 10 * 1000UL || sleepTime == 0)
+    if (updateInterval <= 10 * 1000UL)
        setPowerState(GPS_IDLE);

    else {
@@ -1184,15 +1191,6 @@ int GPS::prepareDeepSleep(void *unused)
    return 0;
 }

-#define PROBE_SIMPLE(CHIP, TOWRITE, RESPONSE, DRIVER, TIMEOUT, ...)                                                              \
-    LOG_DEBUG("Trying " TOWRITE " (" CHIP ") ...\n");                                                                            \
-    clearBuffer();                                                                                                               \
-    _serial_gps->write(TOWRITE "\r\n");                                                                                          \
-    if (getACK(RESPONSE, TIMEOUT) == GNSS_RESPONSE_OK) {                                                                         \
-        LOG_INFO(CHIP " detected, using " #DRIVER " Module\n");                                                                  \
-        return DRIVER;                                                                                                           \
-    }
-
 GnssModel_t GPS::probe(int serialSpeed)
 {
 #if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_RP2040) || defined(ARCH_STM32WL)
@@ -1207,7 +1205,11 @@ GnssModel_t GPS::probe(int serialSpeed)
 #ifdef GNSS_AIROHA
    return GNSS_MODEL_AG3335;
 #endif
-
+#ifdef GPS_DEBUG
+    for (int i = 0; i < 20; i++) {
+        getACK("$GP", 200);
+    }
+#endif
    memset(&info, 0, sizeof(struct uBloxGnssModelInfo));
    uint8_t buffer[768] = {0};
    delay(100);
@@ -1216,24 +1218,70 @@ GnssModel_t GPS::probe(int serialSpeed)
    _serial_gps->write("$PCAS03,0,0,0,0,0,0,0,0,0,0,,,0,0*02\r\n");
    delay(20);

-    // Unicore UFirebirdII Series: UC6580, UM620, UM621, UM670A, UM680A, or UM681A
-    PROBE_SIMPLE("UC6580", "$PDTINFO", "UC6580", GNSS_MODEL_UC6580, 500);
-    PROBE_SIMPLE("UM600", "$PDTINFO", "UM600", GNSS_MODEL_UC6580, 500);
-    PROBE_SIMPLE("ATGM336H", "$PCAS06,1*1A", "$GPTXT,01,01,02,HW=ATGM336H", GNSS_MODEL_ATGM336H, 500);
+    // get version information from Unicore UFirebirdII Series
+    // Works for: UC6580, UM620, UM621, UM670A, UM680A, or UM681A
+    _serial_gps->write("$PDTINFO\r\n");
+    delay(750);
+    if (getACK("UC6580", 500) == GNSS_RESPONSE_OK) {
+        LOG_INFO("UC6580 detected, using UC6580 Module\n");
+        return GNSS_MODEL_UC6580;
+    }
+
+    clearBuffer();
+    _serial_gps->write("$PDTINFO\r\n");
+    delay(750);
+    if (getACK("UM600", 500) == GNSS_RESPONSE_OK) {
+        LOG_INFO("UM600 detected, using UC6580 Module\n");
+        return GNSS_MODEL_UC6580;
+    }
+
+    // Get version information for ATGM336H
+    clearBuffer();
+    _serial_gps->write("$PCAS06,1*1A\r\n");
+    if (getACK("$GPTXT,01,01,02,HW=ATGM336H", 500) == GNSS_RESPONSE_OK) {
+        LOG_INFO("ATGM336H GNSS init succeeded, using ATGM336H Module\n");
+        return GNSS_MODEL_ATGM336H;
+    }
+
    /* ATGM332D series (-11(GPS), -21(BDS), -31(GPS+BDS), -51(GPS+GLONASS), -71-0(GPS+BDS+GLONASS))
    based on AT6558 */
-    PROBE_SIMPLE("ATGM332D", "$PCAS06,1*1A", "$GPTXT,01,01,02,HW=ATGM332D", GNSS_MODEL_ATGM336H, 500);
+    clearBuffer();
+    _serial_gps->write("$PCAS06,1*1A\r\n");
+    if (getACK("$GPTXT,01,01,02,HW=ATGM332D", 500) == GNSS_RESPONSE_OK) {
+        LOG_INFO("ATGM332D detected, using ATGM336H Module\n");
+        return GNSS_MODEL_ATGM336H;
+    }

    /* Airoha (Mediatek) AG3335A/M/S, A3352Q, Quectel L89 2.0, SimCom SIM65M */
-    PROBE_SIMPLE("AG3335", "PAIR020*38", "$PAIR020,AG3335", GNSS_MODEL_AG3335, 500);
+    clearBuffer();
+    _serial_gps->write("PAIR020*38\r\n");
+    if (getACK("$PAIR020,AG3335", 500) == GNSS_RESPONSE_OK) {
+        LOG_INFO("Aioha AG3335 detected, using AG3335 Module\n");
+        return GNSS_MODEL_AG3335;
+    }
+    // Get version information for Airoha AG3335
+    clearBuffer();
+    _serial_gps->write("$PMTK605*31\r\n");

-    PROBE_SIMPLE("L76K", "$PCAS06,0*1B", "$GPTXT,01,01,02,SW=", GNSS_MODEL_MTK, 500);
+    // Get version information
+    clearBuffer();
+    _serial_gps->write("$PCAS06,0*1B\r\n");
+    if (getACK("$GPTXT,01,01,02,SW=", 500) == GNSS_RESPONSE_OK) {
+        LOG_INFO("L76K GNSS init succeeded, using L76K GNSS Module\n");
+        return GNSS_MODEL_MTK;
+    }

    // Close all NMEA sentences, valid for L76B MTK platform (Waveshare Pico GPS)
    _serial_gps->write("$PMTK514,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0*2E\r\n");
    delay(20);

-    PROBE_SIMPLE("L76B", "$PMTK605*31", "Quectel-L76B", GNSS_MODEL_MTK_L76B, 500);
+    // Get version information
+    clearBuffer();
+    _serial_gps->write("$PMTK605*31\r\n");
+    if (getACK("Quectel-L76B", 500) == GNSS_RESPONSE_OK) {
+        LOG_INFO("L76B GNSS init succeeded, using L76B GNSS Module\n");
+        return GNSS_MODEL_MTK_L76B;
+    }

    uint8_t cfg_rate[] = {0xB5, 0x62, 0x06, 0x08, 0x00, 0x00, 0x00, 0x00};
    UBXChecksum(cfg_rate, sizeof(cfg_rate));
@@ -1373,20 +1421,7 @@ GPS *GPS::createGps()
    GPS *new_gps = new GPS;
    new_gps->rx_gpio = _rx_gpio;
    new_gps->tx_gpio = _tx_gpio;
-
-    GpioVirtPin *virtPin = new GpioVirtPin();
-    new_gps->enablePin = virtPin; // Always at least populate a virtual pin
-    if (_en_gpio) {
-        GpioPin *p = new GpioHwPin(_en_gpio);
-
-        if (!GPS_EN_ACTIVE) { // Need to invert the pin before hardware
-            new GpioNotTransformer(
-                virtPin, p); // We just leave this created object on the heap so it can stay watching virtPin and driving en_gpio
-        } else {
-            new GpioUnaryTransformer(
-                virtPin, p); // We just leave this created object on the heap so it can stay watching virtPin and driving en_gpio
-        }
-    }
+    new_gps->en_gpio = _en_gpio;

 #ifdef PIN_GPS_PPS
    // pulse per second
--- a/src/gps/GPS.h
+++ b/src/gps/GPS.h
@@ -3,7 +3,6 @@
 #if !MESHTASTIC_EXCLUDE_GPS

 #include "GPSStatus.h"
-#include "GpioLogic.h"
 #include "Observer.h"
 #include "TinyGPS++.h"
 #include "concurrency/OSThread.h"
@@ -74,6 +73,7 @@ class GPS : private concurrency::OSThread
    uint32_t lastWakeStartMsec = 0, lastSleepStartMsec = 0, lastFixStartMsec = 0;
    uint32_t rx_gpio = 0;
    uint32_t tx_gpio = 0;
+    uint32_t en_gpio = 0;

    int speedSelect = 0;
    int probeTries = 2;
@@ -152,13 +152,6 @@ class GPS : private concurrency::OSThread

    meshtastic_Position p = meshtastic_Position_init_default;

-    /** This is normally bound to config.position.gps_en_gpio but some rare boards (like heltec tracker) need more advanced
-     * implementations. Those boards will set this public variable to a custom implementation.
-     *
-     * Normally set by GPS::createGPS()
-     */
-    GpioVirtPin *enablePin = NULL;
-
    GPS() : concurrency::OSThread("GPS") {}

    virtual ~GPS();
@@ -297,6 +290,7 @@ class GPS : private concurrency::OSThread
    virtual int32_t runOnce() override;

    // Get GNSS model
+    String getNMEA();
    GnssModel_t probe(int serialSpeed);

    // delay counter to allow more sats before fixed position stops GPS thread
--- a/src/graphics/EInkDisplay2.cpp
+++ b/src/graphics/EInkDisplay2.cpp
@@ -157,7 +157,7 @@ bool EInkDisplay::connect()
    }

 #elif defined(HELTEC_WIRELESS_PAPER_V1_0) || defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_VISION_MASTER_E213) ||             \
-    defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER)
+    defined(HELTEC_VISION_MASTER_E290)
    {
        // Start HSPI
        hspi = new SPIClass(HSPI);
--- a/src/graphics/EInkDisplay2.h
+++ b/src/graphics/EInkDisplay2.h
@@ -68,7 +68,7 @@ class EInkDisplay : public OLEDDisplay

    // If display uses HSPI
 #if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0) || defined(HELTEC_VISION_MASTER_E213) ||               \
-    defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER)
+    defined(HELTEC_VISION_MASTER_E290)
    SPIClass *hspi = NULL;
 #endif

--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -123,7 +123,7 @@ static bool heartbeat = false;
 /// Check if the display can render a string (detect special chars; emoji)
 static bool haveGlyphs(const char *str)
 {
-#if defined(OLED_PL) || defined(OLED_UA) || defined(OLED_RU)
+#if defined(OLED_UA) || defined(OLED_RU)
    // Don't want to make any assumptions about custom language support
    return true;
 #endif
@@ -1093,8 +1093,7 @@ static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const NodeStat
 {
    char usersString[20];
    snprintf(usersString, sizeof(usersString), "%d/%d", nodeStatus->getNumOnline(), nodeStatus->getNumTotal());
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS)) &&                                                                                                      \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(HX8357_CS)) &&          \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
    display->drawFastImage(x, y + 3, 8, 8, imgUser);
 #else
@@ -1766,11 +1765,6 @@ void Screen::forceDisplay(bool forceUiUpdate)
 #ifdef USE_EINK
    // If requested, make sure queued commands are run, and UI has rendered a new frame
    if (forceUiUpdate) {
-        // Force a display refresh, in addition to the UI update
-        // Changing the GPS status bar icon apparently doesn't register as a change in image
-        // (False negative of the image hashing algorithm used to skip identical frames)
-        EINK_ADD_FRAMEFLAG(dispdev, DEMAND_FAST);
-
        // No delay between UI frame rendering
        setFastFramerate();

@@ -2420,8 +2414,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 #ifdef ARCH_ESP32
        if (millis() - storeForwardModule->lastHeartbeat >
            (storeForwardModule->heartbeatInterval * 1200)) { // no heartbeat, overlap a bit
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS)) &&                                                                                                      \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(HX8357_CS)) &&          \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                                   imgQuestionL1);
@@ -2432,8 +2425,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                                   imgQuestion);
 #endif
        } else {
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS)) &&                                                                                                      \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(HX8357_CS)) &&          \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8,
                                   imgSFL1);
@@ -2447,8 +2439,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 #endif
    } else {
        // TODO: Raspberry Pi supports more than just the one screen size
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS) || ARCH_PORTDUINO) &&                                                                                    \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(HX8357_CS) ||           \
+     ARCH_PORTDUINO) &&                                                                                                          \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                               imgInfoL1);
--- a/src/graphics/Screen.h
+++ b/src/graphics/Screen.h
@@ -309,7 +309,7 @@ class Screen : public concurrency::OSThread
    static char customFontTableLookup(const uint8_t ch)
    {
        // UTF-8 to font table index converter
-        // Code from http://playground.arduino.cc/Main/Utf8ascii
+        // Code form http://playground.arduino.cc/Main/Utf8ascii
        static uint8_t LASTCHAR;
        static bool SKIPREST; // Only display a single unconvertable-character symbol per sequence of unconvertable characters

@@ -322,57 +322,11 @@ class Screen : public concurrency::OSThread
        uint8_t last = LASTCHAR; // get last char
        LASTCHAR = ch;

-        switch (last) {
+        switch (last) { // conversion depending on first UTF8-character
        case 0xC2: {
            SKIPREST = false;
            return (uint8_t)ch;
        }
-        }
-
-        // We want to strip out prefix chars for two-byte char formats
-        if (ch == 0xC2)
-            return (uint8_t)0;
-
-#if defined(OLED_PL)
-
-        switch (last) {
-        case 0xC3: {
-
-            if (ch == 147)
-                return (uint8_t)(ch); // Ó
-            else if (ch == 179)
-                return (uint8_t)(148); // ó
-            else
-                return (uint8_t)(ch | 0xC0);
-            break;
-        }
-
-        case 0xC4: {
-            SKIPREST = false;
-            return (uint8_t)(ch);
-        }
-
-        case 0xC5: {
-            SKIPREST = false;
-            if (ch == 132)
-                return (uint8_t)(136); // ń
-            else if (ch == 186)
-                return (uint8_t)(137); // ź
-            else
-                return (uint8_t)(ch);
-            break;
-        }
-        }
-
-        // We want to strip out prefix chars for two-byte char formats
-        if (ch == 0xC2 || ch == 0xC3 || ch == 0xC4 || ch == 0xC5)
-            return (uint8_t)0;
-
-#endif
-
-#if defined(OLED_UA) || defined(OLED_RU)
-
-        switch (last) {
        case 0xC3: {
            SKIPREST = false;
            return (uint8_t)(ch | 0xC0);
@@ -422,8 +376,6 @@ class Screen : public concurrency::OSThread
        if (ch == 0xC2 || ch == 0xC3 || ch == 0x82 || ch == 0xD0 || ch == 0xD1)
            return (uint8_t)0;

-#endif
-
        // If we already returned an unconvertable-character symbol for this unconvertable-character sequence, return NULs for the
        // rest of it
        if (SKIPREST)
--- a/src/graphics/ScreenFonts.h
+++ b/src/graphics/ScreenFonts.h
@@ -1,9 +1,5 @@
 #pragma once

-#ifdef OLED_PL
-#include "graphics/fonts/OLEDDisplayFontsPL.h"
-#endif
-
 #ifdef OLED_RU
 #include "graphics/fonts/OLEDDisplayFontsRU.h"
 #endif
@@ -12,17 +8,13 @@
 #include "graphics/fonts/OLEDDisplayFontsUA.h"
 #endif

-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS)) &&                                                                                                      \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(HX8357_CS)) &&          \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16  // Height: 19
 #define FONT_MEDIUM ArialMT_Plain_24 // Height: 28
 #define FONT_LARGE ArialMT_Plain_24  // Height: 28
 #else
-#ifdef OLED_PL
-#define FONT_SMALL ArialMT_Plain_10_PL
-#else
 #ifdef OLED_RU
 #define FONT_SMALL ArialMT_Plain_10_RU
 #else
@@ -32,7 +24,6 @@
 #define FONT_SMALL ArialMT_Plain_10 // Height: 13
 #endif
 #endif
-#endif
 #define FONT_MEDIUM ArialMT_Plain_16 // Height: 19
 #define FONT_LARGE ArialMT_Plain_24  // Height: 28
 #endif
--- a/src/graphics/TFTDisplay.cpp
+++ b/src/graphics/TFTDisplay.cpp
@@ -21,6 +21,10 @@ extern SX1509 gpioExtender;
 #if defined(ST7735S)
 #include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip

+#if defined(ST7735_BACKLIGHT_EN) && !defined(TFT_BL)
+#define TFT_BL ST7735_BACKLIGHT_EN
+#endif
+
 #ifndef TFT_INVERT
 #define TFT_INVERT true
 #endif
@@ -87,20 +91,24 @@ class LGFX : public lgfx::LGFX_Device
            _panel_instance.config(cfg);
        }

-#ifdef TFT_BL
        // Set the backlight control
        {
            auto cfg = _light_instance.config(); // Gets a structure for backlight settings.

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

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

        setPanel(&_panel_instance);
    }
@@ -123,6 +131,10 @@ static void rak14014_tpIntHandle(void)
 #elif defined(ST7789_CS)
 #include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip

+#if defined(ST7789_BACKLIGHT_EN) && !defined(TFT_BL)
+#define TFT_BL ST7789_BACKLIGHT_EN
+#endif
+
 class LGFX : public lgfx::LGFX_Device
 {
    lgfx::Panel_ST7789 _panel_instance;
@@ -192,7 +204,6 @@ class LGFX : public lgfx::LGFX_Device
            _panel_instance.config(cfg);
        }

-#ifdef ST7789_BL
        // Set the backlight control. (delete if not necessary)
        {
            auto cfg = _light_instance.config(); // Gets a structure for backlight settings.
@@ -204,7 +215,6 @@ class LGFX : public lgfx::LGFX_Device
            _light_instance.config(cfg);
            _panel_instance.setLight(&_light_instance); // Set the backlight on the panel.
        }
-#endif

 #if HAS_TOUCHSCREEN
        // Configure settings for touch screen control.
@@ -314,7 +324,6 @@ class LGFX : public lgfx::LGFX_Device
            _panel_instance.config(cfg);
        }

-#ifdef TFT_BL
        // Set the backlight control
        {
            auto cfg = _light_instance.config(); // Gets a structure for backlight settings.
@@ -327,7 +336,6 @@ class LGFX : public lgfx::LGFX_Device
            _light_instance.config(cfg);
            _panel_instance.setLight(&_light_instance); // Set the backlight on the panel.
        }
-#endif

        setPanel(&_panel_instance);
    }
@@ -513,26 +521,9 @@ static LGFX *tft = nullptr;
 extern unPhone unphone;
 #endif

-GpioPin *TFTDisplay::backlightEnable = NULL;
-
 TFTDisplay::TFTDisplay(uint8_t address, int sda, int scl, OLEDDISPLAY_GEOMETRY geometry, HW_I2C i2cBus)
 {
    LOG_DEBUG("TFTDisplay!\n");
-
-#ifdef TFT_BL
-    GpioPin *p = new GpioHwPin(TFT_BL);
-
-    if (!TFT_BACKLIGHT_ON) { // Need to invert the pin before hardware
-        auto virtPin = new GpioVirtPin();
-        new GpioNotTransformer(
-            virtPin, p); // We just leave this created object on the heap so it can stay watching virtPin and driving en_gpio
-        p = virtPin;
-    }
-#else
-    GpioPin *p = new GpioVirtPin(); // Just simulate a pin
-#endif
-    backlightEnable = p;
-
 #if ARCH_PORTDUINO
    if (settingsMap[displayRotate]) {
        setGeometry(GEOMETRY_RAWMODE, settingsMap[configNames::displayHeight], settingsMap[configNames::displayWidth]);
@@ -586,15 +577,24 @@ void TFTDisplay::sendCommand(uint8_t com)
    // handle display on/off directly
    switch (com) {
    case DISPLAYON: {
-        // LOG_DEBUG("Display on\n");
-        backlightEnable->set(true);
 #if ARCH_PORTDUINO
        display(true);
        if (settingsMap[displayBacklight] > 0)
            digitalWrite(settingsMap[displayBacklight], TFT_BACKLIGHT_ON);
+#elif defined(ST7735_BL_V03)
+        digitalWrite(ST7735_BL_V03, TFT_BACKLIGHT_ON);
+#elif defined(ST7735_BL_V05)
+        pinMode(ST7735_BL_V05, OUTPUT);
+        digitalWrite(ST7735_BL_V05, TFT_BACKLIGHT_ON);
 #elif !defined(RAK14014) && !defined(M5STACK) && !defined(UNPHONE)
        tft->wakeup();
        tft->powerSaveOff();
+#elif defined(TFT_BL) && defined(TFT_BACKLIGHT_ON)
+        digitalWrite(TFT_BL, TFT_BACKLIGHT_ON);
+#endif
+
+#ifdef VTFT_CTRL_V03
+        digitalWrite(VTFT_CTRL_V03, LOW);
 #endif

 #ifdef VTFT_CTRL
@@ -610,17 +610,25 @@ void TFTDisplay::sendCommand(uint8_t com)
        break;
    }
    case DISPLAYOFF: {
-        // LOG_DEBUG("Display off\n");
-        backlightEnable->set(false);
 #if ARCH_PORTDUINO
        tft->clear();
        if (settingsMap[displayBacklight] > 0)
            digitalWrite(settingsMap[displayBacklight], !TFT_BACKLIGHT_ON);
+#elif defined(ST7735_BL_V03)
+        digitalWrite(ST7735_BL_V03, !TFT_BACKLIGHT_ON);
+#elif defined(ST7735_BL_V05)
+        pinMode(ST7735_BL_V05, OUTPUT);
+        digitalWrite(ST7735_BL_V05, !TFT_BACKLIGHT_ON);
 #elif !defined(RAK14014) && !defined(M5STACK) && !defined(UNPHONE)
        tft->sleep();
        tft->powerSaveOn();
+#elif defined(TFT_BL) && defined(TFT_BACKLIGHT_ON)
+        digitalWrite(TFT_BL, !TFT_BACKLIGHT_ON);
 #endif

+#ifdef VTFT_CTRL_V03
+        digitalWrite(VTFT_CTRL_V03, HIGH);
+#endif
 #ifdef VTFT_CTRL
        digitalWrite(VTFT_CTRL, HIGH);
 #endif
@@ -704,9 +712,20 @@ bool TFTDisplay::connect()
    tft = new LGFX;
 #endif

-    backlightEnable->set(true);
+#ifdef TFT_BL
+    pinMode(TFT_BL, OUTPUT);
+    digitalWrite(TFT_BL, TFT_BACKLIGHT_ON);
+    // pinMode(PIN_3V3_EN, OUTPUT);
+    // digitalWrite(PIN_3V3_EN, HIGH);
    LOG_INFO("Power to TFT Backlight\n");
+#endif

+#ifdef ST7735_BL_V03
+    digitalWrite(ST7735_BL_V03, TFT_BACKLIGHT_ON);
+#elif defined(ST7735_BL_V05)
+    pinMode(ST7735_BL_V05, OUTPUT);
+    digitalWrite(ST7735_BL_V05, TFT_BACKLIGHT_ON);
+#endif
 #ifdef UNPHONE
    unphone.backlight(true); // using unPhone library
    LOG_INFO("Power to TFT Backlight\n");
--- a/src/graphics/TFTDisplay.h
+++ b/src/graphics/TFTDisplay.h
@@ -1,6 +1,5 @@
 #pragma once

-#include <GpioLogic.h>
 #include <OLEDDisplay.h>

 /**
@@ -40,14 +39,6 @@ class TFTDisplay : public OLEDDisplay
     */
    void setDetected(uint8_t detected);

-    /**
-     * This is normally managed entirely by TFTDisplay, but some rare applications (heltec tracker) might need to replace the
-     * default GPIO behavior with something a bit more complex.
-     *
-     * We (cruftily) make it static so that variant.cpp can access it without needing a ptr to the TFTDisplay instance.
-     */
-    static GpioPin *backlightEnable;
-
  protected:
    // the header size of the buffer used, e.g. for the SPI command header
    virtual int getBufferOffset(void) override { return 0; }
--- a/src/graphics/fonts/OLEDDisplayFontsPL.cpp
+++ b/src/graphics/fonts/OLEDDisplayFontsPL.cpp
@@ -1,440 +0,0 @@
-#include "OLEDDisplayFontsPL.h"
-
-// Font generated or edited with the glyphEditor
-const uint8_t ArialMT_Plain_10_PL[] PROGMEM = {
-    0x0A, // Width: 10
-    0x0D, // Height: 13
-    0x20, // First char: 32
-    0xE0, // Number of chars: 224
-
-    // Jump Table:
-    0xFF, 0xFF, 0x00, 0x03, // 32:65535
-    0x00, 0x00, 0x04, 0x03, // 33
-    0x00, 0x04, 0x05, 0x04, // 34
-    0x00, 0x09, 0x09, 0x06, // 35
-    0x00, 0x12, 0x0A, 0x06, // 36
-    0x00, 0x1C, 0x10, 0x09, // 37
-    0x00, 0x2C, 0x0E, 0x08, // 38
-    0x00, 0x3A, 0x01, 0x02, // 39
-    0x00, 0x3B, 0x06, 0x04, // 40
-    0x00, 0x41, 0x06, 0x04, // 41
-    0x00, 0x47, 0x05, 0x04, // 42
-    0x00, 0x4C, 0x09, 0x06, // 43
-    0x00, 0x55, 0x04, 0x03, // 44
-    0x00, 0x59, 0x03, 0x03, // 45
-    0x00, 0x5C, 0x04, 0x03, // 46
-    0x00, 0x60, 0x05, 0x04, // 47
-    0x00, 0x65, 0x0A, 0x06, // 48
-    0x00, 0x6F, 0x08, 0x05, // 49
-    0x00, 0x77, 0x0A, 0x06, // 50
-    0x00, 0x81, 0x0A, 0x06, // 51
-    0x00, 0x8B, 0x0B, 0x07, // 52
-    0x00, 0x96, 0x0A, 0x06, // 53
-    0x00, 0xA0, 0x0A, 0x06, // 54
-    0x00, 0xAA, 0x09, 0x06, // 55
-    0x00, 0xB3, 0x0A, 0x06, // 56
-    0x00, 0xBD, 0x0A, 0x06, // 57
-    0x00, 0xC7, 0x04, 0x03, // 58
-    0x00, 0xCB, 0x04, 0x03, // 59
-    0x00, 0xCF, 0x0A, 0x06, // 60
-    0x00, 0xD9, 0x09, 0x06, // 61
-    0x00, 0xE2, 0x09, 0x06, // 62
-    0x00, 0xEB, 0x0B, 0x07, // 63
-    0x00, 0xF6, 0x14, 0x0B, // 64
-    0x01, 0x0A, 0x0E, 0x08, // 65
-    0x01, 0x18, 0x0C, 0x07, // 66
-    0x01, 0x24, 0x0C, 0x07, // 67
-    0x01, 0x30, 0x0B, 0x07, // 68
-    0x01, 0x3B, 0x0C, 0x07, // 69
-    0x01, 0x47, 0x09, 0x06, // 70
-    0x01, 0x50, 0x0D, 0x08, // 71
-    0x01, 0x5D, 0x0C, 0x07, // 72
-    0x01, 0x69, 0x04, 0x03, // 73
-    0x01, 0x6D, 0x08, 0x05, // 74
-    0x01, 0x75, 0x0E, 0x08, // 75
-    0x01, 0x83, 0x0C, 0x07, // 76
-    0x01, 0x8F, 0x10, 0x09, // 77
-    0x01, 0x9F, 0x0C, 0x07, // 78
-    0x01, 0xAB, 0x0E, 0x08, // 79
-    0x01, 0xB9, 0x0B, 0x07, // 80
-    0x01, 0xC4, 0x0E, 0x08, // 81
-    0x01, 0xD2, 0x0C, 0x07, // 82
-    0x01, 0xDE, 0x0C, 0x07, // 83
-    0x01, 0xEA, 0x0B, 0x07, // 84
-    0x01, 0xF5, 0x0C, 0x07, // 85
-    0x02, 0x01, 0x0D, 0x08, // 86
-    0x02, 0x0E, 0x11, 0x0A, // 87
-    0x02, 0x1F, 0x0E, 0x08, // 88
-    0x02, 0x2D, 0x0D, 0x08, // 89
-    0x02, 0x3A, 0x0C, 0x07, // 90
-    0x02, 0x46, 0x06, 0x04, // 91
-    0x02, 0x4C, 0x06, 0x04, // 92
-    0x02, 0x52, 0x04, 0x03, // 93
-    0x02, 0x56, 0x09, 0x06, // 94
-    0x02, 0x5F, 0x0C, 0x07, // 95
-    0x02, 0x6B, 0x03, 0x03, // 96
-    0x02, 0x6E, 0x0A, 0x06, // 97
-    0x02, 0x78, 0x0A, 0x06, // 98
-    0x02, 0x82, 0x0A, 0x06, // 99
-    0x02, 0x8C, 0x0A, 0x06, // 100
-    0x02, 0x96, 0x0A, 0x06, // 101
-    0x02, 0xA0, 0x05, 0x04, // 102
-    0x02, 0xA5, 0x0A, 0x06, // 103
-    0x02, 0xAF, 0x0A, 0x06, // 104
-    0x02, 0xB9, 0x04, 0x03, // 105
-    0x02, 0xBD, 0x04, 0x03, // 106
-    0x02, 0xC1, 0x08, 0x05, // 107
-    0x02, 0xC9, 0x04, 0x03, // 108
-    0x02, 0xCD, 0x10, 0x09, // 109
-    0x02, 0xDD, 0x0A, 0x06, // 110
-    0x02, 0xE7, 0x0A, 0x06, // 111
-    0x02, 0xF1, 0x0A, 0x06, // 112
-    0x02, 0xFB, 0x0A, 0x06, // 113
-    0x03, 0x05, 0x05, 0x04, // 114
-    0x03, 0x0A, 0x08, 0x05, // 115
-    0x03, 0x12, 0x06, 0x04, // 116
-    0x03, 0x18, 0x0A, 0x06, // 117
-    0x03, 0x22, 0x09, 0x06, // 118
-    0x03, 0x2B, 0x0E, 0x08, // 119
-    0x03, 0x39, 0x0A, 0x06, // 120
-    0x03, 0x43, 0x09, 0x06, // 121
-    0x03, 0x4C, 0x0A, 0x06, // 122
-    0x03, 0x56, 0x06, 0x04, // 123
-    0x03, 0x5C, 0x04, 0x03, // 124
-    0x03, 0x60, 0x05, 0x04, // 125
-    0x03, 0x65, 0x09, 0x06, // 126
-    0xFF, 0xFF, 0x00, 0x0A, // 127
-    0xFF, 0xFF, 0x00, 0x0A, // 128
-    0x03, 0x6E, 0x0C, 0x07, // 129
-    0x03, 0x7A, 0x05, 0x04, // 130
-    0x03, 0x7F, 0x0C, 0x07, // 131
-    0x03, 0x8B, 0x0E, 0x08, // 132
-    0x03, 0x99, 0x0C, 0x07, // 133
-    0x03, 0xA5, 0x0C, 0x07, // 134
-    0x03, 0xB1, 0x0A, 0x06, // 135
-    0x03, 0xBB, 0x0A, 0x06, // 136
-    0x03, 0xC5, 0x0A, 0x06, // 137
-    0xFF, 0xFF, 0x00, 0x0A, // 138
-    0xFF, 0xFF, 0x00, 0x0A, // 139
-    0xFF, 0xFF, 0x00, 0x0A, // 140
-    0xFF, 0xFF, 0x00, 0x0A, // 141
-    0xFF, 0xFF, 0x00, 0x0A, // 142
-    0xFF, 0xFF, 0x00, 0x0A, // 143
-    0xFF, 0xFF, 0x00, 0x0A, // 144
-    0xFF, 0xFF, 0x00, 0x0A, // 145
-    0xFF, 0xFF, 0x00, 0x0A, // 146
-    0x03, 0xCF, 0x0E, 0x08, // 147
-    0x03, 0xDD, 0x0A, 0x06, // 148
-    0xFF, 0xFF, 0x00, 0x0A, // 149
-    0xFF, 0xFF, 0x00, 0x0A, // 150
-    0xFF, 0xFF, 0x00, 0x0A, // 151
-    0x03, 0xE7, 0x0C, 0x07, // 152
-    0x03, 0xF3, 0x0C, 0x07, // 153
-    0x03, 0xFF, 0x0C, 0x07, // 154
-    0x04, 0x0B, 0x08, 0x05, // 155
-    0xFF, 0xFF, 0x00, 0x0A, // 156
-    0xFF, 0xFF, 0x00, 0x0A, // 157
-    0xFF, 0xFF, 0x00, 0x0A, // 158
-    0xFF, 0xFF, 0x00, 0x0A, // 159
-    0xFF, 0xFF, 0x00, 0x0A, // 160
-    0x04, 0x13, 0x04, 0x03, // 161
-    0x04, 0x17, 0x0A, 0x06, // 162
-    0x04, 0x21, 0x0C, 0x07, // 163
-    0x04, 0x2D, 0x0A, 0x06, // 164
-    0x04, 0x37, 0x0A, 0x06, // 165
-    0x04, 0x41, 0x04, 0x03, // 166
-    0x04, 0x45, 0x0A, 0x06, // 167
-    0x04, 0x4F, 0x05, 0x04, // 168
-    0x04, 0x54, 0x0D, 0x08, // 169
-    0x04, 0x61, 0x07, 0x05, // 170
-    0x04, 0x68, 0x0A, 0x06, // 171
-    0x04, 0x72, 0x09, 0x06, // 172
-    0x04, 0x7B, 0x03, 0x03, // 173
-    0x04, 0x7E, 0x0D, 0x08, // 174
-    0x04, 0x8B, 0x0B, 0x07, // 175
-    0x04, 0x96, 0x07, 0x05, // 176
-    0x04, 0x9D, 0x0A, 0x06, // 177
-    0x04, 0xA7, 0x05, 0x04, // 178
-    0x04, 0xAC, 0x05, 0x04, // 179
-    0x04, 0xB1, 0x05, 0x04, // 180
-    0x04, 0xB6, 0x0A, 0x06, // 181
-    0x04, 0xC0, 0x09, 0x06, // 182
-    0x04, 0xC9, 0x03, 0x03, // 183
-    0x04, 0xCC, 0x06, 0x04, // 184
-    0x04, 0xD2, 0x0C, 0x07, // 185
-    0x04, 0xDE, 0x07, 0x05, // 186
-    0x04, 0xE5, 0x0C, 0x07, // 187
-    0x04, 0xF1, 0x0A, 0x06, // 188
-    0x04, 0xFB, 0x10, 0x09, // 189
-    0x05, 0x0B, 0x10, 0x09, // 190
-    0x05, 0x1B, 0x0A, 0x06, // 191
-    0x05, 0x25, 0x0E, 0x08, // 192
-    0x05, 0x33, 0x0E, 0x08, // 193
-    0x05, 0x41, 0x0E, 0x08, // 194
-    0x05, 0x4F, 0x0E, 0x08, // 195
-    0x05, 0x5D, 0x0E, 0x08, // 196
-    0x05, 0x6B, 0x0E, 0x08, // 197
-    0x05, 0x79, 0x12, 0x0A, // 198
-    0x05, 0x8B, 0x0C, 0x07, // 199
-    0x05, 0x97, 0x0C, 0x07, // 200
-    0x05, 0xA3, 0x0C, 0x07, // 201
-    0x05, 0xAF, 0x0C, 0x07, // 202
-    0x05, 0xBB, 0x0C, 0x07, // 203
-    0x05, 0xC7, 0x05, 0x04, // 204
-    0x05, 0xCC, 0x04, 0x03, // 205
-    0x05, 0xD0, 0x04, 0x03, // 206
-    0x05, 0xD4, 0x05, 0x04, // 207
-    0x05, 0xD9, 0x0B, 0x07, // 208
-    0x05, 0xE4, 0x0C, 0x07, // 209
-    0x05, 0xF0, 0x0E, 0x08, // 210
-    0x05, 0xFE, 0x0E, 0x08, // 211
-    0x06, 0x0C, 0x0E, 0x08, // 212
-    0x06, 0x1A, 0x0E, 0x08, // 213
-    0x06, 0x28, 0x0E, 0x08, // 214
-    0x06, 0x36, 0x0A, 0x06, // 215
-    0x06, 0x40, 0x0D, 0x08, // 216
-    0x06, 0x4D, 0x0C, 0x07, // 217
-    0x06, 0x59, 0x0C, 0x07, // 218
-    0x06, 0x65, 0x0C, 0x07, // 219
-    0x06, 0x71, 0x0C, 0x07, // 220
-    0x06, 0x7D, 0x0D, 0x08, // 221
-    0x06, 0x8A, 0x0B, 0x07, // 222
-    0x06, 0x95, 0x0C, 0x07, // 223
-    0x06, 0xA1, 0x0A, 0x06, // 224
-    0x06, 0xAB, 0x0A, 0x06, // 225
-    0x06, 0xB5, 0x0A, 0x06, // 226
-    0x06, 0xBF, 0x0A, 0x06, // 227
-    0x06, 0xC9, 0x0A, 0x06, // 228
-    0x06, 0xD3, 0x0A, 0x06, // 229
-    0x06, 0xDD, 0x10, 0x09, // 230
-    0x06, 0xED, 0x0A, 0x06, // 231
-    0x06, 0xF7, 0x0A, 0x06, // 232
-    0x07, 0x01, 0x0A, 0x06, // 233
-    0x07, 0x0B, 0x0A, 0x06, // 234
-    0x07, 0x15, 0x0A, 0x06, // 235
-    0x07, 0x1F, 0x05, 0x04, // 236
-    0x07, 0x24, 0x04, 0x03, // 237
-    0x07, 0x28, 0x05, 0x04, // 238
-    0x07, 0x2D, 0x05, 0x04, // 239
-    0x07, 0x32, 0x0A, 0x06, // 240
-    0x07, 0x3C, 0x0A, 0x06, // 241
-    0x07, 0x46, 0x0A, 0x06, // 242
-    0x07, 0x50, 0x0A, 0x06, // 243
-    0x07, 0x5A, 0x0A, 0x06, // 244
-    0x07, 0x64, 0x0A, 0x06, // 245
-    0x07, 0x6E, 0x0A, 0x06, // 246
-    0x07, 0x78, 0x09, 0x06, // 247
-    0x07, 0x81, 0x0A, 0x06, // 248
-    0x07, 0x8B, 0x0A, 0x06, // 249
-    0x07, 0x95, 0x0A, 0x06, // 250
-    0x07, 0x9F, 0x0A, 0x06, // 251
-    0x07, 0xA9, 0x0A, 0x06, // 252
-    0x07, 0xB3, 0x09, 0x06, // 253
-    0x07, 0xBC, 0x0A, 0x06, // 254
-    0x07, 0xC6, 0x09, 0x06, // 255
-    // Font Data:
-    0x00, 0x00, 0xF8, 0x02,                                                                                                 // 33
-    0x38, 0x00, 0x00, 0x00, 0x38,                                                                                           // 34
-    0xA0, 0x03, 0xE0, 0x00, 0xB8, 0x03, 0xE0, 0x00, 0xB8,                                                                   // 35
-    0x30, 0x01, 0x28, 0x02, 0xF8, 0x07, 0x48, 0x02, 0x90, 0x01,                                                             // 36
-    0x00, 0x00, 0x30, 0x00, 0x48, 0x00, 0x30, 0x03, 0xC0, 0x00, 0xB0, 0x01, 0x48, 0x02, 0x80, 0x01,                         // 37
-    0x80, 0x01, 0x50, 0x02, 0x68, 0x02, 0xA8, 0x02, 0x18, 0x01, 0x80, 0x03, 0x80, 0x02,                                     // 38
-    0x38,                                                                                                                   // 39
-    0xE0, 0x03, 0x10, 0x04, 0x08, 0x08,                                                                                     // 40
-    0x08, 0x08, 0x10, 0x04, 0xE0, 0x03,                                                                                     // 41
-    0x28, 0x00, 0x18, 0x00, 0x28,                                                                                           // 42
-    0x40, 0x00, 0x40, 0x00, 0xF0, 0x01, 0x40, 0x00, 0x40,                                                                   // 43
-    0x00, 0x00, 0x00, 0x06,                                                                                                 // 44
-    0x80, 0x00, 0x80,                                                                                                       // 45
-    0x00, 0x00, 0x00, 0x02,                                                                                                 // 46
-    0x00, 0x03, 0xE0, 0x00, 0x18,                                                                                           // 47
-    0xF0, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0xF0, 0x01,                                                             // 48
-    0x00, 0x00, 0x20, 0x00, 0x10, 0x00, 0xF8, 0x03,                                                                         // 49
-    0x10, 0x02, 0x08, 0x03, 0x88, 0x02, 0x48, 0x02, 0x30, 0x02,                                                             // 50
-    0x10, 0x01, 0x08, 0x02, 0x48, 0x02, 0x48, 0x02, 0xB0, 0x01,                                                             // 51
-    0xC0, 0x00, 0xA0, 0x00, 0x90, 0x00, 0x88, 0x00, 0xF8, 0x03, 0x80,                                                       // 52
-    0x60, 0x01, 0x38, 0x02, 0x28, 0x02, 0x28, 0x02, 0xC8, 0x01,                                                             // 53
-    0xF0, 0x01, 0x28, 0x02, 0x28, 0x02, 0x28, 0x02, 0xD0, 0x01,                                                             // 54
-    0x08, 0x00, 0x08, 0x03, 0xC8, 0x00, 0x38, 0x00, 0x08,                                                                   // 55
-    0xB0, 0x01, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02, 0xB0, 0x01,                                                             // 56
-    0x70, 0x01, 0x88, 0x02, 0x88, 0x02, 0x88, 0x02, 0xF0, 0x01,                                                             // 57
-    0x00, 0x00, 0x20, 0x02,                                                                                                 // 58
-    0x00, 0x00, 0x20, 0x06,                                                                                                 // 59
-    0x00, 0x00, 0x40, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0x10, 0x01,                                                             // 60
-    0xA0, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0xA0,                                                                   // 61
-    0x00, 0x00, 0x10, 0x01, 0xA0, 0x00, 0xA0, 0x00, 0x40,                                                                   // 62
-    0x10, 0x00, 0x08, 0x00, 0x08, 0x00, 0xC8, 0x02, 0x48, 0x00, 0x30,                                                       // 63
-    0x00, 0x00, 0xC0, 0x03, 0x30, 0x04, 0xD0, 0x09, 0x28, 0x0A, 0x28, 0x0A, 0xC8, 0x0B, 0x68, 0x0A, 0x10, 0x05, 0xE0, 0x04, // 64
-    0x00, 0x02, 0xC0, 0x01, 0xB0, 0x00, 0x88, 0x00, 0xB0, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 65
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02, 0xF0, 0x01,                                                 // 66
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0x10, 0x01,                                                 // 67
-    0x00, 0x00, 0xF8, 0x03, 0x08, 0x02, 0x08, 0x02, 0x10, 0x01, 0xE0,                                                       // 68
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02,                                                 // 69
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x00, 0x48, 0x00, 0x08,                                                                   // 70
-    0x00, 0x00, 0xE0, 0x00, 0x10, 0x01, 0x08, 0x02, 0x48, 0x02, 0x50, 0x01, 0xC0,                                           // 71
-    0x00, 0x00, 0xF8, 0x03, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00, 0xF8, 0x03,                                                 // 72
-    0x00, 0x00, 0xF8, 0x03,                                                                                                 // 73
-    0x00, 0x03, 0x00, 0x02, 0x00, 0x02, 0xF8, 0x01,                                                                         // 74
-    0x00, 0x00, 0xF8, 0x03, 0x80, 0x00, 0x60, 0x00, 0x90, 0x00, 0x08, 0x01, 0x00, 0x02,                                     // 75
-    0x00, 0x00, 0xF8, 0x03, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02,                                                 // 76
-    0x00, 0x00, 0xF8, 0x03, 0x30, 0x00, 0xC0, 0x01, 0x00, 0x02, 0xC0, 0x01, 0x30, 0x00, 0xF8, 0x03,                         // 77
-    0x00, 0x00, 0xF8, 0x03, 0x30, 0x00, 0x40, 0x00, 0x80, 0x01, 0xF8, 0x03,                                                 // 78
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0xF0, 0x01,                                     // 79
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x00, 0x48, 0x00, 0x48, 0x00, 0x30,                                                       // 80
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x03, 0x08, 0x03, 0xF0, 0x02,                                     // 81
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x00, 0x48, 0x00, 0xC8, 0x00, 0x30, 0x03,                                                 // 82
-    0x00, 0x00, 0x30, 0x01, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02, 0x90, 0x01,                                                 // 83
-    0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0xF8, 0x03, 0x08, 0x00, 0x08,                                                       // 84
-    0x00, 0x00, 0xF8, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0xF8, 0x01,                                                 // 85
-    0x08, 0x00, 0x70, 0x00, 0x80, 0x01, 0x00, 0x02, 0x80, 0x01, 0x70, 0x00, 0x08,                                           // 86
-    0x18, 0x00, 0xE0, 0x01, 0x00, 0x02, 0xF0, 0x01, 0x08, 0x00, 0xF0, 0x01, 0x00, 0x02, 0xE0, 0x01, 0x18,                   // 87
-    0x00, 0x02, 0x08, 0x01, 0x90, 0x00, 0x60, 0x00, 0x90, 0x00, 0x08, 0x01, 0x00, 0x02,                                     // 88
-    0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0xC0, 0x03, 0x20, 0x00, 0x10, 0x00, 0x08,                                           // 89
-    0x08, 0x03, 0x88, 0x02, 0xC8, 0x02, 0x68, 0x02, 0x38, 0x02, 0x18, 0x02,                                                 // 90
-    0x00, 0x00, 0xF8, 0x0F, 0x08, 0x08,                                                                                     // 91
-    0x18, 0x00, 0xE0, 0x00, 0x00, 0x03,                                                                                     // 92
-    0x08, 0x08, 0xF8, 0x0F,                                                                                                 // 93
-    0x40, 0x00, 0x30, 0x00, 0x08, 0x00, 0x30, 0x00, 0x40,                                                                   // 94
-    0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08,                                                 // 95
-    0x08, 0x00, 0x10,                                                                                                       // 96
-    0x00, 0x00, 0x00, 0x03, 0xA0, 0x02, 0xA0, 0x02, 0xE0, 0x03,                                                             // 97
-    0x00, 0x00, 0xF8, 0x03, 0x20, 0x02, 0x20, 0x02, 0xC0, 0x01,                                                             // 98
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x02, 0x20, 0x02, 0x40, 0x01,                                                             // 99
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x02, 0x20, 0x02, 0xF8, 0x03,                                                             // 100
-    0x00, 0x00, 0xC0, 0x01, 0xA0, 0x02, 0xA0, 0x02, 0xC0, 0x02,                                                             // 101
-    0x20, 0x00, 0xF0, 0x03, 0x28,                                                                                           // 102
-    0x00, 0x00, 0xC0, 0x05, 0x20, 0x0A, 0x20, 0x0A, 0xE0, 0x07,                                                             // 103
-    0x00, 0x00, 0xF8, 0x03, 0x20, 0x00, 0x20, 0x00, 0xC0, 0x03,                                                             // 104
-    0x00, 0x00, 0xE8, 0x03,                                                                                                 // 105
-    0x00, 0x08, 0xE8, 0x07,                                                                                                 // 106
-    0xF8, 0x03, 0x80, 0x00, 0xC0, 0x01, 0x20, 0x02,                                                                         // 107
-    0x00, 0x00, 0xF8, 0x03,                                                                                                 // 108
-    0x00, 0x00, 0xE0, 0x03, 0x20, 0x00, 0x20, 0x00, 0xE0, 0x03, 0x20, 0x00, 0x20, 0x00, 0xC0, 0x03,                         // 109
-    0x00, 0x00, 0xE0, 0x03, 0x20, 0x00, 0x20, 0x00, 0xC0, 0x03,                                                             // 110
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x02, 0x20, 0x02, 0xC0, 0x01,                                                             // 111
-    0x00, 0x00, 0xE0, 0x0F, 0x20, 0x02, 0x20, 0x02, 0xC0, 0x01,                                                             // 112
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x02, 0x20, 0x02, 0xE0, 0x0F,                                                             // 113
-    0x00, 0x00, 0xE0, 0x03, 0x20,                                                                                           // 114
-    0x40, 0x02, 0xA0, 0x02, 0xA0, 0x02, 0x20, 0x01,                                                                         // 115
-    0x20, 0x00, 0xF8, 0x03, 0x20, 0x02,                                                                                     // 116
-    0x00, 0x00, 0xE0, 0x01, 0x00, 0x02, 0x00, 0x02, 0xE0, 0x03,                                                             // 117
-    0x20, 0x00, 0xC0, 0x01, 0x00, 0x02, 0xC0, 0x01, 0x20,                                                                   // 118
-    0xE0, 0x01, 0x00, 0x02, 0xC0, 0x01, 0x20, 0x00, 0xC0, 0x01, 0x00, 0x02, 0xE0, 0x01,                                     // 119
-    0x20, 0x02, 0x40, 0x01, 0x80, 0x00, 0x40, 0x01, 0x20, 0x02,                                                             // 120
-    0x20, 0x00, 0xC0, 0x09, 0x00, 0x06, 0xC0, 0x01, 0x20,                                                                   // 121
-    0x20, 0x02, 0x20, 0x03, 0xA0, 0x02, 0x60, 0x02, 0x20, 0x02,                                                             // 122
-    0x80, 0x00, 0x78, 0x0F, 0x08, 0x08,                                                                                     // 123
-    0x00, 0x00, 0xF8, 0x0F,                                                                                                 // 124
-    0x08, 0x08, 0x78, 0x0F, 0x80,                                                                                           // 125
-    0xC0, 0x00, 0x40, 0x00, 0xC0, 0x00, 0x80, 0x00, 0xC0,                                                                   // 126
-    0x00, 0x00, 0xF8, 0x03, 0x40, 0x02, 0x20, 0x02, 0x00, 0x02, 0x00, 0x02,                                                 // 129
-    0x40, 0x00, 0xF8, 0x03, 0x20,                                                                                           // 130
-    0x00, 0x00, 0xF8, 0x03, 0x30, 0x00, 0x44, 0x00, 0x82, 0x01, 0xF8, 0x03,                                                 // 131
-    0x00, 0x02, 0xC0, 0x01, 0xB0, 0x00, 0x88, 0x00, 0xB0, 0x00, 0xC0, 0x05, 0x00, 0x0A,                                     // 132
-    0x00, 0x00, 0x00, 0x03, 0xA0, 0x02, 0xA0, 0x02, 0xE0, 0x07, 0x00, 0x08,                                                 // 133
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x0A, 0x02, 0x09, 0x02, 0x10, 0x01,                                                 // 134
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x02, 0x28, 0x02, 0x44, 0x01,                                                             // 135
-    0x00, 0x00, 0xE0, 0x03, 0x20, 0x00, 0x28, 0x00, 0xC4, 0x03,                                                             // 136
-    0x20, 0x02, 0x20, 0x03, 0xA8, 0x02, 0x64, 0x02, 0x20, 0x02,                                                             // 137
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x08, 0x02, 0x0A, 0x02, 0x09, 0x02, 0xF0, 0x01,                                     // 147
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x02, 0x28, 0x02, 0xC4, 0x01,                                                             // 148
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x48, 0x02, 0x48, 0x06, 0x48, 0x0A,                                                 // 152
-    0x00, 0x00, 0xC0, 0x01, 0xA0, 0x02, 0xA0, 0x02, 0xC0, 0x06, 0x00, 0x08,                                                 // 153
-    0x00, 0x00, 0x30, 0x01, 0x48, 0x02, 0x4A, 0x02, 0x49, 0x02, 0x90, 0x01,                                                 // 154
-    0x40, 0x02, 0xA0, 0x02, 0xA8, 0x02, 0x24, 0x01,                                                                         // 155
-    0x00, 0x00, 0xA0, 0x0F,                                                                                                 // 161
-    0x00, 0x00, 0xC0, 0x01, 0xA0, 0x0F, 0x78, 0x02, 0x40, 0x01,                                                             // 162
-    0x40, 0x02, 0x70, 0x03, 0xC8, 0x02, 0x48, 0x02, 0x08, 0x02, 0x10, 0x02,                                                 // 163
-    0x00, 0x00, 0xE0, 0x01, 0x20, 0x01, 0x20, 0x01, 0xE0, 0x01,                                                             // 164
-    0x48, 0x01, 0x70, 0x01, 0xC0, 0x03, 0x70, 0x01, 0x48, 0x01,                                                             // 165
-    0x00, 0x00, 0x38, 0x0F,                                                                                                 // 166
-    0xD0, 0x04, 0x28, 0x09, 0x48, 0x09, 0x48, 0x0A, 0x90, 0x05,                                                             // 167
-    0x08, 0x00, 0x00, 0x00, 0x08,                                                                                           // 168
-    0xE0, 0x00, 0x10, 0x01, 0x48, 0x02, 0xA8, 0x02, 0xA8, 0x02, 0x10, 0x01, 0xE0,                                           // 169
-    0x68, 0x00, 0x68, 0x00, 0x68, 0x00, 0x78,                                                                               // 170
-    0x00, 0x00, 0x80, 0x01, 0x40, 0x02, 0x80, 0x01, 0x40, 0x02,                                                             // 171
-    0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0xE0,                                                                   // 172
-    0x80, 0x00, 0x80,                                                                                                       // 173
-    0xE0, 0x00, 0x10, 0x01, 0xE8, 0x02, 0x68, 0x02, 0xC8, 0x02, 0x10, 0x01, 0xE0,                                           // 174
-    0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02,                                                       // 175
-    0x00, 0x00, 0x38, 0x00, 0x28, 0x00, 0x38,                                                                               // 176
-    0x40, 0x02, 0x40, 0x02, 0xF0, 0x03, 0x40, 0x02, 0x40, 0x02,                                                             // 177
-    0x48, 0x00, 0x68, 0x00, 0x58,                                                                                           // 178
-    0x48, 0x00, 0x58, 0x00, 0x68,                                                                                           // 179
-    0x00, 0x00, 0x10, 0x00, 0x08,                                                                                           // 180
-    0x00, 0x00, 0xE0, 0x0F, 0x00, 0x02, 0x00, 0x02, 0xE0, 0x03,                                                             // 181
-    0x70, 0x00, 0xF8, 0x0F, 0x08, 0x00, 0xF8, 0x0F, 0x08,                                                                   // 182
-    0x00, 0x00, 0x40,                                                                                                       // 183
-    0x00, 0x00, 0x00, 0x14, 0x00, 0x18,                                                                                     // 184
-    0x08, 0x03, 0x88, 0x02, 0xCA, 0x02, 0x69, 0x02, 0x38, 0x02, 0x18, 0x02,                                                 // 185
-    0x30, 0x00, 0x48, 0x00, 0x48, 0x00, 0x30,                                                                               // 186
-    0x08, 0x03, 0x88, 0x02, 0xC8, 0x02, 0x6A, 0x02, 0x38, 0x02, 0x18, 0x02,                                                 // 187
-    0x20, 0x02, 0x20, 0x03, 0xA8, 0x02, 0x60, 0x02, 0x20, 0x02,                                                             // 188
-    0x00, 0x00, 0x10, 0x02, 0x78, 0x01, 0x80, 0x00, 0x60, 0x00, 0x50, 0x02, 0x48, 0x03, 0xC0, 0x02,                         // 189
-    0x48, 0x00, 0x58, 0x00, 0x68, 0x03, 0x80, 0x00, 0x60, 0x01, 0x90, 0x01, 0xC8, 0x03, 0x00, 0x01,                         // 190
-    0x00, 0x00, 0x00, 0x06, 0x00, 0x09, 0xA0, 0x09, 0x00, 0x04,                                                             // 191
-    0x00, 0x02, 0xC0, 0x01, 0xB0, 0x00, 0x89, 0x00, 0xB2, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 192
-    0x00, 0x02, 0xC0, 0x01, 0xB0, 0x00, 0x8A, 0x00, 0xB1, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 193
-    0x00, 0x02, 0xC0, 0x01, 0xB2, 0x00, 0x89, 0x00, 0xB2, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 194
-    0x00, 0x02, 0xC2, 0x01, 0xB1, 0x00, 0x8A, 0x00, 0xB1, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 195
-    0x00, 0x02, 0xC0, 0x01, 0xB2, 0x00, 0x88, 0x00, 0xB2, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 196
-    0x00, 0x02, 0xC0, 0x01, 0xBE, 0x00, 0x8A, 0x00, 0xBE, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 197
-    0x00, 0x03, 0xC0, 0x00, 0xE0, 0x00, 0x98, 0x00, 0x88, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02,             // 198
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x08, 0x16, 0x08, 0x1A, 0x10, 0x01,                                                 // 199
-    0x00, 0x00, 0xF8, 0x03, 0x49, 0x02, 0x4A, 0x02, 0x48, 0x02, 0x48, 0x02,                                                 // 200
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x4A, 0x02, 0x49, 0x02, 0x48, 0x02,                                                 // 201
-    0x00, 0x00, 0xFA, 0x03, 0x49, 0x02, 0x4A, 0x02, 0x48, 0x02, 0x48, 0x02,                                                 // 202
-    0x00, 0x00, 0xF8, 0x03, 0x4A, 0x02, 0x48, 0x02, 0x4A, 0x02, 0x48, 0x02,                                                 // 203
-    0x00, 0x00, 0xF9, 0x03, 0x02,                                                                                           // 204
-    0x02, 0x00, 0xF9, 0x03,                                                                                                 // 205
-    0x01, 0x00, 0xFA, 0x03,                                                                                                 // 206
-    0x02, 0x00, 0xF8, 0x03, 0x02,                                                                                           // 207
-    0x40, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x48, 0x02, 0x10, 0x01, 0xE0,                                                       // 208
-    0x00, 0x00, 0xFA, 0x03, 0x31, 0x00, 0x42, 0x00, 0x81, 0x01, 0xF8, 0x03,                                                 // 209
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x09, 0x02, 0x0A, 0x02, 0x08, 0x02, 0xF0, 0x01,                                     // 210
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x0A, 0x02, 0x09, 0x02, 0x08, 0x02, 0xF0, 0x01,                                     // 211
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x0A, 0x02, 0x09, 0x02, 0x0A, 0x02, 0xF0, 0x01,                                     // 212
-    0x00, 0x00, 0xF0, 0x01, 0x0A, 0x02, 0x09, 0x02, 0x0A, 0x02, 0x09, 0x02, 0xF0, 0x01,                                     // 213
-    0x00, 0x00, 0xF0, 0x01, 0x0A, 0x02, 0x08, 0x02, 0x0A, 0x02, 0x08, 0x02, 0xF0, 0x01,                                     // 214
-    0x10, 0x01, 0xA0, 0x00, 0xE0, 0x00, 0xA0, 0x00, 0x10, 0x01,                                                             // 215
-    0x00, 0x00, 0xF0, 0x02, 0x08, 0x03, 0xC8, 0x02, 0x28, 0x02, 0x18, 0x03, 0xE8,                                           // 216
-    0x00, 0x00, 0xF8, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02, 0xF8, 0x01,                                                 // 217
-    0x00, 0x00, 0xF8, 0x01, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0xF8, 0x01,                                                 // 218
-    0x00, 0x00, 0xF8, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0xF8, 0x01,                                                 // 219
-    0x00, 0x00, 0xF8, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0xF8, 0x01,                                                 // 220
-    0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0xC2, 0x03, 0x21, 0x00, 0x10, 0x00, 0x08,                                           // 221
-    0x00, 0x00, 0xF8, 0x03, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0xE0,                                                       // 222
-    0x00, 0x00, 0xF0, 0x03, 0x08, 0x01, 0x48, 0x02, 0xB0, 0x02, 0x80, 0x01,                                                 // 223
-    0x00, 0x00, 0x00, 0x03, 0xA4, 0x02, 0xA8, 0x02, 0xE0, 0x03,                                                             // 224
-    0x00, 0x00, 0x00, 0x03, 0xA8, 0x02, 0xA4, 0x02, 0xE0, 0x03,                                                             // 225
-    0x00, 0x00, 0x00, 0x03, 0xA8, 0x02, 0xA4, 0x02, 0xE8, 0x03,                                                             // 226
-    0x00, 0x00, 0x08, 0x03, 0xA4, 0x02, 0xA8, 0x02, 0xE4, 0x03,                                                             // 227
-    0x00, 0x00, 0x00, 0x03, 0xA8, 0x02, 0xA0, 0x02, 0xE8, 0x03,                                                             // 228
-    0x00, 0x00, 0x00, 0x03, 0xAE, 0x02, 0xAA, 0x02, 0xEE, 0x03,                                                             // 229
-    0x00, 0x00, 0x40, 0x03, 0xA0, 0x02, 0xA0, 0x02, 0xC0, 0x01, 0xA0, 0x02, 0xA0, 0x02, 0xC0, 0x02,                         // 230
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x16, 0x20, 0x1A, 0x40, 0x01,                                                             // 231
-    0x00, 0x00, 0xC0, 0x01, 0xA4, 0x02, 0xA8, 0x02, 0xC0, 0x02,                                                             // 232
-    0x00, 0x00, 0xC0, 0x01, 0xA8, 0x02, 0xA4, 0x02, 0xC0, 0x02,                                                             // 233
-    0x00, 0x00, 0xC0, 0x01, 0xA8, 0x02, 0xA4, 0x02, 0xC8, 0x02,                                                             // 234
-    0x00, 0x00, 0xC0, 0x01, 0xA8, 0x02, 0xA0, 0x02, 0xC8, 0x02,                                                             // 235
-    0x00, 0x00, 0xE4, 0x03, 0x08,                                                                                           // 236
-    0x08, 0x00, 0xE4, 0x03,                                                                                                 // 237
-    0x08, 0x00, 0xE4, 0x03, 0x08,                                                                                           // 238
-    0x08, 0x00, 0xE0, 0x03, 0x08,                                                                                           // 239
-    0x00, 0x00, 0xC0, 0x01, 0x28, 0x02, 0x38, 0x02, 0xE0, 0x01,                                                             // 240
-    0x00, 0x00, 0xE8, 0x03, 0x24, 0x00, 0x28, 0x00, 0xC4, 0x03,                                                             // 241
-    0x00, 0x00, 0xC0, 0x01, 0x24, 0x02, 0x28, 0x02, 0xC0, 0x01,                                                             // 242
-    0x00, 0x00, 0xC0, 0x01, 0x28, 0x02, 0x24, 0x02, 0xC0, 0x01,                                                             // 243
-    0x00, 0x00, 0xC0, 0x01, 0x28, 0x02, 0x24, 0x02, 0xC8, 0x01,                                                             // 244
-    0x00, 0x00, 0xC8, 0x01, 0x24, 0x02, 0x28, 0x02, 0xC4, 0x01,                                                             // 245
-    0x00, 0x00, 0xC0, 0x01, 0x28, 0x02, 0x20, 0x02, 0xC8, 0x01,                                                             // 246
-    0x40, 0x00, 0x40, 0x00, 0x50, 0x01, 0x40, 0x00, 0x40,                                                                   // 247
-    0x00, 0x00, 0xC0, 0x02, 0xA0, 0x03, 0x60, 0x02, 0xA0, 0x01,                                                             // 248
-    0x00, 0x00, 0xE0, 0x01, 0x04, 0x02, 0x08, 0x02, 0xE0, 0x03,                                                             // 249
-    0x00, 0x00, 0xE0, 0x01, 0x08, 0x02, 0x04, 0x02, 0xE0, 0x03,                                                             // 250
-    0x00, 0x00, 0xE8, 0x01, 0x04, 0x02, 0x08, 0x02, 0xE0, 0x03,                                                             // 251
-    0x00, 0x00, 0xE0, 0x01, 0x08, 0x02, 0x00, 0x02, 0xE8, 0x03,                                                             // 252
-    0x20, 0x00, 0xC0, 0x09, 0x08, 0x06, 0xC4, 0x01, 0x20,                                                                   // 253
-    0x00, 0x00, 0xF8, 0x0F, 0x20, 0x02, 0x20, 0x02, 0xC0, 0x01,                                                             // 254
-    0x20, 0x00, 0xC8, 0x09, 0x00, 0x06, 0xC8, 0x01, 0x20,                                                                   // 255
-};
--- a/src/graphics/fonts/OLEDDisplayFontsPL.h
+++ b/src/graphics/fonts/OLEDDisplayFontsPL.h
@@ -1,11 +0,0 @@
-#ifndef OLEDDISPLAYFONTSPL_h
-#define OLEDDISPLAYFONTSPL_h
-
-#ifdef ARDUINO
-#include <Arduino.h>
-#elif __MBED__
-#define PROGMEM
-#endif
-
-extern const uint8_t ArialMT_Plain_10_PL[] PROGMEM;
-#endif
--- a/src/graphics/images.h
+++ b/src/graphics/images.h
@@ -20,8 +20,8 @@ const uint8_t bluetoothConnectedIcon[36] PROGMEM = {0xfe, 0x01, 0xff, 0x03, 0x03
                                                    0xfe, 0x31, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xf0, 0x3f, 0xe0, 0x1f};
 #endif

-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) ||          \
-     defined(HX8357_CS) || ARCH_PORTDUINO) &&                                                                                    \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(HX8357_CS) ||           \
+     ARCH_PORTDUINO) &&                                                                                                          \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
 const uint8_t imgQuestionL1[] PROGMEM = {0xff, 0x01, 0x01, 0x32, 0x7b, 0x49, 0x49, 0x6f, 0x26, 0x01, 0x01, 0xff};
 const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};
--- a/src/input/InputBroker.h
+++ b/src/input/InputBroker.h
@@ -4,20 +4,6 @@
 #define ANYKEY 0xFF
 #define MATRIXKEY 0xFE

-#define INPUT_BROKER_MSG_BRIGHTNESS_UP 0x11
-#define INPUT_BROKER_MSG_BRIGHTNESS_DOWN 0x12
-#define INPUT_BROKER_MSG_REBOOT 0x90
-#define INPUT_BROKER_MSG_SHUTDOWN 0x9b
-#define INPUT_BROKER_MSG_GPS_TOGGLE 0x9e
-#define INPUT_BROKER_MSG_MUTE_TOGGLE 0xac
-#define INPUT_BROKER_MSG_SEND_PING 0xaf
-#define INPUT_BROKER_MSG_LEFT 0xb4
-#define INPUT_BROKER_MSG_UP 0xb5
-#define INPUT_BROKER_MSG_DOWN 0xb6
-#define INPUT_BROKER_MSG_RIGHT 0xb7
-#define INPUT_BROKER_MSG_FN_SYMBOL_ON 0xf1
-#define INPUT_BROKER_MSG_FN_SYMBOL_OFF 0xf2
-
 typedef struct _InputEvent {
    const char *source;
    char inputEvent;
--- a/src/input/LinuxInput.cpp
+++ b/src/input/LinuxInput.cpp
@@ -147,11 +147,11 @@ int32_t LinuxInput::runOnce()
                    case KEY_LEFT: // Left
                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
                        break;
-                        e.kbchar = INPUT_BROKER_MSG_LEFT;
+                        e.kbchar = 0xb4;
                    case KEY_RIGHT: // Right
                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
                        break;
-                        e.kbchar = INPUT_BROKER_MSG_RIGHT;
+                        e.kbchar = 0xb7;
                    case KEY_ENTER: // Enter
                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
                        break;
--- a/src/input/SerialKeyboard.cpp
+++ b/src/input/SerialKeyboard.cpp
@@ -87,7 +87,7 @@ int32_t SerialKeyboard::runOnce()
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
            } else if (!(shiftRegister2 & (1 << 2))) {
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
-                e.kbchar = INPUT_BROKER_MSG_RIGHT;
+                e.kbchar = 0xb7;
            } else if (!(shiftRegister2 & (1 << 1))) {
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
            } else if (!(shiftRegister2 & (1 << 0))) {
--- a/src/input/kbI2cBase.cpp
+++ b/src/input/kbI2cBase.cpp
@@ -94,7 +94,7 @@ int32_t KbI2cBase::runOnce()
                case 'e': // sym e
                    if (is_sym) {
                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
-                        e.kbchar = INPUT_BROKER_MSG_UP;
+                        e.kbchar = 0xb5;
                        is_sym = false; // reset sym state after second keypress
                    } else {
                        e.inputEvent = ANYKEY;
@@ -104,7 +104,7 @@ int32_t KbI2cBase::runOnce()
                case 'x': // sym x
                    if (is_sym) {
                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
-                        e.kbchar = INPUT_BROKER_MSG_DOWN;
+                        e.kbchar = 0xb6;
                        is_sym = false; // reset sym state after second keypress
                    } else {
                        e.inputEvent = ANYKEY;
@@ -134,8 +134,8 @@ int32_t KbI2cBase::runOnce()
                case 0x13: // Code scanner says the SYM key is 0x13
                    is_sym = !is_sym;
                    e.inputEvent = ANYKEY;
-                    e.kbchar = is_sym ? INPUT_BROKER_MSG_FN_SYMBOL_ON   // send 0xf1 to tell CannedMessages to display that
-                                      : INPUT_BROKER_MSG_FN_SYMBOL_OFF; // the modifier key is active
+                    e.kbchar =
+                        is_sym ? 0xf1 : 0xf2; // send 0xf1 to tell CannedMessages to display that the modifier key is active
                    break;
                case 0x0a: // apparently Enter on Q10 is a line feed instead of carriage return
                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
@@ -214,7 +214,7 @@ int32_t KbI2cBase::runOnce()
                if (is_sym) {
                    is_sym = false;
                    e.inputEvent = ANYKEY;
-                    e.kbchar = INPUT_BROKER_MSG_MUTE_TOGGLE; // mute notifications
+                    e.kbchar = 0xac; // mute notifications
                } else {
                    e.inputEvent = ANYKEY;
                    e.kbchar = c;
@@ -224,7 +224,7 @@ int32_t KbI2cBase::runOnce()
                if (is_sym) {
                    is_sym = false;
                    e.inputEvent = ANYKEY;
-                    e.kbchar = INPUT_BROKER_MSG_BRIGHTNESS_UP; // Increase Brightness code
+                    e.kbchar = 0x11; // Increase Brightness code
                } else {
                    e.inputEvent = ANYKEY;
                    e.kbchar = c;
@@ -234,7 +234,7 @@ int32_t KbI2cBase::runOnce()
                if (is_sym) {
                    is_sym = false;
                    e.inputEvent = ANYKEY;
-                    e.kbchar = INPUT_BROKER_MSG_BRIGHTNESS_DOWN; // Decrease Brightness code
+                    e.kbchar = 0x12; // Decrease Brightness code
                } else {
                    e.inputEvent = ANYKEY;
                    e.kbchar = c;
@@ -244,7 +244,7 @@ int32_t KbI2cBase::runOnce()
                if (is_sym) {
                    is_sym = false;
                    e.inputEvent = ANYKEY;
-                    e.kbchar = INPUT_BROKER_MSG_SEND_PING; // (fn + space)
+                    e.kbchar = 0xaf; // (fn + space)
                } else {
                    e.inputEvent = ANYKEY;
                    e.kbchar = c;
@@ -254,7 +254,7 @@ int32_t KbI2cBase::runOnce()
                if (is_sym) {
                    is_sym = false;
                    e.inputEvent = ANYKEY;
-                    e.kbchar = INPUT_BROKER_MSG_GPS_TOGGLE;
+                    e.kbchar = 0x9e;
                } else {
                    e.inputEvent = ANYKEY;
                    e.kbchar = c;
@@ -269,33 +269,32 @@ int32_t KbI2cBase::runOnce()
                break;
            case 0xb5: // Up
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
-                e.kbchar = INPUT_BROKER_MSG_UP;
+                e.kbchar = 0xb5;
                break;
            case 0xb6: // Down
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
-                e.kbchar = INPUT_BROKER_MSG_DOWN;
+                e.kbchar = 0xb6;
                break;
            case 0xb4: // Left
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
-                e.kbchar = INPUT_BROKER_MSG_LEFT;
+                e.kbchar = 0xb4;
                break;
            case 0xb7: // Right
                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
-                e.kbchar = INPUT_BROKER_MSG_RIGHT;
+                e.kbchar = 0xb7;
                break;
            case 0xc: // Modifier key: 0xc is alt+c (Other options could be: 0xea = shift+mic button or 0x4 shift+$(speaker))
                // toggle moddifiers button.
                is_sym = !is_sym;
                e.inputEvent = ANYKEY;
-                e.kbchar = is_sym ? INPUT_BROKER_MSG_FN_SYMBOL_ON   // send 0xf1 to tell CannedMessages to display that the
-                                  : INPUT_BROKER_MSG_FN_SYMBOL_OFF; // modifier key is active
+                e.kbchar = is_sym ? 0xf1 : 0xf2; // send 0xf1 to tell CannedMessages to display that the modifier key is active
                break;
-            case 0x90: // fn+r      INPUT_BROKER_MSG_REBOOT
+            case 0x90: // fn+r
            case 0x91: // fn+t
-            case 0x9b: // fn+s      INPUT_BROKER_MSG_SHUTDOWN
-            case 0xac: // fn+m      INPUT_BROKER_MSG_MUTE_TOGGLE
-            case 0x9e: // fn+g      INPUT_BROKER_MSG_GPS_TOGGLE
-            case 0xaf: // fn+space  INPUT_BROKER_MSG_SEND_PING
+            case 0x9b: // fn+s
+            case 0xac: // fn+m
+            case 0x9e: // fn+g
+            case 0xaf: // fn+space
                // just pass those unmodified
                e.inputEvent = ANYKEY;
                e.kbchar = c;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -112,10 +112,6 @@ AccelerometerThread *accelerometerThread = nullptr;
 AudioThread *audioThread = nullptr;
 #endif

-#if defined(TCXO_OPTIONAL)
-float tcxoVoltage = SX126X_DIO3_TCXO_VOLTAGE; // if TCXO is optional, put this here so it can be changed further down.
-#endif
-
 using namespace concurrency;

 // We always create a screen object, but we only init it if we find the hardware
@@ -224,11 +220,6 @@ __attribute__((weak, noinline)) bool loopCanSleep()
    return true;
 }

-// Weak empty variant initialization function.
-// May be redefined by variant files.
-void lateInitVariant() __attribute__((weak));
-void lateInitVariant() {}
-
 /**
 * Print info as a structured log message (for automated log processing)
 */
@@ -236,7 +227,7 @@ void printInfo()
 {
    LOG_INFO("S:B:%d,%s\n", HW_VENDOR, optstr(APP_VERSION));
 }
-#ifndef PIO_UNIT_TESTING
+
 void setup()
 {
    concurrency::hasBeenSetup = true;
@@ -262,12 +253,6 @@ void setup()

 #ifdef DEBUG_PORT
    consoleInit(); // Set serial baud rate and init our mesh console
-#endif
-#if ARCH_PORTDUINO
-    struct timeval tv;
-    tv.tv_sec = time(NULL);
-    tv.tv_usec = 0;
-    perhapsSetRTC(RTCQualityNTP, &tv);
 #endif
    powerMonInit();

@@ -289,9 +274,39 @@ void setup()
    digitalWrite(LORA_TCXO_GPIO, HIGH);
 #endif

-#if defined(VEXT_ENABLE)
+#if defined(VEXT_ENABLE_V03)
+    pinMode(VEXT_ENABLE_V03, OUTPUT);
+    pinMode(ST7735_BL_V03, OUTPUT);
+    digitalWrite(VEXT_ENABLE_V03, 0); // turn on the display power and antenna boost
+    digitalWrite(ST7735_BL_V03, 1);   // display backligth on
+    LOG_DEBUG("HELTEC Detect Tracker V1.0\n");
+#elif defined(VEXT_ENABLE_V05)
+    pinMode(VEXT_ENABLE_V05, OUTPUT);
+    pinMode(ST7735_BL_V05, OUTPUT);
+    digitalWrite(VEXT_ENABLE_V05, 1); // turn on the lora antenna boost
+    digitalWrite(ST7735_BL_V05, 1);   // turn on display backligth
+    LOG_DEBUG("HELTEC Detect Tracker V1.1\n");
+#elif defined(VEXT_ENABLE) && defined(VEXT_ON_VALUE)
    pinMode(VEXT_ENABLE, OUTPUT);
    digitalWrite(VEXT_ENABLE, VEXT_ON_VALUE); // turn on the display power
+#elif defined(VEXT_ENABLE)
+    pinMode(VEXT_ENABLE, OUTPUT);
+    digitalWrite(VEXT_ENABLE, 0); // turn on the display power
+#endif
+
+#if defined(VGNSS_CTRL_V03)
+    pinMode(VGNSS_CTRL_V03, OUTPUT);
+    digitalWrite(VGNSS_CTRL_V03, LOW);
+#endif
+
+#if defined(VTFT_CTRL_V03)
+    pinMode(VTFT_CTRL_V03, OUTPUT);
+    digitalWrite(VTFT_CTRL_V03, LOW);
+#endif
+
+#if defined(VGNSS_CTRL)
+    pinMode(VGNSS_CTRL, OUTPUT);
+    digitalWrite(VGNSS_CTRL, LOW);
 #endif

 #if defined(VTFT_CTRL)
@@ -547,7 +562,6 @@ void setup()
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::BME_680, meshtastic_TelemetrySensorType_BME680)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::BME_280, meshtastic_TelemetrySensorType_BME280)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::BMP_280, meshtastic_TelemetrySensorType_BMP280)
-    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::BMP_3XX, meshtastic_TelemetrySensorType_BMP3XX)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::BMP_085, meshtastic_TelemetrySensorType_BMP085)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA260, meshtastic_TelemetrySensorType_INA260)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA219, meshtastic_TelemetrySensorType_INA219)
@@ -569,7 +583,6 @@ void setup()
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::SHT4X, meshtastic_TelemetrySensorType_SHT4X)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::AHT10, meshtastic_TelemetrySensorType_AHT10)
    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::DFROBOT_LARK, meshtastic_TelemetrySensorType_DFROBOT_LARK)
-    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::CUSTOM_SENSOR, meshtastic_TelemetrySensorType_CUSTOM_SENSOR)

    i2cScanner.reset();
 #endif
@@ -636,6 +649,8 @@ void setup()
 #if !MESHTASTIC_EXCLUDE_I2C
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
    if (acc_info.type != ScanI2C::DeviceType::NONE) {
+        config.display.wake_on_tap_or_motion = true;
+        moduleConfig.external_notification.enabled = true;
        accelerometerThread = new AccelerometerThread(acc_info.type);
    }
 #endif
@@ -885,7 +900,7 @@ void setup()
    }
 #endif

-#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && !defined(TCXO_OPTIONAL)
+#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO)
    if (!rIf) {
        rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
        if (!rIf->init()) {
@@ -899,40 +914,6 @@ void setup()
    }
 #endif

-#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && defined(TCXO_OPTIONAL)
-    if (!rIf) {
-        // Try using the specified TCXO voltage
-        rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("Failed to find SX1262 radio with TCXO using DIO3 reference voltage at %f V\n", tcxoVoltage);
-            delete rIf;
-            rIf = NULL;
-            tcxoVoltage = 0; // if it fails, set the TCXO voltage to zero for the next attempt
-        } else {
-            LOG_INFO("SX1262 Radio init succeeded, using ");
-            LOG_WARN("SX1262 Radio with TCXO");
-            LOG_INFO(", reference voltage at %f V\n", tcxoVoltage);
-            radioType = SX1262_RADIO;
-        }
-    }
-
-    if (!rIf) {
-        // If specified TCXO voltage fails, attempt to use DIO3 as a reference instea
-        rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("Failed to find SX1262 radio with XTAL using DIO3 reference voltage at %f V\n", tcxoVoltage);
-            delete rIf;
-            rIf = NULL;
-            tcxoVoltage = SX126X_DIO3_TCXO_VOLTAGE; // if it fails, set the TCXO voltage back for the next radio search
-        } else {
-            LOG_INFO("SX1262 Radio init succeeded, using ");
-            LOG_WARN("SX1262 Radio with XTAL");
-            LOG_INFO(", reference voltage at %f V\n", tcxoVoltage);
-            radioType = SX1262_RADIO;
-        }
-    }
-#endif
-
 #if defined(USE_SX1268)
    if (!rIf) {
        rIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
@@ -1014,8 +995,6 @@ void setup()
        }
    }

-    lateInitVariant(); // Do board specific init (see extra_variants/README.md for documentation)
-
 #if !MESHTASTIC_EXCLUDE_MQTT
    mqttInit();
 #endif
@@ -1073,7 +1052,7 @@ void setup()
    powerFSMthread = new PowerFSMThread();
    setCPUFast(false); // 80MHz is fine for our slow peripherals
 }
-#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)

@@ -1096,7 +1075,7 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
    deviceMetadata.hasRemoteHardware = moduleConfig.remote_hardware.enabled;
    return deviceMetadata;
 }
-#ifndef PIO_UNIT_TESTING
+
 void loop()
 {
    runASAP = false;
@@ -1141,5 +1120,4 @@ void loop()
        mainDelay.delay(delayMsec);
    }
    // if (didWake) LOG_DEBUG("wake!\n");
-}
-#endif
+}
--- a/src/mesh/Channels.cpp
+++ b/src/mesh/Channels.cpp
@@ -13,6 +13,10 @@
 #include "mqtt/MQTT.h"
 #endif

+/// 16 bytes of random PSK for our _public_ default channel that all devices power up on (AES128)
+static const uint8_t defaultpsk[] = {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59,
+                                     0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0x01};
+
 Channels channels;

 const char *Channels::adminChannel = "admin";
@@ -93,7 +97,7 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
    channelSettings.psk.bytes[0] = defaultpskIndex;
    channelSettings.psk.size = 1;
    strncpy(channelSettings.name, "", sizeof(channelSettings.name));
-    channelSettings.module_settings.position_precision = 13; // default to sending location on the primary channel
+    channelSettings.module_settings.position_precision = 32; // default to sending location on the primary channel
    channelSettings.has_module_settings = true;

    ch.has_settings = true;
@@ -359,4 +363,4 @@ bool Channels::decryptForHash(ChannelIndex chIndex, ChannelHash channelHash)
 int16_t Channels::setActiveByIndex(ChannelIndex channelIndex)
 {
    return setCrypto(channelIndex);
-}
+}
--- a/src/mesh/Channels.h
+++ b/src/mesh/Channels.h
@@ -129,12 +129,4 @@ class Channels
 };

 /// Singleton channel table
-extern Channels channels;
-
-/// 16 bytes of random PSK for our _public_ default channel that all devices power up on (AES128)
-static const uint8_t defaultpsk[] = {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59,
-                                     0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0x01};
-
-static const uint8_t eventpsk[] = {0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36,
-                                   0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74,
-                                   0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa1};
+extern Channels channels;
--- a/src/mesh/CryptoEngine.cpp
+++ b/src/mesh/CryptoEngine.cpp
@@ -1,216 +1,6 @@
 #include "CryptoEngine.h"
-#include "NodeDB.h"
-#include "RadioInterface.h"
-#include "architecture.h"
 #include "configuration.h"

-#if !(MESHTASTIC_EXCLUDE_PKI)
-#include "aes-ccm.h"
-#include "meshUtils.h"
-#include <Crypto.h>
-#include <Curve25519.h>
-#include <SHA256.h>
-#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN)
-
-/**
- * Create a public/private key pair with Curve25519.
- *
- * @param pubKey The destination for the public key.
- * @param privKey The destination for the private key.
- */
-void CryptoEngine::generateKeyPair(uint8_t *pubKey, uint8_t *privKey)
-{
-    LOG_DEBUG("Generating Curve25519 key pair...\n");
-    Curve25519::dh1(public_key, private_key);
-    memcpy(pubKey, public_key, sizeof(public_key));
-    memcpy(privKey, private_key, sizeof(private_key));
-}
-
-/**
- * regenerate a public key with Curve25519.
- *
- * @param pubKey The destination for the public key.
- * @param privKey The source for the private key.
- */
-bool CryptoEngine::regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey)
-{
-    if (!memfll(privKey, 0, sizeof(private_key))) {
-        Curve25519::eval(pubKey, privKey, 0);
-        if (Curve25519::isWeakPoint(pubKey)) {
-            LOG_ERROR("PKI key generation failed. Specified private key results in a weak\n");
-            memset(pubKey, 0, 32);
-            return false;
-        }
-        memcpy(private_key, privKey, sizeof(private_key));
-        memcpy(public_key, pubKey, sizeof(public_key));
-    } else {
-        LOG_WARN("X25519 key generation failed due to blank private key\n");
-        return false;
-    }
-    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
- * for a specific node.
- *
- * @param bytes is updated in place
- */
-bool CryptoEngine::encryptCurve25519(uint32_t toNode, uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes,
-                                     uint8_t *bytesOut)
-{
-    uint8_t *auth;
-    uint32_t *extraNonce;
-    long extraNonceTmp = random();
-    auth = bytesOut + numBytes;
-    extraNonce = (uint32_t *)(auth + 8);
-    *extraNonce = extraNonceTmp;
-    LOG_INFO("Random nonce value: %d\n", *extraNonce);
-    meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(toNode);
-    if (node->num < 1 || node->user.public_key.size == 0) {
-        LOG_DEBUG("Node %d or their public_key not found\n", toNode);
-        return false;
-    }
-    if (!crypto->setDHKey(toNode)) {
-        return false;
-    }
-    initNonce(fromNode, packetNum, *extraNonce);
-
-    // Calculate the shared secret with the destination node and encrypt
-    printBytes("Attempting encrypt using nonce: ", nonce, 13);
-    printBytes("Attempting encrypt using shared_key: ", shared_key, 32);
-    aes_ccm_ae(shared_key, 32, nonce, 8, bytes, numBytes, nullptr, 0, bytesOut,
-               auth); // this can write up to 15 bytes longer than numbytes past bytesOut
-    *extraNonce = extraNonceTmp;
-    return true;
-}
-
-/**
- * Decrypt a packet's payload using a key generated with Curve25519 and SHA256
- * for a specific node.
- *
- * @param bytes is updated in place
- */
-bool CryptoEngine::decryptCurve25519(uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes, uint8_t *bytesOut)
-{
-    uint8_t *auth; // set to last 8 bytes of text?
-    uint32_t *extraNonce;
-    auth = bytes + numBytes - 12;
-    extraNonce = (uint32_t *)(auth + 8);
-    LOG_INFO("Random nonce value: %d\n", *extraNonce);
-    meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(fromNode);
-
-    if (node == nullptr || node->num < 1 || node->user.public_key.size == 0) {
-        LOG_DEBUG("Node or its public key not found in database\n");
-        return false;
-    }
-
-    // Calculate the shared secret with the sending node and decrypt
-    if (!crypto->setDHKey(fromNode)) {
-        return false;
-    }
-    initNonce(fromNode, packetNum, *extraNonce);
-    printBytes("Attempting decrypt using nonce: ", nonce, 13);
-    printBytes("Attempting decrypt using shared_key: ", shared_key, 32);
-    return aes_ccm_ad(shared_key, 32, nonce, 8, bytes, numBytes - 12, nullptr, 0, auth, bytesOut);
-}
-
-void CryptoEngine::setDHPrivateKey(uint8_t *_private_key)
-{
-    memcpy(private_key, _private_key, 32);
-}
-/**
- * Set the PKI key used for encrypt, decrypt.
- *
- * @param nodeNum the node number of the node who's public key we want to use
- */
-bool CryptoEngine::setDHKey(uint32_t nodeNum)
-{
-    meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeNum);
-    if (node->num < 1 || node->user.public_key.size == 0) {
-        LOG_DEBUG("Node %d or their public_key not found\n", nodeNum);
-        return false;
-    }
-
-    if (!setDHPublicKey(node->user.public_key.bytes))
-        return false;
-
-    printBytes("DH Output: ", shared_key, 32);
-
-    /**
-     * D.J. Bernstein reccomends hashing the shared key. We want to do this because there are
-     * at least 128 bits of entropy in the 256-bit output of the DH key exchange, but we don't
-     * really know where. If you extract, for instance, the first 128 bits with basic truncation,
-     * then you don't know if you got all of your 128 entropy bits, or less, possibly much less.
-     *
-     * No exploitable bias is really known at that point, but we know enough to be wary.
-     * Hashing the DH output is a simple and safe way to gather all the entropy and spread
-     * it around as needed.
-     */
-    crypto->hash(shared_key, 32);
-    return true;
-}
-
-/**
- * Hash arbitrary data using SHA256.
- *
- * @param bytes
- * @param numBytes
- */
-void CryptoEngine::hash(uint8_t *bytes, size_t numBytes)
-{
-    SHA256 hash;
-    size_t posn, len;
-    uint8_t size = numBytes;
-    uint8_t inc = 16;
-    hash.reset();
-    for (posn = 0; posn < size; posn += inc) {
-        len = size - posn;
-        if (len > inc)
-            len = inc;
-        hash.update(bytes + posn, len);
-    }
-    hash.finalize(bytes, 32);
-}
-
-void CryptoEngine::aesSetKey(const uint8_t *key_bytes, size_t key_len)
-{
-    if (aes) {
-        delete aes;
-        aes = nullptr;
-    }
-    if (key_len != 0) {
-        aes = new AESSmall256();
-        aes->setKey(key_bytes, key_len);
-    }
-}
-
-void CryptoEngine::aesEncrypt(uint8_t *in, uint8_t *out)
-{
-    aes->encryptBlock(out, in);
-}
-
-bool CryptoEngine::setDHPublicKey(uint8_t *pubKey)
-{
-    uint8_t local_priv[32];
-    memcpy(shared_key, pubKey, 32);
-    memcpy(local_priv, private_key, 32);
-    // Calculate the shared secret with the specified node's public key and our private key
-    // This includes an internal weak key check, which among other things looks for an all 0 public key and shared key.
-    if (!Curve25519::dh2(shared_key, local_priv)) {
-        LOG_WARN("Curve25519DH step 2 failed!\n");
-        return false;
-    }
-    return true;
-}
-
-#endif
 concurrency::Lock *cryptLock;

 void CryptoEngine::setKey(const CryptoKey &k)
@@ -224,59 +14,24 @@ void CryptoEngine::setKey(const CryptoKey &k)
 *
 * @param bytes is updated in place
 */
-void CryptoEngine::encryptPacket(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes)
+void CryptoEngine::encrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes)
 {
-    if (key.length > 0) {
-        initNonce(fromNode, packetId);
-        if (numBytes <= MAX_BLOCKSIZE) {
-            encryptAESCtr(key, nonce, numBytes, bytes);
-        } else {
-            LOG_ERROR("Packet too large for crypto engine: %d. noop encryption!\n", numBytes);
-        }
-    }
+    LOG_WARN("noop encryption!\n");
 }

 void CryptoEngine::decrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes)
 {
-    // For CTR, the implementation is the same
-    encryptPacket(fromNode, packetId, numBytes, bytes);
-}
-
-// Generic implementation of AES-CTR encryption.
-void CryptoEngine::encryptAESCtr(CryptoKey _key, uint8_t *_nonce, size_t numBytes, uint8_t *bytes)
-{
-    if (ctr) {
-        delete ctr;
-        ctr = nullptr;
-    }
-    if (_key.length == 16)
-        ctr = new CTR<AES128>();
-    else
-        ctr = new CTR<AES256>();
-    ctr->setKey(_key.bytes, _key.length);
-    static uint8_t scratch[MAX_BLOCKSIZE];
-    memcpy(scratch, bytes, numBytes);
-    memset(scratch + numBytes, 0,
-           sizeof(scratch) - numBytes); // Fill rest of buffer with zero (in case cypher looks at it)
-
-    ctr->setIV(_nonce, 16);
-    ctr->setCounterSize(4);
-    ctr->encrypt(bytes, scratch, numBytes);
+    LOG_WARN("noop decryption!\n");
 }

 /**
 * Init our 128 bit nonce for a new packet
 */
-void CryptoEngine::initNonce(uint32_t fromNode, uint64_t packetId, uint32_t extraNonce)
+void CryptoEngine::initNonce(uint32_t fromNode, uint64_t packetId)
 {
    memset(nonce, 0, sizeof(nonce));

    // use memcpy to avoid breaking strict-aliasing
    memcpy(nonce, &packetId, sizeof(uint64_t));
    memcpy(nonce + sizeof(uint64_t), &fromNode, sizeof(uint32_t));
-    if (extraNonce)
-        memcpy(nonce + sizeof(uint32_t), &extraNonce, sizeof(uint32_t));
-}
-#ifndef HAS_CUSTOM_CRYPTO_ENGINE
-CryptoEngine *crypto = new CryptoEngine;
-#endif
+}
--- a/src/mesh/CryptoEngine.h
+++ b/src/mesh/CryptoEngine.h
@@ -1,9 +1,6 @@
 #pragma once
-#include "AES.h"
-#include "CTR.h"
+
 #include "concurrency/LockGuard.h"
-#include "configuration.h"
-#include "mesh-pb-constants.h"
 #include <Arduino.h>

 extern concurrency::Lock *cryptLock;
@@ -21,37 +18,17 @@ struct CryptoKey {
 */

 #define MAX_BLOCKSIZE 256
-#define TEST_CURVE25519_FIELD_OPS // Exposes Curve25519::isWeakPoint() for testing keys

 class CryptoEngine
 {
+  protected:
+    /** Our per packet nonce */
+    uint8_t nonce[16] = {0};
+
+    CryptoKey key = {};
+
  public:
-#if !(MESHTASTIC_EXCLUDE_PKI)
-    uint8_t public_key[32] = {0};
-#endif
-
    virtual ~CryptoEngine() {}
-#if !(MESHTASTIC_EXCLUDE_PKI)
-#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN)
-    virtual void generateKeyPair(uint8_t *pubKey, uint8_t *privKey);
-    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, uint64_t packetNum, size_t numBytes, uint8_t *bytes,
-                                   uint8_t *bytesOut);
-    virtual bool decryptCurve25519(uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes, uint8_t *bytesOut);
-    bool setDHKey(uint32_t nodeNum);
-    virtual bool setDHPublicKey(uint8_t *publicKey);
-    virtual void hash(uint8_t *bytes, size_t numBytes);
-
-    virtual void aesSetKey(const uint8_t *key, size_t key_len);
-
-    virtual void aesEncrypt(uint8_t *in, uint8_t *out);
-    AESSmall256 *aes = NULL;
-
-#endif

    /**
     * Set the key used for encrypt, decrypt.
@@ -69,20 +46,10 @@ class CryptoEngine
     *
     * @param bytes is updated in place
     */
-    virtual void encryptPacket(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes);
+    virtual void encrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes);
    virtual void decrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes);
-    virtual void encryptAESCtr(CryptoKey key, uint8_t *nonce, size_t numBytes, uint8_t *bytes);
-#ifndef PIO_UNIT_TESTING
+
  protected:
-#endif
-    /** Our per packet nonce */
-    uint8_t nonce[16] = {0};
-    CryptoKey key = {};
-    CTRCommon *ctr = NULL;
-#if !(MESHTASTIC_EXCLUDE_PKI)
-    uint8_t shared_key[32] = {0};
-    uint8_t private_key[32] = {0};
-#endif
    /**
     * Init our 128 bit nonce for a new packet
     *
@@ -91,7 +58,7 @@ class CryptoEngine
     * a 32 bit sending node number (stored in little endian order)
     * a 32 bit block counter (starts at zero)
     */
-    void initNonce(uint32_t fromNode, uint64_t packetId, uint32_t extraNonce = 0);
+    void initNonce(uint32_t fromNode, uint64_t packetId);
 };

-extern CryptoEngine *crypto;
+extern CryptoEngine *crypto;
--- a/src/mesh/LR11x0Interface.cpp
+++ b/src/mesh/LR11x0Interface.cpp
@@ -50,23 +50,11 @@ template <typename T> bool LR11x0Interface<T>::init()

    limitPower();

-#ifdef TRACKER_T1000_E // Tracker T1000E uses DIO5, DIO6, DIO7, DIO8 for RF switching
-
-    static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7,
-                                                 RADIOLIB_LR11X0_DIO8, RADIOLIB_NC};
-
-    static const Module::RfSwitchMode_t rfswitch_table[] = {
-        // mode             DIO5  DIO6  DIO7  DIO8
-        {LR11x0::MODE_STBY, {LOW, LOW, LOW, LOW}},  {LR11x0::MODE_RX, {HIGH, LOW, LOW, HIGH}},
-        {LR11x0::MODE_TX, {HIGH, HIGH, LOW, HIGH}}, {LR11x0::MODE_TX_HP, {LOW, HIGH, LOW, HIGH}},
-        {LR11x0::MODE_TX_HF, {LOW, LOW, LOW, LOW}}, {LR11x0::MODE_GNSS, {LOW, LOW, HIGH, LOW}},
-        {LR11x0::MODE_WIFI, {LOW, LOW, LOW, LOW}},  END_OF_MODE_TABLE,
-    };
-
-#else
-
    // set RF switch configuration for Wio WM1110
    // Wio WM1110 uses DIO5 and DIO6 for RF switching
+    // NOTE: other boards may be different. If you are
+    // using a different board, you may need to wrap
+    // this in a conditional.

    static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_NC, RADIOLIB_NC,
                                                 RADIOLIB_NC};
@@ -79,8 +67,6 @@ template <typename T> bool LR11x0Interface<T>::init()
        {LR11x0::MODE_WIFI, {LOW, LOW}},  END_OF_MODE_TABLE,
    };

-#endif
-
 // We need to do this before begin() call
 #ifdef LR11X0_DIO_AS_RF_SWITCH
    LOG_DEBUG("Setting DIO RF switch\n");
@@ -104,13 +90,6 @@ template <typename T> bool LR11x0Interface<T>::init()
    if (res == RADIOLIB_ERR_CHIP_NOT_FOUND)
        return false;

-    LR11x0VersionInfo_t version;
-    res = lora.getVersionInfo(&version);
-    if (res == RADIOLIB_ERR_NONE)
-        LOG_DEBUG("LR11x0 Device %d, HW %d, FW %d.%d, WiFi %d.%d, GNSS %d.%d\n", version.device, version.hardware,
-                  version.fwMajor, version.fwMinor, version.fwMajorWiFi, version.fwMinorWiFi, version.fwGNSS,
-                  version.almanacGNSS);
-
    LOG_INFO("Frequency set to %f\n", getFreq());
    LOG_INFO("Bandwidth set to %f\n", bw);
    LOG_INFO("Power output set to %d\n", power);
@@ -121,6 +100,13 @@ template <typename T> bool LR11x0Interface<T>::init()
    // FIXME: May want to set depending on a definition, currently all LR1110 variant files use the DC-DC regulator option
    if (res == RADIOLIB_ERR_NONE)
        res = lora.setRegulatorDCDC();
+#ifdef TRACKER_T1000_E
+#ifdef LR11X0_DIO_RF_SWITCH_CONFIG
+    res = lora.setDioAsRfSwitch(LR11X0_DIO_RF_SWITCH_CONFIG);
+#else
+    res = lora.setDioAsRfSwitch(0x03, 0x0, 0x01, 0x03, 0x02, 0x0, 0x0, 0x0);
+#endif
+#endif
    if (res == RADIOLIB_ERR_NONE) {
        if (config.lora.sx126x_rx_boosted_gain) { // the name is unfortunate but historically accurate
            res = lora.setRxBoostedGainMode(true);
@@ -239,7 +225,9 @@ template <typename T> void LR11x0Interface<T>::startReceive()

    // We use a 16 bit preamble so this should save some power by letting radio sit in standby mostly.
    // Furthermore, we need the PREAMBLE_DETECTED and HEADER_VALID IRQ flag to detect whether we are actively receiving
-    int err = lora.startReceive(RADIOLIB_LR11X0_RX_TIMEOUT_INF, RADIOLIB_IRQ_RX_DEFAULT_FLAGS, RADIOLIB_IRQ_RX_DEFAULT_MASK, 0);
+    int err = lora.startReceive(
+        RADIOLIB_LR11X0_RX_TIMEOUT_INF, RADIOLIB_LR11X0_IRQ_RX_DONE,
+        0); // only RX_DONE IRQ is needed, we'll check for PREAMBLE_DETECTED and HEADER_VALID in isActivelyReceiving
    assert(err == RADIOLIB_ERR_NONE);

    RadioLibInterface::startReceive();
--- a/src/mesh/LR11x0Interface.h
+++ b/src/mesh/LR11x0Interface.h
@@ -25,7 +25,7 @@ template <class T> class LR11x0Interface : public RadioLibInterface
    /// Prepare hardware for sleep.  Call this _only_ for deep sleep, not needed for light sleep.
    virtual bool sleep() override;

-    bool isIRQPending() override { return lora.getIrqFlags() != 0; }
+    bool isIRQPending() override { return lora.getIrqStatus() != 0; }

  protected:
    /**
--- a/src/mesh/MeshModule.cpp
+++ b/src/mesh/MeshModule.cpp
@@ -55,7 +55,7 @@ meshtastic_MeshPacket *MeshModule::allocAckNak(meshtastic_Routing_Error err, Nod
    p->decoded.request_id = idFrom;
    p->channel = chIndex;
    if (err != meshtastic_Routing_Error_NONE)
-        LOG_WARN("Alloc an err=%d,to=0x%x,idFrom=0x%x,id=0x%x\n", err, to, idFrom, p->id);
+        LOG_ERROR("Alloc an err=%d,to=0x%x,idFrom=0x%x,id=0x%x\n", err, to, idFrom, p->id);

    return p;
 }
--- a/src/mesh/MeshPacketQueue.cpp
+++ b/src/mesh/MeshPacketQueue.cpp
@@ -1,5 +1,4 @@
 #include "MeshPacketQueue.h"
-#include "NodeDB.h"
 #include "configuration.h"
 #include <assert.h>

@@ -17,9 +16,12 @@ bool CompareMeshPacketFunc(const meshtastic_MeshPacket *p1, const meshtastic_Mes
 {
    assert(p1 && p2);
    auto p1p = getPriority(p1), p2p = getPriority(p2);
+
    // If priorities differ, use that
-    // for equal priorities, prefer packets already on mesh.
-    return (p1p != p2p) ? (p1p > p2p) : (getFrom(p1) != nodeDB->getNodeNum() && getFrom(p2) == nodeDB->getNodeNum());
+    // for equal priorities, order by id (older packets have higher priority - this will briefly be wrong when IDs roll over but
+    // no big deal)
+    return (p1p != p2p) ? (p1p < p2p)         // prefer bigger priorities
+                        : (p1->id >= p2->id); // prefer smaller packet ids
 }

 MeshPacketQueue::MeshPacketQueue(size_t _maxLen) : maxLen(_maxLen) {}
@@ -37,38 +39,26 @@ void fixPriority(meshtastic_MeshPacket *p)
    // We might receive acks from other nodes (and since generated remotely, they won't have priority assigned.  Check for that
    // and fix it
    if (p->priority == meshtastic_MeshPacket_Priority_UNSET) {
+        // if acks give high priority
        // if a reliable message give a bit higher default priority
-        p->priority = (p->want_ack ? meshtastic_MeshPacket_Priority_RELIABLE : meshtastic_MeshPacket_Priority_DEFAULT);
-        if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
-            // if acks/naks give very high priority
-            if (p->decoded.portnum == meshtastic_PortNum_ROUTING_APP) {
-                p->priority = meshtastic_MeshPacket_Priority_ACK;
-                // if text or admin, give high priority
-            } else if (p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP ||
-                       p->decoded.portnum == meshtastic_PortNum_ADMIN_APP) {
-                p->priority = meshtastic_MeshPacket_Priority_HIGH;
-                // if it is a response, give higher priority to let it arrive early and stop the request being relayed
-            } else if (p->decoded.request_id != 0) {
-                p->priority = meshtastic_MeshPacket_Priority_RESPONSE;
-                // Also if we want a response, give a bit higher priority
-            } else if (p->decoded.want_response) {
-                p->priority = meshtastic_MeshPacket_Priority_RELIABLE;
-            }
-        }
+        p->priority = (p->decoded.portnum == meshtastic_PortNum_ROUTING_APP)
+                          ? meshtastic_MeshPacket_Priority_ACK
+                          : (p->want_ack ? meshtastic_MeshPacket_Priority_RELIABLE : meshtastic_MeshPacket_Priority_DEFAULT);
    }
 }

 /** enqueue a packet, return false if full */
 bool MeshPacketQueue::enqueue(meshtastic_MeshPacket *p)
 {
+    fixPriority(p);
+
    // no space - try to replace a lower priority packet in the queue
    if (queue.size() >= maxLen) {
        return replaceLowerPriorityPacket(p);
    }

-    // Find the correct position using upper_bound to maintain a stable order
-    auto it = std::upper_bound(queue.begin(), queue.end(), p, CompareMeshPacketFunc);
-    queue.insert(it, p); // Insert packet at the found position
+    queue.push_back(p);
+    std::push_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc);
    return true;
 }

@@ -79,7 +69,9 @@ meshtastic_MeshPacket *MeshPacketQueue::dequeue()
    }

    auto *p = queue.front();
-    queue.erase(queue.begin()); // Remove the highest-priority packet
+    std::pop_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc);
+    queue.pop_back();
+
    return p;
 }

@@ -100,6 +92,7 @@ meshtastic_MeshPacket *MeshPacketQueue::remove(NodeNum from, PacketId id)
        auto p = (*it);
        if (getFrom(p) == from && p->id == id) {
            queue.erase(it);
+            std::make_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc);
            return p;
        }
    }
@@ -110,21 +103,28 @@ meshtastic_MeshPacket *MeshPacketQueue::remove(NodeNum from, PacketId id)
 /** Attempt to find and remove a packet from this queue.  Returns the packet which was removed from the queue */
 bool MeshPacketQueue::replaceLowerPriorityPacket(meshtastic_MeshPacket *p)
 {
+    std::sort_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc); // sort ascending based on priority (0 -> 127)

-    if (queue.empty()) {
-        return false; // No packets to replace
-    }
-    // Check if the packet at the back has a lower priority than the new packet
-    auto &backPacket = queue.back();
-    if (backPacket->priority < p->priority) {
-        // Remove the back packet
-        packetPool.release(backPacket);
-        queue.pop_back();
-        // Insert the new packet in the correct order
-        enqueue(p);
-        return true;
+    // find first packet which does not compare less (in priority) than parameter packet
+    auto low = std::lower_bound(queue.begin(), queue.end(), p, &CompareMeshPacketFunc);
+
+    if (low == queue.begin()) { // if already at start, there are no packets with lower priority
+        return false;
    }

-    // If the back packet's priority is not lower, no replacement occurs
-    return false;
-}
+    if (low == queue.end()) {
+        // all priorities in the vector are smaller than the incoming packet. Replace the lowest priority (first) element
+        low = queue.begin();
+    } else {
+        // 'low' iterator points to first packet which does not compare less than parameter
+        --low; // iterate to lower priority packet
+    }
+
+    if (getPriority(p) > getPriority(*low)) {
+        packetPool.release(*low); // deallocate and drop the packet we're replacing
+        *low = p;                 // replace low-pri packet at this position with incoming packet with higher priority
+    }
+
+    std::make_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc);
+    return true;
+}
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -48,19 +48,14 @@ static MemoryDynamic<meshtastic_MqttClientProxyMessage> staticMqttClientProxyMes

 static MemoryDynamic<meshtastic_QueueStatus> staticQueueStatusPool;

-static MemoryDynamic<meshtastic_ClientNotification> staticClientNotificationPool;
-
 Allocator<meshtastic_MqttClientProxyMessage> &mqttClientProxyMessagePool = staticMqttClientProxyMessagePool;

-Allocator<meshtastic_ClientNotification> &clientNotificationPool = staticClientNotificationPool;
-
 Allocator<meshtastic_QueueStatus> &queueStatusPool = staticQueueStatusPool;

 #include "Router.h"

 MeshService::MeshService()
-    : toPhoneQueue(MAX_RX_TOPHONE), toPhoneQueueStatusQueue(MAX_RX_TOPHONE), toPhoneMqttProxyQueue(MAX_RX_TOPHONE),
-      toPhoneClientNotificationQueue(MAX_RX_TOPHONE / 2)
+    : toPhoneQueue(MAX_RX_TOPHONE), toPhoneQueueStatusQueue(MAX_RX_TOPHONE), toPhoneMqttProxyQueue(MAX_RX_TOPHONE)
 {
    lastQueueStatus = {0, 0, 16, 0};
 }
@@ -329,20 +324,6 @@ void MeshService::sendMqttMessageToClientProxy(meshtastic_MqttClientProxyMessage
    fromNum++;
 }

-void MeshService::sendClientNotification(meshtastic_ClientNotification *n)
-{
-    LOG_DEBUG("Sending client notification to phone\n");
-    if (toPhoneClientNotificationQueue.numFree() == 0) {
-        LOG_WARN("ClientNotification queue is full, discarding oldest\n");
-        meshtastic_ClientNotification *d = toPhoneClientNotificationQueue.dequeuePtr(0);
-        if (d)
-            releaseClientNotificationToPool(d);
-    }
-
-    assert(toPhoneClientNotificationQueue.enqueue(n, 0));
-    fromNum++;
-}
-
 meshtastic_NodeInfoLite *MeshService::refreshLocalMeshNode()
 {
    meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeDB->getNodeNum());
--- a/src/mesh/MeshService.h
+++ b/src/mesh/MeshService.h
@@ -21,7 +21,6 @@

 extern Allocator<meshtastic_QueueStatus> &queueStatusPool;
 extern Allocator<meshtastic_MqttClientProxyMessage> &mqttClientProxyMessagePool;
-extern Allocator<meshtastic_ClientNotification> &clientNotificationPool;

 /**
 * Top level app for this service.  keeps the mesh, the radio config and the queue of received packets.
@@ -45,9 +44,6 @@ class MeshService
    // keep list of MqttClientProxyMessages to be send to the client for delivery
    PointerQueue<meshtastic_MqttClientProxyMessage> toPhoneMqttProxyQueue;

-    // keep list of ClientNotifications to be send to the client (phone)
-    PointerQueue<meshtastic_ClientNotification> toPhoneClientNotificationQueue;
-
    // This holds the last QueueStatus send
    meshtastic_QueueStatus lastQueueStatus;

@@ -101,9 +97,6 @@ class MeshService
    // Release MqttClientProxyMessage packet to pool
    void releaseMqttClientProxyMessageToPool(meshtastic_MqttClientProxyMessage *p) { mqttClientProxyMessagePool.release(p); }

-    /// Release the next ClientNotification packet to pool.
-    void releaseClientNotificationToPool(meshtastic_ClientNotification *p) { clientNotificationPool.release(p); }
-
    /**
     *  Given a ToRadio buffer parse it and properly handle it (setup radio, owner or send packet into the mesh)
     * Called by PhoneAPI.handleToRadio.  Note: p is a scratch buffer, this function is allowed to write to it but it can not keep
@@ -141,9 +134,6 @@ class MeshService
    /// Send an MQTT message to the phone for client proxying
    void sendMqttMessageToClientProxy(meshtastic_MqttClientProxyMessage *m);

-    /// Send a ClientNotification to the phone
-    void sendClientNotification(meshtastic_ClientNotification *cn);
-
    bool isToPhoneQueueEmpty();

    ErrorCode sendQueueStatusToPhone(const meshtastic_QueueStatus &qs, ErrorCode res, uint32_t mesh_packet_id);
--- a/src/mesh/MeshTypes.h
+++ b/src/mesh/MeshTypes.h
@@ -14,9 +14,8 @@ typedef uint32_t PacketId; // A packet sequence number
    1 // Reserved to only deliver packets over high speed (non-lora) transports, such as MQTT or BLE mesh (not yet implemented)
 #define ERRNO_OK 0
 #define ERRNO_NO_INTERFACES 33
-#define ERRNO_UNKNOWN 32                   // pick something that doesn't conflict with RH_ROUTER_ERROR_UNABLE_TO_DELIVER
-#define ERRNO_DISABLED 34                  // the interface is disabled
-#define ID_COUNTER_MASK (UINT32_MAX >> 22) // mask to select the counter portion of the ID
+#define ERRNO_UNKNOWN 32  // pick something that doesn't conflict with RH_ROUTER_ERROR_UNABLE_TO_DELIVER
+#define ERRNO_DISABLED 34 // the interface is disabled

 /*
 * Source of a received message
@@ -48,7 +47,4 @@ extern Allocator<meshtastic_MeshPacket> &packetPool;
 * Most (but not always) of the time we want to treat packets 'from' the local phone (where from == 0), as if they originated on
 * the local node. If from is zero this function returns our node number instead
 */
-NodeNum getFrom(const meshtastic_MeshPacket *p);
-
-/* Some clients might not properly set priority, therefore we fix it here. */
-void fixPriority(meshtastic_MeshPacket *p);
+NodeNum getFrom(const meshtastic_MeshPacket *p);
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -19,7 +19,6 @@
 #include "error.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
-#include "meshUtils.h"
 #include "modules/NeighborInfoModule.h"
 #include <ErriezCRC32.h>
 #include <algorithm>
@@ -124,47 +123,7 @@ NodeDB::NodeDB()

    // Include our owner in the node db under our nodenum
    meshtastic_NodeInfoLite *info = getOrCreateMeshNode(getNodeNum());
-    if (!config.has_security) {
-        config.has_security = true;
-        config.security.serial_enabled = config.device.serial_enabled;
-        config.security.is_managed = config.device.is_managed;
-    }
-#if !(MESHTASTIC_EXCLUDE_PKI)
-    // Calculate Curve25519 public and private keys
-    printBytes("Old Pubkey", config.security.public_key.bytes, 32);
-    if (config.security.private_key.size == 32 && config.security.public_key.size == 32) {
-        LOG_INFO("Using saved PKI keys\n");
-        owner.public_key.size = config.security.public_key.size;
-        memcpy(owner.public_key.bytes, config.security.public_key.bytes, config.security.public_key.size);
-        crypto->setDHPrivateKey(config.security.private_key.bytes);
-    } else {
-#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN)
-        bool keygenSuccess = false;
-        if (config.security.private_key.size == 32) {
-            LOG_INFO("Calculating PKI Public Key\n");
-            if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
-                keygenSuccess = true;
-            }
-        } else {
-            LOG_INFO("Generating new PKI keys\n");
-            crypto->generateKeyPair(config.security.public_key.bytes, config.security.private_key.bytes);
-            keygenSuccess = true;
-        }
-        if (keygenSuccess) {
-            config.security.public_key.size = 32;
-            config.security.private_key.size = 32;
-            printBytes("New Pubkey", config.security.public_key.bytes, 32);
-            owner.public_key.size = 32;
-            memcpy(owner.public_key.bytes, config.security.public_key.bytes, 32);
-        }
-#else
-        LOG_INFO("No PKI keys set, and generation disabled!\n");
-#endif
-    }
-
-#endif
-
-    info->user = TypeConversions::ConvertToUserLite(owner);
+    info->user = owner;
    info->has_user = true;

 #ifdef ARCH_ESP32
@@ -278,14 +237,12 @@ void NodeDB::installDefaultConfig()
    config.has_power = true;
    config.has_network = true;
    config.has_bluetooth = (HAS_BLUETOOTH ? true : false);
-    config.has_security = true;
    config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_ALL;

    config.lora.sx126x_rx_boosted_gain = true;
    config.lora.tx_enabled =
        true; // FIXME: maybe false in the future, and setting region to enable it. (unset region forces it off)
    config.lora.override_duty_cycle = false;
-    config.lora.config_ok_to_mqtt = false;
 #ifdef CONFIG_LORA_REGION_USERPREFS
    config.lora.region = CONFIG_LORA_REGION_USERPREFS;
 #else
@@ -302,14 +259,6 @@ void NodeDB::installDefaultConfig()
 #else
    config.lora.ignore_mqtt = false;
 #endif
-#ifdef ADMIN_KEY_USERPREFS
-    memcpy(config.security.admin_key[0].bytes, admin_key_userprefs, 32);
-    config.security.admin_key[0].size = 32;
-#else
-    config.security.admin_key[0].size = 0;
-#endif
-    config.security.public_key.size = 0;
-    config.security.private_key.size = 0;
 #ifdef PIN_GPS_EN
    config.position.gps_en_gpio = PIN_GPS_EN;
 #endif
@@ -318,7 +267,7 @@ void NodeDB::installDefaultConfig()
 #else
    config.device.disable_triple_click = true;
 #endif
-#if !HAS_GPS || defined(T_DECK) || defined(TLORA_T3S3_EPAPER)
+#if !HAS_GPS || defined(T_DECK)
    config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT;
 #elif !defined(GPS_RX_PIN)
    if (config.position.rx_gpio == 0)
@@ -333,8 +282,7 @@ void NodeDB::installDefaultConfig()
    config.position.broadcast_smart_minimum_interval_secs = 30;
    if (config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER)
        config.device.node_info_broadcast_secs = default_node_info_broadcast_secs;
-    config.security.serial_enabled = true;
-    config.security.admin_channel_enabled = false;
+    config.device.serial_enabled = true;
    resetRadioConfig();
    strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);
    // FIXME: Default to bluetooth capability of platform as default
@@ -363,9 +311,6 @@ void NodeDB::installDefaultConfig()
 #ifdef DISPLAY_FLIP_SCREEN
    config.display.flip_screen = true;
 #endif
-#ifdef RAK4630
-    config.display.wake_on_tap_or_motion = true;
-#endif
 #ifdef T_WATCH_S3
    config.display.screen_on_secs = 30;
    config.display.wake_on_tap_or_motion = true;
@@ -409,13 +354,6 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.has_store_forward = true;
    moduleConfig.has_telemetry = true;
    moduleConfig.has_external_notification = true;
-#if defined(PIN_BUZZER)
-    moduleConfig.external_notification.enabled = true;
-    moduleConfig.external_notification.output_buzzer = PIN_BUZZER;
-    moduleConfig.external_notification.use_pwm = true;
-    moduleConfig.external_notification.alert_message_buzzer = true;
-    moduleConfig.external_notification.nag_timeout = 60;
-#endif
 #if defined(RAK4630) || defined(RAK11310)
    // Default to RAK led pin 2 (blue)
    moduleConfig.external_notification.enabled = true;
@@ -425,7 +363,6 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.external_notification.output_ms = 1000;
    moduleConfig.external_notification.nag_timeout = 60;
 #endif
-
 #ifdef HAS_I2S
    // Don't worry about the other settings for T-Watch, we'll also use the DRV2056 behavior for notifications
    moduleConfig.external_notification.enabled = true;
@@ -575,16 +512,10 @@ void NodeDB::cleanupMeshDB()
 {
    int newPos = 0, removed = 0;
    for (int i = 0; i < numMeshNodes; i++) {
-        if (meshNodes->at(i).has_user) {
-            if (meshNodes->at(i).user.public_key.size > 0) {
-                if (memfll(meshNodes->at(i).user.public_key.bytes, 0, meshNodes->at(i).user.public_key.size)) {
-                    meshNodes->at(i).user.public_key.size = 0;
-                }
-            }
+        if (meshNodes->at(i).has_user)
            meshNodes->at(newPos++) = meshNodes->at(i);
-        } else {
+        else
            removed++;
-        }
    }
    numMeshNodes -= removed;
    std::fill(devicestate.node_db_lite.begin() + numMeshNodes, devicestate.node_db_lite.begin() + numMeshNodes + removed,
@@ -642,7 +573,7 @@ void NodeDB::pickNewNodeNum()

    meshtastic_NodeInfoLite *found;
    while ((nodeNum == NODENUM_BROADCAST || nodeNum < NUM_RESERVED) ||
-           ((found = getMeshNode(nodeNum)) && memcmp(found->user.macaddr, ourMacAddr, sizeof(ourMacAddr)) != 0)) {
+           ((found = getMeshNode(nodeNum)) && memcmp(found->user.macaddr, owner.macaddr, sizeof(owner.macaddr)) != 0)) {
        NodeNum candidate = random(NUM_RESERVED, LONG_MAX); // try a new random choice
        LOG_WARN("NOTE! Our desired nodenum 0x%x is invalid or in use, so trying for 0x%x\n", nodeNum, candidate);
        nodeNum = candidate;
@@ -847,7 +778,6 @@ bool NodeDB::saveToDiskNoRetry(int saveWhat)
        config.has_power = true;
        config.has_network = true;
        config.has_bluetooth = true;
-        config.has_security = true;

        success &= saveProto(configFileName, meshtastic_LocalConfig_size, &meshtastic_LocalConfig_msg, &config);
    }
@@ -1027,39 +957,23 @@ void NodeDB::updateTelemetry(uint32_t nodeId, const meshtastic_Telemetry &t, RxS

 /** Update user info and channel for this node based on received user data
 */
-bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelIndex)
+bool NodeDB::updateUser(uint32_t nodeId, const meshtastic_User &p, uint8_t channelIndex)
 {
    meshtastic_NodeInfoLite *info = getOrCreateMeshNode(nodeId);
    if (!info) {
        return false;
    }

-    LOG_DEBUG("old user %s/%s, channel=%d\n", info->user.long_name, info->user.short_name, info->channel);
-#if !(MESHTASTIC_EXCLUDE_PKI)
-    if (p.public_key.size > 0) {
-        printBytes("Incoming Pubkey: ", p.public_key.bytes, 32);
-        if (info->user.public_key.size > 0) { // if we have a key for this user already, don't overwrite with a new one
-            LOG_INFO("Public Key set for node, not updateing!\n");
-            // we copy the key into the incoming packet, to prevent overwrite
-            memcpy(p.public_key.bytes, info->user.public_key.bytes, 32);
-        } else {
-            LOG_INFO("Updating Node Pubkey!\n");
-        }
-    }
-#endif
+    LOG_DEBUG("old user %s/%s/%s, channel=%d\n", info->user.id, info->user.long_name, info->user.short_name, info->channel);

    // Both of info->user and p start as filled with zero so I think this is okay
-    auto lite = TypeConversions::ConvertToUserLite(p);
-    bool changed = memcmp(&info->user, &lite, sizeof(info->user)) || (info->channel != channelIndex);
+    bool changed = memcmp(&info->user, &p, sizeof(info->user)) || (info->channel != channelIndex);

-    info->user = lite;
-    if (info->user.public_key.size == 32) {
-        printBytes("Saved Pubkey: ", info->user.public_key.bytes, 32);
-    }
+    info->user = p;
    if (nodeId != getNodeNum())
        info->channel = channelIndex; // Set channel we need to use to reach this node (but don't set our own channel)
-    LOG_DEBUG("updating changed=%d user %s/%s, channel=%d\n", changed, info->user.long_name, info->user.short_name,
-              info->channel);
+    LOG_DEBUG("updating changed=%d user %s/%s/%s, channel=%d\n", changed, info->user.id, info->user.long_name,
+              info->user.short_name, info->channel);
    info->has_user = true;

    if (changed) {
@@ -1128,32 +1042,19 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
    meshtastic_NodeInfoLite *lite = getMeshNode(n);

    if (!lite) {
-        if ((numMeshNodes >= MAX_NUM_NODES) || (memGet.getFreeHeap() < MINIMUM_SAFE_FREE_HEAP)) {
+        if ((numMeshNodes >= MAX_NUM_NODES) || (memGet.getFreeHeap() < meshtastic_NodeInfoLite_size * 3)) {
            if (screen)
                screen->print("Warn: node database full!\nErasing oldest entry\n");
            LOG_WARN("Node database full with %i nodes and %i bytes free! Erasing oldest entry\n", numMeshNodes,
                     memGet.getFreeHeap());
            // look for oldest node and erase it
            uint32_t oldest = UINT32_MAX;
-            uint32_t oldestBoring = UINT32_MAX;
            int oldestIndex = -1;
-            int oldestBoringIndex = -1;
            for (int i = 1; i < numMeshNodes; i++) {
-                // Simply the oldest non-favorite node
                if (!meshNodes->at(i).is_favorite && meshNodes->at(i).last_heard < oldest) {
                    oldest = meshNodes->at(i).last_heard;
                    oldestIndex = i;
                }
-                // The oldest "boring" node
-                if (!meshNodes->at(i).is_favorite && meshNodes->at(i).user.public_key.size == 0 &&
-                    meshNodes->at(i).last_heard < oldestBoring) {
-                    oldestBoring = meshNodes->at(i).last_heard;
-                    oldestBoringIndex = i;
-                }
-            }
-            // if we found a "boring" node, evict it
-            if (oldestBoringIndex != -1) {
-                oldestIndex = oldestBoringIndex;
            }
            // Shove the remaining nodes down the chain
            for (int i = oldestIndex; i < numMeshNodes - 1; i++) {
@@ -1167,7 +1068,6 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
        // everything is missing except the nodenum
        memset(lite, 0, sizeof(*lite));
        lite->num = n;
-        LOG_INFO("Adding node to database with %i nodes and %i bytes free!\n", numMeshNodes, memGet.getFreeHeap());
    }

    return lite;
@@ -1194,4 +1094,4 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co
    LOG_ERROR("A critical failure occurred, portduino is exiting...");
    exit(2);
 #endif
-}
+}
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -98,7 +98,7 @@ class NodeDB

    /** Update user info and channel for this node based on received user data
     */
-    bool updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelIndex = 0);
+    bool updateUser(uint32_t nodeId, const meshtastic_User &p, uint8_t channelIndex = 0);

    /// @return our node number
    NodeNum getNodeNum() { return myNodeInfo.my_node_num; }
--- a/src/mesh/PhoneAPI.cpp
+++ b/src/mesh/PhoneAPI.cpp
@@ -194,8 +194,6 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
        auto us = nodeDB->readNextMeshNode(readIndex);
        if (us) {
            nodeInfoForPhone = TypeConversions::ConvertToNodeInfo(us);
-            nodeInfoForPhone.hops_away = 0;
-            nodeInfoForPhone.is_favorite = true;
            fromRadioScratch.which_payload_variant = meshtastic_FromRadio_node_info_tag;
            fromRadioScratch.node_info = nodeInfoForPhone;
            // Should allow us to resume sending NodeInfo in STATE_SEND_OTHER_NODEINFOS
@@ -257,13 +255,6 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
            fromRadioScratch.config.which_payload_variant = meshtastic_Config_bluetooth_tag;
            fromRadioScratch.config.payload_variant.bluetooth = config.bluetooth;
            break;
-        case meshtastic_Config_security_tag:
-            fromRadioScratch.config.which_payload_variant = meshtastic_Config_security_tag;
-            fromRadioScratch.config.payload_variant.security = config.security;
-            break;
-        case meshtastic_Config_sessionkey_tag:
-            fromRadioScratch.config.which_payload_variant = meshtastic_Config_sessionkey_tag;
-            break;
        default:
            LOG_ERROR("Unknown config type %d\n", config_state);
        }
--- a/src/mesh/PhoneAPI.h
+++ b/src/mesh/PhoneAPI.h
@@ -66,9 +66,6 @@ class PhoneAPI
    // Keep MqttClientProxyMessage packet just as packetForPhone
    meshtastic_MqttClientProxyMessage *mqttClientProxyMessageForPhone = NULL;

-    // Keep ClientNotification packet just as packetForPhone
-    meshtastic_ClientNotification *clientNotification = NULL;
-
    /// We temporarily keep the nodeInfo here between the call to available and getFromRadio
    meshtastic_NodeInfo nodeInfoForPhone = meshtastic_NodeInfo_init_default;

--- a/src/mesh/RF95Interface.cpp
+++ b/src/mesh/RF95Interface.cpp
@@ -16,7 +16,7 @@
 // In theory up to 27 dBm is possible, but the modules installed in most radios can cope with a max of 20.  So BIG WARNING
 // if you set power to something higher than 17 or 20 you might fry your board.

-#if defined(RADIOMASTER_900_BANDIT_NANO) || defined(RADIOMASTER_900_BANDIT)
+#ifdef RADIOMASTER_900_BANDIT_NANO
 // Structure to hold DAC and DB values
 typedef struct {
    uint8_t dac;
@@ -40,23 +40,12 @@ DACDB getDACandDB(uint8_t dbm)
    static const struct {
        uint8_t dbm;
        DACDB values;
-    }
-#ifdef RADIOMASTER_900_BANDIT_NANO
-    dbmToDACDB[] = {
+    } dbmToDACDB[] = {
        {20, {168, 2}}, // 100mW
        {24, {148, 6}}, // 250mW
        {27, {128, 9}}, // 500mW
        {30, {90, 12}}  // 1000mW
    };
-#endif
-#ifdef RADIOMASTER_900_BANDIT
-    dbmToDACDB[] = {
-        {20, {165, 2}}, // 100mW
-        {24, {155, 6}}, // 250mW
-        {27, {142, 9}}, // 500mW
-        {30, {110, 10}} // 1000mW
-    };
-#endif
    const int numValues = sizeof(dbmToDACDB) / sizeof(dbmToDACDB[0]);

    // Find the interval dbm falls within and interpolate
@@ -67,12 +56,7 @@ DACDB getDACandDB(uint8_t dbm)
    }

    // Return a default value if no match is found and default to 100mW
-#ifdef RADIOMASTER_900_BANDIT_NANO
    DACDB defaultValue = {168, 2};
-#endif
-#ifdef RADIOMASTER_900_BANDIT
-    DACDB defaultValue = {165, 2};
-#endif
    return defaultValue;
 }
 #endif
@@ -111,7 +95,7 @@ bool RF95Interface::init()
 {
    RadioLibInterface::init();

-#if defined(RADIOMASTER_900_BANDIT_NANO) || defined(RADIOMASTER_900_BANDIT)
+#ifdef RADIOMASTER_900_BANDIT_NANO
    // DAC and DB values based on dBm using interpolation
    DACDB dacDbValues = getDACandDB(power);
    int8_t powerDAC = dacDbValues.dac;
@@ -133,7 +117,7 @@ bool RF95Interface::init()
    // enable PA
 #ifdef RF95_PA_EN
 #if defined(RF95_PA_DAC_EN)
-#if defined(RADIOMASTER_900_BANDIT_NANO) || defined(RADIOMASTER_900_BANDIT)
+#ifdef RADIOMASTER_900_BANDIT_NANO
    // Use calculated DAC value
    dacWrite(RF95_PA_EN, powerDAC);
 #else
@@ -179,7 +163,7 @@ bool RF95Interface::init()
    LOG_INFO("Frequency set to %f\n", getFreq());
    LOG_INFO("Bandwidth set to %f\n", bw);
    LOG_INFO("Power output set to %d\n", power);
-#if defined(RADIOMASTER_900_BANDIT_NANO) || defined(RADIOMASTER_900_BANDIT)
+#ifdef RADIOMASTER_900_BANDIT_NANO
    LOG_INFO("DAC output set to %d\n", powerDAC);
 #endif

--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -53,10 +53,8 @@ const RegionInfo regions[] = {

    /*
        https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
-        https://www.arib.or.jp/english/html/overview/doc/5-STD-T108v1_5-E1.pdf
-        https://qiita.com/ammo0613/items/d952154f1195b64dc29f
     */
-    RDEF(JP, 920.5f, 923.5f, 100, 0, 13, true, false, false),
+    RDEF(JP, 920.8f, 927.8f, 100, 0, 16, true, false, false),

    /*
        https://www.iot.org.au/wp/wp-content/uploads/2016/12/IoTSpectrumFactSheet.pdf
@@ -285,9 +283,6 @@ void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
        if (s.want_response)
            out += DEBUG_PORT.mt_sprintf(" WANTRESP");

-        if (p->pki_encrypted)
-            out += DEBUG_PORT.mt_sprintf(" PKI");
-
        if (s.source != 0)
            out += DEBUG_PORT.mt_sprintf(" source=%08x", s.source);

@@ -414,93 +409,67 @@ void RadioInterface::applyModemConfig()
    // Set up default configuration
    // No Sync Words in LORA mode
    meshtastic_Config_LoRaConfig &loraConfig = config.lora;
-    bool validConfig = false; // We need to check for a valid configuration
-    while (!validConfig) {
-        if (loraConfig.use_preset) {
+    if (loraConfig.use_preset) {

-            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;
-            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;
-            case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
-                bw = (myRegion->wideLora) ? 203.125 : 62.5;
-                cr = 8;
-                sf = 12;
-                break;
-            }
-        } else {
-            sf = loraConfig.spread_factor;
-            cr = loraConfig.coding_rate;
-            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;
+        switch (loraConfig.modem_preset) {
+        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;
+        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;
+        case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
+            bw = (myRegion->wideLora) ? 203.125 : 62.5;
+            cr = 8;
+            sf = 12;
+            break;
        }
+    } else {
+        sf = loraConfig.spread_factor;
+        cr = loraConfig.coding_rate;
+        bw = loraConfig.bandwidth;

-        if ((myRegion->freqEnd - myRegion->freqStart) < bw / 1000) {
-            static const char *err_string =
-                "Regional frequency range is smaller than bandwidth. Falling back to default preset.\n";
-            LOG_ERROR(err_string);
-            RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
-
-            meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
-            cn->level = meshtastic_LogRecord_Level_ERROR;
-            sprintf(cn->message, err_string);
-            service->sendClientNotification(cn);
-
-            // Set to default modem preset
-            loraConfig.use_preset = true;
-            loraConfig.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
-        } else {
-            validConfig = true;
-        }
+        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;
    }

    power = loraConfig.tx_power;
@@ -543,7 +512,6 @@ void RadioInterface::applyModemConfig()
    saveChannelNum(channel_num);
    saveFreq(freq + loraConfig.frequency_offset);

-    slotTimeMsec = computeSlotTimeMsec(bw, sf);
    preambleTimeMsec = getPacketTime((uint32_t)0);
    maxPacketTimeMsec = getPacketTime(meshtastic_Constants_DATA_PAYLOAD_LEN + sizeof(PacketHeader));

@@ -617,4 +585,4 @@ size_t RadioInterface::beginSending(meshtastic_MeshPacket *p)

    sendingPacket = p;
    return p->encrypted.size + sizeof(PacketHeader);
-}
+}
--- a/src/mesh/RadioInterface.h
+++ b/src/mesh/RadioInterface.h
@@ -5,7 +5,6 @@
 #include "Observer.h"
 #include "PointerQueue.h"
 #include "airtime.h"
-#include "error.h"

 #define MAX_TX_QUEUE 16 // max number of packets which can be waiting for transmission

@@ -72,20 +71,18 @@ class RadioInterface
      - roundtrip air propagation time (assuming max. 30km between nodes);
      - Tx/Rx turnaround time (maximum of SX126x and SX127x);
      - MAC processing time (measured on T-beam) */
-    uint32_t slotTimeMsec = computeSlotTimeMsec(bw, sf);
+    uint32_t slotTimeMsec = 8.5 * pow(2, sf) / bw + 0.2 + 0.4 + 7;
    uint16_t preambleLength = 16;      // 8 is default, but we use longer to increase the amount of sleep time when receiving
    uint32_t preambleTimeMsec = 165;   // calculated on startup, this is the default for LongFast
    uint32_t maxPacketTimeMsec = 3246; // calculated on startup, this is the default for LongFast
    const uint32_t PROCESSING_TIME_MSEC =
        4500;                // time to construct, process and construct a packet again (empirically determined)
    const uint8_t CWmin = 2; // minimum CWsize
-    const uint8_t CWmax = 7; // maximum CWsize
+    const uint8_t CWmax = 8; // maximum CWsize

    meshtastic_MeshPacket *sendingPacket = NULL; // The packet we are currently sending
    uint32_t lastTxStart = 0L;

-    uint32_t computeSlotTimeMsec(float bw, float sf) { return 8.5 * pow(2, sf) / bw + 0.2 + 0.4 + 7; }
-
    /**
     * A temporary buffer used for sending/receiving packets, sized to hold the biggest buffer we might need
     * */
--- a/src/mesh/RadioLibInterface.h
+++ b/src/mesh/RadioLibInterface.h
@@ -61,6 +61,11 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
     */
    static void isrTxLevel0(), isrLevel0Common(PendingISR code);

+    /**
+     * Debugging counts
+     */
+    uint32_t rxBad = 0, rxGood = 0, txGood = 0;
+
    MeshPacketQueue txQueue = MeshPacketQueue(MAX_TX_QUEUE);

  protected:
@@ -104,11 +109,6 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
     */
    virtual void enableInterrupt(void (*)()) = 0;

-    /**
-     * Debugging counts
-     */
-    uint32_t rxBad = 0, rxGood = 0, txGood = 0;
-
  public:
    RadioLibInterface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
                      RADIOLIB_PIN_TYPE busy, PhysicalLayer *iface = NULL);
--- a/src/mesh/ReliableRouter.cpp
+++ b/src/mesh/ReliableRouter.cpp
@@ -4,7 +4,6 @@
 #include "MeshTypes.h"
 #include "configuration.h"
 #include "mesh-pb-constants.h"
-#include "modules/NodeInfoModule.h"

 // ReliableRouter::ReliableRouter() {}

@@ -110,24 +109,13 @@ void ReliableRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas
                LOG_DEBUG("Some other module has replied to this message, no need for a 2nd ack\n");
            } else if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
                sendAckNak(meshtastic_Routing_Error_NONE, getFrom(p), p->id, p->channel, p->hop_start, p->hop_limit);
-            } else if (p->which_payload_variant == meshtastic_MeshPacket_encrypted_tag && p->channel == 0 &&
-                       (nodeDB->getMeshNode(p->from) == nullptr || nodeDB->getMeshNode(p->from)->user.public_key.size == 0)) {
-                LOG_INFO("This looks like it might be a PKI packet from an unknown node, so send PKI_UNKNOWN_PUBKEY\n");
-                sendAckNak(meshtastic_Routing_Error_PKI_UNKNOWN_PUBKEY, getFrom(p), p->id, channels.getPrimaryIndex(),
-                           p->hop_start, p->hop_limit);
            } else {
                // Send a 'NO_CHANNEL' error on the primary channel if want_ack packet destined for us cannot be decoded
                sendAckNak(meshtastic_Routing_Error_NO_CHANNEL, getFrom(p), p->id, channels.getPrimaryIndex(), p->hop_start,
                           p->hop_limit);
            }
        }
-        if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag && c &&
-            c->error_reason == meshtastic_Routing_Error_PKI_UNKNOWN_PUBKEY) {
-            if (owner.public_key.size == 32) {
-                LOG_INFO("This seems like a remote PKI decrypt failure, so send a NodeInfo");
-                nodeInfoModule->sendOurNodeInfo(p->from, false, p->channel, true);
-            }
-        }
+
        // We consider an ack to be either a !routing packet with a request ID or a routing packet with !error
        PacketId ackId = ((c && c->error_reason == meshtastic_Routing_Error_NONE) || !c) ? p->decoded.request_id : 0;

--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -2,7 +2,6 @@
 #include "Channels.h"
 #include "CryptoEngine.h"
 #include "MeshRadio.h"
-#include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "configuration.h"
@@ -37,7 +36,6 @@ static MemoryDynamic<meshtastic_MeshPacket> staticPool;
 Allocator<meshtastic_MeshPacket> &packetPool = staticPool;

 static uint8_t bytes[MAX_RHPACKETLEN];
-static uint8_t ScratchEncrypted[MAX_RHPACKETLEN];

 /**
 * Constructor
@@ -109,7 +107,7 @@ PacketId generatePacketId()

    rollingPacketId++;

-    rollingPacketId &= ID_COUNTER_MASK;                                    // Mask out the top 22 bits
+    rollingPacketId &= UINT32_MAX >> 22;                                   // Mask out the top 22 bits
    PacketId id = rollingPacketId | random(UINT32_MAX & 0x7fffffff) << 10; // top 22 bits
    LOG_DEBUG("Partially randomized packet id %u\n", id);
    return id;
@@ -165,9 +163,6 @@ meshtastic_QueueStatus Router::getQueueStatus()

 ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
 {
-    if (p->to == 0) {
-        LOG_ERROR("Packet received with to: of 0!\n");
-    }
    // No need to deliver externally if the destination is the local node
    if (p->to == nodeDB->getNodeNum()) {
        printPacket("Enqueued local", p);
@@ -214,13 +209,6 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
 #ifdef DEBUG_PORT
            uint8_t silentMinutes = airTime->getSilentMinutes(hourlyTxPercent, myRegion->dutyCycle);
            LOG_WARN("Duty cycle limit exceeded. Aborting send for now, you can send again in %d minutes.\n", silentMinutes);
-            meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
-            cn->has_reply_id = true;
-            cn->reply_id = p->id;
-            cn->level = meshtastic_LogRecord_Level_WARNING;
-            cn->time = getValidTime(RTCQualityFromNet);
-            sprintf(cn->message, "Duty cycle limit exceeded. You can send again in %d minutes.", silentMinutes);
-            service->sendClientNotification(cn);
 #endif
            meshtastic_Routing_Error err = meshtastic_Routing_Error_DUTY_CYCLE_LIMIT;
            if (getFrom(p) == nodeDB->getNodeNum()) { // only send NAK to API, not to the mesh
@@ -255,8 +243,6 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
        return meshtastic_Routing_Error_BAD_REQUEST;
    }

-    fixPriority(p); // Before encryption, fix the priority if it's unset
-
    // If the packet is not yet encrypted, do so now
    if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
        ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
@@ -313,107 +299,70 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
    if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag)
        return true; // If packet was already decoded just return

-    size_t rawSize = p->encrypted.size;
-    if (rawSize > sizeof(bytes)) {
-        LOG_ERROR("Packet too large to attempt decryption! (rawSize=%d > 256)\n", rawSize);
-        return false;
-    }
-    bool decrypted = false;
-    ChannelIndex chIndex = 0;
-    memcpy(bytes, p->encrypted.bytes,
-           rawSize); // we have to copy into a scratch buffer, because these bytes are a union with the decoded protobuf
-    memcpy(ScratchEncrypted, p->encrypted.bytes, rawSize);
-#if !(MESHTASTIC_EXCLUDE_PKI)
-    // Attempt PKI decryption first
-    if (p->channel == 0 && p->to == nodeDB->getNodeNum() && p->to > 0 && p->to != NODENUM_BROADCAST &&
-        nodeDB->getMeshNode(p->from) != nullptr && nodeDB->getMeshNode(p->from)->user.public_key.size > 0 &&
-        nodeDB->getMeshNode(p->to)->user.public_key.size > 0 && rawSize > 12) {
-        LOG_DEBUG("Attempting PKI decryption\n");
+    // assert(p->which_payloadVariant == MeshPacket_encrypted_tag);

-        if (crypto->decryptCurve25519(p->from, p->id, rawSize, ScratchEncrypted, bytes)) {
-            LOG_INFO("PKI Decryption worked!\n");
-            memset(&p->decoded, 0, sizeof(p->decoded));
-            rawSize -= 12;
-            if (pb_decode_from_bytes(bytes, rawSize, &meshtastic_Data_msg, &p->decoded) &&
-                p->decoded.portnum != meshtastic_PortNum_UNKNOWN_APP) {
-                decrypted = true;
-                LOG_INFO("Packet decrypted using PKI!\n");
-                p->pki_encrypted = true;
-                memcpy(&p->public_key.bytes, nodeDB->getMeshNode(p->from)->user.public_key.bytes, 32);
-                p->public_key.size = 32;
-                // memcpy(bytes, ScratchEncrypted, rawSize); // TODO: Rename the bytes buffers
-                // chIndex = 8;
-            } else {
+    // Try to find a channel that works with this hash
+    for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {
+        // Try to use this hash/channel pair
+        if (channels.decryptForHash(chIndex, p->channel)) {
+            // Try to decrypt the packet if we can
+            size_t rawSize = p->encrypted.size;
+            if (rawSize > sizeof(bytes)) {
+                LOG_ERROR("Packet too large to attempt decription! (rawSize=%d > 256)\n", rawSize);
                return false;
            }
-        }
-    }
-#endif
+            memcpy(bytes, p->encrypted.bytes,
+                   rawSize); // we have to copy into a scratch buffer, because these bytes are a union with the decoded protobuf
+            crypto->decrypt(p->from, p->id, rawSize, bytes);

-    // assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
-    if (!decrypted) {
-        // Try to find a channel that works with this hash
-        for (chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {
-            // Try to use this hash/channel pair
-            if (channels.decryptForHash(chIndex, p->channel)) {
-                // Try to decrypt the packet if we can
-                crypto->decrypt(p->from, p->id, rawSize, bytes);
+            // printBytes("plaintext", bytes, p->encrypted.size);

-                // printBytes("plaintext", bytes, p->encrypted.size);
+            // Take those raw bytes and convert them back into a well structured protobuf we can understand
+            memset(&p->decoded, 0, sizeof(p->decoded));
+            if (!pb_decode_from_bytes(bytes, rawSize, &meshtastic_Data_msg, &p->decoded)) {
+                LOG_ERROR("Invalid protobufs in received mesh packet (bad psk?)!\n");
+            } else if (p->decoded.portnum == meshtastic_PortNum_UNKNOWN_APP) {
+                LOG_ERROR("Invalid portnum (bad psk?)!\n");
+            } else {
+                // parsing was successful
+                p->which_payload_variant = meshtastic_MeshPacket_decoded_tag; // change type to decoded
+                p->channel = chIndex;                                         // change to store the index instead of the hash

-                // Take those raw bytes and convert them back into a well structured protobuf we can understand
-                memset(&p->decoded, 0, sizeof(p->decoded));
-                if (!pb_decode_from_bytes(bytes, rawSize, &meshtastic_Data_msg, &p->decoded)) {
-                    LOG_ERROR("Invalid protobufs in received mesh packet id=0x%08x (bad psk?)!\n", p->id);
-                } else if (p->decoded.portnum == meshtastic_PortNum_UNKNOWN_APP) {
-                    LOG_ERROR("Invalid portnum (bad psk?)!\n");
-                } else {
-                    decrypted = true;
-                    break;
+                /* Not actually ever used.
+                // Decompress if needed. jm
+                if (p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_COMPRESSED_APP) {
+                    // Decompress the payload
+                    char compressed_in[meshtastic_Constants_DATA_PAYLOAD_LEN] = {};
+                    char decompressed_out[meshtastic_Constants_DATA_PAYLOAD_LEN] = {};
+                    int decompressed_len;
+
+                    memcpy(compressed_in, p->decoded.payload.bytes, p->decoded.payload.size);
+
+                    decompressed_len = unishox2_decompress_simple(compressed_in, p->decoded.payload.size, decompressed_out);
+
+                    // LOG_DEBUG("\n\n**\n\nDecompressed length - %d \n", decompressed_len);
+
+                    memcpy(p->decoded.payload.bytes, decompressed_out, decompressed_len);
+
+                    // Switch the port from PortNum_TEXT_MESSAGE_COMPRESSED_APP to PortNum_TEXT_MESSAGE_APP
+                    p->decoded.portnum = meshtastic_PortNum_TEXT_MESSAGE_APP;
+                } */
+
+                printPacket("decoded message", p);
+#if ENABLE_JSON_LOGGING
+                LOG_TRACE("%s\n", MeshPacketSerializer::JsonSerialize(p, false).c_str());
+#elif ARCH_PORTDUINO
+                if (settingsStrings[traceFilename] != "" || settingsMap[logoutputlevel] == level_trace) {
+                    LOG_TRACE("%s\n", MeshPacketSerializer::JsonSerialize(p, false).c_str());
                }
+#endif
+                return true;
            }
        }
    }
-    if (decrypted) {
-        // parsing was successful
-        p->which_payload_variant = meshtastic_MeshPacket_decoded_tag; // change type to decoded
-        p->channel = chIndex;                                         // change to store the index instead of the hash
-        if (p->decoded.has_bitfield)
-            p->decoded.want_response |= p->decoded.bitfield & BITFIELD_WANT_RESPONSE_MASK;

-        /* Not actually ever used.
-        // Decompress if needed. jm
-        if (p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_COMPRESSED_APP) {
-            // Decompress the payload
-            char compressed_in[meshtastic_Constants_DATA_PAYLOAD_LEN] = {};
-            char decompressed_out[meshtastic_Constants_DATA_PAYLOAD_LEN] = {};
-            int decompressed_len;
-
-            memcpy(compressed_in, p->decoded.payload.bytes, p->decoded.payload.size);
-
-            decompressed_len = unishox2_decompress_simple(compressed_in, p->decoded.payload.size, decompressed_out);
-
-            // LOG_DEBUG("\n\n**\n\nDecompressed length - %d \n", decompressed_len);
-
-            memcpy(p->decoded.payload.bytes, decompressed_out, decompressed_len);
-
-            // Switch the port from PortNum_TEXT_MESSAGE_COMPRESSED_APP to PortNum_TEXT_MESSAGE_APP
-            p->decoded.portnum = meshtastic_PortNum_TEXT_MESSAGE_APP;
-        } */
-
-        printPacket("decoded message", p);
-#if ENABLE_JSON_LOGGING
-        LOG_TRACE("%s\n", MeshPacketSerializer::JsonSerialize(p, false).c_str());
-#elif ARCH_PORTDUINO
-        if (settingsStrings[traceFilename] != "" || settingsMap[logoutputlevel] == level_trace) {
-            LOG_TRACE("%s\n", MeshPacketSerializer::JsonSerialize(p, false).c_str());
-        }
-#endif
-        return true;
-    } else {
-        LOG_WARN("No suitable channel found for decoding, hash was 0x%x!\n", p->channel);
-        return false;
-    }
+    LOG_WARN("No suitable channel found for decoding, hash was 0x%x!\n", p->channel);
+    return false;
 }

 /** Return 0 for success or a Routing_Errror code for failure
@@ -422,19 +371,12 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
 {
    concurrency::LockGuard g(cryptLock);

-    int16_t hash;
-
    // If the packet is not yet encrypted, do so now
    if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
-        if (p->from == nodeDB->getNodeNum()) {
-            p->decoded.has_bitfield = true;
-            p->decoded.bitfield |= (config.lora.config_ok_to_mqtt << BITFIELD_OK_TO_MQTT_SHIFT);
-            p->decoded.bitfield |= (p->decoded.want_response << BITFIELD_WANT_RESPONSE_SHIFT);
-        }
-
        size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_Data_msg, &p->decoded);

        /* Not actually used, so save the cycles
+        // Only allow encryption on the text message app.
        //  TODO: Allow modules to opt into compression.
        if (p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP) {

@@ -475,61 +417,17 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
        // printBytes("plaintext", bytes, numbytes);

        ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
-
-#if !(MESHTASTIC_EXCLUDE_PKI)
-        meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
-        if (!owner.is_licensed && config.security.private_key.size == 32 && p->to != NODENUM_BROADCAST && node != nullptr &&
-            node->user.public_key.size > 0 && p->decoded.portnum != meshtastic_PortNum_TRACEROUTE_APP &&
-            p->decoded.portnum != meshtastic_PortNum_NODEINFO_APP && p->decoded.portnum != meshtastic_PortNum_ROUTING_APP &&
-            p->decoded.portnum != meshtastic_PortNum_POSITION_APP) {
-            LOG_DEBUG("Using PKI!\n");
-            if (numbytes + 12 > MAX_RHPACKETLEN)
-                return meshtastic_Routing_Error_TOO_LARGE;
-            if (p->pki_encrypted && !memfll(p->public_key.bytes, 0, 32) &&
-                memcmp(p->public_key.bytes, node->user.public_key.bytes, 32) != 0) {
-                LOG_WARN("Client public key for client differs from requested! Requested 0x%02x, but stored key begins 0x%02x\n",
-                         *p->public_key.bytes, *node->user.public_key.bytes);
-                return meshtastic_Routing_Error_PKI_FAILED;
-            }
-            crypto->encryptCurve25519(p->to, getFrom(p), p->id, numbytes, bytes, ScratchEncrypted);
-            numbytes += 12;
-            memcpy(p->encrypted.bytes, ScratchEncrypted, numbytes);
-            p->channel = 0;
-            p->pki_encrypted = true;
-        } else {
-            if (p->pki_encrypted == true) {
-                // Client specifically requested PKI encryption
-                return meshtastic_Routing_Error_PKI_FAILED;
-            }
-            hash = channels.setActiveByIndex(chIndex);
-
-            // Now that we are encrypting the packet channel should be the hash (no longer the index)
-            p->channel = hash;
-            if (hash < 0) {
-                // No suitable channel could be found for sending
-                return meshtastic_Routing_Error_NO_CHANNEL;
-            }
-            crypto->encryptPacket(getFrom(p), p->id, numbytes, bytes);
-            memcpy(p->encrypted.bytes, bytes, numbytes);
-        }
-#else
-        if (p->pki_encrypted == true) {
-            // Client specifically requested PKI encryption
-            return meshtastic_Routing_Error_PKI_FAILED;
-        }
-        hash = channels.setActiveByIndex(chIndex);
+        auto hash = channels.setActiveByIndex(chIndex);
+        if (hash < 0)
+            // No suitable channel could be found for sending
+            return meshtastic_Routing_Error_NO_CHANNEL;

        // Now that we are encrypting the packet channel should be the hash (no longer the index)
        p->channel = hash;
-        if (hash < 0) {
-            // No suitable channel could be found for sending
-            return meshtastic_Routing_Error_NO_CHANNEL;
-        }
-        crypto->encryptPacket(getFrom(p), p->id, numbytes, bytes);
-        memcpy(p->encrypted.bytes, bytes, numbytes);
-#endif
+        crypto->encrypt(getFrom(p), p->id, numbytes, bytes);

        // Copy back into the packet and set the variant type
+        memcpy(p->encrypted.bytes, bytes, numbytes);
        p->encrypted.size = numbytes;
        p->which_payload_variant = meshtastic_MeshPacket_encrypted_tag;
    }
@@ -641,4 +539,4 @@ void Router::perhapsHandleReceived(meshtastic_MeshPacket *p)
    // cache/learn of the existence of nodes (i.e. FloodRouter) that they should not
    handleReceived(p);
    packetPool.release(p);
-}
+}
--- a/src/mesh/Router.h
+++ b/src/mesh/Router.h
@@ -148,8 +148,3 @@ extern Router *router;
 /// Generate a unique packet id
 // FIXME, move this someplace better
 PacketId generatePacketId();
-
-#define BITFIELD_WANT_RESPONSE_SHIFT 1
-#define BITFIELD_OK_TO_MQTT_SHIFT 0
-#define BITFIELD_WANT_RESPONSE_MASK (1 << BITFIELD_WANT_RESPONSE_SHIFT)
-#define BITFIELD_OK_TO_MQTT_MASK (1 << BITFIELD_OK_TO_MQTT_SHIFT)
--- a/src/mesh/SX126xInterface.cpp
+++ b/src/mesh/SX126xInterface.cpp
@@ -40,7 +40,7 @@ template <typename T> bool SX126xInterface<T>::init()
        0; // "TCXO reference voltage to be set on DIO3. Defaults to 1.6 V, set to 0 to skip." per
           // https://github.com/jgromes/RadioLib/blob/690a050ebb46e6097c5d00c371e961c1caa3b52e/src/modules/SX126x/SX126x.h#L471C26-L471C104
    // (DIO3 is free to be used as an IRQ)
-#elif !defined(TCXO_OPTIONAL)
+#else
    float tcxoVoltage = SX126X_DIO3_TCXO_VOLTAGE;
    // (DIO3 is not free to be used as an IRQ)
 #endif
@@ -264,7 +264,9 @@ template <typename T> void SX126xInterface<T>::startReceive()

    // We use a 16 bit preamble so this should save some power by letting radio sit in standby mostly.
    // Furthermore, we need the PREAMBLE_DETECTED and HEADER_VALID IRQ flag to detect whether we are actively receiving
-    int err = lora.startReceiveDutyCycleAuto(preambleLength, 8, RADIOLIB_IRQ_RX_DEFAULT_FLAGS | RADIOLIB_IRQ_PREAMBLE_DETECTED);
+    int err = lora.startReceiveDutyCycleAuto(preambleLength, 8,
+                                             RADIOLIB_SX126X_IRQ_RX_DEFAULT | RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED |
+                                                 RADIOLIB_SX126X_IRQ_HEADER_VALID);
    if (err != RADIOLIB_ERR_NONE)
        LOG_ERROR("Radiolib error %d when attempting SX126X startReceiveDutyCycleAuto!\n", err);
    assert(err == RADIOLIB_ERR_NONE);
@@ -299,7 +301,7 @@ template <typename T> bool SX126xInterface<T>::isActivelyReceiving()
    // The IRQ status will be cleared when we start our read operation. Check if we've started a header, but haven't yet
    // received and handled the interrupt for reading the packet/handling errors.

-    uint16_t irq = lora.getIrqFlags();
+    uint16_t irq = lora.getIrqStatus();
    bool detected = (irq & (RADIOLIB_SX126X_IRQ_HEADER_VALID | RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED));
    // Handle false detections
    if (detected) {
@@ -343,4 +345,4 @@ template <typename T> bool SX126xInterface<T>::sleep()
 #endif

    return true;
-}
+}
--- a/src/mesh/SX126xInterface.h
+++ b/src/mesh/SX126xInterface.h
@@ -25,7 +25,7 @@ template <class T> class SX126xInterface : public RadioLibInterface
    /// Prepare hardware for sleep.  Call this _only_ for deep sleep, not needed for light sleep.
    virtual bool sleep() override;

-    bool isIRQPending() override { return lora.getIrqFlags() != 0; }
+    bool isIRQPending() override { return lora.getIrqStatus() != 0; }

  protected:
    float currentLimit = 140; // Higher OCP limit for SX126x PA
--- a/src/mesh/SX128xInterface.cpp
+++ b/src/mesh/SX128xInterface.cpp
@@ -256,7 +256,9 @@ template <typename T> void SX128xInterface<T>::startReceive()
 #endif

    // We use the PREAMBLE_DETECTED and HEADER_VALID IRQ flag to detect whether we are actively receiving
-    int err = lora.startReceive(RADIOLIB_SX128X_RX_TIMEOUT_INF, RADIOLIB_IRQ_RX_DEFAULT_FLAGS | RADIOLIB_IRQ_PREAMBLE_DETECTED);
+    int err =
+        lora.startReceive(RADIOLIB_SX128X_RX_TIMEOUT_INF, RADIOLIB_SX128X_IRQ_RX_DEFAULT | RADIOLIB_SX128X_IRQ_PREAMBLE_DETECTED |
+                                                              RADIOLIB_SX128X_IRQ_HEADER_VALID);

    if (err != RADIOLIB_ERR_NONE)
        LOG_ERROR("Radiolib error %d when attempting SX128X startReceive!\n", err);
--- a/src/mesh/SX128xInterface.h
+++ b/src/mesh/SX128xInterface.h
@@ -27,7 +27,7 @@ template <class T> class SX128xInterface : public RadioLibInterface
    /// Prepare hardware for sleep.  Call this _only_ for deep sleep, not needed for light sleep.
    virtual bool sleep() override;

-    bool isIRQPending() override { return lora.getIrqFlags() != 0; }
+    bool isIRQPending() override { return lora.getIrqStatus() != 0; }

  protected:
    /**
--- a/src/mesh/TypeConversions.cpp
+++ b/src/mesh/TypeConversions.cpp
@@ -16,21 +16,15 @@ meshtastic_NodeInfo TypeConversions::ConvertToNodeInfo(const meshtastic_NodeInfo

    if (lite->has_position) {
        info.has_position = true;
-        if (lite->position.latitude_i != 0)
-            info.position.has_latitude_i = true;
        info.position.latitude_i = lite->position.latitude_i;
-        if (lite->position.longitude_i != 0)
-            info.position.has_longitude_i = true;
        info.position.longitude_i = lite->position.longitude_i;
-        if (lite->position.altitude != 0)
-            info.position.has_altitude = true;
        info.position.altitude = lite->position.altitude;
        info.position.location_source = lite->position.location_source;
        info.position.time = lite->position.time;
    }
    if (lite->has_user) {
        info.has_user = true;
-        info.user = ConvertToUser(lite->num, lite->user);
+        info.user = lite->user;
    }
    if (lite->has_device_metrics) {
        info.has_device_metrics = true;
@@ -54,49 +48,11 @@ meshtastic_PositionLite TypeConversions::ConvertToPositionLite(meshtastic_Positi
 meshtastic_Position TypeConversions::ConvertToPosition(meshtastic_PositionLite lite)
 {
    meshtastic_Position position = meshtastic_Position_init_default;
-    if (lite.latitude_i != 0)
-        position.has_latitude_i = true;
    position.latitude_i = lite.latitude_i;
-    if (lite.longitude_i != 0)
-        position.has_longitude_i = true;
    position.longitude_i = lite.longitude_i;
-    if (lite.altitude != 0)
-        position.has_altitude = true;
    position.altitude = lite.altitude;
    position.location_source = lite.location_source;
    position.time = lite.time;

    return position;
-}
-
-meshtastic_UserLite TypeConversions::ConvertToUserLite(meshtastic_User user)
-{
-    meshtastic_UserLite lite = meshtastic_UserLite_init_default;
-
-    strncpy(lite.long_name, user.long_name, sizeof(lite.long_name));
-    strncpy(lite.short_name, user.short_name, sizeof(lite.short_name));
-    lite.hw_model = user.hw_model;
-    lite.role = user.role;
-    lite.is_licensed = user.is_licensed;
-    memccpy(lite.macaddr, user.macaddr, sizeof(user.macaddr), sizeof(lite.macaddr));
-    memcpy(lite.public_key.bytes, user.public_key.bytes, sizeof(lite.public_key.bytes));
-    lite.public_key.size = user.public_key.size;
-    return lite;
-}
-
-meshtastic_User TypeConversions::ConvertToUser(uint32_t nodeNum, meshtastic_UserLite lite)
-{
-    meshtastic_User user = meshtastic_User_init_default;
-
-    snprintf(user.id, sizeof(user.id), "!%08x", nodeNum);
-    strncpy(user.long_name, lite.long_name, sizeof(user.long_name));
-    strncpy(user.short_name, lite.short_name, sizeof(user.short_name));
-    user.hw_model = lite.hw_model;
-    user.role = lite.role;
-    user.is_licensed = lite.is_licensed;
-    memccpy(user.macaddr, lite.macaddr, sizeof(lite.macaddr), sizeof(user.macaddr));
-    memcpy(user.public_key.bytes, lite.public_key.bytes, sizeof(user.public_key.bytes));
-    user.public_key.size = lite.public_key.size;
-
-    return user;
 }
--- a/src/mesh/TypeConversions.h
+++ b/src/mesh/TypeConversions.h
@@ -10,6 +10,4 @@ class TypeConversions
    static meshtastic_NodeInfo ConvertToNodeInfo(const meshtastic_NodeInfoLite *lite);
    static meshtastic_PositionLite ConvertToPositionLite(meshtastic_Position position);
    static meshtastic_Position ConvertToPosition(meshtastic_PositionLite lite);
-    static meshtastic_UserLite ConvertToUserLite(meshtastic_User user);
-    static meshtastic_User ConvertToUser(uint32_t nodeNum, meshtastic_UserLite lite);
 };
--- a/src/mesh/aes-ccm.cpp
+++ b/src/mesh/aes-ccm.cpp
@@ -1,157 +0,0 @@
-/*
- * Counter with CBC-MAC (CCM) with AES
- *
- * Copyright (c) 2010-2012, Jouni Malinen <j@w1.fi>
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-#define AES_BLOCK_SIZE 16
-#include "aes-ccm.h"
-#if !MESHTASTIC_EXCLUDE_PKI
-
-static inline void WPA_PUT_BE16(uint8_t *a, uint16_t val)
-{
-    a[0] = val >> 8;
-    a[1] = val & 0xff;
-}
-
-static void xor_aes_block(uint8_t *dst, const uint8_t *src)
-{
-    uint32_t *d = (uint32_t *)dst;
-    uint32_t *s = (uint32_t *)src;
-    *d++ ^= *s++;
-    *d++ ^= *s++;
-    *d++ ^= *s++;
-    *d++ ^= *s++;
-}
-static void aes_ccm_auth_start(size_t M, size_t L, const uint8_t *nonce, const uint8_t *aad, size_t aad_len, size_t plain_len,
-                               uint8_t *x)
-{
-    uint8_t aad_buf[2 * AES_BLOCK_SIZE];
-    uint8_t b[AES_BLOCK_SIZE];
-    /* Authentication */
-    /* B_0: Flags | Nonce N | l(m) */
-    b[0] = aad_len ? 0x40 : 0 /* Adata */;
-    b[0] |= (((M - 2) / 2) /* M' */ << 3);
-    b[0] |= (L - 1) /* L' */;
-    memcpy(&b[1], nonce, 15 - L);
-    WPA_PUT_BE16(&b[AES_BLOCK_SIZE - L], plain_len);
-    crypto->aesEncrypt(b, x); /* X_1 = E(K, B_0) */
-    if (!aad_len)
-        return;
-    WPA_PUT_BE16(aad_buf, aad_len);
-    memcpy(aad_buf + 2, aad, aad_len);
-    memset(aad_buf + 2 + aad_len, 0, sizeof(aad_buf) - 2 - aad_len);
-    xor_aes_block(aad_buf, x);
-    crypto->aesEncrypt(aad_buf, x); /* X_2 = E(K, X_1 XOR B_1) */
-    if (aad_len > AES_BLOCK_SIZE - 2) {
-        xor_aes_block(&aad_buf[AES_BLOCK_SIZE], x);
-        /* X_3 = E(K, X_2 XOR B_2) */
-        crypto->aesEncrypt(&aad_buf[AES_BLOCK_SIZE], x);
-    }
-}
-static void aes_ccm_auth(const uint8_t *data, size_t len, uint8_t *x)
-{
-    size_t last = len % AES_BLOCK_SIZE;
-    size_t i;
-    for (i = 0; i < len / AES_BLOCK_SIZE; i++) {
-        /* X_i+1 = E(K, X_i XOR B_i) */
-        xor_aes_block(x, data);
-        data += AES_BLOCK_SIZE;
-        crypto->aesEncrypt(x, x);
-    }
-    if (last) {
-        /* XOR zero-padded last block */
-        for (i = 0; i < last; i++)
-            x[i] ^= *data++;
-        crypto->aesEncrypt(x, x);
-    }
-}
-static void aes_ccm_encr_start(size_t L, const uint8_t *nonce, uint8_t *a)
-{
-    /* A_i = Flags | Nonce N | Counter i */
-    a[0] = L - 1; /* Flags = L' */
-    memcpy(&a[1], nonce, 15 - L);
-}
-static void aes_ccm_encr(size_t L, const uint8_t *in, size_t len, uint8_t *out, uint8_t *a)
-{
-    size_t last = len % AES_BLOCK_SIZE;
-    size_t i;
-    /* crypt = msg XOR (S_1 | S_2 | ... | S_n) */
-    for (i = 1; i <= len / AES_BLOCK_SIZE; i++) {
-        WPA_PUT_BE16(&a[AES_BLOCK_SIZE - 2], i);
-        /* S_i = E(K, A_i) */
-        crypto->aesEncrypt(a, out);
-        xor_aes_block(out, in);
-        out += AES_BLOCK_SIZE;
-        in += AES_BLOCK_SIZE;
-    }
-    if (last) {
-        WPA_PUT_BE16(&a[AES_BLOCK_SIZE - 2], i);
-        crypto->aesEncrypt(a, out);
-        /* XOR zero-padded last block */
-        for (i = 0; i < last; i++)
-            *out++ ^= *in++;
-    }
-}
-static void aes_ccm_encr_auth(size_t M, uint8_t *x, uint8_t *a, uint8_t *auth)
-{
-    size_t i;
-    uint8_t tmp[AES_BLOCK_SIZE];
-    /* U = T XOR S_0; S_0 = E(K, A_0) */
-    WPA_PUT_BE16(&a[AES_BLOCK_SIZE - 2], 0);
-    crypto->aesEncrypt(a, tmp);
-    for (i = 0; i < M; i++)
-        auth[i] = x[i] ^ tmp[i];
-}
-static void aes_ccm_decr_auth(size_t M, uint8_t *a, const uint8_t *auth, uint8_t *t)
-{
-    size_t i;
-    uint8_t tmp[AES_BLOCK_SIZE];
-    /* U = T XOR S_0; S_0 = E(K, A_0) */
-    WPA_PUT_BE16(&a[AES_BLOCK_SIZE - 2], 0);
-    crypto->aesEncrypt(a, tmp);
-    for (i = 0; i < M; i++)
-        t[i] = auth[i] ^ tmp[i];
-}
-/* AES-CCM with fixed L=2 and aad_len <= 30 assumption */
-int aes_ccm_ae(const uint8_t *key, size_t key_len, const uint8_t *nonce, size_t M, const uint8_t *plain, size_t plain_len,
-               const uint8_t *aad, size_t aad_len, uint8_t *crypt, uint8_t *auth)
-{
-    const size_t L = 2;
-    uint8_t x[AES_BLOCK_SIZE], a[AES_BLOCK_SIZE];
-    if (aad_len > 30 || M > AES_BLOCK_SIZE)
-        return -1;
-    crypto->aesSetKey(key, key_len);
-    aes_ccm_auth_start(M, L, nonce, aad, aad_len, plain_len, x);
-    aes_ccm_auth(plain, plain_len, x);
-    /* Encryption */
-    aes_ccm_encr_start(L, nonce, a);
-    aes_ccm_encr(L, plain, plain_len, crypt, a);
-    aes_ccm_encr_auth(M, x, a, auth);
-    return 0;
-}
-/* AES-CCM with fixed L=2 and aad_len <= 30 assumption */
-bool aes_ccm_ad(const uint8_t *key, size_t key_len, const uint8_t *nonce, size_t M, const uint8_t *crypt, size_t crypt_len,
-                const uint8_t *aad, size_t aad_len, const uint8_t *auth, uint8_t *plain)
-{
-    const size_t L = 2;
-    uint8_t x[AES_BLOCK_SIZE], a[AES_BLOCK_SIZE];
-    uint8_t t[AES_BLOCK_SIZE];
-    if (aad_len > 30 || M > AES_BLOCK_SIZE)
-        return false;
-    crypto->aesSetKey(key, key_len);
-    /* Decryption */
-    aes_ccm_encr_start(L, nonce, a);
-    aes_ccm_decr_auth(M, a, auth, t);
-    /* plaintext = msg XOR (S_1 | S_2 | ... | S_n) */
-    aes_ccm_encr(L, crypt, crypt_len, plain, a);
-    aes_ccm_auth_start(M, L, nonce, aad, aad_len, crypt_len, x);
-    aes_ccm_auth(plain, crypt_len, x);
-    if (memcmp(x, t, M) != 0) { // FIXME make const comp
-        return false;
-    }
-    return true;
-}
-#endif
--- a/src/mesh/aes-ccm.h
+++ b/src/mesh/aes-ccm.h
@@ -1,10 +0,0 @@
-#pragma once
-#include "CryptoEngine.h"
-#if !MESHTASTIC_EXCLUDE_PKI
-
-int aes_ccm_ae(const uint8_t *key, size_t key_len, const uint8_t *nonce, size_t M, const uint8_t *plain, size_t plain_len,
-               const uint8_t *aad, size_t aad_len, uint8_t *crypt, uint8_t *auth);
-
-bool aes_ccm_ad(const uint8_t *key, size_t key_len, const uint8_t *nonce, size_t M, const uint8_t *crypt, size_t crypt_len,
-                const uint8_t *aad, size_t aad_len, const uint8_t *auth, uint8_t *plain);
-#endif
--- a/src/mesh/api/ServerAPI.cpp
+++ b/src/mesh/api/ServerAPI.cpp
@@ -5,7 +5,7 @@
 template <typename T>
 ServerAPI<T>::ServerAPI(T &_client) : StreamAPI(&client), concurrency::OSThread("ServerAPI"), client(_client)
 {
-    LOG_INFO("Incoming API connection\n");
+    LOG_INFO("Incoming wifi connection\n");
 }

 template <typename T> ServerAPI<T>::~ServerAPI()
@@ -49,16 +49,6 @@ template <class T, class U> int32_t APIServerPort<T, U>::runOnce()
    if (client) {
        // Close any previous connection (see FIXME in header file)
        if (openAPI) {
-#if RAK_4631
-            // RAK13800 Ethernet requests periodically take more time
-            // This backoff addresses most cases keeping max wait < 1s
-            // Reconnections are delayed by full wait time
-            if (waitTime < 400) {
-                waitTime *= 2;
-                LOG_INFO("Previous TCP connection still open, trying again in %dms\n", waitTime);
-                return waitTime;
-            }
-#endif
            LOG_INFO("Force closing previous TCP connection\n");
            delete openAPI;
        }
@@ -66,8 +56,5 @@ template <class T, class U> int32_t APIServerPort<T, U>::runOnce()
        openAPI = new T(client);
    }

-#if RAK_4631
-    waitTime = 100;
-#endif
    return 100; // only check occasionally for incoming connections
 }
--- a/src/mesh/api/ServerAPI.h
+++ b/src/mesh/api/ServerAPI.h
@@ -31,7 +31,7 @@ template <class T> class ServerAPI : public StreamAPI, private concurrency::OSTh
 };

 /**
- * Listens for incoming connections and does accepts and creates instances of ServerAPI as needed
+ * Listens for incoming connections and does accepts and creates instances of WiFiServerAPI as needed
 */
 template <class T, class U> class APIServerPort : public U, private concurrency::OSThread
 {
@@ -41,10 +41,6 @@ template <class T, class U> class APIServerPort : public U, private concurrency:
     * delegate to the worker.  Once coroutines are implemented we can relax this restriction.
     */
    T *openAPI = NULL;
-#if RAK_4631
-    // Track wait time for RAK13800 Ethernet requests
-    int32_t waitTime = 100;
-#endif

  public:
    explicit APIServerPort(int port);
--- a/src/mesh/api/ethServerAPI.h
+++ b/src/mesh/api/ethServerAPI.h
@@ -14,7 +14,7 @@ class ethServerAPI : public ServerAPI<EthernetClient>
 };

 /**
- * Listens for incoming connections and does accepts and creates instances of EthernetServerAPI as needed
+ * Listens for incoming connections and does accepts and creates instances of WiFiServerAPI as needed
 */
 class ethServerPort : public APIServerPort<ethServerAPI, EthernetServer>
 {
--- a/src/mesh/eth/ethClient.cpp
+++ b/src/mesh/eth/ethClient.cpp
@@ -38,7 +38,7 @@ static int32_t reconnectETH()
        Ethernet.maintain();
        if (!ethStartupComplete) {
            // Start web server
-            LOG_INFO("Starting Ethernet network services\n");
+            LOG_INFO("... Starting network services\n");

 #ifndef DISABLE_NTP
            LOG_INFO("Starting NTP time client\n");
@@ -131,8 +131,7 @@ bool initEthernet()
            status = Ethernet.begin(mac);
        } else if (config.network.address_mode == meshtastic_Config_NetworkConfig_AddressMode_STATIC) {
            LOG_INFO("starting Ethernet Static\n");
-            Ethernet.begin(mac, config.network.ipv4_config.ip, config.network.ipv4_config.dns, config.network.ipv4_config.gateway,
-                           config.network.ipv4_config.subnet);
+            Ethernet.begin(mac, config.network.ipv4_config.ip, config.network.ipv4_config.dns, config.network.ipv4_config.subnet);
            status = 1;
        } else {
            LOG_INFO("Ethernet Disabled\n");
@@ -187,4 +186,4 @@ bool isEthernetAvailable()
    }
 }

-#endif
+#endif
--- a/src/mesh/generated/meshtastic/admin.pb.h
+++ b/src/mesh/generated/meshtastic/admin.pb.h
@@ -30,11 +30,7 @@ typedef enum _meshtastic_AdminMessage_ConfigType {
    /* TODO: REPLACE */
    meshtastic_AdminMessage_ConfigType_LORA_CONFIG = 5,
    /* TODO: REPLACE */
-    meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6,
-    /* TODO: REPLACE */
-    meshtastic_AdminMessage_ConfigType_SECURITY_CONFIG = 7,
-    /*  */
-    meshtastic_AdminMessage_ConfigType_SESSIONKEY_CONFIG = 8
+    meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6
 } meshtastic_AdminMessage_ConfigType;

 /* TODO: REPLACE */
@@ -89,7 +85,6 @@ typedef struct _meshtastic_NodeRemoteHardwarePinsResponse {
    meshtastic_NodeRemoteHardwarePin node_remote_hardware_pins[16];
 } meshtastic_NodeRemoteHardwarePinsResponse;

-typedef PB_BYTES_ARRAY_T(8) meshtastic_AdminMessage_session_passkey_t;
 /* This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
 This message is used to do settings operations to both remote AND local nodes.
 (Prior to 1.2 these operations were done via special ToRadio operations) */
@@ -168,9 +163,6 @@ typedef struct _meshtastic_AdminMessage {
        meshtastic_Position set_fixed_position;
        /* Clear fixed position coordinates and then set position.fixed_position = false */
        bool remove_fixed_position;
-        /* Set time only on the node
-     Convenience method to set the time on the node (as Net quality) without any other position data */
-        uint32_t set_time_only;
        /* Begins an edit transaction for config, module config, owner, and channel settings changes
     This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings) */
        bool begin_edit_settings;
@@ -193,10 +185,6 @@ typedef struct _meshtastic_AdminMessage {
        /* Tell the node to reset the nodedb. */
        int32_t nodedb_reset;
    };
-    /* The node generates this key and sends it with any get_x_response packets.
- The client MUST include the same key with any set_x commands. Key expires after 300 seconds.
- Prevents replay attacks for admin messages. */
-    meshtastic_AdminMessage_session_passkey_t session_passkey;
 } meshtastic_AdminMessage;


@@ -206,8 +194,8 @@ extern "C" {

 /* Helper constants for enums */
 #define _meshtastic_AdminMessage_ConfigType_MIN meshtastic_AdminMessage_ConfigType_DEVICE_CONFIG
-#define _meshtastic_AdminMessage_ConfigType_MAX meshtastic_AdminMessage_ConfigType_SESSIONKEY_CONFIG
-#define _meshtastic_AdminMessage_ConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ConfigType)(meshtastic_AdminMessage_ConfigType_SESSIONKEY_CONFIG+1))
+#define _meshtastic_AdminMessage_ConfigType_MAX meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG
+#define _meshtastic_AdminMessage_ConfigType_ARRAYSIZE ((meshtastic_AdminMessage_ConfigType)(meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG+1))

 #define _meshtastic_AdminMessage_ModuleConfigType_MIN meshtastic_AdminMessage_ModuleConfigType_MQTT_CONFIG
 #define _meshtastic_AdminMessage_ModuleConfigType_MAX meshtastic_AdminMessage_ModuleConfigType_PAXCOUNTER_CONFIG
@@ -220,10 +208,10 @@ extern "C" {


 /* Initializer values for message structs */
-#define meshtastic_AdminMessage_init_default     {0, {0}, {0, {0}}}
+#define meshtastic_AdminMessage_init_default     {0, {0}}
 #define meshtastic_HamParameters_init_default    {"", 0, 0, ""}
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_default {0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}}
-#define meshtastic_AdminMessage_init_zero        {0, {0}, {0, {0}}}
+#define meshtastic_AdminMessage_init_zero        {0, {0}}
 #define meshtastic_HamParameters_init_zero       {"", 0, 0, ""}
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_zero {0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}}

@@ -266,7 +254,6 @@ extern "C" {
 #define meshtastic_AdminMessage_remove_favorite_node_tag 40
 #define meshtastic_AdminMessage_set_fixed_position_tag 41
 #define meshtastic_AdminMessage_remove_fixed_position_tag 42
-#define meshtastic_AdminMessage_set_time_only_tag 43
 #define meshtastic_AdminMessage_begin_edit_settings_tag 64
 #define meshtastic_AdminMessage_commit_edit_settings_tag 65
 #define meshtastic_AdminMessage_factory_reset_device_tag 94
@@ -276,7 +263,6 @@ extern "C" {
 #define meshtastic_AdminMessage_shutdown_seconds_tag 98
 #define meshtastic_AdminMessage_factory_reset_config_tag 99
 #define meshtastic_AdminMessage_nodedb_reset_tag 100
-#define meshtastic_AdminMessage_session_passkey_tag 101

 /* Struct field encoding specification for nanopb */
 #define meshtastic_AdminMessage_FIELDLIST(X, a) \
@@ -313,7 +299,6 @@ X(a, STATIC,   ONEOF,    UINT32,   (payload_variant,set_favorite_node,set_favori
 X(a, STATIC,   ONEOF,    UINT32,   (payload_variant,remove_favorite_node,remove_favorite_node),  40) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_fixed_position,set_fixed_position),  41) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,remove_fixed_position,remove_fixed_position),  42) \
-X(a, STATIC,   ONEOF,    FIXED32,  (payload_variant,set_time_only,set_time_only),  43) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,begin_edit_settings,begin_edit_settings),  64) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,commit_edit_settings,commit_edit_settings),  65) \
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,factory_reset_device,factory_reset_device),  94) \
@@ -322,8 +307,7 @@ X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,exit_simulator,exit_simulato
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,reboot_seconds,reboot_seconds),  97) \
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,shutdown_seconds,shutdown_seconds),  98) \
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,factory_reset_config,factory_reset_config),  99) \
-X(a, STATIC,   ONEOF,    INT32,    (payload_variant,nodedb_reset,nodedb_reset), 100) \
-X(a, STATIC,   SINGULAR, BYTES,    session_passkey, 101)
+X(a, STATIC,   ONEOF,    INT32,    (payload_variant,nodedb_reset,nodedb_reset), 100)
 #define meshtastic_AdminMessage_CALLBACK NULL
 #define meshtastic_AdminMessage_DEFAULT NULL
 #define meshtastic_AdminMessage_payload_variant_get_channel_response_MSGTYPE meshtastic_Channel
@@ -365,7 +349,7 @@ extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePinsResponse_msg;

 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_ADMIN_PB_H_MAX_SIZE meshtastic_AdminMessage_size
-#define meshtastic_AdminMessage_size             511
+#define meshtastic_AdminMessage_size             500
 #define meshtastic_HamParameters_size            31
 #define meshtastic_NodeRemoteHardwarePinsResponse_size 496

--- a/src/mesh/generated/meshtastic/apponly.pb.h
+++ b/src/mesh/generated/meshtastic/apponly.pb.h
@@ -55,7 +55,7 @@ extern const pb_msgdesc_t meshtastic_ChannelSet_msg;

 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_APPONLY_PB_H_MAX_SIZE meshtastic_ChannelSet_size
-#define meshtastic_ChannelSet_size               679
+#define meshtastic_ChannelSet_size               676

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/meshtastic/config.pb.cpp
+++ b/src/mesh/generated/meshtastic/config.pb.cpp
@@ -33,12 +33,6 @@ PB_BIND(meshtastic_Config_LoRaConfig, meshtastic_Config_LoRaConfig, 2)
 PB_BIND(meshtastic_Config_BluetoothConfig, meshtastic_Config_BluetoothConfig, AUTO)


-PB_BIND(meshtastic_Config_SecurityConfig, meshtastic_Config_SecurityConfig, AUTO)
-
-
-PB_BIND(meshtastic_Config_SessionkeyConfig, meshtastic_Config_SessionkeyConfig, AUTO)
-
-



--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
github-actions[bot]	98cb3edff1	[create-pull-request] automated change (#4506 ) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2024-08-19 17:21:03 -05:00
Ben Meadors	91d661246a	Milliseconds!	2024-08-19 06:55:58 -05:00