Update past_version.txt

* add shift

* add shift

* format

* add padding (wrote by AI)

* layout fine tune

* remove debug thing

* edit per request

* remove torjan (jk)

* int 16 should be good enough for it

.clang-format

@@ -0,0 +1,14 @@
+---
+BasedOnStyle: Chromium
+IndentWidth: '4'
+SortIncludes: 'false'
+AllowAllArgumentsOnNextLine: 'true'
+ColumnLimit: 0
+Cpp11BracedListStyle: 'true'
+AllowShortLoopsOnASingleLine: 'true'
+AllowShortIfStatementsOnASingleLine: 'true'
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: 1
+
+...

.dockerignore

@@ -0,0 +1 @@
+build

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # https://salt.bountysource.com/checkout/amount?team=portapack-mayhem

.github/ISSUE_TEMPLATE/01_bug_report.yml

@@ -0,0 +1,49 @@
+name: Bug report
+description: File a bug reports regarding the firmware.
+labels:
+  - bug
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thank you for taking the time to fill out an issue, this template is meant for any issues related to the Mayhem firmware.
+      Please try the latest nightly release before submitting this. You can find the latest nightly version here: https://github.com/portapack-mayhem/mayhem-firmware/releases
+- type: textarea
+  id: description
+  attributes:
+    label: Describe the bug.
+    description: "A clear and concise description of what the bug is."
+  validations:
+    required: true
+- type: textarea
+  id: repro
+  attributes: 
+    label: Reproduction
+    description: "How can this bug be reproduced?"
+    placeholder: |
+      1. Switch on...
+      2. Press button '....'
+      3. Wait for the end of the universe
+      4. It burns
+  validations:
+    required: true
+- type: textarea
+  id: expected
+  attributes: 
+    label: Expected behavior
+    description: "A clear and concise description of what you expected to happen"
+    placeholder: |
+      1. Generates file on...
+      2. I get a cheeseburger...
+  validations:
+    required: true
+- type: input
+  id: target
+  attributes:
+    label: Environment/versions
+    description: Specify extra details about versions and environments affected
+- type: textarea
+  id: anything-else
+  attributes:
+    label: Anything else?
+    description: Let us know if you have anything else to share.

.github/ISSUE_TEMPLATE/02_feature_request.yml

@@ -0,0 +1,25 @@
+name: Feature Request
+description: For feature requests regarding the firmware.
+labels:
+  - enhancement
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thank you for taking the time to fill out an issue, this template is meant for any feature suggestions.
+      Please try the latest nightly release before submitting this, make sure it has not been implemented already. You can find the latest nightly version here: https://github.com/portapack-mayhem/mayhem-firmware/releases
+- type: textarea
+  id: proposal
+  attributes:
+    label: "Description of the feature you're suggesting."
+    description: |
+      Please describe your feature request in as many details as possible.
+        - Describe what it should do.
+        - Note whether it is to extend existing functionality or introduce new functionality.
+  validations:
+    required: true
+- type: textarea
+  id: anything-else
+  attributes:
+    label: Anything else?
+    description: Let us know if you have anything else to share.

.github/ISSUE_TEMPLATE/03_problem-upgrading-the-firmware.yml

@@ -0,0 +1,45 @@
+name: Firmware/boot issue
+description: If you are having firmware upgrade or booting problems.
+labels:
+  - firmware
+body:
+  - type: markdown
+    attributes:
+      value: >2-
+         Thank you for taking the time to fill out an issue, this template is meant for any issues related to the Mayhem firmware.
+              Before creating this issue, **do the following**: 
+        * Read the Wiki on booting:
+        https://github.com/portapack-mayhem/mayhem-firmware/wiki/Won't-boot
+
+        * Read:
+        https://github.com/portapack-mayhem/mayhem-firmware/wiki/Update-firmware
+
+        * Watch carefully: https://www.youtube.com/watch?v=_zx4ZvurgOs
+
+        * (if you are not in Windows) also check:
+        https://www.youtube.com/watch?v=kjFB58Y1TAo
+
+        * Check hardware versions:
+        https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions
+  - type: textarea
+    id: problem
+    attributes:
+      label: What happened?
+      description: If after following the above troubleshooting the problem still remains
+      placeholder: Describe what was is the problem
+  - type: input
+    id: hardware
+    attributes:
+      label: Your hardware
+      description: Check the link with the versions above
+      placeholder: Which device you have?
+  - type: checkboxes
+    id: firmware_update_before
+    attributes:
+      label: Tests
+      description: >-
+        Things might be confusing the first time, please check the documentation
+        above
+      options:
+        - label: I managed to update/boot previously
+          required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Need more help?
+    url: https://discord.com/invite/tuwVMv3
+    about: For any question that does not fit as an issue, check our discord.

.github/workflows/changelog.py

@@ -0,0 +1,55 @@
+import os
+import sys
+
+import requests
+from datetime import datetime, timedelta, timezone
+
+# Set up your personal access token and the repository details
+token = os.environ.get('GH_TOKEN')
+repo_owner = "portapack-mayhem"
+repo_name = "mayhem-firmware"
+
+
+def print_stable_changelog(previous_sha):
+    url = f"compare/{previous_sha}...next"
+    commits = handle_get_request(url)
+    for commit in commits["commits"]:
+        # Print the commit details
+        print(format_output(commit))
+
+
+def print_nightly_changelog():
+    # Calculate the date and time 24 hours ago
+    since_time = (datetime.now(timezone.utc) - timedelta(hours=24)).isoformat()  # Check that this is UTC
+    url = "commits"
+    commits = handle_get_request(url, since_time)
+    for commit in commits:
+        # Print the commit details
+        print(format_output(commit))
+
+
+def handle_get_request(path, offset=None):
+    headers = {} if token == None else {"Authorization": f"Bearer {token}"}
+    params = {"since": offset}
+    url_base = f"https://api.github.com/repos/{repo_owner}/{repo_name}/"
+    response = requests.get(url_base + path, headers=headers, params=params)
+
+    # Check if the request was successful (status code 200)
+    if response.status_code == 200:
+        return response.json()
+    else:
+        print(f"Request failed with status code: {response.status_code}")
+    return None
+
+
+def format_output(commit):
+    message_lines = commit["commit"]["message"].split("\n")
+    author = commit["author"]["login"] if commit["author"] and "login" in commit["author"] else commit["commit"]["author"]["name"]
+    return '- ' + commit["sha"][:8] + ' - @' + author + ': ' + message_lines[0]
+
+
+if len(sys.argv) < 2:
+    print_nightly_changelog()
+else:
+    past_version = sys.argv[1]
+    print_stable_changelog(past_version)

.github/workflows/check_formatting.yml

@@ -0,0 +1,23 @@
+name: Check formatting
+
+on: [pull_request]
+
+jobs:
+  check_date:
+    runs-on: ubuntu-latest
+    name: Check formatting
+    strategy:
+      matrix:
+        path:
+          - "firmware/common"
+          - "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:
+          check-path: ${{ matrix.path }}
+          fallback-style: Chromium

.github/workflows/create_nightly_release.yml

@@ -0,0 +1,135 @@
+name: Nightly Release
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+    
+  workflow_dispatch:
+
+jobs:
+  check_date:
+    runs-on: ubuntu-latest
+    name: Check latest commit
+    outputs:
+      should_run: ${{ steps.should_run.outputs.should_run }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: print latest_commit
+        run: echo ${{ github.sha }}
+
+      - name: check latest commit is less than a day
+        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
+    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
+          #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: |
+          git submodule update --init --recursive
+      - 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_date.outputs.date }} -i -v ${{ github.workspace }}:/havoc portapack-dev
+      - name: Create Small SD Card ZIP - No World Map
+        run: |
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && 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
+      - name: Unzip world map
+        run: |
+          unzip world_map.zip -d sdcard/ADSB
+      - name: Create Firmware ZIP
+        run: |
+          zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip *
+      - name: Create SD Card ZIP
+        run: |
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && 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: Create changelog
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          {
+            echo 'content<<EOF'
+            python3 .github/workflows/changelog.py
+            echo EOF
+          } >> "$GITHUB_OUTPUT"
+        id: changelog
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: nightly-tag-${{ steps.date.outputs.date }}
+          release_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.
+            ## Release notes
+            ###  Revision (${{ steps.version_date.outputs.date }}):
+            ${{ 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

.github/workflows/create_stable_release.yml

@@ -0,0 +1,130 @@
+name: Stable Release
+
+on:    
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    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
+          #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: |
+          git submodule update --init --recursive
+      - 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
+      - name: Create Small SD Card ZIP - No World Map
+        run: |
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && 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
+      - name: Unzip world map
+        run: |
+          unzip world_map.zip -d sdcard/ADSB
+      - name: Create Firmware ZIP
+        run: |
+          zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip *
+      - name: Create SD Card ZIP
+        run: |
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && 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: Create changelog
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          {
+            echo 'content<<EOF'
+            python3 .github/workflows/changelog.py ${{ steps.past_version.outputs.past_version }}
+            echo EOF
+          } >> "$GITHUB_OUTPUT"
+        id: changelog
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.version.outputs.version }}
+          release_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
+            Check the [wiki](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Update-firmware) for details how to upgrade.
+            __Warning:__ Since release 1.8.0, some applications has been moved to the SD card as we ran out of flash space.
+
+            ### MicroSD card files
+
+            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
+     

.github/workflows/past_version.txt

@@ -0,0 +1 @@
+v2.0.1

.github/workflows/version.txt

@@ -0,0 +1 @@
+v2.0.2

.gitignore

@@ -13,7 +13,7 @@
 /sdcard/FREQMAN/BHT*
 /sdcard/FREQMAN/R.TXT
 /sdcard/FREQMAN/XXX.TXT
-/sdcard/WAV/*
+/armbin
 
 # Compiled Object files
 *.slo
@@ -28,7 +28,6 @@
 # Compiled Dynamic libraries
 *.so
 *.dylib
-*.dll
 
 # Fortran module files
 *.mod
@@ -40,7 +39,6 @@
 *.lib
 
 # Executables
-*.exe
 *.out
 *.app
 /firmware/baseband/*.bin
@@ -51,17 +49,35 @@
 *.map
 *.lst
 .dep/
-build/
+/build*
 CMakeFiles/
+cmake-build-debug/
 
 # Debugging
 .gdbinit*
 
-# Editor files
+# Editor/ IDE files
 *.sublime-project
 *.sublime-workspace
+.vscode
+.idea
 
-# Host OS turds
+# VSCodium extensions
+.history
+
+# Host OS leftovers
 .DS_Store
 /firmware/CMakeCache.txt
-/sdcard/ADSB/airlines.txt
+
+# Python env/ venv and cache
+env/
+venv/
+**/__pycache__/
+*.pyc
+
+# Other
+*.bak
+
+# generated bitmap arr file
+# TODO: generate bitmap during build, since we use python during build anyway, lemme know if this is a bad idea @zxkmm
+/firmware/tools/bitmap.hpp

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "hackrf"]
 	path = hackrf
-	url = https://github.com/jboone/hackrf.git
+	url = https://github.com/mossmann/hackrf.git

.travis.yml

@@ -1,73 +0,0 @@
-language: cpp
-
-matrix:
-  include:
-    - os: linux
-      compiler: gcc
-      cache: apt
-      dist: xenial
-
-env:
-  global:
-    - PROJECT_NAME=PortaPack-HAVOC
-    - SHORT_COMMIT_HASH=`git rev-parse --short HEAD`
-    - VERSION_STRING=nightly-$SHORT_COMMIT_HASH
-    - BUILD_DATE="`date +%Y-%m-%d`"
-    - BUILD_NAME="$PROJECT_NAME-$BUILD_DATE-$SHORT_COMMIT_HASH"
-    - ARTEFACT_BASE=$TRAVIS_BUILD_DIR/artefacts/
-    - ARTEFACT_PATH=$ARTEFACT_BASE/$BUILD_NAME
-
-notifications:
-  irc:
-    channels:
-      - "chat.freenode.net#portapack"
-    template:
-      - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
-      - "Change view : %{compare_url}"
-      - "Build details : %{build_url}"
-      # TODO: The "build_number.1" in this URL is almost certainly wrong, but correct value not available from Travis?
-      - "Firmware download : https://jboone.github.io/portapack-havoc-nightly/"
-
-before_install:
-  - sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa -y
-  - sudo apt-get update -q
-  - sudo apt-get install gcc-arm-embedded -y
-
-script:
-  # TODO: Introduce top-level Makefile, this is lame.
-  - sed -e "s/\#set(VERSION.*/set(VERSION \"$VERSION_STRING\")/" -i".bak" CMakeLists.txt
-  - mkdir build/
-  - pushd build/
-  - cmake ..
-  - make firmware
-  - popd
-
-after_success:
-  - mkdir -p $ARTEFACT_PATH
-  # Copy firmware to firmware-bin directory
-  - cd $TRAVIS_BUILD_DIR/build
-  - cp firmware/portapack-h1-havoc.bin $ARTEFACT_PATH/
-  - cp hackrf/firmware/hackrf_usb/hackrf_usb.dfu $ARTEFACT_PATH/
-  - cd $TRAVIS_BUILD_DIR
-  - cp LICENSE $ARTEFACT_PATH/
-  # Build the archive
-  - cd $ARTEFACT_BASE
-  - tar -cJvf $ARTEFACT_BASE/$BUILD_NAME.tar.xz $BUILD_NAME
-  - md5sum --binary $BUILD_NAME.tar.xz >MD5SUMS
-  - sha256sum --binary $BUILD_NAME.tar.xz >SHA256SUMS
-
-addons:
-  apt:
-    packages:
-      - coreutils
-      - tar
-      - sed
-      - cmake
-      - dfu-util
-
-deploy:
-  provider: script
-  skip-cleanup: true
-  script: bash $TRAVIS_BUILD_DIR/tools/deploy-nightly.sh
-  on:
-    branch: master

.vscode/launch.json

@@ -0,0 +1,148 @@
+{
+   // Use IntelliSense to learn about possible attributes.
+   // Hover to view descriptions of existing attributes.
+   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+   "version": "0.2.0",
+   "configurations": [
+      {
+         "name": "(gdb) JTAG probe",
+         "type": "cppdbg",
+         "request": "launch",
+         "miDebuggerPath": "arm-none-eabi-gdb",
+         "targetArchitecture": "arm",
+         "program": "${workspaceRoot}/build/firmware/baseband/baseband_adsbrx.elf",
+         "cwd": "${workspaceRoot}",
+         "setupCommands": [
+            // use logging for troubleshooting
+            //{"text": "set logging file ${workspaceRoot}/build/arm-none-eabi-gdb.log"},
+            //{"text": "set logging on"},
+            {
+               "text": "file '${workspaceRoot}/build/firmware/baseband/baseband_adsbrx.elf'"
+            },
+            {
+               "text": "target extended-remote /dev/ttyACM0"
+            },
+            {
+               "text": "monitor swdp_scan"
+            },
+            {
+               "text": "attach 1"
+            },
+         ],
+         "launchCompleteCommand": "None",
+         "externalConsole": false,
+      },
+      {
+         "name": "(gdb) OpenOCD m4 baseband",
+         "type": "cppdbg",
+         "request": "launch",
+         "program": "${workspaceRoot}/build/firmware/baseband/baseband_sd_over_usb.elf",
+         "args": [],
+         "cwd": "${workspaceRoot}",
+         // "environment": [
+         //     {
+         //         "name": "PATH",
+         //         "value": "${env:PATH}"
+         //     }
+         // ],
+         "externalConsole": false,
+         "MIMode": "gdb",
+         "miDebuggerPath": "arm-none-eabi-gdb",
+         "targetArchitecture": "arm",
+         "debugServerPath": "openocd",
+         "debugServerArgs": "-f interface/ftdi/um232h.cfg  -f target/lpc4350.cfg -c \"gdb_breakpoint_override hard\"",
+         "serverStarted": "Listening on port [0-9]+ for gdb connections",
+         "filterStderr": true,
+         "filterStdout": false,
+         "launchCompleteCommand": "None",
+         "postRemoteConnectCommands": [
+            {
+               "description": "Target Remote Device on Port 3333",
+               "text": "target extended-remote :3333",
+               "ignoreFailures": false
+            },
+            {
+               "description": "Respect Hardware Limitations",
+               "text": "set remote hardware-watchpoint-limit 2",
+               "ignoreFailures": false
+            },
+            {
+               "description": "Respect Hardware Limitations",
+               "text": "set remote hardware-breakpoint-limit 4",
+               "ignoreFailures": false
+            },
+            {
+               "description": "Shutdown GDB Server on GDB Detach",
+               "text": "monitor [target current] configure -event gdb-detach { shutdown }",
+               "ignoreFailures": false
+            },
+         ],
+         "stopAtConnect": false,
+         "logging": {
+            "exceptions": true,
+            "engineLogging": false,
+            "moduleLoad": true,
+            "programOutput": true,
+            "trace": false,
+            "traceResponse": false
+         },
+         "useExtendedRemote": true
+      },
+      {
+         "name": "(gdb) OpenOCD m0 application",
+         "type": "cppdbg",
+         "request": "launch",
+         "program": "${workspaceRoot}/build/firmware/application/application.elf",
+         "args": [],
+         "cwd": "${workspaceRoot}",
+         // "environment": [
+         //     {
+         //         "name": "PATH",
+         //         "value": "${env:PATH}"
+         //     }
+         // ],
+         "externalConsole": false,
+         "MIMode": "gdb",
+         "miDebuggerPath": "arm-none-eabi-gdb",
+         "targetArchitecture": "arm",
+         "debugServerPath": "openocd",
+         "debugServerArgs": "-f interface/ftdi/um232h.cfg  -f target/lpc4350.cfg -c \"gdb_breakpoint_override hard\"",
+         "serverStarted": "Listening on port [0-9]+ for gdb connections",
+         "filterStderr": true,
+         "filterStdout": false,
+         "launchCompleteCommand": "None",
+         "postRemoteConnectCommands": [
+            {
+               "description": "Target Remote Device on Port 3334",
+               "text": "target extended-remote :3334",
+               "ignoreFailures": false
+            },
+            {
+               "description": "Respect Hardware Limitations",
+               "text": "set remote hardware-watchpoint-limit 1",
+               "ignoreFailures": false
+            },
+            {
+               "description": "Respect Hardware Limitations",
+               "text": "set remote hardware-breakpoint-limit 2",
+               "ignoreFailures": false
+            },
+            {
+               "description": "Shutdown GDB Server on GDB Detach",
+               "text": "monitor [target current] configure -event gdb-detach { shutdown }",
+               "ignoreFailures": false
+            },
+         ],
+         "stopAtConnect": false,
+         "logging": {
+            "exceptions": true,
+            "engineLogging": false,
+            "moduleLoad": true,
+            "programOutput": true,
+            "trace": false,
+            "traceResponse": false
+         },
+         "useExtendedRemote": true
+      },
+   ]
+}

CMakeLists.txt

@@ -18,15 +18,17 @@
 # Boston, MA 02110-1301, USA.
 #
 
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.5)
 cmake_policy(SET CMP0005 NEW)
 
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/firmware/toolchain-arm-cortex-m.cmake)
 
 project(portapack-h1)
 
-#set(VERSION "")
-if (NOT DEFINED VERSION)
+set(EXPECTED_GCC_VERSION "9.2.1")
+
+set(VERSION "$ENV{VERSION_STRING}")
+if ("${VERSION}" STREQUAL "")
 	execute_process(
 		COMMAND git log -n 1 --format=%h
 		WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
@@ -38,14 +40,26 @@ if (NOT DEFINED VERSION)
 	if (GIT_VERSION_FOUND)
 		set(VERSION "unknown")
 	else (GIT_VERSION_FOUND)
-		set(VERSION "local-${GIT_VERSION}")
+		set(VERSION "${GIT_VERSION}")
 	endif (GIT_VERSION_FOUND)
+
+	set(VERSION_NOHASH "dev")
+else()
+	set(VERSION_NOHASH "${VERSION}")
 endif()
 
+execute_process(
+	COMMAND bash "-c" "echo ${VERSION} | md5sum | head -c 8"
+	OUTPUT_VARIABLE VERSION_MD5
+)
+set(VERSION_MD5 "0x${VERSION_MD5}")
+
+message("Building version: ${VERSION} MD5: ${VERSION_MD5}")
+
 set(LICENSE_PATH ${CMAKE_CURRENT_LIST_DIR}/LICENSE)
 set(HARDWARE_PATH ${CMAKE_CURRENT_LIST_DIR}/hardware)
 
-add_subdirectory(hackrf/firmware/hackrf_usb)
+add_subdirectory(hackrf-portapack)
 
 set(HACKRF_FIRMWARE_DFU_FILENAME hackrf_usb.dfu)
 set(HACKRF_FIRMWARE_BIN_FILENAME hackrf_usb_ram.bin)
@@ -58,4 +72,13 @@ set(HACKRF_CPLD_XSVF_PATH ${HACKRF_PATH}/firmware/cpld/sgpio_if/${HACKRF_CPLD_XS
 set(HACKRF_FIRMWARE_DFU_IMAGE ${hackrf_usb_BINARY_DIR}/${HACKRF_FIRMWARE_DFU_FILENAME})
 set(HACKRF_FIRMWARE_BIN_IMAGE ${hackrf_usb_BINARY_DIR}/${HACKRF_FIRMWARE_BIN_FILENAME})
 
+# this seems causing some issues (ref. in discord discussions), so temporarily disabled, until figure out the pros and cons and bugs of this tool.
+#find_program(CCACHE "ccache")
+#if(CCACHE)
+#    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
+#    set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
+#    set(ENV{CCACHE_SLOPPINESS} pch_defines,time_macros)
+#endif(CCACHE)
+
+enable_testing()
 add_subdirectory(firmware)

LICENSE

@@ -1,281 +1,622 @@
-GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                       TERMS AND CONDITIONS
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+  0. Definitions.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  "This License" refers to version 3 of the GNU General Public License.
 
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+  1. Source Code.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  2. Basic Permissions.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+  13. Use with the GNU Affero General Public License.
 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  14. Revised Versions of this License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-                            NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  15. Disclaimer of Warranty.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
 
@@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {description}
-    Copyright (C) {year}  {fullname}
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    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 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -303,37 +644,31 @@ the "copyright" line and a pointer to where the full notice is found.
     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; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  {signature of Ty Coon}, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

LICENSE.GPL-2.0-or-later

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 of the License, 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; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

README.md

@@ -1,25 +1,63 @@
-## Fork of the unofficial HAVOC
+> [!WARNING]
+> __IF YOU'VE PAID FOR MAYHEM OR ANY PREPACKAGED VERSIONS, YOU'RE BEING SCAMMED.__ 
+>
+> The only legitimate link to our repositories is the [portapack-mayhem](https://github.com/portapack-mayhem/mayhem-firmware) organization on GitHub.
 
-Keeping the latest release files and all features I found, and possible my own features in the future, around here. Check Releases
+# PortaPack Mayhem
 
-[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=CBPQA4HRRPJQ6&source=url)
+[![Nightly Release](https://github.com/portapack-mayhem/mayhem-firmware/actions/workflows/create_nightly_release.yml/badge.svg?branch=next)](https://github.com/portapack-mayhem/mayhem-firmware/actions/workflows/create_nightly_release.yml) [![CodeScene Code Health](https://codescene.io/projects/8381/status-badges/code-health)](https://codescene.io/projects/8381) [![GitHub All Releases](https://img.shields.io/github/downloads/portapack-mayhem/mayhem-firmware/total)](https://github.com/portapack-mayhem/mayhem-firmware/releases) [![GitHub Releases](https://img.shields.io/github/downloads/portapack-mayhem/mayhem-firmware/latest/total)](https://github.com/portapack-mayhem/mayhem-firmware/releases/latest) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/eried/portapack.svg)](https://hub.docker.com/r/eried/portapack) [![Discord Chat](https://dcbadge.vercel.app/api/server/tuwVMv3?style=flat)](https://discord.gg/tuwVMv3)
 
-I only have this [Portapack H2+HackRF+battery](https://s.click.aliexpress.com/e/_dSMPvNo), so that's the version I'll be using for testing the releases before I post them here. BTW, if you have the same H2 (I know... I know it is a *dirty* clone) you could print my case:
-[![Case](doc/h2_front.jpg)](https://www.thingiverse.com/thing:4260973)
+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.
 
-<details>
-  <summary>More details about the H2 case</summary>
-  
-[STL files](https://www.thingiverse.com/thing:4260973)
+[<img src="https://raw.githubusercontent.com/wiki/portapack-mayhem/mayhem-firmware/img/hw_overview_h2_front.png" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview) [<img src="https://raw.githubusercontent.com/wiki/portapack-mayhem/mayhem-firmware/img/hw_overview_h2_inside.png" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview#portapack-internals)
 
-  
-</details>
+*[PortaPack H2+HackRF+battery](https://grabify.link/7T28JP) (clone) with a custom [3d printed case](https://github.com/portapack-mayhem/mayhem-firmware/wiki/H2-Enclosure)*
 
-<details>
-  <summary>Printed magnetic cover for the H2 case</summary>
-  
-[![Cover](doc/h2_cover.jpg)](https://www.thingiverse.com/thing:4278961)
-  
-[STL files](https://www.thingiverse.com/thing:4278961)
-  
-</details>
+# What is this?
+
+If you are new to *HackRF+PortaPack+Mayhem*, check these:
+
+[<img alt="It’s TOO Easy to Accidentally Do Illegal Stuff with This" src="https://img.youtube.com/vi/OPckpjBSAOw/maxresdefault.jpg" width="700">](https://grabify.link/X4D5TF)
+
+[<img alt="What is the HackRF One Portapack H2+?" src="https://img.youtube.com/vi/alrFbY5vxt4/maxresdefault.jpg" width="230">](https://grabify.link/9UZGEW) [<img alt="Beginner's Guide To The HackRF & Portapak With Mayhem" src="https://img.youtube.com/vi/H-bqdWfbhpg/maxresdefault.jpg" width="230">](https://grabify.link/5MU2VH) [<img alt="HackRF 101 : Everything You Need to Know to Get Started!" src="https://img.youtube.com/vi/xGR_PMD9LeU/maxresdefault.jpg" width="230">](https://grabify.link/C0J6ZR)
+
+# Frequently Asked Questions
+
+This repository expands upon the previous work by many people and aims to constantly add new features, bugfixes and generate documentation to make further development easier.  [Collaboration](https://github.com/portapack-mayhem/mayhem-firmware/wiki/How-to-collaborate) is always welcomed and appreciated.
+
+## What to buy?
+
+:heavy_check_mark: ![Static Badge](https://img.shields.io/badge/NEW-yellow) The fabulous [PortaPack H4M Mayhem](https://grabify.link/VPMPSL), featuring numerous improvements and accessories. Sold by our friends at OpenSourceSDRLab. Join their giveaways on discord (check the badge on top).
+
+:heavy_check_mark: A recommended one is this [PortaPack H2](https://grabify.link/7T28JP), that includes everything you need with the plastic case "inspired" on [this](https://github.com/portapack-mayhem/mayhem-firmware/wiki/H2-Enclosure).
+
+:heavy_check_mark: Some individuals lean towards the [H2 with a metal enclosure](https://grabify.link/HTDXG5), but its advantages remain debated. Share your insights on our [wiki](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview). 
+
+:warning: Be cautious , *ask* the seller about compatibility with the latest releases. Look out for the description of the item, if they provide the firmware files for an older version or they have custom setup instructions, this means it might be **NOT compatible**, for example:
+
+![image](https://user-images.githubusercontent.com/1091420/214579017-9ad970b9-0917-48f6-a550-588226d3f89b.png)
+
+:warning: If it looks **too different**, this might mean that they are using their own recipe, check the [different models](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions) in our wiki. For example all the H3 and clones of that version use their own version of the firmware. They do not contribute the changes back and eventually you will be left with a device that nobody maintains:
+
+![image](https://user-images.githubusercontent.com/1091420/214581333-424900ee-26f8-4e96-be2f-69d8dc995ba9.png)
+
+## Where is the latest version?
+
+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.
+
+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).
+
+[![Contributors](https://contrib.rocks/image?repo=portapack-mayhem/mayhem-firmware)](https://github.com/portapack-mayhem/mayhem-firmware/graphs/contributors)
+
+To support the people behind the hardware, please buy a genuine [HackRF](https://greatscottgadgets.com/hackrf/) and [PortaPack](https://store.sharebrained.com/products/portapack-for-hackrf-one-kit).
+
+## What if I really want something specific?
+If what you need can be relevant in general, you can [request a feature](https://github.com/portapack-mayhem/mayhem-firmware/issues/new?labels=enhancement&template=feature_request.md). Alternatively, go to our Discord by clicking the chat badge on [top](#portapack-mayhem) and discuss there.
+
+## What if I need help?
+First, check the [documentation](https://github.com/portapack-mayhem/mayhem-firmware/wiki). If you find a bug or you think the problem is related to the current repository, please open an [issue](https://github.com/portapack-mayhem/mayhem-firmware/issues/new/choose).
+
+You can reach the [official community](https://www.facebook.com/groups/177623356165819) in Facebook, and our Discord by clicking the chat badge on [top](#portapack-mayhem).

doc/widgets.txt

@@ -1,171 +0,0 @@
-~ Pretty ugly PortaPack H1 (+HAVOC) UI widget documentation ~
-              by @furrtek - v0.1 - 2017/02/02
-           Not approved at all by @Sharebrained
-
-The display is 240 x 320 pixels.
-
-A View is basically a rectangular zone on the screen.
-Widgets (aka controls, UI elements...) go into Views.
-
-Views can be pushed to/popped from a stack.
-The main menu view is at the bottom of the stack and can't be popped.
-The title bar view is a special case, it (normally) can't be hidden by pushed Views.
-Since the title bar is 16 pixel high, a regular full-screen view is 240 x 304 pixels.
-
-If the current View can be popped (removed), an arrow shows on the left of the title bar.
-
-Kind of widgets:
-
-==== Rectangle ====
-
-A simple filled or outlined rectangle. No interactivity.
-
-Constructors:
-- Empty
-- Rectangle(Rect, Color)
-
-Methods:
-- set_color(Color)
-- set_outline(bool): Default is filled, set to true for outline only
-
-==== Text ====
-
-A simple text label. No interactivity.
-
-Constructors:
-- Empty
-- Text(Rect)
-- Text(Rect, std::string)
-
-Methods:
-- set(std::string): Updates text
-
-==== BigFrequency (HAVOC) ====
-
-Displays a big 7-segment style frequency value in the XXXX.xxxMHz format.
-If the value is 0, ----.--- is displayed. No leading zeros. No interactivity.
-
-Constructors:
-- BigFrequency(Rect, rf::Frequency)
-
-Methods:
-- set(rf::Frequency): Updates value
-
-==== ProgressBar (HAVOC) ====
-
-Displays progress as an horizontal progress bar with value and maximum value.
-No interactivity.
-
-Constructors:
-- ProgressBar(Rect)
-
-Methods:
-- set_max(uint32_t): Updates maximum value
-- set_value(uint32_t): Updates current value
-
-The maximum value is set by default to 100.
-
-==== Console ====
-
-Displays a scrolling text console. No interactivity.
-
-Constructors:
-- Console(Rect)
-
-Methods:
-- clear(): Clears text and resets cursor to top-left
-- write(std::string): Adds text
-- writeln(std::string): Adds text and CR + LF
-
-==== Checkbox (HAVOC) ====
-
-A toggle option shown as a tickable box with a text label.
-Interactive: select and touch.
-
-Constructors:
-- Empty
-- Checkbox(Point, size_t, std::string)
-- Checkbox(Point, size_t, std::string, bool)
-
-(Position, length of text label, text, regular size/small)
-
-Methods:
-- bool value(): Returns state
-- set_text(std::string): Updates text label
-- set_value(bool): Sets state
-
-Callbacks:
-- on_select: Select key press or touch. Returns state
-
-==== Button ====
-
-A momentary push-button. Interactive: select and touch.
-
-Constructors:
-- Empty
-- Button(Rect, std::string)
-
-Methods:
-- std::string text(): Returns text
-- set_text(std::string): Updates text
-
-Callbacks:
-- on_select: Select key press or touch
-- on_dir: Direction keys press
-- on_highlight: Focus get
-
-==== Image ====
-
-Shows a 1-bit bitmap. No interactivity.
-
-Constructors:
-- Empty
-- Image(Rect, Bitmap*, Color, Color)
-
-(Rect, pointer to bitmap (see bitmap.hpp), foreground, background)
-
-Methods:
-- set_bitmap(Bitmap*): Updates bitmap
-- set_foreground(Color): Changes foreground color
-- set_background(Color): Changes background color
-- invert_colors(): Flip foreground color with background
-
-==== ImageButton ====
-
-Same as the Image widget, except interactive (select and touch). No methods.
-
-Constructors:
-- Empty
-- ImageButton(Rect, Bitmap*, Color, Color)
-
-(Rect, pointer to bitmap (see bitmap.hpp), foreground, background)
-
-Callbacks:
-- on_select: Select key press or touch
-
-==== ImageOptionsField (HAVOC) ====
-
-Options list displayed as images.
-Interactive: change (jog wheel) and focus.
-
-Constructors:
-- Empty
-- ImageOptionsField(Rect, options_t)
-
-options_t is a std::vector of std::pair of unsigned char pointers to color bitmap data and an int32_t
-
-Methods:
-- set_options(options_t)
-- size_t selected_index()
-- size_t selected_index_value()
-- set_selected_index(size_t)
-- set_by_value(value_t)
-
-Callbacks:
-- on_change: Option was changed
-- on_show_options: Focus get
-
-==== OptionsField ====
-==== NumberField ====
-==== SymField (HAVOC) ====
-==== Waveform (HAVOC) ====

docker-compose-nogit.yml

@@ -0,0 +1,9 @@
+version: '3.9'
+
+services:
+  portapack-mayhem-dev:
+    build:
+      context: .
+      dockerfile: dockerfile-nogit-alpine
+    volumes:
+      - ".:/havoc"

docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3.9'
+
+services:
+  portapack-mayhem-dev:
+    build:
+      context: .
+      dockerfile: dockerfile-alpine
+    volumes:
+      - "./bin:/havocbin"

dockerfile

@@ -1,6 +1,6 @@
 #Download base image.
-#The ubuntu:latest tag points to the "latest LTS"
-FROM ubuntu:latest
+#The ubuntu:20.04 tag points to the "20.04 LTS"
+FROM ubuntu:20.04
 
 #Set location to download ARM toolkit from.
 # This will need to be changed over time or replaced with a static link to the latest release.
@@ -14,22 +14,35 @@ COPY ./ /havocsrc
 
 #Fetch dependencies from APT
 RUN apt-get update && \
-	apt-get install -y tar wget dfu-util cmake python python-pip && \
-	apt-get -qy autoremove
+        apt-get install -y tar wget dfu-util cmake python bzip2 lz4 curl python3 python3-yaml && \
+        apt-get -qy autoremove
+
+#Install current pip from PyPa
+RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \
+        python get-pip.py
+
 #Fetch additional dependencies from Python 2.x pip
 RUN pip install pyyaml
+RUN rm -rf /usr/bin/python && \
+        rm -rf /usr/bin/pip && \
+        ln -s /usr/bin/python3 /usr/bin/python && \
+        ln -s /usr/bin/pip3 /usr/bin/pip
+
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
 
 #Grab the GNU ARM toolchain from arm.com
 #Then extract contents to /opt/build/armbin/
 RUN mkdir /opt/build && cd /opt/build && \
-	wget -O gcc-arm-none-eabi $ARMBINURL && \
-	mkdir armbin && \
-	tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
-    
+        wget -O gcc-arm-none-eabi $ARMBINURL && \
+        mkdir armbin && \
+        tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
+
 #Set environment variable so compiler knows where the toolchain lives
 ENV PATH=$PATH:/opt/build/armbin/bin
 
 CMD cd /havocsrc && \
-    mkdir build && cd build && \ 
-    cmake .. && make firmware && \
-    cp /portapack-havoc/firmware/portapack-h1-havoc.bin /havocbin
+        mkdir build && cd build && \ 
+        cmake .. && make firmware && \
+        cp /portapack-havoc/firmware/portapack-h1-havoc.bin /havocbin
+

dockerfile-alpine

@@ -0,0 +1,29 @@
+# Download base image.
+FROM alpine:edge
+
+# Download ARM toolkit.
+RUN apk add --no-cache gcc-arm-none-eabi gcc
+
+# Create volume /havocbin for compiled firmware binaries
+VOLUME /havocbin
+
+# Copy build context (repository root) to /havocsrc
+COPY ./ /havocsrc
+
+# Fetch dependencies from APK
+RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+RUN apk update -U
+RUN apk add --no-cache git tar wget cmake curl bzip2 lz4 make
+RUN apk add --no-cache dfu-util ccache icu-data-full
+RUN apk add --no-cache python3 py3-pip py3-yaml
+RUN apk add --no-cache py3-pyyaml-env-tag
+RUN apk add --no-cache g++ gcc clang clang-static clang-dev llvm-dev llvm-static
+
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
+CMD cd /havocsrc && \
+        mkdir build && cd build && \ 
+        cmake .. && make firmware && \
+        cp /portapack-havoc/firmware/portapack-h1-havoc.bin /havocbin
+

dockerfile-nogit

@@ -1,27 +1,42 @@
-FROM ubuntu:latest
-
-# Set location to download ARM toolkit from.
-# This will need to be changed over time or replaced with a static link to the latest release.
-ENV ARMBINURL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2?revision=108bd959-44bd-4619-9c19-26187abf5225&la=en&hash=E788CE92E5DFD64B2A8C246BBA91A249CB8E2D2D \
-    PATH=$PATH:/opt/build/armbin/bin
-
-#Create volume /havoc/bin for compiled firmware binaries
-VOLUME /havoc
-WORKDIR /havoc/firmware
-
-# Fetch dependencies from APT
-RUN apt-get update && \
-	apt-get install -y git tar wget dfu-util cmake python3 python-pip && \
-	apt-get -qy autoremove
-
-RUN pip install pyyaml
-
-# Grab the GNU ARM toolchain from arm.com
-# Then extract contents to /opt/build/armbin/
-RUN mkdir /opt/build && cd /opt/build && \
-	wget -O gcc-arm-none-eabi $ARMBINURL && \
-	mkdir armbin && \
-	tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
-
-CMD cd .. && cd build && \
-    cmake .. && make firmware
+FROM ubuntu:xenial
+
+# Set location to download ARM toolkit from.
+# This will need to be changed over time or replaced with a static link to the latest release.
+ENV ARMBINURL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2?revision=108bd959-44bd-4619-9c19-26187abf5225&la=en&hash=E788CE92E5DFD64B2A8C246BBA91A249CB8E2D2D \
+	PATH=$HOME/bin:$PATH:/opt/build/armbin/bin
+
+#Create volume /havoc/bin for compiled firmware binaries
+VOLUME /havoc
+WORKDIR /havoc/firmware
+
+# Fetch dependencies from APT
+RUN apt-get update \
+ && apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 liblz4-tool curl ninja-build \
+ && apt-get -qy autoremove \
+ && rm -rf /var/lib/apt/lists/*
+
+#Install current pip from PyPa
+RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \
+	python3 get-pip.py
+
+#Fetch additional dependencies from Python 3.x pip
+RUN pip install pyyaml \
+ && ln -s /usr/bin/python3 /usr/bin/python \
+ && ln -s /usr/bin/pip3 /usr/bin/pip
+
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
+# Grab the GNU ARM toolchain from arm.com
+# Then extract contents to /opt/build/armbin/
+RUN mkdir /opt/build \
+ && cd /opt/build \
+ && wget -O gcc-arm-none-eabi $ARMBINURL \
+ && mkdir armbin \
+ && tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
+
+ADD firmware/tools/docker-entrypoint.sh /usr/local/bin/entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+# replace make with ninja temporarily while building your image if you prefer to use that by default
+CMD ["make"]

dockerfile-nogit-alpine

@@ -0,0 +1,23 @@
+FROM alpine:edge
+
+# Download ARM toolkit.
+RUN apk add --no-cache gcc-arm-none-eabi gcc
+
+# Create volume /havoc/bin for compiled firmware binaries
+VOLUME /havoc
+WORKDIR /havoc/firmware
+
+# Fetch dependencies from APK
+RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+RUN apk update -U
+RUN apk add --no-cache git tar wget cmake curl bzip2 lz4 make
+RUN apk add --no-cache dfu-util ccache icu-data-full
+RUN apk add --no-cache python3 py3-pip py3-yaml
+RUN apk add --no-cache py3-pyyaml-env-tag
+RUN apk add --no-cache g++ gcc clang clang-static clang-dev llvm-dev llvm-static
+
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
+CMD cd .. && cd build && \
+    cmake .. && make ppfw

dockerfile-nogit-arm

@@ -0,0 +1,42 @@
+FROM ubuntu:xenial
+
+# Set location to download ARM toolkit from.
+# This will need to be changed over time or replaced with a static link to the latest release.
+ENV ARMBINURL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-aarch64-linux.tar.bz2?revision=4583ce78-e7e7-459a-ad9f-bff8e94839f1&rev=4583ce78e7e7459aad9fbff8e94839f1&hash=C9B942D74CEA05FF9DE28380F267BB7D3F3B17A6 \
+	PATH=$HOME/bin:$PATH:/opt/build/armbin/bin
+
+#Create volume /havoc/bin for compiled firmware binaries
+VOLUME /havoc
+WORKDIR /havoc/firmware
+
+# Fetch dependencies from APT
+RUN apt-get update \
+ && apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 liblz4-tool curl ninja-build \
+ && apt-get -qy autoremove \
+ && rm -rf /var/lib/apt/lists/*
+
+#Install current pip from PyPa
+RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \
+	python3 get-pip.py
+
+#Fetch additional dependencies from Python 3.x pip
+RUN pip install pyyaml \
+ && ln -s /usr/bin/python3 /usr/bin/python \
+ && ln -s /usr/bin/pip3 /usr/bin/pip
+
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
+# Grab the GNU ARM toolchain from arm.com
+# Then extract contents to /opt/build/armbin/
+RUN mkdir /opt/build \
+ && cd /opt/build \
+ && wget -O gcc-arm-none-eabi $ARMBINURL \
+ && mkdir armbin \
+ && tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
+
+ADD firmware/tools/docker-entrypoint.sh /usr/local/bin/entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+# replace make with ninja temporarily while building your image if you prefer to use that by default
+CMD ["make"]

docs/CNAME

@@ -0,0 +1 @@
+portapack.ried.cl

docs/index.html

@@ -0,0 +1,6 @@
+<head>
+  <meta http-equiv="refresh" content="0; URL=https://github.com/portapack-mayhem/mayhem-firmware/" />
+</head>
+<body>
+  <p>If you are not redirected, <a href="https://github.com/portapack-mayhem/mayhem-firmware/">click here</a>.</p>
+</body>

firmware/CMakeLists.txt

@@ -18,6 +18,8 @@
 # Boston, MA 02110-1301, USA.
 #
 
+cmake_minimum_required(VERSION 3.5)
+
 project(firmware)
 
 set(BASEBAND ${PROJECT_SOURCE_DIR}/baseband)
@@ -26,14 +28,30 @@ set(CHIBIOS ${PROJECT_SOURCE_DIR}/chibios)
 set(CHIBIOS_PORTAPACK ${PROJECT_SOURCE_DIR}/chibios-portapack)
 
 set(EXTRACT_CPLD_DATA ${PROJECT_SOURCE_DIR}/tools/extract_cpld_data.py)
+set(EXPORT_EXTERNAL_APP_IMAGES ${PROJECT_SOURCE_DIR}/tools/export_external_apps.py)
 set(MAKE_SPI_IMAGE ${PROJECT_SOURCE_DIR}/tools/make_spi_image.py)
 set(MAKE_IMAGE_CHUNK ${PROJECT_SOURCE_DIR}/tools/make_image_chunk.py)
+set(LZ4 lz4)
 
-set(FIRMWARE_NAME portapack-h1-havoc)
+set(FIRMWARE_NAME portapack-h1_h2-mayhem)
 set(FIRMWARE_FILENAME ${FIRMWARE_NAME}.bin)
+set(PPFW_FILENAME "portapack-mayhem_OCI.ppfw.tar")
+
+# In our current build container cmake need a little help to get the version :)
+if(NOT DEFINED ${CMAKE_CXX_COMPILER_VERSION})
+	execute_process(COMMAND bash "-c" "arm-none-eabi-g++ -v 2>&1 | grep 'gcc version' | awk '{print $3}'" OUTPUT_VARIABLE CMAKE_CXX_COMPILER_VERSION)
+	string(STRIP ${CMAKE_CXX_COMPILER_VERSION} CMAKE_CXX_COMPILER_VERSION)
+endif()
+
+set(GCC_VERSION_MISMATCH 0)
+if(NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_EQUAL ${EXPECTED_GCC_VERSION})
+	set(GCC_VERSION_MISMATCH 1)
+endif()
 
 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(
@@ -45,16 +63,49 @@ add_custom_command(
 )
 
 add_custom_target(
-	firmware ALL
+	firmware
 	DEPENDS ${FIRMWARE_FILENAME} ${HACKRF_FIRMWARE_DFU_FILENAME}
 )
 
+if(${GCC_VERSION_MISMATCH})
+	set(COMPILER_MISMATCH_MESSAGE "WARNING: Compiler version mismatch, please use the official compiler version ${EXPECTED_GCC_VERSION} when sharing builds! Current compiler version: ${CMAKE_CXX_COMPILER_VERSION}")
+	message(${COMPILER_MISMATCH_MESSAGE})
+	add_custom_command(
+		TARGET firmware POST_BUILD
+		COMMAND echo ${COMPILER_MISMATCH_MESSAGE}
+		VERBATIM)
+endif()
+
 add_custom_target(
 	program
-	COMMAND dfu-util --device 1fc9:000c --download ${HACKRF_FIRMWARE_DFU_IMAGE}
+	COMMAND ${PROJECT_SOURCE_DIR}/tools/enter_mode.sh hackrf
+	COMMAND dfu-util --device 1fc9:000c --download ${HACKRF_FIRMWARE_DFU_IMAGE} || (exit 0) # We need to add it for dfu-utils v.011 , (in v.09 it is not necessary)
 	COMMAND sleep 3s
-	COMMAND hackrf_spiflash -w ${FIRMWARE_FILENAME}
-	DEPENDS ${FIRMWARE_FILENAME}
+	COMMAND hackrf_spiflash -i -R -w ${FIRMWARE_FILENAME}
+	DEPENDS firmware ${FIRMWARE_FILENAME}
+)
+
+add_custom_target(
+	program-external-apps
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	COMMAND ${PROJECT_SOURCE_DIR}/tools/copy_external_apps.sh
+	DEPENDS program standalone_apps
+)
+
+add_custom_command(
+	OUTPUT ${PPFW_FILENAME}
+	
+	COMMAND rm -rf firmware_tar
+	COMMAND mkdir -p firmware_tar/FIRMWARE
+	# Using VERSION_NOHASH to avoid dev builds piling up in the FIRMWARE folder of the sd card of testers in #test-drive
+	COMMAND cp ${FIRMWARE_FILENAME} firmware_tar/FIRMWARE/portapack-mayhem_${VERSION_NOHASH}.bin
+	COMMAND mkdir -p firmware_tar/APPS
+	COMMAND cp application/*.ppma firmware_tar/APPS
+	COMMAND cp standalone/*/*.ppmp firmware_tar/APPS
+	COMMAND cd firmware_tar && tar -cvaf ../${PPFW_FILENAME} *
+	DEPENDS firmware ${FIRMWARE_FILENAME} standalone_apps
+	# Dont use VERBATIM here as it prevents usage of globbing (*)
+	# There shouldnt be any funny business in the filenames above :)
 )
 
 # TODO: Bad hack to fix location of LICENSE file for tar.
@@ -76,7 +127,18 @@ add_custom_command(
 	DEPENDS ${FIRMWARE_NAME}-${VERSION}.tar.bz2 ${FIRMWARE_NAME}-${VERSION}.zip
 )
 
+add_custom_target(
+	ppfw ALL
+	DEPENDS ${PPFW_FILENAME}
+)
+
+add_custom_target(
+	oci
+	DEPENDS ${PPFW_FILENAME}
+)
+
 add_custom_target(
 	release
 	DEPENDS MD5SUMS SHA256SUMS
 )
+

firmware/application/CMakeLists.txt

@@ -27,16 +27,24 @@
 
 enable_language(C CXX ASM)
 
+include(CheckCXXCompilerFlag)
+
 project(application)
 
 # Compiler options here.
-set(USE_OPT "-Os -g --specs=nano.specs")
+set(USE_OPT "-Os -g --specs=nano.specs -specs=nosys.specs")
 
 # C specific options here (added to USE_OPT).
 set(USE_COPT "-std=gnu99")
 
 # C++ specific options here (added to USE_OPT).
-set(USE_CPPOPT "-std=c++17 -fno-rtti -fno-exceptions -Weffc++ -Wuninitialized")
+check_cxx_compiler_flag("-std=c++20" cpp20_supported)
+if(cpp20_supported)
+	set(USE_CPPOPT "-std=c++20")
+else()
+	set(USE_CPPOPT "-std=c++17")
+endif()
+set(USE_CPPOPT "${USE_CPPOPT} -fno-rtti -fno-exceptions -Weffc++ -Wuninitialized -Wno-volatile")
 
 # Enable this if you want the linker to remove unused code and data
 set(USE_LINK_GC yes)
@@ -44,7 +52,7 @@ set(USE_LINK_GC yes)
 # Linker extra options here.
 set(USE_LDOPT)
 
-# Enable this if you want link time optimizations (LTO)
+# Enable this if you want link time optimizations (LTO) - this flag affects chibios only
 set(USE_LTO no)
 
 # If enabled, this option allows to compile the application in THUMB mode.
@@ -89,6 +97,7 @@ include(${CHIBIOS_PORTAPACK}/os/ports/GCC/ARMCMx/LPC43xx_M0/port.cmake)
 include(${CHIBIOS}/os/kernel/kernel.cmake)
 include(${CHIBIOS_PORTAPACK}/os/various/fatfs_bindings/fatfs.cmake)
 include(${CHIBIOS}/test/test.cmake)
+include(external/external.cmake)
 
 # Define linker script file here
 set(LDSCRIPT ${PORTLD}/LPC43xx_M0.ld)
@@ -103,12 +112,24 @@ set(CSRC
 	${PLATFORMSRC}
 	${BOARDSRC}
 	${FATFSSRC}
+	firmware_info.c
+	usb_serial_cdc.c
+	usb_serial_descriptor.c
+	usb_serial_endpoints.c
+	usb_serial_device_to_host.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
+	${CHIBIOS}/os/various/chprintf.c
 )
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 set(CPPSRC
 	main.cpp
+	shell.cpp
 	${COMMON}/acars_packet.cpp
 	${COMMON}/adsb.cpp
 	${COMMON}/adsb_frame.cpp
@@ -124,7 +145,7 @@ set(CPPSRC
 	${COMMON}/cpld_max5.cpp
 	${COMMON}/cpld_update.cpp
 	${COMMON}/cpld_xilinx.cpp
-	${COMMON}/debug.cpp
+	debug.cpp
 	${COMMON}/ert_packet.cpp
 	${COMMON}/event.cpp
 	${COMMON}/gcc.cpp
@@ -140,6 +161,7 @@ set(CPPSRC
 	${COMMON}/png_writer.cpp
 	${COMMON}/pocsag.cpp
 	${COMMON}/pocsag_packet.cpp
+	${COMMON}/aprs_packet.cpp
 	${COMMON}/portapack_io.cpp
 	${COMMON}/portapack_persistent_memory.cpp
 	${COMMON}/portapack_shared_memory.cpp
@@ -151,26 +173,49 @@ set(CPPSRC
 	${COMMON}/ui_painter.cpp
 	${COMMON}/ui_text.cpp
 	${COMMON}/ui_widget.cpp
+	${COMMON}/ui_language.cpp
 	${COMMON}/utility.cpp
 	${COMMON}/wm8731.cpp
+	${COMMON}/ads1110.cpp
+	${COMMON}/max17055.cpp
+	${COMMON}/battery.cpp
+	${COMMON}/performance_counter.cpp
+	${COMMON}/bmpfile.cpp
+	app_settings.cpp
 	audio.cpp
 	baseband_api.cpp
 	capture_thread.cpp
 	clock_manager.cpp
 	core_control.cpp
+	database.cpp
 	de_bruijn.cpp
 	#emu_cc1101.cpp
 	rfm69.cpp
 	event_m0.cpp
+	file_reader.cpp
 	file.cpp
+	file_path.cpp
+	freqman_db.cpp
 	freqman.cpp
+	io_convert.cpp
 	io_file.cpp
 	io_wave.cpp
+	iq_trim.cpp
 	irq_controls.cpp
 	irq_lcd_frame.cpp
 	irq_rtc.cpp
 	log_file.cpp
+	metadata_file.cpp
+	flipper_subfile.cpp
 	portapack.cpp
+	usb_serial_shell.cpp
+	usb_serial_shell_filesystem.cpp
+	usb_serial_event.cpp
+	usb_serial_thread.cpp
+	usb_serial.cpp
+	usb_serial_host_to_device.cpp
+	usb_serial_asyncmsg.cpp
+	qrcodegen.cpp
 	radio.cpp
 	receiver_model.cpp
 	recent_entries.cpp
@@ -182,6 +227,7 @@ set(CPPSRC
 	spectrum_color_lut.cpp
 	string_format.cpp
 	temperature_logger.cpp
+	theme.cpp
 	touch.cpp
 	tone_key.cpp
 	transmitter_model.cpp
@@ -189,6 +235,7 @@ set(CPPSRC
 	hw/debounce.cpp
 	hw/encoder.cpp
 	hw/max2837.cpp
+	hw/max2839.cpp
 	hw/max5864.cpp
 	hw/rffc507x.cpp
 	hw/rffc507x_spi.cpp
@@ -203,72 +250,100 @@ set(CPPSRC
 	ui/ui_alphanum.cpp
 	ui/ui_audio.cpp
 	ui/ui_channel.cpp
+	ui/ui_font_fixed_5x8.cpp
 	ui/ui_font_fixed_8x16.cpp
 	ui/ui_geomap.cpp
+	ui/ui_qrcode.cpp
 	ui/ui_menu.cpp
 	ui/ui_btngrid.cpp
 	ui/ui_receiver.cpp
 	ui/ui_rssi.cpp
+	ui/ui_freqlist.cpp
 	ui/ui_tv.cpp
 	ui/ui_spectrum.cpp
 	ui/ui_tabview.cpp
 	ui/ui_textentry.cpp
+	ui/ui_tone_key.cpp
 	ui/ui_transmitter.cpp
-	apps/ui_about.cpp
+	ui/ui_bmpview.cpp
+	apps/acars_app.cpp
+	apps/ais_app.cpp
+	apps/analog_audio_app.cpp
+	# apps/analog_tv_app.cpp
+	apps/ble_comm_app.cpp
+	apps/ble_rx_app.cpp
+	apps/ble_tx_app.cpp
+	apps/capture_app.cpp
+	apps/ert_app.cpp
+	# apps/gps_sim_app.cpp
+	# apps/lge_app.cpp
+	apps/pocsag_app.cpp
+	# apps/replay_app.cpp
+	apps/soundboard_app.cpp
+	# apps/tpms_app.cpp
+	apps/ui_about_simple.cpp
 	apps/ui_adsb_rx.cpp
-	apps/ui_adsb_tx.cpp
-	apps/ui_afsk_rx.cpp
-	apps/ui_btle_rx.cpp
-	apps/ui_nrf_rx.cpp
+	# apps/ui_adsb_tx.cpp #moved to ext
+	apps/ui_aprs_rx.cpp
 	apps/ui_aprs_tx.cpp
+	apps/ui_battinfo.cpp
 	apps/ui_bht_tx.cpp
-	apps/ui_coasterp.cpp
+	apps/ui_bmp_file_viewer.cpp
+	apps/ui_btle_rx.cpp
+	# apps/ui_coasterp.cpp
 	apps/ui_debug.cpp
+	apps/ui_debug_battery.cpp
+	apps/ui_dfu_menu.cpp
 	apps/ui_encoders.cpp
 	apps/ui_fileman.cpp
+	apps/ui_flash_utility.cpp
 	apps/ui_freqman.cpp
-	apps/ui_jammer.cpp
-	apps/ui_keyfob.cpp
-	apps/ui_lcr.cpp
-	apps/lge_app.cpp
+	apps/ui_fsk_rx.cpp
+	apps/ui_iq_trim.cpp
+	# apps/ui_jammer.cpp
+    # apps/ui_keyfob.cpp
+	# apps/ui_lcr.cpp
+	apps/ui_level.cpp
+	apps/ui_looking_glass_app.cpp
 	apps/ui_mictx.cpp
 	apps/ui_modemsetup.cpp
-	apps/ui_morse.cpp
+	# apps/ui_morse.cpp
+	# apps/ui_nrf_rx.cpp
 	# apps/ui_nuoptix.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_remote.cpp
 	apps/ui_scanner.cpp
-	apps/ui_search.cpp
+	apps/ui_sd_over_usb.cpp
 	apps/ui_sd_wipe.cpp
+	apps/ui_search.cpp
 	apps/ui_settings.cpp
 	apps/ui_siggen.cpp
 	apps/ui_sonde.cpp
-	apps/ui_sstvtx.cpp
+	# apps/ui_spectrum_painter_image.cpp
+	# apps/ui_spectrum_painter_text.cpp
+	# apps/ui_spectrum_painter.cpp
+	apps/ui_ss_viewer.cpp
+	# apps/ui_sstvtx.cpp #moved to ext
+	apps/ui_standalone_view.cpp
+	apps/ui_subghzd.cpp
 	# apps/ui_test.cpp
+	apps/ui_text_editor.cpp
 	apps/ui_tone_search.cpp
 	apps/ui_touch_calibration.cpp
 	apps/ui_touchtunes.cpp
 	apps/ui_view_wav.cpp
+	apps/ui_weatherstation.cpp
 	apps/ui_whipcalc.cpp
-	apps/acars_app.cpp
-	apps/ais_app.cpp
-	apps/analog_audio_app.cpp
-	apps/analog_tv_app.cpp
-	apps/capture_app.cpp
-	apps/ert_app.cpp
-	apps/lge_app.cpp
-	apps/pocsag_app.cpp
-	apps/replay_app.cpp
-	apps/gps_sim_app.cpp
-	apps/soundboard_app.cpp
-	apps/tpms_app.cpp
 	protocols/aprs.cpp
 	protocols/ax25.cpp
 	protocols/bht.cpp
 	protocols/dcs.cpp
 	protocols/encoders.cpp
-	protocols/lcr.cpp
+	# protocols/lcr.cpp
 	protocols/modems.cpp
 	protocols/rds.cpp
 	# ui_handwrite.cpp
@@ -277,11 +352,18 @@ set(CPPSRC
 	# ui_replay_view.cpp
 	# ui_script.cpp
 	ui_sd_card_debug.cpp
+	config_mode.cpp
 	${CPLD_20150901_DATA_CPP}
 	${CPLD_20170522_DATA_CPP}
 	${HACKRF_CPLD_DATA_CPP}
+	ui_external_items_menu_loader.cpp
+	view_factory_base.cpp
 )
 
+set_source_files_properties(${CPPSRC} PROPERTIES COMPILE_FLAGS -flto) # Add lto flag to the non-external sources only
+
+list (APPEND CPPSRC ${EXTCPPSRC}) # Append external sources after setting lto flag to internal ones
+
 # C sources to be compiled in ARM mode regardless of the global setting.
 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
 #       option that results in lower performance and larger code size.
@@ -303,12 +385,18 @@ set(TCSRC)
 set(TCPPSRC)
 
 # List ASM source files here
-set(ASMSRC ${PORTASM})
+set(ASMSRC
+	${PORTASM}
+	lz4.S
+)
 
 set(INCDIR ${CMAKE_CURRENT_BINARY_DIR} ${COMMON} ${PORTINC} ${KERNINC} ${TESTINC}
 	${HALINC} ${PLATFORMINC} ${BOARDINC}
 	${FATFSINC}
 	${CHIBIOS}/os/various
+	${HACKRF_PATH}/firmware/libopencm3/include
+	${HACKRF_PATH}/firmware/common
+	${HACKRF_PATH}/firmware
 	ui
 	hw
 	apps
@@ -352,7 +440,7 @@ 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}\"'")
+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}'")
 
 # List all default ASM defines here, like -D_DEBUG=1
 set(DADEFS)
@@ -421,12 +509,14 @@ set_target_properties(${PROJECT_NAME}.elf PROPERTIES LINK_DEPENDS ${LDSCRIPT})
 add_definitions(${DEFS})
 include_directories(. ${INCDIR})
 link_directories(${LLIBDIR})
-target_link_libraries(${PROJECT_NAME}.elf ${LIBS})
+target_link_libraries(${PROJECT_NAME}.elf ${LIBS} "-L${CMAKE_CURRENT_LIST_DIR}/external")
 target_link_libraries(${PROJECT_NAME}.elf -Wl,-Map=${PROJECT_NAME}.map)
+target_link_libraries(${PROJECT_NAME}.elf -Wl,--print-memory-usage)
 
 add_custom_command(
 	OUTPUT ${PROJECT_NAME}.bin
-	COMMAND ${CMAKE_OBJCOPY} -O binary ${PROJECT_NAME}.elf ${PROJECT_NAME}.bin
+	COMMAND ${CMAKE_OBJCOPY} -v -O binary ${PROJECT_NAME}.elf ${PROJECT_NAME}.bin --remove-section=.external_app_*
+	COMMAND ${EXPORT_EXTERNAL_APP_IMAGES} ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_OBJCOPY} ${EXTAPPLIST}
 	DEPENDS ${PROJECT_NAME}.elf
 )
 

firmware/application/app_settings.cpp

@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2022 Arjan Onwezen
+ * Copyright (C) 2023 Kyle Reed
+ *
+ * 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 "app_settings.hpp"
+
+#include "convert.hpp"
+#include "file.hpp"
+#include "file_reader.hpp"
+#include "portapack.hpp"
+#include "portapack_persistent_memory.hpp"
+#include "utility.hpp"
+#include "file_path.hpp"
+
+#include <algorithm>
+#include <cstring>
+#include <string_view>
+
+namespace fs = std::filesystem;
+using namespace portapack;
+
+namespace {
+fs::path get_settings_path(const std::string& app_name) {
+    return settings_dir / app_name + u".ini";
+}
+}  // namespace
+
+void BoundSetting::parse(std::string_view value) {
+    switch (type_) {
+        case SettingType::I64:
+            parse_int(value, as<int64_t>());
+            break;
+        case SettingType::I32:
+            parse_int(value, as<int32_t>());
+            break;
+        case SettingType::U32:
+            parse_int(value, as<uint32_t>());
+            break;
+        case SettingType::U8:
+            parse_int(value, as<uint8_t>());
+            break;
+        case SettingType::String:
+            as<std::string>() = trim(value);
+            break;
+        case SettingType::Bool: {
+            int parsed = 0;
+            parse_int(value, parsed);
+            as<bool>() = (parsed != 0);
+            break;
+        }
+    };
+}
+
+void BoundSetting::write(File& file) const {
+    // NB: Write directly without allocations. This happens on every
+    // app exit when enabled so should be fast to keep the UX responsive.
+    StringFormatBuffer buffer;
+    size_t length = 0;
+
+    file.write(name_.data(), name_.length());
+    file.write("=", 1);
+
+    switch (type_) {
+        case SettingType::I64:
+            file.write(to_string_dec_int(as<int64_t>(), buffer, length), length);
+            break;
+        case SettingType::I32:
+            file.write(to_string_dec_int(as<int32_t>(), buffer, length), length);
+            break;
+        case SettingType::U32:
+            file.write(to_string_dec_uint(as<uint32_t>(), buffer, length), length);
+            break;
+        case SettingType::U8:
+            file.write(to_string_dec_uint(as<uint8_t>(), buffer, length), length);
+            break;
+        case SettingType::String: {
+            const auto& str = as<std::string>();
+            file.write(str.data(), str.length());
+            break;
+        }
+        case SettingType::Bool:
+            file.write(as<bool>() ? "1" : "0", 1);
+            break;
+    }
+
+    file.write("\r\n", 2);
+}
+
+SettingsStore::SettingsStore(std::string_view store_name, SettingBindings bindings)
+    : store_name_{store_name}, bindings_{bindings} {
+    reload();
+}
+
+SettingsStore::~SettingsStore() {
+    save();
+}
+
+void SettingsStore::reload() {
+    load_settings(store_name_, bindings_);
+}
+
+void SettingsStore::save() const {
+    save_settings(store_name_, bindings_);
+}
+
+bool load_settings(std::string_view store_name, SettingBindings& bindings) {
+    File f;
+    auto path = get_settings_path(std::string{store_name});
+
+    auto error = f.open(path);
+    if (error)
+        return false;
+
+    auto reader = FileLineReader(f);
+    for (const auto& line : reader) {
+        auto cols = split_string(line, '=');
+
+        if (cols.size() != 2)
+            continue;
+
+        // Find a binding with the name.
+        auto it = std::find_if(
+            bindings.begin(), bindings.end(),
+            [name = cols[0]](auto& bound_setting) {
+                return name == bound_setting.name();
+            });
+
+        // If found, parse the value.
+        if (it != bindings.end())
+            it->parse(cols[1]);
+    }
+
+    return true;
+}
+
+bool save_settings(std::string_view store_name, const SettingBindings& bindings) {
+    File f;
+    auto path = get_settings_path(std::string{store_name});
+
+    ensure_directory(settings_dir);
+    auto error = f.create(path);
+    if (error)
+        return false;
+
+    for (const auto& bound_setting : bindings)
+        bound_setting.write(f);
+
+    return true;
+}
+
+namespace app_settings {
+
+void copy_to_radio_model(const AppSettings& settings) {
+    // NB: Don't actually adjust the radio here or it may hang.
+    // Specifically 'modulation' which requires a running baseband.
+
+    if (flags_enabled(settings.mode, Mode::TX)) {
+        persistent_memory::set_target_frequency(settings.tx_frequency);
+        transmitter_model.configure_from_app_settings(settings);
+    }
+
+    if (flags_enabled(settings.mode, Mode::RX)) {
+        persistent_memory::set_target_frequency(settings.rx_frequency);
+        receiver_model.configure_from_app_settings(settings);
+        receiver_model.set_configuration_without_update(
+            static_cast<ReceiverModel::Mode>(settings.modulation),
+            settings.step,
+            settings.am_config_index,
+            settings.nbfm_config_index,
+            settings.wfm_config_index,
+            settings.squelch);
+    }
+
+    receiver_model.set_frequency_step(settings.step);
+    receiver_model.set_normalized_headphone_volume(settings.volume);
+}
+
+void copy_from_radio_model(AppSettings& settings) {
+    if (flags_enabled(settings.mode, Mode::TX)) {
+        settings.tx_frequency = transmitter_model.target_frequency();
+        settings.baseband_bandwidth = transmitter_model.baseband_bandwidth();
+        settings.sampling_rate = transmitter_model.sampling_rate();
+        settings.tx_amp = transmitter_model.rf_amp();
+        settings.tx_gain = transmitter_model.tx_gain();
+        settings.channel_bandwidth = transmitter_model.channel_bandwidth();
+    }
+
+    if (flags_enabled(settings.mode, Mode::RX)) {
+        settings.rx_frequency = receiver_model.target_frequency();
+        settings.baseband_bandwidth = receiver_model.baseband_bandwidth();
+        settings.sampling_rate = receiver_model.sampling_rate();
+        settings.lna = receiver_model.lna();
+        settings.vga = receiver_model.vga();
+        settings.rx_amp = receiver_model.rf_amp();
+        settings.squelch = receiver_model.squelch_level();
+
+        settings.modulation = static_cast<uint8_t>(receiver_model.modulation());
+        settings.am_config_index = receiver_model.am_configuration();
+        settings.nbfm_config_index = receiver_model.nbfm_configuration();
+        settings.wfm_config_index = receiver_model.wfm_configuration();
+    }
+
+    settings.step = receiver_model.frequency_step();
+    settings.volume = receiver_model.normalized_headphone_volume();
+}
+
+/* SettingsManager *************************************************/
+SettingsManager::SettingsManager(std::string_view app_name, Mode mode, Options options)
+    : SettingsManager{app_name, mode, options, {}} {}
+
+SettingsManager::SettingsManager(
+    std::string_view app_name,
+    Mode mode,
+    SettingBindings additional_settings)
+    : SettingsManager{app_name, mode, Options::None, std::move(additional_settings)} {}
+
+SettingsManager::SettingsManager(
+    std::string_view app_name,
+    Mode mode,
+    Options options,
+    SettingBindings additional_settings)
+    : app_name_{app_name},
+      settings_{},
+      bindings_{},
+      loaded_{false} {
+    settings_.mode = mode;
+    settings_.options = options;
+
+    // Pre-alloc enough for app settings and additional settings.
+    additional_settings.reserve(COMMON_APP_SETTINGS_COUNT + additional_settings.size());
+    bindings_ = std::move(additional_settings);
+
+    // Settings should always be loaded because apps now rely
+    // on being able to store UI settings, config, etc.
+
+    // Transmitter model settings.
+    if (flags_enabled(mode, Mode::TX)) {
+        bindings_.emplace_back("tx_frequency"sv, &settings_.tx_frequency);
+        bindings_.emplace_back("tx_amp"sv, &settings_.tx_amp);
+        bindings_.emplace_back("tx_gain"sv, &settings_.tx_gain);
+        bindings_.emplace_back("channel_bandwidth"sv, &settings_.channel_bandwidth);
+    }
+
+    // Receiver model settings.
+    if (flags_enabled(mode, Mode::RX)) {
+        bindings_.emplace_back("rx_frequency"sv, &settings_.rx_frequency);
+        bindings_.emplace_back("lna"sv, &settings_.lna);
+        bindings_.emplace_back("vga"sv, &settings_.vga);
+        bindings_.emplace_back("rx_amp"sv, &settings_.rx_amp);
+        bindings_.emplace_back("modulation"sv, &settings_.modulation);
+        bindings_.emplace_back("am_config_index"sv, &settings_.am_config_index);
+        bindings_.emplace_back("nbfm_config_index"sv, &settings_.nbfm_config_index);
+        bindings_.emplace_back("wfm_config_index"sv, &settings_.wfm_config_index);
+        bindings_.emplace_back("squelch"sv, &settings_.squelch);
+    }
+
+    // Common model settings.
+    bindings_.emplace_back("baseband_bandwidth"sv, &settings_.baseband_bandwidth);
+    bindings_.emplace_back("sampling_rate"sv, &settings_.sampling_rate);
+    bindings_.emplace_back("step"sv, &settings_.step);
+    bindings_.emplace_back("volume"sv, &settings_.volume);
+
+    // RadioState should have initialized default radio parameters before this function;
+    // copy them to settings_ before checking settings .ini file (in case the file doesn't exist
+    // or doesn't include all parameters). Settings in the file can overwrite all, or a subset of parameters.
+    copy_from_radio_model(settings_);
+
+    loaded_ = load_settings(app_name_, bindings_);
+
+    // Only copy to the radio if load was successful.
+    if (loaded_)
+        copy_to_radio_model(settings_);
+}
+
+SettingsManager::~SettingsManager() {
+    copy_from_radio_model(settings_);
+
+    save_settings(app_name_, bindings_);
+}
+
+}  // namespace app_settings

firmware/application/app_settings.hpp

@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2022 Arjan Onwezen
+ * Copyright (C) 2023 Kyle Reed
+ *
+ * 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 __APP_SETTINGS_H__
+#define __APP_SETTINGS_H__
+
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <variant>
+
+#include "file.hpp"
+#include "max283x.hpp"
+#include "string_format.hpp"
+
+// Bring in the string_view literal.
+using std::literals::operator""sv;
+
+#define COMMON_APP_SETTINGS_COUNT 19
+
+/* Represents a named setting bound to a variable instance. */
+/* Using void* instead of std::variant, because variant is a pain to dispatch over. */
+class BoundSetting {
+    /* The type of bound setting. */
+    enum class SettingType : uint8_t {
+        I64,
+        I32,
+        U32,
+        U8,
+        String,
+        Bool,
+    };
+
+   public:
+    BoundSetting(std::string_view name, int64_t* target)
+        : name_{name}, target_{target}, type_{SettingType::I64} {}
+
+    BoundSetting(std::string_view name, int32_t* target)
+        : name_{name}, target_{target}, type_{SettingType::I32} {}
+
+    BoundSetting(std::string_view name, uint32_t* target)
+        : name_{name}, target_{target}, type_{SettingType::U32} {}
+
+    BoundSetting(std::string_view name, uint8_t* target)
+        : name_{name}, target_{target}, type_{SettingType::U8} {}
+
+    BoundSetting(std::string_view name, std::string* target)
+        : name_{name}, target_{target}, type_{SettingType::String} {}
+
+    BoundSetting(std::string_view name, bool* target)
+        : name_{name}, target_{target}, type_{SettingType::Bool} {}
+
+    std::string_view name() const { return name_; }
+    void parse(std::string_view value);
+    void write(File& file) const;
+
+   private:
+    template <typename T>
+    constexpr auto& as() const {
+        return *reinterpret_cast<T*>(target_);
+    }
+
+    std::string_view name_;
+    void* target_;
+    SettingType type_;
+};
+
+using SettingBindings = std::vector<BoundSetting>;
+
+/* RAII wrapper for Settings that loads/saves to the SD card. */
+class SettingsStore {
+   public:
+    SettingsStore(std::string_view store_name, SettingBindings bindings);
+    ~SettingsStore();
+
+    void reload();
+    void save() const;
+
+   private:
+    std::string_view store_name_;
+    SettingBindings bindings_;
+};
+
+bool load_settings(std::string_view store_name, SettingBindings& bindings);
+bool save_settings(std::string_view store_name, const SettingBindings& bindings);
+
+namespace app_settings {
+
+enum class Mode : uint8_t {
+    NO_RF = 0x00,
+    RX = 0x01,
+    TX = 0x02,
+    RX_TX = 0x03,  // Both TX/RX
+};
+
+enum class Options {
+    None = 0x0000,
+};
+
+/* NB: See RX/TX model headers for default values. */
+struct AppSettings {
+    Mode mode = Mode::RX;
+    Options options = Options::None;
+    uint32_t baseband_bandwidth = max283x::filter::bandwidth_minimum;
+    uint32_t sampling_rate = 3072000;  // Good for 48k audio.
+    uint8_t lna = 32;
+    uint8_t vga = 32;
+    uint8_t rx_amp = 0;
+    uint8_t tx_amp = 0;
+    uint8_t tx_gain = 35;
+    uint32_t channel_bandwidth = 1;
+    uint32_t rx_frequency;
+    uint32_t tx_frequency;
+    uint32_t step = 25000;
+    uint8_t modulation = 1;  // NFM
+    uint8_t am_config_index = 0;
+    uint8_t nbfm_config_index = 0;
+    uint8_t wfm_config_index = 0;
+    uint8_t squelch = 80;
+    uint8_t volume;
+    // NOTE: update COMMON_APP_SETTINGS_COUNT when adding to this
+};
+
+/* Copies common values to the receiver/transmitter models. */
+void copy_to_radio_model(const AppSettings& settings);
+
+/* Copies common values from the receiver/transmitter models. */
+void copy_from_radio_model(AppSettings& settings);
+
+/* RAII wrapper for automatically loading and saving settings for an app.
+ * "Additional" settings are always loaded, but radio settings are conditionally
+ * saved/loaded if the global app settings options are enabled.
+ * NB: This should be added to a class before any LNA/VGA controls so that
+ * the receiver/transmitter models are set before the control ctors run. */
+class SettingsManager {
+   public:
+    SettingsManager(std::string_view app_name, Mode mode, Options options = Options::None);
+    SettingsManager(std::string_view app_name, Mode mode, SettingBindings additional_settings);
+    SettingsManager(std::string_view app_name, Mode mode, Options options, SettingBindings additional_settings);
+    ~SettingsManager();
+
+    SettingsManager(const SettingsManager&) = delete;
+    SettingsManager& operator=(const SettingsManager&) = delete;
+    SettingsManager(SettingsManager&&) = delete;
+    SettingsManager& operator=(SettingsManager&&) = delete;
+
+    /* True if settings were successfully loaded from file. */
+    bool loaded() const { return loaded_; }
+
+    Mode mode() const { return settings_.mode; }
+
+    AppSettings& raw() { return settings_; }
+
+   private:
+    std::string_view app_name_;
+    AppSettings settings_;
+    SettingBindings bindings_;
+    bool loaded_;
+};
+
+}  // namespace app_settings
+
+ENABLE_FLAGS_OPERATORS(app_settings::Mode);
+ENABLE_FLAGS_OPERATORS(app_settings::Options);
+
+#endif /*__APP_SETTINGS_H__*/

firmware/application/apps/acars_app.cpp

@@ -24,6 +24,7 @@
 
 #include "baseband_api.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "file_path.hpp"
 
 using namespace portapack;
 using namespace acars;
@@ -32,118 +33,86 @@ using namespace acars;
 #include "utility.hpp"
 
 void ACARSLogger::log_raw_data(const acars::Packet& packet, const uint32_t frequency) {
-	(void)frequency;
-	std::string entry { };	//= "Raw: F:" + to_string_dec_uint(frequency) + "Hz ";
-	entry.reserve(256);
-	
-	// Raw hex dump of all the bytes
-	//for (size_t c = 0; c < packet.length(); c += 32)
-	//	entry += to_string_hex(packet.read(c, 32), 8) + " ";
-	
-	for (size_t c = 0; c < 256; c += 32)
-		entry += to_string_bin(packet.read(c, 32), 32);
-	
-	log_file.write_entry(packet.received_at(), entry);
+    (void)frequency;
+    std::string entry{};  //= "Raw: F:" + to_string_dec_uint(frequency) + "Hz ";
+    entry.reserve(256);
+
+    // Raw hex dump of all the bytes
+    // for (size_t c = 0; c < packet.length(); c += 32)
+    //	entry += to_string_hex(packet.read(c, 32), 8) + " ";
+
+    for (size_t c = 0; c < 256; c += 32)
+        entry += to_string_bin(packet.read(c, 32), 32);
+
+    log_file.write_entry(packet.received_at(), entry);
 }
 
 /*void ACARSLogger::log_decoded(
-	const acars::Packet& packet,
-	const std::string text) {
-	
-	log_file.write_entry(packet.timestamp(), text);
+        const acars::Packet& packet,
+        const std::string text) {
+
+        log_file.write_entry(packet.timestamp(), text);
 }*/
 
 namespace ui {
 
-void ACARSAppView::update_freq(rf::Frequency f) {
-	set_target_frequency(f);
-	portapack::persistent_memory::set_tuned_frequency(f);	// Maybe not ?
-}
+ACARSAppView::ACARSAppView(NavigationView& nav)
+    : nav_{nav} {
+    baseband::run_image(portapack::spi_flash::image_tag_acars);
 
-ACARSAppView::ACARSAppView(NavigationView& nav) {
-	baseband::run_image(portapack::spi_flash::image_tag_acars);
+    add_children({&rssi,
+                  &channel,
+                  &field_rf_amp,
+                  &field_lna,
+                  &field_vga,
+                  &field_frequency,
+                  &check_log,
+                  &console});
 
-	add_children({
-		&rssi,
-		&channel,
-		&field_rf_amp,
-		&field_lna,
-		&field_vga,
-		&field_frequency,
-		&check_log,
-		&console
-	});
-	
-	receiver_model.set_sampling_rate(2457600);
-	receiver_model.set_baseband_bandwidth(1750000);
-	receiver_model.enable();
-	
-	field_frequency.set_value(receiver_model.tuning_frequency());
-	update_freq(receiver_model.tuning_frequency());
-	field_frequency.set_step(receiver_model.frequency_step());
-	field_frequency.on_change = [this](rf::Frequency f) {
-		update_freq(f);
-	};
-	field_frequency.on_edit = [this, &nav]() {
-		// TODO: Provide separate modal method/scheme?
-		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			update_freq(f);
-			field_frequency.set_value(f);
-		};
-	};
-	
-	check_log.set_value(logging);
-	check_log.on_select = [this](Checkbox&, bool v) {
-		logging = v;
-	};
-	
-	logger = std::make_unique<ACARSLogger>();
-	if (logger)
-		logger->append("acars.txt");
+    receiver_model.enable();
+
+    check_log.set_value(logging);
+    check_log.on_select = [this](Checkbox&, bool v) {
+        logging = v;
+    };
+
+    logger = std::make_unique<ACARSLogger>();
+    if (logger)
+        logger->append(logs_dir / u"ACARS.TXT");
 }
 
 ACARSAppView::~ACARSAppView() {
-	receiver_model.disable();
-	baseband::shutdown();
+    receiver_model.disable();
+    baseband::shutdown();
 }
 
 void ACARSAppView::focus() {
-	field_frequency.focus();
+    field_frequency.focus();
 }
 
 void ACARSAppView::on_packet(const acars::Packet& packet) {
-	std::string console_info;
-	
-	/*if (!packet.is_valid()) {
-		console_info = to_string_datetime(packet.received_at(), HMS);
-		console_info += " INVALID";
-		
-		console.writeln(console_info);
-	} else {
-		console_info = to_string_datetime(packet.received_at(), HMS);
-		console_info += ":" + to_string_bin(packet.read(0, 32), 32);
-		//console_info += " REG:" + packet.registration_number();
-		
-		console.writeln(console_info);
-	}*/
-	
-	packet_counter++;
-	if (packet_counter % 10 == 0)
-		console.writeln("Block #" + to_string_dec_uint(packet_counter));
-	
-	// Log raw data whatever it contains
-	if (logger && logging)
-		logger->log_raw_data(packet, target_frequency());
-}
+    std::string console_info;
 
-void ACARSAppView::set_target_frequency(const uint32_t new_value) {
-	target_frequency_ = new_value;
-	receiver_model.set_tuning_frequency(new_value);
-}
+    /*if (!packet.is_valid()) {
+                console_info = to_string_datetime(packet.received_at(), HMS);
+                console_info += " INVALID";
 
-uint32_t ACARSAppView::target_frequency() const {
-	return target_frequency_;
+                console.writeln(console_info);
+        } else {
+                console_info = to_string_datetime(packet.received_at(), HMS);
+                console_info += ":" + to_string_bin(packet.read(0, 32), 32);
+                //console_info += " REG:" + packet.registration_number();
+
+                console.writeln(console_info);
+        }*/
+
+    packet_counter++;
+    if (packet_counter % 10 == 0)
+        console.writeln("Block #" + to_string_dec_uint(packet_counter));
+
+    // Log raw data whatever it contains
+    if (logger && logging)
+        logger->log_raw_data(packet, receiver_model.target_frequency());
 }
 
 } /* namespace ui */

firmware/application/apps/acars_app.hpp

@@ -23,94 +23,89 @@
 #ifndef __ACARS_APP_H__
 #define __ACARS_APP_H__
 
+#include "app_settings.hpp"
+#include "radio_state.hpp"
 #include "ui_widget.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_rssi.hpp"
-
 #include "log_file.hpp"
 
 #include "acars_packet.hpp"
 
 class ACARSLogger {
-public:
-	Optional<File::Error> append(const std::string& filename) {
-		return log_file.append(filename);
-	}
-	
-	void log_raw_data(const acars::Packet& packet, const uint32_t frequency);
-	//void log_decoded(const acars::Packet& packet, const std::string text);
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
 
-private:
-	LogFile log_file { };
+    void log_raw_data(const acars::Packet& packet, const uint32_t frequency);
+    // void log_decoded(const acars::Packet& packet, const std::string text);
+
+   private:
+    LogFile log_file{};
 };
 
 namespace ui {
 
 class ACARSAppView : public View {
-public:
-	ACARSAppView(NavigationView& nav);
-	~ACARSAppView();
+   public:
+    ACARSAppView(NavigationView& nav);
+    ~ACARSAppView();
 
-	void focus() override;
+    void focus() override;
 
-	std::string title() const override { return "ACARS (WIP)"; };
+    std::string title() const override { return "ACARS (WIP)"; };
 
-private:
-	bool logging { false };
-	uint32_t packet_counter { 0 };
+   private:
+    NavigationView& nav_;
+    RxRadioState radio_state_{
+        131550000 /* frequency */,
+        1750000 /* bandwidth */,
+        2457600 /* sampling rate */
+    };
+    app_settings::SettingsManager settings_{
+        "rx_acars", app_settings::Mode::RX};
 
-	RFAmpField field_rf_amp {
-		{ 13 * 8, 0 * 16 }
-	};
-	LNAGainField field_lna {
-		{ 15 * 8, 0 * 16 }
-	};
-	VGAGainField field_vga {
-		{ 18 * 8, 0 * 16 }
-	};
-	RSSI rssi {
-		{ 21 * 8, 0, 6 * 8, 4 },
-	};
-	Channel channel {
-		{ 21 * 8, 5, 6 * 8, 4 },
-	};
-	
-	FrequencyField field_frequency {
-		{ 0 * 8, 0 * 8 },
-	};
-	Checkbox check_log {
-		{ 22 * 8, 21 },
-		3,
-		"LOG",
-		true
-	};
+    bool logging{false};
+    uint32_t packet_counter{0};
 
-	Console console {
-		{ 0, 3 * 16, 240, 256 }
-	};
+    RFAmpField field_rf_amp{
+        {13 * 8, 0 * 16}};
+    LNAGainField field_lna{
+        {15 * 8, 0 * 16}};
+    VGAGainField field_vga{
+        {18 * 8, 0 * 16}};
+    RSSI rssi{
+        {21 * 8, 0, 6 * 8, 4}};
+    Channel channel{
+        {21 * 8, 5, 6 * 8, 4}};
 
-	std::unique_ptr<ACARSLogger> logger { };
+    RxFrequencyField field_frequency{
+        {0 * 8, 0 * 8},
+        nav_};
+    Checkbox check_log{
+        {22 * 8, 21},
+        3,
+        "LOG",
+        true};
 
-	uint32_t target_frequency_ { };
-	
-	void update_freq(rf::Frequency f);
+    Console console{
+        {0, 3 * 16, 240, 256}};
 
-	void on_packet(const acars::Packet& packet);
+    std::unique_ptr<ACARSLogger> logger{};
 
-	uint32_t target_frequency() const;
-	void set_target_frequency(const uint32_t new_value);
-	
-	MessageHandlerRegistration message_handler_packet {
-		Message::ID::ACARSPacket,
-		[this](Message* const p) {
-			const auto message = static_cast<const ACARSPacketMessage*>(p);
-			const acars::Packet packet { message->packet };
-			this->on_packet(packet);
-		}
-	};
+    void on_packet(const acars::Packet& packet);
 
+    MessageHandlerRegistration message_handler_packet{
+        Message::ID::ACARSPacket,
+        [this](Message* const p) {
+            const auto message = static_cast<const ACARSPacketMessage*>(p);
+            const acars::Packet packet{message->packet};
+            this->on_packet(packet);
+        }};
 };
 
 } /* namespace ui */
 
-#endif/*__ACARS_APP_H__*/
+#endif /*__ACARS_APP_H__*/

firmware/application/apps/ais_app.cpp

@@ -20,8 +20,11 @@
  */
 
 #include "ais_app.hpp"
+#include "audio.hpp"
 
 #include "string_format.hpp"
+#include "database.hpp"
+#include "file_path.hpp"
 
 #include "baseband_api.hpp"
 
@@ -30,373 +33,434 @@ using namespace portapack;
 
 #include <algorithm>
 
+namespace pmem = portapack::persistent_memory;
+
 namespace ais {
 namespace format {
 
 static std::string latlon_abs_normalized(const int32_t normalized, const char suffixes[2]) {
-	const auto suffix = suffixes[(normalized < 0) ? 0 : 1];
-	const uint32_t normalized_abs = std::abs(normalized);
-	const uint32_t t = (normalized_abs * 5) / 3;
-	const uint32_t degrees = t / (100 * 10000);
-	const uint32_t fraction = t % (100 * 10000);
-	return to_string_dec_uint(degrees) + "." + to_string_dec_uint(fraction, 6, '0') + suffix;
+    const auto suffix = suffixes[(normalized < 0) ? 0 : 1];
+    const uint32_t normalized_abs = std::abs(normalized);
+    const uint32_t t = (normalized_abs * 5) / 3;
+    const uint32_t degrees = t / (100 * 10000);
+    const uint32_t fraction = t % (100 * 10000);
+    return to_string_dec_uint(degrees) + "." + to_string_dec_uint(fraction, 6, '0') + suffix;
 }
 
 static std::string latlon(const Latitude latitude, const Longitude longitude) {
-	if( latitude.is_valid() && longitude.is_valid() ) {
-		return latlon_abs_normalized(latitude.normalized(), "SN") + " " + latlon_abs_normalized(longitude.normalized(), "WE");
-	} else if( latitude.is_not_available() && longitude.is_not_available() ) {
-		return "not available";
-	} else {
-		return "invalid";
-	}
+    if (latitude.is_valid() && longitude.is_valid()) {
+        return latlon_abs_normalized(latitude.normalized(), "SN") + " " + latlon_abs_normalized(longitude.normalized(), "WE");
+    } else if (latitude.is_not_available() && longitude.is_not_available()) {
+        return "not available";
+    } else {
+        return "invalid";
+    }
 }
 
 static float latlon_float(const int32_t normalized) {
-	return ((((float) normalized) * 5) / 3) / (100 * 10000);
+    return ((((float)normalized) * 5) / 3) / (100 * 10000);
 }
 
 static std::string mmsi(
-	const ais::MMSI& mmsi
-) {
-	return to_string_dec_uint(mmsi, 9);
+    const ais::MMSI& mmsi) {
+    return to_string_dec_uint(mmsi, 9, '0');  // MMSI is always is always 9 characters pre-padded with zeros
+}
+
+static std::string mid(
+    const ais::MMSI& mmsi) {
+    database db;
+    std::string mid_code = "";
+    database::MidDBRecord mid_record = {};
+    int return_code = 0;
+
+    // Try getting the country name from mids.db using MID code for given MMSI
+    mid_code = to_string_dec_uint(mmsi, 9, ' ').substr(0, 3);
+    return_code = db.retrieve_mid_record(&mid_record, mid_code);
+    switch (return_code) {
+        case DATABASE_RECORD_FOUND:
+            return mid_record.country;
+        case DATABASE_NOT_FOUND:
+            return "No mids.db file";
+        default:
+            return "";
+    }
+}
+
+static std::string text(const std::string& text) {
+    size_t end = text.find_last_not_of("@");
+    return (end == std::string::npos) ? "" : text.substr(0, end + 1);
 }
 
 static std::string navigational_status(const unsigned int value) {
-	switch(value) {
-		case 0: return "under way w/engine";
-		case 1: return "at anchor";
-		case 2: return "not under command";
-		case 3: return "restricted maneuv";
-		case 4: return "constrained draught";
-		case 5: return "moored";
-		case 6: return "aground";
-		case 7: return "fishing";
-		case 8: return "sailing";
-		case 9: case 10: case 13: return "reserved";
-		case 11: return "towing astern";
-		case 12: return "towing ahead/along";
-		case 14: return "SART/MOB/EPIRB";
-		case 15: return "undefined";
-		default: return "unknown";
-	}
+    switch (value) {
+        case 0:
+            return "under way w/engine";
+        case 1:
+            return "at anchor";
+        case 2:
+            return "not under command";
+        case 3:
+            return "restricted maneuv";
+        case 4:
+            return "constrained draught";
+        case 5:
+            return "moored";
+        case 6:
+            return "aground";
+        case 7:
+            return "fishing";
+        case 8:
+            return "sailing";
+        case 9:
+        case 10:
+        case 13:
+            return "reserved";
+        case 11:
+            return "towing astern";
+        case 12:
+            return "towing ahead/along";
+        case 14:
+            return "SART/MOB/EPIRB";
+        case 15:
+            return "undefined";
+        default:
+            return "unknown";
+    }
 }
 
 static std::string rate_of_turn(const RateOfTurn value) {
-	switch(value) {
-	case -128: return "not available";
-	case -127: return "left >5 deg/30sec";
-	case    0: return "0 deg/min";
-	case  127: return "right >5 deg/30sec";
-	default:
-		{
-			std::string result = (value < 0) ? "left " : "right ";
-			const float value_deg_sqrt = value / 4.733f;
-			const int32_t value_deg = value_deg_sqrt * value_deg_sqrt;
-			result += to_string_dec_uint(value_deg);
-			result += " deg/min";
-			return result;
-		}
-	}
+    switch (value) {
+        case -128:
+            return "not available";
+        case -127:
+            return "left >5 deg/30sec";
+        case 0:
+            return "0 deg/min";
+        case 127:
+            return "right >5 deg/30sec";
+        default: {
+            std::string result = (value < 0) ? "left " : "right ";
+            const float value_deg_sqrt = value / 4.733f;
+            const int32_t value_deg = value_deg_sqrt * value_deg_sqrt;
+            result += to_string_dec_uint(value_deg);
+            result += " deg/min";
+            return result;
+        }
+    }
 }
 
 static std::string speed_over_ground(const SpeedOverGround value) {
-	if( value == 1023 ) {
-		return "not available";
-	} else if( value == 1022 ) {
-		return ">= 102.2 knots";
-	} else {
-		return to_string_dec_uint(value / 10) + "." + to_string_dec_uint(value % 10, 1) + " knots";
-	}
+    if (value == 1023) {
+        return "not available";
+    } else if (value == 1022) {
+        return ">= 102.2 knots";
+    } else {
+        return to_string_dec_uint(value / 10) + "." + to_string_dec_uint(value % 10, 1) + " knots";
+    }
 }
 
 static std::string course_over_ground(const CourseOverGround value) {
-	if( value > 3600 ) {
-		return "invalid";
-	} else if( value == 3600 ) {
-		return "not available";
-	} else {
-		return to_string_dec_uint(value / 10) + "." + to_string_dec_uint(value % 10, 1) + " deg";
-	}
+    if (value > 3600) {
+        return "invalid";
+    } else if (value == 3600) {
+        return "not available";
+    } else {
+        return to_string_dec_uint(value / 10) + "." + to_string_dec_uint(value % 10, 1) + " deg";
+    }
 }
 
 static std::string true_heading(const TrueHeading value) {
-	if( value == 511 ) {
-		return "not available";
-	} else if( value > 359 ) {
-		return "invalid";
-	} else {
-		return to_string_dec_uint(value) + " deg";
-	}
+    if (value == 511) {
+        return "not available";
+    } else if (value > 359) {
+        return "invalid";
+    } else {
+        return to_string_dec_uint(value) + " deg";
+    }
 }
 
 } /* namespace format */
 } /* namespace ais */
 
 void AISLogger::on_packet(const ais::Packet& packet) {
-	// TODO: Unstuff here, not in baseband!
-	std::string entry;
-	entry.reserve((packet.length() + 3) / 4);
+    // TODO: Unstuff here, not in baseband!
+    std::string entry;
+    entry.reserve((packet.length() + 3) / 4);
 
-	for(size_t i=0; i<packet.length(); i+=4) {
-		const auto nibble = packet.read(i, 4);
-		entry += (nibble >= 10) ? ('W' + nibble) : ('0' + nibble);
-	}
+    for (size_t i = 0; i < packet.length(); i += 4) {
+        const auto nibble = packet.read(i, 4);
+        entry += (nibble >= 10) ? ('W' + nibble) : ('0' + nibble);
+    }
 
-	log_file.write_entry(packet.received_at(), entry);
-}	
+    log_file.write_entry(packet.received_at(), entry);
+
+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
+}
 
 void AISRecentEntry::update(const ais::Packet& packet) {
-	received_count++;
+    received_count++;
 
-	switch(packet.message_id()) {
-	case 1:
-	case 2:
-	case 3:
-		navigational_status = packet.read(38, 4);
-		last_position.rate_of_turn = packet.read(42, 8);
-		last_position.speed_over_ground = packet.read(50, 10);
-		last_position.timestamp = packet.received_at();
-		last_position.latitude = packet.latitude(89);
-		last_position.longitude = packet.longitude(61);
-		last_position.course_over_ground = packet.read(116, 12);
-		last_position.true_heading = packet.read(128, 9);
-		break;
+    switch (packet.message_id()) {
+        case 1:
+        case 2:
+        case 3:
+            navigational_status = packet.read(38, 4);
+            last_position.rate_of_turn = packet.read(42, 8);
+            last_position.speed_over_ground = packet.read(50, 10);
+            last_position.timestamp = packet.received_at();
+            last_position.latitude = packet.latitude(89);
+            last_position.longitude = packet.longitude(61);
+            last_position.course_over_ground = packet.read(116, 12);
+            last_position.true_heading = packet.read(128, 9);
+            break;
 
-	case 4:
-		last_position.timestamp = packet.received_at();
-		last_position.latitude = packet.latitude(107);
-		last_position.longitude = packet.longitude(79);
-		break;
+        case 4:
+            last_position.timestamp = packet.received_at();
+            last_position.latitude = packet.latitude(107);
+            last_position.longitude = packet.longitude(79);
+            break;
 
-	case 5:
-		call_sign = packet.text(70, 7);
-		name = packet.text(112, 20);
-		destination = packet.text(302, 20);
-		break;
+        case 5:
+            call_sign = packet.text(70, 7);
+            name = packet.text(112, 20);
+            destination = packet.text(302, 20);
+            break;
 
-	case 21:
-		name = packet.text(43, 20);
-		last_position.timestamp = packet.received_at();
-		last_position.latitude = packet.latitude(192);
-		last_position.longitude = packet.longitude(164);
-		break;
+        case 18:
+            last_position.timestamp = packet.received_at();
+            last_position.speed_over_ground = packet.read(46, 10);
+            last_position.latitude = packet.latitude(85);
+            last_position.longitude = packet.longitude(57);
+            last_position.course_over_ground = packet.read(112, 12);
+            last_position.true_heading = packet.read(124, 9);
+            break;
 
-	default:
-		break;
-	}
+        case 21:
+            name = packet.text(43, 20);
+            last_position.timestamp = packet.received_at();
+            last_position.latitude = packet.latitude(192);
+            last_position.longitude = packet.longitude(164);
+            break;
+
+        case 24:
+            switch (packet.read(38, 2)) {
+                case 0:
+                    name = packet.text(40, 20);
+                    break;
+
+                case 1:
+                    call_sign = packet.text(90, 7);
+                    break;
+
+                default:
+                    break;
+            }
+
+            break;
+
+        default:
+            break;
+    }
 }
 
 namespace ui {
 
-template<>
+template <>
 void RecentEntriesTable<AISRecentEntries>::draw(
-	const Entry& entry,
-	const Rect& target_rect,
-	Painter& painter,
-	const Style& style
-) {
-	std::string line = ais::format::mmsi(entry.mmsi) + " ";
-	if( !entry.name.empty() ) {
-		line += entry.name;
-	} else {
-		line += entry.call_sign;
-	}
+    const Entry& entry,
+    const Rect& target_rect,
+    Painter& painter,
+    const Style& style) {
+    std::string line = ais::format::mmsi(entry.mmsi) + " ";
+    if (!entry.name.empty()) {
+        line += ais::format::text(entry.name);
+    } else {
+        line += ais::format::text(entry.call_sign);
+    }
 
-	line.resize(target_rect.width() / 8, ' ');
-	painter.draw_string(target_rect.location(), style, line);
+    line.resize(target_rect.width() / 8, ' ');
+    painter.draw_string(target_rect.location(), style, line);
 }
 
 AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {
-	add_children({
-		&button_done,
-		&button_see_map,
-	});
+    add_children({
+        &button_done,
+        &button_see_map,
+    });
 
-	button_done.on_select = [this](const ui::Button&) {
-		if( this->on_close ) {
-			this->on_close();
-		}
-	};
+    button_done.on_select = [this](const ui::Button&) {
+        if (on_close) {
+            on_close();
+        }
+    };
 
-	button_see_map.on_select = [this, &nav](Button&) {
-		geomap_view = nav.push<GeoMapView>(
-			entry_.name,
-			0,
-			GeoPos::alt_unit::METERS,
-			ais::format::latlon_float(entry_.last_position.latitude.normalized()),
-			ais::format::latlon_float(entry_.last_position.longitude.normalized()),
-			entry_.last_position.true_heading,
-			[this]() {
-				send_updates = false;
-			});
-			send_updates = true;
+    button_see_map.on_select = [this, &nav](Button&) {
+        geomap_view = nav.push<GeoMapView>(
+            ais::format::text(entry_.name),
+            0,
+            GeoPos::alt_unit::METERS,
+            GeoPos::spd_unit::NONE,
+            ais::format::latlon_float(entry_.last_position.latitude.normalized()),
+            ais::format::latlon_float(entry_.last_position.longitude.normalized()),
+            entry_.last_position.true_heading,
+            [this]() {
+                send_updates = false;
+            });
+        send_updates = true;
+    };
+}
 
-		
-	};
-	
-	
+AISRecentEntryDetailView::AISRecentEntryDetailView(const AISRecentEntryDetailView& Entry)
+    : View() {
+    (void)Entry;
+}
+
+AISRecentEntryDetailView& AISRecentEntryDetailView::operator=(const AISRecentEntryDetailView& Entry) {
+    (void)Entry;
+    return *this;
 }
 
 void AISRecentEntryDetailView::update_position() {
-	if (send_updates)
-		geomap_view->update_position(ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.longitude.normalized()));
+    if (send_updates)
+        geomap_view->update_position(ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.longitude.normalized()), (float)entry_.last_position.true_heading, 0, entry_.last_position.speed_over_ground);
 }
 
 void AISRecentEntryDetailView::focus() {
-	button_done.focus();
+    button_done.focus();
 }
 
 Rect AISRecentEntryDetailView::draw_field(
-	Painter& painter,
-	const Rect& draw_rect,
-	const Style& style,
-	const std::string& label,
-	const std::string& value
-) {
-	const int label_length_max = 4;
+    Painter& painter,
+    const Rect& draw_rect,
+    const Style& style,
+    const std::string& label,
+    const std::string& value) {
+    const int label_length_max = 4;
 
-	painter.draw_string(Point { draw_rect.left(), draw_rect.top() }, style, label);
-	painter.draw_string(Point { draw_rect.left() + (label_length_max + 1) * 8, draw_rect.top() }, style, value);
+    painter.draw_string(Point{draw_rect.left(), draw_rect.top()}, style, label);
+    painter.draw_string(Point{draw_rect.left() + (label_length_max + 1) * 8, draw_rect.top()}, style, value);
 
-	return { draw_rect.left(), draw_rect.top() + draw_rect.height(), draw_rect.width(), draw_rect.height() };
+    return {draw_rect.left(), draw_rect.top() + draw_rect.height(), draw_rect.width(), draw_rect.height()};
 }
 
 void AISRecentEntryDetailView::paint(Painter& painter) {
-	View::paint(painter);
+    View::paint(painter);
 
-	const auto s = style();
-	const auto rect = screen_rect();
+    const auto s = style();
+    const auto rect = screen_rect();
 
-	auto field_rect = Rect { rect.left(), rect.top() + 16, rect.width(), 16 };
+    auto field_rect = Rect{rect.left(), rect.top() + 16, rect.width(), 16};
 
-	field_rect = draw_field(painter, field_rect, s, "MMSI", ais::format::mmsi(entry_.mmsi));
-	field_rect = draw_field(painter, field_rect, s, "Name", entry_.name);
-	field_rect = draw_field(painter, field_rect, s, "Call", entry_.call_sign);
-	field_rect = draw_field(painter, field_rect, s, "Dest", entry_.destination);
-	field_rect = draw_field(painter, field_rect, s, "Last", to_string_datetime(entry_.last_position.timestamp));
-	field_rect = draw_field(painter, field_rect, s, "Pos ", ais::format::latlon(entry_.last_position.latitude, entry_.last_position.longitude));
-	field_rect = draw_field(painter, field_rect, s, "Stat", ais::format::navigational_status(entry_.navigational_status));
-	field_rect = draw_field(painter, field_rect, s, "RoT ", ais::format::rate_of_turn(entry_.last_position.rate_of_turn));
-	field_rect = draw_field(painter, field_rect, s, "SoG ", ais::format::speed_over_ground(entry_.last_position.speed_over_ground));
-	field_rect = draw_field(painter, field_rect, s, "CoG ", ais::format::course_over_ground(entry_.last_position.course_over_ground));
-	field_rect = draw_field(painter, field_rect, s, "Head", ais::format::true_heading(entry_.last_position.true_heading));
-	field_rect = draw_field(painter, field_rect, s, "Rx #", to_string_dec_uint(entry_.received_count));
+    field_rect = draw_field(painter, field_rect, s, "MMSI", ais::format::mmsi(entry_.mmsi));
+    field_rect = draw_field(painter, field_rect, s, "Ctry", ais::format::mid(entry_.mmsi));
+    field_rect = draw_field(painter, field_rect, s, "Name", ais::format::text(entry_.name));
+    field_rect = draw_field(painter, field_rect, s, "Call", ais::format::text(entry_.call_sign));
+    field_rect = draw_field(painter, field_rect, s, "Dest", ais::format::text(entry_.destination));
+    field_rect = draw_field(painter, field_rect, s, "Last", to_string_datetime(entry_.last_position.timestamp));
+    field_rect = draw_field(painter, field_rect, s, "Pos ", ais::format::latlon(entry_.last_position.latitude, entry_.last_position.longitude));
+    field_rect = draw_field(painter, field_rect, s, "Stat", ais::format::navigational_status(entry_.navigational_status));
+    field_rect = draw_field(painter, field_rect, s, "RoT ", ais::format::rate_of_turn(entry_.last_position.rate_of_turn));
+    field_rect = draw_field(painter, field_rect, s, "SoG ", ais::format::speed_over_ground(entry_.last_position.speed_over_ground));
+    field_rect = draw_field(painter, field_rect, s, "CoG ", ais::format::course_over_ground(entry_.last_position.course_over_ground));
+    field_rect = draw_field(painter, field_rect, s, "Head", ais::format::true_heading(entry_.last_position.true_heading));
+    field_rect = draw_field(painter, field_rect, s, "Rx #", to_string_dec_uint(entry_.received_count));
 }
 
 void AISRecentEntryDetailView::set_entry(const AISRecentEntry& entry) {
-	entry_ = entry;
-	set_dirty();
+    entry_ = entry;
+    set_dirty();
 }
 
-AISAppView::AISAppView(NavigationView& nav) : nav_ { nav } {
-	baseband::run_image(portapack::spi_flash::image_tag_ais);
+AISAppView::AISAppView(NavigationView& nav)
+    : nav_{nav} {
+    baseband::run_image(portapack::spi_flash::image_tag_ais);
 
-	add_children({
-		&label_channel,
-		&options_channel,
-		&field_rf_amp,
-		&field_lna,
-		&field_vga,
-		&rssi,
-		&channel,
-		&recent_entries_view,
-		&recent_entry_detail_view,
-	});
+    add_children({
+        &label_channel,
+        &options_channel,
+        &field_rf_amp,
+        &field_lna,
+        &field_vga,
+        &rssi,
+        &field_volume,
+        &channel,
+        &recent_entries_view,
+        &recent_entry_detail_view,
+    });
 
-	recent_entry_detail_view.hidden(true);
+    recent_entry_detail_view.hidden(true);
 
-	target_frequency_ = initial_target_frequency;
+    receiver_model.enable();
 
-	radio::enable({
-		tuning_frequency(),
-		sampling_rate,
-		baseband_bandwidth,
-		rf::Direction::Receive,
-		receiver_model.rf_amp(),
-		static_cast<int8_t>(receiver_model.lna()),
-		static_cast<int8_t>(receiver_model.vga()),
-	});
+    options_channel.on_change = [this](size_t, OptionsField::value_t v) {
+        receiver_model.set_target_frequency(v);
+    };
+    options_channel.set_by_value(receiver_model.target_frequency());
 
-	options_channel.on_change = [this](size_t, OptionsField::value_t v) {
-		this->on_frequency_changed(v);
-	};
-	options_channel.set_by_value(target_frequency());
+    recent_entries_view.on_select = [this](const AISRecentEntry& entry) {
+        on_show_detail(entry);
+    };
+    recent_entry_detail_view.on_close = [this]() {
+        on_show_list();
+    };
 
-	recent_entries_view.on_select = [this](const AISRecentEntry& entry) {
-		this->on_show_detail(entry);
-	};
-	recent_entry_detail_view.on_close = [this]() {
-		this->on_show_list();
-	};
+    logger = std::make_unique<AISLogger>();
+    if (logger) {
+        logger->append(logs_dir / u"AIS.TXT");
+    }
 
-	logger = std::make_unique<AISLogger>();
-	if( logger ) {
-		logger->append(u"ais.txt");
-	}
+    if (pmem::beep_on_packets()) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
+    }
 }
 
 AISAppView::~AISAppView() {
-	radio::disable();
-
-	baseband::shutdown();
+    audio::output::stop();
+    receiver_model.disable();
+    baseband::shutdown();
 }
 
 void AISAppView::focus() {
-	options_channel.focus();
+    options_channel.focus();
 }
 
 void AISAppView::set_parent_rect(const Rect new_parent_rect) {
-	View::set_parent_rect(new_parent_rect);
-	const Rect content_rect { 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height };
-	recent_entries_view.set_parent_rect(content_rect);
-	recent_entry_detail_view.set_parent_rect(content_rect);
+    View::set_parent_rect(new_parent_rect);
+    const Rect content_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height};
+    recent_entries_view.set_parent_rect(content_rect);
+    recent_entry_detail_view.set_parent_rect(content_rect);
 }
 
 void AISAppView::on_packet(const ais::Packet& packet) {
-	if( logger ) {
-		logger->on_packet(packet);
-	}
+    if (logger) {
+        logger->on_packet(packet);
+    }
 
-	auto& entry = ::on_packet(recent, packet.source_id());
-	entry.update(packet);
-	recent_entries_view.set_dirty();
+    auto& entry = ::on_packet(recent, packet.source_id());
+    entry.update(packet);
+    recent_entries_view.set_dirty();
 
-	// TODO: Crude hack, should be a more formal listener arrangement...
-	if( entry.key() == recent_entry_detail_view.entry().key() ) {
-		recent_entry_detail_view.set_entry(entry);
-		recent_entry_detail_view.update_position();
-	}
+    // TODO: Crude hack, should be a more formal listener arrangement...
+    if (entry.key() == recent_entry_detail_view.entry().key()) {
+        recent_entry_detail_view.set_entry(entry);
+        recent_entry_detail_view.update_position();
+    }
 }
 
 void AISAppView::on_show_list() {
-	recent_entries_view.hidden(false);
-	recent_entry_detail_view.hidden(true);
-	recent_entries_view.focus();
+    recent_entries_view.hidden(false);
+    recent_entry_detail_view.hidden(true);
+    recent_entries_view.focus();
 }
 
 void AISAppView::on_show_detail(const AISRecentEntry& entry) {
-	recent_entries_view.hidden(true);
-	recent_entry_detail_view.hidden(false);
-	recent_entry_detail_view.set_entry(entry);
-	recent_entry_detail_view.focus();
-}
-
-void AISAppView::on_frequency_changed(const uint32_t new_target_frequency) {
-	set_target_frequency(new_target_frequency);
-}
-
-void AISAppView::set_target_frequency(const uint32_t new_value) {
-	target_frequency_ = new_value;
-	radio::set_tuning_frequency(tuning_frequency());
-}
-
-uint32_t AISAppView::target_frequency() const {
-	return target_frequency_;
-}
-
-uint32_t AISAppView::tuning_frequency() const {
-	return target_frequency() - (sampling_rate / 4);
+    recent_entries_view.hidden(true);
+    recent_entry_detail_view.hidden(false);
+    recent_entry_detail_view.set_entry(entry);
+    recent_entry_detail_view.focus();
 }
 
 } /* namespace ui */

firmware/application/apps/ais_app.hpp

@@ -33,7 +33,8 @@
 #include "event_m0.hpp"
 
 #include "log_file.hpp"
-
+#include "app_settings.hpp"
+#include "radio_state.hpp"
 #include "ais_packet.hpp"
 
 #include "lpc43xx_cpp.hpp"
@@ -50,64 +51,62 @@ using namespace lpc43xx;
 #include "recent_entries.hpp"
 
 struct AISPosition {
-	rtc::RTC timestamp { };
-	ais::Latitude latitude { };
-	ais::Longitude longitude { };
-	ais::RateOfTurn rate_of_turn { -128 };
-	ais::SpeedOverGround speed_over_ground { 1023 };
-	ais::CourseOverGround course_over_ground { 3600 };
-	ais::TrueHeading true_heading { 511 };
+    rtc::RTC timestamp{};
+    ais::Latitude latitude{};
+    ais::Longitude longitude{};
+    ais::RateOfTurn rate_of_turn{-128};
+    ais::SpeedOverGround speed_over_ground{1023};
+    ais::CourseOverGround course_over_ground{3600};
+    ais::TrueHeading true_heading{511};
 };
 
 struct AISRecentEntry {
-	using Key = ais::MMSI;
+    using Key = ais::MMSI;
 
-	static constexpr Key invalid_key = 0xffffffff;
+    static constexpr Key invalid_key = 0xffffffff;
 
-	ais::MMSI mmsi;
-	std::string name;
-	std::string call_sign;
-	std::string destination;
-	AISPosition last_position;
-	size_t received_count;
-	int8_t navigational_status;
+    ais::MMSI mmsi;
+    std::string name;
+    std::string call_sign;
+    std::string destination;
+    AISPosition last_position;
+    size_t received_count;
+    int8_t navigational_status;
 
-	AISRecentEntry(
-	) : AISRecentEntry { 0 }
-	{
-	}
+    AISRecentEntry()
+        : AISRecentEntry{0} {
+    }
 
-	AISRecentEntry(
-		const ais::MMSI& mmsi
-	) : mmsi { mmsi },
-		name { },
-		call_sign { },
-		destination { },
-		last_position { },
-		received_count { 0 },
-		navigational_status { -1 }
-	{
-	}
+    AISRecentEntry(
+        const ais::MMSI& mmsi)
+        : mmsi{mmsi},
+          name{},
+          call_sign{},
+          destination{},
+          last_position{},
+          received_count{0},
+          navigational_status{-1} {
+    }
 
-	Key key() const {
-		return mmsi;
-	}
+    Key key() const {
+        return mmsi;
+    }
 
-	void update(const ais::Packet& packet);
+    void update(const ais::Packet& packet);
 };
 
 using AISRecentEntries = RecentEntries<AISRecentEntry>;
 
 class AISLogger {
-public:
-	Optional<File::Error> append(const std::filesystem::path& filename) {
-		return log_file.append(filename);
-	}
-	
-	void on_packet(const ais::Packet& packet);
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
 
-private:
-	LogFile log_file { };
+    void on_packet(const ais::Packet& packet);
+
+   private:
+    LogFile log_file{};
 };
 
 namespace ui {
@@ -115,133 +114,123 @@ namespace ui {
 using AISRecentEntriesView = RecentEntriesView<AISRecentEntries>;
 
 class AISRecentEntryDetailView : public View {
-public:
-	std::function<void(void)> on_close { };
+   public:
+    std::function<void(void)> on_close{};
 
-	AISRecentEntryDetailView(NavigationView& nav);
+    AISRecentEntryDetailView(NavigationView& nav);
 
-	void set_entry(const AISRecentEntry& new_entry);
-	const AISRecentEntry& entry() const { return entry_; };
+    void set_entry(const AISRecentEntry& new_entry);
+    const AISRecentEntry& entry() const { return entry_; };
 
-	void update_position();
-	void focus() override;
-	void paint(Painter&) override;
+    void update_position();
+    void focus() override;
+    void paint(Painter&) override;
 
-private:
-	AISRecentEntry entry_ { };
+    AISRecentEntryDetailView(const AISRecentEntryDetailView& Entry);
+    AISRecentEntryDetailView& operator=(const AISRecentEntryDetailView& Entry);
 
-	Button button_done {
-		{ 125, 216, 96, 24 },
-		"Done"
-	};
-	Button button_see_map {
-		{ 19, 216, 96, 24 },
-		"See on map"
-	};
-	GeoMapView* geomap_view { nullptr };
-	bool send_updates { false };
+   private:
+    AISRecentEntry entry_{};
 
-	Rect draw_field(
-		Painter& painter,
-		const Rect& draw_rect,
-		const Style& style,
-		const std::string& label,
-		const std::string& value
-	);
+    Button button_done{
+        {125, 224, 96, 24},
+        "Done"};
+    Button button_see_map{
+        {19, 224, 96, 24},
+        "See on map"};
+    GeoMapView* geomap_view{nullptr};
+    bool send_updates{false};
+
+    Rect draw_field(
+        Painter& painter,
+        const Rect& draw_rect,
+        const Style& style,
+        const std::string& label,
+        const std::string& value);
 };
 
 class AISAppView : public View {
-public:
-	AISAppView(NavigationView& nav);
-	~AISAppView();
+   public:
+    AISAppView(NavigationView& nav);
+    ~AISAppView();
 
-	void set_parent_rect(const Rect new_parent_rect) override;
+    void set_parent_rect(const Rect new_parent_rect) override;
+    void paint(Painter&) override{};
 
-	// Prevent painting of region covered entirely by a child.
-	// TODO: Add flag to View that specifies view does not need to be cleared before painting.
-	void paint(Painter&) override { };
+    void focus() override;
 
-	void focus() override;
+    std::string title() const override { return "AIS RX"; };
 
-	std::string title() const override { return "AIS"; };
+   private:
+    RxRadioState radio_state_{
+        162025000 /* frequency*/,
+        1750000 /* bandwidth */,
+        2457600 /* sampling rate */
+    };
+    app_settings::SettingsManager settings_{
+        "rx_ais", app_settings::Mode::RX};
 
-private:
-	static constexpr uint32_t initial_target_frequency = 162025000;
-	static constexpr uint32_t sampling_rate = 2457600;
-	static constexpr uint32_t baseband_bandwidth = 1750000;
-	NavigationView& nav_;
+    NavigationView& nav_;
 
-	AISRecentEntries recent { };
-	std::unique_ptr<AISLogger> logger { };
+    AISRecentEntries recent{};
+    std::unique_ptr<AISLogger> logger{};
 
-	const RecentEntriesColumns columns { {
-		{ "MMSI", 9 },
-		{ "Name/Call", 20 },
-	} };
-	AISRecentEntriesView recent_entries_view { columns, recent };
-	AISRecentEntryDetailView recent_entry_detail_view { nav_ };
+    const RecentEntriesColumns columns{{
+        {"MMSI", 9},
+        {"Name/Call", 20},
+    }};
+    AISRecentEntriesView recent_entries_view{columns, recent};
+    AISRecentEntryDetailView recent_entry_detail_view{nav_};
 
-	static constexpr auto header_height = 1 * 16;
+    static constexpr auto header_height = 1 * 16;
 
-	Text label_channel {
-		{ 0 * 8, 0 * 16, 2 * 8, 1 * 16 },
-		"Ch"
-	};
+    Text label_channel{
+        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        "Ch"};
 
-	OptionsField options_channel {
-		{ 3 * 8, 0 * 16 },
-		3,
-		{
-			{ "87B", 161975000 },
-			{ "88B", 162025000 },
-		}
-	};
+    OptionsField options_channel{
+        {3 * 8, 0 * 16},
+        3,
+        {
+            {"87B", 161975000},
+            {"88B", 162025000},
+        }};
 
-	RFAmpField field_rf_amp {
-		{ 13 * 8, 0 * 16 }
-	};
+    RFAmpField field_rf_amp{
+        {13 * 8, 0 * 16}};
 
-	LNAGainField field_lna {
-		{ 15 * 8, 0 * 16 }
-	};
+    LNAGainField field_lna{
+        {15 * 8, 0 * 16}};
 
-	VGAGainField field_vga {
-		{ 18 * 8, 0 * 16 }
-	};
+    VGAGainField field_vga{
+        {18 * 8, 0 * 16}};
 
-	RSSI rssi {
-		{ 21 * 8, 0, 6 * 8, 4 },
-	};
+    RSSI rssi{
+        {21 * 8, 0, 6 * 8, 4},
+    };
 
-	Channel channel {
-		{ 21 * 8, 5, 6 * 8, 4 },
-	};
+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
 
-	MessageHandlerRegistration message_handler_packet {
-		Message::ID::AISPacket,
-		[this](Message* const p) {
-			const auto message = static_cast<const AISPacketMessage*>(p);
-			const ais::Packet packet { message->packet };
-			if( packet.is_valid() ) {
-				this->on_packet(packet);
-			}
-		}
-	};
+    Channel channel{
+        {21 * 8, 5, 6 * 8, 4},
+    };
 
-	uint32_t target_frequency_ = initial_target_frequency;
+    MessageHandlerRegistration message_handler_packet{
+        Message::ID::AISPacket,
+        [this](Message* const p) {
+            const auto message = static_cast<const AISPacketMessage*>(p);
+            const ais::Packet packet{message->packet};
+            if (packet.is_valid()) {
+                this->on_packet(packet);
+            }
+        }};
 
-	void on_packet(const ais::Packet& packet);
-	void on_show_list();
-	void on_show_detail(const AISRecentEntry& entry);
-
-	void on_frequency_changed(const uint32_t new_target_frequency);
-
-	uint32_t target_frequency() const;
-	void set_target_frequency(const uint32_t new_value);
-
-	uint32_t tuning_frequency() const;
+    void on_packet(const ais::Packet& packet);
+    void on_show_list();
+    void on_show_detail(const AISRecentEntry& entry);
 };
 
 } /* namespace ui */
 
-#endif/*__AIS_APP_H__*/
+#endif /*__AIS_APP_H__*/

firmware/application/apps/analog_audio_app.cpp

@@ -22,347 +22,420 @@
 
 #include "analog_audio_app.hpp"
 
+#include "audio.hpp"
 #include "baseband_api.hpp"
-
+#include "file.hpp"
 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "string_format.hpp"
+#include "ui_freqman.hpp"
+#include "utility.hpp"
+#include "radio.hpp"
+
 using namespace portapack;
 using namespace tonekey;
 
-#include "audio.hpp"
-#include "file.hpp"
-
-#include "utility.hpp"
-
-#include "string_format.hpp"
-
 namespace ui {
 
 /* AMOptionsView *********************************************************/
 
 AMOptionsView::AMOptionsView(
-	const Rect parent_rect, const Style* const style
-) : View { parent_rect }
-{
-	set_style(style);
+    Rect parent_rect,
+    const Style* style)
+    : View{parent_rect} {
+    set_style(style);
 
-	add_children({
-		&label_config,
-		&options_config,
-	});
+    add_children({
+        &label_config,
+        &options_config,
+    });
 
-	options_config.set_selected_index(receiver_model.am_configuration());
-	options_config.on_change = [this](size_t n, OptionsField::value_t) {
-		receiver_model.set_am_configuration(n);
-	};
+    freqman_set_bandwidth_option(AM_MODULATION, options_config);  // adding the common message from freqman.cpp to the options_config
+    options_config.set_by_value(receiver_model.am_configuration());
+    options_config.on_change = [this](size_t, OptionsField::value_t n) {
+        receiver_model.set_am_configuration(n);
+    };
 }
 
 /* NBFMOptionsView *******************************************************/
 
 NBFMOptionsView::NBFMOptionsView(
-	const Rect parent_rect, const Style* const style
-) : View { parent_rect }
-{
-	set_style(style);
+    Rect parent_rect,
+    const Style* style)
+    : View{parent_rect} {
+    set_style(style);
 
-	add_children({
-		&label_config,
-		&options_config,
-		&text_squelch,
-		&field_squelch
-	});
+    add_children({&label_config,
+                  &options_config,
+                  &text_squelch,
+                  &field_squelch});
 
-	options_config.set_selected_index(receiver_model.nbfm_configuration());
-	options_config.on_change = [this](size_t n, OptionsField::value_t) {
-		receiver_model.set_nbfm_configuration(n);
-	};
-	
-	field_squelch.set_value(receiver_model.squelch_level());
-	field_squelch.on_change = [this](int32_t v) {
-		receiver_model.set_squelch_level(v);
-	};
+    freqman_set_bandwidth_option(NFM_MODULATION, options_config);  // adding the common message from freqman.cpp to the options_config
+    options_config.set_by_value(receiver_model.nbfm_configuration());
+    options_config.on_change = [this](size_t, OptionsField::value_t n) {
+        receiver_model.set_nbfm_configuration(n);
+    };
+
+    field_squelch.set_value(receiver_model.squelch_level());
+    field_squelch.on_change = [this](int32_t v) {
+        receiver_model.set_squelch_level(v);
+    };
+}
+
+/* WFMOptionsView *******************************************************/
+
+WFMOptionsView::WFMOptionsView(
+    Rect parent_rect,
+    const Style* style)
+    : View{parent_rect} {
+    set_style(style);
+
+    add_children({
+        &label_config,
+        &options_config,
+    });
+
+    freqman_set_bandwidth_option(WFM_MODULATION, options_config);  // adding the common message from freqman.cpp to the options_config
+    options_config.set_by_value(receiver_model.wfm_configuration());
+    options_config.on_change = [this](size_t, OptionsField::value_t n) {
+        receiver_model.set_wfm_configuration(n);
+    };
+}
+
+/* SPECOptionsView *******************************************************/
+
+SPECOptionsView::SPECOptionsView(
+    AnalogAudioView* view,
+    Rect parent_rect,
+    const Style* style)
+    : View{parent_rect} {
+    set_style(style);
+
+    add_children({
+        &label_config,
+        &options_config,
+        &text_speed,
+        &field_speed,
+        &text_rx_cal,
+        &field_rx_iq_phase_cal,
+    });
+
+    options_config.set_selected_index(view->get_spec_bw_index());
+    options_config.on_change = [this, view](size_t n, OptionsField::value_t bw) {
+        view->set_spec_bw(n, bw);
+    };
+
+    field_speed.set_value(view->get_spec_trigger());
+    field_speed.on_change = [this, view](int32_t v) {
+        view->set_spec_trigger(v);
+    };
+
+    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(view->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, view](int32_t v) {
+        view->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
+    };
+
+    view->set_spec_iq_phase_calibration_value(view->get_spec_iq_phase_calibration_value());  // initialize iq_phase_calibration in radio
 }
 
 /* AnalogAudioView *******************************************************/
 
 AnalogAudioView::AnalogAudioView(
-	NavigationView& nav
-) : nav_ (nav)
-{
-	add_children({
-		&rssi,
-		&channel,
-		&audio,
-		&field_frequency,
-		&field_lna,
-		&field_vga,
-		&options_modulation,
-		&field_volume,
-		&text_ctcss,
-		&record_view,
-		&waterfall
-	});
+    NavigationView& nav)
+    : nav_(nav) {
+    // A baseband image _must_ be running before add waterfall view.
+    baseband::run_image(portapack::spi_flash::image_tag_wideband_spectrum);
 
-	field_frequency.set_value(receiver_model.tuning_frequency());
-	field_frequency.set_step(receiver_model.frequency_step());
-	field_frequency.on_change = [this](rf::Frequency f) {
-		this->on_tuning_frequency_changed(f);
-	};
-	field_frequency.on_edit = [this, &nav]() {
-		// TODO: Provide separate modal method/scheme?
-		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			this->on_tuning_frequency_changed(f);
-			this->field_frequency.set_value(f);
-		};
-	};
+    add_children({&rssi,
+                  &channel,
+                  &audio,
+                  &field_frequency,
+                  &field_lna,
+                  &field_vga,
+                  &options_modulation,
+                  &field_volume,
+                  &text_ctcss,
+                  &record_view,
+                  &waterfall});
 
-	field_frequency.on_show_options = [this]() {
-		this->on_show_options_frequency();
-	};
+    // Filename Datetime and Frequency
+    record_view.set_filename_date_frequency(true);
 
-	field_lna.on_show_options = [this]() {
-		this->on_show_options_rf_gain();
-	};
+    field_frequency.on_show_options = [this]() {
+        this->on_show_options_frequency();
+    };
 
-	field_vga.on_show_options = [this]() {
-		this->on_show_options_rf_gain();
-	};
+    field_lna.on_show_options = [this]() {
+        this->on_show_options_rf_gain();
+    };
 
-	const auto modulation = receiver_model.modulation();
-	options_modulation.set_by_value(toUType(modulation));
-	options_modulation.on_change = [this](size_t, OptionsField::value_t v) {
-		this->on_modulation_changed(static_cast<ReceiverModel::Mode>(v));
-	};
-	options_modulation.on_show_options = [this]() {
-		this->on_show_options_modulation();
-	};
+    field_vga.on_show_options = [this]() {
+        this->on_show_options_rf_gain();
+    };
 
-	field_volume.set_value((receiver_model.headphone_volume() - audio::headphone::volume_range().max).decibel() + 99);
-	field_volume.on_change = [this](int32_t v) {
-		this->on_headphone_volume_changed(v);
-	};
+    auto modulation = receiver_model.modulation();
+    // This app doesn't handle "Capture" mode.
+    if (modulation > ReceiverModel::Mode::SpectrumAnalysis)
+        modulation = ReceiverModel::Mode::SpectrumAnalysis;
 
-	record_view.on_error = [&nav](std::string message) {
-		nav.display_modal("Error", message);
-	};
-	
-	waterfall.on_select = [this](int32_t offset) {
-		field_frequency.set_value(receiver_model.tuning_frequency() + offset);
-	};
+    options_modulation.set_by_value(toUType(modulation));
+    options_modulation.on_change = [this](size_t, OptionsField::value_t v) {
+        this->on_modulation_changed(static_cast<ReceiverModel::Mode>(v));
+    };
+    options_modulation.on_show_options = [this]() {
+        this->on_show_options_modulation();
+    };
 
-	audio::output::start();
+    record_view.on_error = [&nav](std::string message) {
+        nav.display_modal("Error", message);
+    };
 
-	update_modulation(static_cast<ReceiverModel::Mode>(modulation));
+    waterfall.on_select = [this](int32_t offset) {
+        field_frequency.set_value(receiver_model.target_frequency() + offset);
+    };
+
+    audio::output::start();
+
+    // This call starts the correct baseband image to run
+    // and sets the radio up as necessary for the given modulation.
+    on_modulation_changed(modulation);
+}
+
+AnalogAudioView::AnalogAudioView(
+    NavigationView& nav,
+    ReceiverModel::settings_t override)
+    : AnalogAudioView(nav) {
+    // Settings to override when launched from another app (versus from AppSettings .ini file)
+    // TODO: Which other settings make sense to override?
+    field_frequency.set_value(override.frequency_app_override);
+    on_frequency_step_changed(override.frequency_step);
+    options_modulation.set_by_value(toUType(override.mode));
+}
+
+size_t AnalogAudioView::get_spec_bw_index() {
+    return spec_bw_index;
+}
+
+void AnalogAudioView::set_spec_bw(size_t index, uint32_t bw) {
+    spec_bw_index = index;
+    spec_bw = bw;
+
+    baseband::set_spectrum(bw, spec_trigger);
+    receiver_model.set_sampling_rate(bw);
+    receiver_model.set_baseband_bandwidth(bw / 2);
+}
+
+uint8_t AnalogAudioView::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 AnalogAudioView::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);
+}
+
+uint16_t AnalogAudioView::get_spec_trigger() {
+    return spec_trigger;
+}
+
+void AnalogAudioView::set_spec_trigger(uint16_t trigger) {
+    spec_trigger = trigger;
+
+    baseband::set_spectrum(spec_bw, spec_trigger);
 }
 
 AnalogAudioView::~AnalogAudioView() {
-	// TODO: Manipulating audio codec here, and in ui_receiver.cpp. Good to do
-	// both?
-	audio::output::stop();
-
-	receiver_model.disable();
-
-	baseband::shutdown();
+    audio::output::stop();
+    receiver_model.disable();
+    baseband::shutdown();
 }
 
-void AnalogAudioView::on_hide() {
-	// TODO: Terrible kludge because widget system doesn't notify Waterfall that
-	// it's being shown or hidden.
-	waterfall.on_hide();
-	View::on_hide();
-}
+void AnalogAudioView::set_parent_rect(Rect new_parent_rect) {
+    View::set_parent_rect(new_parent_rect);
 
-void AnalogAudioView::set_parent_rect(const Rect new_parent_rect) {
-	View::set_parent_rect(new_parent_rect);
-	
-	const ui::Rect waterfall_rect { 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height };
-	waterfall.set_parent_rect(waterfall_rect);
+    ui::Rect waterfall_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height};
+    waterfall.set_parent_rect(waterfall_rect);
 }
 
 void AnalogAudioView::focus() {
-	field_frequency.focus();
-}
-
-void AnalogAudioView::on_tuning_frequency_changed(rf::Frequency f) {
-	receiver_model.set_tuning_frequency(f);
+    field_frequency.focus();
 }
 
 void AnalogAudioView::on_baseband_bandwidth_changed(uint32_t bandwidth_hz) {
-	receiver_model.set_baseband_bandwidth(bandwidth_hz);
+    receiver_model.set_baseband_bandwidth(bandwidth_hz);
 }
 
-void AnalogAudioView::on_modulation_changed(const ReceiverModel::Mode modulation) {
-	// TODO: Terrible kludge because widget system doesn't notify Waterfall that
-	// it's being shown or hidden.
-	waterfall.on_hide();
-	update_modulation(modulation);
-	on_show_options_modulation();
-	waterfall.on_show();
+void AnalogAudioView::on_modulation_changed(ReceiverModel::Mode modulation) {
+    // This app doesn't know what to do with "Capture" mode.
+    if (modulation > ReceiverModel::Mode::SpectrumAnalysis)
+        modulation = ReceiverModel::Mode::SpectrumAnalysis;
+
+    baseband::spectrum_streaming_stop();
+    update_modulation(modulation);
+    on_show_options_modulation();
+    baseband::spectrum_streaming_start();
 }
 
 void AnalogAudioView::remove_options_widget() {
-	if( options_widget ) {
-		remove_child(options_widget.get());
-		options_widget.reset();
-	}
-	
-	field_lna.set_style(nullptr);
-	options_modulation.set_style(nullptr);
-	field_frequency.set_style(nullptr);
+    if (options_widget) {
+        remove_child(options_widget.get());
+        options_widget.reset();
+    }
+
+    field_lna.set_style(nullptr);
+    options_modulation.set_style(nullptr);
+    field_frequency.set_style(nullptr);
 }
 
 void AnalogAudioView::set_options_widget(std::unique_ptr<Widget> new_widget) {
-	remove_options_widget();
+    remove_options_widget();
 
-	if( new_widget ) {
-		options_widget = std::move(new_widget);
-	} else {
-		// TODO: Lame hack to hide options view due to my bad paint/damage algorithm.
-		options_widget = std::make_unique<Rectangle>(options_view_rect, style_options_group.background);
-	}
-	add_child(options_widget.get());
+    if (new_widget) {
+        options_widget = std::move(new_widget);
+    } else {
+        // TODO: Lame hack to hide options view due to my bad paint/damage algorithm.
+        options_widget = std::make_unique<Rectangle>(options_view_rect, Theme::getInstance()->option_active->background);
+    }
+    add_child(options_widget.get());
 }
 
 void AnalogAudioView::on_show_options_frequency() {
-	auto widget = std::make_unique<FrequencyOptionsView>(options_view_rect, &style_options_group);
+    auto widget = std::make_unique<FrequencyOptionsView>(options_view_rect, Theme::getInstance()->option_active);
 
-	widget->set_step(receiver_model.frequency_step());
-	widget->on_change_step = [this](rf::Frequency f) {
-		this->on_frequency_step_changed(f);
-	};
-	widget->set_reference_ppm_correction(persistent_memory::correction_ppb() / 1000);
-	widget->on_change_reference_ppm_correction = [this](int32_t v) {
-		this->on_reference_ppm_correction_changed(v);
-	};
+    widget->set_step(receiver_model.frequency_step());
+    widget->on_change_step = [this](rf::Frequency f) {
+        this->on_frequency_step_changed(f);
+    };
+    widget->set_reference_ppm_correction(persistent_memory::correction_ppb() / 1000);
+    widget->on_change_reference_ppm_correction = [this](int32_t v) {
+        this->on_reference_ppm_correction_changed(v);
+    };
 
-	set_options_widget(std::move(widget));
-	field_frequency.set_style(&style_options_group);
+    set_options_widget(std::move(widget));
+    field_frequency.set_style(Theme::getInstance()->option_active);
 }
 
 void AnalogAudioView::on_show_options_rf_gain() {
-	auto widget = std::make_unique<RadioGainOptionsView>(options_view_rect, &style_options_group);
+    auto widget = std::make_unique<RadioGainOptionsView>(options_view_rect, Theme::getInstance()->option_active);
 
-	set_options_widget(std::move(widget));
-	field_lna.set_style(&style_options_group);
+    set_options_widget(std::move(widget));
+    field_lna.set_style(Theme::getInstance()->option_active);
 }
 
 void AnalogAudioView::on_show_options_modulation() {
-	std::unique_ptr<Widget> widget;
+    std::unique_ptr<Widget> widget;
 
-	const auto modulation = static_cast<ReceiverModel::Mode>(receiver_model.modulation());
-	switch(modulation) {
-	case ReceiverModel::Mode::AMAudio:
-		widget = std::make_unique<AMOptionsView>(options_view_rect, &style_options_group);
-		waterfall.show_audio_spectrum_view(false);
-		text_ctcss.hidden(true);
-		break;
+    const auto modulation = receiver_model.modulation();
+    switch (modulation) {
+        case ReceiverModel::Mode::AMAudio:
+            widget = std::make_unique<AMOptionsView>(options_view_rect, Theme::getInstance()->option_active);
+            waterfall.show_audio_spectrum_view(false);
+            text_ctcss.hidden(true);
+            break;
 
-	case ReceiverModel::Mode::NarrowbandFMAudio:
-		widget = std::make_unique<NBFMOptionsView>(nbfm_view_rect, &style_options_group);
-		waterfall.show_audio_spectrum_view(false);
-		text_ctcss.hidden(false);
-		break;
-	
-	case ReceiverModel::Mode::WidebandFMAudio:
-		waterfall.show_audio_spectrum_view(true);
-		text_ctcss.hidden(true);
-		break;
-	
-	case ReceiverModel::Mode::SpectrumAnalysis:
-		waterfall.show_audio_spectrum_view(false);
-		text_ctcss.hidden(true);
-		break;
-		
-	default:
-		break;
-	}
+        case ReceiverModel::Mode::NarrowbandFMAudio:
+            widget = std::make_unique<NBFMOptionsView>(nbfm_view_rect, Theme::getInstance()->option_active);
+            waterfall.show_audio_spectrum_view(false);
+            text_ctcss.hidden(false);
+            break;
 
-	set_options_widget(std::move(widget));
-	options_modulation.set_style(&style_options_group);
+        case ReceiverModel::Mode::WidebandFMAudio:
+            widget = std::make_unique<WFMOptionsView>(options_view_rect, Theme::getInstance()->option_active);
+            waterfall.show_audio_spectrum_view(true);
+            text_ctcss.hidden(true);
+            break;
+
+        case ReceiverModel::Mode::SpectrumAnalysis:
+            widget = std::make_unique<SPECOptionsView>(this, nbfm_view_rect, Theme::getInstance()->option_active);
+            waterfall.show_audio_spectrum_view(false);
+            text_ctcss.hidden(true);
+            break;
+
+        default:
+            chDbgPanic("Unhandled Mode");
+            break;
+    }
+
+    set_options_widget(std::move(widget));
+    options_modulation.set_style(Theme::getInstance()->option_active);
 }
 
 void AnalogAudioView::on_frequency_step_changed(rf::Frequency f) {
-	receiver_model.set_frequency_step(f);
-	field_frequency.set_step(f);
+    receiver_model.set_frequency_step(f);
+    field_frequency.set_step(f);
 }
 
 void AnalogAudioView::on_reference_ppm_correction_changed(int32_t v) {
-	persistent_memory::set_correction_ppb(v * 1000);
+    persistent_memory::set_correction_ppb(v * 1000);
 }
 
-void AnalogAudioView::on_headphone_volume_changed(int32_t v) {
-	const auto new_volume = volume_t::decibel(v - 99) + audio::headphone::volume_range().max;
-	receiver_model.set_headphone_volume(new_volume);
+void AnalogAudioView::update_modulation(ReceiverModel::Mode modulation) {
+    audio::output::mute();
+    record_view.stop();
+
+    baseband::shutdown();
+
+    portapack::spi_flash::image_tag_t image_tag;
+    switch (modulation) {
+        case ReceiverModel::Mode::AMAudio:
+            image_tag = portapack::spi_flash::image_tag_am_audio;
+            break;
+        case ReceiverModel::Mode::NarrowbandFMAudio:
+            image_tag = portapack::spi_flash::image_tag_nfm_audio;
+            break;
+        case ReceiverModel::Mode::WidebandFMAudio:
+            image_tag = portapack::spi_flash::image_tag_wfm_audio;
+            break;
+        case ReceiverModel::Mode::SpectrumAnalysis:
+            image_tag = portapack::spi_flash::image_tag_wideband_spectrum;
+            break;
+        default:
+            chDbgPanic("Unhandled Mode");
+            break;
+    }
+
+    baseband::run_image(image_tag);
+
+    if (modulation == ReceiverModel::Mode::SpectrumAnalysis) {
+        baseband::set_spectrum(spec_bw, spec_trigger);
+    }
+
+    const auto is_wideband_spectrum_mode = (modulation == ReceiverModel::Mode::SpectrumAnalysis);
+    receiver_model.set_modulation(modulation);
+
+    receiver_model.set_sampling_rate(is_wideband_spectrum_mode ? spec_bw : 3072000);
+    receiver_model.set_baseband_bandwidth(is_wideband_spectrum_mode ? spec_bw / 2 : 1750000);
+
+    receiver_model.enable();
+
+    // TODO: This doesn't belong here! There's a better way.
+    size_t sampling_rate = 0;
+    switch (modulation) {
+        case ReceiverModel::Mode::AMAudio:
+            sampling_rate = 12000;
+            break;
+        case ReceiverModel::Mode::NarrowbandFMAudio:
+            sampling_rate = 24000;
+            break;
+        case ReceiverModel::Mode::WidebandFMAudio:
+            sampling_rate = 48000;
+            break;
+        default:
+            break;
+    }
+    record_view.set_sampling_rate(sampling_rate);
+
+    if (!is_wideband_spectrum_mode) {
+        audio::output::unmute();
+    }
 }
 
-void AnalogAudioView::update_modulation(const ReceiverModel::Mode modulation) {
-	audio::output::mute();
-	record_view.stop();
-
-	baseband::shutdown();
-
-	portapack::spi_flash::image_tag_t image_tag;
-	switch(modulation) {
-	case ReceiverModel::Mode::AMAudio:				image_tag = portapack::spi_flash::image_tag_am_audio;			break;
-	case ReceiverModel::Mode::NarrowbandFMAudio:	image_tag = portapack::spi_flash::image_tag_nfm_audio;			break;
-	case ReceiverModel::Mode::WidebandFMAudio:		image_tag = portapack::spi_flash::image_tag_wfm_audio;			break;
-	case ReceiverModel::Mode::SpectrumAnalysis:		image_tag = portapack::spi_flash::image_tag_wideband_spectrum;	break;
-	default:
-		return;
-	}
-
-	baseband::run_image(image_tag);
-	
-	if (modulation == ReceiverModel::Mode::SpectrumAnalysis) {
-		baseband::set_spectrum(20000000, 127);
-	}
-
-	const auto is_wideband_spectrum_mode = (modulation == ReceiverModel::Mode::SpectrumAnalysis);
-	receiver_model.set_modulation(modulation);
-	receiver_model.set_sampling_rate(is_wideband_spectrum_mode ? 20000000 : 3072000);
-	receiver_model.set_baseband_bandwidth(is_wideband_spectrum_mode ? 12000000 : 1750000);
-	receiver_model.enable();
-
-	// TODO: This doesn't belong here! There's a better way.
-	size_t sampling_rate = 0;
-	switch(modulation) {
-	case ReceiverModel::Mode::AMAudio:				sampling_rate = 12000; break;
-	case ReceiverModel::Mode::NarrowbandFMAudio:	sampling_rate = 24000; break;
-	case ReceiverModel::Mode::WidebandFMAudio:		sampling_rate = 48000; break;
-	default:
-		break;
-	}
-	record_view.set_sampling_rate(sampling_rate);
-
-	if( !is_wideband_spectrum_mode ) {
-		audio::output::unmute();
-	}
+void AnalogAudioView::handle_coded_squelch(uint32_t value) {
+    text_ctcss.set(tone_key_string_by_value(value, text_ctcss.parent_rect().width() / 8));
 }
 
-/*void AnalogAudioView::squelched() {
-	if (exit_on_squelch) nav_.pop();
-}*/
-
-void AnalogAudioView::handle_coded_squelch(const uint32_t value) {
-	float diff, min_diff = value;
-	size_t min_idx { 0 };
-	size_t c;
-	
-	// Find nearest match
-	for (c = 0; c < tone_keys.size(); c++) {
-		diff = abs(((float)value / 100.0) - tone_keys[c].second);
-		if (diff < min_diff) {
-			min_idx = c;
-			min_diff = diff;
-		}
-	}
-	
-	// Arbitrary confidence threshold
-	if (min_diff < 40)
-		text_ctcss.set("CTCSS " + tone_keys[min_idx].first);
-	else
-		text_ctcss.set("???");
+void AnalogAudioView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
 }
-
 } /* namespace ui */

firmware/application/apps/analog_audio_app.hpp

@@ -26,189 +26,244 @@
 #include "receiver_model.hpp"
 
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_spectrum.hpp"
 #include "ui_record_view.hpp"
-
-#include "ui_font_fixed_8x16.hpp"
-
+#include "app_settings.hpp"
+#include "radio_state.hpp"
 #include "tone_key.hpp"
 
 namespace ui {
 
-constexpr Style style_options_group {
-	.font = font::fixed_8x16,
-	.background = Color::blue(),
-	.foreground = Color::white(),
-};
-
 class AMOptionsView : public View {
-public:
-	AMOptionsView(const Rect parent_rect, const Style* const style);
+   public:
+    AMOptionsView(Rect parent_rect, const Style* style);
 
-private:
-	Text label_config {
-		{ 0 * 8, 0 * 16, 2 * 8, 1 * 16 },
-		"BW",
-	};
+   private:
+    Text label_config{
+        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        "BW",
+    };
 
-	OptionsField options_config {
-		{ 3 * 8, 0 * 16 },
-		4,
-		{
-			{ "DSB ", 0 },
-			{ "USB ", 0 },
-			{ "LSB ", 0 },
-		}
-	};
+    OptionsField options_config{
+        {3 * 8, 0 * 16},
+        6,  // Max option length
+        {
+            // Using common messages from freqman_ui.cpp
+        }};
 };
 
 class NBFMOptionsView : public View {
-public:
-	NBFMOptionsView(const Rect parent_rect, const Style* const style);
+   public:
+    NBFMOptionsView(Rect parent_rect, const Style* style);
 
-private:
-	Text label_config {
-		{ 0 * 8, 0 * 16, 2 * 8, 1 * 16 },
-		"BW",
-	};
-	OptionsField options_config {
-		{ 3 * 8, 0 * 16 },
-		4,
-		{
-			{ " 8k5", 0 },
-			{ "11k ", 0 },
-			{ "16k ", 0 },
-		}
-	};
-	
-	Text text_squelch {
-		{ 9 * 8, 0 * 16, 8 * 8, 1 * 16 },
-		"SQ   /99"
-	};
-	NumberField field_squelch {
-		{ 12 * 8, 0 * 16 },
-		2,
-		{ 0, 99 },
-		1,
-		' ',
-	};
+   private:
+    Text label_config{
+        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        "BW",
+    };
+    OptionsField options_config{
+        {3 * 8, 0 * 16},
+        3,  // Max option length
+        {
+            // Using common messages from freqman_ui.cpp
+        }};
+
+    Text text_squelch{
+        {7 * 8, 0 * 16, 8 * 8, 1 * 16},
+        "SQ   /99"};
+    NumberField field_squelch{
+        {10 * 8, 0 * 16},
+        2,
+        {0, 99},
+        1,
+        ' ',
+    };
+};
+
+class WFMOptionsView : public View {
+   public:
+    WFMOptionsView(Rect parent_rect, const Style* style);
+
+   private:
+    Text label_config{
+        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        "BW",
+    };
+    OptionsField options_config{
+        {3 * 8, 0 * 16},
+        4,  // Max option length
+        {
+            // Using common messages from freqman_ui.cpp
+        }};
+};
+
+class AnalogAudioView;
+
+class SPECOptionsView : public View {
+   public:
+    SPECOptionsView(AnalogAudioView* view, Rect parent_rect, const Style* style);
+
+   private:
+    Text label_config{
+        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        "BW",
+    };
+    OptionsField options_config{
+        {3 * 8, 0 * 16},
+        4,
+        {
+            {"20m ", 20000000},
+            {"10m ", 10000000},
+            {" 5m ", 5000000},
+            {" 2m ", 2000000},
+            {" 1m ", 1000000},
+            {"500k", 500000},
+            {"100k", 100000},
+        }};
+
+    Text text_speed{
+        {9 * 8, 0 * 16, 8 * 8, 1 * 16},
+        "SP   /63"};
+    NumberField field_speed{
+        {12 * 8, 0 * 16},
+        2,
+        {0, 63},
+        1,
+        ' ',
+    };
+    Text text_rx_cal{
+        {19 * 8, 0 * 16, 11 * 8, 1 * 16},  // 18 (x col.) x char_size,  12 (length) x 8 blanking space to delete previous chars.
+        "Rx_IQ_CAL  "};
+    NumberField field_rx_iq_phase_cal{
+        {28 * 8, 0 * 16},
+        2,
+        {0, 63},  // 5 or 6 bits IQ CAL phase adjustment (range updated later)
+        1,
+        ' ',
+    };
 };
 
 class AnalogAudioView : public View {
-public:
-	AnalogAudioView(NavigationView& nav);
-	~AnalogAudioView();
+   public:
+    AnalogAudioView(NavigationView& nav);
+    AnalogAudioView(NavigationView& nav, ReceiverModel::settings_t override);
+    ~AnalogAudioView();
 
-	void on_hide() override;
+    void set_parent_rect(Rect new_parent_rect) override;
+    void focus() override;
 
-	void set_parent_rect(const Rect new_parent_rect) override;
+    std::string title() const override { return "Audio RX"; };
 
-	void focus() override;
+    size_t get_spec_bw_index();
+    void set_spec_bw(size_t index, uint32_t bw);
 
-	std::string title() const override { return "Analog audio"; };
-	
-private:
-	static constexpr ui::Dim header_height = 3 * 16;
+    uint16_t get_spec_trigger();
+    void set_spec_trigger(uint16_t trigger);
 
-	const Rect options_view_rect { 0 * 8, 1 * 16, 30 * 8, 1 * 16 };
-	const Rect nbfm_view_rect { 0 * 8, 1 * 16, 18 * 8, 1 * 16 };
+    uint8_t get_spec_iq_phase_calibration_value();
+    void set_spec_iq_phase_calibration_value(uint8_t cal_value);
 
-	NavigationView& nav_;
-	//bool exit_on_squelch { false };
-	
-	RSSI rssi {
-		{ 21 * 8, 0, 6 * 8, 4 },
-	};
+   private:
+    static constexpr ui::Dim header_height = 3 * 16;
 
-	Channel channel {
-		{ 21 * 8, 5, 6 * 8, 4 },
-	};
+    NavigationView& nav_;
+    RxRadioState radio_state_{};
+    uint8_t iq_phase_calibration_value{15};  // initial default RX IQ phase calibration value , used for both max2837 & max2839
+    app_settings::SettingsManager settings_{
+        "rx_audio",
+        app_settings::Mode::RX,
+        {
+            {"iq_phase_calibration"sv, &iq_phase_calibration_value},  // we are saving and restoring that CAL from Settings.
+        }};
 
-	Audio audio {
-		{ 21 * 8, 10, 6 * 8, 4 },
-	};
+    const Rect options_view_rect{0 * 8, 1 * 16, 30 * 8, 1 * 16};
+    const Rect nbfm_view_rect{0 * 8, 1 * 16, 18 * 8, 1 * 16};
 
-	FrequencyField field_frequency {
-		{ 5 * 8, 0 * 16 },
-	};
+    size_t spec_bw_index = 0;
+    uint32_t spec_bw = 20000000;
+    uint16_t spec_trigger = 63;
 
-	LNAGainField field_lna {
-		{ 15 * 8, 0 * 16 }
-	};
+    RSSI rssi{
+        {21 * 8, 0, 6 * 8, 4}};
 
-	VGAGainField field_vga {
-		{ 18 * 8, 0 * 16 }
-	};
+    Channel channel{
+        {21 * 8, 5, 6 * 8, 4}};
 
-	OptionsField options_modulation {
-		{ 0 * 8, 0 * 16 },
-		4,
-		{
-			{ " AM ", toUType(ReceiverModel::Mode::AMAudio) },
-			{ "NFM ", toUType(ReceiverModel::Mode::NarrowbandFMAudio) },
-			{ "WFM ", toUType(ReceiverModel::Mode::WidebandFMAudio) },
-			{ "SPEC", toUType(ReceiverModel::Mode::SpectrumAnalysis) },
-		}
-	};
+    Audio audio{
+        {21 * 8, 10, 6 * 8, 4}};
 
-	NumberField field_volume {
-		{ 28 * 8, 0 * 16 },
-		2,
-		{ 0, 99 },
-		1,
-		' ',
-	};
-	
-	Text text_ctcss {
-		{ 19 * 8, 1 * 16, 11 * 8, 1 * 16 },
-		""
-	};
+    RxFrequencyField field_frequency{
+        {5 * 8, 0 * 16},
+        nav_};
 
-	std::unique_ptr<Widget> options_widget { };
+    LNAGainField field_lna{
+        {15 * 8, 0 * 16}};
 
-	RecordView record_view {
-		{ 0 * 8, 2 * 16, 30 * 8, 1 * 16 },
-		u"AUD_????", RecordView::FileType::WAV, 4096, 4
-	};
+    VGAGainField field_vga{
+        {18 * 8, 0 * 16}};
 
-	spectrum::WaterfallWidget waterfall { true };
+    OptionsField options_modulation{
+        {0 * 8, 0 * 16},
+        4,
+        {
+            {" AM ", toUType(ReceiverModel::Mode::AMAudio)},
+            {"NFM ", toUType(ReceiverModel::Mode::NarrowbandFMAudio)},
+            {"WFM ", toUType(ReceiverModel::Mode::WidebandFMAudio)},
+            {"SPEC", toUType(ReceiverModel::Mode::SpectrumAnalysis)},
+        }};
 
-	void on_tuning_frequency_changed(rf::Frequency f);
-	void on_baseband_bandwidth_changed(uint32_t bandwidth_hz);
-	void on_modulation_changed(const ReceiverModel::Mode modulation);
-	void on_show_options_frequency();
-	void on_show_options_rf_gain();
-	void on_show_options_modulation();
-	void on_frequency_step_changed(rf::Frequency f);
-	void on_reference_ppm_correction_changed(int32_t v);
-	void on_headphone_volume_changed(int32_t v);
-	void on_edit_frequency();
+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
 
-	void remove_options_widget();
-	void set_options_widget(std::unique_ptr<Widget> new_widget);
+    Text text_ctcss{
+        {16 * 8, 1 * 16, 14 * 8, 1 * 16},
+        ""};
 
-	void update_modulation(const ReceiverModel::Mode modulation);
-	
-	//void squelched();
-	void handle_coded_squelch(const uint32_t value);
-	
-	/*MessageHandlerRegistration message_handler_squelch_signal {
-		Message::ID::RequestSignal,
-		[this](const Message* const p) {
-			(void)p;
-			this->squelched();
-		}
-	};*/
-	
-	MessageHandlerRegistration message_handler_coded_squelch {
-		Message::ID::CodedSquelch,
-		[this](const Message* const p) {
-			const auto message = *reinterpret_cast<const CodedSquelchMessage*>(p);
-			this->handle_coded_squelch(message.value);
-		}
-	};
+    std::unique_ptr<Widget> options_widget{};
+
+    RecordView record_view{
+        {0 * 8, 2 * 16, 30 * 8, 1 * 16},
+        u"AUD",
+        u"AUDIO",
+        RecordView::FileType::WAV,
+        4096,
+        4};
+
+    spectrum::WaterfallView waterfall{true};
+
+    void on_baseband_bandwidth_changed(uint32_t bandwidth_hz);
+    void on_modulation_changed(ReceiverModel::Mode modulation);
+    void on_show_options_frequency();
+    void on_show_options_rf_gain();
+    void on_show_options_modulation();
+    void on_frequency_step_changed(rf::Frequency f);
+    void on_reference_ppm_correction_changed(int32_t v);
+
+    void remove_options_widget();
+    void set_options_widget(std::unique_ptr<Widget> new_widget);
+
+    void update_modulation(ReceiverModel::Mode modulation);
+
+    void handle_coded_squelch(uint32_t value);
+
+    void on_freqchg(int64_t freq);
+
+    MessageHandlerRegistration message_handler_coded_squelch{
+        Message::ID::CodedSquelch,
+        [this](const Message* p) {
+            const auto message = *reinterpret_cast<const CodedSquelchMessage*>(p);
+            this->handle_coded_squelch(message.value);
+        }};
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
 };
 
 } /* namespace ui */
 
-#endif/*__ANALOG_AUDIO_APP_H__*/
+#endif /*__ANALOG_AUDIO_APP_H__*/

firmware/application/apps/analog_tv_app.cpp

@@ -1,238 +0,0 @@
-/*
- * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2018 Furrtek
- * Copyright (C) 2020 Shao
- *
- * 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 "analog_tv_app.hpp"
-
-#include "baseband_api.hpp"
-
-#include "portapack.hpp"
-#include "portapack_persistent_memory.hpp"
-using namespace portapack;
-using namespace tonekey;
-
-#include "audio.hpp"
-#include "file.hpp"
-
-#include "utility.hpp"
-
-#include "string_format.hpp"
-
-namespace ui {
-
-/* AnalogTvView *******************************************************/
-
-AnalogTvView::AnalogTvView(
-	NavigationView& nav
-) : nav_ (nav)
-{
-	add_children({
-		&rssi,
-		&channel,
-		&audio,
-		&field_frequency,
-		&field_lna,
-		&field_vga,
-		&options_modulation,
-		&field_volume,
-		&tv
-	});
-
-	field_frequency.set_value(receiver_model.tuning_frequency());
-	field_frequency.set_step(receiver_model.frequency_step());
-	field_frequency.on_change = [this](rf::Frequency f) {
-		this->on_tuning_frequency_changed(f);
-	};
-	field_frequency.on_edit = [this, &nav]() {
-		// TODO: Provide separate modal method/scheme?
-		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			this->on_tuning_frequency_changed(f);
-			this->field_frequency.set_value(f);
-		};
-	};
-
-	field_frequency.on_show_options = [this]() {
-		this->on_show_options_frequency();
-	};
-
-	field_lna.on_show_options = [this]() {
-		this->on_show_options_rf_gain();
-	};
-
-	field_vga.on_show_options = [this]() {
-		this->on_show_options_rf_gain();
-	};
-
-	const auto modulation = receiver_model.modulation();
-	options_modulation.set_by_value(toUType(ReceiverModel::Mode::WidebandFMAudio));
-	options_modulation.on_change = [this](size_t, OptionsField::value_t v) {
-		this->on_modulation_changed(static_cast<ReceiverModel::Mode>(v));
-	};
-	options_modulation.on_show_options = [this]() {
-		this->on_show_options_modulation();
-	};
-
-	field_volume.set_value(0);
-	field_volume.on_change = [this](int32_t v) {
-		this->on_headphone_volume_changed(v);
-	};
-	
-	tv.on_select = [this](int32_t offset) {
-		field_frequency.set_value(receiver_model.tuning_frequency() + offset);
-	};
-
-	update_modulation(static_cast<ReceiverModel::Mode>(modulation));
-        on_modulation_changed(ReceiverModel::Mode::WidebandFMAudio);
-}
-
-AnalogTvView::~AnalogTvView() {
-	// TODO: Manipulating audio codec here, and in ui_receiver.cpp. Good to do
-	// both?
-	audio::output::stop();
-
-	receiver_model.disable();
-
-	baseband::shutdown();
-}
-
-void AnalogTvView::on_hide() {
-	// TODO: Terrible kludge because widget system doesn't notify Waterfall that
-	// it's being shown or hidden.
-	tv.on_hide();
-	View::on_hide();
-}
-
-void AnalogTvView::set_parent_rect(const Rect new_parent_rect) {
-	View::set_parent_rect(new_parent_rect);
-	
-	const ui::Rect tv_rect { 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height };
-	tv.set_parent_rect(tv_rect);
-}
-
-void AnalogTvView::focus() {
-	field_frequency.focus();
-}
-
-void AnalogTvView::on_tuning_frequency_changed(rf::Frequency f) {
-	receiver_model.set_tuning_frequency(f);
-}
-
-void AnalogTvView::on_baseband_bandwidth_changed(uint32_t bandwidth_hz) {
-	receiver_model.set_baseband_bandwidth(bandwidth_hz);
-}
-
-void AnalogTvView::on_modulation_changed(const ReceiverModel::Mode modulation) {
-	// TODO: Terrible kludge because widget system doesn't notify Waterfall that
-	// it's being shown or hidden.
-	tv.on_hide();
-	update_modulation(modulation);
-	on_show_options_modulation();
-	tv.on_show();
-}
-
-void AnalogTvView::remove_options_widget() {
-	if( options_widget ) {
-		remove_child(options_widget.get());
-		options_widget.reset();
-	}
-	
-	field_lna.set_style(nullptr);
-	options_modulation.set_style(nullptr);
-	field_frequency.set_style(nullptr);
-}
-
-void AnalogTvView::set_options_widget(std::unique_ptr<Widget> new_widget) {
-	remove_options_widget();
-
-	if( new_widget ) {
-		options_widget = std::move(new_widget);
-	} else {
-		// TODO: Lame hack to hide options view due to my bad paint/damage algorithm.
-		options_widget = std::make_unique<Rectangle>(options_view_rect, style_options_group_new.background);
-	}
-	add_child(options_widget.get());
-}
-
-void AnalogTvView::on_show_options_frequency() {
-	auto widget = std::make_unique<FrequencyOptionsView>(options_view_rect, &style_options_group_new);
-
-	widget->set_step(receiver_model.frequency_step());
-	widget->on_change_step = [this](rf::Frequency f) {
-		this->on_frequency_step_changed(f);
-	};
-	widget->set_reference_ppm_correction(persistent_memory::correction_ppb() / 1000);
-	widget->on_change_reference_ppm_correction = [this](int32_t v) {
-		this->on_reference_ppm_correction_changed(v);
-	};
-
-	set_options_widget(std::move(widget));
-	field_frequency.set_style(&style_options_group_new);
-}
-
-void AnalogTvView::on_show_options_rf_gain() {
-	auto widget = std::make_unique<RadioGainOptionsView>(options_view_rect, &style_options_group_new);
-
-	set_options_widget(std::move(widget));
-	field_lna.set_style(&style_options_group_new);
-}
-
-void AnalogTvView::on_show_options_modulation() {
-	std::unique_ptr<Widget> widget;
-
-	const auto modulation = static_cast<ReceiverModel::Mode>(receiver_model.modulation());
-	tv.show_audio_spectrum_view(true);
-	
-	set_options_widget(std::move(widget));
-	options_modulation.set_style(&style_options_group_new);
-}
-
-void AnalogTvView::on_frequency_step_changed(rf::Frequency f) {
-	receiver_model.set_frequency_step(f);
-	field_frequency.set_step(f);
-}
-
-void AnalogTvView::on_reference_ppm_correction_changed(int32_t v) {
-	persistent_memory::set_correction_ppb(v * 1000);
-}
-
-void AnalogTvView::on_headphone_volume_changed(int32_t v) {
-	//tv::TVView::set_headphone_volume(this,v);
-}
-
-void AnalogTvView::update_modulation(const ReceiverModel::Mode modulation) {
-	audio::output::mute();
-
-	baseband::shutdown();
-
-	portapack::spi_flash::image_tag_t image_tag;
-	image_tag = portapack::spi_flash::image_tag_am_tv;	
-
-	baseband::run_image(image_tag);
-
-	receiver_model.set_modulation(modulation);
-        receiver_model.set_sampling_rate(2000000);
-        receiver_model.set_baseband_bandwidth(2000000);
-	receiver_model.enable();
-}
-
-} /* namespace ui */

firmware/application/apps/analog_tv_app.hpp

@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2018 Furrtek
- * Copyright (C) 2020 Shao
- *
- * 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 __ANALOG_TV_APP_H__
-#define __ANALOG_TV_APP_H__
-
-#include "receiver_model.hpp"
-
-#include "ui_receiver.hpp"
-#include "ui_tv.hpp"
-#include "ui_record_view.hpp"
-
-#include "ui_font_fixed_8x16.hpp"
-
-#include "tone_key.hpp"
-
-namespace ui {
-
-constexpr Style style_options_group_new {
-	.font = font::fixed_8x16,
-	.background = Color::blue(),
-	.foreground = Color::white(),
-};
-
-class AnalogTvView : public View {
-public:
-	AnalogTvView(NavigationView& nav);
-	~AnalogTvView();
-
-	void on_hide() override;
-
-	void set_parent_rect(const Rect new_parent_rect) override;
-
-	void focus() override;
-
-	std::string title() const override { return "Analog TV"; };
-	
-private:
-	static constexpr ui::Dim header_height = 3 * 16;
-
-	const Rect options_view_rect { 0 * 8, 1 * 16, 30 * 8, 1 * 16 };
-	const Rect nbfm_view_rect { 0 * 8, 1 * 16, 18 * 8, 1 * 16 };
-
-	NavigationView& nav_;
-	
-	RSSI rssi {
-		{ 21 * 8, 0, 6 * 8, 4 },
-	};
-
-	Channel channel {
-		{ 21 * 8, 5, 6 * 8, 4 },
-	};
-
-	Audio audio {
-		{ 21 * 8, 10, 6 * 8, 4 },
-	};
-
-	FrequencyField field_frequency {
-		{ 5 * 8, 0 * 16 },
-	};
-
-	LNAGainField field_lna {
-		{ 15 * 8, 0 * 16 }
-	};
-
-	VGAGainField field_vga {
-		{ 18 * 8, 0 * 16 }
-	};
-
-	OptionsField options_modulation {
-		{ 0 * 8, 0 * 16 },
-		4,
-		{
-			{ "TV ", toUType(ReceiverModel::Mode::WidebandFMAudio) },
-			{ "TV ", toUType(ReceiverModel::Mode::WidebandFMAudio) },
-			{ "TV ", toUType(ReceiverModel::Mode::WidebandFMAudio) },
-		}
-	};
-
-	NumberField field_volume {
-		{ 27 * 8, 0 * 16 },
-		3,
-		{ 0, 255 },
-		1,
-		' ',
-	};
-
-	std::unique_ptr<Widget> options_widget { };
-
-	tv::TVWidget tv { true };
-
-	void on_tuning_frequency_changed(rf::Frequency f);
-	void on_baseband_bandwidth_changed(uint32_t bandwidth_hz);
-	void on_modulation_changed(const ReceiverModel::Mode modulation);
-	void on_show_options_frequency();
-	void on_show_options_rf_gain();
-	void on_show_options_modulation();
-	void on_frequency_step_changed(rf::Frequency f);
-	void on_reference_ppm_correction_changed(int32_t v);
-	void on_headphone_volume_changed(int32_t v);
-	void on_edit_frequency();
-
-	void remove_options_widget();
-	void set_options_widget(std::unique_ptr<Widget> new_widget);
-
-	void update_modulation(const ReceiverModel::Mode modulation);
-	
-
-};
-
-} /* namespace ui */
-
-#endif/*__ANALOG_TV_APP_H__*/

firmware/application/apps/ble_comm_app.cpp

@@ -0,0 +1,332 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2023 TJ Baginski
+ *
+ * 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 "ble_comm_app.hpp"
+
+#include "ui_modemsetup.hpp"
+
+#include "modems.hpp"
+#include "audio.hpp"
+#include "rtc_time.hpp"
+#include "baseband_api.hpp"
+#include "string_format.hpp"
+#include "portapack_persistent_memory.hpp"
+#include "ui_text.hpp"
+#include "file_path.hpp"
+
+using namespace portapack;
+using namespace modems;
+
+void BLECommLogger::log_raw_data(const std::string& data) {
+    log_file.write_entry(data);
+}
+
+namespace ui {
+static std::uint64_t get_freq_by_channel_number(uint8_t channel_number) {
+    uint64_t freq_hz;
+
+    switch (channel_number) {
+        case 37:
+            freq_hz = 2'402'000'000ull;
+            break;
+        case 38:
+            freq_hz = 2'426'000'000ull;
+            break;
+        case 39:
+            freq_hz = 2'480'000'000ull;
+            break;
+        case 0 ... 10:
+            freq_hz = 2'404'000'000ull + channel_number * 2'000'000ull;
+            break;
+        case 11 ... 36:
+            freq_hz = 2'428'000'000ull + (channel_number - 11) * 2'000'000ull;
+            break;
+        default:
+            freq_hz = UINT64_MAX;
+    }
+
+    return freq_hz;
+}
+
+void BLECommView::focus() {
+    options_channel.focus();
+}
+
+BLECommView::BLECommView(NavigationView& nav)
+    : nav_{nav} {
+    add_children({&rssi,
+                  &channel,
+                  &field_rf_amp,
+                  &field_lna,
+                  &field_vga,
+                  &options_channel,
+                  &field_frequency,
+                  &label_send_adv,
+                  &button_send_adv,
+                  &check_log,
+                  &label_packets_sent,
+                  &text_packets_sent,
+                  &console});
+
+    field_frequency.set_step(0);
+
+    button_send_adv.on_select = [this](ImageButton&) {
+        this->toggle();
+    };
+
+    check_log.set_value(logging);
+
+    check_log.on_select = [this](Checkbox&, bool v) {
+        str_log = "";
+        logging = v;
+
+        if (logger && logging)
+            logger->append(logs_dir.string() + "/BLELOG_" + to_string_timestamp(rtc_time::now()) + ".TXT");
+    };
+
+    options_channel.on_change = [this](size_t, int32_t i) {
+        // If we selected Auto don't do anything and Auto will handle changing.
+        if (i == 40) {
+            auto_channel = true;
+            return;
+        } else {
+            auto_channel = false;
+        }
+
+        field_frequency.set_value(get_freq_by_channel_number(i));
+        channel_number_rx = i;
+        channel_number_tx = i;
+    };
+
+    options_channel.set_selected_index(3, true);
+
+    logger = std::make_unique<BLECommLogger>();
+
+    // Generate new random Mac Address upon each new startup.
+    generateRandomMacAddress(randomMac);
+
+    // Setup Initial Advertise Packet.
+    advertisePacket = build_adv_packet();
+}
+
+void BLECommView::set_parent_rect(const Rect new_parent_rect) {
+    View::set_parent_rect(new_parent_rect);
+    const Rect content_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height};
+    console.set_parent_rect(content_rect);
+}
+
+BLECommView::~BLECommView() {
+    receiver_model.disable();
+    transmitter_model.disable();
+    baseband::shutdown();
+}
+
+bool BLECommView::in_tx_mode() const {
+    return (bool)is_running_tx;
+}
+
+void BLECommView::toggle() {
+    if (in_tx_mode()) {
+        sendAdvertisement(false);
+    } else {
+        sendAdvertisement(true);
+    }
+}
+
+BLETxPacket BLECommView::build_adv_packet() {
+    BLETxPacket bleTxPacket;
+    memset(&bleTxPacket, 0, sizeof(BLETxPacket));
+
+    std::string dataString = "11094861636b524620506f7274617061636b";
+
+    strncpy(bleTxPacket.macAddress, randomMac, 12);
+    strncpy(bleTxPacket.advertisementData, dataString.c_str(), dataString.length());
+
+    // Duty cycle of 40% per 100ms advertisment periods.
+    strncpy(bleTxPacket.packetCount, "80", 3);
+    bleTxPacket.packet_count = 80;
+
+    bleTxPacket.packetType = PKT_TYPE_DISCOVERY;
+
+    return bleTxPacket;
+}
+
+void BLECommView::sendAdvertisement(bool enable) {
+    if (enable) {
+        startTx(advertisePacket);
+        is_adv = true;
+    } else {
+        is_adv = false;
+        stopTx();
+    }
+}
+
+void BLECommView::startTx(BLETxPacket packetToSend) {
+    int randomChannel = channel_number_tx;
+
+    if (auto_channel) {
+        int min = 37;
+        int max = 39;
+
+        randomChannel = min + std::rand() % (max - min + 1);
+
+        field_frequency.set_value(get_freq_by_channel_number(randomChannel));
+    }
+
+    if (!in_tx_mode()) {
+        switch_rx_tx(false);
+
+        currentPacket = packetToSend;
+        packet_counter = currentPacket.packet_count;
+
+        button_send_adv.set_bitmap(&bitmap_stop);
+        baseband::set_btletx(randomChannel, currentPacket.macAddress, currentPacket.advertisementData, currentPacket.packetType);
+        transmitter_model.set_tx_gain(47);
+        transmitter_model.enable();
+
+        is_running_tx = true;
+    } else {
+        baseband::set_btletx(randomChannel, currentPacket.macAddress, currentPacket.advertisementData, currentPacket.packetType);
+    }
+
+    if ((packet_counter % 10) == 0) {
+        text_packets_sent.set(to_string_dec_uint(packet_counter));
+    }
+
+    is_sending = true;
+
+    packet_counter--;
+}
+
+void BLECommView::stopTx() {
+    button_send_adv.set_bitmap(&bitmap_play);
+    text_packets_sent.set(to_string_dec_uint(packet_counter));
+
+    switch_rx_tx(true);
+
+    baseband::set_btlerx(channel_number_rx);
+    receiver_model.enable();
+
+    is_running_tx = false;
+}
+
+void BLECommView::switch_rx_tx(bool inRxMode) {
+    if (inRxMode) {
+        // Start Rx
+        transmitter_model.disable();
+        baseband::shutdown();
+        baseband::run_image(portapack::spi_flash::image_tag_btle_rx);
+    } else {
+        // Start Tx
+        receiver_model.disable();
+        baseband::shutdown();
+        baseband::run_image(portapack::spi_flash::image_tag_btle_tx);
+    }
+}
+
+void BLECommView::on_data(BlePacketData* packet) {
+    parse_received_packet(packet, (ADV_PDU_TYPE)packet->type);
+}
+
+// called each 1/60th of second, so 6 = 100ms
+void BLECommView::on_timer() {
+    // Send advertise burst only once every 100ms
+    if (++timer_counter == timer_period) {
+        timer_counter = 0;
+
+        if (!is_adv) {
+            sendAdvertisement(true);
+        }
+    }
+}
+
+void BLECommView::on_tx_progress(const bool done) {
+    if (done) {
+        if (in_tx_mode()) {
+            is_sending = false;
+
+            if (packet_counter == 0) {
+                if (is_adv) {
+                    sendAdvertisement(false);
+                } else {
+                    stopTx();
+                }
+            } else {
+                startTx(currentPacket);
+            }
+        }
+    }
+}
+
+void BLECommView::parse_received_packet(const BlePacketData* packet, ADV_PDU_TYPE pdu_type) {
+    std::string data_string;
+
+    int i;
+
+    for (i = 0; i < packet->dataLen; i++) {
+        data_string += to_string_hex(packet->data[i], 2);
+    }
+
+    receivedPacket.dbValue = packet->max_dB;
+    receivedPacket.timestamp = to_string_timestamp(rtc_time::now());
+    receivedPacket.dataString = data_string;
+
+    receivedPacket.packetData.type = packet->type;
+    receivedPacket.packetData.size = packet->size;
+    receivedPacket.packetData.dataLen = packet->dataLen;
+
+    receivedPacket.packetData.macAddress[0] = packet->macAddress[0];
+    receivedPacket.packetData.macAddress[1] = packet->macAddress[1];
+    receivedPacket.packetData.macAddress[2] = packet->macAddress[2];
+    receivedPacket.packetData.macAddress[3] = packet->macAddress[3];
+    receivedPacket.packetData.macAddress[4] = packet->macAddress[4];
+    receivedPacket.packetData.macAddress[5] = packet->macAddress[5];
+
+    receivedPacket.numHits++;
+
+    for (int i = 0; i < packet->dataLen; i++) {
+        receivedPacket.packetData.data[i] = packet->data[i];
+    }
+
+    if (pdu_type == SCAN_REQ || pdu_type == CONNECT_REQ) {
+        ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data;
+
+        std::reverse(directed_mac_data->A1, directed_mac_data->A1 + 6);
+        console.clear(true);
+        std::string str_console = "";
+        std::string pduTypeStr = "";
+
+        if (pdu_type == SCAN_REQ) {
+            pduTypeStr += "SCAN_REQ";
+        } else if (pdu_type == CONNECT_REQ) {
+            pduTypeStr += "CONNECT_REQ";
+        }
+
+        str_console += "PACKET TYPE:" + pduTypeStr + "\n";
+        str_console += "MY MAC:" + to_string_formatted_mac_address(randomMac) + "\n";
+        str_console += "SCAN MAC:" + to_string_mac_address(directed_mac_data->A1, 6, false) + "\n";
+        console.write(str_console);
+    }
+}
+
+} /* namespace ui */

firmware/application/apps/ble_comm_app.hpp

@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2023 TJ Baginski
+ *
+ * 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 __BLE_COMM_APP_H__
+#define __BLE_COMM_APP_H__
+
+#include "ble_rx_app.hpp"
+#include "ble_tx_app.hpp"
+
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "ui_transmitter.hpp"
+#include "ui_freq_field.hpp"
+#include "ui_record_view.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "log_file.hpp"
+#include "utility.hpp"
+
+#include "recent_entries.hpp"
+
+class BLECommLogger {
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
+
+    void log_raw_data(const std::string& data);
+
+   private:
+    LogFile log_file{};
+};
+
+namespace ui {
+class BLECommView : public View {
+   public:
+    BLECommView(NavigationView& nav);
+    ~BLECommView();
+
+    void set_parent_rect(const Rect new_parent_rect) override;
+    void paint(Painter&) override{};
+
+    void focus() override;
+
+    std::string title() const override { return "BLE Comm"; };
+
+   private:
+    BLETxPacket build_adv_packet();
+    void switch_rx_tx(bool inRxMode);
+    void startTx(BLETxPacket packetToSend);
+    void stopTx();
+    void toggle();
+    bool in_tx_mode() const;
+    void on_timer();
+    void on_data(BlePacketData* packetData);
+    void on_tx_progress(const bool done);
+    void parse_received_packet(const BlePacketData* packet, ADV_PDU_TYPE pdu_type);
+    void sendAdvertisement(bool enable);
+
+    NavigationView& nav_;
+
+    RxRadioState radio_state_rx_{
+        2'402'000'000 /* frequency */,
+        4'000'000 /* bandwidth */,
+        4'000'000 /* sampling rate */,
+        ReceiverModel::Mode::WidebandFMAudio};
+
+    TxRadioState radio_state_tx_{
+        2'402'000'000 /* frequency */,
+        4'000'000 /* bandwidth */,
+        4'000'000 /* sampling rate */
+    };
+
+    app_settings::SettingsManager settings_{
+        "BLE Comm Tx", app_settings::Mode::RX_TX};
+
+    uint8_t console_color{0};
+    uint32_t prev_value{0};
+
+    uint8_t channel_number_tx = 37;
+    uint8_t channel_number_rx = 37;
+    bool auto_channel = false;
+
+    char randomMac[13] = "010203040506";
+
+    bool is_running_tx = false;
+    bool is_sending = false;
+    bool is_adv = false;
+
+    int16_t timer_period{6};  // Delay each packet by 16ms.
+    int16_t timer_counter = 0;
+    int16_t timer_rx_counter = 0;
+    int16_t timer_rx_period{12};  // Poll Rx for at least 200ms. (TBD)
+
+    uint32_t packet_counter{0};
+    BLETxPacket advertisePacket{};
+    BLETxPacket currentPacket{};
+    BleRecentEntry receivedPacket{};
+
+    static constexpr auto header_height = 5 * 16;
+
+    OptionsField options_channel{
+        {0 * 8, 0 * 8},
+        5,
+        {{"Ch.37 ", 37},
+         {"Ch.38", 38},
+         {"Ch.39", 39},
+         {"Auto", 40}}};
+
+    RxFrequencyField field_frequency{
+        {6 * 8, 0 * 16},
+        nav_};
+
+    RFAmpField field_rf_amp{
+        {16 * 8, 0 * 16}};
+
+    LNAGainField field_lna{
+        {18 * 8, 0 * 16}};
+
+    VGAGainField field_vga{
+        {21 * 8, 0 * 16}};
+
+    RSSI rssi{
+        {24 * 8, 0, 6 * 8, 4}};
+
+    Channel channel{
+        {24 * 8, 5, 6 * 8, 4}};
+
+    Labels label_send_adv{
+        {{0 * 8, 2 * 8}, "Send Advertisement:", Theme::getInstance()->fg_light->foreground}};
+
+    ImageButton button_send_adv{
+        {21 * 8, 1 * 16, 10 * 8, 2 * 16},
+        &bitmap_play,
+        Theme::getInstance()->fg_green->foreground,
+        Theme::getInstance()->fg_green->background};
+
+    Checkbox check_log{
+        {24 * 8, 2 * 8},
+        3,
+        "Log",
+        true};
+
+    Labels label_packets_sent{
+        {{0 * 8, 4 * 8}, "Packets Left:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_packets_sent{
+        {13 * 8, 2 * 16, 12 * 8, 16},
+        "-"};
+
+    Console console{
+        {0, 4 * 16, 240, 240}};
+
+    std::string str_log{""};
+    bool logging{false};
+
+    std::unique_ptr<BLECommLogger> logger{};
+
+    MessageHandlerRegistration message_handler_packet{
+        Message::ID::BlePacket,
+        [this](Message* const p) {
+            const auto message = static_cast<const BLEPacketMessage*>(p);
+            this->on_data(message->packet);
+        }};
+
+    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.done);
+        }};
+
+    MessageHandlerRegistration message_handler_frame_sync{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->on_timer();
+        }};
+};
+
+} /* namespace ui */
+
+#endif /*__UI_AFSK_RX_H__*/

firmware/application/apps/ble_rx_app.cpp

@@ -0,0 +1,962 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2023 TJ Baginski
+ *
+ * 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 "ble_rx_app.hpp"
+#include "ble_rx_app.hpp"
+#include "ui_modemsetup.hpp"
+
+#include "modems.hpp"
+#include "audio.hpp"
+#include "io_file.hpp"
+#include "rtc_time.hpp"
+#include "baseband_api.hpp"
+#include "string_format.hpp"
+#include "portapack_persistent_memory.hpp"
+#include "ui_fileman.hpp"
+#include "ui_textentry.hpp"
+
+using namespace portapack;
+using namespace modems;
+namespace fs = std::filesystem;
+
+void BLELogger::log_raw_data(const std::string& data) {
+    log_file.write_entry(data);
+}
+
+std::string pad_string_with_spaces(int snakes) {
+    std::string paddedStr(snakes, ' ');
+    return paddedStr;
+}
+
+uint64_t copy_mac_address_to_uint64(const uint8_t* macAddress) {
+    uint64_t result = 0;
+
+    // Copy each byte of the MAC address to the corresponding byte in the uint64_t.
+    for (int i = 0; i < 6; ++i) {
+        result |= static_cast<uint64_t>(macAddress[i]) << ((5 - i) * 8);
+    }
+
+    return result;
+}
+
+void reverse_byte_array(uint8_t* arr, int length) {
+    int start = 0;
+    int end = length - 1;
+
+    while (start < end) {
+        // Swap elements at start and end
+        uint8_t temp = arr[start];
+        arr[start] = arr[end];
+        arr[end] = temp;
+
+        // Move the indices towards the center
+        start++;
+        end--;
+    }
+}
+
+namespace ui {
+
+std::string pdu_type_to_string(ADV_PDU_TYPE type) {
+    std::string pduTypeStr = "";
+
+    switch (type) {
+        case ADV_IND:
+            pduTypeStr += "ADV_IND";
+            break;
+        case ADV_DIRECT_IND:
+            pduTypeStr += "ADV_DIRECT_IND";
+            break;
+        case ADV_NONCONN_IND:
+            pduTypeStr += "ADV_NONCONN_IND";
+            break;
+        case SCAN_REQ:
+            pduTypeStr += "SCAN_REQ";
+            break;
+        case SCAN_RSP:
+            pduTypeStr += "SCAN_RSP";
+            break;
+        case CONNECT_REQ:
+            pduTypeStr += "CONNECT_REQ";
+            break;
+        case ADV_SCAN_IND:
+            pduTypeStr += "ADV_SCAN_IND";
+            break;
+        case RESERVED0:
+        case RESERVED1:
+        case RESERVED2:
+        case RESERVED3:
+        case RESERVED4:
+        case RESERVED5:
+        case RESERVED6:
+        case RESERVED7:
+        case RESERVED8:
+            pduTypeStr += "RESERVED";
+            break;
+        default:
+            pduTypeStr += "UNKNOWN";
+            break;
+    }
+
+    return pduTypeStr;
+}
+
+template <>
+void RecentEntriesTable<BleRecentEntries>::draw(
+    const Entry& entry,
+    const Rect& target_rect,
+    Painter& painter,
+    const Style& style) {
+    std::string line{};
+    line.reserve(30);
+
+    if (!entry.nameString.empty() && entry.include_name) {
+        line = entry.nameString;
+
+        if (line.length() < 17) {
+            line += pad_string_with_spaces(17 - line.length());
+        } else {
+            line = truncate(line, 17);
+        }
+    } else {
+        line = to_string_mac_address(entry.packetData.macAddress, 6, false);
+    }
+
+    // Pushing single digit values down right justified.
+    std::string hitsStr = to_string_dec_int(entry.numHits);
+    int hitsDigits = hitsStr.length();
+    uint8_t hits_spacing = 8 - hitsDigits;
+
+    // Pushing single digit values down right justified.
+    std::string dbStr = to_string_dec_int(entry.dbValue);
+    int dbDigits = dbStr.length();
+    uint8_t db_spacing = 5 - dbDigits;
+
+    line += pad_string_with_spaces(hits_spacing) + hitsStr;
+
+    line += pad_string_with_spaces(db_spacing) + dbStr;
+
+    line.resize(target_rect.width() / 8, ' ');
+    painter.draw_string(target_rect.location(), style, line);
+}
+
+BleRecentEntryDetailView::BleRecentEntryDetailView(NavigationView& nav, const BleRecentEntry& entry)
+    : nav_{nav},
+      entry_{entry} {
+    add_children({&button_done,
+                  &button_send,
+                  &button_save,
+                  &label_mac_address,
+                  &text_mac_address,
+                  &label_pdu_type,
+                  &text_pdu_type,
+                  &labels});
+
+    text_mac_address.set(to_string_mac_address(entry.packetData.macAddress, 6, false));
+    text_pdu_type.set(pdu_type_to_string(entry.pduType));
+
+    button_done.on_select = [&nav](const ui::Button&) {
+        nav.pop();
+    };
+
+    button_send.on_select = [this, &nav](const ui::Button&) {
+        auto packetToSend = build_packet();
+        nav.set_on_pop([packetToSend, &nav]() {
+            nav.replace<BLETxView>(packetToSend);
+        });
+        nav.pop();
+    };
+
+    button_save.on_select = [this, &nav](const ui::Button&) {
+        auto packetToSave = build_packet();
+
+        packetFileBuffer = "";
+        text_prompt(
+            nav,
+            packetFileBuffer,
+            64,
+            [this, packetToSave](std::string& buffer) {
+                on_save_file(buffer, packetToSave);
+            });
+    };
+}
+
+void BleRecentEntryDetailView::on_save_file(const std::string value, BLETxPacket packetToSave) {
+    ensure_directory(packet_save_path);
+    auto folder = packet_save_path.parent_path();
+    auto ext = packet_save_path.extension();
+    auto new_path = folder / value + ext;
+
+    saveFile(new_path, packetToSave);
+}
+
+bool BleRecentEntryDetailView::saveFile(const std::filesystem::path& path, BLETxPacket packetToSave) {
+    File f;
+    auto error = f.create(path);
+    if (error)
+        return false;
+
+    std::string macAddressStr = packetToSave.macAddress;
+    std::string advertisementDataStr = packetToSave.advertisementData;
+    std::string packetCountStr = packetToSave.packetCount;
+
+    std::string packetString = macAddressStr + ' ' + advertisementDataStr + ' ' + packetCountStr;
+
+    f.write(packetString.c_str(), packetString.length());
+
+    return true;
+}
+
+void BleRecentEntryDetailView::update_data() {
+}
+
+void BleRecentEntryDetailView::focus() {
+    button_done.focus();
+}
+
+Rect BleRecentEntryDetailView::draw_field(
+    Painter& painter,
+    const Rect& draw_rect,
+    const Style& style,
+    const std::string& label,
+    const std::string& value) {
+    const int label_length_max = 4;
+
+    painter.draw_string(Point{draw_rect.left(), draw_rect.top()}, style, label);
+    painter.draw_string(Point{draw_rect.left() + (label_length_max + 1) * 8, draw_rect.top()}, style, value);
+
+    return {draw_rect.left(), draw_rect.top() + draw_rect.height(), draw_rect.width(), draw_rect.height()};
+}
+
+void BleRecentEntryDetailView::paint(Painter& painter) {
+    View::paint(painter);
+
+    const auto s = style();
+    const auto rect = screen_rect();
+
+    auto field_rect = Rect{rect.left(), rect.top() + 64, rect.width(), 16};
+
+    uint8_t type[total_data_lines];
+    uint8_t length[total_data_lines];
+    uint8_t data[total_data_lines][40];
+
+    int currentByte = 0;
+    int currentPacket = 0;
+    int i = 0;
+    int j = 0;
+    int k = 0;
+
+    switch (entry_.pduType) {
+        case ADV_IND:
+        case ADV_NONCONN_IND:
+        case SCAN_RSP:
+        case ADV_SCAN_IND: {
+            ADV_PDU_PAYLOAD_TYPE_0_2_4_6* advertiseData = (ADV_PDU_PAYLOAD_TYPE_0_2_4_6*)entry_.packetData.data;
+
+            for (currentByte = 0; (currentByte < entry_.packetData.dataLen) && (currentPacket < total_data_lines);) {
+                length[currentPacket] = advertiseData->Data[currentByte++];
+                type[currentPacket] = advertiseData->Data[currentByte++];
+
+                // Subtract 1 because type is part of the length.
+                for (i = 0; i < length[currentPacket] - 1; i++) {
+                    data[currentPacket][i] = advertiseData->Data[currentByte++];
+                }
+
+                currentPacket++;
+            }
+
+            for (i = 0; i < currentPacket; i++) {
+                uint8_t number_data_lines = ceil((float)(length[i] - 1) / 10.0);
+                uint8_t current_line = 0;
+                std::array<std::string, total_data_lines> data_strings{};
+
+                for (j = 0; (j < (number_data_lines * 10)) && (j < length[i] - 1); j++) {
+                    if ((j / 10) != current_line) {
+                        current_line++;
+                    }
+
+                    data_strings[current_line] += to_string_hex(data[i][j], 2);
+                }
+
+                // Read the type back to the total length.
+                field_rect = draw_field(painter, field_rect, s, to_string_hex(length[i]), to_string_hex(type[i]) + pad_string_with_spaces(3) + data_strings[0]);
+
+                if (number_data_lines > 1) {
+                    for (k = 1; k < number_data_lines; k++) {
+                        if (!data_strings[k].empty()) {
+                            field_rect = draw_field(painter, field_rect, s, "", pad_string_with_spaces(5) + data_strings[k]);
+                        }
+                    }
+                }
+            }
+        } break;
+
+        case ADV_DIRECT_IND:
+        case SCAN_REQ: {
+            ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)entry_.packetData.data;
+            uint8_t type = 0xFF;
+            field_rect = draw_field(painter, field_rect, s, to_string_hex(entry_.packetData.dataLen), to_string_hex(type) + pad_string_with_spaces(3) + to_string_mac_address(directed_mac_data->A1, 6, false));
+        } break;
+
+        case CONNECT_REQ:
+        default: {
+            uint8_t type = 0xFF;
+
+            // TODO: Display Connect Request Information. For right now just printing full hex data.
+            // This struct will eventually be used to break apart containing data of Connect Request.
+            // ADV_PDU_PAYLOAD_TYPE_5 * connect_req = (ADV_PDU_PAYLOAD_TYPE_5 *)entry_.packetData.data;
+
+            for (currentByte = 0; (currentByte < entry_.packetData.dataLen); currentByte++) {
+                data[0][currentByte] = entry_.packetData.data[currentByte];
+            }
+
+            uint8_t number_data_lines = ceil((float)entry_.packetData.dataLen / 10.0);
+            uint8_t current_line = 0;
+            std::array<std::string, total_data_lines> data_strings{};
+
+            for (j = 0; (j < (number_data_lines * 10)) && (j < entry_.packetData.dataLen); j++) {
+                if ((j / 10) != current_line) {
+                    current_line++;
+                }
+
+                data_strings[current_line] += to_string_hex(data[0][j], 2);
+            }
+
+            field_rect = draw_field(painter, field_rect, s, to_string_hex(entry_.packetData.dataLen), to_string_hex(type) + pad_string_with_spaces(3) + data_strings[0]);
+
+            if (number_data_lines > 1) {
+                for (k = 1; k < number_data_lines; k++) {
+                    if (!data_strings[k].empty()) {
+                        field_rect = draw_field(painter, field_rect, s, "", pad_string_with_spaces(5) + data_strings[k]);
+                    }
+                }
+            }
+        } break;
+    }
+}
+
+void BleRecentEntryDetailView::set_entry(const BleRecentEntry& entry) {
+    entry_ = entry;
+    set_dirty();
+}
+
+BLETxPacket BleRecentEntryDetailView::build_packet() {
+    BLETxPacket bleTxPacket;
+    memset(&bleTxPacket, 0, sizeof(BLETxPacket));
+
+    std::string macAddressStr = to_string_mac_address(entry_.packetData.macAddress, 6, true);
+
+    strncpy(bleTxPacket.macAddress, macAddressStr.c_str(), 12);
+    strncpy(bleTxPacket.advertisementData, entry_.dataString.c_str(), entry_.packetData.dataLen * 2);
+    strncpy(bleTxPacket.packetCount, "50", 3);
+    bleTxPacket.packet_count = 50;
+
+    return bleTxPacket;
+}
+
+static std::uint64_t get_freq_by_channel_number(uint8_t channel_number) {
+    uint64_t freq_hz;
+
+    switch (channel_number) {
+        case 37:
+            freq_hz = 2'402'000'000ull;
+            break;
+        case 38:
+            freq_hz = 2'426'000'000ull;
+            break;
+        case 39:
+            freq_hz = 2'480'000'000ull;
+            break;
+        case 0 ... 10:
+            freq_hz = 2'404'000'000ull + channel_number * 2'000'000ull;
+            break;
+        case 11 ... 36:
+            freq_hz = 2'428'000'000ull + (channel_number - 11) * 2'000'000ull;
+            break;
+        default:
+            freq_hz = UINT64_MAX;
+    }
+
+    return freq_hz;
+}
+
+void BLERxView::focus() {
+    options_channel.focus();
+}
+
+void BLERxView::file_error() {
+    nav_.display_modal("Error", "File read error.");
+}
+
+BLERxView::BLERxView(NavigationView& nav)
+    : nav_{nav} {
+    baseband::run_image(portapack::spi_flash::image_tag_btle_rx);
+
+    add_children({&rssi,
+                  &channel,
+                  &field_rf_amp,
+                  &field_lna,
+                  &field_vga,
+                  &options_channel,
+                  &field_frequency,
+                  &check_log,
+                  &button_find,
+                  &check_name,
+                  &label_sort,
+                  &options_sort,
+                  &label_found,
+                  &text_found_count,
+                  &check_serial_log,
+                  &button_filter,
+                  &options_filter,
+                  &button_save_list,
+                  &button_clear_list,
+                  &button_switch,
+                  &recent_entries_view});
+
+    recent_entries_view.on_select = [this](const BleRecentEntry& entry) {
+        nav_.push<BleRecentEntryDetailView>(entry);
+    };
+
+    check_serial_log.on_select = [this](Checkbox&, bool v) {
+        serial_logging = v;
+        if (v) {
+            usb_serial_thread = std::make_unique<UsbSerialThread>();
+        } else {
+            usb_serial_thread.reset();
+        }
+    };
+    check_serial_log.set_value(serial_logging);
+
+    ensure_directory(find_packet_path);
+    ensure_directory(log_packets_path);
+    ensure_directory(packet_save_path);
+
+    filterBuffer = filter;
+
+    button_filter.on_select = [this](Button&) {
+        text_prompt(
+            nav_,
+            filterBuffer,
+            64,
+            [this](std::string& buffer) {
+                on_filter_change(buffer);
+            });
+    };
+
+    logger = std::make_unique<BLELogger>();
+
+    check_log.on_select = [this](Checkbox&, bool v) {
+        str_log = "";
+        logging = v;
+
+        if (logger && logging)
+            logger->append(blerx_dir.string() + "/Logs/BLELOG_" + to_string_timestamp(rtc_time::now()) + ".TXT");
+    };
+    check_log.set_value(logging);
+
+    button_save_list.on_select = [this, &nav](const ui::Button&) {
+        listFileBuffer = "";
+        text_prompt(
+            nav,
+            listFileBuffer,
+            64,
+            [this](std::string& buffer) {
+                on_save_file(buffer);
+            });
+    };
+
+    button_clear_list.on_select = [this](Button&) {
+        recent.clear();
+    };
+
+    button_switch.on_select = [&nav](Button&) {
+        nav.replace<BLETxView>();
+    };
+
+    field_frequency.set_step(0);
+
+    check_name.set_value(name_enable);
+
+    check_name.on_select = [this](Checkbox&, bool v) {
+        name_enable = v;
+        // update the include_name instance variable value of each entry in recent entries
+        setAllMembersToValue(recent, &BleRecentEntry::include_name, v);
+        recent_entries_view.set_dirty();
+    };
+
+    options_channel.on_change = [this](size_t index, int32_t v) {
+        channel_index = (uint8_t)index;
+
+        // If we selected Auto don't do anything and Auto will handle changing.
+        if (v == 40) {
+            auto_channel = true;
+            return;
+        } else {
+            auto_channel = false;
+        }
+
+        field_frequency.set_value(get_freq_by_channel_number(v));
+        channel_number = v;
+
+        baseband::set_btlerx(channel_number);
+    };
+
+    options_sort.on_change = [this](size_t index, int32_t v) {
+        sort_index = (uint8_t)index;
+        handle_entries_sort(v);
+    };
+
+    options_filter.on_change = [this](size_t index, int32_t v) {
+        filter_index = (uint8_t)index;
+        handle_filter_options(v);
+    };
+
+    options_channel.set_selected_index(channel_index, true);
+    options_sort.set_selected_index(sort_index, true);
+    options_filter.set_selected_index(filter_index, true);
+
+    button_find.on_select = [this](Button&) {
+        auto open_view = nav_.push<FileLoadView>(".TXT");
+        open_view->on_changed = [this](std::filesystem::path new_file_path) {
+            on_file_changed(new_file_path);
+
+            // nav_.set_on_pop([this]() { button_play.focus(); });
+        };
+    };
+
+    // Auto-configure modem for LCR RX (will be removed later)
+    baseband::set_btlerx(channel_number);
+
+    receiver_model.enable();
+}
+
+std::string BLERxView::build_line_str(BleRecentEntry entry) {
+    std::string macAddressStr = to_string_mac_address(entry.packetData.macAddress, 6, false) + ",";
+    std::string timestameStr = entry.timestamp + ",";
+    std::string nameStr = entry.nameString + ",";
+    std::string pduStr = pdu_type_to_string(entry.pduType) + ",";
+    std::string dataStr = "0x" + entry.dataString + ",";
+    std::string hitsStr = to_string_dec_int(entry.numHits) + ",";
+    std::string dbStr = to_string_dec_int(entry.dbValue) + ",";
+    std::string channelStr = to_string_dec_int(entry.channelNumber) + ",";
+
+    std::string lineStr = timestameStr + macAddressStr + nameStr + pduStr + dataStr + hitsStr + dbStr + channelStr;
+    lineStr += pad_string_with_spaces(maxLineLength - lineStr.length());
+
+    return lineStr;
+}
+
+void BLERxView::on_save_file(const std::string value) {
+    auto folder = packet_save_path.parent_path();
+    auto ext = packet_save_path.extension();
+    auto new_path = folder / value + ext;
+
+    saveFile(new_path);
+}
+
+bool BLERxView::saveFile(const std::filesystem::path& path) {
+    // Check to see if file was previously saved.
+    bool file_existed = file_exists(path);
+
+    // Attempt to open, if it can't be opened. Create new.
+    auto src = std::make_unique<File>();
+    auto error = src->open(path, false, true);
+
+    if (error) {
+        return false;
+    }
+
+    for (const auto& entry : recent) {
+        tempList.emplace_back(entry);
+    }
+
+    if (!file_existed) {
+        src->write_line(headerStr.c_str());
+
+        auto it = tempList.begin();
+
+        while (it != tempList.end()) {
+            BleRecentEntry entry = (BleRecentEntry)*it;
+            src->write_line(build_line_str(entry).c_str());
+            it++;
+        }
+    } else {
+        // Check file for macAddressStr before adding.
+        char currentLine[maxLineLength];
+        uint64_t startPos = headerStr.length();
+        uint64_t bytesRead = 0;
+        uint64_t bytePos = 0;
+
+        File::Size currentSize = src->size();
+
+        auto dst = std::make_unique<File>();
+        const std::filesystem::path tempFilePath = path + "~";
+        auto error = dst->open(tempFilePath, false, true);
+
+        if (error) {
+            return false;
+        }
+
+        dst->write_line(headerStr.c_str());
+
+        src->seek(startPos);
+
+        // Look for ones found and rewrite.
+        do {
+            memset(currentLine, 0, maxLineLength);
+
+            bytesRead = readUntil(*src, currentLine, currentSize, '\n');
+
+            if (!bytesRead) {
+                break;
+            }
+
+            bytePos += bytesRead;
+
+            std::string lineStr = "";
+            std::string macAddressStr = "";
+            BleRecentEntry foundEntry;
+
+            char* token;
+            token = strtok(currentLine, ",");
+
+            while (token != NULL) {
+                auto it = tempList.begin();
+
+                while (it != tempList.end()) {
+                    BleRecentEntry& entry = reinterpret_cast<BleRecentEntry&>(*it);
+
+                    macAddressStr = to_string_mac_address(entry.packetData.macAddress, 6, false);
+
+                    if (strstr(token, macAddressStr.c_str()) != NULL) {
+                        entry.entryFound = true;
+                        foundEntry = entry;
+                        break;
+                    }
+
+                    it++;
+                }
+
+                if (foundEntry.entryFound) {
+                    break;
+                }
+
+                token = strtok(NULL, ",");
+            }
+
+            if (foundEntry.entryFound) {
+                dst->write_line(build_line_str(foundEntry).c_str());
+            }
+
+        } while (bytePos <= currentSize);
+
+        // Write the ones not found.
+        auto it = tempList.begin();
+
+        while (it != tempList.end()) {
+            BleRecentEntry entry = (BleRecentEntry)*it;
+
+            if (!entry.entryFound) {
+                dst->write_line(build_line_str(entry).c_str());
+            }
+
+            it++;
+        }
+
+        // Close files before renaming/deleting.
+        src.reset();
+        dst.reset();
+
+        // Delete original and overwrite with temp file.
+        delete_file(path);
+        rename_file(tempFilePath, path);
+    }
+
+    tempList.clear();
+
+    return true;
+}
+
+void BLERxView::on_data(BlePacketData* packet) {
+    if (!logging) {
+        str_log = "";
+    }
+
+    str_console += pdu_type_to_string((ADV_PDU_TYPE)packet->type);
+    str_console += " Len:";
+    str_console += to_string_dec_uint(packet->size);
+    str_console += " Mac:";
+    str_console += to_string_mac_address(packet->macAddress, 6, false);
+    str_console += " Data:";
+
+    int i;
+
+    for (i = 0; i < packet->dataLen; i++) {
+        str_console += to_string_hex(packet->data[i], 2);
+    }
+
+    uint64_t macAddressEncoded = copy_mac_address_to_uint64(packet->macAddress);
+
+    // Start of Packet stuffing.
+    // Masking off the top 2 bytes to avoid invalid keys.
+    auto& entry = ::on_packet(recent, macAddressEncoded & 0xFFFFFFFFFFFF);
+    updateEntry(packet, entry, (ADV_PDU_TYPE)packet->type);
+
+    // Add entries if they meet the criteria.
+    // auto value = filter;
+    // resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
+    //     return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
+    // });
+    handle_filter_options(options_filter.selected_index());
+
+    handle_entries_sort(options_sort.selected_index());
+
+    // Log at End of Packet.
+    if (logger && logging) {
+        logger->log_raw_data(str_console + "\r\n");
+    }
+
+    if (serial_logging) {
+        usb_serial_thread->serial_str = str_console + "\r\n";
+        usb_serial_thread->str_ready = true;
+    }
+    str_console = "";
+
+    if (!searchList.empty()) {
+        auto it = searchList.begin();
+
+        while (it != searchList.end()) {
+            std::string searchStr = (std::string)*it;
+
+            if (entry.dataString.find(searchStr) != std::string::npos) {
+                searchList.erase(it);
+                found_count++;
+                break;
+            }
+
+            it++;
+        }
+
+        text_found_count.set(to_string_dec_uint(found_count) + "/" + to_string_dec_uint(total_count));
+    }
+}
+
+void BLERxView::on_filter_change(std::string value) {
+    // New filter? Reset list from recent entries.
+    if (filter != value) {
+        // resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
+        //     // return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
+        //     return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos) && (to_string_mac_address(entry.packetData.macAddress, 6, false).find(value) == std::string::npos);
+        // });
+        filter = value;
+        handle_filter_options(options_filter.selected_index());
+    }
+}
+
+void BLERxView::on_file_changed(const std::filesystem::path& new_file_path) {
+    file_path = new_file_path;
+    found_count = 0;
+    total_count = 0;
+    searchList.clear();
+
+    {  // Get the size of the data file.
+        File data_file;
+        auto error = data_file.open(file_path, true, false);
+        if (error) {
+            file_error();
+            file_path = "";
+            return;
+        }
+
+        uint64_t bytesRead = 0;
+        uint64_t bytePos = 0;
+        char currentLine[maxLineLength];
+
+        do {
+            memset(currentLine, 0, maxLineLength);
+
+            bytesRead = readUntil(data_file, currentLine, maxLineLength, '\n');
+
+            // Remove return if found.
+            if (currentLine[strlen(currentLine)] == '\r') {
+                currentLine[strlen(currentLine)] = '\0';
+            }
+
+            if (!bytesRead) {
+                break;
+            }
+
+            searchList.push_back(currentLine);
+            total_count++;
+
+            bytePos += bytesRead;
+
+        } while (bytePos <= data_file.size());
+    }
+}
+
+// called each 1/60th of second, so 6 = 100ms
+void BLERxView::on_timer() {
+    if (++timer_count == timer_period) {
+        timer_count = 0;
+
+        if (auto_channel) {
+            int min = 37;
+            int max = 39;
+
+            int randomChannel = min + std::rand() % (max - min + 1);
+
+            field_frequency.set_value(get_freq_by_channel_number(randomChannel));
+            baseband::set_btlerx(randomChannel);
+        }
+    }
+}
+
+void BLERxView::handle_entries_sort(uint8_t index) {
+    switch (index) {
+        case 0:
+            sortEntriesBy(
+                recent, [](const BleRecentEntry& entry) { return entry.macAddress; }, true);
+            break;
+        case 1:
+            sortEntriesBy(
+                recent, [](const BleRecentEntry& entry) { return entry.numHits; }, false);
+            break;
+        case 2:
+            sortEntriesBy(
+                recent, [](const BleRecentEntry& entry) { return entry.dbValue; }, false);
+            break;
+        case 3:
+            sortEntriesBy(
+                recent, [](const BleRecentEntry& entry) { return entry.timestamp; }, false);
+            break;
+        case 4:
+            sortEntriesBy(
+                recent, [](const BleRecentEntry& entry) { return entry.nameString; }, true);
+            break;
+        default:
+            break;
+    }
+
+    recent_entries_view.set_dirty();
+}
+
+void BLERxView::handle_filter_options(uint8_t index) {
+    auto value = filter;
+    switch (index) {
+        case 0:  // filter by Data
+            resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
+                return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
+            });
+            break;
+        case 1:  // filter by MAC address (All caps: e.g. AA:BB:CC:DD:EE:FF)
+            resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
+                return (to_string_mac_address(entry.packetData.macAddress, 6, false).find(value) == std::string::npos);
+            });
+            break;
+        default:
+            break;
+    }
+}
+
+void BLERxView::set_parent_rect(const Rect new_parent_rect) {
+    View::set_parent_rect(new_parent_rect);
+    const Rect content_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height - switch_button_height};
+    recent_entries_view.set_parent_rect(content_rect);
+}
+
+BLERxView::~BLERxView() {
+    receiver_model.disable();
+    baseband::shutdown();
+}
+
+void BLERxView::updateEntry(const BlePacketData* packet, BleRecentEntry& entry, ADV_PDU_TYPE pdu_type) {
+    std::string data_string;
+
+    int i;
+
+    for (i = 0; i < packet->dataLen; i++) {
+        data_string += to_string_hex(packet->data[i], 2);
+    }
+
+    entry.dbValue = packet->max_dB;
+    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;
+
+    // Mac Address of sender.
+    entry.packetData.macAddress[0] = packet->macAddress[0];
+    entry.packetData.macAddress[1] = packet->macAddress[1];
+    entry.packetData.macAddress[2] = packet->macAddress[2];
+    entry.packetData.macAddress[3] = packet->macAddress[3];
+    entry.packetData.macAddress[4] = packet->macAddress[4];
+    entry.packetData.macAddress[5] = packet->macAddress[5];
+
+    entry.numHits++;
+    entry.pduType = pdu_type;
+    entry.channelNumber = channel_number;
+
+    // Parse Data Section into buffer to be interpretted later.
+    for (int i = 0; i < packet->dataLen; i++) {
+        entry.packetData.data[i] = packet->data[i];
+    }
+
+    entry.include_name = check_name.value();
+
+    // Only parse name for advertisment packets and empty name entries
+    if ((pdu_type == ADV_IND || pdu_type == ADV_NONCONN_IND || pdu_type == SCAN_RSP || pdu_type == ADV_SCAN_IND) && entry.nameString.empty()) {
+        ADV_PDU_PAYLOAD_TYPE_0_2_4_6* advertiseData = (ADV_PDU_PAYLOAD_TYPE_0_2_4_6*)entry.packetData.data;
+
+        uint8_t currentByte = 0;
+        uint8_t length = 0;
+        uint8_t type = 0;
+
+        std::string decoded_data;
+        for (currentByte = 0; (currentByte < entry.packetData.dataLen);) {
+            length = advertiseData->Data[currentByte++];
+            type = advertiseData->Data[currentByte++];
+
+            // Subtract 1 because type is part of the length.
+            for (int i = 0; i < length - 1; i++) {
+                // parse the name of bluetooth device: 0x08->Shortened Local Name; 0x09->Complete Local Name
+                if (type == 0x08 || type == 0x09) {
+                    decoded_data += (char)advertiseData->Data[currentByte];
+                }
+                currentByte++;
+            }
+            if (!decoded_data.empty()) {
+                entry.nameString = std::move(decoded_data);
+                break;
+            }
+        }
+    } else if (pdu_type == ADV_DIRECT_IND || pdu_type == SCAN_REQ) {
+        ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)entry.packetData.data;
+        reverse_byte_array(directed_mac_data->A1, 6);
+    }
+}
+
+} /* namespace ui */

firmware/application/apps/ble_rx_app.hpp

@@ -0,0 +1,387 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2023 TJ Baginski
+ *
+ * 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 __BLE_RX_APP_H__
+#define __BLE_RX_APP_H__
+
+#include "ble_tx_app.hpp"
+
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
+#include "ui_record_view.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "log_file.hpp"
+#include "utility.hpp"
+#include "usb_serial_thread.hpp"
+#include "file_path.hpp"
+
+#include "recent_entries.hpp"
+
+class BLELogger {
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
+
+    void log_raw_data(const std::string& data);
+
+   private:
+    LogFile log_file{};
+};
+
+namespace ui {
+typedef enum {
+    ADV_IND = 0,
+    ADV_DIRECT_IND = 1,
+    ADV_NONCONN_IND = 2,
+    SCAN_REQ = 3,
+    SCAN_RSP = 4,
+    CONNECT_REQ = 5,
+    ADV_SCAN_IND = 6,
+    RESERVED0 = 7,
+    RESERVED1 = 8,
+    RESERVED2 = 9,
+    RESERVED3 = 10,
+    RESERVED4 = 11,
+    RESERVED5 = 12,
+    RESERVED6 = 13,
+    RESERVED7 = 14,
+    RESERVED8 = 15
+} ADV_PDU_TYPE;
+
+struct BleRecentEntry {
+    using Key = uint64_t;
+
+    static constexpr Key invalid_key = 0xffffffff;
+
+    uint64_t macAddress;
+    int dbValue;
+    BlePacketData packetData;
+    std::string timestamp;
+    std::string dataString;
+    std::string nameString;
+    bool include_name;
+    uint16_t numHits;
+    ADV_PDU_TYPE pduType;
+    uint8_t channelNumber;
+    bool entryFound;
+
+    BleRecentEntry()
+        : BleRecentEntry{0} {
+    }
+
+    BleRecentEntry(
+        const uint64_t macAddress)
+        : macAddress{macAddress},
+          dbValue{},
+          packetData{},
+          timestamp{},
+          dataString{},
+          nameString{},
+          include_name{},
+          numHits{},
+          pduType{},
+          channelNumber{},
+          entryFound{} {
+    }
+
+    Key key() const {
+        return macAddress;
+    }
+};
+
+using BleRecentEntries = RecentEntries<BleRecentEntry>;
+using BleRecentEntriesView = RecentEntriesView<BleRecentEntries>;
+
+class BleRecentEntryDetailView : public View {
+   public:
+    BleRecentEntryDetailView(NavigationView& nav, const BleRecentEntry& entry);
+
+    void set_entry(const BleRecentEntry& new_entry);
+    const BleRecentEntry& entry() const { return entry_; };
+
+    void update_data();
+    void focus() override;
+    void paint(Painter&) override;
+
+   private:
+    NavigationView& nav_;
+    BleRecentEntry entry_{};
+    BLETxPacket build_packet();
+    void on_save_file(const std::string value, BLETxPacket packetToSave);
+    bool saveFile(const std::filesystem::path& path, BLETxPacket packetToSave);
+    std::string packetFileBuffer{};
+    std::filesystem::path packet_save_path{blerx_dir / u"Lists/????.csv"};
+
+    static constexpr uint8_t total_data_lines{5};
+
+    Labels label_mac_address{
+        {{0 * 8, 0 * 16}, "Mac Address:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_mac_address{
+        {12 * 8, 0 * 16, 17 * 8, 16},
+        "-"};
+
+    Labels label_pdu_type{
+        {{0 * 8, 1 * 16}, "PDU Type:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_pdu_type{
+        {9 * 8, 1 * 16, 17 * 8, 16},
+        "-"};
+
+    Labels labels{
+        {{0 * 8, 3 * 16}, "Len", Theme::getInstance()->fg_light->foreground},
+        {{5 * 8, 3 * 16}, "Type", Theme::getInstance()->fg_light->foreground},
+        {{10 * 8, 3 * 16}, "Value", Theme::getInstance()->fg_light->foreground},
+    };
+
+    Button button_send{
+        {19, 224, 96, 24},
+        "Send"};
+
+    Button button_done{
+        {125, 224, 96, 24},
+        "Done"};
+
+    Button button_save{
+        {72, 264, 96, 24},
+        "Save"};
+
+    bool send_updates{false};
+
+    Rect draw_field(
+        Painter& painter,
+        const Rect& draw_rect,
+        const Style& style,
+        const std::string& label,
+        const std::string& value);
+};
+
+class BLERxView : public View {
+   public:
+    BLERxView(NavigationView& nav);
+    ~BLERxView();
+
+    void set_parent_rect(const Rect new_parent_rect) override;
+    void paint(Painter&) override{};
+
+    void focus() override;
+
+    std::string title() const override { return "BLE RX"; };
+
+   private:
+    std::string build_line_str(BleRecentEntry entry);
+    void on_save_file(const std::string value);
+    bool saveFile(const std::filesystem::path& path);
+    std::unique_ptr<UsbSerialThread> usb_serial_thread{};
+    void on_data(BlePacketData* packetData);
+    void on_filter_change(std::string value);
+    void on_file_changed(const std::filesystem::path& new_file_path);
+    void file_error();
+    void on_timer();
+    void handle_entries_sort(uint8_t index);
+    void handle_filter_options(uint8_t index);
+    void updateEntry(const BlePacketData* packet, BleRecentEntry& entry, ADV_PDU_TYPE pdu_type);
+
+    NavigationView& nav_;
+    RxRadioState radio_state_{
+        2402000000 /* frequency */,
+        4000000 /* bandwidth */,
+        4000000 /* sampling rate */,
+        ReceiverModel::Mode::WidebandFMAudio};
+
+    uint8_t channel_index{0};
+    uint8_t sort_index{0};
+    uint8_t filter_index{0};
+    std::string filter{};
+    bool logging{false};
+    bool serial_logging{false};
+
+    bool name_enable{true};
+    app_settings::SettingsManager settings_{
+        "rx_ble",
+        app_settings::Mode::RX,
+        {
+            {"channel_index"sv, &channel_index},
+            {"sort_index"sv, &sort_index},
+            {"filter"sv, &filter},
+            {"log"sv, &logging},
+            {"filter_index"sv, &filter_index},
+            // disabled to always start without USB serial activated until we can make it non blocking if not connected
+            // {"serial_log"sv, &serial_logging},
+            {"name"sv, &name_enable},
+        }};
+
+    std::string str_console = "";
+    uint8_t console_color{0};
+    uint32_t prev_value{0};
+    uint8_t channel_number = 37;
+    bool auto_channel = false;
+
+    int16_t timer_count{0};
+    int16_t timer_period{6};  // 100ms
+
+    std::string filterBuffer{};
+    std::string listFileBuffer{};
+    std::string headerStr = "Timestamp, MAC Address, Name, Packet Type, Data, Hits, dB, Channel";
+    uint16_t maxLineLength = 140;
+
+    std::filesystem::path file_path{};
+    uint64_t found_count = 0;
+    uint64_t total_count = 0;
+    std::vector<std::string> searchList{};
+
+    std::filesystem::path find_packet_path{blerx_dir / u"Find/????.TXT"};
+    std::filesystem::path log_packets_path{blerx_dir / u"Logs/????.TXT"};
+    std::filesystem::path packet_save_path{blerx_dir / u"Lists/????.csv"};
+
+    static constexpr auto header_height = 9 * 8;
+    static constexpr auto switch_button_height = 3 * 16;
+
+    OptionsField options_channel{
+        {0 * 8, 0 * 8},
+        5,
+        {{"Ch.37", 37},
+         {"Ch.38", 38},
+         {"Ch.39", 39},
+         {"Auto", 40}}};
+
+    RxFrequencyField field_frequency{
+        {6 * 8, 0 * 16},
+        nav_};
+
+    RFAmpField field_rf_amp{
+        {16 * 8, 0 * 16}};
+
+    LNAGainField field_lna{
+        {18 * 8, 0 * 16}};
+
+    VGAGainField field_vga{
+        {21 * 8, 0 * 16}};
+
+    RSSI rssi{
+        {24 * 8, 0, 6 * 8, 4}};
+
+    Channel channel{
+        {24 * 8, 5, 6 * 8, 4}};
+
+    Labels label_sort{
+        {{0 * 8, 2 * 8}, "Sort:", Theme::getInstance()->fg_light->foreground}};
+
+    OptionsField options_sort{
+        {5 * 8, 2 * 8},
+        4,
+        {{"MAC", 0},
+         {"Hits", 1},
+         {"dB", 2},
+         {"Time", 3},
+         {"Name", 4}}};
+
+    Button button_filter{
+        {11 * 8, 2 * 8, 7 * 8, 16},
+        "Filter:"};
+
+    OptionsField options_filter{
+        {18 * 8 + 2, 2 * 8},
+        4,
+        {{"Data", 0},
+         {"MAC", 1}}};
+
+    Checkbox check_log{
+        {10 * 8, 4 * 8 + 2},
+        3,
+        "Log",
+        true};
+
+    Checkbox check_name{
+        {0 * 8, 4 * 8 + 2},
+        3,
+        "Name",
+        true};
+
+    Button button_find{
+        {0 * 8, 7 * 8 - 2, 4 * 8, 16},
+        "Find"};
+
+    Labels label_found{
+        {{5 * 8, 7 * 8 - 2}, "Found:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_found_count{
+        {11 * 8, 7 * 8 - 2, 20 * 8, 16},
+        "0/0"};
+
+    Checkbox check_serial_log{
+        {18 * 8 + 2, 4 * 8 + 2},
+        7,
+        "USB Log",
+        true};
+
+    // Console console{
+    //     {0, 10 * 8, 240, 240}};
+
+    Button button_clear_list{
+        {2 * 8, 320 - (16 + 32), 7 * 8, 32},
+        "Clear"};
+
+    Button button_save_list{
+        {11 * 8, 320 - (16 + 32), 11 * 8, 32},
+        "Export CSV"};
+
+    Button button_switch{
+        {240 - 6 * 8, 320 - (16 + 32), 4 * 8, 32},
+        "Tx"};
+
+    std::string str_log{""};
+    std::unique_ptr<BLELogger> logger{};
+
+    BleRecentEntries recent{};
+    BleRecentEntries tempList{};
+
+    const RecentEntriesColumns columns{{
+        {"Mac Address", 17},
+        {"Hits", 7},
+        {"dB", 4},
+    }};
+
+    BleRecentEntriesView recent_entries_view{columns, recent};
+
+    MessageHandlerRegistration message_handler_packet{
+        Message::ID::BlePacket,
+        [this](Message* const p) {
+            const auto message = static_cast<const BLEPacketMessage*>(p);
+            this->on_data(message->packet);
+        }};
+
+    MessageHandlerRegistration message_handler_frame_sync{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->on_timer();
+        }};
+}; /* BLERxView */
+
+} /* namespace ui */
+
+#endif /*__UI_AFSK_RX_H__*/

firmware/application/apps/ble_tx_app.cpp

@@ -0,0 +1,562 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2023 TJ Baginski
+ *
+ * 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 "ble_tx_app.hpp"
+#include "ble_rx_app.hpp"
+
+#include "ui_fileman.hpp"
+#include "ui_modemsetup.hpp"
+
+#include "audio.hpp"
+#include "baseband_api.hpp"
+#include "io_file.hpp"
+#include "modems.hpp"
+#include "portapack_persistent_memory.hpp"
+#include "rtc_time.hpp"
+#include "string_format.hpp"
+#include "file_path.hpp"
+
+using namespace portapack;
+using namespace modems;
+namespace fs = std::filesystem;
+
+void BLELoggerTx::log_raw_data(const std::string& data) {
+    log_file.write_entry(data);
+}
+
+bool hasValidHexPairs(const std::string& str, int totalPairs) {
+    int validPairs = 0;
+
+    for (int i = 0; i < totalPairs * 2; i += 2) {
+        char c1 = str[i];
+        char c2 = str[i + 1];
+
+        if (!(std::isxdigit(c1) && std::isxdigit(c2))) {
+            return false;  // Return false if any pair is invalid.
+        }
+
+        validPairs++;
+    }
+
+    return (validPairs == totalPairs);
+}
+
+std::vector<std::string> splitIntoStrings(const char* input) {
+    std::vector<std::string> result;
+    int length = std::strlen(input);
+    int start = 0;
+
+    while (start < length) {
+        int remaining = length - start;
+        int chunkSize = (remaining > 29) ? 29 : remaining;
+        result.push_back(std::string(input + start, chunkSize));
+        start += chunkSize;
+    }
+
+    return result;
+}
+
+uint32_t stringToUint32(const std::string& str) {
+    size_t pos = 0;
+    uint32_t result = 0;
+
+    while (pos < str.size() && std::isdigit(str[pos])) {
+        int digit = str[pos] - '0';
+
+        // Check for overflow before adding the next digit
+        if (result > (UINT32_MAX - digit) / 10) {
+            return 0;
+        }
+
+        result = result * 10 + digit;
+        pos++;
+    }
+
+    return result;
+}
+
+static std::uint64_t get_freq_by_channel_number(uint8_t channel_number) {
+    uint64_t freq_hz;
+
+    switch (channel_number) {
+        case 37:
+            freq_hz = 2'402'000'000ull;
+            break;
+        case 38:
+            freq_hz = 2'426'000'000ull;
+            break;
+        case 39:
+            freq_hz = 2'480'000'000ull;
+            break;
+        case 0 ... 10:
+            freq_hz = 2'404'000'000ull + channel_number * 2'000'000ull;
+            break;
+        case 11 ... 36:
+            freq_hz = 2'428'000'000ull + (channel_number - 11) * 2'000'000ull;
+            break;
+        default:
+            freq_hz = UINT64_MAX;
+    }
+
+    return freq_hz;
+}
+
+namespace ui {
+
+void BLETxView::focus() {
+    button_open.focus();
+}
+
+bool BLETxView::is_active() const {
+    return (bool)is_running;
+}
+
+void BLETxView::file_error() {
+    nav_.display_modal("Error", "File read error.");
+}
+
+bool BLETxView::saveFile(const std::filesystem::path& path) {
+    File f;
+    auto error = f.create(path);
+    if (error)
+        return false;
+
+    for (uint32_t i = 0; i < num_packets; i++) {
+        std::string macAddressStr = packets[i].macAddress;
+        std::string advertisementDataStr = packets[i].advertisementData;
+        std::string packetCountStr = packets[i].packetCount;
+
+        std::string packetString = macAddressStr + ' ' + advertisementDataStr + ' ' + packetCountStr;
+
+        // Are we on the last line?
+        if (i != num_packets - 1) {
+            packetString += '\n';
+        }
+
+        f.write(packetString.c_str(), packetString.length());
+    }
+
+    return true;
+}
+
+void BLETxView::toggle() {
+    if (is_active()) {
+        stop();
+    } else {
+        start();
+    }
+}
+
+void BLETxView::start() {
+    baseband::run_image(portapack::spi_flash::image_tag_btle_tx);
+    transmitter_model.enable();
+
+    // Generate new random Mac Address.
+    generateRandomMacAddress(randomMac);
+
+    // If this is our first run, check file.
+    if (!is_active()) {
+        File data_file;
+
+        auto error = data_file.open(file_path);
+        if (error && !file_override) {
+            file_error();
+            check_loop.set_value(false);
+            return;
+        }
+
+        button_play.set_bitmap(&bitmap_stop);
+        is_running = true;
+    }
+
+    char advertisementData[63] = {0};
+    strcpy(advertisementData, packets[current_packet].advertisementData);
+
+    // TODO: Make this a checkbox.
+    if (!markedBytes.empty()) {
+        for (size_t i = 0; i < strlen(advertisementData); i++) {
+            bool found = false;
+
+            auto it = std::find(markedBytes.begin(), markedBytes.end(), i);
+
+            if (it != markedBytes.end()) {
+                found = true;
+            }
+
+            if (found) {
+                uint8_t hexDigit;
+                switch (marked_data_sequence.selected_index_value()) {
+                    case 0:
+                        hexDigit = marked_counter++;
+                        break;
+                    case 1:
+                        hexDigit = marked_counter--;
+                        break;
+                    case 2: {
+                        uint8_t min = 0x00;
+                        uint8_t max = 0x0F;
+
+                        hexDigit = min + std::rand() % (max - min + 1);
+                    } break;
+                    default:
+                        hexDigit = 0;
+                        break;
+                }
+
+                advertisementData[i] = uint_to_char(hexDigit, 16);
+
+                // Bounding to Hex.
+                if (marked_counter == 16) {
+                    marked_counter = 0;
+                } else if (marked_counter == 255) {
+                    marked_counter = 15;
+                }
+            }
+        }
+    }
+
+    // Setup next packet configuration.
+    progressbar.set_max(packets[current_packet].packet_count);
+    baseband::set_btletx(channel_number, random_mac ? randomMac : packets[current_packet].macAddress, advertisementData, pduType);
+}
+
+void BLETxView::stop() {
+    transmitter_model.disable();
+    baseband::shutdown();
+
+    progressbar.set_value(0);
+    button_play.set_bitmap(&bitmap_play);
+    check_loop.set_value(false);
+
+    update_current_packet(packets[0], 0);
+
+    is_running = false;
+}
+
+void BLETxView::reset() {
+    transmitter_model.disable();
+    baseband::shutdown();
+
+    start();
+}
+
+// called each 1/60th of second, so 6 = 100ms
+void BLETxView::on_timer() {
+    if (++timer_count == timer_period) {
+        timer_count = 0;
+
+        if (is_active()) {
+            // Reached end of current packet repeats.
+            if (packet_counter == 0) {
+                // Done sending all packets.
+                if (current_packet == (num_packets - 1)) {
+                    current_packet = 0;
+
+                    // If looping, restart from beginning.
+                    if (check_loop.value()) {
+                        update_current_packet(packets[current_packet], current_packet);
+                        reset();
+                    } else {
+                        stop();
+                    }
+                } else {
+                    current_packet++;
+                    update_current_packet(packets[current_packet], current_packet);
+                    reset();
+                }
+            } else {
+                reset();
+            }
+        }
+    }
+
+    if (++auto_channel_counter == auto_channel_period) {
+        auto_channel_counter = 0;
+
+        if (auto_channel) {
+            int min = 37;
+            int max = 39;
+
+            channel_number = min + std::rand() % (max - min + 1);
+
+            field_frequency.set_value(get_freq_by_channel_number(channel_number));
+        }
+    }
+}
+
+void BLETxView::on_tx_progress(const bool done) {
+    if (done) {
+        if (is_active()) {
+            if ((packet_counter % 10) == 0) {
+                text_packets_sent.set(to_string_dec_uint(packet_counter));
+            }
+
+            packet_counter--;
+            progressbar.set_value(packets[current_packet].packet_count - packet_counter);
+        }
+    }
+}
+
+BLETxView::BLETxView(NavigationView& nav)
+    : nav_{nav} {
+    add_children({&button_open,
+                  &text_filename,
+                  &progressbar,
+                  &check_rand_mac,
+                  &field_frequency,
+                  &tx_view,  // now it handles previous rfgain, rfamp.
+                  &check_loop,
+                  &button_play,
+                  &label_speed,
+                  &options_speed,
+                  &options_channel,
+                  &options_adv_type,
+                  &label_marked_data,
+                  &marked_data_sequence,
+                  &label_packet_index,
+                  &text_packet_index,
+                  &label_packets_sent,
+                  &text_packets_sent,
+                  &label_mac_address,
+                  &text_mac_address,
+                  &label_data_packet,
+                  &dataEditView,
+                  &button_clear_marked,
+                  &button_save_packet,
+                  &button_switch});
+
+    field_frequency.set_step(0);
+
+    ensure_directory(packet_save_path);
+
+    button_play.on_select = [this](ImageButton&) {
+        this->toggle();
+    };
+
+    options_channel.on_change = [this](size_t, int32_t i) {
+        // If we selected Auto don't do anything and Auto will handle changing.
+        if (i == 40) {
+            auto_channel = true;
+            return;
+        } else {
+            auto_channel = false;
+        }
+
+        field_frequency.set_value(get_freq_by_channel_number(i));
+        channel_number = i;
+    };
+
+    options_speed.on_change = [this](size_t, int32_t i) {
+        timer_period = i;
+        timer_count = 0;
+    };
+
+    options_adv_type.on_change = [this](size_t, int32_t i) {
+        pduType = (PKT_TYPE)i;
+    };
+
+    options_speed.set_selected_index(0);
+    options_channel.set_selected_index(0);
+    options_adv_type.set_selected_index(0);
+
+    check_rand_mac.set_value(false);
+    check_rand_mac.on_select = [this](Checkbox&, bool v) {
+        random_mac = v;
+    };
+
+    button_open.on_select = [this](Button&) {
+        auto open_view = nav_.push<FileLoadView>(".TXT");
+        open_view->on_changed = [this](std::filesystem::path new_file_path) {
+            on_file_changed(new_file_path);
+
+            nav_.set_on_pop([this]() { button_play.focus(); });
+        };
+    };
+
+    button_save_packet.on_select = [this, &nav](Button&) {
+        packetFileBuffer = "";
+        text_prompt(
+            nav,
+            packetFileBuffer,
+            64,
+            [this](std::string& buffer) {
+                on_save_file(buffer);
+            });
+    };
+
+    button_switch.on_select = [&nav](Button&) {
+        nav.replace<BLERxView>();
+    };
+
+    dataEditView.on_select = [this] {
+        // Save last selected cursor.
+        cursor_pos.line = dataEditView.line();
+        cursor_pos.col = dataEditView.col();
+
+        // Reject setting newline at index 29.
+        if (cursor_pos.col != 29) {
+            uint16_t dataBytePos = (cursor_pos.line * 29) + cursor_pos.col;
+
+            auto it = std::find(markedBytes.begin(), markedBytes.end(), dataBytePos);
+
+            if (it != markedBytes.end()) {
+                markedBytes.erase(it);
+            } else {
+                markedBytes.push_back(dataBytePos);
+            }
+
+            dataEditView.cursor_mark_selected();
+        }
+    };
+
+    button_clear_marked.on_select = [this](Button&) {
+        marked_counter = 0;
+        markedBytes.clear();
+        dataEditView.cursor_clear_marked();
+    };
+}
+
+BLETxView::BLETxView(
+    NavigationView& nav,
+    BLETxPacket packet)
+    : BLETxView(nav) {
+    packets[0] = packet;
+
+    update_current_packet(packets[0], 0);
+
+    num_packets = 1;
+    file_override = true;
+}
+
+void BLETxView::on_file_changed(const fs::path& new_file_path) {
+    file_path = new_file_path;
+    num_packets = 0;
+
+    {  // Get the size of the data file.
+        File data_file;
+        auto error = data_file.open(file_path);
+        if (error) {
+            file_error();
+            file_path = "";
+            return;
+        }
+
+        do {
+            readUntil(data_file, packets[num_packets].macAddress, mac_address_size_str, ' ');
+            readUntil(data_file, packets[num_packets].advertisementData, max_packet_size_str, ' ');
+            readUntil(data_file, packets[num_packets].packetCount, max_packet_repeat_str, '\n');
+
+            uint64_t macAddressSize = strlen(packets[num_packets].macAddress);
+            uint64_t advertisementDataSize = strlen(packets[num_packets].advertisementData);
+            uint64_t packetCountSize = strlen(packets[num_packets].packetCount);
+
+            packets[num_packets].packet_count = stringToUint32(packets[num_packets].packetCount);
+
+            // Verify Data.
+            if ((macAddressSize == mac_address_size_str) && (advertisementDataSize < max_packet_size_str) && (packetCountSize < max_packet_repeat_str) &&
+                hasValidHexPairs(packets[num_packets].macAddress, macAddressSize / 2) && hasValidHexPairs(packets[num_packets].advertisementData, advertisementDataSize / 2) && (packets[num_packets].packet_count >= 1) && (packets[num_packets].packet_count < max_packet_repeat_count)) {
+                text_filename.set(truncate(file_path.filename().string(), 12));
+
+            } else {
+                // Did not find any packets.
+                if (num_packets == 0) {
+                    file_path = "";
+                    return;
+                }
+
+                break;
+            }
+
+            num_packets++;
+
+        } while (num_packets < max_num_packets);
+
+        update_current_packet(packets[0], 0);
+    }
+}
+
+void BLETxView::on_save_file(const std::string value) {
+    auto folder = packet_save_path.parent_path();
+    auto ext = packet_save_path.extension();
+    auto new_path = folder / value + ext;
+
+    saveFile(new_path);
+}
+
+void BLETxView::on_data(uint32_t value, bool is_data) {
+    std::string str_console = "";
+
+    if (is_data) {
+        str_console += (char)(value);
+    }
+}
+
+void BLETxView::update_current_packet(BLETxPacket packet, uint32_t currentIndex) {
+    std::string formattedMacAddress = to_string_formatted_mac_address(packet.macAddress);
+
+    std::vector<std::string> strings = splitIntoStrings(packet.advertisementData);
+
+    text_packet_index.set(to_string_dec_uint(current_packet));
+
+    text_packets_sent.set(to_string_dec_uint(packet.packet_count));
+
+    text_mac_address.set(formattedMacAddress);
+
+    packet_counter = packet.packet_count;
+    current_packet = currentIndex;
+
+    dataFile.create(dataTempFilePath);
+
+    for (const std::string& str : strings) {
+        dataFile.write(str.c_str(), str.size());
+        dataFile.write("\n", 1);
+        ;
+    }
+
+    dataFile.~File();
+
+    auto result = FileWrapper::open(dataTempFilePath);
+
+    if (!result)
+        return;
+
+    dataFileWrapper = *std::move(result);
+
+    dataEditView.set_font_zoom(true);
+    dataEditView.set_file(*dataFileWrapper);
+    dataEditView.redraw(true, true);
+}
+
+void BLETxView::set_parent_rect(const Rect new_parent_rect) {
+    View::set_parent_rect(new_parent_rect);
+    const Rect content_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height - switch_button_height};
+    dataEditView.set_parent_rect(content_rect);
+}
+
+BLETxView::~BLETxView() {
+    delete_file(dataTempFilePath);
+    transmitter_model.disable();
+    baseband::shutdown();
+}
+
+} /* namespace ui */

firmware/application/apps/ble_tx_app.hpp

@@ -0,0 +1,338 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2023 TJ Baginski
+ *
+ * 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 __BLE_TX_APP_H__
+#define __BLE_TX_APP_H__
+
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "ui_transmitter.hpp"
+#include "ui_text_editor.hpp"
+#include "ui_freq_field.hpp"
+#include "ui_record_view.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "replay_thread.hpp"
+#include "log_file.hpp"
+#include "utility.hpp"
+#include "file_path.hpp"
+
+#include "recent_entries.hpp"
+
+#include <string>
+#include <memory>
+
+class BLELoggerTx {
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
+
+    void log_raw_data(const std::string& data);
+
+   private:
+    LogFile log_file{};
+};
+
+namespace ui {
+
+enum PKT_TYPE {
+    PKT_TYPE_INVALID_TYPE,
+    PKT_TYPE_RAW,
+    PKT_TYPE_DISCOVERY,
+    PKT_TYPE_IBEACON,
+    PKT_TYPE_ADV_IND,
+    PKT_TYPE_ADV_DIRECT_IND,
+    PKT_TYPE_ADV_NONCONN_IND,
+    PKT_TYPE_ADV_SCAN_IND,
+    PKT_TYPE_SCAN_REQ,
+    PKT_TYPE_SCAN_RSP,
+    PKT_TYPE_CONNECT_REQ,
+    PKT_TYPE_LL_DATA,
+    PKT_TYPE_LL_CONNECTION_UPDATE_REQ,
+    PKT_TYPE_LL_CHANNEL_MAP_REQ,
+    PKT_TYPE_LL_TERMINATE_IND,
+    PKT_TYPE_LL_ENC_REQ,
+    PKT_TYPE_LL_ENC_RSP,
+    PKT_TYPE_LL_START_ENC_REQ,
+    PKT_TYPE_LL_START_ENC_RSP,
+    PKT_TYPE_LL_UNKNOWN_RSP,
+    PKT_TYPE_LL_FEATURE_REQ,
+    PKT_TYPE_LL_FEATURE_RSP,
+    PKT_TYPE_LL_PAUSE_ENC_REQ,
+    PKT_TYPE_LL_PAUSE_ENC_RSP,
+    PKT_TYPE_LL_VERSION_IND,
+    PKT_TYPE_LL_REJECT_IND,
+    PKT_TYPE_NUM_PKT_TYPE
+};
+
+struct BLETxPacket {
+    char macAddress[13];
+    char advertisementData[63];
+    char packetCount[11];
+    uint32_t packet_count;
+    PKT_TYPE packetType;
+};
+
+class BLETxView : public View {
+   public:
+    BLETxView(NavigationView& nav);
+    BLETxView(NavigationView& nav, BLETxPacket packet);
+    ~BLETxView();
+
+    void set_parent_rect(const Rect new_parent_rect) override;
+    void paint(Painter&) override{};
+
+    void focus() override;
+
+    bool is_active() const;
+    void toggle();
+    void start();
+    void stop();
+    void reset();
+    void handle_replay_thread_done(const uint32_t return_code);
+    void file_error();
+    bool saveFile(const std::filesystem::path& path);
+
+    std::string title() const override { return "BLE TX"; };
+
+   private:
+    void on_timer();
+    void on_data(uint32_t value, bool is_data);
+    void on_file_changed(const std::filesystem::path& new_file_path);
+    void on_save_file(const std::string value);
+    void on_tx_progress(const bool done);
+    void on_random_data_change(std::string value);
+    void update_current_packet(BLETxPacket packet, uint32_t currentIndex);
+
+    NavigationView& nav_;
+    TxRadioState radio_state_{
+        2'402'000'000 /* frequency */,
+        4'000'000 /* bandwidth */,
+        4'000'000 /* sampling rate */
+    };
+    app_settings::SettingsManager settings_{
+        "tx_ble", app_settings::Mode::TX};
+
+    uint8_t console_color{0};
+    uint32_t prev_value{0};
+
+    std::filesystem::path file_path{};
+    std::filesystem::path packet_save_path{bletx_dir / u"BLETX_????.TXT"};
+    uint8_t channel_number = 37;
+    bool auto_channel = false;
+
+    char randomMac[13] = "010203040506";
+
+    bool is_running = false;
+
+    int16_t timer_count{0};
+    int16_t timer_period{1};
+    int16_t auto_channel_counter = 0;
+    int16_t auto_channel_period{6};
+
+    bool repeatLoop = false;
+    uint32_t packet_counter{0};
+    uint32_t num_packets{0};
+    uint32_t current_packet{0};
+    bool random_mac = false;
+    bool file_override = false;
+
+    typedef struct {
+        uint16_t line;
+        uint16_t col;
+    } CursorPos;
+
+    std::unique_ptr<FileWrapper> dataFileWrapper{};
+    File dataFile{};
+    std::filesystem::path dataTempFilePath{bletx_dir / u"dataFileTemp.TXT"};
+    std::vector<uint16_t> markedBytes{};
+    CursorPos cursor_pos{};
+    uint8_t marked_counter = 0;
+
+    static constexpr uint8_t mac_address_size_str{12};
+    static constexpr uint8_t max_packet_size_str{62};
+    static constexpr uint8_t max_packet_repeat_str{10};
+    static constexpr uint32_t max_packet_repeat_count{UINT32_MAX};
+    static constexpr uint32_t max_num_packets{32};
+
+    BLETxPacket packets[max_num_packets];
+
+    PKT_TYPE pduType = {PKT_TYPE_DISCOVERY};
+
+    static constexpr auto header_height = 10 * 16;
+    static constexpr auto switch_button_height = 6 * 16;
+
+    Button button_open{
+        {0 * 8, 0 * 16, 10 * 8, 2 * 16},
+        "Open file"};
+
+    Text text_filename{
+        {11 * 8, 0 * 16, 12 * 8, 16},
+        "-"};
+
+    ProgressBar progressbar{
+        {11 * 8, 1 * 16, 9 * 8, 16}};
+
+    Checkbox check_rand_mac{
+        {21 * 8, 1 * 16},
+        6,
+        "?? Mac",
+        true};
+
+    TxFrequencyField field_frequency{
+        {0 * 8, 2 * 16},
+        nav_};
+
+    TransmitterView2 tx_view{
+        {11 * 8, 2 * 16},
+        /*short_ui*/ true};
+
+    Checkbox check_loop{
+        {21 * 8, 2 * 16},
+        4,
+        "Loop",
+        true};
+
+    ImageButton button_play{
+        {28 * 8, 2 * 16, 2 * 8, 1 * 16},
+        &bitmap_play,
+        Theme::getInstance()->fg_green->foreground,
+        Theme::getInstance()->fg_green->background};
+
+    Labels label_speed{
+        {{0 * 8, 6 * 8}, "Speed:", Theme::getInstance()->fg_light->foreground}};
+
+    OptionsField options_speed{
+        {7 * 8, 6 * 8},
+        3,
+        {{"1 ", 1},     // 16ms
+         {"2 ", 2},     // 32ms
+         {"3 ", 3},     // 48ms
+         {"4 ", 6},     // 100ms
+         {"5 ", 12}}};  // 200ms
+
+    OptionsField options_channel{
+        {11 * 8, 6 * 8},
+        5,
+        {{"Ch.37 ", 37},
+         {"Ch.38", 38},
+         {"Ch.39", 39},
+         {"Auto", 40}}};
+
+    OptionsField options_adv_type{
+        {17 * 8, 6 * 8},
+        14,
+        {{"DISCOVERY ", PKT_TYPE_DISCOVERY},
+         {"ADV_IND", PKT_TYPE_ADV_IND},
+         {"ADV_DIRECT", PKT_TYPE_ADV_DIRECT_IND},
+         {"ADV_NONCONN", PKT_TYPE_ADV_NONCONN_IND},
+         {"ADV_SCAN_IND", PKT_TYPE_ADV_SCAN_IND},
+         {"SCAN_REQ", PKT_TYPE_SCAN_REQ},
+         {"SCAN_RSP", PKT_TYPE_SCAN_RSP},
+         {"CONNECT_REQ", PKT_TYPE_CONNECT_REQ}}};
+
+    Labels label_marked_data{
+        {{0 * 8, 4 * 16}, "Marked Data:", Theme::getInstance()->fg_light->foreground}};
+
+    OptionsField marked_data_sequence{
+        {12 * 8, 8 * 8},
+        8,
+        {{"Ascend", 0},
+         {"Descend", 1},
+         {"Random", 2}}};
+
+    Labels label_packet_index{
+        {{0 * 8, 12 * 8}, "Packet Index:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_packet_index{
+        {13 * 8, 6 * 16, 12 * 8, 16},
+        "-"};
+
+    Labels label_packets_sent{
+        {{0 * 8, 14 * 8}, "Repeat Count:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_packets_sent{
+        {13 * 8, 7 * 16, 12 * 8, 16},
+        "-"};
+
+    Labels label_mac_address{
+        {{0 * 8, 16 * 8}, "Mac Address:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_mac_address{
+        {12 * 8, 8 * 16, 20 * 8, 16},
+        "-"};
+
+    Labels label_data_packet{
+        {{0 * 8, 9 * 16}, "Packet Data:", Theme::getInstance()->fg_light->foreground}};
+
+    Console console{
+        {0, 9 * 18, 240, 240}};
+
+    TextViewer dataEditView{
+        {0, 9 * 18, 240, 240}};
+
+    Button button_clear_marked{
+        {1 * 8, 14 * 16, 13 * 8, 3 * 8},
+        "Clear Marked"};
+
+    Button button_save_packet{
+        {1 * 8, 16 * 16, 13 * 8, 2 * 16},
+        "Save Packet"};
+
+    Button button_switch{
+        {16 * 8, 16 * 16, 13 * 8, 2 * 16},
+        "Switch to Rx"};
+
+    std::string str_log{""};
+    bool logging{true};
+    bool logging_done{false};
+    std::string packetFileBuffer{};
+
+    std::unique_ptr<BLELoggerTx> logger{};
+
+    MessageHandlerRegistration message_handler_packet{
+        Message::ID::AFSKData,
+        [this](Message* const p) {
+            const auto message = static_cast<const AFSKDataMessage*>(p);
+            this->on_data(message->value, message->is_data);
+        }};
+
+    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.done);
+        }};
+
+    MessageHandlerRegistration message_handler_frame_sync{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->on_timer();
+        }};
+};
+
+} /* namespace ui */
+
+#endif /*__UI_AFSK_RX_H__*/

firmware/application/apps/capture_app.cpp

@@ -21,96 +21,115 @@
  */
 
 #include "capture_app.hpp"
-
 #include "baseband_api.hpp"
-
 #include "portapack.hpp"
+#include "ui_freqman.hpp"
+
 using namespace portapack;
 
 namespace ui {
 
-CaptureAppView::CaptureAppView(NavigationView& nav) {
-	baseband::run_image(portapack::spi_flash::image_tag_capture);
+CaptureAppView::CaptureAppView(NavigationView& nav)
+    : nav_{nav} {
+    baseband::run_image(portapack::spi_flash::image_tag_capture);
 
-	add_children({
-		&labels,
-		&rssi,
-		&channel,
-		&field_frequency,
-		&field_frequency_step,
-		&field_rf_amp,
-		&field_lna,
-		&field_vga,
-		&option_bandwidth,
-		&record_view,
-		&waterfall,
-	});
+    add_children({
+        &labels,
+        &rssi,
+        &channel,
+        &field_frequency,
+        &field_frequency_step,
+        &field_rf_amp,
+        &field_lna,
+        &field_vga,
+        &option_bandwidth,
+        &option_format,
+        &check_trim,
+        &record_view,
+        &waterfall,
+    });
 
-	field_frequency.set_value(receiver_model.tuning_frequency());
-	field_frequency.set_step(receiver_model.frequency_step());
-	field_frequency.on_change = [this](rf::Frequency f) {
-		this->on_tuning_frequency_changed(f);
-	};
-	field_frequency.on_edit = [this, &nav]() {
-		// TODO: Provide separate modal method/scheme?
-		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			this->on_tuning_frequency_changed(f);
-			this->field_frequency.set_value(f);
-		};
-	};
-	
-	field_frequency_step.set_by_value(receiver_model.frequency_step());
-	field_frequency_step.on_change = [this](size_t, OptionsField::value_t v) {
-		receiver_model.set_frequency_step(v);
-		this->field_frequency.set_step(v);
-	};
-	
-	option_bandwidth.on_change = [this](size_t, uint32_t base_rate) {
-		sampling_rate = 8 * base_rate;	// Decimation by 8 done on baseband side
-		
-		waterfall.on_hide();
-		record_view.set_sampling_rate(sampling_rate);
-		receiver_model.set_sampling_rate(sampling_rate);
-		waterfall.on_show();
-	};
-	
-	option_bandwidth.set_selected_index(7);		// 500k
-	
-	receiver_model.set_modulation(ReceiverModel::Mode::Capture);
-	receiver_model.set_baseband_bandwidth(baseband_bandwidth);
-	receiver_model.enable();
+    field_frequency_step.set_by_value(receiver_model.frequency_step());
+    field_frequency_step.on_change = [this](size_t, OptionsField::value_t v) {
+        receiver_model.set_frequency_step(v);
+        this->field_frequency.set_step(v);
+    };
 
-	record_view.on_error = [&nav](std::string message) {
-		nav.display_modal("Error", message);
-	};
+    option_format.set_selected_index(0);  // Default to C16
+    option_format.on_change = [this](size_t, uint32_t file_type) {
+        record_view.set_file_type((RecordView::FileType)file_type);
+    };
+
+    check_trim.on_select = [this](Checkbox&, bool v) {
+        record_view.set_auto_trim(v);
+    };
+
+    freqman_set_bandwidth_option(SPEC_MODULATION, option_bandwidth);
+    option_bandwidth.on_change = [this](size_t, uint32_t bandwidth) {
+        /* Nyquist would imply a sample rate of 2x bandwidth, but because the ADC
+         * provides 2 values (I,Q), the sample_rate is equal to bandwidth here. */
+        auto sample_rate = bandwidth;
+
+        /* base_rate (bandwidth) is used for FFT calculation and display LCD, and also in recording writing SD Card rate. */
+        /* ex. sampling_rate values, 4Mhz, when recording 500 kHz (BW) and fs 8 Mhz, when selected 1 Mhz BW ... */
+        /* ex. recording 500kHz BW to .C16 file, base_rate clock 500kHz x2(I,Q) x 2 bytes (int signed) =2MB/sec rate SD Card. */
+
+        waterfall.stop();
+
+        // record_view determines the correct oversampling to apply and returns the actual sample rate.
+        // NB: record_view is what actually updates proc_capture baseband settings.
+        auto actual_sample_rate = record_view.set_sampling_rate(sample_rate);
+
+        // Update the radio model with the actual sampling rate.
+        receiver_model.set_sampling_rate(actual_sample_rate);
+
+        // Get suitable anti-aliasing BPF bandwidth for MAX2837 given the actual sample rate.
+        auto anti_alias_filter_bandwidth = filter_bandwidth_for_sampling_rate(actual_sample_rate);
+        receiver_model.set_baseband_bandwidth(anti_alias_filter_bandwidth);
+
+        // Automatically switch default capture format to C8 when bandwidth setting is increased to >=1.5MHz
+        if ((bandwidth >= 1500000) && (previous_bandwidth < 1500000)) {
+            option_format.set_selected_index(1);
+        }
+        previous_bandwidth = bandwidth;
+
+        waterfall.start();
+    };
+
+    receiver_model.enable();
+    option_bandwidth.set_by_value(500000);
+
+    record_view.on_error = [&nav](std::string message) {
+        nav.display_modal("Error", message);
+    };
+}
+
+CaptureAppView::CaptureAppView(
+    NavigationView& nav,
+    ReceiverModel::settings_t override)
+    : CaptureAppView(nav) {
+    // Settings to override when launched from another app (versus from AppSettings .ini file)
+    field_frequency.set_value(override.frequency_app_override);
 }
 
 CaptureAppView::~CaptureAppView() {
-	receiver_model.disable();
-	baseband::shutdown();
-}
-
-void CaptureAppView::on_hide() {
-	// TODO: Terrible kludge because widget system doesn't notify Waterfall that
-	// it's being shown or hidden.
-	waterfall.on_hide();
-	View::on_hide();
+    receiver_model.disable();
+    baseband::shutdown();
 }
 
 void CaptureAppView::set_parent_rect(const Rect new_parent_rect) {
-	View::set_parent_rect(new_parent_rect);
+    View::set_parent_rect(new_parent_rect);
 
-	const ui::Rect waterfall_rect { 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height };
-	waterfall.set_parent_rect(waterfall_rect);
+    ui::Rect waterfall_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height};
+    waterfall.set_parent_rect(waterfall_rect);
 }
 
 void CaptureAppView::focus() {
-	record_view.focus();
+    record_view.focus();
 }
 
-void CaptureAppView::on_tuning_frequency_changed(rf::Frequency f) {
-	receiver_model.set_tuning_frequency(f);
+void CaptureAppView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
 }
 
 } /* namespace ui */

firmware/application/apps/capture_app.hpp

@@ -26,87 +26,99 @@
 #include "ui_widget.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_record_view.hpp"
 #include "ui_spectrum.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "file_path.hpp"
 
 namespace ui {
 
 class CaptureAppView : public View {
-public:
-	CaptureAppView(NavigationView& nav);
-	~CaptureAppView();
+   public:
+    CaptureAppView(NavigationView& nav);
+    CaptureAppView(NavigationView& nav, ReceiverModel::settings_t override);
+    ~CaptureAppView();
 
-	void on_hide() override;
+    void focus() override;
+    void set_parent_rect(const Rect new_parent_rect) override;
 
-	void set_parent_rect(const Rect new_parent_rect) override;
+    std::string title() const override { return "Capture"; };
 
-	void focus() override;
+   private:
+    static constexpr ui::Dim header_height = 3 * 16;
+    uint32_t previous_bandwidth{500000};
 
-	std::string title() const override { return "Capture"; };
+    NavigationView& nav_;
+    RxRadioState radio_state_{ReceiverModel::Mode::Capture};
+    app_settings::SettingsManager settings_{
+        "rx_capture", app_settings::Mode::RX};
 
-private:
-	static constexpr ui::Dim header_height = 3 * 16;
+    Labels labels{
+        {{0 * 8, 1 * 16}, "Rate:", Theme::getInstance()->fg_light->foreground},
+        {{11 * 8, 1 * 16}, "Format:", Theme::getInstance()->fg_light->foreground},
+    };
 
-	uint32_t sampling_rate = 0;
-	static constexpr uint32_t baseband_bandwidth = 2500000;
+    RSSI rssi{
+        {24 * 8, 0, 6 * 8, 4}};
 
-	void on_tuning_frequency_changed(rf::Frequency f);
+    Channel channel{
+        {24 * 8, 5, 6 * 8, 4}};
 
-	Labels labels {
-		{ { 0 * 8, 1 * 16 }, "Rate:", Color::light_grey() },
-	};
-	
-	RSSI rssi {
-		{ 24 * 8, 0, 6 * 8, 4 },
-	};
+    RxFrequencyField field_frequency{
+        {0 * 8, 0 * 16},
+        nav_};
 
-	Channel channel {
-		{ 24 * 8, 5, 6 * 8, 4 },
-	};
+    FrequencyStepView field_frequency_step{
+        {10 * 8, 0 * 16}};
 
-	FrequencyField field_frequency {
-		{ 0 * 8, 0 * 16 },
-	};
-	
-	FrequencyStepView field_frequency_step {
-		{ 10 * 8, 0 * 16 },
-	};
+    RFAmpField field_rf_amp{
+        {16 * 8, 0 * 16}};
 
-	RFAmpField field_rf_amp {
-		{ 16 * 8, 0 * 16 }
-	};
+    LNAGainField field_lna{
+        {18 * 8, 0 * 16}};
 
-	LNAGainField field_lna {
-		{ 18 * 8, 0 * 16 }
-	};
+    VGAGainField field_vga{
+        {21 * 8, 0 * 16}};
 
-	VGAGainField field_vga {
-		{ 21 * 8, 0 * 16 }
-	};
+    OptionsField option_bandwidth{
+        {5 * 8, 1 * 16},
+        5,
+        {}};
 
-	OptionsField option_bandwidth {
-		{ 5 * 8, 1 * 16 },
-		5,
-		{
-			{ "  8k5", 8500 },
-			{ " 11k ", 11000 },
-			{ " 16k ", 16000 },
-			{ " 25k ", 25000 },
-			{ " 50k ", 50000 },
-			{ "100k ", 100000 },
-			{ "250k ", 250000 },
-			{ "500k ", 500000 }
-		}
-	};
-	
-	RecordView record_view {
-		{ 0 * 8, 2 * 16, 30 * 8, 1 * 16 },
-		u"BBD_????", RecordView::FileType::RawS16, 16384, 3
-	};
+    OptionsField option_format{
+        {18 * 8, 1 * 16},
+        3,
+        {{"C16", RecordView::FileType::RawS16},
+         {"C8", RecordView::FileType::RawS8}}};
 
-	spectrum::WaterfallWidget waterfall { };
+    Checkbox check_trim{
+        {23 * 8, 1 * 16},
+        4,
+        "Trim",
+        /*small*/ true};
+
+    RecordView record_view{
+        {0 * 8, 2 * 16, 30 * 8, 1 * 16},
+        u"BBD_????.*",
+        captures_dir,
+        RecordView::FileType::RawS16,
+        16384,
+        3};
+
+    spectrum::WaterfallView waterfall{};
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
+
+    void on_freqchg(int64_t freq);
 };
 
 } /* namespace ui */
 
-#endif/*__CAPTURE_APP_HPP__*/
+#endif /*__CAPTURE_APP_HPP__*/

firmware/application/apps/dump1090.hpp

@@ -0,0 +1,454 @@
+// Part of dump1090, a Mode S message decoder for RTLSDR devices.
+//
+// dump1090.h: main program header
+//
+// Copyright (c) 2014-2016 Oliver Jowett <oliver@mutability.co.uk>
+//
+// This file is free software: you may copy, redistribute and/or modify it
+// under the terms of the GNU General Public License as published by the
+// Free Software Foundation, either version 2 of the License, or (at your
+// option) any later version.
+//
+// This file 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.  If not, see <http://www.gnu.org/licenses/>.
+
+// This file incorporates work covered by the following copyright and
+// permission notice:
+//
+//   Copyright (C) 2012 by Salvatore Sanfilippo <antirez@gmail.com>
+//
+//   All rights reserved.
+//
+//   Redistribution and use in source and binary forms, with or without
+//   modification, are permitted provided that the following conditions are
+//   met:
+//
+//    *  Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//
+//    *  Redistributions in binary form must reproduce the above copyright
+//       notice, this list of conditions and the following disclaimer in the
+//       documentation and/or other materials provided with the distribution.
+//
+//   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+//   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+//   HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+//   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+//   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+//   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+//   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+//   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+//   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef __DUMP1090_H
+#define __DUMP1090_H
+
+// Default version number, if not overriden by the Makefile
+#ifndef MODES_DUMP1090_VERSION
+#define MODES_DUMP1090_VERSION "unknown"
+#endif
+
+#ifndef MODES_DUMP1090_VARIANT
+#define MODES_DUMP1090_VARIANT "dump1090-unknown"
+#endif
+
+#define MODES_DEFAULT_FREQ 1090000000
+#define MODES_DEFAULT_WIDTH 1000
+#define MODES_DEFAULT_HEIGHT 700
+#define MODES_RTL_BUFFERS 15                            // Number of RTL buffers
+#define MODES_RTL_BUF_SIZE (16 * 16384)                 // 256k
+#define MODES_MAG_BUF_SAMPLES (MODES_RTL_BUF_SIZE / 2)  // Each sample is 2 bytes
+#define MODES_MAG_BUFFERS 12                            // Number of magnitude buffers (should be smaller than RTL_BUFFERS for flowcontrol to work)
+#define MODES_AUTO_GAIN -100                            // Use automatic gain
+#define MODES_MAX_GAIN 999999                           // Use max available gain
+#define MODES_MSG_SQUELCH_DB 4.0                        // Minimum SNR, in dB
+#define MODES_MSG_ENCODER_ERRS 3                        // Maximum number of encoding errors
+
+#define MODEAC_MSG_SAMPLES (25 * 2)  // include up to the SPI bit
+#define MODEAC_MSG_BYTES 2
+#define MODEAC_MSG_SQUELCH_LEVEL 0x07FF  // Average signal strength limit
+
+#define MODES_PREAMBLE_US 8  // microseconds = bits
+#define MODES_PREAMBLE_SAMPLES (MODES_PREAMBLE_US * 2)
+#define MODES_PREAMBLE_SIZE (MODES_PREAMBLE_SAMPLES * sizeof(uint16_t))
+#define MODES_LONG_MSG_BYTES 14
+#define MODES_SHORT_MSG_BYTES 7
+#define MODES_LONG_MSG_BITS (MODES_LONG_MSG_BYTES * 8)
+#define MODES_SHORT_MSG_BITS (MODES_SHORT_MSG_BYTES * 8)
+#define MODES_LONG_MSG_SAMPLES (MODES_LONG_MSG_BITS * 2)
+#define MODES_SHORT_MSG_SAMPLES (MODES_SHORT_MSG_BITS * 2)
+#define MODES_LONG_MSG_SIZE (MODES_LONG_MSG_SAMPLES * sizeof(uint16_t))
+#define MODES_SHORT_MSG_SIZE (MODES_SHORT_MSG_SAMPLES * sizeof(uint16_t))
+
+#define MODES_OS_PREAMBLE_SAMPLES (20)
+#define MODES_OS_PREAMBLE_SIZE (MODES_OS_PREAMBLE_SAMPLES * sizeof(uint16_t))
+#define MODES_OS_LONG_MSG_SAMPLES (268)
+#define MODES_OS_SHORT_MSG_SAMPLES (135)
+#define MODES_OS_LONG_MSG_SIZE (MODES_LONG_MSG_SAMPLES * sizeof(uint16_t))
+#define MODES_OS_SHORT_MSG_SIZE (MODES_SHORT_MSG_SAMPLES * sizeof(uint16_t))
+
+#define MODES_OUT_BUF_SIZE (1500)
+#define MODES_OUT_FLUSH_SIZE (MODES_OUT_BUF_SIZE - 256)
+#define MODES_OUT_FLUSH_INTERVAL (60000)
+
+#define MODES_USER_LATLON_VALID (1 << 0)
+
+#define INVALID_ALTITUDE (-9999)
+
+/* Where did a bit of data arrive from? In order of increasing priority */
+typedef enum {
+    SOURCE_INVALID,        /* data is not valid */
+    SOURCE_MODE_AC,        /* A/C message */
+    SOURCE_MLAT,           /* derived from mlat */
+    SOURCE_MODE_S,         /* data from a Mode S message, no full CRC */
+    SOURCE_MODE_S_CHECKED, /* data from a Mode S message with full CRC */
+    SOURCE_TISB,           /* data from a TIS-B extended squitter message */
+    SOURCE_ADSR,           /* data from a ADS-R extended squitter message */
+    SOURCE_ADSB,           /* data from a ADS-B extended squitter message */
+} datasource_t;
+
+/* What sort of address is this and who sent it?
+ * (Earlier values are higher priority)
+ */
+typedef enum {
+    ADDR_ADSB_ICAO,    /* Mode S or ADS-B, ICAO address, transponder sourced */
+    ADDR_ADSB_ICAO_NT, /* ADS-B, ICAO address, non-transponder */
+    ADDR_ADSR_ICAO,    /* ADS-R, ICAO address */
+    ADDR_TISB_ICAO,    /* TIS-B, ICAO address */
+
+    ADDR_ADSB_OTHER,     /* ADS-B, other address format */
+    ADDR_ADSR_OTHER,     /* ADS-R, other address format */
+    ADDR_TISB_TRACKFILE, /* TIS-B, Mode A code + track file number */
+    ADDR_TISB_OTHER,     /* TIS-B, other address format */
+
+    ADDR_MODE_A, /* Mode A */
+
+    ADDR_UNKNOWN /* unknown address format */
+} addrtype_t;
+
+typedef enum {
+    UNIT_FEET,
+    UNIT_METERS
+} altitude_unit_t;
+
+typedef enum {
+    UNIT_NAUTICAL_MILES,
+    UNIT_STATUTE_MILES,
+    UNIT_KILOMETERS,
+} interactive_distance_unit_t;
+
+typedef enum {
+    ALTITUDE_BARO,
+    ALTITUDE_GEOM
+} altitude_source_t;
+
+typedef enum {
+    AG_INVALID,
+    AG_GROUND,
+    AG_AIRBORNE,
+    AG_UNCERTAIN
+} airground_t;
+
+typedef enum {
+    SIL_INVALID,
+    SIL_UNKNOWN,
+    SIL_PER_SAMPLE,
+    SIL_PER_HOUR
+} sil_type_t;
+
+typedef enum {
+    CPR_SURFACE,
+    CPR_AIRBORNE,
+    CPR_COARSE
+} cpr_type_t;
+
+typedef enum {
+    HEADING_INVALID,           // Not set
+    HEADING_GROUND_TRACK,      // Direction of track over ground, degrees clockwise from true north
+    HEADING_TRUE,              // Heading, degrees clockwise from true north
+    HEADING_MAGNETIC,          // Heading, degrees clockwise from magnetic north
+    HEADING_MAGNETIC_OR_TRUE,  // HEADING_MAGNETIC or HEADING_TRUE depending on the HRD bit in opstatus
+    HEADING_TRACK_OR_HEADING   // GROUND_TRACK / MAGNETIC / TRUE depending on the TAH bit in opstatus
+} heading_type_t;
+
+typedef enum {
+    COMMB_UNKNOWN,
+    COMMB_AMBIGUOUS,
+    COMMB_EMPTY_RESPONSE,
+    COMMB_DATALINK_CAPS,
+    COMMB_GICB_CAPS,
+    COMMB_AIRCRAFT_IDENT,
+    COMMB_ACAS_RA,
+    COMMB_VERTICAL_INTENT,
+    COMMB_TRACK_TURN,
+    COMMB_HEADING_SPEED
+} commb_format_t;
+
+typedef enum {
+    NAV_MODE_AUTOPILOT = 1,
+    NAV_MODE_VNAV = 2,
+    NAV_MODE_ALT_HOLD = 4,
+    NAV_MODE_APPROACH = 8,
+    NAV_MODE_LNAV = 16,
+    NAV_MODE_TCAS = 32
+} nav_modes_t;
+
+// Matches encoding of the ES type 28/1 emergency/priority status subfield
+typedef enum {
+    EMERGENCY_NONE = 0,
+    EMERGENCY_GENERAL = 1,
+    EMERGENCY_LIFEGUARD = 2,
+    EMERGENCY_MINFUEL = 3,
+    EMERGENCY_NORDO = 4,
+    EMERGENCY_UNLAWFUL = 5,
+    EMERGENCY_DOWNED = 6,
+    EMERGENCY_RESERVED = 7
+} emergency_t;
+
+typedef enum {
+    NAV_ALT_INVALID,
+    NAV_ALT_UNKNOWN,
+    NAV_ALT_AIRCRAFT,
+    NAV_ALT_MCP,
+    NAV_ALT_FMS
+} nav_altitude_source_t;
+
+#define MODES_NON_ICAO_ADDRESS (1 << 24)  // Set on addresses to indicate they are not ICAO addresses
+
+#define MODES_INTERACTIVE_REFRESH_TIME 250   // Milliseconds
+#define MODES_INTERACTIVE_DISPLAY_TTL 60000  // Delete from display after 60 seconds
+
+#define MODES_NET_HEARTBEAT_INTERVAL 60000  // milliseconds
+
+#define MODES_CLIENT_BUF_SIZE 1024
+#define MODES_NET_SNDBUF_SIZE (1024 * 64)
+#define MODES_NET_SNDBUF_MAX (7)
+
+#define HISTORY_SIZE 120
+#define HISTORY_INTERVAL 30000
+
+#define MODES_NOTUSED(V) ((void)V)
+
+#define MAX_AMPLITUDE 65535.0
+#define MAX_POWER (MAX_AMPLITUDE * MAX_AMPLITUDE)
+
+#define FAUP_DEFAULT_RATE_MULTIPLIER 1.0  // FA Upload rate multiplier
+
+//======================== structure declarations =========================
+
+typedef enum {
+    SDR_NONE,
+    SDR_IFILE,
+    SDR_RTLSDR,
+    SDR_BLADERF,
+    SDR_HACKRF,
+    SDR_LIMESDR
+} sdr_type_t;
+
+// The struct we use to store information about a decoded message.
+struct modesMessage {
+    // Generic fields
+    unsigned char msg[MODES_LONG_MSG_BYTES];       // Binary message.
+    unsigned char verbatim[MODES_LONG_MSG_BYTES];  // Binary message, as originally received before correction
+    int msgbits;                                   // Number of bits in message
+    int msgtype;                                   // Downlink format #
+    uint32_t crc;                                  // Message CRC
+    int correctedbits;                             // No. of bits corrected
+    uint32_t addr;                                 // Address Announced
+    addrtype_t addrtype;                           // address format / source
+    uint64_t timestampMsg;                         // Timestamp of the message (12MHz clock)
+    uint64_t sysTimestampMsg;                      // Timestamp of the message (system time)
+    int remote;                                    // If set this message is from a remote station
+    double signalLevel;                            // RSSI, in the range [0..1], as a fraction of full-scale power
+    int score;                                     // Scoring from scoreModesMessage, if used
+    int reliable;                                  // is this a "reliable" message (uncorrected DF11/DF17/DF18)?
+
+    datasource_t source;  // Characterizes the overall message source
+
+    // Raw data, just extracted directly from the message
+    // The names reflect the field names in Annex 4
+    unsigned IID;  // extracted from CRC of DF11s
+    unsigned AA;
+    unsigned AC;
+    unsigned CA;
+    unsigned CC;
+    unsigned CF;
+    unsigned DR;
+    unsigned FS;
+    unsigned ID;
+    unsigned KE;
+    unsigned ND;
+    unsigned RI;
+    unsigned SL;
+    unsigned UM;
+    unsigned VS;
+    unsigned char MB[7];
+    unsigned char MD[10];
+    unsigned char ME[7];
+    unsigned char MV[7];
+
+    // Decoded data
+    unsigned altitude_baro_valid : 1;
+    unsigned altitude_geom_valid : 1;
+    unsigned track_valid : 1;
+    unsigned track_rate_valid : 1;
+    unsigned heading_valid : 1;
+    unsigned roll_valid : 1;
+    unsigned gs_valid : 1;
+    unsigned ias_valid : 1;
+    unsigned tas_valid : 1;
+    unsigned mach_valid : 1;
+    unsigned baro_rate_valid : 1;
+    unsigned geom_rate_valid : 1;
+    unsigned squawk_valid : 1;
+    unsigned callsign_valid : 1;
+    unsigned cpr_valid : 1;
+    unsigned cpr_odd : 1;
+    unsigned cpr_decoded : 1;
+    unsigned cpr_relative : 1;
+    unsigned category_valid : 1;
+    unsigned geom_delta_valid : 1;
+    unsigned from_mlat : 1;
+    unsigned from_tisb : 1;
+    unsigned spi_valid : 1;
+    unsigned spi : 1;
+    unsigned alert_valid : 1;
+    unsigned alert : 1;
+    unsigned emergency_valid : 1;
+
+    unsigned metype;  // DF17/18 ME type
+    unsigned mesub;   // DF17/18 ME subtype
+
+    commb_format_t commb_format;  // Inferred format of a comm-b message
+
+    // valid if altitude_baro_valid:
+    int altitude_baro;                   // Altitude in either feet or meters
+    altitude_unit_t altitude_baro_unit;  // the unit used for altitude
+
+    // valid if altitude_geom_valid:
+    int altitude_geom;                   // Altitude in either feet or meters
+    altitude_unit_t altitude_geom_unit;  // the unit used for altitude
+
+    // following fields are valid if the corresponding _valid field is set:
+    int geom_delta;               // Difference between geometric and baro alt
+    float heading;                // ground track or heading, degrees (0-359). Reported directly or computed from from EW and NS velocity
+    heading_type_t heading_type;  // how to interpret 'track_or_heading'
+    float track_rate;             // Rate of change of track, degrees/second
+    float roll;                   // Roll, degrees, negative is left roll
+    struct {
+        // Groundspeed, kts, reported directly or computed from from EW and NS velocity
+        // For surface movement, this has different interpretations for v0 and v2; both
+        // fields are populated. The tracking layer will update "gs.selected".
+        float v0;
+        float v2;
+        float selected;
+    } gs;
+    unsigned ias;           // Indicated airspeed, kts
+    unsigned tas;           // True airspeed, kts
+    double mach;            // Mach number
+    int baro_rate;          // Rate of change of barometric altitude, feet/minute
+    int geom_rate;          // Rate of change of geometric (GNSS / INS) altitude, feet/minute
+    unsigned squawk;        // 13 bits identity (Squawk), encoded as 4 hex digits
+    char callsign[9];       // 8 chars flight number, NUL-terminated
+    unsigned category;      // A0 - D7 encoded as a single hex byte
+    emergency_t emergency;  // emergency/priority status
+
+    // valid if cpr_valid
+    cpr_type_t cpr_type;  // The encoding type used (surface, airborne, coarse TIS-B)
+    unsigned cpr_lat;     // Non decoded latitude.
+    unsigned cpr_lon;     // Non decoded longitude.
+    unsigned cpr_nucp;    // NUCp/NIC value implied by message type
+
+    airground_t airground;  // air/ground state
+
+    // valid if cpr_decoded:
+    double decoded_lat;
+    double decoded_lon;
+    unsigned decoded_nic;
+    unsigned decoded_rc;
+
+    // various integrity/accuracy things
+    struct {
+        unsigned nic_a_valid : 1;
+        unsigned nic_b_valid : 1;
+        unsigned nic_c_valid : 1;
+        unsigned nic_baro_valid : 1;
+        unsigned nac_p_valid : 1;
+        unsigned nac_v_valid : 1;
+        unsigned gva_valid : 1;
+        unsigned sda_valid : 1;
+
+        unsigned nic_a : 1;     // if nic_a_valid
+        unsigned nic_b : 1;     // if nic_b_valid
+        unsigned nic_c : 1;     // if nic_c_valid
+        unsigned nic_baro : 1;  // if nic_baro_valid
+
+        unsigned nac_p : 4;  // if nac_p_valid
+        unsigned nac_v : 3;  // if nac_v_valid
+
+        unsigned sil : 2;  // if sil_type != SIL_INVALID
+        sil_type_t sil_type;
+
+        unsigned gva : 2;  // if gva_valid
+
+        unsigned sda : 2;  // if sda_valid
+    } accuracy;
+
+    // Operational Status
+    struct {
+        unsigned valid : 1;
+        unsigned version : 3;
+
+        unsigned om_acas_ra : 1;
+        unsigned om_ident : 1;
+        unsigned om_atc : 1;
+        unsigned om_saf : 1;
+
+        unsigned cc_acas : 1;
+        unsigned cc_cdti : 1;
+        unsigned cc_1090_in : 1;
+        unsigned cc_arv : 1;
+        unsigned cc_ts : 1;
+        unsigned cc_tc : 2;
+        unsigned cc_uat_in : 1;
+        unsigned cc_poa : 1;
+        unsigned cc_b2_low : 1;
+        unsigned cc_lw_valid : 1;
+
+        heading_type_t tah;
+        heading_type_t hrd;
+
+        unsigned cc_lw;
+        unsigned cc_antenna_offset;
+    } opstatus;
+
+    // combined:
+    //   Target State & Status (ADS-B V2 only)
+    //   Comm-B BDS4,0 Vertical Intent
+    struct {
+        unsigned heading_valid : 1;
+        unsigned fms_altitude_valid : 1;
+        unsigned mcp_altitude_valid : 1;
+        unsigned qnh_valid : 1;
+        unsigned modes_valid : 1;
+
+        float heading;  // heading, degrees (0-359) (could be magnetic or true heading; magnetic recommended)
+        heading_type_t heading_type;
+        unsigned fms_altitude;  // FMS selected altitude
+        unsigned mcp_altitude;  // MCP/FCU selected altitude
+        float qnh;              // altimeter setting (QFE or QNH/QNE), millibars
+
+        nav_altitude_source_t altitude_source;
+
+        nav_modes_t modes;
+    } nav;
+};
+
+#endif  // __DUMP1090_H

firmware/application/apps/ert_app.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2023 Mark Thompson
  *
  * This file is part of PortaPack.
  *
@@ -22,7 +23,7 @@
 #include "ert_app.hpp"
 
 #include "baseband_api.hpp"
-
+#include "audio.hpp"
 #include "portapack.hpp"
 using namespace portapack;
 
@@ -30,127 +31,155 @@ using namespace portapack;
 
 #include "crc.hpp"
 #include "string_format.hpp"
+#include "file_path.hpp"
+
+namespace pmem = portapack::persistent_memory;
 
 namespace ert {
 
 namespace format {
 
 std::string type(Packet::Type value) {
-	switch(value) {
-	default:
-	case Packet::Type::Unknown:	return "???";
-	case Packet::Type::IDM:		return "IDM";
-	case Packet::Type::SCM:		return "SCM";
-	}
+    switch (value) {
+        default:
+        case Packet::Type::Unknown:
+            return "???";
+        case Packet::Type::IDM:
+            return "IDM";
+        case Packet::Type::SCM:
+            return "SCM";
+        case Packet::Type::SCMPLUS:
+            return "SCM+";
+    }
 }
 
 std::string id(ID value) {
-	return to_string_dec_uint(value, 10);
+    return to_string_dec_uint(value, 10);
 }
 
 std::string consumption(Consumption value) {
-	return to_string_dec_uint(value, 10);
+    return to_string_dec_uint(value, 8);
 }
 
 std::string commodity_type(CommodityType value) {
-	return to_string_dec_uint(value, 2);
+    return to_string_dec_uint(value, 2);
+}
+
+std::string tamper_flags(TamperFlags value) {
+    return to_string_hex(value & 0xFFFF, 4);  // Note: ignoring bits 32-47 of tamper flags in IDM type due to screen width
+}
+
+std::string tamper_flags_scm(TamperFlags value) {
+    return " " + to_string_hex(value & 0x0F, 1) + "/" + to_string_hex(value >> 4, 1);  // Physical/Encoder flags
 }
 
 } /* namespace format */
 
 } /* namespace ert */
 
-void ERTLogger::on_packet(const ert::Packet& packet) {
-	const auto formatted = packet.symbols_formatted();
-	log_file.write_entry(packet.received_at(), formatted.data + "/" + formatted.errors);
+void ERTLogger::on_packet(const ert::Packet& packet, const uint32_t target_frequency) {
+    const auto formatted = packet.symbols_formatted();
+    const auto target_frequency_str = to_string_dec_uint(target_frequency, 10);
+
+    std::string entry = target_frequency_str + " " + ert::format::type(packet.type()) + " " + formatted.data + "/" + formatted.errors + " ID:" + to_string_dec_uint(packet.id(), 1);
+
+    log_file.write_entry(packet.received_at(), entry);
 }
 
-const ERTRecentEntry::Key ERTRecentEntry::invalid_key { };
+const ERTRecentEntry::Key ERTRecentEntry::invalid_key{};
 
 void ERTRecentEntry::update(const ert::Packet& packet) {
-	received_count++;
+    received_count++;
 
-	last_consumption = packet.consumption();
+    last_consumption = packet.consumption();
+    last_tamper_flags = packet.tamper_flags();
+    packet_type = packet.type();
 }
 
 namespace ui {
 
-template<>
+template <>
 void RecentEntriesTable<ERTRecentEntries>::draw(
-	const Entry& entry,
-	const Rect& target_rect,
-	Painter& painter,
-	const Style& style
-) {
-	std::string line = ert::format::id(entry.id) + " " + ert::format::commodity_type(entry.commodity_type) + " " + ert::format::consumption(entry.last_consumption);
+    const Entry& entry,
+    const Rect& target_rect,
+    Painter& painter,
+    const Style& style) {
+    std::string line = ert::format::id(entry.id) + " " + ert::format::commodity_type(entry.commodity_type) + " " + ert::format::consumption(entry.last_consumption) + " ";
 
-	if( entry.received_count > 999 ) {
-		line += " +++";
-	} else {
-		line += " " + to_string_dec_uint(entry.received_count, 3);
-	}
+    line += (entry.packet_type == ert::Packet::Type::SCM) ? ert::format::tamper_flags_scm(entry.last_tamper_flags) : ert::format::tamper_flags(entry.last_tamper_flags);
+    line += (entry.received_count > 99) ? " ++" : to_string_dec_uint(entry.received_count, 3);
 
-	line.resize(target_rect.width() / 8, ' ');
-	painter.draw_string(target_rect.location(), style, line);
+    line.resize(target_rect.width() / 8, ' ');
+    painter.draw_string(target_rect.location(), style, line);
 }
 
-ERTAppView::ERTAppView(NavigationView&) {
-	baseband::run_image(portapack::spi_flash::image_tag_ert);
+ERTAppView::ERTAppView(NavigationView& nav)
+    : nav_{nav} {
+    baseband::run_image(portapack::spi_flash::image_tag_ert);
 
-	add_children({
-		&field_rf_amp,
-		&field_lna,
-		&field_vga,
-		&rssi,
-		&recent_entries_view,
-	});
+    add_children({
+        &field_frequency,
+        &field_rf_amp,
+        &field_lna,
+        &field_vga,
+        &rssi,
+        &field_volume,
+        &recent_entries_view,
+    });
 
-	radio::enable({
-		initial_target_frequency,
-		sampling_rate,
-		baseband_bandwidth,
-		rf::Direction::Receive,
-		receiver_model.rf_amp(),
-		static_cast<int8_t>(receiver_model.lna()),
-		static_cast<int8_t>(receiver_model.vga()),
-	});
+    field_frequency.set_step(1000000);
 
-	logger = std::make_unique<ERTLogger>();
-	if( logger ) {
-		logger->append(u"ert.txt");
-	}
+    receiver_model.enable();
+
+    logger = std::make_unique<ERTLogger>();
+    if (logger) {
+        logger->append(logs_dir / u"ERT.TXT");
+    }
+
+    if (pmem::beep_on_packets()) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
+    }
 }
 
 ERTAppView::~ERTAppView() {
-	radio::disable();
-
-	baseband::shutdown();
+    audio::output::stop();
+    receiver_model.disable();
+    baseband::shutdown();
 }
 
 void ERTAppView::focus() {
-	field_vga.focus();
+    field_vga.focus();
 }
 
 void ERTAppView::set_parent_rect(const Rect new_parent_rect) {
-	View::set_parent_rect(new_parent_rect);
-	recent_entries_view.set_parent_rect({ 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height });
+    View::set_parent_rect(new_parent_rect);
+    recent_entries_view.set_parent_rect({0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height});
 }
 
 void ERTAppView::on_packet(const ert::Packet& packet) {
-	if( logger ) {
-		logger->on_packet(packet);
-	}
+    if (logger) {
+        logger->on_packet(packet, receiver_model.target_frequency());
+    }
 
-	if( packet.crc_ok() ) {
-		auto& entry = ::on_packet(recent, ERTRecentEntry::Key { packet.id(), packet.commodity_type() });
-		entry.update(packet);
-		recent_entries_view.set_dirty();
-	}
+    if (packet.crc_ok()) {
+        auto& entry = ::on_packet(recent, ERTRecentEntry::Key{packet.id(), packet.commodity_type()});
+        entry.update(packet);
+        recent_entries_view.set_dirty();
+    }
+
+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
 }
 
 void ERTAppView::on_show_list() {
-	recent_entries_view.hidden(false);
-	recent_entries_view.focus();
+    recent_entries_view.hidden(false);
+    recent_entries_view.focus();
+}
+
+void ERTAppView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
 }
 
 } /* namespace ui */

firmware/application/apps/ert_app.hpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2023 Mark Thompson
  *
  * This file is part of PortaPack.
  *
@@ -24,11 +25,13 @@
 
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_rssi.hpp"
 #include "ui_channel.hpp"
 
 #include "event_m0.hpp"
-
+#include "app_settings.hpp"
+#include "radio_state.hpp"
 #include "log_file.hpp"
 
 #include "ert_packet.hpp"
@@ -39,65 +42,66 @@
 #include <string>
 
 struct ERTKey {
-	ert::ID id;
-	ert::CommodityType commodity_type;
+    ert::ID id;
+    ert::CommodityType commodity_type;
 
-	constexpr ERTKey(
-		ert::ID id = ert::invalid_id,
-		ert::CommodityType commodity_type = ert::invalid_commodity_type
-	) : id { id  },
-		commodity_type { commodity_type }
-	{
-	}
+    constexpr ERTKey(
+        ert::ID id = ert::invalid_id,
+        ert::CommodityType commodity_type = ert::invalid_commodity_type)
+        : id{id},
+          commodity_type{commodity_type} {
+    }
 
-	ERTKey& operator=(const ERTKey& other) {
-		id = other.id;
-		commodity_type = other.commodity_type;
-		return *this;
-	}
+    ERTKey(const ERTKey& other) = default;
 
-	bool operator==(const ERTKey& other) const {
-		return (id == other.id) && (commodity_type == other.commodity_type);
-	}
+    ERTKey& operator=(const ERTKey& other) {
+        id = other.id;
+        commodity_type = other.commodity_type;
+        return *this;
+    }
+
+    bool operator==(const ERTKey& other) const {
+        return (id == other.id) && (commodity_type == other.commodity_type);
+    }
 };
 
 struct ERTRecentEntry {
-	using Key = ERTKey;
+    using Key = ERTKey;
 
-	// TODO: Is this the right choice of invalid key value?
-	static const Key invalid_key;
+    // TODO: Is this the right choice of invalid key value?
+    static const Key invalid_key;
 
-	ert::ID id { ert::invalid_id };
-	ert::CommodityType commodity_type { ert::invalid_commodity_type };
+    ert::ID id{ert::invalid_id};
+    ert::CommodityType commodity_type{ert::invalid_commodity_type};
+    ert::Consumption last_consumption{};
+    ert::TamperFlags last_tamper_flags{};
+    ert::Packet::Type packet_type{};
 
-	size_t received_count { 0 };
+    size_t received_count{0};
 
-	ert::Consumption last_consumption { };
+    ERTRecentEntry(
+        const Key& key)
+        : id{key.id},
+          commodity_type{key.commodity_type} {
+    }
 
-	ERTRecentEntry(
-		const Key& key
-	) : id { key.id },
-		commodity_type { key.commodity_type }
-	{
-	}
+    Key key() const {
+        return {id, commodity_type};
+    }
 
-	Key key() const {
-		return { id, commodity_type };
-	}
-
-	void update(const ert::Packet& packet);
+    void update(const ert::Packet& packet);
 };
 
 class ERTLogger {
-public:
-	Optional<File::Error> append(const std::filesystem::path& filename) {
-		return log_file.append(filename);
-	}
-	
-	void on_packet(const ert::Packet& packet);
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
 
-private:
-	LogFile log_file { };
+    void on_packet(const ert::Packet& packet, const uint32_t target_frequency);
+
+   private:
+    LogFile log_file{};
 };
 
 using ERTRecentEntries = RecentEntries<ERTRecentEntry>;
@@ -107,67 +111,83 @@ namespace ui {
 using ERTRecentEntriesView = RecentEntriesView<ERTRecentEntries>;
 
 class ERTAppView : public View {
-public:
-	static constexpr uint32_t initial_target_frequency = 911600000;
-	static constexpr uint32_t sampling_rate = 4194304;
-	static constexpr uint32_t baseband_bandwidth = 2500000;
+   public:
+    ERTAppView(NavigationView& nav);
+    ~ERTAppView();
 
-	ERTAppView(NavigationView& nav);
-	~ERTAppView();
+    void set_parent_rect(const Rect new_parent_rect) override;
 
-	void set_parent_rect(const Rect new_parent_rect) override;
+    // Prevent painting of region covered entirely by a child.
+    // TODO: Add flag to View that specifies view does not need to be cleared before painting.
+    void paint(Painter&) override{};
 
-	// Prevent painting of region covered entirely by a child.
-	// TODO: Add flag to View that specifies view does not need to be cleared before painting.
-	void paint(Painter&) override { };
+    void focus() override;
 
-	void focus() override;
+    std::string title() const override { return "ERT RX"; };
 
-	std::string title() const override { return "ERT"; };
+   private:
+    ERTRecentEntries recent{};
+    std::unique_ptr<ERTLogger> logger{};
 
-private:
-	ERTRecentEntries recent { };
-	std::unique_ptr<ERTLogger> logger { };
+    NavigationView& nav_;
+    RxRadioState radio_state_{
+        911600000 /* frequency */,
+        2500000 /* bandwidth */,
+        4194304 /* sampling rate */};
+    app_settings::SettingsManager settings_{
+        "rx_ert", app_settings::Mode::RX};
 
-	const RecentEntriesColumns columns { {
-		{ "ID", 10 },
-		{ "Tp", 2 },
-		{ "Consumpt", 10 },
-		{ "Cnt", 3 },
-	} };
-	ERTRecentEntriesView recent_entries_view { columns, recent };
+    const RecentEntriesColumns columns{{
+        {"ID", 10},
+        {"Ty", 2},
+        {"Consumpt", 8},
+        {"Tamp", 4},
+        {"Ct", 2},
+    }};
+    ERTRecentEntriesView recent_entries_view{columns, recent};
 
-	static constexpr auto header_height = 1 * 16;
+    static constexpr auto header_height = 1 * 16;
 
-	RFAmpField field_rf_amp {
-		{ 13 * 8, 0 * 16 }
-	};
+    RxFrequencyField field_frequency{
+        {0 * 8, 0 * 16},
+        nav_};
 
-	LNAGainField field_lna {
-		{ 15 * 8, 0 * 16 }
-	};
+    RFAmpField field_rf_amp{
+        {13 * 8, 0 * 16}};
 
-	VGAGainField field_vga {
-		{ 18 * 8, 0 * 16 }
-	};
+    LNAGainField field_lna{
+        {15 * 8, 0 * 16}};
 
-	RSSI rssi {
-		{ 21 * 8, 0, 6 * 8, 4 },
-	};
+    VGAGainField field_vga{
+        {18 * 8, 0 * 16}};
 
-	MessageHandlerRegistration message_handler_packet {
-		Message::ID::ERTPacket,
-		[this](Message* const p) {
-			const auto message = static_cast<const ERTPacketMessage*>(p);
-			const ert::Packet packet { message->type, message->packet };
-			this->on_packet(packet);
-		}
-	};
+    RSSI rssi{
+        {21 * 8, 0, 6 * 8, 4},
+    };
 
-	void on_packet(const ert::Packet& packet);
-	void on_show_list();
+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
+
+    MessageHandlerRegistration message_handler_packet{
+        Message::ID::ERTPacket,
+        [this](Message* const p) {
+            const auto message = static_cast<const ERTPacketMessage*>(p);
+            const ert::Packet packet{message->type, message->packet};
+            this->on_packet(packet);
+        }};
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
+
+    void on_freqchg(int64_t freq);
+    void on_packet(const ert::Packet& packet);
+    void on_show_list();
 };
 
 } /* namespace ui */
 
-#endif/*__ERT_APP_H__*/
+#endif /*__ERT_APP_H__*/

firmware/application/apps/gps_sim_app.cpp

@@ -1,260 +0,0 @@
-/*
- * Copyright (C) 2016 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- * Copyright (C) 2020 Shao
- *
- * 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 "gps_sim_app.hpp"
-#include "string_format.hpp"
-
-#include "ui_fileman.hpp"
-#include "io_file.hpp"
-
-#include "baseband_api.hpp"
-#include "portapack.hpp"
-#include "portapack_persistent_memory.hpp"
-
-using namespace portapack;
-
-namespace ui {
-
-void GpsSimAppView::set_ready() {
-	ready_signal = true;
-}
-
-void GpsSimAppView::on_file_changed(std::filesystem::path new_file_path) {
-	File data_file, info_file;
-	char file_data[257];
-	
-	// Get file size
-	auto data_open_error = data_file.open("/" + new_file_path.string());
-	if (data_open_error.is_valid()) {
-		file_error();
-		return;
-	}
-	
-	file_path = new_file_path;
-	
-	// Get original record frequency if available
-	std::filesystem::path info_file_path = file_path;
-	info_file_path.replace_extension(u".TXT");
-	
-	sample_rate = 500000;
-	
-	auto info_open_error = info_file.open("/" + info_file_path.string());
-	if (!info_open_error.is_valid()) {
-		memset(file_data, 0, 257);
-		auto read_size = info_file.read(file_data, 256);
-		if (!read_size.is_error()) {
-			auto pos1 = strstr(file_data, "center_frequency=");
-			if (pos1) {
-				pos1 += 17;
-				field_frequency.set_value(strtoll(pos1, nullptr, 10));
-			}
-			
-			auto pos2 = strstr(file_data, "sample_rate=");
-			if (pos2) {
-				pos2 += 12;
-				sample_rate = strtoll(pos2, nullptr, 10);
-			}
-		}
-	}
-	
-	text_sample_rate.set(unit_auto_scale(sample_rate, 3, 1) + "Hz");
-	
-	auto file_size = data_file.size();
-	auto duration = (file_size * 1000) / (1 * 2 * sample_rate);
-	
-	progressbar.set_max(file_size);
-	text_filename.set(file_path.filename().string().substr(0, 12));
-	text_duration.set(to_string_time_ms(duration));
-	
-	button_play.focus();
-}
-
-void GpsSimAppView::on_tx_progress(const uint32_t progress) {
-	progressbar.set_value(progress);
-}
-
-void GpsSimAppView::focus() {
-	button_open.focus();
-}
-
-void GpsSimAppView::file_error() {
-	nav_.display_modal("Error", "File read error.");
-}
-
-bool GpsSimAppView::is_active() const {
-	return (bool)replay_thread;
-}
-
-void GpsSimAppView::toggle() {
-	if( is_active() ) {
-		stop(false);
-	} else {
-		start();
-	}
-}
-
-void GpsSimAppView::start() {
-	stop(false);
-
-	std::unique_ptr<stream::Reader> reader;
-	
-	auto p = std::make_unique<FileReader>();
-	auto open_error = p->open(file_path);
-	if( open_error.is_valid() ) {
-		file_error();
-	} else {
-		reader = std::move(p);
-	}
-
-	if( reader ) {
-		button_play.set_bitmap(&bitmap_stop);
-		baseband::set_sample_rate(sample_rate );
-		
-		replay_thread = std::make_unique<ReplayThread>(
-			std::move(reader),
-			read_size, buffer_count,
-			&ready_signal,
-			[](uint32_t return_code) {
-				ReplayThreadDoneMessage message { return_code };
-				EventDispatcher::send_message(message);
-			}
-		);
-	}
-	
-	radio::enable({
-		receiver_model.tuning_frequency(),
-		sample_rate ,
-		baseband_bandwidth,
-		rf::Direction::Transmit,
-		receiver_model.rf_amp(),
-		static_cast<int8_t>(receiver_model.lna()),
-		static_cast<int8_t>(receiver_model.vga())
-	});
-}
-
-void GpsSimAppView::stop(const bool do_loop) {
-	if( is_active() )
-		replay_thread.reset();
-	
-	if (do_loop && check_loop.value()) {
-		start();
-	} else {
-		radio::disable();
-		button_play.set_bitmap(&bitmap_play);
-	}
-	
-	ready_signal = false;
-}
-
-void GpsSimAppView::handle_replay_thread_done(const uint32_t return_code) {
-	if (return_code == ReplayThread::END_OF_FILE) {
-		stop(true);
-	} else if (return_code == ReplayThread::READ_ERROR) {
-		stop(false);
-		file_error();
-	}
-	
-	progressbar.set_value(0);
-}
-
-GpsSimAppView::GpsSimAppView(
-	NavigationView& nav
-) : nav_ (nav)
-{
-	baseband::run_image(portapack::spi_flash::image_tag_gps);
-
-	add_children({
-		&labels,
-		&button_open,
-		&text_filename,
-		&text_sample_rate,
-		&text_duration,
-		&progressbar,
-		&field_frequency,
-		&field_lna,
-		&field_rf_amp,
-		&check_loop,
-		&button_play,
-		&waterfall,
-	});
-	
-	field_frequency.set_value(target_frequency());
-	field_frequency.set_step(receiver_model.frequency_step());
-	field_frequency.on_change = [this](rf::Frequency f) {
-		this->on_target_frequency_changed(f);
-	};
-	field_frequency.on_edit = [this, &nav]() {
-		// TODO: Provide separate modal method/scheme?
-		auto new_view = nav.push<FrequencyKeypadView>(this->target_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			this->on_target_frequency_changed(f);
-			this->field_frequency.set_value(f);
-		};
-	};
-
-	field_frequency.set_step(5000);
-	
-	button_play.on_select = [this](ImageButton&) {
-		this->toggle();
-	};
-	
-	button_open.on_select = [this, &nav](Button&) {
-		auto open_view = nav.push<FileLoadView>(".C8");
-		open_view->on_changed = [this](std::filesystem::path new_file_path) {
-			on_file_changed(new_file_path);
-		};
-	};
-}
-
-GpsSimAppView::~GpsSimAppView() {
-	radio::disable();
-	baseband::shutdown();
-}
-
-void GpsSimAppView::on_hide() {
-	// TODO: Terrible kludge because widget system doesn't notify Waterfall that
-	// it's being shown or hidden.
-	waterfall.on_hide();
-	View::on_hide();
-}
-
-void GpsSimAppView::set_parent_rect(const Rect new_parent_rect) {
-	View::set_parent_rect(new_parent_rect);
-
-	const ui::Rect waterfall_rect { 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height };
-	waterfall.set_parent_rect(waterfall_rect);
-}
-
-void GpsSimAppView::on_target_frequency_changed(rf::Frequency f) {
-	set_target_frequency(f);
-}
-
-void GpsSimAppView::set_target_frequency(const rf::Frequency new_value) {
-	persistent_memory::set_tuned_frequency(new_value);;
-}
-
-rf::Frequency GpsSimAppView::target_frequency() const {
-	return persistent_memory::tuned_frequency();
-}
-
-} /* namespace ui */

firmware/application/apps/gps_sim_app.hpp

@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2016 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- * Copyright (C) 2020 Shao
- *
- * 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 __GPS_SIM_APP_HPP__
-#define __GPS_SIM_APP_HPP__
-
-#include "ui_widget.hpp"
-#include "ui_navigation.hpp"
-#include "ui_receiver.hpp"
-#include "replay_thread.hpp"
-#include "ui_spectrum.hpp"
-
-#include <string>
-#include <memory>
-
-namespace ui {
-
-class GpsSimAppView : public View {
-public:
-	GpsSimAppView(NavigationView& nav);
-	~GpsSimAppView();
-
-	void on_hide() override;
-	void set_parent_rect(const Rect new_parent_rect) override;
-	void focus() override;
-
-	std::string title() const override { return "GPS Simulator"; };
-	
-private:
-	NavigationView& nav_;
-	
-	static constexpr ui::Dim header_height = 3 * 16;
-	
-	uint32_t sample_rate = 0;
-	static constexpr uint32_t baseband_bandwidth = 3000000; //filter bandwidth
-	const size_t read_size { 16384 };
-	const size_t buffer_count { 3 };
-
-	void on_file_changed(std::filesystem::path new_file_path);
-	void on_target_frequency_changed(rf::Frequency f);
-	void on_tx_progress(const uint32_t progress);
-	
-	void set_target_frequency(const rf::Frequency new_value);
-	rf::Frequency target_frequency() const;
-
-	void toggle();
-	void start();
-	void stop(const bool do_loop);
-	bool is_active() const;
-	void set_ready();
-	void handle_replay_thread_done(const uint32_t return_code);
-	void file_error();
-
-	std::filesystem::path file_path { };
-	std::unique_ptr<ReplayThread> replay_thread { };
-	bool ready_signal { false };
-
-	Labels labels {
-		{ { 10 * 8, 2 * 16 }, "LNA:   A:", Color::light_grey() }
-	};
-	
-	Button button_open {
-		{ 0 * 8, 0 * 16, 10 * 8, 2 * 16 },
-		"Open file"
-	};
-	
-	Text text_filename {
-		{ 11 * 8, 0 * 16, 12 * 8, 16 },
-		"-"
-	};
-	Text text_sample_rate {
-		{ 24 * 8, 0 * 16, 6 * 8, 16 },
-		"-"
-	};
-	
-	Text text_duration {
-		{ 11 * 8, 1 * 16, 6 * 8, 16 },
-		"-"
-	};
-	ProgressBar progressbar {
-		{ 18 * 8, 1 * 16, 12 * 8, 16 }
-	};
-	
-	FrequencyField field_frequency {
-		{ 0 * 8, 2 * 16 },
-	};
-	LNAGainField field_lna {
-		{ 14 * 8, 2 * 16 }
-	};
-	RFAmpField field_rf_amp {
-		{ 19 * 8, 2 * 16 }
-	};
-	Checkbox check_loop {
-		{ 21 * 8, 2 * 16 },
-		4,
-		"Loop",
-		true
-	};
-	ImageButton button_play {
-		{ 28 * 8, 2 * 16, 2 * 8, 1 * 16 },
-		&bitmap_play,
-		Color::green(),
-		Color::black()
-	};
-
-	spectrum::WaterfallWidget waterfall { };
-
-	MessageHandlerRegistration message_handler_replay_thread_error {
-		Message::ID::ReplayThreadDone,
-		[this](const Message* const p) {
-			const auto message = *reinterpret_cast<const ReplayThreadDoneMessage*>(p);
-			this->handle_replay_thread_done(message.return_code);
-		}
-	};
-	
-	MessageHandlerRegistration message_handler_fifo_signal {
-		Message::ID::RequestSignal,
-		[this](const Message* const p) {
-			const auto message = static_cast<const RequestSignalMessage*>(p);
-			if (message->signal == RequestSignalMessage::Signal::FillRequest) {
-				this->set_ready();
-			}
-		}
-	};
-	
-	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);
-		}
-	};
-};
-
-} /* namespace ui */
-
-#endif/*__GPS_SIM_APP_HPP__*/

firmware/application/apps/lge_app.cpp

@@ -1,358 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2019 Furrtek
- * 
- * 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.
- */
-
-// The UI for this app is in French because it concerns leisure centers
-// only established in France. "LGE" stands for a trademark I'd rather
-// not spell out completely here.
-
-#include "lge_app.hpp"
-
-#include "baseband_api.hpp"
-#include "ui_textentry.hpp"
-
-#include "string_format.hpp"
-
-#include <cstring>
-#include <stdio.h>
-
-using namespace portapack;
-
-namespace ui {
-
-void LGEView::focus() {
-	options_trame.focus();
-}
-
-LGEView::~LGEView() {
-	transmitter_model.disable();
-	baseband::shutdown();
-}
-
-void LGEView::generate_lge_frame(const uint8_t command, const uint16_t address_a, const uint16_t address_b, std::vector<uint8_t>& data) {
-	std::array<uint8_t, 5> header = {
-		command,
-		(uint8_t)(address_a & 255),
-		(uint8_t)(address_a >> 8),
-		(uint8_t)(address_b & 255),
-		(uint8_t)(address_b >> 8),
-	};
-	
-	data.insert(data.begin(), header.begin(), header.end());
-	
-	frame_size = rfm69.gen_frame(data);
-	
-	for (auto b : data)
-		console.write(to_string_hex(b, 2) + " ");
-}
-
-void LGEView::generate_frame_touche() {
-	// 0001.89s
-	// 0D 96 02 12 0E 00 46 28 01 45 27 01 44 23 66 30
-	std::vector<uint8_t> data { 0x46, 0x28, 0x01, 0x45, 0x27, 0x01, 0x44, 0x23 };
-	
-	console.write("\n\x1B\x07Touche:\x1B\x10");
-	generate_lge_frame(0x96, (field_joueur.value() << 8) | field_salle.value(), 0x0001, data);
-}
-
-void LGEView::generate_frame_pseudo() {
-	// 0040.48s:
-	// 30 02 1A 00 19 00 FF 00 02 19 42 52 45 42 49 53 20 00 00 00 00 00 00 00 00 00
-	// 04 01 B0 04 7F 1F 11 33 40 1F 22 01 07 00 00 01 07 00 00 63 05 00 00 99 A2 
-	
-	std::vector<uint8_t> data { };
-	std::array<uint8_t, 3> data_header = { 0xFF, 0x00, 0x02 };
-	std::array<uint8_t, 22> data_footer = {
-		0x01, 0xB0, 0x04, 0x7F,
-		0x1F, 0x11, 0x33, 0x40,
-		0x1F, 0x22, 0x01, 0x07,
-		0x00, 0x00, 0x01, 0x07,
-		0x00, 0x00, 0x63, 0x05,
-		0x00, 0x00
-	};
-	uint32_t c;
-	
-	//data_header[2] = field_salle.value();	// ?
-	//data_footer[0] = field_salle.value();	// ?
-	
-	data.insert(data.begin(), data_header.begin(), data_header.end());
-	
-	data.push_back(field_joueur.value());
-	
-	c = 0;
-	for (auto &ch : pseudo) {
-		data.push_back(ch);
-		c++;
-	}
-	// Space at the end, is this required ?
-	data.push_back(0x20);
-	// Pad with zeroes
-	while (++c < 16)
-		data.push_back(0x00);
-	
-	data.push_back(field_equipe.value());
-	
-	data.insert(data.end(), data_footer.begin(), data_footer.end());
-	
-	console.write("\n\x1B\x0ESet pseudo:\x1B\x10");
-	
-	generate_lge_frame(0x02, 0x001A, field_joueur.value(), data);
-}
-
-void LGEView::generate_frame_equipe() {
-	// 0041.83s:
-	// 3D 03 FF FF FF FF 02 03 01 52 4F 55 47 45 00 00 00 00 00 00 00 00 00 00 00 00
-	// 02 56 45 52 54 45 00 00 00 00 00 00 00 00 00 00 00 01 03 42 4C 45 55 45 00 00
-	// 00 00 00 00 00 00 00 00 00 02 43 29
-
-	std::vector<uint8_t> data { };
-	std::array<uint8_t, 2> data_header = { 0x02, 0x01 };
-	uint32_t c;
-
-	data.insert(data.begin(), data_header.begin(), data_header.end());
-	
-	data.push_back(field_equipe.value());
-	
-	c = 0;
-	for (auto &ch : pseudo) {
-		data.push_back(ch);
-		c++;
-	}
-	// Pad with zeroes
-	while (c++ < 16)
-		data.push_back(0x00);
-	
-	data.push_back(field_equipe.value() - 1);	// Color ?
-	
-	console.write("\n\x1B\x0ASet equipe:\x1B\x10");
-	
-	generate_lge_frame(0x03, data);
-}
-
-void LGEView::generate_frame_broadcast_pseudo() {
-	// 0043.86s:
-	// 3D 04 FF FF FF FF 02 03 19 42 52 45 42 49 53 20 00 00 00 00 00 00 00 00 00 04
-	// 07 50 4F 4E 45 59 20 00 00 00 00 00 00 00 00 00 00 05 1B 41 42 42 59 20 00 00
-	// 00 00 00 00 00 00 00 00 00 04 0A 02
-
-	std::vector<uint8_t> data { };
-	std::array<uint8_t, 2> data_header = { 0x02, 0x01 };
-	uint32_t c;
-
-	data.insert(data.begin(), data_header.begin(), data_header.end());
-	
-	data.push_back(field_joueur.value());
-	
-	c = 0;
-	for (auto &ch : pseudo) {
-		data.push_back(ch);
-		c++;
-	}
-	// Space at the end, is this required ?
-	data.push_back(0x20);
-	// Pad with zeroes
-	while (++c < 16)
-		data.push_back(0x00);
-	
-	data.push_back(field_equipe.value());
-	
-	console.write("\n\x1B\x09" "Broadcast pseudo:\x1B\x10");
-	
-	generate_lge_frame(0x04, data);
-}
-
-void LGEView::generate_frame_start() {
-	// 0166.13s:
-	// 0A 05 FF FF FF FF 02 EC FF FF FF A3 35
-	std::vector<uint8_t> data { 0x02, 0xEC, 0xFF, 0xFF, 0xFF };
-	
-	//data[0] = field_salle.value();	// ?
-	
-	console.write("\n\x1B\x0DStart:\x1B\x10");
-	generate_lge_frame(0x05, data);
-}
-
-void LGEView::generate_frame_gameover() {
-	std::vector<uint8_t> data { (uint8_t)field_salle.value() };
-	
-	console.write("\n\x1B\x0CGameover:\x1B\x10");
-	generate_lge_frame(0x0D, data);
-}
-
-void LGEView::generate_frame_collier() {
-	uint8_t flags = 0;
-	
-	// Custom
-	// 0C 00 13 37 13 37 id flags channel playerid zapduty zaptime checksum CRC CRC
-	// channel: field_channel
-	// playerid: field_joueur
-	// zapduty: field_power
-	// zaptime: field_duration
-	
-	if (checkbox_heartbeat.value())
-		flags |= 1;
-	if (checkbox_rxtick.value())
-		flags |= 2;
-	
-	uint8_t checksum = 0;
-	uint8_t id = (uint8_t)field_id.value();
-	
-	std::vector<uint8_t> data {
-		id,
-		flags,
-		(uint8_t)field_salle.value(),
-		(uint8_t)field_joueur.value(),
-		(uint8_t)field_power.value(),
-		(uint8_t)(field_duration.value() * 10)
-	};
-	
-	for (auto &v : data)
-		checksum += v;
-	
-	data.push_back(checksum - id);
-	
-	console.write("\n\x1B\x06" "Config:\x1B\x10");
-	generate_lge_frame(0x00, 0x3713, 0x3713, data);
-}
-
-void LGEView::start_tx() {
-	if (tx_mode == ALL) {
-		transmitter_model.set_tuning_frequency(channels[channel_index]);
-		tx_view.on_show();	// Refresh tuning frequency display
-		tx_view.set_dirty();
-	}
-	transmitter_model.set_sampling_rate(2280000);
-	transmitter_model.set_baseband_bandwidth(1750000);
-	transmitter_model.enable();
-
-	chThdSleep(100);
-		
-	baseband::set_fsk_data(frame_size * 8, 2280000 / 9600, 4000, 256);
-}
-
-void LGEView::stop_tx() {
-	tx_mode = IDLE;
-	transmitter_model.disable();
-	tx_view.set_transmitting(false);
-}
-
-void LGEView::on_tx_progress(const uint32_t progress, const bool done) {
-	(void)progress;
-	
-	if (!done) return;
-	
-	transmitter_model.disable();
-	
-	/*if (repeats < 2) {
-		chThdSleep(100);
-		repeats++;
-		start_tx();
-	} else {*/
-		if (tx_mode == ALL) {
-			if (channel_index < 2) {
-				channel_index++;
-				repeats = 0;
-				start_tx();
-			} else {
-				stop_tx();
-			}
-		} else {
-			stop_tx();
-		}
-	//}
-}
-
-LGEView::LGEView(NavigationView& nav) {
-	baseband::run_image(portapack::spi_flash::image_tag_fsktx);
-	
-	add_children({
-		&labels,
-		&options_trame,
-		&field_salle,
-		&button_texte,
-		&field_equipe,
-		&field_joueur,
-		&field_id,
-		&field_power,
-		&field_duration,
-		&checkbox_heartbeat,
-		&checkbox_rxtick,
-		&checkbox_channels,
-		&console,
-		&tx_view
-	});
-	
-	field_salle.set_value(1);
-	field_equipe.set_value(1);
-	field_joueur.set_value(1);
-	field_id.set_value(1);
-	field_power.set_value(1);
-	field_duration.set_value(2);
-	
-	button_texte.on_select = [this, &nav](Button&) {
-		text_prompt(
-			nav,
-			pseudo,
-			15,
-			[this](std::string& buffer) {
-				button_texte.set_text(buffer);
-			});
-	};
-	
-	tx_view.on_edit_frequency = [this, &nav]() {
-		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			receiver_model.set_tuning_frequency(f);
-		};
-	};
-	
-	tx_view.on_start = [this]() {
-		if (tx_mode == IDLE) {
-			auto i = options_trame.selected_index_value();
-			if (i == 0)
-				generate_frame_touche();
-			else if (i == 1)
-				generate_frame_pseudo();
-			else if (i == 2)
-				generate_frame_equipe();
-			else if (i == 3)
-				generate_frame_broadcast_pseudo();
-			else if (i == 4)
-				generate_frame_start();
-			else if (i == 5)
-				generate_frame_gameover();
-			else if (i == 6)
-				generate_frame_collier();
-			
-			repeats = 0;
-			channel_index = 0;
-			tx_mode = checkbox_channels.value() ? ALL : SINGLE;
-			tx_view.set_transmitting(true);
-			start_tx();
-		}
-	};
-	
-	tx_view.on_stop = [this]() {
-		stop_tx();
-	};
-}
-
-} /* namespace ui */

firmware/application/apps/lge_app.hpp

@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2019 Furrtek
- * 
- * 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_widget.hpp"
-#include "ui_navigation.hpp"
-#include "ui_transmitter.hpp"
-#include "ui_font_fixed_8x16.hpp"
-#include "rfm69.hpp"
-
-#include "message.hpp"
-#include "transmitter_model.hpp"
-#include "portapack.hpp"
-
-namespace ui {
-
-class LGEView : public View {
-public:
-	LGEView(NavigationView& nav);
-	~LGEView();
-	
-	void focus() override;
-	
-	std::string title() const override { return "LGE tool"; };
-
-private:
-	enum tx_modes {
-		IDLE = 0,
-		SINGLE,
-		ALL
-	};
-	
-	tx_modes tx_mode = IDLE;
-	
-    RFM69 rfm69 { 5, 0x2DD4, true, true };
-    
-	uint32_t frame_size { 0 };
-	uint32_t repeats { 0 };
-	uint32_t channel_index { 0 };
-	std::string pseudo { "ABCDEF" };
-	
-	rf::Frequency channels[3] = { 868067000, 868183000, 868295000 };
-
-	void start_tx();
-	void stop_tx();
-	
-	void generate_lge_frame(const uint8_t command, std::vector<uint8_t>& data) {
-		generate_lge_frame(command, 0xFFFF, 0xFFFF, data);
-	}
-	void generate_lge_frame(const uint8_t command, const uint16_t address_a, const uint16_t address_b, std::vector<uint8_t>& data);
-	void generate_frame_touche();
-	void generate_frame_pseudo();
-	void generate_frame_equipe();
-	void generate_frame_broadcast_pseudo();
-	void generate_frame_start();
-	void generate_frame_gameover();
-	void generate_frame_collier();
-	
-	void on_tx_progress(const uint32_t progress, const bool done);
-	
-	Labels labels {
-		//{ { 7 * 8, 1 * 8 }, "NO FUN ALLOWED !", Color::red() },
-		{ { 1 * 8, 1 * 8 }, "Trame:", Color::light_grey() },
-		{ { 1 * 8, 3 * 8 }, "Salle:", Color::light_grey() },
-		{ { 14 * 8, 3 * 8 }, "Texte:", Color::light_grey() },
-		{ { 0 * 8, 5 * 8 }, "Equipe:", Color::light_grey() },
-		{ { 0 * 8, 7 * 8 }, "Joueur:", Color::light_grey() },
-		{ { 0 * 8, 10 * 8 }, "Collier:", Color::light_grey() },
-		{ { 4 * 8, 12 * 8 }, "ID:", Color::light_grey() },
-		{ { 3 * 8, 14 * 8 }, "Pow:  /10", Color::light_grey() },
-		{ { 1 * 8, 16 * 8 }, "Duree:  x100ms", Color::light_grey() }
-	};
-	
-	OptionsField options_trame {
-		{ 7 * 8, 1 * 8 },
-		13,
-		{
-			{ "Touche", 0 },
-			{ "Set pseudo", 1 },
-			{ "Set equipe", 2 },
-			{ "Brdcst pseudo", 3 },
-			{ "Start", 4 },
-			{ "Game over", 5 },
-			{ "Set collier", 6 }
-		}
-	};
-	
-	Checkbox checkbox_channels {
-		{ 20 * 8, 1 * 8 },
-		7,
-		"All ch.",
-		true
-	};
-	
-	NumberField field_salle {
-		{ 7 * 8, 3 * 8 },
-		1,
-		{ 1, 2 },
-		1,
-		'0'
-	};
-	
-	Button button_texte {
-		{ 14 * 8, 5 * 8, 16 * 8, 3 * 8 },
-		"ABCDEF"
-	};
-	
-	NumberField field_equipe {
-		{ 7 * 8, 5 * 8 },
-		1,
-		{ 1, 6 },
-		1,
-		'0'
-	};
-	
-	NumberField field_joueur {
-		{ 7 * 8, 7 * 8 },
-		2,
-		{ 1, 50 },
-		1,
-		'0'
-	};
-	
-	Checkbox checkbox_heartbeat {
-		{ 17 * 8, 12 * 8 },
-		9,
-		"Heartbeat",
-		true
-	};
-	Checkbox checkbox_rxtick {
-		{ 17 * 8, 15 * 8 },
-		7,
-		"RX tick",
-		true
-	};
-	NumberField field_id {
-		{ 7 * 8, 12 * 8 },
-		1,
-		{ 1, 2 },
-		1,
-		'0'
-	};
-	NumberField field_power {
-		{ 7 * 8, 14 * 8 },
-		2,
-		{ 1, 10 },
-		1,
-		'0'
-	};
-	NumberField field_duration {
-		{ 7 * 8, 16 * 8 },
-		2,
-		{ 1, 25 },
-		1,
-		'0'
-	};
-	
-	Console console {
-		{ 0, 18 * 8, 30 * 8, 7 * 16 }
-	};
-	
-	TransmitterView tx_view {
-		16 * 16,
-		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);
-		}
-	};
-};
-
-} /* namespace ui */

firmware/application/apps/pocsag_app.cpp

@@ -22,192 +22,343 @@
 
 #include "pocsag_app.hpp"
 
+#include "audio.hpp"
 #include "baseband_api.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "string_format.hpp"
+#include "utility.hpp"
+#include "file_path.hpp"
 
 using namespace portapack;
 using namespace pocsag;
-
-#include "string_format.hpp"
-#include "utility.hpp"
+namespace pmem = portapack::persistent_memory;
 
 void POCSAGLogger::log_raw_data(const pocsag::POCSAGPacket& packet, const uint32_t frequency) {
-	std::string entry = "Raw: F:" + to_string_dec_uint(frequency) + "Hz " +
-						pocsag::bitrate_str(packet.bitrate()) + " Codewords:";
-	
-	// Raw hex dump of all the codewords
-	for (size_t c = 0; c < 16; c++)
-		entry += to_string_hex(packet[c], 8) + " ";
-	
-	log_file.write_entry(packet.timestamp(), entry);
+    std::string entry = "Raw: F:" + to_string_dec_uint(frequency) + "Hz " +
+                        to_string_dec_uint(packet.bitrate()) + " Codewords:";
+
+    // Raw hex dump of all the codewords
+    for (size_t c = 0; c < 16; c++)
+        entry += to_string_hex(packet[c], 8) + " ";
+
+    log_file.write_entry(packet.timestamp(), entry);
 }
 
-void POCSAGLogger::log_decoded(
-	const pocsag::POCSAGPacket& packet,
-	const std::string text) {
-	
-	log_file.write_entry(packet.timestamp(), text);
+void POCSAGLogger::log_decoded(Timestamp timestamp, const std::string& text) {
+    log_file.write_entry(timestamp, text);
 }
 
 namespace ui {
 
-void POCSAGAppView::update_freq(rf::Frequency f) {
-	set_target_frequency(f);
-	portapack::persistent_memory::set_tuned_frequency(f);	// Maybe not ?
+POCSAGSettingsView::POCSAGSettingsView(
+    NavigationView& nav,
+    POCSAGSettings& settings)
+    : settings_{settings} {
+    add_children(
+        {&labels,
+         &check_log,
+         &check_log_raw,
+         &check_small_font,
+         &check_hide_bad,
+         &check_hide_addr_only,
+         &opt_filter_mode,
+         &field_filter_address,
+         &button_save});
+
+    check_log.set_value(settings_.enable_logging);
+    check_log_raw.set_value(settings_.enable_raw_log);
+    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);
+    opt_filter_mode.set_by_value(settings_.filter_mode);
+    field_filter_address.set_value(settings_.filter_address);
+
+    button_save.on_select = [this, &nav](Button&) {
+        settings_.enable_logging = check_log.value();
+        settings_.enable_raw_log = check_log_raw.value();
+        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_.filter_mode = opt_filter_mode.selected_index_value();
+        settings_.filter_address = field_filter_address.to_integer();
+
+        nav.pop();
+    };
 }
 
-POCSAGAppView::POCSAGAppView(NavigationView& nav) {
-	uint32_t ignore_address;
-	
-	baseband::run_image(portapack::spi_flash::image_tag_pocsag);
+POCSAGAppView::POCSAGAppView(NavigationView& nav)
+    : nav_{nav} {
+    baseband::run_image(portapack::spi_flash::image_tag_pocsag2);
 
-	add_children({
-		&rssi,
-		&channel,
-		&field_rf_amp,
-		&field_lna,
-		&field_vga,
-		&field_frequency,
-		&options_bitrate,
-		&check_log,
-		&check_ignore,
-		&sym_ignore,
-		&console
-	});
-	
-	receiver_model.set_sampling_rate(3072000);
-	receiver_model.set_baseband_bandwidth(1750000);
-	receiver_model.enable();
-	
-	field_frequency.set_value(receiver_model.tuning_frequency());
-	field_frequency.set_step(receiver_model.frequency_step());
-	field_frequency.on_change = [this](rf::Frequency f) {
-		update_freq(f);
-	};
-	field_frequency.on_edit = [this, &nav]() {
-		// TODO: Provide separate modal method/scheme?
-		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			update_freq(f);
-			field_frequency.set_value(f);
-		};
-	};
-	
-	check_log.set_value(logging);
-	check_log.on_select = [this](Checkbox&, bool v) {
-		logging = v;
-	};
-	
-	options_bitrate.on_change = [this](size_t, OptionsField::value_t v) {
-		on_bitrate_changed(v);
-	};
-	options_bitrate.set_selected_index(1);	// 1200bps
-	
-	check_ignore.set_value(ignore);
-	check_ignore.on_select = [this](Checkbox&, bool v) {
-		ignore = v;
-	};
-	
-	ignore_address = persistent_memory::pocsag_ignore_address();
-	for (size_t c = 0; c < 7; c++) {
-		sym_ignore.set_sym(6 - c, ignore_address % 10);
-		ignore_address /= 10;
-	}
+    add_children(
+        {&rssi,
+         &audio,
+         &field_rf_amp,
+         &field_lna,
+         &field_vga,
+         &field_frequency,
+         &field_squelch,
+         &field_volume,
+         &image_status,
+         &text_packet_count,
+         &widget_baud,
+         &widget_bits,
+         &widget_frames,
+         &button_filter_last,
+         &button_config,
+         &console});
 
-	logger = std::make_unique<POCSAGLogger>();
-	if (logger)
-		logger->append("pocsag.txt");
-}
+    // No app settings, use fallbacks from pmem.
+    if (!app_settings_.loaded()) {
+        settings_.filter_address = pmem::pocsag_ignore_address();
+        settings_.filter_mode = (settings_.filter_address == 0)
+                                    ? FILTER_NONE
+                                    : FILTER_DROP;
+    }
 
-POCSAGAppView::~POCSAGAppView() {	
-	// Save ignored address
-	persistent_memory::set_pocsag_ignore_address(sym_ignore.value_dec_u32());
-	
-	receiver_model.disable();
-	baseband::shutdown();
+    logger.append(logs_dir / u"POCSAG.TXT");
+
+    field_squelch.set_value(receiver_model.squelch_level());
+    field_squelch.on_change = [this](int32_t v) {
+        receiver_model.set_squelch_level(v);
+    };
+
+    button_filter_last.on_select = [this](Button&) {
+        if (settings_.filter_mode == FILTER_NONE)
+            settings_.filter_mode = FILTER_DROP;
+        settings_.filter_address = last_address;
+        refresh_ui();
+    };
+
+    button_config.on_select = [this](Button&) {
+        nav_.push<POCSAGSettingsView>(settings_);
+        nav_.set_on_pop([this]() { refresh_ui(); });
+    };
+
+    refresh_ui();
+
+    if (pmem::beep_on_packets())
+        audio::set_rate(audio::Rate::Hz_24000);
+
+    audio::output::start();
+    receiver_model.enable();
+    baseband::set_pocsag();
 }
 
 void POCSAGAppView::focus() {
-	field_frequency.focus();
+    field_frequency.focus();
 }
 
-// Useless ?
-void POCSAGAppView::set_parent_rect(const Rect new_parent_rect) {
-	View::set_parent_rect(new_parent_rect);
+POCSAGAppView::~POCSAGAppView() {
+    audio::output::stop();
+    receiver_model.disable();
+    baseband::shutdown();
+
+    // Save pmem settings.
+    pmem::set_pocsag_ignore_address(settings_.filter_address);
+    pmem::set_pocsag_last_address(last_address);  // For POCSAG TX.
 }
 
-void POCSAGAppView::on_packet(const POCSAGPacketMessage * message) {
-	std::string alphanum_text = "";
-	
-	if (message->packet.flag() != NORMAL)
-		console.writeln("\n\x1B\x0CRC ERROR: " + pocsag::flag_str(message->packet.flag()));
-	else {
-		pocsag_decode_batch(message->packet, &pocsag_state);
+void POCSAGAppView::refresh_ui() {
+    // Set console font style.
+    console.set_style(
+        settings_.enable_small_font
+            ? Theme::getInstance()->bg_darkest_small
+            : Theme::getInstance()->bg_darkest);
 
-		if ((ignore) && (pocsag_state.address == sym_ignore.value_dec_u32())) {
-			// Ignore (inform, but no log)
-			//console.write("\n\x1B\x03" + to_string_time(message->packet.timestamp()) +
-			//			" Ignored address " + to_string_dec_uint(pocsag_state.address));
-			return;
-		}
+    // Update filter button text.
+    std::string btn_text = "Filter Last";
+    switch (settings_.filter_mode) {
+        case FILTER_DROP:
+            btn_text = "Ignore Last";
+            break;
 
-		std::string console_info;
-		
-		console_info = "\n" + to_string_datetime(message->packet.timestamp(), HM);
-		console_info += " " + pocsag::bitrate_str(message->packet.bitrate());
-		console_info += " ADDR:" + to_string_dec_uint(pocsag_state.address);
-		console_info += " F" + to_string_dec_uint(pocsag_state.function);
+        case FILTER_KEEP:
+            btn_text = "Keep Last";
+            break;
 
-		// Store last received address for POCSAG TX
-		persistent_memory::set_pocsag_last_address(pocsag_state.address);
-		
-		if (pocsag_state.out_type == ADDRESS) {
-			// Address only
-			
-			console.write(console_info);
-			
-			if (logger && logging) {
-				logger->log_decoded(message->packet, to_string_dec_uint(pocsag_state.address) +
-													" F" + to_string_dec_uint(pocsag_state.function) +
-													" Address only");
-			}
-			
-			last_address = pocsag_state.address;
-		} else if (pocsag_state.out_type == MESSAGE) {
-			if (pocsag_state.address != last_address) {
-				// New message
-				console.writeln(console_info);
-				console.write(pocsag_state.output);
-				
-				last_address = pocsag_state.address;
-			} else {
-				// Message continues...
-				console.write(pocsag_state.output);
-			}
-			
-			if (logger && logging)
-				logger->log_decoded(message->packet, to_string_dec_uint(pocsag_state.address) +
-													" F" + to_string_dec_uint(pocsag_state.function) +
-													" Alpha: " + pocsag_state.output);
-		}
-	}
-	
-	// Log raw data whatever it contains
-	if (logger && logging)
-		logger->log_raw_data(message->packet, target_frequency());
+        case FILTER_NONE:
+        default:
+            btn_text = "Filter Last";
+            break;
+    }
+    button_filter_last.set_text(btn_text);
 }
 
-void POCSAGAppView::on_bitrate_changed(const uint32_t new_bitrate) {
-	baseband::set_pocsag(pocsag_bitrates[new_bitrate]);
+bool POCSAGAppView::ignore_address(uint32_t address) const {
+    switch (settings_.filter_mode) {
+        case FILTER_DROP:
+            return address == settings_.filter_address;
+
+        case FILTER_KEEP:
+            return address != settings_.filter_address;
+
+        case FILTER_NONE:
+        default:
+            return false;
+    }
 }
 
-void POCSAGAppView::set_target_frequency(const uint32_t new_value) {
-	target_frequency_ = new_value;
-	receiver_model.set_tuning_frequency(new_value);
+void POCSAGAppView::handle_decoded(Timestamp timestamp, const std::string& prefix) {
+    bool bad_data = pocsag_state.errors >= 3;
+
+    // Too many errors for reliable decode.
+    if (bad_data && hide_bad_data()) {
+        console.write("\n" STR_COLOR_MAGENTA + prefix + " Too many decode errors.");
+        last_address = 0;
+        return;
+    }
+
+    // Ignore address? TODO: could filter earlier.
+    if (ignore_address(pocsag_state.address)) {
+        console.write("\n" STR_COLOR_CYAN + prefix + " Ignored: " + to_string_dec_uint(pocsag_state.address));
+        last_address = pocsag_state.address;
+        return;
+    }
+
+    // Color indicates the message has a lot of decoding errors.
+    std::string color = bad_data ? STR_COLOR_MAGENTA : STR_COLOR_WHITE;
+
+    std::string console_info = "\n" + color + prefix;
+    console_info += " #" + to_string_dec_uint(pocsag_state.address);
+    console_info += " F" + to_string_dec_uint(pocsag_state.function);
+
+    if (pocsag_state.out_type == ADDRESS) {
+        last_address = pocsag_state.address;
+
+        if (!hide_addr_only()) {
+            console.write(console_info);
+
+            if (logging()) {
+                logger.log_decoded(
+                    timestamp,
+                    to_string_dec_uint(pocsag_state.address) +
+                        " F" + to_string_dec_uint(pocsag_state.function));
+            }
+        }
+
+    } else if (pocsag_state.out_type == MESSAGE) {
+        if (pocsag_state.address != last_address) {
+            // New message
+            last_address = pocsag_state.address;
+            console.writeln(console_info);
+            console.write(color + pocsag_state.output);
+        } else {
+            // Message continues...
+            console.write(color + pocsag_state.output);
+        }
+
+        if (logging()) {
+            logger.log_decoded(
+                timestamp,
+                to_string_dec_uint(pocsag_state.address) +
+                    " F" + to_string_dec_uint(pocsag_state.function) +
+                    " " + pocsag_state.output);
+        }
+    }
 }
 
-uint32_t POCSAGAppView::target_frequency() const {
-	return target_frequency_;
+static Color get_status_color(const POCSAGState& state) {
+    if (state.out_type == IDLE)
+        return Theme::getInstance()->bg_darkest->foreground;
+
+    switch (state.mode) {
+        case STATE_CLEAR:
+            return Theme::getInstance()->fg_cyan->foreground;
+        case STATE_HAVE_ADDRESS:
+            return Theme::getInstance()->fg_yellow->foreground;
+        case STATE_GETTING_MSG:
+            return Theme::getInstance()->fg_green->foreground;
+    }
+
+    // Shouldn't get here...
+    return Theme::getInstance()->fg_red->foreground;
+}
+
+void POCSAGAppView::on_packet(const POCSAGPacketMessage* message) {
+    const uint32_t roundVal = 50;
+    const uint32_t bitrate_rounded = roundVal * ((message->packet.bitrate() + (roundVal / 2)) / roundVal);
+    auto bitrate = to_string_dec_uint(bitrate_rounded);
+    auto timestamp = to_string_datetime(message->packet.timestamp(), HM);
+    auto prefix = timestamp + " " + bitrate;
+
+    // Display packet count to be able to tell whether baseband sent a packet for a tone.
+    ++packet_count;
+    text_packet_count.set(to_string_dec_uint(packet_count));
+
+    if (logging_raw())
+        logger.log_raw_data(message->packet, receiver_model.target_frequency());
+
+    if (message->packet.flag() != NORMAL) {
+        console.writeln("\n" STR_COLOR_RED + prefix + " CRC ERROR: " + pocsag::flag_str(message->packet.flag()));
+        last_address = 0;
+    } else {
+        // Set color before to be able to see if decode gets stuck.
+        image_status.set_foreground(Theme::getInstance()->fg_magenta->foreground);
+        pocsag_state.codeword_index = 0;
+        pocsag_state.errors = 0;
+
+        // 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);
+    }
+
+    // Set status icon color to indicate state machine state.
+    image_status.set_foreground(get_status_color(pocsag_state));
+
+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
+}
+
+void POCSAGAppView::on_stats(const POCSAGStatsMessage* stats) {
+    widget_baud.set_rate(stats->baud_rate);
+    widget_bits.set_bits(stats->current_bits);
+    widget_frames.set_frames(stats->current_frames);
+    widget_frames.set_sync(stats->has_sync);
+}
+
+void POCSAGAppView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
+}
+
+void BaudIndicator::paint(Painter& painter) {
+    auto p = screen_pos();
+    char top = '-';
+    char bot = '-';
+
+    if (rate_ > 0) {
+        auto r = rate_ / 100;
+        top = (r / 10) + '0';
+        bot = (r % 10) + '0';
+    }
+
+    painter.draw_char(p, *Theme::getInstance()->bg_darkest_small, top);
+    painter.draw_char({p.x(), p.y() + 8}, *Theme::getInstance()->bg_darkest_small, bot);
+}
+
+void BitsIndicator::paint(Painter&) {
+    auto p = screen_pos();
+    for (size_t i = 0; i < sizeof(bits_) * 8; ++i) {
+        auto is_set = ((bits_ >> i) & 0x1) == 1;
+
+        int x = p.x() + (i / height);
+        int y = p.y() + (i % height);
+        display.draw_pixel({x, y}, is_set ? Theme::getInstance()->bg_darkest->foreground : Theme::getInstance()->bg_darkest->background);
+    }
+}
+
+void FrameIndicator::paint(Painter& painter) {
+    auto p = screen_pos();
+    painter.draw_rectangle({p, {2, height}}, has_sync_ ? Theme::getInstance()->fg_green->foreground : Theme::getInstance()->bg_medium->background);
+
+    for (size_t i = 0; i < height; ++i) {
+        auto p2 = p + Point{2, 15 - (int)i};
+        painter.draw_hline(p2, 2, i < frame_count_ ? Theme::getInstance()->bg_darkest->foreground : Theme::getInstance()->bg_darkest->background);
+    }
 }
 
 } /* namespace ui */

firmware/application/apps/pocsag_app.hpp

@@ -24,120 +24,298 @@
 #define __POCSAG_APP_H__
 
 #include "ui_widget.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_receiver.hpp"
 #include "ui_rssi.hpp"
 
+#include "app_settings.hpp"
 #include "log_file.hpp"
-
 #include "pocsag.hpp"
 #include "pocsag_packet.hpp"
+#include "radio_state.hpp"
+
+#include <functional>
 
 class POCSAGLogger {
-public:
-	Optional<File::Error> append(const std::string& filename) {
-		return log_file.append(filename);
-	}
-	
-	void log_raw_data(const pocsag::POCSAGPacket& packet, const uint32_t frequency);
-	void log_decoded(const pocsag::POCSAGPacket& packet, const std::string text);
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
 
-private:
-	LogFile log_file { };
+    void log_raw_data(const pocsag::POCSAGPacket& packet, const uint32_t frequency);
+    void log_decoded(Timestamp timestamp, const std::string& text);
+
+   private:
+    LogFile log_file{};
 };
 
 namespace ui {
 
+class BaudIndicator : public Widget {
+   public:
+    BaudIndicator(Point position)
+        : Widget{{position, {5, height}}} {}
+
+    void paint(Painter& painter) override;
+    void set_rate(uint16_t rate) {
+        if (rate != rate_) {
+            rate_ = rate;
+            set_dirty();
+        }
+    }
+
+   private:
+    static constexpr uint8_t height = 16;
+    uint16_t rate_ = 0;
+};
+
+class BitsIndicator : public Widget {
+   public:
+    BitsIndicator(Point position)
+        : Widget{{position, {2, height}}} {}
+
+    void paint(Painter& painter) override;
+    void set_bits(uint32_t bits) {
+        if (bits != bits_) {
+            bits_ = bits;
+            set_dirty();
+        }
+    }
+
+   private:
+    static constexpr uint8_t height = 16;
+    uint32_t bits_ = 0;
+};
+
+class FrameIndicator : public Widget {
+   public:
+    FrameIndicator(Point position)
+        : Widget{{position, {4, height}}} {}
+
+    void paint(Painter& painter) override;
+    void set_frames(uint8_t frame_count) {
+        if (frame_count != frame_count_) {
+            frame_count_ = frame_count;
+            set_dirty();
+        }
+    }
+
+    void set_sync(bool has_sync) {
+        if (has_sync != has_sync_) {
+            has_sync_ = has_sync;
+            set_dirty();
+        }
+    }
+
+   private:
+    static constexpr uint8_t height = 16;
+    uint8_t frame_count_ = 0;
+    bool has_sync_ = false;
+};
+
+enum POCSAGFilter : uint8_t {
+    FILTER_NONE,
+    FILTER_DROP,
+    FILTER_KEEP
+};
+
+struct POCSAGSettings {
+    bool enable_small_font = false;
+    bool enable_logging = false;
+    bool enable_raw_log = false;
+    bool hide_bad_data = false;
+    bool hide_addr_only = false;
+    uint8_t filter_mode = false;
+    uint32_t filter_address = 0;
+};
+
+class POCSAGSettingsView : public View {
+   public:
+    POCSAGSettingsView(NavigationView& nav, POCSAGSettings& settings);
+
+    std::string title() const override { return "POCSAG Config"; };
+    void focus() override { button_save.focus(); }
+
+   private:
+    POCSAGSettings& settings_;
+
+    Labels labels{
+        {{2 * 8, 12 * 16}, "Filter Mode:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 13 * 16}, "Filter Addr:", Theme::getInstance()->fg_light->foreground},
+    };
+
+    Checkbox check_log{
+        {2 * 8, 2 * 16},
+        10,
+        "Enable Log"};
+
+    Checkbox check_log_raw{
+        {2 * 8, 4 * 16},
+        12,
+        "Log Raw Data"};
+
+    Checkbox check_small_font{
+        {2 * 8, 6 * 16},
+        4,
+        "Use Small Font"};
+
+    Checkbox check_hide_bad{
+        {2 * 8, 8 * 16},
+        22,
+        "Hide Bad Data"};
+
+    Checkbox check_hide_addr_only{
+        {2 * 8, 10 * 16},
+        22,
+        "Hide Addr Only"};
+
+    OptionsField opt_filter_mode{
+        {15 * 8, 12 * 16},
+        4,
+        {{"None", FILTER_NONE},
+         {"Drop", FILTER_DROP},
+         {"Keep", FILTER_KEEP}}};
+
+    SymField field_filter_address{
+        {15 * 8, 13 * 16},
+        7,
+        SymField::Type::Dec,
+        true /*explicit_edit*/};
+
+    Button button_save{
+        {11 * 8, 16 * 16, 10 * 8, 2 * 16},
+        "Save"};
+};
+
 class POCSAGAppView : public View {
-public:
-	POCSAGAppView(NavigationView& nav);
-	~POCSAGAppView();
+   public:
+    POCSAGAppView(NavigationView& nav);
+    ~POCSAGAppView();
 
-	void set_parent_rect(const Rect new_parent_rect) override;
-	void focus() override;
+    std::string title() const override { return "POCSAG RX"; };
+    void focus() override;
 
-	std::string title() const override { return "POCSAG RX"; };
+   private:
+    bool logging() const { return settings_.enable_logging; };
+    bool logging_raw() const { return settings_.enable_raw_log; };
+    bool hide_bad_data() const { return settings_.hide_bad_data; };
+    bool hide_addr_only() const { return settings_.hide_addr_only; };
 
-private:
-	static constexpr uint32_t initial_target_frequency = 466175000;
+    NavigationView& nav_;
+    RxRadioState radio_state_{
+        466175000 /* frequency*/,
+        max283x::filter::bandwidth_minimum /* bandwidth */,
+        3072000 /* sampling rate */
+    };
 
-	bool logging { true };
-	bool ignore { false };
-	uint32_t last_address = 0xFFFFFFFF;
-	pocsag::POCSAGState pocsag_state { };
+    // Settings
+    POCSAGSettings settings_{};
+    app_settings::SettingsManager app_settings_{
+        "rx_pocsag"sv,
+        app_settings::Mode::RX,
+        {
+            {"small_font"sv, &settings_.enable_small_font},
+            {"enable_logging"sv, &settings_.enable_logging},
+            {"enable_raw_log"sv, &settings_.enable_raw_log},
+            {"filter_mode"sv, &settings_.filter_mode},
+            {"filter_address"sv, &settings_.filter_address},
+            {"hide_bad_data"sv, &settings_.hide_bad_data},
+            {"hide_addr_only"sv, &settings_.hide_addr_only},
+        }};
 
-	RFAmpField field_rf_amp {
-		{ 13 * 8, 0 * 16 }
-	};
-	LNAGainField field_lna {
-		{ 15 * 8, 0 * 16 }
-	};
-	VGAGainField field_vga {
-		{ 18 * 8, 0 * 16 }
-	};
-	RSSI rssi {
-		{ 21 * 8, 0, 6 * 8, 4 },
-	};
-	Channel channel {
-		{ 21 * 8, 5, 6 * 8, 4 },
-	};
-	
-	FrequencyField field_frequency {
-		{ 0 * 8, 0 * 8 },
-	};
-	OptionsField options_bitrate {
-		{ 12 * 8, 21 },
-		7,
-		{
-			{ "512bps ", 0 },
-			{ "1200bps", 1 },
-			{ "2400bps", 2 }
-		}
-	};
-	Checkbox check_log {
-		{ 22 * 8, 21 },
-		3,
-		"LOG",
-		true
-	};
-	
-	Checkbox check_ignore {
-		{ 1 * 8, 40 },
-		15,
-		"Ignore address:",
-		true
-	};
-	SymField sym_ignore {
-		{ 19 * 8, 40 },
-		7,
-		SymField::SYMFIELD_DEC
-	};
+    void refresh_ui();
+    bool ignore_address(uint32_t address) const;
+    void handle_decoded(Timestamp timestamp, const std::string& prefix);
+    void on_packet(const POCSAGPacketMessage* message);
+    void on_stats(const POCSAGStatsMessage* stats);
 
-	Console console {
-		{ 0, 4 * 16, 240, 240 }
-	};
+    uint32_t last_address = 0;
+    pocsag::EccContainer ecc{};
+    pocsag::POCSAGState pocsag_state{&ecc};
+    POCSAGLogger logger{};
+    uint16_t packet_count = 0;
 
-	std::unique_ptr<POCSAGLogger> logger { };
+    RxFrequencyField field_frequency{
+        {0 * 8, 0 * 8},
+        nav_};
 
-	uint32_t target_frequency_ = initial_target_frequency;
-	
-	void update_freq(rf::Frequency f);
+    RFAmpField field_rf_amp{
+        {11 * 8, 0 * 16}};
+    LNAGainField field_lna{
+        {13 * 8, 0 * 16}};
+    VGAGainField field_vga{
+        {16 * 8, 0 * 16}};
 
-	void on_packet(const POCSAGPacketMessage * message);
+    RSSI rssi{
+        {19 * 8 - 4, 3, 6 * 8, 4}};
+    Audio audio{
+        {19 * 8 - 4, 8, 6 * 8, 4}};
 
-	void on_bitrate_changed(const uint32_t new_bitrate);
+    NumberField field_squelch{
+        {25 * 8, 0 * 16},
+        2,
+        {0, 99},
+        1,
+        ' ',
+        true /*wrap*/};
+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
 
-	uint32_t target_frequency() const;
-	void set_target_frequency(const uint32_t new_value);
-	
-	MessageHandlerRegistration message_handler_packet {
-		Message::ID::POCSAGPacket,
-		[this](Message* const p) {
-			const auto message = static_cast<const POCSAGPacketMessage*>(p);
-			this->on_packet(message);
-		}
-	};
+    Image image_status{
+        {0 * 8 + 4, 1 * 16 + 2, 16, 16},
+        &bitmap_icon_pocsag,
+        Theme::getInstance()->bg_darkest->foreground,
+        Theme::getInstance()->bg_darkest->background};
+
+    Text text_packet_count{
+        {3 * 8, 1 * 16 + 2, 5 * 8, 16},
+        "0"};
+
+    BitsIndicator widget_bits{
+        {8 * 8 + 1, 1 * 16 + 2}};
+
+    FrameIndicator widget_frames{
+        {8 * 8 + 4, 1 * 16 + 2}};
+
+    BaudIndicator widget_baud{
+        {8 * 9 + 1, 1 * 16 + 2}};
+
+    Button button_filter_last{
+        {10 * 8, 1 * 16, 12 * 8, 20},
+        "Filter Last"};
+
+    Button button_config{
+        {22 * 8, 1 * 16, 8 * 8, 20},
+        "Config"};
+
+    // 54 == status bar (16) + top controls (2 * 16 + 6).
+    Console console{
+        {0, 2 * 16 + 6, screen_width, screen_height - 54}};
+
+    void on_freqchg(int64_t freq);
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
+
+    MessageHandlerRegistration message_handler_packet{
+        Message::ID::POCSAGPacket,
+        [this](Message* const p) {
+            const auto message = static_cast<const POCSAGPacketMessage*>(p);
+            this->on_packet(message);
+        }};
+
+    MessageHandlerRegistration message_handler_stats{
+        Message::ID::POCSAGStats,
+        [this](Message* const p) {
+            const auto stats = static_cast<const POCSAGStatsMessage*>(p);
+            this->on_stats(stats);
+        }};
 };
 
 } /* namespace ui */
 
-#endif/*__POCSAG_APP_H__*/
+#endif /*__POCSAG_APP_H__*/

firmware/application/apps/replay_app.cpp

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016 Jared Boone, ShareBrained Technology, Inc.
  * Copyright (C) 2016 Furrtek
+ * Copyleft  (ↄ) 2022 NotPike
  *
  * This file is part of PortaPack.
  *
@@ -25,235 +26,199 @@
 
 #include "ui_fileman.hpp"
 #include "io_file.hpp"
+#include "io_convert.hpp"
 
 #include "baseband_api.hpp"
+#include "metadata_file.hpp"
 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "utility.hpp"
 
 using namespace portapack;
+namespace fs = std::filesystem;
 
 namespace ui {
 
 void ReplayAppView::set_ready() {
-	ready_signal = true;
+    ready_signal = true;
 }
 
-void ReplayAppView::on_file_changed(std::filesystem::path new_file_path) {
-	File data_file, info_file;
-	char file_data[257];
-	
-	// Get file size
-	auto data_open_error = data_file.open("/" + new_file_path.string());
-	if (data_open_error.is_valid()) {
-		file_error();
-		return;
-	}
-	
-	file_path = new_file_path;
-	
-	// Get original record frequency if available
-	std::filesystem::path info_file_path = file_path;
-	info_file_path.replace_extension(u".TXT");
-	
-	sample_rate = 500000;
-	
-	auto info_open_error = info_file.open("/" + info_file_path.string());
-	if (!info_open_error.is_valid()) {
-		memset(file_data, 0, 257);
-		auto read_size = info_file.read(file_data, 256);
-		if (!read_size.is_error()) {
-			auto pos1 = strstr(file_data, "center_frequency=");
-			if (pos1) {
-				pos1 += 17;
-				field_frequency.set_value(strtoll(pos1, nullptr, 10));
-			}
-			
-			auto pos2 = strstr(file_data, "sample_rate=");
-			if (pos2) {
-				pos2 += 12;
-				sample_rate = strtoll(pos2, nullptr, 10);
-			}
-		}
-	}
-	
-	text_sample_rate.set(unit_auto_scale(sample_rate, 3, 0) + "Hz");
-	
-	auto file_size = data_file.size();
-	auto duration = (file_size * 1000) / (2 * 2 * sample_rate);
-	
-	progressbar.set_max(file_size);
-	text_filename.set(file_path.filename().string().substr(0, 12));
-	text_duration.set(to_string_time_ms(duration));
-	
-	button_play.focus();
+void ReplayAppView::on_file_changed(const fs::path& new_file_path) {
+    file_path = new_file_path;
+    File::Size file_size{};
+
+    {  // Get the size of the data file.
+        File data_file;
+        auto error = data_file.open(file_path);
+        if (error) {
+            file_error();
+            return;
+        }
+
+        file_size = data_file.size();
+    }
+
+    // Get original record frequency if available.
+    auto metadata_path = get_metadata_path(file_path);
+    auto metadata = read_metadata_file(metadata_path);
+
+    if (metadata) {
+        field_frequency.set_value(metadata->center_frequency);
+        sample_rate = metadata->sample_rate;
+    } else {
+        // TODO: This is interesting because it implies that the
+        // The capture will just be replayed at the freq set on the
+        // FrequencyField. Is that an intentional behavior?
+        sample_rate = 500000;
+    }
+
+    // UI Fixup.
+    text_sample_rate.set(unit_auto_scale(sample_rate, 3, 0) + "Hz");
+    progressbar.set_max(file_size);
+    text_filename.set(truncate(file_path.filename().string(), 12));
+
+    uint8_t sample_size = capture_file_sample_size(current()->path);
+    auto duration = ms_duration(file_size, sample_rate, sample_size);
+    text_duration.set(to_string_time_ms(duration));
+
+    button_play.focus();
 }
 
 void ReplayAppView::on_tx_progress(const uint32_t progress) {
-	progressbar.set_value(progress);
+    progressbar.set_value(progress);
 }
 
 void ReplayAppView::focus() {
-	button_open.focus();
+    button_open.focus();
 }
 
 void ReplayAppView::file_error() {
-	nav_.display_modal("Error", "File read error.");
+    nav_.display_modal("Error", "File read error.");
 }
 
 bool ReplayAppView::is_active() const {
-	return (bool)replay_thread;
+    return (bool)replay_thread;
 }
 
 void ReplayAppView::toggle() {
-	if( is_active() ) {
-		stop(false);
-	} else {
-		start();
-	}
+    if (is_active()) {
+        stop(false);
+    } else {
+        start();
+    }
 }
 
 void ReplayAppView::start() {
-	stop(false);
+    stop(false);
 
-	std::unique_ptr<stream::Reader> reader;
-	
-	auto p = std::make_unique<FileReader>();
-	auto open_error = p->open(file_path);
-	if( open_error.is_valid() ) {
-		file_error();
-	} else {
-		reader = std::move(p);
-	}
+    std::unique_ptr<stream::Reader> reader;
 
-	if( reader ) {
-		button_play.set_bitmap(&bitmap_stop);
-		baseband::set_sample_rate(sample_rate * 8);
-		
-		replay_thread = std::make_unique<ReplayThread>(
-			std::move(reader),
-			read_size, buffer_count,
-			&ready_signal,
-			[](uint32_t return_code) {
-				ReplayThreadDoneMessage message { return_code };
-				EventDispatcher::send_message(message);
-			}
-		);
-	}
-	
-	radio::enable({
-		receiver_model.tuning_frequency(),
-		sample_rate * 8 ,
-		baseband_bandwidth,
-		rf::Direction::Transmit,
-		receiver_model.rf_amp(),
-		static_cast<int8_t>(receiver_model.lna()),
-		static_cast<int8_t>(receiver_model.vga())
-	});
+    auto p = std::make_unique<FileConvertReader>();
+    auto open_error = p->open(file_path);
+    if (open_error.is_valid()) {
+        file_error();
+        return;  // Fixes TX bug if there's a file error
+    } else {
+        reader = std::move(p);
+    }
+
+    if (reader) {
+        button_play.set_bitmap(&bitmap_stop);
+        baseband::set_sample_rate(sample_rate, OversampleRate::x8);
+
+        replay_thread = std::make_unique<ReplayThread>(
+            std::move(reader),
+            read_size, buffer_count,
+            &ready_signal,
+            [](uint32_t return_code) {
+                ReplayThreadDoneMessage message{return_code};
+                EventDispatcher::send_message(message);
+            });
+    }
+
+    transmitter_model.set_sampling_rate(sample_rate * toUType(OversampleRate::x8));
+    transmitter_model.set_baseband_bandwidth(baseband_bandwidth);
+    transmitter_model.enable();
+
+    if (portapack::persistent_memory::stealth_mode()) {
+        DisplaySleepMessage message;
+        EventDispatcher::send_message(message);
+    }
 }
 
 void ReplayAppView::stop(const bool do_loop) {
-	if( is_active() )
-		replay_thread.reset();
-	
-	if (do_loop && check_loop.value()) {
-		start();
-	} else {
-		radio::disable();
-		button_play.set_bitmap(&bitmap_play);
-	}
-	
-	ready_signal = false;
+    if (is_active())
+        replay_thread.reset();
+
+    if (do_loop && check_loop.value()) {
+        start();
+    } else {
+        transmitter_model.disable();
+        button_play.set_bitmap(&bitmap_play);
+    }
+
+    ready_signal = false;
 }
 
 void ReplayAppView::handle_replay_thread_done(const uint32_t return_code) {
-	if (return_code == ReplayThread::END_OF_FILE) {
-		stop(true);
-	} else if (return_code == ReplayThread::READ_ERROR) {
-		stop(false);
-		file_error();
-	}
-	
-	progressbar.set_value(0);
+    if (return_code == ReplayThread::END_OF_FILE) {
+        stop(true);
+    } else if (return_code == ReplayThread::READ_ERROR) {
+        stop(false);
+        file_error();
+    }
+
+    progressbar.set_value(0);
 }
 
 ReplayAppView::ReplayAppView(
-	NavigationView& nav
-) : nav_ (nav)
-{
-	baseband::run_image(portapack::spi_flash::image_tag_replay);
+    NavigationView& nav)
+    : nav_(nav) {
+    baseband::run_image(portapack::spi_flash::image_tag_replay);
 
-	add_children({
-		&labels,
-		&button_open,
-		&text_filename,
-		&text_sample_rate,
-		&text_duration,
-		&progressbar,
-		&field_frequency,
-		&field_lna,
-		&field_rf_amp,
-		&check_loop,
-		&button_play,
-		&waterfall,
-	});
-	
-	field_frequency.set_value(target_frequency());
-	field_frequency.set_step(receiver_model.frequency_step());
-	field_frequency.on_change = [this](rf::Frequency f) {
-		this->on_target_frequency_changed(f);
-	};
-	field_frequency.on_edit = [this, &nav]() {
-		// TODO: Provide separate modal method/scheme?
-		auto new_view = nav.push<FrequencyKeypadView>(this->target_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			this->on_target_frequency_changed(f);
-			this->field_frequency.set_value(f);
-		};
-	};
+    add_children({
+        &button_open,
+        &text_filename,
+        &text_sample_rate,
+        &text_duration,
+        &progressbar,
+        &field_frequency,
+        &tx_view,  // now it handles previous rfgain, rfamp.
+        &check_loop,
+        &button_play,
+        &waterfall,
+    });
 
-	field_frequency.set_step(5000);
-	
-	button_play.on_select = [this](ImageButton&) {
-		this->toggle();
-	};
-	
-	button_open.on_select = [this, &nav](Button&) {
-		auto open_view = nav.push<FileLoadView>(".C16");
-		open_view->on_changed = [this](std::filesystem::path new_file_path) {
-			on_file_changed(new_file_path);
-		};
-	};
+    button_play.on_select = [this](ImageButton&) {
+        this->toggle();
+    };
+
+    button_open.on_select = [this, &nav](Button&) {
+        auto open_view = nav.push<FileLoadView>(".C*");
+        open_view->on_changed = [this](fs::path new_file_path) {
+            on_file_changed(new_file_path);
+        };
+    };
 }
 
 ReplayAppView::~ReplayAppView() {
-	radio::disable();
-	baseband::shutdown();
+    transmitter_model.disable();
+    baseband::shutdown();
 }
 
 void ReplayAppView::on_hide() {
-	// TODO: Terrible kludge because widget system doesn't notify Waterfall that
-	// it's being shown or hidden.
-	waterfall.on_hide();
-	View::on_hide();
+    stop(false);
+    // TODO: Terrible kludge because widget system doesn't notify Waterfall that
+    // it's being shown or hidden.
+    waterfall.on_hide();
+    View::on_hide();
 }
 
 void ReplayAppView::set_parent_rect(const Rect new_parent_rect) {
-	View::set_parent_rect(new_parent_rect);
+    View::set_parent_rect(new_parent_rect);
 
-	const ui::Rect waterfall_rect { 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height };
-	waterfall.set_parent_rect(waterfall_rect);
-}
-
-void ReplayAppView::on_target_frequency_changed(rf::Frequency f) {
-	set_target_frequency(f);
-}
-
-void ReplayAppView::set_target_frequency(const rf::Frequency new_value) {
-	persistent_memory::set_tuned_frequency(new_value);;
-}
-
-rf::Frequency ReplayAppView::target_frequency() const {
-	return persistent_memory::tuned_frequency();
+    const ui::Rect waterfall_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height};
+    waterfall.set_parent_rect(waterfall_rect);
 }
 
 } /* namespace ui */

firmware/application/apps/replay_app.hpp

@@ -23,11 +23,15 @@
 #ifndef __REPLAY_APP_HPP__
 #define __REPLAY_APP_HPP__
 
+#include "app_settings.hpp"
+#include "radio_state.hpp"
 #include "ui_widget.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "replay_thread.hpp"
 #include "ui_spectrum.hpp"
+#include "ui_transmitter.hpp"
 
 #include <string>
 #include <memory>
@@ -35,122 +39,108 @@
 namespace ui {
 
 class ReplayAppView : public View {
-public:
-	ReplayAppView(NavigationView& nav);
-	~ReplayAppView();
+   public:
+    ReplayAppView(NavigationView& nav);
+    ~ReplayAppView();
 
-	void on_hide() override;
-	void set_parent_rect(const Rect new_parent_rect) override;
-	void focus() override;
+    void on_hide() override;
+    void set_parent_rect(const Rect new_parent_rect) override;
+    void focus() override;
 
-	std::string title() const override { return "Replay"; };
-	
-private:
-	NavigationView& nav_;
-	
-	static constexpr ui::Dim header_height = 3 * 16;
-	
-	uint32_t sample_rate = 0;
-	static constexpr uint32_t baseband_bandwidth = 2500000;
-	const size_t read_size { 16384 };
-	const size_t buffer_count { 3 };
+    std::string title() const override { return "Replay"; };
 
-	void on_file_changed(std::filesystem::path new_file_path);
-	void on_target_frequency_changed(rf::Frequency f);
-	void on_tx_progress(const uint32_t progress);
-	
-	void set_target_frequency(const rf::Frequency new_value);
-	rf::Frequency target_frequency() const;
+   private:
+    NavigationView& nav_;
+    TxRadioState radio_state_{};
+    app_settings::SettingsManager settings_{
+        "tx_replay", app_settings::Mode::TX};
 
-	void toggle();
-	void start();
-	void stop(const bool do_loop);
-	bool is_active() const;
-	void set_ready();
-	void handle_replay_thread_done(const uint32_t return_code);
-	void file_error();
+    static constexpr ui::Dim header_height = 3 * 16;
 
-	std::filesystem::path file_path { };
-	std::unique_ptr<ReplayThread> replay_thread { };
-	bool ready_signal { false };
+    uint32_t sample_rate = 0;
+    int32_t tx_gain{47};
+    bool rf_amp{true};  // aux private var to store temporal, Replay App rf_amp user selection.
+    static constexpr uint32_t baseband_bandwidth = 2500000;
+    const size_t read_size{16384};
+    const size_t buffer_count{3};
 
-	Labels labels {
-		{ { 10 * 8, 2 * 16 }, "LNA:   A:", Color::light_grey() }
-	};
-	
-	Button button_open {
-		{ 0 * 8, 0 * 16, 10 * 8, 2 * 16 },
-		"Open file"
-	};
-	
-	Text text_filename {
-		{ 11 * 8, 0 * 16, 12 * 8, 16 },
-		"-"
-	};
-	Text text_sample_rate {
-		{ 24 * 8, 0 * 16, 6 * 8, 16 },
-		"-"
-	};
-	
-	Text text_duration {
-		{ 11 * 8, 1 * 16, 6 * 8, 16 },
-		"-"
-	};
-	ProgressBar progressbar {
-		{ 18 * 8, 1 * 16, 12 * 8, 16 }
-	};
-	
-	FrequencyField field_frequency {
-		{ 0 * 8, 2 * 16 },
-	};
-	LNAGainField field_lna {
-		{ 14 * 8, 2 * 16 }
-	};
-	RFAmpField field_rf_amp {
-		{ 19 * 8, 2 * 16 }
-	};
-	Checkbox check_loop {
-		{ 21 * 8, 2 * 16 },
-		4,
-		"Loop",
-		true
-	};
-	ImageButton button_play {
-		{ 28 * 8, 2 * 16, 2 * 8, 1 * 16 },
-		&bitmap_play,
-		Color::green(),
-		Color::black()
-	};
+    void on_file_changed(const std::filesystem::path& new_file_path);
+    void on_tx_progress(const uint32_t progress);
 
-	spectrum::WaterfallWidget waterfall { };
+    void toggle();
+    void start();
+    void stop(const bool do_loop);
+    bool is_active() const;
+    void set_ready();
+    void handle_replay_thread_done(const uint32_t return_code);
+    void file_error();
 
-	MessageHandlerRegistration message_handler_replay_thread_error {
-		Message::ID::ReplayThreadDone,
-		[this](const Message* const p) {
-			const auto message = *reinterpret_cast<const ReplayThreadDoneMessage*>(p);
-			this->handle_replay_thread_done(message.return_code);
-		}
-	};
-	
-	MessageHandlerRegistration message_handler_fifo_signal {
-		Message::ID::RequestSignal,
-		[this](const Message* const p) {
-			const auto message = static_cast<const RequestSignalMessage*>(p);
-			if (message->signal == RequestSignalMessage::Signal::FillRequest) {
-				this->set_ready();
-			}
-		}
-	};
-	
-	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);
-		}
-	};
+    std::filesystem::path file_path{};
+    std::unique_ptr<ReplayThread> replay_thread{};
+    bool ready_signal{false};
+
+    Button button_open{
+        {0 * 8, 0 * 16, 10 * 8, 2 * 16},
+        "Open file"};
+
+    Text text_filename{
+        {11 * 8, 0 * 16, 12 * 8, 16},
+        "-"};
+    Text text_sample_rate{
+        {24 * 8, 0 * 16, 6 * 8, 16},
+        "-"};
+
+    Text text_duration{
+        {11 * 8, 1 * 16, 6 * 8, 16},
+        "-"};
+    ProgressBar progressbar{
+        {18 * 8, 1 * 16, 12 * 8, 16}};
+
+    TxFrequencyField field_frequency{
+        {0 * 8, 2 * 16},
+        nav_};
+
+    TransmitterView2 tx_view{
+        {11 * 8, 2 * 16},
+        /*short_ui*/ true};
+
+    Checkbox check_loop{
+        {21 * 8, 2 * 16},
+        4,
+        "Loop",
+        true};
+    ImageButton button_play{
+        {28 * 8, 2 * 16, 2 * 8, 1 * 16},
+        &bitmap_play,
+        Theme::getInstance()->fg_green->foreground,
+        Theme::getInstance()->fg_green->background};
+
+    spectrum::WaterfallView waterfall{};
+
+    MessageHandlerRegistration message_handler_replay_thread_error{
+        Message::ID::ReplayThreadDone,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const ReplayThreadDoneMessage*>(p);
+            this->handle_replay_thread_done(message.return_code);
+        }};
+
+    MessageHandlerRegistration message_handler_fifo_signal{
+        Message::ID::RequestSignal,
+        [this](const Message* const p) {
+            const auto message = static_cast<const RequestSignalMessage*>(p);
+            if (message->signal == RequestSignalMessage::Signal::FillRequest) {
+                this->set_ready();
+            }
+        }};
+
+    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);
+        }};
 };
 
 } /* namespace ui */
 
-#endif/*__REPLAY_APP_HPP__*/
+#endif /*__REPLAY_APP_HPP__*/

firmware/application/apps/soundboard_app.cpp

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
  * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2024 Mark Thompson
  *
  * This file is part of PortaPack.
  *
@@ -25,6 +26,9 @@
 #include "soundboard_app.hpp"
 #include "string_format.hpp"
 #include "tonesets.hpp"
+#include "ui_tone_key.hpp"
+#include "audio.hpp"
+#include "file_path.hpp"
 
 using namespace tonekey;
 using namespace portapack;
@@ -32,219 +36,269 @@ using namespace portapack;
 namespace ui {
 
 bool SoundBoardView::is_active() const {
-	return (bool)replay_thread;
+    return (bool)replay_thread;
 }
 
 void SoundBoardView::stop() {
-	if (is_active())
-		replay_thread.reset();
-	
-	transmitter_model.disable();
-	tx_view.set_transmitting(false);
-	
-	//button_play.set_bitmap(&bitmap_play);
-	ready_signal = false;
+    if (is_active())
+        replay_thread.reset();
+
+    audio::output::stop();
+    transmitter_model.disable();
+    tx_view.set_transmitting(false);
+
+    // button_play.set_bitmap(&bitmap_play);
+    ready_signal = false;
 }
 
 void SoundBoardView::handle_replay_thread_done(const uint32_t return_code) {
-	stop();
-	progressbar.set_value(0);
-	
-	if (return_code == ReplayThread::END_OF_FILE) {
-		if (check_random.value()) {
-			lfsr_v = lfsr_iterate(lfsr_v);
-			playing_id = lfsr_v % file_list.size();
-			menu_view.set_highlighted(playing_id);
-			start_tx(playing_id);
-		} else if (check_loop.value()) {
-			start_tx(playing_id);
-		}
-	} else if (return_code == ReplayThread::READ_ERROR) {
-		file_error();
-	}
+    stop();
+    progressbar.set_value(0);
+
+    if (return_code == ReplayThread::END_OF_FILE) {
+        if (check_random.value()) {
+            lfsr_v = lfsr_iterate(lfsr_v);
+            playing_id = lfsr_v % file_list.size();
+            menu_view.set_highlighted(playing_id);
+            start_tx(playing_id);
+        } else if (check_loop.value()) {
+            start_tx(playing_id);
+        }
+    } else if (return_code == ReplayThread::READ_ERROR) {
+        file_error();
+    }
 }
 
 void SoundBoardView::set_ready() {
-	ready_signal = true;
+    ready_signal = true;
 }
 
 void SoundBoardView::focus() {
-	menu_view.focus();
+    menu_view.focus();
 }
 
 void SoundBoardView::file_error() {
-	nav_.display_modal("Error", "File read error.");
+    nav_.display_modal("Error", "File read error.");
 }
 
 void SoundBoardView::start_tx(const uint32_t id) {
-	auto reader = std::make_unique<WAVFileReader>();
-	uint32_t tone_key_index = options_tone_key.selected_index();
-	uint32_t sample_rate;
-	
-	stop();
+    if (file_list.empty()) {
+        file_error();
+        return;
+    }
 
-	if (!reader->open(u"/WAV/" + file_list[id].native())) {
-		file_error();
-		return;
-	}
-	
-	playing_id = id;
-	
-	progressbar.set_max(reader->sample_count());
-	
-	//button_play.set_bitmap(&bitmap_stop);
-	
-	sample_rate = reader->sample_rate();
-	
-	replay_thread = std::make_unique<ReplayThread>(
-		std::move(reader),
-		read_size, buffer_count,
-		&ready_signal,
-		[](uint32_t return_code) {
-			ReplayThreadDoneMessage message { return_code };
-			EventDispatcher::send_message(message);
-		}
-	);
-	
-	baseband::set_audiotx_config(
-		1536000 / 20,		// Update vu-meter at 20Hz
-		transmitter_model.channel_bandwidth(),
-		0,	// Gain is unused
-		TONES_F2D(tone_key_frequency(tone_key_index), 1536000)
-	);
-	baseband::set_sample_rate(sample_rate);
-	
-	transmitter_model.set_sampling_rate(1536000);
-	transmitter_model.set_baseband_bandwidth(1750000);
-	transmitter_model.enable();
-	
-	tx_view.set_transmitting(true);
+    auto reader = std::make_unique<WAVFileReader>();
+
+    uint32_t tone_key_index = options_tone_key.selected_index();
+    uint32_t sample_rate;
+    uint8_t bits_per_sample;
+
+    stop();
+
+    if (!reader->open(u"/WAV/" + file_list[id].native())) {
+        file_error();
+        return;
+    }
+
+    playing_id = id;
+
+    progressbar.set_max(reader->sample_count());
+
+    // button_play.set_bitmap(&bitmap_stop);
+
+    sample_rate = reader->sample_rate();
+    bits_per_sample = reader->bits_per_sample();
+
+    replay_thread = std::make_unique<ReplayThread>(
+        std::move(reader),
+        read_size, buffer_count,
+        &ready_signal,
+        [](uint32_t return_code) {
+            ReplayThreadDoneMessage message{return_code};
+            EventDispatcher::send_message(message);
+        });
+
+    // TODO: Delete all this and use tx model.
+    baseband::set_audiotx_config(
+        1536000 / 20,  // Update vu-meter at 20Hz
+        transmitter_model.channel_bandwidth(),
+        0,  // Gain is unused
+        8,  // shift_bits_s16, default 8 bits, but also unused
+        bits_per_sample,
+        TONES_F2D(tone_key_frequency(tone_key_index), TONES_SAMPLERATE),
+        false,  // AM
+        false,  // DSB
+        false,  // USB
+        false   // LSB
+    );
+    baseband::set_sample_rate(sample_rate);
+
+    transmitter_model.enable();
+
+    tx_view.set_transmitting(true);
+
+    if (tone_key_index == 0)
+        audio::output::start();
 }
 
 /*void SoundBoardView::show_infos() {
-	if (!reader->open(file_list[menu_view.highlighted_index()]))
-		return;
-	
-	text_duration.set(to_string_time_ms(reader->ms_duration()));
-	text_title.set(reader->title().substr(0, 15));
+        if (!reader->open(file_list[menu_view.highlighted_index()]))
+                return;
+
+        text_duration.set(to_string_time_ms(reader->ms_duration()));
+        text_title.set(reader->title().substr(0, 15));
 }*/
 
 void SoundBoardView::on_tx_progress(const uint32_t progress) {
-	progressbar.set_value(progress);
+    progressbar.set_value(progress);
 }
 
 void SoundBoardView::on_select_entry() {
-	tx_view.focus();
+    tx_view.focus();
 }
 
 void SoundBoardView::refresh_list() {
-	auto reader = std::make_unique<WAVFileReader>();
-	
-	file_list.clear();
-	
-	// List directories and files, put directories up top
-	for (const auto& entry : std::filesystem::directory_iterator(u"WAV", u"*")) {
-		if (std::filesystem::is_regular_file(entry.status())) {
-			if (entry.path().string().length()) {
-			
-				auto entry_extension = entry.path().extension().string();
-			
-				for (auto &c: entry_extension)
-					c = toupper(c);
-				
-				if (entry_extension == ".WAV") {
-					
-					if (reader->open(u"/WAV/" + entry.path().native())) {
-						if ((reader->channels() == 1) && (reader->bits_per_sample() == 8)) {
-							//sounds[c].ms_duration = reader->ms_duration();
-							//sounds[c].path = u"WAV/" + entry.path().native();
-							file_list.push_back(entry.path());
-							if (file_list.size() == 100)
-								break;
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	if (!file_list.size()) {
-		// Hide widgets, show warning
-		menu_view.hidden(true);
-		text_empty.hidden(false);
-		set_dirty();
-	} else {
-		// Hide warning, show widgets
-		menu_view.hidden(false);
-		text_empty.hidden(true);
-		set_dirty();
-	
-		menu_view.clear();
-		
-		for (size_t n = 0; n < file_list.size(); n++) {
-			menu_view.add_item({
-				file_list[n].string().substr(0, 30),
-				ui::Color::white(),
-				nullptr,
-				[this](){
-					on_select_entry();
-				}
-			});
-		}
-		
-		menu_view.set_highlighted(0);	// Refresh
-	}
+    auto reader = std::make_unique<WAVFileReader>();
+
+    file_list.clear();
+    c_page = page;
+
+    // List directories and files, put directories up top
+    uint32_t count = 0;
+    for (const auto& entry : std::filesystem::directory_iterator(wav_dir, u"*")) {
+        if (std::filesystem::is_regular_file(entry.status())) {
+            if (entry.path().string().length()) {
+                auto entry_extension = entry.path().extension().string();
+
+                for (auto& c : entry_extension)
+                    c = toupper(c);
+
+                if (entry_extension == ".WAV") {
+                    if (reader->open(wav_dir / entry.path())) {
+                        if ((reader->channels() == 1) && ((reader->bits_per_sample() == 8) || (reader->bits_per_sample() == 16))) {
+                            // sounds[c].ms_duration = reader->ms_duration();
+                            // sounds[c].path = u"WAV/" + entry.path().native();
+                            if (count >= (page - 1) * 100 && count < page * 100) {
+                                file_list.push_back(entry.path());
+                                if (file_list.size() == 100) {
+                                    page++;
+                                    break;
+                                }
+                            }
+                            count++;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if (!file_list.size()) {
+        // Hide widgets, show warning
+        if (page == 1) {
+            menu_view.hidden(true);
+            text_empty.hidden(false);
+            set_dirty();
+        } else {
+            page = 1;
+            refresh_list();
+            return;
+        }
+    } else {
+        // Hide warning, show widgets
+        menu_view.hidden(false);
+        text_empty.hidden(true);
+        set_dirty();
+
+        menu_view.clear();
+
+        for (size_t n = 0; n < file_list.size(); n++) {
+            menu_view.add_item({file_list[n].string().substr(0, 30),
+                                ui::Theme::getInstance()->fg_magenta->foreground,
+                                nullptr,
+                                [this](KeyEvent) {
+                                    on_select_entry();
+                                }});
+        }
+
+        page_info.set("Page: " + to_string_dec_uint(c_page) + "    Sounds: " + to_string_dec_uint(file_list.size()));
+        menu_view.set_highlighted(0);  // Refresh
+    }
+
+    if (file_list.size() < 100) {
+        page = 1;
+    }
 }
 
 SoundBoardView::SoundBoardView(
-	NavigationView& nav
-) : nav_ (nav)
-{
-	baseband::run_image(portapack::spi_flash::image_tag_audio_tx);
-	
-	add_children({
-		&labels,
-		&menu_view,
-		&text_empty,
-		&options_tone_key,
-		&text_title,
-		&text_duration,
-		&progressbar,
-		&check_loop,
-		&check_random,
-		&tx_view
-	});
-	
-	refresh_list();
-	
-	text_title.set(to_string_dec_uint(file_list.size()));
-	
-	tone_keys_populate(options_tone_key);
-	options_tone_key.set_selected_index(0);
-	
-	check_loop.set_value(false);
-	check_random.set_value(false);
+    NavigationView& nav)
+    : nav_(nav) {
+    baseband::run_image(portapack::spi_flash::image_tag_audio_tx);
 
-	tx_view.on_edit_frequency = [this, &nav]() {
-		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			transmitter_model.set_tuning_frequency(f);
-		};
-	};
-	
-	tx_view.on_start = [this]() {
-		start_tx(menu_view.highlighted_index());
-	};
-	
-	tx_view.on_stop = [this]() {
-		tx_view.set_transmitting(false);
-		stop();
-	};
+    add_children({&labels,
+                  &menu_view,
+                  &text_empty,
+                  &options_tone_key,
+                  //&text_title,
+                  //&text_duration,
+                  &progressbar,
+                  &field_volume,
+                  &text_volume_disabled,
+                  &page_info,
+                  &check_loop,
+                  &check_random,
+                  &button_prev_page,
+                  &button_next_page,
+                  &tx_view});
+
+    refresh_list();
+
+    button_next_page.on_select = [this](Button&) {
+        this->refresh_list();
+    };
+
+    button_prev_page.on_select = [this](Button&) {
+        if (c_page == 1) return;
+        if (c_page == 2) page = 1;
+        page = c_page - 1;
+        refresh_list();
+    };
+
+    // text_title.set(to_string_dec_uint(file_list.size()));
+
+    tone_keys_populate(options_tone_key);
+    options_tone_key.set_selected_index(0);
+
+    text_volume_disabled.hidden(true);
+    options_tone_key.on_change = [this](size_t index, OptionsField::value_t) {
+        bool tone_key_enabled = (index != 0);
+        text_volume_disabled.hidden(!tone_key_enabled);
+        field_volume.hidden(tone_key_enabled);
+    };
+
+    check_loop.set_value(false);
+    check_random.set_value(false);
+
+    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(menu_view.highlighted_index());
+    };
+
+    tx_view.on_stop = [this]() {
+        tx_view.set_transmitting(false);
+        stop();
+    };
 }
 
 SoundBoardView::~SoundBoardView() {
-	transmitter_model.disable();
-	baseband::shutdown();
+    stop();
+    baseband::shutdown();
 }
 
-}
+}  // namespace ui

firmware/application/apps/soundboard_app.hpp

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
  * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2024 Mark Thompson
  *
  * This file is part of PortaPack.
  *
@@ -29,133 +30,151 @@
 #include "baseband_api.hpp"
 #include "lfsr_random.hpp"
 #include "io_wave.hpp"
-#include "tone_key.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
 
 namespace ui {
 
 class SoundBoardView : public View {
-public:
-	SoundBoardView(NavigationView& nav);
-	~SoundBoardView();
+   public:
+    SoundBoardView(NavigationView& nav);
+    ~SoundBoardView();
 
-	SoundBoardView(const SoundBoardView&) = delete;
-	SoundBoardView(SoundBoardView&&) = delete;
-	SoundBoardView& operator=(const SoundBoardView&) = delete;
-	SoundBoardView& operator=(SoundBoardView&&) = delete;
+    SoundBoardView(const SoundBoardView&) = delete;
+    SoundBoardView(SoundBoardView&&) = delete;
+    SoundBoardView& operator=(const SoundBoardView&) = delete;
+    SoundBoardView& operator=(SoundBoardView&&) = delete;
 
-	void focus() override;
-	
-	std::string title() const override { return "Soundboard"; };
-	
-private:
-	NavigationView& nav_;
-	
-	enum tx_modes {
-		NORMAL = 0,
-		RANDOM
-	};
-	
-	tx_modes tx_mode = NORMAL;
-	
-	uint32_t playing_id { };
-	
-	std::vector<std::filesystem::path> file_list { };
+    void focus() override;
 
-	const size_t read_size { 2048 };	// Less ?
-	const size_t buffer_count { 3 };
-	std::unique_ptr<ReplayThread> replay_thread { };
-	bool ready_signal { false };
-	lfsr_word_t lfsr_v = 1;
-	
-	//void show_infos();
-	void start_tx(const uint32_t id);
-	//void on_ctcss_changed(uint32_t v);
-	void stop();
-	bool is_active() const;
-	void set_ready();
-	void handle_replay_thread_done(const uint32_t return_code);
-	void file_error();
-	void on_tx_progress(const uint32_t progress);
-	void refresh_list();
-	void on_select_entry();
-	
-	Labels labels {
-		{ { 0, 20 * 8 + 4 }, "Title:", Color::light_grey() },
-		{ { 0, 23 * 8 }, "Key:", Color::light_grey() }
-	};
-	
-	MenuView menu_view {
-		{ 0, 2 * 8, 240, 20 * 8 },
-		true
-	};
-	Text text_empty {
-		{ 7 * 8, 12 * 8, 16 * 8, 16 },
-		"Empty directory !",
-	};
-	
-	Text text_title {
-		{ 6 * 8, 20 * 8 + 4, 15 * 8, 16 }
-	};
-	
-	Text text_duration {
-		{ 22 * 8, 20 * 8 + 4, 6 * 8, 16 }
-	};
-	
-	OptionsField options_tone_key {
-		{ 4 * 8, 23 * 8 },
-		18,
-		{ }
-	};
-	
-	Checkbox check_loop {
-		{ 8, 25 * 8 + 4 },
-		4,
-		"Loop"
-	};
-	
-	Checkbox check_random {
-		{ 10 * 8, 25 * 8 + 4 },
-		6,
-		"Random"
-	};
-	
-	ProgressBar progressbar {
-		{ 0 * 8, 30 * 8 - 4, 30 * 8, 16 }
-	};
-	
-	TransmitterView tx_view {
-		16 * 16,
-		5000,
-		12
-	};
-	
-	MessageHandlerRegistration message_handler_replay_thread_error {
-		Message::ID::ReplayThreadDone,
-		[this](const Message* const p) {
-			const auto message = *reinterpret_cast<const ReplayThreadDoneMessage*>(p);
-			this->handle_replay_thread_done(message.return_code);
-		}
-	};
-	
-	MessageHandlerRegistration message_handler_fifo_signal {
-		Message::ID::RequestSignal,
-		[this](const Message* const p) {
-			const auto message = static_cast<const RequestSignalMessage*>(p);
-			if (message->signal == RequestSignalMessage::Signal::FillRequest) {
-				this->set_ready();
-			}
-		}
-	};
-	
-	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);
-		}
-	};
+    std::string title() const override { return "Soundbrd TX"; };
+
+   private:
+    TxRadioState radio_state_{
+        0 /* frequency */,
+        1750000 /* bandwidth */,
+        1536000 /* sampling rate */
+    };
+    app_settings::SettingsManager settings_{
+        "tx_soundboard", app_settings::Mode::TX};
+
+    NavigationView& nav_;
+
+    enum tx_modes {
+        NORMAL = 0,
+        RANDOM
+    };
+
+    tx_modes tx_mode = NORMAL;
+
+    uint32_t playing_id{};
+    uint32_t page = 1;
+    uint32_t c_page = 1;
+
+    std::vector<std::filesystem::path> file_list{};
+
+    const size_t read_size{2048};  // Less ?
+    const size_t buffer_count{3};
+    std::unique_ptr<ReplayThread> replay_thread{};
+    bool ready_signal{false};
+    lfsr_word_t lfsr_v = 1;
+
+    // void show_infos();
+    void start_tx(const uint32_t id);
+    // void on_ctcss_changed(uint32_t v);
+    void stop();
+    bool is_active() const;
+    void set_ready();
+    void handle_replay_thread_done(const uint32_t return_code);
+    void file_error();
+    void on_tx_progress(const uint32_t progress);
+    void refresh_list();
+    void on_select_entry();
+
+    Labels labels{
+        {{24 * 8, 180}, "Vol:", Theme::getInstance()->fg_light->foreground},
+        {{0, 180}, "Key:", Theme::getInstance()->fg_light->foreground}};
+
+    Button button_next_page{
+        {30 * 7, 25 * 8, 10 * 3, 2 * 14},
+        "=>"};
+
+    Button button_prev_page{
+        {17 * 10, 25 * 8, 10 * 3, 2 * 14},
+        "<="};
+
+    Text page_info{
+        {0, 29 * 8, 30 * 8, 16}};
+
+    MenuView menu_view{
+        {0, 0, 240, 175},
+        true};
+    Text text_empty{
+        {7 * 8, 12 * 8, 16 * 8, 16},
+        "Empty directory !",
+    };
+
+    /*Text text_title {
+                { 6 * 8, 20 * 8 + 4, 15 * 8, 16 }
+        };*/
+
+    /*Text text_duration {
+                { 22 * 8, 20 * 8 + 4, 6 * 8, 16 }
+        };*/
+
+    OptionsField options_tone_key{
+        {4 * 8, 180},
+        18,
+        {}};
+
+    AudioVolumeField field_volume{
+        {28 * 8, 180}};
+    Text text_volume_disabled{
+        {28 * 8, 180, 3 * 8, 16},
+        "--"};
+
+    Checkbox check_loop{
+        {0, 25 * 8 + 4},
+        4,
+        "Loop"};
+
+    Checkbox check_random{
+        {10 * 7, 25 * 8 + 4},
+        6,
+        "Random"};
+
+    ProgressBar progressbar{
+        {0 * 8, 31 * 8 + 2, 30 * 8, 4}};
+
+    TransmitterView tx_view{
+        16 * 16,
+        5000,
+        12};
+
+    MessageHandlerRegistration message_handler_replay_thread_error{
+        Message::ID::ReplayThreadDone,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const ReplayThreadDoneMessage*>(p);
+            this->handle_replay_thread_done(message.return_code);
+        }};
+
+    MessageHandlerRegistration message_handler_fifo_signal{
+        Message::ID::RequestSignal,
+        [this](const Message* const p) {
+            const auto message = static_cast<const RequestSignalMessage*>(p);
+            if (message->signal == RequestSignalMessage::Signal::FillRequest) {
+                this->set_ready();
+            }
+        }};
+
+    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);
+        }};
 };
 
 } /* namespace ui */
 
-#endif/*__UI_SOUNDBOARD_H__*/
+#endif /*__UI_SOUNDBOARD_H__*/

firmware/application/apps/spectrum_analysis_app.cpp

@@ -25,10 +25,10 @@
 using namespace portapack;
 
 SpectrumAnalysisModel::SpectrumAnalysisModel() {
-	receiver_model.set_baseband_configuration({
-		.mode = 4,
-		.sampling_rate = 20000000,
-		.decimation_factor = 1,
-	});
-	receiver_model.set_baseband_bandwidth(12000000);
+    receiver_model.set_baseband_configuration({
+        .mode = 4,
+        .sampling_rate = 20000000,
+        .decimation_factor = 1,
+    });
+    receiver_model.set_baseband_bandwidth(12000000);
 }

firmware/application/apps/spectrum_analysis_app.hpp

@@ -26,19 +26,18 @@
 #include "ui_spectrum.hpp"
 
 class SpectrumAnalysisModel {
-public:
-	SpectrumAnalysisModel();
+   public:
+    SpectrumAnalysisModel();
 };
 
 namespace ui {
 
-class SpectrumAnalysisView : public spectrum::WaterfallWidget {
-public:
-
-private:
-	SpectrumAnalysisModel model;
+class SpectrumAnalysisView : public spectrum::WaterfallView {
+   public:
+   private:
+    SpectrumAnalysisModel model;
 };
 
 } /* namespace ui */
 
-#endif/*__SPECTRUM_ANALYSIS_APP_H__*/
+#endif /*__SPECTRUM_ANALYSIS_APP_H__*/

firmware/application/apps/tpms_app.cpp

@@ -1,220 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- *
- * 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 "tpms_app.hpp"
-
-#include "baseband_api.hpp"
-
-#include "portapack.hpp"
-using namespace portapack;
-
-#include "string_format.hpp"
-
-#include "utility.hpp"
-
-namespace tpms {
-
-namespace format {
-
-std::string type(Reading::Type type) {
-	return to_string_dec_uint(toUType(type), 2);
-}
-
-std::string id(TransponderID id) {
-	return to_string_hex(id.value(), 8);
-}
-
-std::string pressure(Pressure pressure) {
-	return to_string_dec_int(pressure.kilopascal(), 3);
-}
-
-std::string temperature(Temperature temperature) {
-	return to_string_dec_int(temperature.celsius(), 3);
-}
-
-std::string flags(Flags flags) {
-	return to_string_hex(flags, 2);
-}
-
-static std::string signal_type(SignalType signal_type) {
-	switch(signal_type) {
-	case SignalType::FSK_19k2_Schrader:		return "FSK 38400 19200 Schrader";
-	case SignalType::OOK_8k192_Schrader:	return "OOK - 8192 Schrader";
-	case SignalType::OOK_8k4_Schrader:		return "OOK - 8400 Schrader";
-	default:								return "- - - -";
-	}
-}
-
-} /* namespace format */
-
-} /* namespace tpms */
-
-void TPMSLogger::on_packet(const tpms::Packet& packet, const uint32_t target_frequency) {
-	const auto hex_formatted = packet.symbols_formatted();
-
-	// TODO: function doesn't take uint64_t, so when >= 1<<32, weirdness will ensue!
-	const auto tuning_frequency_str = to_string_dec_uint(target_frequency, 10);
-
-	std::string entry = tuning_frequency_str + " " + tpms::format::signal_type(packet.signal_type()) + " " + hex_formatted.data + "/" + hex_formatted.errors;
-	log_file.write_entry(packet.received_at(), entry);
-}
-
-const TPMSRecentEntry::Key TPMSRecentEntry::invalid_key = { tpms::Reading::Type::None, 0 };
-
-void TPMSRecentEntry::update(const tpms::Reading& reading) {
-	received_count++;
-
-	if( reading.pressure().is_valid() ) {
-		last_pressure = reading.pressure();
-	}
-	if( reading.temperature().is_valid() ) {
-		last_temperature = reading.temperature();
-	}
-	if( reading.flags().is_valid() ) {
-		last_flags = reading.flags();
-	}
-}
-
-namespace ui {
-
-template<>
-void RecentEntriesTable<TPMSRecentEntries>::draw(
-	const Entry& entry,
-	const Rect& target_rect,
-	Painter& painter,
-	const Style& style
-) {
-	std::string line = tpms::format::type(entry.type) + " " + tpms::format::id(entry.id);
-
-	if( entry.last_pressure.is_valid() ) {
-		line += " " + tpms::format::pressure(entry.last_pressure.value());
-	} else {
-		line += " " "   ";
-	}
-
-	if( entry.last_temperature.is_valid() ) {
-		line += " " + tpms::format::temperature(entry.last_temperature.value());
-	} else {
-		line += " " "   ";
-	}
-
-	if( entry.received_count > 999 ) {
-		line += " +++";
-	} else {
-		line += " " + to_string_dec_uint(entry.received_count, 3);
-	}
-
-	if( entry.last_flags.is_valid() ) {
-		line += " " + tpms::format::flags(entry.last_flags.value());
-	} else {
-		line += " " "  ";
-	}
-
-	line.resize(target_rect.width() / 8, ' ');
-	painter.draw_string(target_rect.location(), style, line);
-}
-
-TPMSAppView::TPMSAppView(NavigationView&) {
-	baseband::run_image(portapack::spi_flash::image_tag_tpms);
-
-	add_children({
-		&rssi,
-		&channel,
-		&options_band,
-		&field_rf_amp,
-		&field_lna,
-		&field_vga,
-		&recent_entries_view,
-	});
-
-	radio::enable({
-		tuning_frequency(),
-		sampling_rate,
-		baseband_bandwidth,
-		rf::Direction::Receive,
-		receiver_model.rf_amp(),
-		static_cast<int8_t>(receiver_model.lna()),
-		static_cast<int8_t>(receiver_model.vga()),
-	});
-
-	options_band.on_change = [this](size_t, OptionsField::value_t v) {
-		this->on_band_changed(v);
-	};
-	options_band.set_by_value(target_frequency());
-
-	logger = std::make_unique<TPMSLogger>();
-	if( logger ) {
-		logger->append(u"tpms.txt");
-	}
-}
-
-TPMSAppView::~TPMSAppView() {
-	radio::disable();
-
-	baseband::shutdown();
-}
-
-void TPMSAppView::focus() {
-	options_band.focus();
-}
-
-void TPMSAppView::set_parent_rect(const Rect new_parent_rect) {
-	View::set_parent_rect(new_parent_rect);
-	recent_entries_view.set_parent_rect({ 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height });
-}
-
-void TPMSAppView::on_packet(const tpms::Packet& packet) {
-	if( logger ) {
-		logger->on_packet(packet, target_frequency());
-	}
-
-	const auto reading_opt = packet.reading();
-	if( reading_opt.is_valid() ) {
-		const auto reading = reading_opt.value();
-		auto& entry = ::on_packet(recent, TPMSRecentEntry::Key { reading.type(), reading.id() });
-		entry.update(reading);
-		recent_entries_view.set_dirty();
-	}
-}
-
-void TPMSAppView::on_show_list() {
-	recent_entries_view.hidden(false);
-	recent_entries_view.focus();
-}
-
-void TPMSAppView::on_band_changed(const uint32_t new_band_frequency) {
-	set_target_frequency(new_band_frequency);
-}
-
-void TPMSAppView::set_target_frequency(const uint32_t new_value) {
-	target_frequency_ = new_value;
-	radio::set_tuning_frequency(tuning_frequency());
-}
-
-uint32_t TPMSAppView::target_frequency() const {
-	return target_frequency_;
-}
-
-uint32_t TPMSAppView::tuning_frequency() const {
-	return target_frequency() - (sampling_rate / 4);
-}
-
-} /* namespace ui */

firmware/application/apps/tpms_app.hpp

@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- *
- * 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 __TPMS_APP_H__
-#define __TPMS_APP_H__
-
-#include "ui_widget.hpp"
-#include "ui_navigation.hpp"
-#include "ui_receiver.hpp"
-#include "ui_rssi.hpp"
-#include "ui_channel.hpp"
-
-#include "event_m0.hpp"
-
-#include "log_file.hpp"
-
-#include "recent_entries.hpp"
-
-#include "tpms_packet.hpp"
-
-namespace std {
-
-constexpr bool operator==(const tpms::TransponderID& lhs, const tpms::TransponderID& rhs) {
-	return (lhs.value() == rhs.value());
-}
-
-} /* namespace std */
-
-struct TPMSRecentEntry {
-	using Key = std::pair<tpms::Reading::Type, tpms::TransponderID>;
-
-	static const Key invalid_key;
-
-	tpms::Reading::Type type { invalid_key.first };
-	tpms::TransponderID id { invalid_key.second };
-
-	size_t received_count { 0 };
-
-	Optional<Pressure> last_pressure { };
-	Optional<Temperature> last_temperature { };
-	Optional<tpms::Flags> last_flags { };
-
-	TPMSRecentEntry(
-		const Key& key
-	) : type { key.first },
-		id { key.second }
-	{
-	}
-
-	Key key() const {
-		return { type, id };
-	}
-
-	void update(const tpms::Reading& reading);
-};
-
-using TPMSRecentEntries = RecentEntries<TPMSRecentEntry>;
-
-class TPMSLogger {
-public:
-	Optional<File::Error> append(const std::filesystem::path& filename) {
-		return log_file.append(filename);
-	}
-	
-	void on_packet(const tpms::Packet& packet, const uint32_t target_frequency);
-
-private:
-	LogFile log_file { };
-};
-
-namespace ui {
-
-using TPMSRecentEntriesView = RecentEntriesView<TPMSRecentEntries>;
-
-class TPMSAppView : public View {
-public:
-	TPMSAppView(NavigationView& nav);
-	~TPMSAppView();
-
-	void set_parent_rect(const Rect new_parent_rect) override;
-
-	// Prevent painting of region covered entirely by a child.
-	// TODO: Add flag to View that specifies view does not need to be cleared before painting.
-	void paint(Painter&) override { };
-
-	void focus() override;
-
-	std::string title() const override { return "TPMS"; };
-
-private:
-	static constexpr uint32_t initial_target_frequency = 315000000;
-	static constexpr uint32_t sampling_rate = 2457600;
-	static constexpr uint32_t baseband_bandwidth = 1750000;
-
-	MessageHandlerRegistration message_handler_packet {
-		Message::ID::TPMSPacket,
-		[this](Message* const p) {
-			const auto message = static_cast<const TPMSPacketMessage*>(p);
-			const tpms::Packet packet { message->packet, message->signal_type };
-			this->on_packet(packet);
-		}
-	};
-
-	static constexpr ui::Dim header_height = 1 * 16;
-
-	RSSI rssi {
-		{ 21 * 8, 0, 6 * 8, 4 },
-	};
-
-	Channel channel {
-		{ 21 * 8, 5, 6 * 8, 4 },
-	};
-
-	OptionsField options_band {
-		{ 0 * 8, 0 * 16 },
-		3,
-		{
-			{ "315", 315000000 },
-			{ "434", 433920000 },
-		}
-	};
-
-	RFAmpField field_rf_amp {
-		{ 13 * 8, 0 * 16 }
-	};
-
-	LNAGainField field_lna {
-		{ 15 * 8, 0 * 16 }
-	};
-
-	VGAGainField field_vga {
-		{ 18 * 8, 0 * 16 }
-	};
-
-	TPMSRecentEntries recent { };
-	std::unique_ptr<TPMSLogger> logger { };
-
-	const RecentEntriesColumns columns { {
-		{ "Tp", 2 },
-		{ "ID", 8 },
-		{ "kPa", 3 },
-		{ "C", 3 },
-		{ "Cnt", 3 },
-		{ "Fl", 2 },
-	} };
-	TPMSRecentEntriesView recent_entries_view { columns, recent };
-
-	uint32_t target_frequency_ = initial_target_frequency;
-
-	void on_packet(const tpms::Packet& packet);
-	void on_show_list();
-
-	void on_band_changed(const uint32_t new_band_frequency);
-
-	uint32_t target_frequency() const;
-	void set_target_frequency(const uint32_t new_value);
-
-	uint32_t tuning_frequency() const;
-};
-
-} /* namespace ui */
-
-#endif/*__TPMS_APP_H__*/

firmware/application/apps/ui_about.cpp

@@ -40,106 +40,99 @@ namespace ui {
 
 // This is pretty much WaterfallView but in the opposite direction
 CreditsWidget::CreditsWidget(
-	Rect parent_rect
-) : Widget { parent_rect }
-{
+    Rect parent_rect)
+    : Widget{parent_rect} {
 }
 
 void CreditsWidget::paint(Painter&) {
 }
 
 void CreditsWidget::on_show() {
-	clear();
+    clear();
 
-	const auto screen_r = screen_rect();
-	display.scroll_set_area(screen_r.top(), screen_r.bottom());
+    const auto screen_r = screen_rect();
+    display.scroll_set_area(screen_r.top(), screen_r.bottom());
 }
 
 void CreditsWidget::on_hide() {
-	display.scroll_disable();
+    display.scroll_disable();
 }
 
 void CreditsWidget::new_row(
-	const std::array<Color, 240>& pixel_row
-) {
-	// Glitch be here (see comment in main.cpp)
-	const auto draw_y = display.scroll(-1);
-	
-	display.draw_pixels(
-		{ { 0, draw_y - 1 }, { 240, 1 } },
-		pixel_row
-	);
+    const std::array<Color, 240>& pixel_row) {
+    // Glitch be here (see comment in main.cpp)
+    const auto draw_y = display.scroll(-1);
+
+    display.draw_pixels(
+        {{0, draw_y - 1}, {240, 1}},
+        pixel_row);
 }
 
 void CreditsWidget::clear() {
-	display.fill_rectangle(
-		screen_rect(),
-		Color::black()
-	);
+    display.fill_rectangle(
+        screen_rect(),
+        Theme::getInstance()->bg_darkest->background);
 }
 
 void AboutView::update() {
-	size_t i = 0;
-	std::array<Color, 240> pixel_row;
-	
-	slow_down++;
-	if (slow_down % 3 < 2) return;
-	
-	if (!timer) {
-		if (loop) {
-			credits_index = 0;
-			loop = false;
-		}
-		
-		text = credits[credits_index].text;
-		timer = credits[credits_index].delay;
-		start_pos = credits[credits_index].start_pos;
-		
-		if (timer < 0) {
-			timer = 240;
-			loop = true;
-		} else
-			timer += 16;
-		
-		render_line = 0;
-		credits_index++;
-	} else
-		timer--;
-	
-	if (render_line < 16) {
-		for (const auto c : text) {
-			const auto glyph = style().font.glyph(c);
-			
-			const size_t start = (glyph.size().width() / 8) * render_line; 
-			for (Dim c = 0; c < glyph.size().width(); c++) {
-				const auto pixel = glyph.pixels()[start + (c >> 3)] & (1U << (c & 0x7));
-				pixel_row[start_pos + i + c] = pixel ? Color::white() : Color::black();
-			}
-			
-			const auto advance = glyph.advance();
-			i += advance.x();
-		}
-		render_line++;
-	}
-	
-	credits_display.new_row(pixel_row);
+    size_t i = 0;
+    std::array<Color, 240> pixel_row;
+
+    slow_down++;
+    if (slow_down % 3 < 2) return;
+
+    if (!timer) {
+        if (loop) {
+            credits_index = 0;
+            loop = false;
+        }
+
+        text = credits[credits_index].text;
+        timer = credits[credits_index].delay;
+        start_pos = credits[credits_index].start_pos;
+
+        if (timer < 0) {
+            timer = 240;
+            loop = true;
+        } else
+            timer += 16;
+
+        render_line = 0;
+        credits_index++;
+    } else
+        timer--;
+
+    if (render_line < 16) {
+        for (const auto c : text) {
+            const auto glyph = style().font.glyph(c);
+
+            const size_t start = (glyph.size().width() / 8) * render_line;
+            for (Dim c = 0; c < glyph.size().width(); c++) {
+                const auto pixel = glyph.pixels()[start + (c >> 3)] & (1U << (c & 0x7));
+                pixel_row[start_pos + i + c] = pixel ? Theme::getInstance()->bg_darkest->foreground : Theme::getInstance()->bg_darkest->background;
+            }
+
+            const auto advance = glyph.advance();
+            i += advance.x();
+        }
+        render_line++;
+    }
+
+    credits_display.new_row(pixel_row);
 }
 
 AboutView::AboutView(
-	NavigationView& nav
-) {
-	add_children({
-		&credits_display,
-		&button_ok
-	});
+    NavigationView& nav) {
+    add_children({&credits_display,
+                  &button_ok});
 
-	button_ok.on_select = [&nav](Button&){
-		nav.pop();
-	};
+    button_ok.on_select = [&nav](Button&) {
+        nav.pop();
+    };
 }
 
 void AboutView::focus() {
-	button_ok.focus();
+    button_ok.focus();
 }
 
 } /* namespace ui */

firmware/application/apps/ui_about.hpp

@@ -25,100 +25,95 @@
 
 #include "ui_widget.hpp"
 #include "ui_navigation.hpp"
-#include "ui_font_fixed_8x16.hpp"
 
 #include <cstdint>
 
 namespace ui {
 
 class CreditsWidget : public Widget {
-public:
-	CreditsWidget(Rect parent_rect);
-	
-	void on_show() override;
-	void on_hide() override;
+   public:
+    CreditsWidget(Rect parent_rect);
 
-	void paint(Painter&) override;
-	
-	void new_row(const std::array<Color, 240>& pixel_row);
+    void on_show() override;
+    void on_hide() override;
 
-private:
-	void clear();
+    void paint(Painter&) override;
+
+    void new_row(const std::array<Color, 240>& pixel_row);
+
+   private:
+    void clear();
 };
 
 class AboutView : public View {
-public:
-	AboutView(NavigationView& nav);
-	
-	void focus() override;
-	
-	std::string title() const override { return "About"; };
+   public:
+    AboutView(NavigationView& nav);
 
-private:
-	void update();
+    void focus() override;
 
-	uint8_t credits_index { 0 };
-	uint8_t render_line { 0 };
-	Coord start_pos { 0 };
-	uint8_t slow_down { 0 };
-	int32_t timer { 0 };
-	bool loop { false };
-	
-	std::string text { };
-		
-	typedef struct credits_t {
-		size_t start_pos;
-		std::string text;
-		int32_t delay;
-	} credits_t;
-	
-	const credits_t credits[26] = {
-		//           012345678901234567890123456789
-		{ 60,		"PortaPack|HAVOC",					0 },
-		{ 4 * 8,	    "Version " VERSION_STRING,		16 },
-		{ 11 * 8,	           "Gurus  J. Boone",		0 },
-		{ 18 * 8,	                  "M. Ossmann",		16 },
-		{ 11 * 8,	           "HAVOC  Furrtek",		16 },
-		{ 7 * 8,	       "POCSAG rx  T. Sailer",		0 },
-		{ 18 * 8,	                  "E. Oenal",		16 },
-		{ 0 * 8,	"Radiosonde infos  F4GMU",			0 },
-		{ 18 * 8,	                  "RS1729",			16 },
-		{ 4 * 8,	    "RDS waveform  C. Jacquet", 	16 },
-		{ 7 * 8,	       "Xy. infos  cLx", 			16 },
-		{ 2 * 8,	  "OOK scan trick  Samy Kamkar",	16 },
-		{ 7 * 8,	       "World map  NASA", 			16 },
-		{ 0 * 8,	"TouchTunes infos  Notpike",		16 },
-		{ 4 * 8,	    "Subaru infos  Tom",			0 },
-		{ 18 * 8,	                  "Wimmenhove",		16 },
-		{ 1 * 8,	 "GPS,TV,BTLE,NRF  Shao",			24 },
-		{ 6 * 8,	      "Thanks & donators",			16 },
-		{ 1 * 8,	 "Rainer Matla     Keld Norman",	0 },
-		{ 1 * 8,	 " Giorgio C.         DC1RDB",		0 },
-		{ 1 * 8,	 " Sigmounte           Waax",		0 },
-		{ 1 * 8, 	" Windyoona         Channels",		0 },
-		{ 1 * 8, 	"   F4GEV             Pyr3x",		0 },
-		{ 1 * 8,    "  HB3YOE",							24 },
-		{ 11 * 8,	            "MMXVIII",				-1 }
-	};
-	
-	CreditsWidget credits_display {
-		{ 0, 16, 240, 240 }
-	};
+    std::string title() const override { return "About"; };
 
-	Button button_ok {
-		{ 72, 272, 96, 24 },
-		"OK"
-	};
-	
-	MessageHandlerRegistration message_handler_update {
-		Message::ID::DisplayFrameSync,
-		[this](const Message* const) {
-			this->update();
-		}
-	};
-	
+   private:
+    void update();
+
+    uint8_t credits_index{0};
+    uint8_t render_line{0};
+    Coord start_pos{0};
+    uint8_t slow_down{0};
+    int32_t timer{0};
+    bool loop{false};
+
+    std::string text{};
+
+    typedef struct credits_t {
+        size_t start_pos;
+        std::string text;
+        int32_t delay;
+    } credits_t;
+
+    // TODO: Make this dinamically centered and parse \n as the delay value so it is easy to maintain
+    const credits_t credits[26] = {
+        // 012345678901234567890123456789
+        {60, "PortaPack Mayhem", 0},
+        {60, "PortaPack|HAVOC", 0},
+        {11 * 8, "Gurus  J. Boone", 0},
+        {18 * 8, "M. Ossmann", 16},
+        {11 * 8, "HAVOC  Furrtek", 16},
+        {7 * 8, "POCSAG rx  T. Sailer", 0},
+        {18 * 8, "E. Oenal", 16},
+        {0 * 8, "Radiosonde infos  F4GMU", 0},
+        {18 * 8, "RS1729", 16},
+        {4 * 8, "RDS waveform  C. Jacquet", 16},
+        {7 * 8, "Xy. infos  cLx", 16},
+        {2 * 8, "OOK scan trick  Samy Kamkar", 16},
+        {7 * 8, "World map  NASA", 16},
+        {0 * 8, "TouchTunes infos  Notpike", 16},
+        {4 * 8, "Subaru infos  Tom", 0},
+        {18 * 8, "Wimmenhove", 16},
+        {1 * 8, "GPS,TV,BTLE,NRF  Shao", 24},
+        {6 * 8, "Thanks & donators", 16},
+        {1 * 8, "Rainer Matla     Keld Norman", 0},
+        {1 * 8, " Giorgio C.         DC1RDB", 0},
+        {1 * 8, " Sigmounte           Waax", 0},
+        {1 * 8, " Windyoona         Channels", 0},
+        {1 * 8, "   F4GEV             Pyr3x", 0},
+        {1 * 8, "  HB3YOE", 24},
+        {11 * 8, "MMXVIII", -1}};
+
+    CreditsWidget credits_display{
+        {0, 16, 240, 240}};
+
+    Button button_ok{
+        {72, 272, 96, 24},
+        "OK"};
+
+    MessageHandlerRegistration message_handler_update{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->update();
+        }};
 };
 
 } /* namespace ui */
 
-#endif/*__UI_ABOUT_H__*/
+#endif /*__UI_ABOUT_H__*/

firmware/application/apps/ui_about_demo.cpp

@@ -45,374 +45,369 @@ using namespace lpc43xx;
 using namespace portapack;
 
 namespace ui {
-	
+
 void AboutView::on_show() {
-	transmitter_model.set_tuning_frequency(1337000000);		// TODO: Change
-	transmitter_model.set_baseband_configuration({
-		.mode = 0,
-		.sampling_rate = 1536000,
-		.decimation_factor = 1,
-	});
-	transmitter_model.set_rf_amp(true);
-	transmitter_model.set_lna(40);
-	transmitter_model.set_vga(40);
-	transmitter_model.set_baseband_bandwidth(1750000);
-	transmitter_model.enable();
-	
-	baseband::set_audiotx_data(32, 50, false, 0);
-	
-	//audio::headphone::set_volume(volume_t::decibel(0 - 99) + audio::headphone::volume_range().max);
+    transmitter_model.set_target_frequency(1337000000);  // TODO: Change
+    transmitter_model.set_baseband_configuration({
+        .mode = 0,
+        .sampling_rate = 1536000,
+        .decimation_factor = 1,
+    });
+    transmitter_model.set_rf_amp(true);
+    transmitter_model.set_lna(40);
+    transmitter_model.set_vga(40);
+    transmitter_model.enable();
+
+    baseband::set_audiotx_data(32, 50, false, 0);
+
+    // audio::headphone::set_volume(volume_t::decibel(0 - 99) + audio::headphone::volume_range().max);
 }
 
 void AboutView::render_video() {
-	uint8_t p, r, luma, chroma, cy;
-	ui::Color cc;
-	char ch;
-	float s;
-	
-	// Send framebuffer to LCD. Gotta go fast !
-	display.render_box({30, 112}, {180, 72}, framebuffer);
+    uint8_t p, r, luma, chroma, cy;
+    ui::Color cc;
+    char ch;
+    float s;
 
-	// Clear framebuffer to black
-	memset(framebuffer, 0, 180 * 72 * sizeof(ui::Color));
+    // Send framebuffer to LCD. Gotta go fast !
+    display.render_box({30, 112}, {180, 72}, framebuffer);
 
-	// Drum hit palette animation
-	if (drum > 1) drum--;
+    // Clear framebuffer to black
+    memset(framebuffer, 0, 180 * 72 * sizeof(ui::Color));
 
-	// Render copper bars from Y buffer
-	for (p = 0; p < 72; p++) {
-		luma = copperbuffer[p] & 0x0F;		// 0 is transparent
-		if (luma) {
-			chroma = copperbuffer[p]>>4;
-			cc = ui::Color(std::min((coppercolor[chroma][0]/luma)*drum,255), std::min((coppercolor[chroma][1]/luma)*drum,255), std::min((coppercolor[chroma][2]/luma)*drum,255));
-			for (r = 0; r < 180; r++)
-				framebuffer[(p*180)+r] = cc;
-		}
-	}
-	
-	// Scroll in/out state machine
-	if (anim_state == 0) {
-		// Scroll in
-		if (ofy < 8) {
-			ofy++;
-			anim_state = 0;
-		} else {
-			anim_state = 1;
-		}
-		if (ofx < (int16_t)(180 - (strlen(credits[credits_index].name) * 16) - 8)) {
-			ofx += 8;
-			anim_state = 0;
-		}
-	} else if (anim_state == 1) {
-		// Just wait
-		if (credits_timer == (30*3)) {
-			credits_timer = 0;
-			anim_state = 2;
-		} else {
-			credits_timer++;
-		}
-	} else {
-		// Scroll out
-		if (credits[credits_index].change == true) {
-			if (ofy > -24) {
-				ofy--;
-				anim_state = 2;
-			} else {
-				anim_state = 0;
-			}
-		} else {
-			anim_state = 0;
-		}
-		if (ofx < 180) {
-			ofx += 8;
-			anim_state = 2;
-		}
-	
-		// Switch to next text
-		if (anim_state == 0) {
-			if (credits_index == 9)
-				credits_index = 0;
-			else
-				credits_index++;
-			ofx = -(strlen(credits[credits_index].name) * 16) - 16;
-		}
-	}
-	
-	// Sine text ("role")
-	p = 0;
-	while ((ch = credits[credits_index].role[p])) {
-		draw_demoglyph({(ui::Coord)(8+(p*16)), (ui::Coord)(ofy+(sine_table_f32[((p*16)+(phase>>5))&0xFF] * 8))}, ch, paletteA);
-		p++;
-	}
-		
-	// Scroll text (name)
-	p = 0;
-	while ((ch = credits[credits_index].name[p])) {
-		draw_demoglyph({(ui::Coord)(ofx+(p*16)), 56}, ch, paletteB);
-		p++;
-	}
-	
-	// Clear bars Y buffer
-	memset(copperbuffer, 0, 72);
-		
-	// Render bars to Y buffer
-	for (p = 0; p < 5; p++) {
-		cy = copperbars[p];
-		for (r = 0; r < 16; r++)
-			copperbuffer[cy+r] = copperluma[r] + (p<<4);
-	}
-	
-	// Animate bars positions
-	for (p = 0; p < 5; p++) {
-	  	s = sine_table_f32[((p*32)+(phase/24))&0xFF];
-		s += sine_table_f32[((p*16)+(phase/35))&0xFF];
-		copperbars[p] = 28+(uint8_t)(s * 14);
-	}
-	
-	phase += 128;
+    // Drum hit palette animation
+    if (drum > 1) drum--;
+
+    // Render copper bars from Y buffer
+    for (p = 0; p < 72; p++) {
+        luma = copperbuffer[p] & 0x0F;  // 0 is transparent
+        if (luma) {
+            chroma = copperbuffer[p] >> 4;
+            cc = ui::Color(std::min((coppercolor[chroma][0] / luma) * drum, 255), std::min((coppercolor[chroma][1] / luma) * drum, 255), std::min((coppercolor[chroma][2] / luma) * drum, 255));
+            for (r = 0; r < 180; r++)
+                framebuffer[(p * 180) + r] = cc;
+        }
+    }
+
+    // Scroll in/out state machine
+    if (anim_state == 0) {
+        // Scroll in
+        if (ofy < 8) {
+            ofy++;
+            anim_state = 0;
+        } else {
+            anim_state = 1;
+        }
+        if (ofx < (int16_t)(180 - (strlen(credits[credits_index].name) * 16) - 8)) {
+            ofx += 8;
+            anim_state = 0;
+        }
+    } else if (anim_state == 1) {
+        // Just wait
+        if (credits_timer == (30 * 3)) {
+            credits_timer = 0;
+            anim_state = 2;
+        } else {
+            credits_timer++;
+        }
+    } else {
+        // Scroll out
+        if (credits[credits_index].change == true) {
+            if (ofy > -24) {
+                ofy--;
+                anim_state = 2;
+            } else {
+                anim_state = 0;
+            }
+        } else {
+            anim_state = 0;
+        }
+        if (ofx < 180) {
+            ofx += 8;
+            anim_state = 2;
+        }
+
+        // Switch to next text
+        if (anim_state == 0) {
+            if (credits_index == 9)
+                credits_index = 0;
+            else
+                credits_index++;
+            ofx = -(strlen(credits[credits_index].name) * 16) - 16;
+        }
+    }
+
+    // Sine text ("role")
+    p = 0;
+    while ((ch = credits[credits_index].role[p])) {
+        draw_demoglyph({(ui::Coord)(8 + (p * 16)), (ui::Coord)(ofy + (sine_table_f32[((p * 16) + (phase >> 5)) & 0xFF] * 8))}, ch, paletteA);
+        p++;
+    }
+
+    // Scroll text (name)
+    p = 0;
+    while ((ch = credits[credits_index].name[p])) {
+        draw_demoglyph({(ui::Coord)(ofx + (p * 16)), 56}, ch, paletteB);
+        p++;
+    }
+
+    // Clear bars Y buffer
+    memset(copperbuffer, 0, 72);
+
+    // Render bars to Y buffer
+    for (p = 0; p < 5; p++) {
+        cy = copperbars[p];
+        for (r = 0; r < 16; r++)
+            copperbuffer[cy + r] = copperluma[r] + (p << 4);
+    }
+
+    // Animate bars positions
+    for (p = 0; p < 5; p++) {
+        s = sine_table_f32[((p * 32) + (phase / 24)) & 0xFF];
+        s += sine_table_f32[((p * 16) + (phase / 35)) & 0xFF];
+        copperbars[p] = 28 + (uint8_t)(s * 14);
+    }
+
+    phase += 128;
 }
 
-void AboutView::draw_demoglyph(ui::Point p, char ch, ui::Color * pal) {
-	uint8_t x, y, c, cl, cr;
-	uint16_t che;
-	int16_t lbx, il;
+void AboutView::draw_demoglyph(ui::Point p, char ch, ui::Color* pal) {
+    uint8_t x, y, c, cl, cr;
+    uint16_t che;
+    int16_t lbx, il;
 
-	// Map ASCII to font bitmap
-	if ((ch >= 32) || (ch < 96))
-		che = char_map[ch-32];
-	else
-		che = 0xFF;
-		
-	if (che < 0xFF) {
-		che = (che * 128) + 48;		// Start in bitmap
+    // Map ASCII to font bitmap
+    if ((ch >= 32) && (ch < 96))
+        che = char_map[ch - 32];
+    else
+        che = 0xFF;
 
-		il = (180 * p.y) + p.x;		// Start il framebuffer
-		
-		for (y = 0; y < 16; y++) {
-			if (p.y + y >= 72) break;					// Over bottom of framebuffer, abort
-			if (p.y + y >= 0) {
-				for (x = 0; x < 8; x++) {
-					c = demofont_bin[x+(y*8)+che];		// Split byte in 2 4BPP pixels
-					cl = c >> 4;
-					cr = c & 0x0F;
-					lbx = p.x + (x*2);
-					if (cl && (lbx < 180) && (lbx >= 0)) framebuffer[il] = pal[cl];
-					lbx++;
-					il++;
-					if (cr && (lbx < 180) && (lbx >= 0)) framebuffer[il] = pal[cr];
-					il++;
-				}
-				il += 180-16;
-			} else {
-				il += 180;
-			}
-		}
-	}
+    if (che < 0xFF) {
+        che = (che * 128) + 48;  // Start in bitmap
+
+        il = (180 * p.y) + p.x;  // Start il framebuffer
+
+        for (y = 0; y < 16; y++) {
+            if (p.y + y >= 72) break;  // Over bottom of framebuffer, abort
+            if (p.y + y >= 0) {
+                for (x = 0; x < 8; x++) {
+                    c = demofont_bin[x + (y * 8) + che];  // Split byte in 2 4BPP pixels
+                    cl = c >> 4;
+                    cr = c & 0x0F;
+                    lbx = p.x + (x * 2);
+                    if (cl && (lbx < 180) && (lbx >= 0)) framebuffer[il] = pal[cl];
+                    lbx++;
+                    il++;
+                    if (cr && (lbx < 180) && (lbx >= 0)) framebuffer[il] = pal[cr];
+                    il++;
+                }
+                il += 180 - 16;
+            } else {
+                il += 180;
+            }
+        }
+    }
 }
 
 void AboutView::render_audio() {
-	uint8_t i, ymdata;
-	uint16_t ym_render_cnt;
-	
-	// This is heavily inspired by MAME's ay8910.cpp and the YM2149's datasheet
-	
-	// Render 1024 music samples
-	for (ym_render_cnt = 0; ym_render_cnt < 1024; ym_render_cnt++) {
+    uint8_t i, ymdata;
+    uint16_t ym_render_cnt;
 
-		// Update registers at 48000/960 = 50Hz
-		if (ym_sample_cnt == 0) {
-			// "Decompress" on the fly and update YM registers
-			for (i = 0; i < 14; i++) {
-				if (!ym_regs[i].cnt) {
-					// New run
-					ymdata = ymdata_bin[ym_regs[i].ptr++];
-					ym_regs[i].cnt = ymdata & 0x7F;
-					if (ymdata & 0x80) {
-						ym_regs[i].same = true;
-						ym_regs[i].value = ymdata_bin[ym_regs[i].ptr++];
-					} else {
-						ym_regs[i].same = false;
-					}
-					// Detect drum on channel B
-					if (i == 3)
-						if (ym_regs[3].value > 2) drum = 4;
-				}
-				if (ym_regs[i].same == false) {
-					ym_regs[i].value = ymdata_bin[ym_regs[i].ptr++];
-					if (i == 13) {
-						// Update envelope attributes
-						ym_env_att = (ym_regs[13].value & 4) ? 0x1F : 0x00;
-						if (!(ym_regs[13].value & 8)) {
-							ym_env_hold = 1;
-							ym_env_alt = ym_env_att;
-						} else {
-							ym_env_hold = ym_regs[13].value & 1;
-							ym_env_alt = ym_regs[13].value & 2;
-						}
-						// Reset envelope counter
-						ym_env_step = 0x1F;
-						ym_env_holding = 0;
-						ym_env_vol = (ym_env_step ^ ym_env_att);		
-					}
-				}
-				ym_regs[i].cnt--;
-			}
-			ym_frame++;
-		}
-		
-		// Square wave oscillators
-		// 2457600/16/48000 = 3.2, but 4 sounds better than 3...
-		for (i = 0; i < 3; i++) {
-			ym_osc_cnt[i] += 4;
-			if (ym_osc_cnt[i] >= (ym_regs[i*2].value | ((ym_regs[(i*2)+1].value & 0x0f) << 8))) {
-				ym_osc_cnt[i] = 0;
-				ym_osc_out[i] ^= 1;
-			}
-		}
-		
-		// Noise generator
-		ym_noise_cnt += 4;
-		if (ym_noise_cnt >= ((ym_regs[6].value & 0x1F) * 2)) {
-			ym_noise_cnt = 0;
-			ym_rng ^= (((ym_rng & 1) ^ ((ym_rng >> 3) & 1)) << 17);
-			ym_rng >>= 1;
-		}
-		
-		// Mix tones and noise
-		for (i = 0; i < 3; i++)
-			ym_ch[i] = (ym_osc_out[i] | ((ym_regs[7].value >> i) & 1)) & ((ym_rng & 1) | ((ym_regs[7].value >> (i + 3)) & 1));
-			
-		// Envelope generator
-		if (!ym_env_holding) {
-			ym_env_cnt += 8;
-			if (ym_env_cnt >= (ym_regs[11].value | (ym_regs[12].value<<8))) {
-				ym_env_cnt = 0;
-				ym_env_step--;
-				if (ym_env_step < 0) {
-					if (ym_env_hold) {
-						if (ym_env_alt)
-							ym_env_att ^= 0x1F;
-						ym_env_holding = 1;
-						ym_env_step = 0;
-					} else {
-						if (ym_env_alt && (ym_env_step & 0x20))
-							ym_env_att ^= 0x1F;
-						ym_env_step &= 0x1F;
-					}
-				}
-			}
-		}
-		ym_env_vol = (ym_env_step ^ ym_env_att);
+    // This is heavily inspired by MAME's ay8910.cpp and the YM2149's datasheet
 
-		ym_out = 0;
-		for (i = 0; i < 3; i++) {
-			if (ym_regs[i + 8].value & 0x10) {
-				// Envelope mode
-				ym_out += (ym_ch[i] ? ym_env_vol : 0);
-			} else {
-				// Fixed mode
-				ym_out += (ym_ch[i] ? (ym_regs[i + 8].value & 0x0F) : 0);
-			}
-		}
-	
-		ym_buffer[ym_render_cnt] = (ym_out * 2) - 45;
+    // Render 1024 music samples
+    for (ym_render_cnt = 0; ym_render_cnt < 1024; ym_render_cnt++) {
+        // Update registers at 48000/960 = 50Hz
+        if (ym_sample_cnt == 0) {
+            // "Decompress" on the fly and update YM registers
+            for (i = 0; i < 14; i++) {
+                if (!ym_regs[i].cnt) {
+                    // New run
+                    ymdata = ymdata_bin[ym_regs[i].ptr++];
+                    ym_regs[i].cnt = ymdata & 0x7F;
+                    if (ymdata & 0x80) {
+                        ym_regs[i].same = true;
+                        ym_regs[i].value = ymdata_bin[ym_regs[i].ptr++];
+                    } else {
+                        ym_regs[i].same = false;
+                    }
+                    // Detect drum on channel B
+                    if (i == 3)
+                        if (ym_regs[3].value > 2) drum = 4;
+                }
+                if (ym_regs[i].same == false) {
+                    ym_regs[i].value = ymdata_bin[ym_regs[i].ptr++];
+                    if (i == 13) {
+                        // Update envelope attributes
+                        ym_env_att = (ym_regs[13].value & 4) ? 0x1F : 0x00;
+                        if (!(ym_regs[13].value & 8)) {
+                            ym_env_hold = 1;
+                            ym_env_alt = ym_env_att;
+                        } else {
+                            ym_env_hold = ym_regs[13].value & 1;
+                            ym_env_alt = ym_regs[13].value & 2;
+                        }
+                        // Reset envelope counter
+                        ym_env_step = 0x1F;
+                        ym_env_holding = 0;
+                        ym_env_vol = (ym_env_step ^ ym_env_att);
+                    }
+                }
+                ym_regs[i].cnt--;
+            }
+            ym_frame++;
+        }
 
-		if (ym_sample_cnt < 960) {
-			ym_sample_cnt++;
-		} else {
-			ym_sample_cnt = 0;
-		}
-		
-		// Loop
-		if (ym_frame == ym_frames) ym_init();
-	}
+        // Square wave oscillators
+        // 2457600/16/48000 = 3.2, but 4 sounds better than 3...
+        for (i = 0; i < 3; i++) {
+            ym_osc_cnt[i] += 4;
+            if (ym_osc_cnt[i] >= (ym_regs[i * 2].value | ((ym_regs[(i * 2) + 1].value & 0x0f) << 8))) {
+                ym_osc_cnt[i] = 0;
+                ym_osc_out[i] ^= 1;
+            }
+        }
+
+        // Noise generator
+        ym_noise_cnt += 4;
+        if (ym_noise_cnt >= ((ym_regs[6].value & 0x1F) * 2)) {
+            ym_noise_cnt = 0;
+            ym_rng ^= (((ym_rng & 1) ^ ((ym_rng >> 3) & 1)) << 17);
+            ym_rng >>= 1;
+        }
+
+        // Mix tones and noise
+        for (i = 0; i < 3; i++)
+            ym_ch[i] = (ym_osc_out[i] | ((ym_regs[7].value >> i) & 1)) & ((ym_rng & 1) | ((ym_regs[7].value >> (i + 3)) & 1));
+
+        // Envelope generator
+        if (!ym_env_holding) {
+            ym_env_cnt += 8;
+            if (ym_env_cnt >= (ym_regs[11].value | (ym_regs[12].value << 8))) {
+                ym_env_cnt = 0;
+                ym_env_step--;
+                if (ym_env_step < 0) {
+                    if (ym_env_hold) {
+                        if (ym_env_alt)
+                            ym_env_att ^= 0x1F;
+                        ym_env_holding = 1;
+                        ym_env_step = 0;
+                    } else {
+                        if (ym_env_alt && (ym_env_step & 0x20))
+                            ym_env_att ^= 0x1F;
+                        ym_env_step &= 0x1F;
+                    }
+                }
+            }
+        }
+        ym_env_vol = (ym_env_step ^ ym_env_att);
+
+        ym_out = 0;
+        for (i = 0; i < 3; i++) {
+            if (ym_regs[i + 8].value & 0x10) {
+                // Envelope mode
+                ym_out += (ym_ch[i] ? ym_env_vol : 0);
+            } else {
+                // Fixed mode
+                ym_out += (ym_ch[i] ? (ym_regs[i + 8].value & 0x0F) : 0);
+            }
+        }
+
+        ym_buffer[ym_render_cnt] = (ym_out * 2) - 45;
+
+        if (ym_sample_cnt < 960) {
+            ym_sample_cnt++;
+        } else {
+            ym_sample_cnt = 0;
+        }
+
+        // Loop
+        if (ym_frame == ym_frames) ym_init();
+    }
 }
 
 void AboutView::update() {
-	if (framebuffer) {
-		// Update 1 out of 2 frames, 60Hz is very laggy
-		if (refresh_cnt & 1) render_video();
-		refresh_cnt++;
-	}
-	
-	// Slowly increase volume to avoid jumpscare
-	if (headphone_vol < (70 << 2)) {
-		audio::headphone::set_volume(volume_t::decibel((headphone_vol/4) - 99) + audio::headphone::volume_range().max);
-		headphone_vol++;
-	}
+    if (framebuffer) {
+        // Update 1 out of 2 frames, 60Hz is very laggy
+        if (refresh_cnt & 1) render_video();
+        refresh_cnt++;
+    }
+
+    // Slowly increase volume to avoid jumpscare
+    if (headphone_vol < (70 << 2)) {
+        audio::headphone::set_volume(volume_t::decibel((headphone_vol / 4) - 99) + audio::headphone::volume_range().max);
+        headphone_vol++;
+    }
 }
 
 void AboutView::ym_init() {
-	uint8_t reg;
-	
-	for (reg = 0; reg < 14; reg++) {
-		ym_regs[reg].cnt = 0;
-		// Pick up start pointers for each YM registers RLE blocks
-		ym_regs[reg].ptr = ((uint16_t)(ymdata_bin[(reg*2)+3])<<8) + ymdata_bin[(reg*2)+2];
-		ym_regs[reg].same = false;	// Useless ?
-		ym_regs[reg].value = 0;		// Useless ?
-	}
-	
-	ym_frame = 0;
+    uint8_t reg;
+
+    for (reg = 0; reg < 14; reg++) {
+        ym_regs[reg].cnt = 0;
+        // Pick up start pointers for each YM registers RLE blocks
+        ym_regs[reg].ptr = ((uint16_t)(ymdata_bin[(reg * 2) + 3]) << 8) + ymdata_bin[(reg * 2) + 2];
+        ym_regs[reg].same = false;  // Useless ?
+        ym_regs[reg].value = 0;     // Useless ?
+    }
+
+    ym_frame = 0;
 }
 
 AboutView::AboutView(
-	NavigationView& nav
-)
-{
-	uint8_t p, c;
-	
-	baseband::run_image(portapack::spi_flash::image_tag_audio_tx);
-	
-	add_children({ {
-		&text_title,
-		&text_firmware,
-		&text_cpld_hackrf,
-		&text_cpld_hackrf_status,
-		&button_ok,
-	} });
-	
-	if( cpld_hackrf_verify_eeprom() ) {
-		text_cpld_hackrf_status.set(" OK");
-	} else {
-		text_cpld_hackrf_status.set("BAD");
-	}
-	
-	// Politely ask for about 26kB
-	framebuffer = (ui::Color *)chHeapAlloc(0x0, 180 * 72 * sizeof(ui::Color));
-	
-	if (framebuffer) {
-		memset(framebuffer, 0, 180 * 72 * sizeof(ui::Color));
-		
-		// Copy original font palette
-		c = 0;
-		for (p = 0; p < 48; p+=3)
-			paletteA[c++] = ui::Color(demofont_bin[p], demofont_bin[p+1], demofont_bin[p+2]);
-		
-		// Increase red in another one
-		c = 0;
-		for (p = 0; p < 48; p+=3)
-			paletteB[c++] = ui::Color(std::min(demofont_bin[p]+64, 255), demofont_bin[p+1], demofont_bin[p+2]);
-	}
+    NavigationView& nav) {
+    uint8_t p, c;
 
-	// Init YM synth
-	ym_frames = ((uint16_t)(ymdata_bin[1])<<8) + ymdata_bin[0];
-	ym_init();
-	
+    baseband::run_image(portapack::spi_flash::image_tag_audio_tx);
 
-	button_ok.on_select = [this,&nav](Button&){
-		if (framebuffer) chHeapFree(framebuffer);	// Do NOT forget this
-		nav.pop();
-	};
+    add_children({{
+        &text_title,
+        &text_firmware,
+        &text_cpld_hackrf,
+        &text_cpld_hackrf_status,
+        &button_ok,
+    }});
+
+    if (cpld_hackrf_verify_eeprom()) {
+        text_cpld_hackrf_status.set(" OK");
+    } else {
+        text_cpld_hackrf_status.set("BAD");
+    }
+
+    // Politely ask for about 26kB
+    framebuffer = (ui::Color*)chHeapAlloc(0x0, 180 * 72 * sizeof(ui::Color));
+
+    if (framebuffer) {
+        memset(framebuffer, 0, 180 * 72 * sizeof(ui::Color));
+
+        // Copy original font palette
+        c = 0;
+        for (p = 0; p < 48; p += 3)
+            paletteA[c++] = ui::Color(demofont_bin[p], demofont_bin[p + 1], demofont_bin[p + 2]);
+
+        // Increase red in another one
+        c = 0;
+        for (p = 0; p < 48; p += 3)
+            paletteB[c++] = ui::Color(std::min(demofont_bin[p] + 64, 255), demofont_bin[p + 1], demofont_bin[p + 2]);
+    }
+
+    // Init YM synth
+    ym_frames = ((uint16_t)(ymdata_bin[1]) << 8) + ymdata_bin[0];
+    ym_init();
+
+    button_ok.on_select = [this, &nav](Button&) {
+        if (framebuffer) chHeapFree(framebuffer);  // Do NOT forget this
+        nav.pop();
+    };
 }
 
 AboutView::~AboutView() {
-	transmitter_model.disable();
-	baseband::shutdown();
+    transmitter_model.disable();
+    baseband::shutdown();
 }
 
 void AboutView::focus() {
-	button_ok.focus();
+    button_ok.focus();
 }
 
 } /* namespace ui */

firmware/application/apps/ui_about_demo.hpp

@@ -34,141 +34,135 @@
 namespace ui {
 
 class AboutView : public View {
-public:
-	AboutView(NavigationView& nav);
-	~AboutView();
-	
-	void on_show() override;
-	void focus() override;
+   public:
+    AboutView(NavigationView& nav);
+    ~AboutView();
 
-private:
-	void ym_init();
-	void update();
-	void render_video();
-	void render_audio();
-	void draw_demoglyph(ui::Point p, char ch, ui::Color * pal);
-	uint16_t debug_cnt = 0;
-	
-	typedef struct ymreg_t {
-		uint8_t value;
-		uint8_t cnt;
-		uint16_t ptr;
-		bool same;
-	} ymreg_t;
-	
-	uint16_t headphone_vol = 5 << 2;
-	
-	ymreg_t ym_regs[14];
-	uint16_t ym_frames;
-	uint16_t ym_frame;
-	uint8_t drum = 0;
-	uint16_t ym_osc_cnt[3];
-	uint32_t ym_rng = 1;
-	uint16_t ym_noise_cnt;
-	uint8_t ym_env_att, ym_env_hold, ym_env_alt, ym_env_holding, ym_env_vol;
-	int8_t ym_env_step;
-	uint16_t ym_env_cnt;
-	uint8_t ym_osc_out[3];
-	uint8_t ym_ch[3];
-	uint8_t ym_out;
-	uint16_t ym_sample_cnt = 0;
-	
-	int8_t ym_buffer[1024];
+    void on_show() override;
+    void focus() override;
 
-	uint8_t refresh_cnt;
-	ui::Color paletteA[16];
-	ui::Color paletteB[16];
-	ui::Color * framebuffer;
-	uint32_t phase = 0;
-	uint8_t copperbars[5] = { 0 };
-	uint8_t copperbuffer[72] = { 0 };
-	
-	uint8_t anim_state = 0;
-	uint8_t credits_index = 0;
-	uint16_t credits_timer = 0;
-	
-	int16_t ofx = -180, ofy = -24;
+   private:
+    void ym_init();
+    void update();
+    void render_video();
+    void render_audio();
+    void draw_demoglyph(ui::Point p, char ch, ui::Color* pal);
+    uint16_t debug_cnt = 0;
 
-	const uint8_t char_map[64] = { 0xFF, 27, 46, 0xFF, 0xFF, 0xFF, 28, 45,
-									58, 59, 0xFF, 43, 40, 57, 26, 42,
-									29, 30, 31, 32, 33, 34, 35, 36,
-									37, 38, 41, 0xFF, 0xFF, 0xFF, 0xFF, 44,
-									0xFF, 0, 1, 2, 3, 4, 5, 6,
-									7, 8, 9, 10, 11, 12, 13, 14,
-									15, 16, 17, 18, 19, 20, 21, 22,
-									23, 24, 25, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-	
-	const uint8_t copperluma[16] = { 8,7,6,5,4,3,2,1,1,2,3,4,5,6,7,8 };
-	const uint8_t coppercolor[5][3] = {	{ 255,0,0 },
-										{ 0,255,0 },
-										{ 0,0,255 },
-										{ 255,0,255 },
-										{ 255,255,0 } };
-	
-	typedef struct credits_t {
-		char role[12];
-		char name[12];
-		bool change;
-	} credits_t;
-	
-	//								  0123456789A		 0123456789A
-	const credits_t credits[10] = { {"GURUS",			"J. BOONE", 		false},
-									{"GURUS",			"M. OSSMANN", 		true},
-									{"BUGS",			"FURRTEK", 			true},
-									{"RDS WAVE",		"C. JACQUET", 		true},
-									{"POCSAG RX",		"T. SAILER",		false},
-									{"POCSAG RX",		"E. OENAL",			true},
-									{"XYLOS DATA",		"CLX", 				true},
-									{"GREETS TO",		"SIGMOUNTE", 		false},
-									{"GREETS TO",		"WINDYOONA", 		true},
-									{"THIS MUSIC",		"BIG ALEC", 		true}
-									};
+    typedef struct ymreg_t {
+        uint8_t value;
+        uint8_t cnt;
+        uint16_t ptr;
+        bool same;
+    } ymreg_t;
 
-	Text text_title {
-		{ 100, 32, 40, 16 },
-		"About",
-	};
+    uint16_t headphone_vol = 5 << 2;
 
-	Text text_firmware {
-		{ 0, 236, 240, 16 },
-		"Version   " VERSION_STRING,
-	};
+    ymreg_t ym_regs[14];
+    uint16_t ym_frames;
+    uint16_t ym_frame;
+    uint8_t drum = 0;
+    uint16_t ym_osc_cnt[3];
+    uint32_t ym_rng = 1;
+    uint16_t ym_noise_cnt;
+    uint8_t ym_env_att, ym_env_hold, ym_env_alt, ym_env_holding, ym_env_vol;
+    int8_t ym_env_step;
+    uint16_t ym_env_cnt;
+    uint8_t ym_osc_out[3];
+    uint8_t ym_ch[3];
+    uint8_t ym_out;
+    uint16_t ym_sample_cnt = 0;
 
-	Text text_cpld_hackrf {
-		{ 0, 252, 11*8, 16 },
-		"HackRF CPLD",
-	};
+    int8_t ym_buffer[1024];
 
-	Text text_cpld_hackrf_status {
-		{ 240 - 3*8, 252, 3*8, 16 },
-		"???"
-	};
+    uint8_t refresh_cnt;
+    ui::Color paletteA[16];
+    ui::Color paletteB[16];
+    ui::Color* framebuffer;
+    uint32_t phase = 0;
+    uint8_t copperbars[5] = {0};
+    uint8_t copperbuffer[72] = {0};
 
-	Button button_ok {
-		{ 72, 272, 96, 24 },
-		"OK"
-	};
-	
-	MessageHandlerRegistration message_handler_update {
-		Message::ID::DisplayFrameSync,
-		[this](const Message* const) {
-			this->update();
-		}
-	};
-	
-	MessageHandlerRegistration message_handler_fifo_signal {
-		Message::ID::FIFOSignal,
-		[this](const Message* const p) {
-			const auto message = static_cast<const FIFOSignalMessage*>(p);
-			if (message->signaltype == 1) {
-				this->render_audio();
-				baseband::set_fifo_data(ym_buffer);
-			}
-		}
-	};
-	
+    uint8_t anim_state = 0;
+    uint8_t credits_index = 0;
+    uint16_t credits_timer = 0;
+
+    int16_t ofx = -180, ofy = -24;
+
+    const uint8_t char_map[64] = {0xFF, 27, 46, 0xFF, 0xFF, 0xFF, 28, 45,
+                                  58, 59, 0xFF, 43, 40, 57, 26, 42,
+                                  29, 30, 31, 32, 33, 34, 35, 36,
+                                  37, 38, 41, 0xFF, 0xFF, 0xFF, 0xFF, 44,
+                                  0xFF, 0, 1, 2, 3, 4, 5, 6,
+                                  7, 8, 9, 10, 11, 12, 13, 14,
+                                  15, 16, 17, 18, 19, 20, 21, 22,
+                                  23, 24, 25, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+
+    const uint8_t copperluma[16] = {8, 7, 6, 5, 4, 3, 2, 1, 1, 2, 3, 4, 5, 6, 7, 8};
+    const uint8_t coppercolor[5][3] = {{255, 0, 0},
+                                       {0, 255, 0},
+                                       {0, 0, 255},
+                                       {255, 0, 255},
+                                       {255, 255, 0}};
+
+    typedef struct credits_t {
+        char role[12];
+        char name[12];
+        bool change;
+    } credits_t;
+
+    //								  0123456789A		 0123456789A
+    const credits_t credits[10] = {{"GURUS", "J. BOONE", false},
+                                   {"GURUS", "M. OSSMANN", true},
+                                   {"BUGS", "FURRTEK", true},
+                                   {"RDS WAVE", "C. JACQUET", true},
+                                   {"POCSAG RX", "T. SAILER", false},
+                                   {"POCSAG RX", "E. OENAL", true},
+                                   {"XYLOS DATA", "CLX", true},
+                                   {"GREETS TO", "SIGMOUNTE", false},
+                                   {"GREETS TO", "WINDYOONA", true},
+                                   {"THIS MUSIC", "BIG ALEC", true}};
+
+    Text text_title{
+        {100, 32, 40, 16},
+        "About",
+    };
+
+    Text text_firmware{
+        {0, 236, 240, 16},
+        "Version   " VERSION_STRING,
+    };
+
+    Text text_cpld_hackrf{
+        {0, 252, 11 * 8, 16},
+        "HackRF CPLD",
+    };
+
+    Text text_cpld_hackrf_status{
+        {240 - 3 * 8, 252, 3 * 8, 16},
+        "???"};
+
+    Button button_ok{
+        {72, 272, 96, 24},
+        "OK"};
+
+    MessageHandlerRegistration message_handler_update{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->update();
+        }};
+
+    MessageHandlerRegistration message_handler_fifo_signal{
+        Message::ID::FIFOSignal,
+        [this](const Message* const p) {
+            const auto message = static_cast<const FIFOSignalMessage*>(p);
+            if (message->signaltype == 1) {
+                this->render_audio();
+                baseband::set_fifo_data(ym_buffer);
+            }
+        }};
 };
 
 } /* namespace ui */
 
-#endif/*__UI_ABOUT_H__*/
+#endif /*__UI_ABOUT_H__*/

firmware/application/apps/ui_about_simple.cpp

@@ -0,0 +1,88 @@
+#include "ui_about_simple.hpp"
+
+namespace ui {
+
+// TODO: Generate this automatically from github
+// Information: a line starting with a '#' will be yellow coloured
+const std::string authors_list[] = {
+    "#   * List of contributors *  ",
+    " ",
+    "#Mayhem:",
+    "eried,euquiq,gregoryfenton",
+    "johnelder,jwetzell,nnemanjan00",
+    "N0vaPixel,klockee,gullradriel",
+    "jamesshao8,ITAxReal,rascafr",
+    "mcules,dqs105,strijar",
+    "zhang00963,RedFox-Fr,aldude999",
+    "East2West,fossum,ArjanOnwezen",
+    "vXxOinvizioNxX,teixeluis",
+    "Brumi-2021,texasyojimbo",
+    "heurist1,intoxsick,ckuethe",
+    "notpike,jLynx,zigad",
+    "MichalLeonBorsuk,jimilinuxguy",
+    "kallanreed,bernd-herzog",
+    "NotherNgineer,zxkmm,u-foka",
+    "Netro,HTotoo",
+    " ",
+    "#Havoc:",
+    "furrtek,mrmookie,NotPike",
+    "mjwaxios,ImDroided,Giorgiofox",
+    "F4GEV,z4ziggy,xmycroftx",
+    "troussos,silascutler",
+    "nickbouwhuis,msoose,leres",
+    "joakar,dhoetger,clem-42",
+    "brianlechthaler,ZeroChaos-...",
+    " ",
+    "#PortaPack:",
+    "jboone,argilo",
+    " ",
+    "#HackRF:",
+    "mossmann,dominicgs,bvernoux",
+    "bgamari,schneider42,miek",
+    "willcode,hessu,Sec42",
+    "yhetti,ckuethe,smunaut",
+    "wishi,mrbubble62,scateu..."};
+
+AboutView::AboutView(NavigationView& nav) {
+    add_children({&menu_view,
+                  &button_ok});
+
+    button_ok.on_select = [&nav](Button&) {
+        nav.pop();
+    };
+
+    menu_view.on_left = [this]() {
+        button_ok.focus();
+    };
+
+    menu_view.on_right = [this]() {
+        button_ok.focus();
+    };
+
+    for (const std::string& authors_line : authors_list) {
+        // if it's starting with #, it's a title and we have to substract the '#' and paint yellow
+        if (authors_line.size() > 0) {
+            if (authors_line[0] == '#') {
+                menu_view.add_item(
+                    {authors_line.substr(1, authors_line.size() - 1),
+                     ui::Theme::getInstance()->fg_yellow->foreground,
+                     nullptr,
+                     nullptr});
+            } else {
+                menu_view.add_item(
+                    {authors_line,
+                     Theme::getInstance()->bg_darkest->foreground,
+                     nullptr,
+                     nullptr});
+            }
+        }
+    }
+}
+
+void AboutView::focus() {
+    menu_view.focus();
+    // put focus on last text line to make it more obvious that list is scrollable
+    menu_view.set_highlighted(10);
+}
+
+} /* namespace ui */

firmware/application/apps/ui_about_simple.hpp

@@ -0,0 +1,28 @@
+#ifndef __UI_ABOUT_SIMPLE_H__
+#define __UI_ABOUT_SIMPLE_H__
+
+#include "ui_widget.hpp"
+#include "ui_navigation.hpp"
+
+#include <cstdint>
+
+namespace ui {
+class AboutView : public View {
+   public:
+    AboutView(NavigationView& nav);
+    void focus() override;
+    std::string title() const override { return "About"; };
+
+   private:
+    MenuView menu_view{
+        {0, 0, 240, 264},
+        true};
+
+    Button button_ok{
+        {240 / 3, 270, 240 / 3, 24},
+        "OK",
+    };
+};
+}  // namespace ui
+
+#endif /*__UI_ABOUT_SIMPLE_H__*/

firmware/application/apps/ui_adsb_rx.cpp

@@ -1,7 +1,9 @@
 /*
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
  * Copyright (C) 2017 Furrtek
- * 
+ * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2024 Mark Thompson
+ *
  * This file is part of PortaPack.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,286 +22,583 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <algorithm>
+
 #include "ui_adsb_rx.hpp"
 #include "ui_alphanum.hpp"
 
-#include "rtc_time.hpp"
-#include "string_format.hpp"
 #include "baseband_api.hpp"
 #include "portapack_persistent_memory.hpp"
+#include "rtc_time.hpp"
+#include "string_format.hpp"
+#include "file_path.hpp"
+#include "audio.hpp"
 
 using namespace portapack;
 
+namespace pmem = portapack::persistent_memory;
+
 namespace ui {
 
-template<>
-void RecentEntriesTable<AircraftRecentEntries>::draw(
-	const Entry& entry,
-	const Rect& target_rect,
-	Painter& painter,
-	const Style& style
-) {
-	char aged_color;
-	Color target_color;
-	auto entry_age = entry.age;
-	
-	// Color decay for flights not being updated anymore
-	if (entry_age < ADSB_DECAY_A) {
-		aged_color = 0x10;
-		target_color = Color::green();
-	} else if ((entry_age >= ADSB_DECAY_A) && (entry_age < ADSB_DECAY_B)) {
-		aged_color = 0x07;
-		target_color = Color::light_grey();
-	} else {
-		aged_color = 0x08;
-		target_color = Color::dark_grey();
-	}
-	
-	std::string entry_string = "\x1B";
-	entry_string += aged_color;
-	entry_string += to_string_hex(entry.ICAO_address, 6) + " " +
-		entry.callsign + "  " +
-		(entry.hits <= 999 ? to_string_dec_uint(entry.hits, 4) : "999+") + " " + 
-		entry.time_string;
-	
-	painter.draw_string(
-		target_rect.location(),
-		style,
-		entry_string
-	);
-	
-	if (entry.pos.valid)
-		painter.draw_bitmap(target_rect.location() + Point(15 * 8, 0), bitmap_target, target_color, style.background);
+static std::string get_map_tag(const AircraftRecentEntry& entry) {
+    return trimr(entry.callsign.empty() ? entry.icao_str : entry.callsign);
 }
 
-void ADSBLogger::log_str(std::string& logline) {
-	rtc::RTC datetime;
-	rtcGetTime(&RTCD1, &datetime);
-	log_file.write_entry(datetime,logline);
+template <>
+void RecentEntriesTable<AircraftRecentEntries>::draw(
+    const Entry& entry,
+    const Rect& target_rect,
+    Painter& painter,
+    const Style& style) {
+    Color target_color;
+    std::string entry_string;
+
+    switch (entry.state) {
+        case ADSBAgeState::Invalid:
+        case ADSBAgeState::Current:
+            entry_string = "";
+            target_color = Theme::getInstance()->fg_green->foreground;
+            break;
+        case ADSBAgeState::Recent:
+            entry_string = STR_COLOR_LIGHT_GREY;
+            target_color = Theme::getInstance()->fg_light->foreground;
+            break;
+        default:
+            entry_string = STR_COLOR_DARK_GREY;
+            target_color = Theme::getInstance()->fg_medium->foreground;
+    };
+
+    entry_string +=
+        (entry.callsign.empty() ? entry.icao_str + "   " : entry.callsign + " ") +
+        to_string_dec_uint((unsigned int)(entry.pos.altitude / 100), 4) +
+        to_string_dec_uint((unsigned int)entry.velo.speed, 4) +
+        to_string_dec_uint((unsigned int)(entry.amp >> 9), 4) + " " +
+        (entry.hits <= 999 ? to_string_dec_uint(entry.hits, 3) + " " : "1k+ ") +
+        to_string_dec_uint(entry.age, 4);
+
+    painter.draw_string(
+        target_rect.location(),
+        style,
+        entry_string);
+
+    if (entry.pos.valid)
+        painter.draw_bitmap(target_rect.location() + Point(8 * 8, 0),
+                            bitmap_target, target_color, style.background);
 }
 
+/* ADSBLogger ********************************************/
+
+void ADSBLogger::log(const ADSBLogEntry& log_entry) {
+    std::string log_line;
+    log_line.reserve(100);
+
+    log_line = log_entry.raw_data;
+    log_line += "ICAO:" + log_entry.icao;
+
+    if (!log_entry.callsign.empty())
+        log_line += " " + log_entry.callsign;
+
+    if (log_entry.pos.valid)
+        log_line += " Alt:" + to_string_dec_int(log_entry.pos.altitude) +
+                    " Lat:" + to_string_decimal(log_entry.pos.latitude, 7) +
+                    " Lon:" + to_string_decimal(log_entry.pos.longitude, 7);
+
+    if (log_entry.vel.valid)
+        log_line += " Type:" + to_string_dec_uint(log_entry.vel_type) +
+                    " Hdg:" + to_string_dec_uint(log_entry.vel.heading) +
+                    " Spd: " + to_string_dec_int(log_entry.vel.speed);
+    if (log_entry.sil != 0)
+        log_line += " Sil:" + to_string_dec_uint(log_entry.sil);
+    log_file.write_entry(log_line);
+}
+
+/* ADSBRxAircraftDetailsView *****************************/
+
+ADSBRxAircraftDetailsView::ADSBRxAircraftDetailsView(
+    NavigationView& nav,
+    const AircraftRecentEntry& entry) {
+    add_children(
+        {&labels,
+         &text_icao_address,
+         &text_registration,
+         &text_manufacturer,
+         &text_model,
+         &text_type,
+         &text_number_of_engines,
+         &text_engine_type,
+         &text_owner,
+         &text_operator,
+         &button_close});
+
+    text_icao_address.set(entry.icao_str);
+
+    // Try getting the aircraft information from icao24.db
+    database db{};
+    database::AircraftDBRecord aircraft_record;
+    auto return_code = db.retrieve_aircraft_record(&aircraft_record, entry.icao_str);
+    switch (return_code) {
+        case DATABASE_RECORD_FOUND:
+            text_registration.set(aircraft_record.aircraft_registration);
+            text_manufacturer.set(aircraft_record.aircraft_manufacturer);
+            text_model.set(aircraft_record.aircraft_model);
+            text_owner.set(aircraft_record.aircraft_owner);
+            text_operator.set(aircraft_record.aircraft_operator);
+
+            // Check for ICAO type, e.g. L2J
+            if (strlen(aircraft_record.icao_type) == 3) {
+                switch (aircraft_record.icao_type[0]) {
+                    case 'L':
+                        text_type.set("Landplane");
+                        break;
+                    case 'S':
+                        text_type.set("Seaplane");
+                        break;
+                    case 'A':
+                        text_type.set("Amphibian");
+                        break;
+                    case 'H':
+                        text_type.set("Helicopter");
+                        break;
+                    case 'G':
+                        text_type.set("Gyrocopter");
+                        break;
+                    case 'T':
+                        text_type.set("Tilt-wing aircraft");
+                        break;
+                }
+
+                text_number_of_engines.set(std::string{1, aircraft_record.icao_type[1]});
+                switch (aircraft_record.icao_type[2]) {
+                    case 'P':
+                        text_engine_type.set("Piston engine");
+                        break;
+                    case 'T':
+                        text_engine_type.set("Turboprop/Turboshaft engine");
+                        break;
+                    case 'J':
+                        text_engine_type.set("Jet engine");
+                        break;
+                    case 'E':
+                        text_engine_type.set("Electric engine");
+                        break;
+                }
+            }
+
+            // Check for ICAO type designator
+            else if (strlen(aircraft_record.icao_type) == 4) {
+                if (strcmp(aircraft_record.icao_type, "SHIP") == 0)
+                    text_type.set("Airship");
+                else if (strcmp(aircraft_record.icao_type, "BALL") == 0)
+                    text_type.set("Balloon");
+                else if (strcmp(aircraft_record.icao_type, "GLID") == 0)
+                    text_type.set("Glider / sailplane");
+                else if (strcmp(aircraft_record.icao_type, "ULAC") == 0)
+                    text_type.set("Micro/ultralight aircraft");
+                else if (strcmp(aircraft_record.icao_type, "GYRO") == 0)
+                    text_type.set("Micro/ultralight autogyro");
+                else if (strcmp(aircraft_record.icao_type, "UHEL") == 0)
+                    text_type.set("Micro/ultralight helicopter");
+                else if (strcmp(aircraft_record.icao_type, "SHIP") == 0)
+                    text_type.set("Airship");
+                else if (strcmp(aircraft_record.icao_type, "PARA") == 0)
+                    text_type.set("Powered parachute/paraplane");
+            }
+            break;
+
+        case DATABASE_RECORD_NOT_FOUND:
+            // Defaults should be filled by the constructor
+            break;
+
+        case DATABASE_NOT_FOUND:
+            text_manufacturer.set("No icao24.db file");
+            break;
+    }
+
+    button_close.on_select = [&nav](Button&) {
+        nav.pop();
+    };
+}
+
+void ADSBRxAircraftDetailsView::focus() {
+    button_close.focus();
+}
+
+/* ADSBRxDetailsView *************************************/
+
+ADSBRxDetailsView::ADSBRxDetailsView(
+    NavigationView& nav,
+    const AircraftRecentEntry& entry)
+    : entry_(entry) {
+    add_children(
+        {&labels,
+         &text_icao_address,
+         &text_callsign,
+         &text_last_seen,
+         &text_airline,
+         &text_country,
+         &text_infos,
+         &text_info2,
+         &text_frame_pos_even,
+         &text_frame_pos_odd,
+         &button_aircraft_details,
+         &button_see_map});
+
+    text_icao_address.set(entry_.icao_str);
+
+    button_aircraft_details.on_select = [this, &nav](Button&) {
+        aircraft_details_view_ = nav.push<ADSBRxAircraftDetailsView>(entry_);
+        nav.set_on_pop([this]() {
+            aircraft_details_view_ = nullptr;
+            refresh_ui();
+        });
+    };
+
+    button_see_map.on_select = [this, &nav](Button&) {
+        geomap_view_ = nav.push<GeoMapView>(
+            get_map_tag(entry_),
+            entry_.pos.altitude,
+            GeoPos::alt_unit::FEET,
+            GeoPos::spd_unit::MPH,
+            entry_.pos.latitude,
+            entry_.pos.longitude,
+            entry_.velo.heading);
+        nav.set_on_pop([this]() {
+            geomap_view_ = nullptr;
+            refresh_ui();
+        });
+    };
+
+    refresh_ui();
+};
+
 void ADSBRxDetailsView::focus() {
-	button_see_map.focus();
+    button_see_map.focus();
 }
 
 void ADSBRxDetailsView::update(const AircraftRecentEntry& entry) {
-	entry_copy = entry;
-	uint32_t age = entry_copy.age;
-	
-	if (age < 60)
-		text_last_seen.set(to_string_dec_uint(age) + " seconds ago");
-	else
-		text_last_seen.set(to_string_dec_uint(age / 60) + " minutes ago");
-	
-	text_infos.set(entry_copy.info_string);
-	
-	text_frame_pos_even.set(to_string_hex_array(entry_copy.frame_pos_even.get_raw_data(), 14));
-	text_frame_pos_odd.set(to_string_hex_array(entry_copy.frame_pos_odd.get_raw_data(), 14));
-	
-	if (send_updates)
-		geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude);
+    entry_ = entry;
+
+    if (aircraft_details_view_) {
+        // AC Details view is showing, nothing to update.
+    } else if (geomap_view_) {
+        // Map is showing, update the current item.
+        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);
+    } else {
+        // Details is showing, update details.
+        refresh_ui();
+    }
 }
 
-ADSBRxDetailsView::~ADSBRxDetailsView() {
-	on_close_();
+void ADSBRxDetailsView::clear_map_markers() {
+    if (geomap_view_)
+        geomap_view_->clear_markers();
 }
 
-ADSBRxDetailsView::ADSBRxDetailsView(
-	NavigationView& nav,
-	const AircraftRecentEntry& entry,
-	const std::function<void(void)> on_close
-) : entry_copy(entry),
-	on_close_(on_close)
-{
-	char file_buffer[32] { 0 };
-	bool found = false;
-	std::string airline_code;
-	size_t c;
-	
-	add_children({
-		&labels,
-		&text_callsign,
-		&text_last_seen,
-		&text_airline,
-		&text_country,
-		&text_infos,
-		&text_frame_pos_even,
-		&text_frame_pos_odd,
-		&button_see_map
-	});
-	
-	std::unique_ptr<ADSBLogger> logger { };
-	update(entry_copy);
+bool ADSBRxDetailsView::add_map_marker(const AircraftRecentEntry& entry) {
+    // Map not shown, can't add markers.
+    if (!geomap_view_)
+        return false;
 
-	// The following won't (shouldn't !) change for a given airborne aircraft
-	// Try getting the airline's name from airlines.db
-	auto result = db_file.open("ADSB/airlines.db");
-	if (!result.is_valid()) {
-		// Search for 3-letter code in 0x0000~0x2000
-		airline_code = entry_copy.callsign.substr(0, 3);
-		c = 0;
-		do {
-			db_file.read(file_buffer, 4);
-			if (!file_buffer[0])
-				break;
-			if (!airline_code.compare(0, 4, file_buffer))
-				found = true;
-			else
-				c++;
-		} while (!found);
-		
-		if (found) {
-			db_file.seek(0x2000 + (c << 6));
-			db_file.read(file_buffer, 32);
-			text_airline.set(file_buffer);
-			db_file.read(file_buffer, 32);
-			text_country.set(file_buffer);
-		} else {
-			text_airline.set("Unknown");
-			text_country.set("Unknown");
-		}
-	} else {
-		text_airline.set("No airlines.db file");
-		text_country.set("No airlines.db file");
-	}
-	
-	text_callsign.set(entry_copy.callsign);
-	
-	button_see_map.on_select = [this, &nav](Button&) {
-		geomap_view = nav.push<GeoMapView>(
-			entry_copy.callsign,
-			entry_copy.pos.altitude,
-			GeoPos::alt_unit::FEET,
-			entry_copy.pos.latitude,
-			entry_copy.pos.longitude,
-			0,
-			[this]() {
-				send_updates = false;
-			});
-		send_updates = true;
-	};
-};
+    GeoMarker marker{};
+    marker.lon = entry.pos.longitude;
+    marker.lat = entry.pos.latitude;
+    marker.angle = entry.velo.heading;
+    marker.tag = get_map_tag(entry);
 
-void ADSBRxView::focus() {
-	field_vga.focus();
+    auto markerStored = geomap_view_->store_marker(marker);
+    return markerStored == MARKER_STORED;
+}
+
+void ADSBRxDetailsView::on_gps(const GPSPosDataMessage* msg) {
+    if (!geomap_view_)
+        return;
+    geomap_view_->update_my_position(msg->lat, msg->lon, msg->altitude);
+}
+void ADSBRxDetailsView::on_orientation(const OrientationDataMessage* msg) {
+    if (!geomap_view_)
+        return;
+    geomap_view_->update_my_orientation(msg->angle);
+}
+
+void ADSBRxDetailsView::refresh_ui() {
+    // The following won't change for a given airborne aircraft.
+    // Try getting the airline's name from airlines.db.
+    if (!airline_checked && !entry_.callsign.empty()) {
+        airline_checked = true;
+
+        database db;
+        database::AirlinesDBRecord airline_record;
+        std::string airline_code = entry_.callsign.substr(0, 3);
+        auto return_code = db.retrieve_airline_record(&airline_record, airline_code);
+
+        switch (return_code) {
+            case DATABASE_RECORD_FOUND:
+                text_airline.set(airline_record.airline);
+                text_country.set(airline_record.country);
+                break;
+            case DATABASE_RECORD_NOT_FOUND:
+                // text_airline.set("-"); // It's what it is constructed with
+                // text_country.set("-"); // It's what it is constructed with
+                break;
+            case DATABASE_NOT_FOUND:
+                text_airline.set("No airlines.db file");
+                break;
+        }
+    }
+
+    auto age = entry_.age;
+    if (age < 60)
+        text_last_seen.set(to_string_dec_uint(age) + " seconds ago");
+    else
+        text_last_seen.set(to_string_dec_uint(age / 60) + " minutes ago");
+
+    text_callsign.set(entry_.callsign);
+    text_infos.set(entry_.info_string);
+    std::string str_sil = (entry_.sil > 0) ? " Sil:" + to_string_dec_uint(entry_.sil) : "";
+    if (entry_.velo.heading < 360 && entry_.velo.speed >= 0)
+        text_info2.set("Hdg:" + to_string_dec_uint(entry_.velo.heading) +
+                       " Spd:" + to_string_dec_int(entry_.velo.speed) + str_sil);
+    else
+        text_info2.set(str_sil);
+
+    text_frame_pos_even.set(to_string_hex_array(entry_.frame_pos_even.get_raw_data(), 14));
+    text_frame_pos_odd.set(to_string_hex_array(entry_.frame_pos_odd.get_raw_data(), 14));
+}
+
+/* ADSBRxView ********************************************/
+
+ADSBRxView::ADSBRxView(NavigationView& nav) {
+    baseband::run_image(portapack::spi_flash::image_tag_adsb_rx);
+    add_children(
+        {&labels,
+         &field_lna,
+         &field_vga,
+         &field_rf_amp,
+         &rssi,
+         &recent_entries_view,
+         &status_frame,
+         &status_good_frame,
+         &field_volume});
+
+    recent_entries_view.set_parent_rect({0, 16, 240, 272});
+    recent_entries_view.on_select = [this, &nav](const AircraftRecentEntry& entry) {
+        detail_key = entry.key();
+        details_view = nav.push<ADSBRxDetailsView>(entry);
+
+        nav.set_on_pop([this]() {
+            detail_key = AircraftRecentEntry::invalid_key;
+            details_view = nullptr;
+        });
+    };
+
+    signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
+        on_tick_second();
+    };
+
+    logger = std::make_unique<ADSBLogger>();
+    logger->append(logs_dir / u"ADSB.TXT");
+
+    receiver_model.enable();
+    baseband::set_adsb();
+
+    if (pmem::beep_on_packets()) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
+    }
 }
 
 ADSBRxView::~ADSBRxView() {
-	rtc_time::signal_tick_second -= signal_token_tick_second;
-	receiver_model.disable();
-	baseband::shutdown();
+    rtc_time::signal_tick_second -= signal_token_tick_second;
+    audio::output::stop();
+    receiver_model.disable();
+    baseband::shutdown();
 }
 
-void ADSBRxView::on_frame(const ADSBFrameMessage * message) {
-	rtc::RTC datetime;
-	std::string str_timestamp;
-	std::string callsign;
-	std::string str_info;
-	std::string logentry;
+void ADSBRxView::focus() {
+    field_vga.focus();
+}
 
-	auto frame = message->frame;
-	uint32_t ICAO_address = frame.get_ICAO_address();
-	
-	if (frame.check_CRC() && frame.get_ICAO_address()) {
-		rtcGetTime(&RTCD1, &datetime);
-		auto& entry = ::on_packet(recent, ICAO_address);
-		frame.set_rx_timestamp(datetime.minute() * 60 + datetime.second());
-		entry.reset_age();
-		str_timestamp = to_string_datetime(datetime, HMS);
-		entry.set_time_string(str_timestamp);
+void ADSBRxView::on_frame(const ADSBFrameMessage* message) {
+    auto frame = message->frame;
+    uint32_t ICAO_address = frame.get_ICAO_address();
+    status_frame.toggle();
 
-		entry.inc_hit();
-		logentry += to_string_hex_array(frame.get_raw_data(), 14) + " ";
-		logentry += "ICAO:" + to_string_hex(ICAO_address, 6) + " ";
-		
-		if (frame.get_DF() == DF_ADSB) {
-			uint8_t msg_type = frame.get_msg_type();
-			uint8_t * raw_data = frame.get_raw_data();
-			
-			if ((msg_type >= 1) && (msg_type <= 4)) {
-				callsign = decode_frame_id(frame);
-				entry.set_callsign(callsign);
-				logentry+=callsign+" ";
-			} else if (((msg_type >= 9) && (msg_type <= 18)) || ((msg_type >= 20) && (msg_type <= 22))) {
-				entry.set_frame_pos(frame, raw_data[6] & 4);
-				
-				if (entry.pos.valid) {
-					str_info = "Alt:" + to_string_dec_uint(entry.pos.altitude) +
-						" Lat" + to_string_dec_int(entry.pos.latitude) +
-						"." + to_string_dec_int((int)abs(entry.pos.latitude * 1000) % 100, 2, '0') +
-						" Lon" + to_string_dec_int(entry.pos.longitude) +
-						"." + to_string_dec_int((int)abs(entry.pos.longitude * 1000) % 100, 2, '0');
-					
-					entry.set_info_string(str_info);
-					logentry+=str_info+ " ";
+    // Bad frame, skip it.
+    if (!frame.check_CRC() || ICAO_address == 0)
+        return;
 
-					if (send_updates)
-						details_view->update(entry);
-				}
-			}
-		}
-		recent_entries_view.set_dirty(); 
-		
-		logger = std::make_unique<ADSBLogger>();
-        if (logger) {
-                logger->append(u"adsb.txt");
-                // will log each frame in format:
-                // 20171103100227 8DADBEEFDEADBEEFDEADBEEFDEADBEEF ICAO:nnnnnn callsign Alt:nnnnnn Latnnn.nn Lonnnn.nn
-				logger->log_str(logentry);
+    ADSBLogEntry log_entry;
+    status_good_frame.toggle();
+
+    rtc::RTC datetime;
+    rtcGetTime(&RTCD1, &datetime);  // Reading RTC directly to avoid DST transitions when calculating delta
+    frame.set_rx_timestamp(datetime.minute() * 60 + datetime.second());
+
+    // NB: Reference to update entry in-place.
+    auto& entry = find_or_create_entry(ICAO_address);
+    entry.inc_hit();
+    entry.reset_age();
+
+    // Store smoothed amplitude on updates.
+    entry.amp = entry.hits == 0
+                    ? message->amp
+                    : ((entry.amp * 15) + message->amp) >> 4;
+
+    log_entry.raw_data = to_string_hex_array(frame.get_raw_data(), 14);
+    log_entry.icao = entry.icao_str;
+
+    if (frame.get_DF() == DF_ADSB) {
+        uint8_t msg_type = frame.get_msg_type();
+        uint8_t msg_sub = frame.get_msg_sub();
+        uint8_t* raw_data = frame.get_raw_data();
+
+        // 4: // surveillance, altitude reply
+        if ((msg_type >= AIRCRAFT_ID_L) && (msg_type <= AIRCRAFT_ID_H)) {
+            entry.set_callsign(decode_frame_id(frame));
+            log_entry.callsign = entry.callsign;
         }
-	}
+
+        // 9:
+        // 18: // Extended squitter/non-transponder
+        // 21: // Comm-B, identity reply
+        // 20: // Comm-B, altitude reply
+        else if (((msg_type >= AIRBORNE_POS_BARO_L) && (msg_type <= AIRBORNE_POS_BARO_H)) ||
+                 ((msg_type >= AIRBORNE_POS_GPS_L) && (msg_type <= AIRBORNE_POS_GPS_H))) {
+            entry.set_frame_pos(frame, raw_data[6] & 4);
+            log_entry.pos = entry.pos;
+
+            if (entry.pos.valid) {
+                std::string str_info =
+                    "Alt:" + to_string_dec_int(entry.pos.altitude) +
+                    " Lat:" + to_string_decimal(entry.pos.latitude, 2) +
+                    " Lon:" + to_string_decimal(entry.pos.longitude, 2);
+                entry.set_info_string(std::move(str_info));
+            }
+
+        } else if (msg_type == AIRBORNE_VEL && msg_sub >= VEL_GND_SUBSONIC && msg_sub <= VEL_AIR_SUPERSONIC) {
+            entry.set_frame_velo(frame);
+            log_entry.vel = entry.velo;
+            log_entry.vel_type = msg_sub;
+        } else if (msg_type == AIRBORNE_OP_STATUS) {  // for ver 1
+            entry.sil = frame.get_sil_value();
+        }
+    }
+
+    logger->log(log_entry);
+
+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
 }
 
 void ADSBRxView::on_tick_second() {
-	// Decay and refresh if needed
-	for (auto& entry : recent) {
-		entry.inc_age();
-		
-		if (details_view) {
-			if (send_updates && (entry.key() == detailed_entry_key))
-				details_view->update(entry);
-		} else {
-			if ((entry.age == ADSB_DECAY_A) || (entry.age == ADSB_DECAY_B))
-				recent_entries_view.set_dirty();
-		}
-	}
+    status_frame.reset();
+    status_good_frame.reset();
+
+    ++tick_count;
+    ++ticks_since_marker_refresh;
+
+    // Small list, update all at once.
+    if (recent.size() <= max_update_entries) {
+        update_recent_entries(/*age_delta*/ 1);
+        refresh_ui();
+        return;
+    }
+
+    // Too many items, split update work into two phases:
+    // Entry maintenance and UI update.
+    if ((tick_count & 1) == 0)
+        update_recent_entries(/*age_delta*/ 2);
+    else
+        refresh_ui();
 }
 
-ADSBRxView::ADSBRxView(NavigationView& nav) {
-	baseband::run_image(portapack::spi_flash::image_tag_adsb_rx);
-	add_children({
-		&labels,
-		&field_lna,
-		&field_vga,
-		&field_rf_amp,
-		&rssi,
-		&recent_entries_view
-	});
-	
-	recent_entries_view.set_parent_rect({ 0, 16, 240, 272 });
-	recent_entries_view.on_select = [this, &nav](const AircraftRecentEntry& entry) {
-		detailed_entry_key = entry.key();
-		details_view = nav.push<ADSBRxDetailsView>(
-			entry,
-			[this]() {
-				send_updates = false;
-			});
-		send_updates = true;
-	};
-	
-	signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
-		on_tick_second();
-	};
-	
-	baseband::set_adsb();
-	
-	receiver_model.set_tuning_frequency(1090000000);
-	field_lna.set_value(40);
-	field_vga.set_value(40);
-	receiver_model.set_modulation(ReceiverModel::Mode::SpectrumAnalysis);
-	receiver_model.set_sampling_rate(2000000);
-	receiver_model.set_baseband_bandwidth(2500000);
-	receiver_model.enable();
+void ADSBRxView::refresh_ui() {
+    // There's only one ticks handler, but 3 UIs that need to be updated.
+    // This code will dispatch updates to the currently active view.
+
+    if (details_view) {
+        // The details view is showing, forward updates to that UI.
+        bool current_updated = false;
+        bool map_needs_update = false;
+
+        if (details_view->map_active()) {
+            // Is it time to clear and refresh the map's markers?
+            if (ticks_since_marker_refresh >= MARKER_UPDATE_SECONDS) {
+                map_needs_update = true;
+                ticks_since_marker_refresh = 0;
+                details_view->clear_map_markers();
+            }
+        } else {
+            // Refresh map immediately once active.
+            ticks_since_marker_refresh = MARKER_UPDATE_SECONDS;
+        }
+
+        // Process the entries list.
+        for (const auto& entry : recent) {
+            // Found the entry being shown in details view. Update it.
+            if (entry.key() == detail_key) {
+                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.valid && entry.state <= ADSBAgeState::Recent) {
+                map_needs_update = details_view->add_map_marker(entry);
+            }
+
+            // Any work left to do?
+            if (current_updated && !map_needs_update)
+                break;
+        }
+    } else {
+        // Main page is the top view. Redraw the entries view.
+        recent_entries_view.set_dirty();
+    }
+}
+
+void ADSBRxView::update_recent_entries(int age_delta) {
+    for (auto& entry : recent)
+        entry.inc_age(age_delta);
+
+    // Sort and truncate the entries, grouped by state, newest first.
+    sort_entries_by_state();
+    truncate_entries(recent);
+    remove_expired_entries();
+}
+
+AircraftRecentEntry& ADSBRxView::find_or_create_entry(uint32_t ICAO_address) {
+    // Find ...
+    auto it = find(recent, ICAO_address);
+    if (it != recent.end())
+        return *it;
+
+    // ... or Create.
+    return recent.emplace_front(ICAO_address);
+}
+
+void ADSBRxView::sort_entries_by_state() {
+    recent.sort([](const auto& left, const auto& right) {
+        return (left.state < right.state);
+    });
+}
+
+void ADSBRxView::remove_expired_entries() {
+    // NB: Assumes entried are sorted with oldest last.
+    auto it = recent.rbegin();
+    auto end = recent.rend();
+
+    // Find the first !expired entry from the back.
+    while (it != end) {
+        if (it->state != ADSBAgeState::Expired)
+            break;
+
+        std::advance(it, 1);
+    }
+
+    // Remove the range of expired items.
+    recent.erase(it.base(), recent.end());
 }
 
 } /* namespace ui */

firmware/application/apps/ui_adsb_rx.hpp

@@ -1,7 +1,9 @@
 /*
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
  * Copyright (C) 2017 Furrtek
- * 
+ * Copyright (C) 2023 Kyle Reed
+ * Copyright (C) 2024 Mark Thompson
+ *
  * This file is part of PortaPack.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,234 +23,431 @@
  */
 
 #include "ui.hpp"
-
 #include "ui_receiver.hpp"
 #include "ui_geomap.hpp"
-#include "ui_font_fixed_8x16.hpp"
 
-#include "file.hpp"
-#include "recent_entries.hpp"
-#include "log_file.hpp"
 #include "adsb.hpp"
+#include "app_settings.hpp"
+#include "crc.hpp"
+#include "database.hpp"
+#include "file.hpp"
+#include "log_file.hpp"
 #include "message.hpp"
+#include "radio_state.hpp"
+#include "recent_entries.hpp"
+#include "string_format.hpp"
 
 using namespace adsb;
 
 namespace ui {
+#define AIRCRAFT_ID_L 1  // aircraft ID message type (lowest type id)
+#define AIRCRAFT_ID_H 4  // aircraft ID message type (highest type id)
 
-#define ADSB_DECAY_A 10		// In seconds
-#define ADSB_DECAY_B 30
-#define ADSB_DECAY_C 60		// Can be used for removing old entries, RecentEntries already caps to 64
+#define SURFACE_POS_L 5  // surface position (lowest type id)
+#define SURFACE_POS_H 8  // surface position (highest type id)
 
-struct AircraftRecentEntry {
-	using Key = uint32_t;
-	
-	static constexpr Key invalid_key = 0xffffffff;
-	
-	uint32_t ICAO_address { };
-	uint16_t hits { 0 };
-	uint32_t age { 0 };
-	adsb_pos pos { false, 0, 0, 0 };
-	
-	ADSBFrame frame_pos_even { };
-	ADSBFrame frame_pos_odd { };
-	
-	std::string callsign { "        " };
-	std::string time_string { "" };
-	std::string info_string { "" };
-	
-	AircraftRecentEntry(
-		const uint32_t ICAO_address
-	) : ICAO_address { ICAO_address }
-	{
-	}
+#define AIRBORNE_POS_BARO_L 9   // airborne position (lowest type id)
+#define AIRBORNE_POS_BARO_H 18  // airborne position (highest type id)
 
-	Key key() const {
-		return ICAO_address;
-	}
-	
-	void set_callsign(std::string& new_callsign) {
-		callsign = new_callsign;
-	}
-	
-	void inc_hit() {
-		hits++;
-	}
-	
-	void set_frame_pos(ADSBFrame& frame, uint32_t parity) {
-		if (!parity)
-			frame_pos_even = frame;
-		else
-			frame_pos_odd = frame;
-		
-		if (!frame_pos_even.empty() && !frame_pos_odd.empty()) {
-			if (abs(frame_pos_even.get_rx_timestamp() - frame_pos_odd.get_rx_timestamp()) < 20)
-				pos = decode_frame_pos(frame_pos_even, frame_pos_odd);
-		}
-	}
-	
-	void set_info_string(std::string& new_info_string) {
-		info_string = new_info_string;
-	}
-	
-	void set_time_string(std::string& new_time_string) {
-		time_string = new_time_string;
-	}
-	
-	void reset_age() {
-		age = 0;
-	}
-	
-	void inc_age() {
-		age++;
-	}
+#define AIRBORNE_VEL 19  // airborne velocities
+
+#define AIRBORNE_POS_GPS_L 20  // airborne position (lowest type id)
+#define AIRBORNE_POS_GPS_H 22  // airborne position (highest type id)
+
+#define AIRBORNE_OP_STATUS 31  // Aircraft operation status
+
+#define RESERVED_L 23  // reserved for other uses
+#define RESERVED_H 31  // reserved for other uses
+
+#define VEL_GND_SUBSONIC 1
+#define VEL_GND_SUPERSONIC 2
+#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 5  // "other" map marker redraw interval
+
+/* Thresholds (in seconds) that define the transition between ages. */
+struct ADSBAgeLimit {
+    static constexpr int Current = 10;
+    static constexpr int Recent = 30;
+    static constexpr int Expired = 300;
 };
 
+/* Age states used for sorting and drawing recent entries. */
+enum class ADSBAgeState : uint8_t {
+    Invalid,
+    Current,
+    Recent,
+    Old,
+    Expired,
+};
+
+/* Data extracted from ADSB frames. */
+struct AircraftRecentEntry {
+    using Key = uint32_t;
+
+    static constexpr Key invalid_key = 0xffffffff;
+
+    uint32_t ICAO_address{};
+    uint16_t hits{0};
+
+    ADSBAgeState state{ADSBAgeState::Invalid};
+    uint32_t age{0};  // In seconds
+    uint32_t amp{0};
+    adsb_pos pos{false, 0, 0, 0};
+    adsb_vel velo{false, 0, 999, 0};
+    ADSBFrame frame_pos_even{};
+    ADSBFrame frame_pos_odd{};
+
+    std::string icao_str{};
+    std::string callsign{};
+    std::string info_string{};
+
+    uint8_t sil{0};  // Surveillance integrity level
+
+    AircraftRecentEntry(const uint32_t ICAO_address)
+        : ICAO_address{ICAO_address} {
+        this->icao_str = to_string_hex(ICAO_address, 6);
+    }
+
+    /* RecentEntries helpers expect a "key" on every item. */
+    Key key() const {
+        return ICAO_address;
+    }
+
+    void set_callsign(std::string new_callsign) {
+        callsign = std::move(new_callsign);
+    }
+
+    void inc_hit() {
+        hits++;
+    }
+
+    void set_frame_pos(ADSBFrame& frame, uint32_t parity) {
+        if (!parity)
+            frame_pos_even = frame;
+        else
+            frame_pos_odd = frame;
+
+        if (!frame_pos_even.empty() && !frame_pos_odd.empty()) {
+            if (abs(frame_pos_even.get_rx_timestamp() - frame_pos_odd.get_rx_timestamp()) < O_E_FRAME_TIMEOUT)
+                pos = decode_frame_pos(frame_pos_even, frame_pos_odd);
+        }
+    }
+
+    void set_frame_velo(ADSBFrame& frame) {
+        velo = decode_frame_velo(frame);
+    }
+
+    void set_info_string(std::string new_info_string) {
+        info_string = std::move(new_info_string);
+    }
+
+    void reset_age() {
+        age = 0;
+    }
+
+    void inc_age(int delta) {
+        age += delta;
+
+        if (age < ADSBAgeLimit::Current)
+            state = pos.valid ? ADSBAgeState::Invalid
+                              : ADSBAgeState::Current;
+
+        else if (age < ADSBAgeLimit::Recent)
+            state = ADSBAgeState::Recent;
+
+        else if (age < ADSBAgeLimit::Expired)
+            state = ADSBAgeState::Old;
+
+        else
+            state = ADSBAgeState::Expired;
+    }
+};
+
+// NB: uses std::list underneath so assuming refs are NOT invalidated.
 using AircraftRecentEntries = RecentEntries<AircraftRecentEntry>;
 
+/* Holds data for logging. */
+struct ADSBLogEntry {
+    std::string raw_data{};
+    std::string icao{};
+    std::string callsign{};
+    adsb_pos pos{};
+    adsb_vel vel{};
+    uint8_t vel_type{};
+    uint8_t sil{};
+};
+
+// TODO: Make logging optional.
+/* Logs entries to a log file. */
 class ADSBLogger {
-public:
-	Optional<File::Error> append(const std::filesystem::path& filename) {
-		return log_file.append(filename);
-	}
-	void log_str(std::string& logline);
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
+    void log(const ADSBLogEntry& log_entry);
 
-private:
-	LogFile log_file { };
+   private:
+    LogFile log_file{};
 };
 
+/* Shows detailed information about an aircraft. */
+class ADSBRxAircraftDetailsView : public View {
+   public:
+    ADSBRxAircraftDetailsView(
+        NavigationView&,
+        const AircraftRecentEntry& entry);
 
+    void focus() override;
+    std::string title() const override { return "AC Details"; }
+
+   private:
+    Labels labels{
+        {{0 * 8, 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 2 * 16}, "Registration:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 3 * 16}, "Manufacturer:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 5 * 16}, "Model:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 7 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 8 * 16}, "Number of engines:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 9 * 16}, "Engine type:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 11 * 16}, "Owner:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 13 * 16}, "Operator:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_icao_address{
+        {5 * 8, 1 * 16, 6 * 8, 16},
+        "-"};
+
+    Text text_registration{
+        {13 * 8, 2 * 16, 8 * 8, 16},
+        "-"};
+
+    Text text_manufacturer{
+        {0 * 8, 4 * 16, 19 * 8, 16},
+        "-"};
+
+    Text text_model{
+        {0 * 8, 6 * 16, 30 * 8, 16},
+        "-"};
+
+    Text text_type{
+        {5 * 8, 7 * 16, 22 * 8, 16},
+        "-"};
+
+    Text text_number_of_engines{
+        {18 * 8, 8 * 16, 30 * 8, 16},
+        "-"};
+
+    Text text_engine_type{
+        {0 * 8, 10 * 16, 30 * 8, 16},
+        "-"};
+
+    Text text_owner{
+        {0 * 8, 12 * 16, 30 * 8, 16},
+        "-"};
+
+    Text text_operator{
+        {0 * 8, 14 * 16, 30 * 8, 16},
+        "-"};
+
+    Button button_close{
+        {9 * 8, 16 * 16, 12 * 8, 3 * 16},
+        "Back"};
+};
+
+/* Shows detailed information about an aircraft's flight. */
 class ADSBRxDetailsView : public View {
-public:
-	ADSBRxDetailsView(NavigationView&, const AircraftRecentEntry& entry, const std::function<void(void)> on_close);
-	~ADSBRxDetailsView();
+   public:
+    ADSBRxDetailsView(NavigationView&, const AircraftRecentEntry& entry);
 
-	ADSBRxDetailsView(const ADSBRxDetailsView&) = delete;
-	ADSBRxDetailsView(ADSBRxDetailsView&&) = delete;
-	ADSBRxDetailsView& operator=(const ADSBRxDetailsView&) = delete;
-	ADSBRxDetailsView& operator=(ADSBRxDetailsView&&) = delete;
-	
-	void focus() override;
-	
-	void update(const AircraftRecentEntry& entry);
-	
-	std::string title() const override { return "Aircraft details"; };
-	
-private:
-	AircraftRecentEntry entry_copy { 0 };
-	std::function<void(void)> on_close_ { };
-	GeoMapView* geomap_view { nullptr };
-	bool send_updates { false };
-	File db_file { };
-	
-	Labels labels {
-		{ { 0 * 8, 1 * 16 }, "Callsign:", Color::light_grey() },
-		{ { 0 * 8, 2 * 16 }, "Last seen:", Color::light_grey() },
-		{ { 0 * 8, 3 * 16 }, "Airline:", Color::light_grey() },
-		{ { 0 * 8, 5 * 16 }, "Country:", Color::light_grey() },
-		{ { 0 * 8, 12 * 16 }, "Even position frame:", Color::light_grey() },
-		{ { 0 * 8, 14 * 16 }, "Odd position frame:", Color::light_grey() }
-	};
-	
-	Text text_callsign {
-		{ 9 * 8, 1 * 16, 8 * 8, 16 },
-		"-"
-	};
-	
-	Text text_last_seen {
-		{ 11 * 8, 2 * 16, 19 * 8, 16 },
-		"-"
-	};
-	
-	Text text_airline {
-		{ 0 * 8, 4 * 16, 30 * 8, 16 },
-		"-"
-	};
-	
-	Text text_country {
-		{ 8 * 8, 5 * 16, 22 * 8, 16 },
-		"-"
-	};
-	
-	Text text_infos {
-		{ 0 * 8, 6 * 16, 30 * 8, 16 },
-		"-"
-	};
-	Text text_frame_pos_even {
-		{ 0 * 8, 13 * 16, 30 * 8, 16 },
-		"-"
-	};
-	Text text_frame_pos_odd {
-		{ 0 * 8, 15 * 16, 30 * 8, 16 },
-		"-"
-	};
-	
-	Button button_see_map {
-		{ 8 * 8, 8 * 16, 14 * 8, 3 * 16 },
-		"See on map"
-	};
+    ADSBRxDetailsView(const ADSBRxDetailsView&) = delete;
+    ADSBRxDetailsView& operator=(const ADSBRxDetailsView&) = delete;
+
+    void focus() override;
+    void update(const AircraftRecentEntry& entry);
+
+    /* 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);
+
+    std::string title() const override { return "Details"; }
+
+   private:
+    void refresh_ui();
+    void on_gps(const GPSPosDataMessage* msg);
+    void on_orientation(const OrientationDataMessage* msg);
+
+    GeoMapView* geomap_view_{nullptr};
+    ADSBRxAircraftDetailsView* aircraft_details_view_{nullptr};
+
+    // NB: Keeping a copy so that it doesn't end up dangling
+    // if removed from the recent entries list.
+    AircraftRecentEntry entry_{AircraftRecentEntry::invalid_key};
+    bool airline_checked{false};
+
+    Labels labels{
+        {{0 * 8, 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
+        {{13 * 8, 1 * 16}, "Callsign:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 2 * 16}, "Last seen:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 3 * 16}, "Airline:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 5 * 16}, "Country:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 13 * 16}, "Even position frame:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 15 * 16}, "Odd position frame:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_icao_address{
+        {5 * 8, 1 * 16, 6 * 8, 16},
+        "-"};
+
+    Text text_callsign{
+        {22 * 8, 1 * 16, 8 * 8, 16},
+        "-"};
+
+    Text text_last_seen{
+        {11 * 8, 2 * 16, 19 * 8, 16},
+        "-"};
+
+    Text text_airline{
+        {0 * 8, 4 * 16, 30 * 8, 16},
+        "-"};
+
+    Text text_country{
+        {8 * 8, 5 * 16, 22 * 8, 16},
+        "-"};
+
+    Text text_infos{
+        {0 * 8, 6 * 16, 30 * 8, 16},
+        "-"};
+
+    Text text_info2{
+        {0 * 8, 7 * 16, 30 * 8, 16},
+        "-"};
+
+    Text text_frame_pos_even{
+        {0 * 8, 14 * 16, 30 * 8, 16},
+        "-"};
+    Text text_frame_pos_odd{
+        {0 * 8, 16 * 16, 30 * 8, 16},
+        "-"};
+
+    Button button_aircraft_details{
+        {2 * 8, 9 * 16, 12 * 8, 3 * 16},
+        "A/C details"};
+
+    Button button_see_map{
+        {16 * 8, 9 * 16, 12 * 8, 3 * 16},
+        "See on map"};
+
+    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_orientation{
+        Message::ID::OrientationData,
+        [this](Message* const p) {
+            const auto message = static_cast<const OrientationDataMessage*>(p);
+            this->on_orientation(message);
+        }};
 };
-	
+
+/* Main ADSB application view and message dispatch. */
 class ADSBRxView : public View {
-public:
-	ADSBRxView(NavigationView& nav);
-	~ADSBRxView();
-	
-	ADSBRxView(const ADSBRxView&) = delete;
-	ADSBRxView(ADSBRxView&&) = delete;
-	ADSBRxView& operator=(const ADSBRxView&) = delete;
-	ADSBRxView& operator=(ADSBRxView&&) = delete;
-	
-	void focus() override;
-	
-	std::string title() const override { return "ADS-B receive"; };
+   public:
+    ADSBRxView(NavigationView& nav);
+    ~ADSBRxView();
 
-private:
-	std::unique_ptr<ADSBLogger> logger { };
-	void on_frame(const ADSBFrameMessage * message);
-	void on_tick_second();
-	
-	const RecentEntriesColumns columns { {
-		{ "ICAO", 6 },
-		{ "Callsign", 9 },
-		{ "Hits", 4 },
-		{ "Time", 8 }
-	} };
-	AircraftRecentEntries recent { };
-	RecentEntriesView<RecentEntries<AircraftRecentEntry>> recent_entries_view { columns, recent };
-	
-	SignalToken signal_token_tick_second { };
-	ADSBRxDetailsView* details_view { nullptr };
-	uint32_t detailed_entry_key { 0 };
-	bool send_updates { false };
-	
-	Labels labels {
-		{ { 0 * 8, 0 * 8 }, "LNA:   VGA:   AMP:", Color::light_grey() }
-	};
-	
-	LNAGainField field_lna {
-		{ 4 * 8, 0 * 16 }
-	};
+    ADSBRxView(const ADSBRxView&) = delete;
+    ADSBRxView(ADSBRxView&&) = delete;
+    ADSBRxView& operator=(const ADSBRxView&) = delete;
+    ADSBRxView& operator=(ADSBRxView&&) = delete;
 
-	VGAGainField field_vga {
-		{ 11 * 8, 0 * 16 }
-	};
-	
-	RFAmpField field_rf_amp {
-		{ 18 * 8, 0 * 16 }
-	};
-	
-	RSSI rssi {
-		{ 20 * 8, 4, 10 * 8, 8 },
-	};
-	
-	MessageHandlerRegistration message_handler_frame {
-		Message::ID::ADSBFrame,
-		[this](Message* const p) {
-			const auto message = static_cast<const ADSBFrameMessage*>(p);
-			this->on_frame(message);
-		}
-	};
+    void focus() override;
+    std::string title() const override { return "ADS-B RX"; };
+
+   private:
+    RxRadioState radio_state_{
+        1'090'000'000 /* frequency */,
+        2'500'000 /* bandwidth */,
+        2'000'000 /* sampling rate */,
+        ReceiverModel::Mode::SpectrumAnalysis};
+    app_settings::SettingsManager settings_{
+        "rx_adsb", app_settings::Mode::RX};
+
+    std::unique_ptr<ADSBLogger> logger{};
+
+    /* Event Handlers */
+    void on_frame(const ADSBFrameMessage* message);
+    void on_tick_second();
+    void refresh_ui();
+
+    SignalToken signal_token_tick_second{};
+    uint8_t tick_count = 0;
+    uint16_t ticks_since_marker_refresh{MARKER_UPDATE_SECONDS};
+
+    /* Max number of entries that can be updated in a single pass.
+     * 16 is one screen of recent entries. */
+    static constexpr uint8_t max_update_entries = 16;
+
+    /* Recent Entries */
+    const RecentEntriesColumns columns{
+        {{"ICAO/Call", 9},
+         {"Lvl", 3},
+         {"Spd", 3},
+         {"Amp", 3},
+         {"Hit", 3},
+         {"Age", 4}}};
+    AircraftRecentEntries recent{};
+    RecentEntriesView<AircraftRecentEntries> recent_entries_view{columns, recent};
+
+    /* Entry Management */
+    void update_recent_entries(int age_delta);
+    AircraftRecentEntry& find_or_create_entry(uint32_t ICAO_address);
+    void sort_entries_by_state();
+    void remove_expired_entries();
+
+    /* The key of the entry in the details view if shown. */
+    AircraftRecentEntry::Key detail_key{AircraftRecentEntry::invalid_key};
+    ADSBRxDetailsView* details_view{nullptr};
+
+    Labels labels{
+        {{0 * 8, 0 * 8}, "LNA:   VGA:   AMP:", Theme::getInstance()->fg_light->foreground}};
+
+    LNAGainField field_lna{
+        {4 * 8, 0 * 16}};
+
+    VGAGainField field_vga{
+        {11 * 8, 0 * 16}};
+
+    RFAmpField field_rf_amp{
+        {18 * 8, 0 * 16}};
+
+    RSSI rssi{
+        {20 * 8, 4, 7 * 8, 8},
+    };
+
+    ActivityDot status_frame{
+        {27 * 8 + 2, 5, 2, 2},
+        Theme::getInstance()->bg_darkest->foreground,
+    };
+
+    ActivityDot status_good_frame{
+        {27 * 8 + 2, 9, 2, 2},
+        Theme::getInstance()->fg_green->foreground,
+    };
+
+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
+
+    MessageHandlerRegistration message_handler_frame{
+        Message::ID::ADSBFrame,
+        [this](Message* const p) {
+            const auto message = static_cast<const ADSBFrameMessage*>(p);
+            this->on_frame(message);
+        }};
 };
 
 } /* namespace ui */

firmware/application/apps/ui_adsb_tx.cpp

@@ -1,357 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- * 
- * 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_adsb_tx.hpp"
-#include "ui_alphanum.hpp"
-
-#include "manchester.hpp"
-#include "string_format.hpp"
-#include "portapack.hpp"
-#include "baseband_api.hpp"
-
-#include <cstring>
-#include <stdio.h>
-
-using namespace adsb;
-using namespace portapack;
-
-namespace ui {
-
-Compass::Compass(
-	const Point parent_pos
-) : Widget { { parent_pos, { 64, 64 } } }
-{
-}
-
-void Compass::set_value(uint32_t new_value) {
-	Point center = screen_pos() + Point(32, 32);
-	
-	new_value = range.clip(new_value);
-	
-	display.draw_line(
-		center,
-		center + polar_to_point(value_, 28),
-		Color::dark_grey()
-	);
-	
-	display.draw_line(
-		center,
-		center + polar_to_point(new_value, 28),
-		Color::green()
-	);
-
-	value_ = new_value;
-}
-
-void Compass::paint(Painter&) {
-	display.fill_circle(screen_pos() + Point(32, 32), 32, Color::dark_grey(), Color::black());
-	
-	display.fill_rectangle({ screen_pos() + Point(32 - 2, 0), { 4, 4 } }, Color::black());	// N
-	display.fill_rectangle({ screen_pos() + Point(32 - 2, 64 - 4), { 4, 4 } }, Color::black());	// S
-	display.fill_rectangle({ screen_pos() + Point(0, 32 - 2), { 4, 4 } }, Color::black());	// W
-	display.fill_rectangle({ screen_pos() + Point(64 - 4, 32 - 2), { 4, 4 } }, Color::black());	// E
-	
-	set_value(value_);
-}
-
-ADSBPositionView::ADSBPositionView(
-	NavigationView& nav, Rect parent_rect
-) : OptionTabView(parent_rect)
-{
-	set_type("position");
-	
-	add_children({
-		&geopos,
-		&button_set_map
-	});
-	
-	geopos.set_altitude(36000);
-	
-	button_set_map.on_select = [this, &nav](Button&) {
-		nav.push<GeoMapView>(
-			geopos.altitude(),
-			GeoPos::alt_unit::FEET,
-			geopos.lat(),
-			geopos.lon(),
-			[this](int32_t altitude, float lat, float lon) {
-				geopos.set_altitude(altitude);
-				geopos.set_lat(lat);
-				geopos.set_lon(lon);
-			});
-	};
-}
-
-void ADSBPositionView::collect_frames(const uint32_t ICAO_address, std::vector<ADSBFrame>& frame_list) {
-	if (!enabled) return;
-	
-	ADSBFrame temp_frame;
-	
-	encode_frame_pos(temp_frame, ICAO_address, geopos.altitude(),
-		geopos.lat(), geopos.lon(), 0);
-	
-	frame_list.emplace_back(temp_frame);
-	
-	encode_frame_pos(temp_frame, ICAO_address, geopos.altitude(),
-		geopos.lat(), geopos.lon(), 1);
-		
-	frame_list.emplace_back(temp_frame);
-}
-
-ADSBCallsignView::ADSBCallsignView(
-	NavigationView& nav, Rect parent_rect
-) : OptionTabView(parent_rect)
-{
-	set_type("callsign");
-	
-	add_children({
-		&labels_callsign,
-		&button_callsign
-	});
-	
-	set_enabled(true);
-	
-	button_callsign.set_text(callsign);
-	
-	button_callsign.on_select = [this, &nav](Button&) {
-		text_prompt(
-			nav,
-			callsign,
-			8,
-			[this](std::string& s) {
-				button_callsign.set_text(s);
-			}
-		);
-	};
-}
-
-void ADSBCallsignView::collect_frames(const uint32_t ICAO_address, std::vector<ADSBFrame>& frame_list) {
-	if (!enabled) return;
-	
-	ADSBFrame temp_frame;
-	
-	encode_frame_id(temp_frame, ICAO_address, callsign);
-	
-	frame_list.emplace_back(temp_frame);
-}
-
-ADSBSpeedView::ADSBSpeedView(
-	Rect parent_rect
-) : OptionTabView(parent_rect)
-{
-	set_type("speed");
-	
-	add_children({
-		&labels_speed,
-		&compass,
-		&field_angle,
-		&field_speed
-	});
-	
-	field_angle.set_value(0);
-	field_speed.set_value(400);
-	
-	field_angle.on_change = [this](int32_t v) {
-		compass.set_value(v);
-	};
-}
-
-void ADSBSpeedView::collect_frames(const uint32_t ICAO_address, std::vector<ADSBFrame>& frame_list) {
-	if (!enabled) return;
-	
-	ADSBFrame temp_frame;
-	
-	encode_frame_velo(temp_frame, ICAO_address, field_speed.value(),
-		field_angle.value(), 0);	// TODO: v_rate
-	
-	frame_list.emplace_back(temp_frame);
-}
-
-ADSBSquawkView::ADSBSquawkView(
-	Rect parent_rect
-) : OptionTabView(parent_rect)
-{
-	set_type("squawk");
-	
-	add_children({
-		&labels_squawk,
-		&field_squawk
-	});
-}
-
-void ADSBSquawkView::collect_frames(const uint32_t ICAO_address, std::vector<ADSBFrame>& frame_list) {
-	if (!enabled) return;
-	
-	ADSBFrame temp_frame;
-	(void)ICAO_address;
-	
-	encode_frame_squawk(temp_frame, field_squawk.value_dec_u32());
-	
-	frame_list.emplace_back(temp_frame);
-}
-
-ADSBTXThread::ADSBTXThread(
-	std::vector<ADSBFrame> frames
-) : frames_ {  std::move(frames) }
-{
-	thread = chThdCreateFromHeap(NULL, 1024, NORMALPRIO + 10, ADSBTXThread::static_fn, this);
-}
-
-ADSBTXThread::~ADSBTXThread() {
-	if( thread ) {
-		chThdTerminate(thread);
-		chThdWait(thread);
-		thread = nullptr;
-	}
-}
-
-msg_t ADSBTXThread::static_fn(void* arg) {
-	auto obj = static_cast<ADSBTXThread*>(arg);
-	obj->run();
-	return 0;
-}
-
-void ADSBTXThread::run() {
-	uint8_t * bin_ptr = shared_memory.bb_data.data;
-	uint8_t * raw_ptr;
-	uint32_t frame_index = 0;	//, plane_index = 0;
-	//uint32_t regen = 0;
-	//float offs = 0;
-	
-	while( !chThdShouldTerminate() ) {
-		/*if (!regen) {
-			regen = 10;
-			
-			encode_frame_id(frames[0], plane_index, "DEMO" + to_string_dec_uint(plane_index));
-			encode_frame_pos(frames[1], plane_index, 5000, plane_lats[plane_index]/8 + offs + 38.5, plane_lons[plane_index]/8 + 125.8, 0);
-			encode_frame_pos(frames[2], plane_index, 5000, plane_lats[plane_index]/8 + offs + 38.5, plane_lons[plane_index]/8 + 125.8, 1);
-			encode_frame_identity(frames[3], plane_index, 1337);
-			
-			if (plane_index == 11)
-				plane_index = 0;
-			else
-				plane_index++;
-			
-			offs += 0.001;
-		}*/
-		
-		memset(bin_ptr, 0, 256);	// 112 bits * 2 parts = 224 should be enough
-		
-		raw_ptr = frames_[frame_index].get_raw_data();
-		
-		// The preamble isn't manchester encoded
-		memcpy(bin_ptr, adsb_preamble, 16);
-		
-		// Convert to binary (1 byte per bit, faster for baseband code)
-		manchester_encode(bin_ptr + 16, raw_ptr, 112, 0);
-	
-		// Display in hex for debug
-		//text_frame.set(to_string_hex_array(frames[0].get_raw_data(), 14));
-	
-		baseband::set_adsb();
-		
-		chThdSleepMilliseconds(50);
-		
-		frame_index++;
-		if (frame_index >= frames_.size()) {
-			frame_index = 0;
-			//if (regen)
-			//	regen--;
-		}
-	}
-}
-
-void ADSBTxView::focus() {
-	tab_view.focus();
-}
-
-ADSBTxView::~ADSBTxView() {
-	transmitter_model.disable();
-	baseband::shutdown();
-}
-
-void ADSBTxView::generate_frames() {
-	const uint32_t ICAO_address = sym_icao.value_hex_u64();
-	
-	frames.clear();
-	
-	/* This scheme kinda sucks. Each "tab"'s collect_frames method
-	 * is called to generate its related frame(s). Getting values
-	 * from each widget of each tab would be better ?
-	 * */
-	view_position.collect_frames(ICAO_address, frames);
-	view_callsign.collect_frames(ICAO_address, frames);
-	view_speed.collect_frames(ICAO_address, frames);
-	view_squawk.collect_frames(ICAO_address, frames);
-	
-	// Show how many frames were generated
-	//text_frame.set(to_string_dec_uint(frames.size()) + " frame(s).");
-}
-
-void ADSBTxView::start_tx() {
-	generate_frames();
-	
-	transmitter_model.set_sampling_rate(4000000U);
-	transmitter_model.set_baseband_bandwidth(10000000);
-	transmitter_model.enable();
-	
-	baseband::set_adsb();
-	
-	tx_thread = std::make_unique<ADSBTXThread>(frames);
-}
-
-ADSBTxView::ADSBTxView(
-	NavigationView& nav
-) : nav_ { nav }
-{
-	baseband::run_image(portapack::spi_flash::image_tag_adsb_tx);
-
-	add_children({
-		&tab_view,
-		&labels,
-		&sym_icao,
-		&view_position,
-		&view_callsign,
-		&view_speed,
-		&view_squawk,
-		&text_frame,
-		&tx_view
-	});
-	
-	tx_view.on_edit_frequency = [this, &nav]() {
-		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			transmitter_model.set_tuning_frequency(f);
-		};
-	};
-	
-	tx_view.on_start = [this]() {
-		start_tx();
-		tx_view.set_transmitting(true);
-	};
-	
-	tx_view.on_stop = [this]() {
-		tx_view.set_transmitting(false);
-		transmitter_model.disable();
-	};
-}
-
-} /* namespace ui */

firmware/application/apps/ui_adsb_tx.hpp

@@ -1,238 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- * 
- * 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 "adsb.hpp"
-#include "ui_textentry.hpp"
-#include "ui_geomap.hpp"
-#include "ui_tabview.hpp"
-#include "ui_transmitter.hpp"
-#include "message.hpp"
-#include "transmitter_model.hpp"
-#include "portapack.hpp"
-
-using namespace adsb;
-
-namespace ui {
-
-class Compass : public Widget {
-public:
-	Compass(const Point parent_pos);
-
-	void set_value(uint32_t new_value);
-
-	void paint(Painter&) override;
-
-private:
-	const range_t<uint32_t> range { 0, 359 };
-	uint32_t value_ { 0 };
-};
-
-class ADSBPositionView : public OptionTabView {
-public:
-	ADSBPositionView(NavigationView& nav, Rect parent_rect);
-	
-	void collect_frames(const uint32_t ICAO_address, std::vector<ADSBFrame>& frame_list);
-
-private:
-	GeoPos geopos {
-		{ 0, 2 * 16 },
-		GeoPos::FEET
-	};
-	
-	Button button_set_map {
-		{ 8 * 8, 6 * 16, 14 * 8, 2 * 16 },
-		"Set from map"
-	};
-};
-
-class ADSBCallsignView : public OptionTabView {
-public:
-	ADSBCallsignView(NavigationView& nav, Rect parent_rect);
-	
-	void collect_frames(const uint32_t ICAO_address, std::vector<ADSBFrame>& frame_list);
-
-private:
-	std::string callsign = "TEST1234";
-	
-	Labels labels_callsign {
-		{ { 2 * 8, 5 * 8 }, "Callsign:", Color::light_grey() }
-	};
-	
-	Button button_callsign {
-		{ 12 * 8, 2 * 16, 10 * 8, 2 * 16 },
-		""
-	};
-};
-
-class ADSBSpeedView : public OptionTabView {
-public:
-	ADSBSpeedView(Rect parent_rect);
-	
-	void collect_frames(const uint32_t ICAO_address, std::vector<ADSBFrame>& frame_list);
-
-private:
-	Labels labels_speed {
-		{ { 1 * 8, 6 * 16 }, "Speed:    kn  Bearing:    *", Color::light_grey() }
-	};
-	
-	Compass compass {
-		{ 21 * 8, 2 * 16 }
-	};
-	
-	NumberField field_angle {
-		{ 21 * 8 + 20, 6 * 16 }, 3, { 0, 359 }, 1, ' ', true
-	};
-	
-	NumberField field_speed {
-		{ 8 * 8, 6 * 16 }, 3, { 0, 999 }, 5, ' '
-	};
-};
-
-class ADSBSquawkView : public OptionTabView {
-public:
-	ADSBSquawkView(Rect parent_rect);
-	
-	void collect_frames(const uint32_t ICAO_address, std::vector<ADSBFrame>& frame_list);
-
-private:
-	Labels labels_squawk {
-		{ { 2 * 8, 2 * 16 }, "Squawk:", Color::light_grey() }
-	};
-	
-	SymField field_squawk {
-		{ 10 * 8, 2 * 16 },
-		4,
-		SymField::SYMFIELD_OCT
-	};
-};
-
-class ADSBTXThread {
-public:
-	ADSBTXThread(std::vector<ADSBFrame> frames);
-	~ADSBTXThread();
-
-	ADSBTXThread(const ADSBTXThread&) = delete;
-	ADSBTXThread(ADSBTXThread&&) = delete;
-	ADSBTXThread& operator=(const ADSBTXThread&) = delete;
-	ADSBTXThread& operator=(ADSBTXThread&&) = delete;
-
-private:
-	std::vector<ADSBFrame> frames_ { };
-	Thread* thread { nullptr };
-
-	static msg_t static_fn(void* arg);
-	
-	void run();
-};
-
-class ADSBTxView : public View {
-public:
-	ADSBTxView(NavigationView& nav);
-	~ADSBTxView();
-	
-	void focus() override;
-	
-	std::string title() const override { return "ADS-B transmit"; };
-
-private:
-	/*enum tx_modes {
-		IDLE = 0,
-		SINGLE,
-		SEQUENCE
-	};*/
-	
-	/*const float plane_lats[12] = {
-		0,
-		-1,
-		-2,
-		-3,
-		-4,
-		-5,
-		-4.5,
-		-5,
-		-4,
-		-3,
-		-2,
-		-1
-	};
-	const float plane_lons[12] = {
-		0,
-		1,
-		1,
-		1,
-		2,
-		1,
-		0,
-		-1,
-		-2,
-		-1,
-		-1,
-		-1
-	};*/
-	
-	//tx_modes tx_mode = IDLE;
-	NavigationView& nav_;
-	std::vector<ADSBFrame> frames { };
-	
-	void start_tx();
-	void generate_frames();
-	
-	Rect view_rect = { 0, 7 * 8, 240, 192 };
-	
-	ADSBPositionView view_position { nav_, view_rect };
-	ADSBCallsignView view_callsign { nav_, view_rect };
-	ADSBSpeedView view_speed { view_rect };
-	ADSBSquawkView view_squawk { view_rect };
-	
-	TabView tab_view {
-		{ "Position", Color::cyan(), &view_position },
-		{ "Callsign", Color::green(), &view_callsign },
-		{ "Speed", Color::yellow(), &view_speed },
-		{ "Squawk", Color::orange(), &view_squawk }
-	};
-	
-	Labels labels {
-		{ { 2 * 8, 4 * 8 }, "ICAO24:", Color::light_grey() }
-	};
-	
-	SymField sym_icao {
-		{ 10 * 8, 4 * 8 },
-		6,
-		SymField::SYMFIELD_HEX
-	};
-	
-	Text text_frame {
-		{ 1 * 8, 29 * 8, 14 * 8, 16 },
-		"-"
-	};
-	
-	TransmitterView tx_view {
-		16 * 16,
-		1000000,
-		0
-	};
-	
-	std::unique_ptr<ADSBTXThread> tx_thread { };
-};
-
-} /* namespace ui */

firmware/application/apps/ui_afsk_rx.cpp

@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2017 Furrtek
- *
- * 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_afsk_rx.hpp"
-#include "ui_modemsetup.hpp"
-
-#include "modems.hpp"
-#include "audio.hpp"
-#include "rtc_time.hpp"
-#include "baseband_api.hpp"
-#include "string_format.hpp"
-#include "portapack_persistent_memory.hpp"
-
-using namespace portapack;
-using namespace modems;
-
-void AFSKLogger::log_raw_data(const std::string& data) {
-	rtc::RTC datetime;
-	rtcGetTime(&RTCD1, &datetime);
-	
-	log_file.write_entry(datetime, data);
-}
-
-namespace ui {
-
-void AFSKRxView::focus() {
-	field_frequency.focus();
-}
-
-void AFSKRxView::update_freq(rf::Frequency f) {
-	receiver_model.set_tuning_frequency(f);
-}
-
-AFSKRxView::AFSKRxView(NavigationView& nav) {
-	baseband::run_image(portapack::spi_flash::image_tag_afsk_rx);
-	
-	add_children({
-		&rssi,
-		&channel,
-		&field_rf_amp,
-		&field_lna,
-		&field_vga,
-		&field_frequency,
-		&text_debug,
-		&button_modem_setup,
-		&record_view,
-		&console
-	});
-	
-	// DEBUG
-	record_view.on_error = [&nav](std::string message) {
-		nav.display_modal("Error", message);
-	};
-	record_view.set_sampling_rate(24000);
-	
-	// Auto-configure modem for LCR RX (will be removed later)
-	update_freq(467225500);	// 462713300
-	auto def_bell202 = &modem_defs[0];
-	persistent_memory::set_modem_baudrate(def_bell202->baudrate);
-	serial_format_t serial_format;
-	serial_format.data_bits = 7;
-	serial_format.parity = EVEN;
-	serial_format.stop_bits = 1;
-	serial_format.bit_order = LSB_FIRST;
-	persistent_memory::set_serial_format(serial_format);
-	
-	field_frequency.set_value(receiver_model.tuning_frequency());
-	field_frequency.set_step(100);
-	field_frequency.on_change = [this](rf::Frequency f) {
-		update_freq(f);
-	};
-	field_frequency.on_edit = [this, &nav]() {
-		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			update_freq(f);
-			field_frequency.set_value(f);
-		};
-	};
-
-	button_modem_setup.on_select = [&nav](Button&) {
-		nav.push<ModemSetupView>();
-	};
-	
-	logger = std::make_unique<AFSKLogger>();
-	if (logger)
-		logger->append("AFSK_LOG.TXT");
-	
-	// Auto-configure modem for LCR RX (will be removed later)
-	baseband::set_afsk(persistent_memory::modem_baudrate(), 8, 0, false);
-	
-	audio::set_rate(audio::Rate::Hz_24000);
-	audio::output::start();
-	
-	receiver_model.set_sampling_rate(3072000);
-	receiver_model.set_baseband_bandwidth(1750000);
-	receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
-	receiver_model.enable();
-}
-
-void AFSKRxView::on_data(uint32_t value, bool is_data) {
-	std::string str_console = "\x1B";
-	std::string str_byte = "";
-	
-	if (is_data) {
-		// Colorize differently after message splits
-		str_console += (char)((console_color & 3) + 9);
-		
-		//value = deframe_word(value);
-		
-		value &= 0xFF;											// ABCDEFGH
-		value = ((value & 0xF0) >> 4) | ((value & 0x0F) << 4);	// EFGHABCD
-		value = ((value & 0xCC) >> 2) | ((value & 0x33) << 2);	// GHEFCDAB
-		value = ((value & 0xAA) >> 1) | ((value & 0x55) << 1);	// HGFEDCBA
-		value &= 0x7F;											// Ignore parity, which is the MSB now
-		
-		if ((value >= 32) && (value < 127)) {
-			str_console += (char)value;							// Printable
-			str_byte += (char)value;
-		} else {
-			str_console += "[" + to_string_hex(value, 2) + "]";	// Not printable
-			str_byte += "[" + to_string_hex(value, 2) + "]";
-		}
-		
-		//str_byte = to_string_bin(value & 0xFF, 8) + "  ";
-		
-		console.write(str_console);
-		
-		if (logger) str_log += str_byte;
-		
-		if ((value != 0x7F) && (prev_value == 0x7F)) {
-			// Message split
-			console.writeln("");
-			console_color++;
-			
-			if (logger) {
-				logger->log_raw_data(str_log);
-				str_log = "";
-			}
-		}
-		prev_value = value;
-	} else {
-		// Baudrate estimation
-		text_debug.set("~" + to_string_dec_uint(value));
-	}
-}
-
-AFSKRxView::~AFSKRxView() {
-	audio::output::stop();
-	receiver_model.disable();
-	baseband::shutdown();
-}
-
-} /* namespace ui */

firmware/application/apps/ui_afsk_rx.hpp

@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2017 Furrtek
- *
- * 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 __UI_AFSK_RX_H__
-#define __UI_AFSK_RX_H__
-
-#include "ui.hpp"
-#include "ui_navigation.hpp"
-#include "ui_receiver.hpp"
-#include "ui_record_view.hpp"	// DEBUG
-
-#include "log_file.hpp"
-#include "utility.hpp"
-
-class AFSKLogger {
-public:
-	Optional<File::Error> append(const std::string& filename) {
-		return log_file.append(filename);
-	}
-	
-	void log_raw_data(const std::string& data);
-
-private:
-	LogFile log_file { };
-};
-
-namespace ui {
-
-class AFSKRxView : public View {
-public:
-	AFSKRxView(NavigationView& nav);
-	~AFSKRxView();
-
-	void focus() override;
-
-	std::string title() const override { return "AFSK RX (beta)"; };
-	
-private:
-	void on_data(uint32_t value, bool is_data);
-	
-	uint8_t console_color { 0 };
-	uint32_t prev_value { 0 };
-	std::string str_log { "" };
-
-	RFAmpField field_rf_amp {
-		{ 13 * 8, 0 * 16 }
-	};
-	LNAGainField field_lna {
-		{ 15 * 8, 0 * 16 }
-	};
-	VGAGainField field_vga {
-		{ 18 * 8, 0 * 16 }
-	};
-	RSSI rssi {
-		{ 21 * 8, 0, 6 * 8, 4 },
-	};
-	Channel channel {
-		{ 21 * 8, 5, 6 * 8, 4 },
-	};
-	
-	FrequencyField field_frequency {
-		{ 0 * 8, 0 * 16 },
-	};
-	
-	Text text_debug {
-		{ 0 * 8, 1 * 16, 10 * 8, 16 },
-		"DEBUG"
-	};
-	
-	
-	Button button_modem_setup {
-		{ 12 * 8, 1 * 16, 96, 24 },
-		"Modem setup"
-	};
-	
-	// DEBUG
-	RecordView record_view {
-		{ 0 * 8, 3 * 16, 30 * 8, 1 * 16 },
-		u"AFS_????", RecordView::FileType::WAV, 4096, 4
-	};
-	
-	Console console {
-		{ 0, 4 * 16, 240, 240 }
-	};
-
-	void update_freq(rf::Frequency f);
-	void on_data_afsk(const AFSKDataMessage& message);
-	
-	std::unique_ptr<AFSKLogger> logger { };
-	
-	MessageHandlerRegistration message_handler_packet {
-		Message::ID::AFSKData,
-		[this](Message* const p) {
-			const auto message = static_cast<const AFSKDataMessage*>(p);
-			this->on_data(message->value, message->is_data);
-		}
-	};
-};
-
-} /* namespace ui */
-
-#endif/*__UI_AFSK_RX_H__*/

firmware/application/apps/ui_aprs_rx.cpp

@@ -0,0 +1,376 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 Furrtek
+ *
+ * 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_aprs_rx.hpp"
+
+#include "audio.hpp"
+#include "rtc_time.hpp"
+#include "baseband_api.hpp"
+#include "string_format.hpp"
+#include "portapack_persistent_memory.hpp"
+#include "file_path.hpp"
+
+using namespace portapack;
+
+void APRSLogger::log_raw_data(const std::string& data) {
+    log_file.write_entry(data);
+}
+
+namespace ui {
+
+template <>
+void RecentEntriesTable<APRSRecentEntries>::draw(
+    const Entry& entry,
+    const Rect& target_rect,
+    Painter& painter,
+    const Style& style) {
+    Color target_color;
+    // auto entry_age = entry.age;
+
+    target_color = Theme::getInstance()->fg_green->foreground;
+
+    std::string entry_string = "";
+
+    entry_string += entry.source_formatted;
+    entry_string.append(10 - entry.source_formatted.size(), ' ');
+    entry_string += "       ";
+    entry_string += (entry.hits <= 999 ? to_string_dec_uint(entry.hits, 4) : "999+");
+    entry_string += " ";
+    entry_string += entry.time_string;
+
+    painter.draw_string(
+        target_rect.location(),
+        style,
+        entry_string);
+
+    if (entry.has_position) {
+        painter.draw_bitmap(target_rect.location() + Point(12 * 8, 0), bitmap_target, target_color, style.background);
+    }
+}
+
+void APRSRxView::focus() {
+    options_region.focus();
+}
+
+APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect)
+    : View(parent_rect), nav_{nav} {
+    baseband::run_image(portapack::spi_flash::image_tag_aprs_rx);
+
+    add_children({&rssi,
+                  &channel,
+                  &field_rf_amp,
+                  &field_lna,
+                  &field_vga,
+                  &field_volume,
+                  &options_region,
+                  &field_frequency,
+                  &record_view,
+                  &console});
+
+    // DEBUG
+    record_view.on_error = [&nav](std::string message) {
+        nav.display_modal("Error", message);
+    };
+
+    record_view.set_sampling_rate(24000);
+
+    options_region.on_change = [this](size_t, int32_t i) {
+        if (i == 0) {
+            field_frequency.set_value(144390000);
+        } else if (i == 1) {
+            field_frequency.set_value(144800000);
+        } else if (i == 2) {
+            field_frequency.set_value(145175000);
+        } else if (i == 3) {
+            field_frequency.set_value(144575000);
+        } else if (i == 4) {
+            field_frequency.set_value(145825000);
+        }
+    };
+
+    field_frequency.set_step(100);
+    options_region.set_selected_index(0, true);
+
+    logger = std::make_unique<APRSLogger>();
+    if (logger)
+        logger->append(logs_dir / u"APRS.TXT");
+
+    baseband::set_aprs(1200);
+
+    audio::set_rate(audio::Rate::Hz_24000);
+    audio::output::start();
+
+    receiver_model.enable();
+}
+
+void APRSRxView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
+}
+
+void APRSRxView::on_packet(const APRSPacketMessage* message) {
+    std::string str_console = "\x1B";
+
+    aprs::APRSPacket packet = message->packet;
+
+    std::string stream_text = packet.get_stream_text();
+    str_console += (char)((console_color++ & 3) + 9);
+    str_console += stream_text;
+
+    if (logger) {
+        logger->log_raw_data(stream_text);
+    }
+
+    // if(reset_console){ //having more than one console causes issues when switching tabs where one is disabled, and the other enabled breaking the scoll setup.
+    //	console.on_hide();
+    //	console.on_show();
+    //	reset_console = false;
+    // }
+
+    console.writeln(str_console);
+}
+
+void APRSRxView::on_data(uint32_t value, bool is_data) {
+    std::string str_console = "\x1B";
+    std::string str_byte = "";
+
+    if (is_data) {
+        // Colorize differently after message splits
+        str_console += (char)((console_color & 3) + 9);
+
+        if (value == '\n') {
+            // Message split
+            console.writeln("");
+            console_color++;
+
+            if (logger) {
+                logger->log_raw_data(str_log);
+                str_log = "";
+            }
+        } else {
+            if ((value >= 32) && (value < 127)) {
+                str_console += (char)value;  // Printable
+                str_byte += (char)value;
+            } else {
+                str_console += "[" + to_string_hex(value, 2) + "]";  // Not printable
+                str_byte += "[" + to_string_hex(value, 2) + "]";
+            }
+
+            console.write(str_console);
+
+            if (logger) str_log += str_byte;
+        }
+    } else {
+    }
+}
+
+void APRSRxView::on_show() {
+    // some bug where the display scroll area is set to the entire screen when switching from the list tab with details showing back to the stream view.
+    // reset_console = true;
+}
+
+APRSRxView::~APRSRxView() {
+    audio::output::stop();
+    receiver_model.disable();
+    baseband::shutdown();
+}
+
+void APRSTableView::on_show_list() {
+    details_view.hidden(true);
+    recent_entries_view.hidden(false);
+    send_updates = false;
+    focus();
+}
+
+void APRSTableView::on_show_detail(const APRSRecentEntry& entry) {
+    recent_entries_view.hidden(true);
+    details_view.hidden(false);
+    details_view.set_entry(entry);
+    details_view.update();
+    details_view.focus();
+    detailed_entry_key = entry.key();
+    send_updates = true;
+}
+
+APRSTableView::APRSTableView(NavigationView& nav, Rect parent_rec)
+    : View(parent_rec), nav_{nav} {
+    add_children({&recent_entries_view,
+                  &details_view});
+
+    hidden(true);
+
+    details_view.hidden(true);
+
+    recent_entries_view.set_parent_rect({0, 0, 240, 280});
+    details_view.set_parent_rect({0, 0, 240, 280});
+
+    recent_entries_view.on_select = [this](const APRSRecentEntry& entry) {
+        this->on_show_detail(entry);
+    };
+
+    details_view.on_close = [this]() {
+        this->on_show_list();
+    };
+
+    /*	for(size_t i = 0; i <32 ; i++){
+                std::string id = "test" + i;
+                auto& entry = ::on_packet(recent, i);
+                entry.set_source_formatted(id);
+        }
+
+        recent_entries_view.set_dirty(); 	*/
+
+    /*
+
+        std::string str1 = "test1";
+        std::string str12 = "test2";
+        std::string str13 = "test2";
+
+        auto& entry = ::on_packet(recent, 0x1);
+        entry.set_source_formatted(str1);
+
+        auto& entry2 = ::on_packet(recent, 0x2);
+        entry2.set_source_formatted(str12);
+
+        auto& entry3 = ::on_packet(recent, 0x2);
+        entry2.set_source_formatted(str13);
+
+        recent_entries_view.set_dirty();
+
+        */
+}
+
+void APRSTableView::on_pkt(const APRSPacketMessage* message) {
+    aprs::APRSPacket packet = message->packet;
+    rtc::RTC datetime;
+    std::string str_timestamp;
+    std::string source_formatted = packet.get_source_formatted();
+    std::string info_string = packet.get_stream_text();
+
+    rtc_time::now(datetime);
+    auto& entry = ::on_packet(recent, packet.get_source());
+    entry.reset_age();
+    entry.inc_hit();
+    str_timestamp = to_string_datetime(datetime, HMS);
+    entry.set_time_string(str_timestamp);
+    entry.set_info_string(info_string);
+
+    entry.set_source_formatted(source_formatted);
+
+    if (entry.has_position && !packet.has_position()) {
+        // maintain position info
+    } else {
+        entry.set_has_position(packet.has_position());
+        entry.set_pos(packet.get_position());
+    }
+
+    if (entry.key() == details_view.entry().key()) {
+        details_view.set_entry(entry);
+        details_view.update();
+    }
+
+    recent_entries_view.set_dirty();
+}
+
+void APRSTableView::on_show() {
+    on_show_list();
+}
+
+void APRSTableView::on_hide() {
+    details_view.hidden(true);
+}
+
+void APRSTableView::focus() {
+    recent_entries_view.focus();
+}
+
+APRSTableView::~APRSTableView() {
+}
+
+void APRSDetailsView::focus() {
+    button_done.focus();
+}
+
+void APRSDetailsView::set_entry(const APRSRecentEntry& entry) {
+    entry_copy = entry;
+}
+
+void APRSDetailsView::update() {
+    if (!hidden()) {
+        // uint32_t age = entry_copy.age;
+
+        console.clear(true);
+        console.write(entry_copy.info_string);
+
+        button_see_map.hidden(!entry_copy.has_position);
+    }
+
+    if (send_updates)
+        geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude, 0, 0, 0);
+}
+
+APRSDetailsView::~APRSDetailsView() {
+}
+
+APRSDetailsView::APRSDetailsView(
+    NavigationView& nav) {
+    add_children({&console,
+                  &button_done,
+                  &button_see_map});
+
+    button_done.on_select = [this, &nav](Button&) {
+        console.clear(true);
+        this->on_close();
+    };
+
+    button_see_map.on_select = [this, &nav](Button&) {
+        geomap_view = nav.push<GeoMapView>(
+            entry_copy.source_formatted,
+            0,  // entry_copy.pos.altitude,
+            GeoPos::alt_unit::FEET,
+            GeoPos::spd_unit::HIDDEN,
+            entry_copy.pos.latitude,
+            entry_copy.pos.longitude,
+            0, /*entry_copy.velo.heading,*/
+            [this]() {
+                send_updates = false;
+                hidden(false);
+                update();
+            });
+        send_updates = true;
+        hidden(true);
+    };
+};
+
+APRSRXView::APRSRXView(NavigationView& nav)
+    : nav_{nav} {
+    add_children({&tab_view,
+                  &view_stream,
+                  &view_table});
+}
+
+void APRSRXView::focus() {
+    tab_view.focus();
+}
+
+APRSRXView::~APRSRXView() {
+}
+} /* namespace ui */

firmware/application/apps/ui_aprs_rx.hpp

@@ -0,0 +1,286 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 Furrtek
+ *
+ * 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 __UI_APRS_RX_H__
+#define __UI_APRS_RX_H__
+
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
+#include "ui_record_view.hpp"
+#include "ui_geomap.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "recent_entries.hpp"
+#include "ui_tabview.hpp"
+
+#include "log_file.hpp"
+#include "utility.hpp"
+#include "file_path.hpp"
+
+class APRSLogger {
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
+
+    void log_raw_data(const std::string& data);
+
+   private:
+    LogFile log_file{};
+};
+
+namespace ui {
+
+struct APRSRecentEntry {
+    using Key = uint64_t;
+
+    static constexpr Key invalid_key = 0xffffffffffffffff;
+
+    uint16_t hits{0};
+    uint32_t age{0};
+
+    uint64_t source{0};
+    std::string source_formatted{"        "};
+    std::string time_string{""};
+    std::string info_string{""};
+
+    aprs::aprs_pos pos{0, 0, 0, 0};
+    bool has_position = false;
+    APRSRecentEntry(uint64_t src) {
+        source = src;
+    }
+
+    Key key() const {
+        return source;
+    }
+
+    void set_source_formatted(std::string& new_source) {
+        source_formatted = new_source;
+    }
+
+    void inc_hit() {
+        hits++;
+    }
+
+    void set_info_string(std::string& new_info_string) {
+        info_string = new_info_string;
+    }
+
+    void set_time_string(std::string& new_time_string) {
+        time_string = new_time_string;
+    }
+
+    void set_pos(aprs::aprs_pos pos_in) {
+        pos = pos_in;
+    }
+
+    void set_has_position(bool has_pos) {
+        has_position = has_pos;
+    }
+
+    void reset_age() {
+        age = 0;
+    }
+
+    void inc_age() {
+        age++;
+    }
+};
+
+class APRSDetailsView : public View {
+   public:
+    APRSDetailsView(NavigationView&);
+    ~APRSDetailsView();
+
+    APRSDetailsView(const APRSDetailsView&) = delete;
+    APRSDetailsView(APRSDetailsView&&) = delete;
+    APRSDetailsView& operator=(const APRSDetailsView&) = delete;
+    APRSDetailsView& operator=(APRSDetailsView&&) = delete;
+
+    void focus() override;
+
+    void update();
+    void set_entry(const APRSRecentEntry& entry);
+
+    const APRSRecentEntry& entry() const { return entry_copy; };
+
+    std::string title() const override { return "Details"; };
+    std::function<void(void)> on_close{};
+
+   private:
+    APRSRecentEntry entry_copy{0};
+    GeoMapView* geomap_view{nullptr};
+    bool send_updates{false};
+
+    Console console{
+        {0, 0 * 16, 240, 224}};
+
+    Button button_done{
+        {160, 14 * 16, 8 * 8, 3 * 16},
+        "Close"};
+
+    Button button_see_map{
+        {80, 14 * 16, 8 * 8, 3 * 16},
+        "Map"};
+};
+
+using APRSRecentEntries = RecentEntries<APRSRecentEntry>;
+
+class APRSTableView : public View {
+   public:
+    APRSTableView(NavigationView& nav, Rect parent_rec);
+    ~APRSTableView();
+
+    void on_show() override;
+    void on_hide() override;
+    void focus() override;
+    void on_pkt(const APRSPacketMessage* message);
+
+    std::string title() const override { return "Stations"; };
+
+   private:
+    NavigationView& nav_;
+    const RecentEntriesColumns columns{{{"Source", 9},
+                                        {"Loc", 6},
+                                        {"Hits", 4},
+                                        {"Time", 8}}};
+    APRSRecentEntries recent{};
+    RecentEntriesView<RecentEntries<APRSRecentEntry>> recent_entries_view{columns, recent};
+    APRSDetailsView details_view{nav_};
+    uint32_t detailed_entry_key{0};
+    bool send_updates{false};
+
+    void on_show_list();
+    void on_show_detail(const APRSRecentEntry& entry);
+};
+
+class APRSRxView : public View {
+   public:
+    APRSRxView(NavigationView& nav, Rect parent_rect);
+    ~APRSRxView();
+
+    void on_show() override;
+    void focus() override;
+
+    std::string title() const override { return "APRS RX"; };
+    void on_packet(const APRSPacketMessage* message);
+    void on_freqchg(int64_t freq);
+
+   private:
+    void on_data(uint32_t value, bool is_data);
+    bool reset_console = false;
+
+    NavigationView& nav_;
+    RxRadioState radio_state_{
+        144390000 /* frequency */,
+        1750000 /* bandwidth */,
+        3072000 /* sampling rate */
+    };
+    app_settings::SettingsManager settings_{
+        "rx_aprs", app_settings::Mode::RX};
+
+    uint8_t console_color{0};
+    std::string str_log{""};
+
+    RFAmpField field_rf_amp{
+        {13 * 8, 0 * 16}};
+    LNAGainField field_lna{
+        {15 * 8, 0 * 16}};
+    VGAGainField field_vga{
+        {18 * 8, 0 * 16}};
+    RSSI rssi{
+        {21 * 8, 0, 6 * 8, 4}};
+    Channel channel{
+        {21 * 8, 5, 6 * 8, 4}};
+
+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
+
+    OptionsField options_region{
+        {0 * 8, 0 * 8},
+        3,
+        {{"NA ", 0},
+         {"EUR", 1},
+         {"AUS", 2},
+         {"NZ ", 3},
+         {"ISS", 4}}};
+
+    RxFrequencyField field_frequency{
+        {3 * 8, 0 * 16},
+        nav_};
+
+    // DEBUG
+    RecordView record_view{
+        {0 * 8, 1 * 16, 30 * 8, 1 * 16},
+        u"AFS_????.WAV",
+        aprs_dir,
+        RecordView::FileType::WAV,
+        4096,
+        4};
+
+    Console console{
+        {0, 2 * 16, 240, 240}};
+
+    std::unique_ptr<APRSLogger> logger{};
+};
+
+class APRSRXView : public View {
+   public:
+    APRSRXView(NavigationView& nav);
+    ~APRSRXView();
+
+    void focus() override;
+
+    std::string title() const override { return "APRS RX"; };
+
+   private:
+    NavigationView& nav_;
+    Rect view_rect = {0, 3 * 8, 240, 280};
+
+    APRSRxView view_stream{nav_, view_rect};
+    APRSTableView view_table{nav_, view_rect};
+
+    TabView tab_view{
+        {"Stream", Theme::getInstance()->fg_cyan->foreground, &view_stream},
+        {"List", Theme::getInstance()->fg_yellow->foreground, &view_table}};
+
+    MessageHandlerRegistration message_handler_packet{
+        Message::ID::APRSPacket,
+        [this](Message* const p) {
+            const auto message = static_cast<const APRSPacketMessage*>(p);
+            this->view_stream.on_packet(message);
+            this->view_table.on_pkt(message);
+        }};
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->view_stream.on_freqchg(message->freq);
+        }};
+};
+
+} /* namespace ui */
+
+#endif /*__UI_APRS_RX_H__*/

firmware/application/apps/ui_aprs_tx.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
  * Copyright (C) 2017 Furrtek
- * 
+ *
  * This file is part of PortaPack.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -39,89 +39,82 @@ using namespace portapack;
 namespace ui {
 
 void APRSTXView::focus() {
-	tx_view.focus();
+    tx_view.focus();
 }
 
 APRSTXView::~APRSTXView() {
-	transmitter_model.disable();
-	baseband::shutdown();
+    transmitter_model.disable();
+    baseband::shutdown();
 }
 
 void APRSTXView::start_tx() {
-	make_aprs_frame(
-		sym_source.value_string().c_str(), num_ssid_source.value(),
-		sym_dest.value_string().c_str(), num_ssid_dest.value(),
-		payload);
-	
-	//uint8_t * bb_data_ptr = shared_memory.bb_data.data;
-	//text_payload.set(to_string_hex_array(bb_data_ptr + 56, 15));
-	
-	transmitter_model.set_tuning_frequency(persistent_memory::tuned_frequency());
-	transmitter_model.set_sampling_rate(AFSK_TX_SAMPLERATE);
-	transmitter_model.set_baseband_bandwidth(1750000);
-	transmitter_model.enable();
-	
-	baseband::set_afsk_data(
-		AFSK_TX_SAMPLERATE / 1200,
-		1200,
-		2200,
-		1,
-		10000,	//transmitter_model.channel_bandwidth(),
-		8
-	);
+    // TODO: Clean up this API to take string_views to avoid allocations.
+    make_aprs_frame(
+        sym_source.to_string().c_str(), num_ssid_source.value(),
+        sym_dest.to_string().c_str(), num_ssid_dest.value(),
+        payload);
+
+    // uint8_t * bb_data_ptr = shared_memory.bb_data.data;
+    // text_payload.set(to_string_hex_array(bb_data_ptr + 56, 15));
+
+    transmitter_model.enable();
+
+    baseband::set_afsk_data(
+        AFSK_TX_SAMPLERATE / 1200,
+        1200,
+        2200,
+        1,
+        10000,  // APRS uses fixed 10k bandwidth
+        8);
 }
 
 void APRSTXView::on_tx_progress(const uint32_t progress, const bool done) {
-	(void)progress;
-	
-	if (done) {
-		transmitter_model.disable();
-		tx_view.set_transmitting(false);
-	}
+    (void)progress;
+
+    if (done) {
+        transmitter_model.disable();
+        tx_view.set_transmitting(false);
+    }
 }
 
 APRSTXView::APRSTXView(NavigationView& nav) {
-	
-	baseband::run_image(portapack::spi_flash::image_tag_afsk);
+    baseband::run_image(portapack::spi_flash::image_tag_afsk);
 
-	add_children({
-		&labels,
-		&sym_source,
-		&num_ssid_source,
-		&sym_dest,
-		&num_ssid_dest,
-		&text_payload,
-		&button_set,
-		&tx_view
-	});
-	
-	button_set.on_select = [this, &nav](Button&) {
-		text_prompt(
-			nav,
-			payload,
-			30,
-			[this](std::string& s) {
-				text_payload.set(s);
-			}
-		);
-	};
-	
-	tx_view.on_edit_frequency = [this, &nav]() {
-		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
-		new_view->on_changed = [this](rf::Frequency f) {
-			receiver_model.set_tuning_frequency(f);
-		};
-	};
-	
-	tx_view.on_start = [this]() {
-		start_tx();
-		tx_view.set_transmitting(true);
-	};
-	
-	tx_view.on_stop = [this]() {
-		tx_view.set_transmitting(false);
-		transmitter_model.disable();
-	};
+    add_children({&labels,
+                  &sym_source,
+                  &num_ssid_source,
+                  &sym_dest,
+                  &num_ssid_dest,
+                  &text_payload,
+                  &button_set,
+                  &tx_view});
+
+    button_set.on_select = [this, &nav](Button&) {
+        text_prompt(
+            nav,
+            payload,
+            30,
+            [this](std::string& s) {
+                text_payload.set(s);
+            });
+    };
+
+    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.set_transmitting(true);
+    };
+
+    tx_view.on_stop = [this]() {
+        tx_view.set_transmitting(false);
+        transmitter_model.disable();
+    };
 }
 
 } /* namespace ui */

firmware/application/apps/ui_aprs_tx.hpp

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
  * Copyright (C) 2017 Furrtek
- * 
+ *
  * This file is part of PortaPack.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,94 +24,91 @@
 #include "ui_textentry.hpp"
 #include "ui_widget.hpp"
 #include "ui_navigation.hpp"
-#include "ui_font_fixed_8x16.hpp"
 #include "ui_transmitter.hpp"
 
 #include "message.hpp"
+#include "modems.hpp"
 #include "transmitter_model.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
 #include "portapack.hpp"
 
 namespace ui {
 
 class APRSTXView : public View {
-public:
-	APRSTXView(NavigationView& nav);
-	~APRSTXView();
-	
-	void focus() override;
-	
-	std::string title() const override { return "APRS TX (beta)"; };
+   public:
+    APRSTXView(NavigationView& nav);
+    ~APRSTXView();
 
-private:
-	/*enum tx_modes {
-		IDLE = 0,
-		SINGLE,
-		SEQUENCE
-	};
-	
-	tx_modes tx_mode = IDLE;*/
-	
-	std::string payload { "" };
-	
-	void start_tx();
-	void generate_frame();
-	void generate_frame_pos();
-	void on_tx_progress(const uint32_t progress, const bool done);
-	
-	Labels labels {
-		{ { 0 * 8, 1 * 16 }, "Source:       SSID:", Color::light_grey() },	// 6 alphanum + SSID
-		{ { 0 * 8, 2 * 16 }, " Dest.:       SSID:", Color::light_grey() },
-		{ { 0 * 8, 4 * 16 }, "Info field:", Color::light_grey() },
-	};
-	
-	SymField sym_source {
-		{ 7 * 8, 1 * 16 },
-		6,
-		SymField::SYMFIELD_ALPHANUM
-	};
-	NumberField num_ssid_source {
-		{ 19 * 8, 1 * 16 },
-		2,
-		{ 0, 15 },
-		1,
-		' '
-	};
-	
-	SymField sym_dest {
-		{ 7 * 8, 2 * 16 },
-		6,
-		SymField::SYMFIELD_ALPHANUM
-	};
-	NumberField num_ssid_dest {
-		{ 19 * 8, 2 * 16 },
-		2,
-		{ 0, 15 },
-		1,
-		' '
-	};
-	
-	Text text_payload {
-		{ 0 * 8, 5 * 16, 30 * 8, 16 },
-		"-"
-	};
-	Button button_set {
-		{ 0 * 8, 6 * 16, 80, 32 },
-		"Set"
-	};
-	
-	TransmitterView tx_view {
-		16 * 16,
-		5000,
-		10
-	};
-	
-	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);
-		}
-	};
+    void focus() override;
+
+    std::string title() const override { return "APRS TX"; };
+
+   private:
+    TxRadioState radio_state_{
+        144390000 /* frequency */,
+        1750000 /* bandwidth */,
+        AFSK_TX_SAMPLERATE /* sampling rate */
+    };
+    app_settings::SettingsManager settings_{
+        "tx_aprs", app_settings::Mode::TX};
+
+    std::string payload{""};
+
+    void start_tx();
+    void generate_frame();
+    void generate_frame_pos();
+    void on_tx_progress(const uint32_t progress, const bool done);
+
+    Labels labels{
+        {{0 * 8, 1 * 16}, "Source:       SSID:", Theme::getInstance()->fg_light->foreground},  // 6 alphanum + SSID
+        {{0 * 8, 2 * 16}, " Dest.:       SSID:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 4 * 16}, "Info field:", Theme::getInstance()->fg_light->foreground},
+    };
+
+    SymField sym_source{
+        {7 * 8, 1 * 16},
+        6,
+        SymField::Type::Alpha};
+
+    NumberField num_ssid_source{
+        {19 * 8, 1 * 16},
+        2,
+        {0, 15},
+        1,
+        ' '};
+
+    SymField sym_dest{
+        {7 * 8, 2 * 16},
+        6,
+        SymField::Type::Alpha};
+
+    NumberField num_ssid_dest{
+        {19 * 8, 2 * 16},
+        2,
+        {0, 15},
+        1,
+        ' '};
+
+    Text text_payload{
+        {0 * 8, 5 * 16, 30 * 8, 16},
+        "-"};
+    Button button_set{
+        {0 * 8, 6 * 16, 80, 32},
+        "Set"};
+
+    TransmitterView tx_view{
+        16 * 16,
+        5000,
+        0  // disable setting bandwith, since APRS used fixed 10k bandwidth
+    };
+
+    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 */

firmware/application/apps/ui_battinfo.cpp

@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ *
+ * 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_battinfo.hpp"
+
+#include "event_m0.hpp"
+#include "portapack.hpp"
+#include "battery.hpp"
+#include <cstring>
+
+using namespace portapack;
+
+namespace ui {
+
+void BattinfoView::focus() {
+    button_exit.focus();
+}
+
+// called each 1/60th of second, so 6 = 100ms
+void BattinfoView::on_timer() {
+    if (++timer_counter == timer_period) {
+        timer_counter = 0;
+        update_result();
+    }
+}
+
+void BattinfoView::update_result() {
+    if (!battery::BatteryManagement::isDetected()) {
+        text_percent.set("UNKNOWN");
+        text_voltage.set("UNKNOWN");
+        text_current.set("-");
+        text_charge.set("-");
+        text_cycles.set("-");
+        text_ttef.set("-");
+        text_method.set("-");
+        text_warn.set("");
+        return;
+    }
+    bool uichg = false;
+    uint8_t valid_mask = 0;
+    battery::BatteryManagement::getBatteryInfo(valid_mask, percent, voltage, current);
+    // update text fields
+    if (percent <= 100 && (valid_mask & battery::BatteryManagement::BATT_VALID_VOLTAGE) == battery::BatteryManagement::BATT_VALID_VOLTAGE)
+        text_percent.set(to_string_dec_uint(percent) + " %");
+    else
+        text_percent.set("UNKNOWN");
+    if (voltage > 1 && (valid_mask & battery::BatteryManagement::BATT_VALID_VOLTAGE) == battery::BatteryManagement::BATT_VALID_VOLTAGE) {
+        text_voltage.set(to_string_decimal(voltage / 1000.0, 3) + " V");
+    } else {
+        text_voltage.set("UNKNOWN");
+    }
+    if ((valid_mask & battery::BatteryManagement::BATT_VALID_CURRENT) == battery::BatteryManagement::BATT_VALID_CURRENT) {
+        if (labels_opt.hidden()) uichg = true;
+        labels_opt.hidden(false);
+        text_current.hidden(false);
+        text_charge.hidden(false);
+        text_current.set(to_string_dec_int(current) + " mA");
+        text_charge.set(current >= 0 ? "Charging" : "Discharging");
+        labels_opt.hidden(false);
+
+        text_ttef.hidden(false);
+    } else {
+        if (!labels_opt.hidden()) uichg = true;
+        labels_opt.hidden(true);
+        text_current.hidden(true);
+        text_charge.hidden(true);
+        text_cycles.hidden(true);
+        text_ttef.hidden(true);
+        text_warn.set("");
+    }
+    if ((valid_mask & battery::BatteryManagement::BATT_VALID_CYCLES) == battery::BatteryManagement::BATT_VALID_CYCLES) {
+        text_cycles.hidden(false);
+        uint16_t cycles = battery::BatteryManagement::get_cycles();
+        if (cycles < 2)
+            text_warn.set("SoC improves after 2 cycles");
+        else
+            text_warn.set("");
+        text_cycles.set(to_string_dec_uint(cycles));
+    } else {
+        text_cycles.hidden(true);
+        text_warn.set("");
+    }
+    if ((valid_mask & battery::BatteryManagement::BATT_VALID_TTEF) == battery::BatteryManagement::BATT_VALID_TTEF) {
+        text_ttef.hidden(false);
+        float ttef = 0;
+        if (current <= 0) {
+            ttef = battery::BatteryManagement::get_tte();
+        } else {
+            ttef = battery::BatteryManagement::get_ttf();
+        }
+
+        // Convert ttef to hours and minutes
+        uint8_t hours = static_cast<uint8_t>(ttef);
+        uint8_t minutes = static_cast<uint8_t>((ttef - hours) * 60 + 0.5);  // +0.5 for rounding
+
+        // Create the formatted string
+        std::string formatted_time;
+        if (hours > 0) {
+            formatted_time += to_string_dec_uint(hours) + "h ";
+        }
+        formatted_time += to_string_dec_uint(minutes) + "m";
+
+        text_ttef.set(formatted_time);
+    } else {
+        text_ttef.hidden(true);
+    }
+    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
+    BatteryStateMessage msg{valid_mask, percent, current >= 0, voltage};
+    EventDispatcher::send_message(msg);
+}
+
+BattinfoView::BattinfoView(NavigationView& nav)
+    : nav_{nav} {
+    add_children({&labels,
+                  &labels_opt,
+                  &text_percent,
+                  &text_voltage,
+                  &text_current,
+                  &text_charge,
+                  &text_method,
+                  &button_mode,
+                  &button_exit,
+                  &text_cycles,
+                  &text_warn,
+                  &text_ttef});
+
+    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");
+        }
+    };
+    update_result();
+    if (thread == nullptr) thread = chThdCreateFromHeap(NULL, 1024, NORMALPRIO + 10, BattinfoView::static_fn, this);
+}
+
+msg_t BattinfoView::static_fn(void* arg) {
+    auto obj = static_cast<BattinfoView*>(arg);
+    while (!chThdShouldTerminate()) {
+        chThdSleepMilliseconds(16);
+        obj->on_timer();
+    }
+    return 0;
+}
+
+BattinfoView::~BattinfoView() {
+    if (thread) {
+        chThdTerminate(thread);
+        chThdWait(thread);
+        thread = nullptr;
+    }
+}
+}  // namespace ui