initial setup for lora

chasing the release

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
   "features": {
     "ghcr.io/devcontainers/features/python:1": {
       "installTools": true,
-      "version": "3.14"
+      "version": "3.13"
     }
   },
   "customizations": {

.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
-            });

.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] });

.vscode/extensions.json

@@ -1,10 +1,9 @@
 {
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
     "recommendations": [
-        "platformio.platformio-ide"
+        "pioarduino.pioarduino-ide"
     ],
     "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
+        "ms-vscode.cpptools-extension-pack",
+        "platformio.platformio-ide"
     ]
 }

bin/build-esp32.sh

@@ -33,7 +33,7 @@ echo "Copying ESP32 update bin file"
 cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin
 
 echo "Copying Filesystem for ESP32 targets"
-cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin
+cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin || true
 cp bin/device-install.* $OUTDIR/
 cp bin/device-update.* $OUTDIR/
 

bin/config.d/lora-usb-umesh-1262-30dbm.yaml

@@ -1,23 +0,0 @@
-Lora:
-  Module: sx1262
-  CS: 0
-  IRQ: 6
-  Reset: 1
-  Busy: 4
-  RXen: 2
-  DIO2_AS_RF_SWITCH: true
-  spidev: ch341
-  USB_PID: 0x5512
-  USB_VID: 0x1A86
-  DIO3_TCXO_VOLTAGE: true
-#  USB_Serialnum: 12345678
-  SX126X_MAX_POWER: 22
-# Reduce output power to improve EMI
-  NUM_PA_POINTS: 22
-  TX_GAIN_LORA: 12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 8, 8, 7
-# Note: This module integrates an additional PA to achieve higher output power.
-# The 'power' parameter here does not represent the actual RF output.
-# TX_GAIN_LORA defines the gain offset applied at each SX1262 input power step (1–22 dBm).
-# Each array element corresponds to the additional gain when that input level is set,
-# The effective RF output is: Pout ≈ Pset + TX_GAIN_LORA[index].
-# Please refer to https://github.com/linser233/uMesh/blob/main/RF_Power.md for detailed information.

bin/config.d/lora-usb-umesh-1262.yaml

@@ -0,0 +1,15 @@
+Lora:
+  Module: sx1262
+  CS: 0
+  IRQ: 6
+  Reset: 1
+  Busy: 4
+  RXen: 2
+  DIO2_AS_RF_SWITCH: true
+  spidev: ch341
+  USB_PID: 0x5512
+  USB_VID: 0x1A86
+  DIO3_TCXO_VOLTAGE: true
+#  USB_Serialnum: 12345678
+  SX126X_MAX_POWER: 30
+# Reduce output power to improve EMI

bin/config.d/lora-usb-umesh-1268-30dbm.yaml

@@ -1,23 +0,0 @@
-Lora:
-  Module: sx1268
-  CS: 0
-  IRQ: 6
-  Reset: 1
-  Busy: 4
-  RXen: 2
-  DIO2_AS_RF_SWITCH: true
-  spidev: ch341
-  USB_PID: 0x5512
-  USB_VID: 0x1A86
-  DIO3_TCXO_VOLTAGE: true
-#  USB_Serialnum: 12345678
-  SX126X_MAX_POWER: 22
-# Reduce output power to improve EMI
-  NUM_PA_POINTS: 22
-  TX_GAIN_LORA: 12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 8, 8, 7
-# Note: This module integrates an additional PA to achieve higher output power.
-# The 'power' parameter here does not represent the actual RF output.
-# TX_GAIN_LORA defines the gain offset applied at each SX1262 input power step (1–22 dBm).
-# Each array element corresponds to the additional gain when that input level is set,
-# The effective RF output is: Pout ≈ Pset + TX_GAIN_LORA[index].
-# Please refer to https://github.com/linser233/uMesh/blob/main/RF_Power.md for detailed information.

bin/config.d/lora-usb-umesh-1268.yaml

@@ -0,0 +1,15 @@
+Lora:
+  Module: sx1268
+  CS: 0
+  IRQ: 6
+  Reset: 1
+  Busy: 4
+  RXen: 2
+  DIO2_AS_RF_SWITCH: true
+  spidev: ch341
+  USB_PID: 0x5512
+  USB_VID: 0x1A86
+  DIO3_TCXO_VOLTAGE: true
+#  USB_Serialnum: 12345678
+  SX126X_MAX_POWER: 30
+# Reduce output power to improve EMI

bin/device-install.bat

@@ -156,8 +156,16 @@ IF %BPS_RESET% EQU 1 (
 SET "PROGNAME=!FILENAME:.factory.bin=!"
 CALL :LOG_MESSAGE DEBUG "Computed PROGNAME: !PROGNAME!"
 
-@REM Determine OTA filename based on MCU type (unified OTA format)
-SET "OTA_FILENAME=mt-!MCU!-ota.bin"
+IF "__!MCU!__" == "__esp32s3__" (
+    @REM We are working with ESP32-S3
+    SET "OTA_FILENAME=bleota-s3.bin"
+) ELSE IF "__!MCU!__" == "__esp32c3__" (
+    @REM We are working with ESP32-C3
+    SET "OTA_FILENAME=bleota-c3.bin"
+) ELSE (
+    @REM Everything else
+    SET "OTA_FILENAME=bleota.bin"
+)
 CALL :LOG_MESSAGE DEBUG "Set OTA_FILENAME to: !OTA_FILENAME!"
 
 @REM Set SPIFFS filename with "littlefs-" prefix.

bin/device-install.sh

@@ -131,8 +131,14 @@ if [[ -f "$FILENAME" && "$FILENAME" == *.factory.bin ]]; then
         exit 1
     fi
 
-    # Determine OTA filename based on MCU type (unified OTA format)
-    OTAFILE="mt-${MCU}-ota.bin"
+    # Determine OTA filename based on MCU type
+    if [ "$MCU" == "esp32s3" ]; then
+        OTAFILE=bleota-s3.bin
+    elif [ "$MCU" == "esp32c3" ]; then
+        OTAFILE=bleota-c3.bin
+    else
+        OTAFILE=bleota.bin
+    fi
 
     # Set SPIFFS filename with "littlefs-" prefix.
     SPIFFSFILE="littlefs-${PROGNAME/firmware-/}.bin"

bin/platformio-custom.py

@@ -301,7 +301,8 @@ if not should_skip_manifest and platform.name == "espressif32":
     target_lfs = env.DataToBin(
         join("$BUILD_DIR", "${ESP32_FS_IMAGE_NAME}"), "$PROJECT_DATA_DIR"
     )
-    mtjson_deps.append(target_lfs)
+    # prepend the littlefs target to the mtjson dependencies
+    # mtjson_deps.insert(0, target_lfs)
 
 if should_skip_manifest:
     def skip_manifest(source, target, env):

boards/CDEBYTE_EoRa-S3.json

@@ -7,7 +7,7 @@
     "extra_flags": [
       "-D CDEBYTE_EORA_S3",
       "-D ARDUINO_USB_CDC_ON_BOOT=1",
-      "-D ARDUINO_USB_MODE=0",
+      "-D ARDUINO_USB_MODE=1",
       "-D ARDUINO_RUNNING_CORE=1",
       "-D ARDUINO_EVENT_RUNNING_CORE=1",
       "-D BOARD_HAS_PSRAM"

boards/bpi_picow_esp32_s3.json

@@ -6,7 +6,7 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1",
       "-DBOARD_HAS_PSRAM"

boards/hackaday-communicator.json

@@ -8,7 +8,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/heltec_vision_master_e213.json

@@ -9,7 +9,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/heltec_vision_master_e290.json

@@ -9,7 +9,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/heltec_vision_master_t190.json

@@ -9,7 +9,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/heltec_wireless_tracker.json

@@ -8,7 +8,7 @@
     "extra_flags": [
       "-DHELTEC_WIRELESS_TRACKER",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/heltec_wireless_tracker_v2.json

@@ -7,7 +7,7 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/minimesh_lite.json

@@ -1,50 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DMINIMESH_LITE -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x8029"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"]
-    ],
-    "usb_product": "Minimesh Lite",
-    "mcu": "nrf52840",
-    "variant": "dls_Minimesh_Lite",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd"
-  },
-  "frameworks": ["arduino"],
-  "name": "Minimesh Lite",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["nrfutil", "jlink", "nrfjprog", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://deeplabstudio.com",
-  "vendor": "Deeplab Studio"
-}

boards/seeed-xiao-s3.json

@@ -8,7 +8,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=0"
     ],

boards/station-g2.json

@@ -8,7 +8,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=0"
     ],

boards/t-beam-1w.json

@@ -9,7 +9,7 @@
       "-DBOARD_HAS_PSRAM",
       "-DLILYGO_TBEAM_1W",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/t-deck.json

@@ -8,7 +8,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/tbeam-s3-core.json

@@ -8,7 +8,7 @@
       "-DBOARD_HAS_PSRAM",
       "-DLILYGO_TBEAM_S3_CORE",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/tlora-t3s3-v1.json

@@ -7,7 +7,7 @@
     "extra_flags": [
       "-DLILYGO_T3S3_V1",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1",
       "-DBOARD_HAS_PSRAM"

boards/unphone.json

@@ -10,7 +10,7 @@
       "-DBOARD_HAS_PSRAM",
       "-DUNPHONE_SPIN=9",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

default_16MB.csv

@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x640000,
+app1,     app,  ota_1,   0x650000,0x640000,
+spiffs,   data, spiffs,  0xc90000,0x360000,
+coredump, data, coredump,0xFF0000,0x10000,

default_8MB.csv

@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x330000,
+app1,     app,  ota_1,   0x340000,0x330000,
+spiffs,   data, spiffs,  0x670000,0x180000,
+coredump, data, coredump,0x7F0000,0x10000,

extra_scripts/esp32_extra.py

@@ -70,17 +70,6 @@ def esp32_create_combined_bin(source, target, env):
 
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
 
-esp32_kind = env.GetProjectOption("custom_esp32_kind")
-if esp32_kind == "esp32":
-    # Free up some IRAM by removing auxiliary SPI flash chip drivers.
-    # Wrapped stub symbols are defined in src/platform/esp32/iram-quirk.c.
-    env.Append(
-        LINKFLAGS=[
-            "-Wl,--wrap=esp_flash_chip_gd",
-            "-Wl,--wrap=esp_flash_chip_issi",
-            "-Wl,--wrap=esp_flash_chip_winbond",
-        ]
-    )
-else:
-    # For newer ESP32 targets, using newlib nano works better.
-    env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])
+# Enable Newlib Nano formatting to save space
+# ...but allow printf float support (compromise)
+env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])

platformio.ini

@@ -2,7 +2,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = tbeam
+default_envs = heltec-v3
 
 extra_configs =
 	variants/*/*.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/3480b731d28b10d73414cf0dd7975bff745de8cf.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

src/DebugConfiguration.h

@@ -151,9 +151,8 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...);
 #include <RAK13800_W5100S.h>
 #endif // HAS_ETHERNET
 
-#if HAS_ETHERNET && defined(USE_WS5500)
-#include <ETHClass2.h>
-#define ETH ETH2
+#if HAS_ETHERNET && defined(ARCH_ESP32)
+#include <ETH.h>
 #endif // HAS_ETHERNET
 
 #if HAS_WIFI

src/Power.cpp

@@ -1,14 +1,11 @@
 /**
  * @file Power.cpp
- * @brief This file contains the implementation of the Power class, which is
- * responsible for managing power-related functionality of the device. It
- * includes battery level sensing, power management unit (PMU) control, and
- * power state machine management. The Power class is used by the main device
- * class to manage power-related functionality.
+ * @brief This file contains the implementation of the Power class, which is responsible for managing power-related functionality
+ * of the device. It includes battery level sensing, power management unit (PMU) control, and power state machine management. The
+ * Power class is used by the main device class to manage power-related functionality.
  *
- * The file also includes implementations of various battery level sensors, such
- * as the AnalogBatteryLevel class, which assumes the battery voltage is
- * attached via a voltage-divider to an analog input.
+ * The file also includes implementations of various battery level sensors, such as the AnalogBatteryLevel class, which assumes
+ * the battery voltage is attached via a voltage-divider to an analog input.
  *
  * This file is part of the Meshtastic project.
  * For more information, see: https://meshtastic.org/
@@ -22,8 +19,14 @@
 #include "configuration.h"
 #include "main.h"
 #include "meshUtils.h"
-#include "power/PowerHAL.h"
 #include "sleep.h"
+#ifdef ARCH_ESP32
+// #include <driver/adc.h>
+#include <esp_adc/adc_cali.h>
+#include <esp_adc/adc_cali_scheme.h>
+#include <esp_adc/adc_oneshot.h>
+#include <esp_err.h>
+#endif
 
 #if defined(ARCH_PORTDUINO)
 #include "api/WiFiServerAPI.h"
@@ -42,9 +45,8 @@
 #include <WiFi.h>
 #endif
 
-#if HAS_ETHERNET && defined(USE_WS5500)
-#include <ETHClass2.h>
-#define ETH ETH2
+#if HAS_ETHERNET && defined(ARCH_ESP32)
+#include <ETH.h>
 #endif // HAS_ETHERNET
 
 #endif
@@ -56,21 +58,86 @@
 #if defined(BATTERY_PIN) && defined(ARCH_ESP32)
 
 #ifndef BAT_MEASURE_ADC_UNIT // ADC1 is default
-static const adc1_channel_t adc_channel = ADC_CHANNEL;
+static const adc_channel_t adc_channel = ADC_CHANNEL;
 static const adc_unit_t unit = ADC_UNIT_1;
-#else // ADC2
-static const adc2_channel_t adc_channel = ADC_CHANNEL;
+#else  // ADC2
+static const adc_channel_t adc_channel = ADC_CHANNEL;
 static const adc_unit_t unit = ADC_UNIT_2;
-RTC_NOINIT_ATTR uint64_t RTC_reg_b;
-
 #endif // BAT_MEASURE_ADC_UNIT
 
-esp_adc_cal_characteristics_t *adc_characs = (esp_adc_cal_characteristics_t *)calloc(1, sizeof(esp_adc_cal_characteristics_t));
+static adc_oneshot_unit_handle_t adc_handle = nullptr;
+static adc_cali_handle_t adc_cali_handle = nullptr;
+static bool adc_calibrated = false;
 #ifndef ADC_ATTENUATION
 static const adc_atten_t atten = ADC_ATTEN_DB_12;
 #else
 static const adc_atten_t atten = ADC_ATTENUATION;
 #endif
+#ifdef ADC_BITWIDTH
+static const adc_bitwidth_t adc_width = ADC_BITWIDTH;
+#else
+static const adc_bitwidth_t adc_width = ADC_BITWIDTH_DEFAULT;
+#endif
+
+static int adcBitWidthToBits(adc_bitwidth_t width)
+{
+    switch (width) {
+    case ADC_BITWIDTH_9:
+        return 9;
+    case ADC_BITWIDTH_10:
+        return 10;
+    case ADC_BITWIDTH_11:
+        return 11;
+    case ADC_BITWIDTH_12:
+        return 12;
+#ifdef ADC_BITWIDTH_13
+    case ADC_BITWIDTH_13:
+        return 13;
+#endif
+    default:
+        return 12;
+    }
+}
+
+static bool initAdcCalibration()
+{
+#if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
+    adc_cali_curve_fitting_config_t cali_config = {
+        .unit_id = unit,
+        .atten = atten,
+        .bitwidth = adc_width,
+    };
+    esp_err_t ret = adc_cali_create_scheme_curve_fitting(&cali_config, &adc_cali_handle);
+    if (ret == ESP_OK) {
+        LOG_INFO("ADC calibration: curve fitting enabled");
+        return true;
+    }
+    if (ret != ESP_ERR_NOT_SUPPORTED) {
+        LOG_WARN("ADC calibration: curve fitting failed: %s", esp_err_to_name(ret));
+    }
+#endif
+
+#if ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED
+    adc_cali_line_fitting_config_t cali_config = {
+        .unit_id = unit,
+        .atten = atten,
+        .bitwidth = adc_width,
+        .default_vref = DEFAULT_VREF,
+    };
+    esp_err_t ret = adc_cali_create_scheme_line_fitting(&cali_config, &adc_cali_handle);
+    if (ret == ESP_OK) {
+        LOG_INFO("ADC calibration: line fitting enabled");
+        return true;
+    }
+    if (ret != ESP_ERR_NOT_SUPPORTED) {
+        LOG_WARN("ADC calibration: line fitting failed: %s", esp_err_to_name(ret));
+    }
+#endif
+
+    LOG_INFO("ADC calibration not supported; using approximate scaling");
+    return false;
+}
+
 #endif // BATTERY_PIN && ARCH_ESP32
 
 #ifdef EXT_CHRG_DETECT
@@ -175,12 +242,22 @@ Power *power;
 
 using namespace meshtastic;
 
-// NRF52 has AREF_VOLTAGE defined in architecture.h but
-// make sure it's included. If something is wrong with NRF52
-// definition - compilation will fail on missing definition
-#if !defined(AREF_VOLTAGE) && !defined(ARCH_NRF52)
+#ifndef AREF_VOLTAGE
+#if defined(ARCH_NRF52)
+/*
+ * Internal Reference is +/-0.6V, with an adjustable gain of 1/6, 1/5, 1/4,
+ * 1/3, 1/2 or 1, meaning 3.6, 3.0, 2.4, 1.8, 1.2 or 0.6V for the ADC levels.
+ *
+ * External Reference is VDD/4, with an adjustable gain of 1, 2 or 4, meaning
+ * VDD/4, VDD/2 or VDD for the ADC levels.
+ *
+ * Default settings are internal reference with 1/6 gain (GND..3.6V ADC range)
+ */
+#define AREF_VOLTAGE 3.6
+#else
 #define AREF_VOLTAGE 3.3
 #endif
+#endif
 
 /**
  * If this board has a battery level sensor, set this to a valid implementation
@@ -227,8 +304,7 @@ static void battery_adcDisable()
 #endif
 
 /**
- * A simple battery level sensor that assumes the battery voltage is attached
- * via a voltage-divider to an analog input
+ * A simple battery level sensor that assumes the battery voltage is attached via a voltage-divider to an analog input
  */
 class AnalogBatteryLevel : public HasBatteryLevel
 {
@@ -306,8 +382,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
 
 #ifndef BATTERY_SENSE_SAMPLES
 #define BATTERY_SENSE_SAMPLES                                                                                                    \
-    15 // Set the number of samples, it has an effect of increasing sensitivity in
-       // complex electromagnetic environment.
+    15 // Set the number of samples, it has an effect of increasing sensitivity in complex electromagnetic environment.
 #endif
 
 #ifdef BATTERY_PIN
@@ -325,8 +400,20 @@ class AnalogBatteryLevel : public HasBatteryLevel
             battery_adcEnable();
 #ifdef ARCH_ESP32 // ADC block for espressif platforms
             raw = espAdcRead();
-            scaled = esp_adc_cal_raw_to_voltage(raw, adc_characs);
-            scaled *= operativeAdcMultiplier;
+            int voltage_mv = 0;
+            if (adc_calibrated && adc_cali_handle) {
+                if (adc_cali_raw_to_voltage(adc_cali_handle, raw, &voltage_mv) != ESP_OK) {
+                    LOG_WARN("ADC calibration read failed; using raw value");
+                    voltage_mv = 0;
+                }
+            }
+            if (voltage_mv == 0) {
+                // Fallback approximate conversion without calibration
+                const int bits = adcBitWidthToBits(adc_width);
+                const float max_code = powf(2.0f, bits) - 1.0f;
+                voltage_mv = (int)((raw / max_code) * DEFAULT_VREF);
+            }
+            scaled = voltage_mv * operativeAdcMultiplier;
 #else // block for all other platforms
             for (uint32_t i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
                 raw += analogRead(BATTERY_PIN);
@@ -337,8 +424,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
             battery_adcDisable();
 
             if (!initial_read_done) {
-                // Flush the smoothing filter with an ADC reading, if the reading is
-                // plausibly correct
+                // Flush the smoothing filter with an ADC reading, if the reading is plausibly correct
                 if (scaled > last_read_value)
                     last_read_value = scaled;
                 initial_read_done = true;
@@ -347,8 +433,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
                 last_read_value += (scaled - last_read_value) * 0.5; // Virtual LPF
             }
 
-            // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u filtered=%u",
-            // BATTERY_PIN, raw, (uint32_t)(scaled), (uint32_t) (last_read_value));
+            // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u filtered=%u", BATTERY_PIN, raw, (uint32_t)(scaled), (uint32_t)
+            // (last_read_value));
         }
         return last_read_value;
 #endif // BATTERY_PIN
@@ -365,51 +451,22 @@ class AnalogBatteryLevel : public HasBatteryLevel
         uint32_t raw = 0;
         uint8_t raw_c = 0; // raw reading counter
 
-#ifndef BAT_MEASURE_ADC_UNIT // ADC1
+        if (!adc_handle) {
+            LOG_ERROR("ADC oneshot handle not initialized");
+            return 0;
+        }
+
         for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
-            int val_ = adc1_get_raw(adc_channel);
-            if (val_ >= 0) { // save only valid readings
-                raw += val_;
+            int val = 0;
+            esp_err_t err = adc_oneshot_read(adc_handle, adc_channel, &val);
+            if (err == ESP_OK) {
+                raw += val;
                 raw_c++;
-            }
-            // delayMicroseconds(100);
-        }
-#else                            // ADC2
-#ifdef CONFIG_IDF_TARGET_ESP32S3 // ESP32S3
-        // ADC2 wifi bug workaround not required, breaks compile
-        // On ESP32S3, ADC2 can take turns with Wifi (?)
-
-        int32_t adc_buf;
-        esp_err_t read_result;
-
-        // Multiple samples
-        for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
-            adc_buf = 0;
-            read_result = -1;
-
-            read_result = adc2_get_raw(adc_channel, ADC_WIDTH_BIT_12, &adc_buf);
-            if (read_result == ESP_OK) {
-                raw += adc_buf;
-                raw_c++; // Count valid samples
             } else {
-                LOG_DEBUG("An attempt to sample ADC2 failed");
+                LOG_DEBUG("ADC read failed: %s", esp_err_to_name(err));
             }
         }
 
-#else  // Other ESP32
-        int32_t adc_buf = 0;
-        for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
-            // ADC2 wifi bug workaround, see
-            // https://github.com/espressif/arduino-esp32/issues/102
-            WRITE_PERI_REG(SENS_SAR_READ_CTRL2_REG, RTC_reg_b);
-            SET_PERI_REG_MASK(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_DATA_INV);
-            adc2_get_raw(adc_channel, ADC_WIDTH_BIT_12, &adc_buf);
-            raw += adc_buf;
-            raw_c++;
-        }
-#endif // BAT_MEASURE_ADC_UNIT
-
-#endif // End BAT_MEASURE_ADC_UNIT
         return (raw / (raw_c < 1 ? 1 : raw_c));
     }
 #endif
@@ -417,8 +474,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
     /**
      * return true if there is a battery installed in this unit
      */
-    // if we have a integrated device with a battery, we can assume that the
-    // battery is always connected
+    // if we have a integrated device with a battery, we can assume that the battery is always connected
 #ifdef BATTERY_IMMUTABLE
     virtual bool isBatteryConnect() override { return true; }
 #elif defined(ADC_V)
@@ -439,10 +495,10 @@ class AnalogBatteryLevel : public HasBatteryLevel
     virtual bool isBatteryConnect() override { return getBatteryPercent() != -1; }
 #endif
 
-    /// If we see a battery voltage higher than physics allows - assume charger is
-    /// pumping in power On some boards we don't have the power management chip
-    /// (like AXPxxxx) so we use EXT_PWR_DETECT GPIO pin to detect external power
-    /// source
+    /// If we see a battery voltage higher than physics allows - assume charger is pumping
+    /// in power
+    /// On some boards we don't have the power management chip (like AXPxxxx)
+    /// so we use EXT_PWR_DETECT GPIO pin to detect external power source
     virtual bool isVbusIn() override
     {
 #ifdef EXT_PWR_DETECT
@@ -459,12 +515,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
         }
         // if it's not HIGH - check the battery
 #endif
-
-// technically speaking this should work for all(?) NRF52 boards
-// but needs testing across multiple devices. NRF52 USB would not even work if
-// VBUS was not properly connected and detected by the CPU
-#elif defined(MUZI_BASE) || defined(PROMICRO_DIY_TCXO)
-        return powerHAL_isVBUSConnected();
+#elif defined(MUZI_BASE)
+        return NRF_POWER->USBREGSTATUS & POWER_USBREGSTATUS_VBUSDETECT_Msk;
 #endif
         return getBattVoltage() > chargingVolt;
     }
@@ -487,9 +539,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
 #else
 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(DISABLE_INA_CHARGING_DETECTION)
         if (hasINA()) {
-            // get current flow from INA sensor - negative value means power flowing
-            // into the battery default assuming  BATTERY+  <--> INA_VIN+ <--> SHUNT
-            // RESISTOR <--> INA_VIN- <--> LOAD
+            // get current flow from INA sensor - negative value means power flowing into the battery
+            // default assuming  BATTERY+  <--> INA_VIN+ <--> SHUNT RESISTOR <--> INA_VIN- <--> LOAD
             LOG_DEBUG("Using INA on I2C addr 0x%x for charging detection", config.power.device_battery_ina_address);
 #if defined(INA_CHARGING_DETECTION_INVERT)
             return getINACurrent() > 0;
@@ -505,8 +556,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
     }
 
   private:
-    /// If we see a battery voltage higher than physics allows - assume charger is
-    /// pumping in power
+    /// If we see a battery voltage higher than physics allows - assume charger is pumping
+    /// in power
 
     /// For heltecs with no battery connected, the measured voltage is 2204, so
     // need to be higher than that, in this case is 2500mV (3000-500)
@@ -515,8 +566,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
     const float noBatVolt = (OCV[NUM_OCV_POINTS - 1] - 500) * NUM_CELLS;
     // Start value from minimum voltage for the filter to not start from 0
     // that could trigger some events.
-    // This value is over-written by the first ADC reading, it the voltage seems
-    // reasonable.
+    // This value is over-written by the first ADC reading, it the voltage seems reasonable.
     bool initial_read_done = false;
     float last_read_value = (OCV[NUM_OCV_POINTS - 1] * NUM_CELLS);
     uint32_t last_read_time_ms = 0;
@@ -630,44 +680,39 @@ bool Power::analogInit()
 #endif
 
 #ifdef ARCH_ESP32 // ESP32 needs special analog stuff
+    adc_oneshot_unit_init_cfg_t init_config = {
+        .unit_id = unit,
+    };
 
-#ifndef ADC_WIDTH // max resolution by default
-    static const adc_bits_width_t width = ADC_WIDTH_BIT_12;
-#else
-    static const adc_bits_width_t width = ADC_WIDTH;
-#endif
-#ifndef BAT_MEASURE_ADC_UNIT // ADC1
-    adc1_config_width(width);
-    adc1_config_channel_atten(adc_channel, atten);
-#else // ADC2
-    adc2_config_channel_atten(adc_channel, atten);
-#ifndef CONFIG_IDF_TARGET_ESP32S3
-    // ADC2 wifi bug workaround
-    // Not required with ESP32S3, breaks compile
-    RTC_reg_b = READ_PERI_REG(SENS_SAR_READ_CTRL2_REG);
-#endif
-#endif
-    // calibrate ADC
-    esp_adc_cal_value_t val_type = esp_adc_cal_characterize(unit, atten, width, DEFAULT_VREF, adc_characs);
-    // show ADC characterization base
-    if (val_type == ESP_ADC_CAL_VAL_EFUSE_TP) {
-        LOG_INFO("ADC config based on Two Point values stored in eFuse");
-    } else if (val_type == ESP_ADC_CAL_VAL_EFUSE_VREF) {
-        LOG_INFO("ADC config based on reference voltage stored in eFuse");
+    if (!adc_handle) {
+        esp_err_t err = adc_oneshot_new_unit(&init_config, &adc_handle);
+        if (err != ESP_OK) {
+            LOG_ERROR("ADC oneshot init failed: %s", esp_err_to_name(err));
+            return false;
+        }
     }
-#ifdef CONFIG_IDF_TARGET_ESP32S3
-    // ESP32S3
-    else if (val_type == ESP_ADC_CAL_VAL_EFUSE_TP_FIT) {
-        LOG_INFO("ADC config based on Two Point values and fitting curve "
-                 "coefficients stored in eFuse");
-    }
-#endif
-    else {
-        LOG_INFO("ADC config based on default reference voltage");
+
+    adc_oneshot_chan_cfg_t config = {
+        .atten = atten,
+        .bitwidth = adc_width,
+    };
+
+    esp_err_t err = adc_oneshot_config_channel(adc_handle, adc_channel, &config);
+    if (err != ESP_OK) {
+        LOG_ERROR("ADC channel config failed: %s", esp_err_to_name(err));
+        return false;
     }
+
+    adc_calibrated = initAdcCalibration();
 #endif // ARCH_ESP32
 
-    // NRF52 ADC init moved to powerHAL_init in nrf52 platform
+#ifdef ARCH_NRF52
+#ifdef VBAT_AR_INTERNAL
+    analogReference(VBAT_AR_INTERNAL);
+#else
+    analogReference(AR_INTERNAL); // 3.6V
+#endif
+#endif // ARCH_NRF52
 
 #ifndef ARCH_ESP32
     analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS);
@@ -722,16 +767,6 @@ bool Power::setup()
             runASAP = true;
         },
         CHANGE);
-#endif
-#ifdef EXT_CHRG_DETECT
-    attachInterrupt(
-        EXT_CHRG_DETECT,
-        []() {
-            power->setIntervalFromNow(0);
-            runASAP = true;
-            BaseType_t higherWake = 0;
-        },
-        CHANGE);
 #endif
     enabled = found;
     low_voltage_counter = 0;
@@ -778,8 +813,7 @@ void Power::reboot()
     HAL_NVIC_SystemReset();
 #else
     rebootAtMsec = -1;
-    LOG_WARN("FIXME implement reboot for this platform. Note that some settings "
-             "require a restart to be applied");
+    LOG_WARN("FIXME implement reboot for this platform. Note that some settings require a restart to be applied");
 #endif
 }
 
@@ -789,12 +823,9 @@ void Power::shutdown()
 #if HAS_SCREEN
     if (screen) {
 #ifdef T_DECK_PRO
-        screen->showSimpleBanner("Device is powered off.\nConnect USB to start!",
-                                 0); // T-Deck Pro has no power button
+        screen->showSimpleBanner("Device is powered off.\nConnect USB to start!", 0); // T-Deck Pro has no power button
 #elif defined(USE_EINK)
-        screen->showSimpleBanner("Shutting Down...",
-                                 2250); // dismiss after 3 seconds to avoid the
-                                        // banner on the sleep screen
+        screen->showSimpleBanner("Shutting Down...", 2250); // dismiss after 3 seconds to avoid the banner on the sleep screen
 #else
         screen->showSimpleBanner("Shutting Down...", 0); // stays on screen
 #endif
@@ -833,8 +864,7 @@ void Power::readPowerStatus()
     int32_t batteryVoltageMv = -1; // Assume unknown
     int8_t batteryChargePercent = -1;
     OptionalBool usbPowered = OptUnknown;
-    OptionalBool hasBattery = OptUnknown; // These must be static because NRF_APM
-                                          // code doesn't run every time
+    OptionalBool hasBattery = OptUnknown; // These must be static because NRF_APM code doesn't run every time
     OptionalBool isChargingNow = OptUnknown;
 
     if (batteryLevel) {
@@ -847,10 +877,9 @@ void Power::readPowerStatus()
             if (batteryLevel->getBatteryPercent() >= 0) {
                 batteryChargePercent = batteryLevel->getBatteryPercent();
             } else {
-                // If the AXP192 returns a percentage less than 0, the feature is either
-                // not supported or there is an error In that case, we compute an
-                // estimate of the charge percent based on open circuit voltage table
-                // defined in power.h
+                // If the AXP192 returns a percentage less than 0, the feature is either not supported or there is an error
+                // In that case, we compute an estimate of the charge percent based on open circuit voltage table defined
+                // in power.h
                 batteryChargePercent = clamp((int)(((batteryVoltageMv - (OCV[NUM_OCV_POINTS - 1] * NUM_CELLS)) * 1e2) /
                                                    ((OCV[0] * NUM_CELLS) - (OCV[NUM_OCV_POINTS - 1] * NUM_CELLS))),
                                              0, 100);
@@ -858,12 +887,12 @@ void Power::readPowerStatus()
         }
     }
 
-// FIXME: IMO we shouldn't be littering our code with all these ifdefs.  Way
-// better instead to make a Nrf52IsUsbPowered subclass (which shares a
-// superclass with the BatteryLevel stuff) that just provides a few methods. But
-// in the interest of fixing this bug I'm going to follow current practice.
-#ifdef NRF_APM // Section of code detects USB power on the RAK4631 and updates
-               // the power states.  Takes 20 seconds or so to detect changes.
+// FIXME: IMO we shouldn't be littering our code with all these ifdefs.  Way better instead to make a Nrf52IsUsbPowered subclass
+// (which shares a superclass with the BatteryLevel stuff)
+// that just provides a few methods.  But in the interest of fixing this bug I'm going to follow current
+// practice.
+#ifdef NRF_APM // Section of code detects USB power on the RAK4631 and updates the power states.  Takes 20 seconds or so to detect
+               // changes.
 
     nrfx_power_usb_state_t nrf_usb_state = nrfx_power_usbstatus_get();
     // LOG_DEBUG("NRF Power %d", nrf_usb_state);
@@ -937,9 +966,8 @@ void Power::readPowerStatus()
 
 #endif
 
-    // If we have a battery at all and it is less than 0%, force deep sleep if we
-    // have more than 10 low readings in a row. NOTE: min LiIon/LiPo voltage
-    // is 2.0 to 2.5V, current OCV min is set to 3100 that is large enough.
+    // If we have a battery at all and it is less than 0%, force deep sleep if we have more than 10 low readings in
+    // a row. NOTE: min LiIon/LiPo voltage is 2.0 to 2.5V, current OCV min is set to 3100 that is large enough.
     //
 
     if (batteryLevel && powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
@@ -961,8 +989,8 @@ int32_t Power::runOnce()
     readPowerStatus();
 
 #ifdef HAS_PMU
-    // WE no longer use the IRQ line to wake the CPU (due to false wakes from
-    // sleep), but we do poll the IRQ status by reading the registers over I2C
+    // WE no longer use the IRQ line to wake the CPU (due to false wakes from sleep), but we do poll
+    // the IRQ status by reading the registers over I2C
     if (PMU) {
 
         PMU->getIrqStatus();
@@ -1004,8 +1032,7 @@ int32_t Power::runOnce()
         PMU->clearIrqStatus();
     }
 #endif
-    // Only read once every 20 seconds once the power status for the app has been
-    // initialized
+    // Only read once every 20 seconds once the power status for the app has been initialized
     return (statusHandler && statusHandler->isInitialized()) ? (1000 * 20) : RUN_SAME;
 }
 
@@ -1013,12 +1040,10 @@ int32_t Power::runOnce()
  * Init the power manager chip
  *
  * axp192 power
-    DCDC1 0.7-3.5V @ 1200mA max -> OLED // If you turn this off you'll lose
- comms to the axp192 because the OLED and the axp192 share the same i2c bus,
- instead use ssd1306 sleep mode DCDC2 -> unused DCDC3 0.7-3.5V @ 700mA max ->
- ESP32 (keep this on!) LDO1 30mA -> charges GPS backup battery // charges the
- tiny J13 battery by the GPS to power the GPS ram (for a couple of days), can
- not be turned off LDO2 200mA -> LORA LDO3 200mA -> GPS
+    DCDC1 0.7-3.5V @ 1200mA max -> OLED // If you turn this off you'll lose comms to the axp192 because the OLED and the
+ axp192 share the same i2c bus, instead use ssd1306 sleep mode DCDC2 -> unused DCDC3 0.7-3.5V @ 700mA max -> ESP32 (keep this
+ on!) LDO1 30mA -> charges GPS backup battery // charges the tiny J13 battery by the GPS to power the GPS ram (for a couple of
+ days), can not be turned off LDO2 200mA -> LORA LDO3 200mA -> GPS
  *
  */
 bool Power::axpChipInit()
@@ -1063,10 +1088,9 @@ bool Power::axpChipInit()
 
     if (!PMU) {
         /*
-         * In XPowersLib, if the XPowersAXPxxx object is released, Wire.end() will
-         * be called at the same time. In order not to affect other devices, if the
-         * initialization of the PMU fails, Wire needs to be re-initialized once, if
-         * there are multiple devices sharing the bus.
+         * In XPowersLib, if the XPowersAXPxxx object is released, Wire.end() will be called at the same time.
+         * In order not to affect other devices, if the initialization of the PMU fails, Wire needs to be re-initialized once,
+         * if there are multiple devices sharing the bus.
          * * */
 #ifndef PMU_USE_WIRE1
         w->begin(I2C_SDA, I2C_SCL);
@@ -1083,8 +1107,8 @@ bool Power::axpChipInit()
         PMU->enablePowerOutput(XPOWERS_LDO2);
 
         // oled module power channel,
-        // disable it will cause abnormal communication between boot and AXP power
-        // supply, do not turn it off
+        // disable it will cause abnormal communication between boot and AXP power supply,
+        // do not turn it off
         PMU->setPowerChannelVoltage(XPOWERS_DCDC1, 3300);
         // enable oled power
         PMU->enablePowerOutput(XPOWERS_DCDC1);
@@ -1111,8 +1135,7 @@ bool Power::axpChipInit()
         PMU->setChargeTargetVoltage(XPOWERS_AXP192_CHG_VOL_4V2);
     } else if (PMU->getChipModel() == XPOWERS_AXP2101) {
 
-        /*The alternative version of T-Beam 1.1 differs from T-Beam V1.1 in that it
-         * uses an AXP2101 power chip*/
+        /*The alternative version of T-Beam 1.1 differs from T-Beam V1.1 in that it uses an AXP2101 power chip*/
         if (HW_VENDOR == meshtastic_HardwareModel_TBEAM) {
             // Unuse power channel
             PMU->disablePowerOutput(XPOWERS_DCDC2);
@@ -1147,8 +1170,8 @@ bool Power::axpChipInit()
             // t-beam s3 core
             /**
              * gnss module power channel
-             * The default ALDO4 is off, you need to turn on the GNSS power first,
-             * otherwise it will be invalid during initialization
+             * The default ALDO4 is off, you need to turn on the GNSS power first, otherwise it will be invalid during
+             * initialization
              */
             PMU->setPowerChannelVoltage(XPOWERS_ALDO4, 3300);
             PMU->enablePowerOutput(XPOWERS_ALDO4);
@@ -1198,8 +1221,7 @@ bool Power::axpChipInit()
         // disable all axp chip interrupt
         PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
 
-        // Set the constant current charging current of AXP2101, temporarily use
-        // 500mA by default
+        // Set the constant current charging current of AXP2101, temporarily use 500mA by default
         PMU->setChargerConstantCurr(XPOWERS_AXP2101_CHG_CUR_500MA);
 
         // Set up the charging voltage
@@ -1265,12 +1287,11 @@ bool Power::axpChipInit()
                   PMU->getPowerChannelVoltage(XPOWERS_BLDO2));
     }
 
-// We can safely ignore this approach for most (or all) boards because MCU
-// turned off earlier than battery discharged to 2.6V.
+// We can safely ignore this approach for most (or all) boards because MCU turned off
+// earlier than battery discharged to 2.6V.
 //
-// Unfortunately for now we can't use this killswitch for RAK4630-based boards
-// because they have a bug with battery voltage measurement. Probably it
-// sometimes drops to low values.
+// Unfortanly for now we can't use this killswitch for RAK4630-based boards because they have a bug with
+// battery voltage measurement. Probably it sometimes drops to low values.
 #ifndef RAK4630
     // Set PMU shutdown voltage at 2.6V to maximize battery utilization
     PMU->setSysPowerDownVoltage(2600);
@@ -1289,12 +1310,10 @@ bool Power::axpChipInit()
     attachInterrupt(
         PMU_IRQ, [] { pmu_irq = true; }, FALLING);
 
-    // we do not look for AXPXXX_CHARGING_FINISHED_IRQ & AXPXXX_CHARGING_IRQ
-    // because it occurs repeatedly while there is no battery also it could cause
-    // inadvertent waking from light sleep just because the battery filled we
-    // don't look for AXPXXX_BATT_REMOVED_IRQ because it occurs repeatedly while
-    // no battery installed we don't look at AXPXXX_VBUS_REMOVED_IRQ because we
-    // don't have anything hooked to vbus
+    // we do not look for AXPXXX_CHARGING_FINISHED_IRQ & AXPXXX_CHARGING_IRQ because it occurs repeatedly while there is
+    // no battery also it could cause inadvertent waking from light sleep just because the battery filled
+    // we don't look for AXPXXX_BATT_REMOVED_IRQ because it occurs repeatedly while no battery installed
+    // we don't look at AXPXXX_VBUS_REMOVED_IRQ because we don't have anything hooked to vbus
     PMU->enableIRQ(pmuIrqMask);
 
     PMU->clearIrqStatus();
@@ -1410,8 +1429,8 @@ class LipoCharger : public HasBatteryLevel
             bool result = PPM->init(Wire, I2C_SDA, I2C_SCL, BQ25896_ADDR);
             if (result) {
                 LOG_INFO("PPM BQ25896 init succeeded");
-                // Set the minimum operating voltage. Below this voltage, the PPM will
-                // protect PPM->setSysPowerDownVoltage(3100);
+                // Set the minimum operating voltage. Below this voltage, the PPM will protect
+                // PPM->setSysPowerDownVoltage(3100);
 
                 // Set input current limit, default is 500mA
                 // PPM->setInputCurrentLimit(800);
@@ -1434,8 +1453,7 @@ class LipoCharger : public HasBatteryLevel
                 PPM->enableMeasure();
 
                 // Turn on charging function
-                // If there is no battery connected, do not turn on the charging
-                // function
+                // If there is no battery connected, do not turn on the charging function
                 PPM->enableCharge();
             } else {
                 LOG_WARN("PPM BQ25896 init failed");
@@ -1470,8 +1488,7 @@ class LipoCharger : public HasBatteryLevel
     virtual int getBatteryPercent() override
     {
         return -1;
-        // return bq->getChargePercent(); // don't use BQ27220 for battery percent,
-        // it is not calibrated
+        // return bq->getChargePercent(); // don't use BQ27220 for battery percent, it is not calibrated
     }
 
     /**
@@ -1593,8 +1610,7 @@ bool Power::meshSolarInit()
 
 #else
 /**
- * The meshSolar battery level sensor is unavailable - default to
- * AnalogBatteryLevel
+ * The meshSolar battery level sensor is unavailable - default to AnalogBatteryLevel
  */
 bool Power::meshSolarInit()
 {

src/gps/GPS.cpp

@@ -905,12 +905,6 @@ void GPS::writePinStandby(bool standby)
     // Write and log
     pinMode(PIN_GPS_STANDBY, OUTPUT);
     digitalWrite(PIN_GPS_STANDBY, val);
-
-    // Enter backup mode on PA1010D; TODO: may be applicable to other MTK GPS too
-    if (IS_ONE_OF(gnssModel, GNSS_MODEL_MTK_PA1010D)) {
-        _serial_gps->write("$PMTK225,4*2F\r\n");
-    }
-
 #ifdef GPS_DEBUG
     LOG_DEBUG("Pin STANDBY %s", val == HIGH ? "HI" : "LOW");
 #endif

src/gps/RTC.cpp

@@ -397,7 +397,7 @@ uint32_t getValidTime(RTCQuality minQuality, bool local)
     return (currentQuality >= minQuality) ? getTime(local) : 0;
 }
 
-time_t gm_mktime(const struct tm *tm)
+time_t gm_mktime(struct tm *tm)
 {
 #if !MESHTASTIC_EXCLUDE_TZ
     time_t result = 0;
@@ -413,8 +413,8 @@ time_t gm_mktime(const struct tm *tm)
     days_before_this_year -= 719162; // (1969 * 365 + 1969 / 4 - 1969 / 100 + 1969 / 400);
 
     // Now, within this tm->year, compute the days *before* this tm->month starts.
-    static const int days_before_month[12] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; // non-leap year
-    int days_this_year_before_this_month = days_before_month[tm->tm_mon];                             // tm->tm_mon is 0..11
+    int days_before_month[12] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; // non-leap year
+    int days_this_year_before_this_month = days_before_month[tm->tm_mon];                // tm->tm_mon is 0..11
 
     // If this is a leap year, and we're past February, add a day:
     if (tm->tm_mon >= 2 && (year % 4) == 0 && ((year % 100) != 0 || (year % 400) == 0)) {
@@ -435,7 +435,6 @@ time_t gm_mktime(const struct tm *tm)
 
     return result;
 #else
-    struct tm tmCopy = *tm;
-    return mktime(&tmCopy);
+    return mktime(tm);
 #endif
 }

src/gps/RTC.h

@@ -54,7 +54,7 @@ uint32_t getValidTime(RTCQuality minQuality, bool local = false);
 
 RTCSetResult readFromRTC();
 
-time_t gm_mktime(const struct tm *tm);
+time_t gm_mktime(struct tm *tm);
 
 #define SEC_PER_DAY 86400
 #define SEC_PER_HOUR 3600

src/graphics/Screen.cpp

@@ -1731,26 +1731,6 @@ int Screen::handleInputEvent(const InputEvent *event)
                 showFrame(FrameDirection::PREVIOUS);
             } else if (event->inputEvent == INPUT_BROKER_RIGHT || event->inputEvent == INPUT_BROKER_USER_PRESS) {
                 showFrame(FrameDirection::NEXT);
-            } else if (event->inputEvent == INPUT_BROKER_FN_F1) {
-                this->ui->switchToFrame(0);
-                lastScreenTransition = millis();
-                setFastFramerate();
-            } else if (event->inputEvent == INPUT_BROKER_FN_F2) {
-                this->ui->switchToFrame(1);
-                lastScreenTransition = millis();
-                setFastFramerate();
-            } else if (event->inputEvent == INPUT_BROKER_FN_F3) {
-                this->ui->switchToFrame(2);
-                lastScreenTransition = millis();
-                setFastFramerate();
-            } else if (event->inputEvent == INPUT_BROKER_FN_F4) {
-                this->ui->switchToFrame(3);
-                lastScreenTransition = millis();
-                setFastFramerate();
-            } else if (event->inputEvent == INPUT_BROKER_FN_F5) {
-                this->ui->switchToFrame(4);
-                lastScreenTransition = millis();
-                setFastFramerate();
             } else if (event->inputEvent == INPUT_BROKER_UP_LONG) {
                 // Long press up button for fast frame switching
                 showPrevFrame();

src/graphics/draw/MenuHandler.cpp

@@ -266,8 +266,52 @@ void menuHandler::FrequencySlotPicker()
 
     // Calculate number of channels (copied from RadioInterface::applyModemConfig())
     meshtastic_Config_LoRaConfig &loraConfig = config.lora;
-    double bw = loraConfig.use_preset ? modemPresetToBwKHz(loraConfig.modem_preset, myRegion->wideLora)
-                                      : bwCodeToKHz(loraConfig.bandwidth);
+    double bw = loraConfig.bandwidth;
+    if (loraConfig.use_preset) {
+        switch (loraConfig.modem_preset) {
+        case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO:
+            bw = (myRegion->wideLora) ? 1625.0 : 500;
+            break;
+        case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
+            bw = (myRegion->wideLora) ? 812.5 : 250;
+            break;
+        case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
+            bw = (myRegion->wideLora) ? 812.5 : 250;
+            break;
+        case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
+            bw = (myRegion->wideLora) ? 812.5 : 250;
+            break;
+        case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
+            bw = (myRegion->wideLora) ? 812.5 : 250;
+            break;
+        case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
+            bw = (myRegion->wideLora) ? 1625.0 : 500;
+            break;
+        default:
+            bw = (myRegion->wideLora) ? 812.5 : 250;
+            break;
+        case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
+            bw = (myRegion->wideLora) ? 406.25 : 125;
+            break;
+        case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
+            bw = (myRegion->wideLora) ? 406.25 : 125;
+            break;
+        }
+    } else {
+        bw = loraConfig.bandwidth;
+        if (bw == 31) // This parameter is not an integer
+            bw = 31.25;
+        if (bw == 62) // Fix for 62.5Khz bandwidth
+            bw = 62.5;
+        if (bw == 200)
+            bw = 203.125;
+        if (bw == 400)
+            bw = 406.25;
+        if (bw == 800)
+            bw = 812.5;
+        if (bw == 1600)
+            bw = 1625.0;
+    }
 
     uint32_t numChannels = 0;
     if (myRegion) {

src/graphics/draw/MenuHandler.h

@@ -140,7 +140,7 @@ struct ScreenColor {
     uint8_t b;
     bool useVariant;
 
-    explicit ScreenColor(uint8_t rIn = 0, uint8_t gIn = 0, uint8_t bIn = 0, bool variantIn = false)
+    ScreenColor(uint8_t rIn = 0, uint8_t gIn = 0, uint8_t bIn = 0, bool variantIn = false)
         : r(rIn), g(gIn), b(bIn), useVariant(variantIn)
     {
     }

src/graphics/draw/MessageRenderer.cpp

@@ -431,6 +431,45 @@ static int getDrawnLinePixelBottom(int lineTopY, const std::string &line, bool i
     return iconTop + tallest - 1;
 }
 
+static void drawRoundedRectOutline(OLEDDisplay *display, int x, int y, int w, int h, int r)
+{
+    if (w <= 1 || h <= 1)
+        return;
+
+    if (r < 0)
+        r = 0;
+
+    int maxR = (std::min(w, h) / 2) - 1;
+    if (r > maxR)
+        r = maxR;
+
+    if (r == 0) {
+        display->drawRect(x, y, w, h);
+        return;
+    }
+
+    const int x0 = x;
+    const int y0 = y;
+    const int x1 = x + w - 1;
+    const int y1 = y + h - 1;
+
+    // sides
+    if (x0 + r <= x1 - r) {
+        display->drawLine(x0 + r, y0, x1 - r, y0); // top
+        display->drawLine(x0 + r, y1, x1 - r, y1); // bottom
+    }
+    if (y0 + r <= y1 - r) {
+        display->drawLine(x0, y0 + r, x0, y1 - r); // left
+        display->drawLine(x1, y0 + r, x1, y1 - r); // right
+    }
+
+    // corner arcs
+    display->drawCircleQuads(x0 + r, y0 + r, r, 2); // top left
+    display->drawCircleQuads(x1 - r, y0 + r, r, 1); // top right
+    display->drawCircleQuads(x1 - r, y1 - r, r, 8); // bottom right
+    display->drawCircleQuads(x0 + r, y1 - r, r, 4); // bottom left
+}
+
 static std::vector<MessageBlock> buildMessageBlocks(const std::vector<bool> &isHeaderVec, const std::vector<bool> &isMineVec)
 {
     std::vector<MessageBlock> blocks;
@@ -870,37 +909,27 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
             bubbleW = std::max(1, rightEdge - bubbleX);
 
         if (bubbleW > 1 && bubbleH > 1) {
+            int r = BUBBLE_RADIUS;
+            int maxR = (std::min(bubbleW, bubbleH) / 2) - 1;
+            if (maxR < 0)
+                maxR = 0;
+            if (r > maxR)
+                r = maxR;
+
+            drawRoundedRectOutline(display, bubbleX, topY, bubbleW, bubbleH, r);
+            const int extra = 3;
+            const int rr = r + extra;
             int x1 = bubbleX + bubbleW - 1;
             int y1 = topY + bubbleH - 1;
 
-            if (b.mine) {
-                // Send Message (Right side)
-                display->drawRect(x1 + 2 - bubbleW, y1 - bubbleH, bubbleW, bubbleH);
-                // Top Right Corner
-                display->drawRect(x1, topY, 2, 1);
-                display->drawRect(x1, topY, 1, 2);
-                // Bottom Right Corner
-                display->drawRect(x1 - 1, bottomY - 2, 2, 1);
-                display->drawRect(x1, bottomY - 3, 1, 2);
-                // Knock the corners off to make a bubble
-                display->setColor(BLACK);
-                display->drawRect(x1 - bubbleW, topY - 1, 1, 1);
-                display->drawRect(x1 - bubbleW, bottomY - 1, 1, 1);
-                display->setColor(WHITE);
+            if (!b.mine) {
+                // top-left corner square
+                display->drawLine(bubbleX, topY, bubbleX + rr, topY);
+                display->drawLine(bubbleX, topY, bubbleX, topY + rr);
             } else {
-                // Received Message (Left Side)
-                display->drawRect(bubbleX, topY, bubbleW + 1, bubbleH);
-                // Top Left Corner
-                display->drawRect(bubbleX + 1, topY + 1, 2, 1);
-                display->drawRect(bubbleX + 1, topY + 1, 1, 2);
-                // Bottom Left Corner
-                display->drawRect(bubbleX + 1, bottomY - 1, 2, 1);
-                display->drawRect(bubbleX + 1, bottomY - 2, 1, 2);
-                // Knock the corners off to make a bubble
-                display->setColor(BLACK);
-                display->drawRect(bubbleX + bubbleW, topY, 1, 1);
-                display->drawRect(bubbleX + bubbleW, bottomY, 1, 1);
-                display->setColor(WHITE);
+                // bottom-right corner square
+                display->drawLine(x1 - rr, y1, x1, y1);
+                display->drawLine(x1, y1 - rr, x1, y1);
             }
         }
     }

src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp

@@ -155,18 +155,6 @@ void InkHUD::LogoApplet::onShutdown()
     // This is then drawn by InkHUD::Events::onShutdown, with a blocking FULL update, after InkHUD's flash write is complete
 }
 
-void InkHUD::LogoApplet::onApplyingChanges()
-{
-    bringToForeground();
-
-    textLeft = "";
-    textRight = "";
-    textTitle = "Applying changes";
-    fontTitle = fontSmall;
-
-    inkhud->forceUpdate(Drivers::EInk::FAST, false);
-}
-
 void InkHUD::LogoApplet::onReboot()
 {
     bringToForeground();

src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h

@@ -26,7 +26,6 @@ class LogoApplet : public SystemApplet, public concurrency::OSThread
     void onBackground() override;
     void onShutdown() override;
     void onReboot() override;
-    void onApplyingChanges();
 
   protected:
     int32_t runOnce() override;

src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h

@@ -22,7 +22,6 @@ enum MenuAction {
     STORE_CANNEDMESSAGE_SELECTION,
     SEND_CANNEDMESSAGE,
     SHUTDOWN,
-    BACK,
     NEXT_TILE,
     TOGGLE_BACKLIGHT,
     TOGGLE_GPS,
@@ -37,84 +36,6 @@ enum MenuAction {
     TOGGLE_NOTIFICATIONS,
     TOGGLE_INVERT_COLOR,
     TOGGLE_12H_CLOCK,
-    // Regions
-    SET_REGION_US,
-    SET_REGION_EU_868,
-    SET_REGION_EU_433,
-    SET_REGION_CN,
-    SET_REGION_JP,
-    SET_REGION_ANZ,
-    SET_REGION_KR,
-    SET_REGION_TW,
-    SET_REGION_RU,
-    SET_REGION_IN,
-    SET_REGION_NZ_865,
-    SET_REGION_TH,
-    SET_REGION_LORA_24,
-    SET_REGION_UA_433,
-    SET_REGION_UA_868,
-    SET_REGION_MY_433,
-    SET_REGION_MY_919,
-    SET_REGION_SG_923,
-    SET_REGION_PH_433,
-    SET_REGION_PH_868,
-    SET_REGION_PH_915,
-    SET_REGION_ANZ_433,
-    SET_REGION_KZ_433,
-    SET_REGION_KZ_863,
-    SET_REGION_NP_865,
-    SET_REGION_BR_902,
-    // Device Roles
-    SET_ROLE_CLIENT,
-    SET_ROLE_CLIENT_MUTE,
-    SET_ROLE_ROUTER,
-    SET_ROLE_REPEATER,
-    // Presets
-    SET_PRESET_LONG_SLOW,
-    SET_PRESET_LONG_MODERATE,
-    SET_PRESET_LONG_FAST,
-    SET_PRESET_MEDIUM_SLOW,
-    SET_PRESET_MEDIUM_FAST,
-    SET_PRESET_SHORT_SLOW,
-    SET_PRESET_SHORT_FAST,
-    SET_PRESET_SHORT_TURBO,
-    // Timezones
-    SET_TZ_US_HAWAII,
-    SET_TZ_US_ALASKA,
-    SET_TZ_US_PACIFIC,
-    SET_TZ_US_ARIZONA,
-    SET_TZ_US_MOUNTAIN,
-    SET_TZ_US_CENTRAL,
-    SET_TZ_US_EASTERN,
-    SET_TZ_BR_BRAZILIA,
-    SET_TZ_UTC,
-    SET_TZ_EU_WESTERN,
-    SET_TZ_EU_CENTRAL,
-    SET_TZ_EU_EASTERN,
-    SET_TZ_ASIA_KOLKATA,
-    SET_TZ_ASIA_HONG_KONG,
-    SET_TZ_AU_AWST,
-    SET_TZ_AU_ACST,
-    SET_TZ_AU_AEST,
-    SET_TZ_PACIFIC_NZ,
-    // Power
-    TOGGLE_POWER_SAVE,
-    CALIBRATE_ADC,
-    // Bluetooth
-    TOGGLE_BLUETOOTH,
-    TOGGLE_BLUETOOTH_PAIR_MODE,
-    // Channel
-    TOGGLE_CHANNEL_UPLINK,
-    TOGGLE_CHANNEL_DOWNLINK,
-    TOGGLE_CHANNEL_POSITION,
-    SET_CHANNEL_PRECISION,
-    // Display
-    TOGGLE_DISPLAY_UNITS,
-    // Network
-    TOGGLE_WIFI,
-    // Administration
-    RESET_NODEDB_ALL,
-    RESET_NODEDB_KEEP_FAVORITES,
 };
 
 } // namespace NicheGraphics::InkHUD

src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h

@@ -35,7 +35,6 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
     void onRender() override;
 
     void show(Tile *t); // Open the menu, onto a user tile
-    void setStartPage(MenuPage page);
 
   protected:
     Drivers::LatchingBacklight *backlight = nullptr; // Convenient access to the backlight singleton
@@ -57,7 +56,6 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
     void sendText(NodeNum dest, ChannelIndex channel, const char *message); // Send a text message to mesh
     void freeCannedMessageResources();                                      // Clear MenuApplet's canned message processing data
 
-    MenuPage startPageOverride = MenuPage::ROOT;
     MenuPage currentPage = MenuPage::ROOT;
     MenuPage previousPage = MenuPage::EXIT;
     uint8_t cursor = 0;       // Which menu item is currently highlighted
@@ -65,15 +63,7 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
 
     uint16_t systemInfoPanelHeight = 0; // Need to know before we render
 
-    std::vector<MenuItem> items;               // MenuItems for the current page. Filled by ShowPage
-    std::vector<std::string> nodeConfigLabels; // Persistent labels for Node Config pages
-    uint8_t selectedChannelIndex = 0;          // Currently selected LoRa channel (Node Config → Radio → Channel)
-    bool channelPositionEnabled = false;
-    bool gpsEnabled = false;
-
-    // Recents menu checkbox state (derived from settings.recentlyActiveSeconds)
-    static constexpr uint8_t RECENTS_COUNT = 6;
-    bool recentsSelected[RECENTS_COUNT] = {};
+    std::vector<MenuItem> items; // MenuItems for the current page. Filled by ShowPage
 
     // Data for selecting and sending canned messages via the menu
     // Placed into a sub-class for organization only

src/graphics/niche/InkHUD/Applets/System/Menu/MenuItem.h

@@ -30,7 +30,6 @@ class MenuItem
     MenuAction action = NO_ACTION;
     MenuPage nextPage = EXIT;
     bool *checkState = nullptr;
-    bool isHeader = false; // Non-selectable section label
 
     // Various constructors, depending on the intended function of the item
 
@@ -41,12 +40,6 @@ class MenuItem
         : label(label), action(action), nextPage(nextPage), checkState(checkState)
     {
     }
-    static MenuItem Header(const char *label)
-    {
-        MenuItem item(label, NO_ACTION, EXIT);
-        item.isHeader = true;
-        return item;
-    }
 };
 
 } // namespace NicheGraphics::InkHUD

src/graphics/niche/InkHUD/Applets/System/Menu/MenuPage.h

@@ -20,27 +20,10 @@ enum MenuPage : uint8_t {
     SEND,
     CANNEDMESSAGE_RECIPIENT, // Select destination for a canned message
     OPTIONS,
-    NODE_CONFIG,
-    NODE_CONFIG_LORA,
-    NODE_CONFIG_CHANNELS,       // List of channels
-    NODE_CONFIG_CHANNEL_DETAIL, // Per-channel options
-    NODE_CONFIG_CHANNEL_PRECISION,
-    NODE_CONFIG_PRESET,
-    NODE_CONFIG_DEVICE,
-    NODE_CONFIG_DEVICE_ROLE,
-    NODE_CONFIG_POWER,
-    NODE_CONFIG_POWER_ADC_CAL,
-    NODE_CONFIG_NETWORK,
-    NODE_CONFIG_DISPLAY,
-    NODE_CONFIG_BLUETOOTH,
-    NODE_CONFIG_POSITION,
-    NODE_CONFIG_ADMIN_RESET,
-    TIMEZONE,
     APPLETS,
     AUTOSHOW,
     RECENTS, // Select length of "recentlyActiveSeconds"
-    REGION,
-    EXIT, // Dismiss the menu applet
+    EXIT,    // Dismiss the menu applet
 };
 
 } // namespace NicheGraphics::InkHUD

src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp

@@ -10,37 +10,34 @@ using namespace NicheGraphics;
 
 InkHUD::TipsApplet::TipsApplet()
 {
-    bool needsRegion = (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET);
-
-    bool showTutorialTips = (settings->tips.firstBoot || needsRegion);
+    // Decide which tips (if any) should be shown to user after the boot screen
 
     // Welcome screen
-    if (showTutorialTips)
+    if (settings->tips.firstBoot)
         tipQueue.push_back(Tip::WELCOME);
 
-    // Finish setup
-    if (needsRegion)
+    // Antenna, region, timezone
+    // Shown at boot if region not yet set
+    if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET)
         tipQueue.push_back(Tip::FINISH_SETUP);
 
-    // Using the UI
-    if (showTutorialTips) {
-        tipQueue.push_back(Tip::CUSTOMIZATION);
-        tipQueue.push_back(Tip::BUTTONS);
-    }
-
     // Shutdown info
     // Shown until user performs one valid shutdown
     if (!settings->tips.safeShutdownSeen)
         tipQueue.push_back(Tip::SAFE_SHUTDOWN);
 
+    // Using the UI
+    if (settings->tips.firstBoot) {
+        tipQueue.push_back(Tip::CUSTOMIZATION);
+        tipQueue.push_back(Tip::BUTTONS);
+    }
+
     // Catch an incorrect attempt at rotating display
     if (config.display.flip_screen)
         tipQueue.push_back(Tip::ROTATION);
 
-    // Region picker
-    if (needsRegion)
-        tipQueue.push_back(Tip::PICK_REGION);
-
+    // Applet is foreground immediately at boot, but is obscured by LogoApplet, which is also foreground
+    // LogoApplet can be considered to have a higher Z-index, because it is placed before TipsApplet in the systemApplets vector
     if (!tipQueue.empty())
         bringToForeground();
 }
@@ -54,109 +51,81 @@ void InkHUD::TipsApplet::onRender()
 
     case Tip::FINISH_SETUP: {
         setFont(fontMedium);
-        const char *title = "Tip: Finish Setup";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
+        printAt(0, 0, "Tip: Finish Setup");
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
+        int16_t cursorY = fontMedium.lineHeight() * 1.5;
+        printAt(0, cursorY, "- connect antenna");
 
-        auto drawBullet = [&](const char *text) {
-            uint16_t bh = getWrappedTextHeight(0, width(), text);
-            printWrapped(0, cursorY, width(), text);
-            cursorY += bh + (fontSmall.lineHeight() / 3);
-        };
+        cursorY += fontSmall.lineHeight() * 1.2;
+        printAt(0, cursorY, "- connect a client app");
 
-        drawBullet("- connect antenna");
-        drawBullet("- connect a client app");
+        // Only if region not set
+        if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- set region");
+        }
 
-        if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET)
-            drawBullet("- set region");
+        // Only if tz not set
+        if (!(*config.device.tzdef && config.device.tzdef[0] != 0)) {
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- set timezone");
+        }
 
-        if (!(*config.device.tzdef && config.device.tzdef[0] != 0))
-            drawBullet("- set timezone");
-
-        cursorY += fontSmall.lineHeight() / 2;
-        drawBullet("More info at meshtastic.org");
+        cursorY += fontSmall.lineHeight() * 1.5;
+        printAt(0, cursorY, "More info at meshtastic.org");
 
+        setFont(fontSmall);
         printAt(0, Y(1.0), "Press button to continue", LEFT, BOTTOM);
     } break;
 
-    case Tip::PICK_REGION: {
-        setFont(fontMedium);
-        printAt(0, 0, "Set Region");
-
-        setFont(fontSmall);
-        printWrapped(0, fontMedium.lineHeight() * 1.5, width(), "Please select your LoRa region to complete setup.");
-
-        printAt(0, Y(1.0), "Press button to choose", LEFT, BOTTOM);
-    } break;
-
     case Tip::SAFE_SHUTDOWN: {
         setFont(fontMedium);
-
-        const char *title = "Tip: Shutdown";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
+        printAt(0, 0, "Tip: Shutdown");
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
-
-        const char *body = "Before removing power, please shut down from InkHUD menu, or a client app.\n\n"
-                           "This ensures data is saved.";
-
-        uint16_t bodyH = getWrappedTextHeight(0, width(), body);
-        printWrapped(0, cursorY, width(), body);
-        cursorY += bodyH + (fontSmall.lineHeight() / 2);
+        std::string shutdown;
+        shutdown += "Before removing power, please shut down from InkHUD menu, or a client app. \n";
+        shutdown += "\n";
+        shutdown += "This ensures data is saved.";
+        printWrapped(0, fontMedium.lineHeight() * 1.5, width(), shutdown);
 
         printAt(0, Y(1.0), "Press button to continue", LEFT, BOTTOM);
+
     } break;
 
     case Tip::CUSTOMIZATION: {
         setFont(fontMedium);
-
-        const char *title = "Tip: Customization";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
+        printAt(0, 0, "Tip: Customization");
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
-
-        const char *body = "Configure & control display with the InkHUD menu. "
-                           "Optional features, layout, rotation, and more.";
-
-        uint16_t bodyH = getWrappedTextHeight(0, width(), body);
-        printWrapped(0, cursorY, width(), body);
-        cursorY += bodyH + (fontSmall.lineHeight() / 2);
+        printWrapped(0, fontMedium.lineHeight() * 1.5, width(),
+                     "Configure & control display with the InkHUD menu. Optional features, layout, rotation, and more.");
 
         printAt(0, Y(1.0), "Press button to continue", LEFT, BOTTOM);
     } break;
 
     case Tip::BUTTONS: {
         setFont(fontMedium);
-
-        const char *title = "Tip: Buttons";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
+        printAt(0, 0, "Tip: Buttons");
 
         setFont(fontSmall);
-        int16_t cursorY = h + fontSmall.lineHeight();
-
-        auto drawBullet = [&](const char *text) {
-            uint16_t bh = getWrappedTextHeight(0, width(), text);
-            printWrapped(0, cursorY, width(), text);
-            cursorY += bh + (fontSmall.lineHeight() / 3);
-        };
+        int16_t cursorY = fontMedium.lineHeight() * 1.5;
 
         if (!settings->joystick.enabled) {
-            drawBullet("User Button");
-            drawBullet("- short press: next");
-            drawBullet("- long press: select or open menu");
+            printAt(0, cursorY, "User Button");
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- short press: next");
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- long press: select / open menu");
         } else {
-            drawBullet("Joystick");
-            drawBullet("- press: open menu or select");
-            drawBullet("Exit Button");
-            drawBullet("- press: switch tile or close menu");
+            printAt(0, cursorY, "Joystick");
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- open menu / select");
+            cursorY += fontSmall.lineHeight() * 1.5;
+            printAt(0, cursorY, "Exit Button");
+            cursorY += fontSmall.lineHeight() * 1.2;
+            printAt(0, cursorY, "- switch tile / close menu");
         }
 
         printAt(0, Y(1.0), "Press button to continue", LEFT, BOTTOM);
@@ -164,21 +133,12 @@ void InkHUD::TipsApplet::onRender()
 
     case Tip::ROTATION: {
         setFont(fontMedium);
-
-        const char *title = "Tip: Rotation";
-        uint16_t h = getWrappedTextHeight(0, width(), title);
-        printWrapped(0, 0, width(), title);
+        printAt(0, 0, "Tip: Rotation");
 
         setFont(fontSmall);
         if (!settings->joystick.enabled) {
-            int16_t cursorY = h + fontSmall.lineHeight();
-
-            const char *body = "To rotate the display, use the InkHUD menu. "
-                               "Long-press the user button > Options > Rotate.";
-
-            uint16_t bh = getWrappedTextHeight(0, width(), body);
-            printWrapped(0, cursorY, width(), body);
-            cursorY += bh + (fontSmall.lineHeight() / 2);
+            printWrapped(0, fontMedium.lineHeight() * 1.5, width(),
+                         "To rotate the display, use the InkHUD menu. Long-press the user button > Options > Rotate.");
         } else {
             printWrapped(0, fontMedium.lineHeight() * 1.5, width(),
                          "To rotate the display, use the InkHUD menu. Press the user button > Options > Rotate.");
@@ -199,15 +159,12 @@ void InkHUD::TipsApplet::renderWelcome()
 {
     uint16_t padW = X(0.05);
 
-    // Detect portrait orientation
-    bool portrait = height() > width();
-
     // Block 1 - logo & title
     // ========================
 
     // Logo size
-    uint16_t logoWLimit = portrait ? X(0.5) : X(0.3);
-    uint16_t logoHLimit = portrait ? Y(0.25) : Y(0.3);
+    uint16_t logoWLimit = X(0.3);
+    uint16_t logoHLimit = Y(0.3);
     uint16_t logoW = getLogoWidth(logoWLimit, logoHLimit);
     uint16_t logoH = getLogoHeight(logoWLimit, logoHLimit);
 
@@ -220,7 +177,7 @@ void InkHUD::TipsApplet::renderWelcome()
 
     // Center the block
     // Desired effect: equal margin from display edge for logo left and title right
-    int16_t block1Y = portrait ? Y(0.2) : Y(0.3);
+    int16_t block1Y = Y(0.3);
     int16_t block1CX = X(0.5) + (logoW / 2) - (titleW / 2);
     int16_t logoCX = block1CX - (logoW / 2) - (padW / 2);
     int16_t titleCX = block1CX + (titleW / 2) + (padW / 2);
@@ -235,7 +192,7 @@ void InkHUD::TipsApplet::renderWelcome()
     std::string subtitle = "InkHUD";
     if (width() >= 200)
         subtitle += "  -  A Heads-Up Display"; // Future proofing: narrower for tiny display
-    printAt(X(0.5), portrait ? Y(0.45) : Y(0.6), subtitle, CENTER, MIDDLE);
+    printAt(X(0.5), Y(0.6), subtitle, CENTER, MIDDLE);
 
     // Block 3 - press to continue
     // ============================
@@ -267,37 +224,26 @@ void InkHUD::TipsApplet::onBackground()
 // While our SystemApplet::handleInput flag is true
 void InkHUD::TipsApplet::onButtonShortPress()
 {
-    bool needsRegion = (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET);
-    // If we're prompting the user to pick a region, hand off to the menu
-    if (!tipQueue.empty() && tipQueue.front() == Tip::PICK_REGION) {
-        tipQueue.pop_front();
-
-        // Signal InkHUD to open the menu on Region page
-        inkhud->forceRegionMenu = true;
-
-        // Close tips and open menu
-        sendToBackground();
-        inkhud->openMenu();
-        return;
-    }
-    // Consume current tip
     tipQueue.pop_front();
 
     // All tips done
     if (tipQueue.empty()) {
         // Record that user has now seen the "tutorial" set of tips
         // Don't show them on subsequent boots
-        if (settings->tips.firstBoot && !needsRegion) {
+        if (settings->tips.firstBoot) {
             settings->tips.firstBoot = false;
             inkhud->persistence->saveSettings();
         }
 
-        // Close applet and clean the screen
+        // Close applet, and full refresh to clean the screen
+        // Need to force update, because our request would be ignored otherwise, as we are now background
         sendToBackground();
         inkhud->forceUpdate(EInk::UpdateTypes::FULL);
-    } else {
-        requestUpdate();
     }
+
+    // More tips left
+    else
+        requestUpdate();
 }
 
 // Functions the same as the user button in this instance

src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h

@@ -23,7 +23,6 @@ class TipsApplet : public SystemApplet
     enum class Tip {
         WELCOME,
         FINISH_SETUP,
-        PICK_REGION,
         SAFE_SHUTDOWN,
         CUSTOMIZATION,
         BUTTONS,

src/graphics/niche/InkHUD/Events.cpp

@@ -276,15 +276,6 @@ int InkHUD::Events::beforeDeepSleep(void *unused)
     return 0; // We agree: deep sleep now
 }
 
-// Display an intermediate screen while configuration changes are applied
-void InkHUD::Events::applyingChanges()
-{
-    // Bring the logo applet forward with a temporary message
-    for (SystemApplet *sa : inkhud->systemApplets) {
-        sa->onApplyingChanges();
-    }
-}
-
 // Callback for rebootObserver
 // Same as shutdown, without drawing the logoApplet
 // Makes sure we don't lose message history / InkHUD config

src/graphics/niche/InkHUD/Events.h

@@ -29,13 +29,12 @@ class Events
 
     void onButtonShort(); // User button: short press
     void onButtonLong();  // User button: long press
-    void applyingChanges();
-    void onExitShort(); // Exit button: short press
-    void onExitLong();  // Exit button: long press
-    void onNavUp();     // Navigate up
-    void onNavDown();   // Navigate down
-    void onNavLeft();   // Navigate left
-    void onNavRight();  // Navigate right
+    void onExitShort();   // Exit button: short press
+    void onExitLong();    // Exit button: long press
+    void onNavUp();       // Navigate up
+    void onNavDown();     // Navigate down
+    void onNavLeft();     // Navigate left
+    void onNavRight();    // Navigate right
 
     int beforeDeepSleep(void *unused);                             // Prepare for shutdown
     int beforeReboot(void *unused);                                // Prepare for reboot

src/graphics/niche/InkHUD/InkHUD.cpp

@@ -53,13 +53,6 @@ void InkHUD::InkHUD::addApplet(const char *name, Applet *a, bool defaultActive,
     windowManager->addApplet(name, a, defaultActive, defaultAutoshow, onTile);
 }
 
-void InkHUD::InkHUD::notifyApplyingChanges()
-{
-    if (events) {
-        events->applyingChanges();
-    }
-}
-
 // Start InkHUD!
 // Call this only after you have configured InkHUD
 void InkHUD::InkHUD::begin()

src/graphics/niche/InkHUD/InkHUD.h

@@ -47,7 +47,6 @@ class InkHUD
     void setDriver(Drivers::EInk *driver);
     void setDisplayResilience(uint8_t fastPerFull = 5, float stressMultiplier = 2.0);
     void addApplet(const char *name, Applet *a, bool defaultActive = false, bool defaultAutoshow = false, uint8_t onTile = -1);
-    void notifyApplyingChanges();
 
     void begin();
 
@@ -77,9 +76,6 @@ class InkHUD
     void rotateJoystick(uint8_t angle = 1); // rotate 90 deg by default
     void toggleBatteryIcon();
 
-    // Used by TipsApplet to force menu to start on Region selection
-    bool forceRegionMenu = false;
-
     // Updating the display
     // - called by various InkHUD components
 

src/graphics/niche/InkHUD/MessageStore.cpp

@@ -50,12 +50,14 @@ void InkHUD::MessageStore::saveToFlash()
     // For each message
     for (uint8_t i = 0; i < messages.size() && i < MAX_MESSAGES_SAVED; i++) {
         Message &m = messages.at(i);
-        f.write((uint8_t *)&m.timestamp, sizeof(m.timestamp));                    // Write timestamp. 4 bytes
-        f.write((uint8_t *)&m.sender, sizeof(m.sender));                          // Write sender NodeId. 4 Bytes
-        f.write((uint8_t *)&m.channelIndex, sizeof(m.channelIndex));              // Write channel index. 1 Byte
-        f.write((uint8_t *)m.text.c_str(), min(MAX_MESSAGE_SIZE, m.text.size())); // Write message text. Variable length
-        f.write('\0');                                                            // Append null term
-        LOG_DEBUG("Wrote message %u, length %u, text \"%s\"", (uint32_t)i, min(MAX_MESSAGE_SIZE, m.text.size()), m.text.c_str());
+        f.write((uint8_t *)&m.timestamp, sizeof(m.timestamp));       // Write timestamp. 4 bytes
+        f.write((uint8_t *)&m.sender, sizeof(m.sender));             // Write sender NodeId. 4 Bytes
+        f.write((uint8_t *)&m.channelIndex, sizeof(m.channelIndex)); // Write channel index. 1 Byte
+        f.write((uint8_t *)m.text.c_str(),
+                std::min<size_t>(MAX_MESSAGE_SIZE, m.text.size())); // Write message text. Variable length
+        f.write('\0');                                              // Append null term
+        LOG_DEBUG("Wrote message %u, length %u, text \"%s\"", (uint32_t)i, std::min<size_t>(MAX_MESSAGE_SIZE, m.text.size()),
+                  m.text.c_str());
     }
 
     // Release firmware's SPI lock, because SafeFile::close needs it

src/graphics/niche/InkHUD/SystemApplet.h

@@ -27,7 +27,6 @@ class SystemApplet : public Applet
     bool lockRequests = false;  // - prevent other applets from triggering display updates
 
     virtual void onReboot() { onShutdown(); } // - handle reboot specially
-    virtual void onApplyingChanges() {}
 
     // Other system applets may take precedence over our own system applet though
     // The order an applet is passed to WindowManager::addSystemApplet determines this hierarchy (added earlier = higher rank)

src/input/ExpressLRSFiveWay.h

@@ -13,6 +13,8 @@
 
 #ifdef INPUTBROKER_EXPRESSLRSFIVEWAY_TYPE
 
+// REVISIT esp_adc_cal.h
+// "legacy adc calibration driver is deprecated, please migrate to use esp_adc/adc_cali.h and esp_adc/adc_cali_scheme.h"
 #include <esp_adc_cal.h>
 #include <soc/adc_channel.h>
 

src/input/HackadayCommunicatorKeyboard.cpp

@@ -20,20 +20,20 @@ constexpr uint8_t modifierLeftShift = 0b0001;
 
 // Num chars per key, Modulus for rotating through characters
 static uint8_t HackadayCommunicatorTapMod[_TCA8418_NUM_KEYS] = {
-    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
     0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 0, 0, 0, 1, 2, 2, 2, 1, 2, 2, 0, 0, 0, 2, 1, 2, 2, 0, 1, 1, 0,
 };
 
 static unsigned char HackadayCommunicatorTapMap[_TCA8418_NUM_KEYS][2] = {{},
-                                                                         {Key::FUNCTION_F1},
+                                                                         {},
                                                                          {'+'},
                                                                          {'9'},
                                                                          {'8'},
                                                                          {'7'},
-                                                                         {Key::FUNCTION_F2},
-                                                                         {Key::FUNCTION_F3},
-                                                                         {Key::FUNCTION_F4},
-                                                                         {Key::FUNCTION_F5},
+                                                                         {'2'},
+                                                                         {'3'},
+                                                                         {'4'},
+                                                                         {'5'},
                                                                          {Key::ESC},
                                                                          {'q', 'Q'},
                                                                          {'w', 'W'},
@@ -141,7 +141,6 @@ void HackadayCommunicatorKeyboard::pressed(uint8_t key)
     if (state == Init || state == Busy) {
         return;
     }
-    LOG_DEBUG("Key pressed: %u", key);
 
     if (modifierFlag && (millis() - last_modifier_time > _TCA8418_MULTI_TAP_THRESHOLD)) {
         modifierFlag = 0;

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
-}

src/input/InputBroker.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Observer.h"
-#include "concurrency/OSThread.h"
 #include "freertosinc.h"
 
 #ifdef InputBrokerDebug
@@ -28,11 +27,6 @@ enum input_broker_event {
     INPUT_BROKER_SHUTDOWN = 0x9b,
     INPUT_BROKER_GPS_TOGGLE = 0x9e,
     INPUT_BROKER_SEND_PING = 0xaf,
-    INPUT_BROKER_FN_F1 = 0xf1,
-    INPUT_BROKER_FN_F2 = 0xf2,
-    INPUT_BROKER_FN_F3 = 0xf3,
-    INPUT_BROKER_FN_F4 = 0xf4,
-    INPUT_BROKER_FN_F5 = 0xf5,
     INPUT_BROKER_MATRIXKEY = 0xFE,
     INPUT_BROKER_ANYKEY = 0xff
 
@@ -77,7 +71,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 +84,4 @@ class InputBroker : public Observable<const InputEvent *>
 #endif
 };
 
-extern InputBroker *inputBroker;
-extern bool runASAP;
+extern InputBroker *inputBroker;

src/input/TCA8418KeyboardBase.h

@@ -26,12 +26,7 @@ class TCA8418KeyboardBase
         GPS_TOGGLE = 0x9E,
         MUTE_TOGGLE = 0xAC,
         SEND_PING = 0xAF,
-        BL_TOGGLE = 0xAB,
-        FUNCTION_F1 = 0xF1,
-        FUNCTION_F2 = 0xF2,
-        FUNCTION_F3 = 0xF3,
-        FUNCTION_F4 = 0xF4,
-        FUNCTION_F5 = 0xF5
+        BL_TOGGLE = 0xAB
     };
 
     typedef uint8_t (*i2c_com_fptr_t)(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t len);

src/input/TLoraPagerKeyboard.cpp

@@ -68,7 +68,7 @@ TLoraPagerKeyboard::TLoraPagerKeyboard()
     : TCA8418KeyboardBase(_TCA8418_ROWS, _TCA8418_COLS), modifierFlag(0), last_modifier_time(0), last_key(-1), next_key(-1),
       last_tap(0L), char_idx(0), tap_interval(0)
 {
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
     ledcAttach(KB_BL_PIN, LEDC_BACKLIGHT_FREQ, LEDC_BACKLIGHT_BIT_WIDTH);
 #else
     ledcSetup(LEDC_BACKLIGHT_CHANNEL, LEDC_BACKLIGHT_FREQ, LEDC_BACKLIGHT_BIT_WIDTH);
@@ -108,7 +108,7 @@ void TLoraPagerKeyboard::setBacklight(bool on)
     uint32_t _brightness = 0;
     if (on)
         _brightness = brightness;
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
     ledcWrite(KB_BL_PIN, _brightness);
 #else
     ledcWrite(LEDC_BACKLIGHT_CHANNEL, _brightness);

src/input/TrackballInterruptBase.cpp

@@ -1,7 +1,5 @@
 #include "TrackballInterruptBase.h"
-#include "Throttle.h"
 #include "configuration.h"
-
 extern bool osk_found;
 
 TrackballInterruptBase::TrackballInterruptBase(const char *name) : concurrency::OSThread(name), _originName(name) {}
@@ -57,27 +55,17 @@ int32_t TrackballInterruptBase::runOnce()
 {
     InputEvent e = {};
     e.inputEvent = INPUT_BROKER_NONE;
-#if TB_THRESHOLD
-    if (lastInterruptTime && !Throttle::isWithinTimespanMs(lastInterruptTime, 1000)) {
-        left_counter = 0;
-        right_counter = 0;
-        up_counter = 0;
-        down_counter = 0;
-        lastInterruptTime = 0;
-    }
-#ifdef INPUT_DEBUG
-    if (left_counter > 0 || right_counter > 0 || up_counter > 0 || down_counter > 0) {
-        LOG_DEBUG("L %u R %u U %u D %u, time %u", left_counter, right_counter, up_counter, down_counter, millis());
-    }
-#endif
-#endif
 
     // Handle long press detection for press button
     if (pressDetected && pressStartTime > 0) {
         uint32_t pressDuration = millis() - pressStartTime;
         bool buttonStillPressed = false;
 
+#if defined(T_DECK)
+        buttonStillPressed = (this->action == TB_ACTION_PRESSED);
+#else
         buttonStillPressed = !digitalRead(_pinPress);
+#endif
 
         if (!buttonStillPressed) {
             // Button released
@@ -146,31 +134,23 @@ int32_t TrackballInterruptBase::runOnce()
         }
     }
 
-#if TB_THRESHOLD
-    if (this->action == TB_ACTION_PRESSED && (!pressDetected || pressStartTime == 0)) {
+#if defined(T_DECK) // T-deck gets a super-simple debounce on trackball
+    if (this->action == TB_ACTION_PRESSED && !pressDetected) {
         // Start long press detection
         pressDetected = true;
         pressStartTime = millis();
         // Don't send event yet, wait to see if it's a long press
-    } else if (up_counter >= TB_THRESHOLD) {
-#ifdef INPUT_DEBUG
-        LOG_DEBUG("Trackball event UP %u", millis());
-#endif
+    } else if (this->action == TB_ACTION_UP && lastEvent == TB_ACTION_UP) {
+        // LOG_DEBUG("Trackball event UP");
         e.inputEvent = this->_eventUp;
-    } else if (down_counter >= TB_THRESHOLD) {
-#ifdef INPUT_DEBUG
-        LOG_DEBUG("Trackball event DOWN %u", millis());
-#endif
+    } else if (this->action == TB_ACTION_DOWN && lastEvent == TB_ACTION_DOWN) {
+        // LOG_DEBUG("Trackball event DOWN");
         e.inputEvent = this->_eventDown;
-    } else if (left_counter >= TB_THRESHOLD) {
-#ifdef INPUT_DEBUG
-        LOG_DEBUG("Trackball event LEFT %u", millis());
-#endif
+    } else if (this->action == TB_ACTION_LEFT && lastEvent == TB_ACTION_LEFT) {
+        // LOG_DEBUG("Trackball event LEFT");
         e.inputEvent = this->_eventLeft;
-    } else if (right_counter >= TB_THRESHOLD) {
-#ifdef INPUT_DEBUG
-        LOG_DEBUG("Trackball event RIGHT %u", millis());
-#endif
+    } else if (this->action == TB_ACTION_RIGHT && lastEvent == TB_ACTION_RIGHT) {
+        // LOG_DEBUG("Trackball event RIGHT");
         e.inputEvent = this->_eventRight;
     }
 #else
@@ -203,12 +183,6 @@ int32_t TrackballInterruptBase::runOnce()
         e.source = this->_originName;
         e.kbchar = 0x00;
         this->notifyObservers(&e);
-#if TB_THRESHOLD
-        left_counter = 0;
-        right_counter = 0;
-        up_counter = 0;
-        down_counter = 0;
-#endif
     }
 
     // Only update lastEvent for non-press actions or completed press actions
@@ -224,49 +198,25 @@ int32_t TrackballInterruptBase::runOnce()
 
 void TrackballInterruptBase::intPressHandler()
 {
-    if (!Throttle::isWithinTimespanMs(lastInterruptTime, 10))
-        this->action = TB_ACTION_PRESSED;
-    lastInterruptTime = millis();
+    this->action = TB_ACTION_PRESSED;
 }
 
 void TrackballInterruptBase::intDownHandler()
 {
-    if (TB_THRESHOLD || !Throttle::isWithinTimespanMs(lastInterruptTime, 10))
-        this->action = TB_ACTION_DOWN;
-    lastInterruptTime = millis();
-
-#if TB_THRESHOLD
-    down_counter++;
-#endif
+    this->action = TB_ACTION_DOWN;
 }
 
 void TrackballInterruptBase::intUpHandler()
 {
-    if (TB_THRESHOLD || !Throttle::isWithinTimespanMs(lastInterruptTime, 10))
-        this->action = TB_ACTION_UP;
-    lastInterruptTime = millis();
-
-#if TB_THRESHOLD
-    up_counter++;
-#endif
+    this->action = TB_ACTION_UP;
 }
 
 void TrackballInterruptBase::intLeftHandler()
 {
-    if (TB_THRESHOLD || !Throttle::isWithinTimespanMs(lastInterruptTime, 10))
-        this->action = TB_ACTION_LEFT;
-    lastInterruptTime = millis();
-#if TB_THRESHOLD
-    left_counter++;
-#endif
+    this->action = TB_ACTION_LEFT;
 }
 
 void TrackballInterruptBase::intRightHandler()
 {
-    if (TB_THRESHOLD || !Throttle::isWithinTimespanMs(lastInterruptTime, 10))
-        this->action = TB_ACTION_RIGHT;
-    lastInterruptTime = millis();
-#if TB_THRESHOLD
-    right_counter++;
-#endif
+    this->action = TB_ACTION_RIGHT;
 }

src/input/TrackballInterruptBase.h

@@ -12,10 +12,6 @@
 #endif
 #endif
 
-#ifndef TB_THRESHOLD
-#define TB_THRESHOLD 0
-#endif
-
 class TrackballInterruptBase : public Observable<const InputEvent *>, public concurrency::OSThread
 {
   public:
@@ -29,6 +25,8 @@ class TrackballInterruptBase : public Observable<const InputEvent *>, public con
     void intUpHandler();
     void intLeftHandler();
     void intRightHandler();
+    uint32_t lastTime = 0;
+
     virtual int32_t runOnce() override;
 
   protected:
@@ -69,12 +67,4 @@ class TrackballInterruptBase : public Observable<const InputEvent *>, public con
     input_broker_event _eventPressedLong = INPUT_BROKER_NONE;
     const char *_originName;
     TrackballInterruptBaseActionType lastEvent = TB_ACTION_NONE;
-    volatile uint32_t lastInterruptTime = 0;
-
-#if TB_THRESHOLD
-    volatile uint8_t left_counter = 0;
-    volatile uint8_t right_counter = 0;
-    volatile uint8_t up_counter = 0;
-    volatile uint8_t down_counter = 0;
-#endif
 };

src/input/TrackballInterruptImpl1.cpp

@@ -24,26 +24,41 @@ void TrackballInterruptImpl1::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinLe
 
 void TrackballInterruptImpl1::handleIntDown()
 {
-    trackballInterruptImpl1->intDownHandler();
-    trackballInterruptImpl1->setIntervalFromNow(20);
+    if (TB_DIRECTION == RISING || millis() > trackballInterruptImpl1->lastTime + 10) {
+        trackballInterruptImpl1->lastTime = millis();
+        trackballInterruptImpl1->intDownHandler();
+        trackballInterruptImpl1->setIntervalFromNow(20);
+    }
 }
 void TrackballInterruptImpl1::handleIntUp()
 {
-    trackballInterruptImpl1->intUpHandler();
-    trackballInterruptImpl1->setIntervalFromNow(20);
+    if (TB_DIRECTION == RISING || millis() > trackballInterruptImpl1->lastTime + 10) {
+        trackballInterruptImpl1->lastTime = millis();
+        trackballInterruptImpl1->intUpHandler();
+        trackballInterruptImpl1->setIntervalFromNow(20);
+    }
 }
 void TrackballInterruptImpl1::handleIntLeft()
 {
-    trackballInterruptImpl1->intLeftHandler();
-    trackballInterruptImpl1->setIntervalFromNow(20);
+    if (TB_DIRECTION == RISING || millis() > trackballInterruptImpl1->lastTime + 10) {
+        trackballInterruptImpl1->lastTime = millis();
+        trackballInterruptImpl1->intLeftHandler();
+        trackballInterruptImpl1->setIntervalFromNow(20);
+    }
 }
 void TrackballInterruptImpl1::handleIntRight()
 {
-    trackballInterruptImpl1->intRightHandler();
-    trackballInterruptImpl1->setIntervalFromNow(20);
+    if (TB_DIRECTION == RISING || millis() > trackballInterruptImpl1->lastTime + 10) {
+        trackballInterruptImpl1->lastTime = millis();
+        trackballInterruptImpl1->intRightHandler();
+        trackballInterruptImpl1->setIntervalFromNow(20);
+    }
 }
 void TrackballInterruptImpl1::handleIntPressed()
 {
-    trackballInterruptImpl1->intPressHandler();
-    trackballInterruptImpl1->setIntervalFromNow(20);
+    if (TB_DIRECTION == RISING || millis() > trackballInterruptImpl1->lastTime + 10) {
+        trackballInterruptImpl1->lastTime = millis();
+        trackballInterruptImpl1->intPressHandler();
+        trackballInterruptImpl1->setIntervalFromNow(20);
+    }
 }

src/input/kbI2cBase.cpp

@@ -321,26 +321,6 @@ int32_t KbI2cBase::runOnce()
                 e.inputEvent = INPUT_BROKER_ANYKEY;
                 e.kbchar = INPUT_BROKER_MSG_TAB;
                 break;
-            case TCA8418KeyboardBase::FUNCTION_F1:
-                e.inputEvent = INPUT_BROKER_FN_F1;
-                e.kbchar = 0x00;
-                break;
-            case TCA8418KeyboardBase::FUNCTION_F2:
-                e.inputEvent = INPUT_BROKER_FN_F2;
-                e.kbchar = 0x00;
-                break;
-            case TCA8418KeyboardBase::FUNCTION_F3:
-                e.inputEvent = INPUT_BROKER_FN_F3;
-                e.kbchar = 0x00;
-                break;
-            case TCA8418KeyboardBase::FUNCTION_F4:
-                e.inputEvent = INPUT_BROKER_FN_F4;
-                e.kbchar = 0x00;
-                break;
-            case TCA8418KeyboardBase::FUNCTION_F5:
-                e.inputEvent = INPUT_BROKER_FN_F5;
-                e.kbchar = 0x00;
-                break;
             default:
                 if (nextEvent > 127) {
                     e.inputEvent = INPUT_BROKER_NONE;

src/main.cpp

@@ -10,7 +10,6 @@
 #include "ReliableRouter.h"
 #include "airtime.h"
 #include "buzz.h"
-#include "power/PowerHAL.h"
 
 #include "FSCommon.h"
 #include "Led.h"
@@ -43,6 +42,10 @@
 #include "MessageStore.h"
 #endif
 
+#ifdef ELECROW_ThinkNode_M5
+PCA9557 io(0x18, &Wire);
+#endif
+
 #ifdef ARCH_ESP32
 #include "freertosinc.h"
 #if !MESHTASTIC_EXCLUDE_WEBSERVER
@@ -73,10 +76,29 @@ NRF52Bluetooth *nrf52Bluetooth = nullptr;
 #include "mqtt/MQTT.h"
 #endif
 
+#include "LLCC68Interface.h"
+#include "LR1110Interface.h"
+#include "LR1120Interface.h"
+#include "LR1121Interface.h"
+#include "RF95Interface.h"
+#include "SX1262Interface.h"
+#include "SX1268Interface.h"
+#include "SX1280Interface.h"
+#include "detect/LoRaRadioType.h"
+
+#ifdef ARCH_STM32WL
+#include "STM32WLE5JCInterface.h"
+#endif
+
+#if defined(ARCH_PORTDUINO)
+#include "platform/portduino/SimRadio.h"
+#endif
+
 #ifdef ARCH_PORTDUINO
 #include "linux/LinuxHardwareI2C.h"
 #include "mesh/raspihttp/PiWebServer.h"
 #include "platform/portduino/PortduinoGlue.h"
+#include "platform/portduino/USBHal.h"
 #include <cstdlib>
 #include <fstream>
 #include <iostream>
@@ -120,6 +142,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"
 
@@ -206,6 +253,9 @@ ScanI2C::DeviceAddress aqi_found = ScanI2C::ADDRESS_NONE;
 Adafruit_DRV2605 drv;
 #endif
 
+// Global LoRa radio type
+LoRaRadioType radioType = NO_RADIO;
+
 bool isVibrating = false;
 
 bool eink_found = true;
@@ -242,7 +292,6 @@ const char *getDeviceName()
     return name;
 }
 
-// TODO remove from main.cpp
 static int32_t ledBlinker()
 {
     // Still set up the blinking (heartbeat) interval but skip code path below, so LED will blink if
@@ -283,46 +332,6 @@ __attribute__((weak, noinline)) bool loopCanSleep()
 void lateInitVariant() __attribute__((weak));
 void lateInitVariant() {}
 
-void earlyInitVariant() __attribute__((weak));
-void earlyInitVariant() {}
-
-// NRF52 (and probably other platforms) can report when system is in power failure mode
-// (eg. too low battery voltage) and operating it is unsafe (data corruption, bootloops, etc).
-// For example NRF52 will prevent any flash writes in that case automatically
-// (but it causes issues we need to handle).
-// This detection is independent from whatever ADC or dividers used in Meshtastic
-// boards and is internal to chip.
-
-// we use powerHAL layer to get this info and delay booting until power level is safe
-
-// wait until power level is safe to continue booting (to avoid bootloops)
-// blink user led in 3 flashes sequence to indicate what is happening
-void waitUntilPowerLevelSafe()
-{
-
-#ifdef LED_PIN
-    pinMode(LED_PIN, OUTPUT);
-#endif
-
-    while (powerHAL_isPowerLevelSafe() == false) {
-
-#ifdef LED_PIN
-
-        // 3x: blink for 300 ms, pause for 300 ms
-
-        for (int i = 0; i < 3; i++) {
-            digitalWrite(LED_PIN, LED_STATE_ON);
-            delay(300);
-            digitalWrite(LED_PIN, LED_STATE_OFF);
-            delay(300);
-        }
-#endif
-
-        // sleep for 2s
-        delay(2000);
-    }
-}
-
 /**
  * Print info as a structured log message (for automated log processing)
  */
@@ -333,22 +342,26 @@ void printInfo()
 #ifndef PIO_UNIT_TESTING
 void setup()
 {
-
-    // initialize power HAL layer as early as possible
-    powerHAL_init();
-
-    // prevent booting if device is in power failure mode
-    // boot sequence will follow when battery level raises to safe mode
-    waitUntilPowerLevelSafe();
-
-    // Defined in variant.cpp for early init code
-    earlyInitVariant();
+#if defined(R1_NEO)
+    pinMode(DCDC_EN_HOLD, OUTPUT);
+    digitalWrite(DCDC_EN_HOLD, HIGH);
+    pinMode(NRF_ON, OUTPUT);
+    digitalWrite(NRF_ON, HIGH);
+#endif
 
 #if defined(PIN_POWER_EN)
     pinMode(PIN_POWER_EN, OUTPUT);
     digitalWrite(PIN_POWER_EN, HIGH);
 #endif
 
+#if defined(ELECROW_ThinkNode_M5)
+    Wire.begin(48, 47);
+    io.pinMode(PCA_PIN_EINK_EN, OUTPUT);
+    io.pinMode(PCA_PIN_POWER_EN, OUTPUT);
+    io.digitalWrite(PCA_PIN_POWER_EN, HIGH);
+    // io.pinMode(C2_PIN, OUTPUT);
+#endif
+
 #ifdef LED_POWER
     pinMode(LED_POWER, OUTPUT);
     digitalWrite(LED_POWER, LED_STATE_ON);
@@ -373,7 +386,68 @@ void setup()
 #endif
 #endif
 
+#if defined(T_DECK)
+    // GPIO10 manages all peripheral power supplies
+    // Turn on peripheral power immediately after MUC starts.
+    // If some boards are turned on late, ESP32 will reset due to low voltage.
+    // ESP32-C3(Keyboard) , MAX98357A(Audio Power Amplifier) ,
+    // TF Card , Display backlight(AW9364DNR) , AN48841B(Trackball) , ES7210(Decoder)
+    pinMode(KB_POWERON, OUTPUT);
+    digitalWrite(KB_POWERON, HIGH);
+    // T-Deck has all three SPI peripherals (TFT, SD, LoRa) attached to the same SPI bus
+    // We need to initialize all CS pins in advance otherwise there will be SPI communication issues
+    // e.g. when detecting the SD card
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(TFT_CS, OUTPUT);
+    digitalWrite(TFT_CS, HIGH);
+    delay(100);
+#elif defined(T_DECK_PRO)
+    pinMode(LORA_EN, OUTPUT);
+    digitalWrite(LORA_EN, HIGH);
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(PIN_EINK_CS, OUTPUT);
+    digitalWrite(PIN_EINK_CS, HIGH);
+#elif defined(T_LORA_PAGER)
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(TFT_CS, OUTPUT);
+    digitalWrite(TFT_CS, HIGH);
+    pinMode(KB_INT, INPUT_PULLUP);
+    // io expander
+    io.begin(Wire, XL9555_SLAVE_ADDRESS0, SDA, SCL);
+    io.pinMode(EXPANDS_DRV_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_DRV_EN, HIGH);
+    io.pinMode(EXPANDS_AMP_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_AMP_EN, LOW);
+    io.pinMode(EXPANDS_LORA_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_LORA_EN, HIGH);
+    io.pinMode(EXPANDS_GPS_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_GPS_EN, HIGH);
+    io.pinMode(EXPANDS_KB_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_KB_EN, HIGH);
+    io.pinMode(EXPANDS_SD_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_SD_EN, HIGH);
+    io.pinMode(EXPANDS_GPIO_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_GPIO_EN, HIGH);
+    io.pinMode(EXPANDS_SD_PULLEN, INPUT);
+#elif defined(HACKADAY_COMMUNICATOR)
+    pinMode(KB_INT, INPUT);
+#endif
+
     concurrency::hasBeenSetup = true;
+#if ARCH_PORTDUINO
+    SPISettings spiSettings(portduino_config.spiSpeed, MSBFIRST, SPI_MODE0);
+#else
+    SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
+#endif
 
     meshtastic_Config_DisplayConfig_OledType screen_model =
         meshtastic_Config_DisplayConfig_OledType::meshtastic_Config_DisplayConfig_OledType_OLED_AUTO;
@@ -484,11 +558,34 @@ 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();
 
-    // TODO make this ifdef based on defined pins and move from main.cpp
 #if defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
     // The ThinkNodes have their own blink logic
     // ledPeriodic = new Periodic("Blink", elecrowLedBlinker);
@@ -866,7 +963,6 @@ void setup()
     }
 #endif // HAS_SCREEN
 
-    // TODO Remove magic string
     // setup TZ prior to time actions.
 #if !MESHTASTIC_EXCLUDE_TZ
     LOG_DEBUG("Use compiled/slipstreamed %s", slipstreamTZString); // important, removing this clobbers our magic string
@@ -950,9 +1046,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
@@ -991,7 +1258,252 @@ void setup()
 #endif
 #endif
 
-    initLoRa();
+#ifdef ARCH_PORTDUINO
+    // as one can't use a function pointer to the class constructor:
+    auto loraModuleInterface = [](LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+                                  RADIOLIB_PIN_TYPE busy) {
+        switch (portduino_config.lora_module) {
+        case use_rf95:
+            return (RadioInterface *)new RF95Interface(hal, cs, irq, rst, busy);
+        case use_sx1262:
+            return (RadioInterface *)new SX1262Interface(hal, cs, irq, rst, busy);
+        case use_sx1268:
+            return (RadioInterface *)new SX1268Interface(hal, cs, irq, rst, busy);
+        case use_sx1280:
+            return (RadioInterface *)new SX1280Interface(hal, cs, irq, rst, busy);
+        case use_lr1110:
+            return (RadioInterface *)new LR1110Interface(hal, cs, irq, rst, busy);
+        case use_lr1120:
+            return (RadioInterface *)new LR1120Interface(hal, cs, irq, rst, busy);
+        case use_lr1121:
+            return (RadioInterface *)new LR1121Interface(hal, cs, irq, rst, busy);
+        case use_llcc68:
+            return (RadioInterface *)new LLCC68Interface(hal, cs, irq, rst, busy);
+        case use_simradio:
+            return (RadioInterface *)new SimRadio;
+        default:
+            assert(0); // shouldn't happen
+            return (RadioInterface *)nullptr;
+        }
+    };
+
+    LOG_DEBUG("Activate %s radio on SPI port %s", portduino_config.loraModules[portduino_config.lora_module].c_str(),
+              portduino_config.lora_spi_dev.c_str());
+    if (portduino_config.lora_spi_dev == "ch341") {
+        RadioLibHAL = ch341Hal;
+    } else {
+        RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
+    }
+    rIf =
+        loraModuleInterface((LockingArduinoHal *)RadioLibHAL, portduino_config.lora_cs_pin.pin, portduino_config.lora_irq_pin.pin,
+                            portduino_config.lora_reset_pin.pin, portduino_config.lora_busy_pin.pin);
+
+    if (!rIf->init()) {
+        LOG_WARN("No %s radio", portduino_config.loraModules[portduino_config.lora_module].c_str());
+        delete rIf;
+        rIf = NULL;
+        exit(EXIT_FAILURE);
+    } else {
+        LOG_INFO("%s init success", portduino_config.loraModules[portduino_config.lora_module].c_str());
+    }
+
+#elif defined(HW_SPI1_DEVICE)
+    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI1, spiSettings);
+#else // HW_SPI1_DEVICE
+    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
+#endif
+
+    // radio init MUST BE AFTER service.init, so we have our radio config settings (from nodedb init)
+#if defined(USE_STM32WLx)
+    if (!rIf) {
+        rIf = new STM32WLE5JCInterface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        if (!rIf->init()) {
+            LOG_WARN("No STM32WL radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("STM32WL init success");
+            radioType = STM32WLx_RADIO;
+        }
+    }
+#endif
+
+#if defined(RF95_IRQ) && RADIOLIB_EXCLUDE_SX127X != 1
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        rIf = new RF95Interface(RadioLibHAL, LORA_CS, RF95_IRQ, RF95_RESET, RF95_DIO1);
+        if (!rIf->init()) {
+            LOG_WARN("No RF95 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("RF95 init success");
+            radioType = RF95_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && !defined(TCXO_OPTIONAL) && RADIOLIB_EXCLUDE_SX126X != 1
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        auto *sxIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+#ifdef SX126X_DIO3_TCXO_VOLTAGE
+        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
+#endif
+        if (!sxIf->init()) {
+            LOG_WARN("No SX1262 radio");
+            delete sxIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1262 init success");
+            rIf = sxIf;
+            radioType = SX1262_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && defined(TCXO_OPTIONAL)
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        // try using the specified TCXO voltage
+        auto *sxIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
+        if (!sxIf->init()) {
+            LOG_WARN("No SX1262 radio with TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
+            delete sxIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1262 init success, TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
+            rIf = sxIf;
+            radioType = SX1262_RADIO;
+        }
+    }
+
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        // If specified TCXO voltage fails, attempt to use DIO3 as a reference instead
+        rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        if (!rIf->init()) {
+            LOG_WARN("No SX1262 radio with XTAL, Vref 0.0V");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1262 init success, XTAL, Vref 0.0V");
+            radioType = SX1262_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_SX1268)
+#if defined(SX126X_DIO3_TCXO_VOLTAGE) && defined(TCXO_OPTIONAL)
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        // try using the specified TCXO voltage
+        auto *sxIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
+        if (!sxIf->init()) {
+            LOG_WARN("No SX1268 radio with TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
+            delete sxIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1268 init success, TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
+            rIf = sxIf;
+            radioType = SX1268_RADIO;
+        }
+    }
+#endif
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        rIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        if (!rIf->init()) {
+            LOG_WARN("No SX1268 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1268 init success");
+            radioType = SX1268_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_LLCC68)
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        rIf = new LLCC68Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
+        if (!rIf->init()) {
+            LOG_WARN("No LLCC68 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("LLCC68 init success");
+            radioType = LLCC68_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_LR1110) && RADIOLIB_EXCLUDE_LR11X0 != 1
+    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+        rIf = new LR1110Interface(RadioLibHAL, LR1110_SPI_NSS_PIN, LR1110_IRQ_PIN, LR1110_NRESET_PIN, LR1110_BUSY_PIN);
+        if (!rIf->init()) {
+            LOG_WARN("No LR1110 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("LR1110 init success");
+            radioType = LR1110_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_LR1120) && RADIOLIB_EXCLUDE_LR11X0 != 1
+    if (!rIf) {
+        rIf = new LR1120Interface(RadioLibHAL, LR1120_SPI_NSS_PIN, LR1120_IRQ_PIN, LR1120_NRESET_PIN, LR1120_BUSY_PIN);
+        if (!rIf->init()) {
+            LOG_WARN("No LR1120 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("LR1120 init success");
+            radioType = LR1120_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_LR1121) && RADIOLIB_EXCLUDE_LR11X0 != 1
+    if (!rIf) {
+        rIf = new LR1121Interface(RadioLibHAL, LR1121_SPI_NSS_PIN, LR1121_IRQ_PIN, LR1121_NRESET_PIN, LR1121_BUSY_PIN);
+        if (!rIf->init()) {
+            LOG_WARN("No LR1121 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("LR1121 init success");
+            radioType = LR1121_RADIO;
+        }
+    }
+#endif
+
+#if defined(USE_SX1280) && RADIOLIB_EXCLUDE_SX128X != 1
+    if (!rIf) {
+        rIf = new SX1280Interface(RadioLibHAL, SX128X_CS, SX128X_DIO1, SX128X_RESET, SX128X_BUSY);
+        if (!rIf->init()) {
+            LOG_WARN("No SX1280 radio");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            LOG_INFO("SX1280 init success");
+            radioType = SX1280_RADIO;
+        }
+    }
+#endif
+
+    // check if the radio chip matches the selected region
+    if ((config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) && rIf && (!rIf->wideLora())) {
+        LOG_WARN("LoRa chip does not support 2.4GHz. Revert to unset");
+        config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
+        nodeDB->saveToDisk(SEGMENT_CONFIG);
+
+        if (!rIf->reconfigure()) {
+            LOG_WARN("Reconfigure failed, rebooting");
+            if (screen) {
+                screen->showSimpleBanner("Rebooting...");
+            }
+            rebootAtMsec = millis() + 5000;
+        }
+    }
 
     lateInitVariant(); // Do board specific init (see extra_variants/README.md for documentation)
 
@@ -1080,7 +1592,6 @@ bool suppressRebootBanner; // If true, suppress "Rebooting..." overlay (used for
 // This will suppress the current delay and instead try to run ASAP.
 bool runASAP;
 
-// TODO find better home than main.cpp
 extern meshtastic_DeviceMetadata getDeviceMetadata()
 {
     meshtastic_DeviceMetadata deviceMetadata;
@@ -1181,43 +1692,7 @@ void loop()
     if (inputBroker)
         inputBroker->processInputEventQueue();
 #endif
-#if ARCH_PORTDUINO
-    if (portduino_config.lora_spi_dev == "ch341" && ch341Hal != nullptr) {
-        ch341Hal->checkError();
-    }
-    if (portduino_status.LoRa_in_error && rebootAtMsec == 0) {
-        LOG_ERROR("LoRa in error detected, attempting to recover");
-        if (rIf != nullptr) {
-            delete rIf;
-            rIf = nullptr;
-        }
-        if (portduino_config.lora_spi_dev == "ch341") {
-            if (ch341Hal != nullptr) {
-                delete ch341Hal;
-                ch341Hal = nullptr;
-                sleep(3);
-            }
-            try {
-                ch341Hal = new Ch341Hal(0, portduino_config.lora_usb_serial_num, portduino_config.lora_usb_vid,
-                                        portduino_config.lora_usb_pid);
-            } catch (std::exception &e) {
-                std::cerr << e.what() << std::endl;
-                std::cerr << "Could not initialize CH341 device!" << std::endl;
-                exit(EXIT_FAILURE);
-            }
-        }
-        if (initLoRa()) {
-            router->addInterface(rIf);
-            portduino_status.LoRa_in_error = false;
-        } else {
-            LOG_WARN("Reconfigure failed, rebooting");
-            if (screen) {
-                screen->showSimpleBanner("Rebooting...");
-            }
-            rebootAtMsec = millis() + 25;
-        }
-    }
-#if HAS_TFT
+#if ARCH_PORTDUINO && HAS_TFT
     if (screen && portduino_config.displayPanel == x11 &&
         config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
         auto dispdev = screen->getDisplayDevice();
@@ -1225,7 +1700,6 @@ void loop()
             static_cast<TFTDisplay *>(dispdev)->sdlLoop();
     }
 #endif
-#endif
 #if HAS_SCREEN && ENABLE_MESSAGE_PERSISTENCE
     messageStoreAutosaveTick();
 #endif

src/main.h

@@ -26,8 +26,8 @@ extern NRF52Bluetooth *nrf52Bluetooth;
 #if ARCH_PORTDUINO
 extern HardwareSPI *DisplaySPI;
 extern HardwareSPI *LoraSPI;
-#endif
 
+#endif
 extern ScanI2C::DeviceAddress screen_found;
 extern ScanI2C::DeviceAddress cardkb_found;
 extern uint8_t kb_model;
@@ -47,16 +47,16 @@ extern bool isUSBPowered;
 extern Adafruit_DRV2605 drv;
 #endif
 
-#ifdef HAS_PCA9557
-#include <PCA9557.h>
-extern PCA9557 io;
-#endif
-
 #ifdef HAS_I2S
 #include "AudioThread.h"
 extern AudioThread *audioThread;
 #endif
 
+#ifdef ELECROW_ThinkNode_M5
+#include <PCA9557.h>
+extern PCA9557 io;
+#endif
+
 #ifdef HAS_UDP_MULTICAST
 #include "mesh/udp/UdpMulticastHandler.h"
 extern UdpMulticastHandler *udpHandler;

src/mesh/CryptoEngine.cpp

@@ -61,6 +61,11 @@ bool CryptoEngine::regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey)
     return true;
 }
 #endif
+void CryptoEngine::clearKeys()
+{
+    memset(public_key, 0, sizeof(public_key));
+    memset(private_key, 0, sizeof(private_key));
+}
 
 /**
  * Encrypt a packet's payload using a key generated with Curve25519 and SHA256

src/mesh/CryptoEngine.h

@@ -37,6 +37,7 @@ class CryptoEngine
     virtual bool regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey);
 
 #endif
+    void clearKeys();
     void setDHPrivateKey(uint8_t *_private_key);
     virtual bool encryptCurve25519(uint32_t toNode, uint32_t fromNode, meshtastic_UserLite_public_key_t remotePublic,
                                    uint64_t packetNum, size_t numBytes, const uint8_t *bytes, uint8_t *bytesOut);

src/mesh/LR11x0Interface.cpp

@@ -91,21 +91,10 @@ template <typename T> bool LR11x0Interface<T>::init()
     LOG_DEBUG("Set RF1 switch to %s", getFreq() < 1e9 ? "SubGHz" : "2.4GHz");
 #endif
 
-    // Allow extra time for TCXO to stabilize after power-on
-    delay(10);
-
     int res = lora.begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength, tcxoVoltage);
-
-    // Retry if we get SPI command failed - some units need extra TCXO stabilization time
-    if (res == RADIOLIB_ERR_SPI_CMD_FAILED) {
-        LOG_WARN("LR11x0 init failed with %d (SPI_CMD_FAILED), retrying after delay...", res);
-        delay(100);
-        res = lora.begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength, tcxoVoltage);
-    }
-
     // \todo Display actual typename of the adapter, not just `LR11x0`
     LOG_INFO("LR11x0 init result %d", res);
-    if (res == RADIOLIB_ERR_CHIP_NOT_FOUND || res == RADIOLIB_ERR_SPI_CMD_FAILED)
+    if (res == RADIOLIB_ERR_CHIP_NOT_FOUND)
         return false;
 
     LR11x0VersionInfo_t version;

src/mesh/MeshRadio.h

@@ -22,99 +22,4 @@ struct RegionInfo {
 extern const RegionInfo regions[];
 extern const RegionInfo *myRegion;
 
-extern void initRegion();
-
-static inline float bwCodeToKHz(uint16_t bwCode)
-{
-    if (bwCode == 31)
-        return 31.25f;
-    if (bwCode == 62)
-        return 62.5f;
-    if (bwCode == 200)
-        return 203.125f;
-    if (bwCode == 400)
-        return 406.25f;
-    if (bwCode == 800)
-        return 812.5f;
-    if (bwCode == 1600)
-        return 1625.0f;
-    return (float)bwCode;
-}
-
-static inline uint16_t bwKHzToCode(float bwKHz)
-{
-    if (bwKHz > 31.24f && bwKHz < 31.26f)
-        return 31;
-    if (bwKHz > 62.49f && bwKHz < 62.51f)
-        return 62;
-    if (bwKHz > 203.12f && bwKHz < 203.13f)
-        return 200;
-    if (bwKHz > 406.24f && bwKHz < 406.26f)
-        return 400;
-    if (bwKHz > 812.49f && bwKHz < 812.51f)
-        return 800;
-    if (bwKHz > 1624.99f && bwKHz < 1625.01f)
-        return 1600;
-    return (uint16_t)(bwKHz + 0.5f);
-}
-
-static inline void modemPresetToParams(meshtastic_Config_LoRaConfig_ModemPreset preset, bool wideLora, float &bwKHz, uint8_t &sf,
-                                       uint8_t &cr)
-{
-    switch (preset) {
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO:
-        bwKHz = wideLora ? 1625.0f : 500.0f;
-        cr = 5;
-        sf = 7;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
-        bwKHz = wideLora ? 812.5f : 250.0f;
-        cr = 5;
-        sf = 7;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
-        bwKHz = wideLora ? 812.5f : 250.0f;
-        cr = 5;
-        sf = 8;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
-        bwKHz = wideLora ? 812.5f : 250.0f;
-        cr = 5;
-        sf = 9;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
-        bwKHz = wideLora ? 812.5f : 250.0f;
-        cr = 5;
-        sf = 10;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
-        bwKHz = wideLora ? 1625.0f : 500.0f;
-        cr = 8;
-        sf = 11;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
-        bwKHz = wideLora ? 406.25f : 125.0f;
-        cr = 8;
-        sf = 11;
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
-        bwKHz = wideLora ? 406.25f : 125.0f;
-        cr = 8;
-        sf = 12;
-        break;
-    default: // LONG_FAST (or illegal)
-        bwKHz = wideLora ? 812.5f : 250.0f;
-        cr = 5;
-        sf = 11;
-        break;
-    }
-}
-
-static inline float modemPresetToBwKHz(meshtastic_Config_LoRaConfig_ModemPreset preset, bool wideLora)
-{
-    float bwKHz = 0;
-    uint8_t sf = 0;
-    uint8_t cr = 0;
-    modemPresetToParams(preset, wideLora, bwKHz, sf, cr);
-    return bwKHz;
-}
+extern void initRegion();

src/mesh/NodeDB.cpp

@@ -13,7 +13,6 @@
 #include "PacketHistory.h"
 #include "PowerFSM.h"
 #include "RTC.h"
-#include "RadioInterface.h"
 #include "Router.h"
 #include "SPILock.h"
 #include "SafeFile.h"
@@ -27,7 +26,6 @@
 #include <algorithm>
 #include <pb_decode.h>
 #include <pb_encode.h>
-#include <power/PowerHAL.h>
 #include <vector>
 
 #ifdef ARCH_ESP32
@@ -1299,13 +1297,6 @@ void NodeDB::loadFromDisk()
             LOG_INFO("Loaded saved config version %d", config.version);
         }
     }
-
-    // Coerce LoRa config fields derived from presets while bootstrapping.
-    // Some clients/UI components display bandwidth/spread_factor directly from config even in preset mode.
-    if (config.has_lora && config.lora.use_preset) {
-        RadioInterface::bootstrapLoRaConfigFromPreset(config.lora);
-    }
-
     if (backupSecurity.private_key.size > 0) {
         LOG_DEBUG("Restoring backup of security config");
         config.security = backupSecurity;
@@ -1427,14 +1418,6 @@ void NodeDB::loadFromDisk()
 bool NodeDB::saveProto(const char *filename, size_t protoSize, const pb_msgdesc_t *fields, const void *dest_struct,
                        bool fullAtomic)
 {
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway. Device should be sleeping at this point anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveProto() on unsafe device power level.");
-        return false;
-    }
-
     bool okay = false;
 #ifdef FSCom
     auto f = SafeFile(filename, fullAtomic);
@@ -1461,14 +1444,6 @@ bool NodeDB::saveProto(const char *filename, size_t protoSize, const pb_msgdesc_
 
 bool NodeDB::saveChannelsToDisk()
 {
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveChannelsToDisk() on unsafe device power level.");
-        return false;
-    }
-
 #ifdef FSCom
     spiLock->lock();
     FSCom.mkdir("/prefs");
@@ -1479,14 +1454,6 @@ bool NodeDB::saveChannelsToDisk()
 
 bool NodeDB::saveDeviceStateToDisk()
 {
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway. Device should be sleeping at this point anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveDeviceStateToDisk() on unsafe device power level.");
-        return false;
-    }
-
 #ifdef FSCom
     spiLock->lock();
     FSCom.mkdir("/prefs");
@@ -1499,14 +1466,6 @@ bool NodeDB::saveDeviceStateToDisk()
 
 bool NodeDB::saveNodeDatabaseToDisk()
 {
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway. Device should be sleeping at this point anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveNodeDatabaseToDisk() on unsafe device power level.");
-        return false;
-    }
-
 #ifdef FSCom
     spiLock->lock();
     FSCom.mkdir("/prefs");
@@ -1519,14 +1478,6 @@ bool NodeDB::saveNodeDatabaseToDisk()
 
 bool NodeDB::saveToDiskNoRetry(int saveWhat)
 {
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway. Device should be sleeping at this point anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveToDiskNoRetry() on unsafe device power level.");
-        return false;
-    }
-
     bool success = true;
 #ifdef FSCom
     spiLock->lock();
@@ -1582,14 +1533,6 @@ bool NodeDB::saveToDiskNoRetry(int saveWhat)
 bool NodeDB::saveToDisk(int saveWhat)
 {
     LOG_DEBUG("Save to disk %d", saveWhat);
-
-    // do not try to save anything if power level is not safe. In many cases flash will be lock-protected
-    // and all writes will fail anyway. Device should be sleeping at this point anyway.
-    if (!powerHAL_isPowerLevelSafe()) {
-        LOG_ERROR("Error: trying to saveToDisk() on unsafe device power level.");
-        return false;
-    }
-
     bool success = saveToDiskNoRetry(saveWhat);
 
     if (!success) {
@@ -2247,10 +2190,7 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co
 
     // Currently portuino is mostly used for simulation.  Make sure the user notices something really bad happened
 #ifdef ARCH_PORTDUINO
-    LOG_ERROR("A critical failure occurred");
-    // TODO: Determine if other critical errors should also cause an immediate exit
-    if (code == meshtastic_CriticalErrorCode_FLASH_CORRUPTION_RECOVERABLE ||
-        code == meshtastic_CriticalErrorCode_FLASH_CORRUPTION_UNRECOVERABLE)
-        exit(2);
+    LOG_ERROR("A critical failure occurred, portduino is exiting");
+    exit(2);
 #endif
 }

src/mesh/RF95Interface.cpp

@@ -177,9 +177,6 @@ bool RF95Interface::init()
 
     int res = lora->begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength);
     LOG_INFO("RF95 init result %d", res);
-    if (res == RADIOLIB_ERR_CHIP_NOT_FOUND || res == RADIOLIB_ERR_SPI_CMD_FAILED)
-        return false;
-
     LOG_INFO("Frequency set to %f", getFreq());
     LOG_INFO("Bandwidth set to %f", bw);
     LOG_INFO("Power output set to %d", power);

src/mesh/RadioInterface.cpp

@@ -1,36 +1,17 @@
 #include "RadioInterface.h"
 #include "Channels.h"
 #include "DisplayFormatters.h"
-#include "LLCC68Interface.h"
-#include "LR1110Interface.h"
-#include "LR1120Interface.h"
-#include "LR1121Interface.h"
 #include "MeshRadio.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "RF95Interface.h"
 #include "Router.h"
-#include "SX1262Interface.h"
-#include "SX1268Interface.h"
-#include "SX1280Interface.h"
 #include "configuration.h"
-#include "detect/LoRaRadioType.h"
 #include "main.h"
 #include "sleep.h"
 #include <assert.h>
 #include <pb_decode.h>
 #include <pb_encode.h>
 
-#ifdef ARCH_PORTDUINO
-#include "platform/portduino/PortduinoGlue.h"
-#include "platform/portduino/SimRadio.h"
-#include "platform/portduino/USBHal.h"
-#endif
-
-#ifdef ARCH_STM32WL>
-#include "STM32WLE5JCInterface.h"
-#endif
-
 // Calculate 2^n without calling pow()
 uint32_t pow_of_2(uint32_t n)
 {
@@ -224,281 +205,6 @@ bool RadioInterface::uses_default_frequency_slot = true;
 
 static uint8_t bytes[MAX_LORA_PAYLOAD_LEN + 1];
 
-// Global LoRa radio type
-LoRaRadioType radioType = NO_RADIO;
-
-extern RadioInterface *rIf;
-extern RadioLibHal *RadioLibHAL;
-#if defined(HW_SPI1_DEVICE) && defined(ARCH_ESP32)
-extern SPIClass SPI1;
-#endif
-
-bool initLoRa()
-{
-    if (rIf != nullptr) {
-        delete rIf;
-        rIf = nullptr;
-    }
-
-#if ARCH_PORTDUINO
-    SPISettings spiSettings(portduino_config.spiSpeed, MSBFIRST, SPI_MODE0);
-#else
-    SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
-#endif
-
-#ifdef ARCH_PORTDUINO
-    // as one can't use a function pointer to the class constructor:
-    auto loraModuleInterface = [](LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
-                                  RADIOLIB_PIN_TYPE busy) {
-        switch (portduino_config.lora_module) {
-        case use_rf95:
-            return (RadioInterface *)new RF95Interface(hal, cs, irq, rst, busy);
-        case use_sx1262:
-            return (RadioInterface *)new SX1262Interface(hal, cs, irq, rst, busy);
-        case use_sx1268:
-            return (RadioInterface *)new SX1268Interface(hal, cs, irq, rst, busy);
-        case use_sx1280:
-            return (RadioInterface *)new SX1280Interface(hal, cs, irq, rst, busy);
-        case use_lr1110:
-            return (RadioInterface *)new LR1110Interface(hal, cs, irq, rst, busy);
-        case use_lr1120:
-            return (RadioInterface *)new LR1120Interface(hal, cs, irq, rst, busy);
-        case use_lr1121:
-            return (RadioInterface *)new LR1121Interface(hal, cs, irq, rst, busy);
-        case use_llcc68:
-            return (RadioInterface *)new LLCC68Interface(hal, cs, irq, rst, busy);
-        case use_simradio:
-            return (RadioInterface *)new SimRadio;
-        default:
-            assert(0); // shouldn't happen
-            return (RadioInterface *)nullptr;
-        }
-    };
-
-    LOG_DEBUG("Activate %s radio on SPI port %s", portduino_config.loraModules[portduino_config.lora_module].c_str(),
-              portduino_config.lora_spi_dev.c_str());
-    if (portduino_config.lora_spi_dev == "ch341") {
-        RadioLibHAL = ch341Hal;
-    } else {
-        if (RadioLibHAL != nullptr) {
-            delete RadioLibHAL;
-            RadioLibHAL = nullptr;
-        }
-        RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
-    }
-    rIf =
-        loraModuleInterface((LockingArduinoHal *)RadioLibHAL, portduino_config.lora_cs_pin.pin, portduino_config.lora_irq_pin.pin,
-                            portduino_config.lora_reset_pin.pin, portduino_config.lora_busy_pin.pin);
-
-    if (!rIf->init()) {
-        LOG_WARN("No %s radio", portduino_config.loraModules[portduino_config.lora_module].c_str());
-        delete rIf;
-        rIf = NULL;
-        exit(EXIT_FAILURE);
-    } else {
-        LOG_INFO("%s init success", portduino_config.loraModules[portduino_config.lora_module].c_str());
-    }
-
-#elif defined(HW_SPI1_DEVICE)
-    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI1, spiSettings);
-#else // HW_SPI1_DEVICE
-    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
-#endif
-
-// radio init MUST BE AFTER service.init, so we have our radio config settings (from nodedb init)
-#if defined(USE_STM32WLx)
-    if (!rIf) {
-        rIf = new STM32WLE5JCInterface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("No STM32WL radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("STM32WL init success");
-            radioType = STM32WLx_RADIO;
-        }
-    }
-#endif
-
-#if defined(RF95_IRQ) && RADIOLIB_EXCLUDE_SX127X != 1
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        rIf = new RF95Interface(RadioLibHAL, LORA_CS, RF95_IRQ, RF95_RESET, RF95_DIO1);
-        if (!rIf->init()) {
-            LOG_WARN("No RF95 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("RF95 init success");
-            radioType = RF95_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && !defined(TCXO_OPTIONAL) && RADIOLIB_EXCLUDE_SX126X != 1
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        auto *sxIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-#ifdef SX126X_DIO3_TCXO_VOLTAGE
-        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
-#endif
-        if (!sxIf->init()) {
-            LOG_WARN("No SX1262 radio");
-            delete sxIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1262 init success");
-            rIf = sxIf;
-            radioType = SX1262_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && defined(TCXO_OPTIONAL)
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        // try using the specified TCXO voltage
-        auto *sxIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
-        if (!sxIf->init()) {
-            LOG_WARN("No SX1262 radio with TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
-            delete sxIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1262 init success, TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
-            rIf = sxIf;
-            radioType = SX1262_RADIO;
-        }
-    }
-
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        // If specified TCXO voltage fails, attempt to use DIO3 as a reference instead
-        rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("No SX1262 radio with XTAL, Vref 0.0V");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1262 init success, XTAL, Vref 0.0V");
-            radioType = SX1262_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_SX1268)
-#if defined(SX126X_DIO3_TCXO_VOLTAGE) && defined(TCXO_OPTIONAL)
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        // try using the specified TCXO voltage
-        auto *sxIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        sxIf->setTCXOVoltage(SX126X_DIO3_TCXO_VOLTAGE);
-        if (!sxIf->init()) {
-            LOG_WARN("No SX1268 radio with TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
-            delete sxIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1268 init success, TCXO, Vref %fV", SX126X_DIO3_TCXO_VOLTAGE);
-            rIf = sxIf;
-            radioType = SX1268_RADIO;
-        }
-    }
-#endif
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        rIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("No SX1268 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1268 init success");
-            radioType = SX1268_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_LLCC68)
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        rIf = new LLCC68Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("No LLCC68 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("LLCC68 init success");
-            radioType = LLCC68_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_LR1110) && RADIOLIB_EXCLUDE_LR11X0 != 1
-    if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
-        rIf = new LR1110Interface(RadioLibHAL, LR1110_SPI_NSS_PIN, LR1110_IRQ_PIN, LR1110_NRESET_PIN, LR1110_BUSY_PIN);
-        if (!rIf->init()) {
-            LOG_WARN("No LR1110 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("LR1110 init success");
-            radioType = LR1110_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_LR1120) && RADIOLIB_EXCLUDE_LR11X0 != 1
-    if (!rIf) {
-        rIf = new LR1120Interface(RadioLibHAL, LR1120_SPI_NSS_PIN, LR1120_IRQ_PIN, LR1120_NRESET_PIN, LR1120_BUSY_PIN);
-        if (!rIf->init()) {
-            LOG_WARN("No LR1120 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("LR1120 init success");
-            radioType = LR1120_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_LR1121) && RADIOLIB_EXCLUDE_LR11X0 != 1
-    if (!rIf) {
-        rIf = new LR1121Interface(RadioLibHAL, LR1121_SPI_NSS_PIN, LR1121_IRQ_PIN, LR1121_NRESET_PIN, LR1121_BUSY_PIN);
-        if (!rIf->init()) {
-            LOG_WARN("No LR1121 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("LR1121 init success");
-            radioType = LR1121_RADIO;
-        }
-    }
-#endif
-
-#if defined(USE_SX1280) && RADIOLIB_EXCLUDE_SX128X != 1
-    if (!rIf) {
-        rIf = new SX1280Interface(RadioLibHAL, SX128X_CS, SX128X_DIO1, SX128X_RESET, SX128X_BUSY);
-        if (!rIf->init()) {
-            LOG_WARN("No SX1280 radio");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            LOG_INFO("SX1280 init success");
-            radioType = SX1280_RADIO;
-        }
-    }
-#endif
-
-    // check if the radio chip matches the selected region
-    if ((config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) && rIf && (!rIf->wideLora())) {
-        LOG_WARN("LoRa chip does not support 2.4GHz. Revert to unset");
-        config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
-        nodeDB->saveToDisk(SEGMENT_CONFIG);
-
-        if (rIf && !rIf->reconfigure()) {
-            LOG_WARN("Reconfigure failed, rebooting");
-            if (screen) {
-                screen->showSimpleBanner("Rebooting...");
-            }
-            rebootAtMsec = millis() + 5000;
-        }
-    }
-    return rIf != nullptr;
-}
-
 void initRegion()
 {
     const RegionInfo *r = regions;
@@ -514,34 +220,6 @@ void initRegion()
     myRegion = r;
 }
 
-void RadioInterface::bootstrapLoRaConfigFromPreset(meshtastic_Config_LoRaConfig &loraConfig)
-{
-    if (!loraConfig.use_preset) {
-        return;
-    }
-
-    // Find region info to determine whether "wide" LoRa is permitted (2.4 GHz uses wider bandwidth codes).
-    const RegionInfo *r = regions;
-    for (; r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && r->code != loraConfig.region; r++)
-        ;
-
-    const bool regionWideLora = r->wideLora;
-
-    float bwKHz = 0;
-    uint8_t sf = 0;
-    uint8_t cr = 0;
-    modemPresetToParams(loraConfig.modem_preset, regionWideLora, bwKHz, sf, cr);
-
-    // If selected preset requests a bandwidth larger than the region span, fall back to LONG_FAST.
-    if (r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && (r->freqEnd - r->freqStart) < (bwKHz / 1000.0f)) {
-        loraConfig.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
-        modemPresetToParams(loraConfig.modem_preset, regionWideLora, bwKHz, sf, cr);
-    }
-
-    loraConfig.bandwidth = bwKHzToCode(bwKHz);
-    loraConfig.spread_factor = sf;
-}
-
 /**
  * ## LoRaWAN for North America
 
@@ -796,7 +474,54 @@ void RadioInterface::applyModemConfig()
     bool validConfig = false; // We need to check for a valid configuration
     while (!validConfig) {
         if (loraConfig.use_preset) {
-            modemPresetToParams(loraConfig.modem_preset, myRegion->wideLora, bw, sf, cr);
+
+            switch (loraConfig.modem_preset) {
+            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO:
+                bw = (myRegion->wideLora) ? 1625.0 : 500;
+                cr = 5;
+                sf = 7;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
+                bw = (myRegion->wideLora) ? 812.5 : 250;
+                cr = 5;
+                sf = 7;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
+                bw = (myRegion->wideLora) ? 812.5 : 250;
+                cr = 5;
+                sf = 8;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
+                bw = (myRegion->wideLora) ? 812.5 : 250;
+                cr = 5;
+                sf = 9;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
+                bw = (myRegion->wideLora) ? 812.5 : 250;
+                cr = 5;
+                sf = 10;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
+                bw = (myRegion->wideLora) ? 1625.0 : 500;
+                cr = 8;
+                sf = 11;
+                break;
+            default: // Config_LoRaConfig_ModemPreset_LONG_FAST is default. Gracefully use this is preset is something illegal.
+                bw = (myRegion->wideLora) ? 812.5 : 250;
+                cr = 5;
+                sf = 11;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
+                bw = (myRegion->wideLora) ? 406.25 : 125;
+                cr = 8;
+                sf = 11;
+                break;
+            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
+                bw = (myRegion->wideLora) ? 406.25 : 125;
+                cr = 8;
+                sf = 12;
+                break;
+            }
             if (loraConfig.coding_rate >= 5 && loraConfig.coding_rate <= 8 && loraConfig.coding_rate != cr) {
                 cr = loraConfig.coding_rate;
                 LOG_INFO("Using custom Coding Rate %u", cr);
@@ -804,7 +529,20 @@ void RadioInterface::applyModemConfig()
         } else {
             sf = loraConfig.spread_factor;
             cr = loraConfig.coding_rate;
-            bw = bwCodeToKHz(loraConfig.bandwidth);
+            bw = loraConfig.bandwidth;
+
+            if (bw == 31) // This parameter is not an integer
+                bw = 31.25;
+            if (bw == 62) // Fix for 62.5Khz bandwidth
+                bw = 62.5;
+            if (bw == 200)
+                bw = 203.125;
+            if (bw == 400)
+                bw = 406.25;
+            if (bw == 800)
+                bw = 812.5;
+            if (bw == 1600)
+                bw = 1625.0;
         }
 
         if ((myRegion->freqEnd - myRegion->freqStart) < bw / 1000) {

src/mesh/RadioInterface.h

@@ -7,9 +7,6 @@
 #include "airtime.h"
 #include "error.h"
 
-// Forward decl to avoid a direct include of generated config headers / full LoRaConfig definition in this widely-included file.
-typedef struct _meshtastic_Config_LoRaConfig meshtastic_Config_LoRaConfig;
-
 #define MAX_TX_QUEUE 16 // max number of packets which can be waiting for transmission
 
 #define MAX_LORA_PAYLOAD_LEN 255 // max length of 255 per Semtech's datasheets on SX12xx
@@ -118,12 +115,6 @@ class RadioInterface
 
     virtual ~RadioInterface() {}
 
-    /**
-     * Coerce LoRa config fields (bandwidth/spread_factor) derived from presets.
-     * This is used during early bootstrapping so UIs that display these fields directly remain consistent.
-     */
-    static void bootstrapLoRaConfigFromPreset(meshtastic_Config_LoRaConfig &loraConfig);
-
     /**
      * Return true if we think the board can go to sleep (i.e. our tx queue is empty, we are not sending or receiving)
      *
@@ -279,7 +270,5 @@ class RadioInterface
     }
 };
 
-bool initLoRa();
-
 /// Debug printing for packets
 void printPacket(const char *prefix, const meshtastic_MeshPacket *p);

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);

src/mesh/Router.cpp

@@ -7,6 +7,7 @@
 #include "RTC.h"
 
 #include "configuration.h"
+#include "detect/LoRaRadioType.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "meshUtils.h"
@@ -266,13 +267,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);
     }
 }

src/mesh/SX126xInterface.cpp

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

src/mesh/SX128xInterface.cpp

@@ -69,8 +69,6 @@ template <typename T> bool SX128xInterface<T>::init()
     int res = lora.begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength);
     // \todo Display actual typename of the adapter, not just `SX128x`
     LOG_INFO("SX128x init result %d", res);
-    if (res == RADIOLIB_ERR_CHIP_NOT_FOUND || res == RADIOLIB_ERR_SPI_CMD_FAILED)
-        return false;
 
     if ((config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24) && (res == RADIOLIB_ERR_INVALID_FREQUENCY)) {
         LOG_WARN("Radio only supports 2.4GHz LoRa. Adjusting Region and rebooting");

src/mesh/api/WiFiServerAPI.h

@@ -3,9 +3,8 @@
 #include "ServerAPI.h"
 #include <WiFi.h>
 
-#if HAS_ETHERNET && defined(USE_WS5500)
-#include <ETHClass2.h>
-#define ETH ETH2
+#if HAS_ETHERNET && defined(ARCH_ESP32)
+#include <ETH.h>
 #endif // HAS_ETHERNET
 
 /**

src/mesh/generated/meshtastic/admin.pb.cpp

@@ -27,15 +27,6 @@ PB_BIND(meshtastic_SharedContact, meshtastic_SharedContact, AUTO)
 PB_BIND(meshtastic_KeyVerificationAdmin, meshtastic_KeyVerificationAdmin, AUTO)
 
 
-PB_BIND(meshtastic_SensorConfig, meshtastic_SensorConfig, AUTO)
-
-
-PB_BIND(meshtastic_SCD4X_config, meshtastic_SCD4X_config, AUTO)
-
-
-PB_BIND(meshtastic_SEN5X_config, meshtastic_SEN5X_config, AUTO)
-
-
 
 
 

src/mesh/generated/meshtastic/admin.pb.h

@@ -171,48 +171,6 @@ typedef struct _meshtastic_KeyVerificationAdmin {
     uint32_t security_number;
 } meshtastic_KeyVerificationAdmin;
 
-typedef struct _meshtastic_SCD4X_config {
-    /* Set Automatic self-calibration enabled */
-    bool has_set_asc;
-    bool set_asc;
-    /* Recalibration target CO2 concentration in ppm (FRC or ASC) */
-    bool has_set_target_co2_conc;
-    uint32_t set_target_co2_conc;
-    /* Reference temperature in degC */
-    bool has_set_temperature;
-    float set_temperature;
-    /* Altitude of sensor in meters above sea level. 0 - 3000m (overrides ambient pressure) */
-    bool has_set_altitude;
-    uint32_t set_altitude;
-    /* Sensor ambient pressure in Pa. 70000 - 120000 Pa (overrides altitude) */
-    bool has_set_ambient_pressure;
-    uint32_t set_ambient_pressure;
-    /* Perform a factory reset of the sensor */
-    bool has_factory_reset;
-    bool factory_reset;
-    /* Power mode for sensor (true for low power, false for normal) */
-    bool has_set_power_mode;
-    bool set_power_mode;
-} meshtastic_SCD4X_config;
-
-typedef struct _meshtastic_SEN5X_config {
-    /* Reference temperature in degC */
-    bool has_set_temperature;
-    float set_temperature;
-    /* One-shot mode (true for low power - one-shot mode, false for normal - continuous mode) */
-    bool has_set_one_shot_mode;
-    bool set_one_shot_mode;
-} meshtastic_SEN5X_config;
-
-typedef struct _meshtastic_SensorConfig {
-    /* SCD4X CO2 Sensor configuration */
-    bool has_scd4x_config;
-    meshtastic_SCD4X_config scd4x_config;
-    /* SEN5X PM Sensor configuration */
-    bool has_sen5x_config;
-    meshtastic_SEN5X_config sen5x_config;
-} meshtastic_SensorConfig;
-
 typedef PB_BYTES_ARRAY_T(8) meshtastic_AdminMessage_session_passkey_t;
 /* This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
  This message is used to do settings operations to both remote AND local nodes.
@@ -345,8 +303,6 @@ typedef struct _meshtastic_AdminMessage {
         bool nodedb_reset;
         /* Tell the node to reset into the OTA Loader */
         meshtastic_AdminMessage_OTAEvent ota_request;
-        /* Parameters and sensor configuration */
-        meshtastic_SensorConfig sensor_config;
     };
     /* The node generates this key and sends it with any get_x_response packets.
  The client MUST include the same key with any set_x commands. Key expires after 300 seconds.
@@ -395,9 +351,6 @@ extern "C" {
 #define meshtastic_KeyVerificationAdmin_message_type_ENUMTYPE meshtastic_KeyVerificationAdmin_MessageType
 
 
-
-
-
 /* Initializer values for message structs */
 #define meshtastic_AdminMessage_init_default     {0, {0}, {0, {0}}}
 #define meshtastic_AdminMessage_InputEvent_init_default {0, 0, 0, 0}
@@ -406,9 +359,6 @@ extern "C" {
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_default {0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}}
 #define meshtastic_SharedContact_init_default    {0, false, meshtastic_User_init_default, 0, 0}
 #define meshtastic_KeyVerificationAdmin_init_default {_meshtastic_KeyVerificationAdmin_MessageType_MIN, 0, 0, false, 0}
-#define meshtastic_SensorConfig_init_default     {false, meshtastic_SCD4X_config_init_default, false, meshtastic_SEN5X_config_init_default}
-#define meshtastic_SCD4X_config_init_default     {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_SEN5X_config_init_default     {false, 0, false, 0}
 #define meshtastic_AdminMessage_init_zero        {0, {0}, {0, {0}}}
 #define meshtastic_AdminMessage_InputEvent_init_zero {0, 0, 0, 0}
 #define meshtastic_AdminMessage_OTAEvent_init_zero {_meshtastic_OTAMode_MIN, {0, {0}}}
@@ -416,9 +366,6 @@ extern "C" {
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_zero {0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}}
 #define meshtastic_SharedContact_init_zero       {0, false, meshtastic_User_init_zero, 0, 0}
 #define meshtastic_KeyVerificationAdmin_init_zero {_meshtastic_KeyVerificationAdmin_MessageType_MIN, 0, 0, false, 0}
-#define meshtastic_SensorConfig_init_zero        {false, meshtastic_SCD4X_config_init_zero, false, meshtastic_SEN5X_config_init_zero}
-#define meshtastic_SCD4X_config_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_SEN5X_config_init_zero        {false, 0, false, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_AdminMessage_InputEvent_event_code_tag 1
@@ -440,17 +387,6 @@ extern "C" {
 #define meshtastic_KeyVerificationAdmin_remote_nodenum_tag 2
 #define meshtastic_KeyVerificationAdmin_nonce_tag 3
 #define meshtastic_KeyVerificationAdmin_security_number_tag 4
-#define meshtastic_SCD4X_config_set_asc_tag      1
-#define meshtastic_SCD4X_config_set_target_co2_conc_tag 2
-#define meshtastic_SCD4X_config_set_temperature_tag 3
-#define meshtastic_SCD4X_config_set_altitude_tag 4
-#define meshtastic_SCD4X_config_set_ambient_pressure_tag 5
-#define meshtastic_SCD4X_config_factory_reset_tag 6
-#define meshtastic_SCD4X_config_set_power_mode_tag 7
-#define meshtastic_SEN5X_config_set_temperature_tag 1
-#define meshtastic_SEN5X_config_set_one_shot_mode_tag 2
-#define meshtastic_SensorConfig_scd4x_config_tag 1
-#define meshtastic_SensorConfig_sen5x_config_tag 2
 #define meshtastic_AdminMessage_get_channel_request_tag 1
 #define meshtastic_AdminMessage_get_channel_response_tag 2
 #define meshtastic_AdminMessage_get_owner_request_tag 3
@@ -507,7 +443,6 @@ extern "C" {
 #define meshtastic_AdminMessage_factory_reset_config_tag 99
 #define meshtastic_AdminMessage_nodedb_reset_tag 100
 #define meshtastic_AdminMessage_ota_request_tag  102
-#define meshtastic_AdminMessage_sensor_config_tag 103
 #define meshtastic_AdminMessage_session_passkey_tag 101
 
 /* Struct field encoding specification for nanopb */
@@ -568,8 +503,7 @@ X(a, STATIC,   ONEOF,    INT32,    (payload_variant,shutdown_seconds,shutdown_se
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,factory_reset_config,factory_reset_config),  99) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,nodedb_reset,nodedb_reset), 100) \
 X(a, STATIC,   SINGULAR, BYTES,    session_passkey, 101) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,ota_request,ota_request), 102) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,sensor_config,sensor_config), 103)
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,ota_request,ota_request), 102)
 #define meshtastic_AdminMessage_CALLBACK NULL
 #define meshtastic_AdminMessage_DEFAULT NULL
 #define meshtastic_AdminMessage_payload_variant_get_channel_response_MSGTYPE meshtastic_Channel
@@ -591,7 +525,6 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,sensor_config,sensor_config)
 #define meshtastic_AdminMessage_payload_variant_add_contact_MSGTYPE meshtastic_SharedContact
 #define meshtastic_AdminMessage_payload_variant_key_verification_MSGTYPE meshtastic_KeyVerificationAdmin
 #define meshtastic_AdminMessage_payload_variant_ota_request_MSGTYPE meshtastic_AdminMessage_OTAEvent
-#define meshtastic_AdminMessage_payload_variant_sensor_config_MSGTYPE meshtastic_SensorConfig
 
 #define meshtastic_AdminMessage_InputEvent_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   event_code,        1) \
@@ -638,31 +571,6 @@ X(a, STATIC,   OPTIONAL, UINT32,   security_number,   4)
 #define meshtastic_KeyVerificationAdmin_CALLBACK NULL
 #define meshtastic_KeyVerificationAdmin_DEFAULT NULL
 
-#define meshtastic_SensorConfig_FIELDLIST(X, a) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  scd4x_config,      1) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  sen5x_config,      2)
-#define meshtastic_SensorConfig_CALLBACK NULL
-#define meshtastic_SensorConfig_DEFAULT NULL
-#define meshtastic_SensorConfig_scd4x_config_MSGTYPE meshtastic_SCD4X_config
-#define meshtastic_SensorConfig_sen5x_config_MSGTYPE meshtastic_SEN5X_config
-
-#define meshtastic_SCD4X_config_FIELDLIST(X, a) \
-X(a, STATIC,   OPTIONAL, BOOL,     set_asc,           1) \
-X(a, STATIC,   OPTIONAL, UINT32,   set_target_co2_conc,   2) \
-X(a, STATIC,   OPTIONAL, FLOAT,    set_temperature,   3) \
-X(a, STATIC,   OPTIONAL, UINT32,   set_altitude,      4) \
-X(a, STATIC,   OPTIONAL, UINT32,   set_ambient_pressure,   5) \
-X(a, STATIC,   OPTIONAL, BOOL,     factory_reset,     6) \
-X(a, STATIC,   OPTIONAL, BOOL,     set_power_mode,    7)
-#define meshtastic_SCD4X_config_CALLBACK NULL
-#define meshtastic_SCD4X_config_DEFAULT NULL
-
-#define meshtastic_SEN5X_config_FIELDLIST(X, a) \
-X(a, STATIC,   OPTIONAL, FLOAT,    set_temperature,   1) \
-X(a, STATIC,   OPTIONAL, BOOL,     set_one_shot_mode,   2)
-#define meshtastic_SEN5X_config_CALLBACK NULL
-#define meshtastic_SEN5X_config_DEFAULT NULL
-
 extern const pb_msgdesc_t meshtastic_AdminMessage_msg;
 extern const pb_msgdesc_t meshtastic_AdminMessage_InputEvent_msg;
 extern const pb_msgdesc_t meshtastic_AdminMessage_OTAEvent_msg;
@@ -670,9 +578,6 @@ extern const pb_msgdesc_t meshtastic_HamParameters_msg;
 extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePinsResponse_msg;
 extern const pb_msgdesc_t meshtastic_SharedContact_msg;
 extern const pb_msgdesc_t meshtastic_KeyVerificationAdmin_msg;
-extern const pb_msgdesc_t meshtastic_SensorConfig_msg;
-extern const pb_msgdesc_t meshtastic_SCD4X_config_msg;
-extern const pb_msgdesc_t meshtastic_SEN5X_config_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_AdminMessage_fields &meshtastic_AdminMessage_msg
@@ -682,9 +587,6 @@ extern const pb_msgdesc_t meshtastic_SEN5X_config_msg;
 #define meshtastic_NodeRemoteHardwarePinsResponse_fields &meshtastic_NodeRemoteHardwarePinsResponse_msg
 #define meshtastic_SharedContact_fields &meshtastic_SharedContact_msg
 #define meshtastic_KeyVerificationAdmin_fields &meshtastic_KeyVerificationAdmin_msg
-#define meshtastic_SensorConfig_fields &meshtastic_SensorConfig_msg
-#define meshtastic_SCD4X_config_fields &meshtastic_SCD4X_config_msg
-#define meshtastic_SEN5X_config_fields &meshtastic_SEN5X_config_msg
 
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_ADMIN_PB_H_MAX_SIZE meshtastic_AdminMessage_size
@@ -694,9 +596,6 @@ extern const pb_msgdesc_t meshtastic_SEN5X_config_msg;
 #define meshtastic_HamParameters_size            31
 #define meshtastic_KeyVerificationAdmin_size     25
 #define meshtastic_NodeRemoteHardwarePinsResponse_size 496
-#define meshtastic_SCD4X_config_size             29
-#define meshtastic_SEN5X_config_size             7
-#define meshtastic_SensorConfig_size             40
 #define meshtastic_SharedContact_size            127
 
 #ifdef __cplusplus

src/mesh/generated/meshtastic/telemetry.pb.cpp

@@ -33,9 +33,6 @@ PB_BIND(meshtastic_Telemetry, meshtastic_Telemetry, 2)
 PB_BIND(meshtastic_Nau7802Config, meshtastic_Nau7802Config, AUTO)
 
 
-PB_BIND(meshtastic_SEN5XState, meshtastic_SEN5XState, AUTO)
-
-
 
 
 

src/mesh/generated/meshtastic/telemetry.pb.h

@@ -435,25 +435,6 @@ typedef struct _meshtastic_Nau7802Config {
     float calibrationFactor;
 } meshtastic_Nau7802Config;
 
-/* SEN5X State, for saving to flash */
-typedef struct _meshtastic_SEN5XState {
-    /* Last cleaning time for SEN5X */
-    uint32_t last_cleaning_time;
-    /* Last cleaning time for SEN5X - valid flag */
-    bool last_cleaning_valid;
-    /* Config flag for one-shot mode (see admin.proto) */
-    bool one_shot_mode;
-    /* Last VOC state time for SEN55 */
-    bool has_voc_state_time;
-    uint32_t voc_state_time;
-    /* Last VOC state validity flag for SEN55 */
-    bool has_voc_state_valid;
-    bool voc_state_valid;
-    /* VOC state array (8x uint8t) for SEN55 */
-    bool has_voc_state_array;
-    uint64_t voc_state_array;
-} meshtastic_SEN5XState;
-
 
 #ifdef __cplusplus
 extern "C" {
@@ -474,7 +455,6 @@ extern "C" {
 
 
 
-
 /* Initializer values for message structs */
 #define meshtastic_DeviceMetrics_init_default    {false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
@@ -485,7 +465,6 @@ extern "C" {
 #define meshtastic_HostMetrics_init_default      {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
 #define meshtastic_Telemetry_init_default        {0, 0, {meshtastic_DeviceMetrics_init_default}}
 #define meshtastic_Nau7802Config_init_default    {0, 0}
-#define meshtastic_SEN5XState_init_default       {0, 0, 0, false, 0, false, 0, false, 0}
 #define meshtastic_DeviceMetrics_init_zero       {false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
@@ -495,7 +474,6 @@ extern "C" {
 #define meshtastic_HostMetrics_init_zero         {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
 #define meshtastic_Telemetry_init_zero           {0, 0, {meshtastic_DeviceMetrics_init_zero}}
 #define meshtastic_Nau7802Config_init_zero       {0, 0}
-#define meshtastic_SEN5XState_init_zero          {0, 0, 0, false, 0, false, 0, false, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_DeviceMetrics_battery_level_tag 1
@@ -603,12 +581,6 @@ extern "C" {
 #define meshtastic_Telemetry_host_metrics_tag    8
 #define meshtastic_Nau7802Config_zeroOffset_tag  1
 #define meshtastic_Nau7802Config_calibrationFactor_tag 2
-#define meshtastic_SEN5XState_last_cleaning_time_tag 1
-#define meshtastic_SEN5XState_last_cleaning_valid_tag 2
-#define meshtastic_SEN5XState_one_shot_mode_tag  3
-#define meshtastic_SEN5XState_voc_state_time_tag 4
-#define meshtastic_SEN5XState_voc_state_valid_tag 5
-#define meshtastic_SEN5XState_voc_state_array_tag 6
 
 /* Struct field encoding specification for nanopb */
 #define meshtastic_DeviceMetrics_FIELDLIST(X, a) \
@@ -759,16 +731,6 @@ X(a, STATIC,   SINGULAR, FLOAT,    calibrationFactor,   2)
 #define meshtastic_Nau7802Config_CALLBACK NULL
 #define meshtastic_Nau7802Config_DEFAULT NULL
 
-#define meshtastic_SEN5XState_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT32,   last_cleaning_time,   1) \
-X(a, STATIC,   SINGULAR, BOOL,     last_cleaning_valid,   2) \
-X(a, STATIC,   SINGULAR, BOOL,     one_shot_mode,     3) \
-X(a, STATIC,   OPTIONAL, UINT32,   voc_state_time,    4) \
-X(a, STATIC,   OPTIONAL, BOOL,     voc_state_valid,   5) \
-X(a, STATIC,   OPTIONAL, FIXED64,  voc_state_array,   6)
-#define meshtastic_SEN5XState_CALLBACK NULL
-#define meshtastic_SEN5XState_DEFAULT NULL
-
 extern const pb_msgdesc_t meshtastic_DeviceMetrics_msg;
 extern const pb_msgdesc_t meshtastic_EnvironmentMetrics_msg;
 extern const pb_msgdesc_t meshtastic_PowerMetrics_msg;
@@ -778,7 +740,6 @@ extern const pb_msgdesc_t meshtastic_HealthMetrics_msg;
 extern const pb_msgdesc_t meshtastic_HostMetrics_msg;
 extern const pb_msgdesc_t meshtastic_Telemetry_msg;
 extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
-extern const pb_msgdesc_t meshtastic_SEN5XState_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_DeviceMetrics_fields &meshtastic_DeviceMetrics_msg
@@ -790,7 +751,6 @@ extern const pb_msgdesc_t meshtastic_SEN5XState_msg;
 #define meshtastic_HostMetrics_fields &meshtastic_HostMetrics_msg
 #define meshtastic_Telemetry_fields &meshtastic_Telemetry_msg
 #define meshtastic_Nau7802Config_fields &meshtastic_Nau7802Config_msg
-#define meshtastic_SEN5XState_fields &meshtastic_SEN5XState_msg
 
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_TELEMETRY_PB_H_MAX_SIZE meshtastic_Telemetry_size
@@ -802,7 +762,6 @@ extern const pb_msgdesc_t meshtastic_SEN5XState_msg;
 #define meshtastic_LocalStats_size               87
 #define meshtastic_Nau7802Config_size            16
 #define meshtastic_PowerMetrics_size             81
-#define meshtastic_SEN5XState_size               27
 #define meshtastic_Telemetry_size                272
 
 #ifdef __cplusplus

src/mesh/http/WebServer.cpp

@@ -12,9 +12,8 @@
 #include <WebServer.h>
 #include <WiFi.h>
 
-#if HAS_ETHERNET && defined(USE_WS5500)
-#include <ETHClass2.h>
-#define ETH ETH2
+#if HAS_ETHERNET && defined(ARCH_ESP32)
+#include <ETH.h>
 #endif // HAS_ETHERNET
 
 #ifdef ARCH_ESP32

src/mesh/udp/UdpMulticastHandler.h

@@ -12,9 +12,8 @@
 
 #include <AsyncUDP.h>
 
-#if HAS_ETHERNET && defined(USE_WS5500)
-#include <ETHClass2.h>
-#define ETH ETH2
+#if HAS_ETHERNET && defined(ARCH_ESP32)
+#include <ETH.h>
 #endif // HAS_ETHERNET
 
 #define UDP_MULTICAST_DEFAUL_PORT 4403 // Default port for UDP multicast is same as TCP api server

src/mesh/wifi/WiFiAPClient.cpp

@@ -10,9 +10,8 @@
 #include "target_specific.h"
 #include <WiFi.h>
 
-#if HAS_ETHERNET && defined(USE_WS5500)
-#include <ETHClass2.h>
-#define ETH ETH2
+#if HAS_ETHERNET && defined(ARCH_ESP32)
+#include <ETH.h>
 #endif // HAS_ETHERNET
 
 #include <WiFiUdp.h>

src/mesh/wifi/WiFiAPClient.h

@@ -9,9 +9,8 @@
 #include <WiFi.h>
 #endif
 
-#if HAS_ETHERNET && defined(USE_WS5500)
-#include <ETHClass2.h>
-#define ETH ETH2
+#if HAS_ETHERNET && defined(ARCH_ESP32)
+#include <ETH.h>
 #endif // HAS_ETHERNET
 
 extern bool needReconnect;

src/modules/AdminModule.cpp

@@ -234,7 +234,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
         break;
     }
     case meshtastic_AdminMessage_ota_request_tag: {
-#if defined(ARCH_ESP32)
+#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WIFI
         LOG_INFO("OTA Requested");
 
         if (r->ota_request.ota_hash.size != 32) {

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 {

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"
@@ -91,9 +109,6 @@
 #include "modules/DropzoneModule.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)
  */
@@ -164,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();
@@ -232,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

src/modules/NodeInfoModule.cpp

@@ -2,7 +2,6 @@
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "NodeStatus.h"
 #include "RTC.h"
 #include "Router.h"
 #include "configuration.h"
@@ -130,17 +129,14 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
         LOG_DEBUG("Skip send NodeInfo > 40%% ch. util");
         return NULL;
     }
-
-    // Use graduated scaling based on active mesh size (10 minute base, scales with congestion coefficient)
-    uint32_t timeoutMs = Default::getConfiguredOrDefaultMsScaled(0, 10 * 60, nodeStatus->getNumOnline());
-    if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, timeoutMs)) {
-        LOG_DEBUG("Skip send NodeInfo since we sent it <%us ago", timeoutMs / 1000);
+    // If we sent our NodeInfo less than 5 min. ago, don't send it again as it may be still underway.
+    if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 5 * 60 * 1000)) {
+        LOG_DEBUG("Skip send NodeInfo since we sent it <5min ago");
         ignoreRequest = true; // Mark it as ignored for MeshModule
         return NULL;
     } else if (shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 60 * 1000)) {
-        // For interactive/urgent requests (e.g., user-triggered or implicit requests), use a shorter 60s timeout
         LOG_DEBUG("Skip send NodeInfo since we sent it <60s ago");
-        ignoreRequest = true;
+        ignoreRequest = true; // Mark it as ignored for MeshModule
         return NULL;
     } else {
         ignoreRequest = false; // Don't ignore requests anymore

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
         }

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.

src/modules/StoreForwardModule.cpp

@@ -513,7 +513,7 @@ bool StoreForwardModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp,
             LOG_DEBUG("StoreAndForward_RequestResponse_ROUTER_BUSY");
             // retry in messages_saved * packetTimeMax ms
             retry_delay = millis() + getNumAvailablePackets(this->busyTo, this->last_time) * packetTimeMax *
-                                         (p->rr == meshtastic_StoreAndForward_RequestResponse_ROUTER_ERROR ? 2 : 1);
+                                         (meshtastic_StoreAndForward_RequestResponse_ROUTER_ERROR ? 2 : 1);
         }
         break;
 

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;

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;
     }
 

src/modules/Telemetry/Sensor/RAK12035Sensor.cpp

@@ -4,15 +4,6 @@
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "RAK12035Sensor.h"
 
-// The RAK12035 library's sensor_sleep() sets WB_IO2 (GPIO 34) LOW, which controls
-// the 3.3V switched power rail (PIN_3V3_EN). This turns off power to ALL peripherals
-// including GPS. We need to restore power after the library turns it off.
-#ifdef PIN_3V3_EN
-#define RESTORE_3V3_POWER() digitalWrite(PIN_3V3_EN, HIGH)
-#else
-#define RESTORE_3V3_POWER()
-#endif
-
 RAK12035Sensor::RAK12035Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_RAK12035, "RAK12035") {}
 
 bool RAK12035Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
@@ -22,6 +13,7 @@ bool RAK12035Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
     delay(100);
     sensor.begin(dev->address.address);
 
+    // Get sensor firmware version
     uint8_t data = 0;
     sensor.get_sensor_version(&data);
     if (data != 0) {
@@ -29,8 +21,8 @@ bool RAK12035Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
         LOG_INFO("RAK12035Sensor Init Succeed \nSensor1 Firmware version: %i, Sensor Name: %s", data, sensorName);
         status = true;
         sensor.sensor_sleep();
-        RESTORE_3V3_POWER();
     } else {
+        // If we reach here, it means the sensor did not initialize correctly.
         LOG_INFO("Init sensor: %s", sensorName);
         LOG_ERROR("RAK12035Sensor Init Failed");
         status = false;
@@ -46,6 +38,8 @@ bool RAK12035Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
 
 void RAK12035Sensor::setup()
 {
+    // Set the calibration values
+    // Reading the saved calibration values from the sensor.
     // TODO:: Check for and run calibration check for up to 2 additional sensors if present.
     uint16_t zero_val = 0;
     uint16_t hundred_val = 0;
@@ -77,7 +71,6 @@ void RAK12035Sensor::setup()
         LOG_INFO("Wet calibration reset complete. New value is %d", hundred_val);
     }
     sensor.sensor_sleep();
-    RESTORE_3V3_POWER();
     delay(200);
     LOG_INFO("Dry calibration value is %d", zero_val);
     LOG_INFO("Wet calibration value is %d", hundred_val);
@@ -86,6 +79,10 @@ void RAK12035Sensor::setup()
 bool RAK12035Sensor::getMetrics(meshtastic_Telemetry *measurement)
 {
     // TODO:: read and send metrics for up to 2 additional soil monitors if present.
+    //  -- how to do this.. this could get a little complex..
+    //     ie - 1> we combine them into an average and send that, 2> we send them as separate metrics
+    //      ^-- these scenarios would require different handling of the metrics in the receiving end and maybe a setting in the
+    //      device ui and an additional proto for that?
     measurement->variant.environment_metrics.has_soil_temperature = true;
     measurement->variant.environment_metrics.has_soil_moisture = true;
 
@@ -100,7 +97,6 @@ bool RAK12035Sensor::getMetrics(meshtastic_Telemetry *measurement)
     success &= sensor.get_sensor_temperature(&temp);
     delay(200);
     sensor.sensor_sleep();
-    RESTORE_3V3_POWER();
 
     if (success == false) {
         LOG_ERROR("Failed to read sensor data");