Merge branch 'develop' into t-watch-ultra

update device-ui / touch handling
2026-02-01 14:41:50 +00:00 · 2026-01-28 10:37:01 +01:00 · 2026-01-27 16:14:20 +01:00 · 2026-01-27 16:13:46 +01:00 · 2026-01-27 13:38:09 +01:00 · 2026-01-27 13:36:59 +01:00
272 changed files with 1741 additions and 2331 deletions
--- a/.envrc
+++ b/.envrc
@@ -1 +0,0 @@
-use nix
--- a/.github/workflows/models_issue_triage.yml
+++ b/.github/workflows/models_issue_triage.yml
@@ -1,213 +0,0 @@
-name: Issue Triage (Models)
-
-on:
-  issues:
-    types: [opened]
-
-permissions:
-  issues: write
-  models: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number }}
-  cancel-in-progress: true
-
-jobs:
-  triage:
-    if: ${{ github.repository == 'meshtastic/firmware' && github.event.issue.user.type != 'Bot' }}
-    runs-on: ubuntu-latest
-    steps:
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 1: Quality check (spam/AI-slop detection) - runs first, exits early if spam
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Detect spam or low-quality content
-        uses: actions/ai-inference@v2
-        id: quality
-        continue-on-error: true
-        with:
-          max-tokens: 20
-          prompt: |
-            Is this GitHub issue spam, AI-generated slop, or low quality?
-
-            Title: ${{ github.event.issue.title }}
-            Body: ${{ github.event.issue.body }}
-
-            Respond with exactly one of: spam, ai-generated, needs-review, ok
-          system-prompt: You detect spam and low-quality contributions. Be conservative - only flag obvious spam or AI slop.
-          model: openai/gpt-4o-mini
-
-      - name: Apply quality label if needed
-        if: steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
-        uses: actions/github-script@v8
-        env:
-          QUALITY_LABEL: ${{ steps.quality.outputs.response }}
-        with:
-          script: |
-            const label = (process.env.QUALITY_LABEL || '').trim().toLowerCase();
-            const labelMeta = {
-              'spam': { color: 'd73a4a', description: 'Possible spam' },
-              'ai-generated': { color: 'fbca04', description: 'Possible AI-generated low-quality content' },
-              'needs-review': { color: 'f9d0c4', description: 'Needs human review' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.issue.number, labels: [label] });
-
-            // Set output to skip remaining steps
-            core.setOutput('is_spam', 'true');
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 2: Duplicate detection - only if not spam
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Detect duplicate issues
-        if: steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == ''
-        uses: pelikhan/action-genai-issue-dedup@bdb3b5d9451c1090ffcdf123d7447a5e7c7a2528 # v0.0.19
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 3: Completeness check + auto-labeling (combined into one AI call)
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Determine if completeness check should be skipped
-        if: steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == ''
-        uses: actions/github-script@v8
-        id: check-skip
-        with:
-          script: |
-            const title = (context.payload.issue.title || '').toLowerCase();
-            const labels = (context.payload.issue.labels || []).map(label => label.name);
-            const hasFeatureRequest = title.includes('feature request');
-            const hasEnhancement = labels.includes('enhancement');
-            const shouldSkip = hasFeatureRequest && hasEnhancement;
-            core.setOutput('should_skip', shouldSkip ? 'true' : 'false');
-
-      - name: Analyze issue completeness and determine labels
-        if: (steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == '') && steps.check-skip.outputs.should_skip != 'true'
-        uses: actions/ai-inference@v2
-        id: analysis
-        continue-on-error: true
-        with:
-          prompt: |
-            Analyze this GitHub issue for completeness and determine if it needs labels.
-
-            IMPORTANT: Distinguish between:
-            - Device/firmware bugs (crashes, reboots, lockups, radio/GPS/display/power issues) - these need device logs
-            - Build/release/packaging issues (missing files, CI failures, download problems) - these do NOT need device logs
-            - Documentation or website issues - these do NOT need device logs
-
-            If this is a device/firmware bug, request device logs and explain how to get them:
-
-            Web Flasher logs:
-            - Go to https://flasher.meshtastic.org
-            - Connect the device via USB and click Connect
-            - Open the device console/log output, reproduce the problem, then copy/download and attach/paste the logs
-
-            Meshtastic CLI logs:
-            - Run: meshtastic --port <serial-port> --noproto
-            - Reproduce the problem, then copy/paste the terminal output
-
-            Also request key context if missing: device model/variant, firmware version, region, steps to reproduce, expected vs actual.
-
-            Respond ONLY with valid JSON (no markdown, no code fences):
-            {"complete": true, "comment": "", "label": "none"}
-            OR
-            {"complete": false, "comment": "Your helpful comment", "label": "needs-logs"}
-
-            Use "needs-logs" ONLY if this is a device/firmware bug AND no logs are attached.
-            Use "needs-info" if basic info like firmware version or steps to reproduce are missing.
-            Use "none" if the issue is complete, is a feature request, or is a build/CI/packaging issue.
-
-            Title: ${{ github.event.issue.title }}
-            Body: ${{ github.event.issue.body }}
-          system-prompt: You are a helpful assistant that triages GitHub issues. Be conservative with labels. Only request device logs for actual device/firmware bugs, not for build/release/CI issues.
-          model: openai/gpt-4o-mini
-
-      - name: Process analysis result
-        if: (steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == '') && steps.check-skip.outputs.should_skip != 'true' && steps.analysis.outputs.response != ''
-        uses: actions/github-script@v8
-        id: process
-        env:
-          AI_RESPONSE: ${{ steps.analysis.outputs.response }}
-        with:
-          script: |
-            let raw = (process.env.AI_RESPONSE || '').trim();
-
-            // Strip markdown code fences if present
-            raw = raw.replace(/^```(?:json)?\s*/i, '').replace(/\s*```$/i, '').trim();
-
-            let complete = true;
-            let comment = '';
-            let label = 'none';
-
-            try {
-              const parsed = JSON.parse(raw);
-              complete = !!parsed.complete;
-              comment = (parsed.comment ?? '').toString().trim();
-              label = (parsed.label ?? 'none').toString().trim().toLowerCase();
-            } catch {
-              // If JSON parse fails, log warning and don't comment (avoid posting raw JSON)
-              console.log('Failed to parse AI response as JSON:', raw);
-              complete = true;
-              comment = '';
-              label = 'none';
-            }
-
-            // Validate label
-            const allowedLabels = new Set(['needs-logs', 'needs-info', 'none']);
-            if (!allowedLabels.has(label)) label = 'none';
-
-            // Only comment if we have a valid parsed comment (not raw JSON)
-            const shouldComment = !complete && comment.length > 0 && !comment.startsWith('{');
-            core.setOutput('should_comment', shouldComment ? 'true' : 'false');
-            core.setOutput('comment_body', comment);
-            core.setOutput('label', label);
-
-      - name: Apply triage label
-        if: steps.process.outputs.label != '' && steps.process.outputs.label != 'none'
-        uses: actions/github-script@v8
-        env:
-          LABEL_NAME: ${{ steps.process.outputs.label }}
-        with:
-          script: |
-            const label = process.env.LABEL_NAME;
-            const labelMeta = {
-              'needs-logs': { color: 'cfd3d7', description: 'Device logs requested for triage' },
-              'needs-info': { color: 'f9d0c4', description: 'More information requested for triage' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.issue.number, labels: [label] });
-
-      - name: Comment on issue
-        if: steps.process.outputs.should_comment == 'true'
-        uses: actions/github-script@v8
-        env:
-          COMMENT_BODY: ${{ steps.process.outputs.comment_body }}
-        with:
-          script: |
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.issue.number,
-              body: process.env.COMMENT_BODY
-            });
--- a/.github/workflows/models_pr_triage.yml
+++ b/.github/workflows/models_pr_triage.yml
@@ -1,139 +0,0 @@
-name: PR Triage (Models)
-
-on:
-  pull_request_target:
-    types: [opened]
-
-permissions:
-  pull-requests: write
-  issues: write
-  models: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-jobs:
-  triage:
-    if: ${{ github.repository == 'meshtastic/firmware' && github.event.pull_request.user.type != 'Bot' }}
-    runs-on: ubuntu-latest
-    steps:
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 1: Check if PR already has automation/type labels (skip if so)
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Check existing labels
-        uses: actions/github-script@v8
-        id: check-labels
-        with:
-          script: |
-            const skipLabels = new Set(['automation']);
-            const typeLabels = new Set(['bugfix', 'hardware-support', 'enhancement', 'dependencies', 'submodules', 'github_actions', 'trunk', 'cleanup']);
-            const prLabels = context.payload.pull_request.labels.map(l => l.name);
-
-            const shouldSkipAll = prLabels.some(l => skipLabels.has(l));
-            const hasTypeLabel = prLabels.some(l => typeLabels.has(l));
-
-            core.setOutput('skip_all', shouldSkipAll ? 'true' : 'false');
-            core.setOutput('has_type_label', hasTypeLabel ? 'true' : 'false');
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 2: Quality check (spam/AI-slop detection)
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Detect spam or low-quality content
-        if: steps.check-labels.outputs.skip_all != 'true'
-        uses: actions/ai-inference@v2
-        id: quality
-        continue-on-error: true
-        with:
-          max-tokens: 20
-          prompt: |
-            Is this GitHub pull request spam, AI-generated slop, or low quality?
-
-            Title: ${{ github.event.pull_request.title }}
-            Body: ${{ github.event.pull_request.body }}
-
-            Respond with exactly one of: spam, ai-generated, needs-review, ok
-          system-prompt: You detect spam and low-quality contributions. Be conservative - only flag obvious spam or AI slop.
-          model: openai/gpt-4o-mini
-
-      - name: Apply quality label if needed
-        if: steps.check-labels.outputs.skip_all != 'true' && steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
-        uses: actions/github-script@v8
-        id: quality-label
-        env:
-          QUALITY_LABEL: ${{ steps.quality.outputs.response }}
-        with:
-          script: |
-            const label = (process.env.QUALITY_LABEL || '').trim().toLowerCase();
-            const labelMeta = {
-              'spam': { color: 'd73a4a', description: 'Possible spam' },
-              'ai-generated': { color: 'fbca04', description: 'Possible AI-generated low-quality content' },
-              'needs-review': { color: 'f9d0c4', description: 'Needs human review' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.pull_request.number, labels: [label] });
-
-            core.setOutput('is_spam', 'true');
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 3: Auto-label PR type (bugfix/hardware-support/enhancement)
-      # Only skip for spam/ai-generated; still classify needs-review PRs
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Classify PR for labeling
-        if: steps.check-labels.outputs.skip_all != 'true' && steps.check-labels.outputs.has_type_label != 'true' && steps.quality.outputs.response != 'spam' && steps.quality.outputs.response != 'ai-generated'
-        uses: actions/ai-inference@v2
-        id: classify
-        continue-on-error: true
-        with:
-          max-tokens: 30
-          prompt: |
-            Classify this pull request into exactly one category.
-
-            Return exactly one of: bugfix, hardware-support, enhancement
-
-            Use bugfix if it fixes a bug, crash, or incorrect behavior.
-            Use hardware-support if it adds or improves support for a specific hardware device/variant.
-            Use enhancement if it adds a new feature, improves performance, or refactors code.
-
-            Title: ${{ github.event.pull_request.title }}
-            Body: ${{ github.event.pull_request.body }}
-          system-prompt: You classify pull requests into categories. Be conservative and pick the most appropriate single label.
-          model: openai/gpt-4o-mini
-
-      - name: Apply type label
-        if: steps.check-labels.outputs.skip_all != 'true' && steps.check-labels.outputs.has_type_label != 'true' && steps.classify.outputs.response != ''
-        uses: actions/github-script@v8
-        env:
-          TYPE_LABEL: ${{ steps.classify.outputs.response }}
-        with:
-          script: |
-            const label = (process.env.TYPE_LABEL || '').trim().toLowerCase();
-            const labelMeta = {
-              'bugfix': { color: 'd73a4a', description: 'Bug fix' },
-              'hardware-support': { color: '0e8a16', description: 'Hardware support addition or improvement' },
-              'enhancement': { color: 'a2eeef', description: 'New feature or enhancement' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.pull_request.number, labels: [label] });
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,3 @@ idf_component.yml
 CMakeLists.txt
 /sdkconfig.*
 .dummy/*
-
-# PYTHONPATH used by the Nix shell
-.python3
--- a/boards/t-watch-ultra.json
+++ b/boards/t-watch-ultra.json
@@ -0,0 +1,40 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_qspi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "psram_type": "qio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "t-watch-ultra"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino"],
+  "name": "LilyGo T-Watch Ultra",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "require_upload_port": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.lilygo.cc/en-pl/products/t-watch-ultra",
+  "vendor": "LilyGo"
+}
--- a/flake.lock
+++ b/flake.lock
@@ -1,44 +0,0 @@
-{
-  "nodes": {
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1766314097,
-        "narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/flake.nix
+++ b/flake.nix
@@ -1,66 +0,0 @@
-{
-  description = "Nix flake to compile Meshtastic firmware";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-
-    # Shim to make flake.nix work with stable Nix.
-    flake-compat = {
-      url = "github:NixOS/flake-compat";
-      flake = false;
-    };
-  };
-
-  outputs =
-    inputs:
-    let
-      lib = inputs.nixpkgs.lib;
-
-      forAllSystems =
-        fn:
-        lib.genAttrs lib.systems.flakeExposed (
-          system:
-          fn {
-            pkgs = import inputs.nixpkgs {
-              inherit system;
-            };
-            inherit system;
-          }
-        );
-    in
-    {
-      devShells = forAllSystems (
-        { pkgs, ... }:
-        let
-          python3 = pkgs.python312.withPackages (
-            ps: with ps; [
-              google
-            ]
-          );
-        in
-        {
-          default = pkgs.mkShell {
-            buildInputs = with pkgs; [
-              python3
-              platformio
-            ];
-
-            shellHook = ''
-              # Set up PlatformIO to use a local core directory.
-              export PLATFORMIO_CORE_DIR=$PWD/.platformio
-              # Tell pip to put packages into $PIP_PREFIX instead of the usual
-              # location. This is especially necessary under NixOS to avoid having
-              # pip trying to write to the read-only Nix store. For more info,
-              # see https://wiki.nixos.org/wiki/Python
-              export PIP_PREFIX=$PWD/.python3
-              export PYTHONPATH="$PIP_PREFIX/${python3.sitePackages}"
-              export PATH="$PIP_PREFIX/bin:$PATH"
-              # Avoids reproducibility issues with some Python packages
-              # See https://nixos.org/manual/nixpkgs/stable/#python-setup.py-bdist_wheel-cannot-create-.whl
-              unset SOURCE_DATE_EPOCH
-            '';
-          };
-        }
-      );
-    };
-}
--- a/platformio.ini
+++ b/platformio.ini
@@ -56,7 +56,6 @@ build_flags = -Wno-missing-field-initializers
 	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
 	-DMESHTASTIC_EXCLUDE_POWERMON=1
 	-D MAX_THREADS=40 ; As we've split modules, we have more threads to manage
-	-DLED_BUILTIN=-1
 	#-DBUILD_EPOCH=$UNIX_TIME ; set in platformio-custom.py now
 	#-D OLED_PL=1
 	#-D DEBUG_HEAP=1 ; uncomment to add free heap space / memory leak debugging logs
@@ -120,7 +119,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/63967a4a557d33d56fc5746f9128200dde2d88c5.zip
+	https://github.com/meshtastic/device-ui/archive/69739b84f87a91568d3c421498bc89977937a141.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
--- a/shell.nix
+++ b/shell.nix
@@ -1,12 +0,0 @@
-(import (
-  let
-    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-    nodeName = lock.nodes.root.inputs.flake-compat;
-  in
-  fetchTarball {
-    url =
-      lock.nodes.${nodeName}.locked.url
-        or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
-    sha256 = lock.nodes.${nodeName}.locked.narHash;
-  }
-) { src = ./.; }).shellNix
--- a/src/BluetoothStatus.h
+++ b/src/BluetoothStatus.h
@@ -89,14 +89,22 @@ class BluetoothStatus : public Status
            case ConnectionState::CONNECTED:
                LOG_DEBUG("BluetoothStatus CONNECTED");
 #ifdef BLE_LED
-                digitalWrite(BLE_LED, LED_STATE_ON);
+#ifdef BLE_LED_INVERTED
+                digitalWrite(BLE_LED, LOW);
+#else
+                digitalWrite(BLE_LED, HIGH);
+#endif
 #endif
                break;

            case ConnectionState::DISCONNECTED:
                LOG_DEBUG("BluetoothStatus DISCONNECTED");
 #ifdef BLE_LED
-                digitalWrite(BLE_LED, LED_STATE_OFF);
+#ifdef BLE_LED_INVERTED
+                digitalWrite(BLE_LED, HIGH);
+#else
+                digitalWrite(BLE_LED, LOW);
+#endif
 #endif
                break;
            }
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -816,9 +816,6 @@ void Power::shutdown()
 #endif
 #ifdef PIN_LED3
    ledOff(PIN_LED3);
-#endif
-#ifdef LED_NOTIFICATION
-    ledOff(LED_NOTIFICATION);
 #endif
    doDeepSleep(DELAY_FOREVER, true, true);
 #elif defined(ARCH_PORTDUINO)
@@ -1196,6 +1193,48 @@ bool Power::axpChipInit()
            PMU->disablePowerOutput(XPOWERS_DLDO1); // Invalid power channel, it does not exist
            PMU->disablePowerOutput(XPOWERS_DLDO2); // Invalid power channel, it does not exist
            PMU->disablePowerOutput(XPOWERS_VBACKUP);
+        } else if (HW_VENDOR == meshtastic_HardwareModel_T_WATCH_ULTRA) {
+            PMU->clearIrqStatus();
+
+            // Turn off the PMU charging indicator light, no physical connection
+            PMU->setChargingLedMode(XPOWERS_CHG_LED_OFF); // NO LED
+
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO1, 3300); // SD Card
+            PMU->enablePowerOutput(XPOWERS_ALDO1);
+
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO2, 3300); // Display
+            PMU->enablePowerOutput(XPOWERS_ALDO2);
+
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO3, 3300); // LoRa
+            PMU->enablePowerOutput(XPOWERS_ALDO3);
+
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO4, 1800); // Sensor
+            PMU->enablePowerOutput(XPOWERS_ALDO4);
+
+            PMU->setPowerChannelVoltage(XPOWERS_BLDO1, 3300); // GPS
+            PMU->enablePowerOutput(XPOWERS_BLDO1);
+
+            PMU->setPowerChannelVoltage(XPOWERS_BLDO2, 3300); // Speaker
+            PMU->enablePowerOutput(XPOWERS_BLDO2);
+
+            PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300); // RTC Button battery
+            PMU->enablePowerOutput(XPOWERS_VBACKUP);
+
+            // PMU->enablePowerOutput(XPOWERS_DLDO1); // NFC
+
+            // UNUSED POWER CHANNEL
+            PMU->disablePowerOutput(XPOWERS_DCDC2);
+            PMU->disablePowerOutput(XPOWERS_DCDC3);
+            PMU->disablePowerOutput(XPOWERS_DCDC4);
+            PMU->disablePowerOutput(XPOWERS_DCDC5);
+            PMU->disablePowerOutput(XPOWERS_CPULDO);
+
+            // Enable Measure
+            PMU->enableBattDetection();
+            PMU->enableVbusVoltageMeasure();
+            PMU->enableBattVoltageMeasure();
+            PMU->enableSystemVoltageMeasure();
+            PMU->enableTemperatureMeasure();
        }

        // disable all axp chip interrupt
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -390,6 +390,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef HAS_RADIO
 #define HAS_RADIO 0
 #endif
+#ifndef HAS_RTC
+#define HAS_RTC 0
+#endif
 #ifndef HAS_CPU_SHUTDOWN
 #define HAS_CPU_SHUTDOWN 0
 #endif
@@ -425,16 +428,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define HAS_RGB_LED
 #endif

+#ifndef LED_STATE_OFF
+#define LED_STATE_OFF 0
+#endif
 #ifndef LED_STATE_ON
 #define LED_STATE_ON 1
 #endif
-#ifndef LED_STATE_OFF
-#define LED_STATE_OFF (LED_STATE_ON ^ 1)
-#endif
-
-#ifndef ledOff
-#define ledOff(pin) pinMode(pin, INPUT)
-#endif

 // default mapping of pins
 #if defined(PIN_BUTTON2) && !defined(CANCEL_BUTTON_PIN)
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -939,8 +939,8 @@ void GPS::setPowerPMU(bool on)
        } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE) {
            // t-beam-s3-core GNSS power channel
            on ? PMU->enablePowerOutput(XPOWERS_ALDO4) : PMU->disablePowerOutput(XPOWERS_ALDO4);
-        } else if (HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3) {
-            // t-watch-s3-plus GNSS power channel
+        } else if (HW_VENDOR == meshtastic_HardwareModel_T_WATCH_ULTRA || HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3) {
+            // t-watch-ultra / t-watch-s3-plus GNSS power channel
            on ? PMU->enablePowerOutput(XPOWERS_BLDO1) : PMU->disablePowerOutput(XPOWERS_BLDO1);
        }
    } else if (model == XPOWERS_AXP192) {
--- a/src/gps/RTC.cpp
+++ b/src/gps/RTC.cpp
@@ -276,7 +276,11 @@ RTCSetResult perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpd
        settimeofday(tv, NULL);
 #endif

+        // nrf52 doesn't have a readable RTC (yet - software not written)
+#if HAS_RTC
        readFromRTC();
+#endif
+
        return RTCSetResultSuccess;
    } else {
        return RTCSetResultNotSet; // RTC was already set with a higher quality time
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -361,7 +361,8 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
        LOG_INFO("SSD1306 init success");
    }
 #elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7789_CS) ||    \
-    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(HACKADAY_COMMUNICATOR)
+    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(CO5300_CS) ||                \
+    defined(HACKADAY_COMMUNICATOR)
    dispdev = new TFTDisplay(address.address, -1, -1, geometry,
                             (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
 #elif defined(USE_EINK) && !defined(USE_EINK_DYNAMICDISPLAY)
@@ -429,7 +430,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
        if (on) {
            LOG_INFO("Turn on screen");
            powerMon->setState(meshtastic_PowerMon_State_Screen_On);
-#ifdef T_WATCH_S3
+#if defined(T_WATCH_S3) || defined(T_WATCH_ULTRA)
            PMU->enablePowerOutput(XPOWERS_ALDO2);
 #endif

@@ -535,7 +536,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
 #endif
 #endif

-#ifdef T_WATCH_S3
+#if defined(T_WATCH_S3) || defined(T_WATCH_ULTRA)
            PMU->disablePowerOutput(XPOWERS_ALDO2);
 #endif
            enabled = false;
@@ -642,7 +643,8 @@ void Screen::setup()
 #else
    if (!config.display.flip_screen) {
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7789_CS) ||      \
-    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(HACKADAY_COMMUNICATOR)
+    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(CO5300_CS) ||                \
+    defined(HACKADAY_COMMUNICATOR)
        static_cast<TFTDisplay *>(dispdev)->flipScreenVertically();
 #elif defined(USE_ST7789)
        static_cast<ST7789Spi *>(dispdev)->flipScreenVertically();
--- a/src/graphics/ScreenFonts.h
+++ b/src/graphics/ScreenFonts.h
@@ -90,7 +90,7 @@

 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) ||             \
-     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                                                   \
+     defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                             \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL FONT_MEDIUM_LOCAL // Height: 19
--- a/src/graphics/TFTDisplay.cpp
+++ b/src/graphics/TFTDisplay.cpp
@@ -22,6 +22,109 @@ uint16_t TFT_MESH = TFT_MESH_OVERRIDE;
 uint16_t TFT_MESH = COLOR565(0x67, 0xEA, 0x94);
 #endif

+#if defined(CO5300_CS)
+#include <LovyanGFX.hpp> // Graphics and font library for AMOLED driver chip
+class LGFX : public lgfx::LGFX_Device
+{
+    lgfx::Panel_CO5300 _panel_instance;
+    lgfx::Bus_SPI _bus_instance;
+
+  public:
+    LGFX(void)
+    {
+        {
+            auto cfg = _bus_instance.config();
+
+            // configure SPI
+            cfg.spi_host = CO5300_SPI_HOST; // ESP32-S2,S3,C3 : SPI2_HOST or SPI3_HOST / ESP32 : VSPI_HOST or HSPI_HOST
+            cfg.spi_mode = SPI_MODE0;
+            cfg.freq_write = SPI_FREQUENCY; // SPI clock for transmission (up to 80MHz, rounded to the value obtained by dividing
+                                            // 80MHz by an integer)
+            cfg.freq_read = SPI_READ_FREQUENCY; // SPI clock when receiving
+            cfg.spi_3wire = false;              // Set to true if reception is done on the MOSI pin
+            cfg.use_lock = true;                // Set to true to use transaction locking
+            cfg.dma_channel = SPI_DMA_CH_AUTO;  // SPI_DMA_CH_AUTO; // Set DMA channel to use (0=not use DMA / 1=1ch / 2=ch /
+                                                // SPI_DMA_CH_AUTO=auto setting)
+            cfg.pin_sclk = CO5300_SCK;          // Set SPI SCLK pin number
+            cfg.pin_io0 = CO5300_IO0;
+            cfg.pin_io1 = CO5300_IO1;
+            cfg.pin_io2 = CO5300_IO2;
+            cfg.pin_io3 = CO5300_IO3;
+
+            _bus_instance.config(cfg);              // applies the set value to the bus.
+            _panel_instance.setBus(&_bus_instance); // set the bus on the panel.
+        }
+
+        {                                        // Set the display panel control.
+            auto cfg = _panel_instance.config(); // Gets a structure for display panel settings.
+
+            cfg.pin_cs = CO5300_CS;                    // Pin number where CS is connected (-1 = disable)
+            cfg.pin_rst = CO5300_RESET;                // Pin number where RST is connected  (-1 = disable)
+            cfg.panel_width = TFT_WIDTH;               // actual displayable width
+            cfg.panel_height = TFT_HEIGHT;             // actual displayable height
+            cfg.offset_rotation = TFT_OFFSET_ROTATION; // Rotation direction value offset 0~7 (4~7 is upside down)
+            cfg.offset_x = TFT_OFFSET_X;
+            cfg.offset_y = TFT_OFFSET_Y;
+            cfg.dummy_read_pixel = 8; // Number of bits for dummy read before pixel readout
+            cfg.dummy_read_bits = 1;  // Number of bits for dummy read before non-pixel data read
+            cfg.readable = true;      // Set to true if data can be read
+            cfg.invert = false;       // Set to true if the light/darkness of the panel is reversed
+            cfg.rgb_order = false;    // Set to true if the panel's red and blue are swapped
+            cfg.dlen_16bit = false;   // Set to true for panels that transmit data length in 16-bit units
+            cfg.bus_shared = true;    // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.)
+
+            // Set the following only when the display is shifted with a driver with a variable number of pixels
+            cfg.memory_width = TFT_WIDTH;   // Maximum width supported by the driver IC
+            cfg.memory_height = TFT_HEIGHT; // Maximum height supported by the driver IC
+            _panel_instance.config(cfg);
+        }
+
+        setPanel(&_panel_instance);
+    }
+
+    bool enableFrameBuffer(bool auto_display = false)
+    {
+        if (_panel_instance.initPanelFb()) {
+            auto fbPanel = _panel_instance.getPanelFb();
+            if (fbPanel) {
+                fbPanel->setBus(&_bus_instance);
+                fbPanel->setAutoDisplay(auto_display);
+                setPanel(fbPanel);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    void disableFrameBuffer()
+    {
+        auto fbPanel = _panel_instance.getPanelFb();
+        if (fbPanel) {
+            _panel_instance.deinitPanelFb();
+            setPanel(&_panel_instance);
+        }
+    }
+
+    bool init()
+    {
+#ifdef CO5300_RESET
+        LOG_DEBUG("LGFX_Panel_CO5300::init()");
+        lgfx::pinMode(CO5300_RESET, lgfx::pin_mode_t::output);
+        lgfx::gpio_hi(CO5300_RESET);
+        delay(200);
+        lgfx::gpio_lo(CO5300_RESET);
+        delay(300);
+        lgfx::gpio_hi(CO5300_RESET);
+        delay(200);
+#endif
+        return lgfx::LGFX_Device::init() && enableFrameBuffer(false);
+    }
+};
+
+static LGFX *tft = nullptr;
+
+#endif
+
 #if defined(ST7735S)
 #include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip

@@ -1340,7 +1443,7 @@ void TFTDisplay::sendCommand(uint8_t com)
    // handle display on/off directly
    switch (com) {
    case DISPLAYON: {
-        // LOG_DEBUG("Display on");
+        LOG_DEBUG("Display on");
        backlightEnable->set(true);
 #if ARCH_PORTDUINO
        display(true);
@@ -1360,14 +1463,13 @@ void TFTDisplay::sendCommand(uint8_t com)
        unphone.backlight(true); // using unPhone library
 #endif
 #ifdef RAK14014
-#elif !defined(M5STACK) && !defined(ST7789_CS) &&                                                                                \
-    !defined(HACKADAY_COMMUNICATOR) // T-Deck gets brightness set in Screen.cpp in the handleSetOn function
+#elif !defined(M5STACK) && !defined(ST7789_CS) && !defined(HACKADAY_COMMUNICATOR)
        tft->setBrightness(172);
 #endif
        break;
    }
    case DISPLAYOFF: {
-        // LOG_DEBUG("Display off");
+        LOG_DEBUG("Display off");
        backlightEnable->set(false);
 #if ARCH_PORTDUINO
        tft->clear();
@@ -1469,8 +1571,8 @@ bool TFTDisplay::connect()
    tft = new LGFX;
 #endif

-    backlightEnable->set(true);
    LOG_INFO("Power to TFT Backlight");
+    backlightEnable->set(true);

 #ifdef UNPHONE
    unphone.backlight(true); // using unPhone library
@@ -1498,7 +1600,7 @@ bool TFTDisplay::connect()
    tft->setRotation(1); // T-Deck has the TFT in landscape
 #elif defined(T_WATCH_S3)
    tft->setRotation(2); // T-Watch S3 left-handed orientation
-#elif ARCH_PORTDUINO || defined(SENSECAP_INDICATOR) || defined(T_LORA_PAGER)
+#elif ARCH_PORTDUINO || defined(SENSECAP_INDICATOR) || defined(T_LORA_PAGER) || defined(T_WATCH_ULTRA)
    tft->setRotation(0); // use config.yaml to set rotation
 #else
    tft->setRotation(3); // Orient horizontal and wide underneath the silkscreen name label
--- a/src/graphics/draw/DebugRenderer.cpp
+++ b/src/graphics/draw/DebugRenderer.cpp
@@ -97,7 +97,7 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
                                          (storeForwardModule->heartbeatInterval * 1200))) { // no heartbeat, overlap a bit
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796) || ARCH_PORTDUINO) &&                                                 \
+     defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796) || ARCH_PORTDUINO) &&                           \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 12,
                                   8, imgQuestionL1);
@@ -110,7 +110,7 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
        } else {
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                                                   \
+     defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                             \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 16,
                                   8, imgSFL1);
@@ -126,7 +126,7 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
        // TODO: Raspberry Pi supports more than just the one screen size
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796) || ARCH_PORTDUINO) &&                                                 \
+     defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796) || ARCH_PORTDUINO) &&                           \
    !defined(DISPLAY_FORCE_SMALL_FONTS)
        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                               imgInfoL1);
--- a/src/graphics/draw/UIRenderer.cpp
+++ b/src/graphics/draw/UIRenderer.cpp
@@ -265,7 +265,7 @@ void UIRenderer::drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const mes

 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                                                   \
+     defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                             \
    !defined(DISPLAY_FORCE_SMALL_FONTS)

    if (currentResolution == ScreenResolution::High) {
--- a/src/graphics/images.h
+++ b/src/graphics/images.h
@@ -28,7 +28,7 @@ const uint8_t bluetoothConnectedIcon[36] PROGMEM = {0xfe, 0x01, 0xff, 0x03, 0x03

 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) ||             \
-     defined(USE_ST7796) || defined(HACKADAY_COMMUNICATOR) || ARCH_PORTDUINO) &&                                                 \
+     defined(USE_ST7796) || defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR) || 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/graphics/niche/InkHUD/Applet.cpp
+++ b/src/graphics/niche/InkHUD/Applet.cpp
@@ -55,7 +55,7 @@ InkHUD::Tile *InkHUD::Applet::getTile()
 }

 // Draw the applet
-void InkHUD::Applet::render(bool full)
+void InkHUD::Applet::render()
 {
    assert(assignedTile);                              // Ensure that we have a tile
    assert(assignedTile->getAssignedApplet() == this); // Ensure that we have a reciprocal link with the tile
@@ -65,11 +65,10 @@ void InkHUD::Applet::render(bool full)
    wantRender = false;                                       // Flag set by requestUpdate
    wantAutoshow = false;                                     // Flag set by requestAutoShow. May or may not have been honored.
    wantUpdateType = Drivers::EInk::UpdateTypes::UNSPECIFIED; // Update type we wanted. May on may not have been granted.
-    wantFullRender = true;                                    // Default to a full render

    updateDimensions();
    resetDrawingSpace();
-    onRender(full); // Draw the applet
+    onRender(); // Derived applet's drawing takes place here

    // Handle "Tile Highlighting"
    // Some devices may use an auxiliary button to switch between tiles
@@ -116,11 +115,6 @@ Drivers::EInk::UpdateTypes InkHUD::Applet::wantsUpdateType()
    return wantUpdateType;
 }

-bool InkHUD::Applet::wantsFullRender()
-{
-    return wantFullRender;
-}
-
 // Get size of the applet's drawing space from its tile
 // Performed immediately before derived applet's drawing code runs
 void InkHUD::Applet::updateDimensions()
@@ -148,11 +142,10 @@ void InkHUD::Applet::resetDrawingSpace()
 // Once the renderer has given other applets a chance to process whatever event we just detected,
 // it will run Applet::render(), which may draw our applet to screen, if it is shown (foreground)
 // We should requestUpdate even if our applet is currently background, because this might be changed by autoshow
-void InkHUD::Applet::requestUpdate(Drivers::EInk::UpdateTypes type, bool full)
+void InkHUD::Applet::requestUpdate(Drivers::EInk::UpdateTypes type)
 {
    wantRender = true;
    wantUpdateType = type;
-    wantFullRender = full;
    inkhud->requestUpdate();
 }

--- a/src/graphics/niche/InkHUD/Applet.h
+++ b/src/graphics/niche/InkHUD/Applet.h
@@ -64,11 +64,10 @@ class Applet : public GFX

    // Rendering

-    void render(bool full);                       // Draw the applet
+    void render();                                // Draw the applet
    bool wantsToRender();                         // Check whether applet wants to render
    bool wantsToAutoshow();                       // Check whether applet wants to become foreground
    Drivers::EInk::UpdateTypes wantsUpdateType(); // Check which display update type the applet would prefer
-    bool wantsFullRender();                       // Check whether applet wants to render over its previous render
    void updateDimensions();                      // Get current size from tile
    void resetDrawingSpace();                     // Makes sure every render starts with same parameters

@@ -83,7 +82,7 @@ class Applet : public GFX

    // Event handlers

-    virtual void onRender(bool full) = 0; // For drawing the applet
+    virtual void onRender() = 0; // All drawing happens here
    virtual void onActivate() {}
    virtual void onDeactivate() {}
    virtual void onForeground() {}
@@ -97,9 +96,6 @@ class Applet : public GFX
    virtual void onNavDown() {}
    virtual void onNavLeft() {}
    virtual void onNavRight() {}
-    virtual void onFreeText(char c) {}
-    virtual void onFreeTextDone() {}
-    virtual void onFreeTextCancel() {}

    virtual bool approveNotification(Notification &n); // Allow an applet to veto a notification

@@ -112,9 +108,8 @@ class Applet : public GFX
  protected:
    void drawPixel(int16_t x, int16_t y, uint16_t color) override; // Place a single pixel. All drawing output passes through here

-    void requestUpdate(EInk::UpdateTypes type = EInk::UpdateTypes::UNSPECIFIED,
-                       bool full = true); // Ask WindowManager to schedule a display update
-    void requestAutoshow();               // Ask for applet to be moved to foreground
+    void requestUpdate(EInk::UpdateTypes type = EInk::UpdateTypes::UNSPECIFIED); // Ask WindowManager to schedule a display update
+    void requestAutoshow();                                                      // Ask for applet to be moved to foreground

    uint16_t X(float f);                                                      // Map applet width, mapped from 0 to 1.0
    uint16_t Y(float f);                                                      // Map applet height, mapped from 0 to 1.0
@@ -169,7 +164,6 @@ class Applet : public GFX
    bool wantAutoshow = false; // Does the applet have new data it would like to display in foreground?
    NicheGraphics::Drivers::EInk::UpdateTypes wantUpdateType =
        NicheGraphics::Drivers::EInk::UpdateTypes::UNSPECIFIED; // Which update method we'd prefer when redrawing the display
-    bool wantFullRender = true;                                 // Render with a fresh canvas

    using GFX::setFont;     // Make sure derived classes use AppletFont instead of AdafruitGFX fonts directly
    using GFX::setRotation; // Block setRotation calls. Rotation is handled globally by WindowManager.
--- a/src/graphics/niche/InkHUD/Applets/Bases/Map/MapApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/Bases/Map/MapApplet.cpp
@@ -4,7 +4,7 @@

 using namespace NicheGraphics;

-void InkHUD::MapApplet::onRender(bool full)
+void InkHUD::MapApplet::onRender()
 {
    // Abort if no markers to render
    if (!enoughMarkers()) {
--- a/src/graphics/niche/InkHUD/Applets/Bases/Map/MapApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/Bases/Map/MapApplet.h
@@ -27,7 +27,7 @@ namespace NicheGraphics::InkHUD
 class MapApplet : public Applet
 {
  public:
-    void onRender(bool full) override;
+    void onRender() override;

  protected:
    virtual bool shouldDrawNode(meshtastic_NodeInfoLite *node) { return true; } // Allow derived applets to filter the nodes
--- a/src/graphics/niche/InkHUD/Applets/Bases/NodeList/NodeListApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/Bases/NodeList/NodeListApplet.cpp
@@ -103,7 +103,7 @@ uint8_t InkHUD::NodeListApplet::maxCards()
 }

 // Draw, using info which derived applet placed into NodeListApplet::cards for us
-void InkHUD::NodeListApplet::onRender(bool full)
+void InkHUD::NodeListApplet::onRender()
 {

    // ================================
--- a/src/graphics/niche/InkHUD/Applets/Bases/NodeList/NodeListApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/Bases/NodeList/NodeListApplet.h
@@ -46,7 +46,7 @@ class NodeListApplet : public Applet, public MeshModule
  public:
    NodeListApplet(const char *name);

-    void onRender(bool full) override;
+    void onRender() override;

    bool wantPacket(const meshtastic_MeshPacket *p) override;
    ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
--- a/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp
@@ -6,7 +6,7 @@ using namespace NicheGraphics;

 // All drawing happens here
 // Our basic example doesn't do anything useful. It just passively prints some text.
-void InkHUD::BasicExampleApplet::onRender(bool full)
+void InkHUD::BasicExampleApplet::onRender()
 {
    printAt(0, 0, "Hello, World!");

--- a/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.h
@@ -28,7 +28,7 @@ class BasicExampleApplet : public Applet
    // You must have an onRender() method
    // All drawing happens here

-    void onRender(bool full) override;
+    void onRender() override;
 };

 } // namespace NicheGraphics::InkHUD
--- a/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.cpp
@@ -35,7 +35,7 @@ ProcessMessage InkHUD::NewMsgExampleApplet::handleReceived(const meshtastic_Mesh
 // We can trigger a render by calling requestUpdate()
 // Render might be called by some external source
 // We should always be ready to draw
-void InkHUD::NewMsgExampleApplet::onRender(bool full)
+void InkHUD::NewMsgExampleApplet::onRender()
 {
    printAt(0, 0, "Example: NewMsg", LEFT, TOP); // Print top-left corner of text at (0,0)

--- a/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h
@@ -34,7 +34,7 @@ class NewMsgExampleApplet : public Applet, public SinglePortModule
    NewMsgExampleApplet() : SinglePortModule("NewMsgExampleApplet", meshtastic_PortNum_TEXT_MESSAGE_APP) {}

    // All drawing happens here
-    void onRender(bool full) override;
+    void onRender() override;

    // Your applet might also want to use some of these
    // Useful for setting up or tidying up
--- a/src/graphics/niche/InkHUD/Applets/System/AlignStick/AlignStickApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/AlignStick/AlignStickApplet.cpp
@@ -10,7 +10,7 @@ InkHUD::AlignStickApplet::AlignStickApplet()
        bringToForeground();
 }

-void InkHUD::AlignStickApplet::onRender(bool full)
+void InkHUD::AlignStickApplet::onRender()
 {
    setFont(fontMedium);
    printAt(0, 0, "Align Joystick:");
@@ -152,17 +152,19 @@ void InkHUD::AlignStickApplet::onBackground()

    // Need to force an update, as a polite request wouldn't be honored, seeing how we are now in the background
    // Usually, onBackground is followed by another applet's onForeground (which requests update), but not in this case
-    inkhud->forceUpdate(EInk::UpdateTypes::FULL, true);
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::AlignStickApplet::onButtonLongPress()
 {
    sendToBackground();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::AlignStickApplet::onExitLong()
 {
    sendToBackground();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::AlignStickApplet::onNavUp()
@@ -170,6 +172,7 @@ void InkHUD::AlignStickApplet::onNavUp()
    settings->joystick.aligned = true;

    sendToBackground();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::AlignStickApplet::onNavDown()
@@ -178,6 +181,7 @@ void InkHUD::AlignStickApplet::onNavDown()
    settings->joystick.aligned = true;

    sendToBackground();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::AlignStickApplet::onNavLeft()
@@ -186,6 +190,7 @@ void InkHUD::AlignStickApplet::onNavLeft()
    settings->joystick.aligned = true;

    sendToBackground();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::AlignStickApplet::onNavRight()
@@ -194,6 +199,7 @@ void InkHUD::AlignStickApplet::onNavRight()
    settings->joystick.aligned = true;

    sendToBackground();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 #endif
--- a/src/graphics/niche/InkHUD/Applets/System/AlignStick/AlignStickApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/AlignStick/AlignStickApplet.h
@@ -23,7 +23,7 @@ class AlignStickApplet : public SystemApplet
  public:
    AlignStickApplet();

-    void onRender(bool full) override;
+    void onRender() override;
    void onForeground() override;
    void onBackground() override;
    void onButtonLongPress() override;
--- a/src/graphics/niche/InkHUD/Applets/System/BatteryIcon/BatteryIconApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/BatteryIcon/BatteryIconApplet.cpp
@@ -6,8 +6,6 @@ using namespace NicheGraphics;

 InkHUD::BatteryIconApplet::BatteryIconApplet()
 {
-    alwaysRender = true; // render everytime the screen is updated
-
    // Show at boot, if user has previously enabled the feature
    if (settings->optionalFeatures.batteryIcon)
        bringToForeground();
@@ -46,7 +44,7 @@ int InkHUD::BatteryIconApplet::onPowerStatusUpdate(const meshtastic::Status *sta
    return 0; // Tell Observable to continue informing other observers
 }

-void InkHUD::BatteryIconApplet::onRender(bool full)
+void InkHUD::BatteryIconApplet::onRender()
 {
    // Fill entire tile
    // - size of icon controlled by size of tile
--- a/src/graphics/niche/InkHUD/Applets/System/BatteryIcon/BatteryIconApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/BatteryIcon/BatteryIconApplet.h
@@ -23,7 +23,7 @@ class BatteryIconApplet : public SystemApplet
  public:
    BatteryIconApplet();

-    void onRender(bool full) override;
+    void onRender() override;
    int onPowerStatusUpdate(const meshtastic::Status *status); // Called when new info about battery is available

  private:
--- a/src/graphics/niche/InkHUD/Applets/System/Keyboard/KeyboardApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Keyboard/KeyboardApplet.cpp
@@ -1,257 +0,0 @@
-#ifdef MESHTASTIC_INCLUDE_INKHUD
-#include "./KeyboardApplet.h"
-
-using namespace NicheGraphics;
-
-InkHUD::KeyboardApplet::KeyboardApplet()
-{
-    // Calculate row widths
-    for (uint8_t row = 0; row < KBD_ROWS; row++) {
-        rowWidths[row] = 0;
-        for (uint8_t col = 0; col < KBD_COLS; col++)
-            rowWidths[row] += keyWidths[row * KBD_COLS + col];
-    }
-}
-
-void InkHUD::KeyboardApplet::onRender(bool full)
-{
-    uint16_t em = fontSmall.lineHeight(); // 16 pt
-    uint16_t keyH = Y(1.0) / KBD_ROWS;
-    int16_t keyTopPadding = (keyH - fontSmall.lineHeight()) / 2;
-
-    if (full) { // Draw full keyboard
-        for (uint8_t row = 0; row < KBD_ROWS; row++) {
-
-            // Calculate the remaining space to be used as padding
-            int16_t keyXPadding = X(1.0) - ((rowWidths[row] * em) >> 4);
-
-            // Draw keys
-            uint16_t xPos = 0;
-            for (uint8_t col = 0; col < KBD_COLS; col++) {
-                Color fgcolor = BLACK;
-                uint8_t index = row * KBD_COLS + col;
-                uint16_t keyX = ((xPos * em) >> 4) + ((col * keyXPadding) / (KBD_COLS - 1));
-                uint16_t keyY = row * keyH;
-                uint16_t keyW = (keyWidths[index] * em) >> 4;
-                if (index == selectedKey) {
-                    fgcolor = WHITE;
-                    fillRect(keyX, keyY, keyW, keyH, BLACK);
-                }
-                drawKeyLabel(keyX, keyY + keyTopPadding, keyW, keys[index], fgcolor);
-                xPos += keyWidths[index];
-            }
-        }
-    } else { // Only draw the difference
-        if (selectedKey != prevSelectedKey) {
-            // Draw previously selected key
-            uint8_t row = prevSelectedKey / KBD_COLS;
-            int16_t keyXPadding = X(1.0) - ((rowWidths[row] * em) >> 4);
-            uint16_t xPos = 0;
-            for (uint8_t i = prevSelectedKey - (prevSelectedKey % KBD_COLS); i < prevSelectedKey; i++)
-                xPos += keyWidths[i];
-            uint16_t keyX = ((xPos * em) >> 4) + (((prevSelectedKey % KBD_COLS) * keyXPadding) / (KBD_COLS - 1));
-            uint16_t keyY = row * keyH;
-            uint16_t keyW = (keyWidths[prevSelectedKey] * em) >> 4;
-            fillRect(keyX, keyY, keyW, keyH, WHITE);
-            drawKeyLabel(keyX, keyY + keyTopPadding, keyW, keys[prevSelectedKey], BLACK);
-
-            // Draw newly selected key
-            row = selectedKey / KBD_COLS;
-            keyXPadding = X(1.0) - ((rowWidths[row] * em) >> 4);
-            xPos = 0;
-            for (uint8_t i = selectedKey - (selectedKey % KBD_COLS); i < selectedKey; i++)
-                xPos += keyWidths[i];
-            keyX = ((xPos * em) >> 4) + (((selectedKey % KBD_COLS) * keyXPadding) / (KBD_COLS - 1));
-            keyY = row * keyH;
-            keyW = (keyWidths[selectedKey] * em) >> 4;
-            fillRect(keyX, keyY, keyW, keyH, BLACK);
-            drawKeyLabel(keyX, keyY + keyTopPadding, keyW, keys[selectedKey], WHITE);
-        }
-    }
-
-    prevSelectedKey = selectedKey;
-}
-
-// Draw the key label corresponding to the char
-// for most keys it draws the character itself
-// for ['\b', '\n', ' ', '\x1b'] it draws special glyphs
-void InkHUD::KeyboardApplet::drawKeyLabel(uint16_t left, uint16_t top, uint16_t width, char key, Color color)
-{
-    if (key == '\b') {
-        // Draw backspace glyph: 13 x 9 px
-        /**
-         *         [][][][][][][][][]
-         *       [][]              []
-         *     [][]    []      []  []
-         *   [][]        []  []    []
-         * [][]            []      []
-         *   [][]        []  []    []
-         *     [][]    []      []  []
-         *       [][]              []
-         *         [][][][][][][][][]
-         */
-        const uint8_t bsBitmap[] = {0x0f, 0xf8, 0x18, 0x08, 0x32, 0x28, 0x61, 0x48, 0xc0,
-                                    0x88, 0x61, 0x48, 0x32, 0x28, 0x18, 0x08, 0x0f, 0xf8};
-        uint16_t leftPadding = (width - 13) >> 1;
-        drawBitmap(left + leftPadding, top + 1, bsBitmap, 13, 9, color);
-    } else if (key == '\n') {
-        // Draw done glyph: 12 x 9 px
-        /**
-         *                     [][]
-         *                   [][]
-         *                 [][]
-         *               [][]
-         *             [][]
-         * [][]      [][]
-         *   [][]  [][]
-         *     [][][]
-         *       []
-         */
-        const uint8_t doneBitmap[] = {0x00, 0x30, 0x00, 0x60, 0x00, 0xc0, 0x01, 0x80, 0x03,
-                                      0x00, 0xc6, 0x00, 0x6c, 0x00, 0x38, 0x00, 0x10, 0x00};
-        uint16_t leftPadding = (width - 12) >> 1;
-        drawBitmap(left + leftPadding, top + 1, doneBitmap, 12, 9, color);
-    } else if (key == ' ') {
-        // Draw space glyph: 13 x 9 px
-        /**
-         *
-         *
-         *
-         *
-         * []                      []
-         * []                      []
-         * [][][][][][][][][][][][][]
-         *
-         *
-         */
-        const uint8_t spaceBitmap[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-                                       0x08, 0x80, 0x08, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00};
-        uint16_t leftPadding = (width - 13) >> 1;
-        drawBitmap(left + leftPadding, top + 1, spaceBitmap, 13, 9, color);
-    } else if (key == '\x1b') {
-        setTextColor(color);
-        std::string keyText = "ESC";
-        uint16_t leftPadding = (width - getTextWidth(keyText)) >> 1;
-        printAt(left + leftPadding, top, keyText);
-    } else {
-        setTextColor(color);
-        if (key >= 0x61)
-            key -= 32; // capitalize
-        std::string keyText = std::string(1, key);
-        uint16_t leftPadding = (width - getTextWidth(keyText)) >> 1;
-        printAt(left + leftPadding, top, keyText);
-    }
-}
-
-void InkHUD::KeyboardApplet::onForeground()
-{
-    handleInput = true; // Intercept the button input for our applet
-
-    // Select the first key
-    selectedKey = 0;
-    prevSelectedKey = 0;
-}
-
-void InkHUD::KeyboardApplet::onBackground()
-{
-    handleInput = false;
-}
-
-void InkHUD::KeyboardApplet::onButtonShortPress()
-{
-    char key = keys[selectedKey];
-    if (key == '\n') {
-        inkhud->freeTextDone();
-        inkhud->closeKeyboard();
-    } else if (key == '\x1b') {
-        inkhud->freeTextCancel();
-        inkhud->closeKeyboard();
-    } else {
-        inkhud->freeText(key);
-    }
-}
-
-void InkHUD::KeyboardApplet::onButtonLongPress()
-{
-    char key = keys[selectedKey];
-    if (key == '\n') {
-        inkhud->freeTextDone();
-        inkhud->closeKeyboard();
-    } else if (key == '\x1b') {
-        inkhud->freeTextCancel();
-        inkhud->closeKeyboard();
-    } else {
-        if (key >= 0x61)
-            key -= 32; // capitalize
-        inkhud->freeText(key);
-    }
-}
-
-void InkHUD::KeyboardApplet::onExitShort()
-{
-    inkhud->freeTextCancel();
-    inkhud->closeKeyboard();
-}
-
-void InkHUD::KeyboardApplet::onExitLong()
-{
-    inkhud->freeTextCancel();
-    inkhud->closeKeyboard();
-}
-
-void InkHUD::KeyboardApplet::onNavUp()
-{
-    if (selectedKey < KBD_COLS) // wrap
-        selectedKey += KBD_COLS * (KBD_ROWS - 1);
-    else // move 1 row back
-        selectedKey -= KBD_COLS;
-
-    // Request rendering over the previously drawn render
-    requestUpdate(EInk::UpdateTypes::FAST, false);
-    // Force an update to bypass lockRequests
-    inkhud->forceUpdate(EInk::UpdateTypes::FAST);
-}
-
-void InkHUD::KeyboardApplet::onNavDown()
-{
-    selectedKey += KBD_COLS;
-    selectedKey %= (KBD_COLS * KBD_ROWS);
-
-    // Request rendering over the previously drawn render
-    requestUpdate(EInk::UpdateTypes::FAST, false);
-    // Force an update to bypass lockRequests
-    inkhud->forceUpdate(EInk::UpdateTypes::FAST);
-}
-
-void InkHUD::KeyboardApplet::onNavLeft()
-{
-    if (selectedKey % KBD_COLS == 0) // wrap
-        selectedKey += KBD_COLS - 1;
-    else // move 1 column back
-        selectedKey--;
-
-    // Request rendering over the previously drawn render
-    requestUpdate(EInk::UpdateTypes::FAST, false);
-    // Force an update to bypass lockRequests
-    inkhud->forceUpdate(EInk::UpdateTypes::FAST);
-}
-
-void InkHUD::KeyboardApplet::onNavRight()
-{
-    if (selectedKey % KBD_COLS == KBD_COLS - 1) // wrap
-        selectedKey -= KBD_COLS - 1;
-    else // move 1 column forward
-        selectedKey++;
-
-    // Request rendering over the previously drawn render
-    requestUpdate(EInk::UpdateTypes::FAST, false);
-    // Force an update to bypass lockRequests
-    inkhud->forceUpdate(EInk::UpdateTypes::FAST);
-}
-
-uint16_t InkHUD::KeyboardApplet::getKeyboardHeight()
-{
-    const uint16_t keyH = fontSmall.lineHeight() * 1.2;
-    return keyH * KBD_ROWS;
-}
-#endif
--- a/src/graphics/niche/InkHUD/Applets/System/Keyboard/KeyboardApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Keyboard/KeyboardApplet.h
@@ -1,66 +0,0 @@
-#ifdef MESHTASTIC_INCLUDE_INKHUD
-
-/*
-
-System Applet to render an on-screeen keyboard
-
-*/
-
-#pragma once
-
-#include "configuration.h"
-#include "graphics/niche/InkHUD/InkHUD.h"
-#include "graphics/niche/InkHUD/SystemApplet.h"
-#include <string>
-namespace NicheGraphics::InkHUD
-{
-
-class KeyboardApplet : public SystemApplet
-{
-  public:
-    KeyboardApplet();
-
-    void onRender(bool full) override;
-    void onForeground() override;
-    void onBackground() override;
-    void onButtonShortPress() override;
-    void onButtonLongPress() override;
-    void onExitShort() override;
-    void onExitLong() override;
-    void onNavUp() override;
-    void onNavDown() override;
-    void onNavLeft() override;
-    void onNavRight() override;
-
-    static uint16_t getKeyboardHeight(); // used to set the keyboard tile height
-
-  private:
-    void drawKeyLabel(uint16_t left, uint16_t top, uint16_t width, char key, Color color);
-
-    static const uint8_t KBD_COLS = 11;
-    static const uint8_t KBD_ROWS = 4;
-
-    const char keys[KBD_COLS * KBD_ROWS] = {
-        '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '\b',  // row 0
-        'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '\n',  // row 1
-        'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', '!', ' ',   // row 2
-        'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '?', '\x1b' // row 3
-    };
-
-    // This array represents the widths of each key in points
-    // 16 pt = line height of the text
-    const uint16_t keyWidths[KBD_COLS * KBD_ROWS] = {
-        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 24, // row 0
-        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 24, // row 1
-        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 24, // row 2
-        16, 16, 16, 16, 16, 16, 16, 10, 10, 12, 40  // row 3
-    };
-
-    uint16_t rowWidths[KBD_ROWS];
-    uint8_t selectedKey = 0; // selected key index
-    uint8_t prevSelectedKey = 0;
-};
-
-} // namespace NicheGraphics::InkHUD
-
-#endif
--- a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp
@@ -30,7 +30,7 @@ InkHUD::LogoApplet::LogoApplet() : concurrency::OSThread("LogoApplet")
    // This is then drawn with a FULL refresh by Renderer::begin
 }

-void InkHUD::LogoApplet::onRender(bool full)
+void InkHUD::LogoApplet::onRender()
 {
    // Size  of the region which the logo should "scale to fit"
    uint16_t logoWLimit = X(0.8);
@@ -120,7 +120,7 @@ void InkHUD::LogoApplet::onBackground()

    // Need to force an update, as a polite request wouldn't be honored, seeing how we are now in the background
    // Usually, onBackground is followed by another applet's onForeground (which requests update), but not in this case
-    inkhud->forceUpdate(EInk::UpdateTypes::FULL, true);
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 // Begin displaying the screen which is shown at shutdown
@@ -138,10 +138,10 @@ void InkHUD::LogoApplet::onShutdown()
    // Intention is to restore display health.

    inverted = true;
-    inkhud->forceUpdate(Drivers::EInk::FULL, true, false);
+    inkhud->forceUpdate(Drivers::EInk::FULL, false);
    delay(1000); // Cooldown. Back to back updates aren't great for health.
    inverted = false;
-    inkhud->forceUpdate(Drivers::EInk::FULL, true, false);
+    inkhud->forceUpdate(Drivers::EInk::FULL, false);
    delay(1000); // Cooldown

    // Prepare for the powered-off screen now
@@ -176,7 +176,7 @@ void InkHUD::LogoApplet::onReboot()
    textTitle = "Rebooting...";
    fontTitle = fontSmall;

-    inkhud->forceUpdate(Drivers::EInk::FULL, true, false);
+    inkhud->forceUpdate(Drivers::EInk::FULL, false);
    // Perform the update right now, waiting here until complete
 }

--- a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h
@@ -21,7 +21,7 @@ class LogoApplet : public SystemApplet, public concurrency::OSThread
 {
  public:
    LogoApplet();
-    void onRender(bool full) override;
+    void onRender() override;
    void onForeground() override;
    void onBackground() override;
    void onShutdown() override;
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h
@@ -19,10 +19,10 @@ namespace NicheGraphics::InkHUD
 enum MenuAction {
    NO_ACTION,
    SEND_PING,
-    FREE_TEXT,
    STORE_CANNEDMESSAGE_SELECTION,
    SEND_CANNEDMESSAGE,
    SHUTDOWN,
+    BACK,
    NEXT_TILE,
    TOGGLE_BACKLIGHT,
    TOGGLE_GPS,
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
@@ -90,8 +90,6 @@ void InkHUD::MenuApplet::onForeground()
    OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
    OSThread::enabled = true;

-    freeTextMode = false;
-
    // Upgrade the refresh to FAST, for guaranteed responsiveness
    inkhud->forceUpdate(EInk::UpdateTypes::FAST);
 }
@@ -118,8 +116,6 @@ void InkHUD::MenuApplet::onBackground()
    SystemApplet::lockRequests = false;
    SystemApplet::handleInput = false;

-    handleFreeText = false;
-
    // Restore the user applet whose tile we borrowed
    if (borrowedTileOwner)
        borrowedTileOwner->bringToForeground();
@@ -329,6 +325,10 @@ void InkHUD::MenuApplet::execute(MenuItem item)
        }
        break;

+    case BACK:
+        showPage(item.nextPage);
+        return;
+
    case NEXT_TILE:
        inkhud->nextTile();
        // Unselect menu item after tile change
@@ -344,26 +344,12 @@ void InkHUD::MenuApplet::execute(MenuItem item)
        inkhud->forceUpdate(Drivers::EInk::UpdateTypes::FULL);
        break;

-    case FREE_TEXT:
-        OSThread::enabled = false;
-        handleFreeText = true;
-        cm.freeTextItem.rawText.erase(); // clear the previous freetext message
-        freeTextMode = true;             // render input field instead of normal menu
-        // Open the on-screen keyboard if the joystick is enabled
-        if (settings->joystick.enabled)
-            inkhud->openKeyboard();
-        break;
-
    case STORE_CANNEDMESSAGE_SELECTION:
-        if (!settings->joystick.enabled)
-            cm.selectedMessageItem = &cm.messageItems.at(cursor - 1); // Minus one: offset for the initial "Send Ping" entry
-        else
-            cm.selectedMessageItem = &cm.messageItems.at(cursor - 2); // Minus two: offset for the "Send Ping" and free text entry
+        cm.selectedMessageItem = &cm.messageItems.at(cursor - 1); // Minus one: offset for the initial "Send Ping" entry
        break;

    case SEND_CANNEDMESSAGE:
        cm.selectedRecipientItem = &cm.recipientItems.at(cursor);
-        // send selected message
        sendText(cm.selectedRecipientItem->dest, cm.selectedRecipientItem->channelIndex, cm.selectedMessageItem->rawText.c_str());
        inkhud->forceUpdate(Drivers::EInk::UpdateTypes::FULL); // Next refresh should be FULL. Lots of button pressing to get here
        break;
@@ -882,7 +868,6 @@ void InkHUD::MenuApplet::showPage(MenuPage page)

    switch (page) {
    case ROOT:
-        previousPage = MenuPage::EXIT;
        // Optional: next applet
        if (settings->optionalMenuItems.nextTile && settings->userTiles.count > 1)
            items.push_back(MenuItem("Next Tile", MenuAction::NEXT_TILE, MenuPage::ROOT)); // Only if multiple applets shown
@@ -893,6 +878,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
        items.push_back(MenuItem("Node Config", MenuPage::NODE_CONFIG));
        items.push_back(MenuItem("Save & Shut Down", MenuAction::SHUTDOWN));
        items.push_back(MenuItem("Exit", MenuPage::EXIT));
+        previousPage = MenuPage::EXIT;
        break;

    case SEND:
@@ -902,12 +888,11 @@ void InkHUD::MenuApplet::showPage(MenuPage page)

    case CANNEDMESSAGE_RECIPIENT:
        populateRecipientPage();
-        previousPage = MenuPage::SEND;
+        previousPage = MenuPage::OPTIONS;
        break;

    case OPTIONS:
-        previousPage = MenuPage::ROOT;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::ROOT));
        // Optional: backlight
        if (settings->optionalMenuItems.backlight)
            items.push_back(MenuItem(backlight->isLatched() ? "Backlight Off" : "Keep Backlight On", // Label
@@ -931,32 +916,31 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
        invertedColors = (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED);
        items.push_back(MenuItem("Invert Color", MenuAction::TOGGLE_INVERT_COLOR, MenuPage::OPTIONS, &invertedColors));
        items.push_back(MenuItem("Exit", MenuPage::EXIT));
+        previousPage = MenuPage::ROOT;
        break;

    case APPLETS:
-        previousPage = MenuPage::OPTIONS;
        populateAppletPage(); // must be first
-        items.insert(items.begin(), MenuItem("Back", previousPage));
+        items.insert(items.begin(), MenuItem("Back", MenuAction::BACK, MenuPage::OPTIONS));
        items.push_back(MenuItem("Exit", MenuPage::EXIT));
+        previousPage = MenuPage::OPTIONS;
        break;

    case AUTOSHOW:
-        previousPage = MenuPage::OPTIONS;
        populateAutoshowPage(); // must be first
-        items.insert(items.begin(), MenuItem("Back", previousPage));
+        items.insert(items.begin(), MenuItem("Back", MenuAction::BACK, MenuPage::OPTIONS));
        items.push_back(MenuItem("Exit", MenuPage::EXIT));
+        previousPage = MenuPage::OPTIONS;
        break;

    case RECENTS:
-        previousPage = MenuPage::OPTIONS;
        populateRecentsPage(); // builds only the options
-        items.insert(items.begin(), MenuItem("Back", previousPage));
+        items.insert(items.begin(), MenuItem("Back", MenuAction::BACK, MenuPage::OPTIONS));
        items.push_back(MenuItem("Exit", MenuPage::EXIT));
        break;

    case NODE_CONFIG:
-        previousPage = MenuPage::ROOT;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::ROOT));
        // Radio Config Section
        items.push_back(MenuItem::Header("Radio Config"));
        items.push_back(MenuItem("LoRa", MenuPage::NODE_CONFIG_LORA));
@@ -981,8 +965,8 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
        break;

    case NODE_CONFIG_DEVICE: {
-        previousPage = MenuPage::NODE_CONFIG;
-        items.push_back(MenuItem("Back", previousPage));
+
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG));

        const char *role = DisplayFormatters::getDeviceRole(config.device.role);
        nodeConfigLabels.emplace_back("Role: " + std::string(role));
@@ -997,8 +981,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_POSITION: {
-        previousPage = MenuPage::NODE_CONFIG;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG));
 #if !MESHTASTIC_EXCLUDE_GPS && HAS_GPS
        const auto mode = config.position.gps_mode;
        if (mode == meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT) {
@@ -1013,8 +996,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_POWER: {
-        previousPage = MenuPage::NODE_CONFIG;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG));
 #if defined(ARCH_ESP32)
        items.push_back(MenuItem("Powersave", MenuAction::TOGGLE_POWER_SAVE, MenuPage::EXIT, &config.power.is_power_saving));
 #endif
@@ -1047,8 +1029,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_POWER_ADC_CAL: {
-        previousPage = MenuPage::NODE_CONFIG_POWER;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG_POWER));

        // Instruction text (header-style, non-selectable)
        items.push_back(MenuItem::Header("Run on full charge Only"));
@@ -1061,8 +1042,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_NETWORK: {
-        previousPage = MenuPage::NODE_CONFIG;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG));

        const char *wifiLabel = config.network.wifi_enabled ? "WiFi: On" : "WiFi: Off";

@@ -1119,8 +1099,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_DISPLAY: {
-        previousPage = MenuPage::NODE_CONFIG;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG));

        items.push_back(MenuItem("12-Hour Clock", MenuAction::TOGGLE_12H_CLOCK, MenuPage::NODE_CONFIG_DISPLAY,
                                 &config.display.use_12h_clock));
@@ -1135,8 +1114,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_BLUETOOTH: {
-        previousPage = MenuPage::NODE_CONFIG;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG));

        const char *btLabel = config.bluetooth.enabled ? "Bluetooth: On" : "Bluetooth: Off";
        items.push_back(MenuItem(btLabel, MenuAction::TOGGLE_BLUETOOTH, MenuPage::EXIT));
@@ -1149,8 +1127,8 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_LORA: {
-        previousPage = MenuPage::NODE_CONFIG;
-        items.push_back(MenuItem("Back", previousPage));
+
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG));

        const char *region = myRegion ? myRegion->name : "Unset";
        nodeConfigLabels.emplace_back("Region: " + std::string(region));
@@ -1172,8 +1150,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_CHANNELS: {
-        previousPage = MenuPage::NODE_CONFIG;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG));

        for (uint8_t i = 0; i < MAX_NUM_CHANNELS; i++) {
            meshtastic_Channel &ch = channels.getByIndex(i);
@@ -1204,8 +1181,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_CHANNEL_DETAIL: {
-        previousPage = MenuPage::NODE_CONFIG_CHANNELS;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG_CHANNELS));

        meshtastic_Channel &ch = channels.getByIndex(selectedChannelIndex);

@@ -1250,8 +1226,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_CHANNEL_PRECISION: {
-        previousPage = MenuPage::NODE_CONFIG_CHANNEL_DETAIL;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG_CHANNEL_DETAIL));
        meshtastic_Channel &ch = channels.getByIndex(selectedChannelIndex);
        if (!ch.settings.has_module_settings || ch.settings.module_settings.position_precision == 0) {
            items.push_back(MenuItem("Position is Off", MenuPage::NODE_CONFIG_CHANNEL_DETAIL));
@@ -1272,8 +1247,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case NODE_CONFIG_DEVICE_ROLE: {
-        previousPage = MenuPage::NODE_CONFIG_DEVICE;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG_DEVICE));
        items.push_back(MenuItem("Client", MenuAction::SET_ROLE_CLIENT, MenuPage::EXIT));
        items.push_back(MenuItem("Client Mute", MenuAction::SET_ROLE_CLIENT_MUTE, MenuPage::EXIT));
        items.push_back(MenuItem("Router", MenuAction::SET_ROLE_ROUTER, MenuPage::EXIT));
@@ -1283,8 +1257,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }

    case TIMEZONE:
-        previousPage = MenuPage::NODE_CONFIG_DEVICE;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG_DEVICE));
        items.push_back(MenuItem("US/Hawaii", SET_TZ_US_HAWAII, MenuPage::NODE_CONFIG_DEVICE));
        items.push_back(MenuItem("US/Alaska", SET_TZ_US_ALASKA, MenuPage::NODE_CONFIG_DEVICE));
        items.push_back(MenuItem("US/Pacific", SET_TZ_US_PACIFIC, MenuPage::NODE_CONFIG_DEVICE));
@@ -1306,8 +1279,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
        break;

    case REGION:
-        previousPage = MenuPage::NODE_CONFIG_LORA;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG_LORA));
        items.push_back(MenuItem("US", MenuAction::SET_REGION_US, MenuPage::EXIT));
        items.push_back(MenuItem("EU 868", MenuAction::SET_REGION_EU_868, MenuPage::EXIT));
        items.push_back(MenuItem("EU 433", MenuAction::SET_REGION_EU_433, MenuPage::EXIT));
@@ -1338,8 +1310,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
        break;

    case NODE_CONFIG_PRESET: {
-        previousPage = MenuPage::NODE_CONFIG_LORA;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG_LORA));
        items.push_back(MenuItem("Long Moderate", MenuAction::SET_PRESET_LONG_MODERATE, MenuPage::EXIT));
        items.push_back(MenuItem("Long Fast", MenuAction::SET_PRESET_LONG_FAST, MenuPage::EXIT));
        items.push_back(MenuItem("Medium Slow", MenuAction::SET_PRESET_MEDIUM_SLOW, MenuPage::EXIT));
@@ -1352,8 +1323,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    }
    // Administration Section
    case NODE_CONFIG_ADMIN_RESET:
-        previousPage = MenuPage::NODE_CONFIG;
-        items.push_back(MenuItem("Back", previousPage));
+        items.push_back(MenuItem("Back", MenuAction::BACK, MenuPage::NODE_CONFIG));
        items.push_back(MenuItem("Reset All", MenuAction::RESET_NODEDB_ALL, MenuPage::EXIT));
        items.push_back(MenuItem("Keep Favorites Only", MenuAction::RESET_NODEDB_KEEP_FAVORITES, MenuPage::EXIT));
        items.push_back(MenuItem("Exit", MenuPage::EXIT));
@@ -1391,14 +1361,8 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
    currentPage = page;
 }

-void InkHUD::MenuApplet::onRender(bool full)
+void InkHUD::MenuApplet::onRender()
 {
-    // Free text mode draws a text input field and skips the normal rendering
-    if (freeTextMode) {
-        drawInputField(0, fontSmall.lineHeight(), X(1.0), Y(1.0) - fontSmall.lineHeight() - 1, cm.freeTextItem.rawText);
-        return;
-    }
-
    if (items.size() == 0)
        LOG_ERROR("Empty Menu");

@@ -1517,48 +1481,44 @@ void InkHUD::MenuApplet::onRender(bool full)

 void InkHUD::MenuApplet::onButtonShortPress()
 {
-    if (!freeTextMode) {
-        // Push the auto-close timer back
-        OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
+    // Push the auto-close timer back
+    OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);

-        if (!settings->joystick.enabled) {
-            if (!cursorShown) {
-                cursorShown = true;
-                cursor = 0;
-            } else {
-                do {
-                    cursor = (cursor + 1) % items.size();
-                } while (items.at(cursor).isHeader);
-            }
-            requestUpdate(Drivers::EInk::UpdateTypes::FAST);
+    if (!settings->joystick.enabled) {
+        if (!cursorShown) {
+            cursorShown = true;
+            cursor = 0;
        } else {
-            if (cursorShown)
-                execute(items.at(cursor));
-            else
-                showPage(MenuPage::EXIT);
-            if (!wantsToRender())
-                requestUpdate(Drivers::EInk::UpdateTypes::FAST);
+            do {
+                cursor = (cursor + 1) % items.size();
+            } while (items.at(cursor).isHeader);
        }
+        requestUpdate(Drivers::EInk::UpdateTypes::FAST);
+    } else {
+        if (cursorShown)
+            execute(items.at(cursor));
+        else
+            showPage(MenuPage::EXIT);
+        if (!wantsToRender())
+            requestUpdate(Drivers::EInk::UpdateTypes::FAST);
    }
 }

 void InkHUD::MenuApplet::onButtonLongPress()
 {
-    if (!freeTextMode) {
-        // Push the auto-close timer back
-        OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
+    // Push the auto-close timer back
+    OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);

-        if (cursorShown)
-            execute(items.at(cursor));
-        else
-            showPage(MenuPage::EXIT); // Special case: Peek at root-menu; longpress again to close
+    if (cursorShown)
+        execute(items.at(cursor));
+    else
+        showPage(MenuPage::EXIT); // Special case: Peek at root-menu; longpress again to close

-        // If we didn't already request a specialized update, when handling a menu action,
-        // then perform the usual fast update.
-        // FAST keeps things responsive: important because we're dealing with user input
-        if (!wantsToRender())
-            requestUpdate(Drivers::EInk::UpdateTypes::FAST);
-    }
+    // If we didn't already request a specialized update, when handling a menu action,
+    // then perform the usual fast update.
+    // FAST keeps things responsive: important because we're dealing with user input
+    if (!wantsToRender())
+        requestUpdate(Drivers::EInk::UpdateTypes::FAST);
 }

 void InkHUD::MenuApplet::onExitShort()
@@ -1571,107 +1531,56 @@ void InkHUD::MenuApplet::onExitShort()

 void InkHUD::MenuApplet::onNavUp()
 {
-    if (!freeTextMode) {
-        OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
+    OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);

-        if (!cursorShown) {
-            cursorShown = true;
-            cursor = 0;
-        } else {
-            do {
-                if (cursor == 0)
-                    cursor = items.size() - 1;
-                else
-                    cursor--;
-            } while (items.at(cursor).isHeader);
-        }
-
-        requestUpdate(Drivers::EInk::UpdateTypes::FAST);
+    if (!cursorShown) {
+        cursorShown = true;
+        cursor = 0;
+    } else {
+        do {
+            if (cursor == 0)
+                cursor = items.size() - 1;
+            else
+                cursor--;
+        } while (items.at(cursor).isHeader);
    }
+
+    requestUpdate(Drivers::EInk::UpdateTypes::FAST);
 }

 void InkHUD::MenuApplet::onNavDown()
 {
-    if (!freeTextMode) {
-        OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
+    OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);

-        if (!cursorShown) {
-            cursorShown = true;
-            cursor = 0;
-        } else {
-            do {
-                cursor = (cursor + 1) % items.size();
-            } while (items.at(cursor).isHeader);
-        }
-
-        requestUpdate(Drivers::EInk::UpdateTypes::FAST);
+    if (!cursorShown) {
+        cursorShown = true;
+        cursor = 0;
+    } else {
+        do {
+            cursor = (cursor + 1) % items.size();
+        } while (items.at(cursor).isHeader);
    }
+
+    requestUpdate(Drivers::EInk::UpdateTypes::FAST);
 }

 void InkHUD::MenuApplet::onNavLeft()
 {
-    if (!freeTextMode) {
-        OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
+    OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);

-        // Go to the previous menu page
-        showPage(previousPage);
-        requestUpdate(Drivers::EInk::UpdateTypes::FAST);
-    }
+    // Go to the previous menu page
+    showPage(previousPage);
+    requestUpdate(Drivers::EInk::UpdateTypes::FAST);
 }

 void InkHUD::MenuApplet::onNavRight()
 {
-    if (!freeTextMode) {
-        OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
-        if (cursorShown)
-            execute(items.at(cursor));
-        if (!wantsToRender())
-            requestUpdate(Drivers::EInk::UpdateTypes::FAST);
-    }
-}
-
-void InkHUD::MenuApplet::onFreeText(char c)
-{
-    if (cm.freeTextItem.rawText.length() >= menuTextLimit && c != '\b')
-        return;
-    if (c == '\b') {
-        if (!cm.freeTextItem.rawText.empty())
-            cm.freeTextItem.rawText.pop_back();
-    } else {
-        cm.freeTextItem.rawText += c;
-    }
-    requestUpdate(Drivers::EInk::UpdateTypes::FAST);
-}
-
-void InkHUD::MenuApplet::onFreeTextDone()
-{
-    // Restart the auto-close timeout
    OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
-    OSThread::enabled = true;

-    handleFreeText = false;
-    freeTextMode = false;
-
-    if (!cm.freeTextItem.rawText.empty()) {
-        cm.selectedMessageItem = &cm.freeTextItem;
-        showPage(MenuPage::CANNEDMESSAGE_RECIPIENT);
-    }
-    requestUpdate(Drivers::EInk::UpdateTypes::FAST);
-}
-
-void InkHUD::MenuApplet::onFreeTextCancel()
-{
-    // Restart the auto-close timeout
-    OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
-    OSThread::enabled = true;
-
-    handleFreeText = false;
-    freeTextMode = false;
-
-    // Clear the free text message
-    cm.freeTextItem.rawText.erase();
-
-    requestUpdate(Drivers::EInk::UpdateTypes::FAST);
+    if (cursorShown)
+        execute(items.at(cursor));
+    if (!wantsToRender())
+        requestUpdate(Drivers::EInk::UpdateTypes::FAST);
 }

 // Dynamically create MenuItem entries for activating / deactivating Applets, for the "Applet Selection" submenu
@@ -1726,10 +1635,6 @@ void InkHUD::MenuApplet::populateSendPage()
    // Position / NodeInfo packet
    items.push_back(MenuItem("Ping", MenuAction::SEND_PING, MenuPage::EXIT));

-    // If joystick is available, include the Free Text option
-    if (settings->joystick.enabled)
-        items.push_back(MenuItem("Free Text", MenuAction::FREE_TEXT, MenuPage::SEND));
-
    // One menu item for each canned message
    uint8_t count = cm.store->size();
    for (uint8_t i = 0; i < count; i++) {
@@ -1829,48 +1734,6 @@ void InkHUD::MenuApplet::populateRecipientPage()
    items.push_back(MenuItem("Exit", MenuPage::EXIT));
 }

-void InkHUD::MenuApplet::drawInputField(uint16_t left, uint16_t top, uint16_t width, uint16_t height, std::string text)
-{
-    setFont(fontSmall);
-    uint16_t wrapMaxH = 0;
-
-    // Draw the text, input box, and cursor
-    // Adjusting the box for screen height
-    while (wrapMaxH < height - fontSmall.lineHeight()) {
-        wrapMaxH += fontSmall.lineHeight();
-    }
-
-    // If the text is so long that it goes outside of the input box, the text is actually rendered off screen.
-    uint32_t textHeight = getWrappedTextHeight(0, width - 5, text);
-    if (!text.empty()) {
-        uint16_t textPadding = X(1.0) > Y(1.0) ? wrapMaxH - textHeight : wrapMaxH - textHeight + 1;
-        if (textHeight > wrapMaxH)
-            printWrapped(2, textPadding, width - 5, text);
-        else
-            printWrapped(2, top + 2, width - 5, text);
-    }
-
-    uint16_t textCursorX = text.empty() ? 1 : getCursorX();
-    uint16_t textCursorY = text.empty() ? fontSmall.lineHeight() + 2 : getCursorY() - fontSmall.lineHeight() + 3;
-
-    if (textCursorX + 1 > width - 5) {
-        textCursorX = getCursorX() - width + 5;
-        textCursorY += fontSmall.lineHeight();
-    }
-
-    fillRect(textCursorX + 1, textCursorY, 1, fontSmall.lineHeight(), BLACK);
-
-    // A white rectangle clears the top part of the screen for any text that's printed beyond the input box
-    fillRect(0, 0, X(1.0), top, WHITE);
-
-    // Draw character limit
-    std::string ftlen = std::to_string(text.length()) + "/" + to_string(menuTextLimit);
-    uint16_t textLen = getTextWidth(ftlen);
-    printAt(X(1.0) - textLen - 2, 0, ftlen);
-
-    // Draw the border
-    drawRect(0, top, width, wrapMaxH + 5, BLACK);
-}
 // Renders the panel shown at the top of the root menu.
 // Displays the clock, and several other pieces of instantaneous system info,
 // which we'd prefer not to have displayed in a normal applet, as they update too frequently.
@@ -2012,4 +1875,4 @@ void InkHUD::MenuApplet::freeCannedMessageResources()
    cm.messageItems.clear();
    cm.recipientItems.clear();
 }
-#endif // MESHTASTIC_INCLUDE_INKHUD
+#endif // MESHTASTIC_INCLUDE_INKHUD
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h
@@ -32,10 +32,7 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
    void onNavDown() override;
    void onNavLeft() override;
    void onNavRight() override;
-    void onFreeText(char c) override;
-    void onFreeTextDone() override;
-    void onFreeTextCancel() override;
-    void onRender(bool full) override;
+    void onRender() override;

    void show(Tile *t); // Open the menu, onto a user tile
    void setStartPage(MenuPage page);
@@ -54,8 +51,6 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
    void populateAutoshowPage();  // Dynamically create MenuItems for selecting which applets can autoshow
    void populateRecentsPage();   // Create menu items: a choice of values for settings.recentlyActiveSeconds

-    void drawInputField(uint16_t left, uint16_t top, uint16_t width, uint16_t height,
-                        std::string text); // Draw input field for free text
    uint16_t getSystemInfoPanelHeight();
    void drawSystemInfoPanel(int16_t left, int16_t top, uint16_t width,
                             uint16_t *height = nullptr);                   // Info panel at top of root menu
@@ -67,9 +62,8 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
    MenuPage previousPage = MenuPage::EXIT;
    uint8_t cursor = 0;       // Which menu item is currently highlighted
    bool cursorShown = false; // Is *any* item highlighted? (Root menu: no initial selection)
-    bool freeTextMode = false;
+
    uint16_t systemInfoPanelHeight = 0; // Need to know before we render
-    uint16_t menuTextLimit = 200;

    std::vector<MenuItem> items;               // MenuItems for the current page. Filled by ShowPage
    std::vector<std::string> nodeConfigLabels; // Persistent labels for Node Config pages
@@ -110,8 +104,6 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
        // Cleared onBackground (when MenuApplet closes)
        std::vector<MessageItem> messageItems;
        std::vector<RecipientItem> recipientItems;
-
-        MessageItem freeTextItem;
    } cm;

    Applet *borrowedTileOwner = nullptr; // Which applet we have temporarily replaced while displaying menu
--- a/src/graphics/niche/InkHUD/Applets/System/Notification/NotificationApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Notification/NotificationApplet.cpp
@@ -65,7 +65,7 @@ int InkHUD::NotificationApplet::onReceiveTextMessage(const meshtastic_MeshPacket
    return 0;
 }

-void InkHUD::NotificationApplet::onRender(bool full)
+void InkHUD::NotificationApplet::onRender()
 {
    // Clear the region beneath the tile
    // Most applets are drawing onto an empty frame buffer and don't need to do this
@@ -139,47 +139,54 @@ void InkHUD::NotificationApplet::onForeground()
 void InkHUD::NotificationApplet::onBackground()
 {
    handleInput = false;
-    inkhud->forceUpdate(EInk::UpdateTypes::FULL, true);
 }

 void InkHUD::NotificationApplet::onButtonShortPress()
 {
    dismiss();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::NotificationApplet::onButtonLongPress()
 {
    dismiss();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::NotificationApplet::onExitShort()
 {
    dismiss();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::NotificationApplet::onExitLong()
 {
    dismiss();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::NotificationApplet::onNavUp()
 {
    dismiss();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::NotificationApplet::onNavDown()
 {
    dismiss();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::NotificationApplet::onNavLeft()
 {
    dismiss();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 void InkHUD::NotificationApplet::onNavRight()
 {
    dismiss();
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 // Ask the WindowManager to check whether any displayed applets are already displaying the info from this notification
--- a/src/graphics/niche/InkHUD/Applets/System/Notification/NotificationApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Notification/NotificationApplet.h
@@ -26,7 +26,7 @@ class NotificationApplet : public SystemApplet
  public:
    NotificationApplet();

-    void onRender(bool full) override;
+    void onRender() override;
    void onForeground() override;
    void onBackground() override;
    void onButtonShortPress() override;
--- a/src/graphics/niche/InkHUD/Applets/System/Pairing/PairingApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Pairing/PairingApplet.cpp
@@ -9,7 +9,7 @@ InkHUD::PairingApplet::PairingApplet()
    bluetoothStatusObserver.observe(&bluetoothStatus->onNewStatus);
 }

-void InkHUD::PairingApplet::onRender(bool full)
+void InkHUD::PairingApplet::onRender()
 {
    // Header
    setFont(fontMedium);
@@ -45,7 +45,7 @@ void InkHUD::PairingApplet::onBackground()

    // Need to force an update, as a polite request wouldn't be honored, seeing how we are now in the background
    // Usually, onBackground is followed by another applet's onForeground (which requests update), but not in this case
-    inkhud->forceUpdate(EInk::UpdateTypes::FULL, true);
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 int InkHUD::PairingApplet::onBluetoothStatusUpdate(const meshtastic::Status *status)
--- a/src/graphics/niche/InkHUD/Applets/System/Pairing/PairingApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Pairing/PairingApplet.h
@@ -22,7 +22,7 @@ class PairingApplet : public SystemApplet
  public:
    PairingApplet();

-    void onRender(bool full) override;
+    void onRender() override;
    void onForeground() override;
    void onBackground() override;

--- a/src/graphics/niche/InkHUD/Applets/System/Placeholder/PlaceholderApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Placeholder/PlaceholderApplet.cpp
@@ -4,7 +4,7 @@

 using namespace NicheGraphics;

-void InkHUD::PlaceholderApplet::onRender(bool full)
+void InkHUD::PlaceholderApplet::onRender()
 {
    // This placeholder applet fills its area with sparse diagonal lines
    hatchRegion(0, 0, width(), height(), 8, BLACK);
--- a/src/graphics/niche/InkHUD/Applets/System/Placeholder/PlaceholderApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Placeholder/PlaceholderApplet.h
@@ -17,7 +17,7 @@ namespace NicheGraphics::InkHUD
 class PlaceholderApplet : public SystemApplet
 {
  public:
-    void onRender(bool full) override;
+    void onRender() override;

    // Note: onForeground, onBackground, and wantsToRender are not meaningful for this applet.
    // The window manager decides when and where it should be rendered
--- a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
@@ -45,7 +45,7 @@ InkHUD::TipsApplet::TipsApplet()
        bringToForeground();
 }

-void InkHUD::TipsApplet::onRender(bool full)
+void InkHUD::TipsApplet::onRender()
 {
    switch (tipQueue.front()) {
    case Tip::WELCOME:
@@ -261,7 +261,7 @@ void InkHUD::TipsApplet::onBackground()

    // Need to force an update, as a polite request wouldn't be honored, seeing how we are now in the background
    // Usually, onBackground is followed by another applet's onForeground (which requests update), but not in this case
-    inkhud->forceUpdate(EInk::UpdateTypes::FULL, true);
+    inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }

 // While our SystemApplet::handleInput flag is true
@@ -292,8 +292,9 @@ void InkHUD::TipsApplet::onButtonShortPress()
            inkhud->persistence->saveSettings();
        }

-        // Close applet
+        // Close applet and clean the screen
        sendToBackground();
+        inkhud->forceUpdate(EInk::UpdateTypes::FULL);
    } else {
        requestUpdate();
    }
@@ -305,4 +306,4 @@ void InkHUD::TipsApplet::onExitShort()
    onButtonShortPress();
 }

-#endif
+#endif
--- a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h
@@ -33,7 +33,7 @@ class TipsApplet : public SystemApplet
  public:
    TipsApplet();

-    void onRender(bool full) override;
+    void onRender() override;
    void onForeground() override;
    void onBackground() override;
    void onButtonShortPress() override;
--- a/src/graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.cpp
@@ -34,7 +34,7 @@ int InkHUD::AllMessageApplet::onReceiveTextMessage(const meshtastic_MeshPacket *
    return 0;
 }

-void InkHUD::AllMessageApplet::onRender(bool full)
+void InkHUD::AllMessageApplet::onRender()
 {
    // Find newest message, regardless of whether DM or broadcast
    MessageStore::Message *message;
--- a/src/graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h
@@ -30,7 +30,7 @@ class Applet;
 class AllMessageApplet : public Applet
 {
  public:
-    void onRender(bool full) override;
+    void onRender() override;

    void onActivate() override;
    void onDeactivate() override;
--- a/src/graphics/niche/InkHUD/Applets/User/DM/DMApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/User/DM/DMApplet.cpp
@@ -37,7 +37,7 @@ int InkHUD::DMApplet::onReceiveTextMessage(const meshtastic_MeshPacket *p)
    return 0;
 }

-void InkHUD::DMApplet::onRender(bool full)
+void InkHUD::DMApplet::onRender()
 {
    // Abort if no text message
    if (!latestMessage->dm.sender) {
--- a/src/graphics/niche/InkHUD/Applets/User/DM/DMApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/User/DM/DMApplet.h
@@ -30,7 +30,7 @@ class Applet;
 class DMApplet : public Applet
 {
  public:
-    void onRender(bool full) override;
+    void onRender() override;

    void onActivate() override;
    void onDeactivate() override;
--- a/src/graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.cpp
@@ -5,10 +5,10 @@

 using namespace NicheGraphics;

-void InkHUD::PositionsApplet::onRender(bool full)
+void InkHUD::PositionsApplet::onRender()
 {
    // Draw the usual map applet first
-    MapApplet::onRender(full);
+    MapApplet::onRender();

    // Draw our latest "node of interest" as a special marker
    // -------------------------------------------------------
--- a/src/graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h
@@ -24,7 +24,7 @@ class PositionsApplet : public MapApplet, public SinglePortModule
 {
  public:
    PositionsApplet() : SinglePortModule("PositionsApplet", meshtastic_PortNum_POSITION_APP) {}
-    void onRender(bool full) override;
+    void onRender() override;

  protected:
    ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
--- a/src/graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.cpp
@@ -22,7 +22,7 @@ InkHUD::ThreadedMessageApplet::ThreadedMessageApplet(uint8_t channelIndex)
    store = new MessageStore("ch" + to_string(channelIndex));
 }

-void InkHUD::ThreadedMessageApplet::onRender(bool full)
+void InkHUD::ThreadedMessageApplet::onRender()
 {
    // =============
    // Draw a header
--- a/src/graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h
@@ -36,7 +36,7 @@ class ThreadedMessageApplet : public Applet, public SinglePortModule
    explicit ThreadedMessageApplet(uint8_t channelIndex);
    ThreadedMessageApplet() = delete;

-    void onRender(bool full) override;
+    void onRender() override;

    void onActivate() override;
    void onDeactivate() override;
--- a/src/graphics/niche/InkHUD/Events.cpp
+++ b/src/graphics/niche/InkHUD/Events.cpp
@@ -238,39 +238,6 @@ void InkHUD::Events::onNavRight()
    }
 }

-void InkHUD::Events::onFreeText(char c)
-{
-    // Trigger the first system applet that wants to handle the new character
-    for (SystemApplet *sa : inkhud->systemApplets) {
-        if (sa->handleFreeText) {
-            sa->onFreeText(c);
-            break;
-        }
-    }
-}
-
-void InkHUD::Events::onFreeTextDone()
-{
-    // Trigger the first system applet that wants to handle it
-    for (SystemApplet *sa : inkhud->systemApplets) {
-        if (sa->handleFreeText) {
-            sa->onFreeTextDone();
-            break;
-        }
-    }
-}
-
-void InkHUD::Events::onFreeTextCancel()
-{
-    // Trigger the first system applet that wants to handle it
-    for (SystemApplet *sa : inkhud->systemApplets) {
-        if (sa->handleFreeText) {
-            sa->onFreeTextCancel();
-            break;
-        }
-    }
-}
-
 // Callback for deepSleepObserver
 // Returns 0 to signal that we agree to sleep now
 int InkHUD::Events::beforeDeepSleep(void *unused)
@@ -299,7 +266,7 @@ int InkHUD::Events::beforeDeepSleep(void *unused)
    // then prepared a final powered-off screen for us, which shows device shortname.
    // We're updating to show that one now.

-    inkhud->forceUpdate(Drivers::EInk::UpdateTypes::FULL, true, false);
+    inkhud->forceUpdate(Drivers::EInk::UpdateTypes::FULL, false);
    delay(1000); // Cooldown, before potentially yanking display power

    // InkHUD shutdown complete
--- a/src/graphics/niche/InkHUD/Events.h
+++ b/src/graphics/niche/InkHUD/Events.h
@@ -37,11 +37,6 @@ class Events
    void onNavLeft();   // Navigate left
    void onNavRight();  // Navigate right

-    // Free text typing events
-    void onFreeText(char c); // New freetext character input
-    void onFreeTextDone();
-    void onFreeTextCancel();
-
    int beforeDeepSleep(void *unused);                             // Prepare for shutdown
    int beforeReboot(void *unused);                                // Prepare for reboot
    int onReceiveTextMessage(const meshtastic_MeshPacket *packet); // Store most recent text message
--- a/src/graphics/niche/InkHUD/InkHUD.cpp
+++ b/src/graphics/niche/InkHUD/InkHUD.cpp
@@ -175,25 +175,6 @@ void InkHUD::InkHUD::navRight()
    }
 }

-// Call this for keyboard input
-// The Keyboard Applet also calls this
-void InkHUD::InkHUD::freeText(char c)
-{
-    events->onFreeText(c);
-}
-
-// Call this to complete a freetext input
-void InkHUD::InkHUD::freeTextDone()
-{
-    events->onFreeTextDone();
-}
-
-// Call this to cancel a freetext input
-void InkHUD::InkHUD::freeTextCancel()
-{
-    events->onFreeTextCancel();
-}
-
 // Cycle the next user applet to the foreground
 // Only activated applets are cycled
 // If user has a multi-applet layout, the applets will cycle on the "focused tile"
@@ -223,18 +204,6 @@ void InkHUD::InkHUD::openAlignStick()
    windowManager->openAlignStick();
 }

-// Open the on-screen keyboard
-void InkHUD::InkHUD::openKeyboard()
-{
-    windowManager->openKeyboard();
-}
-
-// Close the on-screen keyboard
-void InkHUD::InkHUD::closeKeyboard()
-{
-    windowManager->closeKeyboard();
-}
-
 // In layouts where multiple applets are shown at once, change which tile is focused
 // The focused tile in the one which cycles applets on button short press, and displays menu on long press
 void InkHUD::InkHUD::nextTile()
@@ -283,11 +252,10 @@ void InkHUD::InkHUD::requestUpdate()
 // Ignores all diplomacy:
 //  - the display *will* update
 //  - the specified update type *will* be used
-// If the all parameter is true, the whole screen buffer is cleared and re-rendered
 // If the async parameter is false, code flow is blocked while the update takes place
-void InkHUD::InkHUD::forceUpdate(EInk::UpdateTypes type, bool all, bool async)
+void InkHUD::InkHUD::forceUpdate(EInk::UpdateTypes type, bool async)
 {
-    renderer->forceUpdate(type, all, async);
+    renderer->forceUpdate(type, async);
 }

 // Wait for any in-progress display update to complete before continuing
--- a/src/graphics/niche/InkHUD/InkHUD.h
+++ b/src/graphics/niche/InkHUD/InkHUD.h
@@ -63,11 +63,6 @@ class InkHUD
    void navLeft();
    void navRight();

-    // Freetext handlers
-    void freeText(char c);
-    void freeTextDone();
-    void freeTextCancel();
-
    // Trigger UI changes
    // - called by various InkHUD components
    // - suitable(?) for use by aux button, connected in variant nicheGraphics.h
@@ -76,8 +71,6 @@ class InkHUD
    void prevApplet();
    void openMenu();
    void openAlignStick();
-    void openKeyboard();
-    void closeKeyboard();
    void nextTile();
    void prevTile();
    void rotate();
@@ -91,8 +84,7 @@ class InkHUD
    // - called by various InkHUD components

    void requestUpdate();
-    void forceUpdate(Drivers::EInk::UpdateTypes type = Drivers::EInk::UpdateTypes::UNSPECIFIED, bool all = false,
-                     bool async = true);
+    void forceUpdate(Drivers::EInk::UpdateTypes type = Drivers::EInk::UpdateTypes::UNSPECIFIED, bool async = true);
    void awaitUpdate();

    // (Re)configuring WindowManager
--- a/src/graphics/niche/InkHUD/Renderer.cpp
+++ b/src/graphics/niche/InkHUD/Renderer.cpp
@@ -56,16 +56,15 @@ void InkHUD::Renderer::setDisplayResilience(uint8_t fastPerFull, float stressMul

 void InkHUD::Renderer::begin()
 {
-    forceUpdate(Drivers::EInk::UpdateTypes::FULL, true, false);
+    forceUpdate(Drivers::EInk::UpdateTypes::FULL, false);
 }

 // Set a flag, which will be picked up by runOnce, ASAP.
 // Quite likely, multiple applets will all want to respond to one event (Observable, etc)
 // Each affected applet can independently call requestUpdate(), and all share the one opportunity to render, at next runOnce
-void InkHUD::Renderer::requestUpdate(bool all)
+void InkHUD::Renderer::requestUpdate()
 {
    requested = true;
-    renderAll |= all;

    // We will run the thread as soon as we loop(),
    // after all Applets have had a chance to observe whatever event set this off
@@ -80,11 +79,10 @@ void InkHUD::Renderer::requestUpdate(bool all)
 // Sometimes, however, we will want to trigger a display update manually, in the absence of any sort of applet event
 // Display health, for example.
 // In these situations, we use forceUpdate
-void InkHUD::Renderer::forceUpdate(Drivers::EInk::UpdateTypes type, bool all, bool async)
+void InkHUD::Renderer::forceUpdate(Drivers::EInk::UpdateTypes type, bool async)
 {
    requested = true;
    forced = true;
-    renderAll |= all;
    displayHealth.forceUpdateType(type);

    // Normally, we need to start the timer, in case the display is busy and we briefly defer the update
@@ -221,8 +219,7 @@ void InkHUD::Renderer::render(bool async)
        Drivers::EInk::UpdateTypes updateType = decideUpdateType();

        // Render the new image
-        if (renderAll)
-            clearBuffer();
+        clearBuffer();
        renderUserApplets();
        renderPlaceholders();
        renderSystemApplets();
@@ -250,7 +247,6 @@ void InkHUD::Renderer::render(bool async)
    // Tidy up, ready for a new request
    requested = false;
    forced = false;
-    renderAll = false;
 }

 // Manually fill the image buffer with WHITE
@@ -263,76 +259,6 @@ void InkHUD::Renderer::clearBuffer()
    memset(imageBuffer, 0xFF, imageBufferHeight * imageBufferWidth);
 }

-// Manually clear the pixels below a tile
-void InkHUD::Renderer::clearTile(Tile *t)
-{
-    // Rotate the tile dimensions
-    int16_t left = 0;
-    int16_t top = 0;
-    uint16_t width = 0;
-    uint16_t height = 0;
-    switch (settings->rotation) {
-    case 0:
-        left = t->getLeft();
-        top = t->getTop();
-        width = t->getWidth();
-        height = t->getHeight();
-        break;
-    case 1:
-        left = driver->width - (t->getTop() + t->getHeight());
-        top = t->getLeft();
-        width = t->getHeight();
-        height = t->getWidth();
-        break;
-    case 2:
-        left = driver->width - (t->getLeft() + t->getWidth());
-        top = driver->height - (t->getTop() + t->getHeight());
-        width = t->getWidth();
-        height = t->getHeight();
-        break;
-    case 3:
-        left = t->getTop();
-        top = driver->height - (t->getLeft() + t->getWidth());
-        width = t->getHeight();
-        height = t->getWidth();
-        break;
-    }
-
-    // Calculate the bounds to clear
-    uint16_t xStart = (left < 0) ? 0 : left;
-    uint16_t yStart = (top < 0) ? 0 : top;
-    if (xStart >= driver->width || yStart >= driver->height || left + width < 0 || top + height < 0)
-        return; // the box is completely off the screen
-    uint16_t xEnd = left + width;
-    uint16_t yEnd = top + height;
-    if (xEnd > driver->width)
-        xEnd = driver->width;
-    if (yEnd > driver->height)
-        yEnd = driver->height;
-
-    // Clear the pixels
-    if (xStart == 0 && xEnd == driver->width) { // full width box is easier to clear
-        memset(imageBuffer + (yStart * imageBufferWidth), 0xFF, (yEnd - yStart) * imageBufferWidth);
-    } else {
-        const uint16_t byteStart = (xStart / 8) + 1;
-        const uint16_t byteEnd = xEnd / 8;
-        const uint8_t leadingByte = 0xFF >> (xStart - ((byteStart - 1) * 8));
-        const uint8_t trailingByte = (0xFF00 >> (xEnd - (byteEnd * 8))) & 0xFF;
-        for (uint16_t i = yStart * imageBufferWidth; i < yEnd * imageBufferWidth; i += imageBufferWidth) {
-            // Set the leading byte
-            imageBuffer[i + byteStart - 1] |= leadingByte;
-
-            // Set the continuous bytes
-            if (byteStart < byteEnd)
-                memset(imageBuffer + i + byteStart, 0xFF, byteEnd - byteStart);
-
-            // Set the trailing byte
-            if (byteEnd != imageBufferWidth)
-                imageBuffer[i + byteEnd] |= trailingByte;
-        }
-    }
-}
-
 void InkHUD::Renderer::checkLocks()
 {
    lockRendering = nullptr;
@@ -397,12 +323,12 @@ Drivers::EInk::UpdateTypes InkHUD::Renderer::decideUpdateType()
    if (!forced) {
        // User applets
        for (Applet *ua : inkhud->userApplets) {
-            if (ua && ua->isForeground() && (ua->wantsToRender() || renderAll))
+            if (ua && ua->isForeground())
                displayHealth.requestUpdateType(ua->wantsUpdateType());
        }
        // System Applets
        for (SystemApplet *sa : inkhud->systemApplets) {
-            if (sa && sa->isForeground() && (sa->wantsToRender() || sa->alwaysRender || renderAll))
+            if (sa && sa->isForeground())
                displayHealth.requestUpdateType(sa->wantsUpdateType());
        }
    }
@@ -420,16 +346,9 @@ void InkHUD::Renderer::renderUserApplets()

    // Render any user applets which are currently visible
    for (Applet *ua : inkhud->userApplets) {
-        if (ua && ua->isActive() && ua->isForeground() && (ua->wantsToRender() || renderAll)) {
-
-            // Clear the tile unless the applet wants to draw over its previous render
-            // or everything is getting re-rendered anyways
-            if (ua->wantsFullRender() && !renderAll)
-                clearTile(ua->getTile());
-
+        if (ua && ua->isActive() && ua->isForeground()) {
            uint32_t start = millis();
-            bool full = ua->wantsFullRender() || renderAll;
-            ua->render(full); // Draw!
+            ua->render(); // Draw!
            uint32_t stop = millis();
            LOG_DEBUG("%s took %dms to render", ua->name, stop - start);
        }
@@ -451,9 +370,6 @@ void InkHUD::Renderer::renderSystemApplets()
        if (!sa->isForeground())
            continue;

-        if (!sa->wantsToRender() && !sa->alwaysRender && !renderAll)
-            continue;
-
        // Skip if locked by another applet
        if (lockRendering && lockRendering != sa)
            continue;
@@ -465,14 +381,8 @@ void InkHUD::Renderer::renderSystemApplets()

        assert(sa->getTile());

-        // Clear the tile unless the applet wants to draw over its previous render
-        // or everything is getting re-rendered anyways
-        if (sa->wantsFullRender() && !renderAll)
-            clearTile(sa->getTile());
-
        // uint32_t start = millis();
-        bool full = sa->wantsFullRender() || renderAll;
-        sa->render(full); // Draw!
+        sa->render(); // Draw!
        // uint32_t stop = millis();
        // LOG_DEBUG("%s took %dms to render", sa->name, stop - start);
    }
@@ -499,10 +409,7 @@ void InkHUD::Renderer::renderPlaceholders()
    // uint32_t start = millis();
    for (Tile *t : emptyTiles) {
        t->assignApplet(placeholder);
-        // Clear the tile unless everything is getting re-rendered
-        if (!renderAll)
-            clearTile(t);
-        placeholder->render(true); // full render
+        placeholder->render();
        t->assignApplet(nullptr);
    }
    // uint32_t stop = millis();
--- a/src/graphics/niche/InkHUD/Renderer.h
+++ b/src/graphics/niche/InkHUD/Renderer.h
@@ -37,8 +37,8 @@ class Renderer : protected concurrency::OSThread

    // Call these to make the image change

-    void requestUpdate(bool all = false); // Update display, if a foreground applet has info it wants to show
-    void forceUpdate(Drivers::EInk::UpdateTypes type = Drivers::EInk::UpdateTypes::UNSPECIFIED, bool all = false,
+    void requestUpdate(); // Update display, if a foreground applet has info it wants to show
+    void forceUpdate(Drivers::EInk::UpdateTypes type = Drivers::EInk::UpdateTypes::UNSPECIFIED,
                     bool async = true); // Update display, regardless of whether any applets requested this

    // Wait for an update to complete
@@ -65,7 +65,6 @@ class Renderer : protected concurrency::OSThread
    // Steps of the rendering process

    void clearBuffer();
-    void clearTile(Tile *t);
    void checkLocks();
    bool shouldUpdate();
    Drivers::EInk::UpdateTypes decideUpdateType();
@@ -86,7 +85,6 @@ class Renderer : protected concurrency::OSThread

    bool requested = false;
    bool forced = false;
-    bool renderAll = false;

    // For convenience
    InkHUD *inkhud = nullptr;
--- a/src/graphics/niche/InkHUD/SystemApplet.h
+++ b/src/graphics/niche/InkHUD/SystemApplet.h
@@ -22,11 +22,9 @@ class SystemApplet : public Applet
  public:
    // System applets have the right to:

-    bool handleInput = false;    // - respond to input from the user button
-    bool handleFreeText = false; // - respond to free text input
-    bool lockRendering = false;  // - prevent other applets from being rendered during an update
-    bool lockRequests = false;   // - prevent other applets from triggering display updates
-    bool alwaysRender = false;   // - render every time the screen is updated
+    bool handleInput = false;   // - respond to input from the user button
+    bool lockRendering = false; // - prevent other applets from being rendered during an update
+    bool lockRequests = false;  // - prevent other applets from triggering display updates

    virtual void onReboot() { onShutdown(); } // - handle reboot specially
    virtual void onApplyingChanges() {}
@@ -43,4 +41,4 @@ class SystemApplet : public Applet

 }; // namespace NicheGraphics::InkHUD

-#endif
+#endif
--- a/src/graphics/niche/InkHUD/Tile.cpp
+++ b/src/graphics/niche/InkHUD/Tile.cpp
@@ -18,7 +18,7 @@ static int32_t runtaskHighlight()
    LOG_DEBUG("Dismissing Highlight");
    InkHUD::Tile::highlightShown = false;
    InkHUD::Tile::highlightTarget = nullptr;
-    InkHUD::InkHUD::getInstance()->forceUpdate(Drivers::EInk::UpdateTypes::FAST, true); // Re-render, clearing the highlighting
+    InkHUD::InkHUD::getInstance()->forceUpdate(Drivers::EInk::UpdateTypes::FAST); // Re-render, clearing the highlighting
    return taskHighlight->disable();
 }
 static void inittaskHighlight()
@@ -190,18 +190,6 @@ void InkHUD::Tile::handleAppletPixel(int16_t x, int16_t y, Color c)
    }
 }

-// Used in Renderer for clearing the tile
-int16_t InkHUD::Tile::getLeft()
-{
-    return left;
-}
-
-// Used in Renderer for clearing the tile
-int16_t InkHUD::Tile::getTop()
-{
-    return top;
-}
-
 // Called by Applet base class, when setting applet dimensions, immediately before render
 uint16_t InkHUD::Tile::getWidth()
 {
@@ -232,7 +220,7 @@ void InkHUD::Tile::requestHighlight()
 {
    Tile::highlightTarget = this;
    Tile::highlightShown = false;
-    inkhud->forceUpdate(Drivers::EInk::UpdateTypes::FAST, true);
+    inkhud->forceUpdate(Drivers::EInk::UpdateTypes::FAST);
 }

 // Starts the timer which will automatically dismiss the highlighting, if the tile doesn't organically redraw first
--- a/src/graphics/niche/InkHUD/Tile.h
+++ b/src/graphics/niche/InkHUD/Tile.h
@@ -29,8 +29,6 @@ class Tile
    void setRegion(uint8_t layoutSize, uint8_t tileIndex);                      // Assign region automatically, based on layout
    void setRegion(int16_t left, int16_t top, uint16_t width, uint16_t height); // Assign region manually
    void handleAppletPixel(int16_t x, int16_t y, Color c);                      // Receive px output from assigned applet
-    int16_t getLeft();
-    int16_t getTop();
    uint16_t getWidth();
    uint16_t getHeight();
    static uint16_t maxDisplayDimension(); // Largest possible width / height any tile may ever encounter
--- a/src/graphics/niche/InkHUD/WindowManager.cpp
+++ b/src/graphics/niche/InkHUD/WindowManager.cpp
@@ -4,7 +4,6 @@

 #include "./Applets/System/AlignStick/AlignStickApplet.h"
 #include "./Applets/System/BatteryIcon/BatteryIconApplet.h"
-#include "./Applets/System/Keyboard/KeyboardApplet.h"
 #include "./Applets/System/Logo/LogoApplet.h"
 #include "./Applets/System/Menu/MenuApplet.h"
 #include "./Applets/System/Notification/NotificationApplet.h"
@@ -149,28 +148,6 @@ void InkHUD::WindowManager::openAlignStick()
    }
 }

-void InkHUD::WindowManager::openKeyboard()
-{
-    KeyboardApplet *keyboard = (KeyboardApplet *)inkhud->getSystemApplet("Keyboard");
-
-    if (keyboard) {
-        keyboard->bringToForeground();
-        keyboardOpen = true;
-        changeLayout();
-    }
-}
-
-void InkHUD::WindowManager::closeKeyboard()
-{
-    KeyboardApplet *keyboard = (KeyboardApplet *)inkhud->getSystemApplet("Keyboard");
-
-    if (keyboard) {
-        keyboard->sendToBackground();
-        keyboardOpen = false;
-        changeLayout();
-    }
-}
-
 // On the currently focussed tile: cycle to the next available user applet
 // Applets available for this must be activated, and not already displayed on another tile
 void InkHUD::WindowManager::nextApplet()
@@ -295,6 +272,7 @@ void InkHUD::WindowManager::toggleBatteryIcon()
        batteryIcon->sendToBackground();

    // Force-render
+    // - redraw all applets
    inkhud->forceUpdate(EInk::UpdateTypes::FAST);
 }

@@ -333,25 +311,9 @@ void InkHUD::WindowManager::changeLayout()
        menu->show(ft);
    }

-    // Resize for the on-screen keyboard
-    if (keyboardOpen) {
-        // Send all user applets to the background
-        // User applets currently don't handle free text input
-        for (uint8_t i = 0; i < inkhud->userApplets.size(); i++)
-            inkhud->userApplets.at(i)->sendToBackground();
-        // Find the first system applet that can handle freetext and resize it
-        for (SystemApplet *sa : inkhud->systemApplets) {
-            if (sa->handleFreeText) {
-                const uint16_t keyboardHeight = KeyboardApplet::getKeyboardHeight();
-                sa->getTile()->setRegion(0, 0, inkhud->width(), inkhud->height() - keyboardHeight - 1);
-                break;
-            }
-        }
-    }
-
    // Force-render
    // - redraw all applets
-    inkhud->forceUpdate(EInk::UpdateTypes::FAST, true);
+    inkhud->forceUpdate(EInk::UpdateTypes::FAST);
 }

 // Perform necessary reconfiguration when user activates or deactivates applets at run-time
@@ -385,7 +347,7 @@ void InkHUD::WindowManager::changeActivatedApplets()

    // Force-render
    // - redraw all applets
-    inkhud->forceUpdate(EInk::UpdateTypes::FAST, true);
+    inkhud->forceUpdate(EInk::UpdateTypes::FAST);
 }

 // Some applets may be permitted to bring themselves to foreground, to show new data
@@ -471,10 +433,8 @@ void InkHUD::WindowManager::createSystemApplets()
    addSystemApplet("Logo", new LogoApplet, new Tile);
    addSystemApplet("Pairing", new PairingApplet, new Tile);
    addSystemApplet("Tips", new TipsApplet, new Tile);
-    if (settings->joystick.enabled) {
+    if (settings->joystick.enabled)
        addSystemApplet("AlignStick", new AlignStickApplet, new Tile);
-        addSystemApplet("Keyboard", new KeyboardApplet, new Tile);
-    }

    addSystemApplet("Menu", new MenuApplet, nullptr);

@@ -497,13 +457,9 @@ void InkHUD::WindowManager::placeSystemTiles()
    inkhud->getSystemApplet("Logo")->getTile()->setRegion(0, 0, inkhud->width(), inkhud->height());
    inkhud->getSystemApplet("Pairing")->getTile()->setRegion(0, 0, inkhud->width(), inkhud->height());
    inkhud->getSystemApplet("Tips")->getTile()->setRegion(0, 0, inkhud->width(), inkhud->height());
-    if (settings->joystick.enabled) {
+    if (settings->joystick.enabled)
        inkhud->getSystemApplet("AlignStick")->getTile()->setRegion(0, 0, inkhud->width(), inkhud->height());
-        const uint16_t keyboardHeight = KeyboardApplet::getKeyboardHeight();
-        inkhud->getSystemApplet("Keyboard")
-            ->getTile()
-            ->setRegion(0, inkhud->height() - keyboardHeight, inkhud->width(), keyboardHeight);
-    }
+
    inkhud->getSystemApplet("Notification")->getTile()->setRegion(0, 0, inkhud->width(), 20);

    const uint16_t batteryIconHeight = Applet::getHeaderHeight() - 2 - 2;
--- a/src/graphics/niche/InkHUD/WindowManager.h
+++ b/src/graphics/niche/InkHUD/WindowManager.h
@@ -31,8 +31,6 @@ class WindowManager
    void prevTile();
    void openMenu();
    void openAlignStick();
-    void openKeyboard();
-    void closeKeyboard();
    void nextApplet();
    void prevApplet();
    void rotate();
@@ -66,7 +64,6 @@ class WindowManager
    void findOrphanApplets(); // Find any applets left-behind when layout changes

    std::vector<Tile *> userTiles; // Tiles which can host user applets
-    bool keyboardOpen = false;

    // For convenience
    InkHUD *inkhud = nullptr;
--- a/src/graphics/niche/InkHUD/docs/README.md
+++ b/src/graphics/niche/InkHUD/docs/README.md
@@ -174,7 +174,7 @@ class BasicExampleApplet : public Applet
    // You must have an onRender() method
    // All drawing happens here

-    void onRender(bool full) override;
+    void onRender() override;
 };
 ```

@@ -183,7 +183,7 @@ The `onRender` method is called when the display image is redrawn. This can happ
 ```cpp
 // All drawing happens here
 // Our basic example doesn't do anything useful. It just passively prints some text.
-void InkHUD::BasicExampleApplet::onRender(bool full)
+void InkHUD::BasicExampleApplet::onRender()
 {
    printAt(0, 0, "Hello, world!");
 }
--- a/src/input/InputBroker.cpp
+++ b/src/input/InputBroker.cpp
@@ -1,59 +1,8 @@
 #include "InputBroker.h"
 #include "PowerFSM.h" // needed for event trigger
 #include "configuration.h"
-#include "graphics/Screen.h"
 #include "modules/ExternalNotificationModule.h"

-#if ARCH_PORTDUINO
-#include "input/LinuxInputImpl.h"
-#include "input/SeesawRotary.h"
-#include "platform/portduino/PortduinoGlue.h"
-#endif
-
-#if !MESHTASTIC_EXCLUDE_INPUTBROKER
-#include "input/ExpressLRSFiveWay.h"
-#include "input/RotaryEncoderImpl.h"
-#include "input/RotaryEncoderInterruptImpl1.h"
-#include "input/SerialKeyboardImpl.h"
-#include "input/UpDownInterruptImpl1.h"
-#include "input/i2cButton.h"
-#if HAS_TRACKBALL
-#include "input/TrackballInterruptImpl1.h"
-#endif
-
-#include "modules/StatusLEDModule.h"
-
-#if !MESHTASTIC_EXCLUDE_I2C
-#include "input/cardKbI2cImpl.h"
-#endif
-#include "input/kbMatrixImpl.h"
-#endif
-
-#if HAS_BUTTON || defined(ARCH_PORTDUINO)
-#include "input/ButtonThread.h"
-
-#if defined(BUTTON_PIN_TOUCH)
-ButtonThread *TouchButtonThread = nullptr;
-#if defined(TTGO_T_ECHO_PLUS) && defined(PIN_EINK_EN)
-static bool touchBacklightWasOn = false;
-static bool touchBacklightActive = false;
-#endif
-#endif
-
-#if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO)
-ButtonThread *UserButtonThread = nullptr;
-#endif
-
-#if defined(ALT_BUTTON_PIN)
-ButtonThread *BackButtonThread = nullptr;
-#endif
-
-#if defined(CANCEL_BUTTON_PIN)
-ButtonThread *CancelButtonThread = nullptr;
-#endif
-
-#endif
-
 InputBroker *inputBroker = nullptr;

 InputBroker::InputBroker()
@@ -125,262 +74,3 @@ void InputBroker::pollSoonWorker(void *p)
    vTaskDelete(NULL);
 }
 #endif
-
-void InputBroker::Init()
-{
-
-#ifdef BUTTON_PIN
-#ifdef ARCH_ESP32
-
-#if ESP_ARDUINO_VERSION_MAJOR >= 3
-#ifdef BUTTON_NEED_PULLUP
-    pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT_PULLUP);
-#else
-    pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT); // default to BUTTON_PIN
-#endif
-#else
-    pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT); // default to BUTTON_PIN
-#ifdef BUTTON_NEED_PULLUP
-    gpio_pullup_en((gpio_num_t)(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN));
-    delay(10);
-#endif
-#ifdef BUTTON_NEED_PULLUP2
-    gpio_pullup_en((gpio_num_t)BUTTON_NEED_PULLUP2);
-    delay(10);
-#endif
-#endif
-#endif
-#endif
-
-// buttons are now inputBroker, so have to come after setupModules
-#if HAS_BUTTON
-    int pullup_sense = 0;
-#ifdef INPUT_PULLUP_SENSE
-    // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
-#ifdef BUTTON_SENSE_TYPE
-    pullup_sense = BUTTON_SENSE_TYPE;
-#else
-    pullup_sense = INPUT_PULLUP_SENSE;
-#endif
-#endif
-#if defined(ARCH_PORTDUINO)
-
-    if (portduino_config.userButtonPin.enabled) {
-
-        LOG_DEBUG("Use GPIO%02d for button", portduino_config.userButtonPin.pin);
-        UserButtonThread = new ButtonThread("UserButton");
-        if (screen) {
-            ButtonConfig config;
-            config.pinNumber = (uint8_t)portduino_config.userButtonPin.pin;
-            config.activeLow = true;
-            config.activePullup = true;
-            config.pullupSense = INPUT_PULLUP;
-            config.intRoutine = []() {
-                UserButtonThread->userButton.tick();
-                UserButtonThread->setIntervalFromNow(0);
-                runASAP = true;
-                BaseType_t higherWake = 0;
-                concurrency::mainDelay.interruptFromISR(&higherWake);
-            };
-            config.singlePress = INPUT_BROKER_USER_PRESS;
-            config.longPress = INPUT_BROKER_SELECT;
-            UserButtonThread->initButton(config);
-        }
-    }
-#endif
-
-#ifdef BUTTON_PIN_TOUCH
-    TouchButtonThread = new ButtonThread("BackButton");
-    ButtonConfig touchConfig;
-    touchConfig.pinNumber = BUTTON_PIN_TOUCH;
-    touchConfig.activeLow = true;
-    touchConfig.activePullup = true;
-    touchConfig.pullupSense = pullup_sense;
-    touchConfig.intRoutine = []() {
-        TouchButtonThread->userButton.tick();
-        TouchButtonThread->setIntervalFromNow(0);
-        runASAP = true;
-        BaseType_t higherWake = 0;
-        concurrency::mainDelay.interruptFromISR(&higherWake);
-    };
-    touchConfig.singlePress = INPUT_BROKER_NONE;
-    touchConfig.longPress = INPUT_BROKER_BACK;
-#if defined(TTGO_T_ECHO_PLUS) && defined(PIN_EINK_EN)
-    // On T-Echo Plus the touch pad should only drive the backlight, not UI navigation/sounds
-    touchConfig.longPress = INPUT_BROKER_NONE;
-    touchConfig.suppressLeadUpSound = true;
-    touchConfig.onPress = []() {
-        touchBacklightWasOn = uiconfig.screen_brightness == 1;
-        if (!touchBacklightWasOn) {
-            digitalWrite(PIN_EINK_EN, HIGH);
-        }
-        touchBacklightActive = true;
-    };
-    touchConfig.onRelease = []() {
-        if (touchBacklightActive && !touchBacklightWasOn) {
-            digitalWrite(PIN_EINK_EN, LOW);
-        }
-        touchBacklightActive = false;
-    };
-#endif
-    TouchButtonThread->initButton(touchConfig);
-#endif
-
-#if defined(CANCEL_BUTTON_PIN)
-    // Buttons. Moved here cause we need NodeDB to be initialized
-    CancelButtonThread = new ButtonThread("CancelButton");
-    ButtonConfig cancelConfig;
-    cancelConfig.pinNumber = CANCEL_BUTTON_PIN;
-    cancelConfig.activeLow = CANCEL_BUTTON_ACTIVE_LOW;
-    cancelConfig.activePullup = CANCEL_BUTTON_ACTIVE_PULLUP;
-    cancelConfig.pullupSense = pullup_sense;
-    cancelConfig.intRoutine = []() {
-        CancelButtonThread->userButton.tick();
-        CancelButtonThread->setIntervalFromNow(0);
-        runASAP = true;
-        BaseType_t higherWake = 0;
-        concurrency::mainDelay.interruptFromISR(&higherWake);
-    };
-    cancelConfig.singlePress = INPUT_BROKER_CANCEL;
-    cancelConfig.longPress = INPUT_BROKER_SHUTDOWN;
-    cancelConfig.longPressTime = 4000;
-    CancelButtonThread->initButton(cancelConfig);
-#endif
-
-#if defined(ALT_BUTTON_PIN)
-    // Buttons. Moved here cause we need NodeDB to be initialized
-    BackButtonThread = new ButtonThread("BackButton");
-    ButtonConfig backConfig;
-    backConfig.pinNumber = ALT_BUTTON_PIN;
-    backConfig.activeLow = ALT_BUTTON_ACTIVE_LOW;
-    backConfig.activePullup = ALT_BUTTON_ACTIVE_PULLUP;
-    backConfig.pullupSense = pullup_sense;
-    backConfig.intRoutine = []() {
-        BackButtonThread->userButton.tick();
-        BackButtonThread->setIntervalFromNow(0);
-        runASAP = true;
-        BaseType_t higherWake = 0;
-        concurrency::mainDelay.interruptFromISR(&higherWake);
-    };
-    backConfig.singlePress = INPUT_BROKER_ALT_PRESS;
-    backConfig.longPress = INPUT_BROKER_ALT_LONG;
-    backConfig.longPressTime = 500;
-    BackButtonThread->initButton(backConfig);
-#endif
-
-#if defined(BUTTON_PIN)
-#if defined(USERPREFS_BUTTON_PIN)
-    int _pinNum = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN;
-#else
-    int _pinNum = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN;
-#endif
-#ifndef BUTTON_ACTIVE_LOW
-#define BUTTON_ACTIVE_LOW true
-#endif
-#ifndef BUTTON_ACTIVE_PULLUP
-#define BUTTON_ACTIVE_PULLUP true
-#endif
-
-    // Buttons. Moved here cause we need NodeDB to be initialized
-    // If your variant.h has a BUTTON_PIN defined, go ahead and define BUTTON_ACTIVE_LOW and BUTTON_ACTIVE_PULLUP
-    UserButtonThread = new ButtonThread("UserButton");
-    if (screen) {
-        ButtonConfig userConfig;
-        userConfig.pinNumber = (uint8_t)_pinNum;
-        userConfig.activeLow = BUTTON_ACTIVE_LOW;
-        userConfig.activePullup = BUTTON_ACTIVE_PULLUP;
-        userConfig.pullupSense = pullup_sense;
-        userConfig.intRoutine = []() {
-            UserButtonThread->userButton.tick();
-            UserButtonThread->setIntervalFromNow(0);
-            runASAP = true;
-            BaseType_t higherWake = 0;
-            concurrency::mainDelay.interruptFromISR(&higherWake);
-        };
-        userConfig.singlePress = INPUT_BROKER_USER_PRESS;
-        userConfig.longPress = INPUT_BROKER_SELECT;
-        userConfig.longPressTime = 500;
-        userConfig.longLongPress = INPUT_BROKER_SHUTDOWN;
-        UserButtonThread->initButton(userConfig);
-    } else {
-        ButtonConfig userConfigNoScreen;
-        userConfigNoScreen.pinNumber = (uint8_t)_pinNum;
-        userConfigNoScreen.activeLow = BUTTON_ACTIVE_LOW;
-        userConfigNoScreen.activePullup = BUTTON_ACTIVE_PULLUP;
-        userConfigNoScreen.pullupSense = pullup_sense;
-        userConfigNoScreen.intRoutine = []() {
-            UserButtonThread->userButton.tick();
-            UserButtonThread->setIntervalFromNow(0);
-            runASAP = true;
-            BaseType_t higherWake = 0;
-            concurrency::mainDelay.interruptFromISR(&higherWake);
-        };
-        userConfigNoScreen.singlePress = INPUT_BROKER_USER_PRESS;
-        userConfigNoScreen.longPress = INPUT_BROKER_NONE;
-        userConfigNoScreen.longPressTime = 500;
-        userConfigNoScreen.longLongPress = INPUT_BROKER_SHUTDOWN;
-        userConfigNoScreen.doublePress = INPUT_BROKER_SEND_PING;
-        userConfigNoScreen.triplePress = INPUT_BROKER_GPS_TOGGLE;
-        UserButtonThread->initButton(userConfigNoScreen);
-    }
-#endif
-#endif
-
-#if (HAS_BUTTON || ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_INPUTBROKER
-    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
-#if defined(T_LORA_PAGER)
-        // use a special FSM based rotary encoder version for T-LoRa Pager
-        rotaryEncoderImpl = new RotaryEncoderImpl();
-        if (!rotaryEncoderImpl->init()) {
-            delete rotaryEncoderImpl;
-            rotaryEncoderImpl = nullptr;
-        }
-#elif defined(INPUTDRIVER_ENCODER_TYPE) && (INPUTDRIVER_ENCODER_TYPE == 2)
-        upDownInterruptImpl1 = new UpDownInterruptImpl1();
-        if (!upDownInterruptImpl1->init()) {
-            delete upDownInterruptImpl1;
-            upDownInterruptImpl1 = nullptr;
-        }
-#else
-        rotaryEncoderInterruptImpl1 = new RotaryEncoderInterruptImpl1();
-        if (!rotaryEncoderInterruptImpl1->init()) {
-            delete rotaryEncoderInterruptImpl1;
-            rotaryEncoderInterruptImpl1 = nullptr;
-        }
-#endif
-        cardKbI2cImpl = new CardKbI2cImpl();
-        cardKbI2cImpl->init();
-#if defined(M5STACK_UNITC6L)
-        i2cButton = new i2cButtonThread("i2cButtonThread");
-#endif
-#ifdef INPUTBROKER_MATRIX_TYPE
-        kbMatrixImpl = new KbMatrixImpl();
-        kbMatrixImpl->init();
-#endif // INPUTBROKER_MATRIX_TYPE
-#ifdef INPUTBROKER_SERIAL_TYPE
-        aSerialKeyboardImpl = new SerialKeyboardImpl();
-        aSerialKeyboardImpl->init();
-#endif // INPUTBROKER_MATRIX_TYPE
-    }
-#endif // HAS_BUTTON
-#if ARCH_PORTDUINO
-    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR && portduino_config.i2cdev != "") {
-        seesawRotary = new SeesawRotary("SeesawRotary");
-        if (!seesawRotary->init()) {
-            delete seesawRotary;
-            seesawRotary = nullptr;
-        }
-        aLinuxInputImpl = new LinuxInputImpl();
-        aLinuxInputImpl->init();
-    }
-#endif
-#if !MESHTASTIC_EXCLUDE_INPUTBROKER && HAS_TRACKBALL
-    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
-        trackballInterruptImpl1 = new TrackballInterruptImpl1();
-        trackballInterruptImpl1->init(TB_DOWN, TB_UP, TB_LEFT, TB_RIGHT, TB_PRESS);
-    }
-#endif
-#ifdef INPUTBROKER_EXPRESSLRSFIVEWAY_TYPE
-    expressLRSFiveWayInput = new ExpressLRSFiveWay();
-#endif
-}
--- a/src/input/InputBroker.h
+++ b/src/input/InputBroker.h
@@ -1,7 +1,6 @@
 #pragma once

 #include "Observer.h"
-#include "concurrency/OSThread.h"
 #include "freertosinc.h"

 #ifdef InputBrokerDebug
@@ -77,7 +76,6 @@ class InputBroker : public Observable<const InputEvent *>
    void queueInputEvent(const InputEvent *event);
    void processInputEventQueue();
 #endif
-    void Init();

  protected:
    int handleInputEvent(const InputEvent *event);
@@ -91,5 +89,4 @@ class InputBroker : public Observable<const InputEvent *>
 #endif
 };

-extern InputBroker *inputBroker;
-extern bool runASAP;
+extern InputBroker *inputBroker;
--- a/src/input/SerialKeyboard.cpp
+++ b/src/input/SerialKeyboard.cpp
@@ -5,6 +5,7 @@
 SerialKeyboard *globalSerialKeyboard = nullptr;

 #ifdef INPUTBROKER_SERIAL_TYPE
+#define CANNED_MESSAGE_MODULE_ENABLE 1 // in case it's not set in the variant file

 #if INPUTBROKER_SERIAL_TYPE == 1 // It's a Chatter
 // 3 SHIFT level (lower case, upper case, numbers), up to 4 repeated presses, button number
--- a/src/input/TouchScreenBase.cpp
+++ b/src/input/TouchScreenBase.cpp
@@ -151,7 +151,7 @@ int32_t TouchScreenBase::runOnce()

 void TouchScreenBase::hapticFeedback()
 {
-#ifdef T_WATCH_S3
+#if defined(T_WATCH_S3) || defined(T_WATCH_ULTRA)
    drv.setWaveform(0, 75);
    drv.setWaveform(1, 0); // end waveform
    drv.go();
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -120,6 +120,31 @@ void printPartitionTable()
 #endif // DEBUG_PARTITION_TABLE
 #endif // ARCH_ESP32

+#if HAS_BUTTON || defined(ARCH_PORTDUINO)
+#include "input/ButtonThread.h"
+
+#if defined(BUTTON_PIN_TOUCH)
+ButtonThread *TouchButtonThread = nullptr;
+#if defined(TTGO_T_ECHO_PLUS) && defined(PIN_EINK_EN)
+static bool touchBacklightWasOn = false;
+static bool touchBacklightActive = false;
+#endif
+#endif
+
+#if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO)
+ButtonThread *UserButtonThread = nullptr;
+#endif
+
+#if defined(ALT_BUTTON_PIN)
+ButtonThread *BackButtonThread = nullptr;
+#endif
+
+#if defined(CANCEL_BUTTON_PIN)
+ButtonThread *CancelButtonThread = nullptr;
+#endif
+
+#endif
+
 #include "AmbientLightingThread.h"
 #include "PowerFSMThread.h"

@@ -354,9 +379,9 @@ void setup()
    digitalWrite(LED_POWER, LED_STATE_ON);
 #endif

-#ifdef LED_NOTIFICATION
-    pinMode(LED_NOTIFICATION, OUTPUT);
-    digitalWrite(LED_NOTIFICATION, HIGH ^ LED_STATE_ON);
+#ifdef USER_LED
+    pinMode(USER_LED, OUTPUT);
+    digitalWrite(USER_LED, HIGH ^ LED_STATE_ON);
 #endif

 #ifdef WIFI_LED
@@ -366,7 +391,11 @@ void setup()

 #ifdef BLE_LED
    pinMode(BLE_LED, OUTPUT);
-    digitalWrite(BLE_LED, LED_STATE_OFF);
+#ifdef BLE_LED_INVERTED
+    digitalWrite(BLE_LED, HIGH);
+#else
+    digitalWrite(BLE_LED, LOW);
+#endif
 #endif

    concurrency::hasBeenSetup = true;
@@ -480,6 +509,30 @@ void setup()
    LOG_INFO("Wait for peripherals to stabilize");
    delay(PERIPHERAL_WARMUP_MS);
 #endif
+
+#ifdef BUTTON_PIN
+#ifdef ARCH_ESP32
+
+#if ESP_ARDUINO_VERSION_MAJOR >= 3
+#ifdef BUTTON_NEED_PULLUP
+    pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT_PULLUP);
+#else
+    pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT); // default to BUTTON_PIN
+#endif
+#else
+    pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT); // default to BUTTON_PIN
+#ifdef BUTTON_NEED_PULLUP
+    gpio_pullup_en((gpio_num_t)(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN));
+    delay(10);
+#endif
+#ifdef BUTTON_NEED_PULLUP2
+    gpio_pullup_en((gpio_num_t)BUTTON_NEED_PULLUP2);
+    delay(10);
+#endif
+#endif
+#endif
+#endif
+
    initSPI();

    OSThread::setup();
@@ -489,9 +542,7 @@ void setup()
    // The ThinkNodes have their own blink logic
    // ledPeriodic = new Periodic("Blink", elecrowLedBlinker);
 #else
-
    ledPeriodic = new Periodic("Blink", ledBlinker);
-
 #endif

    fsInit();
@@ -832,7 +883,7 @@ void setup()
    SPI.begin();
 #endif
 #else
-        // ESP32
+// ESP32
 #if defined(HW_SPI1_DEVICE)
    SPI1.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
    LOG_DEBUG("SPI1.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
@@ -850,7 +901,7 @@ void setup()

 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||       \
    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) ||              \
-    defined(USE_SPISSD1306) || defined(USE_ST7796) || defined(HACKADAY_COMMUNICATOR)
+    defined(USE_SPISSD1306) || defined(USE_ST7796) || defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR)
        screen = new graphics::Screen(screen_found, screen_model, screen_geometry);
 #elif defined(ARCH_PORTDUINO)
        if ((screen_found.port != ScanI2C::I2CPort::NO_I2C || portduino_config.displayPanel) &&
@@ -948,9 +999,180 @@ void setup()
        nodeDB->hasWarned = true;
    }
 #endif
-#if !MESHTASTIC_EXCLUDE_INPUTBROKER
-    if (inputBroker)
-        inputBroker->Init();
+
+// buttons are now inputBroker, so have to come after setupModules
+#if HAS_BUTTON
+    int pullup_sense = 0;
+#ifdef INPUT_PULLUP_SENSE
+    // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
+#ifdef BUTTON_SENSE_TYPE
+    pullup_sense = BUTTON_SENSE_TYPE;
+#else
+    pullup_sense = INPUT_PULLUP_SENSE;
+#endif
+#endif
+#if defined(ARCH_PORTDUINO)
+
+    if (portduino_config.userButtonPin.enabled) {
+
+        LOG_DEBUG("Use GPIO%02d for button", portduino_config.userButtonPin.pin);
+        UserButtonThread = new ButtonThread("UserButton");
+        if (screen) {
+            ButtonConfig config;
+            config.pinNumber = (uint8_t)portduino_config.userButtonPin.pin;
+            config.activeLow = true;
+            config.activePullup = true;
+            config.pullupSense = INPUT_PULLUP;
+            config.intRoutine = []() {
+                UserButtonThread->userButton.tick();
+                UserButtonThread->setIntervalFromNow(0);
+                runASAP = true;
+                BaseType_t higherWake = 0;
+                mainDelay.interruptFromISR(&higherWake);
+            };
+            config.singlePress = INPUT_BROKER_USER_PRESS;
+            config.longPress = INPUT_BROKER_SELECT;
+            UserButtonThread->initButton(config);
+        }
+    }
+#endif
+
+#ifdef BUTTON_PIN_TOUCH
+    TouchButtonThread = new ButtonThread("BackButton");
+    ButtonConfig touchConfig;
+    touchConfig.pinNumber = BUTTON_PIN_TOUCH;
+    touchConfig.activeLow = true;
+    touchConfig.activePullup = true;
+    touchConfig.pullupSense = pullup_sense;
+    touchConfig.intRoutine = []() {
+        TouchButtonThread->userButton.tick();
+        TouchButtonThread->setIntervalFromNow(0);
+        runASAP = true;
+        BaseType_t higherWake = 0;
+        mainDelay.interruptFromISR(&higherWake);
+    };
+    touchConfig.singlePress = INPUT_BROKER_NONE;
+    touchConfig.longPress = INPUT_BROKER_BACK;
+#if defined(TTGO_T_ECHO_PLUS) && defined(PIN_EINK_EN)
+    // On T-Echo Plus the touch pad should only drive the backlight, not UI navigation/sounds
+    touchConfig.longPress = INPUT_BROKER_NONE;
+    touchConfig.suppressLeadUpSound = true;
+    touchConfig.onPress = []() {
+        touchBacklightWasOn = uiconfig.screen_brightness == 1;
+        if (!touchBacklightWasOn) {
+            digitalWrite(PIN_EINK_EN, HIGH);
+        }
+        touchBacklightActive = true;
+    };
+    touchConfig.onRelease = []() {
+        if (touchBacklightActive && !touchBacklightWasOn) {
+            digitalWrite(PIN_EINK_EN, LOW);
+        }
+        touchBacklightActive = false;
+    };
+#endif
+    TouchButtonThread->initButton(touchConfig);
+#endif
+
+#if defined(CANCEL_BUTTON_PIN)
+    // Buttons. Moved here cause we need NodeDB to be initialized
+    CancelButtonThread = new ButtonThread("CancelButton");
+    ButtonConfig cancelConfig;
+    cancelConfig.pinNumber = CANCEL_BUTTON_PIN;
+    cancelConfig.activeLow = CANCEL_BUTTON_ACTIVE_LOW;
+    cancelConfig.activePullup = CANCEL_BUTTON_ACTIVE_PULLUP;
+    cancelConfig.pullupSense = pullup_sense;
+    cancelConfig.intRoutine = []() {
+        CancelButtonThread->userButton.tick();
+        CancelButtonThread->setIntervalFromNow(0);
+        runASAP = true;
+        BaseType_t higherWake = 0;
+        mainDelay.interruptFromISR(&higherWake);
+    };
+    cancelConfig.singlePress = INPUT_BROKER_CANCEL;
+    cancelConfig.longPress = INPUT_BROKER_SHUTDOWN;
+    cancelConfig.longPressTime = 4000;
+    CancelButtonThread->initButton(cancelConfig);
+#endif
+
+#if defined(ALT_BUTTON_PIN)
+    // Buttons. Moved here cause we need NodeDB to be initialized
+    BackButtonThread = new ButtonThread("BackButton");
+    ButtonConfig backConfig;
+    backConfig.pinNumber = ALT_BUTTON_PIN;
+    backConfig.activeLow = ALT_BUTTON_ACTIVE_LOW;
+    backConfig.activePullup = ALT_BUTTON_ACTIVE_PULLUP;
+    backConfig.pullupSense = pullup_sense;
+    backConfig.intRoutine = []() {
+        BackButtonThread->userButton.tick();
+        BackButtonThread->setIntervalFromNow(0);
+        runASAP = true;
+        BaseType_t higherWake = 0;
+        mainDelay.interruptFromISR(&higherWake);
+    };
+    backConfig.singlePress = INPUT_BROKER_ALT_PRESS;
+    backConfig.longPress = INPUT_BROKER_ALT_LONG;
+    backConfig.longPressTime = 500;
+    BackButtonThread->initButton(backConfig);
+#endif
+
+#if defined(BUTTON_PIN)
+#if defined(USERPREFS_BUTTON_PIN)
+    int _pinNum = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN;
+#else
+    int _pinNum = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN;
+#endif
+#ifndef BUTTON_ACTIVE_LOW
+#define BUTTON_ACTIVE_LOW true
+#endif
+#ifndef BUTTON_ACTIVE_PULLUP
+#define BUTTON_ACTIVE_PULLUP true
+#endif
+
+    // Buttons. Moved here cause we need NodeDB to be initialized
+    // If your variant.h has a BUTTON_PIN defined, go ahead and define BUTTON_ACTIVE_LOW and BUTTON_ACTIVE_PULLUP
+    UserButtonThread = new ButtonThread("UserButton");
+    if (screen) {
+        ButtonConfig userConfig;
+        userConfig.pinNumber = (uint8_t)_pinNum;
+        userConfig.activeLow = BUTTON_ACTIVE_LOW;
+        userConfig.activePullup = BUTTON_ACTIVE_PULLUP;
+        userConfig.pullupSense = pullup_sense;
+        userConfig.intRoutine = []() {
+            UserButtonThread->userButton.tick();
+            UserButtonThread->setIntervalFromNow(0);
+            runASAP = true;
+            BaseType_t higherWake = 0;
+            mainDelay.interruptFromISR(&higherWake);
+        };
+        userConfig.singlePress = INPUT_BROKER_USER_PRESS;
+        userConfig.longPress = INPUT_BROKER_SELECT;
+        userConfig.longPressTime = 500;
+        userConfig.longLongPress = INPUT_BROKER_SHUTDOWN;
+        UserButtonThread->initButton(userConfig);
+    } else {
+        ButtonConfig userConfigNoScreen;
+        userConfigNoScreen.pinNumber = (uint8_t)_pinNum;
+        userConfigNoScreen.activeLow = BUTTON_ACTIVE_LOW;
+        userConfigNoScreen.activePullup = BUTTON_ACTIVE_PULLUP;
+        userConfigNoScreen.pullupSense = pullup_sense;
+        userConfigNoScreen.intRoutine = []() {
+            UserButtonThread->userButton.tick();
+            UserButtonThread->setIntervalFromNow(0);
+            runASAP = true;
+            BaseType_t higherWake = 0;
+            mainDelay.interruptFromISR(&higherWake);
+        };
+        userConfigNoScreen.singlePress = INPUT_BROKER_USER_PRESS;
+        userConfigNoScreen.longPress = INPUT_BROKER_NONE;
+        userConfigNoScreen.longPressTime = 500;
+        userConfigNoScreen.longLongPress = INPUT_BROKER_SHUTDOWN;
+        userConfigNoScreen.doublePress = INPUT_BROKER_SEND_PING;
+        userConfigNoScreen.triplePress = INPUT_BROKER_GPS_TOGGLE;
+        UserButtonThread->initButton(userConfigNoScreen);
+    }
+#endif
+
 #endif

 #ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
@@ -975,7 +1197,7 @@ void setup()
 // the current region name)
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||       \
    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) ||              \
-    defined(USE_ST7796) || defined(USE_SPISSD1306) || defined(HACKADAY_COMMUNICATOR)
+    defined(USE_ST7796) || defined(USE_SPISSD1306) || defined(CO5300_CS) || defined(HACKADAY_COMMUNICATOR)
    if (screen)
        screen->setup();
 #elif defined(ARCH_PORTDUINO)
--- a/src/mesh/LR11x0Interface.cpp
+++ b/src/mesh/LR11x0Interface.cpp
@@ -170,7 +170,7 @@ template <typename T> bool LR11x0Interface<T>::reconfigure()
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

-    err = lora.setCodingRate(cr, cr != 7); // use long interleaving except if CR is 4/7 which doesn't support it
+    err = lora.setCodingRate(cr);
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -672,7 +672,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
    strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);

 #if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR) ||      \
-     defined(ELECROW_PANEL) || defined(HELTEC_V4_TFT)) &&                                                                        \
+     defined(ELECROW_PANEL) || defined(HELTEC_V4_TFT) || defined(T_WATCH_ULTRA)) &&                                              \
    HAS_TFT
    // switch BT off by default; use TFT programming mode or hotkey to enable
    config.bluetooth.enabled = false;
@@ -750,7 +750,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
 #ifdef RAK4630
    config.display.wake_on_tap_or_motion = true;
 #endif
-#if defined(T_WATCH_S3) || defined(SENSECAP_INDICATOR)
+#if defined(T_WATCH_S3) || defined(SENSECAP_INDICATOR) || defined(T_WATCH_ULTRA)
    config.display.screen_on_secs = 30;
    config.display.wake_on_tap_or_motion = true;
 #endif
@@ -824,10 +824,16 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.external_notification.output_ms = 500;
    moduleConfig.external_notification.nag_timeout = 2;
 #endif
-#if defined(LED_NOTIFICATION)
+#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) || defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3) ||          \
+    defined(ELECROW_ThinkNode_M4) || defined(ELECROW_ThinkNode_M6)
+    // Default to PIN_LED2 for external notification output (LED color depends on device variant)
    moduleConfig.external_notification.enabled = true;
-    moduleConfig.external_notification.output = LED_NOTIFICATION;
-    moduleConfig.external_notification.active = LED_STATE_ON;
+    moduleConfig.external_notification.output = PIN_LED2;
+#if defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3)
+    moduleConfig.external_notification.active = false;
+#else
+    moduleConfig.external_notification.active = true;
+#endif
    moduleConfig.external_notification.alert_message = true;
    moduleConfig.external_notification.output_ms = 1000;
    moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs;
@@ -851,6 +857,15 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.external_notification.output_ms = 100;
    moduleConfig.external_notification.active = true;
 #endif
+#ifdef ELECROW_ThinkNode_M1
+    // Default to Elecrow USER_LED (blue)
+    moduleConfig.external_notification.enabled = true;
+    moduleConfig.external_notification.output = USER_LED;
+    moduleConfig.external_notification.active = true;
+    moduleConfig.external_notification.alert_message = true;
+    moduleConfig.external_notification.output_ms = 1000;
+    moduleConfig.external_notification.nag_timeout = 60;
+#endif
 #ifdef T_LORA_PAGER
    moduleConfig.canned_message.updown1_enabled = true;
    moduleConfig.canned_message.inputbroker_pin_a = ROTARY_A;
@@ -1404,15 +1419,6 @@ void NodeDB::loadFromDisk()
    if (portduino_config.has_configDisplayMode) {
        config.display.displaymode = (_meshtastic_Config_DisplayConfig_DisplayMode)portduino_config.configDisplayMode;
    }
-    if (portduino_config.has_statusMessage) {
-        moduleConfig.has_statusmessage = true;
-        strncpy(moduleConfig.statusmessage.node_status, portduino_config.statusMessage.c_str(),
-                sizeof(moduleConfig.statusmessage.node_status));
-        moduleConfig.statusmessage.node_status[sizeof(moduleConfig.statusmessage.node_status) - 1] = '\0';
-    }
-    if (portduino_config.enable_UDP) {
-        config.network.enabled_protocols = true;
-    }

 #endif
 }
@@ -1553,7 +1559,6 @@ bool NodeDB::saveToDiskNoRetry(int saveWhat)
        moduleConfig.has_ambient_lighting = true;
        moduleConfig.has_audio = true;
        moduleConfig.has_paxcounter = true;
-        moduleConfig.has_statusmessage = true;

        success &=
            saveProto(moduleConfigFileName, meshtastic_LocalModuleConfig_size, &meshtastic_LocalModuleConfig_msg, &moduleConfig);
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -27,7 +27,7 @@
 #include "platform/portduino/USBHal.h"
 #endif

-#ifdef ARCH_STM32WL
+#ifdef ARCH_STM32WL>
 #include "STM32WLE5JCInterface.h"
 #endif

--- a/src/mesh/ReliableRouter.cpp
+++ b/src/mesh/ReliableRouter.cpp
@@ -17,6 +17,12 @@
 ErrorCode ReliableRouter::send(meshtastic_MeshPacket *p)
 {
    if (p->want_ack) {
+        // If someone asks for acks on broadcast, we need the hop limit to be at least one, so that first node that receives our
+        // message will rebroadcast.  But asking for hop_limit 0 in that context means the client app has no preference on hop
+        // counts and we want this message to get through the whole mesh, so use the default.
+        if (p->hop_limit == 0) {
+            p->hop_limit = Default::getConfiguredOrDefaultHopLimit(config.lora.hop_limit);
+        }
        DEBUG_HEAP_BEFORE;
        auto copy = packetPool.allocCopy(*p);
        DEBUG_HEAP_AFTER("ReliableRouter::send", copy);
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -266,13 +266,6 @@ ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
            }
        }

-        // If someone asks for acks on broadcast, we need the hop limit to be at least one, so that first node that receives our
-        // message will rebroadcast.  But asking for hop_limit 0 in that context means the client app has no preference on hop
-        // counts and we want this message to get through the whole mesh, so use the default.
-        if (src == RX_SRC_USER && p->want_ack && p->hop_limit == 0) {
-            p->hop_limit = Default::getConfiguredOrDefaultHopLimit(config.lora.hop_limit);
-        }
-
        return send(p);
    }
 }
@@ -620,19 +613,15 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
            !(p->pki_encrypted != true && (strcasecmp(channels.getName(chIndex), Channels::serialChannel) == 0 ||
                                           strcasecmp(channels.getName(chIndex), Channels::gpioChannel) == 0)) &&
            // Check for valid keys and single node destination
-            config.security.private_key.size == 32 && !isBroadcast(p->to) &&
+            config.security.private_key.size == 32 && !isBroadcast(p->to) && node != nullptr &&
+            // Check for a known public key for the destination
+            (node->user.public_key.size == 32) &&
            // Some portnums either make no sense to send with PKC
            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("Use PKI!");
            if (numbytes + MESHTASTIC_HEADER_LENGTH + MESHTASTIC_PKC_OVERHEAD > MAX_LORA_PAYLOAD_LEN)
                return meshtastic_Routing_Error_TOO_LARGE;
-            // Check for a known public key for the destination
-            if (node == nullptr || node->user.public_key.size != 32) {
-                LOG_WARN("Unknown public key for destination node 0x%08x (portnum %d), refusing to send legacy DM", p->to,
-                         p->decoded.portnum);
-                return meshtastic_Routing_Error_PKI_SEND_FAIL_PUBLIC_KEY;
-            }
            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 differs from requested: 0x%02x, stored key begins 0x%02x", *p->public_key.bytes,
--- a/src/mesh/SX128xInterface.cpp
+++ b/src/mesh/SX128xInterface.cpp
@@ -126,7 +126,7 @@ template <typename T> bool SX128xInterface<T>::reconfigure()
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

-    err = lora.setCodingRate(cr, cr != 7); // use long interleaving except if CR is 4/7 which doesn't support it
+    err = lora.setCodingRate(cr);
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -905,11 +905,10 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)

 bool AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
 {
-    bool shouldReboot = true;
    // If we are in an open transaction or configuring MQTT or Serial (which have validation), defer disabling Bluetooth
    // Otherwise, disable Bluetooth to prevent the phone from interfering with the config
-    if (!hasOpenEditTransaction && !IS_ONE_OF(c.which_payload_variant, meshtastic_ModuleConfig_mqtt_tag,
-                                              meshtastic_ModuleConfig_serial_tag, meshtastic_ModuleConfig_statusmessage_tag)) {
+    if (!hasOpenEditTransaction &&
+        !IS_ONE_OF(c.which_payload_variant, meshtastic_ModuleConfig_mqtt_tag, meshtastic_ModuleConfig_serial_tag)) {
        disableBluetooth();
    }

@@ -1001,14 +1000,8 @@ bool AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
        moduleConfig.has_paxcounter = true;
        moduleConfig.paxcounter = c.payload_variant.paxcounter;
        break;
-    case meshtastic_ModuleConfig_statusmessage_tag:
-        LOG_INFO("Set module config: StatusMessage");
-        moduleConfig.has_statusmessage = true;
-        moduleConfig.statusmessage = c.payload_variant.statusmessage;
-        shouldReboot = false;
-        break;
    }
-    saveChanges(SEGMENT_MODULECONFIG, shouldReboot);
+    saveChanges(SEGMENT_MODULECONFIG);
    return true;
 }

@@ -1187,11 +1180,6 @@ void AdminModule::handleGetModuleConfig(const meshtastic_MeshPacket &req, const
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_paxcounter_tag;
            res.get_module_config_response.payload_variant.paxcounter = moduleConfig.paxcounter;
            break;
-        case meshtastic_AdminMessage_ModuleConfigType_STATUSMESSAGE_CONFIG:
-            LOG_INFO("Get module config: StatusMessage");
-            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_statusmessage_tag;
-            res.get_module_config_response.payload_variant.statusmessage = moduleConfig.statusmessage;
-            break;
        }

        // NOTE: The phone app needs to know the ls_secsvalue so it can properly expect sleep behavior.
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -130,7 +130,8 @@ CannedMessageModule::CannedMessageModule()
    : SinglePortModule("canned", meshtastic_PortNum_TEXT_MESSAGE_APP), concurrency::OSThread("CannedMessage")
 {
    this->loadProtoForModule();
-    if ((this->splitConfiguredMessages() <= 0) && (cardkb_found.address == 0x00) && !INPUTBROKER_MATRIX_TYPE) {
+    if ((this->splitConfiguredMessages() <= 0) && (cardkb_found.address == 0x00) && !INPUTBROKER_MATRIX_TYPE &&
+        !CANNED_MESSAGE_MODULE_ENABLE) {
        LOG_INFO("CannedMessageModule: No messages are configured. Module is disabled");
        this->runState = CANNED_MESSAGE_RUN_STATE_DISABLED;
        disable();
--- a/src/modules/CannedMessageModule.h
+++ b/src/modules/CannedMessageModule.h
@@ -27,6 +27,10 @@ enum CannedMessageModuleIconType { shift, backspace, space, enter };
 #define CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT 50
 #define CANNED_MESSAGE_MODULE_MESSAGES_SIZE 800

+#ifndef CANNED_MESSAGE_MODULE_ENABLE
+#define CANNED_MESSAGE_MODULE_ENABLE 0
+#endif
+
 // ============================
 //        Data Structures
 // ============================
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -442,7 +442,6 @@ ExternalNotificationModule::ExternalNotificationModule()

 ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshPacket &mp)
 {
-    // Trigger external notification if enabled and not muted; isSilenced is from temporary mute toggles
    if (moduleConfig.external_notification.enabled && !isSilenced) {
 #ifdef T_WATCH_S3
        drv.setWaveform(0, 75);
@@ -457,7 +456,6 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
            for (size_t i = 0; i < p.payload.size; i++) {
                if (p.payload.bytes[i] == ASCII_BELL) {
                    containsBell = true;
-                    break;
                }
            }

@@ -467,47 +465,90 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
            // If we receive a broadcast message, apply channel mute setting
            // If we receive a direct message and the receipent is us, apply DM mute setting
            // Else we just handle it as not muted.
-            const bool isDmToUs = !isBroadcast(mp.to) && isToUs(&mp);
-            bool is_muted = isDmToUs ? (sender && ((sender->bitfield & NODEINFO_BITFIELD_IS_MUTED_MASK) != 0))
-                                     : (ch.settings.has_module_settings && ch.settings.module_settings.is_muted);
+            const bool directToUs = !isBroadcast(mp.to) && isToUs(&mp);
+            bool is_muted = directToUs ? (sender && ((sender->bitfield & NODEINFO_BITFIELD_IS_MUTED_MASK) != 0))
+                                       : (ch.settings.has_module_settings && ch.settings.module_settings.is_muted);

-            const bool buzzerModeIsDirectOnly =
-                (config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY);
-
-            if (containsBell || !is_muted) {
-                if (moduleConfig.external_notification.alert_bell || moduleConfig.external_notification.alert_message ||
-                    moduleConfig.external_notification.alert_bell_vibra ||
-                    moduleConfig.external_notification.alert_message_vibra ||
-                    ((moduleConfig.external_notification.alert_bell_buzzer ||
-                      moduleConfig.external_notification.alert_message_buzzer) &&
-                     canBuzz())) {
-                    nagCycleCutoff = millis() + (moduleConfig.external_notification.nag_timeout
-                                                     ? (moduleConfig.external_notification.nag_timeout * 1000)
-                                                     : moduleConfig.external_notification.output_ms);
-                    LOG_INFO("Toggling nagCycleCutoff to %lu", nagCycleCutoff);
+            if (moduleConfig.external_notification.alert_bell) {
+                if (containsBell) {
+                    LOG_INFO("externalNotificationModule - Notification Bell");
                    isNagging = true;
-                }
-
-                if (moduleConfig.external_notification.alert_bell || moduleConfig.external_notification.alert_message) {
-                    LOG_INFO("externalNotificationModule - Notification Module or Bell");
                    setExternalState(0, true);
-                }
-
-                if (moduleConfig.external_notification.alert_bell_vibra ||
-                    moduleConfig.external_notification.alert_message_vibra) {
-                    LOG_INFO("externalNotificationModule - Notification Module or Bell (Vibra)");
-                    setExternalState(1, true);
-                }
-
-                if ((moduleConfig.external_notification.alert_bell_buzzer ||
-                     moduleConfig.external_notification.alert_message_buzzer) &&
-                    canBuzz()) {
-                    LOG_INFO("externalNotificationModule - Notification Module or Bell (Buzzer)");
-                    if (buzzerModeIsDirectOnly && !isDmToUs && !containsBell) {
-                        LOG_INFO("Message buzzer was suppressed because buzzer mode DIRECT_MSG_ONLY");
+                    if (moduleConfig.external_notification.nag_timeout) {
+                        nagCycleCutoff = millis() + moduleConfig.external_notification.nag_timeout * 1000;
                    } else {
-                        // Buzz if buzzer mode is not in DIRECT_MSG_ONLY or is DM to us
+                        nagCycleCutoff = millis() + moduleConfig.external_notification.output_ms;
+                    }
+                }
+            }
+
+            if (moduleConfig.external_notification.alert_bell_vibra) {
+                if (containsBell) {
+                    LOG_INFO("externalNotificationModule - Notification Bell (Vibra)");
+                    isNagging = true;
+                    setExternalState(1, true);
+                    if (moduleConfig.external_notification.nag_timeout) {
+                        nagCycleCutoff = millis() + moduleConfig.external_notification.nag_timeout * 1000;
+                    } else {
+                        nagCycleCutoff = millis() + moduleConfig.external_notification.output_ms;
+                    }
+                }
+            }
+
+            if (moduleConfig.external_notification.alert_bell_buzzer && canBuzz()) {
+                if (containsBell) {
+                    LOG_INFO("externalNotificationModule - Notification Bell (Buzzer)");
+                    isNagging = true;
+                    if (!moduleConfig.external_notification.use_pwm && !moduleConfig.external_notification.use_i2s_as_buzzer) {
+                        setExternalState(2, true);
+                    } else {
+#ifdef HAS_I2S
+                        if (moduleConfig.external_notification.use_i2s_as_buzzer) {
+                            audioThread->beginRttl(rtttlConfig.ringtone, strlen_P(rtttlConfig.ringtone));
+                        } else
+#endif
+                            if (moduleConfig.external_notification.use_pwm) {
+                            rtttl::begin(config.device.buzzer_gpio, rtttlConfig.ringtone);
+                        }
+                    }
+                    if (moduleConfig.external_notification.nag_timeout) {
+                        nagCycleCutoff = millis() + moduleConfig.external_notification.nag_timeout * 1000;
+                    } else {
+                        nagCycleCutoff = millis() + moduleConfig.external_notification.output_ms;
+                    }
+                }
+            }
+
+            if (moduleConfig.external_notification.alert_message && !is_muted) {
+                LOG_INFO("externalNotificationModule - Notification Module");
+                isNagging = true;
+                setExternalState(0, true);
+                if (moduleConfig.external_notification.nag_timeout) {
+                    nagCycleCutoff = millis() + moduleConfig.external_notification.nag_timeout * 1000;
+                } else {
+                    nagCycleCutoff = millis() + moduleConfig.external_notification.output_ms;
+                }
+            }
+
+            if (moduleConfig.external_notification.alert_message_vibra && !is_muted) {
+                LOG_INFO("externalNotificationModule - Notification Module (Vibra)");
+                isNagging = true;
+                setExternalState(1, true);
+                if (moduleConfig.external_notification.nag_timeout) {
+                    nagCycleCutoff = millis() + moduleConfig.external_notification.nag_timeout * 1000;
+                } else {
+                    nagCycleCutoff = millis() + moduleConfig.external_notification.output_ms;
+                }
+            }
+
+            if (moduleConfig.external_notification.alert_message_buzzer && !is_muted) {
+                LOG_INFO("externalNotificationModule - Notification Module (Buzzer)");
+                if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY ||
+                    (!isBroadcast(mp.to) && isToUs(&mp))) {
+                    // Buzz if buzzer mode is not in DIRECT_MSG_ONLY or is DM to us
+                    isNagging = true;
 #ifdef T_LORA_PAGER
+                    if (canBuzz()) {
                        drv.setWaveform(0, 16); // Long buzzer 100%
                        drv.setWaveform(1, 0);  // Pause
                        drv.setWaveform(2, 16);
@@ -517,7 +558,11 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
                        drv.setWaveform(6, 16);
                        drv.setWaveform(7, 0);
                        drv.go();
+                    }
 #endif
+                    if (!moduleConfig.external_notification.use_pwm && !moduleConfig.external_notification.use_i2s_as_buzzer) {
+                        setExternalState(2, true);
+                    } else {
 #ifdef HAS_I2S
                        if (moduleConfig.external_notification.use_i2s_as_buzzer) {
                            audioThread->beginRttl(rtttlConfig.ringtone, strlen_P(rtttlConfig.ringtone));
@@ -525,13 +570,18 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
 #endif
                            if (moduleConfig.external_notification.use_pwm) {
                            rtttl::begin(config.device.buzzer_gpio, rtttlConfig.ringtone);
-                        } else {
-                            setExternalState(2, true);
                        }
                    }
+                    if (moduleConfig.external_notification.nag_timeout) {
+                        nagCycleCutoff = millis() + moduleConfig.external_notification.nag_timeout * 1000;
+                    } else {
+                        nagCycleCutoff = millis() + moduleConfig.external_notification.output_ms;
+                    }
+                } else {
+                    // Don't beep if buzzer mode is "direct messages only" and it is no direct message
+                    LOG_INFO("Message buzzer was suppressed because buzzer mode DIRECT_MSG_ONLY");
                }
            }
-
            setIntervalFromNow(0); // run once so we know if we should do something
        }
    } else {
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -1,8 +1,24 @@
 #include "configuration.h"
 #if !MESHTASTIC_EXCLUDE_INPUTBROKER
 #include "buzz/BuzzerFeedbackThread.h"
-#include "modules/StatusLEDModule.h"
+#include "input/ExpressLRSFiveWay.h"
+#include "input/InputBroker.h"
+#include "input/RotaryEncoderImpl.h"
+#include "input/RotaryEncoderInterruptImpl1.h"
+#include "input/SerialKeyboardImpl.h"
+#include "input/UpDownInterruptImpl1.h"
+#include "input/i2cButton.h"
 #include "modules/SystemCommandsModule.h"
+#if HAS_TRACKBALL
+#include "input/TrackballInterruptImpl1.h"
+#endif
+
+#include "modules/StatusLEDModule.h"
+
+#if !MESHTASTIC_EXCLUDE_I2C
+#include "input/cardKbI2cImpl.h"
+#endif
+#include "input/kbMatrixImpl.h"
 #endif
 #if !MESHTASTIC_EXCLUDE_PKI
 #include "KeyVerificationModule.h"
@@ -43,6 +59,8 @@
 #include "modules/WaypointModule.h"
 #endif
 #if ARCH_PORTDUINO
+#include "input/LinuxInputImpl.h"
+#include "input/SeesawRotary.h"
 #include "modules/Telemetry/HostMetrics.h"
 #if !MESHTASTIC_EXCLUDE_STOREFORWARD
 #include "modules/StoreForwardModule.h"
@@ -90,13 +108,7 @@
 #if !MESHTASTIC_EXCLUDE_DROPZONE
 #include "modules/DropzoneModule.h"
 #endif
-#if !MESHTASTIC_EXCLUDE_STATUS
-#include "modules/StatusMessageModule.h"
-#endif

-#if defined(HAS_HARDWARE_WATCHDOG)
-#include "watchdog/watchdogThread.h"
-#endif
 /**
 * Create module instances here.  If you are adding a new module, you must 'new' it here (or somewhere else)
 */
@@ -153,9 +165,6 @@ void setupModules()
 #if !MESHTASTIC_EXCLUDE_DROPZONE
    dropzoneModule = new DropzoneModule();
 #endif
-#if !MESHTASTIC_EXCLUDE_STATUS
-    statusMessageModule = new StatusMessageModule();
-#endif
 #if !MESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE
    new GenericThreadModule();
 #endif
@@ -170,6 +179,63 @@ void setupModules()
 #endif
    // Example: Put your module here
    // new ReplyModule();
+#if (HAS_BUTTON || ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_INPUTBROKER
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
+#if defined(T_LORA_PAGER)
+        // use a special FSM based rotary encoder version for T-LoRa Pager
+        rotaryEncoderImpl = new RotaryEncoderImpl();
+        if (!rotaryEncoderImpl->init()) {
+            delete rotaryEncoderImpl;
+            rotaryEncoderImpl = nullptr;
+        }
+#elif defined(INPUTDRIVER_ENCODER_TYPE) && (INPUTDRIVER_ENCODER_TYPE == 2)
+        upDownInterruptImpl1 = new UpDownInterruptImpl1();
+        if (!upDownInterruptImpl1->init()) {
+            delete upDownInterruptImpl1;
+            upDownInterruptImpl1 = nullptr;
+        }
+#else
+        rotaryEncoderInterruptImpl1 = new RotaryEncoderInterruptImpl1();
+        if (!rotaryEncoderInterruptImpl1->init()) {
+            delete rotaryEncoderInterruptImpl1;
+            rotaryEncoderInterruptImpl1 = nullptr;
+        }
+#endif
+        cardKbI2cImpl = new CardKbI2cImpl();
+        cardKbI2cImpl->init();
+#if defined(M5STACK_UNITC6L)
+        i2cButton = new i2cButtonThread("i2cButtonThread");
+#endif
+#ifdef INPUTBROKER_MATRIX_TYPE
+        kbMatrixImpl = new KbMatrixImpl();
+        kbMatrixImpl->init();
+#endif // INPUTBROKER_MATRIX_TYPE
+#ifdef INPUTBROKER_SERIAL_TYPE
+        aSerialKeyboardImpl = new SerialKeyboardImpl();
+        aSerialKeyboardImpl->init();
+#endif // INPUTBROKER_MATRIX_TYPE
+    }
+#endif // HAS_BUTTON
+#if ARCH_PORTDUINO
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR && portduino_config.i2cdev != "") {
+        seesawRotary = new SeesawRotary("SeesawRotary");
+        if (!seesawRotary->init()) {
+            delete seesawRotary;
+            seesawRotary = nullptr;
+        }
+        aLinuxInputImpl = new LinuxInputImpl();
+        aLinuxInputImpl->init();
+    }
+#endif
+#if !MESHTASTIC_EXCLUDE_INPUTBROKER && HAS_TRACKBALL
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
+        trackballInterruptImpl1 = new TrackballInterruptImpl1();
+        trackballInterruptImpl1->init(TB_DOWN, TB_UP, TB_LEFT, TB_RIGHT, TB_PRESS);
+    }
+#endif
+#ifdef INPUTBROKER_EXPRESSLRSFIVEWAY_TYPE
+    expressLRSFiveWayInput = new ExpressLRSFiveWay();
+#endif
 #if HAS_SCREEN && !MESHTASTIC_EXCLUDE_CANNEDMESSAGES
    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
        cannedMessageModule = new CannedMessageModule();
@@ -238,9 +304,6 @@ void setupModules()
 #if !MESHTASTIC_EXCLUDE_RANGETEST && !MESHTASTIC_EXCLUDE_GPS
    if (moduleConfig.has_range_test && moduleConfig.range_test.enabled)
        new RangeTestModule();
-#endif
-#if defined(HAS_HARDWARE_WATCHDOG)
-    watchdogThread = new WatchdogThread();
 #endif
    // NOTE! This module must be added LAST because it likes to check for replies from other modules and avoid sending extra
    // acks
--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@@ -60,7 +60,7 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
        if (config.position.fixed_position) {
            LOG_DEBUG("Ignore incoming position update from myself except for time, because position.fixed_position is true");

-#ifdef T_WATCH_S3
+#if defined(T_WATCH_S3) || defined(T_WATCH_ULTRA)
            // Since we return early if position.fixed_position is true, set the T-Watch's RTC to the time received from the
            // client device here
            if (p.time && channels.getByIndex(mp.channel).role == meshtastic_Channel_Role_PRIMARY) {
--- a/src/modules/RoutingModule.cpp
+++ b/src/modules/RoutingModule.cpp
@@ -67,8 +67,6 @@ uint8_t RoutingModule::getHopLimitForResponse(const meshtastic_MeshPacket &mp)
 #if !(EVENTMODE)             // This falls through to the default.
            return hopsUsed; // If the request used more hops than the limit, use the same amount of hops
 #endif
-        } else if (mp.hop_start == 0) {
-            return 0; // The requesting node wanted 0 hops, so the response also uses a direct/local path.
        } else if ((uint8_t)(hopsUsed + 2) < config.lora.hop_limit) {
            return hopsUsed + 2; // Use only the amount of hops needed with some margin as the way back may be different
        }
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -63,25 +63,28 @@
 SerialModule *serialModule;
 SerialModuleRadio *serialModuleRadio;

-#ifndef SERIAL_PRINT_PORT
-#define SERIAL_PRINT_PORT 2
-#endif
+#if defined(TTGO_T_ECHO) || defined(TTGO_T_ECHO_PLUS) || defined(CANARYONE) || defined(MESHLINK) ||                              \
+    defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M4) || defined(ELECROW_ThinkNode_M5) ||                           \
+    defined(HELTEC_MESH_SOLAR) || defined(T_ECHO_LITE) || defined(ELECROW_ThinkNode_M3) || defined(MUZI_BASE)

-#if SERIAL_PRINT_PORT == 0
-#define SERIAL_PRINT_OBJECT Serial
-#elif SERIAL_PRINT_PORT == 1
-#define SERIAL_PRINT_OBJECT Serial1
-#elif SERIAL_PRINT_PORT == 2
-#define SERIAL_PRINT_OBJECT Serial2
-#else
-#error "Unsupported SERIAL_PRINT_PORT value. Allowed values are 0, 1, or 2."
-#endif
-
-SerialModule::SerialModule() : StreamAPI(&SERIAL_PRINT_OBJECT), concurrency::OSThread("Serial")
+SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("Serial")
 {
    api_type = TYPE_SERIAL;
 }
-static Print *serialPrint = &SERIAL_PRINT_OBJECT;
+static Print *serialPrint = &Serial;
+#elif defined(CONFIG_IDF_TARGET_ESP32C6) || defined(RAK3172) || defined(EBYTE_E77_MBL)
+SerialModule::SerialModule() : StreamAPI(&Serial1), concurrency::OSThread("Serial")
+{
+    api_type = TYPE_SERIAL;
+}
+static Print *serialPrint = &Serial1;
+#else
+SerialModule::SerialModule() : StreamAPI(&Serial2), concurrency::OSThread("Serial")
+{
+    api_type = TYPE_SERIAL;
+}
+static Print *serialPrint = &Serial2;
+#endif

 char serialBytes[512];
 size_t serialPayloadSize;
@@ -202,7 +205,9 @@ int32_t SerialModule::runOnce()
                Serial.begin(baud);
                Serial.setTimeout(moduleConfig.serial.timeout > 0 ? moduleConfig.serial.timeout : TIMEOUT);
            }
-#elif SERIAL_PRINT_PORT != 0
+#elif !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) &&                     \
+    !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M4) &&  \
+    !defined(ELECROW_ThinkNode_M5) && !defined(MUZI_BASE)

            if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
 #ifdef ARCH_RP2040
@@ -259,7 +264,9 @@ int32_t SerialModule::runOnce()
                }
            }

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

@@ -533,7 +540,11 @@ ParsedLine parseLine(const char *line)
 */
 void SerialModule::processWXSerial()
 {
-#if SERIAL_PRINT_PORT != 0 && !defined(ARCH_STM32WL) && !defined(CONFIG_IDF_TARGET_ESP32C6)
+#if !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) &&                       \
+    !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) &&                               \
+    !defined(ELECROW_ThinkNode_M3) && \ 
+    !defined(ELECROW_ThinkNode_M4) &&                                                                                            \
+    !defined(ELECROW_ThinkNode_M5) && !defined(ARCH_STM32WL) && !defined(MUZI_BASE)

    static unsigned int lastAveraged = 0;
    static unsigned int averageIntervalMillis = 300000; // 5 minutes hard coded.
--- a/src/modules/StatusLEDModule.cpp
+++ b/src/modules/StatusLEDModule.cpp
@@ -130,6 +130,7 @@ int32_t StatusLEDModule::runOnce()
 #ifdef LED_CHARGE
    digitalWrite(LED_CHARGE, CHARGE_LED_state);
 #endif
+    // digitalWrite(green_LED_PIN, LED_STATE_OFF);
 #ifdef LED_PAIRING
    digitalWrite(LED_PAIRING, PAIRING_LED_state);
 #endif
--- a/src/modules/StatusMessageModule.cpp
+++ b/src/modules/StatusMessageModule.cpp
@@ -1,41 +0,0 @@
-#if !MESHTASTIC_EXCLUDE_STATUS
-
-#include "StatusMessageModule.h"
-#include "MeshService.h"
-#include "ProtobufModule.h"
-
-StatusMessageModule *statusMessageModule;
-
-int32_t StatusMessageModule::runOnce()
-{
-    if (moduleConfig.has_statusmessage && moduleConfig.statusmessage.node_status[0] != '\0') {
-        // create and send message with the status message set
-        meshtastic_StatusMessage ourStatus = meshtastic_StatusMessage_init_zero;
-        strncpy(ourStatus.status, moduleConfig.statusmessage.node_status, sizeof(ourStatus.status));
-        ourStatus.status[sizeof(ourStatus.status) - 1] = '\0'; // ensure null termination
-        meshtastic_MeshPacket *p = allocDataPacket();
-        p->decoded.payload.size = pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes),
-                                                     meshtastic_StatusMessage_fields, &ourStatus);
-        p->to = NODENUM_BROADCAST;
-        p->decoded.want_response = false;
-        p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
-        p->channel = 0;
-        service->sendToMesh(p);
-    }
-
-    return 1000 * 12 * 60 * 60;
-}
-
-ProcessMessage StatusMessageModule::handleReceived(const meshtastic_MeshPacket &mp)
-{
-    if (mp.which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
-        meshtastic_StatusMessage incomingMessage;
-        if (pb_decode_from_bytes(mp.decoded.payload.bytes, mp.decoded.payload.size, meshtastic_StatusMessage_fields,
-                                 &incomingMessage)) {
-            LOG_INFO("Received a NodeStatus message %s", incomingMessage.status);
-        }
-    }
-    return ProcessMessage::CONTINUE;
-}
-
-#endif
--- a/src/modules/StatusMessageModule.h
+++ b/src/modules/StatusMessageModule.h
@@ -1,35 +0,0 @@
-#pragma once
-#if !MESHTASTIC_EXCLUDE_STATUS
-#include "SinglePortModule.h"
-#include "configuration.h"
-
-class StatusMessageModule : public SinglePortModule, private concurrency::OSThread
-{
-
-  public:
-    /** Constructor
-     * name is for debugging output
-     */
-    StatusMessageModule()
-        : SinglePortModule("statusMessage", meshtastic_PortNum_NODE_STATUS_APP), concurrency::OSThread("StatusMessage")
-    {
-        if (moduleConfig.has_statusmessage && moduleConfig.statusmessage.node_status[0] != '\0') {
-            this->setInterval(2 * 60 * 1000);
-        } else {
-            this->setInterval(1000 * 12 * 60 * 60);
-        }
-        // TODO: If we have a string, set the initial delay (15 minutes maybe)
-    }
-
-    virtual int32_t runOnce() override;
-
-  protected:
-    /** Called to handle a particular incoming message
-     */
-    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
-
-  private:
-};
-
-extern StatusMessageModule *statusMessageModule;
-#endif
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -529,46 +529,37 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPac

 bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m)
 {
-    bool valid = false;
+    bool valid = true;
    bool hasSensor = false;
-    // getMetrics() doesn't always get evaluated because of
-    // short-circuit evaluation rules in c++
-    bool get_metrics;
    m->time = getTime();
    m->which_variant = meshtastic_Telemetry_environment_metrics_tag;
    m->variant.environment_metrics = meshtastic_EnvironmentMetrics_init_zero;

    for (TelemetrySensor *sensor : sensors) {
-        get_metrics = sensor->getMetrics(m); // avoid short-circuit evaluation rules
-        valid = valid || get_metrics;
+        valid = valid && sensor->getMetrics(m);
        hasSensor = true;
    }

 #ifndef T1000X_SENSOR_EN
    if (ina219Sensor.hasSensor()) {
-        get_metrics = ina219Sensor.getMetrics(m);
-        valid = valid || get_metrics;
+        valid = valid && ina219Sensor.getMetrics(m);
        hasSensor = true;
    }
    if (ina260Sensor.hasSensor()) {
-        get_metrics = ina260Sensor.getMetrics(m);
-        valid = valid || get_metrics;
+        valid = valid && ina260Sensor.getMetrics(m);
        hasSensor = true;
    }
    if (ina3221Sensor.hasSensor()) {
-        get_metrics = ina3221Sensor.getMetrics(m);
-        valid = valid || get_metrics;
+        valid = valid && ina3221Sensor.getMetrics(m);
        hasSensor = true;
    }
    if (max17048Sensor.hasSensor()) {
-        get_metrics = max17048Sensor.getMetrics(m);
-        valid = valid || get_metrics;
+        valid = valid && max17048Sensor.getMetrics(m);
        hasSensor = true;
    }
 #endif
 #ifdef HAS_RAKPROT
-    get_metrics = rak9154Sensor.getMetrics(m);
-    valid = valid || get_metrics;
+    valid = valid && rak9154Sensor.getMetrics(m);
    hasSensor = true;
 #endif
    return valid && hasSensor;
--- a/src/modules/Telemetry/HealthTelemetry.cpp
+++ b/src/modules/Telemetry/HealthTelemetry.cpp
@@ -168,21 +168,18 @@ bool HealthTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &

 bool HealthTelemetryModule::getHealthTelemetry(meshtastic_Telemetry *m)
 {
-    bool valid = false;
+    bool valid = true;
    bool hasSensor = false;
-    bool get_metrics;
    m->time = getTime();
    m->which_variant = meshtastic_Telemetry_health_metrics_tag;
    m->variant.health_metrics = meshtastic_HealthMetrics_init_zero;

    if (max30102Sensor.hasSensor()) {
-        get_metrics = max30102Sensor.getMetrics(m);
-        valid = valid || get_metrics; // avoid short-circuit evaluation rules
+        valid = valid && max30102Sensor.getMetrics(m);
        hasSensor = true;
    }
    if (mlx90614Sensor.hasSensor()) {
-        get_metrics = mlx90614Sensor.getMetrics(m);
-        valid = valid || get_metrics;
+        valid = valid && mlx90614Sensor.getMetrics(m);
        hasSensor = true;
    }

--- a/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/RAK12035Sensor.cpp
@@ -26,7 +26,7 @@ bool RAK12035Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
    sensor.get_sensor_version(&data);
    if (data != 0) {
        LOG_INFO("Init sensor: %s", sensorName);
-        LOG_INFO("RAK12035Sensor Init Succeed \nSensor Firmware version: %i, Sensor Name: %s", data, sensorName);
+        LOG_INFO("RAK12035Sensor Init Succeed \nSensor1 Firmware version: %i, Sensor Name: %s", data, sensorName);
        status = true;
        sensor.sensor_sleep();
        RESTORE_3V3_POWER();
@@ -49,39 +49,33 @@ void RAK12035Sensor::setup()
    // TODO:: Check for and run calibration check for up to 2 additional sensors if present.
    uint16_t zero_val = 0;
    uint16_t hundred_val = 0;
-    const uint16_t default_zero_val = 510;
-    const uint16_t default_hundred_val = 390;
-
+    uint16_t default_zero_val = 550;
+    uint16_t default_hundred_val = 420;
    sensor.sensor_on();
-    sensor.begin();
    delay(200);
    sensor.get_dry_cal(&zero_val);
-    delay(200);
    sensor.get_wet_cal(&hundred_val);
    delay(200);
-
-    bool calibrationReset = false;
-
-    if (zero_val == 0) {
-        LOG_INFO("Dry calibration not set, using default: %d", default_zero_val);
+    if (zero_val == 0 || zero_val <= hundred_val) {
+        LOG_INFO("Dry calibration value is %d", zero_val);
+        LOG_INFO("Wet calibration value is %d", hundred_val);
+        LOG_INFO("This does not make sense. You can recalibrate this sensor using the calibration sketch included here: "
+                 "https://github.com/RAKWireless/RAK12035_SoilMoisture.");
+        LOG_INFO("For now, setting default calibration value for Dry Calibration: %d", default_zero_val);
        sensor.set_dry_cal(default_zero_val);
-        delay(200);
-        zero_val = default_zero_val;
-        calibrationReset = true;
+        sensor.get_dry_cal(&zero_val);
+        LOG_INFO("Dry calibration reset complete. New value is %d", zero_val);
    }
    if (hundred_val == 0 || hundred_val >= zero_val) {
-        LOG_INFO("Wet calibration not set, using default: %d", default_hundred_val);
+        LOG_INFO("Dry calibration value is %d", zero_val);
+        LOG_INFO("Wet calibration value is %d", hundred_val);
+        LOG_INFO("This does not make sense. You can recalibrate this sensor using the calibration sketch included here: "
+                 "https://github.com/RAKWireless/RAK12035_SoilMoisture.");
+        LOG_INFO("For now, setting default calibration value for Wet Calibration: %d", default_hundred_val);
        sensor.set_wet_cal(default_hundred_val);
-        delay(200);
-        hundred_val = default_hundred_val;
-        calibrationReset = true;
+        sensor.get_wet_cal(&hundred_val);
+        LOG_INFO("Wet calibration reset complete. New value is %d", hundred_val);
    }
-    if (calibrationReset) {
-        LOG_INFO("Default calibration values applied. Consider running the calibration sketch for better accuracy: "
-                 "https://github.com/RAKWireless/RAK12035_SoilMoisture");
-    }
-
-    LOG_INFO("Dry calibration value: %d, Wet calibration value: %d", zero_val, hundred_val);
    sensor.sensor_sleep();
    RESTORE_3V3_POWER();
    delay(200);
--- a/src/nimble/NimbleBluetooth.cpp
+++ b/src/nimble/NimbleBluetooth.cpp
@@ -686,9 +686,6 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
 #ifdef NIMBLE_TWO
        if (ble->isDeInit)
            return;
-#else
-        if (nimbleBluetooth && nimbleBluetooth->isDeInit)
-            return;
 #endif

        meshtastic::BluetoothStatus newStatus(meshtastic::BluetoothStatus::ConnectionState::DISCONNECTED);
@@ -757,7 +754,11 @@ void NimbleBluetooth::deinit()
    isDeInit = true;

 #ifdef BLE_LED
-    digitalWrite(BLE_LED, LED_STATE_OFF);
+#ifdef BLE_LED_INVERTED
+    digitalWrite(BLE_LED, HIGH);
+#else
+    digitalWrite(BLE_LED, LOW);
+#endif
 #endif
 #ifndef NIMBLE_TWO
    NimBLEDevice::deinit();
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -33,6 +33,9 @@
 #ifndef HAS_RADIO
 #define HAS_RADIO 1
 #endif
+#ifndef HAS_RTC
+#define HAS_RTC 1
+#endif
 #ifndef HAS_CPU_SHUTDOWN
 #define HAS_CPU_SHUTDOWN 1
 #endif
@@ -202,6 +205,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_M5STACK_C6L
 #elif defined(HELTEC_WIRELESS_TRACKER_V2)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER_V2
+#elif defined(T_WATCH_ULTRA)
+#define HW_VENDOR meshtastic_HardwareModel_T_WATCH_ULTRA
 #else
 #define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
 #endif
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/src/platform/portduino/PortduinoGlue.cpp
@@ -872,7 +872,6 @@ bool loadConfig(const char *configPath)
        }

        if (yamlConfig["Config"]) {
-            portduino_config.has_config_overrides = true;
            if (yamlConfig["Config"]["DisplayMode"]) {
                portduino_config.has_configDisplayMode = true;
                if ((yamlConfig["Config"]["DisplayMode"]).as<std::string>("") == "TWOCOLOR") {
@@ -885,13 +884,6 @@ bool loadConfig(const char *configPath)
                    portduino_config.configDisplayMode = meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT;
                }
            }
-            if (yamlConfig["Config"]["StatusMessage"]) {
-                portduino_config.has_statusMessage = true;
-                portduino_config.statusMessage = (yamlConfig["Config"]["StatusMessage"]).as<std::string>("");
-            }
-            if ((yamlConfig["Config"]["EnableUDP"]).as<bool>(false)) {
-                portduino_config.enable_UDP = true;
-            }
        }

        if (yamlConfig["General"]) {
--- a/src/platform/portduino/PortduinoGlue.h
+++ b/src/platform/portduino/PortduinoGlue.h
@@ -177,12 +177,8 @@ extern struct portduino_config_struct {
    int hostMetrics_channel = 0;

    // config
-    bool has_config_overrides = false;
    int configDisplayMode = 0;
    bool has_configDisplayMode = false;
-    std::string statusMessage = "";
-    bool has_statusMessage = false;
-    bool enable_UDP = false;

    // General
    std::string mac_address = "";
@@ -509,30 +505,21 @@ extern struct portduino_config_struct {
        }

        // config
-        if (has_config_overrides) {
+        if (has_configDisplayMode) {
            out << YAML::Key << "Config" << YAML::Value << YAML::BeginMap;
-            if (has_configDisplayMode) {
-
-                switch (configDisplayMode) {
-                case meshtastic_Config_DisplayConfig_DisplayMode_TWOCOLOR:
-                    out << YAML::Key << "DisplayMode" << YAML::Value << "TWOCOLOR";
-                    break;
-                case meshtastic_Config_DisplayConfig_DisplayMode_INVERTED:
-                    out << YAML::Key << "DisplayMode" << YAML::Value << "INVERTED";
-                    break;
-                case meshtastic_Config_DisplayConfig_DisplayMode_COLOR:
-                    out << YAML::Key << "DisplayMode" << YAML::Value << "COLOR";
-                    break;
-                case meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT:
-                    out << YAML::Key << "DisplayMode" << YAML::Value << "DEFAULT";
-                    break;
-                }
-            }
-            if (has_statusMessage) {
-                out << YAML::Key << "StatusMessage" << YAML::Value << statusMessage;
-            }
-            if (enable_UDP) {
-                out << YAML::Key << "EnableUDP" << YAML::Value << true;
+            switch (configDisplayMode) {
+            case meshtastic_Config_DisplayConfig_DisplayMode_TWOCOLOR:
+                out << YAML::Key << "DisplayMode" << YAML::Value << "TWOCOLOR";
+                break;
+            case meshtastic_Config_DisplayConfig_DisplayMode_INVERTED:
+                out << YAML::Key << "DisplayMode" << YAML::Value << "INVERTED";
+                break;
+            case meshtastic_Config_DisplayConfig_DisplayMode_COLOR:
+                out << YAML::Key << "DisplayMode" << YAML::Value << "COLOR";
+                break;
+            case meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT:
+                out << YAML::Key << "DisplayMode" << YAML::Value << "DEFAULT";
+                break;
            }

            out << YAML::EndMap; // Config
--- a/src/platform/portduino/architecture.h
+++ b/src/platform/portduino/architecture.h
@@ -17,6 +17,9 @@
 #ifndef HAS_RADIO
 #define HAS_RADIO 1
 #endif
+#ifndef HAS_RTC
+#define HAS_RTC 1
+#endif
 #ifndef HAS_TELEMETRY
 #define HAS_TELEMETRY 1
 #endif
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -241,6 +241,7 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false, bool skipSaveN
 #ifdef PIN_POWER_EN
    digitalWrite(PIN_POWER_EN, LOW);
    pinMode(PIN_POWER_EN, INPUT); // power off peripherals
+    // pinMode(PIN_POWER_EN1, INPUT_PULLDOWN);
 #endif

 #ifdef RAK_WISMESH_TAP_V2
@@ -338,7 +339,7 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false, bool skipSaveN
                // t-beam v1.2 radio power channel
                PMU->disablePowerOutput(XPOWERS_ALDO2); // lora radio power channel
            } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE ||
-                       HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3) {
+                       HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3 || HW_VENDOR == meshtastic_HardwareModel_T_WATCH_ULTRA) {
                PMU->disablePowerOutput(XPOWERS_ALDO3); // lora radio power channel
            }
        } else if (model == XPOWERS_AXP192) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Manuel	db4a097303	Merge branch 'develop' into t-watch-ultra	2026-01-28 10:37:01 +01:00
Manuel	dc212b08ac	Merge branch 'develop' into t-watch-ultra	2026-01-27 16:14:20 +01:00
Manuel	93f05406c4	update device-ui / touch handling	2026-01-27 16:13:46 +01:00
Manuel	147299e44f	Merge branch 'develop' into t-watch-ultra	2026-01-27 13:38:09 +01:00
Manuel	bd7ebd946a	earlyInitVariant() adaptations acc. #9438	2026-01-27 13:36:59 +01:00
Manuel	e4314904be	Merge branch 'develop' into t-watch-ultra	2026-01-27 12:53:09 +01:00
Manuel	42a20016d9	Merge branch 'develop' into t-watch-ultra	2026-01-23 23:53:24 +01:00
Manuel	6015b05c09	update LovyanGFX 1.2.19	2026-01-23 23:52:48 +01:00
Manuel	083c65e42b	Merge branch 'develop' into t-watch-ultra	2026-01-20 01:04:50 +01:00
Manuel	b38cbf9a40	init lora RF switch	2026-01-20 00:21:19 +01:00
Manuel	ad819321f7	haptic touch (only BaseUI)	2026-01-20 00:20:34 +01:00
Manuel	3529c0bce2	trySetRTC when fixedPosition	2026-01-20 00:01:19 +01:00
Manuel	8ee5407db5	fix NodeDB defaults	2026-01-20 00:00:33 +01:00
Manuel	65d4adb7c2	power off lora	2026-01-20 00:00:07 +01:00
Manuel	0cda4eb675	PMU cosmetics	2026-01-19 23:59:49 +01:00
Manuel	7763469c62	update amoled driver reference	2026-01-19 13:34:24 +01:00
Manuel	f158964d5e	trunk fmt	2026-01-19 01:10:35 +01:00
Manuel	a8af68844c	update to device-ui	2026-01-19 00:51:53 +01:00
Manuel	e8153ca6c2	Merge branch 'develop' into t-watch-ultra	2026-01-18 23:26:31 +01:00
Manuel	b905766c6a	Merge branch 'develop' into t-watch-ultra	2026-01-11 11:50:06 +01:00
Manuel	9f8311ffd5	Merge branch 'develop' into t-watch-ultra	2025-10-21 10:17:13 +02:00
Manuel	efd2ca9c06	Merge branch 'develop' into t-watch-ultra	2025-10-10 20:04:37 +02:00
Manuel	19e62b8686	add framebuffer	2025-10-04 12:36:31 +02:00
Manuel	fb46938582	fix init touch controller	2025-10-04 12:35:31 +02:00
Manuel	4776631ba8	Merge branch 'develop' into t-watch-ultra	2025-10-04 08:22:06 +02:00
Manuel	295b8b6db5	Merge branch 'develop' into t-watch-ultra	2025-10-03 23:09:01 +02:00
Manuel	82123b1519	Merge branch 'develop' into t-watch-ultra	2025-10-03 13:34:24 +02:00
mverch67	d5bb3db4ed	feat: T-Watch Ultra support	2025-09-30 20:05:22 +02:00