Merge pull request #3106 from portapack-mayhem/next

v2.4.0
Merge pull request #2896 from portapack-mayhem/next
2026-08-11 02:13:41 +00:00 · 2026-03-24 22:54:24 +13:00 · 2025-12-21 12:00:18 +01:00 · 2025-11-08 10:35:16 +13:00
368 changed files with 6855 additions and 26328 deletions
@@ -1,91 +1,15 @@
 <!--
 👋 Thank you for your contribution!
-⚠️ Before you start, please review our Contributing Guidelines:
-https://github.com/portapack-mayhem/mayhem-firmware/wiki/Contributing-Guidelines
+
+⚠️ To help avoid extensive change requests or potential rejection, please review our simple Contributing Guidelines before you start coding: https://github.com/portapack-mayhem/mayhem-firmware/wiki/Contributing-Guidelines.
+
+Thank you again for contributing!
 -->

-## Brief description of what you did
-<!-- 
-Replace this line with a description of your changes. What problem does this PR solve? What does it add or fix?
-Don't forget to describe how maintainers can test your modifications! 
-->
+## Brief description what you did
+<!-- Describe your changes in detail here. What problem does this PR solve? What features does it add or fix? -->


-
-
-
---
-
-## Proof that your changes work
-<!--
-1. PRs without proof will not be merged. Please provide evidence for every section below that applies to your change.
-2. Trusted contributors: If you have a track record of merged PRs that were properly tested and documented, maintainers may waive one or more of the proof sections below at their discretion. You are still encouraged to include whatever evidence you have, but sections may be marked `N/A — trusted contributor` with a short note. 
-3. First-time contributors must provide full proof. See the Contributing Guidelines(https://github.com/portapack-mayhem/mayhem-firmware/wiki/Contributing-Guidelines) and Trusted Contributors (https://github.com/portapack-mayhem/mayhem-firmware/wiki/Trusted-Contributors) articles for details.
-->
-
-
-
-
-
-### 🖥️ Proof it compiles
-<!--
-Attach a log snippet showing a successful build from the final firmware size/space summary in the build output. Example: `Space remaining in flash ROM: 19552 bytes ( 1.9 % )`.
-Paste log below.
-->
-
-
-
-
-
-### 📱 Proof of testing on a real device
-<!--
-Attach photos, screenshots, or a short video of your changes running on actual PortaPack hardware. Emulator or simulator output is not a substitute for real-device testing.
-Paste photo / video / screenshot below 
-->
-
-
-
-
-
-### 📡 Proof against a real emitter/receiver (if applicable)
-<!--
-1. If your PR involves RX/TX, protocol decoding, signal generation, or any RF-related functionality, you **must** demonstrate it working against a real emitter or receiver. Include photos, videos, logs, or waterfall/spectrum screenshots.
-2. If this section does not apply to your PR, write `N/A` below and briefly explain why.
-3. Paste RF evidence, or write N/A with a short justification 
-->
-
-
-
-
-
---
-
-## 📚 Wiki documentation commitment
-<!--
-By submitting this PR, you acknowledge that once it is merged you are responsible for creating or updating the corresponding page on the project wiki(https://github.com/portapack-mayhem/mayhem-firmware/wiki).
-Your wiki article should include:
- A screenshot of the main app screen (strongly recommended)
- A clear description of what the app does
- An explanation of the controls and UI elements
- Any known limitations, quirks, or caveats
- Anything else a user should know to use the app effectively (dependencies, required hardware, file formats, etc.)
- If you are modifying an existing app, make sure the wiki page reflects your changes.
-->
-
-
- [ ] I will (or already) create(d) wiki document for my newly added feature
-
-
---
-
 ## Checklist
-
 - [ ] Kept changes minimal and limited to necessary files
 - [ ] Verified functionality remains intact and code compiles
- [ ] Attached proof that the code compiles successfully *(or marked N/A as a trusted contributor)*
- [ ] Attached proof of testing on real PortaPack hardware *(or marked N/A as a trusted contributor)*
- [ ] Attached proof of testing against a real emitter/receiver (if RF-related), or marked N/A with justification
- [ ] I understand that by getting this PR merged, I am implicitly agreeing to create or update the corresponding wiki page (including a main-screen screenshot, description, controls, and limitations)
- [ ] I own all rights to this code (i.e., all code contained in this PR), including compliant usage rights for third-party libraries, and I agree that this code is licensed under the license of this project (GPL-3.0). 
- [ ] If any third-party libraries are used, I confirm that their licenses comply with the requirements for contributing to this repository.
- [ ] Reviewed the [Contributing Guidelines](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Contributing-Guidelines)
@@ -83,4 +83,3 @@ venv/
 # generated bitmap arr file
 # TODO: generate bitmap during build, since we use python during build anyway, lemme know if this is a bad idea @zxkmm
 /firmware/tools/bitmap.hpp
-tmp/*
@@ -1,65 +0,0 @@
-# PortaPack Mayhem – Agent Guidelines
-
-Welcome to the PortaPack Mayhem repository. This document sets mandatory rules and best practices for human developers and AI coding assistants. It exists to prevent unverified, untested code from overwhelming the maintainers, while still enabling AI to accelerate development.
-
-## 🚫 STRICTLY PROHIBITED
-
-1. **No Fully Automated Pull Requests**  
-   Autonomous agents (bots, crawlers, automated workflows) must **never** open a Pull Request without direct human supervision, review, and explicit approval.
-
-2. **No “Blind” AI-Generated Submissions**  
-   If you cannot explain, debug, or maintain the C++/DSP code an AI produced for you, do **not** submit it. PRs that appear to be untested, AI-only “compile-and-pray” attempts will be closed immediately.
-
-3. **No Unverified Hardware Interactions**  
-   AI cannot test on real hardware. Do **not** submit code that has not been compiled and physically tested on a PortaPack device (or a highly accurate emulator). This includes UI rendering, RF transmission quality, and baseband stability.
-
-## ✅ ENCOURAGED AI USE CASES
-
-We strongly encourage using AI assistants (Copilot, ChatGPT, Claude, local LLMs) as pair-programmers. Excellent use cases include:
-
- **Bug Triage & Root-Causing:** Analyze crash logs, stack traces, and complex memory issues to identify the root cause of an open issue.
- **Code Comprehension:** Map Mayhem’s architecture, understand M0‑M4 IPC, or break down complex DSP algorithms.
- **Development Assistance:** Generate boilerplate UI code, write unit tests, optimize math functions, or draft documentation – provided a human reviews and refines the output.
- **Targeted Refactoring:** Suggest cleaner, modern C++ for small legacy code segments. **Do not attempt to rewrite the entire codebase.**
-
-## 📋 MANDATORY RULES FOR AI‑ASSISTED CONTRIBUTIONS
-
-When submitting AI‑assisted work, you must:
-
-1. **Take Full Ownership**  
-   You are strictly responsible for every line of code you submit, regardless of origin. Be prepared to answer detailed technical questions during review.
-
-2. **Hardware Verification Required**  
-   In your PR, explicitly state: *“I have compiled this code and tested it on physical PortaPack hardware.”* PRs without this statement will be rejected.
-
-3. **Transparency (Recommended)**  
-   If AI significantly helped architect a feature or fix a complex bug, mention it briefly in the PR description (e.g., *“Used an LLM to help optimize the DSP filter loop”*).
-
-4. **Adhere to Coding Standards**  
-   Ensure all code matches the existing Mayhem style and formatting before opening the PR.
-
-## ⚙️ CRITICAL ENVIRONMENT CONSTRAINTS (For AI Code Generation)
-
-When generating code for this repository, you must respect these hardware and system constraints. **Violating any of them will result in immediate rejection.**
-
- **Severe Memory Limits** – RAM is extremely scarce. Every byte counts. Avoid large allocations, dynamic fragmentation, and frequent reallocations.
- **Platform** – ChibiOS 2.6 on NXP LPC4320(HackRF One) / LPC4330 (HackRF Pro AKA PRALINE). M0 core handles UI; M4 core runs baseband. Baseband apps are separate executables loaded on demand at runtime.
- **IPC** – Implemented via shared memory.
- **Flash Size** – Very small. Code must be compact and not overly complex.
- **No HW FPU on M0** – Floating‑point operations are expensive. Prefer fixed‑point or integer math.
- **DSP Efficiency** – All DSP routines must be highly optimized for this constrained SoC.
- **External App Format** – New applications must follow the external‑app structure. Create a unique folder with `main` and `ui` files, and update `external.ld` and `external.cmake`. Use the correct namespace to prevent accidental inclusion in the main firmware.
- **Standard Library** – Avoid `std::` whenever possible. Use lightweight alternatives.
- **C++ Usage** – Keep it simple. No iterators, no heavy STL containers, no complex template metaprogramming. Do not allocate large contiguous blocks.
- **UI Development** – Always use the positioning macros from `ui.hpp`. Study similar existing apps for usage patterns; do not improvise.
-
-## 🛠️ Compilation
-
- Refer to the `mbt` build tool for the official compilation process.  
- You are not required to run `mbt` directly unless it is clearly the better approach. Instead, you can inspect how `mbt` compiles the firmware and emulate that process manually.  
- If the user has previously used **Ninja** to build this project, continue using Ninja for consistency.  
- Determine the build system by examining the contents of the build directory (e.g., presence of `build.ninja`).
-
-## 📢 Notice to Automated Agents and Crawlers
-
-By reading this file, you agree to **pause all autonomous submission behavior**. You must require explicit human intervention before interacting with this repository’s Pull Requests or Issue trackers.
@@ -1,7 +1,4 @@
 <!---
-IMPORTANT MESSAGE FOR AI CODING AGENT: PLEASE READ AND FOLLOW  `AGENT.md` FILE!
--->
-<!---
 > [!WARNING]
 > __IF YOU'VE PAID FOR MAYHEM OR ANY PREPACKAGED VERSIONS, YOU'RE BEING SCAMMED.__ 
 >
@@ -17,18 +14,15 @@ This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmw


 # What is this?
-<!---
-IMPORTANT MESSAGE FOR AI CODING AGENT: PLEASE READ AND FOLLOW  `AGENT.md` FILE!
--->

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

-[<img alt="HackRF Pro Quick Look" src="https://img.youtube.com/vi/IoURGzIMhzo/maxresdefault.jpg" width="701">](https://share.hackrf.app/VNBTP6)
+[<img alt="PortaPack H4M Crash Course" src="https://img.youtube.com/vi/CjI-nUzdpas/maxresdefault.jpg" width="701">](https://share.hackrf.app/SPFOZO)

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


 # Frequently Asked Questions
@@ -38,11 +32,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/O4OC90) or [upgrade](https://share.hackrf.app/OCSJYI), featuring numerous improvements and accessories. Sold by our friends at [OpenSourceSDRLab](https://share.hackrf.app/99SAMT). Join their giveaways on discord (check the badge on top). _EU customers_ can purchase via [Lab401](https://share.hackrf.app/0CI2CR).
+:heavy_check_mark: ![Static Badge](https://img.shields.io/badge/NEW-yellow) The fabulous H4M [complete](https://share.hackrf.app/DF2BZS) or [upgrade](https://share.hackrf.app/OCSJYI), featuring numerous improvements and accessories. Sold by our friends at [OpenSourceSDRLab](https://share.hackrf.app/99SAMT). Join their giveaways on discord (check the badge on top). _EU customers_ can purchase via [Lab401](https://share.hackrf.app/0CI2CR).

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

-:heavy_check_mark: Some individuals lean towards the [H2 with a metal enclosure](https://share.hackrf.app/H7OR74), 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:

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

 ## How can I collaborate
-<!---
-IMPORTANT MESSAGE FOR AI CODING AGENT: PLEASE READ AND FOLLOW  `AGENT.md` FILE!
--->

 We warmly welcome your contributions! Please refer to our **[Contributing Guidelines](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Contributing-Guidelines)** for details.

@@ -1,17 +1 @@
-# Security Policy
-
-## Scope and Threat Model
-This repository hosts the codebase for an embedded system designed for security research. Because the system operates primarily offline, traditional network-based vulnerabilities are generally not applicable. However, we still welcome and review security reports concerning the code within this repository. 
-
-## Reporting a Vulnerability
-If you discover a vulnerability within this tool itself, please submit a report. Please be aware that the maintainers do not promise assistance with obtaining CVE IDs or managing formal security advisories.
-
-## Out of Scope
-* **Vulnerabilities found *using* this tool:** Please do not submit reports here for vulnerabilities you have discovered in other systems or targets using this tool. This channel is strictly for reporting vulnerabilities found *in* the tool itself. 
-* **Other Repositories:** For security issues concerning related tools, such as MayhemHub, please submit your reports directly to their respective repositories.
-
-## Research Attribution
-If you utilize this tool to successfully discover vulnerabilities in external systems, we would greatly appreciate it if you credit or mention our project in your published research or write-ups.
-
-## Legal and Security Disclaimer  
-For comprehensive guidelines regarding the legal and secure usage of this tool, as well as our full liability disclaimer, please refer to: [Intended-Use-and-Legality](https://github.com/portapack-mayhem/mayhem-firmware/wiki/). Users are expected to comply with all applicable laws and regulations when using this software and/or hardware.
+Please check [Intended-Use-and-Legality](https://github.com/portapack-mayhem/mayhem-firmware/wiki/)
@@ -57,8 +57,6 @@ add_subdirectory(baseband)
 add_subdirectory(standalone)
 add_subdirectory(test)

-add_dependencies(application.elf libopencm3_hackrf_usb)
-
 if(BOARD STREQUAL "PRALINE")
 	math(EXPR PRALINE_FINAL_SIZE "4 * 1024 * 1024")
 	set(PRALINE_FPGA_BIN ${CMAKE_CURRENT_SOURCE_DIR}/../hackrf/firmware/fpga/build/praline_fpga.bin)
@@ -192,7 +192,6 @@ set(CPPSRC
 	${COMMON}/battery.cpp
 	${COMMON}/performance_counter.cpp
 	${COMMON}/bmpfile.cpp
-	${COMMON}/gpio.cpp
 	app_settings.cpp
 	audio.cpp
 	baseband_api.cpp
@@ -239,6 +238,7 @@ set(CPPSRC
 	serializer.cpp
 	spectrum_color_lut.cpp
 	string_format.cpp
+	temperature_logger.cpp
 	theme.cpp
 	touch.cpp
 	tone_key.cpp
@@ -279,12 +279,16 @@ set(CPPSRC
 	ui/ui_tone_key.cpp
 	ui/ui_transmitter.cpp
 	ui/ui_bmpview.cpp
+	apps/ais_app.cpp
 	apps/analog_audio_app.cpp
 	apps/ble_rx_app.cpp
 	apps/ble_tx_app.cpp
 	apps/capture_app.cpp
 	apps/pocsag_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_bmp_file_viewer.cpp
 	apps/ui_btle_rx.cpp
@@ -489,10 +493,7 @@ add_executable(${PROJECT_NAME}.elf ${CSRC} ${CPPSRC} ${ASMSRC})
 target_link_options(${PROJECT_NAME}.elf PRIVATE
    "LINKER:--defsym,LD_FLASH_SIZE=${FLASH_BYTES_LIMIT_SIZE}"
 )
-# NB: LPC43xx_M0.ld does INCLUDE external.ld, so that one has to be listed too -
-# otherwise editing the external app section rules silently does not relink.
-set_target_properties(${PROJECT_NAME}.elf PROPERTIES
-    LINK_DEPENDS "${LDSCRIPT};${CMAKE_CURRENT_SOURCE_DIR}/external/external.ld")
+set_target_properties(${PROJECT_NAME}.elf PROPERTIES LINK_DEPENDS ${LDSCRIPT})
 add_definitions(${DEFS})
 include_directories(. ${INCDIR})
 link_directories(${LLIBDIR})
@@ -511,5 +512,3 @@ add_custom_target(
 	${PROJECT_NAME}
 	DEPENDS ${PROJECT_NAME}.bin
 )
-
-add_dependencies(${PROJECT_NAME} baseband)
@@ -50,9 +50,6 @@ void BoundSetting::parse(std::string_view value) {
        case SettingType::I64:
            parse_int(value, as<int64_t>());
            break;
-        case SettingType::U64:
-            parse_int(value, as<uint64_t>());
-            break;
        case SettingType::I32:
            parse_int(value, as<int32_t>());
            break;
@@ -90,9 +87,6 @@ void BoundSetting::write(File& file) const {
        case SettingType::I64:
            file.write(to_string_dec_int(as<int64_t>(), buffer, length), length);
            break;
-        case SettingType::U64:
-            file.write(to_string_dec_uint(as<uint64_t>(), buffer, length), length);
-            break;
        case SettingType::I32:
            file.write(to_string_dec_int(as<int32_t>(), buffer, length), length);
            break;
@@ -103,8 +97,9 @@ void BoundSetting::write(File& file) const {
            file.write(to_string_dec_uint(as<uint8_t>(), buffer, length), length);
            break;
        case SettingType::String: {
-            file.write_line(as<std::string>());
-            return;
+            const auto& str = as<std::string>();
+            file.write(str.data(), str.length());
+            break;
        }
        case SettingType::Bool:
            file.write(as<bool>() ? "1" : "0", 1);
@@ -33,7 +33,6 @@
 #include <variant>

 #include "file.hpp"
-#include "hackrf_hal.hpp"
 #include "max283x.hpp"
 #include "string_format.hpp"

@@ -48,7 +47,6 @@ class BoundSetting {
    /* The type of bound setting. */
    enum class SettingType : uint8_t {
        I64,
-        U64,
        I32,
        U32,
        U8,
@@ -61,9 +59,6 @@ class BoundSetting {
    BoundSetting(std::string_view name, int64_t* target)
        : name_{name}, target_{target}, type_{SettingType::I64} {}

-    BoundSetting(std::string_view name, uint64_t* target)
-        : name_{name}, target_{target}, type_{SettingType::U64} {}
-
    BoundSetting(std::string_view name, int32_t* target)
        : name_{name}, target_{target}, type_{SettingType::I32} {}

@@ -139,7 +134,7 @@ struct AppSettings {
    uint8_t vga = 32;
    uint8_t rx_amp = 0;
    uint8_t tx_amp = 0;
-    uint8_t tx_gain = hackrf::one::default_tx_gain_db;
+    uint8_t tx_gain = 35;
    uint32_t channel_bandwidth = 1;
    uint32_t rx_frequency;
    uint32_t tx_frequency;
@@ -35,8 +35,7 @@ using namespace portapack;

 namespace pmem = portapack::persistent_memory;

-namespace ui::external_app::ais_rx {
-
+namespace ais {
 namespace format {

 static std::string latlon_abs_normalized(const int32_t normalized, const char suffixes[2]) {
@@ -48,7 +47,7 @@ static std::string latlon_abs_normalized(const int32_t normalized, const char su
    return to_string_dec_uint(degrees) + "." + to_string_dec_uint(fraction, 6, '0') + suffix;
 }

-static std::string latlon(const ais::Latitude latitude, const ais::Longitude longitude) {
+static std::string latlon(const Latitude latitude, const Longitude longitude) {
    if (latitude.is_valid() && longitude.is_valid()) {
        return latlon_abs_normalized(latitude.normalized(), "SN") + " " + latlon_abs_normalized(longitude.normalized(), "WE");
    } else if (latitude.is_not_available() && longitude.is_not_available()) {
@@ -129,7 +128,7 @@ static std::string navigational_status(const unsigned int value) {
    }
 }

-static std::string rate_of_turn(const ais::RateOfTurn value) {
+static std::string rate_of_turn(const RateOfTurn value) {
    switch (value) {
        case -128:
            return "not available";
@@ -150,7 +149,7 @@ static std::string rate_of_turn(const ais::RateOfTurn value) {
    }
 }

-static std::string speed_over_ground(const ais::SpeedOverGround value) {
+static std::string speed_over_ground(const SpeedOverGround value) {
    if (value == 1023) {
        return "not available";
    } else if (value == 1022) {
@@ -160,7 +159,7 @@ static std::string speed_over_ground(const ais::SpeedOverGround value) {
    }
 }

-static std::string course_over_ground(const ais::CourseOverGround value) {
+static std::string course_over_ground(const CourseOverGround value) {
    if (value > 3600) {
        return "invalid";
    } else if (value == 3600) {
@@ -170,7 +169,7 @@ static std::string course_over_ground(const ais::CourseOverGround value) {
    }
 }

-static std::string true_heading(const ais::TrueHeading value) {
+static std::string true_heading(const TrueHeading value) {
    if (value == 511) {
        return "not available";
    } else if (value > 359) {
@@ -181,6 +180,7 @@ static std::string true_heading(const ais::TrueHeading value) {
 }

 } /* namespace format */
+} /* namespace ais */

 void AISLogger::on_packet(const ais::Packet& packet) {
    // TODO: Unstuff here, not in baseband!
@@ -265,33 +265,25 @@ void AISRecentEntry::update(const ais::Packet& packet) {
    }
 }

-}  // namespace ui::external_app::ais_rx
-
 namespace ui {

 template <>
-void RecentEntriesTable<external_app::ais_rx::AISRecentEntries>::draw(
+void RecentEntriesTable<AISRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
    const Style& style,
    RecentEntriesColumns&) {
-    using namespace external_app::ais_rx;
-
-    std::string line = format::mmsi(entry.mmsi) + " ";
+    std::string line = ais::format::mmsi(entry.mmsi) + " ";
    if (!entry.name.empty()) {
-        line += format::text(entry.name);
+        line += ais::format::text(entry.name);
    } else {
-        line += format::text(entry.call_sign);
+        line += ais::format::text(entry.call_sign);
    }
    line.resize(target_rect.width() / 8, ' ');
    painter.draw_string(target_rect.location(), style, line);
 }

-}  // namespace ui
-
-namespace ui::external_app::ais_rx {
-
 AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {
    add_children({
        &button_done,
@@ -306,12 +298,12 @@ AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {

    button_see_map.on_select = [this, &nav](Button&) {
        geomap_view = nav.push<GeoMapView>(
-            format::text(entry_.name),
+            ais::format::text(entry_.name),
            0,
            GeoPos::alt_unit::METERS,
            GeoPos::spd_unit::KNOTS,
-            format::latlon_float(entry_.last_position.latitude.normalized()),
-            format::latlon_float(entry_.last_position.longitude.normalized()),
+            ais::format::latlon_float(entry_.last_position.latitude.normalized()),
+            ais::format::latlon_float(entry_.last_position.longitude.normalized()),
            entry_.last_position.true_heading,
            [this]() {
                send_updates = false;
@@ -332,14 +324,14 @@ AISRecentEntryDetailView& AISRecentEntryDetailView::operator=(const AISRecentEnt

 void AISRecentEntryDetailView::update_position() {
    if (send_updates)
-        geomap_view->update_position(format::latlon_float(entry_.last_position.latitude.normalized()), 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);
+        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 = format::latlon_float(entry.last_position.longitude.normalized());
-        marker.lat = format::latlon_float(entry.last_position.latitude.normalized());
+        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);
@@ -385,18 +377,18 @@ void AISRecentEntryDetailView::paint(Painter& painter) {

    auto field_rect = Rect{rect.left(), rect.top() + 16, rect.width(), 16};

-    field_rect = draw_field(painter, field_rect, s, "MMSI", format::mmsi(entry_.mmsi));
-    field_rect = draw_field(painter, field_rect, s, "Ctry", format::mid(entry_.mmsi));
-    field_rect = draw_field(painter, field_rect, s, "Name", format::text(entry_.name));
-    field_rect = draw_field(painter, field_rect, s, "Call", format::text(entry_.call_sign));
-    field_rect = draw_field(painter, field_rect, s, "Dest", format::text(entry_.destination));
+    field_rect = draw_field(painter, field_rect, s, "MMSI", ais::format::mmsi(entry_.mmsi));
+    field_rect = draw_field(painter, field_rect, s, "Ctry", ais::format::mid(entry_.mmsi));
+    field_rect = draw_field(painter, field_rect, s, "Name", ais::format::text(entry_.name));
+    field_rect = draw_field(painter, field_rect, s, "Call", ais::format::text(entry_.call_sign));
+    field_rect = draw_field(painter, field_rect, s, "Dest", ais::format::text(entry_.destination));
    field_rect = draw_field(painter, field_rect, s, "Last", to_string_datetime(entry_.last_position.timestamp));
-    field_rect = draw_field(painter, field_rect, s, "Pos ", format::latlon(entry_.last_position.latitude, entry_.last_position.longitude));
-    field_rect = draw_field(painter, field_rect, s, "Stat", format::navigational_status(entry_.navigational_status));
-    field_rect = draw_field(painter, field_rect, s, "RoT ", format::rate_of_turn(entry_.last_position.rate_of_turn));
-    field_rect = draw_field(painter, field_rect, s, "SoG ", format::speed_over_ground(entry_.last_position.speed_over_ground));
-    field_rect = draw_field(painter, field_rect, s, "CoG ", format::course_over_ground(entry_.last_position.course_over_ground));
-    field_rect = draw_field(painter, field_rect, s, "Head", format::true_heading(entry_.last_position.true_heading));
+    field_rect = draw_field(painter, field_rect, s, "Pos ", ais::format::latlon(entry_.last_position.latitude, entry_.last_position.longitude));
+    field_rect = draw_field(painter, field_rect, s, "Stat", ais::format::navigational_status(entry_.navigational_status));
+    field_rect = draw_field(painter, field_rect, s, "RoT ", ais::format::rate_of_turn(entry_.last_position.rate_of_turn));
+    field_rect = draw_field(painter, field_rect, s, "SoG ", ais::format::speed_over_ground(entry_.last_position.speed_over_ground));
+    field_rect = draw_field(painter, field_rect, s, "CoG ", ais::format::course_over_ground(entry_.last_position.course_over_ground));
+    field_rect = draw_field(painter, field_rect, s, "Head", ais::format::true_heading(entry_.last_position.true_heading));
    field_rect = draw_field(painter, field_rect, s, "Rx #", to_string_dec_uint(entry_.received_count));
 }

@@ -512,4 +504,4 @@ void AISAppView::on_show_detail(const AISRecentEntry& entry) {
    recent_entry_detail_view.update_map_markers(recent);
 }

-}  // namespace ui::external_app::ais_rx
+} /* namespace ui */
@@ -50,8 +50,6 @@ using namespace lpc43xx;

 #include "recent_entries.hpp"

-namespace ui::external_app::ais_rx {
-
 struct AISPosition {
    rtc::RTC timestamp{};
    ais::Latitude latitude{};
@@ -111,6 +109,8 @@ class AISLogger {
    LogFile log_file{};
 };

+namespace ui {
+
 using AISRecentEntriesView = RecentEntriesView<AISRecentEntries>;

 class AISRecentEntryDetailView : public View {
@@ -239,6 +239,6 @@ class AISAppView : public View {
    void on_tick_second();
 };

-}  // namespace ui::external_app::ais_rx
+} /* namespace ui */

 #endif /*__AIS_APP_H__*/
@@ -280,12 +280,6 @@ AnalogAudioView::AnalogAudioView(
    field_frequency.on_show_options = [this]() {
        this->on_show_options_frequency();
    };
-    field_frequency.changing = [this](rf::Frequency frequency) {
-        return this->on_frequency_changed(frequency);
-    };
-    field_frequency.entered = [this](rf::Frequency frequency) {
-        this->set_frequency_absolute(frequency);
-    };

    field_lna.on_show_options = [this]() {
        this->on_show_options_rf_gain();
@@ -314,10 +308,8 @@ AnalogAudioView::AnalogAudioView(
    };

    waterfall.on_select = [this](int32_t offset) {
-        field_frequency.set_value(
-            field_frequency.value() + offset * receiver_model.frequency_step());
+        field_frequency.set_value(receiver_model.target_frequency() + offset);
    };
-    waterfall.set_live_tuning(true);

 #ifdef PRALINE
    button_pro.on_select = [this](Button&) { this->on_show_options_praline(); };
@@ -327,7 +319,6 @@ AnalogAudioView::AnalogAudioView(

    // This call starts the correct baseband image to run
    // and sets the radio up as necessary for the given modulation.
-    sliding_center_frequency = receiver_model.target_frequency();
    on_modulation_changed(modulation);
 }

@@ -337,7 +328,7 @@ AnalogAudioView::AnalogAudioView(
    : AnalogAudioView(nav) {
    // Settings to override when launched from another app (versus from AppSettings .ini file)
    // TODO: Which other settings make sense to override?
-    set_frequency_absolute(override.frequency_app_override);
+    field_frequency.set_value(override.frequency_app_override);
    on_frequency_step_changed(override.frequency_step);
    options_modulation.set_by_value(toUType(override.mode));
 }
@@ -428,10 +419,10 @@ void AnalogAudioView::on_baseband_bandwidth_changed(uint32_t bandwidth_hz) {
 }

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

 void AnalogAudioView::remove_options_widget() {
@@ -582,14 +573,10 @@ 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);

-    reset_sliding_frequency(modulation);
+    receiver_model.set_hidden_offset(modulation == ReceiverModel::Mode::AMAudioFMApt ? -2200 : 0);  // wefax needs to be shifted, see wefax rx app.

    receiver_model.enable();

-    if (sliding_enabled) {
-        baseband::set_audio_ddc_frequency(0);
-    }
-
    // TODO: This doesn't belong here! There's a better way.
    size_t sampling_rate = 0;
    switch (modulation) {
@@ -623,64 +610,7 @@ void AnalogAudioView::handle_coded_squelch(uint32_t value) {
 }

 void AnalogAudioView::on_freqchg(int64_t freq) {
-    set_frequency_absolute(freq);
-}
-
-void AnalogAudioView::set_frequency_absolute(rf::Frequency frequency) {
-    if (!sliding_enabled) {
-        field_frequency.set_value(frequency);
-        return;
-    }
-
-    sliding_center_frequency = frequency;
-
-    /* set_value() does not call on_change when the displayed frequency is
-     * already equal, so reset the hardware and DDC explicitly in that case. */
-    if (field_frequency.value() == frequency) {
-        receiver_model.set_target_frequency_with_hidden_offset(frequency, 0);
-        baseband::set_audio_ddc_frequency(0);
-    } else {
-        field_frequency.set_value(frequency);
-    }
-}
-
-int32_t AnalogAudioView::sliding_limit() const {
-    const bool zoom_x2 =
-        receiver_model.modulation() == ReceiverModel::Mode::AMAudio &&
-        previous_zoom != 0;
-    return zoom_x2 ? sliding_limit_zoom_x2 : sliding_limit_zoom_x1;
-}
-
-void AnalogAudioView::reset_sliding_frequency(ReceiverModel::Mode modulation) {
-    sliding_enabled =
-        modulation == ReceiverModel::Mode::AMAudio ||
-        modulation == ReceiverModel::Mode::NarrowbandFMAudio;
-    sliding_center_frequency = receiver_model.target_frequency();
-
-    /* AMFM keeps its existing Wefax offset; sliding applies to AM and NFM. */
-    receiver_model.set_hidden_offset(
-        modulation == ReceiverModel::Mode::AMAudioFMApt ? -2200 : 0);
-}
-
-bool AnalogAudioView::on_frequency_changed(rf::Frequency frequency) {
-    if (!sliding_enabled)
-        return false;
-
-    const auto limit = sliding_limit();
-    int64_t offset = frequency - sliding_center_frequency;
-    if (offset > limit) {
-        sliding_center_frequency = frequency - limit;
-        offset = limit;
-    } else if (offset < -limit) {
-        sliding_center_frequency = frequency + limit;
-        offset = -limit;
-    }
-
-    /* Store the displayed frequency and retune the hardware centre atomically. */
-    receiver_model.set_target_frequency_with_hidden_offset(
-        frequency, sliding_center_frequency - frequency);
-    baseband::set_audio_ddc_frequency(static_cast<int32_t>(offset));
-    return true;
+    field_frequency.set_value(freq);
 }

 #ifdef PRALINE
@@ -269,10 +269,6 @@ class AnalogAudioView : public View {
    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)
-    static constexpr int32_t sliding_limit_zoom_x1 = 50000;
-    static constexpr int32_t sliding_limit_zoom_x2 = 30000;
-    rf::Frequency sliding_center_frequency{0};
-    bool sliding_enabled{false};

    app_settings::SettingsManager settings_{
        "rx_audio",
@@ -358,10 +354,6 @@ class AnalogAudioView : public View {
    void handle_coded_squelch(uint32_t value);

    void on_freqchg(int64_t freq);
-    bool on_frequency_changed(rf::Frequency frequency);
-    void set_frequency_absolute(rf::Frequency frequency);
-    int32_t sliding_limit() const;
-    void reset_sliding_frequency(ReceiverModel::Mode modulation);

    MessageHandlerRegistration message_handler_coded_squelch{
        Message::ID::CodedSquelch,
@@ -322,10 +322,10 @@ class BLERxView : public View {
        {UI_POS_X(21), UI_POS_Y(0)}};

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

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

    Labels label_sort{
        {{UI_POS_X(0), UI_POS_Y(1)}, "Sort:", Theme::getInstance()->fg_light->foreground}};
@@ -116,7 +116,7 @@ static std::uint64_t get_freq_by_channel_number(uint8_t channel_number) {
            freq_hz = 2'428'000'000ull + (channel_number - 11) * 2'000'000ull;
            break;
        default:
-            freq_hz = 2'402'000'000ull;  // Default to channel 37 frequency if invalid channel number
+            freq_hz = UINT64_MAX;
    }

    return freq_hz;
@@ -254,7 +254,7 @@ void BLETxView::send_packet() {
 }

 void BLETxView::start() {
-    if (file_path.empty() || num_packets == 0) {
+    if (file_path.empty()) {
        file_error();
        check_loop.set_value(false);
        return;
@@ -266,8 +266,6 @@ void BLETxView::start() {
    button_play.set_bitmap(&bitmap_stop);
    is_running = true;

-    advCount = 0;
-
    send_packet();
 }

@@ -298,61 +296,55 @@ void BLETxView::on_timer() {
 void BLETxView::on_tx_progress(const bool done, uint32_t progress) {
    // TODO: make use of progress variable
    (void)progress;
-    if (!is_active() || num_packets == 0) {
-        return;
-    }
    if (done) {
        if (is_active()) {
            transmitter_model.disable();
-
            if (auto_channel) {
-                advCount++;
+                switch (advCount) {
+                    case 0:
+                        channel_number = 37;
+                        break;
+                    case 1:
+                        channel_number = 38;
+                        break;
+                    case 2:
+                        channel_number = 39;
+                        break;
+                }
+
+                field_frequency.set_value(get_freq_by_channel_number(channel_number));
+
                if (advCount == 3) {
                    channel_number = 37;
-                    field_frequency.set_value(get_freq_by_channel_number(channel_number));
-                    if (packet_counter > 0) packet_counter--;
+                    packet_counter--;
                    packetDone = true;
                    advCount = 0;
                } else {
-                    channel_number = 37 + advCount;
-                    field_frequency.set_value(get_freq_by_channel_number(channel_number));
-                    send_packet();
-                }
-            } else if (all_channels) {
-                advCount++;
-                if (advCount == 40) {
-                    channel_number = 0;
-                    field_frequency.set_value(get_freq_by_channel_number(channel_number));
-                    if (packet_counter > 0) packet_counter--;
-                    packetDone = true;
-                    advCount = 0;
-                } else {
-                    channel_number = advCount;
-                    field_frequency.set_value(get_freq_by_channel_number(channel_number));
                    send_packet();
+                    advCount++;
                }
            } else {
-                if (packet_counter > 0) packet_counter--;
+                packet_counter--;
                packetDone = true;
            }
        }
-    }

-    // Reached end of current packet repeats.
-    if (packet_counter == 0) {
-        // Done sending all packets.
-        current_packet++;
-        if (current_packet >= num_packets) {
-            current_packet = 0;
+        // 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);
+                // If looping, restart from beginning.
+                if (check_loop.value()) {
+                    update_current_packet(packets[current_packet], current_packet);
+                } else {
+                    stop();
+                }
            } else {
-                stop();
+                current_packet++;
+                update_current_packet(packets[current_packet], current_packet);
            }
-        } else {
-            update_current_packet(packets[current_packet], current_packet);
        }
    }
 }
@@ -393,20 +385,16 @@ BLETxView::BLETxView(NavigationView& nav)
    };

    options_channel.on_change = [this](size_t, int32_t i) {
-        auto_channel = (i == BLT_CHAN_AUTO);
-        all_channels = (i == BLT_CHAN_ALL);
-
-        advCount = 0;
-
-        if (auto_channel) {
-            channel_number = 37;
-        } else if (all_channels) {
-            channel_number = 0;
+        // If we selected Auto don't do anything and Auto will handle changing.
+        if (i == 40) {
+            auto_channel = true;
+            return;
        } else {
-            channel_number = i;
+            auto_channel = false;
        }

-        field_frequency.set_value(get_freq_by_channel_number(channel_number));
+        field_frequency.set_value(get_freq_by_channel_number(i));
+        channel_number = i;
    };

    options_speed.on_change = [this](size_t, int32_t i) {
@@ -415,7 +403,7 @@ BLETxView::BLETxView(NavigationView& nav)
    };

    options_speed.set_selected_index(0);
-    options_channel.set_by_value(BLT_CHAN_AUTO);
+    options_channel.set_selected_index(3);

    check_rand_mac.set_value(false);
    check_rand_mac.on_select = [this](Checkbox&, bool v) {
@@ -425,7 +413,8 @@ BLETxView::BLETxView(NavigationView& nav)
    button_open.on_select = [this](Button&) {
        auto open_view = nav_.push<FileLoadView>(".TXT");
        open_view->on_changed = [this](std::filesystem::path new_file_path) {
-            this->on_file_changed(new_file_path);
+            on_file_changed(new_file_path);
+
            nav_.set_on_pop([this]() { button_play.focus(); });
        };
    };
@@ -438,7 +427,7 @@ BLETxView::BLETxView(NavigationView& nav)
            64,
            ENTER_KEYBOARD_MODE_ALPHA,
            [this](std::string& buffer) {
-                this->on_save_file(buffer);
+                on_save_file(buffer);
            });
    };

@@ -517,10 +506,10 @@ void BLETxView::on_file_changed(const fs::path& new_file_path) {
        }

        do {
-            readUntil(data_file, packets[num_packets].macAddress, sizeof(packets[num_packets].macAddress), ' ');
-            readUntil(data_file, packets[num_packets].advertisementData, sizeof(packets[num_packets].advertisementData), ' ');
-            readUntil(data_file, packets[num_packets].packetType, sizeof(packets[num_packets].packetType), ' ');
-            readUntil(data_file, packets[num_packets].packetCount, sizeof(packets[num_packets].packetCount), '\n');
+            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);
@@ -553,8 +542,10 @@ void BLETxView::on_file_changed(const fs::path& new_file_path) {
            num_packets++;

        } while (num_packets < max_num_packets);
-        data_file.close();
+
        update_current_packet(packets[0], 0);
+
+        data_file.close();
    }
 }

@@ -579,9 +570,6 @@ void BLETxView::update_current_packet(BLETxPacket packet, uint32_t currentIndex)

    std::vector<std::string> strings = splitIntoStrings(packet.advertisementData);

-    packet_counter = packet.packet_count;
-    current_packet = currentIndex;
-
    text_packet_index.set(to_string_dec_uint(current_packet));

    text_packets_sent.set(to_string_dec_uint(packet.packet_count));
@@ -590,6 +578,9 @@ void BLETxView::update_current_packet(BLETxPacket packet, uint32_t currentIndex)

    progressbar.set_max(packet.packet_count);

+    packet_counter = packet.packet_count;
+    current_packet = currentIndex;
+
    dataFile.create(dataTempFilePath);

    for (const std::string& str : strings) {
@@ -45,9 +45,6 @@
 #include <string>
 #include <memory>

-#define BLT_CHAN_AUTO 40
-#define BLT_CHAN_ALL 41
-
 class BLELoggerTx {
   public:
    Optional<File::Error> append(const std::filesystem::path& filename) {
@@ -97,7 +94,7 @@ struct BLETxPacket {
    char advertisementData[63];
    char packetCount[11];
    char packetType[17];
-    uint32_t packet_count;  // repeat the same packet count times
+    uint32_t packet_count;
    PKT_TYPE pduType;
 };

@@ -148,7 +145,6 @@ class BLETxView : public View {
    std::filesystem::path packet_save_path{bletx_dir / u"BLETX_????.TXT"};
    uint8_t channel_number = 37;
    bool auto_channel = false;
-    bool all_channels = false;

    char randomMac[13] = "010203040506";

@@ -160,10 +156,10 @@ class BLETxView : public View {
    int16_t auto_channel_period{6};

    bool repeatLoop = false;
-    uint32_t packet_counter{0};  // the counter (decr) of the actual packet as it can be sent multiple times
-    uint32_t num_packets{0};     // how many packets in the file
-    uint32_t current_packet{0};  // the actual packet's num, i'm sending if i have multiple packets
-    uint8_t packetTxCount{0};    // not used
+    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;
@@ -245,48 +241,10 @@ class BLETxView : public View {
    OptionsField options_channel{
        {11 * 8, 6 * 8},
        5,
-        {{"Ch.0", 0},
-         {"Ch.1", 1},
-         {"Ch.2", 2},
-         {"Ch.3", 3},
-         {"Ch.4", 4},
-         {"Ch.5", 5},
-         {"Ch.6", 6},
-         {"Ch.7", 7},
-         {"Ch.8", 8},
-         {"Ch.9", 9},
-         {"Ch.10", 10},
-         {"Ch.11", 11},
-         {"Ch.12", 12},
-         {"Ch.13", 13},
-         {"Ch.14", 14},
-         {"Ch.15", 15},
-         {"Ch.16", 16},
-         {"Ch.17", 17},
-         {"Ch.18", 18},
-         {"Ch.19", 19},
-         {"Ch.20", 20},
-         {"Ch.21", 21},
-         {"Ch.22", 22},
-         {"Ch.23", 23},
-         {"Ch.24", 24},
-         {"Ch.25", 25},
-         {"Ch.26", 26},
-         {"Ch.27", 27},
-         {"Ch.28", 28},
-         {"Ch.29", 29},
-         {"Ch.30", 30},
-         {"Ch.31", 31},
-         {"Ch.32", 32},
-         {"Ch.33", 33},
-         {"Ch.34", 34},
-         {"Ch.35", 35},
-         {"Ch.36", 36},
-         {"Ch.37", 37},
+        {{"Ch.37 ", 37},
         {"Ch.38", 38},
         {"Ch.39", 39},
-         {"Auto", BLT_CHAN_AUTO},
-         {"All", BLT_CHAN_ALL}}};
+         {"Auto", 40}}};

    OptionsField options_adv_type{
        {17 * 8, 6 * 8},
@@ -28,7 +28,6 @@
 #include "string_format.hpp"
 #include "utility.hpp"
 #include "file_path.hpp"
-#include "usb_serial_asyncmsg.hpp"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    uint32_t last_address = 0;
-    uint16_t current_bitrate = 0;    /* bitrate of current packet being decoded */
-    bool current_inverted = false;   /* polarity of current packet being decoded */
-    uint8_t serial_numeric_sent = 0; /* numeric chars already sent to serial/GUI */
-
    pocsag::EccContainer ecc{};
    pocsag::POCSAGState pocsag_state{&ecc};
    POCSAGLogger logger{};
@@ -38,7 +38,7 @@ using namespace portapack;

 namespace pmem = portapack::persistent_memory;

-namespace ui::external_app::adsbrx {
+namespace ui {

 static const char speed_type_msg[][6] = {" Spd:", " IAS:", " TAS:"};

@@ -46,19 +46,13 @@ static std::string get_map_tag(const AircraftRecentEntry& entry) {
    return trimr(entry.callsign.empty() ? entry.icao_str : entry.callsign);
 }

-}  // namespace ui::external_app::adsbrx
-
-namespace ui {
-
 template <>
-void RecentEntriesTable<external_app::adsbrx::AircraftRecentEntries>::draw(
+void RecentEntriesTable<AircraftRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
    const Style& style,
    RecentEntriesColumns& columns) {
-    using namespace external_app::adsbrx;
-
    Color target_color;
    std::string entry_string;

@@ -81,7 +75,7 @@ void RecentEntriesTable<external_app::adsbrx::AircraftRecentEntries>::draw(
    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_int((int32_t)(entry.pos.altitude / 100), 4);
+    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,
@@ -113,10 +107,6 @@ void RecentEntriesTable<external_app::adsbrx::AircraftRecentEntries>::draw(
                            bitmap_target, target_color, style.background);
 }

-}  // namespace ui
-
-namespace ui::external_app::adsbrx {
-
 /* ADSBLogger ********************************************/

 void ADSBLogger::log(const ADSBLogEntry& log_entry) {
@@ -542,18 +532,6 @@ ADSBRxView::ADSBRxView(NavigationView& nav) {
    logger = std::make_unique<ADSBLogger>();
    logger->append(logs_dir / u"ADSB.TXT");

-    /* First run only: start from the configuration that is known to receive
-     * ADS-B on this hardware -- LNA 32, VGA 32, RF amp ON. The first two are
-     * already ReceiverModel's defaults; the amp is not, and running without it
-     * costs about 14 dB, which is the difference between a busy list and an
-     * empty one. Once the user has saved settings for this app their choice
-     * wins, so this only sets the starting point.
-     * Going through the field rather than receiver_model keeps the displayed
-     * value in step: RFAmpField snapshots rf_amp() in its own constructor,
-     * which has already run by the time we get here. */
-    if (!settings_.loaded())
-        field_rf_amp.set_value(1);
-
    receiver_model.enable();
    baseband::set_adsb();

@@ -690,8 +668,9 @@ void ADSBRxView::on_frame(const ADSBFrameMessage* message) {
                        (raw_data[3] & 15);

                // The final altitude is due to the resulting number multiplied by 25, minus 1000.
-                // altitude = 25N - 1000 (ft); minimum is -1000 ft when N=0 (Q=1, M=0 per ICAO Annex 10).
                altitude = 25 * n - 1000;
+                if (altitude < 0)
+                    altitude = 0;
            }  // else N is an 11 bit Gillham coded altitude
        }

@@ -838,4 +817,4 @@ void ADSBRxView::remove_expired_entries() {
    recent.erase(it.base(), recent.end());
 }

-}  // namespace ui::external_app::adsbrx
+} /* namespace ui */
@@ -39,7 +39,7 @@

 using namespace adsb;

-namespace ui::external_app::adsbrx {
+namespace ui {
 #define AIRCRAFT_ID_L 1  // aircraft ID message type (lowest type id)
 #define AIRCRAFT_ID_H 4  // aircraft ID message type (highest type id)

@@ -491,4 +491,4 @@ class ADSBRxView : public View {
        }};
 };

-}  // namespace ui::external_app::adsbrx
+} /* namespace ui */
@@ -31,25 +31,19 @@

 using namespace portapack;

-namespace ui::external_app::aprs_rx {
-
 void APRSLogger::log_raw_data(const std::string& data) {
    log_file.write_entry(data);
 }

-}  // namespace ui::external_app::aprs_rx
-
 namespace ui {

 template <>
-void RecentEntriesTable<external_app::aprs_rx::APRSRecentEntries>::draw(
+void RecentEntriesTable<APRSRecentEntries>::draw(
    const Entry& entry,
    const Rect& target_rect,
    Painter& painter,
    const Style& style,
    RecentEntriesColumns& columns) {
-    using namespace external_app::aprs_rx;
-
    Color target_color;
    // auto entry_age = entry.age;

@@ -74,10 +68,6 @@ void RecentEntriesTable<external_app::aprs_rx::APRSRecentEntries>::draw(
    }
 }

-}  // namespace ui
-
-namespace ui::external_app::aprs_rx {
-
 void APRSRxView::focus() {
    options_region.focus();
 }
@@ -412,4 +402,4 @@ void APRSRXView::focus() {

 APRSRXView::~APRSRXView() {
 }
-}  // namespace ui::external_app::aprs_rx
+} /* namespace ui */
@@ -38,8 +38,6 @@
 #include "utility.hpp"
 #include "file_path.hpp"

-namespace ui::external_app::aprs_rx {
-
 class APRSLogger {
   public:
    Optional<File::Error> append(const std::filesystem::path& filename) {
@@ -52,6 +50,8 @@ class APRSLogger {
    LogFile log_file{};
 };

+namespace ui {
+
 struct APRSRecentEntry {
    using Key = uint64_t;

@@ -290,6 +290,6 @@ class APRSRXView : public View {
        }};
 };

-}  // namespace ui::external_app::aprs_rx
+} /* namespace ui */

 #endif /*__UI_APRS_RX_H__*/
@@ -37,7 +37,7 @@
 using namespace aprs;
 using namespace portapack;

-namespace ui::external_app::aprs_tx {
+namespace ui {

 void APRSTXView::focus() {
    tx_view.focus();
@@ -238,8 +238,7 @@ APRSTXView::APRSTXView(NavigationView& nav) {
                process_coordinates(lat, lon);
            });
    };
-
    // process_coordinates(last_lat, last_lon); //don't load last, so won't confuse users
 }

-}  // namespace ui::external_app::aprs_tx
+} /* namespace ui */
@@ -33,7 +33,7 @@
 #include "radio_state.hpp"
 #include "portapack.hpp"

-namespace ui::external_app::aprs_tx {
+namespace ui {

 class APRSTXView : public View {
   public:
@@ -161,4 +161,4 @@ class APRSTXView : public View {
        }};
 };

-}  // namespace ui::external_app::aprs_tx
+} /* namespace ui */
@@ -27,8 +27,6 @@
 #include "portapack.hpp"
 #include "battery.hpp"
 #include <cstring>
-#include "ui_settings.hpp"
-#include "portapack_persistent_memory.hpp"

 using namespace portapack;

@@ -52,6 +50,7 @@ void BattinfoView::update_result() {
        text_voltage.set("UNKNOWN");
        text_current.set("-");
        text_charge.set("-");
+        // text_cycles.set("-");
        text_ttef.set("-");
        text_method.set("-");
        // text_warn.set("");
@@ -59,9 +58,7 @@ void BattinfoView::update_result() {
    }
    bool uichg = false;
    uint8_t valid_mask = 0;
-    bool battMayChanged = false;
-    battery::BatteryManagement::getBatteryInfo(valid_mask, percent, voltage, current, battMayChanged);
-    text_state.set((battMayChanged || !persistent_memory::battery_cap_valid()) ? "Needs config." : "ok");
+    battery::BatteryManagement::getBatteryInfo(valid_mask, percent, voltage, current);
    // update text fields
    if (percent <= 100 && (valid_mask & battery::BatteryManagement::BATT_VALID_VOLTAGE) == battery::BatteryManagement::BATT_VALID_VOLTAGE)
        text_percent.set(to_string_dec_uint(percent) + " %");
@@ -77,7 +74,6 @@ void BattinfoView::update_result() {
        labels_opt.hidden(false);
        text_current.hidden(false);
        text_charge.hidden(false);
-        text_state.hidden(false);
        text_current.set(to_string_dec_int(current) + " mA");
        if (current >= 25)  // when >25mA it is charging in any scenario
            text_charge.set("Charging");
@@ -100,7 +96,7 @@ void BattinfoView::update_result() {
        labels_opt.hidden(true);
        text_current.hidden(true);
        text_charge.hidden(true);
-        text_state.hidden(true);
+        // text_cycles.hidden(true);
        text_ttef.hidden(true);
        // text_warn.set("");
    }
@@ -142,13 +138,14 @@ void BattinfoView::update_result() {
    }
    if ((valid_mask & battery::BatteryManagement::BATT_VALID_PERCENT) == battery::BatteryManagement::BATT_VALID_PERCENT) {
        text_method.set("IC");
+        button_mode.set_text("Volt");
    } else {
        text_method.set("Voltage");
+        button_mode.set_text("IC");
    }
-    if (battMayChanged) text_capacity.set_style(Theme::getInstance()->fg_red);
    if (uichg) set_dirty();
    // to update status bar too, send message in behalf of batt manager
-    BatteryStateMessage msg{valid_mask, percent, current >= 25, voltage, battMayChanged};
+    BatteryStateMessage msg{valid_mask, percent, current >= 25, voltage};
    EventDispatcher::send_message(msg);
 }

@@ -161,21 +158,26 @@ BattinfoView::BattinfoView(NavigationView& nav)
                  &text_current,
                  &text_charge,
                  &text_method,
-                  &button_settings,
+                  &button_mode,
                  &button_exit,
-                  &text_capacity,
-                  //&text_state, //disabled for now
+                  // &text_cycles,
                  // &text_warn,
                  &text_ttef});

    button_exit.on_select = [this, &nav](Button&) {
        nav.pop();
    };
-    button_settings.on_select = [this, &nav](Button&) {
-        nav.replace<SetBatteryView>();
+    button_mode.on_select = [this, &nav](Button&) {
+        if (button_mode.text() == "IC") {
+            battery::BatteryManagement::set_calc_override(false);
+            persistent_memory::set_ui_override_batt_calc(false);
+            button_mode.set_text("Volt");
+        } else {
+            battery::BatteryManagement::set_calc_override(true);
+            persistent_memory::set_ui_override_batt_calc(true);
+            button_mode.set_text("IC");
+        }
    };
-    text_capacity.set(to_string_dec_uint(persistent_memory::battery_cap_mah()) + " mAh");
-    if (!persistent_memory::battery_cap_valid()) text_capacity.set_style(Theme::getInstance()->fg_red);
    update_result();
    if (thread == nullptr) thread = chThdCreateFromHeap(NULL, 1024, NORMALPRIO + 10, BattinfoView::static_fn, this);
 }
@@ -54,54 +54,48 @@ class BattinfoView : public View {
    int32_t current = 0;

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

    Labels labels_opt{
-        {{UI_POS_X(2), UI_POS_Y(5)}, "Current:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(2), UI_POS_Y(6)}, "Charge:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(2), UI_POS_Y(7)}, "TTF/E:", Theme::getInstance()->fg_light->foreground},
-        //{{UI_POS_X(2), UI_POS_Y(8)}, "State:", Theme::getInstance()->fg_light->foreground}, //for now, this is disabled. see max ic implementation
-        {{UI_POS_X(2), UI_POS_Y(10)}, "Change settings:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 4 * 16}, "Current:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 5 * 16}, "Charge:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 6 * 16}, "TTF/E:", Theme::getInstance()->fg_light->foreground},
+        // {{2 * 8, 7 * 16}, "Cycles:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 10 * 16}, "Change method:", Theme::getInstance()->fg_light->foreground},
    };

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

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

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

    Button button_exit{
        {UI_POS_X_CENTER(12), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
@@ -112,4 +106,4 @@ class BattinfoView : public View {

 } /* namespace ui */

-#endif /*__UI_BATTINFO__*/
+#endif /*__UI_BATTINFO__*/
@@ -3176,9 +3176,9 @@ void RFFC5072StatusView::refresh_status() {

        // Blink LED
        /*for (int i = 0; i < 3; i++) {
-            hackrf::one::led_rx.setActive();
+            hackrf::one::led_rx.on();
            chThdSleepMilliseconds(100);
-            hackrf::one::led_rx.setInactive();
+            hackrf::one::led_rx.off();
            chThdSleepMilliseconds(100);
        }*/
    } else {
@@ -103,8 +103,7 @@ DfuMenu2::DfuMenu2(NavigationView& nav)
                  &text_info_line_8,
                  &text_info_line_9,
                  &text_info_line_10,
-                  &text_info_line_11,
-                  &text_info_line_12});
+                  &text_info_line_11});
 }

 void DfuMenu2::paint(Painter& painter) {
@@ -119,12 +118,9 @@ void DfuMenu2::paint(Painter& painter) {
    text_info_line_9.set(to_string_dec_uint(portapack::transmitter_model.target_frequency(), 10));
    text_info_line_10.set(to_string_dec_uint(portapack::transmitter_model.baseband_bandwidth(), 10));
    text_info_line_11.set(to_string_dec_uint(portapack::transmitter_model.sampling_rate(), 10));
-    text_info_line_12.set(std::string("M") + (radio::get_mixer_invert() ? "Y" : "N") +
-                          " B" + (radio::get_baseband_invert() ? "Y" : "N") +
-                          " IQ" + ((radio::get_mixer_invert() ^ radio::get_baseband_invert()) ? "Y" : "N"));

    constexpr auto margin = 5;
-    constexpr auto lines = 12 + 2;
+    constexpr auto lines = 11 + 2;

    painter.fill_rectangle(
        {{5 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
@@ -96,7 +96,6 @@ class DfuMenu2 : public View {
        {{5 * CHARACTER_WIDTH, 13 * LINE_HEIGHT}, "TX Freq:", Theme::getInstance()->fg_darkcyan->foreground},
        {{5 * CHARACTER_WIDTH, 14 * LINE_HEIGHT}, "TX BW:", Theme::getInstance()->fg_darkcyan->foreground},
        {{5 * CHARACTER_WIDTH, 15 * LINE_HEIGHT}, "TX SampR:", Theme::getInstance()->fg_darkcyan->foreground},
-        {{5 * CHARACTER_WIDTH, 16 * LINE_HEIGHT}, "IQ Inv:", Theme::getInstance()->fg_darkcyan->foreground},
    };

    Text text_info_line_1{{14 * CHARACTER_WIDTH, 5 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
@@ -110,7 +109,6 @@ class DfuMenu2 : public View {
    Text text_info_line_9{{14 * CHARACTER_WIDTH, 13 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_10{{14 * CHARACTER_WIDTH, 14 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_11{{14 * CHARACTER_WIDTH, 15 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
-    Text text_info_line_12{{(14 + 1) * CHARACTER_WIDTH, 16 * LINE_HEIGHT, (10 - 1) * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
 };

 } /* namespace ui */
@@ -43,7 +43,6 @@ namespace ui {
 static const fs::path txt_ext{u".TXT"};
 static const fs::path ppl_ext{u".PPL"};
 static const fs::path c8_ext{u".C8"};
-static const fs::path cu8_ext{u".CU8"};
 static const fs::path c16_ext{u".C16"};
 static const fs::path cxx_ext{u".C*"};
 static const fs::path png_ext{u".PNG"};
@@ -89,11 +88,8 @@ fs::path get_partner_file(fs::path path) {
        path.replace_extension(txt_ext);
    else if (path_iequal(ext, txt_ext)) {
        path.replace_extension(c8_ext);
-        if (!fs::file_exists(path))
-            path.replace_extension(cu8_ext);
        if (!fs::file_exists(path))
            path.replace_extension(c16_ext);
-
    } else
        return {};

@@ -390,7 +386,6 @@ std::string get_stem(std::string t) {
        return t.substr(0, index);
    }
 }
-
 std::string get_filename(std::string _s) {
    const auto index = _s.find_last_of("/");
    if (index == _s.npos) {
@@ -399,7 +394,6 @@ std::string get_filename(std::string _s) {
        return _s.substr(index + 1);
    }
 }
-
 void FileManBaseView::refresh_list() {
    if (on_refresh_widgets)
        on_refresh_widgets(false);
@@ -410,6 +404,8 @@ void FileManBaseView::refresh_list() {
    menu_view.clear();

    for (const auto& entry : entry_list) {
+        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{};
            if (entry.path == str_next || entry.path == str_back) {
@@ -418,10 +414,8 @@ void FileManBaseView::refresh_list() {
                size_str = (entry.path == parent_dir_path.string()) ? "" : to_string_dec_uint(file_count(current_path / entry.path));
            }

-            // CRITICAL: Use "\t" (Tab) to separate the path and the size!
-            // Do not use spaces or padding here. The menu will handle the alignment.
            menu_view.add_item(
-                {entry.path + "\t" + 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) {
@@ -433,9 +427,8 @@ void FileManBaseView::refresh_list() {
            const auto& assoc = get_assoc(get_extension(entry.path));
            auto size_str = to_string_file_size(entry.size);

-            // CRITICAL: Use "\t" (Tab) to separate the path and the size!
            menu_view.add_item(
-                {entry.path + "\t" + 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) {
@@ -80,7 +80,6 @@ class FileManBaseView : public View {
        {u".PNG", &bitmap_icon_file_image, ui::Color::green()},
        {u".BMP", &bitmap_icon_file_image, ui::Color::green()},
        {u".C8", &bitmap_icon_file_iq, ui::Color::dark_cyan()},
-        {u".CU8", &bitmap_icon_file_iq, ui::Color::dark_cyan()},
        {u".C16", &bitmap_icon_file_iq, ui::Color::dark_cyan()},
        {u".WAV", &bitmap_icon_file_wav, ui::Color::dark_magenta()},
        {u".PPL", &bitmap_icon_file_iq, ui::Color::white()},                  // Playlist/Replay
@@ -32,7 +32,7 @@ static const char* hackrf_magic = "HACKRFFW";
 #define FIRST_CHECKSUM_NIGHTLY 240125

 Thread* FlashUtilityView::thread{nullptr};
-static constexpr size_t max_filename_length = 60;  // max length of filename
+static constexpr size_t max_filename_length = 26;

 bool valid_firmware_file(std::filesystem::path::string_type path) {
    File firmware_file;
@@ -134,6 +134,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(
@@ -151,7 +157,6 @@ std::filesystem::path FlashUtilityView::extract_tar(std::filesystem::path::strin

 bool FlashUtilityView::flash_firmware(std::filesystem::path::string_type path) {
    ui::Painter painter;
-    menu_view.hidden(true);
    if (endsWith(path, u".tar")) {
        // extract, then update
        path = extract_tar(u'/' + path, painter).native();
@@ -161,14 +166,13 @@ bool FlashUtilityView::flash_firmware(std::filesystem::path::string_type path) {
        painter.fill_rectangle({0, 50, portapack::display.width(), 90}, Theme::getInstance()->bg_darkest->background);
        painter.draw_string({0, 60}, *Theme::getInstance()->fg_red, "BAD FIRMWARE FILE OR W/R ERR");
        chThdSleepMilliseconds(5000);
-        menu_view.hidden(false);
        return false;
    }
    painter.fill_rectangle(
        {0, 0, portapack::display.width(), portapack::display.height()},
        Theme::getInstance()->bg_darkest->background);

-    painter.draw_string({12, 24}, this->nav_.style(), "This will take 15-45 sec.");
+    painter.draw_string({12, 24}, this->nav_.style(), "This will take 15 seconds.");
    painter.draw_string({12, 64}, this->nav_.style(), "Please wait while LED RX");
    painter.draw_string({12, 84}, this->nav_.style(), "is on and TX is flashing.");
    painter.draw_string({12, 124}, this->nav_.style(), "Device will then restart.");
@@ -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_;
@@ -67,6 +68,14 @@ class FlashUtilityView : public View {
    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 */
@@ -172,7 +172,6 @@ void IQTrimView::update_range_controls(iq::TrimRange trim_range) {

 void IQTrimView::profile_capture() {
    power_buckets_.clear();
-    power_buckets_.resize(screen_width);
    iq::PowerBuckets buckets{
        .p = power_buckets_.data(),
        .size = power_buckets_.size()};
@@ -24,7 +24,6 @@
 #include "ui_looking_glass_app.hpp"
 #include "convert.hpp"
 #include "file_reader.hpp"
-#include "file.hpp"
 #include "string_format.hpp"
 #include "audio.hpp"
 #include "file_path.hpp"
@@ -32,7 +31,6 @@
 using namespace portapack;

 namespace ui {
-
 void GlassView::focus() {
    range_presets.focus();
 }
@@ -46,7 +44,7 @@ GlassView::~GlassView() {

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

 void GlassView::update_display_beep() {
@@ -130,9 +128,8 @@ void GlassView::reset_live_view() {
    max_freq_power = -1000;

    // Clear screen in peak mode.
-    const int spectrum_height = screen_height - spectrum_y;
    if (live_frequency_view == 2)
-        display.fill_rectangle({{0, spectrum_y}, {screen_width, spectrum_height}}, {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) {
@@ -147,9 +144,11 @@ void GlassView::add_spectrum_pixel(uint8_t power) {
            constexpr float rssi_voltage_min = 0.4;
            constexpr float rssi_voltage_max = 2.2;
            constexpr float adc_voltage_max = 3.3;
-            constexpr int raw_min = 0.5f + rssi_sample_range * rssi_voltage_min / adc_voltage_max;
-            constexpr int raw_max = 0.5f + rssi_sample_range * rssi_voltage_max / adc_voltage_max;
-            const int spectrum_height = screen_height - spectrum_y;
+            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, screen_height - (108 + 16)};
+
            // drawing and keeping track of max freq
            for (uint16_t xpos = 0; xpos < screen_width; xpos++) {
                // save max powerwull freq
@@ -157,21 +156,17 @@ void GlassView::add_spectrum_pixel(uint8_t power) {
                    max_freq_power = spectrum_data[xpos];
                    max_freq_hold = get_freq_from_bin_pos(xpos);
                }
-                int16_t point = map(spectrum_data[xpos], 0, 255, 0, spectrum_height);
+                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, spectrum_y}, {1, screen_height - point}}, {0, 0, 0});
+                    display.fill_rectangle({{xpos, 108 + 16}, {1, screen_height - point}}, {0, 0, 0});
                }
-                display.fill_rectangle({{xpos, screen_height - point}, {1, point}}, gradient.lut[spectrum_data[xpos]]);
-            }
-            // indicate RSSI min and max power
-            if (show_rssi_guides) {
-                display.fill_rectangle({{0, screen_height - map(raw_min, 0, 255, 0, spectrum_height)}, {screen_width, 1}}, -gradient.lut[raw_min]);
-                display.fill_rectangle({{0, screen_height - map(raw_max, 0, 255, 0, spectrum_height)}, {screen_width, 1}}, -gradient.lut[raw_max]);
+                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;
-                freq_stats.set("MAX: " + to_string_short_freq(max_freq_hold));
+                freq_stats.set("MAX HOLD: " + to_string_short_freq(max_freq_hold));
            }
            plot_marker(marker_pixel_index);
        } else {
@@ -328,8 +323,8 @@ void GlassView::update_min(int32_t v) {
        min_size = search_span;
    if (min_size < 1)
        min_size = 1;
-    if (v > LOOKING_GLASS_MAX_FREQ_MHZ - min_size) {
-        v = LOOKING_GLASS_MAX_FREQ_MHZ - min_size;
+    if (v > 7200 - min_size) {
+        v = 7200 - min_size;
    }
    if (v > (field_frequency_max.value() - min_size))
        field_frequency_max.set_value(v + min_size, false);
@@ -348,9 +343,6 @@ void GlassView::update_max(int32_t v) {
    if (v < min_size) {
        v = min_size;
    }
-    if (v > LOOKING_GLASS_MAX_FREQ_MHZ) {
-        v = LOOKING_GLASS_MAX_FREQ_MHZ;
-    }
    if (v < (field_frequency_min.value() + min_size))
        field_frequency_min.set_value(v - min_size, false);
    if (locked_range)
@@ -400,8 +392,7 @@ GlassView::GlassView(
                  &button_marker_plus,
                  &button_jump,
                  &button_rst,
-                  &button_rssi,
-                  &freq_stats, &button_play});
+                  &freq_stats});

    load_presets();  // Load available presets from TXT files (or default).
    preset_index = clip<uint8_t>(preset_index, 0, presets_db.size());
@@ -455,7 +446,6 @@ GlassView::GlassView(
                freq_stats.hidden(true);
                button_jump.hidden(true);
                button_rst.hidden(true);
-                button_rssi.hidden(true);
                display.scroll_set_area(109, screen_height - 1);  // Restart scroll on the correct coordinates.
                break;

@@ -466,7 +456,6 @@ GlassView::GlassView(
                freq_stats.hidden(false);
                button_jump.hidden(false);
                button_rst.hidden(false);
-                button_rssi.hidden(false);
                break;

            case 2:  // PEAK
@@ -477,7 +466,6 @@ GlassView::GlassView(
                freq_stats.hidden(false);
                button_jump.hidden(false);
                button_rst.hidden(false);
-                button_rssi.hidden(false);
                break;
        }

@@ -547,31 +535,6 @@ GlassView::GlassView(
        reset_live_view();
    };

-    button_rssi.on_select = [this](Button& button) {
-        show_rssi_guides = !show_rssi_guides;
-        if (show_rssi_guides) {
-            button.set_style(Theme::getInstance()->fg_green);
-        } else {
-            button.set_style(Theme::getInstance()->bg_darkest);
-        }
-        reset_live_view();
-    };
-
-    button_play.on_select = [this](ImageButton&) {
-        paused = !paused;
-        if (paused) {
-            button_play.set_foreground(Theme::getInstance()->fg_red->foreground);
-            button_play.set_background(Theme::getInstance()->fg_red->background);
-            baseband::spectrum_streaming_stop();
-            button_play.set_bitmap(&bitmap_play);
-        } else {
-            button_play.set_foreground(Theme::getInstance()->fg_green->foreground);
-            button_play.set_background(Theme::getInstance()->fg_green->background);
-            baseband::spectrum_streaming_start();
-            button_play.set_bitmap(&bitmap_stop);
-        }
-    };
-
    display.scroll_set_area(109, screen_height - 1);  // Restart scroll on the correct coordinates

    // trigger:
@@ -622,39 +585,34 @@ void GlassView::on_freqchg(int64_t freq) {
 }

 void GlassView::load_presets() {
+    File presets_file;
+    auto error = presets_file.open(looking_glass_dir / u"PRESETS.TXT");
    presets_db.clear();

    // Add the "Manual" entry.
    presets_db.push_back({0, 0, "Manual"});

-    scan_root_files(looking_glass_dir, u"*.TXT", [this](const std::filesystem::path& path) {
-        if (path.empty() || path.native()[0] == u'.')
-            return;
+    if (!error) {
+        auto reader = FileLineReader(presets_file);
+        for (const auto& line : reader) {
+            if (line.length() == 0 || line[0] == '#')
+                continue;

-        File presets_file;
-        auto error = presets_file.open(looking_glass_dir / path);
-        if (!error) {
-            auto reader = FileLineReader(presets_file);
-            for (const auto& line : reader) {
-                if (line.length() == 0 || line[0] == '#')
-                    continue;
+            auto cols = split_string(line, ',');
+            if (cols.size() != 3)
+                continue;

-                auto cols = split_string(line, ',');
-                if (cols.size() != 3)
-                    continue;
+            preset_entry entry{};
+            parse_int(cols[0], entry.min);
+            parse_int(cols[1], entry.max);
+            entry.label = trimr(cols[2]);

-                preset_entry entry{};
-                parse_int(cols[0], entry.min);
-                parse_int(cols[1], entry.max);
-                entry.label = trimr(cols[2]);
+            if (entry.min == 0 || entry.max == 0 || entry.min >= entry.max)
+                continue;  // Invalid line.

-                if (entry.max == 0 || entry.min >= entry.max)
-                    continue;  // Invalid line.
-
-                presets_db.emplace_back(std::move(entry));
-            }
+            presets_db.emplace_back(std::move(entry));
        }
-    });
+    }

    populate_presets();
 }
@@ -42,7 +42,6 @@ namespace ui {
 #define LOOKING_GLASS_SLICE_WIDTH_MAX 20000000
 #define LOOKING_GLASS_MAX_SAMPLERATE 20000000
 #define MHZ_DIV 1000000
-#define LOOKING_GLASS_MAX_FREQ_MHZ 7250  // HackRF upper tuning limit (band_high top), in MHz

 // blanked DC (16 centered bins ignored ) and top left and right (2 bins ignored on each side )
 #define LOOKING_GLASS_FASTSCAN 0
@@ -105,7 +104,6 @@ class GlassView : public View {
    };

    void on_freqchg(int64_t freq);
-    // Function to map the value from one range to another
    int32_t map(int32_t value, int32_t fromLow, int32_t fromHigh, int32_t toLow, int32_t toHigh);
    std::vector<preset_entry> presets_db{};
    void manage_beep_audio();
@@ -130,8 +128,6 @@ class GlassView : public View {
    void populate_presets();
    void launch_audio(rf::Frequency center_freq);

-    bool paused{false};
-
    rf::Frequency search_span{0};
    rf::Frequency f_center{0};
    rf::Frequency f_center_ini{0};
@@ -167,44 +163,40 @@ class GlassView : public View {
    uint8_t bin_length = screen_width;
    uint8_t offset = 0;
    uint8_t ignore_dc = 0;
-    bool show_rssi_guides = false;
-
-    // start of spectrum area
-    static constexpr int spectrum_y = (108 + 16);

    Labels labels{
        {{0, UI_POS_Y(0)}, "MIN:     MAX:     LNA   VGA  ", Theme::getInstance()->fg_light->foreground},
-        {{0, UI_POS_Y(1)}, "RANGE:       FILTER:     AMP:", Theme::getInstance()->fg_light->foreground},
-        {{0, UI_POS_Y(2)}, "P:", Theme::getInstance()->fg_light->foreground},
-        {{0, UI_POS_Y(3)}, "MARKER( / ):          MHz", Theme::getInstance()->fg_light->foreground},
-        {{0, UI_POS_Y(4)}, "RES:     VOL:", 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", Theme::getInstance()->fg_light->foreground},
+        {{0, 4 * 16}, "RES:     VOL:", Theme::getInstance()->fg_light->foreground}};

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

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

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

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

    TextField field_range{
-        {UI_POS_X(6), UI_POS_Y(1), UI_POS_WIDTH(6), UI_POS_HEIGHT(1)},
+        {6 * 8, 1 * 16, 6 * 8, 16},
        ""};

    OptionsField filter_config{
-        {UI_POS_X(20), UI_POS_Y(1)},
+        {20 * 8, 1 * 16},
        4,
        {
            {"OFF ", 0},
@@ -213,47 +205,41 @@ class GlassView : public View {
        }};

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

    OptionsField range_presets{
-        {UI_POS_X(2), UI_POS_Y(2)},
+        {2 * 8, 2 * 16},
        20,
        {}};

    ButtonWithEncoder button_beep_squelch{
-        {UI_POS_X_RIGHT(8), UI_POS_Y(2.25), UI_POS_WIDTH(8), UI_POS_HEIGHT(0.5)},
+        {screen_width - 8 * 8, 2 * 16 + 4, 8 * 8, 1 * 8},
        ""};

-    ImageButton button_play{
-        {UI_POS_X_RIGHT(2), UI_POS_Y(3.25) - 2, UI_POS_WIDTH(2), UI_POS_HEIGHT(0.5)},
-        &bitmap_stop,
-        Theme::getInstance()->fg_green->foreground,
-        Theme::getInstance()->fg_green->background};
-
    TextField field_marker{
-        {UI_POS_X(12), UI_POS_Y(3), UI_POS_WIDTH(9), UI_POS_HEIGHT(1)},
+        {12 * 8, 3 * 16, 9 * 8, 16},
        ""};

    Button button_marker_minus{
-        {UI_POS_X(7), UI_POS_Y(3.25), UI_POS_WIDTH(1), UI_POS_HEIGHT(0.5)},
+        {7 * 8, 3 * 16 + 4, 1 * 8, 1 * 8},
        "-"};

    Button button_marker_plus{
-        {UI_POS_X(9), UI_POS_Y(3.25), UI_POS_WIDTH(1), UI_POS_HEIGHT(0.5)},
+        {9 * 8, 3 * 16 + 4, 1 * 8, 1 * 8},
        "+"};

    NumberField field_trigger{
-        {UI_POS_X(4), UI_POS_Y(4)},
+        {4 * 8, 4 * 16},
        3,
        {2, 128},
        2,
        ' '};

    AudioVolumeField field_volume{
-        {UI_POS_X(13), UI_POS_Y(4)}};
+        {13 * 8, 4 * 16}};

    /*OptionsField steps_config{
-        {UI_POS_X(13), UI_POS_Y(4)},
+        {13 * 8, 4 * 16},
        3,
        {
            {"1", 1},
@@ -265,7 +251,7 @@ class GlassView : public View {
        }};*/

    OptionsField scan_type{
-        {UI_POS_X(17), UI_POS_Y(4)},
+        {17 * 8, 4 * 16},
        2,
        {
            {"F-", LOOKING_GLASS_FASTSCAN},
@@ -273,7 +259,7 @@ class GlassView : public View {
        }};

    OptionsField view_config{
-        {UI_POS_X(19), UI_POS_Y(4)},
+        {19 * 8, 4 * 16},
        7,
        {
            {"SPCTR-V", 0},
@@ -282,7 +268,7 @@ class GlassView : public View {
        }};

    OptionsField level_integration{
-        {UI_POS_X(27), UI_POS_Y(4)},
+        {27 * 8, 4 * 16},
        2,
        {
            {"x0", 0},
@@ -298,19 +284,15 @@ class GlassView : public View {
        }};

    Button button_jump{
-        {UI_POS_X_RIGHT(4), UI_POS_Y(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(1)},
+        {screen_width - 4 * 8, 5 * 16, 4 * 8, 16},
        "JMP"};

    Button button_rst{
-        {UI_POS_X_RIGHT(9), UI_POS_Y(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(1)},
+        {screen_width - 9 * 8, 5 * 16, 4 * 8, 16},
        "RST"};

-    Button button_rssi{
-        {UI_POS_X_RIGHT(15), UI_POS_Y(5), UI_POS_WIDTH(5), UI_POS_HEIGHT(1)},
-        "RSSI"};
-
    Text freq_stats{
-        {UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH(14), UI_POS_HEIGHT(1)},
+        {UI_POS_X(0), 5 * 16, screen_width - 10 * 8, 8},
        ""};

    MessageHandlerRegistration message_handler_spectrum_config{
@@ -6,7 +6,7 @@
 * Copyright (C) 2024 Mark Thompson
 * Copyright (C) 2024 u-foka
 * Copyright (C) 2024 HTotoo
- * copyleft 2024 zxkmm
+ * copyleft 2024 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -1160,10 +1160,7 @@ SetBatteryView::SetBatteryView(NavigationView& nav) {
    add_children({&labels,
                  &button_save,
                  &button_cancel,
-                  &field_battcap,
-                  &button_help_cap,
                  &checkbox_overridebatt,
-                  &checkbox_battery_replaceable,
                  &checkbox_battery_charge_hint});

    if (i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055)) add_children({&button_reset, &labels2});
@@ -1171,51 +1168,21 @@ SetBatteryView::SetBatteryView(NavigationView& nav) {
    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());
-        pmem::set_battery_replaceable(checkbox_battery_replaceable.value());
        battery::BatteryManagement::set_calc_override(checkbox_overridebatt.value());
-        i2cdev::I2cDev_MAX17055* dev = (i2cdev::I2cDev_MAX17055*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055);
-        if (dev) dev->resetChangedFlag();
-        if ((((uint32_t)field_battcap.value() != pmem::battery_cap_mah()) || (!pmem::battery_cap_valid())) || (dev && dev->getIsBattChanged())) {
-            pmem::set_battery_cap_mah(field_battcap.value());
-            if (dev && !dev->reInit()) {
-                nav.display_modal("Error", "Battery gauge re-init failed");
-                return;
-            }
-            if (dev) {
-                dev->resetChangedFlag();
-                dev->update();  // resend the new data
-            }
-        }
        send_system_refresh();
        nav.pop();
    };

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

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

    button_cancel.on_select = [&nav, this](Button&) {
        nav.pop();
@@ -5,7 +5,7 @@
 * Copyright (C) 2023 Kyle Reed
 * Copyright (C) 2024 Mark Thompson
 * Copyright (C) 2024 u-foka
- * copyleft 2024 zxkmm
+ * copyleft 2024 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -1045,55 +1045,35 @@ class SetBatteryView : public View {
   private:
    int32_t selected = 0;
    Labels labels{
-        {{UI_POS_X_CENTER(26), UI_POS_Y(0)}, "Override batt calculation", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X_CENTER(24), UI_POS_Y(1)}, "method to voltage based", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 1 * 16}, "Override batt calculation", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "method to voltage based", Theme::getInstance()->fg_light->foreground},
        /**/
-        {{UI_POS_X_CENTER(29), UI_POS_Y(4)}, "Display a hint to remind you", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X_CENTER(16), UI_POS_Y(5)}, "when you charge", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X_CENTER(17), UI_POS_Y(8)}, "Battery capacity", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(7), UI_POS_Y(9)}, "mAh", Theme::getInstance()->fg_light->foreground}};
+        {{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{{{UI_POS_X(1), UI_POS_Y_BOTTOM(7)}, "Reset IC's learned params.", Theme::getInstance()->fg_light->foreground}};
-
-    NumberField field_battcap{
-        {UI_POS_X(1), UI_POS_Y(9)},
-        5,
-        {BATT_18650_MIN_MAH, BATT_18650_MAX_MAH},
-        100,
-        ' ',
-    };
-
-    Button button_help_cap{
-        {UI_POS_X(12), UI_POS_Y(9), UI_POS_WIDTH(5), UI_POS_HEIGHT(1)},
-        "Help",
-    };
+    Labels labels2{{{1 * 8, 11 * 16}, "Reset IC's learned params.", Theme::getInstance()->fg_light->foreground}};

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

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

-    Checkbox checkbox_battery_replaceable{
-        {UI_POS_X(2), UI_POS_Y(11)},
-        23,
-        "Replaceable battery"};
-
    Button button_cancel{
-        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        {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(3), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        {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{
-        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(6), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y(13), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Reset",
    };
 };
@@ -186,26 +186,26 @@ void set_dirty() {
 }

 standalone_application_api_t api = {
-    .malloc = &alloc,
-    .calloc = &calloc,
-    .realloc = &realloc,
-    .free = &chHeapFree,
-    .create_thread = &create_thread,
-    .fill_rectangle = &fill_rectangle,
-    .swizzled_switches = &swizzled_switches,
-    .get_switches_state = &get_switches_state_ulong,
-    .fixed_5x8_glyph_data = ui::font::fixed_5x8.get_data(),
-    .fixed_8x16_glyph_data = ui::font::fixed_8x16.get_data(),
-    .fill_rectangle_unrolled8 = &fill_rectangle_unrolled8,
-    .draw_bitmap = &draw_bitmap,
-    .scroll_area_y = &scroll_area_y,
-    .scroll_set_area = &scroll_set_area,
-    .scroll_disable = &scroll_disable,
-    .scroll_set_position = &scroll_set_position,
-    .scroll = &scroll,
-    .i2c_read = &i2c_read,
-    .panic = &chDbgPanic,
-    .set_dirty = &set_dirty,
+    /* .malloc = */ &alloc,
+    /* .calloc = */ &calloc,
+    /* .realloc = */ &realloc,
+    /* .free = */ &chHeapFree,
+    /* .create_thread = */ &create_thread,
+    /* .fill_rectangle = */ &fill_rectangle,
+    /* .swizzled_switches = */ &swizzled_switches,
+    /* .get_switches_state = */ &get_switches_state_ulong,
+    /* .fixed_5x8_glyph_data = */ ui::font::fixed_5x8.get_data(),
+    /* .fixed_8x16_glyph_data = */ ui::font::fixed_8x16.get_data(),
+    /* .fill_rectangle_unrolled8 = */ &fill_rectangle_unrolled8,
+    /* .draw_bitmap = */ &draw_bitmap,
+    /* .scroll_area_y = */ &scroll_area_y,
+    /* .scroll_set_area = */ &scroll_set_area,
+    /* .scroll_disable = */ &scroll_disable,
+    /* .scroll_set_position = */ &scroll_set_position,
+    /* .scroll = */ &scroll,
+    /* .i2c_read = */ &i2c_read,
+    /* .panic = */ &chDbgPanic,
+    /* .set_dirty = */ &set_dirty,
    // Version 3
    .f_open = &ext_f_open,
    .f_close = &ext_f_close,
@@ -225,15 +225,8 @@ volume_range_t volume_range() {
    return audio_codec->headphone_gain_range();
 }

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

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

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

 volume_range_t volume_range();

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

 } /* namespace headphone */

@@ -343,11 +343,6 @@ void set_spectrum(
    send_message(&message);
 }

-void set_audio_ddc_frequency(int32_t frequency) {
-    const AudioDDCConfigMessage message{frequency};
-    send_message(&message);
-}
-
 void set_time_sink(
    const size_t sampling_rate,
    const size_t trigger) {
@@ -366,16 +361,6 @@ void set_noaaapt_config() {
    send_message(&message);
 }

-void set_vor_config(bool enabled) {
-    const VorRxConfigureMessage message{enabled};
-    send_message(&message);
-}
-
-void set_vor_tx_config(uint16_t radial_deg, bool ident_enabled, const std::string& ident, bool enabled) {
-    const VorTxConfigureMessage message{radial_deg, ident_enabled, ident.c_str(), enabled};
-    send_message(&message);
-}
-
 void set_flex_config() {
    const FlexConfigureMessage message{};
    send_message(&message);
@@ -408,11 +393,6 @@ void set_moreserx_config(uint8_t mode) {
    send_message(&message);
 }

-void set_tonedetect_config(uint8_t squelch, uint32_t ctcss_freq_x10) {
-    const ToneDetectConfigureMessage message{squelch, ctcss_freq_x10};
-    send_message(&message);
-}
-
 void set_morsetx_config(uint8_t mode, uint32_t tone, float fm_delta) {
    const MorseTXConfigureMessage message{mode, tone, fm_delta};
    send_message(&message);
@@ -447,10 +427,6 @@ void set_epirb_tx_config(EPIRBTXDataMessage& message) {
    send_message(&message);
 }

-void set_epirb_rx_config(EPIRBRXConfig& message) {
-    send_message(&message);
-}
-
 void set_p25tx_data(const uint8_t* dibits, uint16_t frame_length) {
    const size_t max_len = sizeof(shared_memory.bb_data.data);
    if (frame_length > max_len) frame_length = max_len;
@@ -460,20 +436,8 @@ void set_p25tx_data(const uint8_t* dibits, uint16_t frame_length) {
    send_message(&msg);
 }

-void set_hunter_config(uint32_t threshold, uint32_t hangtime_ms, bool start) {
-    HunterConfigMessage message{};
-    message.energy_threshold = threshold;
-    message.hangtime_ms = hangtime_ms;
-    message.start = start;
-    send_message(&message);
-}
-
 static bool baseband_image_running = false;

-bool is_image_running() {
-    return baseband_image_running;
-}
-
 void run_image(const spi_flash::image_tag_t image_tag) {
    if (baseband_image_running) {
        chDbgPanic("BBRunning");
@@ -100,7 +100,6 @@ void set_rds_data(const uint16_t message_length);
 void set_spectrum(
    const size_t sampling_rate,
    const size_t trigger);
-void set_audio_ddc_frequency(int32_t frequency);
 void set_time_sink(
    const size_t sampling_rate,
    const size_t trigger);
@@ -109,28 +108,22 @@ void set_siggen_config(const uint32_t bw, const uint32_t shape, const uint32_t d
 void set_spectrum_painter_config(const uint16_t width, const uint16_t height, bool update, int32_t bw);
 void set_subghzd_config(uint8_t modulation, uint32_t sampling_rate);
 void set_moreserx_config(uint8_t mode);
-void set_tonedetect_config(uint8_t squelch, uint32_t ctcss_freq_x10 = 0);
 void set_morsetx_config(uint8_t mode, uint32_t tone, float fm_delta);
 void set_morsetx_key(bool key_down);
 void set_wefax_config(uint8_t lpm, uint8_t ioc);
 void set_noaaapt_config();
-void set_vor_config(bool enabled = true);
-void set_vor_tx_config(uint16_t radial_deg, bool ident_enabled = true, const std::string& ident = "", bool enabled = true);
 void set_flex_config();
 void set_bitstream_config(uint32_t deviation, uint8_t mode);                                                   // mode 0 for am, 1 for 2fsk
 void set_rtty_config(uint16_t baud, uint16_t shift, uint8_t* payload = nullptr, uint16_t payload_length = 0);  // baud*100
 void set_rtty_config(RTTYDataMessage& message);
 void set_epirb_tx_config(EPIRBTXDataMessage& message);
-void set_epirb_rx_config(EPIRBRXConfig& message);
 void set_p25tx_data(const uint8_t* dibits, uint16_t frame_length);
-void set_hunter_config(uint32_t threshold, uint32_t hangtime_ms, bool start);

 void request_roger_beep();
 void request_rssi_beep();
 void request_beep_stop();
 void request_audio_beep(uint32_t freq, uint32_t sample_rate, uint32_t duration_ms);

-bool is_image_running();
 void run_image(const portapack::spi_flash::image_tag_t image_tag);
 void run_prepared_image(const uint32_t m4_code);
 void shutdown();
@@ -25,19 +25,12 @@
 #include "portapack_io.hpp"
 #include "portapack.hpp"

-#include "lpc43xx.inc"
-
 #include "hackrf_hal.hpp"
 using namespace hackrf::one;

 #include "lpc43xx_cpp.hpp"
 using namespace lpc43xx;

-#ifdef PRALINE
-#include "hackrf_gpio.hpp"
-#include "gpio.hpp"
-#endif
-
 #ifdef PRALINE
 extern "C" {
 #include "fpga_bridge.h"
@@ -332,12 +325,6 @@ static constexpr ClockControl::MultiSynthSource get_si5351a_reference_clock_gene
               ? ClockControl::MultiSynthSource::PLLA
               : ClockControl::MultiSynthSource::PLLB;
 }
-
-static constexpr ClockControl::MultiSynthSource get_si5351c_reference_clock_generator_pll(const ClockManager::ReferenceSource reference_source) {
-    return (reference_source == ClockManager::ReferenceSource::Xtal)
-               ? ClockControl::MultiSynthSource::PLLA
-               : ClockControl::MultiSynthSource::PLLB;
-}
 #else
 static constexpr ClockControl::MultiSynthSource get_si5351c_reference_clock_generator_pll(const ClockManager::ReferenceSource reference_source) {
    return (reference_source == ClockManager::ReferenceSource::Xtal)
@@ -419,11 +406,7 @@ std::string ClockManager::get_freq() {
           to_string_dec_uint((reference.frequency % 1000000) / 100, 4, '0') + " MHz";
 }

-void ClockManager::portapack_tcxo_enable() {
-#ifdef PRALINE
-    gpio_control::clkin_ctrl.setActive();
-    set_p1_control(P1_Function::P22_ClkIn);
-#endif
+static void portapack_tcxo_enable() {
    portapack::io.reference_oscillator(true);

    /* Delay >10ms at 96MHz clock speed for reference oscillator to start. */
@@ -432,10 +415,7 @@ void ClockManager::portapack_tcxo_enable() {
    while (delay--);
 }

-void ClockManager::portapack_tcxo_disable() {
-#ifdef PRALINE
-    gpio_control::clkin_ctrl.setInactive();
-#endif
+static void portapack_tcxo_disable() {
    portapack::io.reference_oscillator(false);
 }

@@ -443,50 +423,47 @@ void ClockManager::portapack_tcxo_disable() {
 using namespace hackrf::one;

 void ClockManager::init_clock_generator() {
+#ifdef PRALINE
+    // PRALINE: Configure clock input mux GPIO
+    // GPIO0_15 (clkin_ctrl) selects GP_CLKIN source:
+    //   0 = P1 connector (external)
+    //   1 = P22 (internal Si5351 CLK2)
+    constexpr GPIO gpio_clkin_ctrl = gpio[GPIO0_15];
+    gpio_clkin_ctrl.output();
+    gpio_clkin_ctrl.write(1);  // CLKIN_SIGNAL_P22 = 1 = internal Si5351 CLK2
+
+    // Also enable MCU clock gate (GPIO0_8)
+    gpio_r9_mcu_clk_en.output();
+    gpio_r9_mcu_clk_en.write(1);
+#else
+    // HackRF One r9: GPIO0_8 (mcu_clk_en) gates Si5351 CLK2/CLK7 to GP_CLKIN
+    if (hackrf_r9) {
+        gpio_r9_mcu_clk_en.output();
+        gpio_r9_mcu_clk_en.write(1);
+    }
+#endif
+
    clock_generator.reset();
    clock_generator.set_crystal_internal_load_capacitance(CrystalInternalLoadCapacitance::XTAL_CL_8pF);
    clock_generator.enable_fanout();

 #ifdef PRALINE
-    constexpr size_t clock_generator_output_pro_mcu_clkin = 2;
-    auto si5351_clock_control_common = si5351a_clock_control_common;
-
-    /*
-     * Match the HackRF One init flow:
-     * 1. PLLA stays on the local 25MHz crystal.
-     * 2. PLLB is configured from the Si5351 CLKIN pin.
-     * 3. CLK2 temporarily drives GP_CLKIN directly from CLKIN so we can
-     *    detect whether P22 is carrying a valid 10MHz reference.
-     * 4. Once the source is chosen, all runtime clocks are switched to the
-     *    selected PLL and the working multisynths are programmed.
+    /* PRALINE has Si5351A (NOT Si5351C like HackRF One OG).
+     * Must use Si5351A configuration: PLLA only, no CLKIN support.
+     *
+     * IMPORTANT: Follow HackRF reference sequence:
+     * 1. Set PLL input sources
+     * 2. Configure PLL and multisynths
+     * 3. Set clock control registers (AFTER multisynths!)
+     * 4. Reset PLLs
+     * 5. Enable outputs
     */
-    clock_generator.set_pll_input_sources(si5351c_pll_input_sources);
+    clock_generator.set_pll_input_sources(si5351a_pll_input_sources);

-    clock_generator.set_clock_control(
-        clock_generator_output_pro_mcu_clkin,
-        si5351_clock_control_common[clock_generator_output_pro_mcu_clkin]
-            .clk_src(ClockControl::ClockSource::CLKIN)
-            .clk_pdn(ClockControl::ClockPowerDown::Power_On));
-    clock_generator.enable_output(clock_generator_output_pro_mcu_clkin);
+    /* Skip MCU CLKIN setup and reference detection for PRALINE - not applicable */
+    reference = Reference{ReferenceSource::Xtal, 0};  // PLLA

-    chThdSleepMilliseconds(20);
-    reference = choose_reference();
-    clock_generator.disable_output(clock_generator_output_pro_mcu_clkin);
-
-    const auto ref_pll =
-        get_si5351c_reference_clock_generator_pll(reference.source);
-
-    const ClockControls si5351_clock_control = ClockControls{{
-        si5351_clock_control_common[0].ms_src(ref_pll),
-        si5351_clock_control_common[1].ms_src(ref_pll),
-        si5351_clock_control_common[2].ms_src(ref_pll),
-        si5351_clock_control_common[3].ms_src(ref_pll),
-        si5351_clock_control_common[4].ms_src(ref_pll),
-        si5351_clock_control_common[5].ms_src(ref_pll),
-        si5351_clock_control_common[6].ms_src(ref_pll),
-        si5351_clock_control_common[7].ms_src(ref_pll),
-    }};
-    clock_generator.set_clock_control_single_byte(si5351_clock_control);
+    /* Clock control will be set AFTER multisynth configuration - see below */
 #else
    clock_generator.set_pll_input_sources(hackrf_r9
                                              ? si5351a_pll_input_sources
@@ -531,50 +508,86 @@ void ClockManager::init_clock_generator() {
 #endif

 #ifdef PRALINE
-    clock_generator.write_pll_single_byte(0, si5351_pll_a_afe_800m);

+    /* * Praline HackRF Pro Clock Assignments (800 MHz VCO Configuration)
+     * VCO Frequency: 800,000,000 Hz (Master Reference)
+     * * CLK0: AFE_CLK (MAX5864 Codec & FPGA ADC Interface)
+     *  - Note: Defines hardware sample rate. Essential for WFM purity.
+     * * CLK1: SCT_CLK (iCE40 FPGA System/Timing Clock)
+     *  - Note: Timing for SGPIO data bus; scales to 2x SR in wideband modes.
+     * * CLK2: MCU_CLKIN (LPC43xx MCU External Clock Input)
+     *  - Note: Synchronizes MCU processing to the RF clock tree.
+     * * CLK3: SG_CLK (Switching Regulator/Internal Logic Sync) SMA Port 1
+     *  - Note: Used for internal FPGA logic/gateware synchronization.
+     * * CLK4: P_CLK (MAX2831 Peripheral/Expansion Clock)
+     *  - Note: Routed to expansion headers for external hardware sync.
+     * * CLK5: AUX_CLK (RFFC5371 Auxiliary reference for secondary logic)
+     *  - Note: Provides additional timing flexibility for the iCE40 FPGA.
+     * * CLK6: SG_CLK (Switching Regulator/Internal Logic Sync) SMA Port 2
+     *  - Note: Used for internal FPGA logic/gateware synchronization.
+     * * CLK7: Unused / Power-Down
+     *  - State: Disabled (si5351a_ms6_7_off_reg)
+     *  - Note: Kept OFF to reduce EMI/RFI near the RF front-end.
+     * * CLKOUT: Optional external clock output on the header.
+     */
+
+    /* Write PLL A (800 MHz based on 25 MHz xtal for RF) and
+     * PLL B (800 MHZ based on 25 MHz xtalfor Digital)
+     * Use single-byte writes to debug I2C issues
+     */
    {
-        const auto& pll_b = si5351c_pll_b_clkin_reg;
+        // Write PLLA (Registers 26-33)
+        /* Write PLL A configuration (Base 26) */
+        const auto& pll_a = si5351_pll_a_800_reg;
+        for (size_t i = 1; i < pll_a.size(); i++) {
+            clock_generator.write_register(pll_a[0] + i - 1, pll_a[i]);
+        }
+
+        // Write PLLB (Registers 34-41)
+        /* Write PLL B configuration (Base 34) */
+        const auto& pll_b = si5351_pll_b_800_reg;
        for (size_t i = 1; i < pll_b.size(); i++) {
            clock_generator.write_register(pll_b[0] + i - 1, pll_b[i]);
        }
    }
-    // CLK0: DAFE_CLK initial 4 MHz
-    clock_generator.write_ms_single_byte(
-        0,
-        si5351_ms_afe_4m);

-    // CLK1: DSCT_CLK initial 10 MHz
-    clock_generator.write_ms_single_byte(
-        1,
-        si5351_ms_10m);
+    /* Write multisynth configurations using single-byte writes */
+    // These cover all active channels on the Praline board
+    clock_generator.write_ms_single_byte(0, si5351_ms_afe_4m);   // CLK0: PLL A AFE Codec (4 MHz)
+    clock_generator.write_ms_single_byte(1, si5351_ms_10m);      // CLK1: PLL B SGPIO/FPGA Timing (10 MHz)
+    clock_generator.write_ms_single_byte(2, si5351_ms_afe_40m);  // CLK2: PLL A Audio and MCU Input (40 MHz)
+    clock_generator.write_ms_single_byte(3, si5351_ms_0_4m);     // CLK3: PLL B SMA Port 1 Logic Sync (4 MHz or 10 MHz)
+    clock_generator.write_ms_single_byte(4, si5351_ms_afe_40m);  // CLK4: PLL A MAX2831 Second IF (40 MHz)
+    clock_generator.write_ms_single_byte(5, si5351_ms_afe_40m);  // CLK5: PLL A RFFC5071First IF (40 MHz)
+    clock_generator.write_ms_single_byte(6, si5351_ms_0_4m);     // CLK6: PLL B SMA Port 2 Logic Sync (4 MHz or 10 MHz)
+    clock_generator.write_ms_single_byte(7, si5351_ms_0_4m);     // CLK7: PLL B Unused (4 MHz)

-    // CLK2: MCU_CLK 40 MHz
-    clock_generator.write_ms_single_byte(
-        2,
-        si5351_ms_afe_40m);
+    /* NOW set clock control registers (AFTER multisynths per HackRF reference) */
+    const auto ref_pll_a = ClockControl::MultiSynthSource::PLLA;
+    const auto ref_pll_b = ClockControl::MultiSynthSource::PLLB;
+    const ClockControls si5351_clock_control = ClockControls{{
+        si5351a_clock_control_common[0].ms_src(ref_pll_a),
+        si5351a_clock_control_common[1].ms_src(ref_pll_b),
+        si5351a_clock_control_common[2].ms_src(ref_pll_a),
+        si5351a_clock_control_common[3].ms_src(ref_pll_b),
+        si5351a_clock_control_common[4].ms_src(ref_pll_a),
+        si5351a_clock_control_common[5].ms_src(ref_pll_a),
+        si5351a_clock_control_common[6].ms_src(ref_pll_b),
+        si5351a_clock_control_common[7].ms_src(ref_pll_b),
+    }};
+    // clock_generator.set_clock_control(si5351_clock_control);
+    //  Use single-byte writes instead of multi-byte
+    clock_generator.set_clock_control_single_byte(si5351_clock_control);

-    // CLK3: P2 clock mux, disabled below
-    clock_generator.write_ms_single_byte(
-        3,
-        si5351_ms_10m);
-
-    // CLK4: DXCVR_CLK 40 MHz
-    clock_generator.write_ms_single_byte(
-        4,
-        si5351_ms_afe_40m);
-
-    // CLK5: DMIX_CLK 40 MHz
-    clock_generator.write_ms_single_byte(
-        5,
-        si5351_ms_afe_40m);
-
-    {
-        const auto& ms6_7 = si5351a_ms6_7_off_reg;
-        for (size_t i = 1; i < ms6_7.size(); i++) {
-            clock_generator.write_register(ms6_7[0] + i - 1, ms6_7[i]);
-        }
-    }
+    // Don't write CLKS 3, 6, and 7 multisynth
+    // Ensure CLK3 clock control has Power_Off
+    // Verify output is disabled
+    clock_generator.disable_output(3);
+    clock_generator.disable_clock(3);
+    clock_generator.disable_output(6);
+    clock_generator.disable_clock(6);
+    clock_generator.disable_output(7);
+    clock_generator.disable_clock(7);
 #else
    if (hackrf_r9) {
        const PLLReg pll_reg = (reference.source == ReferenceSource::Xtal)
@@ -602,14 +615,15 @@ void ClockManager::init_clock_generator() {

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

 #else
    // Wait for PLL(s) to lock - with timeout to prevent hang
@@ -680,7 +694,7 @@ ClockManager::Reference ClockManager::choose_reference() {
    }
 #else
    if (hackrf_r9) {
-        gpio_control::r9_clkin_en.setActive();
+        gpio_r9_clkin_en.write(1);
        volatile uint32_t delay = 240000 + 24000;
        while (delay--);
    }
@@ -695,7 +709,7 @@ ClockManager::Reference ClockManager::choose_reference() {
    }

    if (hackrf_r9) {
-        gpio_control::r9_clkin_en.setInactive();
+        gpio_r9_clkin_en.write(0);
    }
 #endif

@@ -709,13 +723,13 @@ void ClockManager::shutdown() {

 void ClockManager::enable_codec_clocks() {
 #ifdef PRALINE
-    /* PRALINE: only gate the clocks owned by the RF datapath here.
-     * CLK2 is MCU_CLKIN and must stay independent of runtime RX/TX clock
-     * management or the SGPIO/GPIO subsystem can glitch mid-stream. */
+    /* PRALINE: CLK0 (AFE_CLK) for codec/FPGA, CLK1 (SCT_CLK) for FPGA timing.
+     * Reference hackrf_core.c shows PRALINE needs both CLK0 and CLK1. */
    clock_generator.enable_clock(clock_generator_output_og_codec); /* CLK0 MAX5864*/
    clock_generator.enable_clock(clock_generator_output_og_cpld);  /* CLK1 iCE40 FPGA*/
+    clock_generator.enable_clock(clock_generator_output_og_sgpio); /* CLK2 LPC43xx*/
    clock_generator.enable_output_mask(
-        (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld));
+        (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld) | (1U << clock_generator_output_og_sgpio));
 #else
    if (hackrf_r9) {
        clock_generator.enable_clock(clock_generator_output_r9_sgpio);
@@ -743,11 +757,12 @@ void ClockManager::disable_codec_clocks() {
     * CLKx_DISABLE_STATE.
     */
 #ifdef PRALINE
-    /* PRALINE: leave CLK2/MCU_CLKIN alone; only disable datapath-owned clocks. */
+    /* PRALINE: CLK0 (AFE_CLK), CLK1 (SCT_CLK), and CLK2 MCU used for codec/FPGA */
    clock_generator.disable_output_mask(
-        (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld));
+        (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld) | (1U << clock_generator_output_og_sgpio));
    clock_generator.disable_clock(clock_generator_output_og_codec);
    clock_generator.disable_clock(clock_generator_output_og_cpld);
+    clock_generator.disable_clock(clock_generator_output_og_sgpio);
 #else
    if (hackrf_r9) {
        clock_generator.disable_output_mask(1U << clock_generator_output_r9_sgpio);
@@ -806,7 +821,7 @@ void ClockManager::set_sampling_frequency(const uint32_t frequency) {
    /*
     * PRALINE sample rate strategy:
     * 1. Maximize AFE rate to push Nyquist above MAX2831's 11.6 MHz LPF minimum
-     * 2. Use FPGA decimation/interpolation to achieve desired output rate
+     * 2. Use FPGA decimation to achieve desired output rate
     * 3. Ensure AFE rate is achievable by Si5351 (clean division from 800 MHz VCO)
     */

@@ -827,108 +842,50 @@ void ClockManager::set_sampling_frequency(const uint32_t frequency) {
        n++;
    }

-    /* The TX gateware only implements interpolation factors x1..x16
-     * (tx_intrp 0..4). The rate search above can select n == 5 (x32) for very
-     * low TX sample rates. If we kept afe_rate/CLK0/CLK1 at the x32 rate while
-     * the FPGA only interpolated by x16, the TX datapath would be clocked at
-     * twice the gateware's output rate, doubling the waveform speed. Cap the
-     * AFE rate and _resampling_n to the x16 limit in TX so the clocks and the
-     * interpolation setting stay aligned. */
-    if (radio::debug::get_cached_direction() == rf::Direction::Transmit) {
-        constexpr uint8_t MAX_TX_N = 4;  // x16, matches max tx_intrp
-        if (n > MAX_TX_N) {
-            n = MAX_TX_N;
-            afe_rate = frequency << n;
-        }
+    _resampling_n = n;
+
+    // === Stop FPGA processing and flush filters ===
+    fpga_debug_register_write(1, 0x00);  // Disable FPGA filters (resets CIC accumulators)
+
+    // Verify we're in RX mode before writing RX registers
+    if (fpga_get_mode() != FPGA_MODE_RX) {
+        // Either set mode or return error
+        fpga_set_mode(FPGA_MODE_RX);
    }

-    _resampling_n = n;
+    // Set FPGA RX decimation register
+    fpga_debug_register_write(FPGA_REG_DECIM, n);
+
+    /* RX Mode: Register 3 is FPGA_REG_RX_DIGITAL_GAIN.
+     * We shift up by (3 * n) to compensate for CIC bit-growth.
+     * Relationship: ds = (Stages * n) - Offset
+     * For a 3-stage filter, every increment of n grows the signal by 3 bits.
+     * We subtract a baseline offset to keep the signal within 8-bit bounds.
+     * Add a baseline shift to ensure the signal isn't too quiet
+     */
+    uint8_t ds = (3 * n);
+    ds += 2;
+    fpga_debug_register_write(FPGA_REG_RX_DIGITAL_GAIN, ds);

    radio::invalidate_spi_config();

+    // Configure Si5351 clocks
+    // CLK0: AFE_CLK (with r_div=1 for ÷2)
+    // CLK1: SCT_CLK (with r_div=0 for ÷1, runs at 2× AFE for FPGA timing)
    // Configure Si5351 clocks using the correct AFE VCO
-    // CLK0 always drives the AFE/MAX5864 clock.
    clock_generator.set_ms_frequency(0, afe_rate * 2, si5351_vco_afe_f, 1);
+    clock_generator.set_ms_frequency(1, afe_rate * 2, si5351_vco_afe_f, 0);

-    /* Do not reset PLLA here. On PRALINE, CLK2/MCU_CLKIN is sourced from PLLA,
-     * so a runtime PLLA reset can glitch the LPC43xx peripheral clock tree and
-     * break SGPIO-driven RX apps such as ADSB/APRS. Updating the multisynths is
-     * sufficient for sample-rate changes. */
+    // === Reset PLL A for phase alignment ===
+    clock_generator.write_register(si5351::Register::PLLReset, 0x20);

-    if (radio::debug::get_cached_direction() == rf::Direction::Transmit) {
-        /*
-         * TX path:
-         * Baseband generators such as AFSK still synthesize samples at their
-         * legacy logical sample rates (for APRS this is 1.536MHz). On PRALINE,
-         * the FPGA must interpolate those samples up to the active AFE rate.
-         *
-         * The TX datapath is clocked from CLK1/fpgaclk. Therefore CLK1 must
-         * equal the desired complex sample rate at the DAC side. Driving CLK1
-         * at 2x the intended TX sample rate causes the entire APRS waveform to
-         * run twice as fast, which matches the "energy present, undecodable"
-         * symptom seen on HackRF One receivers.
-         *
-         * Gateware mapping from standard.py:
-         *   tx_intrp = 0 -> x1
-         *   tx_intrp = 1 -> x2
-         *   tx_intrp = 2 -> x4
-         *   tx_intrp = 3 -> x8
-         *   tx_intrp = 4 -> x16
-         */
-        if (fpga_get_mode() != FPGA_MODE_TX) {
-            fpga_set_mode(FPGA_MODE_TX);
-        }
+    // Brief delay for PLL lock and clock stability ===
+    // ~1ms at 96MHz = ~96000 cycles, use 10ms for safety
+    volatile uint32_t delay = 240000;  // ~2.5ms
+    while (delay--);

-        // TX gateware consumes complex samples at the rate presented on CLK1.
-        clock_generator.set_ms_frequency(1, afe_rate, si5351_vco_afe_f, 0);
-
-        uint8_t tx_interp = 0;
-        uint32_t tx_rate = frequency;
-        while ((tx_rate < afe_rate) && (tx_interp < 4)) {
-            tx_rate <<= 1;
-            tx_interp++;
-        }
-        fpga_tx_set_interpolation(tx_interp);
-        fpga_tx_set_nco_enable(false);
-        fpga_tx_set_phase_step(0);
-    }
-    // for RX mode
-    else {
-        // RX path keeps CLK1 at 2x AFE for receive timing / SGPIO alignment.
-        clock_generator.set_ms_frequency(1, afe_rate * 2, si5351_vco_afe_f, 0);
-
-        // === Stop FPGA processing and flush filters ===
-        fpga_debug_register_write(1, 0x00);  // Disable FPGA filters (resets CIC accumulators)
-
-        if (fpga_get_mode() != FPGA_MODE_RX) {
-            fpga_set_mode(FPGA_MODE_RX);
-        }
-
-        // Set FPGA RX decimation register
-        fpga_debug_register_write(FPGA_REG_DECIM, n);
-
-        /* No RX digital-gain register is written here.
-         *
-         * Register 0x03 used to be programmed with (3 * n + 2) as a "CIC
-         * bit-growth" renormalisation. The gateware has no such register: the
-         * RX decimator is a chain of unity-gain half-band FIRs selected by
-         * rx_decim (fpga/top/standard.py), and 0x03 is rx_pstep, whose top two
-         * bits are the quarter-rate shift. Writing a gain here silently
-         * cancelled the shift that set_tuning_frequency() had programmed, which
-         * left the analogue passband offset with no matching rotation.
-         *
-         * The shift depends on the AFE rate we just chose, so re-apply it after
-         * the rate change. ReceiverModel::update_sampling_rate() calls
-         * update_tuning_frequency() straight after this, which does exactly
-         * that; the write below only keeps the register consistent in between.
-         */
-        fpga_debug_register_write(
-            FPGA_REG_RX_PSTEP,
-            (radio::debug::get_cached_quarter_shift() & 0b11) << FPGA_RX_QUARTER_SHIFT_SHIFT);
-
-        // Re-enable FPGA processing with clean state ===
-        fpga_debug_register_write(1, 0x01);
-    }
+    // Re-enable FPGA processing with clean state ===
+    fpga_debug_register_write(1, 0x01);

 #else
    /* Codec clock is at sampling frequency, CPLD and SGPIO clocks are at
@@ -1194,7 +1151,8 @@ void ClockManager::enable_clock_output(bool enable) {
    }
 #else
    if (hackrf_r9) {
-        gpio_control::r9_clkout_en.setState(enable);
+        gpio_r9_clkout_en.output();
+        gpio_r9_clkout_en.write(enable);

        // NOTE: RETURNING HERE IF HACKRF_R9 TO PREVENT CLK2 FROM BEING DISABLED OR FREQ MODIFIED SINCE CLK2 ON R9 IS
        // USED FOR BOTH CLKOUT AND FOR THE MCU_CLOCK (== GP_CLKIN) WHICH OTHER LP43XX CLOCKS CURRENTLY RELY ON.
@@ -1222,74 +1180,3 @@ void ClockManager::enable_clock_output(bool enable) {
    }
 #endif
 }
-
-#ifdef PRALINE
-
-void ClockManager::set_p1_control(P1_Function func) {
-    // Truth table based on P1_Control.csv (L=setInactive, H=setActive)
-    switch (func) {
-        case P1_Function::TriggerIn:
-            gpio_control::p1_ctrl2.setInactive();
-            gpio_control::p1_ctrl1.setInactive();
-            gpio_control::p1_ctrl0.setInactive();
-            break;
-        case P1_Function::AuxClk1:
-            gpio_control::p1_ctrl2.setInactive();
-            gpio_control::p1_ctrl1.setInactive();
-            gpio_control::p1_ctrl0.setActive();
-            break;
-        case P1_Function::ClkIn:
-            gpio_control::p1_ctrl2.setInactive();
-            gpio_control::p1_ctrl1.setActive();
-            gpio_control::p1_ctrl0.setInactive();
-            break;
-        case P1_Function::TriggerOut:
-            gpio_control::p1_ctrl2.setInactive();
-            gpio_control::p1_ctrl1.setActive();
-            gpio_control::p1_ctrl0.setActive();
-            break;
-        case P1_Function::P22_ClkIn:
-            gpio_control::p1_ctrl2.setActive();
-            gpio_control::p1_ctrl1.setInactive();
-            gpio_control::p1_ctrl0.setInactive();
-            break;
-        case P1_Function::P2_5:
-            gpio_control::p1_ctrl2.setActive();
-            gpio_control::p1_ctrl1.setInactive();
-            gpio_control::p1_ctrl0.setActive();
-            break;
-        case P1_Function::NotConnected:
-            gpio_control::p1_ctrl2.setActive();
-            gpio_control::p1_ctrl1.setActive();
-            gpio_control::p1_ctrl0.setInactive();
-            break;
-        case P1_Function::AuxClk2:
-            gpio_control::p1_ctrl2.setActive();
-            gpio_control::p1_ctrl1.setActive();
-            gpio_control::p1_ctrl0.setActive();
-            break;
-    }
-}
-
-void ClockManager::set_p2_control(P2_Function func) {
-    // Ensure all P2 control pins are configured as outputs
-
-    // Truth table based on P2_Control.csv (L=setInactive, H=setActive)
-    switch (func) {
-        case P2_Function::Clk3:
-            // CTRL0 is 'X' (don't care) according to CSV, we default it to Low (setInactive)
-            gpio_control::p2_ctrl1.setInactive();
-            gpio_control::p2_ctrl0.setInactive();
-            break;
-        case P2_Function::TriggerIn:
-            gpio_control::p2_ctrl1.setActive();
-            gpio_control::p2_ctrl0.setInactive();
-            break;
-        case P2_Function::TriggerOut:
-            gpio_control::p2_ctrl1.setActive();
-            gpio_control::p2_ctrl0.setActive();
-            break;
-    }
-}
-
-#endif
@@ -77,29 +77,6 @@ class ClockManager {
    void set_reference_ppb(const int32_t ppb);

 #ifdef PRALINE
-
-    enum class P1_Function {
-        TriggerIn,     // CTRL2: L, CTRL1: L, CTRL0: L
-        AuxClk1,       // CTRL2: L, CTRL1: L, CTRL0: H
-        ClkIn,         // CTRL2: L, CTRL1: H, CTRL0: L
-        TriggerOut,    // CTRL2: L, CTRL1: H, CTRL0: H
-        P22_ClkIn,     // CTRL2: H, CTRL1: L, CTRL0: L
-        P2_5,          // CTRL2: H, CTRL1: L, CTRL0: H
-        NotConnected,  // CTRL2: H, CTRL1: H, CTRL0: L (NC)
-        AuxClk2        // CTRL2: H, CTRL1: H, CTRL0: H
-    };
-
-    // Multiplexer 2 (P2) Functions - Based on P2_Control.csv
-    enum class P2_Function {
-        Clk3,       // CTRL1: L, CTRL0: X (Don't care)
-        TriggerIn,  // CTRL1: H, CTRL0: L
-        TriggerOut  // CTRL1: H, CTRL0: H
-    };
-
-    // Function declarations
-    void set_p1_control(P1_Function func);
-    void set_p2_control(P2_Function func);
-
    uint8_t get_resampling_n() const { return _resampling_n; }

    // Si5351 diagnostic methods
@@ -116,9 +93,6 @@ class ClockManager {

    void enable_clock_output(bool enable);

-    void portapack_tcxo_enable();
-    void portapack_tcxo_disable();
-
   private:
    I2C& i2c0;
    si5351::Si5351& clock_generator;
@@ -24,11 +24,6 @@
 #include "hackrf_gpio.hpp"
 #include "portapack_hal.hpp"

-#include "board.h"
-
-#include "gpio.hpp"
-using namespace gpio_control;
-
 void config_mode_blink_until_dfu();

 void config_mode_set() {
@@ -61,6 +56,7 @@ uint32_t blink_patterns[] = {

 void config_mode_run() {
    configure_pins_portapack();
+    portapack::gpio_dfu.input();
    portapack::persistent_memory::cache::init();

    if (hackrf_r9) {
@@ -79,14 +75,14 @@ void config_mode_run() {
        config_mode_blink_until_dfu();
    }

-    auto last_dfu_btn = dfu_button.read();
+    auto last_dfu_btn = portapack::gpio_dfu.read();

    int32_t counter = 0;
    int8_t blink_pattern_value = portapack::persistent_memory::config_cpld() +
                                 (portapack::persistent_memory::config_disable_external_tcxo() ? 5 : 0);

    while (true) {
-        auto dfu_btn = dfu_button.read();
+        auto dfu_btn = portapack::gpio_dfu.read();
        auto dfu_clicked = last_dfu_btn == true && dfu_btn == false;
        last_dfu_btn = dfu_btn;

@@ -107,16 +103,16 @@ void config_mode_run() {

        auto tx_value = ((tx_blink_pattern >> ((counter >> 0) & 31)) & 0x1) == 0x1;
        if (tx_value) {
-            led_tx.setActive();
+            hackrf::one::led_tx.on();
        } else {
-            led_tx.setInactive();
+            hackrf::one::led_tx.off();
        }

        auto rx_value = ((rx_blink_pattern >> ((counter >> 0) & 31)) & 0x1) == 0x1;
        if (rx_value) {
-            led_rx.setActive();
+            hackrf::one::led_rx.on();
        } else {
-            led_rx.setInactive();
+            hackrf::one::led_rx.off();
        }

        chThdSleepMilliseconds(100);
@@ -126,17 +122,17 @@ void config_mode_run() {

 void config_mode_blink_until_dfu() {
    while (true) {
-        led_tx.setActive();
-        led_rx.setActive();
-        led_usb.setActive();
+        hackrf::one::led_tx.on();
+        hackrf::one::led_rx.on();
+        hackrf::one::led_usb.on();
        chThdSleepMilliseconds(10);

-        led_tx.setInactive();
-        led_rx.setInactive();
-        led_usb.setInactive();
+        hackrf::one::led_tx.off();
+        hackrf::one::led_rx.off();
+        hackrf::one::led_usb.off();
        chThdSleepMilliseconds(115);

-        auto dfu_btn = dfu_button.read();
+        auto dfu_btn = portapack::gpio_dfu.read();
        if (dfu_btn)
            break;
    }
@@ -144,7 +140,7 @@ void config_mode_blink_until_dfu() {
    while (true) {
        chThdSleepMilliseconds(10);

-        auto dfu_btn = dfu_button.read();
+        auto dfu_btn = portapack::gpio_dfu.read();
        if (!dfu_btn)
            break;
    }
@@ -33,9 +33,6 @@
 #include "irq_controls.hpp"
 #include "file_path.hpp"

-#include "gpio.hpp"
-using namespace gpio_control;
-
 using namespace ui;

 #define DEBUG_LOG_FILE "debug_log.txt"
@@ -137,9 +134,9 @@ void draw_line(int32_t y_offset, const char* label, regarm_t value) {
 }

 void runtime_error(uint8_t source) {
-    const auto& led = (source == CORTEX_M0) ? led_rx : led_tx;
+    LED led = (source == CORTEX_M0) ? hackrf::one::led_rx : hackrf::one::led_tx;

-    led.setInactive();
+    led.off();

    // wait for DFU button release if pressed, so we don't immediately jump into stack dump
    while (swizzled_switches() & (1 << (int)Switch::Dfu));
@@ -37,20 +37,8 @@

 #include "ch.h"

-#include "gpio.hpp"
-using namespace gpio_control;
-
-#include "irq_rtc.hpp"
-
-#include "i2c_lld.h"
-
-#include "i2cdevmanager.hpp"
-#include "i2cdev_ppmod.hpp"
-
-#include "lpc43xx.inc"
-#include "nvic.h"
-#include "lpc43xx_m0.h"
-#include "rffc507x_spi.hpp"
+#include "lpc43xx_cpp.hpp"
+using namespace lpc43xx;

 #include <array>

@@ -146,186 +134,7 @@ void EventDispatcher::set_display_sleep(const bool sleep) {
        // Let frame sync handler turn on backlight after repaint.
    }
    EventDispatcher::display_sleep = sleep;
-}
-
-void EventDispatcher::charge_deep_sleep(const bool sleep) {
-    bool detect = false;
-    uint8_t valid_mask = 0;
-    uint8_t percent = 0;
-    uint16_t voltage = 0;
-    int32_t current = 0;
-
-    constexpr I2CConfig i2c_config_12mhz{
-        .high_count = 15,
-        .low_count = 15,
-    };
-
-    if (sleep) {
-        auto dev = (i2cdev::I2cDev_PPmod*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDECMDL_PPMOD);
-        if (dev) dev->send_poweroff_command();
-
-        rffc507x::spi::SPI().power_down();
-        portapack::shutdown(false, true);
-
-        // Unmount SD card and stop driver
-        f_mount(nullptr, reinterpret_cast<const TCHAR*>(_T("")), 0);
-        sdcDisconnect(&SDCD1);
-        sdcStop(&SDCD1);
-
-        // Signal application shutdown
-        ShutdownMessage shutdown_message;
-        shared_memory.application_queue.push(shutdown_message);
-        shared_memory.baseband_message = nullptr;
-
-        // Disable core interrupts and system tick
-        nvicDisableVector(DMA_IRQn);
-        nvicDisableVector(M4CORE_IRQn);
-        chSysDisable();
-        systick_stop();
-
-        SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
-
-        power_control::vaa_power_off();
-        power_control::core_power_off();
-
-#ifdef PRALINE
-        // Power management and GPIO configuration for Praline hardware
-        LPC_GPIO->DIR[0] &= ~0xFFFF4000;
-        LPC_GPIO->DIR[1] &= ~0xFFFF1000;
-        LPC_GPIO->DIR[2] &= ~((1 << 14) | (1 << 13) | (1 << 12) | (1 << 11) | (1 << 10) | (1 << 6) | (1 << 0));
-        LPC_GPIO->DIR[3] &= ~((1 << 7) | (1 << 5));
-        LPC_GPIO->DIR[5] &= ~(1 << 16);
-#else
-        // Power management and GPIO configuration for legacy hardware
-        LPC_GPIO->DIR[0] &= ~0xFFFF4000;
-        LPC_GPIO->DIR[1] &= ~0xFFFF1000;
-        LPC_GPIO->DIR[2] &= ~((1 << 14) | (1 << 13) | (1 << 12) | (1 << 11) | (1 << 10) | (1 << 6) | (1 << 0));
-        LPC_GPIO->DIR[3] &= ~((1 << 7) | (1 << 5));
-        LPC_GPIO->DIR[5] &= ~(1 << 16);
-#endif
-
-        // Power down peripherals (CGU cleanup)
-        LPC_RGU->RESET_CTRL[0] = (1 << 5);  // USB0 Reset
-        LPC_CGU->PLL0USB_CTRL.PD = 1;
-        LPC_CGU->BASE_USB0_CLK.PD = 1;
-        LPC_CREG->CREG0 |= (1 << 5);
-
-        LPC_CGU->BASE_USB1_CLK.PD = 1;
-        LPC_CGU->BASE_UART0_CLK.PD = 1;
-        LPC_CGU->BASE_UART1_CLK.PD = 1;
-        LPC_CGU->BASE_UART2_CLK.PD = 1;
-        LPC_CGU->BASE_UART3_CLK.PD = 1;
-        LPC_CGU->BASE_SPI_CLK.PD = 1;
-        LPC_CGU->BASE_PERIPH_CLK.PD = 1;
-        LPC_CGU->BASE_SDIO_CLK.PD = 1;
-        LPC_CGU->BASE_SSP0_CLK.PD = 1;
-        LPC_CGU->BASE_SSP1_CLK.PD = 1;
-        LPC_CGU->BASE_LCD_CLK.PD = 1;
-        LPC_CGU->BASE_OUT_CLK.PD = 1;
-
-        (*(volatile uint32_t*)(&LPC_CGU->PLL0AUDIO_CTRL)) |= (1 << 0);
-
-        LPC_ADC0->CR &= ~(1 << 21);
-        LPC_ADC1->CR &= ~(1 << 21);
-        led_rx.setInactive();
-        led_usb.setInactive();
-
-        rtc_wakeup_init();
-        NVIC_EnableIRQ(I2C0_OR_I2C1_IRQn);
-
-        while (1) {
-            // --- Battery Status Check (I2C) ---
-            detect = battery::BatteryManagement::isDetected();
-            if (detect) {
-                bool dummy;
-                battery::BatteryManagement::getBatteryInfo(valid_mask, percent, voltage, current, dummy);
-
-                bool is_full = (valid_mask == 31 && percent == 100 && current <= 10) ||
-                               (valid_mask == 1 && percent == 100);
-
-                if (is_full) {
-                    // Case 1: Battery full (All LEDs off)
-                    led_rx.setInactive();
-                    led_tx.setInactive();
-                } else if ((voltage < 4150 && current < 10) || valid_mask == 0) {
-                    // Case 2: Not full but low current draw (<10mA) -> Charging error
-                    led_tx.setActive();  // LED indicates error/idle
-                    led_rx.setInactive();
-                } else {
-                    // Case 3: Actively charging
-                    led_rx.setActive();  // LED indicates charging
-                    led_tx.setInactive();
-                }
-            } else {
-                // Case 4: Battery IC not detected -> Error or H2 or older, so don't show that as an error.
-                led_tx.setActive();
-                led_rx.setActive();
-            }
-
-            // Shut down I2C and power down the APB bus for sleep
-            portapack::i2c0.stop();
-            LPC_CGU->BASE_APB1_CLK.PD = 1;
-
-            // Save interrupt states before mass disable
-            uint32_t saved_iser0 = NVIC->ISER[0];
-
-            // Disable and clear all pending interrupts
-            NVIC->ICER[0] = 0xFFFFFFFF;
-
-            NVIC->ICPR[0] = 0xFFFFFFFF;
-
-            // Re-enable only necessary wakeup sources
-            NVIC_EnableIRQ(RTC_IRQn);
-            NVIC_EnableIRQ(EVENTROUTER_IRQn);
-
-            // Configure RTC wakeup interval
-            if (valid_mask != 0 || detect) {
-                rtc_wakeup(60);
-            } else {
-                rtc_wakeup(3);
-            }
-
-            LPC_RTC->ILR = 3;
-            LPC_EVENTROUTER->CLR_STAT = 0xFFFFFFFF;
-            NVIC_ClearPendingIRQ(RTC_IRQn);
-            NVIC_ClearPendingIRQ(EVENTROUTER_IRQn);
-
-            __disable_irq();
-
-            // Configure and enter Deep Sleep
-            SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;
-
-            __DSB();
-            __ISB();
-
-            // CPU enters sleep here
-            __WFI();
-
-            // --- WAKEUP SEQUENCE ---
-            __enable_irq();
-            SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk;
-
-            // Cleanup RTC and restore peripheral clocks
-            LPC_RTC->AMR = 0xFF;
-            LPC_RTC->ILR = 3;
-            LPC_CGU->BASE_APB1_CLK.PD = 0;
-            LPC_RGU->RESET_CTRL[1] = (1 << 16);
-
-            // Short delay for power stability (3V3 rail)
-            for (volatile int d = 0; d < 10000; d++);
-
-            // Restart I2C controller
-            LPC_CGU->BASE_APB1_CLK.PD = 0;
-            portapack::i2c0.start(i2c_config_12mhz);
-
-            // Restore original interrupt enable states
-            NVIC->ISER[0] = saved_iser0;
-
-        }  // End of while(1) deep sleep loop
-    } else {
-        portapack::display.wake(true);
-    }
-}
+};

 eventmask_t EventDispatcher::wait() {
    return chEvtWaitAny(ALL_EVENTS);
@@ -400,6 +209,8 @@ void EventDispatcher::handle_local_queue() {
 void EventDispatcher::handle_rtc_tick() {
    sd_card::poll_inserted();

+    portapack::temperature_logger.second_tick();
+
    const auto backlight_timer = portapack::persistent_memory::config_backlight_timer();
    if (backlight_timer.timeout_enabled()) {
        if (portapack::bl_tick_counter == backlight_timer.timeout_seconds())
@@ -63,8 +63,6 @@ class EventDispatcher {

    static void set_display_sleep(const bool sleep);

-    static void charge_deep_sleep(const bool sleep);
-
    static inline void check_fifo_isr() {
        if (!shared_memory.application_queue.is_empty()) {
            events_flag_isr(EVT_MASK_APPLICATION);
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2026 PortaPack Mayhem
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui_adsb_rx.hpp"
-#include "ui_navigation.hpp"
-#include "external_app.hpp"
-
-namespace ui::external_app::adsbrx {
-
-void initialize_app(ui::NavigationView& nav) {
-    nav.push<ADSBRxView>();
-}
-
-}  // namespace ui::external_app::adsbrx
-
-extern "C" {
-
-__attribute__((section(".external_app.app_adsbrx.application_information"), used)) application_information_t _application_information_adsbrx = {
-    /*.memory_location = */ (uint8_t*)0x00000000,
-    /*.externalAppEntry = */ ui::external_app::adsbrx::initialize_app,
-    /*.header_version = */ CURRENT_HEADER_VERSION,
-    /*.app_version = */ VERSION_MD5,
-
-    /*.app_name = */ "ADS-B",
-    /*.bitmap_data = */ {
-        0x80,
-        0x01,
-        0xC0,
-        0x03,
-        0xC0,
-        0x03,
-        0xC0,
-        0x03,
-        0xC0,
-        0x03,
-        0xE0,
-        0x07,
-        0xF8,
-        0x1F,
-        0xFE,
-        0x7F,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xC0,
-        0x03,
-        0xC0,
-        0x03,
-        0xC0,
-        0x03,
-        0xE0,
-        0x07,
-        0xF0,
-        0x0F,
-        0xF8,
-        0x1F,
-    },
-    /*.icon_color = */ ui::Color::green().v,
-    /*.menu_location = */ app_location_t::RX,
-    /*.desired_menu_position = */ -1,
-
-    /*.m4_app_tag = portapack::spi_flash::image_tag_adsbrx */ {'P', 'A', 'D', 'R'},
-    /*.m4_app_offset = */ 0x00000000,
-};
-
-}  // extern "C"
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2026 PortaPack Mayhem
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ais_app.hpp"
-#include "ui_navigation.hpp"
-#include "external_app.hpp"
-
-namespace ui::external_app::ais_rx {
-
-void initialize_app(ui::NavigationView& nav) {
-    nav.push<AISAppView>();
-}
-
-}  // namespace ui::external_app::ais_rx
-
-extern "C" {
-
-__attribute__((section(".external_app.app_ais_rx.application_information"), used)) application_information_t _application_information_ais_rx = {
-    /*.memory_location = */ (uint8_t*)0x00000000,
-    /*.externalAppEntry = */ ui::external_app::ais_rx::initialize_app,
-    /*.header_version = */ CURRENT_HEADER_VERSION,
-    /*.app_version = */ VERSION_MD5,
-
-    /*.app_name = */ "AIS Boats",
-    /*.bitmap_data = */ {
-        0x00,
-        0x01,
-        0x80,
-        0x01,
-        0xC0,
-        0x01,
-        0xC0,
-        0x0D,
-        0xE0,
-        0x3D,
-        0xF0,
-        0x3D,
-        0xF8,
-        0x7D,
-        0xFC,
-        0x7D,
-        0xFC,
-        0x7D,
-        0xFE,
-        0x7D,
-        0xFF,
-        0x7D,
-        0x00,
-        0x00,
-        0xF8,
-        0x7F,
-        0xF8,
-        0x3F,
-        0xF0,
-        0x0F,
-        0x00,
-        0x00,
-    },
-    /*.icon_color = */ ui::Color::green().v,
-    /*.menu_location = */ app_location_t::RX,
-    /*.desired_menu_position = */ -1,
-
-    /*.m4_app_tag = portapack::spi_flash::image_tag_ais */ {'P', 'A', 'I', 'S'},
-    /*.m4_app_offset = */ 0x00000000,
-};
-
-}  // extern "C"
@@ -131,39 +131,35 @@ void TVView::on_channel_spectrum(
    // I was hoping that by doing this, I can have a longer buffer like 39936, then the frame will looks better vertically
    // however this is useless until now.

-    // Left the original comment, but rewrote the function.
-
-    // Shift the last 128 pixels of the previous packet to the front
-    // This overlap handles an x_correction shift of up to 128 pixels seamlessly.
-    for (size_t i = 0; i < 128; i++) {
-        window_buffer[i] = window_buffer[i + 256];
-    }
-
-    // Load the new 256 pixels into the remainder of the buffer
    for (size_t i = 0; i < 256; i++) {
-        window_buffer[i + 128] = 255 - spectrum.db[i];
+        // video_buffer[i+count*256] = spectrum_rgb4_lut[spectrum.db[i]];
+        video_buffer_int[i + count * 256] = 255 - spectrum.db[i];
    }
+    count = count + 1;
+    if (count == 52 - 1) {
+        ui::Color line_buffer[128];
+        Coord line;
+        uint32_t bmp_px;

-    ui::Color line_buffer[128];
+        /*for (line = 0; line < 104; line++)
+                {
+                        for (bmp_px = 0; bmp_px < 128; bmp_px++)
+                        {
+                                //line_buffer[bmp_px] = video_buffer[bmp_px+line*128];
+                                line_buffer[bmp_px] = spectrum_rgb4_lut[video_buffer_int[bmp_px+line*128 + x_correction]];
+                        }

-    // Render the first line of this batch (matches original doubled-height behavior)
-    for (size_t bmp_px = 0; bmp_px < 128; bmp_px++) {
-        line_buffer[bmp_px] = spectrum_rgb4_lut[window_buffer[bmp_px + x_correction]];
-    }
-    display.render_line({0, (Coord)(count * 4 + 100)}, 128, line_buffer);
-    display.render_line({0, (Coord)(count * 4 + 101)}, 128, line_buffer);
+                        display.render_line({ 0, line + 100 }, 128, line_buffer);
+                }*/
+        for (line = 0; line < 208; line = line + 2) {
+            for (bmp_px = 0; bmp_px < 128; bmp_px++) {
+                // line_buffer[bmp_px] = video_buffer[bmp_px+line*128];
+                line_buffer[bmp_px] = spectrum_rgb4_lut[video_buffer_int[bmp_px + line / 2 * 128 + x_correction]];
+            }

-    // Render the second line of this batch
-    for (size_t bmp_px = 0; bmp_px < 128; bmp_px++) {
-        line_buffer[bmp_px] = spectrum_rgb4_lut[window_buffer[bmp_px + 128 + x_correction]];
-    }
-    display.render_line({0, (Coord)(count * 4 + 102)}, 128, line_buffer);
-    display.render_line({0, (Coord)(count * 4 + 103)}, 128, line_buffer);
-
-    count++;
-
-    // Reset at 52 (52 * 2 lines = 104 lines total)
-    if (count >= 52) {
+            display.render_line({0, line + 100}, 128, line_buffer);
+            display.render_line({0, line + 101}, 128, line_buffer);
+        }
        count = 0;
    }
 }
@@ -79,9 +79,8 @@ class TVView : public Widget {
    void paint(Painter& painter) override;
    void on_channel_spectrum(const ChannelSpectrum& spectrum);
    void on_adjust_xcorr(uint8_t xcorr);
-    // 256 samples from current callback + 128 overlap from the previous callback
-    uint8_t window_buffer[384]{0};
-
+    // ui::Color video_buffer[13312];
+    uint8_t video_buffer_int[13312 + 128]{0};  // 128 is for the over length caused by x_correction
    uint32_t count = 0;
    uint8_t x_correction = 0;

@@ -1,5 +1,5 @@
 /*
- * copyleft 2024 zxkmm
+ * copyleft 2024 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -1,5 +1,5 @@
 /*
- * copyleft 2024 zxkmm
+ * copyleft 2024 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2026 PortaPack Mayhem
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui_aprs_rx.hpp"
-#include "ui_navigation.hpp"
-#include "external_app.hpp"
-
-namespace ui::external_app::aprs_rx {
-
-void initialize_app(ui::NavigationView& nav) {
-    nav.push<APRSRXView>();
-}
-
-}  // namespace ui::external_app::aprs_rx
-
-extern "C" {
-
-__attribute__((section(".external_app.app_aprs_rx.application_information"), used)) application_information_t _application_information_aprs_rx = {
-    /*.memory_location = */ (uint8_t*)0x00000000,
-    /*.externalAppEntry = */ ui::external_app::aprs_rx::initialize_app,
-    /*.header_version = */ CURRENT_HEADER_VERSION,
-    /*.app_version = */ VERSION_MD5,
-
-    /*.app_name = */ "APRS",
-    /*.bitmap_data = */ {
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0xF0,
-        0x0F,
-        0x4C,
-        0x32,
-        0xFE,
-        0x7F,
-        0x25,
-        0xA4,
-        0x25,
-        0xA4,
-        0xFF,
-        0xFF,
-        0x25,
-        0xA4,
-        0x25,
-        0xA4,
-        0xFE,
-        0x7F,
-        0x4C,
-        0x32,
-        0xF0,
-        0x0F,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-    },
-    /*.icon_color = */ ui::Color::green().v,
-    /*.menu_location = */ app_location_t::RX,
-    /*.desired_menu_position = */ -1,
-
-    /*.m4_app_tag = portapack::spi_flash::image_tag_aprs_rx */ {'P', 'A', 'P', 'R'},
-    /*.m4_app_offset = */ 0x00000000,
-};
-
-}  // extern "C"
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2026 PortaPack Mayhem
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui_aprs_tx.hpp"
-#include "ui_navigation.hpp"
-#include "external_app.hpp"
-
-namespace ui::external_app::aprs_tx {
-
-void initialize_app(ui::NavigationView& nav) {
-    nav.push<APRSTXView>();
-}
-
-}  // namespace ui::external_app::aprs_tx
-
-extern "C" {
-
-__attribute__((section(".external_app.app_aprs_tx.application_information"), used)) application_information_t _application_information_aprs_tx = {
-    /*.memory_location = */ (uint8_t*)0x00000000,
-    /*.externalAppEntry = */ ui::external_app::aprs_tx::initialize_app,
-    /*.header_version = */ CURRENT_HEADER_VERSION,
-    /*.app_version = */ VERSION_MD5,
-
-    /*.app_name = */ "APRS TX",
-    /*.bitmap_data = */ {
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0xF0,
-        0x0F,
-        0x4C,
-        0x32,
-        0xFE,
-        0x7F,
-        0x25,
-        0xA4,
-        0x25,
-        0xA4,
-        0xFF,
-        0xFF,
-        0x25,
-        0xA4,
-        0x25,
-        0xA4,
-        0xFE,
-        0x7F,
-        0x4C,
-        0x32,
-        0xF0,
-        0x0F,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-    },
-    /*.icon_color = */ ui::Color::green().v,
-    /*.menu_location = */ app_location_t::TX,
-    /*.desired_menu_position = */ -1,
-
-    /*.m4_app_tag = portapack::spi_flash::image_tag_afsk */ {'P', 'A', 'F', 'T'},
-    /*.m4_app_offset = */ 0x00000000,
-};
-
-}  // extern "C"
@@ -6,9 +6,11 @@
 * ------------------------------------------------------------
 */

-#pragma GCC push_options
-#pragma GCC optimize("Os")
 #include "ui_battleship.hpp"
+#include "portapack_shared_memory.hpp"
+#include "utility.hpp"
+#include "modems.hpp"
+#include "bch_code.hpp"

 using namespace portapack;
 using namespace modems;
@@ -26,6 +28,7 @@ BattleshipView::BattleshipView(NavigationView& nav)
    baseband::run_image(portapack::spi_flash::image_tag_pocsag2);

    add_children({&text_title, &text_subtitle,
+                  //&rect_radio_settings, &rect_audio_settings, &rect_team_selection,
                  &label_radio, &button_frequency,
                  &label_rf_amp, &checkbox_rf_amp,
                  &label_lna, &field_lna,
@@ -148,6 +151,8 @@ BattleshipView::BattleshipView(NavigationView& nav)
    field_tx_gain.set_parent_rect({185, 118, 32, 16});
    checkbox_sound.set_parent_rect({17, 187, 80, 24});
    field_volume.set_parent_rect({165, 187, 32, 16});
+    // button_red_team.set_parent_rect({25, 242, 85, 45});
+    // button_blue_team.set_parent_rect({130, 242, 85, 45});

    // Make menu elements focusable
    button_frequency.set_focusable(true);
@@ -191,22 +196,34 @@ void BattleshipView::init_game() {
 }

 void BattleshipView::show_hide_menu(bool menu_vis) {
-    Widget* const menu_widgets[] = {
-        &text_title, &text_subtitle, &label_radio, &button_frequency,
-        &label_rf_amp, &checkbox_rf_amp, &label_lna, &field_lna,
-        &label_vga, &field_vga, &label_tx_gain, &field_tx_gain,
-        &label_audio, &checkbox_sound, &label_volume, &field_volume,
-        &label_team, &button_red_team, &button_blue_team};
-    for (auto* w : menu_widgets) {
-        w->hidden(!menu_vis);
-    }
-
-    Widget* const game_widgets[] = {
-        &rssi, &button_rotate, &button_place, &button_menu};
-    for (auto* w : game_widgets) {
-        w->hidden(menu_vis);
-    }
+    text_title.hidden(!menu_vis);
+    text_subtitle.hidden(!menu_vis);
+    // rect_radio_settings.hidden(!menu_vis);    rect_audio_settings.hidden(!menu_vis);    rect_team_selection.hidden(!menu_vis);
+    label_radio.hidden(!menu_vis);
+    button_frequency.hidden(!menu_vis);
+    label_rf_amp.hidden(!menu_vis);
+    checkbox_rf_amp.hidden(!menu_vis);
+    label_lna.hidden(!menu_vis);
+    field_lna.hidden(!menu_vis);
+    label_vga.hidden(!menu_vis);
+    field_vga.hidden(!menu_vis);
+    label_tx_gain.hidden(!menu_vis);
+    field_tx_gain.hidden(!menu_vis);
+    label_audio.hidden(!menu_vis);
+    checkbox_sound.hidden(!menu_vis);
+    label_volume.hidden(!menu_vis);
+    field_volume.hidden(!menu_vis);
+    label_team.hidden(!menu_vis);
+    button_red_team.hidden(!menu_vis);
+    button_blue_team.hidden(!menu_vis);
+    rssi.hidden(menu_vis);
+    button_rotate.hidden(menu_vis);
+    button_place.hidden(menu_vis);
+    button_menu.hidden(menu_vis);

+    // button_rotate.set_focusable(false); //no need, since can't focus on hidden
+    // button_place.set_focusable(false);
+    // button_menu.set_focusable(false);
    set_dirty();
 }

@@ -323,23 +340,40 @@ void BattleshipView::paint(Painter& painter) {
    if (game_state == GameState::MENU) {
        draw_menu_screen(painter);

-        auto draw_team_btn = [&painter](Button& btn, Color bg, Color border, const char* name) {
-            if (btn.hidden()) return;
-            Rect r = btn.screen_rect();
-            painter.fill_rectangle(r, bg);
-            painter.draw_rectangle(r, border);
+        // Custom paint team buttons
+        if (!button_red_team.hidden()) {
+            Rect r = button_red_team.screen_rect();
+            painter.fill_rectangle(r, Color::dark_red());
+            painter.draw_rectangle(r, Color::red());

-            if (btn.has_focus()) {
+            if (button_red_team.has_focus()) {
                painter.draw_rectangle({r.location().x() - 1, r.location().y() - 1, r.size().width() + 2, r.size().height() + 2}, Color::yellow());
            }

-            auto style = Style{.font = ui::font::fixed_8x16, .background = bg, .foreground = Color::white()};
-            painter.draw_string(r.center() - Point(24, 16), style, name);
-            painter.draw_string(r.center() - Point(24, 0), style, "TEAM");
-        };
+            auto style_white = Style{
+                .font = ui::font::fixed_8x16,
+                .background = Color::dark_red(),
+                .foreground = Color::white()};
+            painter.draw_string(r.center() - Point(24, 16), style_white, "RED");
+            painter.draw_string(r.center() - Point(24, 0), style_white, "TEAM");
+        }

-        draw_team_btn(button_red_team, Color::dark_red(), Color::red(), "RED");
-        draw_team_btn(button_blue_team, Color::dark_blue(), Color::blue(), "BLUE");
+        if (!button_blue_team.hidden()) {
+            Rect r = button_blue_team.screen_rect();
+            painter.fill_rectangle(r, Color::dark_blue());
+            painter.draw_rectangle(r, Color::blue());
+
+            if (button_blue_team.has_focus()) {
+                painter.draw_rectangle({r.location().x() - 1, r.location().y() - 1, r.size().width() + 2, r.size().height() + 2}, Color::yellow());
+            }
+
+            auto style_white = Style{
+                .font = ui::font::fixed_8x16,
+                .background = Color::dark_blue(),
+                .foreground = Color::white()};
+            painter.draw_string(r.center() - Point(24, 16), style_white, "BLUE");
+            painter.draw_string(r.center() - Point(24, 0), style_white, "TEAM");
+        }

        return;
    }
@@ -383,25 +417,27 @@ void BattleshipView::paint(Painter& painter) {
 void BattleshipView::draw_menu_screen(Painter& painter) {
    painter.draw_hline({12, 20 + 16}, screen_width - 24, Color::dark_cyan());

-    const struct {
-        Rect rect;
-        Point line1_pos;
-        Point line2_pos;
-    } boxes[] = {
-        {{13, 59, screen_width - 26, 116}, {12, 58}, {12, 157}},
-        {{13, 165, screen_width - 24, 57}, {12, 164}, {12, 223}},
-        {{13, 232, screen_width - 26, 67}, {12, 232}, {12, 300}}};
+    painter.fill_rectangle({13, 59, screen_width - 26, 116}, Color::dark_grey());
+    painter.draw_hline({12, 58}, screen_width - 24, Color::cyan());
+    painter.draw_hline({12, 157}, screen_width - 24, Color::cyan());

-    for (const auto& box : boxes) {
-        painter.fill_rectangle(box.rect, Color::dark_grey());
-        painter.draw_hline(box.line1_pos, screen_width - 24, Color::cyan());
-        painter.draw_hline(box.line2_pos, screen_width - 24, Color::cyan());
-    }
+    painter.fill_rectangle({13, 165, screen_width - 24, 57}, Color::dark_grey());
+    painter.draw_hline({12, 164}, screen_width - 24, Color::cyan());
+    painter.draw_hline({12, 223}, screen_width - 24, Color::cyan());
+
+    painter.fill_rectangle({13, 232, screen_width - 26, 67}, Color::dark_grey());
+    painter.draw_hline({12, 232}, screen_width - 24, Color::cyan());
+    painter.draw_hline({12, 300}, screen_width - 24, Color::cyan());

    // Radio status indicator
    Point indicator_pos{UI_POS_MAXWIDTH - 20, 59};
-    painter.fill_rectangle({indicator_pos, {6, 6}}, is_transmitting ? Color::red() : Color::green());
-    painter.draw_rectangle({indicator_pos.x() - 1, indicator_pos.y() - 1, 8, 8}, Color::light_grey());
+    if (is_transmitting) {
+        painter.fill_rectangle({indicator_pos, {6, 6}}, Color::red());
+        painter.draw_rectangle({indicator_pos.x() - 1, indicator_pos.y() - 1, 8, 8}, Color::light_grey());
+    } else {
+        painter.fill_rectangle({indicator_pos, {6, 6}}, Color::green());
+        painter.draw_rectangle({indicator_pos.x() - 1, indicator_pos.y() - 1, 8, 8}, Color::light_grey());
+    }
 }

 void BattleshipView::draw_grid(Painter& painter, uint16_t grid_x, uint16_t grid_y, const std::array<std::array<CellState, GRID_SIZE>, GRID_SIZE>& grid, bool show_ships, bool is_offense_grid) {
@@ -428,14 +464,11 @@ void BattleshipView::draw_cell(Painter& painter, uint16_t cell_x, uint16_t cell_

    if (game_state == GameState::PLACING_SHIPS && !is_offense_grid && current_ship_index < 5) {
        uint8_t ship_size = my_ships[current_ship_index].size();
-        uint8_t dx = placing_horizontal ? 1 : 0;
-        uint8_t dy = placing_horizontal ? 0 : 1;
-        uint16_t grid_x = (cell_x - 1) / CELL_SIZE;
-        uint16_t grid_y = (cell_y - GRID_OFFSET_Y - 6) / CELL_SIZE;
-
        for (uint8_t i = 0; i < ship_size; i++) {
-            uint16_t preview_x = cursor_x + (i * dx);
-            uint16_t preview_y = cursor_y + (i * dy);
+            uint16_t preview_x = placing_horizontal ? cursor_x + i : cursor_x;
+            uint16_t preview_y = placing_horizontal ? cursor_y : cursor_y + i;
+            uint16_t grid_x = (cell_x - 1) / CELL_SIZE;
+            uint16_t grid_y = (cell_y - GRID_OFFSET_Y - 6) / CELL_SIZE;
            if (grid_x == preview_x && grid_y == preview_y && preview_x < GRID_SIZE && preview_y < GRID_SIZE) {
                return;
            }
@@ -507,12 +540,9 @@ void BattleshipView::draw_ship_preview(Painter& painter) {
    uint8_t size = ship.size();
    bool can_place = can_place_ship(cursor_x, cursor_y, size, placing_horizontal);

-    uint8_t dx = placing_horizontal ? 1 : 0;
-    uint8_t dy = placing_horizontal ? 0 : 1;
-
    for (uint8_t i = 0; i < size; i++) {
-        uint8_t x = cursor_x + (i * dx);
-        uint8_t y = cursor_y + (i * dy);
+        uint8_t x = placing_horizontal ? cursor_x + i : cursor_x;
+        uint8_t y = placing_horizontal ? cursor_y : cursor_y + i;

        if (x < GRID_SIZE && y < GRID_SIZE) {
            uint16_t cell_x = GRID_OFFSET_X + x * CELL_SIZE + 1;
@@ -531,21 +561,18 @@ bool BattleshipView::can_place_ship(uint8_t x, uint8_t y, uint8_t size, bool hor
        return false;
    }

-    uint8_t dx = horizontal ? 1 : 0;
-    uint8_t dy = horizontal ? 0 : 1;
-
    for (uint8_t i = 0; i < size; i++) {
-        uint8_t check_x = x + (i * dx);
-        uint8_t check_y = y + (i * dy);
+        uint8_t check_x = horizontal ? x + i : x;
+        uint8_t check_y = horizontal ? y : y + i;

        if (my_grid[check_y][check_x] != CellState::EMPTY) {
            return false;
        }

-        for (int ddy = -1; ddy <= 1; ddy++) {
-            for (int ddx = -1; ddx <= 1; ddx++) {
-                int adj_x = check_x + ddx;
-                int adj_y = check_y + ddy;
+        for (int dy = -1; dy <= 1; dy++) {
+            for (int dx = -1; dx <= 1; dx++) {
+                int adj_x = check_x + dx;
+                int adj_y = check_y + dy;

                if (adj_x >= 0 && adj_x < GRID_SIZE &&
                    adj_y >= 0 && adj_y < GRID_SIZE) {
@@ -577,11 +604,10 @@ void BattleshipView::place_ship() {
    ship.horizontal = placing_horizontal;
    ship.placed = true;

-    uint8_t dx = placing_horizontal ? 1 : 0;
-    uint8_t dy = placing_horizontal ? 0 : 1;
-
    for (uint8_t i = 0; i < size; i++) {
-        my_grid[cursor_y + (i * dy)][cursor_x + (i * dx)] = CellState::SHIP;
+        uint8_t x = placing_horizontal ? cursor_x + i : cursor_x;
+        uint8_t y = placing_horizontal ? cursor_y : cursor_y + i;
+        my_grid[y][x] = CellState::SHIP;
    }

    current_ship_index++;
@@ -618,14 +644,9 @@ void BattleshipView::place_ship() {
 void BattleshipView::send_message(const GameMessage& msg) {
    static const char* msg_strings[] = {"READY", "SHOT:", "HIT:", "MISS:", "SUNK:", "WIN"};

-    std::string message;
-    message.reserve(16);
-    message.append(msg_strings[static_cast<int>(msg.type)]);
-
+    std::string message = msg_strings[static_cast<int>(msg.type)];
    if (msg.type != MessageType::READY && msg.type != MessageType::WIN) {
-        message.append(to_string_dec_uint(msg.x));
-        message.append(",");
-        message.append(to_string_dec_uint(msg.y));
+        message += to_string_dec_uint(msg.x) + "," + to_string_dec_uint(msg.y);
    }

    configure_radio_tx();
@@ -815,12 +836,11 @@ void BattleshipView::process_shot(uint8_t x, uint8_t y) {
            if (!ship.placed) continue;

            bool hit_this_ship = false;
-
-            uint8_t dx = ship.horizontal ? 1 : 0;
-            uint8_t dy = ship.horizontal ? 0 : 1;
-
            for (uint8_t i = 0; i < ship.size(); i++) {
-                if ((ship.x + i * dx) == x && (ship.y + i * dy) == y) {
+                uint8_t check_x = ship.horizontal ? ship.x + i : ship.x;
+                uint8_t check_y = ship.horizontal ? ship.y : ship.y + i;
+
+                if (check_x == x && check_y == y) {
                    hit_this_ship = true;
                    ship.hits++;
                    break;
@@ -832,7 +852,9 @@ void BattleshipView::process_shot(uint8_t x, uint8_t y) {
                ships_remaining--;

                for (uint8_t i = 0; i < ship.size(); i++) {
-                    my_grid[ship.y + (i * dy)][ship.x + (i * dx)] = CellState::SUNK;
+                    uint8_t sunk_x = ship.horizontal ? ship.x + i : ship.x;
+                    uint8_t sunk_y = ship.horizontal ? ship.y : ship.y + i;
+                    my_grid[sunk_y][sunk_x] = CellState::SUNK;
                }
                break;
            }
@@ -865,12 +887,7 @@ void BattleshipView::process_shot(uint8_t x, uint8_t y) {
 }

 void BattleshipView::update_score() {
-    current_score.clear();
-    current_score.reserve(16);
-    current_score.append("W:");
-    current_score.append(to_string_dec_uint(wins));
-    current_score.append(" L:");
-    current_score.append(to_string_dec_uint(losses));
+    current_score = "W:" + to_string_dec_uint(wins) + " L:" + to_string_dec_uint(losses);
 }

 bool BattleshipView::on_touch(const TouchEvent event) {
@@ -963,4 +980,3 @@ bool BattleshipView::on_key(const KeyEvent key) {
 }

 }  // namespace ui::external_app::battleship
-#pragma GCC pop_options
@@ -9,11 +9,6 @@
 #ifndef __UI_BATTLESHIP_H__
 #define __UI_BATTLESHIP_H__

-#include "portapack_shared_memory.hpp"
-#include "utility.hpp"
-#include "modems.hpp"
-#include "bch_code.hpp"
-
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
@@ -294,11 +294,11 @@ void BLESpamView::createWindowsPacket() {
    std::copy(res.begin(), res.end(), advertisementData);
 }

-// Builds a "Complete Local Name" HID advertisement for the given name.
-// Shared by NameSpam (built-in list) and Custom (SD card list) modes.
-void BLESpamView::buildNamePacket(const char* name) {
+void BLESpamView::createNameSpamPacket() {
+    const char* names[] = {"PortaHack", "PwnBt", "iSpam", "GenericFoodVagon", "SignalSnoop", "ByteBandit", "RadioRogue", "RadioRebel", "ByteBlast"};
+
+    const char* name = names[rand() % 9];  //"PortaHack";
    uint8_t name_len = strlen(name);
-    if (name_len > 19) name_len = 19;  // clamp so the hex string fits advertisementData[63]

    uint8_t size = 12 + name_len;
    uint8_t i = 0;
@@ -327,65 +327,6 @@ void BLESpamView::buildNamePacket(const char* name) {
    std::copy(res.begin(), res.end(), advertisementData);
 }

-void BLESpamView::createNameSpamPacket() {
-    const char* names[] = {"PortaHack", "PwnBt", "iSpam", "GenericFoodVagon", "SignalSnoop", "ByteBandit", "RadioRogue", "RadioRebel", "ByteBlast"};
-    buildNamePacket(names[rand() % 9]);
-}
-
-// Opens /BLESPAM/NAME.txt once and keeps it open for the session.
-void BLESpamView::open_custom_file() {
-    custom_loaded_ = true;  // attempt only once
-    auto open_error = custom_file_.open(u"/BLESPAM/NAME.txt");
-    custom_file_valid_ = !open_error;  // false -> caller falls back to NameSpam
-}
-
-// Reads the next line into custom_name_ (clamped to 19 chars), advancing the
-// file position. At end of file it seeks back to the start to cycle. Returns
-// false if the file holds no usable name. Only one line is ever held in RAM.
-bool BLESpamView::read_next_custom_name() {
-    if (!custom_file_valid_) return false;
-
-    custom_name_.clear();
-    bool wrapped = false;
-    char c;
-
-    while (true) {
-        auto read_result = custom_file_.read(&c, 1);
-        if (read_result.is_error()) return false;
-
-        if (read_result.value() == 0) {
-            // end of file
-            if (!custom_name_.empty()) break;
-            // use the final line
-            if (wrapped) return false;
-            // no usable name in file
-            if (custom_file_.seek(0).is_error()) return false;
-            // loop back to the first line
-            wrapped = true;
-            continue;
-        }
-
-        if (c == '\n' || c == '\r') {
-            if (!custom_name_.empty()) break;  // got a complete line
-            continue;                          // skip blank lines / CRLF pairs
-        }
-
-        if (custom_name_.size() < 19)  // clamp; keep scanning rest of long line
-            custom_name_.push_back(c);
-    }
-    return true;
-}
-
-void BLESpamView::createCustomPacket() {
-    if (!custom_loaded_) open_custom_file();
-
-    if (!read_next_custom_name()) {  // no file / unreadable / empty -> fall back
-        createNameSpamPacket();
-        return;
-    }
-    buildNamePacket(custom_name_.c_str());
-}
-
 char BLESpamView::randomNameChar() {
    int randVal = rand() % 62;  // 26 uppercase + 26 lowercase + 10 digits
    if (randVal < 26) {
@@ -681,9 +622,6 @@ void BLESpamView::createPacket(ATK_TYPE attackType) {
        case ATK_NAMERANDOM:
            createNameRandomPacket();
            break;
-        case ATK_CUSTOM:
-            createCustomPacket();
-            break;
        case ATK_ALL_SAFE:
            createAnyPacket(true);
            break;
@@ -39,7 +39,6 @@
 #include "radio_state.hpp"
 #include "log_file.hpp"
 #include "utility.hpp"
-#include "file.hpp"

 using namespace ui;

@@ -53,7 +52,6 @@ enum ATK_TYPE {
    ATK_SAMSUNG,
    ATK_NAMESPAM,
    ATK_NAMERANDOM,
-    ATK_CUSTOM,
    ATK_ALL_SAFE,
    ATK_ALL
 };
@@ -133,9 +131,8 @@ class BLESpamView : public View {
         {"Samsung", 4},
         {"NameSpam", 5},
         {"NameRandom", 6},
-         {"NameCustom", 7},
-         {"All-Safe", 8},
-         {"All", 9}}};
+         {"All-Safe", 7},
+         {"All", 8}}};

    bool is_running{false};

@@ -147,11 +144,6 @@ class BLESpamView : public View {
    bool randomMac{true};
    bool randomDev{true};

-    File custom_file_{};             // kept open while in Custom mode
-    std::string custom_name_{};      // holds only the current name (clamped)
-    bool custom_loaded_{false};      // true once an open attempt has been made
-    bool custom_file_valid_{false};  // true if /BLESPAM/NAME.txt opened successfully
-
    uint8_t channel_number = 37;
    char mac[13] = "010203040407";
    char advertisementData[63] = {"03032CFE06162CFED5A59E020AB4\0"};
@@ -164,11 +156,7 @@ class BLESpamView : public View {
    void createIosPacket(bool crash);
    void createSamsungPacket();
    void createWindowsPacket();
-    void buildNamePacket(const char* name);  // shared name advertisement builder (NameSpam / Custom)
    void createNameSpamPacket();
-    void createCustomPacket();
-    void open_custom_file();       // open /BLESPAM/NAME.txt once (one name per line)
-    bool read_next_custom_name();  // read next line into custom_name_, looping at EOF
    void createNameRandomPacket();
    void createAnyPacket(bool safe);
    void createPacket(ATK_TYPE attackType);
@@ -26,7 +26,6 @@
 #include "ui_freqman.hpp"
 #include "baseband_api.hpp"
 #include "file.hpp"
-#include "file_path.hpp"
 #include "oversample.hpp"
 #include "ui_font_fixed_8x16.hpp"

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

 namespace ui::external_app::detector_rx {

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

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

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

-std::string DetectorRxView::format_freq_mhz(int64_t freq_hz) {
-    int64_t mhz = freq_hz / 1000000;
-    int64_t khz_frac = (freq_hz % 1000000) / 1000;
-    return "< " + to_string_dec_uint(mhz) + "." + to_string_dec_uint(khz_frac, 3, '0') + " MHz >";
-}
-
-void DetectorRxView::load_freqman() {
-    freqman_load_options options{};
-    options.load_freqs = true;
-    options.load_ranges = true;
-    options.load_hamradios = false;
-    options.load_repeaters = false;
-
-    if (!load_freqman_file(freq_file_stem, frequency_list, options) || frequency_list.empty()) {
-        button_file.set_text("No file!");
-        button_index.set_text("");
-        text_entry_desc.set("");
-        button_freq.set_text("");
-        frequency_list.clear();
-        return;
-    }
-
-    current_index = 0;
-    init_current_entry();
-    button_file.set_text(freq_file_stem);
-}
-
-void DetectorRxView::init_current_entry() {
-    if (frequency_list.empty()) return;
-
-    auto& entry = *frequency_list[current_index];
-    if (entry.type == freqman_type::Range) {
-        minfreq = entry.frequency_a;
-        maxfreq = entry.frequency_b;
-        current_freq = minfreq;
-        current_step = is_valid(entry.step) ? freqman_entry_get_step_value(entry.step) : DETECTOR_BW;
-    } else {
-        current_freq = entry.frequency_a;
-        minfreq = current_freq;
-        maxfreq = current_freq;
-        current_step = DETECTOR_BW;
-    }
-
-    update_entry_display();
-    update_freq_display();
-    receiver_model.set_target_frequency(current_freq);
-}
-
-void DetectorRxView::update_entry_display() {
-    if (frequency_list.empty()) return;
-
-    auto& entry = *frequency_list[current_index];
-    button_index.set_text(
-        to_string_dec_uint(current_index + 1) + "/" +
-        to_string_dec_uint(frequency_list.size()));
-    text_entry_desc.set(entry.description);
-}
-
-void DetectorRxView::update_freq_display() {
-    if (auto_scan && (minfreq != maxfreq)) {
-        if (last_update_was_auto_range_type != 1) {
-            button_freq.set_text("RANGE SCAN...");
-            last_update_was_auto_range_type = 1;
-        }
-    } else {
-        button_freq.set_text(format_freq_mhz(current_freq));
-        last_update_was_auto_range_type = 0;
-    }
-}
-
 void DetectorRxView::on_timer() {
-    if (frequency_list.empty() || !auto_scan) return;
+    freq_index++;
+    if (freq_mode == 0 && freq_index >= tetra_uplink_monitoring_frequencies_hz.size()) freq_index = 0;  // TETRA UP
+    if (freq_mode == 1 && freq_index >= lora_monitoring_frequencies_hz.size()) freq_index = 0;          // Lora
+    if (freq_mode == 2 && freq_index >= remotes_monitoring_frequencies_hz.size()) freq_index = 0;       // Remotes

-    auto& entry = *frequency_list[current_index];
-    if (entry.type == freqman_type::Range) {
-        current_freq += current_step;
-        if (current_freq > maxfreq) {
-            if (auto_advance) {
-                current_index = (current_index + 1) % frequency_list.size();
-                init_current_entry();
-                return;
-            }
-            current_freq = minfreq;
-        }
-        receiver_model.set_target_frequency(current_freq);
-        update_freq_display();
-    } else if (auto_advance) {
-        // Single frequency: advance to next entry
-        current_index = (current_index + 1) % frequency_list.size();
-        init_current_entry();
-    }
+    if (freq_mode == 2)
+        freq_ = remotes_monitoring_frequencies_hz[freq_index];
+    else if (freq_mode == 1)
+        freq_ = lora_monitoring_frequencies_hz[freq_index];
+    else
+        freq_ = tetra_uplink_monitoring_frequencies_hz[freq_index];
+    receiver_model.set_target_frequency(freq_);
 }

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

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

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

    rssi_graph.set_nb_columns(256);

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

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

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

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

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

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

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

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

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

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

    receiver_model.enable();

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

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

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

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

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

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

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

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

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

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

 }  // namespace ui::external_app::detector_rx
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "beacon.hpp"
-#include <cstdio>
-#include "string_format.hpp"
-
-// Some but not all methods of beacon class have been externalized in .cpp file
-// This has been done to try and optimize application size by preventing the compiler to inline methods
-namespace ui::external_app::epirb_rx {
-
-size_t Beacon::formatSummary(char* buffer, bool with_time) {
-    size_t result = 0;
-    if (with_time) {
-        result += formatTime(buffer);
-        buffer[result++] = '-';
-    }
-    result += sprintf((buffer + result), "%4s-%5s-", shortId().c_str(), getType());
-    if (location.isUnknown()) {
-        result += sprintf((buffer + result), "      ");
-    } else {
-        result += location.toString((buffer + result), Location::LocationFormat::MAIDENHEAD_LOCATOR);
-    }
-    result += sprintf((buffer + result), "[%s%s%s]", isFrameValid() ? (bch1Corrected || bch2Corrected) ? STR_COLOR_YELLOW : STR_COLOR_GREEN : STR_COLOR_RED, getSatus().c_str(), STR_COLOR_WHITE);
-    return result;
-}
-
-bool Beacon::isFrameValid() {
-    return isBch1Valid() && ((!hasBch2) || isBch2Valid()) && (!isEmpty);
-}
-
-std::string Beacon::shortId() {
-    std::string result = std::string(hexId);
-    return (result.size() >= 4) ? result.substr(0, 4) : result;
-}
-
-size_t Beacon::formatTime(char* buffer) {
-    return sprintf(buffer, "%02d:%02d:%02d", date.hour(), date.minute(), date.second());
-}
-
-}  // namespace ui::external_app::epirb_rx
@@ -1,856 +0,0 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __BEACON_RX_H__
-#define __BEACON_RX_H__
-
-#include "country.hpp"
-#include "location.hpp"
-#include "rtc_time.hpp"
-#include "resources.hpp"
-
-namespace ui::external_app::epirb_rx {
-
-// Size for beacon frame buffer
-#define BEACON_DATA_SIZE 18  // Max 144 bits => 18 bytes
-
-// Constants for BCH control code calculation
-#define BCH_21_POLYNOMIAL 0b1001101101100111100011UL
-#define BCH_21_POLY_LENGTH 22
-#define BCH_12_POLYNOMIAL 0b1010100111001UL
-#define BCH_12_POLY_LENGTH 13
-
-// See content of sdcard/EPIRB/RES/BEACON.RES
-#define ADDITIONAL_DATA_RESOURCE_START 25
-#define LONG_ADDITIONAL_DATA_RESOURCE_START 33
-#define EMERGENCY_RESOURCE_START 39
-#define EMERGENCY_OTHER_RESOURCE_START 49
-#define AUX_DEVICE_RESOURCE_START 53
-
-/**
- * This is the main class for beaon handling
- */
-class Beacon {
-   public:
-    // Real beacon or test beacon ?
-    enum class FrameMode { NORMAL,
-                           SELF_TEST,
-                           UNKNOWN };
-    // Type of main location device
-    enum class MainLocatingDevice { UNDEFINED,
-                                    INTERNAL_NAV,
-                                    EXTERNAL_NAV };
-    // Type of aux location device
-    enum class AuxLocatingDevice { UNDEFINED,
-                                   NONE,
-                                   NONE_OR_OTHER,
-                                   OTHER,
-                                   MHZ121_5,
-                                   SART };
-
-    // Protcol type
-    enum class ProtocolType {
-        UNKNOWN,
-        USER,
-        STANDARD_LOCATION,
-        NATIONAL_LOCATION,
-        RLS_LOCATION,
-        ELT_DT_LOCATION,
-        SPARE
-    };
-
-    // Protocol
-    enum class Protocol {
-        USER_EPIRB_MARITIME,
-        USER_EPIRB_RADIO,
-        USER_ELT,
-        USER_SERIAL,
-        USER_TEST,
-        USER_ORB,
-        USER_NAT,
-        USER_2G,
-        STD_EPIRB,
-        STD_ELT_24,
-        STD_ELT_SERIAL,
-        STD_ELT_AIRCRAFT,
-        STD_EPIRB_SERIAL,
-        STD_PLB_SERIAL,
-        STD_SHIP,
-        STD_TEST,
-        NAT_ELT,
-        NAT_EPIRB,
-        NAT_PLB,
-        NAT_TEST,
-        RLS,
-        ELT_DT,
-        SPARE,
-        UNKNOWN
-    };
-
-#define UNKNOWN_LABEL "Unk."
-
-    // Returns true for User protocol beacons
-    bool protocolIsUser() { return (protocolType == ProtocolType::USER); };
-    // Returns true for National Location protocol beacons
-    bool protocolIsNational() { return (protocolType == ProtocolType::NATIONAL_LOCATION); };
-    // Returns true for Standard Location protocol beacons
-    bool protocolIsStandard() { return (protocolType == ProtocolType::STANDARD_LOCATION); };
-    // Returns true for RLS location protocol beacons
-    bool protocolIsRls() { return (protocolType == ProtocolType::RLS_LOCATION); };
-    // Returns true for RLS or ELT Location protocol beacons
-    bool protocolIsRlsOrElt() { return (protocolType == ProtocolType::RLS_LOCATION || protocolType == ProtocolType::ELT_DT_LOCATION); };
-    // Returns true for unknown protocol beacons
-    bool protocolIsUnknown() { return (protocolType == ProtocolType::UNKNOWN); };
-
-    // Returns the protocol name
-    const char* getProtocolName() {
-        switch (protocolType) {
-            case ProtocolType::STANDARD_LOCATION:
-                return "Standard";
-            case ProtocolType::NATIONAL_LOCATION:
-                return "National";
-            case ProtocolType::RLS_LOCATION:
-                return "RLS";
-            case ProtocolType::ELT_DT_LOCATION:
-                return "ELT(DT)";
-            case ProtocolType::USER:
-                return longFrame ? "User Location" : "User";
-            case ProtocolType::SPARE:
-                return "Spare";
-            default:
-                return UNKNOWN_LABEL;
-        }
-    }
-
-    // Get protocol type for this beacon
-    ProtocolType getProtocolType() {
-        switch (protocol) {
-            case Protocol::USER_EPIRB_MARITIME:
-            case Protocol::USER_EPIRB_RADIO:
-            case Protocol::USER_ELT:
-            case Protocol::USER_SERIAL:
-            case Protocol::USER_TEST:
-            case Protocol::USER_ORB:
-            case Protocol::USER_NAT:
-            case Protocol::USER_2G:
-                return ProtocolType::USER;
-            case Protocol::STD_EPIRB:
-            case Protocol::STD_ELT_24:
-            case Protocol::STD_ELT_SERIAL:
-            case Protocol::STD_ELT_AIRCRAFT:
-            case Protocol::STD_PLB_SERIAL:
-            case Protocol::STD_SHIP:
-            case Protocol::STD_TEST:
-                return ProtocolType::STANDARD_LOCATION;
-            case Protocol::NAT_ELT:
-            case Protocol::NAT_EPIRB:
-            case Protocol::NAT_PLB:
-            case Protocol::NAT_TEST:
-                return ProtocolType::NATIONAL_LOCATION;
-            case Protocol::RLS:
-                return ProtocolType::RLS_LOCATION;
-            case Protocol::ELT_DT:
-                return ProtocolType::ELT_DT_LOCATION;
-            case Protocol::SPARE:
-                return ProtocolType::SPARE;
-            case Protocol::UNKNOWN:
-            default:
-                return ProtocolType::UNKNOWN;
-        }
-    }
-
-    // True for long frames, fals for short grames
-    bool longFrame{true};
-    // True if protocol flag is set for this frame
-    bool protocolFlag{false};
-    // Frame mode (Test or Real)
-    FrameMode frameMode{FrameMode::UNKNOWN};
-    // Main location device
-    MainLocatingDevice mainLocatingDevice{MainLocatingDevice::UNDEFINED};
-    // Axiliary location device
-    AuxLocatingDevice auxLocatingDevice{AuxLocatingDevice::UNDEFINED};
-    // Protocol code for this beacon
-    long protocolCode{0};
-    // Protocol of this beacon
-    Protocol protocol{Protocol::UNKNOWN};
-    // Protocol type of this beacon
-    ProtocolType protocolType{ProtocolType::UNKNOWN};
-    // Country of this beacon
-    Country country{};
-    // Frame data
-    uint8_t frame[BEACON_DATA_SIZE];
-    // Location of this beacon
-    Location location{};
-    // HexId of this beacon
-    uint64_t identifier{0};
-    // Date of reception of this beacon
-    rtc::RTC date{};
-    // Trus if this beacon has additional data
-    bool hasAdditionalData{false};
-    // The additional data tring
-    char additionalData[48]{0};
-    // True if this beacon has a serial number
-    bool hasSerialNumber{false};
-    // The serial number string
-    char serialNumber[32]{0};
-    // Beacon's Hex ID string
-    char hexId[32]{0};
-    // BCH1 code value
-    uint32_t bch1{};
-    // BCH1 calculated value
-    uint32_t computedBch1{};
-    // True if data has been corrected to match BCH1 code
-    bool bch1Corrected{false};
-    // True if this beacon has a BCH2 correction code
-    bool hasBch2{false};
-    // BCH2 code value
-    uint32_t bch2{};
-    // BCH2 calculated value
-    uint32_t computedBch2{};
-    // True if data has been corrected to match BCH2 code
-    bool bch2Corrected{false};
-    // True if this beacon is empty (not initialized)
-    bool isEmpty{true};
-    // True if thsi beacon contains emergency data
-    bool hasEmergency{false};
-    // True if emenrgency data is automatic for this beacon
-    bool isAutoamticEmergency{false};
-    // True if this beacon is a Maritime beacon
-    bool isMaritime{false};
-    // Emergency type string
-    char emergencyType[32]{0};
-
-    /**
-     * Returns the requested bits in this beacon's frame
-     */
-    uint64_t getBits(int startBit, int endBit) {
-        uint64_t result = 0;
-        startBit--;
-        int numBits = endBit - startBit;
-        const uint8_t* pData = &(frame[startBit / 8]);
-        uint8_t b = *pData;
-        int bitOffset = 7 - (startBit % 8);
-        for (int i = 0; i < numBits; ++i) {
-            result <<= 1;
-            result |= ((b >> bitOffset) & 0x01);
-            if (--bitOffset < 0) {
-                b = *(++pData);
-                bitOffset = 7;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Compute a BCH control code for the given bits and poly
-     */
-    uint64_t computeBCH(int startBit, int endBit, unsigned long poly, int polyLength) {
-        int dataLength = endBit - startBit + 1;
-        int totalLength = dataLength + polyLength - 1;
-        uint64_t result = getBits(startBit, startBit + polyLength - 1);
-        for (int i = polyLength; i <= totalLength; i++) {
-            bool firstBit = result >> (polyLength - 1);
-            if (firstBit) result = result ^ poly;
-            if (i < totalLength) {
-                result = result << 1;
-                if (i < dataLength) result |= getBits(startBit + i, startBit + i);
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Compute BCH1 code
-     */
-    uint64_t computeBCH1() { return computeBCH(25, 85, BCH_21_POLYNOMIAL, BCH_21_POLY_LENGTH); }
-    /**
-     * Compute BCH2 code
-     */
-    uint64_t computeBCH2() { return computeBCH(107, 132, BCH_12_POLYNOMIAL, BCH_12_POLY_LENGTH); }
-
-    /**
-     * Convert this frame's data to an hex string
-     */
-    static size_t toHexString(char* buffer, uint8_t* frame, bool withSpace, int start, int end) {
-        size_t result = 0;
-        for (uint8_t i = start; i < end; i++) {
-            if (withSpace && i > start) buffer[result++] = ' ';
-            result += sprintf((buffer + result), "%02X", frame[i]);
-        }
-        buffer[result] = 0;
-        return result;
-    }
-
-    Beacon() {}
-    Beacon(const Beacon& other) = delete;
-    Beacon& operator=(const Beacon& other) = delete;
-
-    /**
-     * Set the data for this Beacon and parse it
-     */
-    void setFrame(const uint8_t* frameBuffer) {
-        frameMode = FrameMode::UNKNOWN;
-        mainLocatingDevice = MainLocatingDevice::UNDEFINED;
-        auxLocatingDevice = AuxLocatingDevice::UNDEFINED;
-        protocolCode = 0;
-        protocol = Protocol::UNKNOWN;
-        protocolType = ProtocolType::UNKNOWN;
-        country.code = 0;
-        country.alphaCode[0] = 0;
-        country.shortName[0] = 0;
-        location.clear();
-        identifier = 0;
-        hasAdditionalData = false;
-        additionalData[0] = 0;
-        hasSerialNumber = false;
-        serialNumber[0] = 0;
-        hexId[0] = 0;
-        bch1 = 0;
-        computedBch1 = 0;
-        hasBch2 = false;
-        bch1Corrected = false;
-        bch2 = 0;
-        computedBch2 = 0;
-        bch2Corrected = false;
-        isEmpty = true;
-        hasEmergency = false;
-        isAutoamticEmergency = false;
-        isMaritime = false;
-        emergencyType[0] = 0;
-        std::memcpy(frame, (const void*)frameBuffer, BEACON_DATA_SIZE);
-        parseFrame();
-    }
-
-    /**
-     * Flip the specified bit in this beacon's data
-     */
-    void flipBit(int bit) {
-        int byteIdx = (bit - 1) / 8;
-        int bitIdx = 7 - ((bit - 1) % 8);
-        frame[byteIdx] ^= (1 << bitIdx);
-    }
-
-    /**
-     * Single bit error correction to match BCH1 or BCH2 code
-     */
-    void simpleCorrection(bool isBCH1) {
-        for (int i = (isBCH1 ? 25 : 107); i <= (isBCH1 ? 85 : 132); i++) {
-            flipBit(i);
-            if ((isBCH1 ? (computeBCH1() == bch1) : (computeBCH2() == bch2))) {
-                if (isBCH1) {
-                    computedBch1 = bch1;
-                    bch1Corrected = true;
-                } else {
-                    computedBch2 = bch2;
-                    bch2Corrected = true;
-                }
-                break;
-            }
-            flipBit(i);  // Restore bit value
-        }
-    }
-
-    /**
-     * Return the string representation of this beacon's type
-     */
-    const char* getType() {
-        if ((protocol == Protocol::USER_EPIRB_MARITIME) || (protocol == Protocol::USER_EPIRB_RADIO) || (protocol == Protocol::STD_EPIRB) || (protocol == Protocol::STD_EPIRB_SERIAL) || (protocol == Protocol::NAT_EPIRB)) return "EPIRB";
-        if ((protocol == Protocol::USER_ELT) || (protocol == Protocol::STD_ELT_24) || (protocol == Protocol::STD_ELT_SERIAL) || (protocol == Protocol::STD_ELT_AIRCRAFT) || (protocol == Protocol::NAT_ELT) || (protocol == Protocol::ELT_DT)) return "ELT";
-        if ((protocol == Protocol::STD_PLB_SERIAL) || (protocol == Protocol::NAT_PLB)) return "PLB";
-        if ((protocol == Protocol::USER_TEST) || (protocol == Protocol::STD_TEST) || (protocol == Protocol::NAT_TEST)) return "TEST";
-        if (protocol == Protocol::USER_SERIAL) return "SRIAL";
-        if (protocol == Protocol::USER_ORB) return "ORB";
-        if (protocol == Protocol::USER_NAT) return "NAT";
-        if (protocol == Protocol::USER_2G) return "2G";
-        if (protocol == Protocol::STD_SHIP) return "SHIP";
-        if (protocol == Protocol::RLS) return "RLS";
-        if (protocol == Protocol::SPARE) return "SPARE";
-        return UNKNOWN_LABEL;
-    }
-
-    /**
-     * Returns true if this beacon has a main location device
-     */
-    bool hasMainLocatingDevice() { return (mainLocatingDevice != MainLocatingDevice::UNDEFINED); }
-
-    /**
-     * Returns this beacon's main location device string representation
-     */
-    const char* getMainLocatingDeviceName() {
-        if (mainLocatingDevice == MainLocatingDevice::EXTERNAL_NAV) return "Exernal";
-        if (mainLocatingDevice == MainLocatingDevice::INTERNAL_NAV) return "Internal";
-        return UNKNOWN_LABEL;
-    }
-
-    /**
-     * Returns true if this beacon has a main location device
-     */
-    bool hasAuxLocatingDevice() { return (auxLocatingDevice != AuxLocatingDevice::UNDEFINED); }
-
-    /**
-     * Returns true if this beacon has a main location device
-     */
-    const char* getAuxLocatingDeviceName() {
-        return ResourceManager::get_beacon_resource(AUX_DEVICE_RESOURCE_START + ((int)auxLocatingDevice));
-    }
-
-    /**
-     * Set the serial number for this beacon
-     */
-    void setSerialNumber(uint32_t serial) {
-        sprintf(serialNumber, "%ld (0x%08lX)", serial, serial);
-    }
-
-    /**
-     * Returns true if BCH1 code is valid
-     */
-    bool isBch1Valid() { return (bch1 == computedBch1); }
-
-    /**
-     * Returns true if BCH2 code is valid
-     */
-
-    bool isBch2Valid() { return (bch2 == computedBch2); }
-
-    /**
-     * Returns true if frame is valid
-     */
-    bool isFrameValid();
-
-    /**
-     * Returns true if frame is orbito
-     */
-    bool isOrbito() { return (protocol == Protocol::USER_ORB); }
-
-    /**
-     * Write the hex preresentation of this frame in the provided buffer
-     */
-    size_t hexString(char* buffer, bool withHeader) {
-        return toHexString(buffer, frame, false, (withHeader ? 0 : 3), (longFrame ? 18 : 14));
-    }
-
-    /**
-     * Returns the short ID for this beacon
-     */
-    std::string shortId();
-
-    /**
-     * Returns the string representation of the status of this frame
-     */
-    std::string getSatus() {
-        if (isFrameValid())
-            return "OK";
-        else
-            return "KO";
-    }
-
-    /**
-     * Format this beacon's time
-     */
-    size_t formatTime(char* buffer);
-
-    /**
-     * Format this beacon's summary
-     */
-    size_t formatSummary(char* buffer, bool with_time);
-
-   private:
-    /* Baudot code matrix */
-    static constexpr char BAUDOT_CODE[64] = {' ', '5', ' ', '9', ' ', ' ', ' ', ' ', ' ', ' ', '4', ' ', '8', '0', ' ', ' ',
-                                             '3', ' ', ' ', ' ', ' ', '6', ' ', '/', '-', '2', ' ', ' ', '7', '1', ' ', ' ',
-                                             ' ', 'T', ' ', 'O', ' ', 'H', 'N', 'M', ' ', 'L', 'R', 'G', 'I', 'P', 'C', 'V',
-                                             'E', 'Z', 'D', 'B', 'S', 'Y', 'F', 'X', 'A', 'W', 'J', ' ', 'U', 'Q', 'K', '\0'};
-
-    /**
-     * Parse this beacon's protocol
-     */
-    void parseProtocol() {
-        protocolFlag = getBits(26, 26);
-        if (protocolFlag)
-            protocolCode = getBits(37, 39);
-        else
-            protocolCode = getBits(37, 40);
-
-        if (!longFrame || protocolFlag == 1) {
-            switch (protocolCode) {
-                case 0b000:
-                    protocol = Protocol::USER_ORB;
-                    break;
-                case 0b001:
-                    protocol = Protocol::USER_ELT;
-                    break;
-                case 0b010:
-                    protocol = Protocol::USER_EPIRB_MARITIME;
-                    isMaritime = true;
-                    break;
-                case 0b011:
-                    protocol = Protocol::USER_SERIAL;
-                    break;
-                case 0b100:
-                    protocol = Protocol::USER_NAT;
-                    break;
-                case 0b101:
-                    protocol = Protocol::USER_2G;
-                    break;
-                case 0b110:
-                    protocol = Protocol::USER_EPIRB_RADIO;
-                    isMaritime = true;
-                    break;
-                case 0b111:
-                    protocol = Protocol::USER_TEST;
-                    break;
-                default:
-                    protocol = Protocol::UNKNOWN;
-            }
-        } else {
-            switch (protocolCode) {
-                case 0b0010:
-                    protocol = Protocol::STD_EPIRB;
-                    break;
-                case 0b0011:
-                    protocol = Protocol::STD_ELT_24;
-                    break;
-                case 0b0100:
-                    protocol = Protocol::STD_ELT_SERIAL;
-                    break;
-                case 0b0101:
-                    protocol = Protocol::STD_ELT_AIRCRAFT;
-                    break;
-                case 0b0110:
-                    protocol = Protocol::STD_EPIRB_SERIAL;
-                    break;
-                case 0b0111:
-                    protocol = Protocol::STD_PLB_SERIAL;
-                    break;
-                case 0b1000:
-                    protocol = Protocol::NAT_ELT;
-                    break;
-                case 0b1001:
-                    protocol = Protocol::ELT_DT;
-                    break;
-                case 0b1010:
-                    protocol = Protocol::NAT_EPIRB;
-                    break;
-                case 0b1011:
-                    protocol = Protocol::NAT_PLB;
-                    break;
-                case 0b1100:
-                    protocol = Protocol::STD_SHIP;
-                    break;
-                case 0b1101:
-                    protocol = Protocol::RLS;
-                    break;
-                case 0b1110:
-                    protocol = Protocol::STD_TEST;
-                    break;
-                case 0b1111:
-                    protocol = Protocol::NAT_TEST;
-                    break;
-                default:
-                    protocol = Protocol::UNKNOWN;
-            }
-        }
-    }
-
-    /**
-     * Parse this beacon's additional data
-     */
-    void parseAdditionalData() {
-        hasAdditionalData = false;
-        hasSerialNumber = false;
-        if (protocolFlag) {
-            if (protocolCode == 0b011) {
-                uint8_t serialUserProtocol = getBits(40, 42);
-                hasAdditionalData = true;
-                switch (serialUserProtocol) {
-                    case 0b100:
-                    case 0b010:
-                        isMaritime = true;
-                        // fallthrough
-                    case 0b000:
-                    case 0b001:
-                    case 0b011:
-                    case 0b110:
-                        strcpy(additionalData, ResourceManager::get_beacon_resource(ADDITIONAL_DATA_RESOURCE_START + serialUserProtocol));
-                        break;
-                    default:
-                        hasAdditionalData = false;
-                }
-                hasSerialNumber = true;
-                setSerialNumber((serialUserProtocol == 0b011) ? getBits(44, 67) : (serialUserProtocol == 0b001) ? getBits(62, 73)
-                                                                                                                : getBits(44, 63));
-            }
-            if (!longFrame) {
-                hasEmergency = getBits(107, 107);
-                if (hasEmergency) {
-                    isAutoamticEmergency = getBits(108, 108);
-                    if (isMaritime) {
-                        uint8_t emmergency = getBits(109, 112);
-                        switch (emmergency) {
-                            case 0b0001:
-                            case 0b0010:
-                            case 0b0011:
-                            case 0b0100:
-                            case 0b0101:
-                            case 0b0110:
-                            case 0b0111:
-                            case 0b1000:
-                                strcpy(emergencyType, ResourceManager::get_beacon_resource(EMERGENCY_RESOURCE_START + emmergency));
-                                break;
-                            default:
-                                strcpy(emergencyType, ResourceManager::get_beacon_resource(EMERGENCY_RESOURCE_START));
-                        }
-                    } else {
-                        bool fire = getBits(109, 109);
-                        bool med = getBits(110, 110);
-                        bool disabled = getBits(111, 111);
-                        char* emmergency_pointer = emergencyType;
-                        if (fire) emmergency_pointer += sprintf(emmergency_pointer, "%s", ResourceManager::get_beacon_resource(EMERGENCY_OTHER_RESOURCE_START));
-                        if (med) {
-                            if (fire) emmergency_pointer += sprintf(emmergency_pointer, "%c", '+');
-                            emmergency_pointer += sprintf(emmergency_pointer, "%s", ResourceManager::get_beacon_resource(EMERGENCY_OTHER_RESOURCE_START + 1));
-                        }
-                        if (disabled) {
-                            if (fire || med) emmergency_pointer += sprintf(emmergency_pointer, "%c", '+');
-                            sprintf(emmergency_pointer, "%s", ResourceManager::get_beacon_resource(EMERGENCY_OTHER_RESOURCE_START + 2));
-                        }
-                    }
-                }
-            }
-        } else if (longFrame) {
-            switch (protocolCode) {
-                case 0b0010:
-                    hasSerialNumber = true;
-                    setSerialNumber(getBits(61, 64));
-                    break;
-                case 0b1100: {
-                    hasAdditionalData = true;
-                    uint32_t mmsi = getBits(41, 60);
-                    sprintf(additionalData, ResourceManager::get_beacon_resource(LONG_ADDITIONAL_DATA_RESOURCE_START), mmsi, mmsi);
-                } break;
-                case 0b0011: {
-                    hasAdditionalData = true;
-                    hasSerialNumber = true;
-                    setSerialNumber(getBits(41, 64));
-                    strcpy(additionalData, ResourceManager::get_beacon_resource(LONG_ADDITIONAL_DATA_RESOURCE_START + 1));
-                } break;
-                case 0b0100:
-                case 0b0110:
-                case 0b0111: {
-                    hasAdditionalData = true;
-                    hasSerialNumber = true;
-                    uint32_t csTaNumber = getBits(41, 50);
-                    sprintf(additionalData, ResourceManager::get_beacon_resource(LONG_ADDITIONAL_DATA_RESOURCE_START + 2), csTaNumber);
-                    setSerialNumber(getBits(51, 64));
-                } break;
-                case 0b0101: {
-                    hasAdditionalData = true;
-                    hasSerialNumber = true;
-                    uint32_t data = getBits(41, 45);
-                    char char1 = BAUDOT_CODE[data + 32];
-                    data = getBits(46, 50);
-                    char char2 = BAUDOT_CODE[data + 32];
-                    data = getBits(51, 55);
-                    char char3 = BAUDOT_CODE[data + 32];
-                    sprintf(additionalData, ResourceManager::get_beacon_resource(LONG_ADDITIONAL_DATA_RESOURCE_START + 3), char1, char2, char3);
-                    setSerialNumber(getBits(56, 64));
-                } break;
-                case 0b1000:
-                case 0b1010:
-                case 0b1011:
-                case 0b1111: {
-                    hasSerialNumber = true;
-                    hasAdditionalData = true;
-                    setSerialNumber(getBits(41, 58));
-                    uint32_t natNum = getBits(127, 132);
-                    sprintf(additionalData, ResourceManager::get_beacon_resource(LONG_ADDITIONAL_DATA_RESOURCE_START + 4), natNum);
-                } break;
-            }
-        }
-    }
-
-    /**
-     * Parse this beacon's locating device
-     */
-    void parseLocatingDevices() {
-        bool mainLoc;
-        if (protocolIsStandard() || protocolIsNational()) {
-            mainLoc = getBits(111, 111);
-            mainLocatingDevice = mainLoc ? MainLocatingDevice::INTERNAL_NAV : MainLocatingDevice::EXTERNAL_NAV;
-        } else if (protocolIsUser() || protocolIsRls()) {
-            mainLoc = getBits(107, 107);
-            mainLocatingDevice = mainLoc ? MainLocatingDevice::INTERNAL_NAV : MainLocatingDevice::EXTERNAL_NAV;
-        }
-        if (protocolIsStandard() || protocolIsNational()) {
-            auxLocatingDevice = getBits(112, 112) ? AuxLocatingDevice::MHZ121_5 : AuxLocatingDevice::NONE_OR_OTHER;
-        } else if (protocolIsRls()) {
-            auxLocatingDevice = getBits(108, 108) ? AuxLocatingDevice::MHZ121_5 : AuxLocatingDevice::NONE_OR_OTHER;
-        } else if (protocolIsUser() && protocolCode != 0b100) {
-            uint8_t aux = getBits(84, 85);
-            if (aux == 0b00)
-                auxLocatingDevice = AuxLocatingDevice::NONE;
-            else if (aux == 0b01)
-                auxLocatingDevice = AuxLocatingDevice::MHZ121_5;
-            else if (aux == 0b10)
-                auxLocatingDevice = AuxLocatingDevice::SART;
-            else
-                auxLocatingDevice = AuxLocatingDevice::OTHER;
-        }
-    }
-
-    /**
-     * Parse this beacon's frame data
-     */
-    void parseFrame() {
-        long latofmin, latofsec, lonofmin, lonofsec;
-        bool latoffset, lonoffset;
-
-        longFrame = getBits(25, 25);
-        parseProtocol();
-        protocolType = getProtocolType();
-        CountryManager::get_country(getBits(27, 36), country);
-
-        if (frame[2] == 0xD0)
-            frameMode = FrameMode::SELF_TEST;
-        else if (frame[2] == 0x2F)
-            frameMode = FrameMode::NORMAL;
-        else
-            frameMode = FrameMode::UNKNOWN;
-
-        if (longFrame) {
-            if (protocolIsUser() && !isOrbito()) {
-                location.latitude.orientation = (frame[13] & 0x10) >> 4;
-                location.latitude.degrees = ((frame[13] & 0x0F) << 3 | (frame[14] & 0xE0) >> 5);
-                location.latitude.minutes = ((frame[14] & 0x1E) >> 1) * 4;
-                location.longitude.orientation = (frame[14] & 0x01);
-                location.longitude.degrees = (frame[15]);
-                location.longitude.minutes = ((frame[16] & 0xF0) >> 4) * 4;
-            } else if (protocolIsNational()) {
-                latoffset = (frame[14] & 0x80) >> 7;
-                location.latitude.orientation = (frame[7] & 0x20) >> 5;
-                location.latitude.degrees = ((frame[7] & 0x1F) << 2 | (frame[8] & 0xC0) >> 6);
-                location.latitude.minutes = ((frame[8] & 0x3E) >> 1) * 2;
-                latofmin = (frame[14] & 0x60) >> 5;
-                latofsec = ((frame[14] & 0x1E) >> 1) * 4;
-                location.latitude.apply_offset(latoffset, latofmin, latofsec);
-                lonoffset = (frame[14] & 0x01);
-                location.longitude.orientation = (frame[8] & 0x01);
-                location.longitude.degrees = (frame[9]);
-                location.longitude.minutes = ((frame[10] & 0xF8) >> 3) * 2;
-                lonofmin = (frame[15] & 0xC0) >> 6;
-                lonofsec = ((frame[15] & 0x3C) >> 2) * 4;
-                location.longitude.apply_offset(lonoffset, lonofmin, lonofsec);
-            } else if (protocolIsStandard()) {
-                latoffset = (frame[14] & 0x80) >> 7;
-                location.latitude.orientation = (frame[8] & 0x80) >> 7;
-                location.latitude.degrees = (frame[8] & 0x7F);
-                location.latitude.minutes = ((frame[9] & 0xC0) >> 6) * 15;
-                latofmin = (frame[14] & 0x7C) >> 2;
-                latofsec = ((frame[14] & 0x03) << 2 | (frame[15] & 0xC0) >> 6) * 4;
-                location.latitude.apply_offset(latoffset, latofmin, latofsec);
-                lonoffset = (frame[15] & 0x20) >> 5;
-                location.longitude.orientation = (frame[9] & 0x20) >> 5;
-                location.longitude.degrees = ((frame[9] & 0x1F) << 3 | (frame[10] & 0xE0) >> 5);
-                location.longitude.minutes = ((frame[10] & 0x18) >> 3) * 15;
-                lonofmin = (frame[15] & 0x1F);
-                lonofsec = ((frame[16] & 0xF0) >> 4) * 4;
-                location.longitude.apply_offset(lonoffset, lonofmin, lonofsec);
-            } else if (protocolIsRlsOrElt()) {
-                latoffset = (frame[14] & 0x20) >> 5;
-                location.latitude.orientation = (frame[8] & 0x20) >> 5;
-                location.latitude.degrees = ((frame[8] & 0x1F) << 2) | ((frame[9] & 0xC0) >> 6);
-                location.latitude.minutes = ((frame[9] & 0x20) >> 5) * 30;
-                latofmin = (frame[14] & 0x1E) >> 1;
-                latofsec = ((frame[14] & 0x01) << 3 | (frame[15] & 0xE0) >> 5) * 4;
-                location.latitude.apply_offset(latoffset, latofmin, latofsec);
-                lonoffset = (frame[15] & 0x10) >> 4;
-                location.longitude.orientation = (frame[9] & 0x10) >> 4;
-                location.longitude.degrees = ((frame[9] & 0x0F) << 4 | (frame[10] & 0xF0) >> 4);
-                location.longitude.minutes = ((frame[10] & 0x08) >> 3) * 30;
-                lonofmin = (frame[15] & 0x0F);
-                lonofsec = ((frame[16] & 0xF0) >> 4) * 4;
-                location.longitude.apply_offset(lonoffset, lonofmin, lonofsec);
-            }
-        }
-
-        parseAdditionalData();
-        parseLocatingDevices();
-
-        identifier = getBits(26, 85);
-
-        uint32_t hexIdHigh = (uint32_t)(identifier >> 32);
-        uint32_t hexIdLow = (uint32_t)identifier;
-
-        if (protocolIsStandard()) {
-            // default value of bits 65 to 74 = 0 111111111 / default value of bits 75 to 85 = 0 1111111111
-            hexIdLow &= 0b11111111'11100000'00000000'00000000;
-            hexIdLow |= 0b00000000'00001111'11111011'11111111;
-        } else if (protocolIsNational()) {
-            // default value of bits 59 to 71 = 0 1111111 00000 / default value of bits 72 to 85 = 0 11111111 00000
-            hexIdLow &= 0b11111000'00000000'00000000'00000000;
-            hexIdLow |= 0b00000011'11111000'00011111'11100000;
-        } else if (protocolIsRlsOrElt()) {
-            // default value of bits 67 to 75 = 0 11111111 / default value of bits 76 to 85 = 0 111111111
-            hexIdLow &= 0b11111111'11111000'00000000'00000000;
-            hexIdLow |= 0b00000000'00000011'11111101'11111111;
-        }
-        std::sprintf(hexId, "%07lX%08lX", hexIdHigh, hexIdLow);
-
-        if (isOrbito() && !longFrame) {
-            isEmpty = true;
-            for (size_t i = 3; i < BEACON_DATA_SIZE; i++) {
-                if (frame[i] != 0) {
-                    isEmpty = false;
-                    break;
-                }
-            }
-        } else
-            isEmpty = false;
-
-        bch1 = getBits(86, 106);
-        computedBch1 = computeBCH1();
-        // Try and correct single bit error on  BCH1 (bits 25-85)
-        if (computedBch1 != bch1) {
-            simpleCorrection(true);
-        }
-
-        hasBch2 = longFrame && !isOrbito();
-        if (hasBch2) {
-            bch2 = getBits(133, 144);
-            computedBch2 = computeBCH2();
-            // Try and correct single bit error on  BCH2 (bits 107 - 132)
-            if (computedBch2 != bch2) {
-                simpleCorrection(false);
-            }
-        }
-        static bool isCorrecting = false;
-        // If BCH1 or BCH2 has been corrected, we need to parse frame again to update beacon properties
-        if (!isCorrecting && (bch1Corrected || bch2Corrected)) {
-            // Prevent recursion
-            isCorrecting = true;
-            parseFrame();
-            isCorrecting = false;
-        }
-    }
-};
-}  // namespace ui::external_app::epirb_rx
-
-#endif  // __BEACON_RX_H__
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "beacon_db.hpp"
-
-namespace ui::external_app::epirb_rx {
-
-/**
- * Add a beacon to the database.
- * @return the added beacon reference.
- */
-Beacon& BeaconDB::add_beacon() {
-    Beacon& result = recent_beacons[recent_beacon_pos];
-    recent_beacon_pos = (recent_beacon_pos + 1) % BEACON_HISTORY_SIZE;
-    if (recent_beacon_pos == 0) recent_beacon_full = true;
-    return result;
-}
-
-/**
- * Get the size of the beacon database
- * @return the size of the beacon database
- */
-size_t BeaconDB::size() {
-    return recent_beacon_full ? BEACON_HISTORY_SIZE : recent_beacon_pos;
-}
-
-/**
- * Returns true if the database is empty
- * @return true if the database is empty
- */
-bool BeaconDB::empty() {
-    return (!recent_beacon_full && (recent_beacon_pos == 0));
-}
-
-/**
- * Returns the beacon at the provided index
- */
-Beacon& BeaconDB::get_beacon(size_t index) {
-    // Start from last beacon et go backward
-    int16_t pos = (int16_t)recent_beacon_pos - 1 - index;
-    while (pos < 0) pos += BEACON_HISTORY_SIZE;
-    return recent_beacons[pos % BEACON_HISTORY_SIZE];
-}
-
-/**
- * Set currently selected beacon
- * @param index the selected index
- */
-void BeaconDB::set_current_beacon(size_t index) {
-    current_beacon_index = index;
-}
-
-/**
- * Get currently selected index
- * @return the currently selected index
- */
-size_t BeaconDB::get_current_beacon_index() {
-    return current_beacon_index;
-}
-
-/**
- * Get the currently selected beacon
- * @return the currently selected beacon
- */
-Beacon& BeaconDB::get_current_beacon() {
-    return get_beacon(current_beacon_index);
-}
-
-/**
- * Clear beacon database
- */
-void BeaconDB::clear() {
-    recent_beacon_pos = 0;
-    recent_beacon_full = false;
-}
-
-}  // namespace ui::external_app::epirb_rx
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __BEACON_DB_H__
-#define __BEACON_DB_H__
-
-#include "beacon.hpp"
-
-namespace ui::external_app::epirb_rx {
-
-// Size of beacon database calculated to match the beacon list component size
-#define BEACON_HISTORY_SIZE 13
-
-class BeaconDB {
-   public:
-    Beacon& add_beacon();
-    Beacon& get_beacon(size_t index);
-    Beacon& get_current_beacon();
-    size_t get_current_beacon_index();
-    void set_current_beacon(size_t index);
-    size_t size();
-    bool empty();
-    void clear();
-
-   private:
-    // Actual beacon database array
-    Beacon recent_beacons[BEACON_HISTORY_SIZE];
-    // Position of the insertion pointer
-    int8_t recent_beacon_pos{0};
-    // Beacon selection handling
-    size_t current_beacon_index{0};
-    // True when database is full
-    bool recent_beacon_full{false};
-};
-
-}  // namespace ui::external_app::epirb_rx
-
-#endif /* __BEACON_DB_H__ */
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __COUNTRY_RX_H__
-#define __COUNTRY_RX_H__
-
-#include "string_format.hpp"
-#include "file_reader.hpp"
-#include "file_path.hpp"
-
-namespace ui::external_app::epirb_rx {
-
-#define DISABLE_COUNTRY_CACHE
-
-// Country struct
-struct Country {
-    int16_t code;
-    char alphaCode[4];   // 3 chars + null
-    char shortName[11];  // 10 chars + null
-};
-
-class CountryManager {
-   public:
-    static void get_country(int code, Country& out) {
-#ifndef DISABLE_COUNTRY_CACHE
-        // Check cache
-        for (int i = 0; i < cache_count; i++) {
-            if (cache[i].code == code) {
-                out = cache[i];
-                if (i > 0) {  // Promotion
-                    Country tmp = cache[i];
-                    for (int j = i; j > 0; j--) cache[j] = cache[j - 1];
-                    cache[0] = tmp;
-                }
-                return;
-            }
-        }
-#endif
-        // Cache miss => load from file
-        if (load_from_file(code, out)) {
-#ifndef DISABLE_COUNTRY_CACHE
-            // Insert in cache
-            int limit = (cache_count < 16) ? cache_count : 15;
-            for (int j = limit; j > 0; j--) cache[j] = cache[j - 1];
-            cache[0] = out;
-            if (cache_count < 16) cache_count++;
-#endif
-        } else {
-            out.code = code;
-            out.alphaCode[0] = '\0';
-            out.shortName[0] = '\0';
-        }
-    }
-
-   private:
-#ifndef DISABLE_COUNTRY_CACHE
-    static Country cache[16];
-    static int cache_count;
-#endif
-
-    static bool load_from_file(int target_code, Country& out) {
-        FIL file;
-        if (f_open(&file, (epirb_dir / u"RES/COUNTRY.RES").tchar(), FA_READ) != FR_OK) return false;
-
-        TCHAR line[48];
-        bool found = false;
-
-        while (f_gets(line, sizeof(line) / sizeof(TCHAR), &file)) {
-            // Light parsing method
-            TCHAR* p = line;
-
-            // Parse CODE
-            int c = 0;
-            while (*p >= '0' && *p <= '9') c = c * 10 + (*p++ - '0');
-            if (c != target_code || *p != ':') continue;
-            p++;  // Skip ':'
-
-            out.code = (int16_t)c;
-
-            // Parse ALPHA CODE (3 chars)
-            for (int i = 0; i < 3 && *p != ':'; i++) out.alphaCode[i] = (char)*p++;
-            out.alphaCode[3] = '\0';
-            if (*p != ':') continue;
-            p++;  // Skip ':'
-
-            // Parse SHORT NAME
-            int i = 0;
-            while (i < static_cast<int>(sizeof(out.shortName) - 1) && *p != '\r' && *p != '\n' && *p != '\0') {
-                out.shortName[i++] = (char)*p++;
-            }
-            out.shortName[i] = '\0';
-
-            found = true;
-            break;
-        }
-
-        f_close(&file);
-        return found;
-    }
-};
-
-}  // namespace ui::external_app::epirb_rx
-
-#endif  // __COUNTRY_RX_H__
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "location.hpp"
-#include <cstdio>
-#include "string_format.hpp"
-
-namespace ui::external_app::epirb_rx {
-
-void Location::Angle::clear() {
-    degrees = 255;
-    minutes = 0;
-    seconds = 0;
-    orientation = false;
-    floatValue = 255;
-}
-
-float Location::Angle::getFloatValue() {
-    if (floatValue >= 255) {
-        floatValue = (float)degrees;
-        floatValue += ((float)minutes / 60.0f);
-        floatValue += ((float)seconds / 3600.0f);
-        if (orientation) {
-            floatValue = -floatValue;
-        }
-    }
-    return floatValue;
-}
-
-void Location::Angle::apply_offset(bool positive, long ofmin, long ofsec) {
-    if (positive) {
-        minutes += ofmin;
-        seconds += ofsec;
-    } else {
-        minutes -= ofmin;
-        if (minutes < 0) {
-            minutes += 60;
-            degrees -= 1;
-        }
-        seconds -= ofsec;
-        if (seconds < 0) {
-            seconds += 60;
-            minutes -= 1;
-        }
-    }
-}
-
-void Location::clear() {
-    latitude.clear();
-    longitude.clear();
-}
-
-bool Location::isUnknown() {
-    return (latitude.degrees >= 255 || longitude.degrees >= 255);
-}
-
-char Location::gps_letterize(int x) {
-    return (char)x + 65;
-}
-
-size_t Location::gps_compute_locator(char* buffer, float lat, float lon, int precision) {
-    size_t result = 0;
-
-    lon += 180.0f;
-    lat += 90.0f;
-
-    int A = lon / 20;
-    int B = lat / 10;
-
-    lon -= A * 20;
-    lat -= B * 10;
-
-    int C = lon / 2;
-    int D = lat / 1;
-
-    lon -= C * 2;
-    lat -= D * 1;
-
-    int E = lon / (5.0f / 60.0f);
-    int F = lat / (2.5f / 60.0f);
-
-    lon -= E * (5.0f / 60.0f);
-    lat -= F * (2.5f / 60.0f);
-
-    int G = lon / (5.0f / 600.0f);
-    int H = lat / (2.5f / 600.0f);
-
-    buffer[result++] = char('A' + A);
-    buffer[result++] = char('A' + B);
-
-    if (precision >= 4) {
-        buffer[result++] = char('0' + C);
-        buffer[result++] = char('0' + D);
-    }
-
-    if (precision >= 6) {
-        buffer[result++] = char('a' + E);
-        buffer[result++] = char('a' + F);
-    }
-
-    if (precision >= 8) {
-        buffer[result++] = char('0' + G);
-        buffer[result++] = char('0' + H);
-    }
-    buffer[result] = 0;
-    return result;
-}
-
-size_t Location::toString(char* buffer, LocationFormat format, int precision) {
-    if (isUnknown()) {
-        return sprintf(buffer, "%s", "GPS not synchronized");
-    }
-    switch (format) {
-        case LocationFormat::SEXAGESIMAL: {
-            return sprintf(buffer, "%ld\xB0%02ld'%02ld\"%c, %ld\xB0%02ld'%02ld\"%c",  // 0xB0 is degree ° symbol in our 8x16 font
-                           latitude.degrees, latitude.minutes, latitude.seconds, latitude.orientation ? 'S' : 'N',
-                           longitude.degrees, longitude.minutes, longitude.seconds, longitude.orientation ? 'W' : 'E');
-        }
-        case LocationFormat::MAIDENHEAD_LOCATOR:
-            return gps_compute_locator(buffer, latitude.getFloatValue(), longitude.getFloatValue(), precision);
-        default:
-        case LocationFormat::DECIMAL:
-            return sprintf(buffer, "%s, %s", to_string_decimal(latitude.getFloatValue(), 5).c_str(), to_string_decimal(longitude.getFloatValue(), 5).c_str());
-    }
-}
-
-void Location::formatFloatLocation(char* buffer, const char* format) {
-    sprintf(buffer, format, to_string_decimal(latitude.getFloatValue(), 6).c_str(), to_string_decimal(longitude.getFloatValue(), 6).c_str());
-}
-
-}  // namespace ui::external_app::epirb_rx
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef __LOCATION_RX_H__
-#define __LOCATION_RX_H__
-
-#include <cstddef>
-
-namespace ui::external_app::epirb_rx {
-
-class Location {
-   public:
-    class Angle {
-       public:
-        long degrees = 0;
-        long minutes = 0;
-        long seconds = 0;
-        bool orientation = false;  // false = N/E, true = S/W
-
-        Angle() {}
-        Angle(long degrees)
-            : degrees(degrees) {}
-
-        void clear();
-
-        float getFloatValue();
-
-        // Apply an offset (minutes / seconds) with sign-based borrow into minutes/degrees.
-        // Out-of-line to keep parseFrame from inlining the same arithmetic 6 times.
-        void apply_offset(bool positive, long ofmin, long ofsec);
-
-       private:
-        float floatValue = 255.0f;
-    };
-
-    enum class LocationFormat { DECIMAL,
-                                SEXAGESIMAL,
-                                MAIDENHEAD_LOCATOR };
-
-    Angle latitude = Angle(127);
-    Angle longitude = Angle(255);
-
-    void clear();
-
-    bool isUnknown();
-
-    static char gps_letterize(int x);
-
-    // For code size optimization reasons, string manipulation is performed with char buffers
-    // with no char buffer size check. Caller methods take care of providing large enough buffers
-    static size_t gps_compute_locator(char* buffer, float lat, float lon, int precision = 6);
-    size_t toString(char* buffer, LocationFormat format, int precision = 6);
-
-    void formatFloatLocation(char* buffer, const char* format);
-};
-
-}  // namespace ui::external_app::epirb_rx
-
-#endif  // __LOCATION_RX_H__
@@ -73,7 +73,7 @@ __attribute__((section(".external_app.app_epirb_rx.application_information"), us
        0x00,
        0x00,
    },
-    /*.icon_color = */ ui::Color::green().v,
+    /*.icon_color = */ ui::Color::orange().v,
    /*.menu_location = */ app_location_t::RX,
    /*.desired_menu_position = */ -1,

@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __RESOUCES_H__
-#define __RESOUCES_H__
-
-#include <cstring>
-#include <vector>
-#include "file_reader.hpp"
-#include "file_path.hpp"
-
-namespace ui::external_app::epirb_rx {
-
-#define UNKNOWN_LABEL "Unk."
-
-extern std::vector<std::string> beacon_res;
-extern std::vector<std::string> freq;
-
-/**
- * This class is used to load string resources from SD card.
- * This is done mostly to reduce application size and keep it under the 32kb limit.
- * It's also used to load frequency values, allowing users to customize frequency list by editing FREQ.TXT file on SD card.
- */
-class ResourceManager {
-   public:
-    // Singleton getter
-    static ResourceManager* getInstance();
-
-    // Singleton instance
-    static ResourceManager* current;
-    // Used from standalone app, to prevent memleak
-    static void destroy();
-
-    // Get a string from BEACON.RES file
-    static const char* get_beacon_resource(uint8_t line) {
-        ResourceManager* rm = getInstance();
-        if (rm->beacon_res.empty()) {
-            load_file((epirb_dir / u"RES/BEACON.RES"), rm->beacon_res);
-        }
-        if (line < rm->beacon_res.size()) {
-            return rm->beacon_res[line].c_str();
-        }
-        return UNKNOWN_LABEL;
-    }
-
-    // Get frequency values
-    static const std::vector<std::string>& get_frequencies() {
-        ResourceManager* rm = getInstance();
-        if (rm->freq.empty()) {
-            load_file((epirb_dir / u"FREQ.TXT"), rm->freq);
-        }
-        return rm->freq;
-    }
-
-   private:
-    // BEACON.RES content
-    std::vector<std::string> beacon_res{};
-    // FREQ.TXT content
-    std::vector<std::string> freq{};
-
-    static void load_file(const std::filesystem::path& path, std::vector<std::string>& vect) {
-        FIL file;
-        if (f_open(&file, path.tchar(), FA_READ) == FR_OK) {
-            TCHAR line_buffer[32];
-            // Read the file line by line
-            while (f_gets(line_buffer, sizeof(line_buffer) / sizeof(TCHAR), &file)) {
-                std::string s;
-                for (int i = 0; line_buffer[i] != '\0' && line_buffer[i] != '\n' && line_buffer[i] != '\r'; i++) {
-                    // Convert each TCHAR in char
-                    s += (char)line_buffer[i];
-                }
-                vect.push_back(std::move(s));
-            }
-            f_close(&file);
-        }
-        if (vect.empty()) vect.push_back(UNKNOWN_LABEL);
-    }
-};
-
-}  // namespace ui::external_app::epirb_rx
-
-#endif  // __RESOUCES_H__
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui_beaconlist.hpp"
-#include <algorithm>
-
-namespace ui::external_app::epirb_rx {
-
-BeaconUIList::BeaconUIList(Rect parent_rect)
-    : View{parent_rect} {
-    this->set_focusable(true);
-}
-
-void BeaconUIList::paint(Painter& painter) {
-    auto rect = screen_rect();
-    // Clear view
-    painter.fill_rectangle(rect, Theme::getInstance()->bg_darkest->background);
-
-    if (!db_ || (db_->empty())) {
-        return;
-    }
-
-    auto base_style = Theme::getInstance()->bg_darkest;
-
-    for (auto offset = 0u; offset < BEACON_HISTORY_SIZE; ++offset) {
-        auto index = start_index_ + offset;
-
-        if (index < db_->size()) {
-            auto line_position = rect.location() + Point{0, 1 + (int)offset * char_height};
-            auto is_selected = (offset == selected_index_);
-            auto style = base_style;
-
-            // Get beacon entry and format it's summary
-            auto& entry = db_->get_beacon(index);
-            char buffer[64];
-            entry.formatSummary(buffer, true);
-
-            if (index == db_->get_current_beacon_index())
-                // If this is the currently displayed beacon change color
-                style = Theme::getInstance()->bg_medium;
-
-            // Draw entry line using stack buffer directly to avoid heap allocation
-            painter.draw_string(
-                line_position, (is_selected ? style->invert() : *style), buffer);
-        }
-    }
-
-    // Draw a bounding rectangle when focused.
-    painter.draw_rectangle(rect, (has_focus() ? Theme::getInstance()->bg_darkest->foreground : Theme::getInstance()->bg_darkest->background));
-}
-
-void BeaconUIList::on_show() {
-    set_dirty();
-}
-
-bool BeaconUIList::on_key(const KeyEvent key) {
-    if (!db_ || db_->empty())
-        return false;
-
-    if (key == KeyEvent::Select && on_select) {
-        // Select this beacon
-        on_select(get_index());
-        set_dirty();
-        return true;
-    }
-
-    auto delta = 0;
-    // Change position in the list
-    if (key == KeyEvent::Up && get_index() > 0)
-        delta = -1;
-    else if (key == KeyEvent::Down && get_index() < db_->size() - 1)
-        delta = 1;
-    else
-        return false;
-
-    adjust_selected_index(delta);
-    set_dirty();
-    return true;
-}
-
-bool BeaconUIList::on_encoder(EncoderEvent delta) {
-    if (!db_ || db_->empty())
-        return false;
-    // Change position in the list according to encoder
-    adjust_selected_index(delta);
-    set_dirty();
-    return true;
-}
-
-size_t BeaconUIList::get_index() const {
-    return start_index_ + selected_index_;
-}
-
-void BeaconUIList::set_db(BeaconDB& db) {
-    db_ = &db;
-    start_index_ = 0;
-    selected_index_ = 0;
-    set_dirty();
-}
-
-void BeaconUIList::adjust_selected_index(int delta) {
-    int32_t new_index = selected_index_ + delta;
-
-    // The selection went off the top of the screen, move up.
-    if (new_index < 0) {
-        start_index_ = std::max<int32_t>(start_index_ + new_index, 0);
-        selected_index_ = 0;
-    }
-
-    // Selection is off the bottom of the screen, move down.
-    else if (new_index >= (int32_t)BEACON_HISTORY_SIZE) {
-        start_index_ = std::min<int32_t>(start_index_ + delta, db_->size() - BEACON_HISTORY_SIZE);
-        selected_index_ = BEACON_HISTORY_SIZE - 1;
-    }
-
-    // Otherwise, scroll within the screen, but not past the end.
-    else {
-        selected_index_ = std::min<int32_t>(new_index, db_->size() - 1);
-    }
-}
-
-}  // namespace ui::external_app::epirb_rx
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __UI_BEACONLIST_H__
-#define __UI_BEACONLIST_H__
-
-#include "ui.hpp"
-#include "ui_painter.hpp"
-#include "ui_widget.hpp"
-#include "beacon_db.hpp"
-
-namespace ui::external_app::epirb_rx {
-
-/**
- * Beacon list component
- */
-class BeaconUIList : public View {
-   public:
-    std::function<void(size_t)> on_select{};
-
-    BeaconUIList(Rect parent_rect);
-    BeaconUIList(const BeaconUIList& other) = delete;
-    BeaconUIList& operator=(const BeaconUIList& other) = delete;
-
-    void paint(Painter& painter) override;
-    void on_show() override;
-    bool on_key(const KeyEvent key) override;
-    bool on_encoder(EncoderEvent delta) override;
-
-    size_t get_index() const;
-    void set_db(BeaconDB& db);
-
-   private:
-    void adjust_selected_index(int index);
-
-    BeaconDB* db_{nullptr};
-    size_t start_index_{0};
-    size_t selected_index_{0};
-};
-
-}  // namespace ui::external_app::epirb_rx
-
-#endif /*__UI_BEACONLIST_H__*/
@@ -1,6 +1,5 @@
 /*
 * Copyright (C) 2024 EPIRB Decoder Implementation
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
 *
 * This file is part of PortaPack.
 *
@@ -30,293 +29,267 @@
 #include "ui_receiver.hpp"
 #include "ui_geomap.hpp"

-// Specan is disable to keep application size below the 32k limit
-// #define SPECAN
-
-// Comment to disable timout reset on select and save approx 200 bytes of flash
-#ifndef PRALINE
-// Application does not fit on Praline with RESET_TIMER enabled
-#define RESET_TIMER
-#endif
-// Comment to disable squelch control
-#define SQUELCH
-// Comment to disable beacon selection by encoder on detail tab
-#define DETAIL_TAB_BEACON_SEL
-// #define LOGGER
-
-#ifdef SPECAN
-#include "ui_spectrum.hpp"
-#endif
-
-#include "ui_tabview.hpp"
-
-#include "ui_qrcode.hpp"
-
 #include "event_m0.hpp"
+#include "signal.hpp"
 #include "message.hpp"
 #include "log_file.hpp"

 #include "baseband_packet.hpp"

-#include "audio.hpp"
-
-#include "beacon.hpp"
-#include "beacon_db.hpp"
-#include "ui_beaconlist.hpp"
-#include "resources.hpp"
+/* #include <cstdint>
+#include <cstddef>
+#include <string>
+#include <array> */

 namespace ui::external_app::epirb_rx {

-/**
- * Status of a packet
- */
+// EPIRB 406 MHz beacon types
+enum class BeaconType : uint8_t {
+    OrbitingLocationBeacon = 0,
+    PersonalLocatorBeacon = 1,
+    EmergencyLocatorTransmitter = 2,
+    SerialELT = 3,
+    NationalELT = 4,
+    Other = 15
+};
+
+// EPIRB distress and emergency types
+enum class EmergencyType : uint8_t {
+    Fire = 0,
+    Flooding = 1,
+    Collision = 2,
+    Grounding = 3,
+    Sinking = 4,
+    Disabled = 5,
+    Abandoning = 6,
+    Piracy = 7,
+    Man_Overboard = 8,
+    Other = 15
+};
+
+struct EPIRBLocation {
+    float latitude;   // degrees, -90 to +90
+    float longitude;  // degrees, -180 to +180
+    bool valid;
+
+    EPIRBLocation()
+        : latitude(0.0f), longitude(0.0f), valid(false) {}
+    EPIRBLocation(float lat, float lon)
+        : latitude(lat), longitude(lon), valid(true) {}
+};
+
 enum class PacketStatus : uint8_t {
    Valid = 0,
    Corrected = 1,
    Error = 2
 };

-// Position of tabs in tab view
-#define EPIRB_TAB_POS_Y (UI_POS_Y(4) + 3 * 8)
-// Height of tabs in tab view
-#define EPIRB_TAB_HEIGHT (screen_height - EPIRB_TAB_POS_Y - UI_POS_HEIGHT(1))
+struct EPIRBBeacon {
+    uint32_t beacon_id;
+    BeaconType beacon_type;
+    EmergencyType emergency_type;
+    EPIRBLocation location;
+    uint32_t country_code;
+    std::string vessel_name;
+    rtc::RTC timestamp;
+    uint32_t sequence_number;
+    PacketStatus packet_status;
+    uint8_t error_count;
+
+    EPIRBBeacon()
+        : beacon_id(0), beacon_type(BeaconType::Other), emergency_type(EmergencyType::Other), location(), country_code(0), vessel_name(), timestamp(), sequence_number(0), packet_status(PacketStatus::Error), error_count(0) {}
+};
+
+class EPIRBDecoder {
+   public:
+    static EPIRBBeacon decode_packet(const baseband::Packet& packet);
+
+   private:
+    static EPIRBLocation decode_location(const std::array<uint8_t, 16>& data);
+    static BeaconType decode_beacon_type(uint8_t type_bits);
+    static EmergencyType decode_emergency_type(uint8_t emergency_bits);
+    static uint32_t decode_country_code(const std::array<uint8_t, 16>& data);
+    static std::string decode_vessel_name(const std::array<uint8_t, 16>& data);
+
+    // BCH error correction methods
+    static PacketStatus perform_bch_check(std::array<uint8_t, 16>& data, uint8_t& error_count);
+    static uint32_t calculate_bch_syndrome(const std::array<uint8_t, 16>& data);
+    static bool correct_single_error(std::array<uint8_t, 16>& data, uint32_t syndrome);
+    static uint8_t count_bit_errors(const std::array<uint8_t, 16>& original, const std::array<uint8_t, 16>& corrected);
+};

-#ifdef LOGGER
 class EPIRBLogger {
   public:
    Optional<File::Error> append(const std::filesystem::path& filename) {
        return log_file.append(filename);
    }

-    void on_packet(Beacon& beacon);
+    void on_packet(const EPIRBBeacon& beacon);

   private:
    LogFile log_file{};
 };
-#endif

-/**
- * Dedicated TextArea component used to optimize application code size
- */
-class TextArea : public Widget {
+// Forward declarations of formatting functions
+std::string format_beacon_type(BeaconType type);
+std::string format_emergency_type(EmergencyType type);
+std::string format_packet_status(PacketStatus status);
+ui::Color get_packet_status_color(PacketStatus status);
+
+class EPIRBBeaconDetailView : public ui::View {
   public:
-    TextArea(Rect parent_rect);
+    std::function<void(void)> on_close{};

-#ifdef RESET_TIMER
-    std::function<void(TextArea&)> on_select{};
-    bool on_key(const KeyEvent key) override;
-#endif
+    EPIRBBeaconDetailView(ui::NavigationView& nav);
+    EPIRBBeaconDetailView(const EPIRBBeaconDetailView&) = delete;
+    EPIRBBeaconDetailView& operator=(const EPIRBBeaconDetailView&) = delete;

-    void set_content(std::string_view value);
-    void paint(Painter& painter) override;
+    void set_beacon(const EPIRBBeacon& beacon);
+    const EPIRBBeacon& beacon() const { return beacon_; }
+
+    void focus() override;
+    void paint(ui::Painter&) override;
+
+    ui::GeoMapView* get_geomap_view() { return geomap_view; }

   private:
-    std::string content{};
+    EPIRBBeacon beacon_{};
+
+    ui::Button button_done{
+        {125, 224, 96, 24},
+        "Done"};
+    ui::Button button_see_map{
+        {19, 224, 96, 24},
+        "See on map"};
+
+    ui::GeoMapView* geomap_view{nullptr};
+
+    ui::Rect draw_field(
+        ui::Painter& painter,
+        const ui::Rect& draw_rect,
+        const ui::Style& style,
+        const std::string& label,
+        const std::string& value);
 };

-// Forward declaration
-class EPIRBAppView;
-
-/**
- * View for beacon detail tab
- */
-class EPIRBDetailView : public View {
-   public:
-    EPIRBDetailView(Rect parent_rect, EPIRBAppView& parent);
-    void set_beacon(Beacon& beacon);
-#ifdef DETAIL_TAB_BEACON_SEL
-    bool on_encoder(EncoderEvent delta) override;
-#endif
-
-   private:
-    TextArea text_beacon{{UI_POS_X(0), UI_POS_Y(0), UI_POS_MAXWIDTH, EPIRB_TAB_HEIGHT}};
-    EPIRBAppView& parent_app;
-};
-
-#define EPIRB_RX_DEFAULT_LATITUDE 43.604f
-#define EPIRB_RX_DEFAULT_LONGITUDE 1.458f
-
-/**
- * View for beacon map tab
- */
-class EPIRBMapView : public View {
-   public:
-    EPIRBMapView(Rect parent_rect);
-    void paint(Painter& painter) override;
-    void on_show() override;
-    void set_main_marker(const std::string& label, float lat, float lon);
-    void clear_markers();
-    void add_marker(GeoMarker& marker);
-    void hide_map(bool hide);
-    void repaint();
-
-   private:
-    GeoMap geomap{{0, 0, UI_POS_MAXWIDTH, EPIRB_TAB_HEIGHT}};
-    float lat_{EPIRB_RX_DEFAULT_LATITUDE};
-    float lon_{EPIRB_RX_DEFAULT_LONGITUDE};
-    bool map_hidden{true};
-};
-
-#define QR_WIDTH 126
-#define QR_HEIGHT 127
-
-/**
- * Vieaw for Beacon QR tab
- */
-class EPRIBQRView : public View {
-   public:
-    EPRIBQRView(Rect parent_rect);
-    EPRIBQRView(const EPRIBQRView&) = delete;
-    EPRIBQRView& operator=(const EPRIBQRView&) = delete;
-
-    void set_beacon(Beacon* beacon);
-    void update_qr();
-    void update_display();
-
-   private:
-    bool show_map{true};
-    Beacon* current_beacon{nullptr};
-    char qr_url[128];
-
-    OptionsField options_qr{
-        {UI_POS_X(5), UI_POS_Y(1)},
-        6,
-        {{"Map", 0},
-         {"Detail", 1}}};
-
-    QRCodeImage qr_code{
-        {UI_POS_MAXWIDTH - QR_WIDTH - UI_POS_X(1), UI_POS_Y(1), QR_WIDTH, QR_HEIGHT}};
-
-    TextArea text_data{{UI_POS_X(0), UI_POS_Y(1), UI_POS_MAXWIDTH, EPIRB_TAB_HEIGHT - UI_POS_Y(1)}};
-};
-
-#ifdef SPECAN
-class EPIRBRxView : public spectrum::WaterfallView {
-   public:
-    EPIRBRxView(EPIRBAppView& parent, Rect parent_rect);
-    void on_show() override;
-    void on_hide() override;
-
-   private:
-    EPIRBAppView& app_view;
-};
-#endif
-
-class EPIRBAppView final : public ui::View {
+class EPIRBAppView : public ui::View {
   public:
    EPIRBAppView(ui::NavigationView& nav);
    ~EPIRBAppView();

+    void set_parent_rect(const ui::Rect new_parent_rect) override;
+    void paint(ui::Painter&) override;
    void focus() override;
-    void refresh();
-
-    // Message to configure rx baseband
-    EPIRBRXConfig epirb_rx_config_message{};
-    void send_config();
-    // Beacons database
-    BeaconDB beacon_db{};
-    // Update display when beacon selection changed0
-    void on_beacon_change();

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

   private:
-    uint8_t squelch{50};
-    // The delay between each frame
-    uint32_t countdown{50};
    app_settings::SettingsManager settings_{
-        "rx_epirb",
-        app_settings::Mode::RX,
-        {
-            {"epirb_squelch"sv, &squelch},
-            {"countdown"sv, &countdown},
-        }};
+        "rx_epirb", app_settings::Mode::RX};

    ui::NavigationView& nav_;

-#ifdef LOGGER
+    std::vector<EPIRBBeacon> recent_beacons{};
    std::unique_ptr<EPIRBLogger> logger{};
-#endif

-    OptionsField options_frequency{
-        {UI_POS_X(0), UI_POS_Y(0)},
+    EPIRBBeaconDetailView beacon_detail_view{nav_};
+
+    static constexpr auto header_height = 4 * 16;
+
+    ui::Text label_frequency{
+        {UI_POS_X(0), UI_POS_Y(0), 4 * 8, 1 * 16},
+        "Freq"};
+
+    ui::OptionsField options_frequency{
+        {5 * 8, UI_POS_Y(0)},
        7,
-        {}};
+        {
+            {"406.028", 406028000},
+            {"406.025", 406025000},
+            {"406.037", 406037000},
+            {"433.025", 433025000},
+            {"144.875", 144875000},
+        }};

    ui::RFAmpField field_rf_amp{
-        {UI_POS_X(8), UI_POS_Y(0)}};
+        {13 * 8, UI_POS_Y(0)}};

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

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

    ui::RSSI rssi{
-        {UI_POS_X(16), UI_POS_Y(0), UI_POS_WIDTH_REMAINING(22), 4}};
+        {UI_POS_X(21), 0, UI_POS_WIDTH_REMAINING(24), 4}};

    ui::Channel channel{
-        {UI_POS_X(16), UI_POS_Y(0) + 5, UI_POS_WIDTH_REMAINING(22), 4}};
-
-    // ui::Audio audio{
-    //     {UI_POS_X(16), UI_POS_Y(0) + 10, UI_POS_WIDTH_REMAINING(22), 4}};
+        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(24), 4}};

    ui::AudioVolumeField field_volume{
-        {UI_POS_WIDTH_REMAINING(2), UI_POS_Y(0)}};
-
-#ifdef SQUELCH
-    NumberField field_squelch{
-        {UI_POS_WIDTH_REMAINING(5), UI_POS_Y(0)},
-        2,
-        {0, 99},
-        1,
-        ' '};
-#endif
+        {screen_width - 2 * 8, UI_POS_Y(0)}};

    // Status display
-    TextArea text_status{{UI_POS_X(0), UI_POS_Y(1), UI_POS_MAXWIDTH, UI_POS_HEIGHT(3)}};
-    TextArea text_timeout{
-        {UI_POS_X(13), UI_POS_Y(1), UI_POS_WIDTH(3), UI_POS_HEIGHT(1)}};
+    ui::Text label_status{
+        {UI_POS_X(0), 1 * 16, 15 * 8, 1 * 16},
+        "Listening..."};
+
+    ui::Text label_beacons_count{
+        {16 * 8, 1 * 16, 14 * 8, 1 * 16},
+        "Beacons: 0"};
+
+    ui::Text label_packet_stats{
+        {UI_POS_X(0), 3 * 16, 29 * 8, 1 * 16},
+        ""};
+
+    // Latest beacon info display
+    ui::Text label_latest{
+        {UI_POS_X(0), 2 * 16, 8 * 8, 1 * 16},
+        "Latest:"};
+
+    ui::Text text_latest_info{
+        {8 * 8, 2 * 16, 22 * 8, 1 * 16},
+        ""};
+
+    // Beacon list
+    ui::Console console{
+        {0, 4 * 16, 240, 152}};
+
+    ui::Button button_map{
+        {0, 224, 60, 24},
+        "Map"};
+
+    ui::Button button_clear{
+        {64, 224, 60, 24},
+        "Clear"};
+
+    ui::Button button_log{
+        {128, 224, 60, 24},
+        "Log"};
+
    SignalToken signal_token_tick_second{};
-    // Timeout string
-    int16_t timeout{0};
-
-    // Tab View
-    Rect view_rect = {0, EPIRB_TAB_POS_Y, UI_POS_MAXWIDTH, EPIRB_TAB_HEIGHT};
-
-    BeaconUIList view_list{view_rect};
-    EPIRBDetailView view_detail{view_rect, (*this)};
-    EPIRBMapView view_map{view_rect};
-#ifdef SPECAN
-    EPIRBRxView view_rx{*this, view_rect};
-#endif
-
-    EPRIBQRView view_qr{view_rect};
-
-    TabView tab_view{
-        {"List", Theme::getInstance()->fg_cyan->foreground, &view_list},
-        {"Detail", Theme::getInstance()->fg_green->foreground, &view_detail},
-        {"Map", Theme::getInstance()->fg_yellow->foreground, &view_map},
-#ifdef SPECAN
-        {"RX", Theme::getInstance()->fg_orange->foreground, &view_rx},
-#endif
-        {"QR", Theme::getInstance()->fg_orange->foreground, &view_qr}};
-
-    uint16_t beacons_received = 0;
-    uint16_t packets_valid = 0;
-    uint16_t packets_corrected = 0;
-    uint16_t packets_error = 0;
+    uint32_t beacons_received = 0;
+    uint32_t packets_valid = 0;
+    uint32_t packets_corrected = 0;
+    uint32_t packets_error = 0;

    MessageHandlerRegistration message_handler_packet{
        Message::ID::EPIRBPacket,
-        [this](Message* const p) { on_packet(p); }};
+        [this](Message* const p) {
+            const auto message = static_cast<const EPIRBPacketMessage*>(p);
+            this->on_packet(message->packet);
+        }};

-    static void decode_packet(const baseband::Packet& packet, Beacon& beacon);
-    void on_packet(Message* const p);
-    void update_map();
+    void on_packet(const baseband::Packet& packet);
+    void on_beacon_decoded(const EPIRBBeacon& beacon);
+    void on_show_map();
+    void on_clear_beacons();
+    void on_toggle_log();
    void on_tick_second();

    void update_display();
+    std::string format_beacon_summary(const EPIRBBeacon& beacon);
+    std::string format_location(const EPIRBLocation& location);
 };

 }  // namespace ui::external_app::epirb_rx
@@ -143,6 +143,30 @@ static void push_bits(uint8_t* buf, int& pos, uint64_t v, int n) {
        set_bit(buf, pos++, (v >> i) & 1);
 }

+/**
+ * Convert a beacon to hex string representation
+ * @param frame the frame to convert
+ * @param start true for the first half of the frame, false for the second half
+ * @return the hex string representation of the specieid half of the frame
+ */
+std::string beacon_to_hex_string(const uint8_t* frame, bool start) {
+    static const char hex[] = "0123456789ABCDEF";
+
+    std::string out;
+    out.resize(18);
+
+    int offset = start ? 0 : 9;
+
+    for (int i = 0; i < 9; i++) {
+        uint8_t b = frame[offset + i];
+
+        out[i * 2] = hex[b >> 4];
+        out[i * 2 + 1] = hex[b & 0x0F];
+    }
+
+    return out;
+}
+
 /**
 * Generate a beacon in the provided buffer
 * @param frame the buffer to generate the frame in
@@ -327,204 +351,6 @@ size_t generate_beacon(uint8_t* frame, const BeaconParams& params) {
    return 18;
 }

-/**
- * Convert a beacon hex string representation (generic range)
- * @param frame the frame data
- * @param offset_bytes starting byte offset
- * @param count_bytes number of bytes to convert
- * @return the hex string representation
- */
-std::string beacon_to_hex_string_range(const uint8_t* frame, int offset_bytes, int count_bytes) {
-    static const char hex[] = "0123456789ABCDEF";
-    std::string out;
-    out.resize(count_bytes * 2);
-    for (int i = 0; i < count_bytes; i++) {
-        uint8_t b = frame[offset_bytes + i];
-        out[i * 2] = hex[b >> 4];
-        out[i * 2 + 1] = hex[b & 0x0F];
-    }
-    return out;
-}
-
-// ---------------------------------------------------------------------------
-// SGB (Second Generation Beacon) — T.018 Rev 7, March 2021
-// ---------------------------------------------------------------------------
-
-// Reference values from T.018 canonical test vector (Appendix B.1)
-#define SGB_TAC_NUMBER 230     // TAC number (16 bits, 0–65535)
-#define SGB_SERIAL_NUMBER 573  // Serial number within TAC (14 bits, 0–16383)
-#define SGB_HOMING_DEVICE 1    // 1 = beacon has 121.5 / 243 MHz homing device
-#define SGB_RLS_FUNCTION 0     // 0 = no Return Link Service function
-
-// BCH(250,202) generator polynomial — lower 48 bits (without leading X^48 term)
-// Full g(x): X^48+X^47+X^46+X^42+X^41+X^40+X^39+X^38+X^37+X^35+X^33+X^32+X^31
-//            +X^26+X^24+X^23+X^22+X^20+X^19+X^18+X^17+X^16+X^13+X^12+X^11+X^10
-//            +X^7+X^4+X^2+X+1
-// Binary MSB-first: 1110001111110101110000101110111110011110010010111 (T.018 App. B.1)
-#define SGB_BCH_G_LOWER UINT64_C(0xC7EB85DF3C97)
-
-/**
- * Encode latitude for SGB GNSS location protocol (T.018 Appendix C)
- * Pushes 23 bits: 1-bit N/S flag + 7-bit degrees + 15-bit decimal fraction
- * @param frame the frame buffer
- * @param pos current bit position (modified in-place)
- * @param south true if southern hemisphere
- * @param lat_mag absolute latitude in decimal degrees (0..90)
- */
-static void push_sgb_latitude(uint8_t* frame, int& pos, bool south, float lat_mag) {
-    push_bits(frame, pos, south ? 1 : 0, 1);
-    uint32_t deg = (uint32_t)lat_mag;
-    if (deg > 90) deg = 90;
-    float frac = lat_mag - (float)deg;
-    uint32_t frac_n = (uint32_t)(frac * 32768.0f + 0.5f);
-    if (frac_n >= 32768) {
-        frac_n = 0;
-        if (deg < 90) deg++;
-    }
-    push_bits(frame, pos, deg, 7);
-    push_bits(frame, pos, frac_n, 15);
-}
-
-/**
- * Encode longitude for SGB GNSS location protocol (T.018 Appendix C)
- * Pushes 24 bits: 1-bit E/W flag + 8-bit degrees + 15-bit decimal fraction
- * @param frame the frame buffer
- * @param pos current bit position (modified in-place)
- * @param west true if western hemisphere
- * @param lon_mag absolute longitude in decimal degrees (0..180)
- */
-static void push_sgb_longitude(uint8_t* frame, int& pos, bool west, float lon_mag) {
-    push_bits(frame, pos, west ? 1 : 0, 1);
-    uint32_t deg = (uint32_t)lon_mag;
-    if (deg > 180) deg = 180;
-    float frac = lon_mag - (float)deg;
-    uint32_t frac_n = (uint32_t)(frac * 32768.0f + 0.5f);
-    if (frac_n >= 32768) {
-        frac_n = 0;
-        if (deg < 180) deg++;
-    }
-    push_bits(frame, pos, deg, 8);
-    push_bits(frame, pos, frac_n, 15);
-}
-
-/**
- * Compute BCH(250,202) parity using LFSR method (T.018 Appendix B.1)
- * Reads 202 message bits from buffer positions 6..207 and writes
- * 48 BCH parity bits to buffer positions 208..255.
- * @param frame the 32-byte SGB buffer (message already written at bits 6..207)
- */
-static void compute_sgb_bch(uint8_t* frame) {
-    uint64_t reg = 0;
-    for (int i = 0; i < 202; i++) {
-        int bp = i + 6;  // buffer bit position (6 = start of message after padding)
-        bool msg_bit = (frame[bp >> 3] >> (7 - (bp & 7))) & 1;
-        bool feedback = ((reg >> 47) & 1) ^ (msg_bit ? 1u : 0u);
-        reg = (reg << 1) & UINT64_C(0xFFFFFFFFFFFF);
-        if (feedback) reg ^= SGB_BCH_G_LOWER;
-    }
-    // Append 48-bit remainder at buffer positions 208..255
-    int pos = 208;
-    push_bits(frame, pos, reg, 48);
-}
-
-/**
- * Map BeaconType to SGB 3-bit beacon type code (T.018 Table 3.1, bits 138-140)
- * 000=ELT, 001=EPIRB, 010=PLB
- */
-static uint8_t sgb_beacon_type_code(BeaconType t) {
-    switch (t) {
-        case BeaconType::EPIRB:
-            return 0b001;
-        case BeaconType::PLB:
-            return 0b010;
-        default:
-        case BeaconType::ELT:
-            return 0b000;
-    }
-}
-
-/**
- * Generate a Second Generation Beacon (SGB / T.018) frame.
- * The 250-bit frame is stored in 32 bytes with 6 leading padding bits
- * (bits 0..4 = 0, bit 5 = 1).
- * The rotating field is Type 0 — G.008 Objective Requirements (Table 3.3),
- * with elapsed_hours and time_last_loc_min updated from elapsed_s.
- * @param frame     32-byte output buffer
- * @param params    beacon parameters
- * @param elapsed_s seconds elapsed since beacon activation (drives rotating field)
- * @return 32 (size of the generated frame in bytes)
- */
-size_t generate_sgb_beacon(uint8_t* frame, const BeaconParams& params, uint32_t elapsed_s) {
-    memset(frame, 0, 32);
-
-    // 6 padding bits at start of 32-byte buffer: [0,0,0,0,1,0]  (5th bit (1 based index as per specification) = 1 to indicate self-test mode)
-    set_bit(frame, 4, 1);
-
-    // Message bits start at buffer bit position 6 (= SGB message bit 1)
-    int pos = 6;
-
-    // Bits  1-16:  TAC number (16 bits) — T.018 Table 3.1
-    push_bits(frame, pos, SGB_TAC_NUMBER, 16);
-    // Bits 17-30:  Serial number within TAC (14 bits)
-    push_bits(frame, pos, SGB_SERIAL_NUMBER, 14);
-    // Bits 31-40:  Country code (10 bits, ITU MID)
-    push_bits(frame, pos, params.country & 0x3FFU, 10);
-    // Bit  41:     Status of homing device (1 = has 121.5/243 MHz homing device)
-    push_bits(frame, pos, params.has_121_5 ? 1 : 0, 1);
-    // Bit  42:     RLS function flag (0 = no RLS)
-    push_bits(frame, pos, SGB_RLS_FUNCTION, 1);
-    // Bit  43:     Test protocol flag
-    push_bits(frame, pos, params.is_test ? 1 : 0, 1);
-
-    // Bits 44-66:  Encoded GNSS latitude (23 bits) — T.018 Appendix C
-    float lat_mag = params.location.latitude < 0.0f ? -params.location.latitude : params.location.latitude;
-    push_sgb_latitude(frame, pos, params.location.south, lat_mag);
-    // Bits 67-90:  Encoded GNSS longitude (24 bits)
-    float lon_mag = params.location.longitude < 0.0f ? -params.location.longitude : params.location.longitude;
-    push_sgb_longitude(frame, pos, params.location.west, lon_mag);
-
-    // Bits 91-137: Vessel ID (47 bits = 3-bit type selector + 44-bit body)
-    // Type 000 = No aircraft/maritime identity; body all zeros
-    push_bits(frame, pos, 0, 47);
-
-    // Bits 138-140: Beacon type (3 bits)
-    push_bits(frame, pos, sgb_beacon_type_code(params.type), 3);
-
-    // Bits 141-154: Spare (14 bits, all 1s in normal operation)
-    push_bits(frame, pos, 0x3FFFU, 14);
-
-    // Bits 155-202: Rotating Field Type 0 — G.008 Objective Requirements (Table 3.3)
-    // Bits 155-158: Identifier (4 bits = 0000)
-    push_bits(frame, pos, 0b0000U, 4);
-    // Bits 159-164: Elapsed time since activation (6 bits, 0-63 h, truncated at 63)
-    uint32_t elapsed_h = elapsed_s / 3600;
-    if (elapsed_h > 63) elapsed_h = 63;
-    push_bits(frame, pos, elapsed_h, 6);
-    // Bits 165-175: Time from last encoded location (11 bits, 0-2046 min; 2047 = no fix)
-    uint32_t loc_age_min = elapsed_s / 60;
-    if (loc_age_min > 2046) loc_age_min = 2046;
-    push_bits(frame, pos, loc_age_min, 11);
-    // Bits 176-185: Altitude of encoded location (10 bits; 0x3FF = no altitude)
-    push_bits(frame, pos, 0x3FFU, 10);
-    // Bits 186-193: Dilution of Precision (4-bit HDOP + 4-bit VDOP; 0 = best HDOP, 0 = best VDOP)
-    push_bits(frame, pos, 0b00000000U, 8);
-    // Bits 194-195: Activation notification (00 = manual by user)
-    push_bits(frame, pos, 0b00U, 2);
-    // Bits 196-198: Remaining battery capacity (101 = >75%)
-    push_bits(frame, pos, 0b101U, 3);
-    // Bits 199-200: GNSS status (10 = 3D fix)
-    push_bits(frame, pos, 0b10U, 2);
-    // Bits 201-202: Spare (00)
-    push_bits(frame, pos, 0b00U, 2);
-
-    // pos == 208: 6 padding + 202 message bits consumed
-
-    // Bits 203-250: BCH(250,202) parity (48 bits) computed and written at positions 208-255
-    compute_sgb_bch(frame);
-
-    return 32;
-}
-
 }  // namespace ui::external_app::epirb_tx

 #endif /*__BEACON_H__*/
@@ -24,6 +24,7 @@
 #include "portapack.hpp"
 #include "ui_epirb_tx.hpp"
 #include <cmath>
+#include <cctype>
 #include <cstdio>

 namespace ui::external_app::epirb_tx {
@@ -36,17 +37,17 @@ namespace ui::external_app::epirb_tx {
 * @param min output minutes value
 * @param sec output seconds value
 */
-static void decimal_to_dms(float value, bool& negative, int16_t& deg, int8_t& min, int8_t& sec) {
+static void decimal_to_dms(double value, bool& negative, uint16_t& deg, uint8_t& min, uint8_t& sec) {
    negative = value < 0;
    value = std::fabs(value);

-    deg = (int16_t)value;
+    deg = (uint16_t)value;

-    float m = (value - deg) * 60.0f;
-    min = (int8_t)m;
+    double m = (value - deg) * 60.0;
+    min = (uint8_t)m;

-    float s = (m - min) * 60.0f;
-    sec = (int8_t)(s + 0.5f);
+    double s = (m - min) * 60.0;
+    sec = (uint8_t)(s + 0.5);

    if (sec == 60) {
        sec = 0;
@@ -67,8 +68,8 @@ static void decimal_to_dms(float value, bool& negative, int16_t& deg, int8_t& mi
 * @param sec seconds value
 * @return value the decimal value
 */
-static float dms_to_decimal(bool negative, int16_t deg, int8_t min, int8_t sec) {
-    float v = deg + min / 60.0f + sec / 3600.0f;
+static double dms_to_decimal(bool negative, uint16_t deg, uint8_t min, uint8_t sec) {
+    double v = deg + min / 60.0 + sec / 3600.0;
    return negative ? -v : v;
 }

@@ -79,60 +80,55 @@ static float dms_to_decimal(bool negative, int16_t deg, int8_t min, int8_t sec)
 * @param lon output longitude
 */
 static void maidenhead_to_decimal(const std::string& loc, float& lat, float& lon) {
-    static const float lon_step[] =
+    static const double lon_step[] =
        {
-            20.0f,
-            2.0f,
-            1.0f / 12.0f,
-            1.0f / 120.0f,
-            1.0f / 2880.0f};
+            20.0,
+            2.0,
+            1.0 / 12.0,
+            1.0 / 120.0,
+            1.0 / 2880.0};

-    static const float lat_step[] =
+    static const double lat_step[] =
        {
-            10.0f,
-            1.0f,
-            1.0f / 24.0f,
-            1.0f / 240.0f,
-            1.0f / 5760.0f};
+            10.0,
+            1.0,
+            1.0 / 24.0,
+            1.0 / 240.0,
+            1.0 / 5760.0};

-    lon = -180.0f;
-    lat = -90.0f;
+    lon = -180.0;
+    lat = -90.0;

    int pairs = loc.size() / 2;
-
    if (pairs > 5)
        pairs = 5;

-    if (pairs > 0) {
-        for (int i = 0; i < pairs; i++) {
-            char c1 = loc[i * 2];
-            char c2 = loc[i * 2 + 1];
-            if (c1 >= 'a' && c1 <= 'z') c1 -= ('a' - 'A');
-            if (c2 >= 'a' && c2 <= 'z') c2 -= ('a' - 'A');
+    for (int i = 0; i < pairs; i++) {
+        char c1 = std::toupper(loc[i * 2]);
+        char c2 = std::toupper(loc[i * 2 + 1]);

-            float lon_size = lon_step[i];
-            float lat_size = lat_step[i];
+        double lon_size = lon_step[i];
+        double lat_size = lat_step[i];

-            int v1, v2;
+        int v1, v2;

-            if (i % 2 == 0)  // letters
-            {
-                v1 = c1 - 'A';
-                v2 = c2 - 'A';
-            } else  // digits
-            {
-                v1 = c1 - '0';
-                v2 = c2 - '0';
-            }
-
-            lon += v1 * lon_size;
-            lat += v2 * lat_size;
+        if (i % 2 == 0)  // letters
+        {
+            v1 = c1 - 'A';
+            v2 = c2 - 'A';
+        } else  // digits
+        {
+            v1 = c1 - '0';
+            v2 = c2 - '0';
        }

-        // Cell center
-        lon += lon_step[pairs - 1] / 2.0f;
-        lat += lat_step[pairs - 1] / 2.0f;
+        lon += v1 * lon_size;
+        lat += v2 * lat_size;
    }
+
+    // Cell center
+    lon += lon_step[pairs - 1] / 2.0;
+    lat += lat_step[pairs - 1] / 2.0;
 }

 /**
@@ -142,9 +138,9 @@ static void maidenhead_to_decimal(const std::string& loc, float& lat, float& lon
 * @param precision (optional, defaults to 8) the number of charater for the maidenhead locator
 * @return the locator
 */
-static std::string decimal_to_maidenhead(float lat, float lon, int precision = 8) {
-    lon += 180.0f;
-    lat += 90.0f;
+static std::string decimal_to_maidenhead(double lat, double lon, int precision = 8) {
+    lon += 180.0;
+    lat += 90.0;

    int A = lon / 20;
    int B = lat / 10;
@@ -158,14 +154,14 @@ static std::string decimal_to_maidenhead(float lat, float lon, int precision = 8
    lon -= C * 2;
    lat -= D * 1;

-    int E = lon / (5.0f / 60.0f);
-    int F = lat / (2.5f / 60.0f);
+    int E = lon / (5.0 / 60.0);
+    int F = lat / (2.5 / 60.0);

-    lon -= E * (5.0f / 60.0f);
-    lat -= F * (2.5f / 60.0f);
+    lon -= E * (5.0 / 60.0);
+    lat -= F * (2.5 / 60.0);

-    int G = lon / (5.0f / 600.0f);
-    int H = lat / (2.5f / 600.0f);
+    int G = lon / (5.0 / 600.0);
+    int H = lat / (2.5 / 600.0);

    std::string locator;

@@ -251,9 +247,9 @@ void init_from_dms(Location& loc) {
 * Convert the provided Loaction to it's latitude string (format <xxx°yy'zz"N>)
 */
 std::string to_latitude_string(const Location& location) {
-    char buffer[20];
+    char buffer[16];
    // Format :  <xxx°yy'zz"N>
-    sprintf(buffer, "%3d\260%02d'%02d\"%c", location.lat_deg, location.lat_min, location.lat_sec, location.south ? 'S' : 'N');
+    snprintf(buffer, sizeof(buffer), "%3d\260%02d'%02d\"%c", location.lat_deg, location.lat_min, location.lat_sec, location.south ? 'S' : 'N');
    return std::string(buffer);
 }

@@ -261,12 +257,12 @@ std::string to_latitude_string(const Location& location) {
 * Convert the provided Loaction to it's longitude string (format <xxx°yy'zz"W>)
 */
 std::string to_longitude_string(const Location& location) {
-    char buffer[20];
+    char buffer[16];
    // Format :  <xxx°yy'zz"W>
-    sprintf(buffer, "%3d\260%02d'%02d\"%c", location.long_deg, location.long_min, location.long_sec, location.west ? 'W' : 'E');
+    snprintf(buffer, sizeof(buffer), "%3d\260%02d'%02d\"%c", location.long_deg, location.long_min, location.long_sec, location.west ? 'W' : 'E');
    return std::string(buffer);
 }

 }  // namespace ui::external_app::epirb_tx

-#endif /*__LOCATION_H__*/
+#endif /*__LOCATION_H__*/
@@ -1,438 +1,332 @@
-/*
- * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __EPIRB_TX_H__
-#define __EPIRB_TX_H__
-
-#include "app_settings.hpp"
-#include "radio_state.hpp"
-#include "ui.hpp"
-#include "ui_widget.hpp"
-#include "ui_navigation.hpp"
-#include "ui_transmitter.hpp"
-
-#include "portapack.hpp"
-#include "message.hpp"
-#include "tonesets.hpp"
-
-#define BEACON_SIZE_FGB 18
-#define BEACON_SIZE_SGB 32
-#define BEACON_HEXA_SIZE_FGB BEACON_SIZE_FGB * 2
-#define BEACON_HEXA_SIZE_SGB BEACON_SIZE_SGB * 2
-#define BEACON_HEXA_SPLIT_FGB 18
-#define BEACON_HEXA_SPLIT_SGB 22
-
-#define AM_TEST_FREQUENCY 121375000
-#define AM_REAL_FREQUENCY 121500000
-
-#define BPSK_FREQUENCY_HAM 433025000
-#define BPSK_FREQUENCY_B 406025000
-#define BPSK_FREQUENCY_C 406028000
-#define BPSK_FREQUENCY_F 406037000
-#define BPSK_FREQUENCY_G 406040000
-#define BPSK_FREQUENCY_J 406049000
-#define BPSK_FREQUENCY_K 406052000
-#define BPSK_FREQUENCY_N 406061000
-#define BPSK_FREQUENCY_O 406064000
-#define BPSK_FREQUENCY_SGB 406050000
-
-namespace ui::external_app::epirb_tx {
-
-enum class BeaconMode {
-    FILE = 0,
-    MODE_MANUAL = 1
-};
-
-enum class BeaconType {
-    EPIRB = 0,
-    ELT = 1,
-    PLB = 2
-};
-
-enum class BeaconProtocol {
-    USER = 0,
-    STANDARD = 1,
-    NATIONAL = 2
-};
-
-enum class AmChannel {
-    TEST = 0,
-    REAL = 1,
-    MANUAL = 2
-};
-
-enum class BpskChannel {
-    HAM = 0,
-    B = 1,
-    C = 2,
-    F = 3,
-    G = 4,
-    J = 5,
-    K = 6,
-    N = 7,
-    O = 8,
-    MANUAL = 10,
-    SGB = 100
-};
-
-struct Location {
-    std::string locator;
-    bool south;
-    int16_t lat_deg;
-    int8_t lat_min;
-    int8_t lat_sec;
-    float latitude;
-    bool west;
-    int16_t long_deg;
-    int8_t long_min;
-    int8_t long_sec;
-    float longitude;
-};
-
-struct BeaconParams {
-    BeaconType type;
-    BeaconProtocol protocol;
-    uint32_t country;
-    bool is_test;
-    bool is_internal;
-    bool has_121_5;
-    Location location;
-};
-
-class EPIRBTXAppView : public View {
-   public:
-    EPIRBTXAppView(NavigationView& nav);
-    ~EPIRBTXAppView();
-
-    void focus() override;
-
-    std::string title() const override { return "EPIRB TX"; };
-
-   private:
-    void start_tx();
-    void stop_tx();
-    void update_config();
-    void on_tx_progress(const uint32_t progress, const bool done);
-    void on_timer();
-    void load_beacons();
-    void set_tx_button_state(bool active);
-    std::string frame_to_hex_string_range(int offset_bytes, int count_bytes);
-    void generate_frame(BeaconParams params);
-    void update_frame(bool updateConfig = true);
-    void update_bpsk_frequency();
-    void update_am_transmission();
-    void update_mode();
-    void update_location(bool updateLocatorField = true);
-
-    struct Beacon {
-        std::string title{};
-        std::string description{};
-        std::string frame{};
-    };
-    NavigationView& nav_;
-
-    std::vector<Beacon> beacons{};
-    Beacon default_beacon{"Self test", "Serial User Location Protocol", "FFFED0D6E6202820000C29FF51041775302D"};
-
-    BeaconParams beacon_params{BeaconType::ELT, BeaconProtocol::STANDARD, 227, true, true, true, {"JN03RO", false, 0, 0, 0, 0, false, 0, 0, 0, 0}};
-
-    // Currently selected beacon index (from BEACONS.TXT file / options_frame combo)
-    uint32_t selected_beacon{0};
-
-    // Frequency of the transmitter before starting the app (used to restore frequency when leaving)
-    rf::Frequency original_frequency{0};
-    // Frequency of the AM emergency signal
-    rf::Frequency am_frequency{AM_TEST_FREQUENCY};
-    // Frequency of the 406 MHz BPSK signal
-    rf::Frequency bpsk_frequency{BPSK_FREQUENCY_HAM};
-    // Selected am channel
-    uint8_t am_channel{(uint8_t)AmChannel::TEST};
-    // Selected bpsk channel
-    uint8_t bpsk_channel{(uint8_t)BpskChannel::HAM};
-    // Manual AM frequency value
-    rf::Frequency manual_am_frequency{AM_TEST_FREQUENCY};
-    // Manual BPSK frequency value
-    rf::Frequency manual_bpsk_frequency{BPSK_FREQUENCY_HAM};
-
-    // True when using a beacon from the BEACONS.TXT file
-    bool mode_file{false};
-    // True when slideshow is enabled for file mode (change beacon after every transmission)
-    bool slideshow_enabled{false};
-    // True when looping on sending beacons is enabled
-    bool loop_enabled{true};
-    // True if AM emergency signal transmission is enabled
-    bool am_enabled{true};
-    // True if we want to send a new frame each time the user changes the current beacon
-    bool send_on_change{true};
-    // The current locator string
-    std::string locator{"JN03RO"};
-    // The delay between each frame when on loop mode
-    uint32_t delay{50};
-    uint8_t beacon_type{(uint8_t)BeaconType::EPIRB};
-    // Currently selected beacon protocol
-    uint8_t beacon_protocol{(uint8_t)BeaconProtocol::USER};
-    // Currently selected beacon country
-    uint32_t beacon_country{227};
-    // Current beacon's internal state (true for internal location system)
-    bool beacon_internal{true};
-
-    TxRadioState radio_state_{
-        0 /* frequency */,
-        1750000 /* bandwidth */,
-        TONES_SAMPLERATE /* sampling rate */
-    };
-    app_settings::SettingsManager settings_{
-        "tx_epirb",
-        app_settings::Mode::TX,
-        {
-            {"sbeacon"sv, &selected_beacon},
-            {"amfreq"sv, &am_frequency},
-            {"bpskfreq"sv, &bpsk_frequency},
-            {"amchan"sv, &am_channel},
-            {"bpskchan"sv, &bpsk_channel},
-            {"loop"sv, &loop_enabled},
-            {"delay"sv, &delay},
-            {"file"sv, &mode_file},
-            {"slideshow"sv, &slideshow_enabled},
-            {"am"sv, &am_enabled},
-            {"soc"sv, &send_on_change},
-            {"type"sv, &beacon_type},
-            {"proto"sv, &beacon_protocol},
-            {"country"sv, &beacon_country},
-            {"internal"sv, &beacon_internal},
-            {"locator"sv, &locator},
-            {"sgb"sv, &format_sgb},
-        }};
-
-    // Time of the last sent frame
-    uint32_t last_frame_time{0};
-    // True when transmission is enabled
-    bool transmitting{false};
-    // True when transmitting a BPSK frame
-    bool transmitting_bpsk{false};
-    // True when currently looping on sending beacons
-    bool loop{false};
-    // True when SGB (Second Generation Beacon) format is selected
-    bool format_sgb{false};
-    // System time (ms) when the current SGB transmission session started
-    uint32_t sgb_start_time{0};
-
-    // Current EPIRBTXDataMessage for baseband
-    EPIRBTXDataMessage epirb_tx_message{};
-
-    const size_t max_text_width = UI_POS_WIDTH_REMAINING(6) / UI_POS_DEFAULT_WIDTH;
-    const size_t max_text_width_ext = UI_POS_WIDTH_REMAINING(0) / UI_POS_DEFAULT_WIDTH;
-
-    Labels labels{
-        {{UI_POS_X(0), UI_POS_Y(0)}, "Source:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), UI_POS_Y(6)}, "Frame:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), UI_POS_Y(10)}, "Next frame in   s.", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), UI_POS_Y(12)}, "AM frequency:         MHz", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), UI_POS_Y(14)}, "AM   chan.:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(0), UI_POS_Y(15)}, "BPSK chan.:", Theme::getInstance()->fg_light->foreground},
-        {{UI_POS_X(17), UI_POS_Y(9)}, "s.", Theme::getInstance()->fg_light->foreground}};
-
-    // For file mode
-    struct FileModeWidgets {
-        Text text_beacon{
-            {UI_POS_X(0), UI_POS_Y(1), UI_POS_WIDTH(7), UI_POS_DEFAULT_HEIGHT},
-            "Beacon:"};
-        // Beacon selection from BEACONS.TXT
-        OptionsField options_frame{
-            {UI_POS_X(7), UI_POS_Y(1)},
-            30,
-            {}};
-        Text text_description_label{
-            {UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT},
-            "Description:"};
-        Text text_description{
-            {UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH_REMAINING(0), UI_POS_DEFAULT_HEIGHT},
-            ""};
-        Text text_description_end{
-            {UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH_REMAINING(0), UI_POS_DEFAULT_HEIGHT},
-            ""};
-        Checkbox checkbox_slideshow{
-            {UI_POS_X(0), UI_POS_Y(5)},
-            9,
-            "Slideshow",
-            true};
-    };
-    std::unique_ptr<FileModeWidgets> file_mode_ui{};
-
-    // For manual mode
-    Text text_beacon_type{
-        {UI_POS_X(0), UI_POS_Y(1), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
-        "Type:"};
-    Text text_beacon_country{
-        {UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
-        "Country:"};
-    Checkbox checkbox_beacon_internal{
-        {UI_POS_X_RIGHT(12), UI_POS_Y(2)},
-        12,
-        "Internal",
-        true};
-    Text text_beacon_locator{
-        {UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
-        "Locator:"};
-    Text text_beacon_latitude{
-        {UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
-        "Lat.:"};
-    Text text_beacon_longitude{
-        {UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
-        "Long.:"};
-    Text text_beacon_latitude_value{
-        {UI_POS_X(7), UI_POS_Y(4), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT},
-        ""};
-    Text text_beacon_longitude_value{
-        {UI_POS_X(7), UI_POS_Y(5), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT},
-        ""};
-    OptionsField options_beacon_type{
-        {UI_POS_X(9), UI_POS_Y(1)},
-        7,
-        {{"EPIRB", (uint8_t)BeaconType::EPIRB},
-         {"ELT", (uint8_t)BeaconType::ELT},
-         {"PLB", (uint8_t)BeaconType::PLB}}};
-    OptionsField options_beacon_protocol{
-        {UI_POS_X(9 + 7), UI_POS_Y(1)},
-        8,
-        {{"User", (uint8_t)BeaconProtocol::USER},
-         {"Standard", (uint8_t)BeaconProtocol::STANDARD},
-         {"National", (uint8_t)BeaconProtocol::NATIONAL}}};
-    // Format selector (FGB / SGB) — manual mode only, same row as type/protocol
-    OptionsField options_format{
-        {UI_POS_X_RIGHT(4), UI_POS_Y(1)},
-        4,
-        {{"FGB", 0},
-         {"SGB", 1}}};
-
-    OptionsField options_beacon_country{
-        {UI_POS_X(9), UI_POS_Y(2)},
-        7,
-        {{"France", 227},
-         {"USA", 366},
-         {"Germany", 211},
-         {"Russia", 273},
-         {"Spain", 224},
-         {"Japan", 431},
-         {"UK", 232}}};
-    TextField text_field_beacon_locator{
-        {UI_POS_X(9), UI_POS_Y(3), UI_POS_WIDTH(10), UI_POS_DEFAULT_HEIGHT},
-        "JN03RO"};
-    Button button_mangps{
-        {UI_POS_X_RIGHT(9), UI_POS_Y(3), UI_POS_WIDTH(9), UI_POS_HEIGHT(2)},
-        "Set pos."};
-
-    // Mode selection (file/manual)
-    OptionsField options_mode{
-        {UI_POS_X(7), UI_POS_Y(0)},
-        30,
-        {{"File (BEACONS.TXT)", (uint8_t)BeaconMode::FILE},
-         {"Manual (Editor)", (uint8_t)BeaconMode::MODE_MANUAL}}};
-
-    // Frame content
-    Text text_frame{
-        {UI_POS_X(6), UI_POS_Y(6), UI_POS_WIDTH_REMAINING(6), UI_POS_DEFAULT_HEIGHT},
-        ""};
-    Text text_frame_end{
-        {UI_POS_X(6), UI_POS_Y(7), UI_POS_WIDTH_REMAINING(6), UI_POS_DEFAULT_HEIGHT},
-        ""};
-    Text text_frame_sgb_end{
-        {UI_POS_X(6), UI_POS_Y(8), UI_POS_WIDTH_REMAINING(6), UI_POS_DEFAULT_HEIGHT},
-        ""};
-
-    Text text_timeout{
-        {UI_POS_X(14), UI_POS_Y(10), UI_POS_WIDTH(2), UI_POS_DEFAULT_HEIGHT},
-        ""};
-
-    // Transmission settings
-    Checkbox checkbox_loop{
-        {UI_POS_X(0), UI_POS_Y(9)},
-        10,
-        "Resend every",
-        true};
-    NumberField field_delay{
-        {UI_POS_X(15), UI_POS_Y(9)},
-        2,
-        {1, 99},
-        1,
-        ' '};
-    Checkbox checkbox_am{
-        {UI_POS_X(0), UI_POS_Y(11)},
-        10,
-        "AM signal",
-        true};
-    FrequencyField field_am_frequency{
-        {UI_POS_X(13), UI_POS_Y(12)}};
-    Checkbox checkbox_send_on_change{
-        {UI_POS_X(0), UI_POS_Y(13)},
-        14,
-        "Send on change",
-        true};
-    Button button_tx{
-        {UI_POS_X_RIGHT(9), UI_POS_Y(9), UI_POS_WIDTH(9), UI_POS_HEIGHT(2)},
-        "START"};
-    const Style& style_tx_start = *Theme::getInstance()->fg_green;
-    const Style& style_tx_stop = *Theme::getInstance()->fg_red;
-    OptionsField options_am_channel{
-        {UI_POS_X(11), UI_POS_Y(14)},
-        20,
-        {{"121.375 MHz (Test)", 0},
-         {"121.500 MHz /!\\Real", 1},
-         {"Manual", 2}}};
-    OptionsField options_bpsk_channel{
-        {UI_POS_X(11), UI_POS_Y(15)},
-        20,
-        {{"433.025 MHz (Ham)", (uint8_t)BpskChannel::HAM},
-         {"406.025 MHz (B)", (uint8_t)BpskChannel::B},
-         {"406.028 MHz (C)", (uint8_t)BpskChannel::C},
-         {"406.037 MHz (F)", (uint8_t)BpskChannel::F},
-         {"406.040 MHz (G)", (uint8_t)BpskChannel::G},
-         {"406.049 MHz (J)", (uint8_t)BpskChannel::J},
-         {"406.052 MHz (K)", (uint8_t)BpskChannel::K},
-         {"406.061 MHz (N)", (uint8_t)BpskChannel::N},
-         {"406.064 MHz (O)", (uint8_t)BpskChannel::O},
-         {"406.050 MHz (SGB)", (uint8_t)BpskChannel::SGB},
-         {"Manual", (uint8_t)BpskChannel::MANUAL}}};
-
-    // Transmitter view
-    TransmitterView tx_view{
-        (int16_t)UI_POS_Y_BOTTOM(4),
-        10000,
-        12};
-
-    MessageHandlerRegistration message_handler_tx_progress{
-        Message::ID::TXProgress,
-        [this](const Message* const p) {
-            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
-            this->on_tx_progress(message.progress, message.done);
-        }};
-
-    MessageHandlerRegistration message_handler_frame_sync{
-        // Use frame sync for our applcation timer callback
-        Message::ID::DisplayFrameSync,
-        [this](const Message* const) {
-            this->on_timer();
-        }};
-};
-
-}  // namespace ui::external_app::epirb_tx
-
-#endif /*__EPIRB_TX_H__*/
+/*
+ * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __EPIRB_TX_H__
+#define __EPIRB_TX_H__
+
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "ui.hpp"
+#include "ui_widget.hpp"
+#include "ui_navigation.hpp"
+#include "ui_transmitter.hpp"
+
+#include "portapack.hpp"
+#include "message.hpp"
+#include "tonesets.hpp"
+
+#define BEACON_HEXA_SIZE 36
+#define BEACON_HEXA_HALF_SIZE 18
+#define BEACON_SIZE 18
+
+namespace ui::external_app::epirb_tx {
+
+enum class BeaconType {
+    EPIRB = 0,
+    ELT = 1,
+    PLB = 2
+};
+
+enum class BeaconProtocol {
+    USER = 0,
+    STANDARD = 1,
+    NATIONAL = 2
+};
+
+struct Location {
+    std::string locator;
+    bool south;
+    uint16_t lat_deg;
+    uint8_t lat_min;
+    uint8_t lat_sec;
+    float latitude;
+    bool west;
+    uint16_t long_deg;
+    uint8_t long_min;
+    uint8_t long_sec;
+    float longitude;
+};
+
+struct BeaconParams {
+    BeaconType type;
+    BeaconProtocol protocol;
+    uint32_t country;
+    bool is_test;
+    bool is_internal;
+    bool has_121_5;
+    Location location;
+};
+
+class EPIRBTXAppView : public View {
+   public:
+    EPIRBTXAppView(NavigationView& nav);
+    ~EPIRBTXAppView();
+
+    void focus() override;
+
+    std::string title() const override { return "EPIRB TX"; };
+
+   private:
+    void start_tx();
+    void stop_tx();
+    void update_config();
+    void on_tx_progress(const uint32_t progress, const bool done);
+    void on_timer();
+    void load_beacons();
+    void set_tx_button_state(bool active);
+    std::string frame_to_hex_string(bool start);
+    void generate_frame(BeaconParams params);
+    void update_frame(bool updateConfig = true);
+    void update_mode();
+    void update_location(bool updateLocatorField = true);
+
+    struct Beacon {
+        std::string title{};
+        std::string description{};
+        std::string frame{};
+    };
+    std::vector<Beacon> beacons{};
+    Beacon default_beacon{"Self test", "Serial User Location Protocol", "FFFED0D6E6202820000C29FF51041775302D"};
+
+    BeaconParams beacon_params{BeaconType::ELT, BeaconProtocol::STANDARD, 227, true, true, true, {"JN03RO", false, 0, 0, 0, 0, false, 0, 0, 0, 0}};
+
+    // Currently selected beacon index (from BEACONS.TXT file / options_frame combo)
+    uint32_t selected_beacon{0};
+
+    // Frequency of the transmitter before starting the app (used to restore frequency when leaving)
+    rf::Frequency original_frequency{0};
+    // Frequency of the AM emergency signal
+    rf::Frequency am_frequency{121500000};
+    // Frequency of the 406 MHz BPSK signal
+    rf::Frequency bpsk_frequency{406025000};
+
+    // True when using a beacon from the BEACONS.TXT file
+    bool mode_file{true};
+    // True when looping on sending beacons is enabled
+    bool loop_enabled{true};
+    // True if AM emergency signal transmission is enabled
+    bool am_enabled{true};
+    // True if we want to send a new frame each time the user changes the current beacon
+    bool send_on_change{false};
+    // The current locator string
+    std::string locator{"JN03RO"};
+    // The delay between each frame when on loop mode
+    uint32_t delay{50};
+    uint8_t beacon_type{0};
+    // Currently selected beacon protocol
+    uint8_t beacon_protocol{0};
+    // Currently selected beacon country
+    uint32_t beacon_country{227};
+    // Current beacon's internal state (true for internal location system)
+    bool beacon_internal{true};
+
+    TxRadioState radio_state_{
+        0 /* frequency */,
+        1750000 /* bandwidth */,
+        TONES_SAMPLERATE /* sampling rate */
+    };
+    app_settings::SettingsManager settings_{
+        "tx_epirb",
+        app_settings::Mode::TX,
+        {
+            {"sbeacon"sv, &selected_beacon},
+            {"amfreq"sv, &am_frequency},
+            {"bpskfreq"sv, &bpsk_frequency},
+            {"loop"sv, &loop_enabled},
+            {"delay"sv, &delay},
+            {"file"sv, &mode_file},
+            {"am"sv, &am_enabled},
+            {"soc"sv, &send_on_change},
+            {"type"sv, &beacon_type},
+            {"proto"sv, &beacon_protocol},
+            {"country"sv, &beacon_country},
+            {"internal"sv, &beacon_internal},
+            {"locator"sv, &locator},
+        }};
+
+    // Time of the last sent frame
+    uint32_t last_frame_time{0};
+    // True when transmission is enabled
+    bool transmitting{false};
+    // True when currently looping on sending beacons
+    bool loop{false};
+
+    // Current EPIRBTXDataMessage for baseband
+    EPIRBTXDataMessage epirb_tx_message{};
+
+    const size_t max_text_width = UI_POS_WIDTH_REMAINING(6) / UI_POS_DEFAULT_WIDTH;
+    const size_t max_text_width_ext = UI_POS_WIDTH_REMAINING(0) / UI_POS_DEFAULT_WIDTH;
+
+    Labels labels{
+        {{UI_POS_X(0), UI_POS_Y(0)}, "Source:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(6)}, "Frame:", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(10)}, "Next frame in   s.", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(0), UI_POS_Y(12)}, "AM frequency          MHz", Theme::getInstance()->fg_light->foreground},
+        {{UI_POS_X(17), UI_POS_Y(9)}, "s.", Theme::getInstance()->fg_light->foreground}};
+
+    // For file mode
+    Text text_beacon{
+        {UI_POS_X(0), UI_POS_Y(1), UI_POS_WIDTH(7), UI_POS_DEFAULT_HEIGHT},
+        "Beacon:"};
+    // Beacon selection from BEACONS.TXT
+    OptionsField options_frame{
+        {UI_POS_X(7), UI_POS_Y(1)},
+        30,
+        {}};
+    Text text_description_label{
+        {UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT},
+        "Description:"};
+    Text text_description{
+        {UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH_REMAINING(0), UI_POS_DEFAULT_HEIGHT},
+        ""};
+    Text text_description_end{
+        {UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH_REMAINING(0), UI_POS_DEFAULT_HEIGHT},
+        ""};
+
+    // For manual mode
+    Text text_beacon_type{
+        {UI_POS_X(0), UI_POS_Y(1), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
+        "Type:"};
+    Text text_beacon_country{
+        {UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
+        "Country:"};
+    Checkbox checkbox_beacon_internal{
+        {UI_POS_X_RIGHT(12), UI_POS_Y(2)},
+        12,
+        "Internal",
+        true};
+    Text text_beacon_locator{
+        {UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
+        "Locator:"};
+    Text text_beacon_latitude{
+        {UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
+        "Lat.:"};
+    Text text_beacon_longitude{
+        {UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT},
+        "Long.:"};
+    Text text_beacon_latitude_value{
+        {UI_POS_X(7), UI_POS_Y(4), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT},
+        ""};
+    Text text_beacon_longitude_value{
+        {UI_POS_X(7), UI_POS_Y(5), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT},
+        ""};
+    OptionsField options_beacon_type{
+        {UI_POS_X(9), UI_POS_Y(1)},
+        7,
+        {{"EPIRB", 0},
+         {"ELT", 1},
+         {"PLB", 2}}};
+    OptionsField options_beacon_protocol{
+        {UI_POS_X(9 + 7), UI_POS_Y(1)},
+        30,
+        {{"User", 0},
+         {"Standard", 1},
+         {"National", 2}}};
+    OptionsField options_beacon_country{
+        {UI_POS_X(9), UI_POS_Y(2)},
+        7,
+        {{"France", 227},
+         {"USA", 366},
+         {"Germany", 211},
+         {"Russia", 273},
+         {"Spain", 224},
+         {"Japan", 431},
+         {"UK", 232}}};
+    TextField text_field_beacon_locator{
+        {UI_POS_X(9), UI_POS_Y(3), UI_POS_WIDTH(10), UI_POS_DEFAULT_HEIGHT},
+        "JN03RO"};
+    Button button_mangps{
+        {UI_POS_X_RIGHT(9), UI_POS_Y(3), UI_POS_WIDTH(9), UI_POS_HEIGHT(2)},
+        "Set pos."};
+
+    // Mode selection (file/manual)
+    OptionsField options_mode{
+        {UI_POS_X(7), UI_POS_Y(0)},
+        30,
+        {{"File (BEACONS.TXT)", 0},
+         {"Manual (Editor)", 1}}};
+
+    // Frame content
+    Text text_frame{
+        {UI_POS_X(6), UI_POS_Y(6), UI_POS_WIDTH_REMAINING(6), UI_POS_DEFAULT_HEIGHT},
+        ""};
+    Text text_frame_end{
+        {UI_POS_X(6), UI_POS_Y(7), UI_POS_WIDTH_REMAINING(6), UI_POS_DEFAULT_HEIGHT},
+        ""};
+
+    Text text_timeout{
+        {UI_POS_X(14), UI_POS_Y(10), UI_POS_WIDTH(2), UI_POS_DEFAULT_HEIGHT},
+        ""};
+
+    // Transmission settings
+    Checkbox checkbox_loop{
+        {UI_POS_X(0), UI_POS_Y(9)},
+        10,
+        "Resend every",
+        true};
+    NumberField field_delay{
+        {UI_POS_X(15), UI_POS_Y(9)},
+        2,
+        {1, 99},
+        1,
+        ' '};
+    Checkbox checkbox_am{
+        {UI_POS_X(0), UI_POS_Y(11)},
+        10,
+        "AM signal",
+        true};
+    FrequencyField field_am_frequency{
+        {UI_POS_X(13), UI_POS_Y(12)}};
+    Checkbox checkbox_send_on_change{
+        {UI_POS_X(0), UI_POS_Y(13)},
+        14,
+        "Send on change",
+        true};
+    Button button_tx{
+        {UI_POS_X_RIGHT(9), UI_POS_Y(9), UI_POS_WIDTH(9), UI_POS_HEIGHT(2)},
+        "START"};
+    const Style& style_tx_start = *Theme::getInstance()->fg_green;
+    const Style& style_tx_stop = *Theme::getInstance()->fg_red;
+
+    // Transmitter view
+    TransmitterView tx_view{
+        (int16_t)UI_POS_Y_BOTTOM(4),
+        10000,
+        12};
+
+    MessageHandlerRegistration message_handler_tx_progress{
+        Message::ID::TXProgress,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
+            this->on_tx_progress(message.progress, message.done);
+        }};
+
+    MessageHandlerRegistration message_handler_frame_sync{
+        // Use frame sync for our applcation timer callback
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->on_timer();
+        }};
+};
+
+}  // namespace ui::external_app::epirb_tx
+
+#endif /*__EPIRB_TX_H__*/
@@ -100,7 +100,7 @@ namespace ui::external_app::ert_app {

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

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

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

-	#vor_rx
-	external/vor_rx/main.cpp
-	external/vor_rx/ui_vor_rx.cpp
-
-	#vor_tx
-	external/vor_tx/main.cpp
-	external/vor_tx/ui_vor_tx.cpp
-
 	#shoppingcart_lock 272 bytes
 	external/shoppingcart_lock/main.cpp
 	external/shoppingcart_lock/shoppingcart_lock.cpp
@@ -169,7 +161,6 @@ set(EXTCPPSRC
 	#mcu_temperature    112
 	external/mcu_temperature/main.cpp
 	external/mcu_temperature/mcu_temperature.cpp
-	external/mcu_temperature/temperature_logger.cpp

 	#fmradio  640
 	external/fmradio/main.cpp
@@ -272,10 +263,6 @@ set(EXTCPPSRC
 	#epirb_rx 168 byte flash 
 	external/epirb_rx/main.cpp
 	external/epirb_rx/ui_epirb_rx.cpp
-	external/epirb_rx/ui_beaconlist.cpp
-	external/epirb_rx/beacon_db.cpp
-	external/epirb_rx/beacon.cpp
-	external/epirb_rx/location.cpp

 	#epirb_tx
 	external/epirb_tx/main.cpp
@@ -322,10 +309,8 @@ set(EXTCPPSRC
 	external/morseradiotx/main.cpp
 	external/morseradiotx/ui_morse_radiotx.cpp

-	#keeloqtx
  	external/keeloqtx/main.cpp
  	external/keeloqtx/ui_keeloqtx.cpp
-
 	#rtty_rx
 	external/rtty_rx/main.cpp
 	external/rtty_rx/ui_rtty_rx.cpp
@@ -336,14 +321,10 @@ set(EXTCPPSRC
 	external/rtty_tx/ui_rtty_tx.cpp
 	external/rtty_tx/baudot.cpp

-	#pocsag_tx
+    #pocsag_tx
 	external/pocsag_tx/main.cpp
 	external/pocsag_tx/ui_pocsag_tx.cpp

-	#flex_tx
-	external/flex_tx/main.cpp
-	external/flex_tx/ui_flex_tx.cpp
-
 	#time_sink
 	external/time_sink/main.cpp
 	external/time_sink/ui_time_sink.cpp
@@ -359,54 +340,6 @@ set(EXTCPPSRC
 	#p25_tx
 	external/p25_tx/main.cpp
 	external/p25_tx/ui_p25_tx.cpp
-
-	#two_tone_pager
-	external/two_tone_pager/main.cpp
-	external/two_tone_pager/ui_two_tone_pager.cpp
-
-	#two_tone_rx
-	external/two_tone_rx/main.cpp
-	external/two_tone_rx/ui_two_tone_rx.cpp
-
-	#hard_reset
-	external/hard_reset/main.cpp
-	external/hard_reset/ui_hard_reset.cpp
-
-	#secplustx
-	external/secplustx/main.cpp
-	external/secplustx/ui_secplustx.cpp
-	external/secplustx/secplustx.cpp
-
-  #signal_hunter
-  external/signal_hunter/main.cpp
-  external/signal_hunter/ui_signal_hunter.cpp
-
-
-	#tetra rx
-	external/tetra_rx/main.cpp
-	external/tetra_rx/ui_tetra_rx.cpp
-	external/tetra_rx/tetra_crc.cpp
-	external/tetra_rx/tetra_descrambler.cpp
-	external/tetra_rx/tetra_interleave.cpp
-	external/tetra_rx/tetra_rcpc.cpp
-	external/tetra_rx/tetra_viterbi.cpp
-
-	#adsb rx
-	external/adsbrx/main.cpp
-	external/adsbrx/ui_adsb_rx.cpp
-
-	#ais rx
-	external/ais_rx/main.cpp
-	external/ais_rx/ais_app.cpp
-
-	#aprs rx
-	external/aprs_rx/main.cpp
-	external/aprs_rx/ui_aprs_rx.cpp
-
-	#aprs tx
-	external/aprs_tx/main.cpp
-	external/aprs_tx/ui_aprs_tx.cpp
-
 )

 set(EXTAPPLIST
@@ -441,8 +374,6 @@ set(EXTAPPLIST
 	acars_rx
 	wefax_rx
 	noaaapt_rx
-	vor_rx
-	vor_tx
 	shoppingcart_lock
 	ookbrute
 	ook_editor
@@ -491,20 +422,9 @@ set(EXTAPPLIST
 	rtty_rx
 	rtty_tx
 	pocsag_tx
-	flex_tx
 	time_sink
 	kiss_tnc
 	p25_tx
-	two_tone_pager
-	two_tone_rx
-	hard_reset
-	secplustx
-  signal_hunter
-	tetra_rx
-	adsbrx
-	ais_rx
-	aprs_rx
-	aprs_tx
 )

 # sdusb has type conflicts with PRALINE (HackRF Pro) - add only for non-PRALINE builds
@@ -515,3 +435,4 @@ if(NOT BOARD STREQUAL "PRALINE")
       )
       list(APPEND EXTAPPLIST sdusb)
 endif()
+
@@ -106,19 +106,6 @@ MEMORY
    ram_external_app_epirb_tx              (rwx) : org = 0xAE010000, len = 32k
    ram_external_app_fpv_detect            (rwx) : org = 0xAE020000, len = 32k
    ram_external_app_p25_tx                (rwx) : org = 0xAE030000, len = 32k
-    ram_external_app_two_tone_pager        (rwx) : org = 0xAE040000, len = 32k
-    ram_external_app_two_tone_rx           (rwx) : org = 0xAE050000, len = 32k
-    ram_external_app_flex_tx               (rwx) : org = 0xAE060000, len = 32k
-    ram_external_app_hard_reset            (rwx) : org = 0xAE070000, len = 32k
-    ram_external_app_secplustx             (rwx) : org = 0xAE080000, len = 32k
-    ram_external_app_vor_rx                (rwx) : org = 0xAE090000, len = 32k
-    ram_external_app_vor_tx                (rwx) : org = 0xAE0A0000, len = 32k
-    ram_external_app_signal_hunter         (rwx) : org = 0xAE0B0000, len = 32k
-    ram_external_app_tetra_rx              (rwx) : org = 0xAE0C0000, len = 32k
-    ram_external_app_adsbrx                (rwx) : org = 0xAE0D0000, len = 32k
-    ram_external_app_ais_rx                (rwx) : org = 0xAE0E0000, len = 32k
-    ram_external_app_aprs_rx               (rwx) : org = 0xAE0F0000, len = 32k
-    ram_external_app_aprs_tx               (rwx) : org = 0xAE100000, len = 32k
 }

 SECTIONS
@@ -126,579 +113,498 @@ SECTIONS
    .external_app_afsk_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_afsk_rx.application_information));
-        */external/afsk_rx/*(*ui*external_app*afsk_rx*);
+        *(*ui*external_app*afsk_rx*);
    } > ram_external_app_afsk_rx

    .external_app_calculator : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_calculator.application_information));
-        */external/calculator/*(*ui*external_app*calculator*);
+        *(*ui*external_app*calculator*);
    } > ram_external_app_calculator

    .external_app_font_viewer : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_font_viewer.application_information));
-        */external/font_viewer/*(*ui*external_app*font_viewer*);
+        *(*ui*external_app*font_viewer*);
    } > ram_external_app_font_viewer

    .external_app_blespam : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_blespam.application_information));
-        */external/blespam/*(*ui*external_app*blespam*);
+        *(*ui*external_app*blespam*);
    } > ram_external_app_blespam

    .external_app_analogtv : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_analogtv.application_information));
-        */external/analogtv/*(*ui*external_app*analogtv*);
+        *(*ui*external_app*analogtv*);
    } > ram_external_app_analogtv

    .external_app_nrf_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_nrf_rx.application_information));
-        */external/nrf_rx/*(*ui*external_app*nrf_rx*);
+        *(*ui*external_app*nrf_rx*);
    } > ram_external_app_nrf_rx

    .external_app_coasterp : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_coasterp.application_information));
-        */external/coasterp/*(*ui*external_app*coasterp*);
+        *(*ui*external_app*coasterp*);
    } > ram_external_app_coasterp

    .external_app_lge : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_lge.application_information));
-        */external/lge/*(*ui*external_app*lge*);
+        *(*ui*external_app*lge*);
    } > ram_external_app_lge

    .external_app_lcr : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_lcr.application_information));
-        */external/lcr/*(*ui*external_app*lcr*);
+        *(*ui*external_app*lcr*);
    } > ram_external_app_lcr

    .external_app_jammer : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_jammer.application_information));
-        */external/jammer/*(*ui*external_app*jammer*);
+        *(*ui*external_app*jammer*);
    } > ram_external_app_jammer

    .external_app_gpssim : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_gpssim.application_information));
-        */external/gpssim/*(*ui*external_app*gpssim*);
+        *(*ui*external_app*gpssim*);
    } > ram_external_app_gpssim

    .external_app_spainter : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_spainter.application_information));
-        */external/spainter/*(*ui*external_app*spainter*);
+        *(*ui*external_app*spainter*);
    } > ram_external_app_spainter

    .external_app_keyfob : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_keyfob.application_information));
-        */external/keyfob/*(*ui*external_app*keyfob*);
+        *(*ui*external_app*keyfob*);
    } > ram_external_app_keyfob

    .external_app_tetris : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_tetris.application_information));
-        */external/tetris/*(*ui*external_app*tetris*);
+        *(*ui*external_app*tetris*);
    } > ram_external_app_tetris

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

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

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

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

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

    .external_app_tpmstx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_tpmstx.application_information));
-        */external/tpmstx/*(*ui*external_app*tpmstx*);
+        *(*ui*external_app*tpmstx*);
    } > ram_external_app_tpmstx

    .external_app_protoview : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_protoview.application_information));
-        */external/protoview/*(*ui*external_app*protoview*);
+        *(*ui*external_app*protoview*);
    } > ram_external_app_protoview

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

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

    .external_app_sstvtx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_sstvtx.application_information));
-        */external/sstvtx/*(*ui*external_app*sstvtx*);
+        *(*ui*external_app*sstvtx*);
    } > ram_external_app_sstvtx

    .external_app_random_password : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_random_password.application_information));
-        */external/random_password/*(*ui*external_app*random_password*);
+        *(*ui*external_app*random_password*);
    } > ram_external_app_random_password

    .external_app_acars_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_acars_rx.application_information));
-        */external/acars_rx/*(*ui*external_app*acars_rx*);
+        *(*ui*external_app*acars_rx*);
    } > ram_external_app_acars_rx

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

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

    .external_app_ookbrute : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_ookbrute.application_information));
-        */external/ookbrute/*(*ui*external_app*ookbrute*);
+        *(*ui*external_app*ookbrute*);
    } > ram_external_app_ookbrute

    .external_app_ook_editor : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_ook_editor.application_information));
-        */external/ook_editor/*(*ui*external_app*ook_editor*);
+        *(*ui*external_app*ook_editor*);
    } > ram_external_app_ook_editor

    .external_app_flippertx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_flippertx.application_information));
-        */external/flippertx/*(*ui*external_app*flippertx*);
+        *(*ui*external_app*flippertx*);
    } > ram_external_app_flippertx

    .external_app_remote : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_remote.application_information));
-        */external/remote/*(*ui*external_app*remote*);
+        *(*ui*external_app*remote*);
    } > ram_external_app_remote

    .external_app_mcu_temperature : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_mcu_temperature.application_information));
-        */external/mcu_temperature/*(*ui*external_app*mcu_temperature*);
+        *(*ui*external_app*mcu_temperature*);
    } > ram_external_app_mcu_temperature

    .external_app_fmradio : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_fmradio.application_information));
-        */external/fmradio/*(*ui*external_app*fmradio*);
+        *(*ui*external_app*fmradio*);
    } > ram_external_app_fmradio

    .external_app_tuner : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_tuner.application_information));
-        */external/tuner/*(*ui*external_app*tuner*);
+        *(*ui*external_app*tuner*);
    } > ram_external_app_tuner

    .external_app_metronome : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_metronome.application_information));
-        */external/metronome/*(*ui*external_app*metronome*);
+        *(*ui*external_app*metronome*);
    } > ram_external_app_metronome

    .external_app_app_manager : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_app_manager.application_information));
-        */external/app_manager/*(*ui*external_app*app_manager*);
+        *(*ui*external_app*app_manager*);
    } > ram_external_app_app_manager

    .external_app_hopper : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_hopper.application_information));
-        */external/hopper/*(*ui*external_app*hopper*);
+        *(*ui*external_app*hopper*);
    } > ram_external_app_hopper

    .external_app_antenna_length : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_antenna_length.application_information));
-        */external/antenna_length/*(*ui*external_app*antenna_length*);
+        *(*ui*external_app*antenna_length*);
    } > ram_external_app_antenna_length

    .external_app_view_wav : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_view_wav.application_information));
-        */external/wav_view/*(*ui*external_app*view_wav*);
+        *(*ui*external_app*view_wav*);
    } > ram_external_app_view_wav

    .external_app_sd_wipe : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_sd_wipe.application_information));
-        */external/sd_wipe/*(*ui*external_app*sd_wipe*);
+        *(*ui*external_app*sd_wipe*);
    } > ram_external_app_sd_wipe

    .external_app_playlist_editor : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_playlist_editor.application_information));
-        */external/playlist_editor/*(*ui*external_app*playlist_editor*);
+        *(*ui*external_app*playlist_editor*);
    } > ram_external_app_playlist_editor

    .external_app_snake : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_snake.application_information));
-        */external/snake/*(*ui*external_app*snake*);
+        *(*ui*external_app*snake*);
    } > ram_external_app_snake

    .external_app_stopwatch : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_stopwatch.application_information));
-        */external/stopwatch/*(*ui*external_app*stopwatch*);
+        *(*ui*external_app*stopwatch*);
    } > ram_external_app_stopwatch

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

    .external_app_noaaapt_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_noaaapt_rx.application_information));
-        */external/noaaapt_rx/*(*ui*external_app*noaaapt_rx*);
+        *(*ui*external_app*noaaapt_rx*);
    } > ram_external_app_noaaapt_rx

-    .external_app_vor_rx : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_vor_rx.application_information));
-        */external/vor_rx/*(*ui*external_app*vor_rx*);
-    } > ram_external_app_vor_rx
-
-    .external_app_vor_tx : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_vor_tx.application_information));
-        */external/vor_tx/*(*ui*external_app*vor_tx*);
-    } > ram_external_app_vor_tx
-
    .external_app_breakout : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_breakout.application_information));
-        */external/breakout/*(*ui*external_app*breakout*);
+        *(*ui*external_app*breakout*);
    } > ram_external_app_breakout

    .external_app_doom : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_doom.application_information));
-        */external/doom/*(*ui*external_app*doom*);
+        *(*ui*external_app*doom*);
    } > ram_external_app_doom

    .external_app_debug_pmem : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_debug_pmem.application_information));
-        */external/debug_pmem/*(*ui*external_app*debug_pmem*);
+        *(*ui*external_app*debug_pmem*);
    } > ram_external_app_debug_pmem

    .external_app_scanner : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_scanner.application_information));
-        */external/scanner/*(*ui*external_app*scanner*);
+        *(*ui*external_app*scanner*);
    } > ram_external_app_scanner

    .external_app_level : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_level.application_information));
-        */external/level/*(*ui*external_app*level*);
+        *(*ui*external_app*level*);
    } > ram_external_app_level

    .external_app_gfxeq : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_gfxeq.application_information));
-        */external/gfxeq/*(*ui*external_app*gfxeq*);
+        *(*ui*external_app*gfxeq*);
    } > ram_external_app_gfxeq

    .external_app_waterfall_designer : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_waterfall_designer.application_information));
-        */external/waterfall_designer/*(*ui*external_app*waterfall_designer*);
+        *(*ui*external_app*waterfall_designer*);
    } > ram_external_app_waterfall_designer

    .external_app_detector_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_detector_rx.application_information));
-        */external/detector_rx/*(*ui*external_app*detector_rx*);
+        *(*ui*external_app*detector_rx*);
    } > ram_external_app_detector_rx

    .external_app_dinogame : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_dinogame.application_information));
-        */external/dinogame/*(*ui*external_app*dinogame*);
+        *(*ui*external_app*dinogame*);
    } > ram_external_app_dinogame

    .external_app_spaceinv : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_spaceinv.application_information));
-        */external/spaceinv/*(*ui*external_app*spaceinv*);
+        *(*ui*external_app*spaceinv*);
    } > ram_external_app_spaceinv

    .external_app_blackjack : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_blackjack.application_information));
-        */external/blackjack/*(*ui*external_app*blackjack*);
+        *(*ui*external_app*blackjack*);
    } > ram_external_app_blackjack

    .external_app_battleship : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_battleship.application_information));
-        */external/battleship/*(*ui*external_app*battleship*);
+        *(*ui*external_app*battleship*);
    } > ram_external_app_battleship

    .external_app_ert : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_ert.application_information));
-        */external/ert/*(*ui*external_app*ert*);
+        *(*ui*external_app*ert*);
    } > ram_external_app_ert

    .external_app_epirb_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_epirb_rx.application_information));
-        */external/epirb_rx/*(*ui*external_app*epirb_rx*);
+        *(*ui*external_app*epirb_rx*);
    } > ram_external_app_epirb_rx

    .external_app_soundboard : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_soundboard.application_information));
-        */external/soundboard/*(*ui*external_app*soundboard*);
+        *(*ui*external_app*soundboard*);
    } > ram_external_app_soundboard

    .external_app_game2048 : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_game2048.application_information));
-        */external/game2048/*(*ui*external_app*game2048*);
+        *(*ui*external_app*game2048*);
    } > ram_external_app_game2048

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

    .external_app_morse_practice : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_morse_practice.application_information));
-        */external/morse_practice/*(*ui*external_app*morse_practice*);
+        *(*ui*external_app*morse_practice*);
    } > ram_external_app_morse_practice

    .external_app_adult_toys_controller : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_adult_toys_controller.application_information));
-        */external/adult_toys_controller/*(*ui*external_app*adult_toys_controller*);
+        *(*ui*external_app*adult_toys_controller*);
    } > ram_external_app_adult_toys_controller

    .external_app_flex_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_flex_rx.application_information));
-        */external/flex_rx/*(*ui*external_app*flex_rx*);
+        *(*ui*external_app*flex_rx*);
    } > ram_external_app_flex_rx

    .external_app_sstvrx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_sstvrx.application_information));
-        */external/sstvrx/*(*ui*external_app*sstvrx*);
+        *(*ui*external_app*sstvrx*);
    } > ram_external_app_sstvrx

    .external_app_subcarrx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_subcarrx.application_information));
-        */external/subcarrx/*(*ui*external_app*subcarrx*);
+        *(*ui*external_app*subcarrx*);
    } > ram_external_app_subcarrx

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

    .external_app_sdusb : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_sdusb.application_information));
-        */external/sdusb/*(*ui*external_app*sdusb*);
+        *(*ui*external_app*sdusb*);
    } > ram_external_app_sdusb

    .external_app_morse_radio : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_morse_radio.application_information));
-        */external/morse_radio/*(*ui*external_app*morse_radio*);
+        *(*ui*external_app*morse_radio*);
    } > ram_external_app_morse_radio

    .external_app_morseradiotx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_morseradiotx.application_information));
-        */external/morseradiotx/*(*ui*external_app*morseradiotx*);
+        *(*ui*external_app*morseradiotx*);
    } > ram_external_app_morseradiotx

    .external_app_keeloqtx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_keeloqtx.application_information));
-        */external/keeloqtx/*(*ui*external_app*keeloqtx*);
+        *(*ui*external_app*keeloqtx*);
    } > ram_external_app_keeloqtx

    .external_app_rtty_rx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_rtty_rx.application_information));
-        */external/rtty_rx/*(*ui*external_app*rtty_rx*);
+        *(*ui*external_app*rtty_rx*);
    } > ram_external_app_rtty_rx

    .external_app_rtty_tx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_rtty_tx.application_information));
-        */external/rtty_tx/*(*ui*external_app*rtty_tx*);
+        *(*ui*external_app*rtty_tx*);
    } > ram_external_app_rtty_tx

    .external_app_pocsag_tx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_pocsag_tx.application_information));
-        */external/pocsag_tx/*(*ui*external_app*pocsag_tx*);
+        *(*ui*external_app*pocsag_tx*);
    } > ram_external_app_pocsag_tx

    .external_app_time_sink : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_time_sink.application_information));
-        */external/time_sink/*(*ui*external_app*time_sink*);
+        *(*ui*external_app*time_sink*);
    } > ram_external_app_time_sink

    .external_app_same_tx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_same_tx.application_information));
-        */external/same_tx/*(*ui*external_app*same_tx*);
+        *(*ui*external_app*same_tx*);
    } > ram_external_app_same_tx

    .external_app_kiss_tnc : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_kiss_tnc.application_information));
-        */external/kiss_tnc/*(*ui*external_app*kiss_tnc*);
+        *(*ui*external_app*kiss_tnc*);
    } > ram_external_app_kiss_tnc

    .external_app_mdc_tx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_mdc_tx.application_information));
-        */external/mdc_tx/*(*ui*external_app*mdc_tx*);
+        *(*ui*external_app*mdc_tx*);
    } > ram_external_app_mdc_tx

    .external_app_epirb_tx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_epirb_tx.application_information));
-        */external/epirb_tx/*(*ui*external_app*epirb_tx*);
+        *(*ui*external_app*epirb_tx*);
    } > ram_external_app_epirb_tx

    .external_app_fpv_detect : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_fpv_detect.application_information));
-        */external/fpv_detect/*(*ui*external_app*fpv_detect*);
+        *(*ui*external_app*fpv_detect*);
    } > ram_external_app_fpv_detect

    .external_app_p25_tx : ALIGN(4) SUBALIGN(4)
    {
        KEEP(*(.external_app.app_p25_tx.application_information));
-        */external/p25_tx/*(*ui*external_app*p25_tx*);
+        *(*ui*external_app*p25_tx*);
    } > ram_external_app_p25_tx
-
-    .external_app_two_tone_pager : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_two_tone_pager.application_information));
-        */external/two_tone_pager/*(*ui*external_app*two_tone_pager*);
-    } > ram_external_app_two_tone_pager
-
-    .external_app_two_tone_rx : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_two_tone_rx.application_information));
-        */external/two_tone_rx/*(*ui*external_app*two_tone_rx*);
-    } > ram_external_app_two_tone_rx
-
-    .external_app_flex_tx : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_flex_tx.application_information));
-        */external/flex_tx/*(*ui*external_app*flex_tx*);
-    } > ram_external_app_flex_tx
-
-    .external_app_hard_reset : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_hard_reset.application_information));
-        */external/hard_reset/*(*ui*external_app*hard_reset*);
-    } > ram_external_app_hard_reset
-
-    .external_app_secplustx : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_secplustx.application_information));
-        */external/secplustx/*(*ui*external_app*secplustx*);
-    } > ram_external_app_secplustx
-
-    .external_app_signal_hunter : ALIGN(4) SUBALIGN(4)
-    {
-      KEEP(*(.external_app.app_signal_hunter.application_information));
-      */external/signal_hunter/*(*ui*external_app*signal_hunter*);
-    } > ram_external_app_signal_hunter
-
-    .external_app_tetra_rx : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_tetra_rx.application_information));
-        */external/tetra_rx/*(*ui*external_app*tetra_rx*);
-    } > ram_external_app_tetra_rx
-
-    .external_app_adsbrx : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_adsbrx.application_information));
-        *(*ui*external_app*adsbrx*);
-    } > ram_external_app_adsbrx
-
-    .external_app_ais_rx : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_ais_rx.application_information));
-        *(*ui*external_app*ais_rx*);
-    } > ram_external_app_ais_rx
-
-    .external_app_aprs_rx : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_aprs_rx.application_information));
-        *(*ui*external_app*aprs_rx*);
-    } > ram_external_app_aprs_rx
-
-    .external_app_aprs_tx : ALIGN(4) SUBALIGN(4)
-    {
-        KEEP(*(.external_app.app_aprs_tx.application_information));
-        *(*ui*external_app*aprs_tx*);
-    } > ram_external_app_aprs_tx
-
-
-
 }
@@ -77,10 +77,6 @@ void ExtSensorsView::on_any() {
    has_data = true;
 }

-void ExtSensorsView::on_show() {
-    i2cdev::I2CDevManager::set_autoscan_interval(3);
-}
-
 void ExtSensorsView::on_gps(const GPSPosDataMessage* msg) {
    on_any();
    std::string tmp = to_string_decimal(msg->lat, 5);
@@ -78,8 +78,6 @@ class ExtSensorsView : public View {
    void on_orientation(const OrientationDataMessage* msg);
    void on_environment(const EnvironmentDataMessage* msg);

-    void on_show() override;
-
    MessageHandlerRegistration message_handler_gps{
        Message::ID::GPSPosData,
        [this](Message* const p) {
@@ -4,15 +4,11 @@
 #include "portapack_persistent_memory.hpp"
 #include "string_format.hpp"
 #include "memory_map.hpp"
-#include "usb_serial_asyncmsg.hpp"

 using namespace portapack;

 namespace ui::external_app::flex_rx {

-static const int flex_tz_table[] = {0, 60, 120, 180, 240, 300, 360, 420, 480, 540, 600, 660, 720,
-                                    210, 270, 330, 0, 345, 390, 570, -210, -660, -600, -540, -480, -420, -360, -300, -240, -180, -120, -60};
-
 FlexAppView::FlexAppView(NavigationView& nav)
    : nav_{nav} {
    // Load baseband image for FLEX decoding
@@ -23,8 +19,6 @@ FlexAppView::FlexAppView(NavigationView& nav)
                  &field_lna,
                  &field_vga,
                  &rssi,
-                  &text_status1,
-                  &text_status2,
                  &console});

    // Restore saved frequency
@@ -45,7 +39,6 @@ FlexAppView::FlexAppView(NavigationView& nav)
    // Initialize FLEX baseband
    baseband::set_flex_config();

-    text_status1.set("No signal");
    console.writeln("Ready");
 }

@@ -58,9 +51,54 @@ void FlexAppView::focus() {
    field_frequency.focus();
 }

-// Add message to console
+// Redraw all messages to console
+void FlexAppView::redraw_console() {
+    console.clear(true);
+    bool first = true;
+    for (const auto& msg : messages) {
+        if (!first) {
+            console.writeln("");  // Blank line between messages
+        }
+        first = false;
+        console.writeln(msg);
+    }
+}
+
+// Add message to log with automatic line wrapping
 void FlexAppView::log_message(const std::string& message) {
-    console.writeln(message);
+    const size_t chars_per_line = screen_width / 8;
+    // Console height accounts for status bar and controls row
+    const size_t console_lines = (screen_height - 2 * 16) / 16;
+
+    messages.push_back(message);
+
+    // Calculate total lines used (messages + blank lines between them)
+    size_t total_lines = 0;
+    for (size_t i = 0; i < messages.size(); i++) {
+        if (i > 0) total_lines++;  // Count blank line separator
+        size_t msg_lines = (messages[i].length() + chars_per_line - 1) / chars_per_line;
+        if (msg_lines == 0) msg_lines = 1;
+        total_lines += msg_lines;
+    }
+
+    // If console would overflow, remove oldest messages and redraw
+    if (total_lines > console_lines) {
+        while (total_lines > console_lines && !messages.empty()) {
+            const auto& oldest = messages.front();
+            size_t oldest_lines = (oldest.length() + chars_per_line - 1) / chars_per_line;
+            if (oldest_lines == 0) oldest_lines = 1;
+            total_lines -= oldest_lines;
+            if (messages.size() > 1) total_lines--;  // Remove separator line too
+            messages.erase(messages.begin());
+        }
+        redraw_console();
+    } else {
+        // Just append new message
+        if (messages.size() > 1) {
+            console.writeln("");  // Blank line before new message
+        }
+        console.writeln(message);
+    }
 }

 // Update frequency and save for persistence
@@ -69,234 +107,9 @@ void FlexAppView::update_freq(rf::Frequency f) {
    receiver_model.set_target_frequency(f);
 }

-// Type tag from numeric type code
-static const char* flex_type_tag(uint32_t type) {
-    switch (type) {
-        case 0:
-            return "SEC";
-        case 1:
-            return "INS";
-        case 2:
-            return "TON";
-        case 3:
-            return "NUM";
-        case 4:
-            return "SNUM";
-        case 5:
-            return "ALN";
-        case 6:
-            return "HEX";
-        case 7:
-            return "NNUM";
-        case 8:
-            return "SHORT";
-        case 9:
-            return "BIW";
-        default:
-            return "UNK";
-    }
-}
-
 // Handle decoded FLEX packet from baseband
 void FlexAppView::on_packet(const FlexPacketMessage* message) {
-    const auto& pkt = message->packet;
-    const char* type = flex_type_tag(pkt.type);
-    const char* pol = pkt.is_inverted ? "I" : "N";
-
-    // Update status row 1: C/F speed polarity time timezone
-    {
-        std::string s1 = "C" + to_string_dec_uint(pkt.cycle) +
-                         "/F" + to_string_dec_uint(pkt.frame) +
-                         " " + to_string_dec_uint(pkt.bitrate) +
-                         " " + pol;
-        if (status_time_[0]) {
-            s1 += "  ";
-            s1 += status_time_;
-        }
-        if (status_tz_[0]) {
-            s1 += " ";
-            s1 += status_tz_;
-        }
-        text_status1.set(s1);
-    }
-
-    // Update status row 2 from BIW data
-    if (pkt.type == 9) {
-        switch (pkt.biw_field) {
-            case 0:  // SSID1
-                status_lid_ = pkt.biw_v1;
-                status_cz_ = pkt.biw_v2;
-                break;
-            case 2: {  // Time
-                uint32_t si = (pkt.biw_v3 * 75) / 10;
-                auto h = to_string_dec_uint(pkt.biw_v1, 2, '0');
-                auto m = to_string_dec_uint(pkt.biw_v2, 2, '0');
-                auto sec = to_string_dec_uint(si, 2, '0');
-                // Store for row 1
-                auto ts = h + ":" + m + ":" + sec;
-                memcpy(status_time_, ts.c_str(), ts.size() + 1);
-                break;
-            }
-            case 5: {  // SysInfo (timezone)
-                if (pkt.biw_v1 == 4 || pkt.biw_v1 == 5) {
-                    uint16_t zone = pkt.biw_v2 & 0x1F;
-                    int ofs = (zone < 32) ? flex_tz_table[zone] : 0;
-                    int hrs = ofs / 60;
-                    int mins = (ofs < 0 ? -ofs : ofs) % 60;
-                    auto tzs = std::string("UTC") + (ofs >= 0 ? "+" : "") +
-                               to_string_dec_int(hrs);
-                    if (mins != 0)
-                        tzs += ":" + to_string_dec_int(mins, 2, '0');
-                    memcpy(status_tz_, tzs.c_str(), tzs.size() + 1);
-                }
-                break;
-            }
-            case 7:  // SSID2
-                status_cc_ = pkt.biw_v1;
-                break;
-        }
-        // Rebuild row 2
-        std::string s2;
-        if (status_lid_) s2 += "LID:" + to_string_dec_uint(status_lid_);
-        if (status_cz_) {
-            s2 += " CZ:";
-            s2 += to_string_dec_uint(status_cz_);
-        }
-        if (status_cc_) {
-            s2 += " CC:";
-            s2 += to_string_dec_uint(status_cc_);
-        }
-        if (pkt.fiw_roaming) s2 += " R";
-        text_status2.set(s2);
-    }
-
-    // Console: skip BIW, tone-only (V=010), SHORT reserved (t=3)
-    bool skip_gui = (pkt.type == 9 || pkt.type == 2);
-    if (pkt.type == 8 && pkt.function == 3) skip_gui = true;
-    if (!skip_gui) {
-        auto cf = to_string_dec_uint(pkt.cycle) + "/" + to_string_dec_uint(pkt.frame);
-        std::string line = cf + " " + to_string_dec_uint(pkt.bitrate) +
-                           " " + pol + " " + std::string(1, pkt.phase) + " ";
-
-        if (pkt.type == 1 && pkt.message[0] == 'i' && pkt.message[2] == 't') {
-            // INS temp group: "1234567 +GRP5@F42"
-            line += to_string_dec_uint(pkt.capcode);
-            line += " +TG";
-            line += to_string_dec_uint(pkt.biw_v1);
-            line += "@F";
-            line += to_string_dec_uint(pkt.biw_v2);
-        } else if (pkt.type == 1) {
-            // Other INS types
-            line += to_string_dec_uint(pkt.capcode);
-            line += " INS ";
-            line += pkt.message;
-        } else if (pkt.addr_type == 2) {
-            // Temp group delivery: "GRP5 ALN message"
-            uint32_t slot = (uint32_t)(pkt.capcode + 0x8000 - 0x1F7800) & 0x0F;
-            line += "TG";
-            line += to_string_dec_uint(slot);
-            line += " ";
-            line += type;
-            if (pkt.message[0]) {
-                line += " ";
-                line += pkt.message;
-            }
-        } else {
-            line += to_string_dec_uint(pkt.capcode);
-            if (pkt.is_priority) line += " P";
-            line += " ";
-            line += type;
-            if (pkt.message[0]) {
-                line += " ";
-                line += pkt.message;
-            }
-        }
-        log_message(line);
-    }
-
-    // Serial: pipe-delimited
-    if (portapack::usb_serial.serial_connected()) {
-        std::string s;
-        s = "FLEX|";
-        s += to_string_dec_uint(pkt.cycle);
-        s += '/';
-        s += to_string_dec_uint(pkt.frame);
-        s += '|';
-        s += to_string_dec_uint(pkt.bitrate);
-        s += '|';
-        s += pol;
-        s += '|';
-        s += pkt.phase;
-
-        if (pkt.type == 9) {
-            s += "|BIW|w=";
-            s += to_string_dec_uint(pkt.function);
-            s += "|t=";
-            s += to_string_dec_uint(pkt.biw_field);
-            s += '|';
-            s += to_string_dec_uint(pkt.biw_v1);
-            s += '|';
-            s += to_string_dec_uint(pkt.biw_v2);
-            s += '|';
-            s += to_string_dec_uint(pkt.biw_v3);
-        } else {
-            s += '|';
-            s += type;
-            s += "|cap=";
-            s += to_string_dec_uint(pkt.capcode);
-            if (pkt.is_priority) s += "|pri=1";
-            if (pkt.addr_type == 2) {
-                // Temporary address: show slot number
-                // capcode = aw - 0x8000, aw = capcode + 0x8000
-                // slot = (aw - 0x1F7800) & 0x0F = (capcode + 0x8000 - 0x1F7800) & 0x0F
-                uint32_t slot = (uint32_t)(pkt.capcode + 0x8000 - 0x1F7800) & 0x0F;
-                s += "|slot=";
-                s += to_string_dec_uint(slot);
-            }
-            if (pkt.has_flags) {
-                if (pkt.type == 7) {
-                    s += "|seq=";
-                    s += to_string_dec_uint(pkt.seq);
-                    s += "|new=";
-                    s += to_string_dec_uint(pkt.is_new);
-                    s += "|fmt=";
-                    s += pkt.nnum_s ? "idrom" : "std";
-                } else {
-                    s += "|frag=";
-                    s += (pkt.frag == 3) ? "first" : to_string_dec_uint(pkt.frag).c_str();
-                    s += "|mf=";
-                    s += to_string_dec_uint(pkt.more_frag);
-                    s += "|seq=";
-                    s += to_string_dec_uint(pkt.seq);
-                    if (pkt.frag == 3) {
-                        s += "|new=";
-                        s += to_string_dec_uint(pkt.is_new);
-                        s += "|md=";
-                        s += to_string_dec_uint(pkt.maildrop);
-                        s += "|sig=";
-                        s += to_string_hex(pkt.sig, 2);
-                    }
-                    if (pkt.type == 0) {
-                        static const char* enc[] = {"alpha", "sep", "bin", "rsvd"};
-                        s += "|enc=";
-                        s += enc[pkt.sec_enc & 3];
-                    }
-                    if (pkt.type == 6 && pkt.frag == 3) {
-                        uint8_t b = pkt.function & 0x0F;
-                        s += "|bb=";
-                        s += to_string_dec_uint(b == 0 ? 16 : b);
-                        if (pkt.function & 0x10) s += "|rtl=1";
-                    }
-                }
-            }
-            if (pkt.message[0]) {
-                s += "|\"";
-                s += pkt.message;
-                s += '"';
-            }
-        }
-        UsbSerialAsyncmsg::asyncmsg(s);
-    }
+    log_message(message->packet.message);
 }

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

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

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

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

    RxRadioState radio_state_{};

-    // Status bar state (updated from BIW packets)
-    char status_time_[12]{};  // "HH:MM:SS"
-    char status_tz_[12]{};    // "UTC+N"
-    uint16_t status_lid_{0};
-    uint16_t status_cz_{0};
-    uint16_t status_cc_{0};
+    // Message storage for console redraw
+    static constexpr size_t MAX_MESSAGES = 20;
+    std::vector<std::string> messages{};

    // Helper methods
    void log_message(const std::string& message);
+    void redraw_console();
    void update_freq(rf::Frequency f);

    // UI Elements - Row 0, dynamically positioned
@@ -56,17 +54,9 @@ class FlexAppView : public View {
    RSSI rssi{
        {UI_POS_X(21), 0, UI_POS_WIDTH(9), 4}};

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

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

-bool FpvDetectView::is_possible_freq_spike(const ChannelStatistics& statistics) const {
+bool FpvDetectView::is_possible_analog_carrier(const ChannelStatistics& statistics) const {
    return statistics.max_db >= detect_threshold_db();
 }

@@ -390,17 +392,17 @@ void FpvDetectView::update_state_badge() {
            text_state.set("SCANNING");
            break;
        case DetectState::Candidate:
-            text_state.set("CHECKING");
+            text_state.set("VERIFY FPV");
            break;
        case DetectState::Locked:
-            text_state.set("FREQ FOUND");
+            text_state.set("DRONE FOUND");
            break;
    }
 }

 void FpvDetectView::update_confidence_text() {
    char buf[16];
-    std::snprintf(buf, sizeof(buf), "Posi %u%%", static_cast<unsigned>(candidate_confidence_));
+    std::snprintf(buf, sizeof(buf), "Conf %u%%", static_cast<unsigned>(candidate_confidence_));
    text_confidence.set(buf);
 }

@@ -410,21 +412,21 @@ void FpvDetectView::update_status_text() {
    switch (detect_state_) {
        case DetectState::Scanning:
            if (band_mode < FPV_NUM_BANDS) {
-                std::snprintf(buf, sizeof(buf), "Scanning band %c", band_labels[band_mode]);
+                std::snprintf(buf, sizeof(buf), "Scanning band %c for analog FPV", band_labels[band_mode]);
            } else {
-                std::snprintf(buf, sizeof(buf), "Scanning all from list");
+                std::snprintf(buf, sizeof(buf), "Scanning all FPV bands");
            }
            break;

        case DetectState::Candidate:
-            std::snprintf(buf, sizeof(buf), "CHKING %c%d  %ld MHz",
+            std::snprintf(buf, sizeof(buf), "VERIFYING %c%d  %ld MHz",
                          band_labels[candidate_band_],
                          static_cast<int>(candidate_ch_ + 1),
                          static_cast<long>(fpv_frequencies[candidate_band_][candidate_ch_] / 1000000LL));
            break;

        case DetectState::Locked:
-            std::snprintf(buf, sizeof(buf), "FREQ FOUND %c%d  %ld",
+            std::snprintf(buf, sizeof(buf), "!!! DRONE FOUND !!! %c%d  %ld",
                          band_labels[candidate_band_],
                          static_cast<int>(candidate_ch_ + 1),
                          static_cast<long>(fpv_frequencies[candidate_band_][candidate_ch_] / 1000000LL));
@@ -451,7 +453,7 @@ void FpvDetectView::update_detail_text() {
            break;

        case DetectState::Locked:
-            std::snprintf(buf, sizeof(buf), "LOCKED %c%d  posi %u%%  hold %u",
+            std::snprintf(buf, sizeof(buf), "LOCKED %c%d  conf %u%%  hold %u",
                          band_labels[candidate_band_],
                          static_cast<int>(candidate_ch_ + 1),
                          static_cast<unsigned>(candidate_confidence_),
@@ -603,7 +605,7 @@ void FpvDetectView::on_statistics_update(const ChannelStatistics& statistics) {

    switch (detect_state_) {
        case DetectState::Scanning:
-            if (is_possible_freq_spike(statistics)) {
+            if (is_possible_analog_carrier(statistics)) {
                enter_candidate(statistics);
            }
            break;
@@ -72,7 +72,7 @@ class FpvDetectView : public View {
    void step_scan();
    void reset_detector(bool retune_current);

-    bool is_possible_freq_spike(const ChannelStatistics& statistics) const;
+    bool is_possible_analog_carrier(const ChannelStatistics& statistics) const;
    void enter_candidate(const ChannelStatistics& statistics);
    void evaluate_candidate_sample(const ChannelStatistics& statistics);
    void enter_lock();
@@ -162,7 +162,7 @@ class FpvDetectView : public View {
    Text text_freq{{UI_POS_X_RIGHT(20), UI_POS_Y(1), UI_POS_WIDTH(20), UI_POS_DEFAULT_HEIGHT}, ""};

    Text text_state{{UI_POS_X(0), UI_POS_Y(2), UI_POS_WIDTH(12), UI_POS_DEFAULT_HEIGHT}, "SCANNING"};
-    Text text_confidence{{UI_POS_X(12), UI_POS_Y(2), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT}, "Posi 0%"};
+    Text text_confidence{{UI_POS_X(12), UI_POS_Y(2), UI_POS_WIDTH(8), UI_POS_DEFAULT_HEIGHT}, "Conf 0%"};
    Text text_detect_label{{UI_POS_X_RIGHT(10), UI_POS_Y(2), UI_POS_WIDTH(5), UI_POS_DEFAULT_HEIGHT}, "Thr>"};

    NumberField field_detect_threshold{
@@ -176,8 +176,8 @@ class FpvDetectView : public View {
    Text freq_stats_rssi{{UI_POS_X(0), UI_POS_Y(3), UI_POS_WIDTH(15), UI_POS_DEFAULT_HEIGHT}, "RSSI 0/0/0"};
    Text freq_stats_db{{UI_POS_X_RIGHT(14), UI_POS_Y(3), UI_POS_WIDTH(14), UI_POS_DEFAULT_HEIGHT}, "PWR -120 dB"};

-    Text text_status{{UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH(30), UI_POS_DEFAULT_HEIGHT}, "SCANNING FOR FREQS"};
-    Text text_detail{{UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH(30), UI_POS_DEFAULT_HEIGHT}, "Waiting for FPV FREQ"};
+    Text text_status{{UI_POS_X(0), UI_POS_Y(4), UI_POS_WIDTH(30), UI_POS_DEFAULT_HEIGHT}, "SCANNING FOR ANALOG FPV"};
+    Text text_detail{{UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH(30), UI_POS_DEFAULT_HEIGHT}, "Waiting for FPV-like carrier"};

    RSSIGraph rssi_graph{{UI_POS_X(0), UI_POS_Y(6), UI_POS_WIDTH_REMAINING(5), UI_POS_HEIGHT_REMAINING(7)}};
    RSSI rssi{{UI_POS_X_RIGHT(5), UI_POS_Y(6), UI_POS_WIDTH(5), UI_POS_HEIGHT_REMAINING(7)}};
@@ -1,5 +1,5 @@
 /*
- * copyleft 2025 zxkmm
+ * copyleft 2025 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -1,5 +1,5 @@
 /*
- * copyleft 2025 zxkmm
+ * copyleft 2025 zxkmm AKA zix aka sommermorgentraum
 *
 * This file is part of PortaPack.
 *
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2026 Pezsma
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui.hpp"
-#include "ui_hard_reset.hpp"
-#include "ui_navigation.hpp"
-#include "external_app.hpp"
-
-namespace ui::external_app::hard_reset {
-
-void initialize_app(NavigationView& nav) {
-    nav.push<HardResetView>();
-}
-
-}  // namespace ui::external_app::hard_reset
-
-extern "C" {
-
-__attribute__((section(".external_app.app_hard_reset.application_information"), used))
-application_information_t _application_information_hard_reset = {
-    /*.memory_location = */ (uint8_t*)0x00000000,
-    /*.externalAppEntry = */ ui::external_app::hard_reset::initialize_app,
-    /*.header_version = */ CURRENT_HEADER_VERSION,
-    /*.app_version = */ VERSION_MD5,
-
-    /*.app_name = */ "Hard Reset",
-    /*.bitmap_data = */ {
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0xC0,
-        0x01,
-        0xFF,
-        0x7F,
-        0xFF,
-        0x7F,
-        0x56,
-        0x35,
-        0x56,
-        0x35,
-        0x56,
-        0x35,
-        0x56,
-        0x35,
-        0x56,
-        0x35,
-        0x56,
-        0x35,
-        0x56,
-        0x35,
-        0x56,
-        0x35,
-        0xFE,
-        0x3F,
-        0xFE,
-        0x3F,
-        0x00,
-        0x00,
-    },
-    /*.icon_color = */ ui::Color::red().v,
-    /*.menu_location = */ app_location_t::SETTINGS,
-    /*.desired_menu_position = */ -1,
-
-    /*.m4_app_tag = portapack::spi_flash::image_tag_none */ {0, 0, 0, 0},
-    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
-};
-
-}  // extern "C"
@@ -1,239 +0,0 @@
-/*
- * Copyright (C) 2026 Pezsma
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui_hard_reset.hpp"
-
-#include "portapack.hpp"
-#include "file.hpp"
-#include "file_path.hpp"
-#include "ui_touch_calibration.hpp"
-#include "ui_external_items_menu_loader.hpp"
-#include "app_settings.hpp"
-
-using namespace portapack;
-namespace pmem = portapack::persistent_memory;
-
-namespace ui::external_app::hard_reset {
-HardResetView::HardResetView(ui::NavigationView& nav)
-    : nav_(nav) {
-    add_children({&chk_settings_file,
-                  &chk_bad_apps,
-                  &chk_pmem,
-                  &txt_settings_file_count,
-                  &txt_bad_apps_count,
-                  &btn_yes,
-                  &btn_no,
-                  &text,
-                  &txt_wait});
-
-    txt_wait.set_style(Theme::getInstance()->warning_dark);
-
-    btn_yes.on_select = [this](Button&) {
-        {  // to  free painter after draw
-            Painter painter;
-            txt_wait.hidden(false);
-            text.hidden(true);
-            painter.fill_rectangle(text.screen_rect(), this->style().background);
-            txt_wait.paint(painter);
-        }
-        if (chk_settings_file.value()) {
-            clear_settings_folder();
-        }
-        if (chk_bad_apps.value()) {
-            delete_bad_apps(apps_dir);
-        }
-        if (chk_pmem.value()) {
-            pmem::cache::defaults();
-            StatusRefreshMessage message{};
-            EventDispatcher::send_message(message);
-            nav_.replace<TouchCalibrationView>();
-        } else {
-            nav_.pop();
-        }
-    };
-
-    btn_no.on_select = [this](Button&) {
-        nav_.pop();
-    };
-    txt_settings_file_count.set_style(Theme::getInstance()->fg_magenta);
-    txt_bad_apps_count.set_style(Theme::getInstance()->fg_magenta);
-
-    signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
-        this->calculate();
-        rtc_time::signal_tick_second -= signal_token_tick_second;
-    };
-}
-
-HardResetView::~HardResetView() {
-    rtc_time::signal_tick_second -= signal_token_tick_second;
-}
-
-void HardResetView::calculate() {
-    settings_file_count = count_ini_files_in_directory(settings_dir);
-    txt_settings_file_count.set(to_string_dec_uint(settings_file_count));
-
-    bad_apps_count = count_bad_apps(apps_dir);
-    txt_bad_apps_count.set(to_string_dec_uint(bad_apps_count));
-
-    if (settings_file_count > 0) {
-        chk_settings_file.set_value(true);
-    }
-    if (bad_apps_count > 0) {
-        chk_bad_apps.set_value(true);
-    }
-    chk_pmem.set_value(true);
-    txt_wait.hidden(true);
-    text.set("Warning! Checked items will beerased (bad apps, P.Mem,      settings). Uncheck to keep.   Touch calibration is required only if P.Mem is reset.");
-}
-
-void HardResetView::focus() {
-    btn_no.focus();
-}
-
-uint16_t HardResetView::count_ini_files_in_directory(const std::filesystem::path& dir_path) {
-    int count = 0;
-    for (const auto& entry : std::filesystem::directory_iterator(dir_path, u"*.ini")) {
-        if (std::filesystem::is_regular_file(entry.status())) {
-            count++;
-        }
-    }
-    return count;
-}
-
-void HardResetView::delete_ini_files_in_directory(const std::filesystem::path& dir_path) {
-    bool found_and_deleted;
-    do {
-        found_and_deleted = false;
-        for (const auto& entry : std::filesystem::directory_iterator(dir_path, u"*.ini")) {
-            if (std::filesystem::is_regular_file(entry.status())) {
-                auto full_path = dir_path / entry.path().filename();
-                delete_file(full_path);
-                found_and_deleted = true;
-                break;  // iterator can become invalid if the dir is modified, so break and restart the loop after deletion
-            }
-        }
-    } while (found_and_deleted);
-}
-
-void HardResetView::clear_settings_folder() {
-    delete_ini_files_in_directory(settings_dir);
-}
-
-bool HardResetView::is_bad_app(const std::filesystem::path& file_path, bool is_ppma) {
-    File app;
-    if (app.open(file_path)) {
-        return true;
-    }
-    bool is_bad = false;
-    if (is_ppma) {
-        application_information_t app_info = {};
-        auto readResult = app.read(&app_info, sizeof(application_information_t));
-        if (!readResult || readResult.value() != sizeof(application_information_t)) {
-            is_bad = true;
-        } else if (app_info.header_version != CURRENT_HEADER_VERSION) {
-            is_bad = true;
-        } else if (VERSION_MD5 != app_info.app_version) {
-            is_bad = true;
-        } else {
-            // --- CHECKSUM VALIDATION ---
-            // Similar to run_external_app: read through the file and calculate the checksum
-            app.seek(0);
-            uint32_t checksum = 0;
-            uint8_t buffer[512];  // 512-byte buffer to conserve RAM
-
-            while (true) {
-                auto res = app.read(buffer, sizeof(buffer));
-                if (!res) break;
-                checksum += simple_checksum((uint32_t)buffer, res.value());
-                if (res.value() < sizeof(buffer)) break;  // End of file
-            }
-
-            if (checksum != EXT_APP_EXPECTED_CHECKSUM) {
-                is_bad = true;  // The file body is corrupted / truncated!
-            }
-        }
-    } else {
-        // PPMP validation
-        standalone_application_information_t app_info = {};
-        auto readResult = app.read(&app_info, sizeof(standalone_application_information_t));
-        if (!readResult || readResult.value() != sizeof(standalone_application_information_t)) {
-            is_bad = true;
-        } else if (app_info.header_version > CURRENT_STANDALONE_APPLICATION_API_VERSION) {
-            is_bad = true;
-        }
-    }
-
-    app.close();
-    return is_bad;
-}
-
-uint16_t HardResetView::count_bad_apps(const std::filesystem::path& apps_dir) {
-    int bad_count = 0;
-
-    // Check .ppma files
-    for (const auto& entry : std::filesystem::directory_iterator(apps_dir, u"*.ppma")) {
-        auto file_path = apps_dir / entry.path();
-        if (is_bad_app(file_path, true)) {
-            bad_count++;
-        }
-    }
-
-    // Check .ppmp files
-    for (const auto& entry : std::filesystem::directory_iterator(apps_dir, u"*.ppmp")) {
-        auto file_path = apps_dir / entry.path();
-        if (is_bad_app(file_path, false)) {
-            bad_count++;
-        }
-    }
-
-    return bad_count;
-}
-
-void HardResetView::delete_bad_apps(const std::filesystem::path& apps_dir) {
-    // Delete bad .ppma files
-    bool deleted_something;
-    do {
-        deleted_something = false;
-        for (const auto& entry : std::filesystem::directory_iterator(apps_dir, u"*.ppma")) {
-            auto file_path = apps_dir / entry.path();
-            if (is_bad_app(file_path, true)) {
-                delete_file(file_path);
-                deleted_something = true;
-                break;
-            }
-        }
-    } while (deleted_something);
-
-    // Delete bad .ppmp files
-    do {
-        deleted_something = false;
-        for (const auto& entry : std::filesystem::directory_iterator(apps_dir, u"*.ppmp")) {
-            auto file_path = apps_dir / entry.path();
-            if (is_bad_app(file_path, false)) {
-                delete_file(file_path);
-                deleted_something = true;
-                break;
-            }
-        }
-    } while (deleted_something);
-}
-
-}  // namespace ui::external_app::hard_reset
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2026 Pezsma
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __UI_HARD_RESET_H__
-#define __UI_HARD_RESET_H__
-
-#include "ui_navigation.hpp"
-#include "signal.hpp"
-using namespace ui;
-
-namespace ui::external_app::hard_reset {
-
-class HardResetView : public ui::View {
-   public:
-    HardResetView(ui::NavigationView& nav);
-    ~HardResetView();
-
-    std::string title() const override { return "Hard Reset"; }
-    void focus() override;
-
-   private:
-    ui::NavigationView& nav_;
-
-    SignalToken signal_token_tick_second{};
-    ui::Button btn_yes{{UI_POS_X(1), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(11), UI_POS_HEIGHT(2)}, "Erase sel."};
-    ui::Button btn_no{{UI_POS_X_RIGHT(11), UI_POS_Y_BOTTOM(4), UI_POS_WIDTH(10), UI_POS_HEIGHT(2)}, "No"};
-    ui::Text text{{UI_POS_X(0), UI_POS_Y(6), UI_POS_MAXWIDTH, UI_POS_HEIGHT(5)}, ""};
-    Checkbox chk_settings_file{{UI_POS_X(1), UI_POS_Y(1)}, 14, "Settings file:", true};
-    Checkbox chk_bad_apps{{UI_POS_X(1), UI_POS_Y(2.5)}, 9, "Bad apps:", true};
-    Checkbox chk_pmem{{UI_POS_X(1), UI_POS_Y(4)}, 11, "P.mem reset", true};
-
-    Text txt_settings_file_count{{UI_POS_X(19), UI_POS_Y(1), UI_POS_WIDTH(5), UI_POS_HEIGHT(1)}, "?"};
-    Text txt_bad_apps_count{{UI_POS_X(14), UI_POS_Y(2.5), UI_POS_WIDTH(5), UI_POS_HEIGHT(1)}, "?"};
-
-    Text txt_wait{{UI_POS_X_CENTER(14), UI_POS_Y(8), UI_POS_WIDTH(14), UI_POS_HEIGHT(1)}, "Please wait..."};
-
-    uint16_t count_ini_files_in_directory(const std::filesystem::path& dir_path);
-    void delete_ini_files_in_directory(const std::filesystem::path& dir_path);
-    void clear_settings_folder();
-    void calculate();
-    bool is_bad_app(const std::filesystem::path& file_path, bool is_ppma);
-    uint16_t count_bad_apps(const std::filesystem::path& apps_dir);
-    void delete_bad_apps(const std::filesystem::path& apps_dir);
-
-    uint16_t settings_file_count = 0;
-    uint16_t bad_apps_count = 0;
-};
-
-}  // namespace ui::external_app::hard_reset
-
-#endif  // __UI_HARD_RESET_H__
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jLynx	d1a2318fe4	Merge pull request #3106 from portapack-mayhem/next v2.4.0	2026-03-24 22:54:24 +13:00
gullradriel	93775129cb	Merge pull request #2896 from portapack-mayhem/next Christmas stable merge	2025-12-21 12:00:18 +01:00
jLynx	fe9448f149	Merge pull request #2859 from portapack-mayhem/next V2.3.1	2025-11-08 10:35:16 +13:00