FLEX TX: fix stop button not stopping transmission (fixes #3135 ) (#3137 )

Reset tx_phase_ to 0 on stop so on_tx_progress does not restart the next phase. Reset progress bar and repaint capcode info.
externalize basebands, not needed, and remove too high level function (#3134 )
2026-08-22 15:39:04 +00:00 · 2026-04-13 15:57:31 +08:00 · 2026-04-10 21:08:46 +02:00 · 2026-04-10 11:17:52 +02:00 · 2026-04-10 08:37:38 +02:00 · 2026-04-10 08:35:43 +02:00
400 changed files with 33424 additions and 2423 deletions
@@ -1,14 +1,13 @@
 ---
 BasedOnStyle: Chromium
-IndentWidth: '4'
-SortIncludes: 'false'
-AllowAllArgumentsOnNextLine: 'true'
+IndentWidth: 4
+SortIncludes: false
+AllowAllArgumentsOnNextLine: true
 ColumnLimit: 0
-Cpp11BracedListStyle: 'true'
-AllowShortLoopsOnASingleLine: 'true'
-AllowShortIfStatementsOnASingleLine: 'true'
+Cpp11BracedListStyle: true
+AllowShortLoopsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: true
 SpacesInLineCommentPrefix:
  Minimum: 1
  Maximum: 1
-
 ...
@@ -0,0 +1,15 @@
+<!--
+👋 Thank you for your contribution!
+
+⚠️ To help avoid extensive change requests or potential rejection, please review our simple Contributing Guidelines before you start coding: https://github.com/portapack-mayhem/mayhem-firmware/wiki/Contributing-Guidelines.
+
+Thank you again for contributing!
+-->
+
+## Brief description what you did
+<!-- Describe your changes in detail here. What problem does this PR solve? What features does it add or fix? -->
+
+
+## Checklist
+- [ ] Kept changes minimal and limited to necessary files
+- [ ] Verified functionality remains intact and code compiles
@@ -3,7 +3,7 @@ name: Check formatting
 on: [pull_request]

 jobs:
-  check_date:
+  check_format:
    runs-on: ubuntu-latest
    name: Check formatting
    strategy:
@@ -13,12 +13,20 @@ jobs:
          - "firmware/application"
          - "firmware/baseband"
    steps:
-      - uses: actions/checkout@v2
-      - name: print latest_commit
-        run: echo ${{ github.sha }}
-      - name: clang-format Check
-        uses: jidicula/clang-format-action@v4.11.0
-        with:
-          clang-format-version: '18'
-          check-path: ${{ matrix.path }}
-          fallback-style: Chromium
+      - uses: actions/checkout@v4
+
+      - name: clang-format check (repo pinned)
+        run: |
+          set -euo pipefail
+
+          CF="./tools/clang-format.sh"
+          chmod +x "$CF" || true
+
+          "$CF" --version
+
+          ROOT="${{ matrix.path }}"
+          find "$ROOT" -type f \( \
+              -name '*.c' -o -name '*.cpp' -o \
+              -name '*.h' -o -name '*.hpp' \
+            \) -print0 \
+            | xargs -0 -r "$CF" --dry-run --Werror --style=file
@@ -3,7 +3,7 @@ name: Nightly Release
 on:
  schedule:
    - cron: "0 0 * * *"
-    
+
  workflow_dispatch:

 jobs:
@@ -21,27 +21,36 @@ jobs:
        id: should_run
        continue-on-error: true
        run: test -z $(git rev-list  --after="24 hours" ${{ github.sha }}) && echo "should_run=false" >> $GITHUB_OUTPUT
+
  build:
    needs: check_date
    if: ${{ needs.check_date.outputs.should_run != 'false' }}
    runs-on: ubuntu-latest
+    name: build (${{ matrix.device_name }})
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - device: default
+            device_name: HackRF
+            cmake_args: ""
+            artifact_suffix: "_hackrf"
+          - device: portarf
+            device_name: PortaRF
+            cmake_args: "-DFLASH_MB_SIZE=2 -DFLASH_MB_LIMIT_SIZE=2"
+            artifact_suffix: "_portarf"
+          - device: hpro
+            device_name: HackRF Pro
+            cmake_args: "-DBOARD=PRALINE"
+            artifact_suffix: "_hpro"
    steps:
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
      - name: Get version date
        id: version_date
        run: echo "date=n_$(date +'%y%m%d')" >> $GITHUB_OUTPUT
-      - name: Checkout 
+      - name: Checkout
        uses: actions/checkout@master
        with:
          fetch-depth: 0
-          #ref: next
-          # The branch, tag or SHA to checkout. When checking out the repository that
-          # triggered a workflow, this defaults to the reference or SHA for that event.
-          # Otherwise, uses the default branch.
-          # https://github.com/actions/checkout
-          # So scheduled runs will use the default branch (next) but its now possible to trigger a workflow from another branch
          submodules: true
      - name: Git Sumbodule Update
        run: |
@@ -51,10 +60,10 @@ jobs:
      - name: Make build folder
        run: mkdir ${{ github.workspace }}/build
      - name: Run the Docker image
-        run: docker run -e VERSION_STRING=${{ steps.version_date.outputs.date }} -i -v ${{ github.workspace }}:/havoc portapack-dev
+        run: docker run -e VERSION_STRING=${{ steps.version_date.outputs.date }} -i -v ${{ github.workspace }}:/havoc portapack-dev ${{ matrix.cmake_args }}
      - name: Create Small SD Card ZIP - No World Map
        run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_nightly_${{ steps.version_date.outputs.date }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_nightly_${{ steps.version_date.outputs.date }}${{ matrix.artifact_suffix }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
      - name: Download world map
        run: |
          wget https://github.com/portapack-mayhem/mayhem-firmware/releases/download/world_map/world_map.zip
@@ -63,13 +72,55 @@ jobs:
          unzip world_map.zip -d sdcard/ADSB
      - name: Prepare Firmware ZIP
        run: |
-          cp build/hackrf/firmware/hackrf_usb/hackrf_usb.dfu flashing/utils/hackrf_one_usb.dfu && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.bin flashing/utils/hackrf_one_usb.bin
+          mkdir -p flashing/firmware && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.dfu flashing/firmware/hackrf_usb.dfu && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.bin flashing/firmware/hackrf_usb.bin
      - name: Create Firmware ZIP
        run: |
          zip -j firmware.zip build/firmware/portapack-mayhem-firmware.bin && cd flashing && zip -r ../firmware.zip *
      - name: Create SD Card ZIP
        run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_nightly_${{ steps.version_date.outputs.date }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_nightly_${{ steps.version_date.outputs.date }}${{ matrix.artifact_suffix }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
+      - name: Upload firmware zip artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-${{ matrix.device }}
+          path: ./firmware.zip
+      - name: Upload SD card artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: sdcard-${{ matrix.device }}
+          path: ./sdcard.zip
+      - name: Upload SD card no-map artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: sdcard-no-map-${{ matrix.device }}
+          path: ./sdcard-no-map.zip
+      - name: Upload OCI tar artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: oci-tar-${{ matrix.device }}
+          path: build/firmware/portapack-mayhem_OCI.ppfw.tar
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Get current date
+        id: date
+        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+      - name: Get version date
+        id: version_date
+        run: echo "date=n_$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+      - name: Checkout
+        uses: actions/checkout@master
+        with:
+          fetch-depth: 0
+          submodules: true
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
      - name: Create changelog
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -80,14 +131,42 @@ jobs:
            echo EOF
          } >> "$GITHUB_OUTPUT"
        id: changelog
+      # Combine all 3 device firmware bins into a single zip with device selector bat
+      - name: Create Combined Firmware ZIP
+        run: |
+          mkdir -p firmware_combined
+          unzip artifacts/firmware-default/firmware.zip -d firmware_combined
+          mv firmware_combined/portapack-mayhem-firmware.bin firmware_combined/firmware/firmware_hackrf.bin
+          unzip -j artifacts/firmware-portarf/firmware.zip portapack-mayhem-firmware.bin -d firmware_combined/firmware
+          mv firmware_combined/firmware/portapack-mayhem-firmware.bin firmware_combined/firmware/firmware_portarf.bin
+          unzip -j artifacts/firmware-hpro/firmware.zip portapack-mayhem-firmware.bin -d firmware_combined/firmware
+          mv firmware_combined/firmware/portapack-mayhem-firmware.bin firmware_combined/firmware/firmware_hpro.bin
+          unzip -j artifacts/firmware-hpro/firmware.zip firmware/hackrf_usb.dfu firmware/hackrf_usb.bin -d firmware_combined_hpro
+          mv firmware_combined_hpro/hackrf_usb.dfu firmware_combined/firmware/hackrf_hpro_usb.dfu
+          mv firmware_combined_hpro/hackrf_usb.bin firmware_combined/firmware/hackrf_hpro_usb.bin
+          cd firmware_combined && zip -r ../firmware_all_devices.zip . && cd ..
+      - name: Prepare release assets
+        run: |
+          VER="${{ steps.version_date.outputs.date }}"
+          mkdir -p release_assets
+          # OCI tar assets
+          cp artifacts/oci-tar-default/portapack-mayhem_OCI.ppfw.tar "release_assets/OCI_hackrf_mayhem_nightly_${VER}.ppfw.tar"
+          cp artifacts/oci-tar-portarf/portapack-mayhem_OCI.ppfw.tar "release_assets/OCI_portarf_mayhem_nightly_${VER}.ppfw.tar"
+          cp artifacts/oci-tar-hpro/portapack-mayhem_OCI.ppfw.tar "release_assets/OCI_hpro_mayhem_nightly_${VER}.ppfw.tar"
+          # Combined firmware
+          cp firmware_all_devices.zip "release_assets/FIRMWARE_mayhem_nightly_${VER}.zip"
+          # SD card assets
+          cp artifacts/sdcard-default/sdcard.zip "release_assets/COPY_TO_SDCARD_hackrf_mayhem_nightly_${VER}.zip"
+          cp artifacts/sdcard-no-map-default/sdcard-no-map.zip "release_assets/COPY_TO_SDCARD_hackrf_mayhem_nightly_${VER}-no-world-map.zip"
+          cp artifacts/sdcard-portarf/sdcard.zip "release_assets/COPY_TO_SDCARD_portarf_mayhem_nightly_${VER}.zip"
+          cp artifacts/sdcard-no-map-portarf/sdcard-no-map.zip "release_assets/COPY_TO_SDCARD_portarf_mayhem_nightly_${VER}-no-world-map.zip"
+          cp artifacts/sdcard-hpro/sdcard.zip "release_assets/COPY_TO_SDCARD_hpro_mayhem_nightly_${VER}.zip"
+          cp artifacts/sdcard-no-map-hpro/sdcard-no-map.zip "release_assets/COPY_TO_SDCARD_hpro_mayhem_nightly_${VER}-no-world-map.zip"
      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2
        with:
          tag_name: nightly-tag-${{ steps.date.outputs.date }}
-          release_name: Nightly Release - ${{ steps.date.outputs.date }}
+          name: Nightly Release - ${{ steps.date.outputs.date }}
          body: |
            **Nightly release - ${{ steps.date.outputs.date }}**
            This build is the latest and greatest, although may not be the most stable as this is a nightly release.
@@ -96,43 +175,4 @@ jobs:
            ${{ steps.changelog.outputs.content }}
          draft: false
          prerelease: true
-      - name: Upload Firmware TAR Asset
-        id: upload-firmware-tar-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: build/firmware/portapack-mayhem_OCI.ppfw.tar
-          asset_name: mayhem_nightly_${{ steps.version_date.outputs.date }}_OCI.ppfw.tar
-          asset_content_type: application/x-tar
-      - name: Upload Firmware Asset
-        id: upload-firmware-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./firmware.zip
-          asset_name: mayhem_nightly_${{ steps.version_date.outputs.date }}_FIRMWARE.zip
-          asset_content_type: application/zip
-      - name: Upload SD Card Assets
-        id: upload-sd-card-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./sdcard.zip
-          asset_name: mayhem_nightly_${{ steps.version_date.outputs.date }}_COPY_TO_SDCARD.zip
-          asset_content_type: application/zip
-      - name: Upload SD Card Assets - No Map
-        id: upload-sd-card-asset-no-map 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./sdcard-no-map.zip
-          asset_name: mayhem_nightly_${{ steps.version_date.outputs.date }}_COPY_TO_SDCARD-no-world-map.zip
-          asset_content_type: application/zip
+          files: release_assets/*
@@ -1,25 +1,36 @@
 name: Stable Release

-on:    
+on:
  workflow_dispatch:

 jobs:
  build:
    runs-on: ubuntu-latest
+    name: build (${{ matrix.device_name }})
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - device: default
+            device_name: HackRF
+            cmake_args: ""
+            artifact_suffix: "_hackrf"
+          - device: portarf
+            device_name: PortaRF
+            cmake_args: "-DFLASH_MB_SIZE=2 -DFLASH_MB_LIMIT_SIZE=2"
+            artifact_suffix: "_portarf"
+          - device: hpro
+            device_name: HackRF Pro
+            cmake_args: "-DBOARD=PRALINE"
+            artifact_suffix: "_hpro"
    steps:
      - name: Get current date
        id: date
        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-      - name: Checkout 
+      - name: Checkout
        uses: actions/checkout@master
        with:
          fetch-depth: 0
-          #ref: next
-          # The branch, tag or SHA to checkout. When checking out the repository that
-          # triggered a workflow, this defaults to the reference or SHA for that event.
-          # Otherwise, uses the default branch.
-          # https://github.com/actions/checkout
-          # So scheduled runs will use the default branch (next) but its now possible to trigger a workflow from another branch
          submodules: true
      - name: Git Sumbodule Update
        run: |
@@ -27,18 +38,15 @@ jobs:
      - name: Get version
        id: version
        run: echo "version=$(cat .github/workflows/version.txt)" >> $GITHUB_OUTPUT
-      - name: Get past version
-        id: past_version
-        run: echo "past_version=$(cat .github/workflows/past_version.txt)" >> $GITHUB_OUTPUT
      - name: Build the Docker image
        run: docker build -t portapack-dev -f dockerfile-nogit . --tag my-image-name:$(date +%s)
      - name: Make build folder
        run: mkdir ${{ github.workspace }}/build
      - name: Run the Docker image
-        run: docker run -e VERSION_STRING=${{ steps.version.outputs.version }} -i -v ${{ github.workspace }}:/havoc portapack-dev
+        run: docker run -e VERSION_STRING=${{ steps.version.outputs.version }} -i -v ${{ github.workspace }}:/havoc portapack-dev ${{ matrix.cmake_args }}
      - name: Create Small SD Card ZIP - No World Map
        run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_${{ steps.version.outputs.version }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_${{ steps.version.outputs.version }}${{ matrix.artifact_suffix }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
      - name: Download world map
        run: |
          wget https://github.com/portapack-mayhem/mayhem-firmware/releases/download/world_map/world_map.zip
@@ -47,13 +55,58 @@ jobs:
          unzip world_map.zip -d sdcard/ADSB
      - name: Prepare Firmware ZIP
        run: |
-          cp build/hackrf/firmware/hackrf_usb/hackrf_usb.dfu flashing/utils/hackrf_one_usb.dfu && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.bin flashing/utils/hackrf_one_usb.bin
+          mkdir -p flashing/firmware && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.dfu flashing/firmware/hackrf_usb.dfu && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.bin flashing/firmware/hackrf_usb.bin
      - name: Create Firmware ZIP
        run: |
          zip -j firmware.zip build/firmware/portapack-mayhem-firmware.bin && cd flashing && zip -r ../firmware.zip *
      - name: Create SD Card ZIP
        run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_${{ steps.version.outputs.version }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_${{ steps.version.outputs.version }}${{ matrix.artifact_suffix }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
+      - name: Upload firmware zip artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-${{ matrix.device }}
+          path: ./firmware.zip
+      - name: Upload SD card artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: sdcard-${{ matrix.device }}
+          path: ./sdcard.zip
+      - name: Upload SD card no-map artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: sdcard-no-map-${{ matrix.device }}
+          path: ./sdcard-no-map.zip
+      - name: Upload OCI tar artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: oci-tar-${{ matrix.device }}
+          path: build/firmware/portapack-mayhem_OCI.ppfw.tar
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Get current date
+        id: date
+        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+      - name: Checkout
+        uses: actions/checkout@master
+        with:
+          fetch-depth: 0
+          submodules: true
+      - name: Get version
+        id: version
+        run: echo "version=$(cat .github/workflows/version.txt)" >> $GITHUB_OUTPUT
+      - name: Get past version
+        id: past_version
+        run: echo "past_version=$(cat .github/workflows/past_version.txt)" >> $GITHUB_OUTPUT
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
      - name: Create changelog
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -64,21 +117,49 @@ jobs:
            echo EOF
          } >> "$GITHUB_OUTPUT"
        id: changelog
+      # Combine all 3 device firmware bins into a single zip with device selector bat
+      - name: Create Combined Firmware ZIP
+        run: |
+          mkdir -p firmware_combined
+          unzip artifacts/firmware-default/firmware.zip -d firmware_combined
+          mv firmware_combined/portapack-mayhem-firmware.bin firmware_combined/firmware/firmware_hackrf.bin
+          unzip -j artifacts/firmware-portarf/firmware.zip portapack-mayhem-firmware.bin -d firmware_combined/firmware
+          mv firmware_combined/firmware/portapack-mayhem-firmware.bin firmware_combined/firmware/firmware_portarf.bin
+          unzip -j artifacts/firmware-hpro/firmware.zip portapack-mayhem-firmware.bin -d firmware_combined/firmware
+          mv firmware_combined/firmware/portapack-mayhem-firmware.bin firmware_combined/firmware/firmware_hpro.bin
+          unzip -j artifacts/firmware-hpro/firmware.zip firmware/hackrf_usb.dfu firmware/hackrf_usb.bin -d firmware_combined_hpro
+          mv firmware_combined_hpro/hackrf_usb.dfu firmware_combined/firmware/hackrf_hpro_usb.dfu
+          mv firmware_combined_hpro/hackrf_usb.bin firmware_combined/firmware/hackrf_hpro_usb.bin
+          cd firmware_combined && zip -r ../firmware_all_devices.zip . && cd ..
+      - name: Prepare release assets
+        run: |
+          VER="${{ steps.version.outputs.version }}"
+          mkdir -p release_assets
+          # OCI tar assets
+          cp artifacts/oci-tar-default/portapack-mayhem_OCI.ppfw.tar "release_assets/OCI_hackrf_mayhem_${VER}.ppfw.tar"
+          cp artifacts/oci-tar-portarf/portapack-mayhem_OCI.ppfw.tar "release_assets/OCI_portarf_mayhem_${VER}.ppfw.tar"
+          cp artifacts/oci-tar-hpro/portapack-mayhem_OCI.ppfw.tar "release_assets/OCI_hpro_mayhem_${VER}.ppfw.tar"
+          # Combined firmware
+          cp firmware_all_devices.zip "release_assets/FIRMWARE_mayhem_${VER}.zip"
+          # SD card assets
+          cp artifacts/sdcard-default/sdcard.zip "release_assets/COPY_TO_SDCARD_hackrf_mayhem_${VER}.zip"
+          cp artifacts/sdcard-no-map-default/sdcard-no-map.zip "release_assets/COPY_TO_SDCARD_hackrf_mayhem_${VER}-no-world-map.zip"
+          cp artifacts/sdcard-portarf/sdcard.zip "release_assets/COPY_TO_SDCARD_portarf_mayhem_${VER}.zip"
+          cp artifacts/sdcard-no-map-portarf/sdcard-no-map.zip "release_assets/COPY_TO_SDCARD_portarf_mayhem_${VER}-no-world-map.zip"
+          cp artifacts/sdcard-hpro/sdcard.zip "release_assets/COPY_TO_SDCARD_hpro_mayhem_${VER}.zip"
+          cp artifacts/sdcard-no-map-hpro/sdcard-no-map.zip "release_assets/COPY_TO_SDCARD_hpro_mayhem_${VER}-no-world-map.zip"
      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2
        with:
          tag_name: ${{ steps.version.outputs.version }}
-          release_name: Mayhem firmware ${{ steps.version.outputs.version }}
+          name: Mayhem firmware ${{ steps.version.outputs.version }}
          body: |
            **Stable release - ${{ steps.version.outputs.version }}**
            This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmware, which itself was a fork of the [PortaPack](https://github.com/sharebrained/portapack-hackrf) firmware, an add-on for the [HackRF](http://greatscottgadgets.com/hackrf/). Please check the [readme](https://github.com/portapack-mayhem/mayhem-firmware/blob/master/README.md) for details.
            ## Release notes
            ###  Revision (${{ steps.version.outputs.version }}):
            ${{ steps.changelog.outputs.content }}
-            
+
            **Full Changelog**: https://github.com/portapack-mayhem/mayhem-firmware/compare/${{ steps.past_version.outputs.past_version }}...${{ steps.version.outputs.version }}

            ## Installation
@@ -90,44 +171,4 @@ jobs:
            For certain functionality, like external apps, the world map, GPS simulator, and others you need to uncompress (using [7-zip](https://www.7-zip.org/download.html)) the files from `mayhem_vX.Y.Z_COPY_TO_SDCARD.zip` to a FAT32 formatted MicroSD card.
          draft: true
          prerelease: false
-      - name: Upload Firmware TAR Asset
-        id: upload-firmware-tar-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: build/firmware/portapack-mayhem_OCI.ppfw.tar
-          asset_name: mayhem_${{ steps.version.outputs.version }}_OCI.ppfw.tar
-          asset_content_type: application/x-tar
-      - name: Upload Firmware Asset
-        id: upload-firmware-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./firmware.zip
-          asset_name: mayhem_${{ steps.version.outputs.version }}_FIRMWARE.zip
-          asset_content_type: application/zip
-      - name: Upload SD Card Assets
-        id: upload-sd-card-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./sdcard.zip
-          asset_name: mayhem_${{ steps.version.outputs.version }}_COPY_TO_SDCARD.zip
-          asset_content_type: application/zip
-      - name: Upload SD Card Assets - No Map
-        id: upload-sd-card-asset-no-map 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./sdcard-no-map.zip
-          asset_name: mayhem_${{ steps.version.outputs.version }}_COPY_TO_SDCARD-no-world-map.zip
-          asset_content_type: application/zip
-     
+          files: release_assets/*
@@ -1 +1 @@
-v2.3.1
+v2.3.2
@@ -1 +1 @@
-v2.3.2
+v2.4.0
@@ -27,6 +27,37 @@ set(CMAKE_COLOR_MAKEFILE ON)

 add_compile_options(-fdiagnostics-color=always)

+#Flash size related options
+#This is the size of the flash memory we SUPPORT. Don't worry, the internl flash app has harder limits based on device type.
+if(NOT DEFINED FLASH_MB_SIZE)
+    if(BOARD STREQUAL "PRALINE")
+        set(FLASH_MB_SIZE 4) # PRALINE has 4MB flash
+    else()
+        set(FLASH_MB_SIZE 2) # Default to 2MB if not provided. For PortaRf this should be 2MB passed to cmake with -DFLASH_MB_SIZE=2
+    endif()
+endif()
+message("Configuring for FLASH_MB_SIZE=${FLASH_MB_SIZE}MB")
+#This is the flash memory size we build. This can be less, so the FW size will be less, so can be flashed with older utils.
+if(NOT DEFINED FLASH_MB_LIMIT_SIZE)
+	if(BOARD STREQUAL "PRALINE")
+		set(FLASH_MB_LIMIT_SIZE 3.5) #PRALINE 4 MB = 3.5 firmware + 0.5 MB fpga bitstream.
+	else()
+	    set(FLASH_MB_LIMIT_SIZE 1) #TODO: should be ${FLASH_MB_SIZE} remove once we got a stable build for all devices we support with bigger than 1 mb flash
+		endif()
+endif()
+message("Configuring for FLASH_MB_LIMIT_SIZE=${FLASH_MB_LIMIT_SIZE}MB")
+
+if(FLASH_MB_SIZE LESS FLASH_MB_LIMIT_SIZE)
+    message(FATAL_ERROR "Error: The supported flash size is lower than the generated flash file. Build halted.")
+endif()
+
+math(EXPR FLASH_BYTES_SIZE "${FLASH_MB_SIZE} * 1024 * 1024")
+if(BOARD STREQUAL "PRALINE")
+	math(EXPR FLASH_BYTES_LIMIT_SIZE "3584 * 1024") #4 MB = 3.5 firmware + 0.5 MB fpga bitstream.
+else()
+    math(EXPR FLASH_BYTES_LIMIT_SIZE "${FLASH_MB_LIMIT_SIZE} * 1024 * 1024")
+endif()
+
 option(USE_CCACHE "Enable ccache, please keep an eye on this because sometimes it's not quite stable and generated unusable binary" OFF)

 project(portapack-h1)
@@ -10,16 +10,20 @@
 This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmware, which itself was a fork of the [PortaPack](https://github.com/sharebrained/portapack-hackrf) firmware, an add-on for the [HackRF](http://greatscottgadgets.com/hackrf/). A fork is a derivate, in this case one that has extra features and fixes when compared to the older versions.

 [<img src="https://github.com/user-attachments/assets/dea337ab-fb64-4a2a-b419-69afd272e815" height="310">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#new-h4m-mayhem-edition) 
-[<img src="https://camo.githubusercontent.com/5c1f1da0688240ac7b2ccca0c8dbfd1d73f2540741ad8b1828ba4d5ea68af248/68747470733a2f2f6769746875622d70726f64756374696f6e2d757365722d61737365742d3632313064662e73332e616d617a6f6e6177732e636f6d2f343339333937392f3239353533323731382d38653562363631632d663934362d346365652d386232642d3061363135663737313566342e706e67" height="310">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#h2m-mayhem-edition)
-[<img src="https://camo.githubusercontent.com/c1f7dd1e7672324f60a513f0de23de76da6a669e63896a9de535d8c8093fc3c7/68747470733a2f2f7261772e6769746875622e636f6d2f7368617265627261696e65642f706f7274617061636b2d6861636b72662f6d61737465722f646f632f696d616765732f68617264776172652f706f7274617061636b5f68315f6f7065726174696e672e6a7067" height="310">]([https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#h2m-mayhem-edition](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#h1r1r2))
+[<img src="https://github-production-user-asset-6210df.s3.amazonaws.com/4393979/295532718-8e5b661c-f946-4cee-8b2d-0a615f7715f4.png" height="310">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#h2m-mayhem-edition)
+

 # What is this?

 If you are new to *HackRF+PortaPack+Mayhem*, check these:

-[<img alt="The Latest HackRF & Portapak Combo - H4M The Flipper Zero Killer?" src="https://img.youtube.com/vi/Ew2qDgm2hf0/maxresdefault.jpg" width="701">](https://share.hackrf.app/6HKX9A)
+[<img alt="PortaPack H4M Crash Course" src="https://img.youtube.com/vi/CjI-nUzdpas/maxresdefault.jpg" width="701">](https://share.hackrf.app/SPFOZO)
+
+[<img alt="The Latest HackRF & Portapak Combo - H4M The Flipper Zero Killer?" src="https://img.youtube.com/vi/Ew2qDgm2hf0/maxresdefault.jpg" width="172">](https://share.hackrf.app/6HKX9A)
+[<img alt="It’s TOO Easy to Accidentally Do Illegal Stuff with This" src="https://img.youtube.com/vi/OPckpjBSAOw/maxresdefault.jpg" width="172">](https://share.hackrf.app/X4D5TF)
+[<img alt="HackRF Portapack H4M - Getting Started Guide" src="https://img.youtube.com/vi/wzP0zWi85SI/maxresdefault.jpg" width="172">](https://share.hackrf.app/F9MPOO)
+[<img alt="The new HackRF Portapack H4M" src="https://img.youtube.com/vi/onQRdCITmuk/maxresdefault.jpg" width="172">](https://share.hackrf.app/0JUHZ6)

-[<img alt="It’s TOO Easy to Accidentally Do Illegal Stuff with This" src="https://img.youtube.com/vi/OPckpjBSAOw/maxresdefault.jpg" width="172">](https://share.hackrf.app/X4D5TF) [<img alt="HackRF Portapack H4M - Getting Started Guide" src="https://img.youtube.com/vi/wzP0zWi85SI/maxresdefault.jpg" width="172">](https://share.hackrf.app/F9MPOO) [<img alt="The new HackRF Portapack H4M" src="https://img.youtube.com/vi/onQRdCITmuk/maxresdefault.jpg" width="172">](https://share.hackrf.app/0JUHZ6) [<img alt="HackRF 101 : Everything You Need to Know to Get Started!" src="https://img.youtube.com/vi/xGR_PMD9LeU/maxresdefault.jpg" width="172">](https://share.hackrf.app/C0J6ZR)

 # Frequently Asked Questions

@@ -28,9 +32,9 @@ This repository expands upon the previous work by many people and aims to consta
 ## What to buy?

 <!---not direct to h4m but to opensourcesdrlab https://share.hackrf.app/TUOLYI---> 
-:heavy_check_mark: ![Static Badge](https://img.shields.io/badge/NEW-yellow) The fabulous H4M [complete](https://share.hackrf.app/9UMBN5) or [upgrade](https://share.hackrf.app/30CQ55), featuring numerous improvements and accessories. Sold by our friends at [OpenSourceSDRLab](https://share.hackrf.app/99SAMT). Join their giveaways on discord (check the badge on top). _EU customers_ can purchase via [Lab401](https://share.hackrf.app/0CI2CR).
+:heavy_check_mark: ![Static Badge](https://img.shields.io/badge/NEW-yellow) The fabulous H4M [complete](https://share.hackrf.app/DF2BZS) or [upgrade](https://share.hackrf.app/OCSJYI), featuring numerous improvements and accessories. Sold by our friends at [OpenSourceSDRLab](https://share.hackrf.app/99SAMT). Join their giveaways on discord (check the badge on top). _EU customers_ can purchase via [Lab401](https://share.hackrf.app/0CI2CR).

-:heavy_check_mark: A recommended one is this [PortaPack H2](https://www.ebay.com/itm/116382397447), that includes everything you need with the plastic case "inspired" on [this](https://github.com/portapack-mayhem/mayhem-firmware/wiki/3d-printed-enclosure).
+:heavy_check_mark: A recommended one is this [PortaPack H2](https://share.hackrf.app/QT5JMB), that includes everything you need with the plastic case "inspired" on [this](https://github.com/portapack-mayhem/mayhem-firmware/wiki/3d-printed-enclosure).

 :heavy_check_mark: Some individuals lean towards the [H2 with a metal enclosure](https://share.hackrf.app/24T3TO), but its advantages remain debated. Share your insights on our [wiki](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview). 

@@ -47,7 +51,10 @@ This repository expands upon the previous work by many people and aims to consta
 The current **stable release** is on the [![GitHub release (latest by date)](https://img.shields.io/github/v/release/portapack-mayhem/mayhem-firmware?label=Releases&style=social)](https://github.com/portapack-mayhem/mayhem-firmware/releases/latest) page. Follow the instructions you can find in the release description. The **latest (nightly) release** can be found [here](https://github.com/portapack-mayhem/mayhem-firmware/releases/).

 ## How can I collaborate
-You can write [documentation](https://github.com/portapack-mayhem/mayhem-firmware/wiki), fix bugs and [answer issues](https://github.com/portapack-mayhem/mayhem-firmware/issues) or add new functionality. Please check the following [guide](https://github.com/portapack-mayhem/mayhem-firmware/wiki/How-to-collaborate) with details.
+
+We warmly welcome your contributions! Please refer to our **[Contributing Guidelines](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Contributing-Guidelines)** for details.
+
+You can write [documentation](https://github.com/portapack-mayhem/mayhem-firmware/wiki), fix bugs and [answer issues](https://github.com/portapack-mayhem/mayhem-firmware/issues) or add new functionality. Please also check the following [guide](https://github.com/portapack-mayhem/mayhem-firmware/wiki/How-to-collaborate) with details.

 Consider that the hardware and firmware has been created and maintain by a [lot](https://github.com/mossmann/hackrf/graphs/contributors) of [people](https://github.com/portapack-mayhem/mayhem-firmware/graphs/contributors), so always try collaborating your time and effort first. For coding related questions, if something does not fit as an issue, please join our Discord by clicking the chat badge on [top](#portapack-mayhem).

@@ -1 +1,17 @@
-Please check [Intended-Use-and-Legality](https://github.com/portapack-mayhem/mayhem-firmware/wiki/)
+# Security Policy
+
+## Scope and Threat Model
+This repository hosts the codebase for an embedded system designed for security research. Because the system operates primarily offline, traditional network-based vulnerabilities are generally not applicable. However, we still welcome and review security reports concerning the code within this repository. 
+
+## Reporting a Vulnerability
+If you discover a vulnerability within this tool itself, please submit a report. Please be aware that the maintainers do not promise assistance with obtaining CVE IDs or managing formal security advisories.
+
+## Out of Scope
+* **Vulnerabilities found *using* this tool:** Please do not submit reports here for vulnerabilities you have discovered in other systems or targets using this tool. This channel is strictly for reporting vulnerabilities found *in* the tool itself. 
+* **Other Repositories:** For security issues concerning related tools, such as MayhemHub, please submit your reports directly to their respective repositories.
+
+## Research Attribution
+If you utilize this tool to successfully discover vulnerabilities in external systems, we would greatly appreciate it if you credit or mention our project in your published research or write-ups.
+
+## Legal and Security Disclaimer  
+For comprehensive guidelines regarding the legal and secure usage of this tool, as well as our full liability disclaimer, please refer to: [Intended-Use-and-Legality](https://github.com/portapack-mayhem/mayhem-firmware/wiki/). Users are expected to comply with all applicable laws and regulations when using this software and/or hardware.
@@ -15,8 +15,11 @@
 # - Get a shell inside the build image to
 #   inspect problems: ./dockerize.sh shell
 # - Give additional parameters to the container:
-#   ./dockerize.sh -j10
-#   ./dockerize.sh ninja -j10
+#   Additional parameters to make:        ./dockerize.sh -j10
+#   Use ninja instead of make:            ./dockerize.sh ninja -j10
+#   Addotopnal CMake parameters:          ./dockerize.sh -DBOARD=PRALINE
+#   Change the default build directory:   ./dockerize.sh -B build-alt
+#                                         (Alternatively --workdir works as well)
 # - Use a different dockerfile:
 #   ./dockerize.sh build dockerfile-other
 # - Use a different cpu architecture:
@@ -1 +0,0 @@
-portapack.ried.cl
@@ -48,19 +48,44 @@ if(NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_EQUAL ${EXPECTED_GCC_VERSION})
 	set(GCC_VERSION_MISMATCH 1)
 endif()

+#generate h files
+configure_file(flashsize.h.in flashsize.h)
+add_compile_options(-include ${CMAKE_CURRENT_BINARY_DIR}/flashsize.h)
+
 add_subdirectory(application)
 add_subdirectory(baseband)
 add_subdirectory(standalone)
 add_subdirectory(test)

-# NOTE: Dependencies break if the .bin files aren't included in DEPENDS. WTF, CMake?
-add_custom_command(
-	OUTPUT ${FIRMWARE_FILENAME}
-	COMMAND ${MAKE_SPI_IMAGE} ${application_BINARY_DIR}/application.bin ${baseband_BINARY_DIR}/baseband.img ${FIRMWARE_FILENAME}
-	DEPENDS baseband application ${MAKE_SPI_IMAGE}
-		 ${baseband_BINARY_DIR}/baseband.img ${application_BINARY_DIR}/application.bin
-	VERBATIM
-)
+if(BOARD STREQUAL "PRALINE")
+	math(EXPR PRALINE_FINAL_SIZE "4 * 1024 * 1024")
+	set(PRALINE_FPGA_BIN ${CMAKE_CURRENT_SOURCE_DIR}/../hackrf/firmware/fpga/build/praline_fpga.bin)
+	set(APPEND_FPGA_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/tools/append_fpga_bitstream.py)
+
+	# NOTE: Dependencies break if the .bin files aren't included in DEPENDS. WTF, CMake?
+	add_custom_command(
+		OUTPUT ${FIRMWARE_FILENAME}
+		COMMAND ${MAKE_SPI_IMAGE} ${application_BINARY_DIR}/application.bin ${baseband_BINARY_DIR}/baseband.img ${FIRMWARE_FILENAME} ${FLASH_BYTES_LIMIT_SIZE}
+		# PRALINE: Append FPGA bitstream to firmware at offset 0x380000
+		# The base firmware is 3.5MB, FPGA bitstream gets appended at the end of it, final size is 4MB
+		COMMAND ${CMAKE_COMMAND} -E echo "Appending PRALINE FPGA bitstream to firmware..."
+		COMMAND python3 ${APPEND_FPGA_SCRIPT} ${FIRMWARE_FILENAME} ${PRALINE_FPGA_BIN} ${FIRMWARE_FILENAME}.tmp ${PRALINE_FINAL_SIZE}
+		COMMAND ${CMAKE_COMMAND} -E rename ${FIRMWARE_FILENAME}.tmp ${FIRMWARE_FILENAME}
+		DEPENDS baseband application ${MAKE_SPI_IMAGE}
+			${baseband_BINARY_DIR}/baseband.img ${application_BINARY_DIR}/application.bin
+			${PRALINE_FPGA_BIN} ${APPEND_FPGA_SCRIPT}
+		VERBATIM
+	)
+else() # Sadly this part had to be duplicated (or at least I couldn't find a better way to do it)
+	# NOTE: Dependencies break if the .bin files aren't included in DEPENDS. WTF, CMake?
+	add_custom_command(
+		OUTPUT ${FIRMWARE_FILENAME}
+		COMMAND ${MAKE_SPI_IMAGE} ${application_BINARY_DIR}/application.bin ${baseband_BINARY_DIR}/baseband.img ${FIRMWARE_FILENAME} ${FLASH_BYTES_LIMIT_SIZE}
+		DEPENDS baseband application ${MAKE_SPI_IMAGE}
+			${baseband_BINARY_DIR}/baseband.img ${application_BINARY_DIR}/application.bin
+		VERBATIM
+	)
+endif()

 add_custom_target(
 	firmware
@@ -86,6 +86,9 @@ set(CPLD_20150901_DATA_CPP ${CMAKE_CURRENT_BINARY_DIR}/portapack_cpld_20150901_d
 set(CPLD_20170522_SVF_PATH ${HARDWARE_PATH}/portapack_h1/cpld/20170522/output_files/portapack_h1_cpld.svf)
 set(CPLD_20170522_DATA_CPP ${CMAKE_CURRENT_BINARY_DIR}/portapack_cpld_20170522_data.cpp)

+set(CPLD_H4M_SVF_PATH ${HARDWARE_PATH}/portapack_h4m/CPLD/AG256SL100/output_files/portapack_h4m_cpld.svf)
+set(CPLD_H4M_DATA_CPP ${CMAKE_CURRENT_BINARY_DIR}/portapack_cpld_h4m_data.cpp)
+
 set(HACKRF_CPLD_DATA_HPP ${CMAKE_CURRENT_BINARY_DIR}/hackrf_cpld_data.hpp)
 set(HACKRF_CPLD_DATA_CPP ${CMAKE_CURRENT_BINARY_DIR}/hackrf_cpld_data.cpp)

@@ -118,11 +121,16 @@ set(CSRC
 	usb_serial_endpoints.c
 	usb_serial_device_to_host.c
 	i2c_device_to_host.c
+	hackrf_core_mini.c
+	${HACKRF_PATH}/firmware/common/adc.c
 	${HACKRF_PATH}/firmware/common/usb.c
 	${HACKRF_PATH}/firmware/common/usb_queue.c
 	${HACKRF_PATH}/firmware/hackrf_usb/usb_device.c
 	${HACKRF_PATH}/firmware/common/usb_request.c
 	${HACKRF_PATH}/firmware/common/usb_standard_request.c
+	${HACKRF_PATH}/firmware/libopencm3/lib/lpc43xx/scu.c
+	${HACKRF_PATH}/firmware/common/gpio_lpc.c
+	${HACKRF_PATH}/firmware/common/platform_detect.c
 	${CHIBIOS}/os/various/chprintf.c
 )

@@ -205,6 +213,9 @@ set(CPPSRC
 	irq_controls.cpp
 	irq_lcd_frame.cpp
 	irq_rtc.cpp
+    keeloq_common.cpp
+	keeloq_file.cpp
+	keeloq_keystore.cpp
 	log_file.cpp
 	metadata_file.cpp
 	flipper_subfile.cpp
@@ -237,6 +248,7 @@ set(CPPSRC
 	hw/encoder.cpp
 	hw/max2837.cpp
 	hw/max2839.cpp
+	hw/max2831.cpp
 	hw/max5864.cpp
 	hw/rffc507x.cpp
 	hw/rffc507x_spi.cpp
@@ -246,6 +258,7 @@ set(CPPSRC
 	ook_file.cpp
 	ui_baseband_stats_view.cpp
 	ui_navigation.cpp
+	ui_notifications.cpp
 	ui_record_view.cpp
 	ui_sd_card_status_view.cpp
 	ui/ui_alphanum.cpp
@@ -292,14 +305,11 @@ set(CPPSRC
 	apps/ui_mictx.cpp
 	apps/ui_modemsetup.cpp
 	apps/ui_playlist.cpp
-	apps/ui_pocsag_tx.cpp
 	apps/ui_rds.cpp
 	apps/ui_recon_settings.cpp
 	apps/ui_recon.cpp
-	apps/ui_sd_over_usb.cpp
 	apps/ui_search.cpp
 	apps/ui_settings.cpp
-	apps/ui_siggen.cpp
 	apps/ui_sonde.cpp
 	apps/ui_ss_viewer.cpp
 	apps/ui_standalone_view.cpp
@@ -319,6 +329,7 @@ set(CPPSRC
 	config_mode.cpp
 	${CPLD_20150901_DATA_CPP}
 	${CPLD_20170522_DATA_CPP}
+	${CPLD_H4M_DATA_CPP}
 	${HACKRF_CPLD_DATA_CPP}
 	ui_external_items_menu_loader.cpp
 	view_factory_base.cpp
@@ -404,7 +415,11 @@ set(CPPWARN "-Wall -Wextra -Wno-psabi")
 # List all default C defines here, like -D_DEBUG=1
 # TODO: Switch -DCRT0_INIT_DATA depending on load from RAM or SPIFI?
 # NOTE: _RANDOM_TCC to kill a GCC 4.9.3 error with std::max argument types
-set(DDEFS "-DLPC43XX -DLPC43XX_M0 -D__NEWLIB__ -DHACKRF_ONE -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D_RANDOM_TCC=0 -D'VERSION_STRING=\"${VERSION}\"' -DVERSION_MD5=${VERSION_MD5} -D'GCC_VERSION_MISMATCH=${GCC_VERSION_MISMATCH}'")
+# Use BOARD variable if set, otherwise default to HACKRF_ONE
+if(NOT DEFINED BOARD)
+    set(BOARD "HACKRF_ONE")
+endif()
+set(DDEFS "-DLPC43XX -DLPC43XX_M0 -D__NEWLIB__ -D${BOARD} -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D_RANDOM_TCC=0 -D'VERSION_STRING=\"${VERSION}\"' -DVERSION_MD5=${VERSION_MD5} -D'GCC_VERSION_MISMATCH=${GCC_VERSION_MISMATCH}'")

 # List all default ASM defines here, like -D_DEBUG=1
 set(DADEFS)
@@ -462,6 +477,12 @@ add_custom_command(
 	DEPENDS ${EXTRACT_CPLD_DATA} ${CPLD_20170522_SVF_PATH}
 )

+add_custom_command(
+	OUTPUT ${CPLD_H4M_DATA_CPP}
+	COMMAND ${EXTRACT_CPLD_DATA} ${CPLD_H4M_SVF_PATH} rev_h4m >${CPLD_H4M_DATA_CPP}
+	DEPENDS ${EXTRACT_CPLD_DATA} ${CPLD_H4M_SVF_PATH}
+)
+
 add_custom_command(
 	OUTPUT ${HACKRF_CPLD_DATA_CPP}
 	COMMAND ${HACKRF_CPLD_TOOL} --xsvf ${HACKRF_CPLD_XSVF_PATH} --portapack-data ${HACKRF_CPLD_DATA_CPP}
@@ -469,6 +490,9 @@ add_custom_command(
 )

 add_executable(${PROJECT_NAME}.elf ${CSRC} ${CPPSRC} ${ASMSRC})
+target_link_options(${PROJECT_NAME}.elf PRIVATE
+    "LINKER:--defsym,LD_FLASH_SIZE=${FLASH_BYTES_LIMIT_SIZE}"
+)
 set_target_properties(${PROJECT_NAME}.elf PROPERTIES LINK_DEPENDS ${LDSCRIPT})
 add_definitions(${DEFS})
 include_directories(. ${INCDIR})
@@ -68,6 +68,9 @@ void BoundSetting::parse(std::string_view value) {
            as<bool>() = (parsed != 0);
            break;
        }
+        case SettingType::Float:
+            as<float>() = atof(value.data());
+            break;
    };
 }

@@ -101,6 +104,11 @@ void BoundSetting::write(File& file) const {
        case SettingType::Bool:
            file.write(as<bool>() ? "1" : "0", 1);
            break;
+
+        case SettingType::Float: {
+            auto float_str = to_string_decimal(as<float>(), 6);
+            file.write(float_str.c_str(), float_str.length());
+        }
    }

    file.write("\r\n", 2);
@@ -52,6 +52,7 @@ class BoundSetting {
        U8,
        String,
        Bool,
+        Float
    };

   public:
@@ -73,6 +74,9 @@ class BoundSetting {
    BoundSetting(std::string_view name, bool* target)
        : name_{name}, target_{target}, type_{SettingType::Bool} {}

+    BoundSetting(std::string_view name, float* target)
+        : name_{name}, target_{target}, type_{SettingType::Float} {}
+
    std::string_view name() const { return name_; }
    void parse(std::string_view value);
    void write(File& file) const;
@@ -199,6 +199,55 @@ SPECOptionsView::SPECOptionsView(
    view->set_spec_iq_phase_calibration_value(view->get_spec_iq_phase_calibration_value());  // initialize iq_phase_calibration in radio
 }

+/* PralineOptionsView *******************************************************/
+
+#ifdef PRALINE
+PralineOptionsView::PralineOptionsView(Rect parent_rect, const Style* style) {
+    set_style(style);
+    set_parent_rect(parent_rect);
+    add_children({&label_sr, &options_sr, &label_dc, &options_dc,
+                  &label_qi, &options_qi, &label_qs, &options_qs});
+
+    // READ the current state from hardware
+    fpga_reg_1 = radio::debug::fpga::register_read(1);
+
+    // INITIALIZE UI WIDGETS based on read bits
+    options_dc.set_by_value((fpga_reg_1 & 0x01) ? 1 : 0);  // Bit 0
+    options_qi.set_by_value((fpga_reg_1 & 0x02) ? 1 : 0);  // Bit 1
+    options_qs.set_by_value((fpga_reg_1 & 0x04) ? 1 : 0);  // Bit 2
+    options_sr.set_value(receiver_model.sampling_rate());
+
+    options_sr.on_change = [this](int32_t v) { receiver_model.set_sampling_rate(static_cast<uint32_t>(v)); };
+    options_dc.on_change = [this](size_t, OptionsField::value_t v) {
+        if (v)
+            fpga_reg_1 |= 0x01;
+        else
+            fpga_reg_1 &= ~0x01;
+        update_fpga_ctrl();
+    };
+
+    options_qi.on_change = [this](size_t, OptionsField::value_t v) {
+        if (v)
+            fpga_reg_1 |= 0x02;
+        else
+            fpga_reg_1 &= ~0x02;
+        update_fpga_ctrl();
+    };
+
+    options_qs.on_change = [this](size_t, OptionsField::value_t v) {
+        if (v)
+            fpga_reg_1 |= 0x04;
+        else
+            fpga_reg_1 &= ~0x04;
+        update_fpga_ctrl();
+    };
+}
+
+void PralineOptionsView::update_fpga_ctrl() {
+    radio::debug::fpga::register_write(1, fpga_reg_1);
+}
+#endif
+
 /* AnalogAudioView *******************************************************/

 AnalogAudioView::AnalogAudioView(
@@ -217,7 +266,13 @@ AnalogAudioView::AnalogAudioView(
                  &field_volume,
                  &text_ctcss,
                  &record_view,
-                  &waterfall});
+#ifdef PRALINE
+                  &waterfall,
+                  &button_pro
+#else
+                  &waterfall
+#endif
+    });

    // Filename Datetime and Frequency
    record_view.set_filename_date_frequency(true);
@@ -256,6 +311,10 @@ AnalogAudioView::AnalogAudioView(
        field_frequency.set_value(receiver_model.target_frequency() + offset);
    };

+#ifdef PRALINE
+    button_pro.on_select = [this](Button&) { this->on_show_options_praline(); };
+#endif
+
    audio::output::start();

    // This call starts the correct baseband image to run
@@ -360,10 +419,10 @@ void AnalogAudioView::on_baseband_bandwidth_changed(uint32_t bandwidth_hz) {
 }

 void AnalogAudioView::on_modulation_changed(ReceiverModel::Mode modulation) {
-    baseband::spectrum_streaming_stop();
+    waterfall.stop();
    update_modulation(modulation);
    on_show_options_modulation();
-    baseband::spectrum_streaming_start();
+    waterfall.start();
 }

 void AnalogAudioView::remove_options_widget() {
@@ -553,4 +612,11 @@ void AnalogAudioView::handle_coded_squelch(uint32_t value) {
 void AnalogAudioView::on_freqchg(int64_t freq) {
    field_frequency.set_value(freq);
 }
+
+#ifdef PRALINE
+void AnalogAudioView::on_show_options_praline() {
+    set_options_widget(std::make_unique<PralineOptionsView>(options_view_rect, Theme::getInstance()->option_active));
+}
+#endif
+
 } /* namespace ui */
@@ -37,6 +37,38 @@ namespace ui {

 class AnalogAudioView;

+#ifdef PRALINE
+class PralineOptionsView : public View {
+   public:
+    PralineOptionsView(Rect parent_rect, const Style* style);
+
+   private:
+    // Layout: SR (Sample Rate), DC (DC Block), QI (Q-Invert), QS (Quarter Shift), D (Decim)
+    Text label_sr{{UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)}, "SR"};
+
+    // Parameters: Position, Length (in chars), Range, Step, and default value
+    NumberField options_sr{
+        {UI_POS_X(3), UI_POS_Y(0)},
+        8,              // Number of digits to show
+        {0, 40000000},  // Range: 0 to 40,000 kHz
+        100,            // Step: 100 Hz
+        ' '             // Fix: Single quotes for char
+    };
+
+    Text label_dc{{UI_POS_X(14), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)}, "DC"};
+    OptionsField options_dc{{UI_POS_X(16), UI_POS_Y(0)}, 2, {{"Of", 0}, {"On", 1}}};
+
+    Text label_qi{{UI_POS_X(20), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)}, "QI"};
+    OptionsField options_qi{{UI_POS_X(22), UI_POS_Y(0)}, 2, {{"Of", 0}, {"On", 1}}};
+
+    Text label_qs{{UI_POS_X(26), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)}, "QS"};
+    OptionsField options_qs{{UI_POS_X(28), UI_POS_Y(0)}, 2, {{"Of", 0}, {"On", 1}}};
+
+    uint8_t fpga_reg_1{0x00};  // Tracks DC, QI, QS bits
+    void update_fpga_ctrl();
+};
+#endif
+
 class AMOptionsView : public View {
   public:
    AMOptionsView(AnalogAudioView* view, Rect parent_rect, const Style* style);
@@ -222,6 +254,11 @@ class AnalogAudioView : public View {
    uint8_t get_previous_zoom_option();
    void set_previous_zoom_option(uint8_t zoom);

+#ifdef PRALINE
+    Button button_pro{{UI_POS_X(12), UI_POS_Y(2), UI_POS_WIDTH(3), UI_POS_HEIGHT(1)}, "PRO"};
+    void on_show_options_praline();
+#endif
+
   private:
    static constexpr ui::Dim header_height = 3 * 16;

@@ -645,6 +645,20 @@ BLERxView::BLERxView(NavigationView& nav)
    options_sort.set_selected_index(sort_index, true);
    options_filter.set_selected_index(filter_index, true);

+    // ------------------------------------------------------------------------------
+    // Handle Max Recent Entries
+    // ------------------------------------------------------------------------------
+
+    // Max Recent Entries UI widget
+    add_child(&label_max_entries);
+    add_child(&field_max_entries);
+    field_max_entries.set_value(max_recent_entries);
+
+    // Define what happens when the user changes the number
+    field_max_entries.on_change = [this](int32_t v) {
+        max_recent_entries = (size_t)v;
+    };
+
    // Auto-configure modem for LCR RX (will be removed later)
    baseband::set_btlerx(channel_number);

@@ -819,6 +833,10 @@ void BLERxView::on_data(BlePacketData* packet) {
        recent.push_front(*it);
        recent.erase(it);
    } else {
+        // Enforce limit
+        while (recent.size() >= max_recent_entries) {
+            recent.pop_back();
+        }
        recent.emplace_front(key);
        truncate_entries(recent);
    }
@@ -887,6 +905,9 @@ void BLERxView::on_filter_change(std::string value) {
 }

 void BLERxView::on_file_changed(const std::filesystem::path& new_file_path) {
+    // Clear searchList
+    searchList.clear();
+
    file_path = new_file_path;
    found_count = 0;
    total_count = 0;
@@ -919,8 +940,10 @@ void BLERxView::on_file_changed(const std::filesystem::path& new_file_path) {
                break;
            }

-            searchList.push_back(currentLine);
-            total_count++;
+            if (searchList.size() < max_recent_entries) {
+                searchList.push_back(currentLine);
+                total_count++;
+            }

            bytePos += bytesRead;

@@ -940,6 +963,21 @@ void BLERxView::on_timer() {
            channel_number = (channel_number < 39) ? channel_number + 1 : 37;
        }
    }
+
+    // Debug: Check heap status every ~1 second
+    static int heap_check_counter = 0;
+    if (++heap_check_counter >= 60) {
+        heap_check_counter = 0;
+        size_t heap_free = chCoreStatus();
+        if (heap_free < 4096) {  // Less than 4KB free
+            // Emergency: clear old entries
+            while (recent.size() > (max_recent_entries - 1)) {
+                recent.pop_back();
+            }
+            recent_entries_view.set_dirty();
+        }
+    }
+
    if (ble_rx_error != BLE_RX_NO_ERROR) {
        if (ble_rx_error == BLE_RX_LIST_FILENAME_EMPTY_ERROR) {
            nav_.display_modal("Error", "List filename is empty !");
@@ -1059,7 +1097,6 @@ bool BLERxView::updateEntry(const BlePacketData* packet, BleRecentEntry& entry,
        entry.dbValue = packet->max_dB - (receiver_model.lna() + receiver_model.vga() + (receiver_model.rf_amp() ? 14 : 0));
        entry.timestamp = to_string_timestamp(rtc_time::now());
        entry.dataString = data_string;
-
        entry.packetData.type = packet->type;
        entry.packetData.size = packet->size;
        entry.packetData.dataLen = packet->dataLen;
@@ -42,6 +42,12 @@

 #include "recent_entries.hpp"

+// Add for heap debugging
+// For ChibiOS core functions
+#include "ch.h"
+#include "chcore.h"
+#include "chheap.h"
+
 class BLELogger {
   public:
    Optional<File::Error> append(const std::filesystem::path& filename) {
@@ -90,6 +96,7 @@ struct BleRecentEntry {
    uint64_t uniqueKey;
    int dbValue;
    BlePacketData packetData;
+
    std::string timestamp;
    std::string dataString;
    std::string nameString;
@@ -426,6 +433,20 @@ class BLERxView : public View {
        [this](const Message* const) {
            this->on_timer();
        }};
+
+    // Widget to control the list limit
+    Labels label_max_entries{
+        {{UI_POS_X(22), 10 * 8 - 2}, "List:", Theme::getInstance()->fg_light->foreground}};
+    NumberField field_max_entries{
+        {UI_POS_X(28), 10 * 8 - 2},  // Correct: Position (x, y)
+        2,                           // Number of digits
+        {5, 64},                     // Range (min, max) <- Coincides with max_entries
+        1,                           // Step size
+        ' '                          // Filler character
+    };
+
+    // Variable to store the current limit
+    size_t max_recent_entries = 25;
 }; /* BLERxView */

 } /* namespace ui */
@@ -199,6 +199,7 @@ void BLETxView::send_packet() {
    generateRandomMacAddress(randomMac);

    char advertisementData[63] = {0};
+    packets[current_packet].advertisementData[62] = '\0';
    strcpy(advertisementData, packets[current_packet].advertisementData);

    // TODO: Make this a checkbox.
@@ -225,7 +226,7 @@ void BLETxView::send_packet() {
                        uint8_t min = 0x00;
                        uint8_t max = 0x0F;

-                        hexDigit = min + std::rand() % (max - min + 1);
+                        hexDigit = min + rand() % (max - min + 1);
                    } break;
                    default:
                        hexDigit = 0;
@@ -28,6 +28,7 @@
 #include "string_format.hpp"
 #include "utility.hpp"
 #include "file_path.hpp"
+#include "usb_serial_asyncmsg.hpp"

 using namespace portapack;
 using namespace pocsag;
@@ -62,6 +63,7 @@ POCSAGSettingsView::POCSAGSettingsView(
         &check_small_font,
         &check_hide_bad,
         &check_hide_addr_only,
+         &check_numeric_detect,
         &opt_filter_mode,
         &field_filter_address,
         &button_save});
@@ -72,6 +74,7 @@ POCSAGSettingsView::POCSAGSettingsView(
    check_small_font.set_value(settings_.enable_small_font);
    check_hide_bad.set_value(settings_.hide_bad_data);
    check_hide_addr_only.set_value(settings_.hide_addr_only);
+    check_numeric_detect.set_value(settings_.enable_numeric_detect);
    opt_filter_mode.set_by_value(settings_.filter_mode);
    field_filter_address.set_value(settings_.filter_address);

@@ -81,6 +84,7 @@ POCSAGSettingsView::POCSAGSettingsView(
        settings_.enable_small_font = check_small_font.value();
        settings_.hide_bad_data = check_hide_bad.value();
        settings_.hide_addr_only = check_hide_addr_only.value();
+        settings_.enable_numeric_detect = check_numeric_detect.value();
        settings_.filter_mode = opt_filter_mode.selected_index_value();
        settings_.filter_address = field_filter_address.to_integer();
        settings_.baud_rate = opt_baud_rate.selected_index_value();
@@ -219,12 +223,24 @@ void POCSAGAppView::handle_decoded(Timestamp timestamp, const std::string& prefi
        return;
    }

-    // Color indicates the message has a lot of decoding errors.
-    std::string color = bad_data ? STR_COLOR_MAGENTA : STR_COLOR_WHITE;
+    // Type indicator with its own color.
+    std::string type_str;
+    bool numeric_detect = settings_.enable_numeric_detect;
+    if (numeric_detect && pocsag_state.detected == pocsag::DET_NUMERIC)
+        type_str = STR_COLOR_GREEN "n";
+    else if (numeric_detect && pocsag_state.detected == pocsag::DET_ALPHA)
+        type_str = STR_COLOR_LIGHT_GREY "a";
+    else if (pocsag_state.out_type == ADDRESS)
+        type_str = STR_COLOR_DARK_YELLOW "t";
+    else
+        type_str = "";

-    std::string console_info = "\n" + color + prefix;
-    console_info += " #" + to_string_dec_uint(pocsag_state.address);
+    // Header: timestamp+baud in light grey, capcode+function in white.
+    std::string console_info = "\n" STR_COLOR_LIGHT_GREY + prefix;
+    console_info += STR_COLOR_WHITE " #" + to_string_dec_uint(pocsag_state.address);
    console_info += " F" + to_string_dec_uint(pocsag_state.function);
+    if (!type_str.empty())
+        console_info += " " + type_str;

    if (pocsag_state.out_type == ADDRESS) {
        last_address = pocsag_state.address;
@@ -240,23 +256,110 @@ void POCSAGAppView::handle_decoded(Timestamp timestamp, const std::string& prefi
            }
        }

+        /* Serial: tone-only page */
+        if (portapack::usb_serial.serial_connected()) {
+            std::string s = "\r\nPOCSAG " + to_string_dec_uint(current_bitrate) + " " + to_string_dec_uint(pocsag_state.address) + " " + std::string(1, 'A' + pocsag_state.function) + (current_inverted ? " I" : " S") + " tone";
+            UsbSerialAsyncmsg::asyncmsg(s);
+        }
+
    } else if (pocsag_state.out_type == MESSAGE) {
-        if (pocsag_state.address != last_address) {
-            // New message
+        if (pocsag_state.new_message) {
            last_address = pocsag_state.address;
+            serial_numeric_sent = 0;
            console.writeln(console_info);
-            console.write(color + pocsag_state.output);
+
+            // If heuristic chose numeric, show numeric line first (green).
+            if (numeric_detect &&
+                pocsag_state.detected == pocsag::DET_NUMERIC &&
+                pocsag_state.numeric_len > 0) {
+                std::string num_str(pocsag_state.numeric_buf, pocsag_state.numeric_len);
+                console.write(STR_COLOR_GREEN + num_str);
+                console.writeln("");
+            }
+
+            // Alpha decode (already has per-char color escapes from decoder).
+            console.write(pocsag_state.output);
+
+            /* Serial: header + first chunk.
+             * hex field contains rendered alpha as hex bytes (color escapes
+             * stripped).  Non-printable and uncorrectable chars show as '.'
+             * (0x2E) — original 7-bit values are not preserved.
+             * Numeric decode goes in the quoted message field only. */
+            if (portapack::usb_serial.serial_connected()) {
+                /* Build hex representation of decoded alpha characters. */
+                std::string raw;
+                for (size_t i = 0; i < pocsag_state.output.size(); ++i)
+                    raw += to_string_hex((uint8_t)pocsag_state.output[i], 2);
+
+                std::string s = "\r\nPOCSAG " + to_string_dec_uint(current_bitrate) + " " + to_string_dec_uint(pocsag_state.address) + " " + std::string(1, 'A' + pocsag_state.function) + (current_inverted ? " I" : " S");
+
+                if (numeric_detect && pocsag_state.detected == pocsag::DET_NUMERIC) {
+                    s += " numeric \"";
+                    if (pocsag_state.numeric_len > 0)
+                        s += std::string(pocsag_state.numeric_buf, pocsag_state.numeric_len);
+                    s += "\"";
+                    serial_numeric_sent = pocsag_state.numeric_len;
+                } else {
+                    /* For alpha, the quoted text is the same chars as raw but as ASCII.
+                     * Escape " and \ to avoid breaking the quoted field. */
+                    s += " alpha \"";
+                    for (size_t i = 0; i < pocsag_state.output.size(); ++i) {
+                        if (pocsag_state.output[i] == '"' || pocsag_state.output[i] == '\\') {
+                            s += '\\';
+                        }
+                        s += pocsag_state.output[i];
+                    }
+                    s += "\"";
+                }
+                s += " hex:" + raw;
+                UsbSerialAsyncmsg::asyncmsg(s);
+            }
        } else {
-            // Message continues...
-            console.write(color + pocsag_state.output);
+            // Message continues from previous batch.
+            bool is_numeric = numeric_detect && pocsag_state.detected == pocsag::DET_NUMERIC;
+
+            // GUI: show numeric continuation if applicable.
+            if (is_numeric && pocsag_state.numeric_len > serial_numeric_sent) {
+                std::string num_str(pocsag_state.numeric_buf + serial_numeric_sent,
+                                    pocsag_state.numeric_len - serial_numeric_sent);
+                console.write(STR_COLOR_GREEN + num_str);
+            }
+            console.write(pocsag_state.output);
+
+            /* Serial: continuation chunk with full header.
+             * Type label carries over from first batch (numeric+ or alpha+). */
+            if (portapack::usb_serial.serial_connected()) {
+                std::string raw;
+                std::string decoded;
+                for (size_t i = 0; i < pocsag_state.output.size(); ++i) {
+                    if (pocsag_state.output[i] == '"' || pocsag_state.output[i] == '\\')
+                        decoded += '\\';
+                    decoded += pocsag_state.output[i];
+                    raw += to_string_hex((uint8_t)pocsag_state.output[i], 2);
+                }
+                if (!decoded.empty() || pocsag_state.numeric_len > serial_numeric_sent) {
+                    std::string s = "\r\nPOCSAG " + to_string_dec_uint(current_bitrate) + " " + to_string_dec_uint(pocsag_state.address) + " " + std::string(1, 'A' + pocsag_state.function) + (current_inverted ? " I" : " S") + (is_numeric ? " numeric+" : " alpha+") + " \"";
+                    if (is_numeric && pocsag_state.numeric_len > serial_numeric_sent)
+                        s += std::string(pocsag_state.numeric_buf + serial_numeric_sent,
+                                         pocsag_state.numeric_len - serial_numeric_sent);
+                    else
+                        s += decoded;
+                    s += "\" hex:" + raw;
+                    UsbSerialAsyncmsg::asyncmsg(s);
+                }
+            }
+            serial_numeric_sent = pocsag_state.numeric_len;
        }

        if (logging()) {
-            logger.log_decoded(
-                timestamp,
-                to_string_dec_uint(pocsag_state.address) +
-                    " F" + to_string_dec_uint(pocsag_state.function) +
-                    " " + pocsag_state.output);
+            std::string log_entry = to_string_dec_uint(pocsag_state.address) +
+                                    " F" + to_string_dec_uint(pocsag_state.function);
+            if (numeric_detect &&
+                pocsag_state.detected == pocsag::DET_NUMERIC &&
+                pocsag_state.numeric_len > 0)
+                log_entry += " N:" + std::string(pocsag_state.numeric_buf, pocsag_state.numeric_len);
+            log_entry += " " + pocsag_state.output;
+            logger.log_decoded(timestamp, log_entry);
        }
    }
 }
@@ -300,13 +403,19 @@ void POCSAGAppView::on_packet(const POCSAGPacketMessage* message) {
        image_status.set_foreground(Theme::getInstance()->fg_magenta->foreground);
        pocsag_state.codeword_index = 0;
        pocsag_state.errors = 0;
+        current_bitrate = message->packet.bitrate();
+        current_inverted = message->packet.inverted();

        // Handle multiple messages (if any).
        while (pocsag_decode_batch(message->packet, pocsag_state))
            handle_decoded(message->packet.timestamp(), prefix);

-        // Handle the remainder.
-        handle_decoded(message->packet.timestamp(), prefix);
+        // Handle the remainder. Skip if decoder is still in
+        // STATE_HAVE_ADDRESS — the address was at the end of this
+        // batch and we can't yet tell if it's tone-only or has
+        // message data in the next batch.
+        if (pocsag_state.mode != STATE_HAVE_ADDRESS)
+            handle_decoded(message->packet.timestamp(), prefix);
    }

    // Set status icon color to indicate state machine state.
@@ -125,6 +125,7 @@ struct POCSAGSettings {
    bool enable_raw_log = false;
    bool hide_bad_data = false;
    bool hide_addr_only = false;
+    bool enable_numeric_detect = true; /* heuristic alpha/numeric type detection */
    uint8_t filter_mode = false;
    int32_t baud_rate = -1;
    uint32_t filter_address = 0;
@@ -150,8 +151,8 @@ class POCSAGSettingsView : public View {

    Labels labels{
        {{2 * 8, 0 * 16}, "Baud:", Theme::getInstance()->fg_light->foreground},
-        {{2 * 8, 12 * 16}, "Filter Mode:", Theme::getInstance()->fg_light->foreground},
-        {{2 * 8, 13 * 16}, "Filter Addr:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 14 * 16}, "Filter Mode:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 15 * 16}, "Filter Addr:", Theme::getInstance()->fg_light->foreground},
    };

    Checkbox check_log{
@@ -179,21 +180,26 @@ class POCSAGSettingsView : public View {
        22,
        "Hide Addr Only"};

+    Checkbox check_numeric_detect{
+        {2 * 8, 12 * 16},
+        22,
+        "Detect Numeric"};
+
    OptionsField opt_filter_mode{
-        {15 * 8, 12 * 16},
+        {15 * 8, 14 * 16},
        4,
        {{"None", FILTER_NONE},
         {"Drop", FILTER_DROP},
         {"Keep", FILTER_KEEP}}};

    SymField field_filter_address{
-        {15 * 8, 13 * 16},
+        {15 * 8, 15 * 16},
        7,
        SymField::Type::Dec,
        true /*explicit_edit*/};

    Button button_save{
-        {UI_POS_X_CENTER(10), UI_POS_Y(16), 10 * 8, 2 * 16},
+        {UI_POS_X_CENTER(10), UI_POS_Y(17), 10 * 8, 2 * 16},
        "Save"};
 };

@@ -231,6 +237,7 @@ class POCSAGAppView : public View {
            {"filter_address"sv, &settings_.filter_address},
            {"hide_bad_data"sv, &settings_.hide_bad_data},
            {"hide_addr_only"sv, &settings_.hide_addr_only},
+            {"numeric_detect"sv, &settings_.enable_numeric_detect},
            {"baud_rate"sv, &settings_.baud_rate},
        }};

@@ -241,6 +248,10 @@ class POCSAGAppView : public View {
    void on_stats(const POCSAGStatsMessage* stats);

    uint32_t last_address = 0;
+    uint16_t current_bitrate = 0;    /* bitrate of current packet being decoded */
+    bool current_inverted = false;   /* polarity of current packet being decoded */
+    uint8_t serial_numeric_sent = 0; /* numeric chars already sent to serial/GUI */
+
    pocsag::EccContainer ecc{};
    pocsag::POCSAGState pocsag_state{&ecc};
    POCSAGLogger logger{};
@@ -271,10 +271,17 @@ ADSBRxDetailsView::ADSBRxDetailsView(
         &text_frame_pos_even,
         &text_frame_pos_odd,
         &button_aircraft_details,
-         &button_see_map});
+         &button_see_map,
+         &opt_map_list});

    text_icao_address.set(entry_.icao_str);

+    opt_map_list.on_change = [this](size_t, uint32_t mf) {
+        map_filter = mf;
+        clear_map_markers();  // reset them
+        pos_history.clear();  // erase the trail
+    };
+
    button_aircraft_details.on_select = [this, &nav](Button&) {
        aircraft_details_view_ = nav.push<ADSBRxAircraftDetailsView>(entry_);
        nav.set_on_pop([this]() {
@@ -288,7 +295,7 @@ ADSBRxDetailsView::ADSBRxDetailsView(
            get_map_tag(entry_),
            entry_.pos.altitude,
            GeoPos::alt_unit::FEET,
-            GeoPos::spd_unit::HIDDEN,
+            GeoPos::spd_unit::KNOTS,
            entry_.pos.latitude,
            entry_.pos.longitude,
            entry_.velo.heading);
@@ -312,17 +319,107 @@ void ADSBRxDetailsView::update(const AircraftRecentEntry& entry) {
        // AC Details view is showing, nothing to update.
    } else if (geomap_view_) {
        // Map is showing, update the current item.
+        if (map_filter == 1) {
+            // add to map trail history
+            add_map_trail(entry);
+        }
        geomap_view_->update_tag(get_map_tag(entry_));
-        geomap_view_->update_position(entry.pos.latitude, entry.pos.longitude, entry.velo.heading, entry.pos.altitude, entry.velo.speed);
+        geomap_view_->update_position(entry.pos.latitude, entry.pos.longitude, entry.velo.heading, entry.pos.altitude, entry.get_ground_speed());
    } else {
        // Details is showing, update details.
        refresh_ui();
    }
 }

+void ADSBRxDetailsView::get_altitude_color(int32_t alt_ft, uint8_t* r, uint8_t* g, uint8_t* b) {
+    static const struct {
+        int32_t alt;
+        uint8_t r, g, b;
+    } stops[] = {
+        {0, 220, 220, 220},    // 0 ft:     White/Grey (Ground)
+        {2000, 255, 255, 0},   // 2k ft:    Yellow
+        {10000, 0, 255, 0},    // 10k ft:   Green
+        {20000, 0, 255, 255},  // 20k ft:   Cyan
+        {30000, 60, 60, 255},  // 30k ft:   Blue (Lightened for visibility on Black)
+        {40000, 255, 0, 255}   // 40k+ ft:  Magenta
+    };
+    if (alt_ft <= stops[0].alt) {
+        *r = stops[0].r;
+        *g = stops[0].g;
+        *b = stops[0].b;
+        return;
+    }
+    const int count = sizeof(stops) / sizeof(stops[0]);
+    if (alt_ft >= stops[count - 1].alt) {
+        *r = stops[count - 1].r;
+        *g = stops[count - 1].g;
+        *b = stops[count - 1].b;
+        return;
+    }
+    for (int i = 0; i < count - 1; i++) {
+        if (alt_ft < stops[i + 1].alt) {
+            float t = (float)(alt_ft - stops[i].alt) / (stops[i + 1].alt - stops[i].alt);
+
+            *r = (uint8_t)(stops[i].r + (stops[i + 1].r - stops[i].r) * t);
+            *g = (uint8_t)(stops[i].g + (stops[i + 1].g - stops[i].g) * t);
+            *b = (uint8_t)(stops[i].b + (stops[i + 1].b - stops[i].b) * t);
+            return;
+        }
+    }
+    // Fallback: in case no interval matched, default to ground color.
+    *r = stops[0].r;
+    *g = stops[0].g;
+    *b = stops[0].b;
+}
+
 void ADSBRxDetailsView::clear_map_markers() {
    if (geomap_view_)
        geomap_view_->clear_markers();
+    if (map_filter == 1)
+        refresh_trail_markers();  // re add trail
+}
+
+void ADSBRxDetailsView::refresh_trail_markers() {
+    if (!geomap_view_)
+        return;
+
+    geomap_view_->clear_markers();
+    for (const auto& pos : pos_history) {
+        GeoMarker marker{};
+        marker.lon = pos.lon;
+        marker.lat = pos.lat;
+        marker.angle = pos.heading;
+        marker.tag = "";  // No tag for trail points
+        uint8_t r, g, b;
+        get_altitude_color(pos.altitude, &r, &g, &b);
+        marker.color = Color(r, g, b);
+        geomap_view_->store_marker(marker);
+    }
+}
+
+void ADSBRxDetailsView::add_map_trail(const AircraftRecentEntry& entry) {
+    if (!geomap_view_)
+        return;
+    if (entry.pos.pos_valid == false)
+        return;
+
+    if (!pos_history.empty()) {
+        const auto& last_pos = pos_history.back();
+        const float THRESH_DEG = 0.009f;
+        const float THRESH_SQ = THRESH_DEG * THRESH_DEG;  // 0.00002025f
+
+        float d_lat = entry.pos.latitude - last_pos.lat;
+        float d_lon = entry.pos.longitude - last_pos.lon;
+        if ((d_lat * d_lat) + (d_lon * d_lon) < THRESH_SQ) {
+            return;  // Moved less than ~1000m, skip (rough estimate, varies with latitude but good enough for our purposes). This prevents adding too many points when the plane is circling or taxiing.
+        }
+    }
+
+    // Only keep the last 30 positions in the trail.
+    if (pos_history.size() >= 30)
+        pos_history.erase(pos_history.begin());
+    pos_history.push_back({entry.pos.latitude, entry.pos.longitude, entry.velo.heading, entry.pos.altitude});
+    refresh_trail_markers();
 }

 bool ADSBRxDetailsView::add_map_marker(const AircraftRecentEntry& entry) {
@@ -330,11 +427,16 @@ bool ADSBRxDetailsView::add_map_marker(const AircraftRecentEntry& entry) {
    if (!geomap_view_)
        return false;

+    if (map_filter == 1) return false;  // this is the 'only me' option, so skip all others
+
    GeoMarker marker{};
    marker.lon = entry.pos.longitude;
    marker.lat = entry.pos.latitude;
    marker.angle = entry.velo.heading;
    marker.tag = get_map_tag(entry);
+    uint8_t r, g, b;
+    get_altitude_color(entry.pos.altitude, &r, &g, &b);
+    marker.color = Color(r, g, b);

    auto markerStored = geomap_view_->store_marker(marker);
    return markerStored == MARKER_STORED;
@@ -651,14 +753,15 @@ void ADSBRxView::refresh_ui() {
        // Process the entries list.
        for (const auto& entry : recent) {
            // Found the entry being shown in details view. Update it.
-            if (entry.key() == detail_key) {
+            if (entry.key() == detail_key) {  // we don't add it to the markers, since this is the currently selected and shown in the middle one. This eliminates the "shadow" marker, and saves ram
                details_view->update(entry);
                current_updated = true;
-            }
-
-            // NB: current entry also gets a marker so it shows up if map is panned.
-            if (map_needs_update && entry.pos.pos_valid && entry.state <= ADSBAgeState::Recent) {
-                map_needs_update = details_view->add_map_marker(entry);
+            } else {
+                // Add others only
+                // NB: current entry also gets a marker so it shows up if map is panned.
+                if (map_needs_update && entry.pos.pos_valid && entry.state <= ADSBAgeState::Recent) {
+                    map_needs_update = details_view->add_map_marker(entry);
+                }
            }

            // Any work left to do?
@@ -64,9 +64,9 @@ namespace ui {
 #define VEL_AIR_SUBSONIC 3
 #define VEL_AIR_SUPERSONIC 4

-#define O_E_FRAME_TIMEOUT 20          // timeout between odd and even frames
-#define MARKER_UPDATE_SECONDS_OSM 10  // "other" map marker redraw interval for osm
-#define MARKER_UPDATE_SECONDS_BIN 5   // "other" map marker redraw interval for bin map
+#define O_E_FRAME_TIMEOUT 20         // timeout between odd and even frames
+#define MARKER_UPDATE_SECONDS_OSM 8  // "other" map marker redraw interval for osm
+#define MARKER_UPDATE_SECONDS_BIN 5  // "other" map marker redraw interval for bin map

 /* Thresholds (in seconds) that define the transition between ages. */
 struct ADSBAgeLimit {
@@ -150,6 +150,19 @@ struct AircraftRecentEntry {
        age = 0;
    }

+    int32_t get_ground_speed() const {
+        if (velo.valid == false) return 0;
+        if (velo.type == SPD_GND)
+            return velo.speed;
+        else if (velo.type == SPD_IAS) {
+            if (!pos.alt_valid) return velo.speed;  // can't correct without altitude, so just return IAS
+            return (int32_t)(velo.speed * (1.0f + (0.02f * (pos.altitude / 1000.0f))));
+        } else if (velo.type == SPD_TAS)
+            return velo.speed;  // We don't know the wind speed
+        else
+            return 0;
+    }
+
    void inc_age(int delta) {
        age += delta;

@@ -208,50 +221,50 @@ class ADSBRxAircraftDetailsView : public View {

   private:
    Labels labels{
-        {{UI_POS_X(0), 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 2 * 16}, "Registration:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 3 * 16}, "Manufacturer:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 5 * 16}, "Model:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 7 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 8 * 16}, "Number of engines:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 9 * 16}, "Engine type:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 11 * 16}, "Owner:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 13 * 16}, "Operator:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(1)}, "ICAO:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(2)}, "Registration:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(3)}, "Manufacturer:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(5)}, "Model:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(7)}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(8)}, "Number of engines:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(9)}, "Engine type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(11)}, "Owner:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(13)}, "Operator:", Theme::getInstance()->fg_light->foreground}};

    Text text_icao_address{
-        {5 * 8, 1 * 16, 6 * 8, UI_POS_HEIGHT(1)},
+        {UI_POS_X(5), UI_POS_Y(1), 6 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_registration{
-        {13 * 8, 2 * 16, 8 * 8, UI_POS_HEIGHT(1)},
+        {UI_POS_X(13), UI_POS_Y(2), 8 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_manufacturer{
-        {UI_POS_X(0), 4 * 16, 19 * 8, UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), UI_POS_Y(4), 19 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_model{
-        {UI_POS_X(0), 6 * 16, screen_width, UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), UI_POS_Y(6), screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_type{
-        {5 * 8, 7 * 16, 22 * 8, UI_POS_HEIGHT(1)},
+        {UI_POS_X(5), UI_POS_Y(7), 22 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_number_of_engines{
-        {18 * 8, 8 * 16, screen_width, UI_POS_HEIGHT(1)},
+        {UI_POS_X(18), UI_POS_Y(8), screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_engine_type{
-        {UI_POS_X(0), 10 * 16, screen_width, UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), UI_POS_Y(10), screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_owner{
-        {UI_POS_X(0), 12 * 16, screen_width, UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), UI_POS_Y(12), screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_operator{
-        {UI_POS_X(0), 14 * 16, screen_width, UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), UI_POS_Y(14), screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Button button_close{
@@ -270,11 +283,14 @@ class ADSBRxDetailsView : public View {
    void focus() override;
    void update(const AircraftRecentEntry& entry);

+    void get_altitude_color(int32_t alt_ft, uint8_t* r, uint8_t* g, uint8_t* b);
    /* Calls forwarded to map view if shown. */
    bool map_active() const { return geomap_view_; }
    void clear_map_markers();
    /* Adds a marker for the entry to the map. Returns true on success. */
    bool add_map_marker(const AircraftRecentEntry& entry);
+    void add_map_trail(const AircraftRecentEntry& entry);
+    void refresh_trail_markers();

    std::string title() const override { return "Details"; }

@@ -297,57 +313,72 @@ class ADSBRxDetailsView : public View {
    // if removed from the recent entries list.
    AircraftRecentEntry entry_{AircraftRecentEntry::invalid_key};
    bool airline_checked{false};
+    uint8_t map_filter{0};  // 0: all, 1: only this, set by opt_map_list.
+    struct PosHistory {
+        float lat;
+        float lon;
+        uint16_t heading;
+        int32_t altitude;
+    };
+    std::vector<PosHistory> pos_history{};

    Labels labels{
-        {{UI_POS_X(0), 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
-        {{13 * 8, 1 * 16}, "Callsign:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 2 * 16}, "Last seen:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 3 * 16}, "Airline:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 5 * 16}, "Country:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 13 * 16}, "Even position frame:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 15 * 16}, "Odd position frame:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(0)}, "ICAO:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(13), UI_POS_Y(0)}, "Callsign:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(1)}, "Last seen:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(2)}, "Airline:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(4)}, "Country:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(7)}, "Map filter:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(13)}, "Even position frame:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(15)}, "Odd position frame:", Theme::getInstance()->fg_light->foreground}};

    Text text_icao_address{
-        {5 * 8, 1 * 16, 6 * 8, UI_POS_HEIGHT(1)},
+        {UI_POS_X(5), UI_POS_Y(0), 6 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_callsign{
-        {22 * 8, 1 * 16, 8 * 8, UI_POS_HEIGHT(1)},
+        {UI_POS_X(22), UI_POS_Y(0), 8 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_last_seen{
-        {11 * 8, 2 * 16, 19 * 8, UI_POS_HEIGHT(1)},
+        {UI_POS_X(11), UI_POS_Y(1), 19 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_airline{
-        {UI_POS_X(0), 4 * 16, screen_width, UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), UI_POS_Y(3), screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_country{
-        {8 * 8, 5 * 16, 22 * 8, UI_POS_HEIGHT(1)},
+        {UI_POS_X(8), UI_POS_Y(4), 22 * 8, UI_POS_HEIGHT(1)},
        "-"};

    Text text_infos{
-        {UI_POS_X(0), 6 * 16, screen_width, UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), UI_POS_Y(5), screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_info2{
-        {UI_POS_X(0), 7 * 16, screen_width, UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), UI_POS_Y(6), screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Text text_frame_pos_even{
-        {UI_POS_X(0), 14 * 16, screen_width, UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), UI_POS_Y(14), screen_width, UI_POS_HEIGHT(1)},
        "-"};
    Text text_frame_pos_odd{
-        {UI_POS_X(0), 16 * 16, screen_width, UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), UI_POS_Y(16), screen_width, UI_POS_HEIGHT(1)},
        "-"};

    Button button_aircraft_details{
-        {UI_POS_X_CENTER(12) - UI_POS_X(8), UI_POS_Y(9), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
+        {UI_POS_X_CENTER(12) - UI_POS_X(8), UI_POS_Y(8), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
        "A/C details"};

+    OptionsField opt_map_list{
+        {UI_POS_X_CENTER(12) + UI_POS_X(8), UI_POS_Y(7)},
+        12,
+        {{"All", 0},
+         {"Only this", 1}}};
+
    Button button_see_map{
-        {UI_POS_X_CENTER(12) + UI_POS_X(8), UI_POS_Y(9), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
+        {UI_POS_X_CENTER(12) + UI_POS_X(8), UI_POS_Y(8), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
        "See on map"};

    MessageHandlerRegistration message_handler_gps{
@@ -29,6 +29,7 @@
 #include "baseband_api.hpp"
 #include "portapack_shared_memory.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "ui_geomap.hpp"

 #include <cstring>
 #include <stdio.h>
@@ -49,10 +50,24 @@ APRSTXView::~APRSTXView() {

 void APRSTXView::start_tx() {
    // TODO: Clean up this API to take string_views to avoid allocations.
+    std::string new_payload = payload;
+
+    std::string gps = text_gps_coord.get();
+    std::string token = "?GPS?";
+    size_t pos = 0;
+    while ((pos = new_payload.find(token, pos)) != std::string::npos) {
+        new_payload.replace(pos, token.size(), gps);
+        pos += gps.size();
+    }
+
+    text_payload.set(new_payload);
+
+    std::string path = text_path.get();
+
    make_aprs_frame(
        sym_source.to_string().c_str(), num_ssid_source.value(),
        sym_dest.to_string().c_str(), num_ssid_dest.value(),
-        payload);
+        new_payload, path);

    // uint8_t * bb_data_ptr = shared_memory.bb_data.data;
    // text_payload.set(to_string_hex_array(bb_data_ptr + 56, 15));
@@ -77,6 +92,61 @@ void APRSTXView::on_tx_progress(const uint32_t progress, const bool done) {
    }
 }

+void APRSTXView::process_coordinates(float lat_, float lon_) {
+    std::string s;
+
+    char ns = lat_ >= 0 ? 'N' : 'S';
+    float lat = (lat_ >= 0) ? lat_ : -lat_;
+    uint32_t lat_d = (uint32_t)lat;
+    uint32_t lat_m = (uint32_t)((lat - lat_d) * 6000.0f + 0.5f);
+
+    if (lat_m >= 6000) {
+        lat_m = 0;
+        lat_d++;
+    }
+
+    s += to_string_dec_uint(lat_d, 2, '0');
+    s += to_string_dec_uint(lat_m / 100, 2, '0');
+    s += ".";
+    s += to_string_dec_uint(lat_m % 100, 2, '0');
+    s += ns;
+
+    s += "/";
+
+    char ew = lon_ >= 0 ? 'E' : 'W';
+    float lon = (lon_ >= 0) ? lon_ : -lon_;
+    uint32_t lon_d = (uint32_t)lon;
+    uint32_t lon_m = (uint32_t)((lon - lon_d) * 6000.0f + 0.5f);
+
+    if (lon_m >= 6000) {
+        lon_m = 0;
+        lon_d++;
+    }
+
+    s += to_string_dec_uint(lon_d, 3, '0');
+    s += to_string_dec_uint(lon_m / 100, 2, '0');
+    s += ".";
+    s += to_string_dec_uint(lon_m % 100, 2, '0');
+    s += ew;
+    text_gps_coord.set(s);
+}
+
+void APRSTXView::on_gps(const GPSPosDataMessage* message) {
+    if (manual_gps_mode) {
+        return;  // no more update once set manually
+    }
+    if (message->lat < -90.0 || message->lat > 90.0 ||
+        message->lon < -180.0 || message->lon > 180.0) {
+        return;
+    }
+    if (message->lat == 0.0f && message->lon == 0.0f) {
+        return;
+    }
+    last_lat = message->lat;
+    last_lon = message->lon;
+    process_coordinates(message->lat, message->lon);
+}
+
 APRSTXView::APRSTXView(NavigationView& nav) {
    baseband::run_image(portapack::spi_flash::image_tag_afsk);

@@ -87,8 +157,33 @@ APRSTXView::APRSTXView(NavigationView& nav) {
                  &num_ssid_dest,
                  &text_payload,
                  &button_set,
+                  &text_gps_coord,
+                  &button_mangps,
+                  &gps_is_manual,
+                  &text_path,
+                  &button_setpath,
                  &tx_view});

+    sym_source.set_value(symsrc);
+    num_ssid_source.set_value(ssidsrc);
+    sym_dest.set_value(symdst);
+    num_ssid_dest.set_value(ssiddst);
+    text_payload.set(payload);
+    text_path.set(path_cache);
+
+    sym_source.on_change = [this](SymField&) {
+        symsrc = sym_source.to_string();
+    };
+    num_ssid_source.on_change = [this](int32_t v) {
+        ssidsrc = v;
+    };
+    sym_dest.on_change = [this](SymField&) {
+        symdst = sym_dest.to_string();
+    };
+    num_ssid_dest.on_change = [this](int32_t v) {
+        ssiddst = v;
+    };
+
    button_set.on_select = [this, &nav](Button&) {
        text_prompt(
            nav,
@@ -99,6 +194,17 @@ APRSTXView::APRSTXView(NavigationView& nav) {
                text_payload.set(s);
            });
    };
+    button_setpath.on_select = [this, &nav](Button&) {
+        text_prompt(
+            nav,
+            path_cache,
+            60,
+            ENTER_KEYBOARD_MODE_ALPHA,
+            [this](std::string& s) {
+                text_path.set(s);
+                path_cache = s;
+            });
+    };

    tx_view.on_edit_frequency = [this, &nav]() {
        auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
@@ -116,6 +222,23 @@ APRSTXView::APRSTXView(NavigationView& nav) {
        tx_view.set_transmitting(false);
        transmitter_model.disable();
    };
+
+    button_mangps.on_select = [this, &nav](Button&) {
+        nav.push<GeoMapView>(
+            0,
+            GeoPos::alt_unit::METERS,
+            GeoPos::spd_unit::HIDDEN,
+            last_lat,
+            last_lon,
+            [this](int32_t, float lat, float lon, int32_t) {
+                last_lat = lat;
+                last_lon = lon;
+                manual_gps_mode = true;
+                gps_is_manual.set("MANUAL");
+                process_coordinates(lat, lon);
+            });
+    };
+    // process_coordinates(last_lat, last_lon); //don't load last, so won't confuse users
 }

 } /* namespace ui */
@@ -50,59 +50,109 @@ class APRSTXView : public View {
        1750000 /* bandwidth */,
        AFSK_TX_SAMPLERATE /* sampling rate */
    };
-    app_settings::SettingsManager settings_{
-        "tx_aprs", app_settings::Mode::TX};

+    std::string symsrc = "";
+    std::string symdst = "";
    std::string payload{""};
+    std::string path_cache = "";
+    int32_t ssidsrc = 0;
+    int32_t ssiddst = 0;
+
+    bool manual_gps_mode = false;
+    float last_lat = 0.0f;
+    float last_lon = 0.0f;
+
+    app_settings::SettingsManager settings_{
+        "tx_aprs",
+        app_settings::Mode::TX,
+        {{"symsrc"sv, &symsrc},
+         {"symdst"sv, &symdst},
+         {"ssidsrc"sv, &ssidsrc},
+         {"ssiddst"sv, &ssiddst},
+         {"payload"sv, &payload},
+         {"last_lat"sv, &last_lat},
+         {"last_lon"sv, &last_lon},
+         {"path"sv, &path_cache}}};

    void start_tx();
    void generate_frame();
    void generate_frame_pos();
    void on_tx_progress(const uint32_t progress, const bool done);
+    void on_gps(const GPSPosDataMessage* message);
+    void process_coordinates(float lat, float lon);

    Labels labels{
-        {{UI_POS_X(0), 1 * 16}, "Source:       SSID:", Theme::getInstance()->fg_light->foreground},  // 6 alphanum + SSID
-        {{UI_POS_X(0), 2 * 16}, " Dest.:       SSID:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), 4 * 16}, "Info field:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Source:       SSID:", Theme::getInstance()->fg_light->foreground},  // 6 alphanum + SSID
+        {{UI_POS_X(0), UI_POS_Y(1)}, " Dest.:       SSID:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(2)}, "Path: (ex.: WIDE1-1,WIDE2-1)", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(6)}, "Info field:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(10)}, "GPS:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(22), UI_POS_Y(14)}, "Use ?GPS? in the info", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(17), UI_POS_Y(15)}, "as a placeholder.", Theme::getInstance()->fg_light->foreground},
+    };
+
+    Text text_path{
+        {UI_POS_X(0), UI_POS_Y(3), UI_POS_MAXWIDTH, UI_POS_HEIGHT(1)},
+        "WIDE1-1",
+    };
+    Text gps_is_manual{
+        {UI_POS_X(6), UI_POS_Y(10), UI_POS_WIDTH(10), UI_POS_HEIGHT(1)},
+        "",
    };

    SymField sym_source{
-        {7 * 8, 1 * 16},
+        {UI_POS_X(7), UI_POS_Y(0)},
        6,
        SymField::Type::Alpha};

    NumberField num_ssid_source{
-        {19 * 8, 1 * 16},
+        {UI_POS_X(19), UI_POS_Y(0)},
        2,
        {0, 15},
        1,
        ' '};

    SymField sym_dest{
-        {7 * 8, 2 * 16},
+        {UI_POS_X(7), UI_POS_Y(1)},
        6,
        SymField::Type::Alpha};

    NumberField num_ssid_dest{
-        {19 * 8, 2 * 16},
+        {UI_POS_X(19), UI_POS_Y(1)},
        2,
        {0, 15},
        1,
        ' '};

    Text text_payload{
-        {UI_POS_X(0), 5 * 16, screen_width, 16},
-        "-"};
+        {UI_POS_X(0), UI_POS_Y(7), UI_POS_MAXWIDTH, UI_POS_HEIGHT(1)},
+        ""};
    Button button_set{
-        {UI_POS_X(0), 6 * 16, 80, 32},
+        {UI_POS_X(0), UI_POS_Y(8), UI_POS_WIDTH(10), UI_POS_HEIGHT(2)},
        "Set"};

+    Text text_gps_coord{
+        {UI_POS_X(0), UI_POS_Y(11), UI_POS_WIDTH(20), UI_POS_HEIGHT(1)},
+        "-"};
+
+    Button button_mangps{
+        {UI_POS_X(0), UI_POS_Y(12), UI_POS_WIDTH(14), UI_POS_HEIGHT(2)},
+        "Manual GPS"};
+    Button button_setpath{
+        {UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH(14), UI_POS_HEIGHT(2)},
+        "Set Path"};
    TransmitterView tx_view{
        (int16_t)UI_POS_Y_BOTTOM(4),
        5000,
        0  // disable setting bandwith, since APRS used fixed 10k bandwidth
    };

+    MessageHandlerRegistration message_handler_gps{
+        Message::ID::GPSPosData,
+        [this](Message* const p) {
+            const auto message = static_cast<const GPSPosDataMessage*>(p);
+            this->on_gps(message);
+        }};
    MessageHandlerRegistration message_handler_tx_progress{
        Message::ID::TXProgress,
        [this](const Message* const p) {
@@ -27,6 +27,8 @@
 #include "portapack.hpp"
 #include "battery.hpp"
 #include <cstring>
+#include "ui_settings.hpp"
+#include "portapack_persistent_memory.hpp"

 using namespace portapack;

@@ -138,10 +140,8 @@ void BattinfoView::update_result() {
    }
    if ((valid_mask & battery::BatteryManagement::BATT_VALID_PERCENT) == battery::BatteryManagement::BATT_VALID_PERCENT) {
        text_method.set("IC");
-        button_mode.set_text("Volt");
    } else {
        text_method.set("Voltage");
-        button_mode.set_text("IC");
    }
    if (uichg) set_dirty();
    // to update status bar too, send message in behalf of batt manager
@@ -158,8 +158,9 @@ BattinfoView::BattinfoView(NavigationView& nav)
                  &text_current,
                  &text_charge,
                  &text_method,
-                  &button_mode,
+                  &button_settings,
                  &button_exit,
+                  &text_capacity,
                  // &text_cycles,
                  // &text_warn,
                  &text_ttef});
@@ -167,17 +168,11 @@ BattinfoView::BattinfoView(NavigationView& nav)
    button_exit.on_select = [this, &nav](Button&) {
        nav.pop();
    };
-    button_mode.on_select = [this, &nav](Button&) {
-        if (button_mode.text() == "IC") {
-            battery::BatteryManagement::set_calc_override(false);
-            persistent_memory::set_ui_override_batt_calc(false);
-            button_mode.set_text("Volt");
-        } else {
-            battery::BatteryManagement::set_calc_override(true);
-            persistent_memory::set_ui_override_batt_calc(true);
-            button_mode.set_text("IC");
-        }
+    button_settings.on_select = [this, &nav](Button&) {
+        nav.replace<SetBatteryView>();
    };
+    text_capacity.set(to_string_dec_uint(persistent_memory::battery_cap_mah()) + " mAh");
+    if (!persistent_memory::battery_cap_valid()) text_capacity.set_style(Theme::getInstance()->fg_red);
    update_result();
    if (thread == nullptr) thread = chThdCreateFromHeap(NULL, 1024, NORMALPRIO + 10, BattinfoView::static_fn, this);
 }
@@ -54,51 +54,56 @@ class BattinfoView : public View {
    int32_t current = 0;

    Labels labels{
-        {{2 * 8, 1 * 16}, "Percent:", Theme::getInstance()->fg_light->foreground},
-        {{2 * 8, 2 * 16}, "Voltage:", Theme::getInstance()->fg_light->foreground},
-        {{2 * 8, 3 * 16}, "Method:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(2), UI_POS_Y(1)}, "Percent:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(2), UI_POS_Y(2)}, "Voltage:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(2), UI_POS_Y(3)}, "Method:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(2), UI_POS_Y(4)}, "Capacity:", Theme::getInstance()->fg_light->foreground},
    };

    Labels labels_opt{
-        {{2 * 8, 4 * 16}, "Current:", Theme::getInstance()->fg_light->foreground},
-        {{2 * 8, 5 * 16}, "Charge:", Theme::getInstance()->fg_light->foreground},
-        {{2 * 8, 6 * 16}, "TTF/E:", Theme::getInstance()->fg_light->foreground},
-        // {{2 * 8, 7 * 16}, "Cycles:", Theme::getInstance()->fg_light->foreground},
-        {{2 * 8, 10 * 16}, "Change method:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(2), UI_POS_Y(5)}, "Current:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(2), UI_POS_Y(6)}, "Charge:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(2), UI_POS_Y(7)}, "TTF/E:", Theme::getInstance()->fg_light->foreground},
+        // {{UI_POS_X(2), UI_POS_Y(8)}, "Cycles:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(2), UI_POS_Y(10)}, "Change settings:", Theme::getInstance()->fg_light->foreground},
    };

    Text text_percent{
-        {13 * 8, 1 * 16, 10 * 16, 16},
+        {UI_POS_X(13), UI_POS_Y(1), UI_POS_WIDTH(10), UI_POS_HEIGHT(1)},
        "-"};
    Text text_voltage{
-        {13 * 8, 2 * 16, 10 * 16, 16},
+        {UI_POS_X(13), UI_POS_Y(2), UI_POS_WIDTH(10), UI_POS_HEIGHT(1)},
        "-"};
    Text text_method{
-        {13 * 8, 3 * 16, 10 * 16, 16},
+        {UI_POS_X(13), UI_POS_Y(3), UI_POS_WIDTH(10), UI_POS_HEIGHT(1)},
+        "-"};
+    Text text_capacity{
+        {UI_POS_X(13), UI_POS_Y(4), UI_POS_WIDTH(10), UI_POS_HEIGHT(1)},
        "-"};
    Text text_current{
-        {13 * 8, 4 * 16, 10 * 16, 16},
+        {UI_POS_X(13), UI_POS_Y(5), UI_POS_WIDTH(10), UI_POS_HEIGHT(1)},
        "-"};
    Text text_charge{
-        {13 * 8, 5 * 16, 10 * 16, 16},
+        {UI_POS_X(13), UI_POS_Y(6), UI_POS_WIDTH(10), UI_POS_HEIGHT(1)},
        "-"};
    Text text_ttef{
-        {13 * 8, 6 * 16, 10 * 16, 16},
+        {UI_POS_X(13), UI_POS_Y(7), UI_POS_WIDTH(10), UI_POS_HEIGHT(1)},
        "-"};
+
    /* Text text_cycles{
-        {13 * 8, 7 * 16, 10 * 16, 16},
+        {UI_POS_X(13), UI_POS_Y(8), UI_POS_WIDTH(10), UI_POS_HEIGHT(1)},
        "-"};

    Text text_warn{
-        {1 * 8, 8 * 16, screen_width, 2 * 16},
+        {UI_POS_X(1), UI_POS_Y(9), screen_width, UI_POS_HEIGHT(2)},
        ""}; */

-    Button button_mode{
-        {2 * 8, 11 * 16 + 5, 5 * 16, 32},
-        "Volt"};
+    Button button_settings{
+        {UI_POS_X(2), UI_POS_Y(11) + 5, UI_POS_WIDTH(10), UI_POS_HEIGHT(2)},
+        "Settings"};

    Button button_exit{
-        {UI_POS_X_CENTER(12), 17 * 16, UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
+        {UI_POS_X_CENTER(12), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Back"};
    static msg_t static_fn(void* arg);
    Thread* thread{nullptr};
@@ -45,10 +45,14 @@ bool valid_firmware_file(std::filesystem::path::string_type path) {
    // test read of the whole file just to validate checksum (baseband flash code will re-read when flashing)
    auto result = firmware_file.open(path.c_str());
    if (!result.is_valid()) {
+        uint64_t file_size = firmware_file.size();
+        if (file_size > FLASH_ROM_SIZE) {
+            // Firmware file is larger than the flash size for this device
+            return false;
+        }
        checksum = 0;
-        for (uint32_t offset = 0; offset < FLASH_ROM_SIZE; offset += sizeof(read_buffer)) {
+        for (uint64_t offset = 0; offset < FLASH_ROM_SIZE && offset < file_size; offset += sizeof(read_buffer)) {
            auto readResult = firmware_file.read(&read_buffer, sizeof(read_buffer));
-
            if ((!readResult) || (readResult.value() != sizeof(read_buffer))) {
                // File was smaller than 1MB:
                // If version is such that the file SHOULD have been 1MB, call it a checksum error (otherwise say it's OK).
@@ -32,7 +32,7 @@
 #include "untar.hpp"
 #include <cstdint>

-#define FLASH_ROM_SIZE 1048576
+#define FLASH_ROM_SIZE (FLASH_SIZE_MB * 1024 * 1024)
 #define FLASH_STARTING_ADDRESS 0x00000000
 #define FLASH_EXPECTED_CHECKSUM 0x00000000
 #define FLASH_CHECKSUM_ERROR 0xFFFFFFFF
@@ -69,7 +69,7 @@ void GlassView::manage_beep_audio() {
    }
 }

-void GlassView::get_max_power(const ChannelSpectrum& spectrum, uint8_t bin, uint8_t& max_power) {
+void GlassView::get_max_power(const ChannelSpectrum& spectrum, uint16_t bin, uint8_t& max_power) {
    if (mode == LOOKING_GLASS_SINGLEPASS) {
        // <20MHz spectrum mode
        if (bin < 120) {
@@ -91,7 +91,7 @@ void GlassView::get_max_power(const ChannelSpectrum& spectrum, uint8_t bin, uint
    }
 }

-rf::Frequency GlassView::get_freq_from_bin_pos(uint8_t pos) {
+rf::Frequency GlassView::get_freq_from_bin_pos(uint16_t pos) {
    rf::Frequency freq_at_pos = 0;
    if (mode == LOOKING_GLASS_SINGLEPASS) {
        // starting from the middle, minus 8 ignored bin on each side. Since pos is [-120,120] after the (pos - 120), it's divided by screen_width(240)/2 => 120
@@ -101,7 +101,14 @@ rf::Frequency GlassView::get_freq_from_bin_pos(uint8_t pos) {
    return freq_at_pos;
 }

-void GlassView::on_marker_change() {
+void GlassView::on_marker_change(int8_t delta) {
+    if ((marker_pixel_index + delta) < 0)
+        marker_pixel_index = marker_pixel_index + delta + screen_width;
+    else if ((marker_pixel_index + delta) > screen_width)
+        marker_pixel_index = marker_pixel_index + delta - screen_width;
+    else
+        marker_pixel_index = marker_pixel_index + delta;
+
    marker = get_freq_from_bin_pos(marker_pixel_index);
    field_marker.set_text(to_string_short_freq(marker));
    plot_marker(marker_pixel_index);  // Refresh marker on screen
@@ -200,7 +207,7 @@ void GlassView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
    baseband::spectrum_streaming_stop();
    // Convert bins of this spectrum slice into a representative max_power and when enough, into pixels
    // we actually need screen_width (240) of those bins
-    for (uint8_t bin = 0; bin < bin_length; bin++) {
+    for (uint16_t bin = 0; bin < bin_length; bin++) {
        get_max_power(spectrum, bin, max_power);
        if (max_power > range_max_power)
            range_max_power = max_power;
@@ -208,7 +215,7 @@ void GlassView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
        if (bin == 119) {
            uint8_t next_max_power = 0;
            get_max_power(spectrum, bin + 1, next_max_power);
-            for (uint8_t it = 0; it < ignore_dc; it++) {
+            for (uint16_t it = 0; it < ignore_dc; it++) {
                uint8_t med_max_power = (max_power + next_max_power) / 2;  // due to the way process_bins works we have to keep resetting the color
                if (process_bins(&med_max_power) == true)
                    return;  // new line signaled, return
@@ -285,7 +292,7 @@ void GlassView::on_range_changed() {
    max_power = 0;
    bins_hz_size = 0;

-    on_marker_change();
+    on_marker_change(0);
    update_range_field();

    // set the sample rate and bandwidth
@@ -298,8 +305,8 @@ void GlassView::on_range_changed() {
    receiver_model.set_target_frequency(f_center);  // tune rx for this slice
 }

-void GlassView::plot_marker(uint8_t pos) {
-    uint8_t shift_y = 0;
+void GlassView::plot_marker(uint16_t pos) {
+    uint16_t shift_y = 0;
    if (live_frequency_view > 0)  // plot one line down when in live view
    {
        shift_y = 16;
@@ -381,9 +388,10 @@ GlassView::GlassView(
                  &button_beep_squelch,
                  &field_marker,
                  &field_trigger,
+                  &button_marker_minus,
+                  &button_marker_plus,
                  &button_jump,
                  &button_rst,
-                  &field_rx_iq_phase_cal,
                  &freq_stats});

    load_presets();  // Load available presets from TXT files (or default).
@@ -491,13 +499,7 @@ GlassView::GlassView(
    range_presets.set_selected_index(preset_index);

    field_marker.on_encoder_change = [this](TextField&, EncoderEvent delta) {
-        if ((marker_pixel_index + delta) < 0)
-            marker_pixel_index = marker_pixel_index + delta + screen_width;
-        else if ((marker_pixel_index + delta) > screen_width)
-            marker_pixel_index = marker_pixel_index + delta - screen_width;
-        else
-            marker_pixel_index = marker_pixel_index + delta;
-        on_marker_change();
+        on_marker_change(delta);
    };

    field_marker.on_select = [this](TextField&) {
@@ -516,6 +518,14 @@ GlassView::GlassView(
        update_range_field();
    };

+    button_marker_minus.on_select = [this](Button&) {
+        on_marker_change(-1);
+    };
+
+    button_marker_plus.on_select = [this](Button&) {
+        on_marker_change(1);
+    };
+
    button_jump.on_select = [this](Button&) {
        // Launch Audio with peak frequency.
        launch_audio(max_freq_hold);
@@ -525,13 +535,6 @@ GlassView::GlassView(
        reset_live_view();
    };

-    field_rx_iq_phase_cal.set_range(0, hackrf_r9 ? 63 : 31);                 // max2839 has 6 bits [0..63],  max2837 has 5 bits [0..31]
-    field_rx_iq_phase_cal.set_value(get_spec_iq_phase_calibration_value());  // using  accessor function of AnalogAudioView to read iq_phase_calibration_value from rx_audio.ini
-    field_rx_iq_phase_cal.on_change = [this](int32_t v) {
-        set_spec_iq_phase_calibration_value(v);  // using  accessor function of AnalogAudioView to write inside SPEC submenu, register value to max283x and save it to rx_audio.ini
-    };
-    set_spec_iq_phase_calibration_value(get_spec_iq_phase_calibration_value());  // initialize iq_phase_calibration in radio
-
    display.scroll_set_area(109, screen_height - 1);  // Restart scroll on the correct coordinates

    // trigger:
@@ -581,15 +584,6 @@ void GlassView::on_freqchg(int64_t freq) {
    on_range_changed();
 }

-uint8_t GlassView::get_spec_iq_phase_calibration_value() {  // define accessor functions inside AnalogAudioView to read & write real iq_phase_calibration_value
-    return iq_phase_calibration_value;
-}
-
-void GlassView::set_spec_iq_phase_calibration_value(uint8_t cal_value) {  // define accessor functions
-    iq_phase_calibration_value = cal_value;
-    radio::set_rx_max283x_iq_phase_calibration(iq_phase_calibration_value);
-}
-
 void GlassView::load_presets() {
    File presets_file;
    auto error = presets_file.open(looking_glass_dir / u"PRESETS.TXT");
@@ -66,9 +66,6 @@ class GlassView : public View {
    void on_hide() override;
    void focus() override;

-    uint8_t get_spec_iq_phase_calibration_value();
-    void set_spec_iq_phase_calibration_value(uint8_t cal_value);
-
   private:
    NavigationView& nav_;
    Gradient gradient{};
@@ -80,11 +77,10 @@ class GlassView : public View {
    uint8_t filter_index = 0;  // OFF
    uint8_t trigger = 32;
    uint8_t mode = LOOKING_GLASS_FASTSCAN;
-    uint8_t live_frequency_view = 0;         // Spectrum
-    uint8_t live_frequency_integrate = 3;    // Default (3 * old value + new_value) / 4
-    uint8_t iq_phase_calibration_value{15};  // initial default RX IQ phase calibration value , used for both max2837 & max2839
-    int32_t beep_squelch = 20;               // range from -100 to +20, >=20 disabled
-    bool beep_enabled = false;               // activate on bip button click
+    uint8_t live_frequency_view = 0;       // Spectrum
+    uint8_t live_frequency_integrate = 3;  // Default (3 * old value + new_value) / 4
+    int32_t beep_squelch = 20;             // range from -100 to +20, >=20 disabled
+    bool beep_enabled = false;             // activate on bip button click
    app_settings::SettingsManager settings_{
        "rx_glass"sv,
        app_settings::Mode::RX,
@@ -97,7 +93,6 @@ class GlassView : public View {
            {"scan_mode"sv, &mode},
            {"freq_view"sv, &live_frequency_view},
            {"freq_integrate"sv, &live_frequency_integrate},
-            {"iq_phase_calibration"sv, &iq_phase_calibration_value},  // we are saving and restoring that CAL from Settings.
            {"beep_squelch"sv, &beep_squelch},
            {"beep_enabled"sv, &beep_enabled},
        }};
@@ -116,9 +111,9 @@ class GlassView : public View {
    void update_min(int32_t v);
    void update_max(int32_t v);
    void update_range_field();
-    void get_max_power(const ChannelSpectrum& spectrum, uint8_t bin, uint8_t& max_power);
-    rf::Frequency get_freq_from_bin_pos(uint8_t pos);
-    void on_marker_change();
+    void get_max_power(const ChannelSpectrum& spectrum, uint16_t bin, uint8_t& max_power);
+    rf::Frequency get_freq_from_bin_pos(uint16_t pos);
+    void on_marker_change(int8_t delta);
    void retune();
    bool process_bins(uint8_t* powerlevel);
    void on_channel_spectrum(const ChannelSpectrum& spectrum);
@@ -128,7 +123,7 @@ class GlassView : public View {
    void on_range_changed();
    void reset_live_view();
    void add_spectrum_pixel(uint8_t power);
-    void plot_marker(uint8_t pos);
+    void plot_marker(uint16_t pos);
    void load_presets();
    void populate_presets();
    void launch_audio(rf::Frequency center_freq);
@@ -138,7 +133,7 @@ class GlassView : public View {
    rf::Frequency f_center_ini{0};

    rf::Frequency marker{0};
-    uint8_t marker_pixel_index{0};
+    uint16_t marker_pixel_index{0};
    rf::Frequency marker_pixel_step{0};

    // Size of one spectrum bin in Hz.
@@ -173,8 +168,7 @@ class GlassView : public View {
        {{0, UI_POS_Y(0)}, "MIN:     MAX:     LNA   VGA  ", Theme::getInstance()->fg_light->foreground},
        {{0, 1 * 16}, "RANGE:       FILTER:     AMP:", Theme::getInstance()->fg_light->foreground},
        {{0, 2 * 16}, "P:", Theme::getInstance()->fg_light->foreground},
-        {{0, 3 * 16}, "MARKER:          MHz RXIQCAL", Theme::getInstance()->fg_light->foreground},
-        //{{0, 4 * 16}, "RES:    STEPS:", Theme::getInstance()->fg_light->foreground}};
+        {{0, 3 * 16}, "MARKER( / ):          MHz", Theme::getInstance()->fg_light->foreground},
        {{0, 4 * 16}, "RES:     VOL:", Theme::getInstance()->fg_light->foreground}};

    NumberField field_frequency_min{
@@ -223,16 +217,16 @@ class GlassView : public View {
        ""};

    TextField field_marker{
-        {7 * 8, 3 * 16, 9 * 8, 16},
+        {12 * 8, 3 * 16, 9 * 8, 16},
        ""};

-    NumberField field_rx_iq_phase_cal{
-        {28 * 8, 3 * 16},
-        2,
-        {0, 63},  // 5 or 6 bits IQ CAL phase adjustment (range updated later)
-        1,
-        ' ',
-    };
+    Button button_marker_minus{
+        {7 * 8, 3 * 16 + 4, 1 * 8, 1 * 8},
+        "-"};
+
+    Button button_marker_plus{
+        {9 * 8, 3 * 16 + 4, 1 * 8, 1 * 8},
+        "+"};

    NumberField field_trigger{
        {4 * 8, 4 * 16},
@@ -350,6 +350,12 @@ MicTXView::MicTXView(
                  &tx_button,
                  &tx_icon});

+    // disable key repeat on select
+    initial_switch_config_ = get_switches_repeat_config();
+    SwitchesState config = initial_switch_config_;
+    config[toUType(Switch::Sel)] = false;
+    set_switches_repeat_config(config);
+
    set_rxbw_options();
    set_rxbw_defaults(settings_.loaded());

@@ -640,6 +646,9 @@ MicTXView::MicTXView(
 }

 MicTXView::~MicTXView() {
+    // restore select key repeat mode
+    set_switches_repeat_config(initial_switch_config_);
+
    audio::input::stop();
    if (rx_enabled) {  // Also turn off both (audio rx if enabled, and disable  mic_loop to HP)
        rxaudio(false);
@@ -90,6 +90,9 @@ class MicTXView : public View {
        sampling_rate /* sampling rate */
    };

+    // structure used to control key repeat
+    SwitchesState initial_switch_config_{};
+
    enum Mic_Modulation : uint32_t {
        MIC_MOD_NFM = 0,
        MIC_MOD_WFM = 1,
@@ -301,7 +304,8 @@ class MicTXView : public View {
        {
            {" 8k5  ", 0},  // Initial dynamic values when we start Mic App.
            {" 11k  ", 1},
-            {" 16k  ", 2},
+            {" 12k5  ", 2},
+            {" 16k  ", 3},
        }};

    NumberField field_squelch{
@@ -1261,6 +1261,7 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
            else
                v = SPEC_MODULATION;
            field_mode.set_selected_index(v);
+            return;  // Important ! Guru will occur if you don't return when modifying field from within on_change !
        }
        last_mode = v;
        change_mode(v);
@@ -33,6 +33,9 @@
 #include "ui_touch_calibration.hpp"
 #include "ui_text_editor.hpp"
 #include "ui_external_items_menu_loader.hpp"
+#include "ui_ss_viewer.hpp"
+#include "ui_fileman.hpp"
+#include "ui_sd_card_debug.hpp"

 #include "portapack_persistent_memory.hpp"
 #include "lpc43xx_cpp.hpp"
@@ -309,13 +312,45 @@ SetFrequencyCorrectionModel SetRadioView::form_collect() {
    };
 }

+/* SetTXLimitView ************************************/
+
+SetTXLimitView::SetTXLimitView(NavigationView& nav) {
+    add_children({
+        &labels,
+        &tx_gain_max_db,
+        &tx_disable_switch,
+        &tx_amp_disable_switch,
+        &button_save,
+        &button_cancel,
+    });
+
+    tx_disable_switch.set_value(pmem::config_tx_disabled());
+    tx_amp_disable_switch.set_value(pmem::config_tx_amp_disabled());
+    tx_gain_max_db.set_value(pmem::config_tx_gain_max_db());
+
+    button_save.on_select = [&nav, this](Button&) {
+        pmem::set_config_tx_disabled(tx_disable_switch.value());
+        pmem::set_config_tx_amp_disabled(tx_amp_disable_switch.value());
+        pmem::set_config_tx_gain_max_db(tx_gain_max_db.value());
+        send_system_refresh();
+        nav.pop();
+    };
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        nav.pop();
+    };
+}
+
+void SetTXLimitView::focus() {
+    button_save.focus();
+}
+
 /* SetUIView *********************************************/

 SetUIView::SetUIView(NavigationView& nav) {
    add_children({&checkbox_disable_touchscreen,
                  &checkbox_bloff,
                  &options_bloff,
-                  &checkbox_showsplash,
                  &checkbox_showclock,
                  &options_clockformat,
                  &checkbox_guireturnflag,
@@ -342,7 +377,6 @@ SetUIView::SetUIView(NavigationView& nav) {
    }

    checkbox_disable_touchscreen.set_value(pmem::disable_touchscreen());
-    checkbox_showsplash.set_value(pmem::config_splash());
    checkbox_showclock.set_value(!pmem::hide_clock());
    checkbox_guireturnflag.set_value(pmem::show_gui_return_icon());

@@ -381,7 +415,6 @@ SetUIView::SetUIView(NavigationView& nav) {
                pmem::set_clock_with_date(false);
        }

-        pmem::set_config_splash(checkbox_showsplash.value());
        pmem::set_clock_hidden(!checkbox_showclock.value());
        pmem::set_gui_return_icon(checkbox_guireturnflag.value());
        pmem::set_disable_touchscreen(checkbox_disable_touchscreen.value());
@@ -414,7 +447,11 @@ void SetUIView::focus() {
 /* SetSDCardView *********************************************/

 SetSDCardView::SetSDCardView(NavigationView& nav) {
-    add_children({&labels,
+    add_children({&status_labels,
+                  &text_card_status,
+                  &text_filesystem_type,
+                  &button_more_info,
+                  &labels,
                  &checkbox_sdcard_speed,
                  &button_test_sdcard_high_speed,
                  &text_sdcard_test_status,
@@ -423,6 +460,10 @@ SetSDCardView::SetSDCardView(NavigationView& nav) {

    checkbox_sdcard_speed.set_value(pmem::config_sdcard_high_speed_io());

+    button_more_info.on_select = [&nav, this](Button&) {
+        nav.push<SDCardDebugView>();
+    };
+
    button_test_sdcard_high_speed.on_select = [&nav, this](Button&) {
        pmem::set_config_sdcard_high_speed_io(true, false);
        text_sdcard_test_status.set("!! HIGH SPEED MODE ON !!");
@@ -440,7 +481,79 @@ SetSDCardView::SetSDCardView(NavigationView& nav) {
 }

 void SetSDCardView::focus() {
-    button_save.focus();
+    button_cancel.focus();
+}
+
+void SetSDCardView::on_show() {
+    sd_card_status_signal_token = sd_card::status_signal += [this](const sd_card::Status) {
+        update_sd_card_status();
+    };
+
+    update_sd_card_status();
+}
+
+void SetSDCardView::on_hide() {
+    sd_card::status_signal -= sd_card_status_signal_token;
+}
+
+void SetSDCardView::update_sd_card_status() {
+    using sd_card::Status;
+
+    const auto status = sd_card::status();
+
+    // Update card status text
+    switch (status) {
+        case Status::NotPresent:
+            text_card_status.set("Not Inserted");
+            text_filesystem_type.set("---");
+            break;
+        case Status::Present:
+            text_card_status.set("Inserted");
+            text_filesystem_type.set("---");
+            break;
+        case Status::Mounted:
+            text_card_status.set("Mounted");
+            // Determine filesystem type
+            {
+                const auto fs_type = sd_card::fs.fs_type;
+                std::string fs_name;
+                switch (fs_type) {
+                    case FS_FAT12:
+                        fs_name = "FAT12";
+                        break;
+                    case FS_FAT16:
+                        fs_name = "FAT16";
+                        break;
+                    case FS_FAT32:
+                        fs_name = "FAT32";
+                        break;
+                    case FS_EXFAT:
+                        fs_name = "exFAT";
+                        break;
+                    default:
+                        fs_name = "Unknown";
+                        break;
+                }
+                text_filesystem_type.set(fs_name);
+            }
+            break;
+        case Status::ConnectError:
+            text_card_status.set("Connect Error");
+            text_filesystem_type.set("---");
+            break;
+        case Status::MountError:
+            text_card_status.set("Mount Error");
+            text_filesystem_type.set("---");
+            break;
+        case Status::IOError:
+            text_card_status.set("I/O Error");
+            text_filesystem_type.set("---");
+            break;
+        default:
+            text_card_status.set("Unknown");
+            text_filesystem_type.set("---");
+            break;
+    }
 }

 /* SetConverterSettingsView ******************************/
@@ -1047,6 +1160,8 @@ SetBatteryView::SetBatteryView(NavigationView& nav) {
    add_children({&labels,
                  &button_save,
                  &button_cancel,
+                  &field_battcap,
+                  &button_help_cap,
                  &checkbox_overridebatt,
                  &checkbox_battery_charge_hint});

@@ -1056,21 +1171,44 @@ SetBatteryView::SetBatteryView(NavigationView& nav) {
        pmem::set_ui_override_batt_calc(checkbox_overridebatt.value());
        pmem::set_ui_battery_charge_hint(checkbox_battery_charge_hint.value());
        battery::BatteryManagement::set_calc_override(checkbox_overridebatt.value());
+        if (((uint32_t)field_battcap.value() != pmem::battery_cap_mah()) || (!pmem::battery_cap_valid())) {
+            pmem::set_battery_cap_mah(field_battcap.value());
+            i2cdev::I2cDev_MAX17055* dev = (i2cdev::I2cDev_MAX17055*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055);
+            if (dev && !dev->reInit()) {
+                nav.display_modal("Error", "Battery gauge re-init failed");
+                return;
+            }
+        }
        send_system_refresh();
        nav.pop();
    };

    button_reset.on_select = [&nav, this](Button&) {
        auto dev = (i2cdev::I2cDev_MAX17055*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055);
-        if (dev->reset_learned())
+        if (dev && dev->reset_learned())
            nav.display_modal("Reset", "Battery parameters reset");
        else
            nav.display_modal("Error", "Error parameter reset");
    };

+    button_help_cap.on_select = [&nav, this](Button&) {
+        nav.display_modal("Battery Capacity",
+                          "Only change default, if you\n"
+                          "   changed the battery!\n"
+                          "Defaults:\n"
+                          "H4 + Hackrf One: 2500\n"
+                          "H4 + Hackrf Pro: 2000\n"
+                          "H4Pro + Hackrf Pro: custom\n"
+                          "PortaRf: 3000\n"
+
+        );
+    };
+
    checkbox_overridebatt.set_value(pmem::ui_override_batt_calc());
    checkbox_battery_charge_hint.set_value(pmem::ui_battery_charge_hint());

+    field_battcap.set_value(pmem::battery_cap_mah());
+
    button_cancel.on_select = [&nav, this](Button&) {
        nav.pop();
    };
@@ -1080,6 +1218,46 @@ void SetBatteryView::focus() {
    button_cancel.focus();
 }

+/* SetSlpash *********************************************/
+
+SetSplash::SetSplash(NavigationView& nav) {
+    add_children({&checkbox_showsplash,
+                  &checkbox_randomsplash,
+                  &message,
+                  &button_picture_select,
+                  &button_save,
+                  &button_cancel});
+
+    checkbox_showsplash.set_value(pmem::config_splash());
+    splash_bmp_exists = file_exists(splash_dot_bmp);
+    checkbox_randomsplash.set_value(!splash_bmp_exists);
+    message.hidden(splash_bmp_exists);
+
+    checkbox_randomsplash.on_select = [this](Checkbox&, bool v) {
+        random_enabled = v;
+    };
+
+    button_picture_select.on_select = [this, &nav](Button&) {
+        auto ret = nav.push<FileManagerView>();
+        ret->push_dir(splash_dir);
+    };
+
+    button_save.on_select = [&nav, this](Button&) {
+        if (random_enabled == true) delete_file(splash_dot_bmp);
+        pmem::set_config_splash(checkbox_showsplash.value());
+        send_system_refresh();
+        nav.pop();
+    };
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        nav.pop();
+    };
+}
+
+void SetSplash::focus() {
+    button_save.focus();
+}
+
 /* SettingsMenuView **************************************/

 SettingsMenuView::SettingsMenuView(NavigationView& nav)
@@ -1107,11 +1285,13 @@ void SettingsMenuView::on_populate() {
        {"Freq. Correct", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetFrequencyCorrectionView>(); }},
        {"P.Memory Mgmt", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<SetPersistentMemoryView>(); }},
        {"Radio", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetRadioView>(); }},
+        {"TX Limit", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetTXLimitView>(); }},
        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [this]() { nav_.push<SetSDCardView>(); }},
        {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [this]() { nav_.push<SetUIView>(); }},
        {"Display", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetDisplayView>(); }},
        {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetMenuColorView>(); }},
        {"Theme", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetThemeView>(); }},
+        {"Splash settings", ui::Color::dark_cyan(), &bitmap_icon_file_image, [this]() { nav_.push<SetSplash>(); }},
    });

    if (battery::BatteryManagement::isDetected()) add_item({"Battery", ui::Color::dark_cyan(), &bitmap_icon_batt_icon, [this]() { nav_.push<SetBatteryView>(); }});
@@ -34,6 +34,7 @@
 #include "ui_navigation.hpp"
 #include "bitmap.hpp"
 #include "ff.h"
+#include "sd_card.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "irq_controls.hpp"

@@ -264,6 +265,51 @@ class SetRadioView : public View {
    SetFrequencyCorrectionModel form_collect();
 };

+class SetTXLimitView : public View {
+   public:
+    SetTXLimitView(NavigationView& nav);
+
+    void focus() override;
+
+    std::string title() const override { return "TX Limit"; };
+
+   private:
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Limits RF TX Gain", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "(This may affect", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "all applications.)", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 12 * 16}, "TX Max Gain:", Theme::getInstance()->fg_light->foreground},
+
+    };
+
+    Checkbox tx_disable_switch{
+        {1 * 8, 6 * 16},
+        23,
+        "Disable TX"};
+
+    Checkbox tx_amp_disable_switch{
+        {1 * 8, 8 * 16},
+        23,
+        "Disable TX Amp"};
+
+    NumberField tx_gain_max_db{
+        {20 * 8, 12 * 16},
+        6,
+        {0, 47},
+        1,
+        ' ',
+    };
+
+    Button button_save{
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        "Save"};
+
+    Button button_cancel{
+        {UI_POS_X_CENTER(16) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        "Cancel",
+    };
+};
+
 using portapack::persistent_memory::backlight_timeout_t;

 class SetUIView : public View {
@@ -298,77 +344,72 @@ class SetUIView : public View {
            {"1 hour", backlight_timeout_t::Timeout3600Sec},
        }};

-    Checkbox checkbox_showsplash{
-        {3 * 8, 6 * 16},
-        20,
-        "Show splash"};
-
    Checkbox checkbox_showclock{
-        {3 * 8, 8 * 16},
+        {3 * 8, 6 * 16},
        20,
        "Show clock with:"};

    OptionsField options_clockformat{
-        {60, 9 * 16 + 8},
+        {60, 7 * 16 + 8},
        20,
        {{"time only", 0},
         {"time and date", 1}}};

    Checkbox checkbox_guireturnflag{
-        {3 * 8, 11 * 16},
+        {3 * 8, 9 * 16},
        20,
        "Back button in menu"};

    Labels labels{
-        {{3 * 8, 13 * 16}, "Show/Hide Status Icons", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, 11 * 16}, "Show/Hide Status Icons", Theme::getInstance()->fg_light->foreground},
    };

    ImageToggle toggle_camera{
-        {2 * 8, 14 * 16 + 2, 16, 16},
+        {2 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_icon_camera};

    ImageToggle toggle_sleep{
-        {4 * 8, 14 * 16 + 2, 16, 16},
+        {4 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_icon_sleep};

    ImageToggle toggle_stealth{
-        {6 * 8, 14 * 16 + 2, 16, 16},
+        {6 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_icon_stealth};

    ImageToggle toggle_converter{
-        {8 * 8, 14 * 16 + 2, 16, 16},
+        {8 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_icon_upconvert};

    ImageToggle toggle_bias_tee{
-        {10 * 8, 14 * 16 + 2, 16, 16},
+        {10 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_icon_biast_off};

    ImageToggle toggle_clock{
-        {12 * 8, 14 * 16 + 2, 8, 16},
+        {12 * 8, 12 * 16 + 2, 8, 16},
        &bitmap_icon_clk_ext};

    ImageToggle toggle_mute{
-        {13 * 8, 14 * 16 + 2, 16, 16},
+        {13 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_icon_speaker_and_headphones_mute};

    ImageToggle toggle_speaker{
-        {15 * 8, 14 * 16 + 2, 16, 16},
+        {15 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_icon_speaker_mute};

    ImageToggle toggle_battery_icon{
-        {17 * 8, 14 * 16 + 2, 16, 16},
+        {17 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_icon_batt_icon};

    ImageToggle toggle_battery_text{
-        {19 * 8, 14 * 16 + 2, 16, 16},
+        {19 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_icon_batt_text};

    ImageToggle toggle_fake_brightness{
-        {21 * 8, 14 * 16 + 2, 16, 16},
+        {21 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_icon_brightness};

    ImageToggle toggle_sd_card{
-        {23 * 8, 14 * 16 + 2, 16, 16},
+        {23 * 8, 12 * 16 + 2, 16, 16},
        &bitmap_sd_card_ok};

    Button button_save{
@@ -384,36 +425,60 @@ class SetSDCardView : public View {
   public:
    SetSDCardView(NavigationView& nav);

+    void on_show() override;
+    void on_hide() override;
+
    void focus() override;

    std::string title() const override { return "SD Card"; };

   private:
+    SignalToken sd_card_status_signal_token{};
+    // Status section (top half)
+    Labels status_labels{
+        {{10, 24}, "Card Status:", Theme::getInstance()->fg_light->foreground},
+        {{10, 48}, "Filesystem:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_card_status{
+        {120, 24, 110, 16},
+        ""};
+
+    Text text_filesystem_type{
+        {120, 48, 110, 16},
+        ""};
+
+    Button button_more_info{
+        {UI_POS_X_CENTER(20), 90, UI_POS_WIDTH(20), UI_POS_HEIGHT(2)},
+        "More Info"};
+
+    // Settings section (bottom half)
    Labels labels{
        // 01234567890123456789012345678
-        {{UI_POS_X_CENTER(26), 120 - 48}, "  HIGH SPEED SDCARD IO   ", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X_CENTER(26), 120 - 32}, " May or may not work !!  ", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X_CENTER(26), 140}, "  HIGH SPEED SDCARD IO   ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(26), 156}, " May or may not work !!  ", Theme::getInstance()->fg_light->foreground}};

    Checkbox checkbox_sdcard_speed{
-        {UI_POS_X_CENTER(26), 120},
+        {UI_POS_X_CENTER(26), 180},
        20,
        "enable high speed IO"};

    Button button_test_sdcard_high_speed{
-        {UI_POS_X_CENTER(27), 152, UI_POS_WIDTH(27), UI_POS_HEIGHT(2)},
+        {UI_POS_X_CENTER(27), 210, UI_POS_WIDTH(27), UI_POS_HEIGHT(2)},
        "TEST BUTTON (NO PMEM SAVE)"};

    Text text_sdcard_test_status{
-        {UI_POS_X_CENTER(28), 198, UI_POS_WIDTH(28), UI_POS_HEIGHT(1)},
+        {UI_POS_X_CENTER(28), 256, UI_POS_WIDTH(28), UI_POS_HEIGHT(1)},
        ""};

    Button button_save{
-        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Save"};

    Button button_cancel{
-        {UI_POS_X_CENTER(16) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Cancel"};
+
+    void update_sd_card_status();
 };

 class SetConverterSettingsView : public View {
@@ -980,21 +1045,36 @@ class SetBatteryView : public View {
   private:
    int32_t selected = 0;
    Labels labels{
-        {{1 * 8, 1 * 16}, "Override batt calculation", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 2 * 16}, "method to voltage based", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(26), UI_POS_Y(0)}, "Override batt calculation", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(24), UI_POS_Y(1)}, "method to voltage based", Theme::getInstance()->fg_light->foreground},
        /**/
-        {{1 * 8, 6 * 16}, "Display a hint to remind you", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 7 * 16}, "when you charge", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X_CENTER(29), UI_POS_Y(4)}, "Display a hint to remind you", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(16), UI_POS_Y(5)}, "when you charge", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(17), UI_POS_Y(8)}, "Battery capacity", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(7), UI_POS_Y(9)}, "mAh", Theme::getInstance()->fg_light->foreground}};

-    Labels labels2{{{1 * 8, 11 * 16}, "Reset IC's learned params.", Theme::getInstance()->fg_light->foreground}};
+    Labels labels2{{{UI_POS_X(1), UI_POS_Y(11)}, "Reset IC's learned params.", Theme::getInstance()->fg_light->foreground}};
+
+    NumberField field_battcap{
+        {UI_POS_X(1), UI_POS_Y(9)},
+        5,
+        {BATT_18650_MIN_MAH, BATT_18650_MAX_MAH},
+        100,
+        ' ',
+    };
+
+    Button button_help_cap{
+        {UI_POS_X(12), UI_POS_Y(9), UI_POS_WIDTH(5), UI_POS_HEIGHT(1)},
+        "Help",
+    };

    Checkbox checkbox_overridebatt{
-        {2 * 8, 4 * 16},
+        {UI_POS_X(2), UI_POS_Y(2)},
        23,
        "Override"};

    Checkbox checkbox_battery_charge_hint{
-        {2 * 8, 9 * 16},
+        {UI_POS_X(2), UI_POS_Y(6)},
        23,
        "Charge hint"};

@@ -1024,6 +1104,43 @@ class SettingsMenuView : public BtnGridView {
    void on_populate() override;
 };

+class SetSplash : public View {
+   public:
+    SetSplash(NavigationView& nav);
+
+    void focus() override;
+
+    std::string title() const override { return "Splash"; };
+
+   private:
+    bool splash_bmp_exists = false;
+    bool random_enabled = false;
+
+    Checkbox checkbox_showsplash{
+        {3 * 8, 1 * 16},
+        20,
+        "Show splash"};
+
+    Checkbox checkbox_randomsplash{
+        {3 * 8, 3 * 16},
+        20,
+        "Random splash on boot"};
+
+    Text message{{UI_POS_X(1), UI_POS_Y(6), UI_POS_WIDTH(26), UI_POS_HEIGHT(1)}, "Pick image to stop random."};
+
+    Button button_picture_select{
+        {UI_POS_X_CENTER(8) - UI_POS_WIDTH(4), UI_POS_Y_BOTTOM(7), UI_POS_WIDTH(13), UI_POS_HEIGHT(2)},
+        "Select pict."};
+
+    Button button_save{
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        "Save"};
+
+    Button button_cancel{
+        {UI_POS_X_CENTER(16) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        "Cancel"};
+};
+
 } /* namespace ui */

 #endif /*__UI_SETTINGS_H__*/
@@ -27,8 +27,6 @@ namespace fs = std::filesystem;

 namespace ui {

-const std::filesystem::path splash_dot_bmp{u"/splash.bmp"};
-
 ScreenshotViewer::ScreenshotViewer(
    NavigationView& nav,
    const std::filesystem::path& path)
@@ -44,7 +42,6 @@ bool ScreenshotViewer::on_key(KeyEvent) {

 void ScreenshotViewer::paint(Painter& painter) {
    File file{};
-
    painter.fill_rectangle({0, 0, screen_width, screen_height}, Color::black());

    auto show_invalid = [&]() {
@@ -28,11 +28,10 @@
 #include "ui_painter.hpp"
 #include "ui_widget.hpp"
 #include "file.hpp"
+#include "file_path.hpp"

 namespace ui {

-extern const std::filesystem::path splash_dot_bmp;
-
 class ScreenshotViewer : public View {
   public:
    ScreenshotViewer(NavigationView& nav, const std::filesystem::path& path);
@@ -49,7 +48,6 @@ class SplashViewer : public View {
    SplashViewer(NavigationView& nav, const std::filesystem::path& path);
    bool on_key(KeyEvent key) override;
    void paint(Painter& painter) override;
-    void update_ss(void);

   private:
    NavigationView& nav_;
@@ -34,7 +34,7 @@
 namespace ui {

 void create_thread(int32_t (*fn)(void*), void* arg, size_t stack_size, int priority) {
-    // TODO: collect memory on terminate, once this is used
+    // TODO: collect memory on terminate, once this is used. This is a HUGE TODO! need to call chThdWait on all of them!
    chThdCreateFromHeap(NULL, stack_size, priority, fn, arg);
 }

@@ -25,6 +25,10 @@
 #include "baseband_api.hpp"
 #include "string_format.hpp"
 #include "file_path.hpp"
+#include "ui_textentry.hpp"
+#include "../keeloq_keystore.hpp"
+#include "../keeloq_file.hpp"
+#include "../keeloq_common.hpp"
 #include "portapack_persistent_memory.hpp"

 using namespace portapack;
@@ -56,6 +60,51 @@ void SubGhzDRecentEntryDetailView::update_data() {
    if (cnt != SD_NO_CNT) console.writeln("Cnt: " + to_string_dec_uint(cnt));

    if (entry_.data != 0) console.writeln("Data: " + to_string_hex(entry_.data));
+
+    if (entry_.sensorType == FPS_RESTAURANT_PAGER) {
+        uint8_t pager_addr = (entry_.data >> 5) & 0x0F;
+        uint8_t func_code = (entry_.data >> 1) & 0x0F;
+        console.writeln("Station: 0x" + to_string_hex(serial) + " (" + to_string_dec_uint(serial) + ")");
+        console.writeln("Pager: " + to_string_dec_uint(pager_addr));
+        if (func_code == 0x0D)
+            console.writeln("Action: Buzz");
+        else if (func_code == 0x0F)
+            console.writeln("Action: Sync");
+        else
+            console.writeln("Action: 0x" + to_string_hex(func_code));
+    }
+
+    if (entry_.sensorType == FPS_KEELOQ) {
+        console.writeln("Fix: " + to_string_hex(fix));
+        console.writeln("Encrypted: " + to_string_hex(encrypted));
+        console.writeln("Manufacturer: " + mf_name);
+
+        if (hop != SD_NO_HOP) {
+            console.writeln("Hop: " + to_string_hex(hop));
+
+            add_children({&button_save});
+
+            button_save.on_select = [this](const Button&) {
+                keeloq_file_buffer.clear();
+
+                text_prompt(
+                    nav_,
+                    keeloq_file_buffer,
+                    64,
+                    ENTER_KEYBOARD_MODE_ALPHA,
+                    [this](std::string& buffer) {
+                        KeeloqData params{
+                            mf_name,
+                            serial,
+                            (uint16_t)cnt,
+                            btn};
+
+                        ensure_directory(keeloq_remotes_dir);
+                        write_keeloq_file(keeloq_remotes_dir / buffer + ".KEELOQ", params);
+                    });
+            };
+        }
+    }
 }

 SubGhzDRecentEntryDetailView::SubGhzDRecentEntryDetailView(NavigationView& nav, const SubGhzDRecentEntry& entry)
@@ -242,6 +291,10 @@ const char* SubGhzDView::getSensorTypeName(FPROTO_SUBGHZD_SENSOR type) {
            return "GangQi";
        case FPS_MARANTEC24:
            return "Marantec24";
+        case FPS_HOLTEKHT6P20B:
+            return "Holtek HT6P20B";
+        case FPS_RESTAURANT_PAGER:
+            return "Rest. Pager";
        case FPS_Invalid:
        default:
            return "Unknown";
@@ -268,7 +321,14 @@ void RecentEntriesTable<ui::SubGhzDRecentEntries>::draw(
    line.reserve(30);

    line = SubGhzDView::getSensorTypeName((FPROTO_SUBGHZD_SENSOR)entry.sensorType);
-    line = line + " " + to_string_hex(entry.data << 32);
+    if (entry.sensorType == FPS_RESTAURANT_PAGER) {
+        uint8_t pgr = (entry.data >> 5) & 0x0F;
+        uint8_t func = (entry.data >> 1) & 0x0F;
+        line += " P:" + to_string_dec_uint(pgr) + (func == 0x0D ? " Buzz" : func == 0x0F ? " Sync"
+                                                                                         : "");
+    } else {
+        line = line + " " + to_string_hex(entry.data << 32);
+    }
    line.resize(columns.at(0).second, ' ');
    std::string ageStr = to_string_dec_uint(entry.age);
    std::string bitsStr = to_string_dec_uint(entry.bits);
@@ -301,6 +361,29 @@ void atomo_decrypt(uint8_t* buff) {
    }
 }

+bool SubGhzDRecentEntryDetailView::keeloq_check_decrypt(uint32_t decrypt) {
+    uint16_t end_serial = serial & 0xFF;
+
+    if ((decrypt >> 28 == btn) && (((((uint16_t)(decrypt >> 16)) & 0xFF) == end_serial) ||
+                                   ((((uint16_t)(decrypt >> 16)) & 0xFF) == 0))) {
+        cnt = decrypt & 0xFFFF;
+
+        return true;
+    }
+
+    return false;
+}
+
+bool SubGhzDRecentEntryDetailView::keeloq_check_decrypt_centurion(uint32_t decrypt) {
+    if ((decrypt >> 28 == btn) && ((((uint16_t)(decrypt >> 16)) & 0x3FF) == 0x1CE)) {
+        cnt = decrypt & 0xFFFF;
+
+        return true;
+    }
+
+    return false;
+}
+
 const uint32_t came_twee_magic_numbers_xor[15] = {
    0x0E0E0E00,
    0x1D1D1D11,
@@ -589,7 +672,57 @@ void SubGhzDRecentEntryDetailView::parseProtocol() {
    }

    if (entry_.sensorType == FPS_KEELOQ) {
-        // too many sub protocol versions, skipping. maybe in future when we'll have much more fw space
+        uint64_t data_rev = FProtoGeneral::subghz_protocol_blocks_reverse_key(entry_.data, 64);
+
+        btn = data_rev >> 60;
+        serial = (data_rev >> 32) & 0xFFFFFFF;
+        fix = data_rev >> 32;
+        encrypted = data_rev & 0xFFFFFFFF;
+
+        KeeloqKeystore keystore{};
+
+        const auto& keys = keystore.get_keys();
+
+        if (keys.empty()) {
+            return;
+        }
+
+        for (const auto& key : keys) {
+            switch (key.type) {
+                case KEELOQ_SIMPLE_LEARNING: {
+                    uint32_t decrypted = keeloq_decrypt(encrypted, key.key);
+
+                    if (keeloq_check_decrypt(decrypted)) {
+                        mf_name = key.mf_name;
+                        hop = decrypted;
+
+                        return;
+                    }
+
+                    break;
+                }
+
+                case KEELOQ_NORMAL_LEARNING: {
+                    uint64_t man = keeloq_normal_learning(fix, key.key);
+                    uint32_t decrypted = keeloq_decrypt(encrypted, man);
+
+                    if (key.mf_name == "Centurion" && keeloq_check_decrypt_centurion(decrypted)) {
+                        mf_name = "Centurion";
+                        hop = decrypted;
+
+                        return;
+                    } else if (keeloq_check_decrypt(decrypted)) {
+                        mf_name = key.mf_name;
+                        hop = decrypted;
+
+                        return;
+                    }
+
+                    break;
+                }
+            }
+        }
+
        return;
    }

@@ -756,5 +889,18 @@ void SubGhzDRecentEntryDetailView::parseProtocol() {
        btn = entry_.data & 0xf;
        return;
    }
+
+    if (entry_.sensorType == FPS_HOLTEKHT6P20B) {
+        serial = entry_.data >> 8;
+        btn = (entry_.data >> 4) & 0xF;
+        return;
+    }
+
+    if (entry_.sensorType == FPS_RESTAURANT_PAGER) {
+        // 25-bit EV1527-variant: [sysid:16][pager:4][func:4][stop:1]
+        serial = (entry_.data >> 9) & 0xFFFF;  // System ID
+        // btn/cnt left as SD_NO values; friendly output in update_data()
+        return;
+    }
 }
-}  // namespace ui
+}  // namespace ui
@@ -25,7 +25,11 @@

 #define SD_NO_SERIAL 0xFFFFFFFF
 #define SD_NO_BTN 0xFF
-#define SD_NO_CNT 0xFF
+#define SD_NO_CNT 0xFFFFFFFF
+
+#define SD_NO_HOP 0xFFFFFFFF
+#define SD_NO_FIX 0xFFFFFFFF
+#define SD_NO_ENCRYPTED 0xFFFFFFFF

 #include "ui.hpp"
 #include "ui_navigation.hpp"
@@ -191,6 +195,19 @@ class SubGhzDRecentEntryDetailView : public View {
    uint32_t cnt = SD_NO_CNT;
    uint32_t seed = 0;

+    // keeloq specific
+    std::string keeloq_file_buffer{};
+
+    uint32_t hop = SD_NO_HOP;
+    uint32_t fix = SD_NO_FIX;
+    uint32_t encrypted = SD_NO_ENCRYPTED;
+
+    std::string mf_name = "Unknown";
+
+    bool keeloq_check_decrypt(uint32_t decrypt);
+    bool keeloq_check_decrypt_centurion(uint32_t decrypt);
+    // end keeloq specific
+
    Text text_type{{UI_POS_X(0), 1 * 16, 15 * 8, 16}, "?"};
    Text text_id{{6 * 8, 2 * 16, 10 * 8, 16}, "?"};

@@ -207,6 +224,10 @@ class SubGhzDRecentEntryDetailView : public View {
        {screen_width - 96 - 4, screen_height - 32 - 12, 96, 32},
        "Done"};

+    Button button_save{
+        {4, screen_height - 32 - 12, 96, 32},
+        "Save"};
+
    void parseProtocol();
 };

@@ -225,8 +225,15 @@ volume_range_t volume_range() {
    return audio_codec->headphone_gain_range();
 }

-void set_volume(const volume_t volume) {
-    audio_codec->set_headphone_volume(volume);
+bool set_volume(const volume_t volume) {
+    // add retry method
+    for (int i = 0; i < 100; ++i) {
+        if (audio_codec->set_headphone_volume(volume)) {
+            return true;
+        }
+        chThdSleepMilliseconds(2);
+    }
+    return false;
 }

 } /* namespace headphone */
@@ -49,7 +49,7 @@ class Codec {
    virtual void headphone_enable() = 0;
    virtual void headphone_disable() = 0;
    virtual volume_range_t headphone_gain_range() const = 0;
-    virtual void set_headphone_volume(const volume_t volume) = 0;
+    virtual bool set_headphone_volume(const volume_t volume) = 0;

    virtual void microphone_enable(int8_t alc_mode, bool mic_to_HP_enabled) = 0;  // added user-GUI  AK4951 ,selected ALC mode.
    virtual void microphone_disable() = 0;
@@ -93,7 +93,7 @@ namespace headphone {

 volume_range_t volume_range();

-void set_volume(const volume_t volume);
+bool set_volume(const volume_t volume);

 } /* namespace headphone */

@@ -21,6 +21,7 @@
 */

 #include "baseband_api.hpp"
+#include <cstring>

 #include "audio.hpp"
 #include "tonesets.hpp"
@@ -52,12 +53,21 @@ static void send_message(const Message* const message) {
    creg::m0apptxevent::assert_event();

    if constexpr (check_for_message_hang) {
+#ifdef PRALINE
+        /* Timeout: ~3 seconds at typical clock speeds */
+        auto count = 200'000'000u;
+#else
        auto count = UINT32_MAX;
+#endif
        while (shared_memory.baseband_message && --count)
            /* spin */;

        if (count == 0)
+#ifdef PRALINE
+            chDbgPanic("BB Msg Timeout");
+#else
            chDbgPanic("Baseband Send Fail");
+#endif
    } else {
        while (shared_memory.baseband_message)
            /* spin */;
@@ -325,12 +335,22 @@ void set_rds_data(const uint16_t message_length) {
    send_message(&message);
 }

-void set_spectrum(const size_t sampling_rate, const size_t trigger) {
+void set_spectrum(
+    const size_t sampling_rate,
+    const size_t trigger) {
    const WidebandSpectrumConfigMessage message{
        sampling_rate, trigger};
    send_message(&message);
 }

+void set_time_sink(
+    const size_t sampling_rate,
+    const size_t trigger) {
+    const TimeSinkConfigMessage message{
+        sampling_rate, trigger};
+    send_message(&message);
+}
+
 void set_wefax_config(uint8_t lpm = 120, uint8_t ioc = 0) {
    const WeFaxRxConfigureMessage message{lpm, ioc};
    send_message(&message);
@@ -368,6 +388,59 @@ void set_subghzd_config(uint8_t modulation = 0, uint32_t sampling_rate = 0) {
    send_message(&message);
 }

+void set_moreserx_config(uint8_t mode) {
+    const MorseRXConfigureMessage message{mode};
+    send_message(&message);
+}
+
+void set_tonedetect_config(uint8_t squelch, uint32_t ctcss_freq_x10) {
+    const ToneDetectConfigureMessage message{squelch, ctcss_freq_x10};
+    send_message(&message);
+}
+
+void set_morsetx_config(uint8_t mode, uint32_t tone, float fm_delta) {
+    const MorseTXConfigureMessage message{mode, tone, fm_delta};
+    send_message(&message);
+}
+
+void set_morsetx_key(bool key_down) {
+    const MorseTXkeyMessage message{key_down};
+    send_message(&message);
+}
+
+void set_bitstream_config(uint32_t deviation, uint8_t mode) {
+    const StreamTXConfigurationMessage message{deviation, mode};
+    send_message(&message);
+}
+
+void set_rtty_config(uint16_t baud, uint16_t shift, uint8_t* payload, uint16_t payload_length) {
+    RTTYDataMessage message{baud, shift};
+    if (payload && payload_length > 0) {
+        message.data_len = payload_length > message.max_len ? message.max_len : payload_length;
+        for (size_t i = 0; i < message.data_len; ++i) {
+            message.data[i] = payload[i];
+        }
+    }
+    send_message(&message);
+}
+
+void set_rtty_config(RTTYDataMessage& message) {
+    send_message(&message);
+}
+
+void set_epirb_tx_config(EPIRBTXDataMessage& message) {
+    send_message(&message);
+}
+
+void set_p25tx_data(const uint8_t* dibits, uint16_t frame_length) {
+    const size_t max_len = sizeof(shared_memory.bb_data.data);
+    if (frame_length > max_len) frame_length = max_len;
+    memcpy(shared_memory.bb_data.data, dibits, frame_length);
+    P25TxConfigureMessage msg{};
+    msg.frame_length = frame_length;
+    send_message(&msg);
+}
+
 static bool baseband_image_running = false;

 void run_image(const spi_flash::image_tag_t image_tag) {
@@ -429,7 +502,12 @@ void shutdown() {
    send_message(&message);

    shared_memory.application_queue.reset();
-
+    // Allow time for the shutdown message to be processed and for the baseband
+    // core to stop before starting another image. Otherwise, the M4 may still be
+    // running and cause a crash when the next image is started.
+#ifdef PRALINE
+    chThdSleepMilliseconds(20);
+#endif
    baseband_image_running = false;
 }

@@ -97,14 +97,28 @@ void set_pocsag(int8_t baud_config = -1);
 void set_adsb();
 void set_jammer(const bool run, const jammer::JammerType type, const uint32_t speed);
 void set_rds_data(const uint16_t message_length);
-void set_spectrum(const size_t sampling_rate, const size_t trigger);
+void set_spectrum(
+    const size_t sampling_rate,
+    const size_t trigger);
+void set_time_sink(
+    const size_t sampling_rate,
+    const size_t trigger);
 void set_siggen_tone(const uint32_t tone);
 void set_siggen_config(const uint32_t bw, const uint32_t shape, const uint32_t duration);
 void set_spectrum_painter_config(const uint16_t width, const uint16_t height, bool update, int32_t bw);
 void set_subghzd_config(uint8_t modulation, uint32_t sampling_rate);
+void set_moreserx_config(uint8_t mode);
+void set_tonedetect_config(uint8_t squelch, uint32_t ctcss_freq_x10 = 0);
+void set_morsetx_config(uint8_t mode, uint32_t tone, float fm_delta);
+void set_morsetx_key(bool key_down);
 void set_wefax_config(uint8_t lpm, uint8_t ioc);
 void set_noaaapt_config();
 void set_flex_config();
+void set_bitstream_config(uint32_t deviation, uint8_t mode);                                                   // mode 0 for am, 1 for 2fsk
+void set_rtty_config(uint16_t baud, uint16_t shift, uint8_t* payload = nullptr, uint16_t payload_length = 0);  // baud*100
+void set_rtty_config(RTTYDataMessage& message);
+void set_epirb_tx_config(EPIRBTXDataMessage& message);
+void set_p25tx_data(const uint8_t* dibits, uint16_t frame_length);

 void request_roger_beep();
 void request_rssi_beep();
@@ -4297,7 +4297,7 @@ static constexpr Bitmap bitmap_icon_tpms{
    {16, 16},
    bitmap_icon_tpms_data};

-static constexpr uint8_t bitmap_icon_tranceivers_data[] = {
+static constexpr uint8_t bitmap_icon_transceivers_data[] = {
    0x80,
    0x01,
    0xC0,
@@ -4331,9 +4331,9 @@ static constexpr uint8_t bitmap_icon_tranceivers_data[] = {
    0xFF,
    0xFF,
 };
-static constexpr Bitmap bitmap_icon_tranceivers{
+static constexpr Bitmap bitmap_icon_transceivers{
    {16, 16},
-    bitmap_icon_tranceivers_data};
+    bitmap_icon_transceivers_data};

 static constexpr uint8_t bitmap_icon_transmit_data[] = {
    0x80,
@@ -23,6 +23,7 @@

 #include "portapack_persistent_memory.hpp"
 #include "portapack_io.hpp"
+#include "portapack.hpp"

 #include "hackrf_hal.hpp"
 using namespace hackrf::one;
@@ -30,8 +31,20 @@ using namespace hackrf::one;
 #include "lpc43xx_cpp.hpp"
 using namespace lpc43xx;

+#ifdef PRALINE
+extern "C" {
+#include "fpga_bridge.h"
+}
+// Need access to ssp1_arbiter from radio namespace for FPGA related radio method dependencies.
+#include "radio.hpp"
+#endif
+
 constexpr uint32_t si5351_vco_f = 800000000;

+#ifdef PRALINE
+constexpr uint32_t si5351_vco_afe_f = 800000000;  // If necessary may be changed to 768 MHz for optimal for 3.072 MHz sample frequencies commonly used by apps
+#endif
+
 constexpr si5351::Inputs si5351_inputs{
    .f_xtal = si5351_xtal_f,
    .f_clkin = si5351_clkin_f,
@@ -53,7 +66,49 @@ constexpr si5351::PLL si5351_pll_xtal_25m{
    .b = 0,
    .c = 1,
 };
+
+#ifdef PRALINE
+// Define pll_a from 25MHz clock for stable PLL A, and AFE locked reference
+// PLL A: 800 MHz VCO (32x Multiplier for jitter-free 3.072 MHz sampling)
+constexpr si5351::PLL si5351_pll_a_afe_800m{
+    .f_in = si5351_inputs.f_xtal,  // 25,000,000 Hz
+    .a = 32,                       // Multiplier: 25 * 32 = 800
+    .b = 0,
+    .c = 1,
+};
+// PLL A: registers (Base 34) 800 MHz VCO (For jitter-free AFE sampling frequencies)
+constexpr auto si5351_pll_a_800_reg = si5351_pll_a_afe_800m.reg(0);  // Base 26
+
+static_assert(si5351_pll_a_afe_800m.f_vco() == si5351_vco_f, "PLL A XTAL frequency wrong");
+static_assert(si5351_pll_a_afe_800m.p1() == 3584, "PLL A XTAL P1 wrong");
+static_assert(si5351_pll_a_afe_800m.p2() == 0, "PLL A XTAL P2 wrong");
+static_assert(si5351_pll_a_afe_800m.p3() == 1, "PLL A XTAL P3 wrong");
+
+// Define pll_b 25MHz clock for stable PLL B
+// PLL B: 800 MHz VCO (32x Multiplier for (For stable Digital/SGPIO bus)
+constexpr si5351::PLL si5351_pll_b_800m{
+    .f_in = si5351_inputs.f_xtal,  // 25,000,000 Hz
+    .a = 32,                       // Multiplier: 25 * 32 = 800
+    .b = 0,
+    .c = 1,
+};
+// PLL B: registers (Base 34) 800 MHz VCO (For stable Digital/SGPIO bus)
+constexpr auto si5351_pll_b_800_reg = si5351_pll_b_800m.reg(1);  // Base 34
+
+static_assert(si5351_pll_b_800m.f_vco() == si5351_vco_f, "PLL B XTAL frequency wrong");
+static_assert(si5351_pll_b_800m.p1() == 3584, "PLL B XTAL P1 wrong");
+static_assert(si5351_pll_b_800m.p2() == 0, "PLL B XTAL P2 wrong");
+static_assert(si5351_pll_b_800m.p3() == 1, "PLL B XTAL P3 wrong");
+
+#else
+
+// PLL A registers (Base 26)
 constexpr auto si5351_pll_a_xtal_reg = si5351_pll_xtal_25m.reg(0);
+static_assert(si5351_pll_xtal_25m.f_vco() == si5351_vco_f, "PLL XTAL frequency wrong");
+static_assert(si5351_pll_xtal_25m.p1() == 3584, "PLL XTAL P1 wrong");
+static_assert(si5351_pll_xtal_25m.p2() == 0, "PLL XTAL P2 wrong");
+static_assert(si5351_pll_xtal_25m.p3() == 1, "PLL XTAL P3 wrong");
+#endif

 constexpr si5351::PLL si5351_pll_clkin_10m{
    .f_in = si5351_inputs.f_clkin_out(),
@@ -64,11 +119,6 @@ constexpr si5351::PLL si5351_pll_clkin_10m{
 constexpr auto si5351c_pll_b_clkin_reg = si5351_pll_clkin_10m.reg(1);
 constexpr auto si5351a_pll_a_clkin_reg = si5351_pll_clkin_10m.reg(0);

-static_assert(si5351_pll_xtal_25m.f_vco() == si5351_vco_f, "PLL XTAL frequency wrong");
-static_assert(si5351_pll_xtal_25m.p1() == 3584, "PLL XTAL P1 wrong");
-static_assert(si5351_pll_xtal_25m.p2() == 0, "PLL XTAL P2 wrong");
-static_assert(si5351_pll_xtal_25m.p3() == 1, "PLL XTAL P3 wrong");
-
 static_assert(si5351_pll_clkin_10m.f_vco() == si5351_vco_f, "PLL CLKIN frequency wrong");
 static_assert(si5351_pll_clkin_10m.p1() == 9728, "PLL CLKIN P1 wrong");
 static_assert(si5351_pll_clkin_10m.p2() == 0, "PLL CLKIN P2 wrong");
@@ -82,16 +132,16 @@ constexpr si5351::MultisynthFractional si5351_ms_18m432 {
        .r_div = 1,
 };
 */
-/*
-constexpr si5351::MultisynthFractional si5351_ms_0_20m {
-        .f_src = si5351_vco_f,
-        .a = 20,
-        .b = 0,
-        .c = 1,
-        .r_div = 1,
+// constexpr auto si5351_ms_0_20m_reg = si5351_ms_0_20m.reg(0);
+
+constexpr si5351::MultisynthFractional si5351_ms_0_4m{
+    .f_src = si5351_vco_f,  // 800,000,000 Hz
+    .a = 100,               // Integer divider 100
+    .b = 0,
+    .c = 1,
+    .r_div = 1  // Final R-divider: 2^1 = 2
 };
-constexpr auto si5351_ms_0_20m_reg = si5351_ms_0_20m.reg(0);
-*/
+
 constexpr si5351::MultisynthFractional si5351_ms_0_8m{
    .f_src = si5351_vco_f,
    .a = 50,
@@ -99,8 +149,91 @@ constexpr si5351::MultisynthFractional si5351_ms_0_8m{
    .c = 1,
    .r_div = 1,
 };
+
+#ifdef PRALINE
+// (initial 4 MHz from 800 MHz VCO: 800 / 200 = 4)
+constexpr si5351::MultisynthFractional si5351_ms_afe_4m{
+    .f_src = si5351_vco_afe_f,  // 800 MHz
+    .a = 200,
+    .b = 0,
+    .c = 1,
+    .r_div = 0};
+
+// (10 MHz from 800 MHz VCO: 800 / 80 = 10)
+constexpr si5351::MultisynthFractional si5351_ms_afe_10m{
+    .f_src = si5351_vco_afe_f,  // 800 MHz
+    .a = 80,
+    .b = 0,
+    .c = 1,
+    .r_div = 0};
+
+// (20 MHz from 800 MHz VCO: 800 / 40 = 20)
+constexpr si5351::MultisynthFractional si5351_ms_afe_20m{
+    .f_src = si5351_vco_afe_f,
+    .a = 40,
+    .b = 0,
+    .c = 1,
+    .r_div = 0,
+};
+
+// (25 MHz from 800 MHz VCO: 800 / 32 = 25)
+// Define xtal MultiSynth 25MHz clock for stable PLL A, and AFE locked XTAL reference
+constexpr si5351::MultisynthFractional si5351_ms_afe_25m{
+    .f_src = si5351_vco_afe_f,  // 800,000,000 Hz
+    .a = 32,                    // 800 / 32 = 25 MHz
+    .b = 0,
+    .c = 1,
+    .r_div = 0  // No final bit-shifting
+};
+
+// (40 MHz from 800 MHz VCO: 800 / 20 = 40)
+constexpr si5351::MultisynthFractional si5351_ms_afe_40m{
+    .f_src = si5351_vco_afe_f,  // 800 MHz
+    .a = 20,
+    .b = 0,
+    .c = 1,
+    .r_div = 0};
+
+// (20 MHz from 800 MHz VCO: 800 / 40 = 20)
+constexpr si5351::MultisynthFractional si5351_ms_20m{
+    .f_src = si5351_vco_f,
+    .a = 40,
+    .b = 0,
+    .c = 1,
+    .r_div = 0,
+};
+// constexpr auto si5351_ms_20m_reg = si5351_ms_20m.reg(0);
+
+// (25 MHz from 800 MHz VCO: 800 / 32 = 25)
+// Define xtal MultiSynth 25MHz clock for stable PLL B, and XTAL reference
+constexpr si5351::MultisynthFractional si5351_ms_25m{
+    .f_src = si5351_vco_f,  // 800,000,000 Hz
+    .a = 32,                // 800 / 32 = 25 MHz
+    .b = 0,
+    .c = 1,
+    .r_div = 0  // No final bit-shifting
+};
+
+#endif
+
 constexpr auto si5351c_ms_0_8m_reg = si5351_ms_0_8m.reg(clock_generator_output_og_codec);

+#ifdef PRALINE
+// Verify compile-time values for 8 MHz config
+static_assert(si5351_ms_0_8m.p1() == 5888, "MS0 8MHz P1 should be 5888 (0x1700)");
+static_assert(si5351_ms_0_8m.p2() == 0, "MS0 8MHz P2 should be 0");
+static_assert(si5351_ms_0_8m.p3() == 1, "MS0 8MHz P3 should be 1");
+static_assert(si5351_ms_0_8m.f_out() == 8000000, "MS0 should output 8 MHz");
+
+// Verify register array encoding
+static_assert(si5351c_ms_0_8m_reg[0] == 42, "MS0 base register should be 42");
+static_assert(si5351c_ms_0_8m_reg[1] == 0x00, "MS0 reg43 P3[15:8] should be 0x00");
+static_assert(si5351c_ms_0_8m_reg[2] == 0x01, "MS0 reg44 P3[7:0] should be 0x01");
+static_assert(si5351c_ms_0_8m_reg[3] == 0x10, "MS0 reg45 R_DIV should be 0x10");
+static_assert(si5351c_ms_0_8m_reg[4] == 0x17, "MS0 reg46 P1[15:8] should be 0x17");
+static_assert(si5351c_ms_0_8m_reg[5] == 0x00, "MS0 reg47 P1[7:0] should be 0x00");
+#endif
+
 constexpr si5351::MultisynthFractional si5351_ms_group{
    .f_src = si5351_vco_f,
    .a = 80, /* Don't care */
@@ -186,12 +319,21 @@ static_assert(si5351a_ms_int_mcu_clkin.f_out() == mcu_clkin_r9_f, "MS int MCU CL

 using namespace si5351;

+#ifdef PRALINE
+static constexpr ClockControl::MultiSynthSource get_si5351a_reference_clock_generator_pll(const ClockManager::ReferenceSource reference_source) {
+    return (reference_source == ClockManager::ReferenceSource::Xtal)
+               ? ClockControl::MultiSynthSource::PLLA
+               : ClockControl::MultiSynthSource::PLLB;
+}
+#else
 static constexpr ClockControl::MultiSynthSource get_si5351c_reference_clock_generator_pll(const ClockManager::ReferenceSource reference_source) {
    return (reference_source == ClockManager::ReferenceSource::Xtal)
               ? ClockControl::MultiSynthSource::PLLA
               : ClockControl::MultiSynthSource::PLLB;
 }
+#endif

+#ifndef PRALINE
 constexpr ClockControls si5351c_clock_control_common{{
    {ClockControl::ClockCurrentDrive::_8mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, get_si5351c_reference_clock_generator_pll(ClockManager::ReferenceSource::Xtal), ClockControl::MultiSynthMode::Fractional, ClockControl::ClockPowerDown::Power_Off},
    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Group, ClockControl::ClockInvert::Invert, get_si5351c_reference_clock_generator_pll(ClockManager::ReferenceSource::Xtal), ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
@@ -202,17 +344,43 @@ constexpr ClockControls si5351c_clock_control_common{{
    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, get_si5351c_reference_clock_generator_pll(ClockManager::ReferenceSource::Xtal), ClockControl::MultiSynthMode::Fractional, ClockControl::ClockPowerDown::Power_Off},
    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, get_si5351c_reference_clock_generator_pll(ClockManager::ReferenceSource::Xtal), ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
 }};
+#endif

 constexpr ClockControls si5351a_clock_control_common{{
+#ifdef PRALINE
+    // CLK0: MAX5864 (ADC) - 4mA, Normal PLLA Integer
+    {ClockControl::ClockCurrentDrive::_4mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_On},
+    // CLK1: SCT_CLK (iCE40 FPGA) - 4mA, Normal PLLB Integer
+    {ClockControl::ClockCurrentDrive::_4mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLB, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_On},
+    // CLK2: LPC43xx MCU - 2mA, Normal PLLA (Must be Integer for MCU stability)
+    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_On},
+    // CLK3: CLKOUT SMA Port P1 - 2mA, Normal PLLB Integer Power_Off
+    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLB, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
+    // CLK4: MAX2831 reference (40 MHz) - 4mA, Invert PLLA Integer (Required for mixer lock)
+    {ClockControl::ClockCurrentDrive::_4mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Invert, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_On},
+    // CLK5: RFFC5072 reference (40 MHz) - 4mA, Invert PLLA Integer (Required for mixer lock)
+    {ClockControl::ClockCurrentDrive::_4mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Invert, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_On},
+    // CLK6: Not used (disabled) 2mA, Normal PLLB Integer, Power_Off
+    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLB, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
+    // CLK7: Not used (disabled) 2mA, Normal PLLB Integer, Power_Off
+    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLB, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
+#else
    {ClockControl::ClockCurrentDrive::_6mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
    {ClockControl::ClockCurrentDrive::_4mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Fractional, ClockControl::ClockPowerDown::Power_Off},
    {ClockControl::ClockCurrentDrive::_8mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
+    // CLK4: HackRF r9 - not inverted
    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
+    // CLK5: HackRF r9 - not used
    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
+    // CLK6: Not used
    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
+    // CLK7: Not used
    {ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
+#endif
+
 }};
+
 ClockManager::Reference ClockManager::get_reference() const {
    return reference;
 }
@@ -255,9 +423,48 @@ static void portapack_tcxo_disable() {
 using namespace hackrf::one;

 void ClockManager::init_clock_generator() {
+#ifdef PRALINE
+    // PRALINE: Configure clock input mux GPIO
+    // GPIO0_15 (clkin_ctrl) selects GP_CLKIN source:
+    //   0 = P1 connector (external)
+    //   1 = P22 (internal Si5351 CLK2)
+    constexpr GPIO gpio_clkin_ctrl = gpio[GPIO0_15];
+    gpio_clkin_ctrl.output();
+    gpio_clkin_ctrl.write(1);  // CLKIN_SIGNAL_P22 = 1 = internal Si5351 CLK2
+
+    // Also enable MCU clock gate (GPIO0_8)
+    gpio_r9_mcu_clk_en.output();
+    gpio_r9_mcu_clk_en.write(1);
+#else
+    // HackRF One r9: GPIO0_8 (mcu_clk_en) gates Si5351 CLK2/CLK7 to GP_CLKIN
+    if (hackrf_r9) {
+        gpio_r9_mcu_clk_en.output();
+        gpio_r9_mcu_clk_en.write(1);
+    }
+#endif
+
    clock_generator.reset();
    clock_generator.set_crystal_internal_load_capacitance(CrystalInternalLoadCapacitance::XTAL_CL_8pF);
    clock_generator.enable_fanout();
+
+#ifdef PRALINE
+    /* PRALINE has Si5351A (NOT Si5351C like HackRF One OG).
+     * Must use Si5351A configuration: PLLA only, no CLKIN support.
+     *
+     * IMPORTANT: Follow HackRF reference sequence:
+     * 1. Set PLL input sources
+     * 2. Configure PLL and multisynths
+     * 3. Set clock control registers (AFTER multisynths!)
+     * 4. Reset PLLs
+     * 5. Enable outputs
+     */
+    clock_generator.set_pll_input_sources(si5351a_pll_input_sources);
+
+    /* Skip MCU CLKIN setup and reference detection for PRALINE - not applicable */
+    reference = Reference{ReferenceSource::Xtal, 0};  // PLLA
+
+    /* Clock control will be set AFTER multisynth configuration - see below */
+#else
    clock_generator.set_pll_input_sources(hackrf_r9
                                              ? si5351a_pll_input_sources
                                              : si5351c_pll_input_sources);
@@ -298,7 +505,90 @@ void ClockManager::init_clock_generator() {
        si5351_clock_control_common[7].ms_src(ref_pll),
    }};
    clock_generator.set_clock_control(si5351_clock_control);
+#endif

+#ifdef PRALINE
+
+    /* * Praline HackRF Pro Clock Assignments (800 MHz VCO Configuration)
+     * VCO Frequency: 800,000,000 Hz (Master Reference)
+     * * CLK0: AFE_CLK (MAX5864 Codec & FPGA ADC Interface)
+     *  - Note: Defines hardware sample rate. Essential for WFM purity.
+     * * CLK1: SCT_CLK (iCE40 FPGA System/Timing Clock)
+     *  - Note: Timing for SGPIO data bus; scales to 2x SR in wideband modes.
+     * * CLK2: MCU_CLKIN (LPC43xx MCU External Clock Input)
+     *  - Note: Synchronizes MCU processing to the RF clock tree.
+     * * CLK3: SG_CLK (Switching Regulator/Internal Logic Sync) SMA Port 1
+     *  - Note: Used for internal FPGA logic/gateware synchronization.
+     * * CLK4: P_CLK (MAX2831 Peripheral/Expansion Clock)
+     *  - Note: Routed to expansion headers for external hardware sync.
+     * * CLK5: AUX_CLK (RFFC5371 Auxiliary reference for secondary logic)
+     *  - Note: Provides additional timing flexibility for the iCE40 FPGA.
+     * * CLK6: SG_CLK (Switching Regulator/Internal Logic Sync) SMA Port 2
+     *  - Note: Used for internal FPGA logic/gateware synchronization.
+     * * CLK7: Unused / Power-Down
+     *  - State: Disabled (si5351a_ms6_7_off_reg)
+     *  - Note: Kept OFF to reduce EMI/RFI near the RF front-end.
+     * * CLKOUT: Optional external clock output on the header.
+     */
+
+    /* Write PLL A (800 MHz based on 25 MHz xtal for RF) and
+     * PLL B (800 MHZ based on 25 MHz xtalfor Digital)
+     * Use single-byte writes to debug I2C issues
+     */
+    {
+        // Write PLLA (Registers 26-33)
+        /* Write PLL A configuration (Base 26) */
+        const auto& pll_a = si5351_pll_a_800_reg;
+        for (size_t i = 1; i < pll_a.size(); i++) {
+            clock_generator.write_register(pll_a[0] + i - 1, pll_a[i]);
+        }
+
+        // Write PLLB (Registers 34-41)
+        /* Write PLL B configuration (Base 34) */
+        const auto& pll_b = si5351_pll_b_800_reg;
+        for (size_t i = 1; i < pll_b.size(); i++) {
+            clock_generator.write_register(pll_b[0] + i - 1, pll_b[i]);
+        }
+    }
+
+    /* Write multisynth configurations using single-byte writes */
+    // These cover all active channels on the Praline board
+    clock_generator.write_ms_single_byte(0, si5351_ms_afe_4m);   // CLK0: PLL A AFE Codec (4 MHz)
+    clock_generator.write_ms_single_byte(1, si5351_ms_10m);      // CLK1: PLL B SGPIO/FPGA Timing (10 MHz)
+    clock_generator.write_ms_single_byte(2, si5351_ms_afe_40m);  // CLK2: PLL A Audio and MCU Input (40 MHz)
+    clock_generator.write_ms_single_byte(3, si5351_ms_0_4m);     // CLK3: PLL B SMA Port 1 Logic Sync (4 MHz or 10 MHz)
+    clock_generator.write_ms_single_byte(4, si5351_ms_afe_40m);  // CLK4: PLL A MAX2831 Second IF (40 MHz)
+    clock_generator.write_ms_single_byte(5, si5351_ms_afe_40m);  // CLK5: PLL A RFFC5071First IF (40 MHz)
+    clock_generator.write_ms_single_byte(6, si5351_ms_0_4m);     // CLK6: PLL B SMA Port 2 Logic Sync (4 MHz or 10 MHz)
+    clock_generator.write_ms_single_byte(7, si5351_ms_0_4m);     // CLK7: PLL B Unused (4 MHz)
+
+    /* NOW set clock control registers (AFTER multisynths per HackRF reference) */
+    const auto ref_pll_a = ClockControl::MultiSynthSource::PLLA;
+    const auto ref_pll_b = ClockControl::MultiSynthSource::PLLB;
+    const ClockControls si5351_clock_control = ClockControls{{
+        si5351a_clock_control_common[0].ms_src(ref_pll_a),
+        si5351a_clock_control_common[1].ms_src(ref_pll_b),
+        si5351a_clock_control_common[2].ms_src(ref_pll_a),
+        si5351a_clock_control_common[3].ms_src(ref_pll_b),
+        si5351a_clock_control_common[4].ms_src(ref_pll_a),
+        si5351a_clock_control_common[5].ms_src(ref_pll_a),
+        si5351a_clock_control_common[6].ms_src(ref_pll_b),
+        si5351a_clock_control_common[7].ms_src(ref_pll_b),
+    }};
+    // clock_generator.set_clock_control(si5351_clock_control);
+    //  Use single-byte writes instead of multi-byte
+    clock_generator.set_clock_control_single_byte(si5351_clock_control);
+
+    // Don't write CLKS 3, 6, and 7 multisynth
+    // Ensure CLK3 clock control has Power_Off
+    // Verify output is disabled
+    clock_generator.disable_output(3);
+    clock_generator.disable_clock(3);
+    clock_generator.disable_output(6);
+    clock_generator.disable_clock(6);
+    clock_generator.disable_output(7);
+    clock_generator.disable_clock(7);
+#else
    if (hackrf_r9) {
        const PLLReg pll_reg = (reference.source == ReferenceSource::Xtal)
                                   ? si5351_pll_a_xtal_reg
@@ -319,21 +609,37 @@ void ClockManager::init_clock_generator() {
        clock_generator.write(si5351c_ms_5_reg);
        clock_generator.write(si5351c_ms6_7_off_mcu_clkin_reg);
    }
+#endif

    clock_generator.reset_plls();

    // Wait for PLL(s) to lock.
+#ifdef PRALINE
+    // PRALINE: Wait for 0x60 (0x20 | 0x40), PLLA and PLLB to lock (0x20 = LOL_A bit, 0x40 = LOL_B bit)
+    uint8_t device_status_mask = 0x60;
+    uint32_t pll_timeout = 100000;
+    while ((clock_generator.device_status() & device_status_mask) != 0 && pll_timeout > 0) {
+        pll_timeout--;
+    }
+    // Store PLL lock status for debugging
+    static volatile uint32_t pll_lock_timeout = pll_timeout;
+    (void)pll_lock_timeout;
+
+#else
+    // Wait for PLL(s) to lock - with timeout to prevent hang
    uint8_t device_status_mask = hackrf_r9
                                     ? 0x20
                                 : (ref_pll == ClockControl::MultiSynthSource::PLLB)
                                     ? 0x40
                                     : 0x20;
+
    while ((clock_generator.device_status() & device_status_mask) != 0);

    clock_generator.set_clock_control(
        clock_generator_output_mcu_clkin,
        si5351_clock_control_common[clock_generator_output_mcu_clkin].ms_src(ref_pll).clk_pdn(ClockControl::ClockPowerDown::Power_On));
    clock_generator.enable_output(clock_generator_output_mcu_clkin);
+#endif
 }

 uint32_t ClockManager::measure_gp_clkin_frequency() {
@@ -344,12 +650,16 @@ uint32_t ClockManager::measure_gp_clkin_frequency() {
 }

 bool ClockManager::loss_of_signal() {
+#ifdef PRALINE
+    return clock_generator.clkin_loss_of_signal();
+#else
    if (hackrf_r9) {
        const auto frequency = measure_gp_clkin_frequency();
        return (frequency < 9850000) || (frequency > 10150000);
    } else {
        return clock_generator.clkin_loss_of_signal();
    }
+#endif
 }

 ClockManager::ReferenceSource ClockManager::detect_reference_source() {
@@ -372,6 +682,17 @@ ClockManager::ReferenceSource ClockManager::detect_reference_source() {
 }

 ClockManager::Reference ClockManager::choose_reference() {
+#ifdef PRALINE
+    const auto detected_reference = detect_reference_source();
+
+    if ((detected_reference == ReferenceSource::External) ||
+        (detected_reference == ReferenceSource::PortaPack)) {
+        const auto frequency = measure_gp_clkin_frequency();
+        if ((frequency >= 9850000) && (frequency <= 10150000)) {
+            return {detected_reference, 10000000};
+        }
+    }
+#else
    if (hackrf_r9) {
        gpio_r9_clkin_en.write(1);
        volatile uint32_t delay = 240000 + 24000;
@@ -390,6 +711,7 @@ ClockManager::Reference ClockManager::choose_reference() {
    if (hackrf_r9) {
        gpio_r9_clkin_en.write(0);
    }
+#endif

    portapack_tcxo_disable();
    return {ReferenceSource::Xtal, 25000000};
@@ -400,6 +722,15 @@ void ClockManager::shutdown() {
 }

 void ClockManager::enable_codec_clocks() {
+#ifdef PRALINE
+    /* PRALINE: CLK0 (AFE_CLK) for codec/FPGA, CLK1 (SCT_CLK) for FPGA timing.
+     * Reference hackrf_core.c shows PRALINE needs both CLK0 and CLK1. */
+    clock_generator.enable_clock(clock_generator_output_og_codec); /* CLK0 MAX5864*/
+    clock_generator.enable_clock(clock_generator_output_og_cpld);  /* CLK1 iCE40 FPGA*/
+    clock_generator.enable_clock(clock_generator_output_og_sgpio); /* CLK2 LPC43xx*/
+    clock_generator.enable_output_mask(
+        (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld) | (1U << clock_generator_output_og_sgpio));
+#else
    if (hackrf_r9) {
        clock_generator.enable_clock(clock_generator_output_r9_sgpio);
    } else {
@@ -417,6 +748,7 @@ void ClockManager::enable_codec_clocks() {
        clock_generator.enable_output_mask(
            (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld) | (1U << clock_generator_output_og_sgpio));
    }
+#endif
 }

 void ClockManager::disable_codec_clocks() {
@@ -424,6 +756,14 @@ void ClockManager::disable_codec_clocks() {
     * be enabled for the output to come to rest at the state specified by
     * CLKx_DISABLE_STATE.
     */
+#ifdef PRALINE
+    /* PRALINE: CLK0 (AFE_CLK), CLK1 (SCT_CLK), and CLK2 MCU used for codec/FPGA */
+    clock_generator.disable_output_mask(
+        (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld) | (1U << clock_generator_output_og_sgpio));
+    clock_generator.disable_clock(clock_generator_output_og_codec);
+    clock_generator.disable_clock(clock_generator_output_og_cpld);
+    clock_generator.disable_clock(clock_generator_output_og_sgpio);
+#else
    if (hackrf_r9) {
        clock_generator.disable_output_mask(1U << clock_generator_output_r9_sgpio);
        clock_generator.disable_clock(clock_generator_output_r9_sgpio);
@@ -434,9 +774,17 @@ void ClockManager::disable_codec_clocks() {
        clock_generator.disable_clock(clock_generator_output_og_cpld);
        clock_generator.disable_clock(clock_generator_output_og_sgpio);
    }
+#endif
 }

 void ClockManager::enable_if_clocks() {
+#ifdef PRALINE
+    /* PRALINE uses CLK5 (first IF) and CLK4 (second IF) */
+    clock_generator.enable_clock(clock_generator_output_og_first_if);
+    clock_generator.enable_output_mask(1U << clock_generator_output_og_first_if);
+    clock_generator.enable_clock(clock_generator_output_og_second_if);
+    clock_generator.enable_output_mask(1U << clock_generator_output_og_second_if);
+#else
    if (hackrf_r9) {
        clock_generator.enable_clock(clock_generator_output_r9_if);
        clock_generator.enable_output_mask(1U << clock_generator_output_r9_if);
@@ -446,9 +794,16 @@ void ClockManager::enable_if_clocks() {
        clock_generator.enable_clock(clock_generator_output_og_second_if);
        clock_generator.enable_output_mask(1U << clock_generator_output_og_second_if);
    }
+#endif
 }

 void ClockManager::disable_if_clocks() {
+#ifdef PRALINE
+    clock_generator.disable_output_mask(1U << clock_generator_output_og_first_if);
+    clock_generator.disable_clock(clock_generator_output_og_first_if);
+    clock_generator.disable_output_mask(1U << clock_generator_output_og_second_if);
+    clock_generator.disable_clock(clock_generator_output_og_second_if);
+#else
    if (hackrf_r9) {
        clock_generator.disable_output_mask(1U << clock_generator_output_r9_if);
        clock_generator.disable_clock(clock_generator_output_r9_if);
@@ -458,19 +813,93 @@ void ClockManager::disable_if_clocks() {
        clock_generator.disable_output_mask(1U << clock_generator_output_og_second_if);
        clock_generator.disable_clock(clock_generator_output_og_second_if);
    }
+#endif
 }

 void ClockManager::set_sampling_frequency(const uint32_t frequency) {
+#ifdef PRALINE
+    /*
+     * PRALINE sample rate strategy:
+     * 1. Maximize AFE rate to push Nyquist above MAX2831's 11.6 MHz LPF minimum
+     * 2. Use FPGA decimation to achieve desired output rate
+     * 3. Ensure AFE rate is achievable by Si5351 (clean division from 800 MHz VCO)
+     */
+
+    constexpr uint32_t MAX_AFE_RATE = 40000000;  // Use 40 MHz per GSG reference
+    constexpr uint8_t MAX_N = 5;
+
+    _base_band_frequency = frequency;
+
+    uint8_t n = 0;
+    uint32_t afe_rate = frequency;
+
+    // Find the largest n where AFE rate stays within limit
+    // Start at n=0 and work up
+    while (n < MAX_N) {
+        uint32_t next_rate = afe_rate << 1;
+        if (next_rate > MAX_AFE_RATE) break;
+        afe_rate = next_rate;
+        n++;
+    }
+
+    _resampling_n = n;
+
+    // === Stop FPGA processing and flush filters ===
+    fpga_debug_register_write(1, 0x00);  // Disable FPGA filters (resets CIC accumulators)
+
+    // Verify we're in RX mode before writing RX registers
+    if (fpga_get_mode() != FPGA_MODE_RX) {
+        // Either set mode or return error
+        fpga_set_mode(FPGA_MODE_RX);
+    }
+
+    // Set FPGA RX decimation register
+    fpga_debug_register_write(FPGA_REG_DECIM, n);
+
+    /* RX Mode: Register 3 is FPGA_REG_RX_DIGITAL_GAIN.
+     * We shift up by (3 * n) to compensate for CIC bit-growth.
+     * Relationship: ds = (Stages * n) - Offset
+     * For a 3-stage filter, every increment of n grows the signal by 3 bits.
+     * We subtract a baseline offset to keep the signal within 8-bit bounds.
+     * Add a baseline shift to ensure the signal isn't too quiet
+     */
+    uint8_t ds = (3 * n);
+    ds += 2;
+    fpga_debug_register_write(FPGA_REG_RX_DIGITAL_GAIN, ds);
+
+    radio::invalidate_spi_config();
+
+    // Configure Si5351 clocks
+    // CLK0: AFE_CLK (with r_div=1 for ÷2)
+    // CLK1: SCT_CLK (with r_div=0 for ÷1, runs at 2× AFE for FPGA timing)
+    // Configure Si5351 clocks using the correct AFE VCO
+    clock_generator.set_ms_frequency(0, afe_rate * 2, si5351_vco_afe_f, 1);
+    clock_generator.set_ms_frequency(1, afe_rate * 2, si5351_vco_afe_f, 0);
+
+    // === Reset PLL A for phase alignment ===
+    clock_generator.write_register(si5351::Register::PLLReset, 0x20);
+
+    // Brief delay for PLL lock and clock stability ===
+    // ~1ms at 96MHz = ~96000 cycles, use 10ms for safety
+    volatile uint32_t delay = 240000;  // ~2.5ms
+    while (delay--);
+
+    // Re-enable FPGA processing with clean state ===
+    fpga_debug_register_write(1, 0x01);
+
+#else
    /* Codec clock is at sampling frequency, CPLD and SGPIO clocks are at
     * twice the frequency, and derived from the MS0 synth. So it's only
     * necessary to change the MS0 synth frequency, and ensure the output
     * is divided by two.
     */
+
    if (hackrf_r9) {
        clock_generator.set_ms_frequency(clock_generator_output_r9_sgpio, frequency * 2, si5351_vco_f, 0);
    } else {
        clock_generator.set_ms_frequency(clock_generator_output_og_codec, frequency * 2, si5351_vco_f, 1);
    }
+#endif
 }

 void ClockManager::set_reference_ppb(const int32_t ppb) {
@@ -478,10 +907,21 @@ void ClockManager::set_reference_ppb(const int32_t ppb) {
     * It is assumed an external clock coming in to CLKIN/PLLB is sufficiently accurate as to not need adjustment.
     * TODO: Revisit the above policy. It may be good to allow adjustment of the external reference too.
     */
+#ifdef PRALINE
+    // On Praline, only apply if we aren't locked to a superior external 10MHz source
+    // (Assuming you have a way to detect the 10MHz presence on Praline)
+    if (reference.source == ReferenceSource::External) {
+        return;
+    }
+    constexpr uint32_t pll_multiplier = si5351_pll_a_afe_800m.a;
+#else
    if (hackrf_r9 && reference.source != ReferenceSource::Xtal) {
        return;
    }
+
    constexpr uint32_t pll_multiplier = si5351_pll_xtal_25m.a;
+#endif
+
    constexpr uint32_t denominator = 1000000 / pll_multiplier;
    const uint32_t new_a = (ppb >= 0) ? pll_multiplier : (pll_multiplier - 1);
    const uint32_t new_b = (ppb >= 0) ? (ppb / 1000) : (denominator + (ppb / 1000));
@@ -493,8 +933,13 @@ void ClockManager::set_reference_ppb(const int32_t ppb) {
        .b = new_b,
        .c = new_c,
    };
+
+#ifdef PRALINE
+    clock_generator.write_pll_single_byte(0, pll);
+#else
    const auto pll_a_reg = pll.reg(0);
    clock_generator.write(pll_a_reg);
+#endif
 }

 void ClockManager::start_frequency_monitor_measurement(const cgu::CLK_SEL clk_sel) {
@@ -509,8 +954,16 @@ void ClockManager::start_frequency_monitor_measurement(const cgu::CLK_SEL clk_se
 }

 void ClockManager::wait_For_frequency_monitor_measurement_done() {
-    // FREQ_MON mechanism fails to finish if there's no clock present on selected input?!
+// FREQ_MON mechanism fails to finish if there's no clock present on selected input?!
+#ifdef PRALINE
+    // PRALINE FIX: Add timeout to prevent infinite hang
+    uint32_t timeout = 100000;
+    while (LPC_CGU->FREQ_MON.MEAS == 1 && timeout > 0) {
+        timeout--;
+    }
+#else
    while (LPC_CGU->FREQ_MON.MEAS == 1);
+#endif
 }

 uint32_t ClockManager::get_frequency_monitor_measurement_in_hertz() {
@@ -521,6 +974,91 @@ uint32_t ClockManager::get_frequency_monitor_measurement_in_hertz() {
 }

 void ClockManager::start_audio_pll() {
+#ifdef PRALINE
+
+    // Control Block
+    cgu::pll0audio::ctrl({
+        .pd = 1,            // Start powered down
+        .bypass = 0,        // Use the PLL
+        .directi = 0,       // Enable N-divider
+        .directo = 0,       // Enable P-divider
+        .clken = 0,         // Disable output initially
+        .frm = 0,           // Normal mode
+        .autoblock = 1,     // Glitchless switching
+        .pllfract_req = 1,  // Integer, Disabled
+        .sel_ext = 1,       // Use GP_CLKIN (CLK2)
+        .mod_pd = 0,        // Modulator OFF
+        .clk_sel = cgu::CLK_SEL::GP_CLKIN,
+    });
+
+    /*
+     * Audio PLL Configuration for 48 kHz audio with 256Fs MCLK
+     * Target output: Fout = 12.288 MHz
+     *
+     * Formulas:
+     *   Fout = Fin × MSEL / (NSEL × PSEL)
+     *   FCO  = 2 × Fin × MSEL / NSEL  (must be 275-550 MHz)
+     */
+
+    /*
+     * ┌─────────────────────────────────────────────────────────────────┐
+     * │ 10 MHz INPUT (HackRF r9 compatible but interfere with fm band)  │
+     * ├─────────────────────────────────────────────────────────────────┤
+     * │ MSEL=3072, NSEL=125, PSEL=20                                    │
+     * │ Fout = 10 × 3072 / (125 × 20) = 30720 / 2500 = 12.288 MHz ✓     │
+     * │ FCO  = 2 × 10 × 3072 / 125 = 61440 / 125 = 491.52 MHz ✓         │
+     * │                                                                 │
+     * │ Encoded values: MDEC=8308, NDEC=45, PDEC=31                     │
+     * │ CLK2 harmonics: 90, 100, 110 MHz (interfere with FM band!)      │
+     * └─────────────────────────────────────────────────────────────────┘
+     */
+
+    /*
+    // Math: (10 MHz * 3072) / (125 * 20) * 2 = 12.288MHz
+    cgu::pll0audio::mdiv({.mdec = 8308UL});  // MSEL = 3072
+    cgu::pll0audio::np_div({
+        .pdec = 31,  // PSEL = 20 for 10 MHz
+        .ndec = 45   // NSEL = 125 for 10 MHz
+    });
+    */
+
+    /*
+     * ┌─────────────────────────────────────────────────────────────────┐
+     * │ 40 MHz INPUT (Recommended - avoids FM band harmonics)           │
+     * ├─────────────────────────────────────────────────────────────────┤
+     * │ MSEL=768, NSEL=125, PSEL=20                                     │
+     * │ Fout = 40 × 768 / (125 × 20) = 30720 / 2500 = 12.288 MHz ✓      │
+     * │ FCO  = 2 × 40 × 768 / 125 = 61440 / 125 = 491.52 MHz ✓          │
+     * │                                                                 │
+     * │ Encoded values: MDEC=30542, NDEC=45, PDEC=31                    │
+     * │ CLK2 harmonics: 80, 120, 160 MHz (none in FM 88-108 MHz band)   │
+     * └─────────────────────────────────────────────────────────────────┘
+     */
+
+    // 40 MHz input → 12.288 MHz output (same as HackRF OG)
+    // Math: (40MHz * 768) / (125 * 20) * 2 = 12.288MHz
+    cgu::pll0audio::mdiv({.mdec = 30542UL});  // MSEL = 768
+    cgu::pll0audio::np_div({.pdec = 31,
+                            .ndec = 45});
+
+    cgu::pll0audio::frac({.pllfract_ctrl = 0});
+    cgu::pll0audio::power_up();
+
+    // Lock and Routing (Keep as is)
+    {
+        uint32_t timeout = 100000;
+        while (!cgu::pll0audio::is_locked() && timeout > 0) {
+            timeout--;
+        }
+    }
+
+    cgu::pll0audio::clock_enable();
+    set_base_audio_clock_divider(1);
+
+    LPC_CGU->BASE_AUDIO_CLK.AUTOBLOCK = 1;
+    LPC_CGU->BASE_AUDIO_CLK.CLK_SEL = toUType(cgu::CLK_SEL::IDIVD);
+
+#else
    cgu::pll0audio::ctrl({
        .pd = 1,
        .bypass = 0,
@@ -555,13 +1093,15 @@ void ClockManager::start_audio_pll() {
    });

    cgu::pll0audio::power_up();
-    while (!cgu::pll0audio::is_locked());
-    cgu::pll0audio::clock_enable();

+    while (!cgu::pll0audio::is_locked());
+
+    cgu::pll0audio::clock_enable();
    set_base_audio_clock_divider(1);

    LPC_CGU->BASE_AUDIO_CLK.AUTOBLOCK = 1;
    LPC_CGU->BASE_AUDIO_CLK.CLK_SEL = toUType(cgu::CLK_SEL::IDIVD);
+#endif
 }

 void ClockManager::set_base_audio_clock_divider(const size_t divisor) {
@@ -570,12 +1110,46 @@ void ClockManager::set_base_audio_clock_divider(const size_t divisor) {
 }

 void ClockManager::stop_audio_pll() {
+#ifdef PRALINE
+    /* PRALINE: Gracefully switch audio peripherals away from the PLL branch */
+    LPC_CGU->BASE_AUDIO_CLK.PD = 1;                                // Power down the branch first
+    LPC_CGU->BASE_AUDIO_CLK.CLK_SEL = toUType(cgu::CLK_SEL::IRC);  // Reset to safe IRC source
+#endif
+
    cgu::pll0audio::clock_disable();
    cgu::pll0audio::power_down();
+
+#ifdef PRALINE
+    /* PRALINE: Add a safety timeout to the unlock check to prevent potential hangs */
+    uint32_t timeout = 100000;
+    while (cgu::pll0audio::is_locked() && timeout > 0) {
+        timeout--;
+    }
+#else
    while (cgu::pll0audio::is_locked());
+#endif
 }

 void ClockManager::enable_clock_output(bool enable) {
+#ifdef PRALINE
+    auto clkout_select = clock_generator_output_og_clkout;
+
+    if (enable) {
+        clock_generator.enable_output(clkout_select);
+        if (portapack::persistent_memory::clkout_freq() < 1000) {
+            clock_generator.set_ms_frequency(clkout_select, portapack::persistent_memory::clkout_freq() * 128000, si5351_vco_f, 7);
+        } else {
+            clock_generator.set_ms_frequency(clkout_select, portapack::persistent_memory::clkout_freq() * 1000, si5351_vco_f, 0);
+        }
+
+        auto si5351_clock_control_common = si5351a_clock_control_common;
+        const auto ref_pll = get_si5351a_reference_clock_generator_pll(reference.source);
+        clock_generator.set_clock_control(clkout_select, si5351_clock_control_common[clkout_select].ms_src(ref_pll).clk_pdn(ClockControl::ClockPowerDown::Power_On));
+    } else {
+        clock_generator.disable_output(clkout_select);
+        clock_generator.set_clock_control(clkout_select, ClockControl::power_off());
+    }
+#else
    if (hackrf_r9) {
        gpio_r9_clkout_en.output();
        gpio_r9_clkout_en.write(enable);
@@ -604,4 +1178,5 @@ void ClockManager::enable_clock_output(bool enable) {
        clock_generator.disable_output(clkout_select);
        clock_generator.set_clock_control(clkout_select, ClockControl::power_off());
    }
+#endif
 }
@@ -70,8 +70,21 @@ class ClockManager {

    void set_sampling_frequency(const uint32_t frequency);

+    uint32_t get_sampling_frequency() const {
+        return _base_band_frequency;
+    };
+
    void set_reference_ppb(const int32_t ppb);

+#ifdef PRALINE
+    uint8_t get_resampling_n() const { return _resampling_n; }
+
+    // Si5351 diagnostic methods
+    uint8_t si5351_read_status() { return clock_generator.device_status(); }
+    uint8_t si5351_read_register(uint8_t reg) { return clock_generator.read_register(reg); }
+    void si5351_write_register(uint8_t reg, uint8_t value) { clock_generator.write_register(reg, value); }
+#endif
+
    uint32_t get_frequency_monitor_measurement_in_hertz();

    Reference get_reference() const;
@@ -85,6 +98,8 @@ class ClockManager {
    si5351::Si5351& clock_generator;
    Reference reference;

+    uint32_t _base_band_frequency{20000000};
+
    void set_gp_clkin_to_clkin_direct();

    void start_frequency_monitor_measurement(const cgu::CLK_SEL clk_sel);
@@ -99,6 +114,10 @@ class ClockManager {
    ReferenceSource detect_reference_source();
    Reference choose_reference();
    bool loss_of_signal();
+
+#ifdef PRALINE
+    uint8_t _resampling_n{0};  // Current decimation factor (log2)
+#endif
 };

 #endif /*__CLOCK_MANAGER_H__*/
@@ -256,7 +256,9 @@ ui::Widget* EventDispatcher::touch_widget(ui::Widget* const w, ui::TouchEvent ev
    if (!w->hidden()) {
        // To achieve reverse depth ordering (last object drawn is
        // considered "top"), descend first.
-        for (const auto child : w->children()) {
+        auto& children = w->children();
+        for (auto it = children.rbegin(); it != children.rend(); ++it) {  // reverse, bc the lastly added will be "top" if overlaps
+            const auto& child = *it;
            const auto touched_widget = touch_widget(child, event);
            if (touched_widget) {
                return touched_widget;
@@ -33,6 +33,76 @@ using namespace portapack;

 namespace ui::external_app::acars_rx {

+// ACARS frame field layout (0-based byte offsets):
+//   [0]          SOH framing byte   (skipped)
+//   [1..7]       Aircraft registration (7 chars)
+//   [8]          STX framing byte   (skipped)
+//   [9..10]      Label              (2 chars)
+//   [11]         Block ID           (1 char)
+//   [12..14]     Message number     (3 chars)
+//   [15..20]     Flight ID          (6 chars)
+//   [21..N-3]    Free-text payload  (variable)
+//   [N-2..N-1]   CRC-16/CCITT      (2 bytes, MSB first, NOT part of payload)
+//
+// Minimum valid frame: 21-byte fixed header + 2 CRC bytes = 23 bytes.
+// (A zero-length payload is legal per spec; we require at least 23 bytes.)
+static constexpr std::string::size_type kAcarsCrcLen = 2;
+static constexpr std::string::size_type kAcarsHeaderLen = 21;
+static constexpr std::string::size_type kAcarsMinLen = kAcarsHeaderLen + kAcarsCrcLen;
+
+// CRC-16/CCITT: poly 0x1021, init 0x0000, no reflection, no final XOR.
+// This is the variant used by ACARS (same as XMODEM CRC).
+static uint16_t acars_crc16(const std::string& data, std::string::size_type len) {
+    uint16_t crc = 0x0000;
+    for (std::string::size_type i = 0; i < len; ++i) {
+        crc ^= static_cast<uint16_t>(static_cast<uint8_t>(data[i])) << 8;
+        for (int bit = 0; bit < 8; ++bit) {
+            if (crc & 0x8000)
+                crc = static_cast<uint16_t>((crc << 1) ^ 0x1021);
+            else
+                crc = static_cast<uint16_t>(crc << 1);
+        }
+    }
+    return crc;
+}
+
+AcarsDecoded acars_decode(const std::string& raw) {
+    AcarsDecoded result;
+    if (raw.size() < kAcarsMinLen) {
+        result.txt = "ACARS message too short (" + std::to_string(raw.size()) +
+                     " bytes, need " + std::to_string(kAcarsMinLen) + ")";
+        return result;
+    }
+
+    // Verify CRC: computed over everything except the last 2 bytes,
+    // then compared against those 2 bytes (MSB first).
+    const std::string::size_type payload_len = raw.size() - kAcarsCrcLen;
+    const uint16_t computed = acars_crc16(raw, payload_len);
+    const uint16_t received = (static_cast<uint16_t>(static_cast<uint8_t>(raw[raw.size() - 2])) << 8) |
+                              static_cast<uint16_t>(static_cast<uint8_t>(raw[raw.size() - 1]));
+    result.crc_ok = (computed == received);
+
+    result.reg = raw.substr(1, 7);
+    result.label = raw.substr(9, 2);
+    result.block_id = raw[11];
+    result.msg_num = raw.substr(12, 3);
+    result.flight_id = raw.substr(15, 6);
+    // Payload sits between end of fixed header and the 2 trailing CRC bytes.
+    if (payload_len > kAcarsHeaderLen)
+        result.txt = raw.substr(kAcarsHeaderLen, payload_len - kAcarsHeaderLen);
+    return result;
+}
+
+std::string acars_format(const AcarsDecoded& msg) {
+    return std::string("ACARS Decoded Result\nCRC: ") + (msg.crc_ok ? "OK" : "FAIL") +
+           "\nRegistration: " + msg.reg +
+           "\nLabel: " + msg.label +
+           "\nBlockID: " + msg.block_id +
+           "\nMsgNum: " + msg.msg_num +
+           "\nFlightID: " + msg.flight_id +
+           "\nMessage: " + msg.txt;
+}
+
 void ACARSLogger::log_str(std::string msg) {
    log_file.write_entry(msg);
 }
@@ -77,17 +147,16 @@ void ACARSAppView::focus() {

 void ACARSAppView::on_packet(const ACARSPacketMessage* packet) {
    std::string console_info;
-
    if (packet->state == 255) {
        // got a packet, parse it, and display
        rtc::RTC datetime;
        rtc_time::now(datetime);
-        // todo parity error recovery
        console_info = to_string_datetime(datetime, HMS);
        console_info += ": ";
-        console_info += packet->message;
+        std::string message{packet->message, packet->message + packet->msg_len};
+        AcarsDecoded decoded = acars_decode(message);
+        console_info += acars_format(decoded);
        console.writeln(console_info);
-        // Log raw data whatever it contains
        if (logger && logging)
            logger->log_str(console_info);
    } else {
@@ -33,6 +33,26 @@

 namespace ui::external_app::acars_rx {

+// Decoded ACARS message fields extracted from a raw frame.
+// CRC-16/CCITT (poly 0x1021, init 0x0000) is verified against the two
+// trailing bytes of the raw frame; crc_ok reflects that result.
+struct AcarsDecoded {
+    bool crc_ok{false};
+    std::string reg{};
+    std::string label{};
+    std::string flight_id{};
+    std::string msg_num{};
+    char block_id{'\0'};
+    std::string txt{};
+};
+
+// Decode a raw ACARS frame: verify CRC-16/CCITT and extract fixed-offset fields.
+// Returns a partially-filled AcarsDecoded (txt error only) if the frame is too short.
+AcarsDecoded acars_decode(const std::string& raw);
+
+// Format a decoded ACARS message for display or logging.
+std::string acars_format(const AcarsDecoded& msg);
+
 class ACARSLogger {
   public:
    Optional<File::Error> append(const std::filesystem::path& filename) {
@@ -106,4 +126,4 @@ class ACARSAppView : public View {

 }  // namespace ui::external_app::acars_rx

-#endif /*__ACARS_APP_H__*/
+#endif /*__ACARS_APP_H__*/
@@ -1,83 +1,83 @@
-/*
- * Copyright (C) 2023 Bernd Herzog
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui.hpp"
-#include "acars_app.hpp"
-#include "ui_navigation.hpp"
-#include "external_app.hpp"
-
-namespace ui::external_app::acars_rx {
-void initialize_app(ui::NavigationView& nav) {
-    nav.push<ACARSAppView>();
-}
-}  // namespace ui::external_app::acars_rx
-
-extern "C" {
-
-__attribute__((section(".external_app.app_acars_rx.application_information"), used)) application_information_t _application_information_acars_rx = {
-    /*.memory_location = */ (uint8_t*)0x00000000,
-    /*.externalAppEntry = */ ui::external_app::acars_rx::initialize_app,
-    /*.header_version = */ CURRENT_HEADER_VERSION,
-    /*.app_version = */ VERSION_MD5,
-
-    /*.app_name = */ "ACARS",
-    /*.bitmap_data = */ {
-        0x80,
-        0x01,
-        0xC0,
-        0x03,
-        0xC0,
-        0x03,
-        0xC0,
-        0x03,
-        0xC0,
-        0x03,
-        0xE0,
-        0x07,
-        0xF8,
-        0x1F,
-        0xFE,
-        0x7F,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xC0,
-        0x03,
-        0xC0,
-        0x03,
-        0xC0,
-        0x03,
-        0xE0,
-        0x07,
-        0xF0,
-        0x0F,
-        0xF8,
-        0x1F,
-    },
-    /*.icon_color = */ ui::Color::orange().v,
-    /*.menu_location = */ app_location_t::RX,
-    /*.desired_menu_position = */ -1,
-
-    /*.m4_app_tag = portapack::spi_flash::image_tag_acars */ {'P', 'A', 'C', 'A'},
-    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
-};
-}
+/*
+ * Copyright (C) 2023 Bernd Herzog
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui.hpp"
+#include "acars_app.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::acars_rx {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<ACARSAppView>();
+}
+}  // namespace ui::external_app::acars_rx
+
+extern "C" {
+
+__attribute__((section(".external_app.app_acars_rx.application_information"), used)) application_information_t _application_information_acars_rx = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::acars_rx::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "ACARS",
+    /*.bitmap_data = */ {
+        0x80,
+        0x01,
+        0xC0,
+        0x03,
+        0xC0,
+        0x03,
+        0xC0,
+        0x03,
+        0xC0,
+        0x03,
+        0xE0,
+        0x07,
+        0xF8,
+        0x1F,
+        0xFE,
+        0x7F,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xC0,
+        0x03,
+        0xC0,
+        0x03,
+        0xC0,
+        0x03,
+        0xE0,
+        0x07,
+        0xF0,
+        0x0F,
+        0xF8,
+        0x1F,
+    },
+    /*.icon_color = */ ui::Color::orange().v,
+    /*.menu_location = */ app_location_t::RX,
+    /*.desired_menu_position = */ -1,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_acars */ {'P', 'A', 'C', 'A'},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}
@@ -339,7 +339,7 @@ void AdultToysView::randomizeMac() {
 }

 void AdultToysView::randomChn() {
-    channel_number = 37 + std::rand() % (39 - 37 + 1);
+    channel_number = 37 + rand() % (39 - 37 + 1);
    field_frequency.set_value(get_freq_by_channel_number(channel_number));
 }

@@ -62,19 +62,24 @@ AppManagerView::AppManagerView(NavigationView& nav)
        auto app_name = get_app_info(menu_view.highlighted_index(), true);
        auto app_id = get_app_info(menu_view.highlighted_index(), false);

-        info += "Hidden:";
+        if (!app_name.empty()) {
+            info += "Hidden:";

-        if (is_blacklisted(app_name)) {
-            info += "Yes ";
-        } else {
-            info += "No ";
+            if (is_blacklisted(app_name)) {
+                info += "Yes ";
+            } else {
+                info += "No ";
+            }
        }

-        info += "Autostart:";
-        if (is_autostart_app(app_id)) {
-            info += "Yes";
-        } else {
-            info += "No";
+        if (!app_id.empty()) {
+            info += "Autostart:";
+
+            if (is_autostart_app(app_id)) {
+                info += "Yes";
+            } else {
+                info += "No";
+            }
        }

        if (info.empty()) {
@@ -82,6 +87,8 @@ AppManagerView::AppManagerView(NavigationView& nav)
        }

        text_app_info.set(info);
+        button_hide_unhide.set_focusable(!app_name.empty());
+        button_set_cancel_autostart.set_focusable(!app_id.empty());
    };

    button_hide_unhide.on_select = [this](Button&) {
@@ -120,27 +127,23 @@ void AppManagerView::refresh_list() {
    };

    for (auto& app : NavigationView::appList) {
-        if (app.id == nullptr) continue;
-
        app_list_index++;

-        menu_view.add_item({app.displayName + std::string(is_autostart_app(app.id) ? padding(app.displayName) : ""),
+        menu_view.add_item({app.displayName + std::string((app.id != nullptr && is_autostart_app(app.id)) ? padding(app.displayName) : ""),
                            app.iconColor,
                            app.icon,
-                            [this, app_id = std::string(app.id)](KeyEvent) {
+                            [this, app_id = std::string(app.id != nullptr ? app.id : "")](KeyEvent) {
                                button_hide_unhide.focus();
                            }});
    }

    ExternalItemsMenuLoader::load_all_external_items_callback([this, &index, &padding](ui::AppInfoConsole& app) {
-        if (app.appCallName == nullptr) return;
-
        app_list_index++;

-        menu_view.add_item({app.appFriendlyName + std::string(is_autostart_app(app.appCallName) ? padding(app.appFriendlyName) : ""),
+        menu_view.add_item({app.appFriendlyName + std::string((app.appCallName != nullptr && is_autostart_app(app.appCallName)) ? padding(app.appFriendlyName) : ""),
                            ui::Color::light_grey(),
                            &bitmap_icon_sdcard,
-                            [this, app_id = std::string(app.appCallName)](KeyEvent) {
+                            [this, app_id = std::string(app.appCallName != nullptr ? app.appCallName : "")](KeyEvent) {
                                button_hide_unhide.focus();
                            }});
    });
@@ -156,19 +159,29 @@ void AppManagerView::hide_app() {
    std::vector<std::string> blacklist;
    get_blacklist(blacklist);

-    blacklist.push_back(get_app_info(menu_view.highlighted_index(), true));
+    auto app_name = get_app_info(menu_view.highlighted_index(), true);
+    if (app_name.empty()) return;
+
+    blacklist.push_back(app_name);
    write_blacklist(blacklist);
 }

 void AppManagerView::unhide_app() {
    std::vector<std::string> blacklist;
    get_blacklist(blacklist);
-    blacklist.erase(std::remove(blacklist.begin(), blacklist.end(), get_app_info(menu_view.highlighted_index(), true)), blacklist.end());
+
+    auto app_name = get_app_info(menu_view.highlighted_index(), true);
+    if (app_name.empty()) return;
+
+    blacklist.erase(std::remove(blacklist.begin(), blacklist.end(), app_name), blacklist.end());
    write_blacklist(blacklist);
 }

 void AppManagerView::hide_unhide_app() {
-    if (is_blacklisted(get_app_info(menu_view.highlighted_index(), true)))
+    auto app_name = get_app_info(menu_view.highlighted_index(), true);
+    if (app_name.empty()) return;
+
+    if (is_blacklisted(app_name))
        unhide_app();
    else
        hide_app();
@@ -218,6 +231,7 @@ void AppManagerView::set_auto_start() {
    if (app_index >= app_list_index) return;

    auto id_aka_app_call_name = get_app_info(app_index, false);
+    if (id_aka_app_call_name.empty()) return;

    autostart_app = id_aka_app_call_name;

@@ -234,6 +248,7 @@ void AppManagerView::set_unset_autostart_app() {
    if (app_index >= app_list_index) return;

    auto id_aka_friendly_name = get_app_info(app_index, false);
+    if (id_aka_friendly_name.empty()) return;

    if (is_autostart_app(id_aka_friendly_name))
        unset_auto_start();
@@ -254,17 +269,15 @@ std::string AppManagerView::get_app_info(uint16_t index, bool is_display_name) {
    std::string result;

    for (auto& app : NavigationView::appList) {
-        if (app.id == nullptr) continue;
        if (current_index == index) {
-            return is_display_name ? std::string(app.displayName) : std::string(app.id);
+            return is_display_name ? std::string(app.displayName != nullptr ? app.displayName : "") : std::string(app.id != nullptr ? app.id : "");
        }
        current_index++;
    }

    ExternalItemsMenuLoader::load_all_external_items_callback([&current_index, &index, &result, &is_display_name](ui::AppInfoConsole& app) {
-        if (app.appCallName == nullptr) return;
        if (current_index == index) {
-            result = is_display_name ? app.appFriendlyName : app.appCallName;
+            result = is_display_name ? (app.appFriendlyName != nullptr ? app.appFriendlyName : "") : (app.appCallName != nullptr ? app.appCallName : "");
        }
        current_index++;
    });
@@ -45,7 +45,7 @@ __attribute__((section(".external_app.app_battleship.application_information"),
        0xFF, 0xFF,  // ################
        0xFC, 0x3F,  // ..############..
    },
-    /*.icon_color = */ ui::Color::blue().v,
+    /*.icon_color = */ ui::Color::green().v,
    /*.menu_location = */ app_location_t::GAMES,
    /*.desired_menu_position = */ -1,

@@ -43,7 +43,7 @@ __attribute__((section(".external_app.app_blackjack.application_information"), u
        0x80, 0x01,  // .......##.......
        0x00, 0x00,  // ................
    },
-    ui::Color::red().v,  // Red color for diamonds
+    ui::Color::green().v,  // Red color for diamonds
    app_location_t::GAMES,
    -1,

@@ -72,7 +72,7 @@ void BlackjackView::paint(Painter& painter) {

    if (!initialized) {
        initialized = true;
-        std::srand(LPC_RTC->CTIME0);
+        srand(LPC_RTC->CTIME0);
        init_deck();
    }
 }
@@ -132,7 +132,7 @@ void BLESpamView::reset() {
 }

 void BLESpamView::randomChn() {
-    channel_number = 37 + std::rand() % (39 - 37 + 1);
+    channel_number = 37 + rand() % (39 - 37 + 1);
    field_frequency.set_value(get_freq_by_channel_number(channel_number));
 }

@@ -655,7 +655,7 @@ void BreakoutView::paint(Painter& painter) {

    if (!initialized) {
        initialized = true;
-        std::srand(LPC_RTC->CTIME0);
+        srand(LPC_RTC->CTIME0);
        init_game();
    }
 }
@@ -24,7 +24,7 @@ __attribute__((section(".external_app.app_cvs_spam.application_information"), us

    /*.app_name = */ "CVS Spam",
    /*.bitmap_data = */ {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81},
-    /*.icon_color = */ ui::Color::red().v,
+    /*.icon_color = */ ui::Color::yellow().v,
    /*.menu_location = */ app_location_t::TX,
    /*.desired_menu_position = */ -1,

@@ -73,7 +73,7 @@ __attribute__((section(".external_app.app_detector_rx.application_information"),
        0x0C,
        0xF0,
        0x0F},
-    /*.icon_color = */ ui::Color::orange().v,
+    /*.icon_color = */ ui::Color::yellow().v,
    /*.menu_location = */ app_location_t::RX,
    /*.desired_menu_position = */ -1,

@@ -26,6 +26,7 @@
 #include "ui_freqman.hpp"
 #include "baseband_api.hpp"
 #include "file.hpp"
+#include "file_path.hpp"
 #include "oversample.hpp"
 #include "ui_font_fixed_8x16.hpp"

@@ -35,36 +36,112 @@ using portapack::memory::map::backup_ram;

 namespace ui::external_app::detector_rx {

-// Function to map the value from one range to another
 int32_t DetectorRxView::map(int32_t value, int32_t fromLow, int32_t fromHigh, int32_t toLow, int32_t toHigh) {
    return toLow + (value - fromLow) * (toHigh - toLow) / (fromHigh - fromLow);
 }

 void DetectorRxView::focus() {
-    field_lna.focus();
+    button_index.focus();
 }

 DetectorRxView::~DetectorRxView() {
-    // reset performance counters request to default
    shared_memory.request_m4_performance_counter = 0;
    receiver_model.disable();
    audio::output::stop();
    baseband::shutdown();
 }

-void DetectorRxView::on_timer() {
-    freq_index++;
-    if (freq_mode == 0 && freq_index >= tetra_uplink_monitoring_frequencies_hz.size()) freq_index = 0;  // TETRA UP
-    if (freq_mode == 1 && freq_index >= lora_monitoring_frequencies_hz.size()) freq_index = 0;          // Lora
-    if (freq_mode == 2 && freq_index >= remotes_monitoring_frequencies_hz.size()) freq_index = 0;       // Remotes
+std::string DetectorRxView::format_freq_mhz(int64_t freq_hz) {
+    int64_t mhz = freq_hz / 1000000;
+    int64_t khz_frac = (freq_hz % 1000000) / 1000;
+    return "< " + to_string_dec_uint(mhz) + "." + to_string_dec_uint(khz_frac, 3, '0') + " MHz >";
+}

-    if (freq_mode == 2)
-        freq_ = remotes_monitoring_frequencies_hz[freq_index];
-    else if (freq_mode == 1)
-        freq_ = lora_monitoring_frequencies_hz[freq_index];
-    else
-        freq_ = tetra_uplink_monitoring_frequencies_hz[freq_index];
-    receiver_model.set_target_frequency(freq_);
+void DetectorRxView::load_freqman() {
+    freqman_load_options options{};
+    options.load_freqs = true;
+    options.load_ranges = true;
+    options.load_hamradios = false;
+    options.load_repeaters = false;
+
+    if (!load_freqman_file(freq_file_stem, frequency_list, options) || frequency_list.empty()) {
+        button_file.set_text("No file!");
+        button_index.set_text("");
+        text_entry_desc.set("");
+        button_freq.set_text("");
+        frequency_list.clear();
+        return;
+    }
+
+    current_index = 0;
+    init_current_entry();
+    button_file.set_text(freq_file_stem);
+}
+
+void DetectorRxView::init_current_entry() {
+    if (frequency_list.empty()) return;
+
+    auto& entry = *frequency_list[current_index];
+    if (entry.type == freqman_type::Range) {
+        minfreq = entry.frequency_a;
+        maxfreq = entry.frequency_b;
+        current_freq = minfreq;
+        current_step = is_valid(entry.step) ? freqman_entry_get_step_value(entry.step) : DETECTOR_BW;
+    } else {
+        current_freq = entry.frequency_a;
+        minfreq = current_freq;
+        maxfreq = current_freq;
+        current_step = DETECTOR_BW;
+    }
+
+    update_entry_display();
+    update_freq_display();
+    receiver_model.set_target_frequency(current_freq);
+}
+
+void DetectorRxView::update_entry_display() {
+    if (frequency_list.empty()) return;
+
+    auto& entry = *frequency_list[current_index];
+    button_index.set_text(
+        to_string_dec_uint(current_index + 1) + "/" +
+        to_string_dec_uint(frequency_list.size()));
+    text_entry_desc.set(entry.description);
+}
+
+void DetectorRxView::update_freq_display() {
+    if (auto_scan && (minfreq != maxfreq)) {
+        if (last_update_was_auto_range_type != 1) {
+            button_freq.set_text("RANGE SCAN...");
+            last_update_was_auto_range_type = 1;
+        }
+    } else {
+        button_freq.set_text(format_freq_mhz(current_freq));
+        last_update_was_auto_range_type = 0;
+    }
+}
+
+void DetectorRxView::on_timer() {
+    if (frequency_list.empty() || !auto_scan) return;
+
+    auto& entry = *frequency_list[current_index];
+    if (entry.type == freqman_type::Range) {
+        current_freq += current_step;
+        if (current_freq > maxfreq) {
+            if (auto_advance) {
+                current_index = (current_index + 1) % frequency_list.size();
+                init_current_entry();
+                return;
+            }
+            current_freq = minfreq;
+        }
+        receiver_model.set_target_frequency(current_freq);
+        update_freq_display();
+    } else if (auto_advance) {
+        // Single frequency: advance to next entry
+        current_index = (current_index + 1) % frequency_list.size();
+        init_current_entry();
+    }
 }

 DetectorRxView::DetectorRxView(NavigationView& nav)
@@ -75,21 +152,22 @@ DetectorRxView::DetectorRxView(NavigationView& nav)
        &field_vga,
        &field_rf_amp,
        &field_volume,
-        &text_frequency,
-        &freq_stats_rssi,
-        &freq_stats_db,
+        &button_file,
+        &button_index,
+        &text_entry_desc,
        &text_beep_squelch,
        &field_beep_squelch,
+        &freq_stats_db,
+        &freq_stats_rssi,
+        &button_freq,
+        &button_auto_scan,
+        &button_auto_advance,
        &rssi,
        &rssi_graph,
-        &field_mode,
    });

-    // activate vertical bar mode
    rssi.set_vertical_rssi(true);

-    freq_ = receiver_model.target_frequency();
-
    field_beep_squelch.set_value(beep_squelch);
    field_beep_squelch.on_change = [this](int32_t v) {
        beep_squelch = v;
@@ -97,29 +175,85 @@ DetectorRxView::DetectorRxView(NavigationView& nav)

    rssi_graph.set_nb_columns(256);

+    // FILE button opens file picker
+    button_file.on_select = [this](Button&) {
+        auto open_view = nav_.push<FileLoadView>(".TXT");
+        open_view->push_dir(freqman_dir);
+        open_view->on_changed = [this](std::filesystem::path new_file_path) {
+            if (new_file_path.native().find((u"/" / freqman_dir).native()) != 0) {
+                button_file.set_text("Invalid file");
+                return;
+            }
+            freq_file_stem = new_file_path.stem().string();
+            load_freqman();
+        };
+    };
+
+    // Index encoder: rotate to change entry, click does nothing
+    button_index.on_change = [this]() {
+        if (frequency_list.empty()) return;
+        int32_t delta = button_index.get_encoder_delta();
+        button_index.set_encoder_delta(0);
+        if (delta == 0) return;
+
+        // Use signed arithmetic for index wraparound to avoid unsigned promotion issues.
+        const int32_t list_size = static_cast<int32_t>(frequency_list.size());
+        int32_t idx = static_cast<int32_t>(current_index);
+        if (delta > 0) {
+            idx = (idx + 1) % list_size;
+        } else {
+            idx = (idx - 1 + list_size) % list_size;
+        }
+        current_index = static_cast<size_t>(idx);
+        init_current_entry();
+    };
+
+    // Frequency encoder: rotate to step within range
+    button_freq.on_change = [this]() {
+        if (frequency_list.empty()) return;
+        auto& entry = *frequency_list[current_index];
+        if (entry.type != freqman_type::Range) {
+            button_freq.set_encoder_delta(0);
+            return;
+        }
+
+        int32_t delta = button_freq.get_encoder_delta();
+        button_freq.set_encoder_delta(0);
+        if (delta == 0) return;
+
+        if (delta > 0) {
+            current_freq += current_step;
+            if (current_freq > maxfreq) current_freq = minfreq;
+        } else {
+            current_freq -= current_step;
+            if (current_freq < minfreq) current_freq = maxfreq;
+        }
+        receiver_model.set_target_frequency(current_freq);
+        update_freq_display();
+    };
+
+    // Auto-scan toggle
+    button_auto_scan.on_select = [this](Button&) {
+        auto_scan = !auto_scan;
+        button_auto_scan.set_text(auto_scan ? "AUTOSCAN" : "NO SCAN");
+        update_freq_display();
+    };
+    button_auto_scan.set_text(auto_scan ? "AUTOSCAN" : "NO SCAN");
+
+    // Auto-advance toggle
+    button_auto_advance.on_select = [this](Button&) {
+        auto_advance = !auto_advance;
+        button_auto_advance.set_text(auto_advance ? "AUTOADV" : "NO ADV");
+    };
+    button_auto_advance.set_text(auto_advance ? "AUTOADV" : "NO ADV");
+
    change_mode();
    rssi.set_peak(true, 3000);

-    // FILL STEP OPTIONS
    freq_stats_rssi.set_style(Theme::getInstance()->bg_darkest);
    freq_stats_db.set_style(Theme::getInstance()->bg_darkest);

-    field_mode.on_change = [this](size_t, int32_t value) {
-        freq_mode = value;
-        freq_index = 0;
-        switch (value) {
-            case 1:  // Lora
-                text_frequency.set("   433, 868, 915 Mhz");
-                break;
-            case 2:  // Remotes
-                text_frequency.set("        433, 315 Mhz");
-                break;
-            default:
-            case 0:  // TETRA UP
-                text_frequency.set("         380-390 Mhz");
-                break;
-        }
-    };
+    load_freqman();
 }

 void DetectorRxView::on_statistics_update(const ChannelStatistics& statistics) {
@@ -130,25 +264,23 @@ void DetectorRxView::on_statistics_update(const ChannelStatistics& statistics) {

    rssi_graph.add_values(rssi.get_min(), rssi.get_avg(), rssi.get_max(), statistics.max_db);

-    // refresh db
    if (last_max_db != statistics.max_db) {
        last_max_db = statistics.max_db;
        freq_stats_db.set("Power: " + to_string_dec_int(statistics.max_db) + " db");
        rssi.set_db(statistics.max_db);
    }
-    // refresh rssi
+
    if (last_min_rssi != rssi_graph.get_graph_min() || last_avg_rssi != rssi_graph.get_graph_avg() || last_max_rssi != rssi_graph.get_graph_max()) {
        last_min_rssi = rssi_graph.get_graph_min();
        last_avg_rssi = rssi_graph.get_graph_avg();
        last_max_rssi = rssi_graph.get_graph_max();
-        freq_stats_rssi.set("RSSI: " + to_string_dec_uint(last_min_rssi) + "/" + to_string_dec_uint(last_avg_rssi) + "/" + to_string_dec_uint(last_max_rssi));
+        freq_stats_rssi.set("RSSI:" + to_string_dec_uint(last_min_rssi) + "/" + to_string_dec_uint(last_avg_rssi) + "/" + to_string_dec_uint(last_max_rssi));
    }

    if (statistics.max_db > beep_squelch) {
        baseband::request_audio_beep(map(statistics.max_db, -100, 20, 400, 2600), 24000, 150);
    }
-
-} /* on_statistic_updates */
+}

 size_t DetectorRxView::change_mode() {
    audio::output::stop();
@@ -160,14 +292,13 @@ size_t DetectorRxView::change_mode() {
    receiver_model.set_modulation(ReceiverModel::Mode::Capture);

    baseband::set_sample_rate(DETECTOR_BW, get_oversample_rate(DETECTOR_BW));
-    // The radio needs to know the effective sampling rate.
    auto actual_sampling_rate = get_actual_sample_rate(DETECTOR_BW);
    receiver_model.set_sampling_rate(actual_sampling_rate);
    receiver_model.set_baseband_bandwidth(filter_bandwidth_for_sampling_rate(actual_sampling_rate));

    audio::set_rate(audio_sampling_rate);
    audio::output::start();
-    receiver_model.set_headphone_volume(receiver_model.headphone_volume());  // WM8731 hack.
+    receiver_model.set_headphone_volume(receiver_model.headphone_volume());

    receiver_model.enable();

@@ -29,6 +29,7 @@
 #include "audio.hpp"
 #include "baseband_api.hpp"
 #include "file.hpp"
+#include "freqman.hpp"
 #include "freqman_db.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "radio_state.hpp"
@@ -60,20 +61,35 @@ class DetectorRxView : public View {
    int32_t map(int32_t value, int32_t fromLow, int32_t fromHigh, int32_t toLow, int32_t toHigh);
    size_t change_mode();
    void on_statistics_update(const ChannelStatistics& statistics);
-    void set_display_freq(int64_t freq);
    void on_timer();
+    void load_freqman();
+    void init_current_entry();
+    void update_entry_display();
+    void update_freq_display();
+    std::string format_freq_mhz(int64_t freq_hz);
+
+    freqman_db frequency_list{};
+    size_t current_index{0};
+    int64_t current_freq{0};
+    int64_t minfreq{0};
+    int64_t maxfreq{0};
+    int32_t current_step{DETECTOR_BW};
+    std::string freq_file_stem{"DETECTOR"};
+    bool auto_scan{true};
+    bool auto_advance{false};
+    uint8_t last_update_was_auto_range_type = -1;

-    uint8_t freq_index = 0;
-    rf::Frequency freq_ = {433920000};
    int32_t beep_squelch = 0;
    audio::Rate audio_sampling_rate = audio::Rate::Hz_48000;
-    uint8_t freq_mode = 0;

    app_settings::SettingsManager settings_{
        "rx_detector",
        app_settings::Mode::RX,
        {
            {"beep_squelch"sv, &beep_squelch},
+            {"freq_file"sv, &freq_file_stem},
+            {"auto_scan"sv, &auto_scan},
+            {"auto_advance"sv, &auto_advance},
        }};

    Labels labels{
@@ -93,41 +109,55 @@ class DetectorRxView : public View {
    AudioVolumeField field_volume{
        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

-    OptionsField field_mode{
-        {UI_POS_X(0), UI_POS_Y(1)},
-        9,
-        {
-            {"TETRA UP", 0},
-            {"Lora", 1},
-            {"Remotes", 2},
-        }};
+    // Row 1: filename + auto advance
+    Button button_file{
+        {UI_POS_X(0), UI_POS_Y(1), UI_POS_WIDTH(20), UI_POS_DEFAULT_HEIGHT},
+        ""};

-    Text text_frequency{
-        {UI_POS_X_RIGHT(20), UI_POS_Y(1), UI_POS_WIDTH(20), UI_POS_DEFAULT_HEIGHT},
+    Button button_auto_advance{
+        {UI_POS_X_RIGHT(9), UI_POS_Y(1), UI_POS_WIDTH(9), UI_POS_DEFAULT_HEIGHT},
+        "NO ADV"};
+
+    // Row 2: index encoder + description + auto scan
+    ButtonWithEncoder button_index{
+        {UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(4), UI_POS_DEFAULT_HEIGHT},
+        ""};
+
+    Text text_entry_desc{
+        {UI_POS_X(4), UI_POS_Y(2), UI_POS_WIDTH(17), UI_POS_DEFAULT_HEIGHT},
+        ""};
+
+    Button button_auto_scan{
+        {UI_POS_X_RIGHT(9), UI_POS_Y(2), UI_POS_WIDTH(9), UI_POS_DEFAULT_HEIGHT},
+        "AUTO SCAN"};
+
+    // Row 3: frequency encoder + bip level
+    ButtonWithEncoder button_freq{
+        {UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH(20), UI_POS_DEFAULT_HEIGHT},
        ""};

    Text text_beep_squelch{
-        {UI_POS_X_RIGHT(9), UI_POS_Y(2), UI_POS_WIDTH(4), UI_POS_DEFAULT_HEIGHT},
+        {UI_POS_X_RIGHT(9), UI_POS_Y(3), UI_POS_WIDTH(4), UI_POS_DEFAULT_HEIGHT},
        "Bip>"};

    NumberField field_beep_squelch{
-        {UI_POS_X_RIGHT(5), UI_POS_Y(2)},
+        {UI_POS_X_RIGHT(5), UI_POS_Y(3)},
        4,
        {-100, 20},
        1,
        ' ',
    };

-    // RSSI: XX/XX/XXX
-    Text freq_stats_rssi{
-        {UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(15), UI_POS_DEFAULT_HEIGHT},
-    };
-
-    // Power: -XXX db
+    // Row 4: Power + RSSI on same line
    Text freq_stats_db{
-        {UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH(15), UI_POS_DEFAULT_HEIGHT},
+        {UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH(15), UI_POS_DEFAULT_HEIGHT},
    };

+    Text freq_stats_rssi{
+        {UI_POS_X(15), UI_POS_Y(4), UI_POS_WIDTH(15), UI_POS_DEFAULT_HEIGHT},
+    };
+
+    // Row 5+: RSSI graph + vertical bar
    RSSIGraph rssi_graph{
        {UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH_REMAINING(5), UI_POS_HEIGHT_REMAINING(6)},
    };
@@ -147,55 +177,6 @@ class DetectorRxView : public View {
        [this](const Message* const) {
            this->on_timer();
        }};
-
-    const std::vector<uint32_t> remotes_monitoring_frequencies_hz = {
-        // Around 315 MHz (common for older remotes, key fobs in some regions)
-        // Window centered on 315 MHz, covers 314.625 - 315.375 MHz
-        315000000,
-
-        // Around 433.92 MHz (very common for remotes, sensors, key fobs globally)
-        // Window centered on 433.92 MHz, covers 433.545 - 434.295 MHz
-        433920000,
-    };
-    const std::vector<uint32_t> lora_monitoring_frequencies_hz = {
-        // EU433 Band (Europe, typically 433.05 MHz to 434.79 MHz)
-        // Scanning the approximate range 433.0 MHz to 434.8 MHz with 750kHz steps
-        433375000,  // Covers 433.000 - 433.750 MHz
-        434125000,  // Covers 433.750 - 434.500 MHz (includes 433.92 MHz)
-        434875000,  // Covers 434.500 - 435.250 MHz (covers up to 434.79 MHz)
-
-        // EU868 Band (Europe, typically 863 MHz to 870 MHz, specific channels around 868 MHz)
-        // Targeting common LoRaWAN channel groups (approx 867.0 - 868.6 MHz) with 750kHz steps
-        867375000,  // Covers 867.000 - 867.750 MHz
-        868125000,  // Covers 867.750 - 868.500 MHz
-        868875000,  // Covers 868.500 - 869.250 MHz (covers up to 868.6 MHz)
-
-        // US915 Band (North America, typically 902 MHz to 928 MHz, specific channels around 915 MHz)
-        // Providing a few sample windows around the 915 MHz area with 750kHz steps.
-        // This band is wide; a full scan would require many more frequencies.
-        914250000,  // Covers 913.875 - 914.625 MHz
-        915000000,  // Covers 914.625 - 915.375 MHz (Centered on 915 MHz)
-        915750000,  // Covers 915.375 - 916.125 MHz
-    };
-    const std::vector<uint32_t> tetra_uplink_monitoring_frequencies_hz = {
-        // Band starts at 380,000,000 Hz, ends at 390,000,000 Hz.
-        // First center: 380,000,000 + 375,000 = 380,375,000 Hz
-        // Last center:  380,375,000 + 13 * 750,000 = 390,125,000 Hz (14 frequencies total for this band)
-        380375000,  // Covers 380.000 - 380.750 MHz
-        381125000,  // Covers 380.750 - 381.500 MHz
-        381875000,  // Covers 381.500 - 382.250 MHz
-        382625000,  // Covers 382.250 - 383.000 MHz
-        383375000,  // Covers 383.000 - 383.750 MHz
-        384125000,  // Covers 383.750 - 384.500 MHz
-        384875000,  // Covers 384.500 - 385.250 MHz
-        385625000,  // Covers 385.250 - 386.000 MHz
-        386375000,  // Covers 386.000 - 386.750 MHz
-        387125000,  // Covers 386.750 - 387.500 MHz
-        387875000,  // Covers 387.500 - 388.250 MHz
-        388625000,  // Covers 388.250 - 389.000 MHz
-        389375000,  // Covers 389.000 - 389.750 MHz
-        390125000,  // Covers 389.750 - 390.500 MHz
-    };
 };

 }  // namespace ui::external_app::detector_rx
@@ -125,7 +125,7 @@ void DinoGameView::paint(Painter& painter) {

    if (!initialized) {
        initialized = true;
-        std::srand(LPC_RTC->CTIME0);
+        srand(LPC_RTC->CTIME0);
        init_game();
    }
 }
@@ -789,8 +789,8 @@ void DinoGameView::draw_current_score() {

 void DinoGameView::draw_high_score() {
    auto style = *ui::Theme::getInstance()->fg_light;
-    painter.fill_rectangle({UI_POS_X_RIGHT(90), 28, 90, 18}, Color::black());
-    painter.draw_string({UI_POS_X_RIGHT(90), 30}, style, "HI " + score_to_string(highScore));
+    painter.fill_rectangle({UI_POS_X_RIGHT(10), 28, 90, 18}, Color::black());
+    painter.draw_string({UI_POS_X_RIGHT(10), 30}, style, "HI " + score_to_string(highScore));
 }

 void DinoGameView::jump() {
@@ -58,7 +58,7 @@ __attribute__((section(".external_app.app_doom.application_information"), used))
        0x00,
        0x00,
    },
-    ui::Color::red().v,
+    ui::Color::green().v,
    app_location_t::GAMES,
    -1,
    {0, 0, 0, 0},
@@ -204,11 +204,11 @@ void spawn_entity(uint8_t type, uint8_t x, uint8_t y) {

 void spawn_random_entity(uint8_t type) {
    if (num_entities >= MAX_ENTITIES) return;
-    std::srand(LPC_RTC->CTIME0);
+    srand(LPC_RTC->CTIME0);
    uint8_t spawn_x, spawn_y;
    do {
-        spawn_x = std::rand() % LEVEL_WIDTH;
-        spawn_y = std::rand() % LEVEL_HEIGHT;
+        spawn_x = rand() % LEVEL_WIDTH;
+        spawn_y = rand() % LEVEL_HEIGHT;
    } while (get_block_at(spawn_x, spawn_y) == 0xF ||
             (spawn_x == (uint8_t)player.pos.x && spawn_y == (uint8_t)player.pos.y));

@@ -227,9 +227,9 @@ void remove_entity(uint8_t index) {
        bool spawned = false;

        while (!spawned && attempts < 50) {
-            std::srand(LPC_RTC->CTIME0 + attempts);
-            uint8_t spawn_x = std::rand() % LEVEL_WIDTH;
-            uint8_t spawn_y = std::rand() % LEVEL_HEIGHT;
+            srand(LPC_RTC->CTIME0 + attempts);
+            uint8_t spawn_x = rand() % LEVEL_WIDTH;
+            uint8_t spawn_y = rand() % LEVEL_HEIGHT;

            int16_t dx = (int16_t)spawn_x - (int16_t)player.pos.x;
            int16_t dy = (int16_t)spawn_y - (int16_t)player.pos.y;
@@ -270,9 +270,9 @@ void initialize_level() {
    uint8_t attempts = 0;

    while (initial_enemies < 2 && num_entities < MAX_ENTITIES && attempts < 50) {
-        std::srand(LPC_RTC->CTIME0 + attempts);
-        int8_t offset_x = (std::rand() % 11) - 5;
-        int8_t offset_y = (std::rand() % 11) - 5;
+        srand(LPC_RTC->CTIME0 + attempts);
+        int8_t offset_x = (rand() % 11) - 5;
+        int8_t offset_y = (rand() % 11) - 5;

        if (abs(offset_x) < 3 && abs(offset_y) < 3) {
            attempts++;
@@ -307,10 +307,10 @@ void initialize_level() {

    attempts = 0;
    while (num_entities < MIN_ENTITIES && attempts < 100) {
-        std::srand(LPC_RTC->CTIME0 + attempts + 100);
+        srand(LPC_RTC->CTIME0 + attempts + 100);

-        uint8_t spawn_x = std::rand() % LEVEL_WIDTH;
-        uint8_t spawn_y = std::rand() % LEVEL_HEIGHT;
+        uint8_t spawn_x = rand() % LEVEL_WIDTH;
+        uint8_t spawn_y = rand() % LEVEL_HEIGHT;

        int16_t dx = (int16_t)spawn_x - (int16_t)player.pos.x;
        int16_t dy = (int16_t)spawn_y - (int16_t)player.pos.y;
@@ -1045,7 +1045,7 @@ void DoomView::on_show() {
 void DoomView::paint(Painter& painter) {
    if (!initialized) {
        initialized = true;
-        std::srand(LPC_RTC->CTIME0);
+        srand(LPC_RTC->CTIME0);
        scene = 0;
        up = down = left = right = fired = false;
        jogging = view_height = 0;
@@ -1081,7 +1081,7 @@ void DoomView::paint(Painter& painter) {
            int hud_y = RENDER_HEIGHT + 5;
            painter.draw_string({5, hud_y}, style_yellow, "Health: " + std::to_string(player.health));
            painter.draw_string({UI_POS_X_CENTER(15), hud_y}, style_red, "Kills: " + std::to_string(kills));
-            painter.draw_string({UI_POS_X_RIGHT(80), hud_y}, style_blue, "Ammo: " + std::to_string(player.ammo));
+            painter.draw_string({UI_POS_X_RIGHT(10), hud_y}, style_blue, "Ammo: " + std::to_string(player.ammo));

            prev_velocity_moving = (player.velocity != 0);
            needs_redraw = false;
@@ -1113,7 +1113,7 @@ void DoomView::paint(Painter& painter) {
            int hud_y = RENDER_HEIGHT + 5;
            painter.draw_string({5, hud_y}, style_yellow, "Health: " + std::to_string(player.health));
            painter.draw_string({UI_POS_X_CENTER(15), hud_y}, style_red, "Kills: " + std::to_string(kills));
-            painter.draw_string({UI_POS_X_RIGHT(80), hud_y}, style_blue, "Ammo: " + std::to_string(player.ammo));
+            painter.draw_string({UI_POS_X_RIGHT(10), hud_y}, style_blue, "Ammo: " + std::to_string(player.ammo));

            needs_gun_redraw = false;
        }
@@ -73,7 +73,7 @@ __attribute__((section(".external_app.app_epirb_rx.application_information"), us
        0x00,
        0x00,
    },
-    /*.icon_color = */ ui::Color::red().v,
+    /*.icon_color = */ ui::Color::orange().v,
    /*.menu_location = */ app_location_t::RX,
    /*.desired_menu_position = */ -1,

@@ -0,0 +1,356 @@
+/*
+ * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef __BEACON_H__
+#define __BEACON_H__
+
+#include "portapack.hpp"
+#include "ui_epirb_tx.hpp"
+#include "location.hpp"
+
+namespace ui::external_app::epirb_tx {
+
+/**
+ * Get bits frop the provided frame
+ * @param data the frame data
+ * @param startBit the start bit number (one based to match documentation)
+ * @param endBit the end bit number (one based to match documentation)
+ * @return the selected bits (max 64)
+ */
+static uint64_t get_bits(uint8_t* data, int startBit, int endBit) {
+    uint64_t result = 0;
+    // 0 bases bit count
+    startBit--;
+    int numBits = endBit - startBit;
+
+    // get a pointer to the starting byte...
+    const uint8_t* pData = &(data[startBit / 8]);
+    uint8_t b = *pData;
+
+    // calculate the starting bit within that byte...
+    int bitOffset = 7 - (startBit % 8);
+
+    // iterate for the desired number of bits...
+    for (int i = 0; i < numBits; ++i) {
+        // make room for the next bit...
+        result <<= 1;
+        // copy the bit...
+        result |= ((b >> bitOffset) & 0x01);
+        // reached the end of the current byte?
+        if (--bitOffset < 0) {
+            b = *(++pData);  // go to the next byte...
+            bitOffset = 7;   // restart at the first bit in that byte...
+        }
+    }
+
+    // all done...
+    return result;
+}
+
+/**
+ * Compute a BCH code
+ * @param frame the frame data
+ * @param startBit the bit to start BCH calculation
+ * @param endBit the bit to stop calculation
+ * @param poly the BCH polynome
+ * @param polyLength the BCH polynome length
+ * @return the BCH code
+ */
+static uint64_t compute_bch(uint8_t* frame, int startBit, int endBit, unsigned long poly, int polyLength) {  // Length of data to be checked (not including the BCH code)
+    int dataLength = endBit - startBit + 1;
+    // Total lengh (including the BCH code that will be padded to zeros (BCH code length is polyLengh-1))
+    int totalLength = dataLength + polyLength - 1;
+    // Start with the first polyLength bits
+    uint64_t result = get_bits(frame, startBit, startBit + polyLength - 1);
+    for (int i = polyLength; i <= totalLength; i++) {  // Iterate on each bit after the first polyLength batch
+        bool firstBit = result >> (polyLength - 1);
+        if (firstBit) {  // We have a leading 1 => xor the result with the poly
+            result = result ^ poly;
+        }
+        if (i < totalLength) {  // Move to next bit
+            result = result << 1;
+            if (i < dataLength) {  // Append next bit
+                result |= get_bits(frame, startBit + i, startBit + i);
+            }  // else : 0 padding after data length
+        }
+    }
+    return result;
+}
+
+// 21 bits BCH polynomial
+#define BCH_21_POLYNOMIAL 0b1001101101100111100011UL
+#define BCH_21_POLY_LENGTH 22
+// 12 bits BCH polynomial
+#define BCH_12_POLYNOMIAL 0b1010100111001UL
+#define BCH_12_POLY_LENGTH 13
+
+/**
+ * Combyte BCH1 code for the provided frame
+ */
+static uint64_t compute_bch1(uint8_t* frame) {
+    return compute_bch(frame, 25, 85, BCH_21_POLYNOMIAL, BCH_21_POLY_LENGTH);
+}
+
+/**
+ * Combyte BCH2 code for the provided frame
+ */
+static uint64_t compute_bch2(uint8_t* frame) {
+    return compute_bch(frame, 107, 132, BCH_12_POLYNOMIAL, BCH_12_POLY_LENGTH);
+}
+
+/**
+ * Set a bit in the provided frame
+ * @param buf the frame
+ * @param bit the position of the bit to set (0 based)
+ * @param v the bit value
+ */
+static void set_bit(uint8_t* buf, int bit, bool v) {
+    int byte = bit >> 3;
+    int off = 7 - (bit & 7);
+
+    if (v)
+        buf[byte] |= (1 << off);
+    else
+        buf[byte] &= ~(1 << off);
+}
+
+/**
+ * Push bits to the provided frame
+ * @param buf the frame
+ * @param pos the current frame possition (in/out, will be incremented during the opreration)
+ * @param v the bits to push (max 64)
+ * @param n the number of bits to push
+ */
+static void push_bits(uint8_t* buf, int& pos, uint64_t v, int n) {
+    for (int i = n - 1; i >= 0; i--)
+        set_bit(buf, pos++, (v >> i) & 1);
+}
+
+/**
+ * Convert a beacon to hex string representation
+ * @param frame the frame to convert
+ * @param start true for the first half of the frame, false for the second half
+ * @return the hex string representation of the specieid half of the frame
+ */
+std::string beacon_to_hex_string(const uint8_t* frame, bool start) {
+    static const char hex[] = "0123456789ABCDEF";
+
+    std::string out;
+    out.resize(18);
+
+    int offset = start ? 0 : 9;
+
+    for (int i = 0; i < 9; i++) {
+        uint8_t b = frame[offset + i];
+
+        out[i * 2] = hex[b >> 4];
+        out[i * 2 + 1] = hex[b & 0x0F];
+    }
+
+    return out;
+}
+
+/**
+ * Generate a beacon in the provided buffer
+ * @param frame the buffer to generate the frame in
+ * @param params the beacon parameters
+ * @return the size of the generated frame
+ */
+size_t generate_beacon(uint8_t* frame, const BeaconParams& params) {
+    // Clear the content of the frame
+    memset(frame, 0, 18);
+
+    int pos = 0;
+    uint32_t deg, min, sec;
+
+    // bit sync
+    for (int i = 0; i < 15; i++)
+        push_bits(frame, pos, 1, 1);
+
+    // frame sync
+    push_bits(frame, pos, params.is_test ? 0b011010000 : 0b000101111, 9);
+
+    // PDF-1 (Protexted Data field 1)
+    int pdf1_start = pos;
+
+    push_bits(frame, pos, 1, 1);  // format flag (long)
+    bool is_user = (params.protocol == BeaconProtocol::USER);
+    bool is_standard = (params.protocol == BeaconProtocol::STANDARD);
+    push_bits(frame, pos, is_user, 1);          // protocol flag
+    push_bits(frame, pos, params.country, 10);  // country code
+    switch (params.type) {
+        case BeaconType::EPIRB:
+            if (is_user)
+                push_bits(frame, pos, 0b010, 3);
+            else if (is_standard)
+                push_bits(frame, pos, 0b0010, 4);
+            else
+                push_bits(frame, pos, 0b1010, 4);
+            break;
+        case BeaconType::PLB:
+            if (is_user)
+                push_bits(frame, pos, 0b011, 3);
+            else if (is_standard)
+                push_bits(frame, pos, 0b0111, 4);
+            else
+                push_bits(frame, pos, 0b1011, 4);
+            break;
+        default:
+        case BeaconType::ELT:
+            if (is_user)
+                push_bits(frame, pos, 0b001, 3);
+            else if (is_standard)
+                push_bits(frame, pos, 0b0011, 4);
+            else
+                push_bits(frame, pos, 0b1000, 4);
+            break;
+    }
+
+    // Fill the rest of PDF 1 with zeros
+    while (pos < pdf1_start + 61)
+        push_bits(frame, pos, 0, 1);
+
+    if (is_user) {
+        // User Location Protocol: no position in PDF1
+        if (params.type == BeaconType::PLB) {
+            // Set bits for PLB
+            set_bit(frame, 40 - 1, 1);
+            set_bit(frame, 41 - 1, 1);
+            set_bit(frame, 42 - 1, 0);
+        }
+
+        set_bit(frame, 85 - 1, params.has_121_5);
+    } else if (is_standard) {
+        // Standard  Location Protocol
+        // North / south
+        set_bit(frame, 65 - 1, params.location.south);
+        // E / W
+        set_bit(frame, 75 - 1, params.location.west);
+        pos = 66 - 1;
+        // Latitude 1/4 degrees (9 bits)
+        deg = (params.location.lat_deg << 2) + (params.location.lat_min / 15);
+        push_bits(frame, pos, deg, 9);
+        pos = 76 - 1;
+        // Longitude 1/4 degrees (10 bits)
+        deg = (params.location.long_deg << 2) + (params.location.long_min / 15);
+        push_bits(frame, pos, deg, 10);
+        pos = pdf1_start + 61;
+    } else {
+        // National Location Protocol
+        // North / south
+        set_bit(frame, 59 - 1, params.location.south);
+        // E / W
+        set_bit(frame, 72 - 1, params.location.west);
+        pos = 60 - 1;
+        // Latitude degrees (7 bits)
+        push_bits(frame, pos, params.location.lat_deg, 7);
+        // Latitude min (5 bits, 2 min increment)
+        min = params.location.lat_min / 2;
+        push_bits(frame, pos, min, 5);
+        pos = 73 - 1;
+        // Longitude degrees (8 bits)
+        push_bits(frame, pos, params.location.long_deg, 8);
+        // Longiitude min (5 bits, 2 min increment)
+        min = params.location.long_min / 2;
+        push_bits(frame, pos, min, 5);
+        pos = pdf1_start + 61;
+    }
+
+    // Set BCH1
+    uint64_t bch1 = compute_bch1(frame);
+    push_bits(frame, pos, bch1, 21);
+
+    // PDF-2 (Protexted Data Field 2)
+    int pdf2_start = pos;
+    if (is_user) {
+        // User Location Protocol
+        push_bits(frame, pos, params.is_internal, 1);
+        // Latitude N/S
+        push_bits(frame, pos, params.location.south, 1);
+        // Latitude degrees (7 bits)
+        push_bits(frame, pos, params.location.lat_deg, 7);
+        // Latitude minutes (4 bits, 4 minutes precision)
+        min = params.location.lat_min / 4;
+        push_bits(frame, pos, min, 4);
+        // Longitude E/W
+        push_bits(frame, pos, params.location.west, 1);
+        // Longitude degrees (8 bits)
+        push_bits(frame, pos, params.location.long_deg, 8);
+        // Longitude minutes (4 bits, 4 minutes precision)
+        min = params.location.long_min / 4;
+        push_bits(frame, pos, min, 4);
+    } else if (is_standard) {
+        // Standard Location Protocol
+        push_bits(frame, pos, 0b1101, 4);
+        push_bits(frame, pos, params.is_internal, 1);
+        push_bits(frame, pos, params.has_121_5, 1);
+        // Latiitude
+        // +
+        push_bits(frame, pos, 1, 1);
+        // Min
+        min = params.location.lat_min % 15;
+        push_bits(frame, pos, min, 5);
+        // Sec (4 bits, 4 sec precision)
+        sec = params.location.lat_sec / 4;
+        push_bits(frame, pos, sec, 4);
+        // Longitude
+        // +
+        push_bits(frame, pos, 1, 1);
+        // Min
+        min = params.location.long_min % 15;
+        push_bits(frame, pos, min, 5);
+        // Sec (4 bits, 4 sec precision)
+        sec = params.location.long_sec / 4;
+        push_bits(frame, pos, sec, 4);
+    } else {
+        // National Location Protocol
+        push_bits(frame, pos, 0b1101, 4);
+        push_bits(frame, pos, params.is_internal, 1);
+        push_bits(frame, pos, params.has_121_5, 1);
+        // Lat
+        // +
+        push_bits(frame, pos, 1, 1);
+        // Min
+        push_bits(frame, pos, (params.location.lat_min % 2), 2);
+        // Sec (4 bits, 4 sec precision)
+        sec = params.location.lat_sec / 4;
+        push_bits(frame, pos, sec, 4);
+        // LLon
+        // +
+        push_bits(frame, pos, 1, 1);
+        // Min
+        push_bits(frame, pos, (params.location.long_min % 2), 2);
+        // Sec (4 bits, 4 sec precision)
+        sec = params.location.long_sec / 4;
+        push_bits(frame, pos, sec, 4);
+    }
+
+    while (pos < pdf2_start + 26)
+        push_bits(frame, pos, 0, 1);
+
+    // Compute BCH 2
+    uint64_t bch2 = compute_bch2(frame);
+    push_bits(frame, pos, bch2, 12);
+    return 18;
+}
+
+}  // namespace ui::external_app::epirb_tx
+
+#endif /*__BEACON_H__*/
@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef __LOCATION_H__
+#define __LOCATION_H__
+
+#include "portapack.hpp"
+#include "ui_epirb_tx.hpp"
+#include <cmath>
+#include <cctype>
+#include <cstdio>
+
+namespace ui::external_app::epirb_tx {
+
+/**
+ * Convert decimal coordinates to sexagesimal coordinates
+ * @param value the decimal value
+ * @param negative output N(false)/S(true) or E(false)/W(true) value
+ * @param deg output degrees value
+ * @param min output minutes value
+ * @param sec output seconds value
+ */
+static void decimal_to_dms(double value, bool& negative, uint16_t& deg, uint8_t& min, uint8_t& sec) {
+    negative = value < 0;
+    value = std::fabs(value);
+
+    deg = (uint16_t)value;
+
+    double m = (value - deg) * 60.0;
+    min = (uint8_t)m;
+
+    double s = (m - min) * 60.0;
+    sec = (uint8_t)(s + 0.5);
+
+    if (sec == 60) {
+        sec = 0;
+        min++;
+    }
+
+    if (min == 60) {
+        min = 0;
+        deg++;
+    }
+}
+
+/**
+ * Convert sexagesimal coordinates to decimal
+ * @param negative N(false)/S(true) or E(false)/W(true) value
+ * @param deg degrees value
+ * @param min minutes value
+ * @param sec seconds value
+ * @return value the decimal value
+ */
+static double dms_to_decimal(bool negative, uint16_t deg, uint8_t min, uint8_t sec) {
+    double v = deg + min / 60.0 + sec / 3600.0;
+    return negative ? -v : v;
+}
+
+/**
+ * Convert maidenhead locator to decima coordinates
+ * @param loc the locator
+ * @param lat output latitude
+ * @param lon output longitude
+ */
+static void maidenhead_to_decimal(const std::string& loc, float& lat, float& lon) {
+    static const double lon_step[] =
+        {
+            20.0,
+            2.0,
+            1.0 / 12.0,
+            1.0 / 120.0,
+            1.0 / 2880.0};
+
+    static const double lat_step[] =
+        {
+            10.0,
+            1.0,
+            1.0 / 24.0,
+            1.0 / 240.0,
+            1.0 / 5760.0};
+
+    lon = -180.0;
+    lat = -90.0;
+
+    int pairs = loc.size() / 2;
+    if (pairs > 5)
+        pairs = 5;
+
+    for (int i = 0; i < pairs; i++) {
+        char c1 = std::toupper(loc[i * 2]);
+        char c2 = std::toupper(loc[i * 2 + 1]);
+
+        double lon_size = lon_step[i];
+        double lat_size = lat_step[i];
+
+        int v1, v2;
+
+        if (i % 2 == 0)  // letters
+        {
+            v1 = c1 - 'A';
+            v2 = c2 - 'A';
+        } else  // digits
+        {
+            v1 = c1 - '0';
+            v2 = c2 - '0';
+        }
+
+        lon += v1 * lon_size;
+        lat += v2 * lat_size;
+    }
+
+    // Cell center
+    lon += lon_step[pairs - 1] / 2.0;
+    lat += lat_step[pairs - 1] / 2.0;
+}
+
+/**
+ * Convert decimal coordinates to maidenhead locator
+ * @param lat the latitude
+ * @param lon the longitude
+ * @param precision (optional, defaults to 8) the number of charater for the maidenhead locator
+ * @return the locator
+ */
+static std::string decimal_to_maidenhead(double lat, double lon, int precision = 8) {
+    lon += 180.0;
+    lat += 90.0;
+
+    int A = lon / 20;
+    int B = lat / 10;
+
+    lon -= A * 20;
+    lat -= B * 10;
+
+    int C = lon / 2;
+    int D = lat / 1;
+
+    lon -= C * 2;
+    lat -= D * 1;
+
+    int E = lon / (5.0 / 60.0);
+    int F = lat / (2.5 / 60.0);
+
+    lon -= E * (5.0 / 60.0);
+    lat -= F * (2.5 / 60.0);
+
+    int G = lon / (5.0 / 600.0);
+    int H = lat / (2.5 / 600.0);
+
+    std::string locator;
+
+    locator += char('A' + A);
+    locator += char('A' + B);
+
+    if (precision >= 4) {
+        locator += char('0' + C);
+        locator += char('0' + D);
+    }
+
+    if (precision >= 6) {
+        locator += char('a' + E);
+        locator += char('a' + F);
+    }
+
+    if (precision >= 8) {
+        locator += char('0' + G);
+        locator += char('0' + H);
+    }
+
+    return locator;
+}
+
+/**
+ * Init the provided Location values from its locator
+ */
+void init_from_locator(Location& loc) {
+    maidenhead_to_decimal(loc.locator, loc.latitude, loc.longitude);
+
+    decimal_to_dms(loc.latitude,
+                   loc.south,
+                   loc.lat_deg,
+                   loc.lat_min,
+                   loc.lat_sec);
+
+    decimal_to_dms(loc.longitude,
+                   loc.west,
+                   loc.long_deg,
+                   loc.long_min,
+                   loc.long_sec);
+}
+
+/**
+ * Init the provided Location values from its decimal coordinates
+ */
+void init_from_decimal(Location& loc) {
+    decimal_to_dms(loc.latitude,
+                   loc.south,
+                   loc.lat_deg,
+                   loc.lat_min,
+                   loc.lat_sec);
+
+    decimal_to_dms(loc.longitude,
+                   loc.west,
+                   loc.long_deg,
+                   loc.long_min,
+                   loc.long_sec);
+
+    loc.locator = decimal_to_maidenhead(loc.latitude, loc.longitude);
+}
+
+/**
+ * Init the provided Location values from its sexagesimal coordinates
+ */
+void init_from_dms(Location& loc) {
+    loc.latitude = dms_to_decimal(
+        loc.south,
+        loc.lat_deg,
+        loc.lat_min,
+        loc.lat_sec);
+
+    loc.longitude = dms_to_decimal(
+        loc.west,
+        loc.long_deg,
+        loc.long_min,
+        loc.long_sec);
+
+    loc.locator = decimal_to_maidenhead(loc.latitude, loc.longitude);
+}
+
+/**
+ * Convert the provided Loaction to it's latitude string (format <xxx°yy'zz"N>)
+ */
+std::string to_latitude_string(const Location& location) {
+    char buffer[16];
+    // Format :  <xxx°yy'zz"N>
+    snprintf(buffer, sizeof(buffer), "%3d\260%02d'%02d\"%c", location.lat_deg, location.lat_min, location.lat_sec, location.south ? 'S' : 'N');
+    return std::string(buffer);
+}
+
+/**
+ * Convert the provided Loaction to it's longitude string (format <xxx°yy'zz"W>)
+ */
+std::string to_longitude_string(const Location& location) {
+    char buffer[16];
+    // Format :  <xxx°yy'zz"W>
+    snprintf(buffer, sizeof(buffer), "%3d\260%02d'%02d\"%c", location.long_deg, location.long_min, location.long_sec, location.west ? 'W' : 'E');
+    return std::string(buffer);
+}
+
+}  // namespace ui::external_app::epirb_tx
+
+#endif /*__LOCATION_H__*/
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui.hpp"
+#include "ui_epirb_tx.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::epirb_tx {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<EPIRBTXAppView>();
+}
+}  // namespace ui::external_app::epirb_tx
+extern "C" {
+
+__attribute__((section(".external_app.app_epirb_tx.application_information"), used)) application_information_t _application_information_epirb_tx = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::epirb_tx::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "EPIRB TX",
+    /*.bitmap_data = */ {
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x7C,
+        0x3E,
+        0xFE,
+        0x7F,
+        0xFF,
+        0xFF,
+        0xF7,
+        0xEF,
+        0xE3,
+        0xC7,
+        0xE3,
+        0xC7,
+        0xE3,
+        0xC7,
+        0xE3,
+        0xC7,
+        0xF7,
+        0xEF,
+        0xFF,
+        0xFF,
+        0xFE,
+        0x7F,
+        0x7C,
+        0x3E,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+    },
+    /*.icon_color = */ ui::Color::green().v,
+    /*.menu_location = */ app_location_t::TX,
+    /*.desired_menu_position = */ -1,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_epirb_tx */ {'P', 'E', 'P', 'T'},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}
@@ -0,0 +1,632 @@
+/*
+ * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui_epirb_tx.hpp"
+
+#include "tonesets.hpp"
+#include "portapack.hpp"
+#include "baseband_api.hpp"
+#include "string_format.hpp"
+#include "file_reader.hpp"
+#include "file_path.hpp"
+#include "ui_geomap.hpp"
+#include "ui_alphanum.hpp"
+
+#include <cstring>
+#include <stdio.h>
+
+#include "beacon.hpp"
+
+using namespace portapack;
+
+namespace ui::external_app::epirb_tx {
+
+void EPIRBTXAppView::focus() {
+    button_tx.focus();
+}
+
+EPIRBTXAppView::~EPIRBTXAppView() {
+    // Restore original frequency before leaving
+    transmitter_model.set_target_frequency(original_frequency);
+    transmitter_model.disable();
+    baseband::shutdown();
+}
+
+/**
+ * Conversion from hex char to half byte
+ */
+static uint8_t hexval(char c) {
+    if (c >= '0' && c <= '9') return c - '0';
+    if (c >= 'A' && c <= 'F') return c - 'A' + 10;
+    if (c >= 'a' && c <= 'f') return c - 'a' + 10;
+    return 0;
+}
+
+/**
+ * Convert from hex chars to uint8_t
+ */
+static uint8_t hexToByte(char high, char low) {
+    return (hexval(high) << 4) | hexval(low);
+}
+
+std::string EPIRBTXAppView::frame_to_hex_string(bool start) {
+    return beacon_to_hex_string(epirb_tx_message.data, start);
+}
+
+void EPIRBTXAppView::generate_frame(BeaconParams params) {
+    epirb_tx_message.data_len = generate_beacon(epirb_tx_message.data, params);
+}
+
+void EPIRBTXAppView::on_timer() {
+    // Timer is called on display refresh
+    if (loop) {
+        if (loop_enabled) {
+            // chTimeNow() returns milliseconds on our version of ChibiOS / Hardware
+            auto now = chTimeNow();
+            auto elapsed = ((now - last_frame_time) / 1000);
+            std::string timeout = std::to_string((uint32_t)(delay > elapsed ? delay - elapsed : 0));
+            if (timeout != text_timeout.get()) {
+                // Update timeout text every seconds
+                text_timeout.set(timeout);
+            }
+            if (now > (last_frame_time + (delay * 1000))) {
+                // Send a new frame after the delay
+                start_tx();
+            }
+        } else {
+            // Stop send loop
+            loop = false;
+        }
+    }
+}
+
+void EPIRBTXAppView::update_bpsk_frequency() {
+    bool was_transmitting = false;
+    if (transmitting && (am_enabled || transmitting_bpsk)) {
+        // We need to stop transmission before changing frequency
+        transmitter_model.disable();
+        was_transmitting = true;
+    }
+    transmitter_model.set_target_frequency(bpsk_frequency);
+    // Update displayed frequency
+    tx_view.on_show();
+    if (was_transmitting) {
+        // Start over
+        start_tx();
+    }
+}
+
+void EPIRBTXAppView::update_am_transmission() {
+    if (am_enabled && transmitting && !transmitting_bpsk) {
+        // Start am transmission
+        // Restore am frequency
+        epirb_tx_message.mode_bpsk = false;
+        transmitter_model.set_target_frequency(am_frequency);
+        // Send config to baseband
+        baseband::set_epirb_tx_config(epirb_tx_message);
+        // Start transmitting
+        transmitter_model.enable();
+    } else if (transmitting && !transmitting_bpsk) {
+        // Stop am transmission
+        transmitter_model.disable();
+        tx_view.set_transmitting(false);
+    }
+}
+
+void EPIRBTXAppView::update_frame(bool updateConfig) {
+    if (mode_file) {
+        // In file mode, currently selected beacon has changed => load the new one
+        Beacon& beacon = beacons[selected_beacon];
+        // Set desciption
+        text_description.set(beacon.description.substr(0, max_text_width_ext));
+        text_description_end.set(beacon.description.size() > max_text_width_ext ? "-" + beacon.description.substr(max_text_width_ext, max_text_width_ext + max_text_width_ext - 1) : "");
+        // Udapte frame content on display
+        text_frame.set(beacon.frame.substr(0, 18));
+        text_frame_end.set(beacon.frame.size() > 18 ? beacon.frame.substr(18, 36) : "");
+        // Prepare tx configuration
+        epirb_tx_message.data_len = std::min<size_t>((beacon.frame.size() / 2), 18);
+        for (uint8_t i = 0; i < epirb_tx_message.data_len; i++) {
+            epirb_tx_message.data[i] = hexToByte(
+                beacon.frame[2 * i],
+                beacon.frame[2 * i + 1]);
+        }
+    } else {
+        // In manual mode, generate frame content for current beacon params
+        generate_frame(beacon_params);
+        // Update frame content on display
+        text_frame.set(frame_to_hex_string(true));
+        text_frame_end.set(frame_to_hex_string(false));
+    }
+    if (updateConfig && send_on_change && loop) {
+        // Need to update config / send new beacon
+        if (am_enabled) {
+            // Already transmitting => update config
+            last_frame_time = chTimeNow();
+            update_config();
+        } else {
+            // Not yet transmitting => start tx
+            start_tx();
+        }
+    }
+}
+
+void EPIRBTXAppView::update_config() {
+    if (!epirb_tx_message.mode_bpsk) {
+        // Previously in AM mode => restore bpsk frequency
+        transmitter_model.set_target_frequency(bpsk_frequency);
+        // Update displayed frequency
+        tx_view.on_show();
+    }
+    // Set mode to bpsk
+    epirb_tx_message.mode_bpsk = true;
+    transmitting_bpsk = true;
+    // Set pre/post count
+    epirb_tx_message.pre_count = (160 * TONES_SAMPLERATE) / 1000;   // 160 ms carrier (COSPAS spec.)
+    epirb_tx_message.post_count = (100 * TONES_SAMPLERATE) / 1000;  // 100 ms
+    // Send config to baseband
+    baseband::set_epirb_tx_config(epirb_tx_message);
+}
+
+void EPIRBTXAppView::set_tx_button_state(bool active) {
+    button_tx.set_text(active ? "START" : "STOP");
+    button_tx.set_style(active ? &style_tx_start : &style_tx_stop);
+}
+
+void EPIRBTXAppView::start_tx() {
+    last_frame_time = chTimeNow();
+    update_config();
+    loop = loop_enabled;
+    transmitter_model.enable();
+    tx_view.set_transmitting(true);
+    set_tx_button_state(false);
+    transmitting = true;
+}
+
+void EPIRBTXAppView::stop_tx() {
+    loop = false;
+    transmitter_model.disable();
+    tx_view.set_transmitting(false);
+    set_tx_button_state(true);
+    transmitting = false;
+}
+
+void EPIRBTXAppView::on_tx_progress(const uint32_t progress, const bool done) {
+    (void)progress;
+    if (done) {
+        transmitting_bpsk = false;
+        if (am_enabled) {
+            // BPSK frame sent, switch back to 121.5 AM signal
+            epirb_tx_message.mode_bpsk = false;
+            // Start am transmission
+            update_am_transmission();
+        } else {
+            // End of BPSK frame
+            transmitter_model.disable();
+            tx_view.set_transmitting(false);
+            if (!loop) {
+                // Not looping => update transmission state
+                set_tx_button_state(true);
+                transmitting = false;
+            }
+        }
+    }
+}
+
+void EPIRBTXAppView::update_location(bool updateLocatorField) {
+    locator = beacon_params.location.locator;
+    if (updateLocatorField) text_field_beacon_locator.set_text(beacon_params.location.locator);
+    text_beacon_latitude_value.set(to_latitude_string(beacon_params.location));
+    text_beacon_longitude_value.set(to_longitude_string(beacon_params.location));
+}
+
+void EPIRBTXAppView::update_mode() {
+    // Hide / show widgets for file mode or manual mode
+    text_beacon.hidden(!mode_file);
+    text_description_label.hidden(!mode_file);
+    options_frame.hidden(!mode_file);
+    text_description.hidden(!mode_file);
+    text_description_end.hidden(!mode_file);
+    text_beacon_type.hidden(mode_file);
+    text_beacon_country.hidden(mode_file);
+    checkbox_beacon_internal.hidden(mode_file);
+    text_beacon_locator.hidden(mode_file);
+    text_beacon_latitude.hidden(mode_file);
+    text_beacon_latitude_value.hidden(mode_file);
+    text_beacon_longitude.hidden(mode_file);
+    text_beacon_longitude_value.hidden(mode_file);
+    button_mangps.hidden(mode_file);
+    options_beacon_type.hidden(mode_file);
+    options_beacon_protocol.hidden(mode_file);
+    options_beacon_country.hidden(mode_file);
+    text_field_beacon_locator.hidden(mode_file);
+}
+
+EPIRBTXAppView::EPIRBTXAppView(
+    NavigationView& nav) {
+    baseband::run_prepared_image(portapack::memory::map::m4_code.base());
+
+    add_children({&labels,
+                  &options_mode,
+                  &text_beacon,
+                  &text_description_label,
+                  &text_beacon_type,
+                  &options_beacon_type,
+                  &options_beacon_protocol,
+                  &text_beacon_country,
+                  &options_beacon_country,
+                  &checkbox_beacon_internal,
+                  &text_beacon_locator,
+                  &text_beacon_latitude,
+                  &text_beacon_latitude_value,
+                  &text_beacon_longitude,
+                  &text_beacon_longitude_value,
+                  &button_mangps,
+                  &text_field_beacon_locator,
+                  &options_frame,
+                  &text_description,
+                  &text_description_end,
+                  &text_frame,
+                  &text_frame_end,
+                  &text_timeout,
+                  &checkbox_loop,
+                  &field_delay,
+                  &button_tx,
+                  &checkbox_am,
+                  &field_am_frequency,
+                  &checkbox_send_on_change,
+                  &options_am_channel,
+                  &options_bpsk_channel,
+                  &tx_view});
+
+    text_beacon.set_style(Theme::getInstance()->fg_light);
+    text_description_label.set_style(Theme::getInstance()->fg_light);
+    text_beacon_type.set_style(Theme::getInstance()->fg_light);
+    text_beacon_country.set_style(Theme::getInstance()->fg_light);
+    text_beacon_locator.set_style(Theme::getInstance()->fg_light);
+    text_beacon_latitude.set_style(Theme::getInstance()->fg_light);
+    text_beacon_longitude.set_style(Theme::getInstance()->fg_light);
+
+    // Restore settings
+    checkbox_am.set_value(am_enabled);
+    checkbox_loop.set_value(loop_enabled);
+    checkbox_send_on_change.set_value(send_on_change);
+    options_mode.set_by_value(!mode_file);
+    transmitter_model.set_target_frequency(bpsk_frequency);
+    field_am_frequency.set_value(am_frequency);
+    options_am_channel.set_by_value(am_channel);
+    options_am_channel.set_style((am_channel == (uint8_t)AmChannel::REAL) ? Theme::getInstance()->fg_red : Theme::getInstance()->bg_darkest);
+    manual_am_frequency = am_frequency;
+    options_bpsk_channel.set_by_value(bpsk_channel);
+    manual_bpsk_frequency = bpsk_frequency;
+    field_delay.set_value(delay);
+    options_beacon_type.set_by_value(beacon_type);
+    options_beacon_protocol.set_by_value(beacon_protocol);
+    options_beacon_country.set_by_value(beacon_country);
+    checkbox_beacon_internal.set_value(beacon_internal);
+    beacon_params.type = (BeaconType)beacon_type;
+    beacon_params.has_121_5 = am_enabled;
+    beacon_params.location.locator = locator;
+    beacon_params.is_internal = beacon_internal;
+    init_from_locator(beacon_params.location);
+    update_mode();
+    update_location();
+
+    options_mode.on_change = [this](size_t, OptionsField::value_t value) {
+        mode_file = (((BeaconMode)value) == BeaconMode::FILE);
+        update_mode();
+        update_frame();
+        set_dirty();
+    };
+
+    options_beacon_type.on_change = [this](size_t, OptionsField::value_t value) {
+        beacon_params.type = (BeaconType)value;
+        beacon_type = value;
+        update_frame();
+        set_dirty();
+    };
+
+    options_beacon_protocol.on_change = [this](size_t, OptionsField::value_t value) {
+        beacon_params.protocol = (BeaconProtocol)value;
+        beacon_protocol = value;
+        update_frame();
+        set_dirty();
+    };
+
+    options_beacon_country.on_change = [this](size_t, OptionsField::value_t v) {
+        beacon_params.country = v;
+        beacon_country = v;
+        update_frame();
+        set_dirty();
+    };
+
+    options_am_channel.on_change = [this](size_t, OptionsField::value_t v) {
+        bool is_real = false;
+        switch ((AmChannel)v) {
+            case AmChannel::REAL:
+                is_real = true;
+                am_frequency = AM_REAL_FREQUENCY;
+                break;
+            case AmChannel::MANUAL:
+                am_frequency = manual_am_frequency;
+                break;
+            default:
+                v = (uint8_t)AmChannel::TEST;
+                // fallthrough
+            case AmChannel::TEST:
+                am_frequency = AM_TEST_FREQUENCY;
+                break;
+        }
+        // Actual frequency change will be done by field_am_frequency.on_change()
+        field_am_frequency.set_value(am_frequency);
+        am_channel = v;
+        options_am_channel.set_style(is_real ? Theme::getInstance()->fg_red : Theme::getInstance()->bg_darkest);
+        set_dirty();
+    };
+
+    options_bpsk_channel.on_change = [this](size_t, OptionsField::value_t v) {
+        switch ((BpskChannel)v) {
+            case BpskChannel::MANUAL:
+                bpsk_frequency = manual_bpsk_frequency;
+                break;
+            case BpskChannel::B:
+                bpsk_frequency = BPSK_FREQUENCY_B;
+                break;
+            case BpskChannel::C:
+                bpsk_frequency = BPSK_FREQUENCY_C;
+                break;
+            case BpskChannel::F:
+                bpsk_frequency = BPSK_FREQUENCY_F;
+                break;
+            case BpskChannel::G:
+                bpsk_frequency = BPSK_FREQUENCY_G;
+                break;
+            case BpskChannel::J:
+                bpsk_frequency = BPSK_FREQUENCY_J;
+                break;
+            case BpskChannel::K:
+                bpsk_frequency = BPSK_FREQUENCY_K;
+                break;
+            case BpskChannel::N:
+                bpsk_frequency = BPSK_FREQUENCY_N;
+                break;
+            case BpskChannel::O:
+                bpsk_frequency = BPSK_FREQUENCY_O;
+                break;
+            default:
+                v = (uint8_t)BpskChannel::HAM;
+                // fallthrough
+            case BpskChannel::HAM:
+                bpsk_frequency = BPSK_FREQUENCY_HAM;
+                break;
+        }
+        bpsk_channel = v;
+        update_bpsk_frequency();
+        set_dirty();
+    };
+
+    checkbox_beacon_internal.on_select = [this](Checkbox&, bool v) {
+        beacon_internal = v;
+        beacon_params.is_internal = v;
+        update_frame();
+        set_dirty();
+    };
+
+    text_field_beacon_locator.on_select = [this, &nav](TextField&) mutable {
+        auto te_view = nav.push<AlphanumView>(locator, 10, ENTER_KEYBOARD_MODE_ALPHA);
+        te_view->on_changed = [this](std::string& value) {
+            beacon_params.location.locator = value;
+            init_from_locator(beacon_params.location);
+            update_location();
+            update_frame();
+            set_dirty();
+        };
+    };
+
+    button_mangps.on_select = [this, &nav](Button&) {
+        nav.push<GeoMapView>(
+            0,
+            GeoPos::alt_unit::METERS,
+            GeoPos::spd_unit::HIDDEN,
+            beacon_params.location.latitude,
+            beacon_params.location.longitude,
+            [this](int32_t, float lat, float lon, int32_t) {
+                beacon_params.location.latitude = lat;
+                beacon_params.location.longitude = lon;
+                init_from_decimal(beacon_params.location);
+                // Update locator field
+                update_location();
+                update_frame();
+                set_dirty();
+            });
+    };
+
+    field_am_frequency.on_change = [this](rf::Frequency freq) {
+        am_frequency = freq;
+        if (transmitting && !transmitting_bpsk && am_enabled)
+            // Update transmitter frequency
+            transmitter_model.set_target_frequency(am_frequency);
+    };
+
+    // Load available beacons from BEACONS.TXT files (or default).
+    load_beacons();
+    // Setup options_frame content with loaded beacons
+    using option_t = std::pair<std::string, int32_t>;
+    using options_t = std::vector<option_t>;
+    options_t entries;
+    for (const auto& beacon : beacons)
+        entries.emplace_back(beacon.title, entries.size());
+
+    options_frame.set_options(std::move(entries));
+    if (selected_beacon >= beacons.size())
+        // BEACONS.TXT file has changed since last launch, default index to 0
+        selected_beacon = 0;
+    options_frame.set_selected_index(selected_beacon);
+    options_frame.on_change = [this](size_t index, OptionsField::value_t) {
+        selected_beacon = index;
+        update_frame();
+        set_dirty();
+    };
+
+    // Init frame content / baseband param with currently setup beacon
+    update_frame(false);
+
+    checkbox_loop.on_select = [this](Checkbox&, bool v) {
+        loop_enabled = v;
+    };
+
+    field_delay.on_change = [this](int32_t v) {
+        delay = v;
+    };
+
+    checkbox_am.on_select = [this](Checkbox&, bool v) {
+        beacon_params.has_121_5 = v;
+        am_enabled = v;
+        update_am_transmission();
+        // We update the additional location device data in the frame based on this
+        if (!mode_file) update_frame(false);
+    };
+
+    // AM frequency field edit
+    field_am_frequency.on_edit = [this, &nav]() {
+        auto new_view = nav.push<FrequencyKeypadView>(field_am_frequency.value());
+        new_view->on_changed = [this](rf::Frequency f) {
+            switch (f) {
+                case AM_REAL_FREQUENCY:
+                    am_channel = (uint8_t)AmChannel::REAL;
+                    break;
+                case AM_TEST_FREQUENCY:
+                    am_channel = (uint8_t)AmChannel::TEST;
+                    break;
+                default:
+                    manual_am_frequency = f;
+                    am_channel = (uint8_t)AmChannel::MANUAL;
+                    break;
+            }
+            // Actual frequency change will be done by options_am_channel.on_change()
+            options_am_channel.set_by_value(am_channel);
+            set_dirty();
+        };
+    };
+
+    checkbox_send_on_change.on_select = [this](Checkbox&, bool v) {
+        send_on_change = v;
+    };
+
+    tx_view.on_edit_frequency = [this, &nav]() {
+        auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
+        new_view->on_changed = [this](rf::Frequency f) {
+            bpsk_frequency = f;
+            switch (f) {
+                case BPSK_FREQUENCY_HAM:
+                    bpsk_channel = (uint8_t)BpskChannel::HAM;
+                    break;
+                case BPSK_FREQUENCY_B:
+                    bpsk_channel = (uint8_t)BpskChannel::B;
+                    break;
+                case BPSK_FREQUENCY_C:
+                    bpsk_channel = (uint8_t)BpskChannel::C;
+                    break;
+                case BPSK_FREQUENCY_F:
+                    bpsk_channel = (uint8_t)BpskChannel::F;
+                    break;
+                case BPSK_FREQUENCY_G:
+                    bpsk_channel = (uint8_t)BpskChannel::G;
+                    break;
+                case BPSK_FREQUENCY_J:
+                    bpsk_channel = (uint8_t)BpskChannel::J;
+                    break;
+                case BPSK_FREQUENCY_K:
+                    bpsk_channel = (uint8_t)BpskChannel::K;
+                    break;
+                case BPSK_FREQUENCY_N:
+                    bpsk_channel = (uint8_t)BpskChannel::N;
+                    break;
+                case BPSK_FREQUENCY_O:
+                    bpsk_channel = (uint8_t)BpskChannel::O;
+                    break;
+                default:
+                    bpsk_channel = (uint8_t)BpskChannel::MANUAL;
+                    manual_bpsk_frequency = bpsk_frequency;
+                    break;
+            }
+            // Actual frequency change will be done by options_bpsk_channel.on_change()
+            options_bpsk_channel.set_by_value(bpsk_channel);
+            set_dirty();
+        };
+    };
+
+    tx_view.on_start = [this]() {
+        start_tx();
+    };
+
+    tx_view.on_stop = [this]() {
+        stop_tx();
+    };
+
+    button_tx.on_select = [this](Button&) {
+        if (!transmitting)
+            start_tx();
+        else
+            stop_tx();
+    };
+}
+
+/**
+ * Load beacons from /EPIRB/BEACONS.TXT file on sd card
+ */
+void EPIRBTXAppView::load_beacons() {
+    File beacons_file;
+    auto error = beacons_file.open(epirb_dir / u"BEACONS.TXT");
+    beacons.clear();
+
+    if (!error) {
+        // BEACONS.TXT file exists
+        auto reader = FileLineReader(beacons_file);
+        for (const auto& line : reader) {
+            // Skip comment lines
+            if (line.length() == 0 || line[0] == '#')
+                continue;
+
+            // Split line with ';' separator
+            auto cols = split_string(line, ';');
+            if (cols.size() != 3)
+                continue;
+
+            // Read current beacon
+            Beacon beacon{};
+            beacon.title = trim(cols[0]);
+            beacon.description = trim(cols[1]);
+            // Make sure frame is not longer tha 18 bytes / 36 hex character
+            beacon.frame = trim(cols[2]).substr(0, 36);
+            size_t size = beacon.frame.size();
+            if (size <= 0)
+                continue;  // Invalid line.
+            // Beacon is valid, add it to the list
+            beacons.emplace_back(std::move(beacon));
+        }
+    }
+    if (beacons.empty()) {
+        // No beacons file or empty flile: just add default beacon
+        beacons.push_back(default_beacon);
+    }
+}
+
+}  // namespace ui::external_app::epirb_tx
@@ -0,0 +1,404 @@
+/*
+ * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __EPIRB_TX_H__
+#define __EPIRB_TX_H__
+
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "ui.hpp"
+#include "ui_widget.hpp"
+#include "ui_navigation.hpp"
+#include "ui_transmitter.hpp"
+
+#include "portapack.hpp"
+#include "message.hpp"
+#include "tonesets.hpp"
+
+#define BEACON_HEXA_SIZE 36
+#define BEACON_HEXA_HALF_SIZE 18
+#define BEACON_SIZE 18
+
+#define AM_TEST_FREQUENCY 121375000
+#define AM_REAL_FREQUENCY 121500000
+
+#define BPSK_FREQUENCY_HAM 433025000
+#define BPSK_FREQUENCY_B 406025000
+#define BPSK_FREQUENCY_C 406028000
+#define BPSK_FREQUENCY_F 406037000
+#define BPSK_FREQUENCY_G 406040000
+#define BPSK_FREQUENCY_J 406049000
+#define BPSK_FREQUENCY_K 406052000
+#define BPSK_FREQUENCY_N 406061000
+#define BPSK_FREQUENCY_O 406064000
+
+namespace ui::external_app::epirb_tx {
+
+enum class BeaconMode {
+    FILE = 0,
+    MODE_MANUAL = 1
+};
+
+enum class BeaconType {
+    EPIRB = 0,
+    ELT = 1,
+    PLB = 2
+};
+
+enum class BeaconProtocol {
+    USER = 0,
+    STANDARD = 1,
+    NATIONAL = 2
+};
+
+enum class AmChannel {
+    TEST = 0,
+    REAL = 1,
+    MANUAL = 2
+};
+
+enum class BpskChannel {
+    HAM = 0,
+    B = 1,
+    C = 2,
+    F = 3,
+    G = 4,
+    J = 5,
+    K = 6,
+    N = 7,
+    O = 8,
+    MANUAL = 10
+};
+
+struct Location {
+    std::string locator;
+    bool south;
+    uint16_t lat_deg;
+    uint8_t lat_min;
+    uint8_t lat_sec;
+    float latitude;
+    bool west;
+    uint16_t long_deg;
+    uint8_t long_min;
+    uint8_t long_sec;
+    float longitude;
+};
+
+struct BeaconParams {
+    BeaconType type;
+    BeaconProtocol protocol;
+    uint32_t country;
+    bool is_test;
+    bool is_internal;
+    bool has_121_5;
+    Location location;
+};
+
+class EPIRBTXAppView : public View {
+   public:
+    EPIRBTXAppView(NavigationView& nav);
+    ~EPIRBTXAppView();
+
+    void focus() override;
+
+    std::string title() const override { return "EPIRB TX"; };
+
+   private:
+    void start_tx();
+    void stop_tx();
+    void update_config();
+    void on_tx_progress(const uint32_t progress, const bool done);
+    void on_timer();
+    void load_beacons();
+    void set_tx_button_state(bool active);
+    std::string frame_to_hex_string(bool start);
+    void generate_frame(BeaconParams params);
+    void update_frame(bool updateConfig = true);
+    void update_bpsk_frequency();
+    void update_am_transmission();
+    void update_mode();
+    void update_location(bool updateLocatorField = true);
+
+    struct Beacon {
+        std::string title{};
+        std::string description{};
+        std::string frame{};
+    };
+    std::vector<Beacon> beacons{};
+    Beacon default_beacon{"Self test", "Serial User Location Protocol", "FFFED0D6E6202820000C29FF51041775302D"};
+
+    BeaconParams beacon_params{BeaconType::ELT, BeaconProtocol::STANDARD, 227, true, true, true, {"JN03RO", false, 0, 0, 0, 0, false, 0, 0, 0, 0}};
+
+    // Currently selected beacon index (from BEACONS.TXT file / options_frame combo)
+    uint32_t selected_beacon{0};
+
+    // Frequency of the transmitter before starting the app (used to restore frequency when leaving)
+    rf::Frequency original_frequency{0};
+    // Frequency of the AM emergency signal
+    rf::Frequency am_frequency{AM_TEST_FREQUENCY};
+    // Frequency of the 406 MHz BPSK signal
+    rf::Frequency bpsk_frequency{BPSK_FREQUENCY_HAM};
+    // Selected am channel
+    uint8_t am_channel{(uint8_t)AmChannel::TEST};
+    // Selected bpsk channel
+    uint8_t bpsk_channel{(uint8_t)BpskChannel::HAM};
+    // Manual AM frequency value
+    rf::Frequency manual_am_frequency{AM_TEST_FREQUENCY};
+    // Manual BPSK frequency value
+    rf::Frequency manual_bpsk_frequency{BPSK_FREQUENCY_HAM};
+
+    // True when using a beacon from the BEACONS.TXT file
+    bool mode_file{false};
+    // True when looping on sending beacons is enabled
+    bool loop_enabled{true};
+    // True if AM emergency signal transmission is enabled
+    bool am_enabled{true};
+    // True if we want to send a new frame each time the user changes the current beacon
+    bool send_on_change{true};
+    // The current locator string
+    std::string locator{"JN03RO"};
+    // The delay between each frame when on loop mode
+    uint32_t delay{50};
+    uint8_t beacon_type{(uint8_t)BeaconType::EPIRB};
+    // Currently selected beacon protocol
+    uint8_t beacon_protocol{(uint8_t)BeaconProtocol::USER};
+    // Currently selected beacon country
+    uint32_t beacon_country{227};
+    // Current beacon's internal state (true for internal location system)
+    bool beacon_internal{true};
+
+    TxRadioState radio_state_{
+        0 /* frequency */,
+        1750000 /* bandwidth */,
+        TONES_SAMPLERATE /* sampling rate */
+    };
+    app_settings::SettingsManager settings_{
+        "tx_epirb",
+        app_settings::Mode::TX,
+        {
+            {"sbeacon"sv, &selected_beacon},
+            {"amfreq"sv, &am_frequency},
+            {"bpskfreq"sv, &bpsk_frequency},
+            {"amchan"sv, &am_channel},
+            {"bpskchan"sv, &bpsk_channel},
+            {"loop"sv, &loop_enabled},
+            {"delay"sv, &delay},
+            {"file"sv, &mode_file},
+            {"am"sv, &am_enabled},
+            {"soc"sv, &send_on_change},
+            {"type"sv, &beacon_type},
+            {"proto"sv, &beacon_protocol},
+            {"country"sv, &beacon_country},
+            {"internal"sv, &beacon_internal},
+            {"locator"sv, &locator},
+        }};
+
+    // Time of the last sent frame
+    uint32_t last_frame_time{0};
+    // True when transmission is enabled
+    bool transmitting{false};
+    // True when transmitting a BPSK frame
+    bool transmitting_bpsk{false};
+    // True when currently looping on sending beacons
+    bool loop{false};
+
+    // Current EPIRBTXDataMessage for baseband
+    EPIRBTXDataMessage epirb_tx_message{};
+
+    const size_t max_text_width = UI_POS_WIDTH_REMAINING(6) / UI_POS_DEFAULT_WIDTH;
+    const size_t max_text_width_ext = UI_POS_WIDTH_REMAINING(0) / UI_POS_DEFAULT_WIDTH;
+
+    Labels labels{
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Source:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(6)}, "Frame:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(10)}, "Next frame in   s.", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(12)}, "AM frequency:         MHz", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(14)}, "AM   chan.:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(15)}, "BPSK chan.:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(17), UI_POS_Y(9)}, "s.", Theme::getInstance()->fg_light->foreground}};
+
+    // For file mode
+    Text text_beacon{
+        {UI_POS_X(0), UI_POS_Y(1), UI_POS_WIDTH(7), UI_POS_DEFAULT_HEIGHT},
+        "Beacon:"};
+    // Beacon selection from BEACONS.TXT
+    OptionsField options_frame{
+        {UI_POS_X(7), UI_POS_Y(1)},
+        30,
+        {}};
+    Text text_description_label{
+        {UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT},
+        "Description:"};
+    Text text_description{
+        {UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH_REMAINING(0), UI_POS_DEFAULT_HEIGHT},
+        ""};
+    Text text_description_end{
+        {UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH_REMAINING(0), UI_POS_DEFAULT_HEIGHT},
+        ""};
+
+    // For manual mode
+    Text text_beacon_type{
+        {UI_POS_X(0), UI_POS_Y(1), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
+        "Type:"};
+    Text text_beacon_country{
+        {UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
+        "Country:"};
+    Checkbox checkbox_beacon_internal{
+        {UI_POS_X_RIGHT(12), UI_POS_Y(2)},
+        12,
+        "Internal",
+        true};
+    Text text_beacon_locator{
+        {UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
+        "Locator:"};
+    Text text_beacon_latitude{
+        {UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
+        "Lat.:"};
+    Text text_beacon_longitude{
+        {UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
+        "Long.:"};
+    Text text_beacon_latitude_value{
+        {UI_POS_X(7), UI_POS_Y(4), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT},
+        ""};
+    Text text_beacon_longitude_value{
+        {UI_POS_X(7), UI_POS_Y(5), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT},
+        ""};
+    OptionsField options_beacon_type{
+        {UI_POS_X(9), UI_POS_Y(1)},
+        7,
+        {{"EPIRB", (uint8_t)BeaconType::EPIRB},
+         {"ELT", (uint8_t)BeaconType::ELT},
+         {"PLB", (uint8_t)BeaconType::PLB}}};
+    OptionsField options_beacon_protocol{
+        {UI_POS_X(9 + 7), UI_POS_Y(1)},
+        30,
+        {{"User", (uint8_t)BeaconProtocol::USER},
+         {"Standard", (uint8_t)BeaconProtocol::STANDARD},
+         {"National", (uint8_t)BeaconProtocol::NATIONAL}}};
+    OptionsField options_beacon_country{
+        {UI_POS_X(9), UI_POS_Y(2)},
+        7,
+        {{"France", 227},
+         {"USA", 366},
+         {"Germany", 211},
+         {"Russia", 273},
+         {"Spain", 224},
+         {"Japan", 431},
+         {"UK", 232}}};
+    TextField text_field_beacon_locator{
+        {UI_POS_X(9), UI_POS_Y(3), UI_POS_WIDTH(10), UI_POS_DEFAULT_HEIGHT},
+        "JN03RO"};
+    Button button_mangps{
+        {UI_POS_X_RIGHT(9), UI_POS_Y(3), UI_POS_WIDTH(9), UI_POS_HEIGHT(2)},
+        "Set pos."};
+
+    // Mode selection (file/manual)
+    OptionsField options_mode{
+        {UI_POS_X(7), UI_POS_Y(0)},
+        30,
+        {{"File (BEACONS.TXT)", (uint8_t)BeaconMode::FILE},
+         {"Manual (Editor)", (uint8_t)BeaconMode::MODE_MANUAL}}};
+
+    // Frame content
+    Text text_frame{
+        {UI_POS_X(6), UI_POS_Y(6), UI_POS_WIDTH_REMAINING(6), UI_POS_DEFAULT_HEIGHT},
+        ""};
+    Text text_frame_end{
+        {UI_POS_X(6), UI_POS_Y(7), UI_POS_WIDTH_REMAINING(6), UI_POS_DEFAULT_HEIGHT},
+        ""};
+
+    Text text_timeout{
+        {UI_POS_X(14), UI_POS_Y(10), UI_POS_WIDTH(2), UI_POS_DEFAULT_HEIGHT},
+        ""};
+
+    // Transmission settings
+    Checkbox checkbox_loop{
+        {UI_POS_X(0), UI_POS_Y(9)},
+        10,
+        "Resend every",
+        true};
+    NumberField field_delay{
+        {UI_POS_X(15), UI_POS_Y(9)},
+        2,
+        {1, 99},
+        1,
+        ' '};
+    Checkbox checkbox_am{
+        {UI_POS_X(0), UI_POS_Y(11)},
+        10,
+        "AM signal",
+        true};
+    FrequencyField field_am_frequency{
+        {UI_POS_X(13), UI_POS_Y(12)}};
+    Checkbox checkbox_send_on_change{
+        {UI_POS_X(0), UI_POS_Y(13)},
+        14,
+        "Send on change",
+        true};
+    Button button_tx{
+        {UI_POS_X_RIGHT(9), UI_POS_Y(9), UI_POS_WIDTH(9), UI_POS_HEIGHT(2)},
+        "START"};
+    const Style& style_tx_start = *Theme::getInstance()->fg_green;
+    const Style& style_tx_stop = *Theme::getInstance()->fg_red;
+    OptionsField options_am_channel{
+        {UI_POS_X(11), UI_POS_Y(14)},
+        20,
+        {{"121.375 MHz (Test)", 0},
+         {"121.500 MHz /!\\Real", 1},
+         {"Manual", 2}}};
+    OptionsField options_bpsk_channel{
+        {UI_POS_X(11), UI_POS_Y(15)},
+        20,
+        {{"433.025 MHz (Ham)", (uint8_t)BpskChannel::HAM},
+         {"406.025 MHz (B)", (uint8_t)BpskChannel::B},
+         {"406.028 MHz (C)", (uint8_t)BpskChannel::C},
+         {"406.037 MHz (F)", (uint8_t)BpskChannel::F},
+         {"406.040 MHz (G)", (uint8_t)BpskChannel::G},
+         {"406.049 MHz (J)", (uint8_t)BpskChannel::J},
+         {"406.052 MHz (K)", (uint8_t)BpskChannel::K},
+         {"406.061 MHz (N)", (uint8_t)BpskChannel::N},
+         {"406.064 MHz (O)", (uint8_t)BpskChannel::O},
+         {"Manual", (uint8_t)BpskChannel::MANUAL}}};
+
+    // Transmitter view
+    TransmitterView tx_view{
+        (int16_t)UI_POS_Y_BOTTOM(4),
+        10000,
+        12};
+
+    MessageHandlerRegistration message_handler_tx_progress{
+        Message::ID::TXProgress,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
+            this->on_tx_progress(message.progress, message.done);
+        }};
+
+    MessageHandlerRegistration message_handler_frame_sync{
+        // Use frame sync for our applcation timer callback
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->on_timer();
+        }};
+};
+
+}  // namespace ui::external_app::epirb_tx
+
+#endif /*__EPIRB_TX_H__*/
@@ -100,7 +100,7 @@ namespace ui::external_app::ert_app {

 ERTAppView::ERTAppView(NavigationView& nav)
    : nav_{nav} {
-    baseband::run_image(portapack::spi_flash::image_tag_ert);
+    baseband::run_prepared_image(portapack::memory::map::m4_code.base());

    add_children({
        &field_frequency,
@@ -77,7 +77,7 @@ __attribute__((section(".external_app.app_ert.application_information"), used))
    /*.menu_location = */ app_location_t::RX,
    /*.desired_menu_position = */ -1,

-    /*.m4_app_tag = portapack::spi_flash::image_tag_none */ {'P', 'E', 'R', 'T'},
+    /*.m4_app_tag = portapack::spi_flash::image_tag_ert */ {'P', 'E', 'R', 'T'},
    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
 };
 }
@@ -83,6 +83,10 @@ set(EXTCPPSRC
 	external/tpmsrx/main.cpp
 	external/tpmsrx/tpms_app.cpp

+	#tpmstx 800 bytes - TPMS transmit with editable fields
+	external/tpmstx/main.cpp
+	external/tpmstx/tpms_tx_app.cpp
+
 	#protoview 8 byte
 	external/protoview/main.cpp
 	external/protoview/ui_protoview.cpp
@@ -91,14 +95,22 @@ set(EXTCPPSRC
 	external/adsbtx/main.cpp
 	external/adsbtx/ui_adsb_tx.cpp

-	#morse_tx 768 bytes
-	external/morse_tx/main.cpp
-	external/morse_tx/ui_morse.cpp
+	#morse_tx 768 bytes -- disabled because of the new morse tx app with more functions
+	#external/morse_tx/main.cpp
+	#external/morse_tx/ui_morse.cpp

 	#sstvtx 456 bytes
 	external/sstvtx/main.cpp
 	external/sstvtx/ui_sstvtx.cpp

+	#same_tx
+	external/same_tx/main.cpp
+	external/same_tx/ui_same_tx.cpp
+
+	#mdc_tx
+	external/mdc_tx/main.cpp
+	external/mdc_tx/ui_mdc_tx.cpp
+
 	#sstvrx
 	external/sstvrx/main.cpp
 	external/sstvrx/ui_sstvrx.cpp
@@ -109,8 +121,8 @@ set(EXTCPPSRC
 	external/random_password/sha512.cpp

 	#acars
-	#external/acars_rx/main.cpp
-	#external/acars_rx/acars_app.cpp
+	external/acars_rx/main.cpp
+	external/acars_rx/acars_app.cpp

 	#wefax_rx 192 bytes
 	external/wefax_rx/main.cpp
@@ -222,7 +234,11 @@ set(EXTCPPSRC

 	#gfxEQ 80 byte
 	external/gfxeq/main.cpp
-	external/gfxeq/ui_gfxeq.cpp
+	external/gfxeq/ui_gfxeq.cpp	
+
+	#waterfall designer
+	external/waterfall_designer/main.cpp
+	external/waterfall_designer/ui_waterfall_designer.cpp

 	#detector_rx  168 byte
 	external/detector_rx/main.cpp
@@ -248,6 +264,10 @@ set(EXTCPPSRC
 	external/epirb_rx/main.cpp
 	external/epirb_rx/ui_epirb_rx.cpp

+	#epirb_tx
+	external/epirb_tx/main.cpp
+	external/epirb_tx/ui_epirb_tx.cpp
+
 	#soundboard  272byte  - 1236 bytes
 	external/soundboard/main.cpp
 	external/soundboard/soundboard_app.cpp
@@ -276,6 +296,64 @@ set(EXTCPPSRC
 	#subcarrx
 	external/subcarrx/main.cpp
 	external/subcarrx/ui_subcar.cpp
+
+	#siggen
+	external/siggen/main.cpp
+	external/siggen/ui_siggen.cpp
+
+	#morse_radio
+	external/morse_radio/main.cpp
+	external/morse_radio/ui_morse_radio.cpp
+
+	#morseradiotx
+	external/morseradiotx/main.cpp
+	external/morseradiotx/ui_morse_radiotx.cpp
+
+	#keeloqtx
+  	external/keeloqtx/main.cpp
+  	external/keeloqtx/ui_keeloqtx.cpp
+
+	#rtty_rx
+	external/rtty_rx/main.cpp
+	external/rtty_rx/ui_rtty_rx.cpp
+	external/rtty_rx/baudot.cpp
+
+	#rtty_tx
+	external/rtty_tx/main.cpp
+	external/rtty_tx/ui_rtty_tx.cpp
+	external/rtty_tx/baudot.cpp
+
+    #pocsag_tx
+	external/pocsag_tx/main.cpp
+	external/pocsag_tx/ui_pocsag_tx.cpp
+
+	#flex_tx
+	external/flex_tx/main.cpp
+	external/flex_tx/ui_flex_tx.cpp
+
+	#time_sink
+	external/time_sink/main.cpp
+	external/time_sink/ui_time_sink.cpp
+
+	#kiss_tnc
+	external/kiss_tnc/main.cpp
+	external/kiss_tnc/ui_kiss_tnc.cpp
+
+	#fpv_detect
+	external/fpv_detect/main.cpp
+	external/fpv_detect/ui_fpv_detect.cpp
+
+	#p25_tx
+	external/p25_tx/main.cpp
+	external/p25_tx/ui_p25_tx.cpp
+
+	#two_tone_pager
+	external/two_tone_pager/main.cpp
+	external/two_tone_pager/ui_two_tone_pager.cpp
+
+	#two_tone_rx
+	external/two_tone_rx/main.cpp
+	external/two_tone_rx/ui_two_tone_rx.cpp 
 )

 set(EXTAPPLIST
@@ -298,13 +376,16 @@ set(EXTAPPLIST
 	audio_test
 	wardrivemap
 	tpmsrx
+	tpmstx
 	protoview
 	adsbtx
-	morse_tx
+	#morse_tx
 	sstvtx
+	same_tx
+	mdc_tx
 	sstvrx
 	random_password
-	# acars_rx --not working
+	acars_rx
 	wefax_rx
 	noaaapt_rx
 	shoppingcart_lock
@@ -332,12 +413,15 @@ set(EXTAPPLIST
 	scanner
 	level
 	gfxeq
+	waterfall_designer
 	detector_rx
+	fpv_detect
 	spaceinv
 	blackjack
 	battleship
 	ert
 	epirb_rx
+	epirb_tx
 	soundboard
 	game2048
 	bht_tx
@@ -345,4 +429,27 @@ set(EXTAPPLIST
 	adult_toys_controller
 	flex_rx
 	subcarrx
+	siggen
+	morse_radio
+	morseradiotx
+	keeloqtx
+	rtty_rx
+	rtty_tx
+	pocsag_tx
+	flex_tx
+	time_sink
+	kiss_tnc
+	p25_tx
+	two_tone_pager
+	two_tone_rx
 )
+
+# sdusb has type conflicts with PRALINE (HackRF Pro) - add only for non-PRALINE builds
+if(NOT BOARD STREQUAL "PRALINE")
+       list(APPEND EXTCPPSRC
+               external/sdusb/main.cpp
+               external/sdusb/ui_sd_over_usb.cpp
+       )
+       list(APPEND EXTAPPLIST sdusb)
+endif()
+
@@ -23,73 +23,92 @@ MEMORY
     * Also need to consider processor memory map - reading 0xADxxxxxx generates a fault which may be better than unexpected behavior.
     * External app address ranges below must match those in python file "external_app_info.py".
     */
-    ram_external_app_afsk_rx    (rwx) : org = 0xADB10000, len = 32k
-    ram_external_app_calculator (rwx) : org = 0xADB20000, len = 32k
-    ram_external_app_font_viewer(rwx) : org = 0xADB30000, len = 32k
-    ram_external_app_blespam    (rwx) : org = 0xADB40000, len = 32k
-    ram_external_app_analogtv   (rwx) : org = 0xADB50000, len = 32k
-    ram_external_app_nrf_rx     (rwx) : org = 0xADB60000, len = 32k
-    ram_external_app_coasterp   (rwx) : org = 0xADB70000, len = 32k
-    ram_external_app_lge        (rwx) : org = 0xADB80000, len = 32k
-    ram_external_app_lcr        (rwx) : org = 0xADB90000, len = 32k
-    ram_external_app_jammer     (rwx) : org = 0xADBA0000, len = 32k
-    ram_external_app_gpssim     (rwx) : org = 0xADBB0000, len = 32k
-    ram_external_app_spainter   (rwx) : org = 0xADBC0000, len = 32k
-    ram_external_app_keyfob     (rwx) : org = 0xADBD0000, len = 32k
-    ram_external_app_tetris     (rwx) : org = 0xADBE0000, len = 32k
-    ram_external_app_extsensors (rwx) : org = 0xADBF0000, len = 32k
-    ram_external_app_foxhunt_rx (rwx) : org = 0xADC00000, len = 32k
-    ram_external_app_audio_test (rwx) : org = 0xADC10000, len = 32k
-    ram_external_app_wardrivemap(rwx) : org = 0xADC20000, len = 32k
-    ram_external_app_tpmsrx     (rwx) : org = 0xADC30000, len = 32k
-    ram_external_app_protoview  (rwx) : org = 0xADC40000, len = 32k
-    ram_external_app_adsbtx     (rwx) : org = 0xADC50000, len = 32k
-    ram_external_app_morse_tx   (rwx) : org = 0xADC60000, len = 32k
-    ram_external_app_sstvtx     (rwx) : org = 0xADC70000, len = 32k
-    ram_external_app_random_password(rwx): org = 0xADC80000, len = 32k
-    ram_external_app_acars_rx   (rwx) : org = 0xADC90000, len = 32k
-    ram_external_app_shoppingcart_lock(rwx): org = 0xADCA0000, len = 32k
-    ram_external_app_cvs_spam   (rwx) : org = 0xADCB0000, len = 32k
-    ram_external_app_ookbrute   (rwx) : org = 0xADCC0000, len = 32k
-    ram_external_app_flippertx  (rwx) : org = 0xADCD0000, len = 32k
-    ram_external_app_ook_editor (rwx) : org = 0xADCE0000, len = 32k
-    ram_external_app_remote     (rwx) : org = 0xADCF0000, len = 32k
-    ram_external_app_mcu_temperature(rwx): org = 0xADD00000, len = 32k
-    ram_external_app_fmradio    (rwx) : org = 0xADD10000, len = 32k
-    ram_external_app_tuner      (rwx) : org = 0xADD20000, len = 32k
-    ram_external_app_metronome  (rwx) : org = 0xADD30000, len = 32k
-    ram_external_app_app_manager(rwx) : org = 0xADD40000, len = 32k
-    ram_external_app_hopper     (rwx) : org = 0xADD50000, len = 32k
-    ram_external_app_antenna_length(rwx): org = 0xADD60000, len = 32k
-    ram_external_app_view_wav   (rwx) : org = 0xADD70000, len = 32k
-    ram_external_app_sd_wipe    (rwx) : org = 0xADD80000, len = 32k
-    ram_external_app_playlist_editor(rwx): org = 0xADD90000, len = 32k
-    ram_external_app_snake      (rwx) : org = 0xADDA0000, len = 32k
-    ram_external_app_stopwatch  (rwx) : org = 0xADDB0000, len = 32k
-    ram_external_app_wefax_rx   (rwx) : org = 0xADDC0000, len = 32k
-    ram_external_app_breakout   (rwx) : org = 0xADDD0000, len = 32k
-    ram_external_app_doom       (rwx) : org = 0xADDE0000, len = 32k
-    ram_external_app_debug_pmem (rwx) : org = 0xADDF0000, len = 32k
-    ram_external_app_scanner    (rwx) : org = 0xADE00000, len = 32k
-    ram_external_app_level      (rwx) : org = 0xADE10000, len = 32k
-    ram_external_app_gfxeq      (rwx) : org = 0xADE20000, len = 32k
-    ram_external_app_noaaapt_rx   (rwx) : org = 0xADE30000, len = 32k
-    ram_external_app_detector_rx   (rwx) : org = 0xADE40000, len = 32k
-    ram_external_app_dinogame   (rwx) : org = 0xADE50000, len = 32k
-    ram_external_app_spaceinv   (rwx) : org = 0xADE60000, len = 32k
-    ram_external_app_blackjack  (rwx) : org = 0xADE70000, len = 32k
-    ram_external_app_battleship   (rwx) : org = 0xADE80000, len = 32k
-    ram_external_app_ert        (rwx) : org = 0xADE90000, len = 32k
-    ram_external_app_epirb_rx   (rwx) : org = 0xADEA0000, len = 32k
-    ram_external_app_soundboard   (rwx) : org = 0xADEB0000, len = 32k
-    ram_external_app_game2048     (rwx) : org = 0xADEC0000, len = 32k
-    ram_external_app_bht_tx          (rwx) : org = 0xADED0000, len = 32k
-    ram_external_app_morse_practice  (rwx) : org = 0xADEE0000, len = 32k
-    ram_external_app_adult_toys_controller  (rwx) : org = 0xADEF0000, len = 32k
-    ram_external_app_flex_rx  (rwx) : org = 0xADF00000, len = 32k
-    ram_external_app_sstvrx  (rwx) : org = 0xADF10000, len = 32k
-    ram_external_app_subcarrx  (rwx) : org = 0xADF20000, len = 32k
-
+    ram_external_app_afsk_rx               (rwx) : org = 0xADB10000, len = 32k
+    ram_external_app_calculator            (rwx) : org = 0xADB20000, len = 32k
+    ram_external_app_font_viewer           (rwx) : org = 0xADB30000, len = 32k
+    ram_external_app_blespam               (rwx) : org = 0xADB40000, len = 32k
+    ram_external_app_analogtv              (rwx) : org = 0xADB50000, len = 32k
+    ram_external_app_nrf_rx                (rwx) : org = 0xADB60000, len = 32k
+    ram_external_app_coasterp              (rwx) : org = 0xADB70000, len = 32k
+    ram_external_app_lge                   (rwx) : org = 0xADB80000, len = 32k
+    ram_external_app_lcr                   (rwx) : org = 0xADB90000, len = 32k
+    ram_external_app_jammer                (rwx) : org = 0xADBA0000, len = 32k
+    ram_external_app_gpssim                (rwx) : org = 0xADBB0000, len = 32k
+    ram_external_app_spainter              (rwx) : org = 0xADBC0000, len = 32k
+    ram_external_app_keyfob                (rwx) : org = 0xADBD0000, len = 32k
+    ram_external_app_tetris                (rwx) : org = 0xADBE0000, len = 32k
+    ram_external_app_extsensors            (rwx) : org = 0xADBF0000, len = 32k
+    ram_external_app_foxhunt_rx            (rwx) : org = 0xADC00000, len = 32k
+    ram_external_app_audio_test            (rwx) : org = 0xADC10000, len = 32k
+    ram_external_app_wardrivemap           (rwx) : org = 0xADC20000, len = 32k
+    ram_external_app_tpmsrx                (rwx) : org = 0xADC30000, len = 32k
+    ram_external_app_protoview             (rwx) : org = 0xADC40000, len = 32k
+    ram_external_app_adsbtx                (rwx) : org = 0xADC50000, len = 32k
+    ram_external_app_morse_tx              (rwx) : org = 0xADC60000, len = 32k
+    ram_external_app_sstvtx                (rwx) : org = 0xADC70000, len = 32k
+    ram_external_app_random_password       (rwx) : org = 0xADC80000, len = 32k
+    ram_external_app_acars_rx              (rwx) : org = 0xADC90000, len = 32k
+    ram_external_app_shoppingcart_lock     (rwx) : org = 0xADCA0000, len = 32k
+    ram_external_app_cvs_spam              (rwx) : org = 0xADCB0000, len = 32k
+    ram_external_app_ookbrute              (rwx) : org = 0xADCC0000, len = 32k
+    ram_external_app_flippertx             (rwx) : org = 0xADCD0000, len = 32k
+    ram_external_app_ook_editor            (rwx) : org = 0xADCE0000, len = 32k
+    ram_external_app_remote                (rwx) : org = 0xADCF0000, len = 32k
+    ram_external_app_mcu_temperature       (rwx) : org = 0xADD00000, len = 32k
+    ram_external_app_fmradio               (rwx) : org = 0xADD10000, len = 32k
+    ram_external_app_tuner                 (rwx) : org = 0xADD20000, len = 32k
+    ram_external_app_metronome             (rwx) : org = 0xADD30000, len = 32k
+    ram_external_app_app_manager           (rwx) : org = 0xADD40000, len = 32k
+    ram_external_app_hopper                (rwx) : org = 0xADD50000, len = 32k
+    ram_external_app_antenna_length        (rwx) : org = 0xADD60000, len = 32k
+    ram_external_app_view_wav              (rwx) : org = 0xADD70000, len = 32k
+    ram_external_app_sd_wipe               (rwx) : org = 0xADD80000, len = 32k
+    ram_external_app_playlist_editor       (rwx) : org = 0xADD90000, len = 32k
+    ram_external_app_snake                 (rwx) : org = 0xADDA0000, len = 32k
+    ram_external_app_stopwatch             (rwx) : org = 0xADDB0000, len = 32k
+    ram_external_app_wefax_rx              (rwx) : org = 0xADDC0000, len = 32k
+    ram_external_app_breakout              (rwx) : org = 0xADDD0000, len = 32k
+    ram_external_app_doom                  (rwx) : org = 0xADDE0000, len = 32k
+    ram_external_app_debug_pmem            (rwx) : org = 0xADDF0000, len = 32k
+    ram_external_app_scanner               (rwx) : org = 0xADE00000, len = 32k
+    ram_external_app_level                 (rwx) : org = 0xADE10000, len = 32k
+    ram_external_app_gfxeq                 (rwx) : org = 0xADE20000, len = 32k
+    ram_external_app_noaaapt_rx            (rwx) : org = 0xADE30000, len = 32k
+    ram_external_app_detector_rx           (rwx) : org = 0xADE40000, len = 32k
+    ram_external_app_dinogame              (rwx) : org = 0xADE50000, len = 32k
+    ram_external_app_spaceinv              (rwx) : org = 0xADE60000, len = 32k
+    ram_external_app_blackjack             (rwx) : org = 0xADE70000, len = 32k
+    ram_external_app_battleship            (rwx) : org = 0xADE80000, len = 32k
+    ram_external_app_ert                   (rwx) : org = 0xADE90000, len = 32k
+    ram_external_app_epirb_rx              (rwx) : org = 0xADEA0000, len = 32k
+    ram_external_app_soundboard            (rwx) : org = 0xADEB0000, len = 32k
+    ram_external_app_game2048              (rwx) : org = 0xADEC0000, len = 32k
+    ram_external_app_bht_tx                (rwx) : org = 0xADED0000, len = 32k
+    ram_external_app_morse_practice        (rwx) : org = 0xADEE0000, len = 32k
+    ram_external_app_adult_toys_controller (rwx) : org = 0xADEF0000, len = 32k
+    ram_external_app_flex_rx               (rwx) : org = 0xADF00000, len = 32k
+    ram_external_app_sstvrx                (rwx) : org = 0xADF10000, len = 32k
+    ram_external_app_subcarrx              (rwx) : org = 0xADF20000, len = 32k
+    ram_external_app_siggen                (rwx) : org = 0xADF30000, len = 32k
+    ram_external_app_sdusb                 (rwx) : org = 0xADF40000, len = 32k
+    ram_external_app_morse_radio           (rwx) : org = 0xADF50000, len = 32k
+    ram_external_app_waterfall_designer    (rwx) : org = 0xADF60000, len = 32k
+    ram_external_app_morseradiotx          (rwx) : org = 0xADF70000, len = 32k
+    ram_external_app_keeloqtx              (rwx) : org = 0xADF80000, len = 32k
+    ram_external_app_rtty_rx               (rwx) : org = 0xADF90000, len = 32k
+    ram_external_app_rtty_tx               (rwx) : org = 0xADFA0000, len = 32k
+    ram_external_app_tpmstx                (rwx) : org = 0xADFB0000, len = 32k
+    ram_external_app_pocsag_tx             (rwx) : org = 0xADFC0000, len = 32k
+    ram_external_app_time_sink             (rwx) : org = 0xADFD0000, len = 32k
+    ram_external_app_same_tx               (rwx) : org = 0xADFE0000, len = 32k
+    ram_external_app_kiss_tnc              (rwx) : org = 0xADFF0000, len = 32k
+    ram_external_app_mdc_tx                (rwx) : org = 0xAE000000, len = 32k
+    ram_external_app_epirb_tx              (rwx) : org = 0xAE010000, len = 32k
+    ram_external_app_fpv_detect            (rwx) : org = 0xAE020000, len = 32k
+    ram_external_app_p25_tx                (rwx) : org = 0xAE030000, len = 32k
+    ram_external_app_two_tone_pager        (rwx) : org = 0xAE040000, len = 32k
+    ram_external_app_two_tone_rx           (rwx) : org = 0xAE050000, len = 32k
+    ram_external_app_flex_tx               (rwx) : org = 0xAE060000, len = 32k
 }

 SECTIONS
@@ -130,7 +149,7 @@ SECTIONS
        *(*ui*external_app*nrf_rx*);
    } > ram_external_app_nrf_rx

-     .external_app_coasterp : ALIGN(4) SUBALIGN(4)
+    .external_app_coasterp : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_coasterp.application_information));
        *(*ui*external_app*coasterp*);
@@ -178,55 +197,61 @@ SECTIONS
        *(*ui*external_app*tetris*);
    } > ram_external_app_tetris

-   .external_app_extsensors : ALIGN(4) SUBALIGN(4)
+    .external_app_extsensors : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_extsensors.application_information));
        *(*ui*external_app*extsensors*);
    } > ram_external_app_extsensors

-   .external_app_foxhunt_rx : ALIGN(4) SUBALIGN(4)
+    .external_app_foxhunt_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_foxhunt_rx.application_information));
        *(*ui*external_app*foxhunt_rx*);
    } > ram_external_app_foxhunt_rx

-   .external_app_audio_test : ALIGN(4) SUBALIGN(4)
+    .external_app_audio_test : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_audio_test.application_information));
        *(*ui*external_app*audio_test*);
    } > ram_external_app_audio_test

-   .external_app_wardrivemap : ALIGN(4) SUBALIGN(4)
+    .external_app_wardrivemap : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_wardrivemap.application_information));
        *(*ui*external_app*wardrivemap*);
    } > ram_external_app_wardrivemap

-   .external_app_tpmsrx : ALIGN(4) SUBALIGN(4)
+    .external_app_tpmsrx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_tpmsrx.application_information));
        *(*ui*external_app*tpmsrx*);
    } > ram_external_app_tpmsrx

-   .external_app_protoview : ALIGN(4) SUBALIGN(4)
+    .external_app_tpmstx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_tpmstx.application_information));
+        *(*ui*external_app*tpmstx*);
+    } > ram_external_app_tpmstx
+
+    .external_app_protoview : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_protoview.application_information));
        *(*ui*external_app*protoview*);
    } > ram_external_app_protoview

-   .external_app_adsbtx : ALIGN(4) SUBALIGN(4)
+    .external_app_adsbtx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_adsbtx.application_information));
        *(*ui*external_app*adsbtx*);
    } > ram_external_app_adsbtx

-   .external_app_morse_tx : ALIGN(4) SUBALIGN(4)
+    .external_app_morse_tx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_morse_tx.application_information));
        *(*ui*external_app*morse_tx*);
    } > ram_external_app_morse_tx

-   .external_app_sstvtx : ALIGN(4) SUBALIGN(4)
+    .external_app_sstvtx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_sstvtx.application_information));
        *(*ui*external_app*sstvtx*);
@@ -244,19 +269,19 @@ SECTIONS
        *(*ui*external_app*acars_rx*);
    } > ram_external_app_acars_rx

-   .external_app_shoppingcart_lock : ALIGN(4) SUBALIGN(4)
+    .external_app_shoppingcart_lock : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_shoppingcart_lock.application_information));
        *(*ui*external_app*shoppingcart_lock*);
    } > ram_external_app_shoppingcart_lock

-   .external_app_cvs_spam : ALIGN(4) SUBALIGN(4)
+    .external_app_cvs_spam : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_cvs_spam.application_information));
        *(*ui*external_app*cvs_spam*);
    } > ram_external_app_cvs_spam

-   .external_app_ookbrute : ALIGN(4) SUBALIGN(4)
+    .external_app_ookbrute : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_ookbrute.application_information));
        *(*ui*external_app*ookbrute*);
@@ -268,7 +293,7 @@ SECTIONS
        *(*ui*external_app*ook_editor*);
    } > ram_external_app_ook_editor

-   .external_app_flippertx : ALIGN(4) SUBALIGN(4)
+    .external_app_flippertx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_flippertx.application_information));
        *(*ui*external_app*flippertx*);
@@ -352,13 +377,13 @@ SECTIONS
        *(*ui*external_app*stopwatch*);
    } > ram_external_app_stopwatch

-   .external_app_wefax_rx : ALIGN(4) SUBALIGN(4)
+    .external_app_wefax_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_wefax_rx.application_information));
        *(*ui*external_app*wefax_rx*);
    } > ram_external_app_wefax_rx

-   .external_app_noaaapt_rx : ALIGN(4) SUBALIGN(4)
+    .external_app_noaaapt_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_noaaapt_rx.application_information));
        *(*ui*external_app*noaaapt_rx*);
@@ -400,6 +425,12 @@ SECTIONS
        *(*ui*external_app*gfxeq*);
    } > ram_external_app_gfxeq

+    .external_app_waterfall_designer : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_waterfall_designer.application_information));
+        *(*ui*external_app*waterfall_designer*);
+    } > ram_external_app_waterfall_designer
+
    .external_app_detector_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_detector_rx.application_information));
@@ -454,14 +485,12 @@ SECTIONS
        *(*ui*external_app*game2048*);
    } > ram_external_app_game2048

-
    .external_app_bht_tx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_bht_tx.application_information));
        *(*ui*external_app*bht_tx*);
    } > ram_external_app_bht_tx

-
    .external_app_morse_practice : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_morse_practice.application_information));
@@ -478,7 +507,7 @@ SECTIONS
    {
        KEEP(*(.external_app.app_flex_rx.application_information));
        *(*ui*external_app*flex_rx*);
-    } > ram_external_app_flex_rx    
+    } > ram_external_app_flex_rx

    .external_app_sstvrx : ALIGN(4) SUBALIGN(4)
    {
@@ -492,6 +521,111 @@ SECTIONS
        *(*ui*external_app*subcarrx*);
    } > ram_external_app_subcarrx

-    
-}
+    .external_app_siggen : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_siggen.application_information));
+        *(*ui*external_app*siggen*);
+    } > ram_external_app_siggen

+    .external_app_sdusb : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_sdusb.application_information));
+        *(*ui*external_app*sdusb*);
+    } > ram_external_app_sdusb
+
+    .external_app_morse_radio : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_morse_radio.application_information));
+        *(*ui*external_app*morse_radio*);
+    } > ram_external_app_morse_radio
+
+    .external_app_morseradiotx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_morseradiotx.application_information));
+        *(*ui*external_app*morseradiotx*);
+    } > ram_external_app_morseradiotx
+
+    .external_app_keeloqtx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_keeloqtx.application_information));
+        *(*ui*external_app*keeloqtx*);
+    } > ram_external_app_keeloqtx
+
+    .external_app_rtty_rx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_rtty_rx.application_information));
+        *(*ui*external_app*rtty_rx*);
+    } > ram_external_app_rtty_rx
+
+    .external_app_rtty_tx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_rtty_tx.application_information));
+        *(*ui*external_app*rtty_tx*);
+    } > ram_external_app_rtty_tx
+
+    .external_app_pocsag_tx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_pocsag_tx.application_information));
+        *(*ui*external_app*pocsag_tx*);
+    } > ram_external_app_pocsag_tx
+
+    .external_app_time_sink : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_time_sink.application_information));
+        *(*ui*external_app*time_sink*);
+    } > ram_external_app_time_sink
+
+    .external_app_same_tx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_same_tx.application_information));
+        *(*ui*external_app*same_tx*);
+    } > ram_external_app_same_tx
+
+    .external_app_kiss_tnc : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_kiss_tnc.application_information));
+        *(*ui*external_app*kiss_tnc*);
+    } > ram_external_app_kiss_tnc
+
+    .external_app_mdc_tx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_mdc_tx.application_information));
+        *(*ui*external_app*mdc_tx*);
+    } > ram_external_app_mdc_tx
+
+    .external_app_epirb_tx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_epirb_tx.application_information));
+        *(*ui*external_app*epirb_tx*);
+    } > ram_external_app_epirb_tx
+
+    .external_app_fpv_detect : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_fpv_detect.application_information));
+        *(*ui*external_app*fpv_detect*);
+    } > ram_external_app_fpv_detect
+
+    .external_app_p25_tx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_p25_tx.application_information));
+        *(*ui*external_app*p25_tx*);
+    } > ram_external_app_p25_tx
+
+    .external_app_two_tone_pager : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_two_tone_pager.application_information));
+        *(*ui*external_app*two_tone_pager*);
+    } > ram_external_app_two_tone_pager
+
+    .external_app_two_tone_rx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_two_tone_rx.application_information));
+        *(*ui*external_app*two_tone_rx*);
+    } > ram_external_app_two_tone_rx
+
+    .external_app_flex_tx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_flex_tx.application_information));
+        *(*ui*external_app*flex_tx*);
+    } > ram_external_app_flex_tx
+}
@@ -73,7 +73,7 @@ __attribute__((section(".external_app.app_extsensors.application_information"),
        0xF0,
        0x0F,
    },
-    /*.icon_color = */ ui::Color::orange().v,
+    /*.icon_color = */ ui::Color::yellow().v,
    /*.menu_location = */ app_location_t::DEBUG,
    /*.desired_menu_position = */ -1,

@@ -73,7 +73,7 @@ __attribute__((section(".external_app.app_flex_rx.application_information"), use
        0x00,
        0x00,
    },
-    /*.icon_color = */ ui::Color::orange().v,
+    /*.icon_color = */ ui::Color::yellow().v,
    /*.menu_location = */ app_location_t::RX,
    /*.desired_menu_position = */ -1,

@@ -4,6 +4,7 @@
 #include "portapack_persistent_memory.hpp"
 #include "string_format.hpp"
 #include "memory_map.hpp"
+#include "usb_serial_asyncmsg.hpp"

 using namespace portapack;

@@ -19,6 +20,8 @@ FlexAppView::FlexAppView(NavigationView& nav)
                  &field_lna,
                  &field_vga,
                  &rssi,
+                  &text_status1,
+                  &text_status2,
                  &console});

    // Restore saved frequency
@@ -54,12 +57,7 @@ void FlexAppView::focus() {
 // Redraw all messages to console
 void FlexAppView::redraw_console() {
    console.clear(true);
-    bool first = true;
    for (const auto& msg : messages) {
-        if (!first) {
-            console.writeln("");  // Blank line between messages
-        }
-        first = false;
        console.writeln(msg);
    }
 }
@@ -67,15 +65,13 @@ void FlexAppView::redraw_console() {
 // Add message to log with automatic line wrapping
 void FlexAppView::log_message(const std::string& message) {
    const size_t chars_per_line = screen_width / 8;
-    // Console height accounts for status bar and controls row
-    const size_t console_lines = (screen_height - 2 * 16) / 16;
+    // Console height matches widget: starts at 3*16, height = screen_height - 4*16
+    const size_t console_lines = (screen_height - 4 * 16) / 16;

    messages.push_back(message);

-    // Calculate total lines used (messages + blank lines between them)
    size_t total_lines = 0;
    for (size_t i = 0; i < messages.size(); i++) {
-        if (i > 0) total_lines++;  // Count blank line separator
        size_t msg_lines = (messages[i].length() + chars_per_line - 1) / chars_per_line;
        if (msg_lines == 0) msg_lines = 1;
        total_lines += msg_lines;
@@ -88,15 +84,10 @@ void FlexAppView::log_message(const std::string& message) {
            size_t oldest_lines = (oldest.length() + chars_per_line - 1) / chars_per_line;
            if (oldest_lines == 0) oldest_lines = 1;
            total_lines -= oldest_lines;
-            if (messages.size() > 1) total_lines--;  // Remove separator line too
            messages.erase(messages.begin());
        }
        redraw_console();
    } else {
-        // Just append new message
-        if (messages.size() > 1) {
-            console.writeln("");  // Blank line before new message
-        }
        console.writeln(message);
    }
 }
@@ -107,9 +98,287 @@ void FlexAppView::update_freq(rf::Frequency f) {
    receiver_model.set_target_frequency(f);
 }

+// Type tag from numeric type code
+static const char* flex_type_tag(uint32_t type) {
+    switch (type) {
+        case 0:
+            return "SEC";
+        case 1:
+            return "INS";
+        case 2:
+            return "TON";
+        case 3:
+            return "NUM";
+        case 4:
+            return "SNUM";
+        case 5:
+            return "ALN";
+        case 6:
+            return "HEX";
+        case 7:
+            return "NNUM";
+        case 8:
+            return "SMSG";
+        case 9:
+            return "BIW";
+        default:
+            return "UNK";
+    }
+}
+
 // Handle decoded FLEX packet from baseband
 void FlexAppView::on_packet(const FlexPacketMessage* message) {
-    log_message(message->packet.message);
+    const auto& pkt = message->packet;
+    const char* type = flex_type_tag(pkt.type);
+    const char* pol = pkt.is_inverted ? "I" : "N";
+
+    // Update status row 1: C/F speed polarity time timezone
+    {
+        std::string s1 = "C" + to_string_dec_uint(pkt.cycle) +
+                         "/F" + to_string_dec_uint(pkt.frame) +
+                         " " + to_string_dec_uint(pkt.bitrate) +
+                         " " + pol;
+        if (status_time_[0]) {
+            s1 += "  ";
+            s1 += status_time_;
+        }
+        if (status_tz_[0]) {
+            s1 += " ";
+            s1 += status_tz_;
+        }
+        text_status1.set(s1);
+    }
+
+    // Update status row 2 from BIW data
+    if (pkt.type == 9) {
+        switch (pkt.biw_field) {
+            case 0:  // SSID1
+                status_lid_ = pkt.biw_v1;
+                status_cz_ = pkt.biw_v2;
+                break;
+            case 2: {  // Time
+                uint32_t si = (pkt.biw_v3 * 75) / 10;
+                auto h = to_string_dec_uint(pkt.biw_v1, 2, '0');
+                auto m = to_string_dec_uint(pkt.biw_v2, 2, '0');
+                auto sec = to_string_dec_uint(si, 2, '0');
+                // Store for row 1
+                auto ts = h + ":" + m + ":" + sec;
+                memcpy(status_time_, ts.c_str(), ts.size() + 1);
+                break;
+            }
+            case 5: {  // SysInfo (timezone)
+                if (pkt.biw_v1 == 4 || pkt.biw_v1 == 5) {
+                    static const int tz[] = {0, 60, 120, 180, 240, 300, 360, 420, 480, 540, 600, 660, 720,
+                                             210, 270, 330, 0, 345, 390, 570, -210, -660, -600, -540, -480, -420, -360, -300, -240, -180, -120, -60};
+                    uint16_t zone = pkt.biw_v2 & 0x1F;
+                    int ofs = (zone < 32) ? tz[zone] : 0;
+                    auto tzs = std::string("UTC") + (ofs >= 0 ? "+" : "") +
+                               to_string_dec_int(ofs / 60);
+                    memcpy(status_tz_, tzs.c_str(), tzs.size() + 1);
+                }
+                break;
+            }
+            case 7:  // SSID2
+                status_cc_ = pkt.biw_v1;
+                break;
+        }
+        // Rebuild row 2
+        std::string s2;
+        if (status_lid_) s2 += "LID:" + to_string_dec_uint(status_lid_);
+        if (status_cz_) {
+            s2 += " CZ:";
+            s2 += to_string_dec_uint(status_cz_);
+        }
+        if (status_cc_) {
+            s2 += " CC:";
+            s2 += to_string_dec_uint(status_cc_);
+        }
+        if (pkt.fiw_roaming) s2 += " R";
+        text_status2.set(s2);
+    }
+
+    // Console: skip BIW events (shown in status bar), show messages only
+    if (pkt.type != 9) {
+        auto cf = to_string_dec_uint(pkt.cycle) + "/" + to_string_dec_uint(pkt.frame);
+        std::string line = cf + " " + to_string_dec_uint(pkt.bitrate) +
+                           " " + pol + " " + std::string(1, pkt.phase) + " ";
+
+        if (pkt.type == 1 && pkt.message[0] == 'i' && pkt.message[2] == 't') {
+            // INS temp group: "1234567 +GRP5@F42"
+            line += to_string_dec_uint(pkt.capcode);
+            line += " +GRP";
+            line += to_string_dec_uint(pkt.biw_v1);
+            line += "@F";
+            line += to_string_dec_uint(pkt.biw_v2);
+        } else if (pkt.type == 1) {
+            // Other INS types
+            line += to_string_dec_uint(pkt.capcode);
+            line += " INS ";
+            line += pkt.message;
+        } else if (pkt.addr_type == 2) {
+            // Temp address delivery: "GRP5 ALN message"
+            uint32_t slot = (uint32_t)(pkt.capcode + 0x8000 - 0x1F7800) & 0x0F;
+            line += "GRP";
+            line += to_string_dec_uint(slot);
+            line += " ";
+            line += type;
+            if (pkt.message[0]) {
+                line += " ";
+                line += pkt.message;
+            }
+        } else {
+            line += to_string_dec_uint(pkt.capcode);
+            if (pkt.is_group) line += pkt.is_temp_group ? " TG" : " G";
+            if (pkt.is_priority) line += " P";
+            line += " ";
+            line += type;
+            if (pkt.message[0]) {
+                line += " ";
+                line += pkt.message;
+            }
+        }
+        log_message(line);
+    }
+
+    // Serial: pipe-delimited
+    if (portapack::usb_serial.serial_connected()) {
+        std::string s;
+        s.reserve(320);
+        s = "FLEX|";
+        s += to_string_dec_uint(pkt.cycle);
+        s += '/';
+        s += to_string_dec_uint(pkt.frame);
+        s += '|';
+        s += to_string_dec_uint(pkt.bitrate);
+        s += '|';
+        s += pol;
+        s += '|';
+        s += pkt.phase;
+
+        if (pkt.type == 9) {
+            // BIW: format from raw values for serial
+            s += "|BIW";
+            s += to_string_dec_uint(pkt.function);
+            switch (pkt.biw_field) {
+                case 0:
+                    s += "|SSID|lid=";
+                    s += to_string_dec_uint(pkt.biw_v1);
+                    s += "|cz=";
+                    s += to_string_dec_uint(pkt.biw_v2);
+                    break;
+                case 1:
+                    s += "|DATE|";
+                    s += to_string_dec_uint(pkt.biw_v1);
+                    s += '-';
+                    s += to_string_dec_uint(pkt.biw_v2, 2, '0');
+                    s += '-';
+                    s += to_string_dec_uint(pkt.biw_v3, 2, '0');
+                    break;
+                case 2: {
+                    uint32_t si = (pkt.biw_v3 * 75) / 10;
+                    s += "|TIME|";
+                    s += to_string_dec_uint(pkt.biw_v1, 2, '0');
+                    s += ':';
+                    s += to_string_dec_uint(pkt.biw_v2, 2, '0');
+                    s += ':';
+                    s += to_string_dec_uint(si, 2, '0');
+                    break;
+                }
+                case 5: {
+                    uint16_t a = pkt.biw_v1, info = pkt.biw_v2;
+                    if (a == 4 || a == 5) {
+                        static const int tz[] = {0, 60, 120, 180, 240, 300, 360, 420, 480, 540, 600, 660, 720,
+                                                 210, 270, 330, 0, 345, 390, 570, -210, -660, -600, -540, -480, -420, -360, -300, -240, -180, -120, -60};
+                        uint16_t zone = info & 0x1F;
+                        int ofs = (zone < 32) ? tz[zone] : 0;
+                        int dst = (info >> 5) & 1;
+                        s += "|TZ|UTC";
+                        s += (ofs >= 0 ? "+" : "");
+                        s += to_string_dec_int(ofs / 60);
+                        s += "h";
+                        int m = (ofs < 0 ? -ofs : ofs) % 60;
+                        if (m) {
+                            s += to_string_dec_uint(m, 2, '0');
+                            s += "m";
+                        }
+                        s += "|dst=";
+                        s += dst ? "no" : "yes";
+                    } else if (a <= 3) {
+                        static const char* t[] = {"all", "home", "roaming", "ssid"};
+                        s += "|SYSMSG|target=";
+                        s += t[a];
+                    } else if (a == 6) {
+                        s += "|CHAN|ofs=";
+                        s += to_string_dec_uint(info & 0x3F);
+                    }
+                    break;
+                }
+                case 7:
+                    s += "|SSID2|cc=";
+                    s += to_string_dec_uint(pkt.biw_v1);
+                    s += "|tmf=";
+                    s += to_string_dec_uint(pkt.biw_v2);
+                    break;
+            }
+        } else {
+            s += '|';
+            s += type;
+            s += "|cap=";
+            s += to_string_dec_uint(pkt.capcode);
+            if (pkt.is_group) s += pkt.is_temp_group ? "|grp=temp" : "|grp=1";
+            if (pkt.is_priority) s += "|pri=1";
+            if (pkt.addr_type == 2) {
+                // Temporary address: show slot number
+                // capcode = aw - 0x8000, aw = capcode + 0x8000
+                // slot = (aw - 0x1F7800) & 0x0F = (capcode + 0x8000 - 0x1F7800) & 0x0F
+                uint32_t slot = (uint32_t)(pkt.capcode + 0x8000 - 0x1F7800) & 0x0F;
+                s += "|slot=";
+                s += to_string_dec_uint(slot);
+            }
+            if (pkt.has_flags) {
+                if (pkt.type == 7) {
+                    s += "|seq=";
+                    s += to_string_dec_uint(pkt.seq);
+                    s += "|new=";
+                    s += to_string_dec_uint(pkt.is_new);
+                    s += "|fmt=";
+                    s += pkt.nnum_s ? "idrom" : "std";
+                } else {
+                    s += "|frag=";
+                    s += (pkt.frag == 3) ? "first" : to_string_dec_uint(pkt.frag).c_str();
+                    s += "|mf=";
+                    s += to_string_dec_uint(pkt.more_frag);
+                    s += "|seq=";
+                    s += to_string_dec_uint(pkt.seq);
+                    if (pkt.frag == 3) {
+                        s += "|new=";
+                        s += to_string_dec_uint(pkt.is_new);
+                        s += "|md=";
+                        s += to_string_dec_uint(pkt.maildrop);
+                        s += "|sig=";
+                        s += to_string_hex(pkt.sig, 2);
+                    }
+                    if (pkt.type == 0) {
+                        static const char* enc[] = {"alpha", "sep", "bin", "rsvd"};
+                        s += "|enc=";
+                        s += enc[pkt.sec_enc & 3];
+                    }
+                    if (pkt.type == 6 && pkt.frag == 3) {
+                        uint8_t b = pkt.function & 0x0F;
+                        s += "|bb=";
+                        s += to_string_dec_uint(b == 0 ? 16 : b);
+                        if (pkt.function & 0x10) s += "|rtl=1";
+                    }
+                }
+            }
+            if (pkt.message[0]) {
+                s += "|\"";
+                s += pkt.message;
+                s += '"';
+            }
+        }
+        UsbSerialAsyncmsg::asyncmsg(s);
+    }
 }

 // Handle stats message (currently unused)
@@ -118,12 +387,15 @@ void FlexAppView::on_stats(const FlexStatsMessage*) {

 // Debug handler - uncomment to see baseband debug messages
 void FlexAppView::on_debug(const FlexDebugMessage* message) {
-    (void)message;  // Suppress unused parameter warning
-    // std::string text = "DBG: ";
-    // text += message->text;
-    // text += " " + to_string_hex(message->val1, 8);
-    // text += " " + to_string_hex(message->val2, 8);
-    // log_message(text);
+    if (portapack::usb_serial.serial_connected()) {
+        std::string s = "DBG|";
+        s += message->text;
+        s += "|";
+        s += to_string_dec_int(message->val1);
+        s += "|";
+        s += to_string_dec_int(message->val2);
+        UsbSerialAsyncmsg::asyncmsg(s);
+    }
 }

 }  // namespace ui::external_app::flex_rx
@@ -26,10 +26,17 @@ class FlexAppView : public View {
    NavigationView& nav_;

    // Saved settings
-    rf::Frequency frequency_value{931740000};  // Default FLEX frequency
+    rf::Frequency frequency_value{931740000};

    RxRadioState radio_state_{};

+    // Status bar state (updated from BIW packets)
+    char status_time_[12]{};  // "HH:MM:SS"
+    char status_tz_[12]{};    // "UTC+N"
+    uint16_t status_lid_{0};
+    uint16_t status_cz_{0};
+    uint16_t status_cc_{0};
+
    // Message storage for console redraw
    static constexpr size_t MAX_MESSAGES = 20;
    std::vector<std::string> messages{};
@@ -54,9 +61,17 @@ class FlexAppView : public View {
    RSSI rssi{
        {UI_POS_X(21), 0, UI_POS_WIDTH(9), 4}};

-    // Message display area (below controls, account for status bar)
+    // Status rows (rows 1-2)
+    Text text_status1{
+        {0, 1 * 16, screen_width, 16},
+        ""};
+    Text text_status2{
+        {0, 2 * 16, screen_width, 16},
+        ""};
+
+    // Message display area (below status rows)
    Console console{
-        {0, 1 * 16, screen_width, screen_height - 2 * 16}};
+        {0, 3 * 16, screen_width, screen_height - 4 * 16}};

    // Persistent settings manager
    app_settings::SettingsManager settings_{
@@ -0,0 +1,62 @@
+#include "ui.hpp"
+#include "ui_flex_tx.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::flex_tx {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<FlexTXView>();
+}
+}  // namespace ui::external_app::flex_tx
+
+extern "C" {
+
+__attribute__((section(".external_app.app_flex_tx.application_information"), used)) application_information_t _application_information_flex_tx = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::flex_tx::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "FLEX TX",
+    /*.bitmap_data = */ {
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0xFC,
+        0x3F,
+        0xFE,
+        0x7F,
+        0x02,
+        0x40,
+        0xBA,
+        0x45,
+        0x02,
+        0x40,
+        0xFE,
+        0x7F,
+        0xFE,
+        0x7F,
+        0x92,
+        0x7C,
+        0x92,
+        0x7C,
+        0xFC,
+        0x3F,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+    },
+    /*.icon_color = */ ui::Color::cyan().v,
+    /*.menu_location = */ app_location_t::TX,
+    /*.desired_menu_position = */ -1,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_fsktx */ {'P', 'F', 'S', 'K'},
+    /*.m4_app_offset = */ 0x00000000,
+};
+}
@@ -0,0 +1,903 @@
+#include "ui_flex_tx.hpp"
+
+#include "baseband_api.hpp"
+#include "string_format.hpp"
+#include "ui_textentry.hpp"
+#include "portapack_persistent_memory.hpp"
+#include "portapack_shared_memory.hpp"
+#include "rtc_time.hpp"
+
+#include <cstring>
+
+using namespace portapack;
+
+namespace ui::external_app::flex_tx {
+
+#define MAX_FLEX_MSG 240
+#define BCH_POLY 0x769
+#define DATA_MASK 0x1FFFFF
+
+// ===== Bit reversal =====
+
+static uint32_t reverse_bits32(uint32_t v) {
+    v = ((v >> 1) & 0x55555555) | ((v & 0x55555555) << 1);
+    v = ((v >> 2) & 0x33333333) | ((v & 0x33333333) << 2);
+    v = ((v >> 4) & 0x0F0F0F0F) | ((v & 0x0F0F0F0F) << 4);
+    v = ((v >> 8) & 0x00FF00FF) | ((v & 0x00FF00FF) << 8);
+    v = (v >> 16) | (v << 16);
+    return v;
+}
+
+// ===== BCH(31,21) encoder =====
+
+static uint32_t flex_encode_word(uint32_t dw) {
+    uint32_t data = dw >> 11;
+    uint32_t dividend = data << 10;
+    for (int i = 30; i >= 10; i--) {
+        if ((dividend >> i) & 1)
+            dividend ^= BCH_POLY << (i - 10);
+    }
+    uint32_t ecc = dividend & 0x3FF;
+    uint32_t code31 = (data << 10) | ecc;
+    uint32_t p = 0, tmp = code31;
+    while (tmp) {
+        p ^= (tmp & 1);
+        tmp >>= 1;
+    }
+    return (code31 << 1) | p;
+}
+
+static uint32_t flex_enc(uint32_t data21) {
+    return flex_encode_word(reverse_bits32(data21));
+}
+
+// ===== Checksum =====
+
+static uint32_t flex_checksum(uint32_t d) {
+    uint32_t s = (d & 0xF) + ((d >> 4) & 0xF) + ((d >> 8) & 0xF) +
+                 ((d >> 12) & 0xF) + ((d >> 16) & 0xF) + ((d >> 20) & 0x1);
+    return (d & ~0xFU) | ((0xF - (s & 0xF)) & 0xF);
+}
+
+// ===== Year equivalence =====
+
+static int flex_is_leap(int y) {
+    return (y % 4 == 0 && y % 100 != 0) || (y % 400 == 0);
+}
+
+static int flex_jan1_dow(int y) {
+    static const int t[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4};
+    return (y + y / 4 - y / 100 + y / 400 + t[0] + 1) % 7;
+}
+
+static int flex_equiv_year(int year) {
+    if (year >= 1994 && year <= 2025)
+        return year;
+    int target_leap = flex_is_leap(year);
+    int target_dow = flex_jan1_dow(year);
+    for (int y = 2025; y >= 1994; y--) {
+        if (flex_is_leap(y) == target_leap &&
+            flex_jan1_dow(y) == target_dow)
+            return y;
+    }
+    return 1994 + ((year - 1994) & 0x1F);
+}
+
+// ===== FIW =====
+
+static uint32_t flex_fiw(uint32_t cycle, uint32_t frame, uint32_t roaming) {
+    uint32_t d = 0;
+    d |= (cycle & 0xF) << 4;
+    d |= (frame & 0x7F) << 8;
+    d |= (roaming & 1) << 15;
+    // r=0, t=0 (single transmission, no low traffic flags)
+    return flex_enc(flex_checksum(d));
+}
+
+// ===== BIW1 =====
+
+static uint32_t flex_biw1(uint32_t astart, uint32_t vstart, uint32_t collapse) {
+    uint32_t d = 0;
+    d |= ((astart - 1) & 0x03) << 8;
+    d |= (vstart & 0x3F) << 10;
+    d |= (collapse & 0x07) << 18;
+    return flex_enc(flex_checksum(d));
+}
+
+// ===== BIW Date (type 001) =====
+
+static uint32_t flex_biw_date(uint32_t year_field, uint32_t month, uint32_t day) {
+    uint32_t d = 0;
+    d |= (1U) << 4;  // type = 001
+    d |= (year_field & 0x1F) << 7;
+    d |= (day & 0x1F) << 12;
+    d |= (month & 0x0F) << 17;
+    return flex_enc(flex_checksum(d));
+}
+
+// ===== BIW Time (type 010) =====
+
+static uint32_t flex_biw_time(uint32_t hour, uint32_t minute, uint32_t second_step) {
+    uint32_t d = 0;
+    d |= (2U) << 4;  // type = 010
+    d |= (hour & 0x1F) << 7;
+    d |= (minute & 0x3F) << 12;
+    d |= (second_step & 0x07) << 18;
+    return flex_enc(flex_checksum(d));
+}
+
+// ===== BIW SysInfo (type 101) =====
+
+static uint32_t flex_biw_sysinfo(uint32_t a_type, uint32_t info) {
+    uint32_t d = 0;
+    d |= (5U) << 4;  // type = 101
+    d |= (a_type & 0x0F) << 7;
+    d |= (info & 0x03FF) << 11;
+    return flex_enc(flex_checksum(d));
+}
+
+// ===== BIW SSID1 (type 000) =====
+
+static uint32_t flex_biw_ssid1(uint32_t local_id, uint32_t coverage_zone) {
+    uint32_t d = 0;
+    // type = 000 (no bits to set)
+    d |= (coverage_zone & 0x1F) << 7;
+    d |= (local_id & 0x01FF) << 12;
+    return flex_enc(flex_checksum(d));
+}
+
+// ===== BIW SSID2 (type 111) =====
+
+static uint32_t flex_biw_ssid2(uint32_t country_code, uint32_t tmf) {
+    uint32_t d = 0;
+    d |= (7U) << 4;  // type = 111
+    d |= (tmf & 0x0F) << 7;
+    d |= (country_code & 0x03FF) << 11;
+    return flex_enc(flex_checksum(d));
+}
+
+// ===== Short address =====
+
+static uint32_t flex_short_addr(uint64_t capcode) {
+    return flex_enc((uint32_t)(capcode + 0x8000) & DATA_MASK);
+}
+
+// ===== Long address (2 words) =====
+
+static int flex_long_addr(uint64_t capcode, uint32_t out[2]) {
+    uint64_t result;
+    uint32_t w1, w2;
+    if (capcode >= 2101249ULL && capcode <= 1075843072ULL) {
+        result = capcode - 2068481ULL;
+        w1 = (result % 32768) + 1;
+        w2 = 2097151U - (result / 32768);
+    } else if (capcode >= 1075843073ULL && capcode <= 3223326720ULL) {
+        result = capcode - 2068481ULL;
+        w1 = (result % 32768) + 1;
+        w2 = (result / 32768) + 1933312U;
+    } else if (capcode >= 3223326721ULL && capcode <= 4297068542ULL) {
+        result = capcode - 2068479ULL;
+        w1 = (result % 32768) + 2064383U;
+        w2 = (result / 32768) + 1867776U;
+    } else {
+        return -1;
+    }
+    out[0] = flex_enc(w1 & DATA_MASK);
+    out[1] = flex_enc(w2 & DATA_MASK);
+    return 0;
+}
+
+// ===== Vector words =====
+
+static uint32_t flex_alpha_vector(uint32_t mw_start, uint32_t mw_count) {
+    uint32_t d = 0;
+    d |= (5U & 0x07) << 4;
+    d |= (mw_start & 0x7F) << 7;
+    d |= (mw_count & 0x7F) << 14;
+    return flex_enc(flex_checksum(d));
+}
+
+static uint32_t flex_numeric_vector(uint32_t type, uint32_t mw_start, uint32_t mw_count, uint32_t kbit) {
+    uint32_t n_field = (mw_count > 0) ? mw_count - 1 : 0;
+    uint32_t d = 0;
+    d |= (type & 0x07) << 4;
+    d |= (mw_start & 0x7F) << 7;
+    d |= (n_field & 0x07) << 14;
+    d |= (kbit & 0x0F) << 17;
+    return flex_enc(flex_checksum(d));
+}
+
+// Short vector (type 2, t=00): BCD digits in vector word
+// Short addr: 3 digits in d0-d11. Long addr: 3 + 5 in 2nd word.
+// Tone-only: call with empty string (all digits become space 0xC).
+static uint32_t flex_short_vector(int is_long, const std::string& msg, uint32_t* vy_out) {
+    static const char bcd_chars[20] = "0123456789 U -][";
+    auto to_bcd = [&](char c) -> uint8_t {
+        for (int k = 0; k < 16; k++)
+            if (bcd_chars[k] == c) return k;
+        return 0xC;  // space
+    };
+
+    int max_digits = is_long ? 8 : 3;
+    uint8_t digits[8];
+    for (int i = 0; i < 8; i++) {
+        digits[i] = (i < (int)msg.size() && i < max_digits) ? to_bcd(msg[i]) : 0xC;
+    }
+
+    uint32_t vw = 0;
+    vw |= (2U & 0x07) << 4;  // type = 010
+    // t1t0 = 00 (numeric) — bits 7-8 stay 0
+    vw |= ((uint32_t)digits[0] & 0xF) << 9;
+    vw |= ((uint32_t)digits[1] & 0xF) << 13;
+    vw |= ((uint32_t)digits[2] & 0xF) << 17;
+
+    if (is_long && vy_out) {
+        uint32_t d2 = 0;
+        for (int i = 0; i < 5 && (i + 3) < max_digits; i++)
+            d2 |= ((uint32_t)digits[i + 3] & 0xF) << (i * 4);
+        *vy_out = flex_enc(d2);
+    }
+    return flex_enc(flex_checksum(vw));
+}
+
+// ===== Block interleave =====
+
+static void flex_interleave_block(uint32_t blk, uint32_t* frame_words) {
+    uint32_t src[8];
+    uint8_t dst[32];
+    memcpy(src, frame_words + blk * 8, sizeof(src));
+    for (uint32_t i = 0; i < 32; i++) {
+        dst[i] = (uint8_t)((((src[0] >> (31 - i)) & 1) << 7) |
+                           (((src[1] >> (31 - i)) & 1) << 6) |
+                           (((src[2] >> (31 - i)) & 1) << 5) |
+                           (((src[3] >> (31 - i)) & 1) << 4) |
+                           (((src[4] >> (31 - i)) & 1) << 3) |
+                           (((src[5] >> (31 - i)) & 1) << 2) |
+                           (((src[6] >> (31 - i)) & 1) << 1) |
+                           (((src[7] >> (31 - i)) & 1) << 0));
+    }
+    memcpy(frame_words + blk * 8, dst, sizeof(dst));
+}
+
+// ===== Alpha encoding =====
+
+static int flex_encode_alpha(const std::string& msg, uint32_t* words, int max_words, uint32_t seq, uint32_t msg_r) {
+    int wc = 0;
+    uint32_t hdr = 0;
+    hdr |= (3U << 11);
+    hdr |= ((seq & 0x3F) << 13);
+    hdr |= ((msg_r & 1U) << 19);
+    words[wc++] = hdr;
+
+    size_t ci = 0;
+    uint32_t dw = 0;
+    uint8_t ch;
+    ch = (ci < msg.size()) ? msg[ci++] : 0x03;
+    dw |= ((uint32_t)(ch & 0x7F)) << 7;
+    ch = (ci < msg.size()) ? msg[ci++] : 0x03;
+    dw |= ((uint32_t)(ch & 0x7F)) << 14;
+    words[wc++] = dw;
+
+    while (ci < msg.size() && wc < max_words) {
+        dw = 0;
+        for (int s = 0; s < 3; s++) {
+            ch = (ci < msg.size()) ? msg[ci++] : 0x03;
+            dw |= ((uint32_t)(ch & 0x7F)) << (s * 7);
+        }
+        words[wc++] = dw;
+    }
+
+    // Signature
+    {
+        uint32_t sig_sum = 0;
+        for (int i = 1; i < wc; i++) {
+            uint32_t c0 = (words[i] >> 0) & 0x7F;
+            uint32_t c1 = (words[i] >> 7) & 0x7F;
+            uint32_t c2 = (words[i] >> 14) & 0x7F;
+            if (c0 != 0x03) sig_sum += c0;
+            if (c1 != 0x03) sig_sum += c1;
+            if (c2 != 0x03) sig_sum += c2;
+        }
+        words[1] = (words[1] & ~0x7FU) | ((~sig_sum) & 0x7F);
+    }
+
+    // K checksum
+    {
+        uint32_t k_sum = 0;
+        for (int i = 0; i < wc; i++) {
+            k_sum += words[i] & 0xFF;
+            k_sum += (words[i] >> 8) & 0xFF;
+            k_sum += (words[i] >> 16) & 0x1F;
+        }
+        words[0] |= ((~k_sum) & 0x3FF);
+    }
+
+    for (int i = 0; i < wc; i++)
+        words[i] = flex_enc(words[i]);
+
+    return wc;
+}
+
+// ===== Numeric BCD encoding =====
+
+static int flex_encode_numeric(const std::string& msg, uint32_t* words, int max_words, uint32_t* k_out) {
+    static const char bcd[20] = "0123456789 U -][";
+    uint32_t mw[8] = {0};
+    int bit = 2;
+    int word_idx = 0;
+    for (size_t i = 0; i < msg.size(); i++) {
+        uint8_t nib = 0;
+        for (int k = 0; k < 16; k++)
+            if (bcd[k] == msg[i]) {
+                nib = k;
+                break;
+            }
+        for (int b = 0; b < 4; b++) {
+            word_idx = bit / 21;
+            if (word_idx >= 8) break;
+            if (nib & (1 << b))
+                mw[word_idx] |= (1U << (bit % 21));
+            bit++;
+        }
+    }
+    word_idx = (bit > 0) ? (bit - 1) / 21 : 0;
+    {
+        int end_bit = (word_idx + 1) * 21;
+        while (bit + 4 <= end_bit) {
+            for (int b = 0; b < 4; b++) {
+                if (0x0C & (1 << b))
+                    mw[bit / 21] |= (1U << (bit % 21));
+                bit++;
+            }
+        }
+    }
+    uint32_t kb = 0;
+    for (int i = 0; i <= word_idx; i++) {
+        kb += mw[i] & 0xFF;
+        kb += (mw[i] >> 8) & 0xFF;
+        kb += (mw[i] >> 16) & 0x1F;
+    }
+    kb &= 0xFF;
+    kb = (kb & 0x3F) + (kb >> 6);
+    kb = ~kb;
+    mw[0] |= ((kb >> 4) & 0x03);
+    *k_out = kb & 0x0F;
+    int wc = word_idx + 1;
+    for (int i = 0; i < wc && i < max_words; i++)
+        words[i] = flex_enc(mw[i]);
+    return wc;
+}
+
+// ===== Sync patterns =====
+
+static const uint8_t bs1[] = {0xAA, 0xAA, 0xAA, 0xAA};
+static const uint8_t a1[] = {0x78, 0xF3, 0x59, 0x39};
+static const uint8_t b_code[4] = {0x55, 0x55, 0x00, 0x00};
+static const uint8_t ar[] = {0xCB, 0x20, 0x59, 0x39};
+
+static void write_word(uint8_t*& p, uint32_t w) {
+    *p++ = (w >> 24) & 0xFF;
+    *p++ = (w >> 16) & 0xFF;
+    *p++ = (w >> 8) & 0xFF;
+    *p++ = w & 0xFF;
+}
+
+// ===== Build frame =====
+
+static size_t build_frame(uint8_t* buf, uint64_t capcode, int msg_type, const std::string& msg, uint32_t cycle, uint32_t frame, uint32_t msg_r, const FlexBIWParams& bp) {
+    uint8_t* p = buf;
+
+    // S1 sync
+    memcpy(p, bs1, 4);
+    p += 4;
+    memcpy(p, a1, 4);
+    p += 4;
+    memcpy(p, b_code, 2);
+    p += 2;
+    for (int i = 0; i < 4; i++) *p++ = ~a1[i];
+
+    // FIW
+    write_word(p, flex_fiw(cycle, frame, bp.roaming));
+
+    // S2
+    {
+        uint8_t s2[5];
+        memset(s2, 0, 5);
+        uint64_t bits = 0;
+        bits |= (uint64_t)0xA << 36;
+        bits |= (uint64_t)0xED84 << 20;
+        bits |= (uint64_t)0x5 << 16;
+        bits |= (uint64_t)0x127B;
+        s2[0] = (bits >> 32) & 0xFF;
+        s2[1] = (bits >> 24) & 0xFF;
+        s2[2] = (bits >> 16) & 0xFF;
+        s2[3] = (bits >> 8) & 0xFF;
+        s2[4] = bits & 0xFF;
+        memcpy(p, s2, 5);
+        p += 5;
+    }
+
+    // Build extra BIW words (max 3 slots)
+    uint32_t extra_biw[4];
+    int extra_count = 0;
+
+    // Slot priority: SSID1 first (always when enabled), then Time, Date, TZ, SSID2
+    if (bp.send_ssid1 && extra_count < 3)
+        extra_biw[extra_count++] = flex_biw_ssid1(bp.local_id, bp.coverage_zone);
+    if (bp.send_time && extra_count < 3) {
+        uint32_t sec_step = (uint32_t)(bp.second * 2 / 15);  // 7.5s steps
+        if (sec_step > 7) sec_step = 7;
+        extra_biw[extra_count++] = flex_biw_time(bp.hour, bp.minute, sec_step);
+    }
+    if (bp.send_date && extra_count < 3) {
+        uint32_t year_field = (uint32_t)(bp.year - 1994);
+        extra_biw[extra_count++] = flex_biw_date(year_field, bp.month, bp.day);
+    }
+    if (bp.send_tz && extra_count < 3) {
+        uint32_t tz_info = (uint32_t)bp.tz_code & 0x1F;
+        if (bp.send_dst)
+            tz_info |= (0U << 5);  // L0=0 means DST active
+        else
+            tz_info |= (1U << 5);  // L0=1 means standard time
+        extra_biw[extra_count++] = flex_biw_sysinfo(0x04, tz_info);
+    }
+    if (bp.send_ssid2 && extra_count < 3)
+        extra_biw[extra_count++] = flex_biw_ssid2(bp.country_code, 0);
+
+    uint32_t fw[88];
+    uint32_t mw[84];
+    int mwc = 0;
+    uint32_t num_k = 0;
+
+    if (msg_type == 0)
+        mwc = flex_encode_alpha(msg, mw, 84, bp.msg_number, msg_r);
+    else if (msg_type == 1)
+        mwc = flex_encode_numeric(msg, mw, 84, &num_k);
+
+    // Address encoding
+    int is_long = (capcode >= 2101249ULL);
+    int addr_words = is_long ? 2 : 1;
+    int vec_words = is_long ? 2 : 1;
+    int astart = 1 + extra_count;
+    int vstart = astart + addr_words;
+    int mstart = vstart + vec_words;
+
+    fw[0] = flex_biw1(astart, vstart, 0);
+
+    // Extra BIW words (words 1..extra_count)
+    for (int i = 0; i < extra_count; i++)
+        fw[1 + i] = extra_biw[i];
+
+    // Address words
+    if (is_long) {
+        uint32_t la[2];
+        if (flex_long_addr(capcode, la) < 0) return 0;
+        fw[astart] = la[0];
+        fw[astart + 1] = la[1];
+    } else {
+        fw[astart] = flex_short_addr(capcode);
+    }
+
+    // Vector + message
+    if (msg_type == 0) {
+        fw[vstart] = flex_alpha_vector(mstart, mwc);
+        if (is_long && mwc > 0) {
+            fw[vstart + 1] = mw[0];
+            for (int i = 0; i < mwc - 1 && (mstart + i) < 88; i++)
+                fw[mstart + i] = mw[i + 1];
+            mwc = (mwc > 0) ? mwc - 1 : 0;
+        } else {
+            for (int i = 0; i < mwc && (mstart + i) < 88; i++)
+                fw[mstart + i] = mw[i];
+        }
+    } else if (msg_type == 1) {
+        fw[vstart] = flex_numeric_vector(3, mstart, mwc, num_k);
+        if (is_long) {
+            fw[vstart + 1] = (mwc > 0) ? mw[0] : flex_enc(0);
+            for (int i = 1; i < mwc && (mstart + i - 1) < 88; i++)
+                fw[mstart + i - 1] = mw[i];
+        } else {
+            for (int i = 0; i < mwc && (mstart + i) < 88; i++)
+                fw[mstart + i] = mw[i];
+        }
+    } else {
+        // Type 2 = short/tone (empty msg), Type 3 = short numeric (msg digits)
+        std::string short_msg = (msg_type == 3) ? msg : "";
+        uint32_t short_vy = 0;
+        fw[vstart] = flex_short_vector(is_long, short_msg, &short_vy);
+        if (is_long)
+            fw[vstart + 1] = short_vy;
+    }
+
+    // Idle fill
+    int mf_words = mwc;
+    if (is_long && mwc > 0 && msg_type == 1)
+        mf_words = mwc - 1;
+    for (int i = mstart + mf_words; i < 88; i++)
+        fw[i] = (i & 1) ? 0x00000000 : 0xFFFFFFFF;
+
+    for (int blk = 0; blk < 11; blk++)
+        flex_interleave_block(blk, fw);
+
+    memcpy(p, fw, 88 * 4);
+    p += 88 * 4;
+
+    // Trailing idle
+    *p++ = 0xAA;
+    *p++ = 0xAA;
+    *p++ = 0xAA;
+    *p++ = 0xAA;
+
+    return (size_t)(p - buf);
+}
+
+// ===== ERS =====
+
+static size_t build_ers(uint8_t* buf, int cycles) {
+    uint8_t* p = buf;
+    uint8_t ar_inv[4];
+    for (int i = 0; i < 4; i++) ar_inv[i] = ~ar[i];
+    for (int c = 0; c < cycles; c++) {
+        *p++ = 0xAA;
+        *p++ = 0xAA;
+        memcpy(p, ar, 4);
+        p += 4;
+        *p++ = 0x55;
+        *p++ = 0x55;
+        memcpy(p, ar_inv, 4);
+        p += 4;
+    }
+    return (size_t)(p - buf);
+}
+
+// ===== FlexParamsView =====
+
+FlexParamsView::FlexParamsView(NavigationView& nav, FlexBIWParams& params)
+    : params_(params), nav_(nav) {
+    add_children({&labels,
+                  &check_date, &field_year, &field_month, &field_day,
+                  &check_time, &field_hour, &field_minute, &field_second,
+                  &check_tz, &options_tz, &check_dst,
+                  &check_ssid1, &field_local_id, &labels_cz, &field_coverage,
+                  &check_ssid2, &field_country, &check_roaming,
+                  &labels_msg, &field_msg_number,
+                  &check_ers, &field_ers_count,
+                  &button_save, &button_cancel});
+
+    // Populate from params
+    check_date.set_value(params_.send_date);
+    field_year.set_value(params_.year);
+    field_month.set_value(params_.month);
+    field_day.set_value(params_.day);
+
+    check_time.set_value(params_.send_time);
+    field_hour.set_value(params_.hour);
+    field_minute.set_value(params_.minute);
+    field_second.set_value(params_.second);
+
+    check_tz.set_value(params_.send_tz);
+    options_tz.set_by_value(params_.tz_code);
+    check_dst.set_value(params_.send_dst);
+
+    check_ssid1.set_value(params_.send_ssid1);
+    field_local_id.set_value(params_.local_id);
+    field_coverage.set_value(params_.coverage_zone);
+
+    check_ssid2.set_value(params_.send_ssid2);
+    field_country.set_value(params_.country_code);
+    check_roaming.set_value(params_.roaming);
+
+    field_msg_number.set_value(params_.msg_number);
+
+    check_ers.set_value(params_.send_ers);
+    field_ers_count.set_value(params_.ers_count);
+
+    // Roaming implies SSID1 + SSID2
+    check_roaming.on_select = [this](Checkbox&, bool v) {
+        on_roaming_changed(v);
+    };
+
+    button_save.on_select = [this, &nav](Button&) {
+        int32_t yr = field_year.value();
+        if (yr > 2025) {
+            int equiv = flex_equiv_year(yr);
+            nav.display_modal(
+                "Year > 2025",
+                "Valid: 1994-2025\nEquiv for " + to_string_dec_uint(yr) + ": " + to_string_dec_uint(equiv));
+            field_year.set_value(equiv);
+            return;
+        }
+        params_.send_date = check_date.value();
+        params_.year = yr;
+        params_.month = field_month.value();
+        params_.day = field_day.value();
+        params_.send_time = check_time.value();
+        params_.hour = field_hour.value();
+        params_.minute = field_minute.value();
+        params_.second = field_second.value();
+        params_.send_tz = check_tz.value();
+        params_.tz_code = options_tz.selected_index_value();
+        params_.send_dst = check_dst.value();
+        params_.send_ssid1 = check_ssid1.value();
+        params_.local_id = field_local_id.value();
+        params_.coverage_zone = field_coverage.value();
+        params_.send_ssid2 = check_ssid2.value();
+        params_.country_code = field_country.value();
+        params_.roaming = check_roaming.value();
+        params_.msg_number = field_msg_number.value();
+        params_.send_ers = check_ers.value();
+        params_.ers_count = field_ers_count.value();
+        nav.pop();
+    };
+
+    button_cancel.on_select = [&nav](Button&) {
+        nav.pop();
+    };
+}
+
+void FlexParamsView::on_roaming_changed(bool v) {
+    if (v) {
+        check_ssid1.set_value(true);
+        check_ssid2.set_value(true);
+    }
+}
+
+void FlexParamsView::focus() {
+    button_save.focus();
+}
+
+// ===== Serial message handler =====
+
+void FlexTXView::on_serial_msg(const FlexTosendMessage data) {
+    field_capcode.set_value(data.capcode);
+    capcode_value = data.capcode;
+    options_type.set_selected_index(data.type);
+    message = std::string((char*)data.msg, data.msglen);
+    buffer = message;
+    text_message.set(message);
+    if (message.length() > 30 && message.length() <= 60)
+        text_message_l2.set(message.substr(29));
+    else if (message.length() > 60)
+        text_message_l2.set(message.substr(29, 27) + "...");
+    else
+        text_message_l2.set("");
+    field_capcode.dirty();
+    options_type.dirty();
+    text_message.dirty();
+    text_message_l2.dirty();
+    tx_view.focus();
+    if (start_tx()) tx_view.set_transmitting(true);
+}
+
+// ===== TX =====
+
+void FlexTXView::on_tx_progress(const uint32_t progress, const bool done) {
+    if (done) {
+        if (tx_phase_ == 0) return;  // stopped by user
+        int ers_n = tx_steps_total_ - 2;
+        if (tx_phase_ == 1 && ers_remaining_ > 0) {
+            tx_step_++;
+            text_capinfo.set("[" + to_string_dec_uint(tx_step_) + "/" + to_string_dec_uint(tx_steps_total_) +
+                             "] ERS " + to_string_dec_uint(tx_step_) + "/" + to_string_dec_uint(ers_n));
+            uint8_t* data = shared_memory.bb_data.data;
+            size_t total = build_ers(data, 42);
+            ers_remaining_--;
+            uint32_t total_bits = total * 8;
+            progressbar.set_max(total_bits / 64);
+            baseband::set_fsk_data(total_bits, 2280000 / 1600, 4500, 64);
+        } else if (tx_phase_ == 1) {
+            tx_phase_ = 2;
+            tx_step_++;
+            text_capinfo.set("[" + to_string_dec_uint(tx_step_) + "/" + to_string_dec_uint(tx_steps_total_) +
+                             "] Frame 1/2 (new)");
+            send_frame(1);
+        } else if (tx_phase_ == 2) {
+            tx_phase_ = 3;
+            tx_step_++;
+            text_capinfo.set("[" + to_string_dec_uint(tx_step_) + "/" + to_string_dec_uint(tx_steps_total_) +
+                             "] Frame 2/2 (dup)");
+            send_frame(0);
+        } else {
+            biw_params_.msg_number = (biw_params_.msg_number + 1) & 63;
+            transmitter_model.disable();
+            progressbar.set_value(0);
+            tx_view.set_transmitting(false);
+            tx_phase_ = 0;
+            set_dirty();  // repaint capcode info
+        }
+    } else {
+        if (tx_phase_ != 0)
+            progressbar.set_value(progress);
+    }
+}
+
+bool FlexTXView::start_tx() {
+    uint64_t capcode = field_capcode.to_integer();
+    capcode_value = capcode;
+    if (capcode < 1 || capcode > 4297068542ULL) {
+        nav_.display_modal("Bad capcode", "Capcode: 1-4297068542");
+        return false;
+    }
+
+    int msg_type = options_type.selected_index();
+    if (msg_type == 1) {
+        if (message.find_first_not_of("0123456789 U-][") != std::string::npos) {
+            nav_.display_modal("Bad message", "Numeric: 0-9 U - ] [ space");
+            return false;
+        }
+    }
+
+    transmitter_model.set_sampling_rate(2280000);
+    transmitter_model.set_baseband_bandwidth(1'750'000);
+    transmitter_model.enable();
+
+    int ers_n = (biw_params_.send_ers && biw_params_.ers_count > 0) ? biw_params_.ers_count : 0;
+    tx_steps_total_ = ers_n + 2;
+    tx_step_ = 0;
+
+    if (ers_n > 0) {
+        tx_phase_ = 1;
+        ers_remaining_ = ers_n;
+        tx_step_++;
+        text_capinfo.set("[" + to_string_dec_uint(tx_step_) + "/" + to_string_dec_uint(tx_steps_total_) +
+                         "] ERS " + to_string_dec_uint(tx_step_) + "/" + to_string_dec_uint(ers_n));
+        uint8_t* data = shared_memory.bb_data.data;
+        size_t total = build_ers(data, 42);
+        ers_remaining_--;
+        uint32_t total_bits = total * 8;
+        progressbar.set_max(total_bits / 64);
+        baseband::set_fsk_data(total_bits, 2280000 / 1600, 4500, 64);
+    } else {
+        tx_phase_ = 2;
+        tx_step_++;
+        text_capinfo.set("[" + to_string_dec_uint(tx_step_) + "/" + to_string_dec_uint(tx_steps_total_) +
+                         "] Frame 1/2 (new)");
+        send_frame(1);
+    }
+
+    return true;
+}
+
+void FlexTXView::send_frame(uint32_t msg_r) {
+    uint64_t capcode = field_capcode.to_integer();
+    int msg_type = options_type.selected_index();
+
+    uint8_t* data = shared_memory.bb_data.data;
+    size_t total = 0;
+
+    total += build_ers(data + total, 8);
+    total += build_frame(data + total, capcode, msg_type, message, 0, 0, msg_r, biw_params_);
+
+    uint32_t total_bits = total * 8;
+    progressbar.set_max(total_bits / 64);
+    baseband::set_fsk_data(total_bits, 2280000 / 1600, 4500, 64);
+}
+
+// ===== UI =====
+
+void FlexTXView::focus() {
+    field_capcode.focus();
+}
+
+FlexTXView::~FlexTXView() {
+    transmitter_model.disable();
+    baseband::shutdown();
+}
+
+void FlexTXView::paint(Painter&) {
+    message = buffer;
+    text_message.set(message);
+    if (message.length() > 30 && message.length() <= 60)
+        text_message_l2.set(message.substr(29));
+    else if (message.length() > 60)
+        text_message_l2.set(message.substr(29, 27) + "...");
+    else
+        text_message_l2.set("");
+
+    // Capcode info line
+    uint64_t cap = field_capcode.to_integer();
+    std::string info;
+    if (cap == 0) {
+        info = "Invalid";
+    } else if (cap <= 1933312ULL) {
+        info = "Short addr";
+    } else if (cap >= 2062336ULL && cap <= 2062351ULL) {
+        info = "Temp grp #" + to_string_dec_uint(cap - 2062336ULL);
+    } else if (cap >= 2062352ULL && cap <= 2062367ULL) {
+        info = "Operator msg";
+    } else if (cap >= 2058240ULL && cap <= 2062335ULL) {
+        info = "Network addr";
+    } else if (cap >= 2041856ULL && cap <= 2058239ULL) {
+        info = "Info service";
+    } else if (cap > 1933312ULL && cap < 2101249ULL) {
+        info = "Reserved";
+    } else if (cap >= 2101249ULL && cap <= 4297068542ULL) {
+        info = "Long addr";
+    } else {
+        info = "Invalid";
+    }
+    // Computed frame/phase for all valid addresses
+    if (cap >= 1 && cap <= 4297068542ULL) {
+        static const char ph[] = "ABCD";
+        int frame = (int)((cap / 16) % 128);
+        int phase = (int)((cap / 4) % 4);
+        info += ", F" + to_string_dec_uint(frame) +
+                " " + std::string(1, ph[phase]);
+    }
+    text_capinfo.set(info);
+}
+
+void FlexTXView::on_set_text(NavigationView& nav) {
+    text_prompt(nav, buffer, MAX_FLEX_MSG, ENTER_KEYBOARD_MODE_ALPHA);
+}
+
+FlexTXView::FlexTXView(NavigationView& nav)
+    : nav_(nav) {
+    baseband::run_prepared_image(portapack::memory::map::m4_code.base());
+
+    // Init random msg number from RTC
+    {
+        rtc::RTC datetime;
+        rtc_time::now(datetime);
+        int seed = datetime.second() + datetime.minute() * 7 + datetime.hour();
+        biw_params_.msg_number = seed & 63;
+        if (biw_params_.msg_number == 0)
+            biw_params_.msg_number = 1;
+    }
+
+    // Always populate date/time/dst from RTC
+    {
+        rtc::RTC datetime;
+        rtc_time::now(datetime);
+        int real_year = datetime.year();
+        biw_params_.year = flex_equiv_year(real_year);
+        biw_params_.month = datetime.month();
+        biw_params_.day = datetime.day();
+        biw_params_.hour = datetime.hour();
+        biw_params_.minute = datetime.minute();
+        biw_params_.second = datetime.second();
+        biw_params_.send_dst = portapack::persistent_memory::dst_enabled() ? 1 : 0;
+    }
+
+    add_children({&labels, &text_capinfo, &field_capcode, &options_speed, &options_type,
+                  &text_message, &text_message_l2,
+                  &button_message, &button_params, &progressbar, &tx_view});
+
+    options_speed.set_selected_index(0);
+    options_type.set_selected_index(0);
+    field_capcode.set_value(capcode_value);
+
+    field_capcode.on_change = [this](SymField&) {
+        set_dirty();  // trigger repaint to update capcode info text
+    };
+
+    button_message.on_select = [this, &nav](Button&) {
+        this->on_set_text(nav);
+    };
+
+    button_params.on_select = [this, &nav](Button&) {
+        nav.push<FlexParamsView>(biw_params_);
+    };
+
+    tx_view.on_edit_frequency = [this, &nav]() {
+        auto new_view =
+            nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
+        new_view->on_changed = [this](rf::Frequency f) {
+            transmitter_model.set_target_frequency(f);
+        };
+    };
+
+    tx_view.on_start = [this]() {
+        if (start_tx()) tx_view.set_transmitting(true);
+    };
+
+    tx_view.on_stop = [this]() {
+        tx_phase_ = 0;
+        tx_view.set_transmitting(false);
+        transmitter_model.disable();
+        progressbar.set_value(0);
+        set_dirty();  // repaint capcode info
+    };
+}
+
+}  // namespace ui::external_app::flex_tx
@@ -0,0 +1,251 @@
+#ifndef __UI_FLEX_TX_H__
+#define __UI_FLEX_TX_H__
+
+#include "ui.hpp"
+#include "ui_widget.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "ui_transmitter.hpp"
+#include "message.hpp"
+#include "transmitter_model.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+
+namespace ui::external_app::flex_tx {
+
+struct FlexBIWParams {
+    int32_t send_date{1};
+    int32_t send_time{1};
+    int32_t send_tz{1};
+    int32_t send_dst{0};
+    int32_t send_ssid1{0};
+    int32_t send_ssid2{0};
+    int32_t roaming{0};
+    int32_t year{2015};
+    int32_t month{1};
+    int32_t day{1};
+    int32_t hour{0};
+    int32_t minute{0};
+    int32_t second{0};
+    int32_t tz_code{0};
+    int32_t local_id{0};
+    int32_t coverage_zone{0};
+    int32_t country_code{0};
+    int32_t msg_number{0};
+    int32_t send_ers{1};
+    int32_t ers_count{1};
+};
+
+class FlexParamsView : public View {
+   public:
+    FlexParamsView(NavigationView& nav, FlexBIWParams& params);
+
+    std::string title() const override { return "FLEX Params"; };
+    void focus() override;
+
+   private:
+    FlexBIWParams& params_;
+    NavigationView& nav_;
+
+    void on_roaming_changed(bool v);
+
+    Labels labels{
+        {{12 * 8, 1 * 16}, "-", Theme::getInstance()->fg_light->foreground},
+        {{15 * 8, 1 * 16}, "-", Theme::getInstance()->fg_light->foreground},
+        {{10 * 8, 2 * 16}, ":", Theme::getInstance()->fg_light->foreground},
+        {{13 * 8, 2 * 16}, ":", Theme::getInstance()->fg_light->foreground},
+    };
+
+    Checkbox check_date{{0 * 8, 1 * 16}, 4, "Date", true};
+    NumberField field_year{{8 * 8, 1 * 16}, 4, {1994, 2099}, 1, '0', true};
+    NumberField field_month{{13 * 8, 1 * 16}, 2, {1, 12}, 1, '0', true};
+    NumberField field_day{{16 * 8, 1 * 16}, 2, {1, 31}, 1, '0', true};
+
+    Checkbox check_time{{0 * 8, 2 * 16}, 4, "Time", true};
+    NumberField field_hour{{8 * 8, 2 * 16}, 2, {0, 23}, 1, '0', true};
+    NumberField field_minute{{11 * 8, 2 * 16}, 2, {0, 59}, 1, '0', true};
+    NumberField field_second{{14 * 8, 2 * 16}, 2, {0, 59}, 1, '0', true};
+
+    Checkbox check_tz{{0 * 8, 3 * 16}, 2, "TZ", true};
+    OptionsField options_tz{
+        {6 * 8, 3 * 16},
+        9,
+        {{"UTC+0   ", 0},
+         {"UTC+1   ", 1},
+         {"UTC+2   ", 2},
+         {"UTC+3   ", 3},
+         {"UTC+4   ", 4},
+         {"UTC+5   ", 5},
+         {"UTC+6   ", 6},
+         {"UTC+7   ", 7},
+         {"UTC+8   ", 8},
+         {"UTC+9   ", 9},
+         {"UTC+10  ", 10},
+         {"UTC+11  ", 11},
+         {"UTC+12  ", 12},
+         {"UTC+3:30", 13},
+         {"UTC+4:30", 14},
+         {"UTC+5:30", 15},
+         {"UTC+5:45", 17},
+         {"UTC+6:30", 18},
+         {"UTC+9:30", 19},
+         {"UTC-3:30", 20},
+         {"UTC-11  ", 21},
+         {"UTC-10  ", 22},
+         {"UTC-9   ", 23},
+         {"UTC-8   ", 24},
+         {"UTC-7   ", 25},
+         {"UTC-6   ", 26},
+         {"UTC-5   ", 27},
+         {"UTC-4   ", 28},
+         {"UTC-3   ", 29},
+         {"UTC-2   ", 30},
+         {"UTC-1   ", 31}}};
+    Checkbox check_dst{{18 * 8, 3 * 16}, 3, "DST", true};
+
+    Checkbox check_ssid1{{0 * 8, 5 * 16}, 5, "LocID", true};
+    NumberField field_local_id{{9 * 8, 5 * 16}, 3, {0, 511}, 1, '0'};
+    Labels labels_cz{
+        {{12 * 8, 5 * 16}, "CovZone", Theme::getInstance()->fg_light->foreground},
+    };
+    NumberField field_coverage{{20 * 8, 5 * 16}, 2, {0, 31}, 1, '0'};
+
+    Checkbox check_ssid2{{0 * 8, 6 * 16}, 11, "CountryCode", true};
+    NumberField field_country{{15 * 8, 6 * 16}, 4, {0, 1023}, 1, '0'};
+    Checkbox check_roaming{{0 * 8, 7 * 16}, 4, "Roam", true};
+
+    Labels labels_msg{
+        {{0 * 8, 9 * 16}, "Msg#:", Theme::getInstance()->fg_light->foreground},
+    };
+    NumberField field_msg_number{{5 * 8, 9 * 16}, 2, {0, 63}, 1, '0'};
+
+    Checkbox check_ers{{0 * 8, 10 * 16}, 3, "ERS", true};
+    NumberField field_ers_count{{8 * 8, 10 * 16}, 2, {1, 10}, 1, ' '};
+
+    Button button_save{{1 * 8, 12 * 16, 12 * 8, 32}, "Save"};
+    Button button_cancel{{16 * 8, 12 * 16, 12 * 8, 32}, "Cancel"};
+};
+
+class FlexTXView : public View {
+   public:
+    FlexTXView(NavigationView& nav);
+    ~FlexTXView();
+
+    FlexTXView(const FlexTXView&) = delete;
+    FlexTXView& operator=(const FlexTXView&) = delete;
+
+    void focus() override;
+    void paint(Painter&) override;
+    std::string title() const override { return "FLEX TX"; };
+
+    FlexBIWParams biw_params_{};
+
+   private:
+    std::string buffer{"FLEX TEST"};
+    std::string message{};
+    NavigationView& nav_;
+    int tx_phase_{0};
+    int ers_remaining_{0};
+    int tx_step_{0};
+    int tx_steps_total_{0};
+
+    int64_t capcode_value{1000};
+
+    TxRadioState radio_state_{
+        931740000 /* frequency */,
+        1750000 /* bandwidth */,
+        2280000 /* sampling rate */
+    };
+    app_settings::SettingsManager settings_{
+        "tx_flex",
+        app_settings::Mode::TX,
+        {{"capcode", &capcode_value},
+         {"biw_date", &biw_params_.send_date},
+         {"biw_time", &biw_params_.send_time},
+         {"biw_tz", &biw_params_.send_tz},
+         {"biw_ssid1", &biw_params_.send_ssid1},
+         {"biw_ssid2", &biw_params_.send_ssid2},
+         {"biw_roam", &biw_params_.roaming},
+         {"biw_tzc", &biw_params_.tz_code},
+         {"biw_lid", &biw_params_.local_id},
+         {"biw_cz", &biw_params_.coverage_zone},
+         {"biw_cc", &biw_params_.country_code},
+         {"biw_ers", &biw_params_.send_ers},
+         {"biw_ersc", &biw_params_.ers_count}}};
+
+    void on_set_text(NavigationView& nav);
+    void on_tx_progress(const uint32_t progress, const bool done);
+    void on_serial_msg(const FlexTosendMessage data);
+    bool start_tx();
+    void send_frame(uint32_t msg_r);
+
+    Labels labels{
+        {{1 * 8, 4 * 8}, "Capcode:", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, 6 * 8}, "Speed:", Theme::getInstance()->fg_light->foreground},
+        {{4 * 8, 8 * 8}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 12 * 8}, "Message:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_capinfo{
+        {UI_POS_X(0), 2 * 8, screen_width, 16},
+        ""};
+
+    SymField field_capcode{
+        {10 * 8, 4 * 8},
+        10};
+
+    OptionsField options_speed{
+        {10 * 8, 6 * 8},
+        10,
+        {{"1600/2FSK ", 0}}};
+
+    OptionsField options_type{
+        {10 * 8, 8 * 8},
+        14,
+        {{"Alphanumeric ", 0},
+         {"Numeric      ", 1},
+         {"Short/tone   ", 2},
+         {"Short numeric", 3}}};
+
+    Text text_message{
+        {UI_POS_X(0), 14 * 8, screen_width, 16},
+        ""};
+    Text text_message_l2{
+        {UI_POS_X(0), 16 * 8, screen_width, 16},
+        ""};
+
+    Button button_message{
+        {UI_POS_X(0), 18 * 8, 13 * 8, 32},
+        "Set message"};
+
+    Button button_params{
+        {14 * 8, 18 * 8, 13 * 8, 32},
+        "Set params"};
+
+    ProgressBar progressbar{
+        {16, 210, UI_POS_WIDTH_REMAINING(4), 16}};
+
+    TransmitterView tx_view{
+        (int16_t)UI_POS_Y_BOTTOM(4),
+        10000,
+        9};
+
+    MessageHandlerRegistration message_handler_tx_progress{
+        Message::ID::TXProgress,
+        [this](const Message* const p) {
+            const auto message =
+                *reinterpret_cast<const TXProgressMessage*>(p);
+            this->on_tx_progress(message.progress, message.done);
+        }};
+
+    MessageHandlerRegistration message_handler_flex_tosend{
+        Message::ID::FlexTosend,
+        [this](const Message* const p) {
+            const auto message =
+                *reinterpret_cast<const FlexTosendMessage*>(p);
+            this->on_serial_msg(message);
+        }};
+};
+
+}  // namespace ui::external_app::flex_tx
+
+#endif
@@ -73,7 +73,7 @@ __attribute__((section(".external_app.app_flippertx.application_information"), u
        0xE0,
        0x07,
    },
-    /*.icon_color = */ ui::Color::orange().v,
+    /*.icon_color = */ ui::Color::yellow().v,
    /*.menu_location = */ app_location_t::TX,
    /*.desired_menu_position = */ -1,

@@ -80,7 +80,7 @@ bool FlipperTxView::on_file_changed(std::filesystem::path new_file_path) {
        return false;
    }
    preset = submeta.value().preset;
-    if (preset != FLIPPER_PRESET_OOK) {
+    if (preset != FLIPPER_PRESET_OOK && preset != FLIPPER_PRESET_2FSK) {
        field_filename.set_text("File: err, not supp. preset");
        return false;
    }
@@ -108,8 +108,13 @@ void FlipperTxView::stop() {
 bool FlipperTxView::start() {
    if (filename.empty()) return false;
    baseband::run_prepared_image(portapack::memory::map::m4_code.base());
+    transmitter_model.set_sampling_rate(OOK_SAMPLERATE);
    transmitter_model.enable();
    button_startstop.set_text(LanguageHelper::currentMessages[LANG_STOP]);
+    uint8_t mode = 0;
+    if (preset == FLIPPER_PRESET_2FSK)
+        mode = 1;
+    baseband::set_bitstream_config(FM_DEVIATION, mode);
    // start thread
    replay_thread = std::make_unique<FlipperPlayThread>(
        filename,
@@ -28,6 +28,8 @@ using namespace ui;
 namespace ui::external_app::flippertx {

 #define OOK_SAMPLERATE 2280000U
+#define FM_DEVIATION 60000U
+
 class FlipperPlayThread;
 class FlipperTxView : public View {
   public:
@@ -165,7 +165,7 @@ FmRadioView::FmRadioView(NavigationView& nav)
                  &gr});

    txt_save_help.set_focusable(false);
-    txt_save_help.visible(false);
+    txt_save_help.hidden(true);
    for (uint8_t i = 0; i < 12; ++i) {
        if (freq_fav_list[i].frequency == 0) {
            freq_fav_list[i].frequency = 87000000;
@@ -195,7 +195,7 @@ FmRadioView::FmRadioView(NavigationView& nav)
    btn_fav_save.on_select = [this](Button&) {
        save_fav = !save_fav;
        txt_save_help.set_text(save_fav ? "Select slot" : "");
-        txt_save_help.visible(save_fav);
+        txt_save_help.hidden(!save_fav);
        txt_save_help.set_dirty();
    };

@@ -229,9 +229,9 @@ void FmRadioView::on_btn_clicked(uint8_t i) {
        freq_fav_list[i].modulation = field_modulation.selected_index_value();
        freq_fav_list[i].bandwidth = radio_bw;
        update_fav_btn_texts();
-        txt_save_help.visible(save_fav);
+        txt_save_help.hidden(true);
        txt_save_help.set_text("");
-        txt_save_help.set_dirty();
+        set_dirty();
        return;
    }
    field_frequency.set_value(freq_fav_list[i].frequency);
@@ -266,7 +266,7 @@ FmRadioView::~FmRadioView() {
 }

 void FmRadioView::on_audio_spectrum() {
-    if (gr.visible() && audio_spectrum_data) gr.update_audio_spectrum(*audio_spectrum_data);
+    if (gr.drawn() && audio_spectrum_data) gr.update_audio_spectrum(*audio_spectrum_data);
    if (audio_spectrum_data && audio_spectrum_data->db.size() <= 128) {
        for (size_t i = 0; i < audio_spectrum_data->db.size(); ++i) {
            audio_spectrum[i] = ((int16_t)audio_spectrum_data->db[i] - 127) * 256;
@@ -0,0 +1,65 @@
+// Author: berkeozkir (Berke Özkır)
+
+#include "ui.hpp"
+#include "ui_fpv_detect.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::fpv_detect {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<FpvDetectView>();
+}
+}  // namespace ui::external_app::fpv_detect
+
+extern "C" {
+
+__attribute__((section(".external_app.app_fpv_detect.application_information"), used)) application_information_t _application_information_fpv_detect = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::fpv_detect::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "FPV DETECT",
+    /*.bitmap_data = */
+    {
+        0x00,
+        0x00,
+        0xC0,
+        0x03,
+        0x20,
+        0x04,
+        0x10,
+        0x08,
+        0x48,
+        0x12,
+        0xA4,
+        0x25,
+        0x54,
+        0x2A,
+        0xA8,
+        0x15,
+        0x54,
+        0x2A,
+        0xA4,
+        0x25,
+        0x48,
+        0x12,
+        0x10,
+        0x08,
+        0x20,
+        0x04,
+        0xC0,
+        0x03,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+    },
+    /*.icon_color = */ ui::Color::orange().v,
+    /*.menu_location = */ app_location_t::RX,
+    /*.desired_menu_position = */ -1,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_wfm_audio */ {'P', 'W', 'F', 'M'},
+    /*.m4_app_offset = */ 0x00000000,
+};
+}
@@ -0,0 +1,664 @@
+// Author: berkeozkir (Berke Özkır)
+
+/*
+ * FPV RX — how frequency search and lock work
+ *
+ * 1. Power metric: We use channelized power that portapack RSSI algo included.
+ *
+ * 2. Scanning: We step through FPV bands/channels (A/B/E/F/R, 8 ch each). When
+ *    power on the current channel exceeds the detect threshold, we enter
+ *    "Candidate" and run verification - with some edge detecting algo.
+ *
+ * 3. Verification (making sure the drone is on that freq):
+ *    - Multiple samples: verify_hits / verify_misses over several updates.
+ *    - Confidence score: combines average above threshold, peak margin,
+ *      hit count, and crucially neighbor_margin = center power − max(adjacent ch).
+ *    - Neighbor check: we only lock if the center channel is at least
+ *      MIN_NEIGHBOR_MARGIN_FOR_LOCK_DB above both adjacent channels. That
+ *      avoids locking on wide/noise that looks strong on many channels.
+ *      During Candidate we re-sample left/right adjacent channels so the
+ *      margin is based on current measurements, not stale scan data.
+ *    - Lock requires: enough hits, confidence ≥ LOCK_CONFIDENCE_MIN, and
+ *      center stronger than neighbors (strong lock path has same requirement).
+ *
+ * 4. Lock hold: Once locked, we only unlock when power stays below
+ *    unlock_threshold_db() long enough to drain lock_hold_ (down from
+ *    LOCK_HOLD_MAX), so brief fades don't drop lock.
+ */
+
+#include "ui_fpv_detect.hpp"
+
+#include <cstdio>
+
+#include "baseband_api.hpp"
+#include "oversample.hpp"
+
+using namespace portapack;
+
+namespace ui::external_app::fpv_detect {
+
+static constexpr uint8_t SCAN_DWELL_FRAMES = 1;
+static constexpr uint8_t VERIFY_SAMPLE_TARGET = 5;
+static constexpr uint8_t VERIFY_MIN_HITS = 4;
+static constexpr uint8_t STRONG_LOCK_PEAK_MARGIN_DB = 8;
+static constexpr uint8_t LOCK_HOLD_MAX = 12;
+static constexpr uint8_t LOCK_CONFIDENCE_MIN = 72;
+/** Center channel must be at least this many dB above adjacent channels to lock.
+ *  Ensures we lock on a real FPV carrier (narrow peak) rather than wide/noise. */
+static constexpr int32_t MIN_NEIGHBOR_MARGIN_FOR_LOCK_DB = 3;
+static constexpr uint8_t BEEP_GUARD_FRAMES = 8;
+
+int32_t FpvDetectView::clamp_value(int32_t value, int32_t low, int32_t high) {
+    if (value < low) return low;
+    if (value > high) return high;
+    return value;
+}
+
+int32_t FpvDetectView::map_value(int32_t value, int32_t from_low, int32_t from_high, int32_t to_low, int32_t to_high) {
+    const auto clamped = clamp_value(value, from_low, from_high);
+    return to_low + (clamped - from_low) * (to_high - to_low) / (from_high - from_low);
+}
+
+void FpvDetectView::focus() {
+    field_lna.focus();
+}
+
+FpvDetectView::~FpvDetectView() {
+    shared_memory.request_m4_performance_counter = 0;
+    receiver_model.disable();
+    audio::output::stop();
+    baseband::shutdown();
+}
+
+uint8_t FpvDetectView::channel_index(uint8_t band, uint8_t ch) const {
+    return static_cast<uint8_t>(band * FPV_CHANNELS_PER_BAND + ch);
+}
+
+uint8_t FpvDetectView::current_channel_index() const {
+    return channel_index(scan_band, scan_ch);
+}
+
+int16_t FpvDetectView::detect_threshold_db() const {
+    return static_cast<int16_t>(detect_threshold_db_);
+}
+
+int16_t FpvDetectView::unlock_threshold_db() const {
+    return static_cast<int16_t>(detect_threshold_db() - 6);
+}
+
+int16_t FpvDetectView::candidate_average_db() const {
+    if (!verify_samples_) {
+        return -120;
+    }
+    return static_cast<int16_t>(verify_sum_db_ / verify_samples_);
+}
+
+int16_t FpvDetectView::neighbor_best_db() const {
+    int16_t best = -120;
+
+    if (candidate_ch_ > 0) {
+        const auto& left = channel_memory_[channel_index(candidate_band_, static_cast<uint8_t>(candidate_ch_ - 1))];
+        if (left.last_db > best) {
+            best = left.last_db;
+        }
+    }
+
+    if ((candidate_ch_ + 1) < FPV_CHANNELS_PER_BAND) {
+        const auto& right = channel_memory_[channel_index(candidate_band_, static_cast<uint8_t>(candidate_ch_ + 1))];
+        if (right.last_db > best) {
+            best = right.last_db;
+        }
+    }
+
+    return best;
+}
+
+void FpvDetectView::request_event_beep(uint32_t hz, uint32_t duration_ms) {
+    if ((frame_counter_ - last_beep_frame_) < BEEP_GUARD_FRAMES) {
+        return;
+    }
+    last_beep_frame_ = frame_counter_;
+    baseband::request_audio_beep(hz, 24000, duration_ms);
+}
+
+void FpvDetectView::retune_to(uint8_t band, uint8_t ch) {
+    scan_band = band;
+    scan_ch = ch;
+    freq_ = fpv_frequencies[band][ch];
+    receiver_model.set_target_frequency(freq_);
+    update_freq_display();
+}
+
+void FpvDetectView::step_scan() {
+    if (band_mode < FPV_NUM_BANDS) {
+        scan_band = band_mode;
+        scan_ch = static_cast<uint8_t>((scan_ch + 1) % FPV_CHANNELS_PER_BAND);
+    } else {
+        scan_ch = static_cast<uint8_t>(scan_ch + 1);
+        if (scan_ch >= FPV_CHANNELS_PER_BAND) {
+            scan_ch = 0;
+            scan_band = static_cast<uint8_t>(scan_band + 1);
+            if (scan_band >= FPV_NUM_BANDS) {
+                scan_band = 0;
+            }
+        }
+    }
+
+    retune_to(scan_band, scan_ch);
+    scan_dwell_frames_ = SCAN_DWELL_FRAMES;
+}
+
+void FpvDetectView::reset_detector(bool retune_current) {
+    detect_state_ = DetectState::Scanning;
+    candidate_band_ = scan_band;
+    candidate_ch_ = scan_ch;
+    verify_samples_ = 0;
+    verify_hits_ = 0;
+    verify_misses_ = 0;
+    verify_sum_db_ = 0;
+    verify_peak_db_ = -120;
+    candidate_confidence_ = 0;
+    lock_hold_ = 0;
+    neighbor_phase_ = 0;
+    neighbors_fresh_ = false;
+    scan_dwell_frames_ = 0;
+
+    update_state_badge();
+    update_confidence_text();
+    update_status_text();
+    update_detail_text();
+    update_visual_state();
+
+    if (retune_current) {
+        retune_to(scan_band, scan_ch);
+        scan_dwell_frames_ = SCAN_DWELL_FRAMES;
+    }
+}
+
+bool FpvDetectView::is_possible_freq_spike(const ChannelStatistics& statistics) const {
+    return statistics.max_db >= detect_threshold_db();
+}
+
+uint8_t FpvDetectView::compute_candidate_confidence() const {
+    if (!verify_samples_) {
+        return 0;
+    }
+
+    const int32_t avg_db = candidate_average_db();
+    const int32_t center_margin = avg_db - detect_threshold_db();
+    const int32_t peak_margin = verify_peak_db_ - detect_threshold_db();
+    const int32_t neighbor_margin = avg_db - neighbor_best_db();
+
+    int32_t score = 18;
+    score += center_margin * 7;
+    score += peak_margin * 4;
+    score += static_cast<int32_t>(verify_hits_) * 5;
+    score -= static_cast<int32_t>(verify_misses_) * 10;
+
+    if (neighbor_margin >= 6) {
+        score += 12;
+    } else if (neighbor_margin >= 3) {
+        score += 6;
+    } else if (neighbor_margin <= 0) {
+        score -= 8;
+    }
+
+    const auto& mem = channel_memory_[channel_index(candidate_band_, candidate_ch_)];
+    if (mem.hits >= 2) {
+        score += 4;
+    }
+
+    return static_cast<uint8_t>(clamp_value(score, 0, 99));
+}
+
+void FpvDetectView::enter_candidate(const ChannelStatistics& statistics) {
+    detect_state_ = DetectState::Candidate;
+    candidate_band_ = scan_band;
+    candidate_ch_ = scan_ch;
+    verify_samples_ = 1;
+    verify_hits_ = 1;
+    verify_misses_ = 0;
+    verify_sum_db_ = statistics.max_db;
+    verify_peak_db_ = statistics.max_db;
+    candidate_confidence_ = compute_candidate_confidence();
+    neighbor_phase_ = 0;
+    neighbors_fresh_ = false;
+
+    retune_to(candidate_band_, candidate_ch_);
+
+    update_state_badge();
+    update_confidence_text();
+    update_status_text();
+    update_detail_text();
+    update_visual_state();
+    request_event_beep(1150, 60);
+}
+
+void FpvDetectView::evaluate_candidate_sample(const ChannelStatistics& statistics) {
+    if (detect_state_ != DetectState::Candidate) {
+        return;
+    }
+
+    ++verify_samples_;
+    verify_sum_db_ += statistics.max_db;
+    if (statistics.max_db > verify_peak_db_) {
+        verify_peak_db_ = statistics.max_db;
+    }
+
+    if (statistics.max_db >= detect_threshold_db()) {
+        ++verify_hits_;
+    } else {
+        ++verify_misses_;
+    }
+
+    candidate_confidence_ = compute_candidate_confidence();
+    update_confidence_text();
+    update_detail_text();
+
+    /* Refresh adjacent channel power so neighbor_best_db() uses current
+     * measurements instead of stale scan data. Do this before any lock decision. */
+    if (verify_samples_ >= 2 && !neighbors_fresh_) {
+        if (candidate_ch_ > 0) {
+            neighbor_phase_ = 1;
+            retune_to(candidate_band_, static_cast<uint8_t>(candidate_ch_ - 1));
+        } else {
+            neighbor_phase_ = 2;
+            retune_to(candidate_band_, static_cast<uint8_t>(candidate_ch_ + 1));
+        }
+        return;
+    }
+
+    /* Lock decisions use neighbor margin; only run when we have fresh neighbor data. */
+    if (!neighbors_fresh_) {
+        return;
+    }
+
+    const bool strong_lock =
+        verify_samples_ >= 3 &&
+        verify_hits_ >= 3 &&
+        verify_peak_db_ >= (detect_threshold_db() + STRONG_LOCK_PEAK_MARGIN_DB) &&
+        candidate_confidence_ >= 80 &&
+        (candidate_average_db() - neighbor_best_db()) >= MIN_NEIGHBOR_MARGIN_FOR_LOCK_DB;
+
+    if (strong_lock) {
+        enter_lock();
+        return;
+    }
+
+    if (verify_samples_ < VERIFY_SAMPLE_TARGET) {
+        return;
+    }
+
+    const bool center_stronger_than_neighbors =
+        (candidate_average_db() - neighbor_best_db()) >= MIN_NEIGHBOR_MARGIN_FOR_LOCK_DB;
+    if (verify_hits_ >= VERIFY_MIN_HITS && candidate_confidence_ >= LOCK_CONFIDENCE_MIN &&
+        center_stronger_than_neighbors) {
+        enter_lock();
+        return;
+    }
+
+    detect_state_ = DetectState::Scanning;
+    candidate_confidence_ = static_cast<uint8_t>(candidate_confidence_ / 2);
+    verify_samples_ = 0;
+    verify_hits_ = 0;
+    verify_misses_ = 0;
+    verify_sum_db_ = 0;
+    verify_peak_db_ = -120;
+    scan_dwell_frames_ = 0;
+
+    update_state_badge();
+    update_confidence_text();
+    update_status_text();
+    update_detail_text();
+    update_visual_state();
+}
+
+void FpvDetectView::enter_lock() {
+    detect_state_ = DetectState::Locked;
+    lock_hold_ = LOCK_HOLD_MAX;
+    candidate_confidence_ = static_cast<uint8_t>(clamp_value(candidate_confidence_, LOCK_CONFIDENCE_MIN, 99));
+
+    retune_to(candidate_band_, candidate_ch_);
+
+    update_state_badge();
+    update_confidence_text();
+    update_status_text();
+    update_detail_text();
+    update_visual_state();
+
+    request_event_beep(1850, 180);
+}
+
+void FpvDetectView::update_lock(const ChannelStatistics& statistics) {
+    if (detect_state_ != DetectState::Locked) {
+        return;
+    }
+
+    if (statistics.max_db >= unlock_threshold_db()) {
+        if (lock_hold_ < LOCK_HOLD_MAX) {
+            ++lock_hold_;
+        }
+        if (candidate_confidence_ < 99) {
+            ++candidate_confidence_;
+        }
+    } else {
+        if (lock_hold_ > 0) {
+            --lock_hold_;
+        }
+        if (candidate_confidence_ > 0) {
+            --candidate_confidence_;
+        }
+    }
+
+    update_confidence_text();
+    update_detail_text();
+
+    if (lock_hold_ > 0) {
+        return;
+    }
+
+    detect_state_ = DetectState::Scanning;
+    candidate_confidence_ = 0;
+    verify_samples_ = 0;
+    verify_hits_ = 0;
+    verify_misses_ = 0;
+    verify_sum_db_ = 0;
+    verify_peak_db_ = -120;
+    scan_dwell_frames_ = 0;
+
+    update_state_badge();
+    update_confidence_text();
+    update_status_text();
+    update_detail_text();
+    update_visual_state();
+
+    request_event_beep(650, 90);
+}
+
+void FpvDetectView::update_freq_display() {
+    char buf[28];
+    std::snprintf(buf, sizeof(buf), "%c%d  %ld MHz",
+                  band_labels[scan_band],
+                  static_cast<int>(scan_ch + 1),
+                  static_cast<long>(freq_ / 1000000LL));
+    text_freq.set(buf);
+}
+
+void FpvDetectView::update_state_badge() {
+    switch (detect_state_) {
+        case DetectState::Scanning:
+            text_state.set("SCANNING");
+            break;
+        case DetectState::Candidate:
+            text_state.set("CHECKING");
+            break;
+        case DetectState::Locked:
+            text_state.set("FREQ FOUND");
+            break;
+    }
+}
+
+void FpvDetectView::update_confidence_text() {
+    char buf[16];
+    std::snprintf(buf, sizeof(buf), "Posi %u%%", static_cast<unsigned>(candidate_confidence_));
+    text_confidence.set(buf);
+}
+
+void FpvDetectView::update_status_text() {
+    char buf[40];
+
+    switch (detect_state_) {
+        case DetectState::Scanning:
+            if (band_mode < FPV_NUM_BANDS) {
+                std::snprintf(buf, sizeof(buf), "Scanning band %c", band_labels[band_mode]);
+            } else {
+                std::snprintf(buf, sizeof(buf), "Scanning all from list");
+            }
+            break;
+
+        case DetectState::Candidate:
+            std::snprintf(buf, sizeof(buf), "CHKING %c%d  %ld MHz",
+                          band_labels[candidate_band_],
+                          static_cast<int>(candidate_ch_ + 1),
+                          static_cast<long>(fpv_frequencies[candidate_band_][candidate_ch_] / 1000000LL));
+            break;
+
+        case DetectState::Locked:
+            std::snprintf(buf, sizeof(buf), "FREQ FOUND %c%d  %ld",
+                          band_labels[candidate_band_],
+                          static_cast<int>(candidate_ch_ + 1),
+                          static_cast<long>(fpv_frequencies[candidate_band_][candidate_ch_] / 1000000LL));
+            break;
+    }
+
+    text_status.set(buf);
+}
+
+void FpvDetectView::update_detail_text() {
+    char buf[40];
+
+    switch (detect_state_) {
+        case DetectState::Scanning:
+            std::snprintf(buf, sizeof(buf), "Need >= %d dB, stable dwell", static_cast<int>(detect_threshold_db()));
+            break;
+
+        case DetectState::Candidate:
+            std::snprintf(buf, sizeof(buf), "avg %d  peak %d  hits %u/%u",
+                          static_cast<int>(candidate_average_db()),
+                          static_cast<int>(verify_peak_db_),
+                          static_cast<unsigned>(verify_hits_),
+                          static_cast<unsigned>(verify_samples_));
+            break;
+
+        case DetectState::Locked:
+            std::snprintf(buf, sizeof(buf), "LOCKED %c%d  posi %u%%  hold %u",
+                          band_labels[candidate_band_],
+                          static_cast<int>(candidate_ch_ + 1),
+                          static_cast<unsigned>(candidate_confidence_),
+                          static_cast<unsigned>(lock_hold_));
+            break;
+    }
+
+    text_detail.set(buf);
+}
+
+void FpvDetectView::update_visual_state() {
+    auto* theme = Theme::getInstance();
+
+    /*
+     * Conservative styling for cross-branch compatibility.
+     * If your branch has explicit blue/red banner theme styles,
+     * swap the styles in this function only.
+     */
+    auto normal_style = theme->bg_darkest;
+    auto attention_style = theme->fg_red;
+
+    switch (detect_state_) {
+        case DetectState::Scanning:
+            text_state.set_style(normal_style);
+            text_status.set_style(normal_style);
+            break;
+        case DetectState::Candidate:
+            text_state.set_style(normal_style);
+            text_status.set_style(normal_style);
+            break;
+        case DetectState::Locked:
+            text_state.set_style(attention_style);
+            text_status.set_style(attention_style);
+            break;
+    }
+
+    freq_stats_rssi.set_style(normal_style);
+    freq_stats_db.set_style(normal_style);
+    text_detail.set_style(normal_style);
+    text_confidence.set_style(normal_style);
+}
+
+void FpvDetectView::update_stats_text(const ChannelStatistics& statistics) {
+    rssi_graph.add_values(rssi.get_min(), rssi.get_avg(), rssi.get_max(), statistics.max_db);
+
+    auto& mem = channel_memory_[current_channel_index()];
+    mem.last_db = statistics.max_db;
+    if (statistics.max_db > mem.peak_db) {
+        mem.peak_db = statistics.max_db;
+    }
+    if (statistics.max_db >= detect_threshold_db()) {
+        if (mem.hits < 255) {
+            ++mem.hits;
+        }
+    }
+    mem.confidence = candidate_confidence_;
+
+    if (last_max_db_ != statistics.max_db) {
+        last_max_db_ = statistics.max_db;
+        char power_buf[20];
+        std::snprintf(power_buf, sizeof(power_buf), "PWR %d dB", static_cast<int>(statistics.max_db));
+        freq_stats_db.set(power_buf);
+        rssi.set_db(statistics.max_db);
+    }
+
+    const uint8_t graph_min = rssi_graph.get_graph_min();
+    const uint8_t graph_avg = rssi_graph.get_graph_avg();
+    const uint8_t graph_max = rssi_graph.get_graph_max();
+
+    if (last_min_rssi_ != graph_min || last_avg_rssi_ != graph_avg || last_max_rssi_ != graph_max) {
+        last_min_rssi_ = graph_min;
+        last_avg_rssi_ = graph_avg;
+        last_max_rssi_ = graph_max;
+
+        char rssi_buf[22];
+        std::snprintf(rssi_buf, sizeof(rssi_buf), "RSSI %u/%u/%u",
+                      static_cast<unsigned>(graph_min),
+                      static_cast<unsigned>(graph_avg),
+                      static_cast<unsigned>(graph_max));
+        freq_stats_rssi.set(rssi_buf);
+    }
+}
+
+void FpvDetectView::on_timer() {
+    ++frame_counter_;
+
+    if (detect_state_ != DetectState::Scanning) {
+        return;
+    }
+
+    if (scan_dwell_frames_ > 0) {
+        --scan_dwell_frames_;
+        return;
+    }
+
+    step_scan();
+}
+
+FpvDetectView::FpvDetectView(NavigationView& nav)
+    : nav_{nav} {
+    add_children({
+        &labels,
+        &field_lna,
+        &field_vga,
+        &field_rf_amp,
+        &field_volume,
+        &field_band,
+        &text_freq,
+        &text_state,
+        &text_confidence,
+        &text_detect_label,
+        &field_detect_threshold,
+        &freq_stats_rssi,
+        &freq_stats_db,
+        &text_status,
+        &text_detail,
+        &rssi,
+        &rssi_graph,
+    });
+
+    rssi.set_vertical_rssi(true);
+    rssi.set_peak(true, 3000);
+    rssi_graph.set_nb_columns(256);
+
+    field_detect_threshold.set_value(detect_threshold_db_);
+    field_detect_threshold.on_change = [this](int32_t v) {
+        detect_threshold_db_ = v;
+        update_detail_text();
+    };
+
+    field_band.on_change = [this](size_t, int32_t value) {
+        band_mode = static_cast<uint8_t>(value);
+        scan_band = (band_mode < FPV_NUM_BANDS) ? band_mode : 0;
+        scan_ch = 0;
+        reset_detector(true);
+    };
+
+    change_mode();
+    field_band.set_selected_index(FPV_AUTO_SCAN_MODE);
+    reset_detector(true);
+}
+
+void FpvDetectView::on_statistics_update(const ChannelStatistics& statistics) {
+    const bool is_sampling_neighbor =
+        (detect_state_ == DetectState::Candidate && (neighbor_phase_ == 1 || neighbor_phase_ == 2));
+    if (!is_sampling_neighbor) {
+        update_stats_text(statistics);
+    }
+
+    switch (detect_state_) {
+        case DetectState::Scanning:
+            if (is_possible_freq_spike(statistics)) {
+                enter_candidate(statistics);
+            }
+            break;
+
+        case DetectState::Candidate:
+            if (neighbor_phase_ == 1) {
+                const auto idx = channel_index(candidate_band_, static_cast<uint8_t>(candidate_ch_ - 1));
+                channel_memory_[idx].last_db = statistics.max_db;
+                if (candidate_ch_ + 1 < FPV_CHANNELS_PER_BAND) {
+                    neighbor_phase_ = 2;
+                    retune_to(candidate_band_, static_cast<uint8_t>(candidate_ch_ + 1));
+                } else {
+                    neighbor_phase_ = 0;
+                    neighbors_fresh_ = true;
+                    retune_to(candidate_band_, candidate_ch_);
+                }
+                break;
+            }
+            if (neighbor_phase_ == 2) {
+                const auto idx = channel_index(candidate_band_, static_cast<uint8_t>(candidate_ch_ + 1));
+                channel_memory_[idx].last_db = statistics.max_db;
+                neighbor_phase_ = 0;
+                neighbors_fresh_ = true;
+                retune_to(candidate_band_, candidate_ch_);
+                break;
+            }
+            evaluate_candidate_sample(statistics);
+            break;
+
+        case DetectState::Locked:
+            update_lock(statistics);
+            break;
+    }
+}
+
+size_t FpvDetectView::change_mode() {
+    audio::output::stop();
+    receiver_model.disable();
+    baseband::shutdown();
+
+    audio_sampling_rate = audio::Rate::Hz_24000;
+    baseband::run_image(portapack::spi_flash::image_tag_capture);
+    receiver_model.set_modulation(ReceiverModel::Mode::Capture);
+
+    baseband::set_sample_rate(FPV_RX_BW, get_oversample_rate(FPV_RX_BW));
+    auto actual_sampling_rate = get_actual_sample_rate(FPV_RX_BW);
+    receiver_model.set_sampling_rate(actual_sampling_rate);
+    receiver_model.set_baseband_bandwidth(filter_bandwidth_for_sampling_rate(actual_sampling_rate));
+
+    audio::set_rate(audio_sampling_rate);
+    audio::output::start();
+    receiver_model.set_headphone_volume(receiver_model.headphone_volume());
+    receiver_model.enable();
+
+    return 0;
+}
+
+}  // namespace ui::external_app::fpv_detect
@@ -0,0 +1,200 @@
+// Author: berkeozkir (Berke Özkır)
+
+#ifndef _UI_FPV_DETECT
+#define _UI_FPV_DETECT
+
+#include <array>
+#include <cstdint>
+
+#include "analog_audio_app.hpp"
+#include "app_settings.hpp"
+#include "audio.hpp"
+#include "baseband_api.hpp"
+#include "radio_state.hpp"
+#include "receiver_model.hpp"
+#include "string_format.hpp"
+#include "ui.hpp"
+#include "ui_receiver.hpp"
+#include "ui_spectrum.hpp"
+
+namespace ui::external_app::fpv_detect {
+
+static constexpr uint8_t FPV_NUM_BANDS = 5;
+static constexpr uint8_t FPV_CHANNELS_PER_BAND = 8;
+static constexpr uint8_t FPV_TOTAL_CHANNELS = FPV_NUM_BANDS * FPV_CHANNELS_PER_BAND;
+static constexpr uint8_t FPV_AUTO_SCAN_MODE = FPV_NUM_BANDS;
+
+static constexpr int64_t fpv_frequencies[FPV_NUM_BANDS][FPV_CHANNELS_PER_BAND] = {
+    /* Band A */ {5865000000LL, 5845000000LL, 5825000000LL, 5805000000LL, 5785000000LL, 5765000000LL, 5745000000LL, 5725000000LL},
+    /* Band B */ {5733000000LL, 5752000000LL, 5771000000LL, 5790000000LL, 5809000000LL, 5828000000LL, 5847000000LL, 5866000000LL},
+    /* Band E */ {5705000000LL, 5685000000LL, 5665000000LL, 5645000000LL, 5885000000LL, 5905000000LL, 5925000000LL, 5945000000LL},
+    /* Band F */ {5740000000LL, 5760000000LL, 5780000000LL, 5800000000LL, 5820000000LL, 5840000000LL, 5860000000LL, 5880000000LL},
+    /* Band R */ {5658000000LL, 5695000000LL, 5732000000LL, 5769000000LL, 5806000000LL, 5843000000LL, 5880000000LL, 5917000000LL},
+};
+
+static constexpr char band_labels[] = {'A', 'B', 'E', 'F', 'R'};
+
+#define FPV_RX_BW 750000
+
+class FpvDetectView : public View {
+   public:
+    explicit FpvDetectView(NavigationView& nav);
+    ~FpvDetectView();
+
+    void focus() override;
+    std::string title() const override { return "FPV DETECT"; };
+
+   private:
+    enum class DetectState : uint8_t {
+        Scanning,
+        Candidate,
+        Locked,
+    };
+
+    struct ChannelMemory {
+        int16_t last_db = -120;
+        int16_t peak_db = -120;
+        uint8_t hits = 0;
+        uint8_t confidence = 0;
+    };
+
+    NavigationView& nav_;
+    RxRadioState radio_state_{};
+
+    static int32_t clamp_value(int32_t value, int32_t low, int32_t high);
+    static int32_t map_value(int32_t value, int32_t from_low, int32_t from_high, int32_t to_low, int32_t to_high);
+
+    size_t change_mode();
+    void on_statistics_update(const ChannelStatistics& statistics);
+    void on_timer();
+
+    void retune_to(uint8_t band, uint8_t ch);
+    void step_scan();
+    void reset_detector(bool retune_current);
+
+    bool is_possible_freq_spike(const ChannelStatistics& statistics) const;
+    void enter_candidate(const ChannelStatistics& statistics);
+    void evaluate_candidate_sample(const ChannelStatistics& statistics);
+    void enter_lock();
+    void update_lock(const ChannelStatistics& statistics);
+
+    uint8_t current_channel_index() const;
+    uint8_t channel_index(uint8_t band, uint8_t ch) const;
+    uint8_t compute_candidate_confidence() const;
+    int16_t detect_threshold_db() const;
+    int16_t unlock_threshold_db() const;
+    int16_t candidate_average_db() const;
+    int16_t neighbor_best_db() const;
+
+    void request_event_beep(uint32_t hz, uint32_t duration_ms);
+    void update_freq_display();
+    void update_state_badge();
+    void update_confidence_text();
+    void update_status_text();
+    void update_detail_text();
+    void update_stats_text(const ChannelStatistics& statistics);
+    void update_visual_state();
+
+    DetectState detect_state_ = DetectState::Scanning;
+
+    uint8_t scan_band = 0;
+    uint8_t scan_ch = 0;
+    uint8_t band_mode = FPV_AUTO_SCAN_MODE;
+
+    uint8_t candidate_band_ = 0;
+    uint8_t candidate_ch_ = 0;
+    uint8_t verify_samples_ = 0;
+    uint8_t verify_hits_ = 0;
+    uint8_t verify_misses_ = 0;
+    int32_t verify_sum_db_ = 0;
+    int16_t verify_peak_db_ = -120;
+    uint8_t candidate_confidence_ = 0;
+    uint8_t lock_hold_ = 0;
+    /** During Candidate: 0=center, 1=left neighbor, 2=right neighbor. Used to
+     * re-sample adjacent channels so neighbor_margin uses current measurements. */
+    uint8_t neighbor_phase_ = 0;
+    bool neighbors_fresh_ = false;
+
+    uint8_t scan_dwell_frames_ = 0;
+    uint32_t frame_counter_ = 0;
+    uint32_t last_beep_frame_ = 0;
+
+    int16_t last_max_db_ = -127;
+    uint8_t last_min_rssi_ = 0;
+    uint8_t last_avg_rssi_ = 0;
+    uint8_t last_max_rssi_ = 0;
+
+    std::array<ChannelMemory, FPV_TOTAL_CHANNELS> channel_memory_{};
+
+    rf::Frequency freq_ = {fpv_frequencies[0][0]};
+    int32_t detect_threshold_db_ = -38;
+    audio::Rate audio_sampling_rate = audio::Rate::Hz_48000;
+
+    app_settings::SettingsManager settings_{
+        "rx_fpv",
+        app_settings::Mode::RX,
+        {
+            {"detect_threshold"sv, &detect_threshold_db_},
+        }};
+
+    Labels labels{
+        {{UI_POS_X(0), UI_POS_Y(0)}, "LNA:   VGA:   AMP:  ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(6), UI_POS_Y(0)}, "VOL:  ", Theme::getInstance()->fg_light->foreground},
+    };
+
+    LNAGainField field_lna{{UI_POS_X(4), UI_POS_Y(0)}};
+    VGAGainField field_vga{{UI_POS_X(11), UI_POS_Y(0)}};
+    RFAmpField field_rf_amp{{UI_POS_X(18), UI_POS_Y(0)}};
+    AudioVolumeField field_volume{{UI_POS_X_RIGHT(2), UI_POS_Y(0)}};
+
+    OptionsField field_band{
+        {UI_POS_X(0), UI_POS_Y(1)},
+        9,
+        {
+            {"Band A  ", 0},
+            {"Band B  ", 1},
+            {"Band E  ", 2},
+            {"Band F  ", 3},
+            {"Band R  ", 4},
+            {"AutoScan", FPV_AUTO_SCAN_MODE},
+        }};
+
+    Text text_freq{{UI_POS_X_RIGHT(20), UI_POS_Y(1), UI_POS_WIDTH(20), UI_POS_DEFAULT_HEIGHT}, ""};
+
+    Text text_state{{UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT}, "SCANNING"};
+    Text text_confidence{{UI_POS_X(12), UI_POS_Y(2), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT}, "Posi 0%"};
+    Text text_detect_label{{UI_POS_X_RIGHT(10), UI_POS_Y(2), UI_POS_WIDTH(5), UI_POS_DEFAULT_HEIGHT}, "Thr>"};
+
+    NumberField field_detect_threshold{
+        {UI_POS_X_RIGHT(5), UI_POS_Y(2)},
+        4,
+        {-100, 20},
+        1,
+        ' ',
+    };
+
+    Text freq_stats_rssi{{UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH(15), UI_POS_DEFAULT_HEIGHT}, "RSSI 0/0/0"};
+    Text freq_stats_db{{UI_POS_X_RIGHT(14), UI_POS_Y(3), UI_POS_WIDTH(14), UI_POS_DEFAULT_HEIGHT}, "PWR -120 dB"};
+
+    Text text_status{{UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH(30), UI_POS_DEFAULT_HEIGHT}, "SCANNING FOR FREQS"};
+    Text text_detail{{UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH(30), UI_POS_DEFAULT_HEIGHT}, "Waiting for FPV FREQ"};
+
+    RSSIGraph rssi_graph{{UI_POS_X(0), UI_POS_Y(6), UI_POS_WIDTH_REMAINING(5), UI_POS_HEIGHT_REMAINING(7)}};
+    RSSI rssi{{UI_POS_X_RIGHT(5), UI_POS_Y(6), UI_POS_WIDTH(5), UI_POS_HEIGHT_REMAINING(7)}};
+
+    MessageHandlerRegistration message_handler_stats{
+        Message::ID::ChannelStatistics,
+        [this](const Message* const p) {
+            this->on_statistics_update(static_cast<const ChannelStatisticsMessage*>(p)->statistics);
+        }};
+
+    MessageHandlerRegistration message_handler_frame_sync{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->on_timer();
+        }};
+};
+
+}  // namespace ui::external_app::fpv_detect
+
+#endif
@@ -33,7 +33,7 @@ Game2048View::Game2048View(NavigationView& nav)

 void Game2048View::on_show() {
    if (!initialized) {
-        std::srand(LPC_RTC->CTIME0);
+        srand(LPC_RTC->CTIME0);
        reset_game();
        initialized = true;
    }
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2026 lifegame1lu111
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_keeloqtx.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::ui_keeloqtx {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<KeeloqTXView>();
+}
+}  // namespace ui::external_app::ui_keeloqtx
+
+extern "C" {
+
+__attribute__((section(".external_app.app_keeloqtx.application_information"), used)) application_information_t _application_information_keeloqtx = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::ui_keeloqtx::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+    /*.app_name = */ "KeeLoq TX",
+    /*.bitmap_data = */ {
+        0x20,
+        0x00,
+        0x20,
+        0x00,
+        0x20,
+        0x00,
+        0x20,
+        0x00,
+        0xE0,
+        0x07,
+        0xF0,
+        0x0F,
+        0x30,
+        0x0C,
+        0x30,
+        0x0C,
+        0xF0,
+        0x0F,
+        0xF0,
+        0x0F,
+        0x70,
+        0x0D,
+        0xB0,
+        0x0E,
+        0x70,
+        0x0D,
+        0xB0,
+        0x0E,
+        0xF0,
+        0x0F,
+        0xE0,
+        0x07,
+    },
+    /*.icon_color = */ ui::Color::yellow().v,
+    /*.menu_location = */ app_location_t::TX,
+    /*.desired_menu_position = */ -1,
+    /*.m4_app_tag = portapack::spi_flash::image_tag_ook */ {'P', 'O', 'O', 'K'},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}
@@ -0,0 +1,248 @@
+#include "ui_keeloqtx.hpp"
+#include "ui_fileman.hpp"
+#include "baseband_api.hpp"
+#include "../../keeloq_common.hpp"
+#include "../../baseband/fprotos/fprotogeneral.hpp"
+
+using namespace portapack;
+using namespace ui;
+
+namespace fs = std::filesystem;
+
+namespace ui::external_app::ui_keeloqtx {
+
+void KeeloqTXView::focus() {
+    button_open.focus();
+}
+
+void KeeloqTXView::update_hop() {
+    hop = data.btn << 28 | (data.serial & 0x3FF) << 16 | data.counter;
+
+    if (data.mf_name == "Aprimatic") {
+        uint32_t apri_serial = data.serial;
+        uint8_t apr1 = 0;
+
+        for (uint16_t i = 1; i != 0b10000000000; i <<= 1) {
+            if (apri_serial & i) apr1++;
+        }
+
+        apri_serial &= 0b00001111111111;
+
+        if (apr1 % 2 == 0) {
+            apri_serial |= 0b110000000000;
+        }
+
+        hop = data.btn << 28 | (apri_serial & 0xFFF) << 16 | data.counter;
+    } else if (
+        data.mf_name == "DTM_Neo" || data.mf_name == "FAAC_RC,XT" || data.mf_name == "Mutanco_Mutancode" || data.mf_name == "Came_Space" || data.mf_name == "Genius_Bravo" || data.mf_name == "GSN" || data.mf_name == "Rosh" || data.mf_name == "Rossi" || data.mf_name == "Peccinin" || data.mf_name == "Steelmate" || data.mf_name == "Cardin_S449") {
+        hop = data.btn << 28 | (data.serial & 0xFFF) << 16 | data.counter;
+    } else if (
+        data.mf_name == "NICE_Smilo" || data.mf_name == "NICE_MHOUSE" || data.mf_name == "JCM_Tech") {
+        hop = data.btn << 28 | (data.serial & 0xFF) << 16 | data.counter;
+    } else if (data.mf_name == "Merlin") {
+        hop = data.btn << 28 | (0x000) << 16 | data.counter;
+    } else if (data.mf_name == "Centurion") {
+        hop = data.btn << 28 | (0x1CE) << 16 | data.counter;
+    } else if (data.mf_name == "Monarch") {
+        hop = data.btn << 28 | (0x100) << 16 | data.counter;
+    } else if (data.mf_name == "Dea_Mio") {
+        uint8_t first_disc_num = (data.serial >> 8) & 0xF;
+        uint8_t result_disc = (0xC + (first_disc_num % 4));
+
+        uint32_t dea_serial = (data.serial & 0xFF) | (((uint32_t)result_disc) << 8);
+
+        hop = data.btn << 28 | (dea_serial & 0xFFF) << 16 | data.counter;
+    }
+
+    text_hop.set(to_string_hex(hop));
+}
+
+void KeeloqTXView::update_payload() {
+    uint64_t encrypt = 0;
+
+    switch (current_key.type) {
+        case KEELOQ_SIMPLE_LEARNING: {
+            encrypt = keeloq_encrypt(hop, current_key.key);
+
+            break;
+        }
+        case KEELOQ_NORMAL_LEARNING: {
+            uint64_t man = keeloq_normal_learning(fix, current_key.key);
+
+            encrypt = keeloq_encrypt(hop, man);
+
+            break;
+        }
+    }
+
+    payload = (uint64_t)fix << 32 | encrypt;
+
+    uint64_t preview_payload = FProtoGeneral::subghz_protocol_blocks_reverse_key(payload, 64);
+
+    text_payload.set(to_string_hex(preview_payload));
+    encode_data();
+}
+
+void KeeloqTXView::encode_data() {
+    std::string fragments{};
+
+    for (uint32_t i = 0; i < 64; ++i) {
+        fragments += keeloq_fragments[bit(payload, i)];
+    }
+
+    encoded_data = KEELOQ_HEADER + fragments + "1001";
+
+    if (data.mf_name == "Sommer") {
+        pause_duration = 28;
+    } else {
+        pause_duration = 39;
+    }
+}
+
+KeeloqTXView::KeeloqTXView(NavigationView& nav)
+    : nav_{nav} {
+    baseband::run_image(portapack::spi_flash::image_tag_ook);
+
+    add_children({&labels,
+                  &text_mf_name,
+                  &text_serial,
+                  &text_fix,
+                  &text_hop,
+                  &field_counter,
+                  &field_button,
+                  &field_repeat,
+                  &text_payload,
+                  &button_open,
+                  &text_status,
+                  &progressbar,
+                  &tx_view});
+
+    field_counter.on_change = [this](uint32_t value) {
+        data.counter = (uint16_t)value;
+
+        update_hop();
+        update_payload();
+    };
+
+    field_button.on_change = [this](uint32_t value) {
+        data.btn = (uint8_t)value;
+
+        fix &= 0xFFFFFFF;
+        fix |= data.btn << 28;
+
+        text_fix.set(to_string_hex(fix));
+
+        update_hop();
+        update_payload();
+    };
+
+    field_repeat.on_change = [this](uint32_t value) {
+        repeat = value;
+    };
+
+    field_repeat.set_value(4, true);
+
+    tx_view.on_edit_frequency = [this, &nav]() {
+        auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
+        new_view->on_changed = [this](rf::Frequency f) {
+            transmitter_model.set_target_frequency(f);
+        };
+    };
+
+    tx_view.on_start = [this]() {
+        start_tx();
+    };
+
+    tx_view.on_stop = [this]() {
+        baseband::kill_ook();
+        stop_tx();
+    };
+
+    button_open.on_select = [this](const Button&) {
+        auto open_view = nav_.push<FileLoadView>(".KEELOQ");
+
+        ensure_directory(keeloq_remotes_dir);
+        open_view->push_dir(keeloq_remotes_dir);
+        open_view->on_changed = [this](fs::path path) {
+            nav_.set_on_pop([this, path]() {
+                if (!read_keeloq_file(path, data)) {
+                    return;
+                }
+
+                file_path = path;
+
+                for (const auto& key : keystore.get_keys()) {
+                    if (key.mf_name == data.mf_name) {
+                        current_key = key;
+
+                        break;
+                    }
+                }
+
+                fix = data.btn << 28 | data.serial;
+
+                update_hop();
+
+                text_mf_name.set(data.mf_name);
+                text_serial.set(to_string_hex(data.serial));
+                text_fix.set(to_string_hex(fix));
+
+                field_counter.set_value(data.counter, false);
+                field_button.set_value(data.btn, false);
+
+                update_payload();
+
+                field_counter.focus();
+            });
+        };
+    };
+}
+
+void KeeloqTXView::start_tx() {
+    size_t bitstream_length = encoders::make_bitstream(encoded_data);
+
+    progressbar.set_max(repeat);
+    tx_view.set_transmitting(true);
+
+    transmitter_model.enable();
+
+    baseband::set_ook_data(
+        bitstream_length,
+        OOK_SAMPLERATE * (400.0 / 1000000.0),
+        repeat,
+        pause_duration);
+}
+
+void KeeloqTXView::stop_tx() {
+    transmitter_model.disable();
+    text_status.set("Ready");
+    progressbar.set_value(0);
+    tx_view.set_transmitting(false);
+
+    data.counter += 1;
+
+    field_counter.set_value(data.counter, false);
+
+    update_hop();
+    update_payload();
+
+    write_keeloq_file(file_path, data);
+}
+
+void KeeloqTXView::on_tx_progress(uint32_t progress, bool done) {
+    if (!done) {
+        text_status.set(to_string_dec_uint(progress + 1) + "/" + to_string_dec_uint(repeat));
+        progressbar.set_value(progress + 1);
+    } else {
+        chThdSleepMilliseconds(10);
+
+        stop_tx();
+    }
+}
+
+KeeloqTXView::~KeeloqTXView() {
+    transmitter_model.disable();
+    baseband::shutdown();
+}
+
+}  // namespace ui::external_app::ui_keeloqtx
@@ -0,0 +1,129 @@
+#ifndef __KEELOQTX__
+#define __KEELOQTX__
+
+#include "ui.hpp"
+#include "ui_transmitter.hpp"
+#include "transmitter_model.hpp"
+#include "file_path.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "encoders.hpp"
+#include "string_format.hpp"
+#include "../../keeloq_file.hpp"
+#include "../../keeloq_keystore.hpp"
+
+#define KEELOQ_HEADER "101010101010101010101010000000000"
+
+namespace ui::external_app::ui_keeloqtx {
+
+class KeeloqTXView : public View {
+   public:
+    KeeloqTXView(NavigationView& nav);
+    ~KeeloqTXView();
+
+    void focus() override;
+
+    std::string title() const override {
+        return "KeeLoqTX";
+    }
+
+   private:
+    const std::string keeloq_fragments[2] = {"110", "100"};
+
+    NavigationView& nav_;
+
+    TxRadioState radio_state_{
+        433920000,
+        1750000,
+        OOK_SAMPLERATE};
+
+    app_settings::SettingsManager settings_{
+        "tx_keeloq", app_settings::Mode::TX};
+
+    std::filesystem::path file_path{};
+
+    KeeloqKeystore keystore{};
+    KeeloqKey current_key{};
+    KeeloqData data{};
+
+    uint32_t fix = 0;
+    uint32_t hop = 0;
+    uint64_t payload = 0;
+
+    void update_hop();
+
+    Labels labels{
+        {{UI_POS_X(1), UI_POS_Y(0)}, "Manufacturer:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), UI_POS_Y(1)}, "Serial:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), UI_POS_Y(2)}, "Fix:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), UI_POS_Y(3)}, "Hop:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), UI_POS_Y(4)}, "Counter:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), UI_POS_Y(5)}, "Button:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), UI_POS_Y(6)}, "Repeat:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(2), UI_POS_Y(8)}, "Payload:", Theme::getInstance()->fg_light->foreground},
+    };
+
+    Text text_mf_name{{UI_POS_X(15), UI_POS_Y(0), 128, 16}, ""};
+    Text text_serial{{UI_POS_X(9), UI_POS_Y(1), 64, 16}, "00000000"};
+    Text text_fix{{UI_POS_X(6), UI_POS_Y(2), 64, 16}, "00000000"};
+    Text text_hop{{UI_POS_X(6), UI_POS_Y(3), 64, 16}, "00000000"};
+
+    NumberField field_counter{
+        {UI_POS_X(10), UI_POS_Y(4)},
+        5,
+        {0, 65535},
+        1,
+        ' '};
+    NumberField field_button{
+        {UI_POS_X(9), UI_POS_Y(5)},
+        2,
+        {0, 15},
+        1,
+        ' '};
+    NumberField field_repeat{
+        {UI_POS_X(10), UI_POS_Y(6)},
+        3,
+        {0, 100},
+        1,
+        ' '};
+
+    Text text_payload{{UI_POS_X(2), UI_POS_Y(9), 128, 16}, "0000000000000000"};
+
+    void update_payload();
+
+    Button button_open{{UI_POS_X(0), UI_POS_Y(11), screen_width, 32}, "Open file"};
+
+    Text text_status{{UI_POS_X(2), UI_POS_Y_BOTTOM(7), 128, 16}, "Ready"};
+
+    ProgressBar progressbar{
+        {UI_POS_X(2), UI_POS_Y_BOTTOM(7) + 20, UI_POS_WIDTH_REMAINING(4), 16}};
+
+    TransmitterView tx_view{
+        (int16_t)UI_POS_Y_BOTTOM(4),
+        50000,
+        9};
+
+    std::string encoded_data{};
+
+    void encode_data();
+
+    uint32_t repeat = 4;
+    uint32_t pause_duration = 0;
+
+    void start_tx();
+    void stop_tx();
+
+    void update_progress();
+    void on_tx_progress(uint32_t progress, bool done);
+
+    MessageHandlerRegistration message_handler_tx_progress{
+        Message::ID::TXProgress,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
+            this->on_tx_progress(message.progress, message.done);
+        }};
+};
+
+}  // namespace ui::external_app::ui_keeloqtx
+
+#endif
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2024 Sarah Rose
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui.hpp"
+#include "ui_kiss_tnc.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::kiss_tnc {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<KissTncView>();
+}
+}  // namespace ui::external_app::kiss_tnc
+
+extern "C" {
+
+__attribute__((section(".external_app.app_kiss_tnc.application_information"), used)) application_information_t _application_information_kiss_tnc = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::kiss_tnc::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "KISS TNC",
+    /*.bitmap_data = */ {
+        // 16x16 icon - radio tower / TNC
+        0x00,
+        0x00,
+        0x08,
+        0x00,
+        0x14,
+        0x00,
+        0x22,
+        0x00,
+        0x08,
+        0x00,
+        0x08,
+        0x00,
+        0x08,
+        0x00,
+        0x3E,
+        0x00,
+        0x22,
+        0x00,
+        0x22,
+        0x00,
+        0x22,
+        0x00,
+        0x22,
+        0x00,
+        0x3E,
+        0x00,
+        0x1C,
+        0x00,
+        0x08,
+        0x00,
+        0x00,
+        0x00,
+    },
+    /*.icon_color = */ ui::Color::green().v,
+    /*.menu_location = */ app_location_t::TRX,
+    /*.desired_menu_position = */ -1,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_aprs_rx */ {'P', 'A', 'P', 'R'},
+    /*.m4_app_offset = */ 0x00000000,
+};
+}
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2024 Sarah Rose
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui_kiss_tnc.hpp"
+#include "baseband_api.hpp"
+#include "portapack.hpp"
+#include "receiver_model.hpp"
+#include "transmitter_model.hpp"
+#include "string_format.hpp"
+#include "memory_map.hpp"
+#include "ax25.hpp"
+#include "spi_image.hpp"
+
+extern "C" {
+#include "usb_serial_device_to_host.h"
+}
+
+using namespace portapack;
+
+namespace ui::external_app::kiss_tnc {
+
+namespace {
+KissTncView* g_kiss_tnc_instance = nullptr;
+}
+
+void KissTncView::kiss_input_trampoline(const uint8_t* data, size_t len) {
+    if (g_kiss_tnc_instance) g_kiss_tnc_instance->on_kiss_bytes(data, len);
+}
+
+KissTncView::KissTncView(NavigationView& nav)
+    : nav_{nav} {
+    baseband::run_prepared_image(portapack::memory::map::m4_code.base());
+    add_children({&field_frequency,
+                  &field_rf_amp,
+                  &field_lna,
+                  &field_vga,
+                  &rssi,
+                  &channel,
+                  &text_status,
+                  &text_usb_status,
+                  &text_rx_count,
+                  &text_tx_count,
+                  &labels,
+                  &console});
+    receiver_model.enable();
+    baseband::set_aprs(1200);
+    g_kiss_tnc_instance = this;
+    usb_input_handler_.emplace(kiss_input_trampoline);
+    update_stats();
+}
+
+KissTncView::~KissTncView() {
+    g_kiss_tnc_instance = nullptr;
+    usb_input_handler_.reset();
+    if (tx_active_) {
+        transmitter_model.disable();
+    } else {
+        receiver_model.disable();
+    }
+    baseband::shutdown();
+}
+
+void KissTncView::focus() {
+    field_frequency.focus();
+}
+
+void KissTncView::update_stats() {
+    text_rx_count.set(to_string_dec_uint(rx_count_));
+    text_tx_count.set(to_string_dec_uint(tx_count_));
+    text_usb_status.set(portapack::usb_serial.serial_connected() ? "Connected" : "Disconnected");
+}
+
+void KissTncView::send_kiss_frame(const uint8_t* data, size_t len) {
+    // Stack-allocate output buffer: max KISS overhead is 2x data + 2 FENDs + 1 cmd byte
+    uint8_t buf[512];
+    size_t i = 0;
+    buf[i++] = 0xC0;  // FEND
+    buf[i++] = 0x00;  // data command
+    for (size_t j = 0; j < len; j++) {
+        if (data[j] == 0xC0) {
+            if (i + 3 > sizeof(buf)) break;  // need 2 for escape + 1 for final FEND
+            buf[i++] = 0xDB;
+            buf[i++] = 0xDC;
+        } else if (data[j] == 0xDB) {
+            if (i + 3 > sizeof(buf)) break;  // need 2 for escape + 1 for final FEND
+            buf[i++] = 0xDB;
+            buf[i++] = 0xDD;
+        } else {
+            if (i + 2 > sizeof(buf)) break;  // need 1 for data + 1 for final FEND
+            buf[i++] = data[j];
+        }
+    }
+    buf[i++] = 0xC0;  // FEND
+    if (usb_input_handler_)
+        usb_input_handler_->write(buf, i);
+}
+
+void KissTncView::on_packet(const APRSPacketMessage* message) {
+    aprs::APRSPacket pkt = message->packet;
+
+    uint8_t payload_size = pkt.size();
+    if (payload_size > 2) {
+        uint8_t raw[256];
+        size_t raw_len = payload_size - 2;
+        for (size_t i = 0; i < raw_len; i++)
+            raw[i] = static_cast<uint8_t>(pkt[i]);
+        send_kiss_frame(raw, raw_len);
+    }
+
+    console.writeln(pkt.get_source_formatted() + ">" + pkt.get_destination_formatted());
+    rx_count_++;
+    update_stats();
+}
+
+void KissTncView::on_kiss_bytes(const uint8_t* data, size_t len) {
+    for (size_t i = 0; i < len; i++) {
+        uint8_t b = data[i];
+        switch (kiss_state_) {
+            case KissState::IDLE:
+                if (b == 0xC0) kiss_state_ = KissState::CMD;
+                break;
+            case KissState::CMD:
+                if (b == 0xC0) break;
+                if (b == 0x00) {
+                    kiss_idx_ = 0;
+                    kiss_state_ = KissState::DATA;
+                } else {
+                    kiss_state_ = KissState::IDLE;
+                }
+                break;
+            case KissState::DATA:
+                if (b == 0xC0) {
+                    if (kiss_idx_ > 0) process_kiss_frame();
+                    kiss_idx_ = 0;
+                    kiss_state_ = KissState::CMD;
+                } else if (b == 0xDB) {
+                    kiss_state_ = KissState::ESC;
+                } else if (kiss_idx_ < sizeof(kiss_buf_)) {
+                    kiss_buf_[kiss_idx_++] = b;
+                }
+                break;
+            case KissState::ESC:
+                if (b == 0xDC) {
+                    if (kiss_idx_ < sizeof(kiss_buf_)) kiss_buf_[kiss_idx_++] = 0xC0;
+                } else if (b == 0xDD) {
+                    if (kiss_idx_ < sizeof(kiss_buf_)) kiss_buf_[kiss_idx_++] = 0xDB;
+                }
+                kiss_state_ = KissState::DATA;
+                break;
+        }
+    }
+}
+
+void KissTncView::process_kiss_frame() {
+    if (tx_active_ || kiss_idx_ == 0) return;
+    // AFSK shared buffer is 512 bytes (256 uint16_t words). Each raw byte
+    // produces ~10 encoded bits after bit-stuffing + flags, so cap at 200 bytes
+    // to ensure the bitstream plus required 0-word terminator always fits.
+    if (kiss_idx_ > 200) return;
+    start_tx();
+}
+
+void KissTncView::start_tx() {
+    tx_active_ = true;
+
+    ax25::AX25Frame frame;
+    frame.make_frame_from_raw(kiss_buf_, kiss_idx_);
+
+    rx_frequency_ = receiver_model.target_frequency();
+    receiver_model.disable();
+    baseband::shutdown();
+
+    baseband::run_image(portapack::spi_flash::image_tag_afsk);
+
+    transmitter_model.set_target_frequency(rx_frequency_);
+    transmitter_model.set_sampling_rate(AFSK_SAMPLE_RATE);
+    transmitter_model.set_baseband_bandwidth(AFSK_BASEBAND_BW);
+    transmitter_model.enable();
+
+    baseband::set_afsk_data(AFSK_SAMPLE_RATE / 1200, 1200, 2200, 1, 10000, 8);
+
+    text_status.set("Transmitting");
+    tx_count_++;
+    update_stats();
+}
+
+void KissTncView::finish_tx() {
+    transmitter_model.disable();
+    baseband::shutdown();
+
+    // Must reload from SPI flash — run_image(afsk) overwrote m4_code.base()
+    baseband::run_image(portapack::spi_flash::image_tag_aprs_rx);
+
+    receiver_model.set_target_frequency(rx_frequency_);
+    receiver_model.set_sampling_rate(APRS_RX_SAMPLE_RATE);
+    receiver_model.set_baseband_bandwidth(APRS_RX_BASEBAND_BW);
+    receiver_model.enable();
+    baseband::set_aprs(1200);
+    tx_active_ = false;
+    text_status.set("Listening");
+    update_stats();
+}
+
+}  // namespace ui::external_app::kiss_tnc
--- a/Show More
+++ b/Show More