Revert "resolve conflicts merge" (#2860 )

This reverts commit 344aa0c741.
Update version.txt (#2858 )
2026-07-26 10:38:52 +00:00 · 2025-11-08 10:21:33 +13:00 · 2025-11-08 10:13:35 +13:00 · 2025-11-07 21:36:41 +01:00 · 2025-11-07 20:52:28 +01:00 · 2025-11-05 20:53:23 +01:00
553 changed files with 99325 additions and 12252 deletions
@@ -1 +1,2 @@
-build
+*
+!firmware/tools/docker-entrypoint.sh
@@ -8,6 +8,12 @@ body:
    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
+      > [!NOTE]  
+      For hardware related issue, please open as a hardware issue instead.
+      For feature requests, please open as a feature request instead.
+      If you have questions, please join our Discord server to ask.
+      For your information, they are options you can choose when you open an issue.
+      Unrelated issues will be closed without notice.
 - type: textarea
  id: description
  attributes:
@@ -0,0 +1,38 @@
+name: Hardware / QC / QA / selling
+description: Issues that related with hardware, quality control, quality assurance, selling, etc.
+labels:
+  - question
+  - hardware problem
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thank you for taking the time to fill out an issue. 
+
+      We would like to inform you that we can't provide much help regarding hardware/QC/QA/selling issues because we are not controlling various vendors/manufacturers, and also we are not profiting from you buying your device.
+  
+      You are still welcome to ask, but please be aware that for this kind of issue, ask the seller would be the best option.
+- type: textarea
+  id: description
+  attributes:
+    label: Describe the problem
+    description: "A clear and concise description of what the problem is."
+  validations:
+    required: true
+- type: textarea
+  id: hardware-info
+  attributes: 
+    label: Hardware information
+    description: "Please provide the hardware information here."
+    placeholder: |
+      1. HackrfRF revision
+      2. Portapack revision
+      3. (if it's audio/mic/display/touchscreen/buttons related) audio chip/ CPLD/ screen info...
+      4. (if hardware is visually damaged) please provide a photo
+  validations:
+    required: true
+- type: textarea
+  id: anything-else
+  attributes:
+    label: Anything else?
+    description: Let us know if you have anything else to share.
@@ -0,0 +1,20 @@
+name: Hardware Issue Warning
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  add-comment:
+    if: github.event.label.name == 'hardware problem'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: Add warning comment
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            > [!IMPORTANT]  
+            If you are a seller/vendor and your customer has directed you to this page as a reference/evidence of a "broken device" or similar issue, please be aware that we are not providing any "official guarantee of a faulty device." We are only offering suggestions based on what the submitter has stated. We do not guarantee that the device is broken or anything else.
@@ -1 +1 @@
-v2.0.2
+v2.2.0
@@ -1 +1 @@
-v2.1.0
+v2.3.1
@@ -61,6 +61,8 @@ cmake-build-debug/
 *.sublime-workspace
 .vscode
 .idea
+*.swp
+.claude

 # VSCodium extensions
 .history
@@ -18,7 +18,7 @@
 # Boston, MA 02110-1301, USA.
 #

-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 cmake_policy(SET CMP0005 NEW)

 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/firmware/toolchain-arm-cortex-m.cmake)
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+https://github.com/portapack-mayhem/mayhem-firmware/issues/new/.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
@@ -0,0 +1 @@
+Please see [How-to-collaborate](https://github.com/portapack-mayhem/mayhem-firmware/wiki/How-to-collaborate)
@@ -5,11 +5,13 @@
 > The only legitimate link to our repositories is the [portapack-mayhem](https://github.com/portapack-mayhem/mayhem-firmware) organization on GitHub.--->
 # PortaPack Mayhem

-[![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)
+[![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://img.shields.io/discord/719669764804444213?label=Discord)](https://discord.gg/tuwVMv3)

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

-[<img src="https://github.com/user-attachments/assets/dea337ab-fb64-4a2a-b419-69afd272e815" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#new-h4m-mayhem-edition) [<img src="https://camo.githubusercontent.com/5c1f1da0688240ac7b2ccca0c8dbfd1d73f2540741ad8b1828ba4d5ea68af248/68747470733a2f2f6769746875622d70726f64756374696f6e2d757365722d61737365742d3632313064662e73332e616d617a6f6e6177732e636f6d2f343339333937392f3239353533323731382d38653562363631632d663934362d346365652d386232642d3061363135663737313566342e706e67" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#h2m-mayhem-edition)
+[<img src="https://github.com/user-attachments/assets/dea337ab-fb64-4a2a-b419-69afd272e815" height="310">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#new-h4m-mayhem-edition) 
+[<img src="https://camo.githubusercontent.com/5c1f1da0688240ac7b2ccca0c8dbfd1d73f2540741ad8b1828ba4d5ea68af248/68747470733a2f2f6769746875622d70726f64756374696f6e2d757365722d61737365742d3632313064662e73332e616d617a6f6e6177732e636f6d2f343339333937392f3239353533323731382d38653562363631632d663934362d346365652d386232642d3061363135663737313566342e706e67" height="310">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#h2m-mayhem-edition)
+[<img src="https://camo.githubusercontent.com/c1f7dd1e7672324f60a513f0de23de76da6a669e63896a9de535d8c8093fc3c7/68747470733a2f2f7261772e6769746875622e636f6d2f7368617265627261696e65642f706f7274617061636b2d6861636b72662f6d61737465722f646f632f696d616765732f68617264776172652f706f7274617061636b5f68315f6f7065726174696e672e6a7067" height="310">]([https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#h2m-mayhem-edition](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#h1r1r2))

 # What is this?

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

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

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

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

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

@@ -0,0 +1 @@
+Please check [Intended-Use-and-Legality](https://github.com/portapack-mayhem/mayhem-firmware/wiki/)
@@ -3,7 +3,7 @@ FROM ubuntu:noble
 # 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
+	PATH=$PATH:/opt/build/armbin/bin

 #Create volume /havoc/bin for compiled firmware binaries
 VOLUME /havoc
@@ -15,8 +15,8 @@ RUN apt-get update \
 && apt-get -qy autoremove \
 && rm -rf /var/lib/apt/lists/*

-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
+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/
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+#################################################
+# This script aids building mayhem inside docker
+#
+# Basic usage:
+# - Build dev container: ./dockerize.sh build
+# - Build mayhem: ./dockerize.sh
+#
+# The image will be automatically build if it
+# does not exist, but if the dockerfile changes
+# it need to be rebuilt manually.
+# 
+# Advanced parameters:
+# - Get a shell inside the build image to
+#   inspect problems: ./dockerize.sh shell
+# - Give additional parameters to the container:
+#   ./dockerize.sh -j10
+#   ./dockerize.sh ninja -j10
+# - Use a different dockerfile:
+#   ./dockerize.sh build dockerfile-other
+# - Use a different cpu architecture:
+#   ./dockerize.sh build dockerfile-nogit-arm arm64
+#
+# Environment variables:
+# - It is possible to override the default image
+#   name that is being used to build and run the
+#   build container using an environment variable.
+#   The default is 'portapack-dev'
+#   Override by setting the following environment
+#   variable: MAYHEM_DEV_DOCKER_IMAGE
+#
+
+#
+# Copyright (C) 2024 u-foka
+#
+# 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.
+#
+
+set -e # exit immediatelly on any failure
+
+DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+
+IMAGE="${MAYHEM_DEV_DOCKER_IMAGE:-portapack-dev}"
+
+build_image() {
+   DOCKERFILE=${1:-dockerfile-nogit}
+   PLATFORM=${2:-amd64}
+   docker build --platform "linux/${PLATFORM}" -t "${IMAGE}" -f "${DOCKERFILE}" .
+}
+
+start_docker() {
+   if [ -z "$(docker images -q ${IMAGE} 2> /dev/null)" ]; then
+      build_image
+   fi
+
+   exec docker run -v "${DIR}:/havoc" -u "$(id -u):$(id -g)" -ti --rm "${IMAGE}" "$@"
+}
+
+if [ "$1" = 'shell' ]; then # open a shell into the container
+   start_docker "bash -li"
+elif [ "$1" = 'build' ]; then # build the default (or specified) target with ninja
+   shift # remove the first item from $@ as we consumed it, we can then pass the rest on to make
+   build_image "$@"
+   exit $?
+fi
+
+start_docker "$@"
@@ -18,7 +18,7 @@
 # Boston, MA 02110-1301, USA.
 #

-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)

 project(firmware)

@@ -191,8 +191,7 @@ set(CPPSRC
 	clock_manager.cpp
 	core_control.cpp
 	database.cpp
-	de_bruijn.cpp
-	rfm69.cpp
+	gradient.cpp
 	event_m0.cpp
 	file_reader.cpp
 	file.cpp
@@ -261,7 +260,6 @@ set(CPPSRC
 	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
@@ -270,19 +268,15 @@ set(CPPSRC
 	ui/ui_bmpview.cpp
 	apps/ais_app.cpp
 	apps/analog_audio_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/pocsag_app.cpp
-	apps/soundboard_app.cpp
 	apps/ui_about_simple.cpp
 	apps/ui_adsb_rx.cpp
 	apps/ui_aprs_rx.cpp
 	apps/ui_aprs_tx.cpp
 	apps/ui_battinfo.cpp
-	apps/ui_bht_tx.cpp
 	apps/ui_bmp_file_viewer.cpp
 	apps/ui_btle_rx.cpp
 	apps/ui_debug.cpp
@@ -294,7 +288,6 @@ set(CPPSRC
 	apps/ui_flash_utility.cpp
 	apps/ui_freqman.cpp
 	apps/ui_iq_trim.cpp
-	apps/ui_level.cpp
 	apps/ui_looking_glass_app.cpp
 	apps/ui_mictx.cpp
 	apps/ui_modemsetup.cpp
@@ -303,9 +296,7 @@ set(CPPSRC
 	apps/ui_rds.cpp
 	apps/ui_recon_settings.cpp
 	apps/ui_recon.cpp
-	apps/ui_scanner.cpp
 	apps/ui_sd_over_usb.cpp
-	apps/ui_sd_wipe.cpp
 	apps/ui_search.cpp
 	apps/ui_settings.cpp
 	apps/ui_siggen.cpp
@@ -317,12 +308,9 @@ set(CPPSRC
 	apps/ui_text_editor.cpp
 	apps/ui_touch_calibration.cpp
 	apps/ui_touchtunes.cpp
-	apps/ui_view_wav.cpp
 	apps/ui_weatherstation.cpp
-	apps/ui_whipcalc.cpp
 	protocols/aprs.cpp
 	protocols/ax25.cpp
-	protocols/bht.cpp
 	protocols/dcs.cpp
 	protocols/encoders.cpp
 	protocols/modems.cpp
@@ -377,7 +365,7 @@ set(INCDIR ${CMAKE_CURRENT_BINARY_DIR} ${COMMON} ${PORTINC} ${KERNINC} ${TESTINC
 	hw
 	apps
 	protocols
-	bitmaps
+	bmps
 )

 #
@@ -188,6 +188,7 @@ void copy_to_radio_model(const AppSettings& settings) {
            settings.am_config_index,
            settings.nbfm_config_index,
            settings.wfm_config_index,
+            settings.wfmam_config_index,
            settings.squelch);
    }

@@ -218,6 +219,7 @@ void copy_from_radio_model(AppSettings& settings) {
        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.wfmam_config_index = receiver_model.wfmam_configuration();
    }

    settings.step = receiver_model.frequency_step();
@@ -271,6 +273,7 @@ SettingsManager::SettingsManager(
        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("wfmam_config_index"sv, &settings_.wfmam_config_index);
        bindings_.emplace_back("squelch"sv, &settings_.squelch);
    }

@@ -139,6 +139,7 @@ struct AppSettings {
    uint8_t am_config_index = 0;
    uint8_t nbfm_config_index = 0;
    uint8_t wfm_config_index = 0;
+    uint8_t wfmam_config_index = 0;
    uint8_t squelch = 80;
    uint8_t volume;
    // NOTE: update COMMON_APP_SETTINGS_COUNT when adding to this
@@ -223,9 +223,9 @@ void AISRecentEntry::update(const ais::Packet& packet) {
            break;

        case 5:
-            call_sign = packet.text(70, 7);
-            name = packet.text(112, 20);
-            destination = packet.text(302, 20);
+            call_sign = trim(packet.text(70, 7));
+            name = trim(packet.text(112, 20));
+            destination = trim(packet.text(302, 20));
            break;

        case 18:
@@ -238,7 +238,7 @@ void AISRecentEntry::update(const ais::Packet& packet) {
            break;

        case 21:
-            name = packet.text(43, 20);
+            name = trim(packet.text(43, 20));
            last_position.timestamp = packet.received_at();
            last_position.latitude = packet.latitude(192);
            last_position.longitude = packet.longitude(164);
@@ -247,11 +247,11 @@ void AISRecentEntry::update(const ais::Packet& packet) {
        case 24:
            switch (packet.read(38, 2)) {
                case 0:
-                    name = packet.text(40, 20);
+                    name = trim(packet.text(40, 20));
                    break;

                case 1:
-                    call_sign = packet.text(90, 7);
+                    call_sign = trim(packet.text(90, 7));
                    break;

                default:
@@ -272,14 +272,14 @@ void RecentEntriesTable<AISRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns&) {
    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);
 }
@@ -301,7 +301,7 @@ AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {
            ais::format::text(entry_.name),
            0,
            GeoPos::alt_unit::METERS,
-            GeoPos::spd_unit::NONE,
+            GeoPos::spd_unit::KNOTS,
            ais::format::latlon_float(entry_.last_position.latitude.normalized()),
            ais::format::latlon_float(entry_.last_position.longitude.normalized()),
            entry_.last_position.true_heading,
@@ -324,7 +324,31 @@ AISRecentEntryDetailView& AISRecentEntryDetailView::operator=(const AISRecentEnt

 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()), (float)entry_.last_position.true_heading, 0, entry_.last_position.speed_over_ground);
+        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 > 1022 ? 0 : entry_.last_position.speed_over_ground / 10);
+}
+
+bool AISRecentEntryDetailView::add_map_marker(const AISRecentEntry& entry) {
+    if (geomap_view && send_updates) {
+        GeoMarker marker{};
+        marker.lon = ais::format::latlon_float(entry.last_position.longitude.normalized());
+        marker.lat = ais::format::latlon_float(entry.last_position.latitude.normalized());
+        marker.angle = entry.last_position.true_heading;
+        marker.tag = entry.call_sign.empty() ? to_string_dec_uint(entry.mmsi) : entry.call_sign;
+        auto markerStored = geomap_view->store_marker(marker);
+        return markerStored == MARKER_STORED;
+    }
+    return false;
+}
+void AISRecentEntryDetailView::update_map_markers(AISRecentEntries& entries) {
+    if (geomap_view && send_updates) {
+        geomap_view->clear_markers();
+        for (const auto& entry : entries) {
+            // if (entry.last_position.latitude.is_valid() && entry.last_position.longitude.is_valid()) {
+            add_map_marker(entry);
+            // }
+        }
+        update_position();  // to update view
+    }
 }

 void AISRecentEntryDetailView::focus() {
@@ -415,14 +439,30 @@ AISAppView::AISAppView(NavigationView& nav)
        audio::set_rate(audio::Rate::Hz_24000);
        audio::output::start();
    }
+
+    signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
+        on_tick_second();
+    };
 }

 AISAppView::~AISAppView() {
+    rtc_time::signal_tick_second -= signal_token_tick_second;
    audio::output::stop();
    receiver_model.disable();
    baseband::shutdown();
 }

+void AISAppView::on_tick_second() {
+    ++timer_seconds;
+    if (timer_seconds % 10 == 0) {
+        if (recent_entry_detail_view.hidden()) return;
+        if (got_new_packet) {
+            got_new_packet = false;
+            recent_entry_detail_view.update_map_markers(recent);
+        }
+    }
+}
+
 void AISAppView::focus() {
    options_channel.focus();
 }
@@ -438,7 +478,7 @@ void AISAppView::on_packet(const ais::Packet& packet) {
    if (logger) {
        logger->on_packet(packet);
    }
-
+    got_new_packet = true;
    auto& entry = ::on_packet(recent, packet.source_id());
    entry.update(packet);
    recent_entries_view.set_dirty();
@@ -461,6 +501,7 @@ void AISAppView::on_show_detail(const AISRecentEntry& entry) {
    recent_entry_detail_view.hidden(false);
    recent_entry_detail_view.set_entry(entry);
    recent_entry_detail_view.focus();
+    recent_entry_detail_view.update_map_markers(recent);
 }

 } /* namespace ui */
@@ -125,18 +125,22 @@ class AISRecentEntryDetailView : public View {
    void update_position();
    void focus() override;
    void paint(Painter&) override;
+    bool add_map_marker(const AISRecentEntry& entry);
+    void update_map_markers(AISRecentEntries& entries);

    AISRecentEntryDetailView(const AISRecentEntryDetailView& Entry);
    AISRecentEntryDetailView& operator=(const AISRecentEntryDetailView& Entry);

+    GeoMapView* get_geomap_view() { return geomap_view; }
+
   private:
    AISRecentEntry entry_{};

    Button button_done{
-        {125, 224, 96, 24},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(6), UI_POS_Y(14), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Done"};
    Button button_see_map{
-        {19, 224, 96, 24},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y(14), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "See on map"};
    GeoMapView* geomap_view{nullptr};
    bool send_updates{false};
@@ -175,9 +179,9 @@ class AISAppView : public View {
    AISRecentEntries recent{};
    std::unique_ptr<AISLogger> logger{};

-    const RecentEntriesColumns columns{{
+    RecentEntriesColumns columns{{
        {"MMSI", 9},
-        {"Name/Call", 20},
+        {"Name/Call", 0},
    }};
    AISRecentEntriesView recent_entries_view{columns, recent};
    AISRecentEntryDetailView recent_entry_detail_view{nav_};
@@ -185,11 +189,11 @@ class AISAppView : public View {
    static constexpr auto header_height = 1 * 16;

    Text label_channel{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), 2 * 8, 1 * 16},
        "Ch"};

    OptionsField options_channel{
-        {3 * 8, 0 * 16},
+        {3 * 8, UI_POS_Y(0)},
        3,
        {
            {"87B", 161975000},
@@ -197,24 +201,27 @@ class AISAppView : public View {
        }};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4},
+        {UI_POS_X(21), UI_POS_Y(0), UI_POS_WIDTH_REMAINING(23), 4},
    };

    AudioVolumeField field_volume{
-        {28 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    Channel channel{
-        {21 * 8, 5, 6 * 8, 4},
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(23), 4},
    };
+    SignalToken signal_token_tick_second{};
+    uint8_t timer_seconds = 0;
+    bool got_new_packet{false};  // got any new packet since latest screen update?

    MessageHandlerRegistration message_handler_packet{
        Message::ID::AISPacket,
@@ -229,6 +236,7 @@ class AISAppView : public View {
    void on_packet(const ais::Packet& packet);
    void on_show_list();
    void on_show_detail(const AISRecentEntry& entry);
+    void on_tick_second();
 };

 } /* namespace ui */
@@ -40,6 +40,7 @@ namespace ui {
 /* AMOptionsView *********************************************************/

 AMOptionsView::AMOptionsView(
+    AnalogAudioView* view,
    Rect parent_rect,
    const Style* style)
    : View{parent_rect} {
@@ -48,12 +49,23 @@ AMOptionsView::AMOptionsView(
    add_children({
        &label_config,
        &options_config,
+        &zoom_config,
    });

-    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);
+    zoom_config.on_change = [this, view](size_t, OptionsField::value_t n) {            // n , has two option values. when GUI =zoom+1 => (0), when GUI=zoom+2 (6)
+        receiver_model.set_am_configuration(view->get_previous_AM_mode_option() + n);  // n (0 or 6)
+        view->set_zoom_factor(AM_MODULATION, n);
+        view->set_previous_zoom_option(n);
+    };
+
+    // restore zoom selection
+    zoom_config.set_by_value(view->get_zoom_factor(AM_MODULATION));
+
+    freqman_set_bandwidth_option(AM_MODULATION, options_config);                                        // freqman.cpp to the options_config, only allowing 5 modes  freqman_bandwidths[AM]  {"DSB 9k", 0},  {"DSB 6k", 1},  {"USB+3k", 2}, {"LSB-3k", 3}, {"CW", 4},
+    options_config.set_by_value(receiver_model.am_configuration() - view->get_previous_zoom_option());  // restore AM GUI option mode ,   AM FIR index filters (0..11) values ,  <baseband::AMConfig, 12> am_configs has 12 fir  index elements.
+    options_config.on_change = [this, view](size_t, OptionsField::value_t n) {
+        receiver_model.set_am_configuration(n + view->get_previous_zoom_option());  // we select proper FIR AM filter (0..11), = 0..4 GUI AM modes + offset +6 (if zoom+2)
+        view->set_previous_AM_mode_option(n);                                       // (0..4) allowing 5 AM modes (DSB9K, DSB6K, USB,LSB, CW)
    };
 }

@@ -102,6 +114,54 @@ WFMOptionsView::WFMOptionsView(
    };
 }

+/* WFMAMAptOptionsView *******************************************************/
+
+WFMAMAptOptionsView::WFMAMAptOptionsView(
+    Rect parent_rect,
+    const Style* style)
+    : View{parent_rect} {
+    set_style(style);
+
+    add_children({
+        &label_config,
+        &options_config,
+    });
+
+    freqman_set_bandwidth_option(WFMAM_MODULATION, options_config);  // adding the common message from freqman.cpp to the options_config
+    options_config.set_by_value(receiver_model.wfmam_configuration());
+    options_config.on_change = [this](size_t, OptionsField::value_t n) {
+        receiver_model.set_wfmam_configuration(n);
+    };
+}
+
+/* AMFMAptOptionsView *********************************************************/
+
+AMFMAptOptionsView::AMFMAptOptionsView(
+    AnalogAudioView* view,
+    Rect parent_rect,
+    const Style* style)
+    : View{parent_rect} {
+    set_style(style);
+
+    add_children({
+        &label_config,
+        &options_config,
+        &zoom_config,
+    });
+
+    freqman_set_bandwidth_option(AMFM_MODULATION, options_config);  // adding the common message from freqman.cpp to the options_config
+    receiver_model.set_amfm_configuration(5);                       // Fix index 5 manually, not from freqman: set to  RX AM (USB+FM) mode to demod audio tone, and get Wefax_APT signal.
+    options_config.set_by_value(receiver_model.amfm_configuration());
+
+    zoom_config.on_change = [this, view](size_t, OptionsField::value_t n) {
+        receiver_model.set_amfm_configuration(5 + n);
+        view->set_zoom_factor(AMFM_MODULATION, n);
+    };
+
+    // restore zoom selection
+    zoom_config.set_by_value(view->get_zoom_factor(AMFM_MODULATION));
+}
+
 /* SPECOptionsView *******************************************************/

 SPECOptionsView::SPECOptionsView(
@@ -175,8 +235,9 @@ AnalogAudioView::AnalogAudioView(
    };

    auto modulation = receiver_model.modulation();
+
    // This app doesn't handle "Capture" mode.
-    if (modulation > ReceiverModel::Mode::SpectrumAnalysis)
+    if (modulation == ReceiverModel::Mode::Capture)
        modulation = ReceiverModel::Mode::SpectrumAnalysis;

    options_modulation.set_by_value(toUType(modulation));
@@ -226,11 +287,42 @@ void AnalogAudioView::set_spec_bw(size_t index, uint32_t 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
+uint8_t AnalogAudioView::get_zoom_factor(uint8_t mode) {  // define accessor functions inside AnalogAudioView to read zoom value
+    if (mode == AM_MODULATION)
+        return zoom_factor_am;
+    else if (mode == AMFM_MODULATION)
+        return zoom_factor_amfm;
+    return 0;  // default if unsupported mode
+}
+
+void AnalogAudioView::set_zoom_factor(uint8_t mode, uint8_t zoom) {  // define accessor functions inside AnalogAudioView to write zoom value
+    if (mode == AM_MODULATION)
+        zoom_factor_am = zoom;
+    else if (mode == AMFM_MODULATION)
+        zoom_factor_amfm = zoom;
+}
+
+uint8_t AnalogAudioView::get_previous_AM_mode_option() {
+    return previous_AM_mode_option;
+}
+
+void AnalogAudioView::set_previous_AM_mode_option(uint8_t mode) {
+    previous_AM_mode_option = mode;
+}
+
+uint8_t AnalogAudioView::get_previous_zoom_option() {
+    return previous_zoom;
+}
+
+void AnalogAudioView::set_previous_zoom_option(uint8_t zoom) {
+    previous_zoom = zoom;
+}
+
+uint8_t AnalogAudioView::get_spec_iq_phase_calibration_value() {  // define accessor functions inside AnalogAudioView to read iq_phase_calibration_value
    return iq_phase_calibration_value;
 }

-void AnalogAudioView::set_spec_iq_phase_calibration_value(uint8_t cal_value) {  // define accessor functions
+void AnalogAudioView::set_spec_iq_phase_calibration_value(uint8_t cal_value) {  // define accessor functions inside AnalogAudioView to write iq_phase_calibration_value
    iq_phase_calibration_value = cal_value;
    radio::set_rx_max283x_iq_phase_calibration(iq_phase_calibration_value);
 }
@@ -246,6 +338,7 @@ void AnalogAudioView::set_spec_trigger(uint16_t trigger) {
 }

 AnalogAudioView::~AnalogAudioView() {
+    receiver_model.set_hidden_offset(0);
    audio::output::stop();
    receiver_model.disable();
    baseband::shutdown();
@@ -267,10 +360,6 @@ void AnalogAudioView::on_baseband_bandwidth_changed(uint32_t bandwidth_hz) {
 }

 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();
@@ -329,7 +418,7 @@ void AnalogAudioView::on_show_options_modulation() {
    const auto modulation = receiver_model.modulation();
    switch (modulation) {
        case ReceiverModel::Mode::AMAudio:
-            widget = std::make_unique<AMOptionsView>(options_view_rect, Theme::getInstance()->option_active);
+            widget = std::make_unique<AMOptionsView>(this, options_view_rect, Theme::getInstance()->option_active);
            waterfall.show_audio_spectrum_view(false);
            text_ctcss.hidden(true);
            break;
@@ -346,6 +435,18 @@ void AnalogAudioView::on_show_options_modulation() {
            text_ctcss.hidden(true);
            break;

+        case ReceiverModel::Mode::WFMAudioAMApt:
+            widget = std::make_unique<WFMAMAptOptionsView>(options_view_rect, Theme::getInstance()->option_active);
+            waterfall.show_audio_spectrum_view(true);
+            text_ctcss.hidden(true);
+            break;
+
+        case ReceiverModel::Mode::AMAudioFMApt:
+            widget = std::make_unique<AMFMAptOptionsView>(this, options_view_rect, Theme::getInstance()->option_active);
+            waterfall.show_audio_spectrum_view(false);
+            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);
@@ -387,6 +488,12 @@ void AnalogAudioView::update_modulation(ReceiverModel::Mode modulation) {
        case ReceiverModel::Mode::WidebandFMAudio:
            image_tag = portapack::spi_flash::image_tag_wfm_audio;
            break;
+        case ReceiverModel::Mode::WFMAudioAMApt:
+            image_tag = portapack::spi_flash::image_tag_wfm_audio;
+            break;
+        case ReceiverModel::Mode::AMAudioFMApt:
+            image_tag = portapack::spi_flash::image_tag_am_audio;
+            break;
        case ReceiverModel::Mode::SpectrumAnalysis:
            image_tag = portapack::spi_flash::image_tag_wideband_spectrum;
            break;
@@ -407,6 +514,8 @@ void AnalogAudioView::update_modulation(ReceiverModel::Mode 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.set_hidden_offset(modulation == ReceiverModel::Mode::AMAudioFMApt ? -2200 : 0);  // wefax needs to be shifted, see wefax rx app.
+
    receiver_model.enable();

    // TODO: This doesn't belong here! There's a better way.
@@ -421,6 +530,12 @@ void AnalogAudioView::update_modulation(ReceiverModel::Mode modulation) {
        case ReceiverModel::Mode::WidebandFMAudio:
            sampling_rate = 48000;
            break;
+        case ReceiverModel::Mode::WFMAudioAMApt:
+            sampling_rate = 12000;
+            break;
+        case ReceiverModel::Mode::AMAudioFMApt:
+            sampling_rate = 12000;
+            break;
        default:
            break;
    }
@@ -35,22 +35,56 @@

 namespace ui {

+class AnalogAudioView;
+
 class AMOptionsView : public View {
   public:
-    AMOptionsView(Rect parent_rect, const Style* style);
+    AMOptionsView(AnalogAudioView* view, Rect parent_rect, const Style* style);

   private:
    Text label_config{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "BW",
    };

    OptionsField options_config{
-        {3 * 8, 0 * 16},
+        {UI_POS_X(3), UI_POS_Y(0)},
        6,  // Max option length
        {
            // Using common messages from freqman_ui.cpp
        }};
+
+    OptionsField zoom_config{
+        {UI_POS_X_RIGHT(7), UI_POS_Y(0)},
+        7,
+        {{"ZOOM x1", 0},
+         {"ZOOM x2", 6}}  // offset index AM modes array FIR filters.
+    };
+};
+
+class AMFMAptOptionsView : public View {
+   public:
+    AMFMAptOptionsView(AnalogAudioView* view, Rect parent_rect, const Style* style);
+
+   private:
+    Text label_config{
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
+        "BW",
+    };
+
+    OptionsField options_config{
+        {UI_POS_X(3), UI_POS_Y(0)},
+        17,  // Max option length chars   "USB+FM(Wefax Apt)"
+        {
+            // Using common messages from freqman_ui.cpp In HF USB , Here  we only need USB Audio demod, + post-FM demod fsubcarrier FM tone to get APT signal.
+        }};
+
+    OptionsField zoom_config{
+        {UI_POS_X_RIGHT(7), UI_POS_Y(0)},
+        7,
+        {{"ZOOM x1", 0},
+         {"ZOOM x2", 6}}  // offset index array filters.
+    };
 };

 class NBFMOptionsView : public View {
@@ -59,21 +93,21 @@ class NBFMOptionsView : public View {

   private:
    Text label_config{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "BW",
    };
    OptionsField options_config{
-        {3 * 8, 0 * 16},
+        {UI_POS_X(3), UI_POS_Y(0)},
        3,  // Max option length
        {
            // Using common messages from freqman_ui.cpp
        }};

    Text text_squelch{
-        {7 * 8, 0 * 16, 8 * 8, 1 * 16},
+        {UI_POS_X(7), UI_POS_Y(0), UI_POS_WIDTH(8), UI_POS_HEIGHT(1)},
        "SQ   /99"};
    NumberField field_squelch{
-        {10 * 8, 0 * 16},
+        {UI_POS_X(10), UI_POS_Y(0)},
        2,
        {0, 99},
        1,
@@ -87,18 +121,33 @@ class WFMOptionsView : public View {

   private:
    Text label_config{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "BW",
    };
    OptionsField options_config{
-        {3 * 8, 0 * 16},
+        {UI_POS_X(3), UI_POS_Y(0)},
        4,  // Max option length
        {
            // Using common messages from freqman_ui.cpp
        }};
 };

-class AnalogAudioView;
+class WFMAMAptOptionsView : public View {
+   public:
+    WFMAMAptOptionsView(Rect parent_rect, const Style* style);
+
+   private:
+    Text label_config{
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
+        "BW",
+    };
+    OptionsField options_config{
+        {UI_POS_X(3), UI_POS_Y(0)},
+        16,  // Max option char length "80k-NOAA Apt LPF" , example.
+        {
+            // Using common messages from freqman_ui.cpp
+        }};
+};

 class SPECOptionsView : public View {
   public:
@@ -106,11 +155,11 @@ class SPECOptionsView : public View {

   private:
    Text label_config{
-        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(0), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "BW",
    };
    OptionsField options_config{
-        {3 * 8, 0 * 16},
+        {UI_POS_X(3), UI_POS_Y(0)},
        4,
        {
            {"20m ", 20000000},
@@ -123,20 +172,20 @@ class SPECOptionsView : public View {
        }};

    Text text_speed{
-        {9 * 8, 0 * 16, 8 * 8, 1 * 16},
+        {UI_POS_X(9), UI_POS_Y(0), UI_POS_WIDTH(8), UI_POS_HEIGHT(1)},
        "SP   /63"};
    NumberField field_speed{
-        {12 * 8, 0 * 16},
+        {UI_POS_X(12), UI_POS_Y(0)},
        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.
+        {UI_POS_X(19), UI_POS_Y(0), UI_POS_WIDTH(11), UI_POS_HEIGHT(1)},  // 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},
+        {screen_width - 2 * 8, UI_POS_Y(0)},
        2,
        {0, 63},  // 5 or 6 bits IQ CAL phase adjustment (range updated later)
        1,
@@ -164,66 +213,86 @@ class AnalogAudioView : public View {
    uint8_t get_spec_iq_phase_calibration_value();
    void set_spec_iq_phase_calibration_value(uint8_t cal_value);

+    uint8_t get_zoom_factor(uint8_t mode);
+    void set_zoom_factor(uint8_t mode, uint8_t zoom);
+
+    uint8_t get_previous_AM_mode_option();
+    void set_previous_AM_mode_option(uint8_t mode);
+
+    uint8_t get_previous_zoom_option();
+    void set_previous_zoom_option(uint8_t zoom);
+
   private:
    static constexpr ui::Dim header_height = 3 * 16;

    NavigationView& nav_;
    RxRadioState radio_state_{};
    uint8_t iq_phase_calibration_value{15};  // initial default RX IQ phase calibration value , used for both max2837 & max2839
+    uint8_t zoom_factor_am{0};               // initial zoom factor in AM mode
+    uint8_t zoom_factor_amfm{0};             // initial zoom factor in AMFM mode
+    uint8_t previous_AM_mode_option{0};      // GUI 5 AM modes :  (0..4 ) (DSB9K, DSB6K, USB,LSB, CW). Used to select proper FIR filter (0..11) AM mode  + offset 0 (zoom+1) or +6 (if zoom+2)
+    uint8_t previous_zoom{0};                // GUI ZOOM+1, ZOOM+2 , equivalent to two values offset 0 (zoom+1) or +6 (if zoom+2)
+
    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.
+            {"zoom_factor_am"sv, &zoom_factor_am},                    // we are saving and restoring AM ZOOM factor from Settings.
+            {"zoom_factor_amfm"sv, &zoom_factor_amfm},                // we are saving and restoring AMFM ZOOM factor from Settings.
+            {"previous_AM_mode_option"sv, &previous_AM_mode_option},  // we are saving and restoring AMFM ZOOM factor from Settings.
+            {"previous_zoom"sv, &previous_zoom},                      // we are saving and restoring AMFM ZOOM factor from Settings.
        }};

-    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};
+    const Rect options_view_rect{UI_POS_X(0), UI_POS_Y(1), UI_POS_MAXWIDTH, UI_POS_HEIGHT(1)};
+    const Rect nbfm_view_rect{UI_POS_X(0), UI_POS_Y(1), UI_POS_WIDTH(18), UI_POS_HEIGHT(1)};

    size_t spec_bw_index = 0;
    uint32_t spec_bw = 20000000;
    uint16_t spec_trigger = 63;

    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(21), 0, UI_POS_WIDTH_REMAINING(21) - UI_POS_WIDTH(2), 4}};

    Channel channel{
-        {21 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(21) - UI_POS_WIDTH(2), 4}};

    Audio audio{
-        {21 * 8, 10, 6 * 8, 4}};
+        {UI_POS_X(21), 10, UI_POS_WIDTH_REMAINING(21) - UI_POS_WIDTH(2), 4}};

    RxFrequencyField field_frequency{
-        {5 * 8, 0 * 16},
+        {UI_POS_X(5), UI_POS_Y(0)},
        nav_};

    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {UI_POS_X(15), UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {UI_POS_X(18), UI_POS_Y(0)}};

    OptionsField options_modulation{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        4,
        {
            {" AM ", toUType(ReceiverModel::Mode::AMAudio)},
            {"NFM ", toUType(ReceiverModel::Mode::NarrowbandFMAudio)},
            {"WFM ", toUType(ReceiverModel::Mode::WidebandFMAudio)},
            {"SPEC", toUType(ReceiverModel::Mode::SpectrumAnalysis)},
+            {"AMFM", toUType(ReceiverModel::Mode::AMAudioFMApt)},  // Added to handle  HF  WeatherFax , SSB (USB demod) + Tone_Subcarrier FM demod
+            {"FMAM", toUType(ReceiverModel::Mode::WFMAudioAMApt)}  // Added to handle  SAT NOAA APT
        }};

    AudioVolumeField field_volume{
-        {28 * 8, 0 * 16}};
+        {screen_width - 2 * 8, UI_POS_Y(0)}};

    Text text_ctcss{
-        {16 * 8, 1 * 16, 14 * 8, 1 * 16},
+        {UI_POS_X(16), UI_POS_Y(1), UI_POS_WIDTH(14), UI_POS_HEIGHT(1)},
        ""};

    std::unique_ptr<Widget> options_widget{};

    RecordView record_view{
-        {0 * 8, 2 * 16, 30 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(2), UI_POS_MAXWIDTH, UI_POS_HEIGHT(1)},
        u"AUD",
        u"AUDIO",
        RecordView::FileType::WAV,
@@ -69,7 +69,7 @@ static std::uint64_t get_freq_by_channel_number(uint8_t channel_number) {
 }

 void BLECommView::focus() {
-    options_channel.focus();
+    field_frequency.focus();
 }

 BLECommView::BLECommView(NavigationView& nav)
@@ -79,10 +79,7 @@ BLECommView::BLECommView(NavigationView& nav)
                  &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,
@@ -90,10 +87,6 @@ BLECommView::BLECommView(NavigationView& nav)

    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) {
@@ -104,27 +97,8 @@ BLECommView::BLECommView(NavigationView& nav)
            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();
 }
@@ -145,86 +119,66 @@ 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);
+    std::string dataString = "02010603030F1807084861636B5246";
    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;
+    strncpy(bleTxPacket.packetCount, "1", 2);
+    bleTxPacket.packet_count = 1;

-    bleTxPacket.packetType = PKT_TYPE_DISCOVERY;
+    bleTxPacket.pduType = PKT_TYPE_ADV_IND;

    return bleTxPacket;
 }

-void BLECommView::sendAdvertisement(bool enable) {
-    if (enable) {
-        startTx(advertisePacket);
-        is_adv = true;
-    } else {
-        is_adv = false;
-        stopTx();
-    }
+void BLECommView::sendAdvertisement(void) {
+    startTx(advertisePacket);
+    ble_state = Ble_State_Advertising;
 }

 void BLECommView::startTx(BLETxPacket packetToSend) {
-    int randomChannel = channel_number_tx;
+    switch_rx_tx(false);

-    if (auto_channel) {
-        int min = 37;
-        int max = 39;
+    currentPacket = packetToSend;
+    packet_counter = currentPacket.packet_count;

-        randomChannel = min + std::rand() % (max - min + 1);
-
-        field_frequency.set_value(get_freq_by_channel_number(randomChannel));
+    switch (advCount) {
+        case 0:
+            channel_number_tx = 37;
+            break;
+        case 1:
+            channel_number_tx = 38;
+            break;
+        case 2:
+            channel_number_tx = 39;
+            break;
    }

-    if (!in_tx_mode()) {
-        switch_rx_tx(false);
+    field_frequency.set_value(get_freq_by_channel_number(37));

-        currentPacket = packetToSend;
-        packet_counter = currentPacket.packet_count;
+    advCount++;

-        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 (advCount == 3) {
+        advCount = 0;
    }

-    if ((packet_counter % 10) == 0) {
-        text_packets_sent.set(to_string_dec_uint(packet_counter));
-    }
+    baseband::set_btletx(37, deviceMAC, currentPacket.advertisementData, currentPacket.pduType);
+    transmitter_model.set_tx_gain(47);
+    transmitter_model.enable();

-    is_sending = true;
-
-    packet_counter--;
+    is_running_tx = true;
 }

 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);
+    field_frequency.set_value(get_freq_by_channel_number(channel_number_rx));
    receiver_model.enable();

    is_running_tx = false;
@@ -248,14 +202,12 @@ 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);
+        if (ble_state == Ble_State_Receiving || ble_state == Ble_State_Idle) {
+            sendAdvertisement();
        }
    }
 }
@@ -263,17 +215,18 @@ void BLECommView::on_timer() {
 void BLECommView::on_tx_progress(const bool done) {
    if (done) {
        if (in_tx_mode()) {
-            is_sending = false;
+            ble_state = Ble_State_Receiving;

-            if (packet_counter == 0) {
-                if (is_adv) {
-                    sendAdvertisement(false);
-                } else {
-                    stopTx();
-                }
-            } else {
-                startTx(currentPacket);
-            }
+            timer_counter = 0;
+            timer_period = 12;
+
+            stopTx();
+
+            // else
+            // {
+            //     startTx(advertisePacket);
+            //     advCount++;
+            // }
        }
    }
 }
@@ -309,23 +262,28 @@ void BLECommView::parse_received_packet(const BlePacketData* packet, ADV_PDU_TYP
    }

    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";
-        }
+            ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data;

-        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);
+            std::reverse(directed_mac_data->A1, directed_mac_data->A1 + 6);
+            std::string directedMAC = to_string_mac_address(directed_mac_data->A1, 6, false);
+
+            // Compare directed MAC Hex with the device MAC.
+            if (1) {
+                // std::string str_console = "Received SCAN_REQ from directed MAC: " + directedMAC + "\n";
+                // console.clear(true);
+                // console.writeln(str_console);
+            }
+        } else if (pdu_type == CONNECT_REQ) {
+            ADV_PDU_PAYLOAD_TYPE_5* connectReq = (ADV_PDU_PAYLOAD_TYPE_5*)packet->data;
+
+            std::reverse(connectReq->AdvA, connectReq->AdvA + 6);
+            std::string directedMAC = to_string_mac_address(connectReq->AdvA, 6, false);
+
+            std::string str_console = "Received CONNECT_REQ from directed MAC: " + directedMAC + "\n";
+            console.clear(true);
+            console.writeln(str_console);
+        }
    }
 }

@@ -76,7 +76,16 @@ class BLECommView : public View {
    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);
+    void sendAdvertisement(void);
+
+    typedef enum {
+        Ble_State_Idle = 0,
+        Ble_State_Advertising = 1,
+        Ble_State_Receiving = 2,
+        Ble_State_Sending = 3
+    } BleState;
+
+    BleState ble_state{Ble_State_Idle};

    NavigationView& nav_;

@@ -101,8 +110,9 @@ class BLECommView : public View {
    uint8_t channel_number_tx = 37;
    uint8_t channel_number_rx = 37;
    bool auto_channel = false;
+    uint8_t advCount = 0;

-    char randomMac[13] = "010203040506";
+    char deviceMAC[13] = "C23456789ABC";

    bool is_running_tx = false;
    bool is_sending = false;
@@ -111,7 +121,7 @@ class BLECommView : public View {
    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)
+    int16_t timer_rx_period{12};  // Poll Rx for at least 150ms. (TBD)

    uint32_t packet_counter{0};
    BLETxPacket advertisePacket{};
@@ -121,7 +131,7 @@ class BLECommView : public View {
    static constexpr auto header_height = 5 * 16;

    OptionsField options_channel{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), 0 * 8},
        5,
        {{"Ch.37 ", 37},
         {"Ch.38", 38},
@@ -129,17 +139,17 @@ class BLECommView : public View {
         {"Auto", 40}}};

    RxFrequencyField field_frequency{
-        {6 * 8, 0 * 16},
+        {6 * 8, UI_POS_Y(0)},
        nav_};

    RFAmpField field_rf_amp{
-        {16 * 8, 0 * 16}};
+        {16 * 8, UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {21 * 8, 0 * 16}};
+        {21 * 8, UI_POS_Y(0)}};

    RSSI rssi{
        {24 * 8, 0, 6 * 8, 4}};
@@ -147,15 +157,6 @@ class BLECommView : public View {
    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,
@@ -163,14 +164,14 @@ class BLECommView : public View {
        true};

    Labels label_packets_sent{
-        {{0 * 8, 4 * 8}, "Packets Left:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 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}};
+        {0, 4 * 16, ui::screen_width, ui::screen_height - 80}};

    std::string str_log{""};
    bool logging{false};
@@ -2,6 +2,7 @@
 * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
 * Copyright (C) 2023 TJ Baginski
+ * Copyright (C) 2025 Tommaso Ventafridda
 *
 * This file is part of PortaPack.
 *
@@ -21,7 +22,6 @@
 * Boston, MA 02110-1301, USA.
 */

-#include "ble_rx_app.hpp"
 #include "ble_rx_app.hpp"
 #include "ui_modemsetup.hpp"

@@ -34,11 +34,22 @@
 #include "portapack_persistent_memory.hpp"
 #include "ui_fileman.hpp"
 #include "ui_textentry.hpp"
+#include "usb_serial_asyncmsg.hpp"
+
+#include <string_view>

 using namespace portapack;
 using namespace modems;
 namespace fs = std::filesystem;

+#define BLE_RX_NO_ERROR 0
+#define BLE_RX_LIST_FILENAME_EMPTY_ERROR 1
+#define BLE_RX_ENTRY_FILENAME_EMPTY_ERROR 2
+#define BLE_RX_LIST_SAVE_ERROR 3
+#define BLE_RX_ENTRY_SAVE_ERROR 4
+
+static uint8_t ble_rx_error = BLE_RX_NO_ERROR;
+
 void BLELogger::log_raw_data(const std::string& data) {
    log_file.write_entry(data);
 }
@@ -59,6 +70,50 @@ uint64_t copy_mac_address_to_uint64(const uint8_t* macAddress) {
    return result;
 }

+MAC_VENDOR_STATUS lookup_mac_vendor_status(const uint8_t* mac_address, std::string& vendor_name) {
+    static bool db_checked = false;
+    static bool db_exists = false;
+
+    if (!db_checked) {
+        database db;
+        database::MacAddressDBRecord dummy_record;
+        int test_result = db.retrieve_macaddress_record(&dummy_record, "000000");
+        db_exists = (test_result != DATABASE_NOT_FOUND);
+        db_checked = true;
+    }
+
+    if (!db_exists) {
+        vendor_name = "macaddress.db not found";
+        return MAC_DB_NOT_FOUND;
+    }
+
+    database db;
+    database::MacAddressDBRecord record;
+
+    // Convert MAC address to hex string
+    std::string mac_hex = "";
+    for (int i = 0; i < 3; i++) {
+        // Only need first 3 bytes for OUI
+        mac_hex += to_string_hex(mac_address[i], 2);
+    }
+
+    int result = db.retrieve_macaddress_record(&record, mac_hex);
+
+    if (result == DATABASE_RECORD_FOUND) {
+        vendor_name = std::string(record.vendor_name);
+        return MAC_VENDOR_FOUND;
+    } else {
+        vendor_name = "Unknown";
+        return MAC_VENDOR_NOT_FOUND;
+    }
+}
+
+std::string lookup_mac_vendor(const uint8_t* mac_address) {
+    std::string vendor_name;
+    lookup_mac_vendor_status(mac_address, vendor_name);
+    return vendor_name;
+}
+
 void reverse_byte_array(uint8_t* arr, int length) {
    int start = 0;
    int end = length - 1;
@@ -126,24 +181,26 @@ void RecentEntriesTable<BleRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    std::string line{};
-    line.reserve(30);
-
+    line.reserve(40);
    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);
    }
+    line.resize(columns.at(0).second, ' ');
+
+    std::string hitsStr;
+
+    if (!entry.informationString.empty()) {
+        hitsStr = entry.informationString;
+    } else {
+        hitsStr = to_string_dec_int(entry.numHits);
+    }

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

@@ -157,7 +214,10 @@ void RecentEntriesTable<BleRecentEntries>::draw(
    line += pad_string_with_spaces(db_spacing) + dbStr;

    line.resize(target_rect.width() / 8, ' ');
-    painter.draw_string(target_rect.location(), style, line);
+
+    Style row_style = (entry.vendor_status == MAC_VENDOR_FOUND) ? style : Style{style.font, style.background, Color::grey()};
+
+    painter.draw_string(target_rect.location(), row_style, line);
 }

 BleRecentEntryDetailView::BleRecentEntryDetailView(NavigationView& nav, const BleRecentEntry& entry)
@@ -170,17 +230,20 @@ BleRecentEntryDetailView::BleRecentEntryDetailView(NavigationView& nav, const Bl
                  &text_mac_address,
                  &label_pdu_type,
                  &text_pdu_type,
+                  &label_vendor,
+                  &text_vendor,
                  &labels});

    text_mac_address.set(to_string_mac_address(entry.packetData.macAddress, 6, false));
    text_pdu_type.set(pdu_type_to_string(entry.pduType));
+    text_vendor.set(entry.vendor_name.empty() ? lookup_mac_vendor(entry.packetData.macAddress) : entry.vendor_name);

    button_done.on_select = [&nav](const ui::Button&) {
        nav.pop();
    };

    button_send.on_select = [this, &nav](const ui::Button&) {
-        auto packetToSend = build_packet();
+        auto packetToSend = build_packet(entry_);
        nav.set_on_pop([packetToSend, &nav]() {
            nav.replace<BLETxView>(packetToSend);
        });
@@ -188,13 +251,14 @@ BleRecentEntryDetailView::BleRecentEntryDetailView(NavigationView& nav, const Bl
    };

    button_save.on_select = [this, &nav](const ui::Button&) {
-        auto packetToSave = build_packet();
+        auto packetToSave = build_packet(entry_);

        packetFileBuffer = "";
        text_prompt(
            nav,
            packetFileBuffer,
            64,
+            ENTER_KEYBOARD_MODE_ALPHA,
            [this, packetToSave](std::string& buffer) {
                on_save_file(buffer, packetToSave);
            });
@@ -202,19 +266,23 @@ BleRecentEntryDetailView::BleRecentEntryDetailView(NavigationView& nav, const Bl
 }

 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);
+    if (value.length() > 0) {
+        ensure_directory(packet_save_path);
+        auto folder = packet_save_path.parent_path();
+        auto ext = packet_save_path.extension();
+        auto new_path = folder / value + ext;
+        ble_rx_error = saveFile(new_path, packetToSave);
+    } else {
+        nav_.pop();
+        ble_rx_error = BLE_RX_ENTRY_FILENAME_EMPTY_ERROR;
+    }
 }

 bool BleRecentEntryDetailView::saveFile(const std::filesystem::path& path, BLETxPacket packetToSave) {
    File f;
    auto error = f.create(path);
    if (error)
-        return false;
+        return BLE_RX_ENTRY_SAVE_ERROR;

    std::string macAddressStr = packetToSave.macAddress;
    std::string advertisementDataStr = packetToSave.advertisementData;
@@ -224,7 +292,7 @@ bool BleRecentEntryDetailView::saveFile(const std::filesystem::path& path, BLETx

    f.write(packetString.c_str(), packetString.length());

-    return true;
+    return BLE_RX_NO_ERROR;
 }

 void BleRecentEntryDetailView::update_data() {
@@ -357,10 +425,13 @@ void BleRecentEntryDetailView::paint(Painter& painter) {

 void BleRecentEntryDetailView::set_entry(const BleRecentEntry& entry) {
    entry_ = entry;
+    text_mac_address.set(to_string_mac_address(entry.packetData.macAddress, 6, false));
+    text_pdu_type.set(pdu_type_to_string(entry.pduType));
+    text_vendor.set(entry.vendor_name.empty() ? lookup_mac_vendor(entry.packetData.macAddress) : entry.vendor_name);
    set_dirty();
 }

-BLETxPacket BleRecentEntryDetailView::build_packet() {
+BLETxPacket BleRecentEntryDetailView::build_packet(BleRecentEntry entry_) {
    BLETxPacket bleTxPacket;
    memset(&bleTxPacket, 0, sizeof(BLETxPacket));

@@ -368,8 +439,8 @@ BLETxPacket BleRecentEntryDetailView::build_packet() {

    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;
+    strncpy(bleTxPacket.packetCount, "10", 3);
+    bleTxPacket.packet_count = 10;

    return bleTxPacket;
 }
@@ -419,85 +490,38 @@ BLERxView::BLERxView(NavigationView& nav)
                  &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,
+                  &check_name,
+                  &check_log,
+                  &check_serial_log,
+                  &check_unique,
+                  &check_duplicate_packets,
+                  &button_find,
+                  &label_found,
+                  &text_found_count,
                  &button_save_list,
                  &button_clear_list,
                  &button_switch,
                  &recent_entries_view});

+    async_tx_states_when_entered = portapack::async_tx_enabled;
+
    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);
-            });
-    };
-
+    // ------------------------------------------------------------------------------
+    // Handle Check Boxes
+    // ------------------------------------------------------------------------------
    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
@@ -505,6 +529,89 @@ BLERxView::BLERxView(NavigationView& nav)
        recent_entries_view.set_dirty();
    };

+    check_log.on_select = [this](Checkbox&, bool v) {
+        logging = v;
+
+        if (logger && logging)
+            logger->append(bletx_dir.string() + "/Packets/BLETx_" + to_string_timestamp(rtc_time::now()) + ".TXT");
+    };
+
+    check_serial_log.on_select = [this](Checkbox&, bool v) {
+        serial_logging = v;
+        if (v) {
+            portapack::async_tx_enabled = true;
+        } else {
+            portapack::async_tx_enabled = false;
+        }
+    };
+
+    check_unique.on_select = [this](Checkbox&, bool v) {
+        uniqueParsing = v;
+        recent.clear();
+        recent_entries_view.set_dirty();
+    };
+
+    check_duplicate_packets.on_select = [this](Checkbox&, bool v) {
+        duplicatePackets = v;
+        recent.clear();
+        recent_entries_view.set_dirty();
+    };
+
+    check_name.set_value(name_enable);
+    check_log.set_value(logging);
+    check_serial_log.set_value(serial_logging);
+    check_unique.set_value(uniqueParsing);
+    check_duplicate_packets.set_value(duplicatePackets);
+
+    // ------------------------------------------------------------------------------
+    // Handle Buttons
+    // ------------------------------------------------------------------------------
+    filterBuffer = filter;
+
+    button_filter.on_select = [this](Button&) {
+        text_prompt(
+            nav_,
+            filterBuffer,
+            64,
+            ENTER_KEYBOARD_MODE_ALPHA,
+            [this](std::string& buffer) {
+                on_filter_change(buffer);
+            });
+    };
+
+    button_save_list.on_select = [this, &nav](const ui::Button&) {
+        listFileBuffer = "";
+        text_prompt(
+            nav,
+            listFileBuffer,
+            64,
+            ENTER_KEYBOARD_MODE_ALPHA,
+            [this](std::string& buffer) {
+                on_save_file(buffer);
+            });
+    };
+
+    button_clear_list.on_select = [this](Button&) {
+        recent.clear();
+        recent_entries_view.set_dirty();
+    };
+
+    button_switch.on_select = [&nav](Button&) {
+        nav.replace<BLETxView>();
+    };
+
+    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);
+        };
+    };
+
+    // ------------------------------------------------------------------------------
+    // Handle Options
+    // ------------------------------------------------------------------------------
+    field_frequency.set_step(0);
+
    options_channel.on_change = [this](size_t index, int32_t v) {
        channel_index = (uint8_t)index;

@@ -528,23 +635,16 @@ BLERxView::BLERxView(NavigationView& nav)
    };

    options_filter.on_change = [this](size_t index, int32_t v) {
+        (void)v;
        filter_index = (uint8_t)index;
-        handle_filter_options(v);
+        recent.clear();
+        recent_entries_view.set_dirty();
    };

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

@@ -568,11 +668,14 @@ std::string BLERxView::build_line_str(BleRecentEntry entry) {
 }

 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);
+    if (value.length() > 0) {
+        auto folder = packet_save_path.parent_path();
+        auto ext = packet_save_path.extension();
+        auto new_path = folder / value + ext;
+        ble_rx_error = saveFile(new_path);
+    } else {
+        ble_rx_error = BLE_RX_LIST_FILENAME_EMPTY_ERROR;
+    }
 }

 bool BLERxView::saveFile(const std::filesystem::path& path) {
@@ -584,7 +687,7 @@ bool BLERxView::saveFile(const std::filesystem::path& path) {
    auto error = src->open(path, false, true);

    if (error) {
-        return false;
+        return BLE_RX_LIST_SAVE_ERROR;
    }

    for (const auto& entry : recent) {
@@ -615,7 +718,7 @@ bool BLERxView::saveFile(const std::filesystem::path& path) {
        auto error = dst->open(tempFilePath, false, true);

        if (error) {
-            return false;
+            return BLE_RX_LIST_SAVE_ERROR;
        }

        dst->write_line(headerStr.c_str());
@@ -695,82 +798,91 @@ bool BLERxView::saveFile(const std::filesystem::path& path) {

    tempList.clear();

-    return true;
+    return BLE_RX_NO_ERROR;
 }

 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);
+    uint64_t uniqueKeyEncoded = 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());
+    uint64_t key = (uniqueKeyEncoded & 0xFFFFFFFFFFFF);

-    handle_entries_sort(options_sort.selected_index());
+    if (duplicatePackets) {
+        key |= ((uint64_t)packet->type) << 48;
+    }
+
+    // If found store into tempEntry to modify.
+    auto it = find(recent, key);
+    if (it != recent.end()) {
+        recent.push_front(*it);
+        recent.erase(it);
+    } else {
+        recent.emplace_front(key);
+        truncate_entries(recent);
+    }
+
+    if (updateEntry(packet, recent.front(), (ADV_PDU_TYPE)packet->type)) {
+        if (!searchList.empty()) {
+            auto it = searchList.begin();
+
+            while (it != searchList.end()) {
+                std::string searchStr = (std::string)*it;
+
+                if (recent.front().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));
+        }
+
+        // Packets were updated, resort the list.
+        handle_entries_sort(options_sort.selected_index());
+    } else {
+        recent.pop_front();
+    }
+
+    log_ble_packet(packet);
+}
+
+void BLERxView::log_ble_packet(BlePacketData* packet) {
+    if ((logger && logging) || serial_logging) {
+        str_console = "";
+        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);
+        }
+    }

    // Log at End of Packet.
    if (logger && logging) {
-        logger->log_raw_data(str_console + "\r\n");
+        logger->log_raw_data(str_console);
    }

    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));
+        UsbSerialAsyncmsg::asyncmsg(str_console);  // new line handled there, no need here.
    }
 }

 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());
+        recent.clear();
    }
 }

@@ -822,22 +934,31 @@ void BLERxView::on_timer() {
        timer_count = 0;

        if (auto_channel) {
-            int min = 37;
-            int max = 39;
+            field_frequency.set_value(get_freq_by_channel_number(channel_number));
+            baseband::set_btlerx(channel_number);

-            int randomChannel = min + std::rand() % (max - min + 1);
-
-            field_frequency.set_value(get_freq_by_channel_number(randomChannel));
-            baseband::set_btlerx(randomChannel);
+            channel_number = (channel_number < 39) ? channel_number + 1 : 37;
        }
    }
+    if (ble_rx_error != BLE_RX_NO_ERROR) {
+        if (ble_rx_error == BLE_RX_LIST_FILENAME_EMPTY_ERROR) {
+            nav_.display_modal("Error", "List filename is empty !");
+        } else if (ble_rx_error == BLE_RX_ENTRY_FILENAME_EMPTY_ERROR) {
+            nav_.display_modal("Error", "Entry filename is empty !");
+        } else if (ble_rx_error == BLE_RX_LIST_SAVE_ERROR) {
+            nav_.display_modal("Error", "Couldn't save list !");
+        } else if (ble_rx_error == BLE_RX_ENTRY_SAVE_ERROR) {
+            nav_.display_modal("Error", "Couldn't save entry !");
+        }
+        ble_rx_error = BLE_RX_NO_ERROR;
+    }
 }

 void BLERxView::handle_entries_sort(uint8_t index) {
    switch (index) {
        case 0:
            sortEntriesBy(
-                recent, [](const BleRecentEntry& entry) { return entry.macAddress; }, true);
+                recent, [](const BleRecentEntry& entry) { return entry.uniqueKey & 0xFFFFFFFFFFFF; }, true);
            break;
        case 1:
            sortEntriesBy(
@@ -855,6 +976,10 @@ void BLERxView::handle_entries_sort(uint8_t index) {
            sortEntriesBy(
                recent, [](const BleRecentEntry& entry) { return entry.nameString; }, true);
            break;
+        case 5:
+            sortEntriesBy(
+                recent, [](const BleRecentEntry& entry) { return entry.informationString; }, true);
+            break;
        default:
            break;
    }
@@ -862,21 +987,31 @@ void BLERxView::handle_entries_sort(uint8_t index) {
    recent_entries_view.set_dirty();
 }

-void BLERxView::handle_filter_options(uint8_t index) {
-    auto value = filter;
+bool BLERxView::handle_filter_options(uint8_t index, const BleRecentEntry& entry) {
+    const std::string& value = filter;  // no copy
+    if (value.empty()) return true;
+
    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;
+        case 0:  // Data OR Name
+            return std::string_view(entry.dataString).find(value) != std::string_view::npos || std::string_view(entry.nameString).find(value) != std::string_view::npos;
+
+        case 1:  // MAC
+            return std::string_view(to_string_mac_address(entry.packetData.macAddress, 6, false)).find(value) != std::string_view::npos;
+
+        case 2:  // Name
+            return std::string_view(entry.nameString).find(value) != std::string_view::npos;
+
+        case 3:  // Info
+            return std::string_view(entry.informationString).find(value) != std::string_view::npos;
+
+        case 4:  // Vendor
+            return std::string_view(entry.vendor_name).find(value) != std::string_view::npos;
+
+        case 5:  // Channel (string once, not per call)
+            return std::string_view(to_string_dec_int(entry.channelNumber)).find(value) != std::string_view::npos;
+
        default:
-            break;
+            return true;
    }
 }

@@ -887,76 +1022,219 @@ void BLERxView::set_parent_rect(const Rect new_parent_rect) {
 }

 BLERxView::~BLERxView() {
+    portapack::async_tx_enabled = async_tx_states_when_entered;
    receiver_model.disable();
    baseband::shutdown();
 }

-void BLERxView::updateEntry(const BlePacketData* packet, BleRecentEntry& entry, ADV_PDU_TYPE pdu_type) {
+bool 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();
+    bool success = false;

    // 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;
+    if (pdu_type == ADV_IND || pdu_type == ADV_NONCONN_IND || pdu_type == SCAN_RSP || pdu_type == ADV_SCAN_IND) {
+        if (uniqueParsing) {
+            success = parse_tracking_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString);
+        }

-        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;
-            }
+        if (!success && !uniqueParsing) {
+            success = parse_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString);
        }
    } 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);
+        if (!uniqueParsing) {
+            ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data;
+            reverse_byte_array(directed_mac_data->A1, 6);
+            success = true;
+        }
    }
+
+    if (success) {
+        int i;
+
+        for (i = 0; i < packet->dataLen; i++) {
+            data_string += to_string_hex(packet->data[i], 2);
+        }
+
+        entry.dbValue = packet->max_dB - (receiver_model.lna() + receiver_model.vga() + (receiver_model.rf_amp() ? 14 : 0));
+        entry.timestamp = to_string_timestamp(rtc_time::now());
+        entry.dataString = data_string;
+
+        entry.packetData.type = packet->type;
+        entry.packetData.size = packet->size;
+        entry.packetData.dataLen = packet->dataLen;
+
+        // 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.pduType = pdu_type;
+        entry.channelNumber = channel_number;
+        entry.numHits++;
+
+        if (entry.vendor_status == MAC_VENDOR_UNKNOWN) {
+            entry.vendor_status = lookup_mac_vendor_status(entry.packetData.macAddress, entry.vendor_name);
+        }
+
+        // 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();
+    }
+
+    return handle_filter_options(options_filter.selected_index(), entry) && success;
+}
+
+bool BLERxView::parse_tracking_beacon_data(const uint8_t* data, uint8_t length, std::string& nameString, std::string& informationString) {
+    uint8_t currentByte, currentLength, currentType = 0;
+
+    for (currentByte = 0; currentByte < length;) {
+        currentLength = data[currentByte++];
+        currentType = data[currentByte++];
+
+        // Manufacturer Specific Data (0xFF)
+        if (currentType == 0xFF && currentLength >= 4) {
+            uint16_t companyID = data[currentByte] | (data[currentByte + 1] << 8);
+
+            // Apple AirTag / Find My
+            if (companyID == 0x004C && currentLength >= 6) {
+                uint8_t appleType = data[currentByte + 2];
+                uint8_t appleLen = data[currentByte + 3];
+                if (appleType == 0x12 && appleLen == 0x19 && currentLength >= 4 + appleLen) {
+                    nameString.assign("Apple AirTag");
+                    informationString.assign("Find My");
+                    return true;
+                } else if (appleType == 0x02 && appleLen == 0x15) {
+                    uint16_t major = (data[currentByte + 20] << 8) | data[currentByte + 21];
+                    uint16_t minor = (data[currentByte + 22] << 8) | data[currentByte + 23];
+
+                    nameString.assign("iBeacon");
+                    informationString.assign(to_string_hex(major) + to_string_hex(minor));
+                    return true;
+                }
+            }
+        }
+        // Services
+        else if ((currentType == 0x02 || currentType == 0x03) && currentLength >= 3) {
+            for (int u = 0; u < currentLength - 1; u += 2) {
+                uint16_t uuid16 = data[currentByte + u] | (data[currentByte + u + 1] << 8);
+                if (uuid16 == 0x1802) {  // Immediate Alert Service = Find Me Profile
+                    nameString.assign("FindMe");
+                    informationString.assign("IAS");
+                    return true;
+                }
+            }
+        }
+        // Service Data
+        else if (currentType == 0x16 && currentLength >= 3) {
+            uint16_t uuid16 = data[currentByte] | (data[currentByte + 1] << 8);
+
+            switch (uuid16) {
+                case 0xFD59: {  // Samsung SmartTag - Unregistered
+                    nameString.assign("Samsung SmartTag");
+                    informationString.assign("Unreg");
+                    return true;
+                }
+                case 0xFD5A: {  // Samsung SmartTag - Registered
+                    nameString.assign("Samsung SmartTag");
+                    informationString.assign("Reg");
+                    return true;
+                }
+                case 0xFD84: {
+                    if (currentByte + 2 < length) {
+                        uint8_t model = data[currentByte + 2];
+                        switch (model) {
+                            case 0x01:
+                                informationString.assign("Mate");
+                                break;
+                            case 0x02:
+                                informationString.assign("Pro");
+                                break;
+                            case 0x03:
+                                informationString.assign("Slim");
+                                break;
+                            case 0x04:
+                                informationString.assign("Sticker");
+                                break;
+                            default:
+                                informationString.assign("Unknown");
+                                break;
+                        }
+                    }
+                    nameString.assign("Tile");
+                    return true;
+                }
+                case 0xFEAA: {
+                    if (currentByte + 2 < length) {
+                        uint8_t frameType = data[currentByte + 2];
+                        switch (frameType) {
+                            case 0x00:
+                                informationString.assign("UID");
+                                break;
+                            case 0x10:
+                                informationString.assign("URL");
+                                break;
+                            case 0x20:
+                                informationString.assign("TLM");
+                                break;
+                            case 0x30:
+                                informationString.assign("EID");
+                                break;
+                            default:
+                                informationString.assign("Unknown");
+                                break;
+                        }
+                    }
+                    nameString.assign("Eddystone");
+                    return true;
+                }
+            }
+        }
+
+        currentByte += (currentLength - 1);
+    }
+
+    return false;
+}
+
+bool BLERxView::parse_beacon_data(const uint8_t* data, uint8_t length, std::string& nameString, std::string& informationString) {
+    uint8_t currentByte, currentLength, currentType = 0;
+    std::string tempName = "";
+
+    for (currentByte = 0; currentByte < length;) {
+        currentLength = data[currentByte++];
+        currentType = data[currentByte++];
+
+        // Subtract 1 because type is part of the length.
+        for (int i = 0; ((i < currentLength - 1) && (currentByte < length)); i++) {
+            // parse the name of bluetooth device: 0x08->Shortened Local Name; 0x09->Complete Local Name
+            if (currentType == 0x08 || currentType == 0x09) {
+                tempName += (char)data[currentByte];
+            }
+            currentByte++;
+        }
+
+        if (!tempName.empty()) {
+            nameString = tempName;
+            break;
+        }
+    }
+
+    informationString = "";
+
+    if (!informationString.empty()) {
+        // Option to change title of Hits Column.
+        // Setting to default for now.
+        columns.set(1, "Hits", 7);
+    }
+
+    return true;
 }

 } /* namespace ui */
@@ -2,6 +2,7 @@
 * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
 * Copyright (C) 2023 TJ Baginski
+ * Copyright (C) 2025 Tommaso Ventafridda
 *
 * This file is part of PortaPack.
 *
@@ -33,6 +34,7 @@
 #include "ui_record_view.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
+#include "database.hpp"
 #include "log_file.hpp"
 #include "utility.hpp"
 #include "usb_serial_thread.hpp"
@@ -69,24 +71,35 @@ typedef enum {
    RESERVED5 = 12,
    RESERVED6 = 13,
    RESERVED7 = 14,
-    RESERVED8 = 15
+    RESERVED8 = 15,
+    UNKNOWN = 16
 } ADV_PDU_TYPE;

+typedef enum {
+    MAC_VENDOR_UNKNOWN = 0,
+    MAC_VENDOR_FOUND = 1,
+    MAC_VENDOR_NOT_FOUND = 2,
+    MAC_DB_NOT_FOUND = 3
+} MAC_VENDOR_STATUS;
+
 struct BleRecentEntry {
    using Key = uint64_t;

-    static constexpr Key invalid_key = 0xffffffff;
+    static constexpr Key invalid_key = 0xFFFFFFFFFFFFF;

-    uint64_t macAddress;
+    uint64_t uniqueKey;
    int dbValue;
    BlePacketData packetData;
    std::string timestamp;
    std::string dataString;
    std::string nameString;
+    std::string informationString;
    bool include_name;
    uint16_t numHits;
    ADV_PDU_TYPE pduType;
    uint8_t channelNumber;
+    MAC_VENDOR_STATUS vendor_status;
+    std::string vendor_name;
    bool entryFound;

    BleRecentEntry()
@@ -94,22 +107,25 @@ struct BleRecentEntry {
    }

    BleRecentEntry(
-        const uint64_t macAddress)
-        : macAddress{macAddress},
+        const uint64_t uniqueKey)
+        : uniqueKey{uniqueKey},
          dbValue{},
          packetData{},
          timestamp{},
          dataString{},
          nameString{},
+          informationString{},
          include_name{},
          numHits{},
          pduType{},
          channelNumber{},
+          vendor_status{MAC_VENDOR_UNKNOWN},
+          vendor_name{},
          entryFound{} {
    }

    Key key() const {
-        return macAddress;
+        return uniqueKey;
    }
 };

@@ -126,11 +142,11 @@ class BleRecentEntryDetailView : public View {
    void update_data();
    void focus() override;
    void paint(Painter&) override;
+    static BLETxPacket build_packet(BleRecentEntry entry_);

   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{};
@@ -139,35 +155,42 @@ class BleRecentEntryDetailView : public View {
    static constexpr uint8_t total_data_lines{5};

    Labels label_mac_address{
-        {{0 * 8, 0 * 16}, "Mac Address:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Mac Address:", Theme::getInstance()->fg_light->foreground}};

    Text text_mac_address{
-        {12 * 8, 0 * 16, 17 * 8, 16},
+        {UI_POS_X(12), UI_POS_Y(0), UI_POS_WIDTH(17), UI_POS_HEIGHT(1)},
        "-"};

    Labels label_pdu_type{
-        {{0 * 8, 1 * 16}, "PDU Type:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(1)}, "PDU Type:", Theme::getInstance()->fg_light->foreground}};

    Text text_pdu_type{
-        {9 * 8, 1 * 16, 17 * 8, 16},
+        {9 * 8, UI_POS_Y(1), 17 * 8, UI_POS_HEIGHT(1)},
+        "-"};
+
+    Labels label_vendor{
+        {{UI_POS_X(0), UI_POS_Y(2)}, "Vendor:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_vendor{
+        {7 * 8, UI_POS_Y(2), 23 * 8, UI_POS_HEIGHT(1)},
        "-"};

    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},
+        {{UI_POS_X(0), UI_POS_Y(3)}, "Len", Theme::getInstance()->fg_light->foreground},
+        {{5 * 8, UI_POS_Y(3)}, "Type", Theme::getInstance()->fg_light->foreground},
+        {{10 * 8, UI_POS_Y(3)}, "Value", Theme::getInstance()->fg_light->foreground},
    };

    Button button_send{
-        {19, 224, 96, 24},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), 224, 96, 24},
        "Send"};

    Button button_done{
-        {125, 224, 96, 24},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), 224, 96, 24},
        "Done"};

    Button button_save{
-        {72, 264, 96, 24},
+        {UI_POS_X_CENTER(12), 264, 96, 24},
        "Save"};

    bool send_updates{false};
@@ -198,15 +221,19 @@ class BLERxView : public View {
    bool saveFile(const std::filesystem::path& path);
    std::unique_ptr<UsbSerialThread> usb_serial_thread{};
    void on_data(BlePacketData* packetData);
+    void log_ble_packet(BlePacketData* packet);
    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);
+    bool handle_filter_options(uint8_t index, const BleRecentEntry& entry);
+    bool updateEntry(const BlePacketData* packet, BleRecentEntry& entry, ADV_PDU_TYPE pdu_type);
+    bool parse_beacon_data(const uint8_t* data, uint8_t length, std::string& nameString, std::string& informationString);
+    bool parse_tracking_beacon_data(const uint8_t* data, uint8_t length, std::string& nameString, std::string& informationString);

    NavigationView& nav_;
+
    RxRadioState radio_state_{
        2402000000 /* frequency */,
        4000000 /* bandwidth */,
@@ -216,9 +243,12 @@ class BLERxView : public View {
    uint8_t channel_index{0};
    uint8_t sort_index{0};
    uint8_t filter_index{0};
+    bool uniqueParsing = false;
+    bool duplicatePackets = false;
    std::string filter{};
    bool logging{false};
    bool serial_logging{false};
+    bool async_tx_states_when_entered{false};

    bool name_enable{true};
    app_settings::SettingsManager settings_{
@@ -233,6 +263,8 @@ class BLERxView : public View {
            // 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},
+            {"unique_parsing"sv, &uniqueParsing},
+            {"duplicate_packets"sv, &duplicatePackets},
        }};

    std::string str_console = "";
@@ -242,7 +274,7 @@ class BLERxView : public View {
    bool auto_channel = false;

    int16_t timer_count{0};
-    int16_t timer_period{6};  // 100ms
+    int16_t timer_period{1};  // 25ms

    std::string filterBuffer{};
    std::string listFileBuffer{};
@@ -258,11 +290,11 @@ class BLERxView : public View {
    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 header_height = 12 * 8;
    static constexpr auto switch_button_height = 3 * 16;

    OptionsField options_channel{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), UI_POS_Y(0)},
        5,
        {{"Ch.37", 37},
         {"Ch.38", 38},
@@ -270,45 +302,50 @@ class BLERxView : public View {
         {"Auto", 40}}};

    RxFrequencyField field_frequency{
-        {6 * 8, 0 * 16},
+        {UI_POS_X(6), UI_POS_Y(0)},
        nav_};

    RFAmpField field_rf_amp{
-        {16 * 8, 0 * 16}};
+        {UI_POS_X(16), UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {18 * 8, 0 * 16}};
+        {UI_POS_X(18), UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {21 * 8, 0 * 16}};
+        {UI_POS_X(21), UI_POS_Y(0)}};

    RSSI rssi{
-        {24 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(24), 0, UI_POS_WIDTH_REMAINING(6), 4}};

    Channel channel{
-        {24 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(24), 5, UI_POS_WIDTH_REMAINING(6), 4}};

    Labels label_sort{
-        {{0 * 8, 2 * 8}, "Sort:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(1)}, "Sort:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_sort{
-        {5 * 8, 2 * 8},
+        {5 * 8, UI_POS_Y(1)},
        4,
        {{"MAC", 0},
         {"Hits", 1},
         {"dB", 2},
         {"Time", 3},
-         {"Name", 4}}};
+         {"Name", 4},
+         {"Info", 5}}};

    Button button_filter{
-        {11 * 8, 2 * 8, 7 * 8, 16},
+        {11 * 8, UI_POS_Y(1), 7 * 8, 16},
        "Filter:"};

    OptionsField options_filter{
-        {18 * 8 + 2, 2 * 8},
-        4,
+        {18 * 8 + 2, UI_POS_Y(1)},
+        7,
        {{"Data", 0},
-         {"MAC", 1}}};
+         {"MAC", 1},
+         {"Name", 2},
+         {"Info", 3},
+         {"Vendor", 4},
+         {"Channel", 5}}};

    Checkbox check_log{
        {10 * 8, 4 * 8 + 2},
@@ -317,41 +354,50 @@ class BLERxView : public View {
        true};

    Checkbox check_name{
-        {0 * 8, 4 * 8 + 2},
+        {UI_POS_X(0), 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}};
+    Checkbox check_unique{
+        {0 * 8 + 2, 7 * 8 + 2},
+        7,
+        "Unique",
+        true};
+
+    Checkbox check_duplicate_packets{
+        {10 * 8 + 2, 7 * 8 + 2},
+        7,
+        "Duplicate",
+        true};
+
+    Button button_find{
+        {UI_POS_X(0), 10 * 8 - 2, 4 * 8, 16},
+        "Find"};
+
+    Labels label_found{
+        {{5 * 8, 10 * 8 - 2}, "Found:", Theme::getInstance()->fg_light->foreground}};
+
+    Text text_found_count{
+        {11 * 8, 10 * 8 - 2, 20 * 8, 16},
+        "0/0"};

    Button button_clear_list{
-        {2 * 8, 320 - (16 + 32), 7 * 8, 32},
+        {2 * 8, screen_height - (16 + 32), 7 * 8, 32},
        "Clear"};

    Button button_save_list{
-        {11 * 8, 320 - (16 + 32), 11 * 8, 32},
+        {UI_POS_X_CENTER(11), screen_height - (16 + 32), 11 * 8, 32},
        "Export CSV"};

    Button button_switch{
-        {240 - 6 * 8, 320 - (16 + 32), 4 * 8, 32},
+        {UI_POS_X_RIGHT(6), screen_height - (16 + 32), 4 * 8, 32},
        "Tx"};

    std::string str_log{""};
@@ -360,10 +406,10 @@ class BLERxView : public View {
    BleRecentEntries recent{};
    BleRecentEntries tempList{};

-    const RecentEntriesColumns columns{{
-        {"Mac Address", 17},
+    RecentEntriesColumns columns{{
+        {"Name", 0},
        {"Hits", 7},
-        {"dB", 4},
+        {"dBm", 4},
    }};

    BleRecentEntriesView recent_entries_view{columns, recent};
@@ -35,6 +35,7 @@
 #include "rtc_time.hpp"
 #include "string_format.hpp"
 #include "file_path.hpp"
+#include "usb_serial_asyncmsg.hpp"

 using namespace portapack;
 using namespace modems;
@@ -123,6 +124,31 @@ static std::uint64_t get_freq_by_channel_number(uint8_t channel_number) {

 namespace ui {

+PKT_TYPE get_pkt_type_from_string(const std::string& type_str) {
+    if (type_str == "RAW") {
+        return PKT_TYPE_RAW;
+    } else if (type_str == "DISCOVERY") {
+        return PKT_TYPE_DISCOVERY;
+    } else if (type_str == "IBEACON") {
+        return PKT_TYPE_IBEACON;
+    } else if (type_str == "ADV_IND") {
+        return PKT_TYPE_ADV_IND;
+    } else if (type_str == "ADV_DIRECT_IND") {
+        return PKT_TYPE_ADV_DIRECT_IND;
+    } else if (type_str == "ADV_NONCONN_IND") {
+        return PKT_TYPE_ADV_NONCONN_IND;
+    } else if (type_str == "ADV_SCAN_IND") {
+        return PKT_TYPE_ADV_SCAN_IND;
+    } else if (type_str == "SCAN_REQ") {
+        return PKT_TYPE_SCAN_REQ;
+    } else if (type_str == "SCAN_RSP") {
+        return PKT_TYPE_SCAN_RSP;
+    } else if (type_str == "CONNECT_REQ") {
+        return PKT_TYPE_CONNECT_REQ;
+    }
+    return PKT_TYPE_INVALID_TYPE;
+}
+
 void BLETxView::focus() {
    button_open.focus();
 }
@@ -167,28 +193,11 @@ void BLETxView::toggle() {
    }
 }

-void BLETxView::start() {
-    baseband::run_image(portapack::spi_flash::image_tag_btle_tx);
-    transmitter_model.enable();
-
+void BLETxView::send_packet() {
    // Generate new random Mac Address.
+    transmitter_model.enable();
    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);

@@ -235,9 +244,28 @@ void BLETxView::start() {
        }
    }

-    // 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);
+    progressbar.set_value(packets[current_packet].packet_count - packet_counter);
+    text_packets_sent.set(to_string_dec_uint(packet_counter));
+
+    baseband::set_btletx(channel_number, random_mac ? randomMac : packets[current_packet].macAddress, advertisementData, packets[current_packet].pduType);
+
+    packetDone = false;
+}
+
+void BLETxView::start() {
+    if (file_path.empty()) {
+        file_error();
+        check_loop.set_value(false);
+        return;
+    }
+
+    baseband::run_image(portapack::spi_flash::image_tag_btle_tx);
+    transmitter_model.enable();
+
+    button_play.set_bitmap(&bitmap_stop);
+    is_running = true;
+
+    send_packet();
 }

 void BLETxView::stop() {
@@ -253,73 +281,77 @@ void BLETxView::stop() {
    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));
+        if (is_active() && packetDone) {
+            send_packet();
        }
    }
 }

-void BLETxView::on_tx_progress(const bool done) {
+void BLETxView::on_tx_progress(const bool done, uint32_t progress) {
+    // TODO: make use of progress variable
+    (void)progress;
    if (done) {
        if (is_active()) {
-            if ((packet_counter % 10) == 0) {
-                text_packets_sent.set(to_string_dec_uint(packet_counter));
-            }
+            transmitter_model.disable();
+            if (auto_channel) {
+                switch (advCount) {
+                    case 0:
+                        channel_number = 37;
+                        break;
+                    case 1:
+                        channel_number = 38;
+                        break;
+                    case 2:
+                        channel_number = 39;
+                        break;
+                }

-            packet_counter--;
-            progressbar.set_value(packets[current_packet].packet_count - packet_counter);
+                field_frequency.set_value(get_freq_by_channel_number(channel_number));
+
+                if (advCount == 3) {
+                    channel_number = 37;
+                    packet_counter--;
+                    packetDone = true;
+                    advCount = 0;
+                } else {
+                    send_packet();
+                    advCount++;
+                }
+            } else {
+                packet_counter--;
+                packetDone = true;
+            }
+        }
+
+        // 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);
+                } else {
+                    stop();
+                }
+            } else {
+                current_packet++;
+                update_current_packet(packets[current_packet], current_packet);
+            }
        }
    }
 }

 BLETxView::BLETxView(NavigationView& nav)
    : nav_{nav} {
-    add_children({&button_open,
+    add_children({&dataEditView,
+                  &button_open,
                  &text_filename,
                  &progressbar,
                  &check_rand_mac,
@@ -330,7 +362,6 @@ BLETxView::BLETxView(NavigationView& nav)
                  &label_speed,
                  &options_speed,
                  &options_channel,
-                  &options_adv_type,
                  &label_marked_data,
                  &marked_data_sequence,
                  &label_packet_index,
@@ -340,7 +371,6 @@ BLETxView::BLETxView(NavigationView& nav)
                  &label_mac_address,
                  &text_mac_address,
                  &label_data_packet,
-                  &dataEditView,
                  &button_clear_marked,
                  &button_save_packet,
                  &button_switch});
@@ -371,13 +401,8 @@ BLETxView::BLETxView(NavigationView& nav)
        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);
+    options_channel.set_selected_index(3);

    check_rand_mac.set_value(false);
    check_rand_mac.on_select = [this](Checkbox&, bool v) {
@@ -399,6 +424,7 @@ BLETxView::BLETxView(NavigationView& nav)
            nav,
            packetFileBuffer,
            64,
+            ENTER_KEYBOARD_MODE_ALPHA,
            [this](std::string& buffer) {
                on_save_file(buffer);
            });
@@ -429,6 +455,23 @@ BLETxView::BLETxView(NavigationView& nav)
        }
    };

+    dataEditView.on_change = [this](uint8_t value) {
+        // Reject setting newline at index 29.
+        if (cursor_pos.col != 29) {
+            uint16_t dataBytePos = (cursor_pos.line * 29) + cursor_pos.col;
+
+            packets[current_packet].advertisementData[dataBytePos] = uint_to_char(value, 16);
+
+            update_current_packet(packets[current_packet], current_packet);
+        }
+    };
+
+    dataEditView.on_cursor_moved = [this]() {
+        // Save last selected cursor.
+        cursor_pos.line = dataEditView.line();
+        cursor_pos.col = dataEditView.col();
+    };
+
    button_clear_marked.on_select = [this](Button&) {
        marked_counter = 0;
        markedBytes.clear();
@@ -464,17 +507,25 @@ void BLETxView::on_file_changed(const fs::path& new_file_path) {
        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].packetType, max_packet_type_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);
+            uint64_t packetTypeSize = strlen(packets[num_packets].packetType);

            packets[num_packets].packet_count = stringToUint32(packets[num_packets].packetCount);
+            packets[num_packets].pduType = (PKT_TYPE)get_pkt_type_from_string(packets[num_packets].packetType);

            // 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)) {
+            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) &&
+                (packetTypeSize <= max_packet_type_str)) {
                text_filename.set(truncate(file_path.filename().string(), 12));

            } else {
@@ -492,6 +543,8 @@ void BLETxView::on_file_changed(const fs::path& new_file_path) {
        } while (num_packets < max_num_packets);

        update_current_packet(packets[0], 0);
+
+        data_file.close();
    }
 }

@@ -522,6 +575,8 @@ void BLETxView::update_current_packet(BLETxPacket packet, uint32_t currentIndex)

    text_mac_address.set(formattedMacAddress);

+    progressbar.set_max(packet.packet_count);
+
    packet_counter = packet.packet_count;
    current_packet = currentIndex;

@@ -530,10 +585,9 @@ void BLETxView::update_current_packet(BLETxPacket packet, uint32_t currentIndex)
    for (const std::string& str : strings) {
        dataFile.write(str.c_str(), str.size());
        dataFile.write("\n", 1);
-        ;
    }

-    dataFile.~File();
+    dataFile.close();

    auto result = FileWrapper::open(dataTempFilePath);

@@ -545,6 +599,7 @@ void BLETxView::update_current_packet(BLETxPacket packet, uint32_t currentIndex)
    dataEditView.set_font_zoom(true);
    dataEditView.set_file(*dataFileWrapper);
    dataEditView.redraw(true, true);
+    dataEditView.cursor_set(cursor_pos.line, cursor_pos.col);
 }

 void BLETxView::set_parent_rect(const Rect new_parent_rect) {
@@ -38,6 +38,8 @@
 #include "utility.hpp"
 #include "file_path.hpp"

+#include "ble_tx_app.hpp"
+
 #include "recent_entries.hpp"

 #include <string>
@@ -91,8 +93,9 @@ struct BLETxPacket {
    char macAddress[13];
    char advertisementData[63];
    char packetCount[11];
+    char packetType[17];
    uint32_t packet_count;
-    PKT_TYPE packetType;
+    PKT_TYPE pduType;
 };

 class BLETxView : public View {
@@ -109,8 +112,8 @@ class BLETxView : public View {
    bool is_active() const;
    void toggle();
    void start();
+    void send_packet();
    void stop();
-    void reset();
    void handle_replay_thread_done(const uint32_t return_code);
    void file_error();
    bool saveFile(const std::filesystem::path& path);
@@ -122,7 +125,7 @@ class BLETxView : public View {
    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_tx_progress(const bool done, uint32_t progress);
    void on_random_data_change(std::string value);
    void update_current_packet(BLETxPacket packet, uint32_t currentIndex);

@@ -156,6 +159,8 @@ class BLETxView : public View {
    uint32_t packet_counter{0};
    uint32_t num_packets{0};
    uint32_t current_packet{0};
+    uint8_t packetTxCount{0};
+    bool packetDone = false;
    bool random_mac = false;
    bool file_override = false;

@@ -170,39 +175,39 @@ class BLETxView : public View {
    std::vector<uint16_t> markedBytes{};
    CursorPos cursor_pos{};
    uint8_t marked_counter = 0;
+    uint8_t advCount = 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 uint8_t max_packet_type_str{16};
    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},
+        {UI_POS_X(0), UI_POS_Y(0), 10 * 8, 2 * 16},
        "Open file"};

    Text text_filename{
-        {11 * 8, 0 * 16, 12 * 8, 16},
+        {11 * 8, UI_POS_Y(0), UI_POS_WIDTH_REMAINING(11), 16},
        "-"};

    ProgressBar progressbar{
-        {11 * 8, 1 * 16, 9 * 8, 16}};
+        {11 * 8, 1 * 16, UI_POS_WIDTH_REMAINING(11 + 10), 16}};

    Checkbox check_rand_mac{
-        {21 * 8, 1 * 16},
+        {UI_POS_X_RIGHT(9), 1 * 16},
        6,
        "?? Mac",
        true};

    TxFrequencyField field_frequency{
-        {0 * 8, 2 * 16},
+        {UI_POS_X(0), 2 * 16},
        nav_};

    TransmitterView2 tx_view{
@@ -210,28 +215,28 @@ class BLETxView : public View {
        /*short_ui*/ true};

    Checkbox check_loop{
-        {21 * 8, 2 * 16},
+        {UI_POS_X_RIGHT(9), 2 * 16},
        4,
        "Loop",
        true};

    ImageButton button_play{
-        {28 * 8, 2 * 16, 2 * 8, 1 * 16},
+        {UI_POS_X_RIGHT(2), 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}};
+        {{UI_POS_X(0), 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
+        {{"1 ", 2},     // 25ms
+         {"2 ", 4},     // 50ms
+         {"3 ", 6},     // 75ms
+         {"4 ", 8},     // 100ms
+         {"5 ", 12}}};  // 150ms

    OptionsField options_channel{
        {11 * 8, 6 * 8},
@@ -254,7 +259,7 @@ class BLETxView : public View {
         {"CONNECT_REQ", PKT_TYPE_CONNECT_REQ}}};

    Labels label_marked_data{
-        {{0 * 8, 4 * 16}, "Marked Data:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 4 * 16}, "Marked Data:", Theme::getInstance()->fg_light->foreground}};

    OptionsField marked_data_sequence{
        {12 * 8, 8 * 8},
@@ -264,45 +269,42 @@ class BLETxView : public View {
         {"Random", 2}}};

    Labels label_packet_index{
-        {{0 * 8, 12 * 8}, "Packet Index:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 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}};
+        {{UI_POS_X(0), 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}};
+        {{UI_POS_X(0), 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}};
+        {{UI_POS_X(0), 9 * 16}, "Packet Data:", Theme::getInstance()->fg_light->foreground}};

    TextViewer dataEditView{
        {0, 9 * 18, 240, 240}};

    Button button_clear_marked{
-        {1 * 8, 14 * 16, 13 * 8, 3 * 8},
+        {UI_POS_X(1), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(13), UI_POS_HEIGHT(1.5)},
        "Clear Marked"};

    Button button_save_packet{
-        {1 * 8, 16 * 16, 13 * 8, 2 * 16},
+        {UI_POS_X(1), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(13), UI_POS_HEIGHT(2)},
        "Save Packet"};

    Button button_switch{
-        {16 * 8, 16 * 16, 13 * 8, 2 * 16},
+        {UI_POS_X_RIGHT(14), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(13), UI_POS_HEIGHT(2)},
        "Switch to Rx"};

    std::string str_log{""};
@@ -323,7 +325,7 @@ class BLETxView : public View {
        Message::ID::TXProgress,
        [this](const Message* const p) {
            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
-            this->on_tx_progress(message.done);
+            this->on_tx_progress(message.done, message.progress);
        }};

    MessageHandlerRegistration message_handler_frame_sync{
@@ -55,22 +55,24 @@ CaptureAppView::CaptureAppView(NavigationView& nav)
        this->field_frequency.set_step(v);
    };

-    option_format.set_selected_index(0);  // Default to C16
+    option_format.set_selected_index(file_format);
    option_format.on_change = [this](size_t, uint32_t file_type) {
+        file_format = file_type;
        record_view.set_file_type((RecordView::FileType)file_type);
    };

+    check_trim.set_value(trim);
    check_trim.on_select = [this](Checkbox&, bool v) {
+        trim = 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) {
+    option_bandwidth.on_change = [this](size_t, uint32_t new_capture_rate) {
        /* 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. */
+        /* capture_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. */

@@ -78,7 +80,7 @@ CaptureAppView::CaptureAppView(NavigationView& nav)

        // 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);
+        auto actual_sample_rate = record_view.set_sampling_rate(new_capture_rate);

        // Update the radio model with the actual sampling rate.
        receiver_model.set_sampling_rate(actual_sample_rate);
@@ -88,19 +90,19 @@ CaptureAppView::CaptureAppView(NavigationView& nav)
        receiver_model.set_baseband_bandwidth(anti_alias_filter_bandwidth);

        // Automatically switch default capture format to C8 when bandwidth setting is increased to >=1.5MHz anb back to C16 for <=1,25Mhz
-        if ((bandwidth >= 1500000) && (previous_bandwidth < 1500000)) {
+        if ((new_capture_rate >= 1500000) && (capture_rate < 1500000)) {
            option_format.set_selected_index(1);  // Default C8 format for REC, 1500K ... 5500k
        }
-        if ((bandwidth <= 1250000) && (previous_bandwidth > 1250000)) {
+        if ((new_capture_rate <= 1250000) && (capture_rate > 1250000)) {
            option_format.set_selected_index(0);  // Default C16 format for REC , 12k5 ... 1250K
        }
-        previous_bandwidth = bandwidth;
+        capture_rate = new_capture_rate;

        waterfall.start();
    };

    receiver_model.enable();
-    option_bandwidth.set_by_value(500000);
+    option_bandwidth.set_by_value(capture_rate);

    record_view.on_error = [&nav](std::string message) {
        nav.display_modal("Error", message);
@@ -48,39 +48,48 @@ class CaptureAppView : public View {

   private:
    static constexpr ui::Dim header_height = 3 * 16;
-    uint32_t previous_bandwidth{500000};
+
+    uint32_t capture_rate{500000};
+    uint32_t file_format{0};
+    bool trim{false};

    NavigationView& nav_;
    RxRadioState radio_state_{ReceiverModel::Mode::Capture};
    app_settings::SettingsManager settings_{
-        "rx_capture", app_settings::Mode::RX};
+        "rx_capture",
+        app_settings::Mode::RX,
+        {
+            {"capture_rate"sv, &capture_rate},
+            {"file_format"sv, &file_format},
+            {"trim"sv, &trim},
+        }};

    Labels labels{
-        {{0 * 8, 1 * 16}, "Rate:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 1 * 16}, "Rate:", Theme::getInstance()->fg_light->foreground},
        {{11 * 8, 1 * 16}, "Format:", Theme::getInstance()->fg_light->foreground},
    };

    RSSI rssi{
-        {24 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(24), 0, UI_POS_WIDTH_REMAINING(24), 4}};

    Channel channel{
-        {24 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(24), 5, UI_POS_WIDTH_REMAINING(24), 4}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        nav_};

    FrequencyStepView field_frequency_step{
-        {10 * 8, 0 * 16}};
+        {10 * 8, UI_POS_Y(0)}};

    RFAmpField field_rf_amp{
-        {16 * 8, 0 * 16}};
+        {16 * 8, UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {21 * 8, 0 * 16}};
+        {21 * 8, UI_POS_Y(0)}};

    OptionsField option_bandwidth{
        {5 * 8, 1 * 16},
@@ -100,7 +109,7 @@ class CaptureAppView : public View {
        /*small*/ true};

    RecordView record_view{
-        {0 * 8, 2 * 16, 30 * 8, 1 * 16},
+        {UI_POS_X(0), 2 * 16, screen_width, 1 * 16},
        u"BBD_????.*",
        captures_dir,
        RecordView::FileType::RawS16,
@@ -183,7 +183,7 @@ class POCSAGSettingsView : public View {
        true /*explicit_edit*/};

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

@@ -236,30 +236,30 @@ class POCSAGAppView : public View {
    uint16_t packet_count = 0;

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), 0 * 8},
        nav_};

    RFAmpField field_rf_amp{
-        {11 * 8, 0 * 16}};
+        {11 * 8, UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {16 * 8, 0 * 16}};
+        {16 * 8, UI_POS_Y(0)}};

    RSSI rssi{
-        {19 * 8 - 4, 3, 6 * 8, 4}};
+        {19 * 8 - 4, 3, UI_POS_WIDTH_REMAINING(26), 4}};
    Audio audio{
-        {19 * 8 - 4, 8, 6 * 8, 4}};
+        {19 * 8 - 4, 8, UI_POS_WIDTH_REMAINING(26), 4}};

    NumberField field_squelch{
-        {25 * 8, 0 * 16},
+        {UI_POS_X_RIGHT(6), UI_POS_Y(0)},
        2,
        {0, 99},
        1,
        ' ',
        true /*wrap*/};
    AudioVolumeField field_volume{
-        {28 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    Image image_status{
        {0 * 8 + 4, 1 * 16 + 2, 16, 16},
@@ -7,30 +7,34 @@
 namespace ui {

 // Information: a line starting with a '#' will be yellow coloured
-constexpr std::string_view authors_list[] = {
-    "#   * List of contributors *  ",
+constexpr std::string_view mayhem_information_list[] = {
+    "#****** Mayhem Community ******",
+    " ",
+    "  https://discord.mayhem.app",
+    " ",
+    "#**** List of contributors ****",
    " ",
    "#Mayhem-Firmware:",
    "jboone,eried,furrtek,",
    "NotherNgineer,gullradriel,",
    "jLynx,kallanreed,Brumi-2021,",
-    "htotoo,bernd-herzog,zxkmm,",
+    "htotoo,zxkmm,bernd-herzog,",
    "ArjanOnwezen,euquiq,u-foka,",
    "iNetro,heurist1,dqs105,",
    "teixeluis,jwetzell,",
    "jimilinuxguy,gregoryfenton,",
    "notpike,strijar,BehleZebub,",
-    "arneluehrs,rascafr,joyel24,",
-    "ImDroided,zigad,johnelder,",
-    "klockee,nnesetto,LupusE,",
-    "argilo,dc2dc,formtapez,",
+    "arneluehrs,mcules,rascafr,",
+    "joyel24,ImDroided,zigad,",
+    "johnelder,klockee,nnesetto,",
+    "LupusE,argilo,dc2dc,formtapez,",
    "RocketGod-git,mrmookie,",
    "ITAxReal,F33RNI,F4GEV,",
    "rusty-labs,mjwaxios,andrej-mk,",
    "RedFox-Fr,nemanjan00,",
    "MichalLeonBorsuk,",
-    "MatiasFernandez,Giorgiofox,",
-    "ckuethe",
+    "MatiasFernandez,Giorgiofox",
+    "TommasoVentafridda",
    " ",
    "#Havoc:",
    "jboone,furrtek,eried,argilo,",
@@ -72,7 +76,7 @@ AboutView::AboutView(NavigationView& nav) {
        button_ok.focus();
    };

-    for (auto& authors_line : authors_list) {
+    for (auto& authors_line : mayhem_information_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] == '#') {
@@ -103,15 +107,13 @@ void AboutView::on_frame_sync() {
            menu_view.set_highlighted(current + 1);
        } else {
            menu_view.set_highlighted(0);
-            // ^ to go back to the REAL top instead of make the 2 at the top to make the title disappeares
-            menu_view.set_highlighted(2);  // the first line that has human name
        }
    }
 }

 void AboutView::focus() {
    button_ok.focus();
-    menu_view.set_highlighted(2);  // the first line that has human name
+    menu_view.set_highlighted(3);  // contributors block starting line
 }

 bool AboutView::on_touch(const TouchEvent) {
@@ -6,6 +6,10 @@

 #include <cstdint>

+/*
+    TODO: Now it is dyn width. There should be an algorithm to fill the menu based on it's size.
+*/
+
 namespace ui {
 class AboutView : public View {
   public:
@@ -22,11 +26,11 @@ class AboutView : public View {
    uint16_t frame_sync_count{0};
    void on_frame_sync();
    MenuView menu_view{
-        {0, 0, 240, 264},
+        {0, 0, screen_width, screen_height - 56},
        true};

    Button button_ok{
-        {240 / 3, 270, 240 / 3, 24},
+        {screen_width / 3, screen_height - 50, screen_width / 3, 24},
        "OK",
    };

@@ -40,6 +40,8 @@ namespace pmem = portapack::persistent_memory;

 namespace ui {

+static const char speed_type_msg[][6] = {" Spd:", " IAS:", " TAS:"};
+
 static std::string get_map_tag(const AircraftRecentEntry& entry) {
    return trimr(entry.callsign.empty() ? entry.icao_str : entry.callsign);
 }
@@ -49,7 +51,8 @@ void RecentEntriesTable<AircraftRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    Color target_color;
    std::string entry_string;

@@ -68,21 +71,39 @@ void RecentEntriesTable<AircraftRecentEntries>::draw(
            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);
+    std::string ipc = (entry.callsign.empty() ? entry.icao_str + "   " : entry.callsign + " ");
+    uint8_t firstcolwidth = columns.at(0).second;
+    ipc.resize(firstcolwidth, ' ');  // Make sure this is always match the first column's width that is dynamic.
+
+    entry_string += ipc + to_string_dec_uint((unsigned int)(entry.pos.altitude / 100), 4);
+
+    if (entry.velo.type == SPD_IAS && entry.pos.alt_valid) {  // IAS can be converted to TAS
+        // It is generally accepted that for every thousand feet of altitude,
+        // true airspeed is approximately 2% higher than indicated airspeed.
+        // Since the application CPU has no floating point unit, we avoid floating point here
+        // tas = entry.velo.speed + (float)entry.pos.altitude / 1000.0 * 0.02 * entry.velo.speed;
+        unsigned int tas = entry.velo.speed + entry.pos.altitude * 2 * entry.velo.speed / 100000;
+
+        entry_string +=
+            to_string_dec_uint(tas, 4) + '*' +
+            to_string_dec_uint((unsigned int)(entry.amp >> 9), 3);
+    } else {
+        entry_string +=
+            to_string_dec_uint((unsigned int)entry.velo.speed, 4) +
+            to_string_dec_uint((unsigned int)(entry.amp >> 9), 4);
+    }
+
+    entry_string += " " +
+                    (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),
+    if (entry.pos.pos_valid)
+        painter.draw_bitmap(target_rect.location() + Point(firstcolwidth * 8 - 8, 0),
                            bitmap_target, target_color, style.background);
 }

@@ -93,22 +114,31 @@ void ADSBLogger::log(const ADSBLogEntry& log_entry) {
    log_line.reserve(100);

    log_line = log_entry.raw_data;
-    log_line += "ICAO:" + log_entry.icao;
+    log_line += " ICAO:" + log_entry.icao;
+
+    if (log_entry.sqwk)
+        log_line += " Squawk:" + to_string_dec_uint(log_entry.sqwk, 4, '0');

    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) +
+    if (log_entry.pos.alt_valid)
+        log_line += " Alt:" + to_string_dec_int(log_entry.pos.altitude);
+
+    if (log_entry.pos.pos_valid)
+        log_line += " 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);
+                    speed_type_msg[log_entry.vel.type] +
+                    to_string_dec_int(log_entry.vel.speed) +
+                    " Vrate:" + to_string_dec_int(log_entry.vel.v_rate);
+
    if (log_entry.sil != 0)
        log_line += " Sil:" + to_string_dec_uint(log_entry.sil);
+
    log_file.write_entry(log_line);
 }

@@ -258,7 +288,7 @@ ADSBRxDetailsView::ADSBRxDetailsView(
            get_map_tag(entry_),
            entry_.pos.altitude,
            GeoPos::alt_unit::FEET,
-            GeoPos::spd_unit::MPH,
+            GeoPos::spd_unit::HIDDEN,
            entry_.pos.latitude,
            entry_.pos.longitude,
            entry_.velo.heading);
@@ -356,11 +386,12 @@ void ADSBRxDetailsView::refresh_ui() {
    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) : "";
+    std::string str_sqw = (entry_.sqwk > 0) ? " Sqw:" + to_string_dec_uint(entry_.sqwk) : "";
    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);
+                       speed_type_msg[entry_.velo.type] + to_string_dec_int(entry_.velo.speed) + str_sil + str_sqw);
    else
-        text_info2.set(str_sil);
+        text_info2.set(str_sil + str_sqw);

    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));
@@ -381,7 +412,7 @@ ADSBRxView::ADSBRxView(NavigationView& nav) {
         &status_good_frame,
         &field_volume});

-    recent_entries_view.set_parent_rect({0, 16, 240, 272});
+    recent_entries_view.set_parent_rect({0, 16, screen_width, UI_POS_HEIGHT_REMAINING(2)});
    recent_entries_view.on_select = [this, &nav](const AircraftRecentEntry& entry) {
        detail_key = entry.key();
        details_view = nav.push<ADSBRxDetailsView>(entry);
@@ -421,14 +452,22 @@ void ADSBRxView::focus() {

 void ADSBRxView::on_frame(const ADSBFrameMessage* message) {
    auto frame = message->frame;
-    uint32_t ICAO_address = frame.get_ICAO_address();
    status_frame.toggle();

-    // Bad frame, skip it.
-    if (!frame.check_CRC() || ICAO_address == 0)
-        return;
+    uint32_t ICAO_address;
+    uint32_t crc = frame.check_CRC();
+
+    if (crc != 0) {
+        if (find(recent, crc) != recent.end())
+            ICAO_address = crc;
+        else
+            return;  // Bad frame, skip it.
+    } else {
+        ICAO_address = frame.get_ICAO_address();
+        if (ICAO_address == 0)
+            return;  // Bad frame, skip it.
+    }

-    ADSBLogEntry log_entry;
    status_good_frame.toggle();

    rtc::RTC datetime;
@@ -440,42 +479,68 @@ void ADSBRxView::on_frame(const ADSBFrameMessage* message) {
    entry.inc_hit();
    entry.reset_age();

+    if (pmem::beep_on_packets()) {
+        baseband::request_audio_beep(1000, 24000, 60);
+    }
+
    // 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);
+    uint8_t df = frame.get_DF();
+
+    if (df == 11)  // do not log DF11, because messages arrive too frequently
+        return;
+
+    ADSBLogEntry log_entry;
+    uint8_t* raw_data = frame.get_raw_data();
+
+    if (df & 0x10)  // 112 bits
+        log_entry.raw_data = to_string_hex_array(raw_data, 14);
+    else {  // 56 bits
+        log_entry.raw_data = to_string_hex_array(raw_data, 7);
+        log_entry.raw_data.append(14, ' ');
+    }
+
    log_entry.icao = entry.icao_str;

-    if (frame.get_DF() == DF_ADSB) {
+    // 17: // Extended squitter
+    // 18: // Extended squitter/non-transponder
+    if (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)) {
+        // transmitted when horizontal position information is not available but altitude information is available
+        if (msg_type == 0) {
+            // Q-bit must be present
+            if (raw_data[5] & 1) {
+                int altitude = ((((raw_data[5] & 0xFE) << 3) | ((raw_data[6] & 0xF0) >> 4)) * 25) - 1000;
+
+                log_entry.pos.altitude = entry.pos.altitude = altitude;
+                log_entry.pos.alt_valid = entry.pos.alt_valid = true;
+            }
+        }
+        // 1-4: Aircraft identification
+        else 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
+        // 9-18: Airborne position (w/Baro Altitude)
+        // 20-22: Airborne position (w/GNSS Height)
        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) {
+            if (entry.pos.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));
            }
-
+            // 19: Airborne velocities
        } 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;
@@ -485,11 +550,59 @@ void ADSBRxView::on_frame(const ADSBFrameMessage* message) {
        }
    }

-    logger->log(log_entry);
+    // 4: // surveillance, altitude reply
+    // 20: // Comm-B, altitude reply
+    // 21: // Comm-B, identity reply
+    if (df == 0 || df == 4 || df == 20) {  // Decode the 13 bit AC altitude field
+        uint8_t m_bit = raw_data[3] & (1 << 6);
+        uint8_t q_bit = raw_data[3] & (1 << 4);
+        int altitude = 0;

-    if (pmem::beep_on_packets()) {
-        baseband::request_audio_beep(1000, 24000, 60);
+        if (!m_bit) {     // units -> FEET
+            if (q_bit) {  // N is the 11 bit integer resulting from the removal of bit Q and M
+                int n = ((raw_data[2] & 31) << 6) |
+                        ((raw_data[3] & 0x80) >> 2) |
+                        ((raw_data[3] & 0x20) >> 1) |
+                        (raw_data[3] & 15);
+
+                // The final altitude is due to the resulting number multiplied by 25, minus 1000.
+                altitude = 25 * n - 1000;
+                if (altitude < 0)
+                    altitude = 0;
+            }  // else N is an 11 bit Gillham coded altitude
+        }
+
+        log_entry.pos.altitude = entry.pos.altitude = altitude;
+        log_entry.pos.alt_valid = entry.pos.alt_valid = true;
    }
+
+    if (df == 5 || df == 21 ||
+        (df == 17 && frame.get_msg_type() == 28 && frame.get_msg_sub() == 1)) {  // Decode the squawk code
+        uint8_t* s = (df == 17) ? raw_data + 5 : raw_data + 2;                   // calc start of the code
+        uint16_t sqwk{0};
+
+        sqwk = ((s[1] & 0x80) >> 5) | ((s[0] & 0x02) >> 0) | ((s[0] & 0x08) >> 3);  // A
+        sqwk *= 10;
+        sqwk += ((s[1] & 0x02) << 1) | ((s[1] & 0x08) >> 2) | ((s[1] & 0x20) >> 5);  // B
+        sqwk *= 10;
+        sqwk += ((s[0] & 0x01) << 2) | ((s[0] & 0x04) >> 1) | ((s[0] & 0x10) >> 4);  // C
+        sqwk *= 10;
+        sqwk += ((s[1] & 0x01) << 2) | ((s[1] & 0x04) >> 1) | ((s[1] & 0x10) >> 4);  // D
+
+        log_entry.sqwk = entry.sqwk = sqwk;
+    }
+
+    if (df == 20 || df == 21) {
+        if (raw_data[4] == 0x20) {  // try decode as BDS20
+            std::string callsign = decode_frame_id(frame);
+            if (callsign.find('#') == std::string::npos) {  // all chars OK
+                entry.set_callsign(callsign);
+                log_entry.callsign = callsign;
+            }
+        }
+    }
+
+    logger->log(log_entry);
 }

 void ADSBRxView::on_tick_second() {
@@ -525,14 +638,14 @@ void ADSBRxView::refresh_ui() {

        if (details_view->map_active()) {
            // Is it time to clear and refresh the map's markers?
-            if (ticks_since_marker_refresh >= MARKER_UPDATE_SECONDS) {
+            if (ticks_since_marker_refresh >= (details_view->get_map_type() == MAP_TYPE_OSM ? MARKER_UPDATE_SECONDS_OSM : MARKER_UPDATE_SECONDS_BIN)) {
                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;
+            ticks_since_marker_refresh = MARKER_UPDATE_SECONDS_OSM;  // this is the bigger, so set it to force
        }

        // Process the entries list.
@@ -544,7 +657,7 @@ void ADSBRxView::refresh_ui() {
            }

            // 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) {
+            if (map_needs_update && entry.pos.pos_valid && entry.state <= ADSBAgeState::Recent) {
                map_needs_update = details_view->add_map_marker(entry);
            }

@@ -64,8 +64,9 @@ namespace ui {
 #define VEL_AIR_SUBSONIC 3
 #define VEL_AIR_SUPERSONIC 4

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

 /* Thresholds (in seconds) that define the transition between ages. */
 struct ADSBAgeLimit {
@@ -95,8 +96,8 @@ struct AircraftRecentEntry {
    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};
+    adsb_pos pos{false, false, 0, 0, 0};
+    adsb_vel velo{false, SPD_GND, 0, 999, 0};
    ADSBFrame frame_pos_even{};
    ADSBFrame frame_pos_odd{};

@@ -105,6 +106,7 @@ struct AircraftRecentEntry {
    std::string info_string{};

    uint8_t sil{0};  // Surveillance integrity level
+    uint16_t sqwk{0};

    AircraftRecentEntry(const uint32_t ICAO_address)
        : ICAO_address{ICAO_address} {
@@ -152,8 +154,8 @@ struct AircraftRecentEntry {
        age += delta;

        if (age < ADSBAgeLimit::Current)
-            state = pos.valid ? ADSBAgeState::Invalid
-                              : ADSBAgeState::Current;
+            state = pos.pos_valid ? ADSBAgeState::Current
+                                  : ADSBAgeState::Invalid;

        else if (age < ADSBAgeLimit::Recent)
            state = ADSBAgeState::Recent;
@@ -178,6 +180,7 @@ struct ADSBLogEntry {
    adsb_vel vel{};
    uint8_t vel_type{};
    uint8_t sil{};
+    uint16_t sqwk{};
 };

 // TODO: Make logging optional.
@@ -205,54 +208,54 @@ class ADSBRxAircraftDetailsView : public View {

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

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

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

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

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

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

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

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

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

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

    Button button_close{
-        {9 * 8, 16 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12), UI_POS_Y(16), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
        "Back"};
 };

@@ -275,6 +278,13 @@ class ADSBRxDetailsView : public View {

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

+    MapType get_map_type() {
+        if (geomap_view_)
+            return geomap_view_->get_map_type();
+        else
+            return MapType::MAP_TYPE_BIN;  // default
+    }
+
   private:
    void refresh_ui();
    void on_gps(const GPSPosDataMessage* msg);
@@ -289,55 +299,55 @@ class ADSBRxDetailsView : public View {
    bool airline_checked{false};

    Labels labels{
-        {{0 * 8, 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 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}};
+        {{UI_POS_X(0), 2 * 16}, "Last seen:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Airline:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 5 * 16}, "Country:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 13 * 16}, "Even position frame:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 15 * 16}, "Odd position frame:", Theme::getInstance()->fg_light->foreground}};

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

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

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

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

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

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

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

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

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

    Button button_see_map{
-        {16 * 8, 9 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12) + UI_POS_X(8), UI_POS_Y(9), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
        "See on map"};

    MessageHandlerRegistration message_handler_gps{
@@ -386,15 +396,15 @@ class ADSBRxView : public View {

    SignalToken signal_token_tick_second{};
    uint8_t tick_count = 0;
-    uint16_t ticks_since_marker_refresh{MARKER_UPDATE_SECONDS};
+    uint16_t ticks_since_marker_refresh{MARKER_UPDATE_SECONDS_OSM};

    /* 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},
+    RecentEntriesColumns columns{
+        {{"ICAO/Call", 0},
         {"Lvl", 3},
         {"Spd", 3},
         {"Amp", 3},
@@ -414,33 +424,33 @@ class ADSBRxView : public View {
    ADSBRxDetailsView* details_view{nullptr};

    Labels labels{
-        {{0 * 8, 0 * 8}, "LNA:   VGA:   AMP:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), UI_POS_Y(0)}, "LNA:   VGA:   AMP:", Theme::getInstance()->fg_light->foreground}};

    LNAGainField field_lna{
-        {4 * 8, 0 * 16}};
+        {UI_POS_X(4), UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {11 * 8, 0 * 16}};
+        {UI_POS_X(11), UI_POS_Y(0)}};

    RFAmpField field_rf_amp{
-        {18 * 8, 0 * 16}};
+        {UI_POS_X(18), UI_POS_Y(0)}};

    RSSI rssi{
-        {20 * 8, 4, 7 * 8, 8},
+        {UI_POS_X(20), 4, UI_POS_WIDTH_REMAINING(23), 8},
    };

    ActivityDot status_frame{
-        {27 * 8 + 2, 5, 2, 2},
+        {UI_POS_X_RIGHT(3) + 2, 5, 2, 2},
        Theme::getInstance()->bg_darkest->foreground,
    };

    ActivityDot status_good_frame{
-        {27 * 8 + 2, 9, 2, 2},
+        {UI_POS_X_RIGHT(3) + 2, 9, 2, 2},
        Theme::getInstance()->fg_green->foreground,
    };

    AudioVolumeField field_volume{
-        {28 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    MessageHandlerRegistration message_handler_frame{
        Message::ID::ADSBFrame,
@@ -42,7 +42,8 @@ void RecentEntriesTable<APRSRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    Color target_color;
    // auto entry_age = entry.age;

@@ -51,8 +52,8 @@ void RecentEntriesTable<APRSRecentEntries>::draw(
    std::string entry_string = "";

    entry_string += entry.source_formatted;
-    entry_string.append(10 - entry.source_formatted.size(), ' ');
-    entry_string += "       ";
+    entry_string.resize(columns.at(0).second, ' ');
+    entry_string += "        ";
    entry_string += (entry.hits <= 999 ? to_string_dec_uint(entry.hits, 4) : "999+");
    entry_string += " ";
    entry_string += entry.time_string;
@@ -99,13 +100,21 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect)
            field_frequency.set_value(aprs_rx_freq);
        } else if (i == 1) {  // NA - North America - is also the default
            field_frequency.set_value(144390000);
-        } else if (i == 2) {  // EUR
-            field_frequency.set_value(144800000);
-        } else if (i == 3) {  // AUS
-            field_frequency.set_value(145175000);
-        } else if (i == 4) {  // NZ
+        } else if (i == 2) {  // NZ
            field_frequency.set_value(144575000);
-        } else if (i == 5) {  // ISS
+        } else if (i == 3) {  // JAP
+            field_frequency.set_value(144640000);
+        } else if (i == 4) {  // PHI
+            field_frequency.set_value(144740000);
+        } else if (i == 5) {  // EUR
+            field_frequency.set_value(144800000);
+        } else if (i == 6) {  // THA
+            field_frequency.set_value(144900000);
+        } else if (i == 7) {  // AUS
+            field_frequency.set_value(145175000);
+        } else if (i == 8) {  // BR
+            field_frequency.set_value(145570000);
+        } else if (i == 9) {  // ISS
            field_frequency.set_value(145825000);
        }
        options_region_id = i;
@@ -239,8 +248,8 @@ APRSTableView::APRSTableView(NavigationView& nav, Rect parent_rec)

    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.set_parent_rect({0, 0, screen_width, screen_height - 40});
+    details_view.set_parent_rect({0, 0, screen_width, screen_height - 40});

    recent_entries_view.on_select = [this](const APRSRecentEntry& entry) {
        this->on_show_detail(entry);
@@ -134,14 +134,14 @@ class APRSDetailsView : public View {
    bool send_updates{false};

    Console console{
-        {0, 0 * 16, 240, 224}};
+        {UI_POS_X(0), UI_POS_Y(0), screen_width, screen_height - 80}};

    Button button_done{
-        {160, 14 * 16, 8 * 8, 3 * 16},
+        {UI_POS_X_CENTER(4) - UI_POS_WIDTH(8), UI_POS_Y(14), UI_POS_WIDTH(8), UI_POS_HEIGHT(3)},
        "Close"};

    Button button_see_map{
-        {80, 14 * 16, 8 * 8, 3 * 16},
+        {UI_POS_X_CENTER(4) + UI_POS_WIDTH(8), UI_POS_Y(14), UI_POS_WIDTH(8), UI_POS_HEIGHT(3)},
        "Map"};
 };

@@ -161,10 +161,10 @@ class APRSTableView : public View {

   private:
    NavigationView& nav_;
-    const RecentEntriesColumns columns{{{"Source", 9},
-                                        {"Loc", 6},
-                                        {"Hits", 4},
-                                        {"Time", 8}}};
+    RecentEntriesColumns columns{{{"Source", 0},
+                                  {"Loc", 6},
+                                  {"Hits", 4},
+                                  {"Time", 8}}};
    APRSRecentEntries recent{};
    RecentEntriesView<RecentEntries<APRSRecentEntry>> recent_entries_view{columns, recent};
    APRSDetailsView details_view{nav_};
@@ -209,35 +209,39 @@ class APRSRxView : public View {
    std::string str_log{""};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {UI_POS_X(13), UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {UI_POS_X(15), UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {UI_POS_X(18), UI_POS_Y(0)}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(21), 0, UI_POS_WIDTH_REMAINING(21) - UI_POS_WIDTH(2), 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(21) - UI_POS_WIDTH(2), 4}};

    AudioVolumeField field_volume{
-        {28 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    OptionsField options_region{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), UI_POS_Y(0)},
        3,
        {{"MAN", 0},
         {"NA ", 1},
-         {"EUR", 2},
-         {"AUS", 3},
-         {"NZ ", 4},
-         {"ISS", 5}}};
+         {"NZ ", 2},
+         {"JAP", 3},
+         {"PHI", 4},
+         {"EUR", 5},
+         {"THA", 6},
+         {"AUS", 7},
+         {"BR ", 8},
+         {"ISS", 9}}};

    FrequencyField field_frequency{
-        {3 * 8, 0 * 16}};
+        {UI_POS_X(3), UI_POS_Y(0)}};

    // DEBUG
    RecordView record_view{
-        {0 * 8, 1 * 16, 30 * 8, 1 * 16},
+        {UI_POS_X(0), UI_POS_Y(1), UI_POS_MAXWIDTH, UI_POS_HEIGHT(1)},
        u"AFS_????.WAV",
        aprs_dir,
        RecordView::FileType::WAV,
@@ -245,7 +249,7 @@ class APRSRxView : public View {
        4};

    Console console{
-        {0, 2 * 16, 240, 240}};
+        {UI_POS_X(0), UI_POS_Y(2), UI_POS_MAXWIDTH, screen_height - 80}};

    std::unique_ptr<APRSLogger> logger{};
 };
@@ -261,7 +265,7 @@ class APRSRXView : public View {

   private:
    NavigationView& nav_;
-    Rect view_rect = {0, 3 * 8, 240, 280};
+    Rect view_rect = {UI_POS_X(0), 3 * 8, UI_POS_MAXWIDTH, screen_height - 40};

    APRSRxView view_stream{nav_, view_rect};
    APRSTableView view_table{nav_, view_rect};
@@ -94,6 +94,7 @@ APRSTXView::APRSTXView(NavigationView& nav) {
            nav,
            payload,
            30,
+            ENTER_KEYBOARD_MODE_ALPHA,
            [this](std::string& s) {
                text_payload.set(s);
            });
@@ -61,9 +61,9 @@ class APRSTXView : public View {
    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},
+        {{UI_POS_X(0), 1 * 16}, "Source:       SSID:", Theme::getInstance()->fg_light->foreground},  // 6 alphanum + SSID
+        {{UI_POS_X(0), 2 * 16}, " Dest.:       SSID:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 4 * 16}, "Info field:", Theme::getInstance()->fg_light->foreground},
    };

    SymField sym_source{
@@ -91,14 +91,14 @@ class APRSTXView : public View {
        ' '};

    Text text_payload{
-        {0 * 8, 5 * 16, 30 * 8, 16},
+        {UI_POS_X(0), 5 * 16, screen_width, 16},
        "-"};
    Button button_set{
-        {0 * 8, 6 * 16, 80, 32},
+        {UI_POS_X(0), 6 * 16, 80, 32},
        "Set"};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        5000,
        0  // disable setting bandwith, since APRS used fixed 10k bandwidth
    };
@@ -90,7 +90,7 @@ class BattinfoView : public View {
        "-"};

    Text text_warn{
-        {1 * 8, 8 * 16, 30 * 8, 2 * 16},
+        {1 * 8, 8 * 16, screen_width, 2 * 16},
        ""}; */

    Button button_mode{
@@ -98,7 +98,7 @@ class BattinfoView : public View {
        "Volt"};

    Button button_exit{
-        {72, 17 * 16, 96, 32},
+        {UI_POS_X_CENTER(12), 17 * 16, UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
        "Back"};
    static msg_t static_fn(void* arg);
    Thread* thread{nullptr};
@@ -42,7 +42,7 @@ class BMPFileViewer : public View {
   private:
    NavigationView& nav_;
    std::filesystem::path path_{};
-    BMPViewer bmp{{0, 0, 240, 320}};
+    BMPViewer bmp{{0, 0, screen_width, screen_height}};
 };

 }  // namespace ui
@@ -63,26 +63,26 @@ class BTLERxView : public View {
    static constexpr uint8_t channel_number = 37;

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {UI_POS_X(13), UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {UI_POS_X(15), UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {UI_POS_X(18), UI_POS_Y(0)}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {UI_POS_X(21), UI_POS_Y(0), UI_POS_WIDTH_REMAINING(21), 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4}};
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(21), 4}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        nav_};

    Button button_modem_setup{
-        {240 - 12 * 8, 1 * 16, 96, 24},
+        {screen_width - 12 * 8, UI_POS_Y(1), 96, 24},
        "Modem setup"};

    Console console{
-        {0, 4 * 16, 240, 240}};
+        {0, 4 * 16, screen_width, screen_height - 80}};

    MessageHandlerRegistration message_handler_packet{
        Message::ID::AFSKData,
@@ -202,10 +202,10 @@ RegistersView::RegistersView(
    };
    button_done.on_select = [&nav](Button&) { nav.pop(); };

-    registers_widget.set_parent_rect({0, 48, 240, 192});
+    registers_widget.set_parent_rect({0, 48, screen_width, 192});
    registers_widget.set_page(0);

-    text_title.set_parent_rect({(240 - static_cast<int>(title.size()) * 8) / 2, 16,
+    text_title.set_parent_rect({(screen_width - static_cast<int>(title.size()) * 8) / 2, 16,
                                static_cast<int>(title.size()) * 8, 16});
    text_title.set(title);

@@ -419,7 +419,6 @@ void DebugMenuView::on_populate() {
    }
    add_items({
        {"Buttons Test", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_controls, [this]() { nav_.push<DebugControlsView>(); }},
-        {"Debug Dump", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { portapack::persistent_memory::debug_dump(); }},
        {"M0 Stack Dump", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { stack_dump(); }},
        {"Memory Dump", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { nav_.push<DebugMemoryDumpView>(); }},
        {"Peripherals", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_peripherals, [this]() { nav_.push<DebugPeripheralsMenuView>(); }},
@@ -483,7 +482,7 @@ DebugPmemView::DebugPmemView(NavigationView& nav)
    : registers_widget(RegistersWidgetConfig{CT_PMEM, PMEM_SIZE_BYTES, page_size, 8}) {
    add_children({&registers_widget, &text_checksum, &text_checksum2, &button_ok});

-    registers_widget.set_parent_rect({0, 32, 240, 192});
+    registers_widget.set_parent_rect({0, 32, screen_width, 192});

    text_checksum.set("Size: " + to_string_dec_uint(portapack::persistent_memory::data_size(), 3) + "  CRC: " + to_string_hex(portapack::persistent_memory::pmem_stored_checksum(), 8));
    text_checksum2.set("Calculated CRC: " + to_string_hex(portapack::persistent_memory::pmem_calculated_checksum(), 8));
@@ -242,9 +242,9 @@ class DebugControlsView : public View {

   private:
    Labels labels{
-        {{8 * 8, 1 * 16}, "Controls State", Theme::getInstance()->bg_darkest->foreground},
-        {{0 * 8, 11 * 16}, "Dial:", Theme::getInstance()->fg_medium->foreground},
-        {{0 * 8, 14 * 16}, "Long-Press Mode:", Theme::getInstance()->fg_medium->foreground}};
+        {{UI_POS_X_CENTER(14), 1 * 16}, "Controls State", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X(0), 11 * 16}, "Dial:", Theme::getInstance()->fg_medium->foreground},
+        {{UI_POS_X(0), 14 * 16}, "Long-Press Mode:", Theme::getInstance()->fg_medium->foreground}};

    ControlsSwitchesWidget switches_widget{
        {80, 80, 80, 112},
@@ -259,7 +259,7 @@ class DebugControlsView : public View {
        }};

    Button button_done{
-        {72, 264, 96, 24},
+        {UI_POS_X_CENTER(12), 264, 96, 24},
        "Done"};
 };

@@ -271,28 +271,28 @@ class DebugMemoryDumpView : public View {

   private:
    Button button_dump{
-        {72, 4 * 16, 96, 24},
+        {UI_POS_X_CENTER(12), 4 * 16, 96, 24},
        "Dump"};

    Button button_read{
-        {16, 11 * 16, 96, 24},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(10), 11 * 16, 96, 24},
        "Read"};

    Button button_write{
-        {128, 11 * 16, 96, 24},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(10), 11 * 16, 96, 24},
        "Write"};

    Button button_done{
-        {128, 240, 96, 24},
+        {UI_POS_X_RIGHT(12), UI_POS_Y_BOTTOM(3), 96, 24},
        "Done"};

    Labels labels{
        {{5 * 8, 1 * 16}, "Dump Range to File", Theme::getInstance()->fg_yellow->foreground},
-        {{0 * 8, 2 * 16}, "Starting Address: 0x", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 3 * 16}, "Byte Count:       0x", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 2 * 16}, "Starting Address: 0x", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Byte Count:       0x", Theme::getInstance()->fg_light->foreground},
        {{3 * 8, 8 * 16}, "Read/Write Single Word", Theme::getInstance()->fg_yellow->foreground},
-        {{0 * 8, 9 * 16}, "Memory Address:   0x", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 10 * 16}, "Data Value:       0x", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 9 * 16}, "Memory Address:   0x", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 10 * 16}, "Data Value:       0x", Theme::getInstance()->fg_light->foreground}};

    SymField field_starting_address{
        {20 * 8, 2 * 16},
@@ -332,7 +332,7 @@ class DebugPmemView : public View {
    Text text_checksum2{{16, 248, 208, 16}};

    Button button_ok{
-        {240 / 3, 270, 240 / 3, 24},
+        {screen_width / 3, 270, screen_width / 3, 24},
        "OK",
    };

@@ -364,7 +364,7 @@ public:

 private:
        Console console {
-                { 8, 16, 224, 240 }
+                { 8, 16, 224, screen_height-80 }
        };

        Button button_exit {
@@ -12,7 +12,7 @@ BatteryCapacityView::RegisterEntry BatteryCapacityView::get_entry(size_t index)

 BatteryCapacityView::BatteryCapacityView(NavigationView& nav) {
    for (size_t i = 0; i < ENTRIES_PER_PAGE; ++i) {
-        name_texts[i].set_parent_rect({0 * 8, static_cast<int>((i + 1) * 16), 8 * 8, 16});
+        name_texts[i].set_parent_rect({UI_POS_X(0), static_cast<int>((i + 1) * 16), 8 * 8, 16});
        addr_texts[i].set_parent_rect({9 * 8, static_cast<int>((i + 1) * 16), 4 * 8, 16});
        hex_texts[i].set_parent_rect({14 * 8, static_cast<int>((i + 1) * 16), 6 * 8, 16});
        value_texts[i].set_parent_rect({21 * 8, static_cast<int>((i + 1) * 16), 10 * 8, 16});
@@ -24,18 +24,18 @@ class BatteryCapacityView : public View {
    static RegisterEntry get_entry(size_t index);

    Labels labels{
-        {{0 * 8, 0 * 16}, "Reg", Theme::getInstance()->fg_yellow->foreground},
-        {{9 * 8, 0 * 16}, "Addr", Theme::getInstance()->fg_yellow->foreground},
-        {{14 * 8, 0 * 16}, "Hex", Theme::getInstance()->fg_yellow->foreground},
-        {{21 * 8, 0 * 16}, "Value", Theme::getInstance()->fg_yellow->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Reg", Theme::getInstance()->fg_yellow->foreground},
+        {{9 * 8, UI_POS_Y(0)}, "Addr", Theme::getInstance()->fg_yellow->foreground},
+        {{14 * 8, UI_POS_Y(0)}, "Hex", Theme::getInstance()->fg_yellow->foreground},
+        {{21 * 8, UI_POS_Y(0)}, "Value", Theme::getInstance()->fg_yellow->foreground},
    };
    std::array<Text, 16> name_texts = {};
    std::array<Text, 16> addr_texts = {};
    std::array<Text, 16> hex_texts = {};
    std::array<Text, 16> value_texts = {};

-    Text page_text{{144, 284, 80, 16}, "Page 1/1"};
-    Button button_done{{16, 280, 96, 24}, "Done"};
+    Text page_text{{144, UI_POS_Y_BOTTOM(3), 80, 16}, "Page 1/1"};
+    Button button_done{{16, UI_POS_Y_BOTTOM(3), 96, 24}, "Done"};

    void update_values();
    void populate_page(int start_index);
@@ -25,7 +25,6 @@
 #include "ui_transmitter.hpp"
 #include "transmitter_model.hpp"
 #include "encoders.hpp"
-#include "de_bruijn.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"

@@ -125,7 +124,7 @@ class EncodersConfigView : public View {
        ""};

    Waveform waveform{
-        {0, 17 * 8, 240, 32},
+        {0, 17 * 8, screen_width, 32},
        waveform_buffer,
        0,
        0,
@@ -202,7 +201,7 @@ class EncodersView : public View {
    void start_tx(const bool scan);
    void on_tx_progress(const uint32_t progress, const bool done);

-    Rect view_rect = {0, 4 * 8, 240, 168};
+    Rect view_rect = {0, 4 * 8, screen_width, 168};

    EncodersConfigView view_config{nav_, view_rect};
    EncodersScanView view_scan{nav_, view_rect};
@@ -217,10 +216,10 @@ class EncodersView : public View {
        "Ready"};

    ProgressBar progressbar{
-        {2 * 8, 13 * 16 + 20, 208, 16}};
+        {2 * 8, 13 * 16 + 20, UI_POS_WIDTH_REMAINING(4), 16}};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        50000,
        9};

@@ -92,12 +92,21 @@ void ExternalModuleView::on_tick_second() {
            case app_location_t::TX:
                btnText += " (TX)";
                break;
+            case app_location_t::TRX:
+                btnText += " (TRX)";
+                break;
+            case app_location_t::SETTINGS:
+                btnText += " (Settings)";
+                break;
            case app_location_t::DEBUG:
                btnText += " (Debug)";
                break;
            case app_location_t::HOME:
                btnText += " (Home)";
                break;
+            case app_location_t::GAMES:
+                btnText += " (Games)";
+                break;
        }

        switch (i) {
@@ -119,4 +128,5 @@ void ExternalModuleView::on_tick_second() {
        }
    }
 }
+
 }  // namespace ui
@@ -84,7 +84,7 @@ class ExternalModuleView : public View {
    Text text_app5_name{{24, 160, 200, 16}};

    Button dummy{
-        {240, 0, 0, 0},
+        {screen_width, 0, 0, 0},
        ""};

    SignalToken signal_token_tick_second{};
@@ -228,6 +228,8 @@ void FileManBaseView::load_directory_contents(const fs::path& dir_path) {

    text_current.set(dir_path.empty() ? "(sd root)" : truncate(dir_path, 24));

+    // Collect all entries first
+    std::list<fileman_entry> all_entries;
    for (const auto& entry : fs::directory_iterator(dir_path, u"*")) {
        // Hide files starting with '.' (hidden / tmp).
        if (!show_hidden_files && is_hidden_file(entry.path()))
@@ -235,36 +237,40 @@ void FileManBaseView::load_directory_contents(const fs::path& dir_path) {

        if (fs::is_regular_file(entry.status())) {
            if (!filtering || path_iequal(entry.path().extension(), extension_filter) || (cxx_file && is_cxx_capture_file(entry.path())))
-                insert_sorted(entry_list, {entry.path().string(), (uint32_t)entry.size(), false});
+                insert_sorted(all_entries, {entry.path().string(), (uint32_t)entry.size(), false});
        } else if (fs::is_directory(entry.status())) {
-            insert_sorted(entry_list, {entry.path().string(), 0, true});
+            insert_sorted(all_entries, {entry.path().string(), 0, true});
        }
    }

-    // paginating
-    auto list_size = entry_list.size();
-    nb_pages = 1 + (list_size / items_per_page);
-    size_t start = pagination * items_per_page;
-    size_t stop = start + items_per_page;
-    if (list_size > start) {
-        if (list_size < stop)
-            stop = list_size;
-        entry_list.erase(std::next(entry_list.begin(), stop), entry_list.end());
-        entry_list.erase(entry_list.begin(), std::next(entry_list.begin(), start));
+    // Calculate pagination
+    nb_pages = (all_entries.size() + items_per_page - 1) / items_per_page;
+    if (nb_pages == 0) nb_pages = 1;
+
+    size_t start_idx = pagination * items_per_page;
+    size_t end_idx = std::min(start_idx + items_per_page, all_entries.size());
+
+    // Add "parent" directory if not at the root and on first page
+    if (!dir_path.empty() && pagination == 0) {
+        entry_list.push_back({parent_dir_path.string(), 0, true});
    }

-    // Add "parent" directory if not at the root.
-    if (!dir_path.empty() && pagination == 0)
-        entry_list.insert(entry_list.begin(), {parent_dir_path.string(), 0, true});
-
-    // add next page
-    if (list_size > start + items_per_page) {
-        entry_list.push_back({str_next, (uint32_t)pagination + 1, true});
-    }
-
-    // add prev page
+    // Add prev page navigation if not on first page
    if (pagination > 0) {
-        entry_list.insert(entry_list.begin(), {str_back, (uint32_t)pagination - 1, true});
+        entry_list.push_back({str_back, (uint32_t)pagination - 1, true});
+    }
+
+    // Add entries for current page
+    auto it = all_entries.begin();
+    std::advance(it, start_idx);
+
+    for (size_t i = start_idx; i < end_idx && it != all_entries.end(); i++, ++it) {
+        entry_list.push_back(*it);
+    }
+
+    // Add next page navigation if not on last page
+    if (end_idx < all_entries.size()) {
+        entry_list.push_back({str_next, (uint32_t)pagination + 1, true});
    }
 }

@@ -288,6 +294,7 @@ FileManBaseView::FileManBaseView(
    std::string filter)
    : nav_{nav},
      extension_filter{filter} {
+    max_filename_length = screen_width / 8 - 10;
    add_children({&labels,
                  &text_current,
                  &button_exit});
@@ -320,30 +327,49 @@ void FileManBaseView::focus() {
    } else {
        menu_view.focus();
    }
+
+    // Set menu to the correct page and select the correct item
+    menu_view.set_highlighted(prev_highlight % items_per_page);
 }

+// Push directory - store the global index (page * items_per_page + local_index)
 void FileManBaseView::push_dir(const fs::path& path) {
    if (path == parent_dir_path) {
        pop_dir();
    } else {
+        // Save global index (combines page number and item position)
+        saved_index_stack.push_back(menu_view.highlighted_index() + (pagination * items_per_page));
+
        current_path /= path;
-        saved_index_stack.push_back(menu_view.highlighted_index());
-        menu_view.set_highlighted(0);
-        reload_current(true);
+        reload_current(true);  // Reset pagination when entering new directory
    }
 }

 void FileManBaseView::pop_dir() {
-    if (saved_index_stack.empty())
+    if (current_path.empty()) {
        return;
+    }

+    // Move to parent directory
    current_path = current_path.parent_path();
-    reload_current(true);
-    menu_view.set_highlighted(saved_index_stack.back());
-    saved_index_stack.pop_back();
+
+    // Restore the previous global index if available
+    if (!saved_index_stack.empty()) {
+        uint32_t global_index = saved_index_stack.back();
+        saved_index_stack.pop_back();
+
+        // Calculate pagination from global index
+        pagination = global_index / items_per_page;
+
+        // Calculate local index within the page
+        prev_highlight = global_index % items_per_page;
+        restoring_navigation = true;
+    }
+
+    reload_current(false);  // Important: don't reset pagination
 }

-std::string get_extension(std::string t) {
+std::string FileManBaseView::get_extension(const std::string& t) const {
    const auto index = t.find_last_of(u'.');
    if (index == t.npos) {
        return {};
@@ -372,11 +398,13 @@ void FileManBaseView::refresh_list() {
    if (on_refresh_widgets)
        on_refresh_widgets(false);

-    prev_highlight = menu_view.highlighted_index();
+    if (!restoring_navigation) {
+        prev_highlight = menu_view.highlighted_index();
+    }
    menu_view.clear();

    for (const auto& entry : entry_list) {
-        auto entry_name = std::string{entry.path.length() <= 20 ? entry.path : entry.path.substr(0, 20)};
+        auto entry_name = std::string{entry.path.length() <= max_filename_length ? entry.path : entry.path.substr(0, max_filename_length)};

        if (entry.is_directory) {
            std::string size_str{};
@@ -387,7 +415,7 @@ void FileManBaseView::refresh_list() {
            }

            menu_view.add_item(
-                {entry_name.substr(0, max_filename_length) + std::string(21 - entry_name.length(), ' ') + size_str,
+                {entry_name.substr(0, max_filename_length) + std::string((max_filename_length + 1) - entry_name.length(), ' ') + size_str,
                 Theme::getInstance()->fg_yellow->foreground,
                 &bitmap_icon_dir,
                 [this](KeyEvent key) {
@@ -400,7 +428,7 @@ void FileManBaseView::refresh_list() {
            auto size_str = to_string_file_size(entry.size);

            menu_view.add_item(
-                {entry_name.substr(0, max_filename_length) + std::string(21 - entry_name.length(), ' ') + size_str,
+                {entry_name.substr(0, max_filename_length) + std::string((max_filename_length + 1) - entry_name.length(), ' ') + size_str,
                 assoc.color,
                 assoc.icon,
                 [this](KeyEvent key) {
@@ -411,14 +439,29 @@ void FileManBaseView::refresh_list() {
    }

    menu_view.set_highlighted(prev_highlight);
+    restoring_navigation = false;
 }

 void FileManBaseView::reload_current(bool reset_pagination) {
-    if (reset_pagination) pagination = 0;
+    // Only reset pagination if explicitly requested
+    if (reset_pagination) {
+        pagination = 0;
+    }
    load_directory_contents(current_path);
    refresh_list();
 }

+void FileManBaseView::copy_waterfall(std::filesystem::path path) {
+    nav_.push<ModalMessageView>(
+        "Install", " Use this gradient file\n for all waterfalls?", YESNO,
+        [this, path](bool choice) {
+            if (choice) {
+                delete_file(default_gradient_file);
+                copy_file(path, default_gradient_file);
+            }
+        });
+}
+
 const FileManBaseView::file_assoc_t& FileManBaseView::get_assoc(
    const fs::path& ext) const {
    size_t index = 0;
@@ -444,7 +487,7 @@ FileLoadView::FileLoadView(
    add_children({&menu_view});

    // Resize menu view to fill screen
-    menu_view.set_parent_rect({0, 3 * 8, 240, 29 * 8});
+    menu_view.set_parent_rect({0, 3 * 8, screen_width, UI_POS_HEIGHT_REMAINING(4.5)});

    refresh_list();

@@ -478,63 +521,6 @@ void FileLoadView::refresh_widgets(const bool) {
    set_dirty();
 }

-/* FileSaveView **************************************************************/
-/*
-FileSaveView::FileSaveView(
-        NavigationView& nav,
-        const fs::path& path,
-        const fs::path& file
-) : nav_{ nav },
-        path_{ path },
-        file_{ file }
-{
-        add_children({
-                &text_path,
-                &button_edit_path,
-                &text_name,
-                &button_edit_name,
-                &button_save,
-                &button_cancel,
-        });
-
-        button_edit_path.on_select = [this](Button&) {
-                buffer_ = path_.string();
-                text_prompt(nav_, buffer_, max_filename_length,
-                        [this](std::string&) {
-                                path_ = buffer_;
-                                refresh_widgets();
-                        });
-        };
-
-        button_edit_name.on_select = [this](Button&) {
-                buffer_ = file_.string();
-                text_prompt(nav_, buffer_, max_filename_length,
-                        [this](std::string&) {
-                                file_ = buffer_;
-                                refresh_widgets();
-                        });
-        };
-
-        button_save.on_select = [this](Button&) {
-                if (on_save)
-                        on_save(path_ / file_);
-                else
-                        nav_.pop();
-        };
-
-        button_cancel.on_select = [this](Button&) {
-                nav_.pop();
-        };
-
-        refresh_widgets();
-}
-
-void FileSaveView::refresh_widgets() {
-        text_path.set(truncate(path_, 30));
-        text_name.set(truncate(file_, 30));
-        set_dirty();
-}
-*/
 /* FileManagerView ***********************************************************/

 void FileManagerView::refresh_widgets(const bool v) {
@@ -566,7 +552,7 @@ void FileManagerView::on_rename(std::string_view hint) {
        cursor_pos = pos;

    text_prompt(
-        nav_, name_buffer, cursor_pos, max_filename_length,
+        nav_, name_buffer, cursor_pos, max_filename_length, ENTER_KEYBOARD_MODE_ALPHA,
        [this](std::string& renamed) {
            auto renamed_path = fs::path{renamed};
            rename_file(get_selected_full_path(), current_path / renamed_path);
@@ -640,7 +626,7 @@ void FileManagerView::on_clean() {

 void FileManagerView::on_new_dir() {
    name_buffer = "";
-    text_prompt(nav_, name_buffer, max_filename_length, [this](std::string& dir_name) {
+    text_prompt(nav_, name_buffer, max_filename_length, ENTER_KEYBOARD_MODE_ALPHA, [this](std::string& dir_name) {
        make_new_directory(current_path / dir_name);
        reload_current(true);
    });
@@ -671,7 +657,7 @@ void FileManagerView::on_paste() {

 void FileManagerView::on_new_file() {
    name_buffer = "";
-    text_prompt(nav_, name_buffer, max_filename_length, [this](std::string& file_name) {
+    text_prompt(nav_, name_buffer, max_filename_length, ENTER_KEYBOARD_MODE_ALPHA, [this](std::string& file_name) {
        make_new_file(current_path / file_name);
        reload_current(true);
    });
@@ -685,7 +671,11 @@ bool FileManagerView::handle_file_open() {
    auto ext = path.extension();

    if (path_iequal(txt_ext, ext)) {
-        nav_.push<TextEditorView>(path);
+        if (path_iequal(current_path, u"/" + waterfalls_dir)) {
+            copy_waterfall(path);
+        } else {
+            nav_.push<TextEditorView>(path);
+        }
        return true;
    } else if (is_cxx_capture_file(path) || path_iequal(ppl_ext, ext)) {
        // TODO: Enough memory to push?
@@ -64,7 +64,8 @@ class FileManBaseView : public View {
    uint32_t prev_highlight = 0;
    uint8_t pagination = 0;
    uint8_t nb_pages = 1;
-    static constexpr size_t max_filename_length = 20;
+    bool restoring_navigation = false;
+    size_t max_filename_length = 20;
    static constexpr size_t max_items_loaded = 75;  // too memory hungry, so won't sort it
    static constexpr size_t items_per_page = 20;

@@ -96,6 +97,8 @@ class FileManBaseView : public View {
    void load_directory_contents(const std::filesystem::path& dir_path);
    void load_directory_contents_unordered(const std::filesystem::path& dir_path, size_t file_cnt);
    const file_assoc_t& get_assoc(const std::filesystem::path& ext) const;
+    std::string get_extension(const std::string& t) const;
+    void copy_waterfall(std::filesystem::path path);

    NavigationView& nav_;

@@ -119,16 +122,16 @@ class FileManBaseView : public View {
        {{0, 0}, "Path:", Theme::getInstance()->fg_light->foreground}};

    Text text_current{
-        {6 * 8, 0 * 8, 24 * 8, 16},
+        {UI_POS_X(6), UI_POS_Y(0), UI_POS_WIDTH_REMAINING(6), UI_POS_HEIGHT(1)},
        "",
    };

    MenuView menu_view{
-        {0, 2 * 8, 240, 26 * 8},
+        {0, UI_POS_Y(1), UI_POS_MAXWIDTH, UI_POS_HEIGHT_REMAINING(7)},
        true};

    Button button_exit{
-        {22 * 8, 34 * 8, 8 * 8, 32},
+        {UI_POS_X_RIGHT(8), UI_POS_Y_BOTTOM(3), 8 * 8, UI_POS_HEIGHT(2)},
        "Exit"};
 };

@@ -171,7 +174,7 @@ private:
        };

        Text text_path {
-                { 0 * 8, 2 * 16, 30 * 8, 16 },
+                { 0 * 8, 2 * 16, screen_width, 16 },
                "",
        };

@@ -181,7 +184,7 @@ private:
        };

        Text text_name {
-                { 0 * 8, 7 * 16, 30 * 8, 16 },
+                { 0 * 8, 7 * 16, screen_width, 16 },
                "",
        };

@@ -227,66 +230,66 @@ class FileManagerView : public FileManBaseView {
    bool selected_is_valid() const;

    Text text_date{
-        {0 * 8, 26 * 8, 28 * 8, 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(6), 28 * 8, UI_POS_HEIGHT(1)},
        ""};

    NewButton button_rename{
-        {0 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_rename,
        Theme::getInstance()->fg_blue->foreground};

    NewButton button_delete{
-        {9 * 8, 34 * 8, 4 * 8, 32},
+        {UI_POS_X(9), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_trash,
        Theme::getInstance()->fg_red->foreground};

    NewButton button_clean{
-        {13 * 8, 34 * 8, 4 * 8, 32},
+        {UI_POS_X(13), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_clean,
        Theme::getInstance()->fg_red->foreground};

    NewButton button_cut{
-        {9 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(9), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_cut,
        Theme::getInstance()->fg_dark->foreground};

    NewButton button_copy{
-        {13 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(13), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_copy,
        Theme::getInstance()->fg_dark->foreground};

    NewButton button_paste{
-        {17 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(17), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_paste,
        Theme::getInstance()->fg_dark->foreground};

    NewButton button_new_dir{
-        {22 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(22), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_new_dir,
        Theme::getInstance()->fg_green->foreground};

    NewButton button_new_file{
-        {26 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(26), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_new_file,
        Theme::getInstance()->fg_green->foreground};

    NewButton button_open_notepad{
-        {0 * 8, 34 * 8, 4 * 8, 32},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_notepad,
        Theme::getInstance()->fg_orange->foreground};

    NewButton button_rename_timestamp{

-        {4 * 8, 29 * 8, 4 * 8, 32},
+        {UI_POS_X(4), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_options_datetime,
        Theme::getInstance()->fg_blue->foreground,
@@ -294,13 +297,13 @@ class FileManagerView : public FileManBaseView {

    NewButton button_open_iq_trim{

-        {4 * 8, 34 * 8, 4 * 8, 32},
+        {UI_POS_X(4), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_trim,
        Theme::getInstance()->fg_orange->foreground};

    NewButton button_show_hidden_files{
-        {17 * 8, 34 * 8, 4 * 8, 32},
+        {UI_POS_X(17), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_hide,
        Theme::getInstance()->fg_dark->foreground};
@@ -80,7 +80,7 @@ FlashUtilityView::FlashUtilityView(NavigationView& nav)
    add_children({&labels,
                  &menu_view});

-    menu_view.set_parent_rect({0, 3 * 8, 240, 33 * 8});
+    menu_view.set_parent_rect({0, 3 * 8, screen_width, 33 * 8});

    ensure_directory(apps_dir);
    ensure_directory(firmware_dir);
@@ -130,6 +130,12 @@ bool FlashUtilityView::endsWith(const std::u16string& str, const std::u16string&
    }
 }

+void FlashUtilityView::wait_till_loaded() {
+    while (!isLoaded) {
+        chThdSleepMilliseconds(50);
+    }
+}
+
 std::filesystem::path FlashUtilityView::extract_tar(std::filesystem::path::string_type path, ui::Painter& painter) {
    //
    painter.fill_rectangle(
@@ -177,4 +183,4 @@ void FlashUtilityView::focus() {
    menu_view.focus();
 }

-} /* namespace ui */
+} /* namespace ui */
@@ -49,6 +49,7 @@ class FlashUtilityView : public View {

    std::string title() const override { return "Flash Utility"; };
    bool flash_firmware(std::filesystem::path::string_type path);
+    void wait_till_loaded();

   private:
    NavigationView& nav_;
@@ -60,13 +61,21 @@ class FlashUtilityView : public View {
        {{4, 4}, "Select firmware to flash:", Theme::getInstance()->bg_darkest->foreground}};

    MenuView menu_view{
-        {0, 2 * 8, 240, 26 * 8},
+        {0, UI_POS_Y(1), screen_width, UI_POS_HEIGHT_REMAINING(2)},
        true};

    std::filesystem::path extract_tar(std::filesystem::path::string_type path, ui::Painter& painter);  // extracts the tar file, and returns the firmware.bin path from it. empty string if no fw
    void firmware_selected(std::filesystem::path::string_type path);

    bool endsWith(const std::u16string& str, const std::u16string& suffix);
+    bool isLoaded = false;
+    uint8_t refreshcnt = 0;
+    MessageHandlerRegistration message_handler_frame_sync{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            refreshcnt++;
+            if (refreshcnt > 5) isLoaded = true;
+        }};
 };

 } /* namespace ui */
@@ -45,8 +45,8 @@ using option_db_t = std::pair<std::string_view, int32_t>;
 using options_db_t = std::vector<option_db_t>;

 extern options_db_t freqman_modulations;
-extern options_db_t freqman_bandwidths[4];
-extern options_db_t freqman_steps;
+extern options_db_t freqman_bandwidths[6];
+// extern options_db_t freqman_steps; // now included via ui_receiver.hpp
 extern options_db_t freqman_steps_short;

 options_t dboptions_to_options(const options_db_t& dboptions) {
@@ -240,7 +240,7 @@ void FrequencyManagerView::on_edit_freq() {

 void FrequencyManagerView::on_edit_desc() {
    temp_buffer_ = current_entry().description;
-    text_prompt(nav_, temp_buffer_, freqman_max_desc_size, [this](std::string& new_desc) {
+    text_prompt(nav_, temp_buffer_, freqman_max_desc_size, ENTER_KEYBOARD_MODE_ALPHA, [this](std::string& new_desc) {
        auto entry = current_entry();
        entry.description = std::move(new_desc);
        db_.replace_entry(current_index(), entry);
@@ -250,7 +250,7 @@ void FrequencyManagerView::on_edit_desc() {

 void FrequencyManagerView::on_add_category() {
    temp_buffer_.clear();
-    text_prompt(nav_, temp_buffer_, 20, [this](std::string& new_name) {
+    text_prompt(nav_, temp_buffer_, 20, ENTER_KEYBOARD_MODE_ALPHA, [this](std::string& new_name) {
        if (!new_name.empty()) {
            create_freqman_file(new_name);
            refresh_categories();
@@ -65,14 +65,14 @@ class FreqManBaseView : public View {

    OptionsField options_category{
        {3 * 8, 2},
-        20 /* length */,
+        19 /* length */,
        {}};

    FreqManUIList freqlist_view{
        {0, 3 * 8, screen_width, 12 * 16 + 2 /* 2 Keeps text out of border. */}};

    Button button_exit{
-        {15 * 8, 17 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X_RIGHT(14), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(14), UI_POS_HEIGHT(2)},
        "Exit"};

   protected:
@@ -97,14 +97,14 @@ class FrequencySaveView : public FreqManBaseView {
        0};

    Labels labels{
-        {{0 * 8, 6 * 16}, "Description:", Theme::getInstance()->bg_darkest->foreground}};
+        {{UI_POS_X(0), 6 * 16}, "Description:", Theme::getInstance()->bg_darkest->foreground}};

    TextField field_description{
-        {0 * 8, 7 * 16, 30 * 8, 1 * 16},
+        {UI_POS_X(0), 7 * 16, screen_width, 1 * 16},
        ""};

    Button button_save{
-        {0 * 8, 17 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(14), UI_POS_HEIGHT(2)},
        "Save"};
 };

@@ -134,44 +134,44 @@ class FrequencyManagerView : public FreqManBaseView {
    void on_del_entry();

    NewButton button_add_category{
-        {23 * 8, 0 * 16, 7 * 4, 20},
+        {UI_POS_X_RIGHT(8), UI_POS_Y(0), 7 * 4, 20},
        {},
        &bitmap_icon_new_file,
        Theme::getInstance()->bg_darkest->foreground,
        true};

    NewButton button_del_category{
-        {26 * 8 + 4, 0 * 16, 7 * 4, 20},
+        {UI_POS_X_RIGHT(4), UI_POS_Y(0), 7 * 4, 20},
        {},
        &bitmap_icon_trash,
        Theme::getInstance()->fg_red->foreground,
        true};

    Button button_edit_entry{
-        {0 * 8, 14 * 16 - 4, 15 * 8, 1 * 16 + 4},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(6.5) + 4, 15 * 8, 1 * 16 + 4},
        "Edit"};

    Rectangle rect_padding{
-        {15 * 8, 14 * 16 - 4, 15 * 8, 1 * 16 + 4},
+        {15 * 8, UI_POS_Y_BOTTOM(6.5), 15 * 8, 1 * 16 + 4},
        Theme::getInstance()->fg_medium->background};

    Button button_edit_freq{
-        {0 * 8, 15 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(5), 15 * 8, 2 * 16},
        "Frequency"};

    Button button_edit_desc{
-        {0 * 8, 17 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(3), 15 * 8, 2 * 16},
        "Description"};

    NewButton button_add_entry{
-        {15 * 8, 15 * 16, 7 * 8 + 4, 2 * 16},
+        {15 * 8, UI_POS_Y_BOTTOM(5), 7 * 8 + 4, 2 * 16},
        {},
        &bitmap_icon_add,
        Theme::getInstance()->bg_darkest->foreground,
        true};

    NewButton button_del_entry{
-        {22 * 8 + 4, 15 * 16, 7 * 8 + 4, 2 * 16},
+        {22 * 8 + 4, UI_POS_Y_BOTTOM(5), 7 * 8 + 4, 2 * 16},
        {},
        &bitmap_icon_delete,
        Theme::getInstance()->fg_red->foreground,
@@ -201,14 +201,14 @@ class FrequencyEditView : public View {

    Labels labels{
        {{5 * 8, 1 * 16}, "Edit Frequency Entry", Theme::getInstance()->bg_darkest->foreground},
-        {{0 * 8, 3 * 16}, "Entry Type :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 4 * 16}, "Frequency A:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 5 * 16}, "Frequency B:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 6 * 16}, "Modulation :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 7 * 16}, "Bandwidth  :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 8 * 16}, "Step       :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 9 * 16}, "Tone Freq  :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 10 * 16}, "Description:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Entry Type :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 4 * 16}, "Frequency A:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 5 * 16}, "Frequency B:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 6 * 16}, "Modulation :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 7 * 16}, "Bandwidth  :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 8 * 16}, "Step       :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 9 * 16}, "Tone Freq  :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 10 * 16}, "Description:", Theme::getInstance()->fg_light->foreground},
    };

    OptionsField field_type{
@@ -243,11 +243,11 @@ class FrequencyEditView : public View {
        {}};

    Button button_save{
-        {0 * 8, 17 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(3), 15 * 8, 2 * 16},
        "Save"};

    Button button_cancel{
-        {15 * 8, 17 * 16, 15 * 8, 2 * 16},
+        {UI_POS_X_RIGHT(15), UI_POS_Y_BOTTOM(3), 15 * 8, 2 * 16},
        "Cancel"};
 };

@@ -34,6 +34,7 @@ namespace ui {

 IQTrimView::IQTrimView(NavigationView& nav)
    : nav_{nav} {
+    power_buckets_.resize(screen_width);
    add_children({
        &labels,
        &field_path,
@@ -170,7 +171,7 @@ void IQTrimView::update_range_controls(iq::TrimRange trim_range) {
 }

 void IQTrimView::profile_capture() {
-    power_buckets_ = {};
+    power_buckets_.clear();
    iq::PowerBuckets buckets{
        .p = power_buckets_.data(),
        .size = power_buckets_.size()};
@@ -54,7 +54,7 @@ class TrimProgressUI {
    }

    void clear() {
-        p.fill_rectangle({0 * 8, 4 * 16, screen_width, 3 * 16}, Theme::getInstance()->bg_darkest->background);
+        p.fill_rectangle({UI_POS_X(0), 4 * 16, screen_width, 3 * 16}, Theme::getInstance()->bg_darkest->background);
    }

    auto get_callback() {
@@ -96,26 +96,26 @@ class IQTrimView : public View {

    std::filesystem::path path_{};
    Optional<iq::CaptureInfo> info_{};
-    std::array<iq::PowerBuckets::Bucket, screen_width> power_buckets_{};
+    std::vector<iq::PowerBuckets::Bucket> power_buckets_{};
    TrimProgressUI progress_ui{};

    Labels labels{
-        {{0 * 8, 0 * 16}, "Capture File:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 6 * 16}, "Start  :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 7 * 16}, "End    :", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 8 * 16}, "Samples:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 9 * 16}, "Max Pwr:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 10 * 16}, "Cutoff :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Capture File:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 6 * 16}, "Start  :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 7 * 16}, "End    :", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 8 * 16}, "Samples:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 9 * 16}, "Max Pwr:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 10 * 16}, "Cutoff :", Theme::getInstance()->fg_light->foreground},
        {{12 * 8, 10 * 16}, "%", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 12 * 16}, "Amplify:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 12 * 16}, "Amplify:", Theme::getInstance()->fg_light->foreground},
        {{10 * 8, 12 * 16}, "x", Theme::getInstance()->fg_light->foreground},
    };

    TextField field_path{
-        {0 * 8, 1 * 16, 30 * 8, 1 * 16},
+        {UI_POS_X(0), 1 * 16, screen_width, 1 * 16},
        "Open File..."};

-    Point pos_lines{0 * 8, 4 * 16};
+    Point pos_lines{UI_POS_X(0), 4 * 16};
    Dim height_lines{2 * 16};

    NumberField field_start{
@@ -155,7 +155,7 @@ class IQTrimView : public View {
        ' '};

    Button button_trim{
-        {20 * 8, 16 * 16, 8 * 8, 2 * 16},
+        {UI_POS_X_CENTER(8), UI_POS_Y_BOTTOM(3), 8 * 8, 2 * 16},
        "Trim"};
 };

@@ -94,10 +94,10 @@ void GlassView::get_max_power(const ChannelSpectrum& spectrum, uint8_t bin, uint
 rf::Frequency GlassView::get_freq_from_bin_pos(uint8_t pos) {
    rf::Frequency freq_at_pos = 0;
    if (mode == LOOKING_GLASS_SINGLEPASS) {
-        // starting from the middle, minus 8 ignored bin on each side. Since pos is [-120,120] after the (pos - 120), it's divided by SCREEN_W(240)/2 => 120
-        freq_at_pos = f_center_ini + ((pos - 120) * ((looking_glass_range - ((16 * looking_glass_range) / SPEC_NB_BINS)) / 2)) / (SCREEN_W / 2);
+        // starting from the middle, minus 8 ignored bin on each side. Since pos is [-120,120] after the (pos - 120), it's divided by screen_width(240)/2 => 120
+        freq_at_pos = f_center_ini + ((pos - 120) * ((looking_glass_range - ((16 * looking_glass_range) / SPEC_NB_BINS)) / 2)) / (screen_width / 2);
    } else
-        freq_at_pos = f_min + (2 * offset * each_bin_size) + (pos * looking_glass_range) / SCREEN_W;
+        freq_at_pos = f_min + (2 * offset * each_bin_size) + (pos * looking_glass_range) / screen_width;
    return freq_at_pos;
 }

@@ -122,15 +122,15 @@ void GlassView::reset_live_view() {

    // Clear screen in peak mode.
    if (live_frequency_view == 2)
-        display.fill_rectangle({{0, 108 + 16}, {SCREEN_W, SCREEN_H - (108 + 16)}}, {0, 0, 0});
+        display.fill_rectangle({{0, 108 + 16}, {screen_width, screen_height - (108 + 16)}}, {0, 0, 0});
 }

 void GlassView::add_spectrum_pixel(uint8_t power) {
-    spectrum_row[pixel_index] = spectrum_rgb3_lut[power];                                                                           // row of colors
+    spectrum_row[pixel_index] = gradient.lut[power];                                                                                // row of colors
    spectrum_data[pixel_index] = (live_frequency_integrate * spectrum_data[pixel_index] + power) / (live_frequency_integrate + 1);  // smoothing
    pixel_index++;

-    if (pixel_index == SCREEN_W)  // got an entire waterfall line
+    if (pixel_index == screen_width)  // got an entire waterfall line
    {
        if (live_frequency_view > 0) {
            constexpr int rssi_sample_range = SPEC_NB_BINS;
@@ -140,22 +140,22 @@ void GlassView::add_spectrum_pixel(uint8_t power) {
            constexpr int raw_min = rssi_sample_range * rssi_voltage_min / adc_voltage_max;
            constexpr int raw_max = rssi_sample_range * rssi_voltage_max / adc_voltage_max;
            constexpr int raw_delta = raw_max - raw_min;
-            const range_t<int> y_max_range{0, 320 - (108 + 16)};
+            const range_t<int> y_max_range{0, screen_height - (108 + 16)};

            // drawing and keeping track of max freq
-            for (uint16_t xpos = 0; xpos < SCREEN_W; xpos++) {
+            for (uint16_t xpos = 0; xpos < screen_width; xpos++) {
                // save max powerwull freq
                if (spectrum_data[xpos] > max_freq_power) {
                    max_freq_power = spectrum_data[xpos];
                    max_freq_hold = get_freq_from_bin_pos(xpos);
                }
-                int16_t point = y_max_range.clip(((spectrum_data[xpos] - raw_min) * (320 - (108 + 16))) / raw_delta);
+                int16_t point = y_max_range.clip(((spectrum_data[xpos] - raw_min) * (screen_height - (108 + 16))) / raw_delta);
                uint8_t color_gradient = (point * 255) / 212;
                // clear if not in peak view
                if (live_frequency_view != 2) {
-                    display.fill_rectangle({{xpos, 108 + 16}, {1, SCREEN_H - point}}, {0, 0, 0});
+                    display.fill_rectangle({{xpos, 108 + 16}, {1, screen_height - point}}, {0, 0, 0});
                }
-                display.fill_rectangle({{xpos, SCREEN_H - point}, {1, point}}, {color_gradient, 0, uint8_t(255 - color_gradient)});
+                display.fill_rectangle({{xpos, screen_height - point}, {1, point}}, {color_gradient, 0, uint8_t(255 - color_gradient)});
            }
            if (last_max_freq != max_freq_hold) {
                last_max_freq = max_freq_hold;
@@ -163,7 +163,7 @@ void GlassView::add_spectrum_pixel(uint8_t power) {
            }
            plot_marker(marker_pixel_index);
        } else {
-            display.draw_pixels({{0, display.scroll(1)}, {SCREEN_W, 1}}, spectrum_row);  // new line at top, one less var, speedier
+            display.draw_pixels({{0, display.scroll(1)}, {screen_width, 1}}, spectrum_row);  // new line at top, one less var, speedier
        }
        pixel_index = 0;  // Start New cascade line
    }
@@ -199,7 +199,7 @@ bool GlassView::process_bins(uint8_t* powerlevel) {
 void GlassView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
    baseband::spectrum_streaming_stop();
    // Convert bins of this spectrum slice into a representative max_power and when enough, into pixels
-    // we actually need SCREEN_W (240) of those bins
+    // we actually need screen_width (240) of those bins
    for (uint8_t bin = 0; bin < bin_length; bin++) {
        get_max_power(spectrum, bin, max_power);
        if (max_power > range_max_power)
@@ -238,7 +238,7 @@ void GlassView::on_hide() {
 }

 void GlassView::on_show() {
-    display.scroll_set_area(109, 319);  // Restart scroll on the correct coordinates
+    display.scroll_set_area(109, screen_height - 1);  // Restart scroll on the correct coordinates
    baseband::spectrum_streaming_start();
 }

@@ -253,11 +253,11 @@ void GlassView::on_range_changed() {
        // if the view is done in one pass, show it like in analog_audio_app
        mode = LOOKING_GLASS_SINGLEPASS;
        offset = 2;
-        bin_length = SCREEN_W;
+        bin_length = screen_width;
        ignore_dc = 0;
        looking_glass_bandwidth = looking_glass_range;
        looking_glass_sampling_rate = looking_glass_range;
-        each_bin_size = looking_glass_bandwidth / SCREEN_W;
+        each_bin_size = looking_glass_bandwidth / screen_width;
        looking_glass_step = looking_glass_bandwidth;
        f_center_ini = f_min + (looking_glass_bandwidth / 2);  // Initial center frequency for sweep
    } else {
@@ -269,7 +269,7 @@ void GlassView::on_range_changed() {
        if (mode == LOOKING_GLASS_FASTSCAN) {
            offset = 2;
            ignore_dc = 4;
-            bin_length = SCREEN_W;
+            bin_length = screen_width;
        } else {  // if( mode == LOOKING_GLASS_SLOWSCAN )
            offset = 2;
            bin_length = 80;
@@ -279,7 +279,7 @@ void GlassView::on_range_changed() {
        f_center_ini = f_min - (offset * each_bin_size) + (looking_glass_bandwidth / 2);  // Initial center frequency for sweep
    }
    search_span = looking_glass_range / MHZ_DIV;
-    marker_pixel_step = looking_glass_range / SCREEN_W;  // Each pixel value in Hz
+    marker_pixel_step = looking_glass_range / screen_width;  // Each pixel value in Hz

    pixel_index = 0;
    max_power = 0;
@@ -304,10 +304,10 @@ void GlassView::plot_marker(uint8_t pos) {
    {
        shift_y = 16;
    }
-    portapack::display.fill_rectangle({0, 100 + shift_y, SCREEN_W, 8}, Theme::getInstance()->bg_darkest->background);  // Clear old marker and whole marker rectangle btw
-    portapack::display.fill_rectangle({pos - 2, 100 + shift_y, 5, 3}, Theme::getInstance()->fg_red->foreground);       // Red marker top
-    portapack::display.fill_rectangle({pos - 1, 103 + shift_y, 3, 3}, Theme::getInstance()->fg_red->foreground);       // Red marker middle
-    portapack::display.fill_rectangle({pos, 106 + shift_y, 1, 2}, Theme::getInstance()->fg_red->foreground);           // Red marker bottom
+    portapack::display.fill_rectangle({0, 100 + shift_y, screen_width, 8}, Theme::getInstance()->bg_darkest->background);  // Clear old marker and whole marker rectangle btw
+    portapack::display.fill_rectangle({pos - 2, 100 + shift_y, 5, 3}, Theme::getInstance()->fg_red->foreground);           // Red marker top
+    portapack::display.fill_rectangle({pos - 1, 103 + shift_y, 3, 3}, Theme::getInstance()->fg_red->foreground);           // Red marker middle
+    portapack::display.fill_rectangle({pos, 106 + shift_y, 1, 2}, Theme::getInstance()->fg_red->foreground);               // Red marker bottom
 }

 void GlassView::update_min(int32_t v) {
@@ -358,6 +358,11 @@ GlassView::GlassView(
    NavigationView& nav)
    : nav_(nav) {
    baseband::run_image(portapack::spi_flash::image_tag_wideband_spectrum);
+    spectrum_row.resize(screen_width);
+    spectrum_data.resize(screen_width);
+    if (!gradient.load_file(default_gradient_file)) {
+        gradient.set_default();
+    }

    add_children({&labels,
                  &field_frequency_min,
@@ -433,11 +438,11 @@ GlassView::GlassView(
                freq_stats.hidden(true);
                button_jump.hidden(true);
                button_rst.hidden(true);
-                display.scroll_set_area(109, 319);  // Restart scroll on the correct coordinates.
+                display.scroll_set_area(109, screen_height - 1);  // Restart scroll on the correct coordinates.
                break;

            case 1:  // LEVEL
-                display.fill_rectangle({{0, 108}, {SCREEN_W, 24}}, {0, 0, 0});
+                display.fill_rectangle({{0, 108}, {screen_width, 24}}, {0, 0, 0});
                display.scroll_disable();
                level_integration.hidden(false);
                freq_stats.hidden(false);
@@ -447,7 +452,7 @@ GlassView::GlassView(

            case 2:  // PEAK
            default:
-                display.fill_rectangle({{0, 108}, {SCREEN_W, 24}}, {0, 0, 0});
+                display.fill_rectangle({{0, 108}, {screen_width, 24}}, {0, 0, 0});
                display.scroll_disable();
                level_integration.hidden(false);
                freq_stats.hidden(false);
@@ -487,9 +492,9 @@ GlassView::GlassView(

    field_marker.on_encoder_change = [this](TextField&, EncoderEvent delta) {
        if ((marker_pixel_index + delta) < 0)
-            marker_pixel_index = marker_pixel_index + delta + SCREEN_W;
-        else if ((marker_pixel_index + delta) > SCREEN_W)
-            marker_pixel_index = marker_pixel_index + delta - SCREEN_W;
+            marker_pixel_index = marker_pixel_index + delta + screen_width;
+        else if ((marker_pixel_index + delta) > screen_width)
+            marker_pixel_index = marker_pixel_index + delta - screen_width;
        else
            marker_pixel_index = marker_pixel_index + delta;
        on_marker_change();
@@ -527,7 +532,7 @@ GlassView::GlassView(
    };
    set_spec_iq_phase_calibration_value(get_spec_iq_phase_calibration_value());  // initialize iq_phase_calibration in radio

-    display.scroll_set_area(109, 319);
+    display.scroll_set_area(109, screen_height - 1);  // Restart scroll on the correct coordinates

    // trigger:
    // Discord User jteich:  WidebandSpectrum::on_message to set the trigger value. In WidebandSpectrum::execute,
@@ -535,7 +540,7 @@ GlassView::GlassView(
    // at which time it pushes the buffer up with channel_spectrum.feed
    baseband::set_spectrum(looking_glass_bandwidth, trigger);

-    marker_pixel_index = SCREEN_W / 2;
+    marker_pixel_index = screen_width / 2;
    on_range_changed();  // Force a UI update.

    receiver_model.set_sampling_rate(looking_glass_sampling_rate);   // 20mhz
@@ -35,7 +35,7 @@
 #include "ui_receiver.hpp"
 #include "string_format.hpp"
 #include "analog_audio_app.hpp"
-#include "spectrum_color_lut.hpp"
+#include "gradient.hpp"

 namespace ui {

@@ -51,9 +51,6 @@ namespace ui {
 #define LOOKING_GLASS_SINGLEPASS 2
 // one spectrum line number of bins
 #define SPEC_NB_BINS 256
-// screen dimensions
-#define SCREEN_W 240
-#define SCREEN_H 320

 class GlassView : public View {
   public:
@@ -74,6 +71,7 @@ class GlassView : public View {

   private:
    NavigationView& nav_;
+    Gradient gradient{};
    RxRadioState radio_state_{ReceiverModel::Mode::SpectrumAnalysis};
    // Settings
    rf::Frequency f_min = 260 * MHZ_DIV;  // Default to 315/433 remote range.
@@ -154,8 +152,8 @@ class GlassView : public View {
    uint8_t min_color_power{0};  // Filter cutoff level.
    uint32_t pixel_index{0};

-    std::array<Color, SCREEN_W> spectrum_row{};
-    std::array<uint8_t, SCREEN_W> spectrum_data{};
+    std::vector<Color> spectrum_row{};
+    std::vector<uint8_t> spectrum_data{};
    ChannelSpectrumFIFO* fifo{};

    int32_t steps = 1;
@@ -167,12 +165,12 @@ class GlassView : public View {
    rf::Frequency max_freq_hold = 0;
    rf::Frequency last_max_freq = 0;
    int16_t max_freq_power = -1000;
-    uint8_t bin_length = SCREEN_W;
+    uint8_t bin_length = screen_width;
    uint8_t offset = 0;
    uint8_t ignore_dc = 0;

    Labels labels{
-        {{0, 0 * 16}, "MIN:     MAX:     LNA   VGA  ", Theme::getInstance()->fg_light->foreground},
+        {{0, UI_POS_Y(0)}, "MIN:     MAX:     LNA   VGA  ", Theme::getInstance()->fg_light->foreground},
        {{0, 1 * 16}, "RANGE:       FILTER:     AMP:", Theme::getInstance()->fg_light->foreground},
        {{0, 2 * 16}, "P:", Theme::getInstance()->fg_light->foreground},
        {{0, 3 * 16}, "MARKER:          MHz RXIQCAL", Theme::getInstance()->fg_light->foreground},
@@ -180,24 +178,24 @@ class GlassView : public View {
        {{0, 4 * 16}, "RES:     VOL:", Theme::getInstance()->fg_light->foreground}};

    NumberField field_frequency_min{
-        {4 * 8, 0 * 16},
+        {4 * 8, UI_POS_Y(0)},
        4,
        {0, 7199},
        1,  // number of steps by encoder delta
        ' '};

    NumberField field_frequency_max{
-        {13 * 8, 0 * 16},
+        {13 * 8, UI_POS_Y(0)},
        4,
        {1, 7200},
        1,  // number of steps by encoder delta
        ' '};

    LNAGainField field_lna{
-        {21 * 8, 0 * 16}};
+        {21 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {27 * 8, 0 * 16}};
+        {27 * 8, UI_POS_Y(0)}};

    TextField field_range{
        {6 * 8, 1 * 16, 6 * 8, 16},
@@ -221,7 +219,7 @@ class GlassView : public View {
        {}};

    ButtonWithEncoder button_beep_squelch{
-        {240 - 8 * 8, 2 * 16 + 4, 8 * 8, 1 * 8},
+        {screen_width - 8 * 8, 2 * 16 + 4, 8 * 8, 1 * 8},
        ""};

    TextField field_marker{
@@ -292,15 +290,15 @@ class GlassView : public View {
        }};

    Button button_jump{
-        {SCREEN_W - 4 * 8, 5 * 16, 4 * 8, 16},
+        {screen_width - 4 * 8, 5 * 16, 4 * 8, 16},
        "JMP"};

    Button button_rst{
-        {SCREEN_W - 9 * 8, 5 * 16, 4 * 8, 16},
+        {screen_width - 9 * 8, 5 * 16, 4 * 8, 16},
        "RST"};

    Text freq_stats{
-        {0 * 8, 5 * 16, SCREEN_W - 10 * 8, 8},
+        {UI_POS_X(0), 5 * 16, screen_width - 10 * 8, 8},
        ""};

    MessageHandlerRegistration message_handler_spectrum_config{
@@ -202,7 +202,7 @@ void MicTXView::rxaudio(bool enable) {
                receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
                // receiver_model.set_nbfm_configuration(n); is called above, depending user's selection (8k5, 11k, 16k).
                break;
-            case MIC_MOD_WFM:  // WFM, BW 200Khz aprox, or the two new addional BW filters (180k, 40k)
+            case MIC_MOD_WFM:  // WFM, BW 200Khz aprox, or the two new addional BW filters (180k, 80k)
                baseband::run_image(portapack::spi_flash::image_tag_wfm_audio);
                receiver_model.set_modulation(ReceiverModel::Mode::WidebandFMAudio);
                // receiver_model.set_wfm_configuration(n); is called above, depending user's selection (200k, 180k, 0k).
@@ -300,7 +300,7 @@ void MicTXView::update_receiver_rxbw(void) {
            receiver_model.set_nbfm_configuration(rxbw_index);  // we are in NFM/FM case, we need to select proper NFM/FM RX channel filter, NFM BW 8K5(0), NFM BW 11K(1), FM BW 16K (2)
            break;
        case MIC_MOD_WFM:
-            receiver_model.set_wfm_configuration(rxbw_index);  // we are in WFM case, we need to select proper WFB RX BW filter, WFM BW 200K(0), WFM BW 180K(1), WFM BW 40K(2)
+            receiver_model.set_wfm_configuration(rxbw_index);  // we are in WFM case, we need to select proper WFB RX BW filter, WFM BW 200K(0), WFM BW 180K(1), WFM BW 80K(2)
            break;
        case MIC_MOD_AM:
            receiver_model.set_am_configuration(rxbw_index);  // we are in AM TX mode, we need to select proper AM full path config AM-9K filter. 0+0 =>AM-9K(0), 0+1=1 =>AM-6K(1),
@@ -446,6 +446,8 @@ MicTXView::MicTXView(
    field_frequency.set_value(tx_frequency);

    // TODO: would be nice if frequency step was configurable in this app
+    // but now, make it a bit lower
+    receiver_model.set_frequency_step(12'500);  // set freq step to 12.5kHz
    field_frequency.set_step(receiver_model.frequency_step());

    // WARNING: transmitter_model.set_target_frequency() and receiver_model.set_target_frequency() both update the same tuning freq, but one has an offset!
@@ -170,7 +170,7 @@ class MicTXView : public View {
        {{17 * 8, 1 * 8}, "ALC", Theme::getInstance()->fg_light->foreground}};

    VuMeter vumeter{
-        {0 * 8, 1 * 8, 2 * 8, 33 * 8},
+        {UI_POS_X(0), 1 * 8, 2 * 8, 33 * 8},
        12,
        true};

@@ -350,7 +350,7 @@ class MicTXView : public View {
    };

    Button tx_button{
-        {10 * 8, 30 * 8, 10 * 8, 5 * 8},
+        {10 * 8, screen_width, 10 * 8, 5 * 8},
        "PTT TX",
        true};

@@ -104,7 +104,7 @@ class ModemSetupView : public View {
        "SET"};

    Button button_save{
-        {9 * 8, 250, 96, 40},
+        {UI_POS_X_CENTER(12), 250, UI_POS_WIDTH(12), 40},
        "Save"};
 };

@@ -387,7 +387,6 @@ PlaylistView::PlaylistView(
        &button_next,
        &waterfall,
    });
-
    ensure_directory(playlist_dir);
    waterfall.show_audio_spectrum_view(false);

@@ -107,24 +107,24 @@ class PlaylistView : public View {
    void handle_replay_thread_done(uint32_t return_code);

    Text text_filename{
-        {0 * 8, 0 * 16, 30 * 8, 16}};
+        {UI_POS_X(0), UI_POS_Y(0), screen_width, 16}};

    FrequencyField field_frequency{
-        {0 * 8, 1 * 16}};
+        {UI_POS_X(0), 1 * 16}};

    Text text_sample_rate{
        {10 * 8, 1 * 16, 7 * 8, 16}};

    ProgressBar progressbar_track{
-        {18 * 8, 1 * 16, 12 * 8, 8 + 1}};
+        {18 * 8, 1 * 16, UI_POS_WIDTH_REMAINING(19), 8 + 1}};

    // (-1) to overlap with progressbar_track so there's
    // only 1 pixel between them instead of 2.
    ProgressBar progressbar_transmit{
-        {18 * 8, 3 * 8 - 1, 12 * 8, 8}};
+        {18 * 8, 3 * 8 - 1, UI_POS_WIDTH_REMAINING(19), 8}};

    Text text_duration{
-        {0 * 8, 2 * 16, 5 * 8, 16}};
+        {UI_POS_X(0), 2 * 16, 5 * 8, 16}};

    // TODO: delay duration field.

@@ -133,19 +133,19 @@ class PlaylistView : public View {
        /*short_ui*/ true};

    Checkbox check_loop{
-        {21 * 8, 2 * 16},
+        {UI_POS_X_RIGHT(9), 2 * 16},
        4,
        "Loop",
        true};

    ImageButton button_play{
-        {28 * 8, 2 * 16, 2 * 8, 1 * 16},
+        {screen_width - 2 * 8, 2 * 16, 2 * 8, 1 * 16},
        &bitmap_play,
        Theme::getInstance()->fg_green->foreground,
        Theme::getInstance()->fg_green->background};

    Text text_track{
-        {0 * 8, 3 * 16, 30 * 8, 16}};
+        {UI_POS_X(0), 3 * 16, screen_width, 16}};

    NewButton button_prev{
        {2 * 8, 4 * 16, 4 * 8, 2 * 16},
@@ -153,7 +153,7 @@ void POCSAGTXView::paint(Painter&) {
 }

 void POCSAGTXView::on_set_text(NavigationView& nav) {
-    text_prompt(nav, buffer, MAX_POCSAG_LENGTH);
+    text_prompt(nav, buffer, MAX_POCSAG_LENGTH, ENTER_KEYBOARD_MODE_ALPHA);
 }

 POCSAGTXView::POCSAGTXView(
@@ -85,7 +85,7 @@ class POCSAGTXView : public View {
        {{6 * 8, 8 * 8}, "Type:", Theme::getInstance()->fg_light->foreground},
        {{2 * 8, 10 * 8}, "Function:", Theme::getInstance()->fg_light->foreground},
        {{5 * 8, 12 * 8}, "Phase:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 14 * 8}, "Message:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 14 * 8}, "Message:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_bitrate{
        {11 * 8, 4 * 8},
@@ -122,21 +122,21 @@ class POCSAGTXView : public View {
        }};

    Text text_message{
-        {0 * 8, 16 * 8, 30 * 8, 16},
+        {UI_POS_X(0), 16 * 8, screen_width, 16},
        ""};
    Text text_message_l2{
-        {0 * 8, 18 * 8, 30 * 8, 16},
+        {UI_POS_X(0), 18 * 8, screen_width, 16},
        ""};

    Button button_message{
-        {0 * 8, 20 * 8, 14 * 8, 32},
+        {UI_POS_X(0), 20 * 8, 14 * 8, 32},
        "Set message"};

    ProgressBar progressbar{
-        {16, 210, 208, 16}};
+        {16, 210, UI_POS_WIDTH_REMAINING(4), 16}};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        10000,
        9};

@@ -65,6 +65,7 @@ RDSPSNView::RDSPSNView(
            nav,
            PSN,
            8,
+            ENTER_KEYBOARD_MODE_ALPHA,
            [this](std::string& s) {
                text_psn.set(s);
            });
@@ -86,6 +87,7 @@ RDSRadioTextView::RDSRadioTextView(
            nav,
            radiotext,
            28,
+            ENTER_KEYBOARD_MODE_ALPHA,
            [this](std::string& s) {
                text_radiotext.set(s);
            });
@@ -82,7 +82,7 @@ class RDSRadioTextView : public OptionTabView {
        {1 * 8, 4 * 16, 28 * 8, 16},
        "-"};
    Button button_set{
-        {88, 6 * 16, 64, 32},
+        {UI_POS_X_CENTER(8), 6 * 16, UI_POS_WIDTH(8), 32},
        "Set"};
 };

@@ -92,7 +92,7 @@ class RDSDateTimeView : public OptionTabView {

   private:
    Labels labels{
-        {{44, 5 * 16}, "Not yet implemented", Theme::getInstance()->error_dark->foreground}};
+        {{UI_POS_X_CENTER(19), 5 * 16}, "Not yet implemented", Theme::getInstance()->error_dark->foreground}};
 };

 class RDSAudioView : public OptionTabView {
@@ -101,7 +101,7 @@ class RDSAudioView : public OptionTabView {

   private:
    Labels labels{
-        {{44, 5 * 16}, "Not yet implemented", Theme::getInstance()->error_dark->foreground}};
+        {{UI_POS_X_CENTER(19), 5 * 16}, "Not yet implemented", Theme::getInstance()->error_dark->foreground}};
 };

 class RDSThread {
@@ -160,7 +160,7 @@ class RDSView : public View {

    void start_tx();

-    Rect view_rect = {0, 8 * 8, 240, 192};
+    Rect view_rect = {0, 8 * 8, screen_width, 192};

    RDSPSNView view_PSN{nav_, view_rect};
    RDSRadioTextView view_radiotext{nav_, view_rect};
@@ -174,7 +174,7 @@ class RDSView : public View {
        {"Audio", Theme::getInstance()->fg_orange->foreground, &view_audio}};

    Labels labels{
-        {{0 * 8, 28}, "Program type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 28}, "Program type:", Theme::getInstance()->fg_light->foreground},
        //{ { 14 * 8, 16 + 8 }, "CC:", Theme::getInstance()->fg_light->foreground },
        {{2 * 8, 28 + 16}, "Program ID:", Theme::getInstance()->fg_light->foreground},
        //{ { 13 * 8, 32 + 8 }, "Cov:",Theme::getInstance()->fg_light->foreground },
@@ -319,7 +319,7 @@ class RDSView : public View {
        "TP"};

    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        50000,
        9};

@@ -335,7 +335,7 @@ ReconView::ReconView(NavigationView& nav)
    tx_view.hidden(true);

    // set record View
-    record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
+    record_view = std::make_unique<RecordView>(Rect{0, 0, screen_width, 1 * 16},
                                               u"AUTO_AUDIO", audio_dir,
                                               RecordView::FileType::WAV, 4096, 4);
    record_view->set_filename_date_frequency(true);
@@ -517,11 +517,7 @@ ReconView::ReconView(NavigationView& nav)
    };
    set_loop_config(continuous);

-    rssi.set_focusable(true);
    rssi.set_peak(true, 500);
-    rssi.on_select = [this](RSSI&) {
-        nav_.replace<LevelView>();
-    };

    // TODO: *BUG* Both transmitter_model and receiver_model share the same pmem setting for target_frequency.
    button_mic_app.on_select = [this](Button&) {
@@ -1168,18 +1164,18 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
    }
    if (new_mod == SPEC_MODULATION) {
        if (persistent_memory::recon_repeat_recorded()) {
-            record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
+            record_view = std::make_unique<RecordView>(Rect{0, 0, screen_width, 1 * 16},
                                                       u"RECON_REPEAT.C16", captures_dir,
                                                       RecordView::FileType::RawS16, 16384, 3);
            record_view->set_filename_as_is(true);
        } else {
-            record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
+            record_view = std::make_unique<RecordView>(Rect{0, 0, screen_width, 1 * 16},
                                                       u"AUTO_RAW", captures_dir,
                                                       RecordView::FileType::RawS16, 16384, 3);
            record_view->set_filename_date_frequency(true);
        }
    } else {
-        record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
+        record_view = std::make_unique<RecordView>(Rect{0, 0, screen_width, 1 * 16},
                                                   u"AUTO_AUDIO", audio_dir,
                                                   RecordView::FileType::WAV, 4096, 4);
        record_view->set_filename_date_frequency(true);
@@ -1257,9 +1253,17 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {

    field_mode.set_selected_index(new_mod);
    field_mode.on_change = [this](size_t, OptionsField::value_t v) {
-        if (v != -1) {
-            change_mode(v);
+        // initialize to a value under SPEC
+        static freqman_index_t last_mode = WFM_MODULATION;
+        if (v > SPEC_MODULATION) {
+            if (last_mode == SPEC_MODULATION)
+                v = AM_MODULATION;
+            else
+                v = SPEC_MODULATION;
+            field_mode.set_selected_index(v);
        }
+        last_mode = v;
+        change_mode(v);
    };
    // for some motive, audio output gets stopped.
    if (!recon && field_mode.selected_index_value() != SPEC_MODULATION)
@@ -1400,8 +1404,8 @@ void ReconView::start_repeat() {
            std::string delay_message = "TX DELAY: " + to_string_dec_uint(delay) + "s";

            // update display information
-            p.fill_rectangle({0, (SCREEN_H / 2) - 16, SCREEN_W, 64}, Theme::getInstance()->fg_light->foreground);
-            p.draw_string({(SCREEN_W / 2) - 7 * 8, SCREEN_H / 2}, *Theme::getInstance()->fg_red, delay_message);
+            p.fill_rectangle({0, (screen_height / 2) - 16, screen_width, 64}, Theme::getInstance()->fg_light->foreground);
+            p.draw_string({(screen_width / 2) - 7 * 8, screen_height / 2}, *Theme::getInstance()->fg_red, delay_message);

            // sleep 1 second
            chThdSleepMilliseconds(1000);
@@ -31,7 +31,6 @@
 #include "analog_audio_app.hpp"
 #include "audio.hpp"
 #include "ui_mictx.hpp"
-#include "ui_level.hpp"
 #include "ui_looking_glass_app.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "baseband_api.hpp"
@@ -218,35 +217,36 @@ class ReconView : public View {
    std::unique_ptr<RecordView> record_view{};

    Labels labels{
-        {{0 * 8, 0 * 16}, "LNA:   VGA:   AMP:  VOL:     ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "LNA:   VGA:   AMP:  ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(6), UI_POS_Y(0)}, "VOL:  ", Theme::getInstance()->fg_light->foreground},
        {{3 * 8, 8 * 16}, "START       END", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, (22 * 8)}, "                S:          ", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, (24 * 8) + 4}, "NBLCKS:x      W,L:      ,     ", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, (26 * 8) + 4}, "MODE:     ,      SQUELCH:    ", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), (22 * 8)}, "                S:          ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), (24 * 8) + 4}, "NBLCKS:x      W,L:      ,     ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), (26 * 8) + 4}, "MODE:     ,      SQUELCH:    ", Theme::getInstance()->fg_light->foreground}};

    LNAGainField field_lna{
-        {4 * 8, 0 * 16}};
+        {4 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {11 * 8, 0 * 16}};
+        {11 * 8, UI_POS_Y(0)}};

    RFAmpField field_rf_amp{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    AudioVolumeField field_volume{
-        {24 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    Text file_name{
        // show file used
-        {0, 1 * 16, SCREEN_W, 16},
+        {0, 1 * 16, screen_width, 16},
    };

    Text desc_cycle{
-        {0, 2 * 16, SCREEN_W, 16},
+        {0, 2 * 16, screen_width, 16},
    };

    RSSI rssi{
-        {0 * 16, 3 * 16 + 2, SCREEN_W - 8 * 8 + 4, 12},
+        {0 * 16, 3 * 16 + 2, screen_width - 8 * 8 + 4, 12},
    };

    ButtonWithEncoder text_cycle{
@@ -286,19 +286,19 @@ class ReconView : public View {

    // Button can be RECON or SCANNER
    Button button_scanner_mode{
-        {SCREEN_W - 7 * 8, 3 * 16, 7 * 8, 28},
+        {screen_width - 7 * 8, 3 * 16, 7 * 8, 28},
        "RECON"};

    Button button_loop_config{
-        {SCREEN_W - 7 * 8, 5 * 16, 7 * 8, 28},
+        {screen_width - 7 * 8, 5 * 16, 7 * 8, 28},
        "[LOOP]"};

    Button button_config{
-        {SCREEN_W - 7 * 8, 7 * 16, 7 * 8, 28},
+        {screen_width - 7 * 8, 7 * 16, 7 * 8, 28},
        "CONFIG"};

    ButtonWithEncoder button_manual_start{
-        {0 * 8, 9 * 16, 11 * 8, 28},
+        {UI_POS_X(0), 9 * 16, 11 * 8, 28},
        ""};

    ButtonWithEncoder button_manual_end{
@@ -306,7 +306,7 @@ class ReconView : public View {
        ""};

    OptionsField field_recon_match_mode{
-        {0 * 8, 11 * 16},
+        {UI_POS_X(0), 11 * 16},
        16,  // CONTINUOUS MATCH MODE / SPARSE TIMED MATCH MODE
        {
            {"MATCH:CONTINOUS", 0},
@@ -364,15 +364,15 @@ class ReconView : public View {
    };

    ButtonWithEncoder button_pause{
-        {0, (15 * 16) - 4, 72, 28},
+        {0, (15 * 16) - 4, UI_POS_WIDTH(9), 28},
        "PAUSE"};

    Button button_audio_app{
-        {84, (15 * 16) - 4, 72, 28},
+        {UI_POS_X_CENTER(9), (15 * 16) - 4, UI_POS_WIDTH(9), 28},
        "AUDIO"};

    ButtonWithEncoder button_add{
-        {168, (15 * 16) - 4, 72, 28},
+        {UI_POS_X_RIGHT(9), (15 * 16) - 4, UI_POS_WIDTH(9), 28},
        "<STORE>"};

    Button button_dir{
@@ -384,15 +384,15 @@ class ReconView : public View {
        "RST"};

    Button button_mic_app{
-        {84, (35 * 8) - 4, 72, 28},
+        {UI_POS_X_CENTER(9), (35 * 8) - 4, UI_POS_WIDTH(9), 28},
        "MIC TX"};

    ButtonWithEncoder button_remove{
-        {168, (35 * 8) - 4, 72, 28},
+        {UI_POS_X_RIGHT(9), (35 * 8) - 4, UI_POS_WIDTH(9), 28},
        "<REMOVE>"};

    ProgressBar progressbar{
-        {0 * 8, SCREEN_H / 2 - 16, SCREEN_W, 32}};
+        {UI_POS_X(0), screen_height / 2 - 16, screen_width, 32}};

    TransmitterView2 tx_view{
        {11 * 8, 2 * 16},
@@ -82,7 +82,7 @@ ReconSetupViewMain::ReconSetupViewMain(NavigationView& nav, Rect parent_rect, st
    };

    button_choose_output_name.on_select = [this, &nav](Button&) {
-        text_prompt(nav, _output_file, 28, [this](std::string& buffer) {
+        text_prompt(nav, _output_file, 28, ENTER_KEYBOARD_MODE_ALPHA, [this](std::string& buffer) {
            _output_file = buffer;
            button_choose_output_name.set_text(_output_file);
        });
@@ -57,10 +57,6 @@
 #define RECON_MIN_LOCK_DURATION 100   // have to be >= and a multiple of STATS_UPDATE_INTERVAL
 #define RECON_DEF_WAIT_DURATION 1000  // will be incremented/decremented by STATS_UPDATE_INTERVAL steps

-// screen size helper
-#define SCREEN_W 240
-// #define SCREEN_H 320
-
 // recon settings nb params
 #define RECON_SETTINGS_NB_PARAMS 7

@@ -219,7 +215,7 @@ class ReconSetupView : public View {
    std::string input_file{"RECON"};
    std::string output_file{"RECON_RESULTS"};

-    Rect view_rect{0, 3 * 8, SCREEN_W, 230};
+    Rect view_rect{0, 3 * 8, screen_width, 230};

    ReconSetupViewMain viewMain{nav_, view_rect, input_file, output_file};
    ReconSetupViewMore viewMore{nav_, view_rect};
@@ -229,7 +225,7 @@ class ReconSetupView : public View {
        {"More", Theme::getInstance()->fg_green->foreground, &viewMore}};

    Button button_save{
-        {9 * 8, 255, 14 * 8, 40},
+        {UI_POS_X_CENTER(18), 255, UI_POS_WIDTH(18), 40},
        "SAVE"};
 };

@@ -46,15 +46,15 @@ class SdOverUsbView : public View {
    NavigationView& nav_;

    Labels labels{
-        {{3 * 8, 2 * 16}, "Click Run to start the", Theme::getInstance()->bg_darkest->foreground},
-        {{3 * 8, 3 * 16}, "USB Mass Storage Mode.", Theme::getInstance()->bg_darkest->foreground},
-        {{3 * 8, 5 * 16}, "It can take up to 20s", Theme::getInstance()->bg_darkest->foreground},
-        {{3 * 8, 6 * 16}, "for the drive to be", Theme::getInstance()->bg_darkest->foreground},
-        {{3 * 8, 7 * 16}, "available.", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X_CENTER(22), 2 * 16}, "Click Run to start the", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X_CENTER(22), 3 * 16}, "USB Mass Storage Mode.", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X_CENTER(21), 5 * 16}, "It can take up to 20s", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X_CENTER(19), 6 * 16}, "for the drive to be", Theme::getInstance()->bg_darkest->foreground},
+        {{UI_POS_X_CENTER(10), 7 * 16}, "available.", Theme::getInstance()->bg_darkest->foreground},
    };

    Button button_run{
-        {9 * 8, 15 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12), 15 * 16, 12 * 8, 3 * 16},
        "Run"};
 };

@@ -26,17 +26,24 @@
 #include "binder.hpp"
 #include "string_format.hpp"
 #include "ui_freqman.hpp"
+#include "audio.hpp"

 using namespace portapack;
+namespace pmem = portapack::persistent_memory;

 namespace ui {

+void SearchLogger::log_data(SearchRecentEntry& data) {
+    log_file.write_entry(";" + to_string_short_freq(data.frequency) + ";" + std::to_string(data.duration));
+}
+
 template <>
 void RecentEntriesTable<SearchRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    std::string str_duration = "";

    if (entry.duration < 600)
@@ -44,9 +51,10 @@ void RecentEntriesTable<SearchRecentEntries>::draw(
    else
        str_duration = to_string_dec_uint(entry.duration / 600) + "m" + to_string_dec_uint((entry.duration / 10) % 60) + "s";

-    str_duration.resize(target_rect.width() / 8, ' ');
-
-    painter.draw_string(target_rect.location(), style, to_string_short_freq(entry.frequency) + " " + entry.time + " " + str_duration);
+    str_duration.resize(11, ' ');
+    std::string freq = to_string_short_freq(entry.frequency);
+    freq.resize(columns.at(0).second, ' ');
+    painter.draw_string(target_rect.location(), style, freq + " " + entry.time + " " + str_duration);
 }

 /* SearchView ********************************************/
@@ -54,8 +62,13 @@ void RecentEntriesTable<SearchRecentEntries>::draw(
 SearchView::SearchView(
    NavigationView& nav)
    : nav_(nav) {
+    spectrum_row.resize(240);
    baseband::run_image(portapack::spi_flash::image_tag_wideband_spectrum);

+    if (!gradient.load_file(default_gradient_file)) {
+        gradient.set_default();
+    }
+
    add_children({&labels,
                  &field_frequency_min,
                  &field_frequency_max,
@@ -71,11 +84,12 @@ SearchView::SearchView(
                  &check_snap,
                  &options_snap,
                  &big_display,
+                  &check_log,
                  &recent_entries_view});

    baseband::set_spectrum(SEARCH_SLICE_WIDTH, 31);

-    recent_entries_view.set_parent_rect({0, 28 * 8, screen_width, 12 * 8});
+    recent_entries_view.set_parent_rect({0, 28 * 8, screen_width, screen_height - 28 * 8});
    recent_entries_view.on_select = [this, &nav](const SearchRecentEntry& entry) {
        nav.push<FrequencySaveView>(entry.frequency);
    };
@@ -96,6 +110,14 @@ SearchView::SearchView(
        on_range_changed();
    });

+    check_log.on_select = [this](Checkbox&, bool v) {
+        logging = v;
+        if (logging) {
+            logger.append(logs_dir.string() + "/SEARCH_" + to_string_timestamp(rtc_time::now()) + ".CSV");
+            logger.write_header();
+        }
+    };
+
    bind(field_threshold, settings_.power_threshold);
    bind(check_snap, settings_.snap_search);
    bind(options_snap, settings_.snap_step);
@@ -104,9 +126,15 @@ SearchView::SearchView(

    on_range_changed();
    receiver_model.enable();
+
+    if (pmem::beep_on_packets()) {
+        audio::set_rate(audio::Rate::Hz_24000);
+        audio::output::start();
+    }
 }

 SearchView::~SearchView() {
+    audio::output::stop();
    receiver_model.disable();
    baseband::shutdown();
 }
@@ -135,9 +163,8 @@ void SearchView::do_detection() {
    // Display spectrum
    bin_skip_acc = 0;
    pixel_index = 0;
-    display.draw_pixels(
-        {{0, 88}, {(Dim)spectrum_row.size(), 1}},
-        spectrum_row);
+    uint16_t center_align_start = (screen_width - spectrum_row.size()) / 2;
+    display.draw_pixels({{center_align_start, 88}, {(Dim)spectrum_row.size(), 1}}, spectrum_row);

    mean_power = mean_acc / (SEARCH_BIN_NB_NO_DC * slices_nb);
    mean_acc = 0;
@@ -188,7 +215,9 @@ void SearchView::do_detection() {

                        locked = true;
                        locked_bin = bin_max;
-
+                        if (pmem::beep_on_packets()) {
+                            baseband::request_audio_beep(1000, 24000, 60);
+                        }
                        // TODO: open Audio.
                    } else
                        text_infos.set("Out of range");
@@ -206,6 +235,7 @@ void SearchView::do_detection() {

                auto& entry = ::on_packet(recent, resolved_frequency);
                entry.set_duration(duration);
+                if (logging) logger.log_data(entry);
                recent_entries_view.set_dirty();

                text_infos.set("Listening");
@@ -221,7 +251,7 @@ void SearchView::do_detection() {
    // Refresh red tick
    portapack::display.fill_rectangle({last_tick_pos, 90, 1, 6}, Theme::getInstance()->fg_red->background);
    if (bin_max > -1) {
-        last_tick_pos = (Coord)(bin_max / slices_nb);
+        last_tick_pos = (Coord)(bin_max / slices_nb) + center_align_start;
        portapack::display.fill_rectangle({last_tick_pos, 90, 1, 6}, Theme::getInstance()->fg_red->foreground);
    }
 }
@@ -290,7 +320,7 @@ void SearchView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
                power = spectrum.db[bin - 128];
        }

-        add_spectrum_pixel(spectrum_rgb3_lut[power]);
+        add_spectrum_pixel(gradient.lut[power]);

        mean_acc += power;
        if (power > max_power) {
@@ -370,7 +400,7 @@ void SearchView::add_spectrum_pixel(Color color) {

    bin_skip_acc -= 0x10000;

-    if (pixel_index < screen_width)
+    if (pixel_index < spectrum_row.size())
        spectrum_row[pixel_index++] = color;
 }

@@ -24,8 +24,10 @@
 #include "receiver_model.hpp"
 #include "recent_entries.hpp"
 #include "radio_state.hpp"
-#include "spectrum_color_lut.hpp"
+#include "gradient.hpp"
 #include "ui_receiver.hpp"
+#include "log_file.hpp"
+#include "file_path.hpp"

 namespace ui {

@@ -70,6 +72,21 @@ struct SearchRecentEntry {

 using SearchRecentEntries = RecentEntries<SearchRecentEntry>;

+class SearchLogger {
+   public:
+    Optional<File::Error> append(const std::filesystem::path& filename) {
+        return log_file.append(filename);
+    }
+
+    void log_data(SearchRecentEntry& data);
+    void write_header() {
+        log_file.write_raw("Time;Freq;Duration;");
+    }
+
+   private:
+    LogFile log_file{};
+};
+
 class SearchView : public View {
   public:
    SearchView(NavigationView& nav);
@@ -88,6 +105,7 @@ class SearchView : public View {

   private:
    NavigationView& nav_;
+    Gradient gradient{};
    RxRadioState radio_state_{
        100'000'000 /* frequency */,
        2500000 /* bandwidth */,
@@ -125,7 +143,7 @@ class SearchView : public View {
    uint32_t bin_skip_acc = 0;
    uint32_t bin_skip_frac = 0;
    uint32_t pixel_index = 0;
-    std::array<Color, 240> spectrum_row{};
+    std::vector<Color> spectrum_row{};
    ChannelSpectrumFIFO* fifo = nullptr;

    uint8_t detect_timer = 0;
@@ -147,6 +165,8 @@ class SearchView : public View {
    uint16_t locked_bin = 0;
    uint8_t search_counter = 0;
    bool locked = false;
+    bool logging = false;
+    SearchLogger logger{};

    void do_detection();
    void do_timers();
@@ -154,75 +174,82 @@ class SearchView : public View {
    void on_range_changed();
    void add_spectrum_pixel(Color color);

-    const RecentEntriesColumns columns{{{"Frequency", 9},
-                                        {"Time", 8},
-                                        {"Duration", 11}}};
+    RecentEntriesColumns columns{{{"Frequency", 0},
+                                  {"Time", 8},
+                                  {"Duration", 11}}};
    SearchRecentEntries recent{};
    RecentEntriesView<RecentEntries<SearchRecentEntry>> recent_entries_view{columns, recent};

    Labels labels{
-        {{1 * 8, 0}, "Min:      Max:       LNA VGA", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 4 * 8}, "Trig:   /255    Mean:   /255", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 6 * 8}, "Slices:  /32      Rate:   Hz", Theme::getInstance()->fg_light->foreground},
-        {{6 * 8, 10 * 8}, "Timer  Status", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 25 * 8}, "Accuracy +/-4.9kHz", Theme::getInstance()->fg_light->foreground},
-        {{26 * 8, 25 * 8}, "MHz", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(1), UI_POS_Y(0)}, "Min:      Max:       ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(7), UI_POS_Y(0)}, "LNA VGA", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), UI_POS_Y(2)}, "Trig:   /255", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(12), UI_POS_Y(2)}, "Mean:   /255", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), UI_POS_Y(3)}, "Slices:  /32", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(10), UI_POS_Y(3)}, "Rate:   Hz", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(6), UI_POS_Y(5)}, "Timer  Status", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(1), 25 * 8}, "Accuracy +/-4.9kHz", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_RIGHT(4), 25 * 8}, "MHz", Theme::getInstance()->fg_light->foreground}};
+
+    Checkbox check_log{
+        {UI_POS_X_RIGHT(6), UI_POS_Y(5)},
+        3,
+        "LOG",
+        true};

    FrequencyField field_frequency_min{
-        {1 * 8, 1 * 16}};
+        {UI_POS_X(1), UI_POS_Y(1)}};
    FrequencyField field_frequency_max{
-        {11 * 8, 1 * 16}};
+        {UI_POS_X(11), UI_POS_Y(1)}};

    LNAGainField field_lna{
-        {22 * 8, 1 * 16}};
+        {UI_POS_X_RIGHT(7), UI_POS_Y(1)}};
    VGAGainField field_vga{
-        {26 * 8, 1 * 16}};
+        {UI_POS_X_RIGHT(3), UI_POS_Y(1)}};

    NumberField field_threshold{
-        {6 * 8, 2 * 16},
+        {UI_POS_X(6), UI_POS_Y(2)},
        3,
        {5, 255},
        5,
        ' '};
    Text text_mean{
-        {22 * 8, 2 * 16, 3 * 8, 16},
+        {UI_POS_X_RIGHT(7), UI_POS_Y(2), UI_POS_WIDTH(3), UI_POS_HEIGHT(1)},
        "---"};
    Text text_slices{
-        {8 * 8, 3 * 16, 2 * 8, 16},
+        {UI_POS_X(8), UI_POS_Y(3), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)},
        "--"};
    Text text_rate{
-        {24 * 8, 3 * 16, 3 * 8, 16},
+        {UI_POS_X_RIGHT(5), UI_POS_Y(3), UI_POS_WIDTH(3), UI_POS_HEIGHT(1)},
        "---"};

    VuMeter vu_max{
-        {1 * 8, 11 * 8 - 4, 3 * 8, 48},
+        {UI_POS_X(1), 11 * 8 - 4, 3 * 8, 48},
        18,
        false};

    ProgressBar progress_timers{
-        {6 * 8, 12 * 8, 6 * 8, 16}};
+        {UI_POS_X(6), UI_POS_Y(6), UI_POS_WIDTH(6), UI_POS_HEIGHT(1)}};
    Text text_infos{
-        {13 * 8, 12 * 8, 15 * 8, 16},
+        {UI_POS_X(13), UI_POS_Y(6), UI_POS_WIDTH(15), UI_POS_HEIGHT(1)},
        "Listening"};

    Checkbox check_snap{
-        {6 * 8, 15 * 8},
+        {UI_POS_X(6), 15 * 8},
        7,
        "Snap to:",
        true};
    OptionsField options_snap{
-        {17 * 8, 15 * 8},  // Position
-        7,                 // Length
-        {                  // Options
+        {UI_POS_X(17), 15 * 8},  // Position
+        7,                       // Length
+        {                        // Options
         {"25kHz  ", 25'000},
         {"12.5kHz", 12'500},
         {"8.33kHz", 8'333},
         {"2.5kHz", 2'500},
         {"500Hz", 500}}};

-    BigFrequency big_display{
-        {4, 9 * 16, 28 * 8, 52},
-        0};
+    BigFrequency big_display{{UI_POS_X_CENTER(28), UI_POS_Y(9), UI_POS_WIDTH(28), 52}, 0};

    MessageHandlerRegistration message_handler_spectrum_config{
        Message::ID::ChannelSpectrumConfig,
@@ -6,7 +6,7 @@
 * Copyright (C) 2024 Mark Thompson
 * Copyright (C) 2024 u-foka
 * Copyright (C) 2024 HTotoo
- * Copyleft (ɔ) 2024 zxkmm under GPL license
+ * copyleft 2024 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -40,6 +40,7 @@ using namespace lpc43xx;

 #include "audio.hpp"
 #include "portapack.hpp"
+#include "portapack_io.hpp"
 using namespace portapack;

 #include "file.hpp"
@@ -53,6 +54,8 @@ namespace fs = std::filesystem;
 #include "i2cdevmanager.hpp"
 #include "i2cdev_max17055.hpp"

+#include "file_reader.hpp"
+
 extern ui::SystemView* system_view_ptr;

 namespace pmem = portapack::persistent_memory;
@@ -324,6 +327,7 @@ SetUIView::SetUIView(NavigationView& nav) {
                  &toggle_bias_tee,
                  &toggle_clock,
                  &toggle_mute,
+                  &toggle_fake_brightness,
                  &toggle_sd_card,
                  &button_save,
                  &button_cancel});
@@ -361,6 +365,7 @@ SetUIView::SetUIView(NavigationView& nav) {
    toggle_clock.set_value(!pmem::ui_hide_clock());
    toggle_speaker.set_value(!pmem::ui_hide_speaker());
    toggle_mute.set_value(!pmem::ui_hide_mute());
+    toggle_fake_brightness.set_value(!pmem::ui_hide_fake_brightness());
    toggle_battery_icon.set_value(!pmem::ui_hide_battery_icon());
    toggle_battery_text.set_value(!pmem::ui_hide_numeric_battery());
    toggle_sd_card.set_value(!pmem::ui_hide_sd_card());
@@ -389,6 +394,7 @@ SetUIView::SetUIView(NavigationView& nav) {
        pmem::set_ui_hide_clock(!toggle_clock.value());
        pmem::set_ui_hide_speaker(!toggle_speaker.value());
        pmem::set_ui_hide_mute(!toggle_mute.value());
+        pmem::set_ui_hide_fake_brightness(!toggle_fake_brightness.value());
        pmem::set_ui_hide_battery_icon(!toggle_battery_icon.value());
        pmem::set_ui_hide_numeric_battery(!toggle_battery_text.value());
        pmem::set_ui_hide_sd_card(!toggle_sd_card.value());
@@ -669,32 +675,6 @@ void SetAudioView::focus() {
    button_save.focus();
 }

-/* SetQRCodeView *****************************************/
-
-SetQRCodeView::SetQRCodeView(NavigationView& nav) {
-    add_children({
-        &labels,
-        &checkbox_bigger_qr,
-        &button_save,
-        &button_cancel,
-    });
-
-    checkbox_bigger_qr.set_value(pmem::show_bigger_qr_code());
-
-    button_save.on_select = [&nav, this](Button&) {
-        pmem::set_show_bigger_qr_code(checkbox_bigger_qr.value());
-        nav.pop();
-    };
-
-    button_cancel.on_select = [&nav, this](Button&) {
-        nav.pop();
-    };
-}
-
-void SetQRCodeView::focus() {
-    button_save.focus();
-}
-
 /* SetEncoderDialView ************************************/

 SetEncoderDialView::SetEncoderDialView(NavigationView& nav) {
@@ -702,14 +682,34 @@ SetEncoderDialView::SetEncoderDialView(NavigationView& nav) {
                  &field_encoder_dial_sensitivity,
                  &field_encoder_rate_multiplier,
                  &button_save,
-                  &button_cancel});
+                  &button_cancel,
+                  &button_dial_sensitivity_plus,
+                  &button_dial_sensitivity_minus,
+                  &button_rate_multiplier_plus,
+                  &button_rate_multiplier_minus,
+                  &field_encoder_dial_direction});

    field_encoder_dial_sensitivity.set_by_value(pmem::encoder_dial_sensitivity());
    field_encoder_rate_multiplier.set_value(pmem::encoder_rate_multiplier());
+    field_encoder_dial_direction.set_by_value(pmem::encoder_dial_direction());
+
+    button_dial_sensitivity_plus.on_select = [this](Button&) {
+        field_encoder_dial_sensitivity.on_encoder(1);
+    };
+    button_dial_sensitivity_minus.on_select = [this](Button&) {
+        field_encoder_dial_sensitivity.on_encoder(-1);
+    };
+    button_rate_multiplier_plus.on_select = [this](Button&) {
+        field_encoder_rate_multiplier.on_encoder(1);
+    };
+    button_rate_multiplier_minus.on_select = [this](Button&) {
+        field_encoder_rate_multiplier.on_encoder(-1);
+    };

    button_save.on_select = [&nav, this](Button&) {
        pmem::set_encoder_dial_sensitivity(field_encoder_dial_sensitivity.selected_index_value());
        pmem::set_encoder_rate_multiplier(field_encoder_rate_multiplier.value());
+        pmem::set_encoder_dial_direction(field_encoder_dial_direction.selected_index_value());
        nav.pop();
    };

@@ -722,6 +722,36 @@ void SetEncoderDialView::focus() {
    button_save.focus();
 }

+/* SetButtonsView ************************************/
+
+SetButtonsView::SetButtonsView(NavigationView& nav) {
+    add_children({&labels,
+                  &button_save,
+                  &button_cancel,
+                  &field_repeat_delay,
+                  &field_repeat_speed,
+                  &field_long_press_delay});
+
+    field_repeat_delay.set_by_value(pmem::ui_button_repeat_delay());
+    field_repeat_speed.set_by_value(pmem::ui_button_repeat_speed());
+    field_long_press_delay.set_by_value(pmem::ui_button_long_press_delay());
+
+    button_save.on_select = [&nav, this](Button&) {
+        pmem::set_ui_button_repeat_delay(field_repeat_delay.selected_index_value());
+        pmem::set_ui_button_repeat_speed(field_repeat_speed.selected_index_value());
+        pmem::set_ui_button_long_press_delay(field_long_press_delay.selected_index_value());
+        nav.pop();
+    };
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        nav.pop();
+    };
+}
+
+void SetButtonsView::focus() {
+    button_save.focus();
+}
+
 /* AppSettingsView ************************************/

 AppSettingsView::AppSettingsView(
@@ -730,7 +760,7 @@ AppSettingsView::AppSettingsView(
    add_children({&labels,
                  &menu_view});

-    menu_view.set_parent_rect({0, 3 * 8, 240, 33 * 8});
+    menu_view.set_parent_rect({0, 3 * 8, screen_width, UI_POS_HEIGHT_REMAINING(3)});

    ensure_directory(settings_dir);

@@ -777,21 +807,38 @@ void SetConfigModeView::focus() {
 /* SetDisplayView ************************************/

 SetDisplayView::SetDisplayView(NavigationView& nav) {
-    add_children({&button_save,
+    add_children({&labels,
+                  &field_fake_brightness,
+                  &button_save,
                  &button_cancel,
-                  &checkbox_invert_switch});
+                  &checkbox_brightness_switch});

-    checkbox_invert_switch.set_value(pmem::config_lcd_inverted_mode());
+    if (portapack::device_type == portapack::DeviceType::DEV_PORTAPACK) {
+        add_child(&checkbox_ips_screen_switch);
+    }
+
+    field_fake_brightness.set_by_value(pmem::fake_brightness_level());
+    checkbox_brightness_switch.set_value(pmem::apply_fake_brightness());
+    checkbox_ips_screen_switch.set_value(pmem::config_lcd_normally_black());

    button_save.on_select = [&nav, this](Button&) {
-        if (checkbox_invert_switch.value() != pmem::config_lcd_inverted_mode()) {
-            display.set_inverted(checkbox_invert_switch.value());
-            pmem::set_lcd_inverted_mode(checkbox_invert_switch.value());
+        pmem::set_apply_fake_brightness(checkbox_brightness_switch.value());
+        pmem::set_fake_brightness_level(field_fake_brightness.selected_index_value());
+        if (checkbox_ips_screen_switch.value() != pmem::config_lcd_normally_black()) {
+            pmem::set_lcd_normally_black(checkbox_ips_screen_switch.value());
        }
        send_system_refresh();
        nav.pop();
    };

+    // only enable invert OR fake brightness
+    checkbox_ips_screen_switch.on_select = [this](Checkbox&, bool v) {
+        if (v) checkbox_brightness_switch.set_value(false);
+    };
+    checkbox_brightness_switch.on_select = [this](Checkbox&, bool v) {
+        if (v) checkbox_ips_screen_switch.set_value(false);
+    };
+
    button_cancel.on_select = [&nav, this](Button&) {
        nav.pop();
    };
@@ -957,67 +1004,6 @@ void SetMenuColorView::focus() {
    button_save.focus();
 }

-/* SetAutoStartView ************************************/
-
-SetAutostartView::SetAutostartView(NavigationView& nav) {
-    add_children({&labels,
-                  &button_save,
-                  &button_cancel,
-                  &button_reset,
-                  &options});
-
-    button_save.on_select = [&nav, this](Button&) {
-        autostart_app = "";
-        if (selected != 0) {
-            auto it = full_app_list.find(selected);
-            if (it != full_app_list.end())
-                autostart_app = it->second;
-        }
-        nav.pop();
-    };
-
-    button_cancel.on_select = [&nav, this](Button&) {
-        nav.pop();
-    };
-
-    button_reset.on_select = [this](Button&) {
-        selected = 0;
-        options.set_selected_index(0);
-        autostart_app = "";
-    };
-
-    // options
-    i = 0;
-    OptionsField::option_t o{"-none-", i};
-    opts.emplace_back(o);
-    for (auto& app : NavigationView::appList) {
-        if (app.id == nullptr) continue;
-        i++;
-        o = {app.displayName, i};
-        opts.emplace_back(o);
-        full_app_list.emplace(i, app.id);
-        if (autostart_app == app.id) selected = i;
-    }
-    ExternalItemsMenuLoader::load_all_external_items_callback([this](ui::AppInfoConsole& app) {
-        if (app.appCallName == nullptr) return;
-        i++;
-        OptionsField::option_t o = {app.appFriendlyName, i};
-        opts.emplace_back(o);
-        full_app_list.emplace(i, app.appCallName);
-        if (autostart_app == app.appCallName) selected = i;
-    });
-
-    options.set_options(opts);
-    options.on_change = [this](size_t, OptionsField::value_t v) {
-        selected = v;
-    };
-    options.set_selected_index(selected);
-}
-
-void SetAutostartView::focus() {
-    options.focus();
-}
-
 /* SetThemeView ************************************/

 SetThemeView::SetThemeView(NavigationView& nav) {
@@ -1061,12 +1047,14 @@ SetBatteryView::SetBatteryView(NavigationView& nav) {
    add_children({&labels,
                  &button_save,
                  &button_cancel,
-                  &checkbox_overridebatt});
+                  &checkbox_overridebatt,
+                  &checkbox_battery_charge_hint});

    if (i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055)) add_children({&button_reset, &labels2});

    button_save.on_select = [&nav, this](Button&) {
        pmem::set_ui_override_batt_calc(checkbox_overridebatt.value());
+        pmem::set_ui_battery_charge_hint(checkbox_battery_charge_hint.value());
        battery::BatteryManagement::set_calc_override(checkbox_overridebatt.value());
        send_system_refresh();
        nav.pop();
@@ -1081,6 +1069,7 @@ SetBatteryView::SetBatteryView(NavigationView& nav) {
    };

    checkbox_overridebatt.set_value(pmem::ui_override_batt_calc());
+    checkbox_battery_charge_hint.set_value(pmem::ui_battery_charge_hint());

    button_cancel.on_select = [&nav, this](Button&) {
        nav.pop();
@@ -1099,9 +1088,12 @@ SettingsMenuView::SettingsMenuView(NavigationView& nav)
 }

 void SettingsMenuView::on_populate() {
-    if (pmem::show_gui_return_icon()) {
+    const bool return_icon = pmem::show_gui_return_icon();
+
+    if (return_icon) {
        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [this]() { nav_.pop(); }}});
    }
+
    add_items({
        {"App Settings", ui::Color::dark_cyan(), &bitmap_icon_notepad, [this]() { nav_.push<AppSettingsView>(); }},
        {"Audio", ui::Color::dark_cyan(), &bitmap_icon_speaker, [this]() { nav_.push<SetAudioView>(); }},
@@ -1111,18 +1103,20 @@ void SettingsMenuView::on_populate() {
        {"Converter", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetConverterSettingsView>(); }},
        {"Date/Time", ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [this]() { nav_.push<SetDateTimeView>(); }},
        {"Encoder Dial", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetEncoderDialView>(); }},
+        {"Button Speed", ui::Color::dark_cyan(), &bitmap_icon_controls, [this]() { nav_.push<SetButtonsView>(); }},
        {"Freq. Correct", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetFrequencyCorrectionView>(); }},
        {"P.Memory Mgmt", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<SetPersistentMemoryView>(); }},
        {"Radio", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetRadioView>(); }},
        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [this]() { nav_.push<SetSDCardView>(); }},
        {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [this]() { nav_.push<SetUIView>(); }},
-        //{"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [this]() { nav_.push<SetQRCodeView>(); }},
        {"Display", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetDisplayView>(); }},
        {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetMenuColorView>(); }},
        {"Theme", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetThemeView>(); }},
-        {"Autostart", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetAutostartView>(); }},
    });
+
    if (battery::BatteryManagement::isDetected()) add_item({"Battery", ui::Color::dark_cyan(), &bitmap_icon_batt_icon, [this]() { nav_.push<SetBatteryView>(); }});
+
+    add_external_items(nav_, app_location_t::SETTINGS, *this, return_icon ? 1 : 0);
 }

 } /* namespace ui */
@@ -5,7 +5,7 @@
 * Copyright (C) 2023 Kyle Reed
 * Copyright (C) 2024 Mark Thompson
 * Copyright (C) 2024 u-foka
- * Copyleft (ɔ) 2024 zxkmm under GPL license
+ * copyleft 2024 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -72,8 +72,8 @@ class SetDateTimeView : public View {
        {{1 * 8, 5 * 16 - 2}, "YYYY-MM-DD HH:MM:SS  DoW DoY", Theme::getInstance()->fg_medium->foreground},
        {{5 * 8, 6 * 16}, "-  -     :  :", Theme::getInstance()->fg_light->foreground},
        {{1 * 8, 11 * 16}, "DST adds 1 hour to RTC time.", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 12 * 16}, "Start: 0:00 on Nth  DDD in", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 13 * 16}, "End:   1:00 on Nth  DDD in", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 12 * 16}, "Start: 0:00 on Nth  DDD in", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 13 * 16}, "End:   1:00 on Nth  DDD in", Theme::getInstance()->fg_light->foreground}};

    NumberField field_year{
        {1 * 8, 6 * 16},
@@ -170,10 +170,10 @@ class SetDateTimeView : public View {
        {}};

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

    void form_init(const SetDateTimeModel& model);
@@ -253,10 +253,10 @@ class SetRadioView : public View {
        "Disable external TCXO"};

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

@@ -363,16 +363,20 @@ class SetUIView : public View {
        {19 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_icon_batt_text};

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

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

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

@@ -387,28 +391,28 @@ class SetSDCardView : public View {
   private:
    Labels labels{
        // 01234567890123456789012345678
-        {{1 * 8, 120 - 48}, "    HIGH SPEED SDCARD IO     ", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 120 - 32}, "   May or may not work !!    ", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X_CENTER(26), 120 - 48}, "  HIGH SPEED SDCARD IO   ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(26), 120 - 32}, " May or may not work !!  ", Theme::getInstance()->fg_light->foreground}};

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

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

    Text text_sdcard_test_status{
-        {2 * 8, 198, 28 * 8, 16},
+        {UI_POS_X_CENTER(28), 198, UI_POS_WIDTH(28), UI_POS_HEIGHT(1)},
        ""};

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

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

@@ -451,7 +455,7 @@ class SetConverterSettingsView : public View {
        {8 * 8, 10 * 16}};

    Button button_return{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Return",
    };
 };
@@ -494,7 +498,7 @@ class SetFrequencyCorrectionView : public View {
        {8 * 8, 10 * 16}};

    Button button_return{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12), UI_POS_Y_BOTTOM(4), 12 * 8, UI_POS_HEIGHT(2)},
        "Return",
    };
 };
@@ -532,44 +536,16 @@ class SetAudioView : public View {
        "Beep on RX packets"};

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

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
-        "Cancel",
-    };
-};
-
-class SetQRCodeView : public View {
-   public:
-    SetQRCodeView(NavigationView& nav);
-
-    void focus() override;
-
-    std::string title() const override { return "QR Code"; };
-
-   private:
-    Labels labels{
-        {{1 * 8, 1 * 16}, "Change the size of the QR", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 2 * 16}, "code shown in Radiosonde.", Theme::getInstance()->fg_light->foreground},
-    };
-
-    Checkbox checkbox_bigger_qr{
-        {3 * 8, 4 * 16},
-        20,
-        "Show large QR code"};
-
-    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
-        "Save"};
-
-    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Cancel",
    };
 };

+using portapack::persistent_memory::encoder_dial_direction;
 using portapack::persistent_memory::encoder_dial_sensitivity;
 using portapack::persistent_memory::encoder_rate_multiplier;

@@ -583,36 +559,101 @@ class SetEncoderDialView : public View {

   private:
    Labels labels{
-        {{1 * 8, 1 * 16}, "Adjusts sensitivity to dial", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 2 * 16}, "rotation position (number of", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 3 * 16}, "steps per full rotation):", Theme::getInstance()->fg_light->foreground},
-        {{2 * 8, 5 * 16}, "Dial sensitivity:", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 8 * 16}, "Adjusts sensitivity to dial", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 9 * 16}, "rotation rate (default 1", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 10 * 16}, "means no rate dependency):", Theme::getInstance()->fg_light->foreground},
-        {{3 * 8, 12 * 16}, "Rate multiplier:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Sensitivity to dial rotation", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 1 * 16}, "position (x steps per 360):", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "Sensitivity:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 7 * 16}, "Rotation rate (default 1", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 8 * 16}, "means no rate dependency):", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 10 * 16}, "Rate multiplier:", Theme::getInstance()->fg_light->foreground},
+        {{4 * 8, 14 * 16}, "Direction:", Theme::getInstance()->fg_light->foreground},
+
    };

    OptionsField field_encoder_dial_sensitivity{
-        {20 * 8, 5 * 16},
+        {20 * 8, 3 * 16},
        6,
        {{"LOW", encoder_dial_sensitivity::DIAL_SENSITIVITY_LOW},
         {"NORMAL", encoder_dial_sensitivity::DIAL_SENSITIVITY_NORMAL},
         {"HIGH", encoder_dial_sensitivity::DIAL_SENSITIVITY_HIGH}}};

    NumberField field_encoder_rate_multiplier{
-        {20 * 8, 12 * 16},
+        {20 * 8, 10 * 16},
        2,
        {1, 15},
        1,
        ' '};

+    OptionsField field_encoder_dial_direction{
+        {18 * 8, 14 * 16},
+        7,
+        {{"NORMAL", false},
+         {"REVERSE", true}}};
+
+    Button button_dial_sensitivity_plus{
+        {20 * 8, 2 * 16, 16, 16},
+        "+"};
+
+    Button button_dial_sensitivity_minus{
+        {20 * 8, 4 * 16, 16, 16},
+        "-"};
+
+    Button button_rate_multiplier_plus{
+        {20 * 8, 9 * 16, 16, 16},
+        "+"};
+
+    Button button_rate_multiplier_minus{
+        {20 * 8, 11 * 16, 16, 16},
+        "-"};
+
    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Save"};

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
+        "Cancel",
+    };
+};
+
+class SetButtonsView : public View {
+   public:
+    SetButtonsView(NavigationView& nav);
+    void focus() override;
+    std::string title() const override { return "Button Speed"; };
+
+   private:
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Adjusts response time when a", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "button is held down.", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 5 * 16}, "Repeat delay:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 7 * 16}, "Repeat speed:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 9 * 16}, "Long press delay:", Theme::getInstance()->fg_light->foreground},
+    };
+
+    OptionsField field_repeat_delay{
+        {20 * 8, 5 * 16},
+        6,
+        {{"NORMAL", false},
+         {"FAST", true}}};
+
+    OptionsField field_repeat_speed{
+        {20 * 8, 7 * 16},
+        6,
+        {{"NORMAL", false},
+         {"FAST", true}}};
+
+    OptionsField field_long_press_delay{
+        {20 * 8, 9 * 16},
+        6,
+        {{"NORMAL", false},
+         {"FAST", true}}};
+
+    Button button_save{
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
+        "Save"};
+
+    Button button_cancel{
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Cancel",
    };
 };
@@ -633,7 +674,7 @@ class SetPersistentMemoryView : public View {
    };

    Text text_pmem_status{
-        {1 * 8, 4 * 16 + 8, 28 * 8, 16},
+        {UI_POS_X_CENTER(28), 4 * 16 + 8, 28 * 8, 16},
        ""};

    Checkbox check_use_sdcard_for_pmem{
@@ -642,19 +683,19 @@ class SetPersistentMemoryView : public View {
        "Use SD card for P.Mem"};

    Button button_save_mem_to_file{
-        {1 * 8, 8 * 16, 28 * 8, 2 * 16},
+        {UI_POS_X_CENTER(28), 8 * 16, 28 * 8, 2 * 16},
        "Save P.Mem to SD card"};

    Button button_load_mem_from_file{
-        {1 * 8, 10 * 16 + 2, 28 * 8, 2 * 16},
+        {UI_POS_X_CENTER(28), 10 * 16 + 2, 28 * 8, 2 * 16},
        "Load P.Mem from SD Card"};

    Button button_load_mem_defaults{
-        {1 * 8, 12 * 16 + 4, 28 * 8, 2 * 16},
+        {UI_POS_X_CENTER(28), 12 * 16 + 4, 28 * 8, 2 * 16},
        "Reset P.Mem to defaults"};

    Button button_return{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Return",
    };
 };
@@ -672,7 +713,7 @@ class AppSettingsView : public View {
        {{0, 4}, "Select file to edit:", Theme::getInstance()->bg_darkest->foreground}};

    MenuView menu_view{
-        {0, 2 * 8, 240, 26 * 8},
+        {0, 2 * 8, screen_width, UI_POS_HEIGHT_REMAINING(3)},
        true};
 };

@@ -697,14 +738,15 @@ class SetConfigModeView : public View {
        "Config Mode enable"};

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

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 32},
        "Cancel",
    };
 };
+using portapack::persistent_memory::fake_brightness_level_options;

 class SetDisplayView : public View {
   public:
@@ -715,17 +757,38 @@ class SetDisplayView : public View {
    std::string title() const override { return "Display"; };

   private:
-    Checkbox checkbox_invert_switch{
-        {1 * 8, 2 * 16},
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Limits screen brightness", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "(has a small performance", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "impact when enabled).", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 8 * 16}, "Brightness:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 10 * 16}, "REBOOT TO APPLY SCREEN TYPE", Theme::getInstance()->fg_light->foreground},
+
+    };
+
+    OptionsField field_fake_brightness{
+        {20 * 8, 8 * 16},
+        6,
+        {{"12.5%", fake_brightness_level_options::BRIGHTNESS_12p5},
+         {"25%", fake_brightness_level_options::BRIGHTNESS_25},
+         {"50%", fake_brightness_level_options::BRIGHTNESS_50}}};
+
+    Checkbox checkbox_brightness_switch{
+        {1 * 8, 5 * 16},
+        16,
+        "Enable brightness adjust"};
+
+    Checkbox checkbox_ips_screen_switch{
+        {1 * 8, 12 * 16},
        23,
-        "Invert colors (For IPS)"};
+        "IPS Screen"};

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

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(16) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Cancel",
    };
 };
@@ -778,19 +841,19 @@ class SetTouchscreenThresholdView : public View {
    };

    Button button_autodetect{
-        {2 * 8, 13 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), 13 * 16, 12 * 8, 32},
        "Auto Detect"};
    Button button_reset{
-        {16 * 8, 13 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), 13 * 16, 12 * 8, 32},
        "Reset",
    };

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

    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), 16 * 16, 12 * 8, 32},
        "Cancel",
    };

@@ -813,14 +876,14 @@ class SetMenuColorView : public View {
    void paint_sample();

    Labels labels{
-        {{3 * 8, 1 * 16}, "Menu Button Color Scheme", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X_CENTER(25), 1 * 16}, "Menu Button Color Scheme", Theme::getInstance()->fg_light->foreground},
        {{2 * 8, 8 * 16}, "Red Level:", Theme::getInstance()->fg_light->foreground},
        {{2 * 8, 9 * 16}, "Green Level:", Theme::getInstance()->fg_light->foreground},
        {{2 * 8, 10 * 16}, "Blue Level:", Theme::getInstance()->fg_light->foreground},
    };

    NewButton button_sample{
-        {8 * 8, 4 * 16, 14 * 8, 3 * 16},
+        {UI_POS_X_CENTER(14), 4 * 16, 14 * 8, 3 * 16},
        "New Color",
        &bitmap_icon_brightness,
    };
@@ -850,61 +913,20 @@ class SetMenuColorView : public View {
    };

    Button button_reset{
-        {2 * 8, 13 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(7), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Reset",
    };

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

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

-class SetAutostartView : public View {
-   public:
-    SetAutostartView(NavigationView& nav);
-
-    void focus() override;
-
-    std::string title() const override { return "Autostart"; };
-
-   private:
-    int32_t i = 0;
-    std::string autostart_app{""};
-    OptionsField::options_t opts{};
-    std::map<int32_t, std::string> full_app_list{};  // looking table
-    int32_t selected = 0;
-    SettingsStore nav_setting{
-        "nav"sv,
-        {{"autostart_app"sv, &autostart_app}}};
-    Labels labels{
-        {{1 * 8, 1 * 16}, "Select app to start on boot", Theme::getInstance()->fg_light->foreground},
-        {{2 * 8, 2 * 16}, "(an SD Card is required)", Theme::getInstance()->fg_light->foreground}};
-
-    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
-        "Save"};
-
-    OptionsField options{
-        {0 * 8, 4 * 16},
-        screen_width / 8,
-        {},
-        true};
-
-    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
-        "Cancel",
-    };
-
-    Button button_reset{
-        {2 * 8, 6 * 16, screen_width - 4 * 8, 32},
-        "Reset"};
-};
-
 class SetThemeView : public View {
   public:
    SetThemeView(NavigationView& nav);
@@ -919,19 +941,16 @@ class SetThemeView : public View {
        {{1 * 8, 1 * 16}, "Select a theme.", Theme::getInstance()->fg_light->foreground},
        {{1 * 8, 2 * 16}, "Restart PP to fully apply!", Theme::getInstance()->fg_light->foreground}};

-    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
-        "Save"};
-
    OptionsField options{
-        {0 * 8, 4 * 16},
-        screen_width / 8,
+        {UI_POS_X(0), 4 * 16},
+        (size_t)(screen_width / 8),
        {
            {"Default - Grey", 0},
            {"Yellow", 1},
            {"Aqua", 2},
            {"Green", 3},
            {"Red", 4},
+            {"Dark", 5},
        },
        true};

@@ -940,8 +959,12 @@ class SetThemeView : public View {
        23,
        "Set Menu color too"};

+    Button button_save{
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        "Save"};
+
    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Cancel",
    };
 };
@@ -958,25 +981,34 @@ class SetBatteryView : public View {
    int32_t selected = 0;
    Labels labels{
        {{1 * 8, 1 * 16}, "Override batt calculation", Theme::getInstance()->fg_light->foreground},
-        {{1 * 8, 2 * 16}, "method to voltage based", Theme::getInstance()->fg_light->foreground}};
-    Labels labels2{
-        {{1 * 8, 6 * 16}, "Reset IC's learned params.", Theme::getInstance()->fg_light->foreground}};
-    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
-        "Save"};
+        {{1 * 8, 2 * 16}, "method to voltage based", Theme::getInstance()->fg_light->foreground},
+        /**/
+        {{1 * 8, 6 * 16}, "Display a hint to remind you", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 7 * 16}, "when you charge", Theme::getInstance()->fg_light->foreground}};
+
+    Labels labels2{{{1 * 8, 11 * 16}, "Reset IC's learned params.", Theme::getInstance()->fg_light->foreground}};

    Checkbox checkbox_overridebatt{
        {2 * 8, 4 * 16},
        23,
        "Override"};

+    Checkbox checkbox_battery_charge_hint{
+        {2 * 8, 9 * 16},
+        23,
+        "Charge hint"};
+
    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Cancel",
    };

+    Button button_save{
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        "Save"};
+
    Button button_reset{
-        {2 * 8, 8 * 16, 12 * 8, 32},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y(13), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Reset",
    };
 };
@@ -988,6 +1020,7 @@ class SettingsMenuView : public BtnGridView {

   private:
    NavigationView& nav_;
+
    void on_populate() override;
 };

@@ -57,7 +57,7 @@ void SIGFRXView::paint(Painter& painter) {
    uint8_t i, xp;

    // portapack::display.draw_bmp_from_bmp_hex_arr({0, 302-160}, fox_bmp);
-    portapack::display.fill_rectangle({0, 16, 240, 160 - 16}, Theme::getInstance()->bg_darkest->foreground);
+    portapack::display.fill_rectangle({0, 16, screen_width, 160 - 16}, Theme::getInstance()->bg_darkest->foreground);
    for (i = 0; i < 6; i++) {
        xp = sigfrx_marks[i * 3];
        painter.draw_string({(ui::Coord)sigfrx_marks[(i * 3) + 1], 144 - 20}, style_white, to_string_dec_uint(sigfrx_marks[(i * 3) + 2]));
@@ -66,7 +66,7 @@ void SIGFRXView::paint(Painter& painter) {
 }

 void SIGFRXView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
-    portapack::display.fill_rectangle({0, 144, 240, 4}, Theme::getInstance()->bg_darkest->foreground);
+    portapack::display.fill_rectangle({0, 144, screen_width, 4}, Theme::getInstance()->bg_darkest->foreground);

    uint8_t xmax = 0, imax = 0;
    size_t i;
@@ -44,9 +44,9 @@ SigGenView::~SigGenView() {

 void SigGenView::update_config() {
    if (checkbox_stop.value())
-        baseband::set_siggen_config(transmitter_model.channel_bandwidth(), options_shape.selected_index_value(), field_stop.value());
+        baseband::set_siggen_config(transmitter_model.channel_bandwidth(), (options_mod.selected_index_value() << 4) + options_shape.selected_index_value(), field_stop.value());
    else
-        baseband::set_siggen_config(transmitter_model.channel_bandwidth(), options_shape.selected_index_value(), 0);
+        baseband::set_siggen_config(transmitter_model.channel_bandwidth(), (options_mod.selected_index_value() << 4) + options_shape.selected_index_value(), 0);
 }

 void SigGenView::update_tone() {
@@ -78,6 +78,7 @@ SigGenView::SigGenView(
    baseband::run_image(portapack::spi_flash::image_tag_siggen);

    add_children({&labels,
+                  &options_mod,
                  &options_shape,
                  &text_shape,
                  &symfield_tone,
@@ -87,22 +88,48 @@ SigGenView::SigGenView(
                  &field_stop,
                  &tx_view});

-    symfield_tone.hidden(1);        // At first launch , by default we are in CW Shape has NO MOD , we are not using Tone modulation.
+    symfield_tone.hidden(true);  // At first launch , by default we are in CW: Shape ignored, we are not using Tone modulation.
+    options_shape.hidden(true);
+    text_shape.hidden(true);
    symfield_tone.set_value(1000);  // Default: 1000 Hz
    options_shape.on_change = [this](size_t, OptionsField::value_t v) {
        text_shape.set(shape_strings[v]);
        if (auto_update)
            update_config();
-        if ((v == 0) || (v == 6)) {  // In Shapes Options (CW & Pseudo Random Noise) we are not using Tone modulation freq.
-            symfield_tone.hidden(1);
+
+        if (v == 5) {  // In Shape Pseudo Random Noise we are not using Tone modulation freq.
+            symfield_tone.hidden(true);
        } else {
-            symfield_tone.hidden(0);
+            symfield_tone.hidden(false);
        }
+
        set_dirty();
    };
    options_shape.set_selected_index(0);
    text_shape.set(shape_strings[0]);

+    options_mod.on_change = [this](size_t, OptionsField::value_t v) {
+        if (auto_update)
+            update_config();
+
+        if (v == 0) {  // In Modulation Options CW we are not using Tone modulation freq.
+            symfield_tone.hidden(true);
+        } else {
+            symfield_tone.hidden(false);
+        }
+
+        if ((v == 0) || (v == 2) || (v == 3) || (v == 7)) {  // In Modulation Options CW, QPSK, BPSK, Pulsed CW we are not using Shapes.
+            options_shape.hidden(true);
+            text_shape.hidden(true);
+        } else {
+            options_shape.hidden(false);
+            text_shape.hidden(false);
+        }
+
+        set_dirty();
+    };
+    options_mod.set_selected_index(0);
+
    field_stop.set_value(1);

    symfield_tone.set_value(1000);  // Default: 1000 Hz
@@ -127,6 +154,13 @@ SigGenView::SigGenView(
        };
    };

+    tx_view.on_bandwidth_changed = [this]() {
+        // we don't protect here with auto_update because other field of tx_view obj isn't protected too
+        // to remains the design logic same
+
+        update_config();
+    };
+
    tx_view.on_start = [this]() {
        start_tx();
        tx_view.set_transmitting(true);
@@ -138,4 +172,4 @@ SigGenView::SigGenView(
    };
 }

-} /* namespace ui */
+} /* namespace ui */
@@ -58,70 +58,76 @@ class SigGenView : public View {
    app_settings::SettingsManager settings_{
        "tx_siggen", app_settings::Mode::TX};

-    const std::string shape_strings[9] = {
-        "CW  (No mod.) ",
-        "Sine mod. FM",
-        "Triangle mod.FM",  // max 15 character text space.
-        "Saw up mod. FM",
-        "Saw down mod.FM",
-        "Square mod. FM",
-        "Pseudo Noise FM",  // using 16 bits LFSR register, 16 order polynomial feedback.
-        "BPSK 0,1,0,1...",
-        "QPSK 00-01-10.."};
+    const std::string shape_strings[6] = {// max 15 character text space.
+                                          "Sine",
+                                          "Triangle",
+                                          "Saw up",
+                                          "Saw down",
+                                          "Square",
+                                          "Pseudo Noise"};

    bool auto_update{false};

    Labels labels{
-        {{3 * 8, 4 + 10}, "Shape:", Theme::getInstance()->fg_light->foreground},
-        {{6 * 8, 7 * 8}, "Tone:      Hz", Theme::getInstance()->fg_light->foreground},
-        {{22 * 8, 15 * 8 + 4}, "s.", Theme::getInstance()->fg_light->foreground},
-        {{8 * 8, 20 * 8}, "Modulation: FM", Theme::getInstance()->fg_light->foreground}};
+        {{3 * 8, 2 * 8}, "Modulation:", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, 3 * 8 + 8 + 10}, "Shape:", Theme::getInstance()->fg_light->foreground},
+        {{6 * 8, 2 * 8 + 7 * 8}, "Tone:      Hz", Theme::getInstance()->fg_light->foreground},
+        {{22 * 8, 2 * 8 + 15 * 8 + 4}, "s.", Theme::getInstance()->fg_light->foreground}};

    ImageOptionsField options_shape{
-        {10 * 8, 4, 32, 32},
+        {10 * 8, 3 * 8 + 8, 32, 32},
        Theme::getInstance()->bg_darkest->foreground,
        Theme::getInstance()->bg_darkest->background,
-        {{&bitmap_sig_cw, 0},
-         {&bitmap_sig_sine, 1},
-         {&bitmap_sig_tri, 2},
-         {&bitmap_sig_saw_up, 3},
-         {&bitmap_sig_saw_down, 4},
-         {&bitmap_sig_square, 5},
-         {&bitmap_sig_noise, 6},
-         {&bitmap_sig_noise, 7},    // Pending to add a correct BPSK icon.
-         {&bitmap_sig_noise, 8}}};  // Pending to add a correct QPSK icon.
+        {{&bitmap_sig_sine, 0},
+         {&bitmap_sig_tri, 1},
+         {&bitmap_sig_saw_up, 2},
+         {&bitmap_sig_saw_down, 3},
+         {&bitmap_sig_square, 4},
+         {&bitmap_sig_noise, 5}}};

    Text text_shape{
-        {15 * 8, 4 + 10, 15 * 8, 16},
+        {15 * 8, 3 * 8 + 8 + 10, 15 * 8, 16},
        ""};

    SymField symfield_tone{
-        {12 * 8, 7 * 8},
+        {12 * 8, 2 * 8 + 7 * 8},
        5};

    Button button_update{
-        {5 * 8, 10 * 8, 8 * 8, 3 * 8},
+        {5 * 8, 2 * 8 + 10 * 8, 8 * 8, 3 * 8},
        "Update"};

    Checkbox checkbox_auto{
-        {15 * 8, 10 * 8},
+        {15 * 8, 2 * 8 + 10 * 8},
        4,
        "Auto"};

    Checkbox checkbox_stop{
-        {5 * 8, 15 * 8},
+        {5 * 8, 2 * 8 + 15 * 8},
        10,
        "Stop after"};

    NumberField field_stop{
-        {20 * 8, 15 * 8 + 4},
+        {20 * 8, 2 * 8 + 15 * 8 + 4},
        2,
        {1, 99},
        1,
        ' '};

+    OptionsField options_mod{
+        {15 * 8, 2 * 8},
+        12,
+        {{"CW (No mod.)", 0},
+         {"FM", 1},
+         {"BPSK", 2},
+         {"QPSK", 3},
+         {"DSB", 4},
+         {"AM 100% dep.", 5},
+         {"AM 50% depth", 6},
+         {"Pulse CW 25%", 7}}};
+
    TransmitterView tx_view{
-        16 * 16,
+        (int16_t)UI_POS_Y_BOTTOM(4),
        10000,
        12};

@@ -54,6 +54,7 @@ SondeView::SondeView(NavigationView& nav)
                  &field_lna,
                  &field_vga,
                  &rssi,
+                  &channel,
                  &field_volume,
                  &check_log,
                  &check_crc,
@@ -96,39 +96,42 @@ class SondeView : public View {
    Labels labels{
        {{4 * 8, 2 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
        {{6 * 8, 3 * 16}, "ID:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 4 * 16}, "DateTime:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 4 * 16}, "DateTime:", Theme::getInstance()->fg_light->foreground},

        {{3 * 8, 5 * 16}, "Vbatt:", Theme::getInstance()->fg_light->foreground},
        {{3 * 8, 6 * 16}, "Frame:", Theme::getInstance()->fg_light->foreground},
        {{4 * 8, 7 * 16}, "Temp:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 8 * 16}, "Humidity:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 8 * 16}, "Humidity:", Theme::getInstance()->fg_light->foreground}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), 0 * 8},
        nav_};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {21 * 8, 0, UI_POS_WIDTH_REMAINING(24), 4}};
+    Channel channel{
+        {21 * 8, 5, UI_POS_WIDTH_REMAINING(24), 4},
+    };

    AudioVolumeField field_volume{
-        {28 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    Checkbox check_log{
-        {22 * 8, 8 * 16},
+        {UI_POS_X_RIGHT(8), UI_POS_Y(8)},
        3,
        "Log"};

    Checkbox check_crc{
-        {22 * 8, 10 * 16},
+        {UI_POS_X_RIGHT(8), UI_POS_Y(10)},
        3,
        "CRC"};

@@ -166,11 +169,11 @@ class SondeView : public View {
        GeoPos::spd_unit::HIDDEN};

    Button button_see_qr{
-        {2 * 8, 15 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 3 * 16},
        "See QR"};

    Button button_see_map{
-        {16 * 8, 15 * 16, 12 * 8, 3 * 16},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(4), 12 * 8, 3 * 16},
        "See on map"};

    GeoMapView* geomap_view_{nullptr};
@@ -58,7 +58,7 @@ void ScreenshotViewer::paint(Painter& painter) {
    }

    // Screenshots from PNGWriter are all this size.
-    if (file.size() != 232383) {
+    if ((file.size() != 232383 && screen_width == 240) || (screen_width == 320 && file.size() != 463743)) {
        show_invalid();
        return;
    }
@@ -66,7 +66,7 @@ void ScreenshotViewer::paint(Painter& painter) {
    constexpr size_t read_chunk = 80;  // NB: must be a factor of pixel_width.
    constexpr size_t buffer_size = sizeof(ColorRGB888) * read_chunk;
    uint8_t buffer[buffer_size];
-    std::array<Color, screen_width> pixel_data;
+    std::vector<Color> pixel_data(screen_width);

    // Seek past all the headers.
    file.seek(43);
@@ -27,6 +27,9 @@

 #include "ui_font_fixed_5x8.hpp"
 #include "ui_font_fixed_8x16.hpp"
+#include "portapack.hpp"
+
+#include "file.hpp"

 namespace ui {

@@ -93,8 +96,90 @@ bool i2c_read(uint8_t* cmd, size_t cmd_len, uint8_t* data, size_t data_len) {
    return dev->i2c_read(cmd, cmd_len, data, data_len);
 }

+// v3
+//  Version 3
+FRESULT ext_f_open(FIL* fp, const TCHAR* path, BYTE mode) {
+    return f_open(fp, path, mode);
+}
+FRESULT ext_f_close(FIL* fp) {
+    return f_close(fp);
+}
+FRESULT ext_f_read(FIL* fp, void* buff, UINT btr, UINT* br) {
+    return f_read(fp, buff, btr, br);
+}
+FRESULT ext_f_write(FIL* fp, const void* buff, UINT btw, UINT* bw) {
+    return f_write(fp, buff, btw, bw);
+}
+FRESULT ext_f_lseek(FIL* fp, FSIZE_t ofs) {
+    return f_lseek(fp, ofs);
+}
+FRESULT ext_f_truncate(FIL* fp) {
+    return f_truncate(fp);
+}
+FRESULT ext_f_sync(FIL* fp) {
+    return f_sync(fp);
+}
+FRESULT ext_f_opendir(DIR* dp, const TCHAR* path) {
+    return f_opendir(dp, path);
+}
+FRESULT ext_f_closedir(DIR* dp) {
+    return f_closedir(dp);
+}
+FRESULT ext_f_readdir(DIR* dp, FILINFO* fno) {
+    return f_readdir(dp, fno);
+}
+FRESULT ext_f_findfirst(DIR* dp, FILINFO* fno, const TCHAR* path, const TCHAR* pattern) {
+    return f_findfirst(dp, fno, path, pattern);
+}
+FRESULT ext_f_findnext(DIR* dp, FILINFO* fno) {
+    return f_findnext(dp, fno);
+}
+FRESULT ext_f_mkdir(const TCHAR* path) {
+    return f_mkdir(path);
+}
+FRESULT ext_f_unlink(const TCHAR* path) {
+    return f_unlink(path);
+}
+FRESULT ext_f_rename(const TCHAR* path_old, const TCHAR* path_new) {
+    return f_rename(path_old, path_new);
+}
+FRESULT ext_f_stat(const TCHAR* path, FILINFO* fno) {
+    return f_stat(path, fno);
+}
+FRESULT ext_f_utime(const TCHAR* path, const FILINFO* fno) {
+    return f_utime(path, fno);
+}
+FRESULT ext_f_getfree(const TCHAR* path, DWORD* nclst, FATFS** fatfs) {
+    return f_getfree(path, nclst, fatfs);
+}
+FRESULT ext_f_mount(FATFS* fs, const TCHAR* path, BYTE opt) {
+    return f_mount(fs, path, opt);
+}
+int ext_f_putc(TCHAR c, FIL* fp) {
+    return f_putc(c, fp);
+}
+int ext_f_puts(const TCHAR* str, FIL* cp) {
+    return f_puts(str, cp);
+}
+int ext_f_printf(FIL* fp, const TCHAR* str, ...) {
+    return f_printf(fp, str);
+}
+TCHAR* ext_f_gets(TCHAR* buff, int len, FIL* fp) {
+    return f_gets(buff, len, fp);
+}
+void ext_draw_pixels(const ui::Rect r, const ui::Color* const colors, const size_t count) {
+    portapack::display.draw_pixels(r, colors, count);
+}
+void ext_draw_pixel(const ui::Point p, const ui::Color color) {
+    portapack::display.draw_pixel(p, color);
+}
+
 StandaloneView* standaloneView = nullptr;

+void exit_app() {
+    if (standaloneView) standaloneView->exit();
+}
+
 void set_dirty() {
    if (standaloneView != nullptr)
        standaloneView->set_dirty();
@@ -121,6 +206,36 @@ standalone_application_api_t api = {
    /* .i2c_read = */ &i2c_read,
    /* .panic = */ &chDbgPanic,
    /* .set_dirty = */ &set_dirty,
+    // Version 3
+    .f_open = &ext_f_open,
+    .f_close = &ext_f_close,
+    .f_read = &ext_f_read,
+    .f_write = &ext_f_write,
+    .f_lseek = &ext_f_lseek,
+    .f_truncate = &ext_f_truncate,
+    .f_sync = &ext_f_sync,
+    .f_opendir = &ext_f_opendir,
+    .f_closedir = &ext_f_closedir,
+    .f_readdir = &ext_f_readdir,
+    .f_findfirst = &ext_f_findfirst,
+    .f_findnext = &ext_f_findnext,
+    .f_mkdir = &ext_f_mkdir,
+    .f_unlink = &ext_f_unlink,
+    .f_rename = &ext_f_rename,
+    .f_stat = &ext_f_stat,
+    .f_utime = &ext_f_utime,
+    .f_getfree = &ext_f_getfree,
+    .f_mount = &ext_f_mount,
+    .f_putc = &ext_f_putc,
+    .f_puts = &ext_f_puts,
+    .f_printf = &ext_f_printf,
+    .f_gets = &ext_f_gets,
+    .draw_pixels = &ext_draw_pixels,
+    .draw_pixel = &ext_draw_pixel,
+    .exit_app = &exit_app,
+    // version 4
+    .screen_height = &screen_height,
+    .screen_width = &screen_width,
 };

 StandaloneView::StandaloneView(NavigationView& nav, uint8_t* app_image)
@@ -158,22 +273,21 @@ bool StandaloneView::on_key(const KeyEvent key) {
    if (get_application_information()->header_version > 1) {
        return get_application_information()->OnKeyEvent((uint8_t)key);
    }
-
-    return false;
+    return true;
 }

 bool StandaloneView::on_encoder(const EncoderEvent event) {
    if (get_application_information()->header_version > 1) {
        return get_application_information()->OnEncoder((int32_t)event);
    }
-    return false;
+    return true;
 }

 bool StandaloneView::on_touch(const TouchEvent event) {
    if (get_application_information()->header_version > 1) {
-        get_application_information()->OnTouchEvent(event.point.x(), event.point.y(), (uint32_t)event.type);
+        return get_application_information()->OnTouchEvent(event.point.x(), event.point.y(), (uint32_t)event.type);
    }
-    return true;
+    return false;
 }

 bool StandaloneView::on_keyboard(const KeyboardEvent event) {
@@ -202,4 +316,8 @@ void StandaloneView::on_before_detach() {
    context().focus_manager().clearMirror();
 }

+void StandaloneView::exit() {
+    nav_.pop();
+}
+
 }  // namespace ui
@@ -51,6 +51,8 @@ class StandaloneView : public View {

    void frame_sync();

+    void exit();
+
   private:
    bool initialized = false;
    NavigationView& nav_;
@@ -84,6 +84,7 @@ void SubGhzDView::focus() {
 SubGhzDView::SubGhzDView(NavigationView& nav)
    : nav_{nav} {
    add_children({&rssi,
+                  &channel,
                  &field_rf_amp,
                  &field_lna,
                  &field_vga,
@@ -261,17 +262,14 @@ void RecentEntriesTable<ui::SubGhzDRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    std::string line{};
    line.reserve(30);

    line = SubGhzDView::getSensorTypeName((FPROTO_SUBGHZD_SENSOR)entry.sensorType);
    line = line + " " + to_string_hex(entry.data << 32);
-    if (line.length() < 19) {
-        line += SubGhzDView::pad_string_with_spaces(19 - line.length());
-    } else {
-        line = truncate(line, 19);
-    }
+    line.resize(columns.at(0).second, ' ');
    std::string ageStr = to_string_dec_uint(entry.age);
    std::string bitsStr = to_string_dec_uint(entry.bits);
    line += SubGhzDView::pad_string_with_spaces(5 - bitsStr.length()) + bitsStr;
@@ -341,7 +339,7 @@ void SubGhzDRecentEntryDetailView::parseProtocol() {
    if (entry_.sensorType == FPS_CAMEATOMO) {
        entry_.data ^= 0xFFFFFFFFFFFFFFFF;
        entry_.data <<= 4;
-        uint8_t pack[8] = {};
+        uint8_t pack[8];
        pack[0] = (entry_.data >> 56);
        pack[1] = ((entry_.data >> 48) & 0xFF);
        pack[2] = ((entry_.data >> 40) & 0xFF);
@@ -122,15 +122,18 @@ class SubGhzDView : public View {
    SubGhzDRecentEntries recent{};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {21 * 8, 0, UI_POS_WIDTH_REMAINING(24), 4}};
+    Channel channel{
+        {21 * 8, 5, UI_POS_WIDTH_REMAINING(24), 4},
+    };
    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        nav_};

    SignalToken signal_token_tick_second{};
@@ -149,8 +152,8 @@ class SubGhzDView : public View {

    std::unique_ptr<SubGhzDLogger> logger{};

-    const RecentEntriesColumns columns{{
-        {"Type", 19},
+    RecentEntriesColumns columns{{
+        {"Type", 0},
        {"Bits", 4},
        {"Age", 3},
    }};
@@ -188,16 +191,16 @@ class SubGhzDRecentEntryDetailView : public View {
    uint32_t cnt = SD_NO_CNT;
    uint32_t seed = 0;

-    Text text_type{{0 * 8, 1 * 16, 15 * 8, 16}, "?"};
+    Text text_type{{UI_POS_X(0), 1 * 16, 15 * 8, 16}, "?"};
    Text text_id{{6 * 8, 2 * 16, 10 * 8, 16}, "?"};

    Console console{
-        {0, 4 * 16, 240, screen_height - (4 * 16) - 36}};
+        {0, 4 * 16, screen_width, screen_height - (4 * 16) - 36}};

    Labels labels{
-        {{0 * 8, 0 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 2 * 16}, "Serial: ", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 3 * 16}, "Data:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 2 * 16}, "Serial: ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Data:", Theme::getInstance()->fg_light->foreground},
    };

    Button button_done{
@@ -99,8 +99,8 @@ void TestView::on_packet(const testapp::Packet& packet) {
    display.draw_pixel(Point(cur_x, 4 * 16 + (256 - ((raw_alt - cal_value) / 4))), Color::white());

    cur_x++;
-    if (cur_x >= 240) {
-        display.fill_rectangle(Rect(0, 5 * 16, 240, 256), Color::black());
+    if (cur_x >= screen_width) {
+        display.fill_rectangle(Rect(0, 5 * 16, screen_width, 256), Color::black());
        cur_x = 0;
    }

@@ -76,29 +76,29 @@ class TestView : public View {
    bool logging{false};

    Labels labels{
-        {{0 * 8, 1 * 16}, "Data:", Theme::getInstance()->fg_light->foreground}};
+        {{UI_POS_X(0), 1 * 16}, "Data:", Theme::getInstance()->fg_light->foreground}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 8},
+        {UI_POS_X(0), 0 * 8},
        nav_};
    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};

    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};

    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};

    RSSI rssi{
        {21 * 8, 0, 6 * 8, 4},
    };

    Text text_debug_a{
-        {0 * 8, 4 * 16, 30 * 8, 16},
+        {UI_POS_X(0), 4 * 16, screen_width, 16},
        "..."};
    Text text_debug_b{
-        {0 * 8, 5 * 16, 30 * 8, 16},
+        {UI_POS_X(0), 5 * 16, screen_width, 16},
        "..."};

    Button button_cal{
@@ -26,6 +26,7 @@

 #include "log_file.hpp"
 #include "string_format.hpp"
+#include "irq_controls.hpp"

 using namespace portapack;
 namespace fs = std::filesystem;
@@ -81,21 +82,75 @@ void TextViewer::paint(Painter& painter) {
    paint_cursor(painter);
 }

+void TextViewer::enable_long_press() {
+    // Enable long press on "Select".
+    SwitchesState config;
+    config[toUType(Switch::Sel)] = true;
+    set_switches_long_press_config(config);
+}
+
+void TextViewer::on_focus() {
+    enable_long_press();
+}
+
 bool TextViewer::on_key(const KeyEvent key) {
    int16_t delta_col = 0;
    int16_t delta_line = 0;

-    if (key == KeyEvent::Left)
-        delta_col = -1;
-    else if (key == KeyEvent::Right)
-        delta_col = 1;
-    else if (key == KeyEvent::Up)
-        delta_line = -1;
-    else if (key == KeyEvent::Down)
-        delta_line = 1;
-    else if (key == KeyEvent::Select && on_select) {
-        on_select();
-        return true;
+    if (key == KeyEvent::Select) {
+        // Toggle 'digit' mode with long-press.
+        if (digit_mode_ || key_is_long_pressed(key)) {
+            digit_mode_ = !digit_mode_;
+            set_dirty();
+            return true;
+        }
+    }
+
+    if (digit_mode_) {
+        switch (key) {
+            case KeyEvent::Left:
+                delta_col = -1;
+                break;
+            case KeyEvent::Right:
+                delta_col = 1;
+                break;
+            case KeyEvent::Up:
+                set_value(value_ == 0x0F ? 0x00 : value_ + 1);
+                break;
+            case KeyEvent::Down:
+                set_value(value_ == 0x00 ? 0x0F : value_ - 1);
+                break;
+            default:
+                return false;
+        }
+
+        if (delta_col == 0 && delta_line == 0) {
+            return true;
+        }
+    } else {
+        switch (key) {
+            case KeyEvent::Left:
+                delta_col = -1;
+                break;
+            case KeyEvent::Right:
+                delta_col = 1;
+                break;
+            case KeyEvent::Up:
+                delta_line = -1;
+                break;
+            case KeyEvent::Down:
+                delta_line = 1;
+                break;
+            case KeyEvent::Select: {
+                if (on_select) {
+                    on_select();
+                    return true;
+                }
+                break;
+            }
+            default:
+                return false;
+        }
    }

    // Always allow cursor direction to be updated.
@@ -111,19 +166,42 @@ bool TextViewer::on_key(const KeyEvent key) {
 bool TextViewer::on_encoder(EncoderEvent delta) {
    bool updated = false;

-    if (cursor_.dir == ScrollDirection::Horizontal)
-        updated = apply_scrolling_constraints(0, delta);
-    else {
-        delta *= 16;
-        updated = apply_scrolling_constraints(delta, 0);
+    if (digit_mode_) {
+        if (delta > 0) {
+            set_value(value_ == 0x0F ? 0x00 : value_ + 1);
+        } else if (delta < 0) {
+            set_value(value_ == 0x00 ? 0x0F : value_ - 1);
+        }
+
+        updated = true;
+    } else {
+        if (cursor_.dir == ScrollDirection::Horizontal) {
+            updated = apply_scrolling_constraints(0, delta);
+        } else {
+            delta *= 16;
+            updated = apply_scrolling_constraints(delta, 0);
+        }
+
+        if (updated) {
+            redraw();
+        }
    }

-    if (updated)
-        redraw();
-
    return updated;
 }

+void TextViewer::set_value(uint8_t new_value) {
+    if (new_value != value_) {
+        value_ = new_value;
+
+        if (on_change) {
+            on_change(value_);
+        }
+
+        set_dirty();
+    }
+}
+
 void TextViewer::redraw(bool redraw_text, bool redraw_marked) {
    paint_state_.redraw_text = redraw_text;
    paint_state_.redraw_marked = redraw_marked;
@@ -349,7 +427,7 @@ void TextViewer::set_font_zoom(bool zoom) {
 /* TextEditorMenu ***************************************************/

 TextEditorMenu::TextEditorMenu()
-    : View{{7 * 4, 9 * 4, 25 * 8, 25 * 8}} {
+    : View{{UI_POS_X_CENTER(25), 9 * 4, 25 * 8, 25 * 8}} {
    add_children(
        {
            &rect_frame,
@@ -534,7 +612,7 @@ void TextEditorView::open_file(const fs::path& path) {
    viewer.clear_file();
    delete_temp_file(path_);

-    path_ = {};
+    path_ = "";
    file_dirty_ = false;
    has_temp_file_ = false;
    auto result = FileWrapper::open(
@@ -617,6 +695,7 @@ void TextEditorView::show_edit_line() {
        edit_line_buffer_,
        viewer.col(),
        max_edit_length,
+        ENTER_KEYBOARD_MODE_ALPHA,
        [this](std::string& buffer) {
            auto range = file_->line_range(viewer.line());
            if (!range)
@@ -54,10 +54,13 @@ class TextViewer : public Widget {

    std::function<void()> on_select{};
    std::function<void()> on_cursor_moved{};
+    std::function<void(uint8_t)> on_change{};

    void paint(Painter& painter) override;
    bool on_key(KeyEvent key) override;
    bool on_encoder(EncoderEvent delta) override;
+    void set_value(uint8_t new_value);
+    void on_focus() override;

    void redraw(bool redraw_text = false, bool redraw_marked = false);

@@ -74,6 +77,7 @@ class TextViewer : public Widget {
    void cursor_set(uint16_t line, uint16_t col);
    void cursor_mark_selected();
    void cursor_clear_marked();
+    void enable_long_press();

    typedef std::pair<uint16_t, uint16_t> LineColPair;
    std::vector<LineColPair> lineColPair{};
@@ -95,6 +99,9 @@ class TextViewer : public Widget {
    int8_t char_height{};
    uint8_t max_line{};
    uint8_t max_col{};
+    bool digit_mode_{false};
+    uint8_t value_{0};
+    bool allow_digit_mode_{true};

    /* Returns true if the cursor was updated. */
    bool apply_scrolling_constraints(
@@ -157,7 +164,7 @@ class TextEditorMenu : public View {
    void hide_children(bool hidden);

    Rectangle rect_frame{
-        {0 * 8, 0 * 8, 23 * 8, 23 * 8},
+        {UI_POS_X(0), 0 * 8, 23 * 8, 23 * 8},
        Theme::getInstance()->fg_dark->foreground};

    NewButton button_home{
@@ -260,23 +267,23 @@ class TextEditorView : public View {

    TextViewer viewer{
        /* 272 = screen_height - 16 (top bar) - 32 (bottom controls) */
-        {0, 0, screen_width, 272}};
+        {0, 0, screen_width, UI_POS_HEIGHT_REMAINING(4)}};

    TextEditorMenu menu{};

    NewButton button_menu{
-        {26 * 8, 34 * 8, 4 * 8, 4 * 8},
+        {UI_POS_X_RIGHT(4), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(4), UI_POS_HEIGHT(2)},
        {},
        &bitmap_icon_controls,
        Theme::getInstance()->bg_dark->background,
        /*vcenter*/ true};

    Text text_position{
-        {0 * 8, 34 * 8, 26 * 8, 2 * 8},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH_REMAINING(5), UI_POS_HEIGHT(1)},
        ""};

    Text text_size{
-        {0 * 8, 36 * 8, 26 * 8, 2 * 8},
+        {UI_POS_X(0), UI_POS_Y_BOTTOM(2), UI_POS_WIDTH_REMAINING(5), UI_POS_HEIGHT(1)},
        ""};
 };

@@ -81,13 +81,13 @@ class TouchCalibrationView : public View {
        Color::black()};

    Image image_calibrate_1{
-        {240 - 32 - 16, (320 - 16) / 2 - 16, 32, 32},
+        {screen_width - 32 - 16, (screen_height - 16) / 2 - 16, 32, 32},
        &bitmap_target_calibrate,
        Color::white(),
        Color::black()};

    Image image_calibrate_2{
-        {240 / 2 - 16, (320 - 16) - 32 - 16, 32, 32},
+        {screen_width / 2 - 16, (screen_height - 16) - 32 - 16, 32, 32},
        &bitmap_target_calibrate,
        Color::white(),
        Color::black()};
@@ -99,13 +99,13 @@ class TouchCalibrationView : public View {
        Color::black()};

    Image image_verify_1{
-        {240 - 32 - 16, (320 - 16) / 2 - 16, 32, 32},
+        {screen_width - 32 - 16, (screen_height - 16) / 2 - 16, 32, 32},
        &bitmap_target_verify,
        Color::white(),
        Color::black()};

    Image image_verify_2{
-        {240 / 2 - 16, (320 - 16) - 32 - 16, 32, 32},
+        {screen_width / 2 - 16, (screen_height - 16) - 32 - 16, 32, 32},
        &bitmap_target_verify,
        Color::white(),
        Color::black()};
@@ -131,11 +131,11 @@ class TouchCalibrationView : public View {
        "Calibration failed. Retry?"};

    Button button_cancel{
-        {40, 200, 64, 24},
+        {40, 200, UI_POS_WIDTH(8), 24},
        "Cancel"};

    Button button_ok{
-        {136, 200, 64, 24},
+        {136, 200, UI_POS_WIDTH(8), 24},
        "OK"};

    void on_frame_sync();
@@ -162,16 +162,16 @@ class TouchTunesView : public View {
                                                         {{18 * 8 + 4, 18 * 8}, "V"},
                                                         {{22 * 8, 18 * 8}, "F4"},

-                                                         {{0 * 8, 5 * 8}, "1"},
+                                                         {{UI_POS_X(0), 5 * 8}, "1"},
                                                         {{4 * 8, 5 * 8}, "2"},
                                                         {{8 * 8, 5 * 8}, "3"},
-                                                         {{0 * 8, 10 * 8}, "4"},
+                                                         {{UI_POS_X(0), 10 * 8}, "4"},
                                                         {{4 * 8, 10 * 8}, "5"},
                                                         {{8 * 8, 10 * 8}, "6"},
-                                                         {{0 * 8, 15 * 8}, "7"},
+                                                         {{UI_POS_X(0), 15 * 8}, "7"},
                                                         {{4 * 8, 15 * 8}, "8"},
                                                         {{8 * 8, 15 * 8}, "9"},
-                                                         {{0 * 8, 20 * 8}, "*"},
+                                                         {{UI_POS_X(0), 20 * 8}, "*"},
                                                         {{4 * 8, 20 * 8}, "0"},
                                                         {{8 * 8, 20 * 8}, "#"},

@@ -107,6 +107,7 @@ void WeatherView::focus() {
 WeatherView::WeatherView(NavigationView& nav)
    : nav_{nav} {
    add_children({&rssi,
+                  &channel,
                  &field_rf_amp,
                  &field_lna,
                  &field_vga,
@@ -196,6 +197,10 @@ WeatherView::~WeatherView() {
    baseband::shutdown();
 }

+uint16_t WeatherView::bcd_decode_short(uint32_t data) {
+    return (data & 0xF) * 10 + ((data >> 4) & 0xF);
+}
+
 const char* WeatherView::getWeatherSensorTypeName(FPROTO_WEATHER_SENSOR type) {
    switch (type) {
        case FPW_NexusTH:
@@ -224,6 +229,8 @@ const char* WeatherView::getWeatherSensorTypeName(FPROTO_WEATHER_SENSOR type) {
            return "LaCrosse TX141THBv2";
        case FPW_OREGON2:
            return "Oregon2";
+        case FPW_OREGON2B:
+            return "Oregon2B";
        case FPW_OREGON3:
            return "Oregon3";
        case FPW_OREGONv1:
@@ -269,16 +276,13 @@ void RecentEntriesTable<ui::WeatherRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
-    const Style& style) {
+    const Style& style,
+    RecentEntriesColumns& columns) {
    std::string line{};
    line.reserve(30);

    line = WeatherView::getWeatherSensorTypeName((FPROTO_WEATHER_SENSOR)entry.sensorType);
-    if (line.length() < 10) {
-        line += WeatherView::pad_string_with_spaces(10 - line.length());
-    } else {
-        line = truncate(line, 10);
-    }
+    line.resize(columns.at(0).second, ' ');

    std::string temp = (weather_units_fahr ? to_string_decimal((entry.temp * 9 / 5) + 32, 1) : to_string_decimal(entry.temp, 1));
    std::string humStr = (entry.humidity != WS_NO_HUMIDITY) ? to_string_dec_uint(entry.humidity) + "%" : "-";
@@ -301,7 +305,9 @@ WeatherRecentEntry WeatherView::process_data(const WeatherDataMessage* data) {
    WeatherRecentEntry ret = {};
    ret.sensorType = data->sensorType;
    int16_t i16 = 0;
+    int32_t i32 = 0;
    uint16_t u16 = 0;
+
    uint64_t u64 = 0;
    uint8_t u8 = 0;
    uint8_t channel_3021[] = {3, 0, 2, 1};
@@ -444,12 +450,34 @@ WeatherRecentEntry WeatherView::process_data(const WeatherDataMessage* data) {
            ret.humidity = (data->decode_data >> 8) & 0xFF;
            break;
        case FPW_OREGON2:
-            i16 = ((data->decode_data >> 4) & 0xF) * 10 + (((data->decode_data >> 4) >> 4) & 0xF);
-            i16 *= 10;
-            i16 += (data->decode_data >> 12) & 0xF;
-            if (data->decode_data & 0xF) i16 = -i16;
-            ret.temp = (float)i16 / 10.0;
-            // todo fix missing parts.
+            i32 = bcd_decode_short(data->decode_data >> 4);
+            i32 *= 10;
+            i32 += (data->decode_data >> 12) & 0xf;
+            if (data->decode_data & 0xF) i32 = -i32;
+            ret.temp = (float)i32 / 10.0;
+            ret.battery_low = ((data->decode_data >> 32) & 0x4) ? 1 : 0;
+            u8 = (data->decode_data >> 44) & 0xF;
+            ret.channel = 1;
+            while (u8 > 1) {
+                ret.channel++;
+                u8 >>= 1;
+            }
+            break;
+        case FPW_OREGON2B:
+            ret.humidity = bcd_decode_short(data->decode_data);
+            u64 = data->decode_data >> 8;
+            i32 = bcd_decode_short(u64 >> 4);
+            i32 *= 10;
+            i32 += (u64 >> 12) & 0xf;
+            if (u64 & 0xF) i32 = -i32;
+            ret.temp = (float)i32 / 10.0;
+            ret.battery_low = ((data->decode_data >> 32) & 0x4) ? 1 : 0;
+            u8 = (data->decode_data >> 44) & 0xF;
+            ret.channel = 1;
+            while (u8 > 1) {
+                ret.channel++;
+                u8 >>= 1;
+            }
            break;
        case FPW_OREGON3:
            // todo check
@@ -114,6 +114,7 @@ class WeatherView : public View {

   private:
    void on_tick_second();
+    uint16_t bcd_decode_short(uint32_t data);
    void on_data(const WeatherDataMessage* data);
    WeatherRecentEntry process_data(const WeatherDataMessage* data);
    NavigationView& nav_;
@@ -134,25 +135,28 @@ class WeatherView : public View {
    WeatherRecentEntries recent{};

    OptionsField options_temperature{
-        {10 * 8, 0 * 16},
+        {10 * 8, UI_POS_Y(0)},
        2,
        {{STR_DEGREES_C, 0},
         {STR_DEGREES_F, 1}}};

    RFAmpField field_rf_amp{
-        {13 * 8, 0 * 16}};
+        {13 * 8, UI_POS_Y(0)}};
    LNAGainField field_lna{
-        {15 * 8, 0 * 16}};
+        {15 * 8, UI_POS_Y(0)}};
    VGAGainField field_vga{
-        {18 * 8, 0 * 16}};
+        {18 * 8, UI_POS_Y(0)}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4}};
+        {21 * 8, 0, UI_POS_WIDTH_REMAINING(24), 4}};
+    Channel channel{
+        {21 * 8, 5, UI_POS_WIDTH_REMAINING(24), 4},
+    };

    AudioVolumeField field_volume{
-        {28 * 8, 0 * 16}};
+        {UI_POS_X_RIGHT(2), UI_POS_Y(0)}};

    RxFrequencyField field_frequency{
-        {0 * 8, 0 * 16},
+        {UI_POS_X(0), UI_POS_Y(0)},
        nav_};

    SignalToken signal_token_tick_second{};
@@ -171,8 +175,8 @@ class WeatherView : public View {

    std::unique_ptr<WeatherLogger> logger{};

-    const RecentEntriesColumns columns{{
-        {"Type", 10},
+    RecentEntriesColumns columns{{
+        {"Type", 0},
        {"Temp", 5},
        {"Hum", 4},
        {"Ch", 3},
@@ -215,14 +219,14 @@ class WeatherRecentEntryDetailView : public View {
    Text text_age{{10 * 8, 7 * 16, 10 * 8, 16}, "?"};

    Labels labels{
-        {{0 * 8, 0 * 16}, "Weather Station", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 1 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 2 * 16}, "Id: ", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 3 * 16}, "Temp:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 4 * 16}, "Humidity:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 5 * 16}, "Channel:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 6 * 16}, "Battery:", Theme::getInstance()->fg_light->foreground},
-        {{0 * 8, 7 * 16}, "Age:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Weather Station", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 1 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 2 * 16}, "Id: ", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 3 * 16}, "Temp:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 4 * 16}, "Humidity:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 5 * 16}, "Channel:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 6 * 16}, "Battery:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), 7 * 16}, "Age:", Theme::getInstance()->fg_light->foreground},
    };

    Button button_done{
@@ -66,12 +66,13 @@ static void send_message(const Message* const message) {

 void AMConfig::apply() const {
    const AMConfigureMessage message{
-        taps_6k0_decim_0,  // common FIR filter taps pre-decim_0 to all 5 x AM mod types.(AM-9K, AM-6K, USB, LSB, CW)
-        taps_6k0_decim_1,  // common FIR filter taps pre-decim_1 to all 5 x AM mod. types.
-        decim_2,           // var decim_2 FIR taps filter , variable values, depending selected  AM mod(AM  9k / 6k all rest AM modes)
-        channel,           // var channel FIR taps filter , variable values, depending selected  AM mode, each one different  (DSB-9K, DSB-6K, USB-3K, LSB-3K,CW)
-        modulation,        // var parameter .
-        audio_12k_hpf_300hz_config};
+        taps_6k0_decim_0,             // common FIR filter taps pre-decim_0 to all 6 x AM mod types.(AM-9K, AM-6K, USB, LSB, CW, AMFM-WFAX)
+        decim_1,                      // var decim_1 FIR taps filter , variable values , to handle two spectrum decim factor 1 and 2 (zoom) and more APT LPF filtered .
+        decim_2,                      // var decim_2 FIR taps filter , variable values, depending selected  AM mod(AM  9k / 6k and all rest AM modes)
+        channel,                      // var channel FIR taps filter , variable values, depending selected  AM mode, each one different  (DSB-9K, DSB-6K, USB-3K, LSB-3K,CW,AMFM-WFAX)
+        modulation,                   // var parameter . enum class Modulation : int32_t {DSB = 0, SSB = 1, SSB_FM = 2}
+        audio_12k_iir_filter_config,  // var parameter , 300 Hz hpf all except Wefax (1.500Hz lpf)
+        spectrum_decimation_factor};  // var parameter , waterfall no zoom : 1 ,for zoom x 2 : 2
    send_message(&message);
    audio::set_rate(audio::Rate::Hz_12000);
 }
@@ -92,9 +93,9 @@ void NBFMConfig::apply(const uint8_t squelch_level) const {

 void WFMConfig::apply() const {
    const WFMConfigureMessage message{
-        decim_0,  // 	taps_200k_decim_0 , 	taps_180k_wfm_decim_0, taps_40k_wfm_decim_0
-        decim_1,  // 	taps_200k_decim_1 or 	taps_180k_wfm_decim_1, taps_40k_wfm_decim_1
-        taps_64_lp_156_198,
+        decim_0,             // 	Dynamic array 24 taps : taps_200k_decim_0 , 	taps_180k_wfm_decim_0, taps_80k_wfm_decim_0
+        decim_1,             // 	Dynamic array 16 taps : taps_200k_decim_1 or 	taps_180k_wfm_decim_1, taps_80k_wfm_decim_1
+        taps_64_lp_156_198,  // Fixed channel audio filter 15khz
        75000,
        audio_48k_hpf_30hz_config,
        audio_48k_deemph_2122_6_config};
@@ -102,6 +103,18 @@ void WFMConfig::apply() const {
    audio::set_rate(audio::Rate::Hz_48000);
 }

+void WFMAMConfig::apply() const {
+    const WFMAMConfigureMessage message{
+        decim_0,         // 	Fixed 24 taps array : taps_16k0_decim_0
+        decim_1,         // Dynamic  32 taps array : taps_80k_wfmam_decim_1, 38k_wfmam
+        taps_64_lp_bpf,  // Dynamic 64 taps array , to filter modulated DSB AM 2k4 carrier before demod. AM .(LPF / BPF)
+        17000,           // NOAA satellite tx , FM deviation = +-17Khz.
+        apt_audio_12k_notch_2k4_config,
+        apt_audio_12k_lpf_2000hz_config};
+    send_message(&message);
+    audio::set_rate(audio::Rate::Hz_12000);
+}
+
 void set_tone(const uint32_t index, const uint32_t delta, const uint32_t duration) {
    shared_memory.bb_data.tones_data.tone_defs[index].delta = delta;
    shared_memory.bb_data.tones_data.tone_defs[index].duration = duration;
@@ -173,13 +186,14 @@ void set_nrf(const uint32_t baudrate, const uint32_t word_length, const uint32_t
    send_message(&message);
 }

-void set_fsk(const size_t deviation) {
+void set_fsk(const uint8_t samplesPerSymbol, const uint32_t syncWord, const uint8_t syncWordLength, const uint32_t preamble, const uint8_t preambleLength, uint16_t numDataBytes) {
    const FSKRxConfigureMessage message{
-        taps_200k_decim_0,
-        taps_16k0_decim_1,
-        taps_11k0_channel,
-        2,
-        deviation};
+        samplesPerSymbol,
+        syncWord,
+        syncWordLength,
+        preamble,
+        preambleLength,
+        numDataBytes};

    send_message(&message);
 }
@@ -304,6 +318,16 @@ void set_spectrum(const size_t sampling_rate, const size_t trigger) {
    send_message(&message);
 }

+void set_wefax_config(uint8_t lpm = 120, uint8_t ioc = 0) {
+    const WeFaxRxConfigureMessage message{lpm, ioc};
+    send_message(&message);
+}
+
+void set_noaaapt_config() {
+    const NoaaAptRxConfigureMessage message{};
+    send_message(&message);
+}
+
 void set_siggen_tone(const uint32_t tone) {
    const SigGenToneMessage message{
        TONES_F2D(tone, TONES_SAMPLERATE)};
@@ -36,9 +36,12 @@
 namespace baseband {

 struct AMConfig {
-    const fir_taps_real<32> decim_2;  // added to handle two types decim_2 9k, 6k
+    const fir_taps_real<32> decim_1;  // added to handle two var LPF in AMFM to avoid aliasing when spectrum zoom factor 2.
+    const fir_taps_real<32> decim_2;  // added to handle two var types decim_2 9k, 6k
    const fir_taps_complex<64> channel;
    const AMConfigureMessage::Modulation modulation;
+    const iir_biquad_config_t audio_12k_iir_filter_config;  // added to handle two var IIR filter types : 300 hpf(as before) , 1500Hz lpf for Wefax.
+    const size_t spectrum_decimation_factor;                // used to handle LCD AM waterfall zoom x1 / zoom x2.

    void apply() const;
 };
@@ -53,12 +56,20 @@ struct NBFMConfig {
 };

 struct WFMConfig {
-    const fir_taps_real<24> decim_0;  // To handle both WFM filters , 200k and 40K for NOAA APT
+    const fir_taps_real<24> decim_0;  // To handle all 3 WFM filters , 200k, 180k and 80K-
    const fir_taps_real<16> decim_1;

    void apply() const;
 };

+struct WFMAMConfig {
+    const fir_taps_real<24> decim_0;  // To handle WFM filter   BW=40K for NOAA APT
+    const fir_taps_real<32> decim_1;
+    const fir_taps_real<64> taps_64_lp_bpf;  // to handle dynamically  LPF / BPF .
+
+    void apply() const;
+};
+
 void set_tone(const uint32_t index, const uint32_t delta, const uint32_t duration);
 void set_tones_config(const uint32_t bw, const uint32_t pre_silence, const uint16_t tone_count, const bool dual_tone, const bool audio_out);
 void kill_tone();
@@ -69,7 +80,7 @@ void set_pitch_rssi(int32_t avg, bool enabled);
 void set_afsk_data(const uint32_t afsk_samples_per_bit, const uint32_t afsk_phase_inc_mark, const uint32_t afsk_phase_inc_space, const uint8_t afsk_repeat, const uint32_t afsk_bw, const uint8_t symbol_count);
 void kill_afsk();
 void set_afsk(const uint32_t baudrate, const uint32_t word_length, const uint32_t trigger_value, const bool trigger_word);
-void set_fsk(const size_t deviation);
+void set_fsk(const uint32_t samplesPerSymbol, const uint32_t syncWord, const uint8_t syncWordLength, const uint32_t preamble, const uint8_t preambleLength, uint16_t numDataBytes);
 void set_aprs(const uint32_t baudrate);

 void set_btlerx(uint8_t channel_number);
@@ -89,6 +100,8 @@ void set_siggen_tone(const uint32_t tone);
 void set_siggen_config(const uint32_t bw, const uint32_t shape, const uint32_t duration);
 void set_spectrum_painter_config(const uint16_t width, const uint16_t height, bool update, int32_t bw);
 void set_subghzd_config(uint8_t modulation, uint32_t sampling_rate);
+void set_wefax_config(uint8_t lpm, uint8_t ioc);
+void set_noaaapt_config();

 void request_roger_beep();
 void request_rssi_beep();
@@ -25,6 +25,7 @@
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_widget.hpp"
+#include "ui_textentry.hpp"

 namespace ui {

@@ -105,7 +106,7 @@ void bind(TextField& field, T& value, NavigationView& nav, Fn fn = Fn{}) {
    // Capture a new string and make the lambda mutable so it can be modified.
    field.on_select = [&nav, buf = std::string{}](TextField& tf) mutable {
        buf = tf.get_text();
-        text_prompt(nav, buf, /*max_length*/ 255,
+        text_prompt(nav, buf, /*max_length*/ 255, ENTER_KEYBOARD_MODE_ALPHA,
                    [&tf](std::string& str) {
                        tf.set_text(str);
                    });
@@ -1,72 +0,0 @@
-unsigned char modal_warning_bmp[] = {
-    0x42, 0x4d, 0xfa, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0x00,
-    0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x28, 0x00,
-    0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0xa8, 0x02,
-    0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x07, 0x00,
-    0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x42, 0x47, 0x52, 0x73, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0xff, 0x00, 0x00, 0x5a,
-    0xff, 0x00, 0x78, 0x78, 0x78, 0x00, 0x00, 0x7c, 0xff, 0x00, 0x00, 0xa9,
-    0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0x02, 0x03, 0x24, 0x66, 0x02, 0x30,
-    0x00, 0x00, 0x02, 0x36, 0x24, 0x66, 0x02, 0x63, 0x00, 0x00, 0x02, 0x66,
-    0x02, 0x63, 0x20, 0x00, 0x02, 0x36, 0x02, 0x66, 0x00, 0x00, 0x02, 0x36,
-    0x02, 0x60, 0x20, 0x00, 0x02, 0x06, 0x02, 0x63, 0x00, 0x00, 0x02, 0x06,
-    0x02, 0x60, 0x0c, 0x00, 0x00, 0x08, 0x03, 0x66, 0x66, 0x30, 0x0c, 0x00,
-    0x02, 0x06, 0x02, 0x60, 0x00, 0x00, 0x02, 0x03, 0x02, 0x66, 0x0c, 0x00,
-    0x00, 0x08, 0x06, 0x11, 0x11, 0x60, 0x0c, 0x00, 0x02, 0x66, 0x02, 0x30,
-    0x00, 0x00, 0x02, 0x00, 0x02, 0x66, 0x0c, 0x00, 0x00, 0x08, 0x06, 0x21,
-    0x21, 0x60, 0x0c, 0x00, 0x02, 0x66, 0x02, 0x00, 0x00, 0x00, 0x00, 0x06,
-    0x00, 0x36, 0x60, 0x00, 0x0a, 0x00, 0x00, 0x08, 0x06, 0x42, 0x42, 0x60,
-    0x0a, 0x00, 0x00, 0x06, 0x06, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
-    0x00, 0x06, 0x60, 0x00, 0x0a, 0x00, 0x00, 0x08, 0x06, 0x54, 0x45, 0x60,
-    0x0a, 0x00, 0x00, 0x06, 0x06, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
-    0x00, 0x03, 0x66, 0x00, 0x0a, 0x00, 0x00, 0x08, 0x03, 0x66, 0x66, 0x30,
-    0x0a, 0x00, 0x00, 0x06, 0x66, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
-    0x00, 0x00, 0x66, 0x00, 0x1c, 0x00, 0x00, 0x06, 0x66, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x36, 0x60, 0x18, 0x00, 0x00, 0x08,
-    0x06, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x06, 0x60,
-    0x0a, 0x00, 0x02, 0x36, 0x02, 0x63, 0x0a, 0x00, 0x00, 0x08, 0x06, 0x60,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x03, 0x66, 0x08, 0x00,
-    0x00, 0x08, 0x03, 0x61, 0x16, 0x30, 0x08, 0x00, 0x00, 0x08, 0x66, 0x30,
-    0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x02, 0x66, 0x08, 0x00, 0x00, 0x08,
-    0x06, 0x11, 0x11, 0x60, 0x08, 0x00, 0x02, 0x66, 0x06, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x02, 0x36, 0x02, 0x60, 0x06, 0x00, 0x00, 0x08, 0x06, 0x11,
-    0x11, 0x60, 0x06, 0x00, 0x02, 0x06, 0x02, 0x63, 0x06, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x02, 0x06, 0x02, 0x60, 0x06, 0x00, 0x00, 0x08, 0x06, 0x11,
-    0x11, 0x60, 0x06, 0x00, 0x02, 0x06, 0x02, 0x60, 0x06, 0x00, 0x00, 0x00,
-    0x06, 0x00, 0x02, 0x03, 0x02, 0x66, 0x06, 0x00, 0x00, 0x08, 0x06, 0x11,
-    0x11, 0x60, 0x06, 0x00, 0x02, 0x66, 0x02, 0x30, 0x06, 0x00, 0x00, 0x00,
-    0x08, 0x00, 0x02, 0x66, 0x06, 0x00, 0x00, 0x08, 0x06, 0x11, 0x11, 0x60,
-    0x06, 0x00, 0x02, 0x66, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x18,
-    0x36, 0x60, 0x00, 0x00, 0x06, 0x11, 0x11, 0x60, 0x00, 0x00, 0x06, 0x63,
-    0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x18, 0x06, 0x60, 0x00, 0x00,
-    0x06, 0x21, 0x21, 0x60, 0x00, 0x00, 0x06, 0x60, 0x08, 0x00, 0x00, 0x00,
-    0x08, 0x00, 0x00, 0x18, 0x03, 0x66, 0x00, 0x00, 0x06, 0x12, 0x12, 0x60,
-    0x00, 0x00, 0x66, 0x30, 0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x14,
-    0x66, 0x00, 0x00, 0x06, 0x21, 0x21, 0x60, 0x00, 0x00, 0x66, 0x0a, 0x00,
-    0x00, 0x00, 0x0a, 0x00, 0x00, 0x14, 0x36, 0x60, 0x00, 0x06, 0x22, 0x22,
-    0x60, 0x00, 0x06, 0x63, 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x14,
-    0x06, 0x60, 0x00, 0x06, 0x24, 0x24, 0x60, 0x00, 0x06, 0x60, 0x0a, 0x00,
-    0x00, 0x00, 0x0a, 0x00, 0x00, 0x14, 0x03, 0x66, 0x00, 0x06, 0x42, 0x42,
-    0x60, 0x00, 0x66, 0x30, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x10,
-    0x66, 0x00, 0x06, 0x54, 0x45, 0x60, 0x00, 0x66, 0x0c, 0x00, 0x00, 0x00,
-    0x0c, 0x00, 0x00, 0x10, 0x36, 0x60, 0x03, 0x66, 0x66, 0x30, 0x06, 0x63,
-    0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x02, 0x06, 0x02, 0x60, 0x08, 0x00,
-    0x02, 0x06, 0x02, 0x60, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x02, 0x03,
-    0x02, 0x66, 0x08, 0x00, 0x02, 0x66, 0x02, 0x30, 0x0c, 0x00, 0x00, 0x00,
-    0x0e, 0x00, 0x02, 0x66, 0x08, 0x00, 0x02, 0x66, 0x0e, 0x00, 0x00, 0x00,
-    0x0e, 0x00, 0x00, 0x0c, 0x36, 0x60, 0x00, 0x00, 0x06, 0x63, 0x0e, 0x00,
-    0x00, 0x00, 0x0e, 0x00, 0x00, 0x0c, 0x06, 0x60, 0x00, 0x00, 0x06, 0x60,
-    0x0e, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x0c, 0x03, 0x66, 0x00, 0x00,
-    0x66, 0x30, 0x0e, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x08, 0x66, 0x00,
-    0x00, 0x66, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x08, 0x36, 0x60,
-    0x06, 0x63, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x08, 0x06, 0x60,
-    0x06, 0x60, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x08, 0x03, 0x66,
-    0x66, 0x30, 0x10, 0x00, 0x00, 0x00, 0x12, 0x00, 0x02, 0x66, 0x02, 0x66,
-    0x12, 0x00, 0x00, 0x00, 0x12, 0x00, 0x02, 0x36, 0x02, 0x63, 0x12, 0x00,
-    0x00, 0x01};
-unsigned int modal_warning_bmp_len = 830;
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Please see [How-to-collaborate](https://github.com/portapack-mayhem/mayhem-firmware/wiki/How-to-collaborate)`
				`@@ -0,0 +1 @@`
				`Please check [Intended-Use-and-Legality](https://github.com/portapack-mayhem/mayhem-firmware/wiki/)`