fix mbt build on rare errors (#3242 )

Lna investigations and fix (#3240 )
* The LNA gain field 'L' lives in LPF_VGA_2 (reg 6), not RXRF_2 (reg 2). RXRF_2 only holds LNAgain_SPI_EN. The configure_rx_gain() function wrote 'L' into lpf_vga_2 but marked RXRF_2 dirty => the LNA value only got flushed incidentally because the following VGA write marks LPF_VGA_2 dirty. Drop the stray RXRF_2 dirty flag and rely on the LPF_VGA_2 flag, which carries both L and VGA. * The baseband build defined IS_H1_R9 as the compile-time constant 0, on the (now incorrect) assumption that detected_platform() isn't linked. The sd_over_usb image is the only baseband target that compiles the IS_H1_R9-gated upstream files (rf_path.c, si5351c.c, sgpio.c, platform_gpio.c, platform_scu.c), and it *does* link platform_detect.c and call detect_hardware_platform() at startup. Forcing IS_H1_R9=0 dead-stripped every 'if (IS_H1_R9)' branch, so a real HackRF One r9 was set up with the OG clock/GPIO/RF-path config in that image. Define IS_H1_R9 as the runtime '(detected_platform()==BOARD_ID_HACKRF1_R9)', mirroring upstream platform-detect.cmake for HACKRF_ONE. All usages are '#ifdef IS_H1_R9' + 'if (IS_H1_R9)' (no arithmetic '#if'), so a function-call expression is safe, single-quoted -D with no internal spaces keeps it intact through the shell-split DDEFS blob. --------- Co-authored-by: gullradriel <gullradriel@users.noreply.github.com>
2026-07-26 10:38:52 +00:00 · 2026-07-01 14:42:25 +02:00 · 2026-07-01 08:47:07 +02:00 · 2026-06-25 09:08:44 +02:00 · 2026-06-25 08:46:36 +02:00 · 2026-06-22 16:50:16 +02:00
183 changed files with 10073 additions and 4007 deletions
@@ -1,58 +1,80 @@
 <!--
 👋 Thank you for your contribution!
-
 ⚠️ Before you start, please review our Contributing Guidelines:
 https://github.com/portapack-mayhem/mayhem-firmware/wiki/Contributing-Guidelines
 -->

 ## 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! 
+-->
+
+
+

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

 ---

 ## 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.
+-->
+
+
+

-> ⚠️ **PRs without proof will not be merged.** Please provide evidence for every section below that applies to your change.
->
-> 🛈 **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. 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.
+-->
+
+
+

-<!-- 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 
+-->
+
+

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

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

-If this section does not apply to your PR, write `N/A` below and briefly explain why.

-<!-- 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).**
-
+<!--
+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
+- 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

-If you are modifying an existing app, make sure the wiki page reflects your changes.

 ---

@@ -64,4 +86,6 @@ If you are modifying an existing app, make sure the wiki page reflects your chan
 - [ ] 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)
@@ -0,0 +1,65 @@
+# 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,4 +1,7 @@
 <!---
+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.__ 
 >
@@ -14,15 +17,18 @@ 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="PortaPack H4M Crash Course" src="https://img.youtube.com/vi/CjI-nUzdpas/maxresdefault.jpg" width="701">](https://share.hackrf.app/SPFOZO)
+[<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="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
@@ -32,11 +38,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/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: ![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: 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: 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: 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). 
+: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). 

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

@@ -51,6 +57,9 @@ 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.

@@ -57,6 +57,8 @@ 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,6 +192,7 @@ set(CPPSRC
 	${COMMON}/battery.cpp
 	${COMMON}/performance_counter.cpp
 	${COMMON}/bmpfile.cpp
+	${COMMON}/gpio.cpp
 	app_settings.cpp
 	audio.cpp
 	baseband_api.cpp
@@ -332,6 +333,7 @@ set(CPPSRC
 	${CPLD_H4M_DATA_CPP}
 	${HACKRF_CPLD_DATA_CPP}
 	ui_external_items_menu_loader.cpp
+	view_factory_base.cpp
 )

 set_source_files_properties(${CPPSRC} PROPERTIES COMPILE_FLAGS -flto) # Add lto flag to the non-external sources only
@@ -511,3 +513,5 @@ add_custom_target(
 	${PROJECT_NAME}
 	DEPENDS ${PROJECT_NAME}.bin
 )
+
+add_dependencies(${PROJECT_NAME} baseband)
@@ -50,6 +50,9 @@ 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;
@@ -87,6 +90,9 @@ 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;
@@ -97,9 +103,8 @@ void BoundSetting::write(File& file) const {
            file.write(to_string_dec_uint(as<uint8_t>(), buffer, length), length);
            break;
        case SettingType::String: {
-            const auto& str = as<std::string>();
-            file.write(str.data(), str.length());
-            break;
+            file.write_line(as<std::string>());
+            return;
        }
        case SettingType::Bool:
            file.write(as<bool>() ? "1" : "0", 1);
@@ -33,6 +33,7 @@
 #include <variant>

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

@@ -47,6 +48,7 @@ class BoundSetting {
    /* The type of bound setting. */
    enum class SettingType : uint8_t {
        I64,
+        U64,
        I32,
        U32,
        U8,
@@ -59,6 +61,9 @@ 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} {}

@@ -134,7 +139,7 @@ struct AppSettings {
    uint8_t vga = 32;
    uint8_t rx_amp = 0;
    uint8_t tx_amp = 0;
-    uint8_t tx_gain = 35;
+    uint8_t tx_gain = hackrf::one::default_tx_gain_db;
    uint32_t channel_bandwidth = 1;
    uint32_t rx_frequency;
    uint32_t tx_frequency;
@@ -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(6), 4}};
+        {UI_POS_X(24), 0, UI_POS_WIDTH_REMAINING(24), 4}};

    Channel channel{
-        {UI_POS_X(24), 5, UI_POS_WIDTH_REMAINING(6), 4}};
+        {UI_POS_X(24), 5, UI_POS_WIDTH_REMAINING(24), 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 = UINT64_MAX;
+            freq_hz = 2'402'000'000ull;  // Default to channel 37 frequency if invalid channel number
    }

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

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

+    advCount = 0;
+
    send_packet();
 }

@@ -296,55 +298,61 @@ 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) {
-                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));
-
+                advCount++;
                if (advCount == 3) {
                    channel_number = 37;
-                    packet_counter--;
+                    field_frequency.set_value(get_freq_by_channel_number(channel_number));
+                    if (packet_counter > 0) 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 {
-                packet_counter--;
+                if (packet_counter > 0) packet_counter--;
                packetDone = true;
            }
        }
+    }

-        // Reached end of current packet repeats.
-        if (packet_counter == 0) {
-            // Done sending all packets.
-            if (current_packet == (num_packets - 1)) {
-                current_packet = 0;
+    // Reached end of current packet repeats.
+    if (packet_counter == 0) {
+        // Done sending all packets.
+        current_packet++;
+        if (current_packet >= num_packets) {
+            current_packet = 0;

-                // If looping, restart from beginning.
-                if (check_loop.value()) {
-                    update_current_packet(packets[current_packet], current_packet);
-                } else {
-                    stop();
-                }
-            } else {
-                current_packet++;
+            // If looping, restart from beginning.
+            if (check_loop.value()) {
                update_current_packet(packets[current_packet], current_packet);
+            } else {
+                stop();
            }
+        } else {
+            update_current_packet(packets[current_packet], current_packet);
        }
    }
 }
@@ -385,16 +393,20 @@ BLETxView::BLETxView(NavigationView& nav)
    };

    options_channel.on_change = [this](size_t, int32_t i) {
-        // If we selected Auto don't do anything and Auto will handle changing.
-        if (i == 40) {
-            auto_channel = true;
-            return;
+        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;
        } else {
-            auto_channel = false;
+            channel_number = i;
        }

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

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

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

    check_rand_mac.set_value(false);
    check_rand_mac.on_select = [this](Checkbox&, bool v) {
@@ -413,8 +425,7 @@ 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) {
-            on_file_changed(new_file_path);
-
+            this->on_file_changed(new_file_path);
            nav_.set_on_pop([this]() { button_play.focus(); });
        };
    };
@@ -427,7 +438,7 @@ BLETxView::BLETxView(NavigationView& nav)
            64,
            ENTER_KEYBOARD_MODE_ALPHA,
            [this](std::string& buffer) {
-                on_save_file(buffer);
+                this->on_save_file(buffer);
            });
    };

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

        do {
-            readUntil(data_file, packets[num_packets].macAddress, mac_address_size_str, ' ');
-            readUntil(data_file, packets[num_packets].advertisementData, max_packet_size_str, ' ');
-            readUntil(data_file, packets[num_packets].packetType, max_packet_type_str, ' ');
-            readUntil(data_file, packets[num_packets].packetCount, max_packet_repeat_str, '\n');
+            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');

            uint64_t macAddressSize = strlen(packets[num_packets].macAddress);
            uint64_t advertisementDataSize = strlen(packets[num_packets].advertisementData);
@@ -542,10 +553,8 @@ void BLETxView::on_file_changed(const fs::path& new_file_path) {
            num_packets++;

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

@@ -570,6 +579,9 @@ 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));
@@ -578,9 +590,6 @@ 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,6 +45,9 @@
 #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) {
@@ -94,7 +97,7 @@ struct BLETxPacket {
    char advertisementData[63];
    char packetCount[11];
    char packetType[17];
-    uint32_t packet_count;
+    uint32_t packet_count;  // repeat the same packet count times
    PKT_TYPE pduType;
 };

@@ -145,6 +148,7 @@ 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";

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

    bool repeatLoop = false;
-    uint32_t packet_counter{0};
-    uint32_t num_packets{0};
-    uint32_t current_packet{0};
-    uint8_t packetTxCount{0};
+    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
    bool packetDone = false;
    bool random_mac = false;
    bool file_override = false;
@@ -241,10 +245,48 @@ class BLETxView : public View {
    OptionsField options_channel{
        {11 * 8, 6 * 8},
        5,
-        {{"Ch.37 ", 37},
+        {{"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.38", 38},
         {"Ch.39", 39},
-         {"Auto", 40}}};
+         {"Auto", BLT_CHAN_AUTO},
+         {"All", BLT_CHAN_ALL}}};

    OptionsField options_adv_type{
        {17 * 8, 6 * 8},
@@ -238,6 +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
 }

@@ -52,7 +52,6 @@ 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("");
@@ -60,7 +59,9 @@ void BattinfoView::update_result() {
    }
    bool uichg = false;
    uint8_t valid_mask = 0;
-    battery::BatteryManagement::getBatteryInfo(valid_mask, percent, voltage, current);
+    bool battMayChanged = false;
+    battery::BatteryManagement::getBatteryInfo(valid_mask, percent, voltage, current, battMayChanged);
+    text_state.set((battMayChanged || !persistent_memory::battery_cap_valid()) ? "Needs config." : "ok");
    // 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) + " %");
@@ -76,6 +77,7 @@ 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");
@@ -98,7 +100,7 @@ void BattinfoView::update_result() {
        labels_opt.hidden(true);
        text_current.hidden(true);
        text_charge.hidden(true);
-        // text_cycles.hidden(true);
+        text_state.hidden(true);
        text_ttef.hidden(true);
        // text_warn.set("");
    }
@@ -143,9 +145,10 @@ void BattinfoView::update_result() {
    } else {
        text_method.set("Voltage");
    }
+    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};
+    BatteryStateMessage msg{valid_mask, percent, current >= 25, voltage, battMayChanged};
    EventDispatcher::send_message(msg);
 }

@@ -161,7 +164,7 @@ BattinfoView::BattinfoView(NavigationView& nav)
                  &button_settings,
                  &button_exit,
                  &text_capacity,
-                  // &text_cycles,
+                  //&text_state, //disabled for now
                  // &text_warn,
                  &text_ttef});

@@ -64,7 +64,7 @@ class BattinfoView : public View {
        {{UI_POS_X(2), UI_POS_Y(5)}, "Current:", Theme::getInstance()->fg_light->foreground},
        {{UI_POS_X(2), UI_POS_Y(6)}, "Charge:", Theme::getInstance()->fg_light->foreground},
        {{UI_POS_X(2), UI_POS_Y(7)}, "TTF/E:", Theme::getInstance()->fg_light->foreground},
-        // {{UI_POS_X(2), UI_POS_Y(8)}, "Cycles:", Theme::getInstance()->fg_light->foreground},
+        //{{UI_POS_X(2), UI_POS_Y(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},
    };

@@ -90,13 +90,14 @@ class BattinfoView : public View {
        {UI_POS_X(13), UI_POS_Y(7), UI_POS_WIDTH(11), UI_POS_HEIGHT(1)},
        "-"};

-    /* Text text_cycles{
-        {UI_POS_X(13), UI_POS_Y(8), UI_POS_WIDTH(11), UI_POS_HEIGHT(1)},
-        "-"};
-
+    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)},
-        ""}; */
+        ""};
+    */

    Button button_settings{
        {UI_POS_X(2), UI_POS_Y(11) + 5, UI_POS_WIDTH(10), UI_POS_HEIGHT(2)},
@@ -3176,9 +3176,9 @@ void RFFC5072StatusView::refresh_status() {

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

 void DfuMenu2::paint(Painter& painter) {
@@ -118,9 +119,12 @@ 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 = 11 + 2;
+    constexpr auto lines = 12 + 2;

    painter.fill_rectangle(
        {{5 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
@@ -96,6 +96,7 @@ 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}, ""};
@@ -109,6 +110,7 @@ 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,6 +43,7 @@ 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"};
@@ -88,8 +89,11 @@ 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 {};

@@ -386,6 +390,7 @@ 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) {
@@ -394,6 +399,7 @@ std::string get_filename(std::string _s) {
        return _s.substr(index + 1);
    }
 }
+
 void FileManBaseView::refresh_list() {
    if (on_refresh_widgets)
        on_refresh_widgets(false);
@@ -404,8 +410,6 @@ 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) {
@@ -414,8 +418,10 @@ 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_name.substr(0, max_filename_length) + std::string((max_filename_length + 1) - entry_name.length(), ' ') + size_str,
+                {entry.path + "\t" + size_str,
                 Theme::getInstance()->fg_yellow->foreground,
                 &bitmap_icon_dir,
                 [this](KeyEvent key) {
@@ -427,8 +433,9 @@ 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_name.substr(0, max_filename_length) + std::string((max_filename_length + 1) - entry_name.length(), ' ') + size_str,
+                {entry.path + "\t" + size_str,
                 assoc.color,
                 assoc.icon,
                 [this](KeyEvent key) {
@@ -80,6 +80,7 @@ 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 = 26;
+static constexpr size_t max_filename_length = 60;  // max length of filename

 bool valid_firmware_file(std::filesystem::path::string_type path) {
    File firmware_file;
@@ -134,12 +134,6 @@ 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(
@@ -157,6 +151,7 @@ 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();
@@ -166,13 +161,14 @@ 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 seconds.");
+    painter.draw_string({12, 24}, this->nav_.style(), "This will take 15-45 sec.");
    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,7 +49,6 @@ 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_;
@@ -68,14 +67,6 @@ 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,6 +172,7 @@ 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,6 +24,7 @@
 #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"
@@ -31,6 +32,7 @@
 using namespace portapack;

 namespace ui {
+
 void GlassView::focus() {
    range_presets.focus();
 }
@@ -44,7 +46,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);
+    return toLow + ((value - fromLow) * (toHigh - toLow) + (fromHigh - fromLow) / 2) / (fromHigh - fromLow);
 }

 void GlassView::update_display_beep() {
@@ -128,8 +130,9 @@ 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, 108 + 16}, {screen_width, screen_height - (108 + 16)}}, {0, 0, 0});
+        display.fill_rectangle({{0, spectrum_y}, {screen_width, spectrum_height}}, {0, 0, 0});
 }

 void GlassView::add_spectrum_pixel(uint8_t power) {
@@ -144,11 +147,9 @@ 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 = 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)};
-
+            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;
            // drawing and keeping track of max freq
            for (uint16_t xpos = 0; xpos < screen_width; xpos++) {
                // save max powerwull freq
@@ -156,17 +157,21 @@ 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 = y_max_range.clip(((spectrum_data[xpos] - raw_min) * (screen_height - (108 + 16))) / raw_delta);
-                uint8_t color_gradient = (point * 255) / 212;
+                int16_t point = map(spectrum_data[xpos], 0, 255, 0, spectrum_height);
                // clear if not in peak view
                if (live_frequency_view != 2) {
-                    display.fill_rectangle({{xpos, 108 + 16}, {1, screen_height - point}}, {0, 0, 0});
+                    display.fill_rectangle({{xpos, spectrum_y}, {1, screen_height - point}}, {0, 0, 0});
                }
-                display.fill_rectangle({{xpos, screen_height - point}, {1, point}}, {color_gradient, 0, uint8_t(255 - color_gradient)});
+                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]);
            }
            if (last_max_freq != max_freq_hold) {
                last_max_freq = max_freq_hold;
-                freq_stats.set("MAX HOLD: " + to_string_short_freq(max_freq_hold));
+                freq_stats.set("MAX: " + to_string_short_freq(max_freq_hold));
            }
            plot_marker(marker_pixel_index);
        } else {
@@ -392,6 +397,7 @@ GlassView::GlassView(
                  &button_marker_plus,
                  &button_jump,
                  &button_rst,
+                  &button_rssi,
                  &freq_stats});

    load_presets();  // Load available presets from TXT files (or default).
@@ -446,6 +452,7 @@ 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;

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

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

@@ -535,6 +544,16 @@ 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();
+    };
+
    display.scroll_set_area(109, screen_height - 1);  // Restart scroll on the correct coordinates

    // trigger:
@@ -585,34 +604,39 @@ 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"});

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

-            auto cols = split_string(line, ',');
-            if (cols.size() != 3)
-                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;

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

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

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

    populate_presets();
 }
@@ -104,6 +104,7 @@ 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();
@@ -163,40 +164,44 @@ 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, 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}};
+        {{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}};

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

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

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

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

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

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

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

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

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

    TextField field_marker{
-        {12 * 8, 3 * 16, 9 * 8, 16},
+        {UI_POS_X(12), UI_POS_Y(3), UI_POS_WIDTH(9), UI_POS_HEIGHT(1)},
        ""};

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

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

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

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

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

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

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

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

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

    Button button_rst{
-        {screen_width - 9 * 8, 5 * 16, 4 * 8, 16},
+        {UI_POS_X_RIGHT(9), UI_POS_Y(5), UI_POS_WIDTH(4), UI_POS_HEIGHT(1)},
        "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), 5 * 16, screen_width - 10 * 8, 8},
+        {UI_POS_X(0), UI_POS_Y(5), UI_POS_WIDTH(14), UI_POS_HEIGHT(1)},
        ""};

    MessageHandlerRegistration message_handler_spectrum_config{
@@ -1163,6 +1163,7 @@ SetBatteryView::SetBatteryView(NavigationView& nav) {
                  &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});
@@ -1170,14 +1171,20 @@ 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());
-        if (((uint32_t)field_battcap.value() != pmem::battery_cap_mah()) || (!pmem::battery_cap_valid())) {
+        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());
-            i2cdev::I2cDev_MAX17055* dev = (i2cdev::I2cDev_MAX17055*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055);
            if (dev && !dev->reInit()) {
                nav.display_modal("Error", "Battery gauge re-init failed");
                return;
            }
+            if (dev) {
+                dev->resetChangedFlag();
+                dev->update();  // resend the new data
+            }
        }
        send_system_refresh();
        nav.pop();
@@ -1206,6 +1213,7 @@ SetBatteryView::SetBatteryView(NavigationView& nav) {

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

    field_battcap.set_value(pmem::battery_cap_mah());

@@ -1053,7 +1053,7 @@ class SetBatteryView : public View {
        {{UI_POS_X_CENTER(17), UI_POS_Y(8)}, "Battery capacity", Theme::getInstance()->fg_light->foreground},
        {{UI_POS_X(7), UI_POS_Y(9)}, "mAh", Theme::getInstance()->fg_light->foreground}};

-    Labels labels2{{{UI_POS_X(1), UI_POS_Y(11)}, "Reset IC's learned params.", 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)},
@@ -1078,17 +1078,22 @@ class SetBatteryView : public View {
        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(4), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        {UI_POS_X_CENTER(12) + UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(3), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
        "Cancel",
    };

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

    Button button_reset{
-        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y(13), UI_POS_WIDTH(12), UI_POS_HEIGHT(2)},
+        {UI_POS_X_CENTER(12) - UI_POS_WIDTH(8), UI_POS_Y_BOTTOM(6), 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,
@@ -432,6 +432,10 @@ 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;
@@ -443,6 +447,10 @@ void set_p25tx_data(const uint8_t* dibits, uint16_t frame_length) {

 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");
@@ -118,6 +118,7 @@ void set_bitstream_config(uint32_t deviation, uint8_t mode);
 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 request_roger_beep();
@@ -125,6 +126,7 @@ 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,12 +25,19 @@
 #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"
@@ -325,6 +332,12 @@ 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)
@@ -406,7 +419,11 @@ std::string ClockManager::get_freq() {
           to_string_dec_uint((reference.frequency % 1000000) / 100, 4, '0') + " MHz";
 }

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

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

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

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

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

    clock_generator.reset();
    clock_generator.set_crystal_internal_load_capacitance(CrystalInternalLoadCapacitance::XTAL_CL_8pF);
    clock_generator.enable_fanout();

 #ifdef PRALINE
-    /* PRALINE has Si5351A (NOT Si5351C like HackRF One OG).
-     * Must use Si5351A configuration: PLLA only, no CLKIN support.
-     *
-     * IMPORTANT: Follow HackRF reference sequence:
-     * 1. Set PLL input sources
-     * 2. Configure PLL and multisynths
-     * 3. Set clock control registers (AFTER multisynths!)
-     * 4. Reset PLLs
-     * 5. Enable outputs
+    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.
     */
-    clock_generator.set_pll_input_sources(si5351a_pll_input_sources);
+    clock_generator.set_pll_input_sources(si5351c_pll_input_sources);

-    /* Skip MCU CLKIN setup and reference detection for PRALINE - not applicable */
-    reference = Reference{ReferenceSource::Xtal, 0};  // PLLA
+    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);

-    /* Clock control will be set AFTER multisynth configuration - see below */
+    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);
 #else
    clock_generator.set_pll_input_sources(hackrf_r9
                                              ? si5351a_pll_input_sources
@@ -508,86 +536,50 @@ 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
-     */
    {
-        // 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;
+        const auto& pll_b = si5351c_pll_b_clkin_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);

-    /* 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)
+    // CLK1: DSCT_CLK initial 10 MHz
+    clock_generator.write_ms_single_byte(
+        1,
+        si5351_ms_10m);

-    /* 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);
+    // CLK2: MCU_CLK 40 MHz
+    clock_generator.write_ms_single_byte(
+        2,
+        si5351_ms_afe_40m);

-    // 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);
+    // 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]);
+        }
+    }
 #else
    if (hackrf_r9) {
        const PLLReg pll_reg = (reference.source == ReferenceSource::Xtal)
@@ -615,15 +607,14 @@ void ClockManager::init_clock_generator() {

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

 #else
    // Wait for PLL(s) to lock - with timeout to prevent hang
@@ -723,13 +714,13 @@ void ClockManager::shutdown() {

 void ClockManager::enable_codec_clocks() {
 #ifdef PRALINE
-    /* PRALINE: CLK0 (AFE_CLK) for codec/FPGA, CLK1 (SCT_CLK) for FPGA timing.
-     * Reference hackrf_core.c shows PRALINE needs both CLK0 and CLK1. */
+    /* 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. */
    clock_generator.enable_clock(clock_generator_output_og_codec); /* CLK0 MAX5864*/
    clock_generator.enable_clock(clock_generator_output_og_cpld);  /* CLK1 iCE40 FPGA*/
-    clock_generator.enable_clock(clock_generator_output_og_sgpio); /* CLK2 LPC43xx*/
    clock_generator.enable_output_mask(
-        (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld) | (1U << clock_generator_output_og_sgpio));
+        (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld));
 #else
    if (hackrf_r9) {
        clock_generator.enable_clock(clock_generator_output_r9_sgpio);
@@ -757,12 +748,11 @@ void ClockManager::disable_codec_clocks() {
     * CLKx_DISABLE_STATE.
     */
 #ifdef PRALINE
-    /* PRALINE: CLK0 (AFE_CLK), CLK1 (SCT_CLK), and CLK2 MCU used for codec/FPGA */
+    /* PRALINE: leave CLK2/MCU_CLKIN alone; only disable datapath-owned clocks. */
    clock_generator.disable_output_mask(
-        (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld) | (1U << clock_generator_output_og_sgpio));
+        (1U << clock_generator_output_og_codec) | (1U << clock_generator_output_og_cpld));
    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);
@@ -821,7 +811,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 to achieve desired output rate
+     * 2. Use FPGA decimation/interpolation to achieve desired output rate
     * 3. Ensure AFE rate is achievable by Si5351 (clean division from 800 MHz VCO)
     */

@@ -842,50 +832,96 @@ void ClockManager::set_sampling_frequency(const uint32_t 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);
+    /* 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;
+        }
    }

-    // 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);
+    _resampling_n = n;

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

-    // === Reset PLL A for phase alignment ===
-    clock_generator.write_register(si5351::Register::PLLReset, 0x20);
+    /* 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. */

-    // 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--);
+    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);
+        }

-    // Re-enable FPGA processing with clean state ===
-    fpga_debug_register_write(1, 0x01);
+        // 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);
+
+        /* RX Mode: Register 3 is FPGA_REG_RX_DIGITAL_GAIN.
+         * We shift up by (3 * n) to compensate for CIC bit-growth.
+         */
+        uint8_t ds = (3 * n);
+        ds += 2;
+        fpga_debug_register_write(FPGA_REG_RX_DIGITAL_GAIN, ds);
+
+        // 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
@@ -1180,3 +1216,74 @@ 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,6 +77,29 @@ 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
@@ -93,6 +116,9 @@ class ClockManager {

    void enable_clock_output(bool enable);

+    void portapack_tcxo_enable();
+    void portapack_tcxo_disable();
+
   private:
    I2C& i2c0;
    si5351::Si5351& clock_generator;
@@ -24,6 +24,11 @@
 #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() {
@@ -103,16 +108,16 @@ void config_mode_run() {

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

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

        chThdSleepMilliseconds(100);
@@ -122,14 +127,14 @@ void config_mode_run() {

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

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

        auto dfu_btn = portapack::gpio_dfu.read();
@@ -33,6 +33,9 @@
 #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"
@@ -134,9 +137,9 @@ void draw_line(int32_t y_offset, const char* label, regarm_t value) {
 }

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

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

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

 #include "ch.h"

-#include "hackrf_gpio.hpp"
-using namespace hackrf::one;
+#include "gpio.hpp"
+using namespace gpio_control;

 #include "irq_rtc.hpp"

@@ -185,10 +185,11 @@ void EventDispatcher::charge_deep_sleep(const bool sleep) {

        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
-        gpio_vaa_disable.set();
-        gpio_1v2_enable.clear();
        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));
@@ -196,8 +197,6 @@ void EventDispatcher::charge_deep_sleep(const bool sleep) {
        LPC_GPIO->DIR[5] &= ~(1 << 16);
 #else
        // Power management and GPIO configuration for legacy hardware
-        gpio_og_vaa_disable.set();
-        gpio_r9_vaa_disable.clear();
        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));
@@ -228,8 +227,8 @@ void EventDispatcher::charge_deep_sleep(const bool sleep) {

        LPC_ADC0->CR &= ~(1 << 21);
        LPC_ADC1->CR &= ~(1 << 21);
-        led_rx.off();
-        led_usb.off();
+        led_rx.setInactive();
+        led_usb.setInactive();

        rtc_wakeup_init();
        NVIC_EnableIRQ(I2C0_OR_I2C1_IRQn);
@@ -238,28 +237,29 @@ void EventDispatcher::charge_deep_sleep(const bool sleep) {
            // --- Battery Status Check (I2C) ---
            detect = battery::BatteryManagement::isDetected();
            if (detect) {
-                battery::BatteryManagement::getBatteryInfo(valid_mask, percent, voltage, current);
+                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.off();
-                    led_tx.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.on();  // LED indicates error/idle
-                    led_rx.off();
+                    led_tx.setActive();  // LED indicates error/idle
+                    led_rx.setInactive();
                } else {
                    // Case 3: Actively charging
-                    led_rx.on();  // LED indicates charging
-                    led_tx.off();
+                    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.on();
-                led_rx.on();
+                led_tx.setActive();
+                led_rx.setActive();
            }

            // Shut down I2C and power down the APB bus for sleep
@@ -268,17 +268,11 @@ void EventDispatcher::charge_deep_sleep(const bool sleep) {

            // Save interrupt states before mass disable
            uint32_t saved_iser0 = NVIC->ISER[0];
-            uint32_t saved_iser1 = NVIC->ISER[1];
-            uint32_t saved_iser2 = NVIC->ISER[2];

            // Disable and clear all pending interrupts
            NVIC->ICER[0] = 0xFFFFFFFF;
-            NVIC->ICER[1] = 0xFFFFFFFF;
-            NVIC->ICER[2] = 0xFFFFFFFF;

            NVIC->ICPR[0] = 0xFFFFFFFF;
-            NVIC->ICPR[1] = 0xFFFFFFFF;
-            NVIC->ICPR[2] = 0xFFFFFFFF;

            // Re-enable only necessary wakeup sources
            NVIC_EnableIRQ(RTC_IRQn);
@@ -326,8 +320,6 @@ void EventDispatcher::charge_deep_sleep(const bool sleep) {

            // Restore original interrupt enable states
            NVIC->ISER[0] = saved_iser0;
-            NVIC->ISER[1] = saved_iser1;
-            NVIC->ISER[2] = saved_iser2;

        }  // End of while(1) deep sleep loop
    } else {
@@ -6,11 +6,9 @@
 * ------------------------------------------------------------
 */

+#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;
@@ -28,7 +26,6 @@ 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,
@@ -151,8 +148,6 @@ 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);
@@ -196,34 +191,22 @@ void BattleshipView::init_game() {
 }

 void BattleshipView::show_hide_menu(bool 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);
+    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);
+    }

-    // 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();
 }

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

-        // 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());
+        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);

-            if (button_red_team.has_focus()) {
+            if (btn.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_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");
-        }
+            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");
+        };

-        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");
-        }
+        draw_team_btn(button_red_team, Color::dark_red(), Color::red(), "RED");
+        draw_team_btn(button_blue_team, Color::dark_blue(), Color::blue(), "BLUE");

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

-    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());
+    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, 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());
+    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());
+    }

    // Radio status indicator
    Point indicator_pos{UI_POS_MAXWIDTH - 20, 59};
-    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());
-    }
+    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());
 }

 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) {
@@ -464,11 +428,14 @@ 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 = 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;
+            uint16_t preview_x = cursor_x + (i * dx);
+            uint16_t preview_y = cursor_y + (i * dy);
            if (grid_x == preview_x && grid_y == preview_y && preview_x < GRID_SIZE && preview_y < GRID_SIZE) {
                return;
            }
@@ -540,9 +507,12 @@ 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 = placing_horizontal ? cursor_x + i : cursor_x;
-        uint8_t y = placing_horizontal ? cursor_y : cursor_y + i;
+        uint8_t x = cursor_x + (i * dx);
+        uint8_t y = cursor_y + (i * dy);

        if (x < GRID_SIZE && y < GRID_SIZE) {
            uint16_t cell_x = GRID_OFFSET_X + x * CELL_SIZE + 1;
@@ -561,18 +531,21 @@ 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 = horizontal ? x + i : x;
-        uint8_t check_y = horizontal ? y : y + i;
+        uint8_t check_x = x + (i * dx);
+        uint8_t check_y = y + (i * dy);

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

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

                if (adj_x >= 0 && adj_x < GRID_SIZE &&
                    adj_y >= 0 && adj_y < GRID_SIZE) {
@@ -604,10 +577,11 @@ 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++) {
-        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;
+        my_grid[cursor_y + (i * dy)][cursor_x + (i * dx)] = CellState::SHIP;
    }

    current_ship_index++;
@@ -644,9 +618,14 @@ 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 = msg_strings[static_cast<int>(msg.type)];
+    std::string message;
+    message.reserve(16);
+    message.append(msg_strings[static_cast<int>(msg.type)]);
+
    if (msg.type != MessageType::READY && msg.type != MessageType::WIN) {
-        message += to_string_dec_uint(msg.x) + "," + to_string_dec_uint(msg.y);
+        message.append(to_string_dec_uint(msg.x));
+        message.append(",");
+        message.append(to_string_dec_uint(msg.y));
    }

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

            bool hit_this_ship = false;
-            for (uint8_t i = 0; i < ship.size(); i++) {
-                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) {
+            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) {
                    hit_this_ship = true;
                    ship.hits++;
                    break;
@@ -852,9 +832,7 @@ void BattleshipView::process_shot(uint8_t x, uint8_t y) {
                ships_remaining--;

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

 void BattleshipView::update_score() {
-    current_score = "W:" + to_string_dec_uint(wins) + " L:" + to_string_dec_uint(losses);
+    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));
 }

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

 }  // namespace ui::external_app::battleship
+#pragma GCC pop_options
@@ -9,6 +9,11 @@
 #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"
@@ -0,0 +1,59 @@
+/*
+ * 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
@@ -0,0 +1,856 @@
+/*
+ * 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__
@@ -0,0 +1,95 @@
+/*
+ * 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
@@ -0,0 +1,56 @@
+/*
+ * 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__ */
@@ -0,0 +1,122 @@
+/*
+ * 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__
@@ -0,0 +1,149 @@
+/*
+ * 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
@@ -0,0 +1,76 @@
+/*
+ * 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::orange().v,
+    /*.icon_color = */ ui::Color::green().v,
    /*.menu_location = */ app_location_t::RX,
    /*.desired_menu_position = */ -1,

@@ -0,0 +1,100 @@
+/*
+ * 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__
@@ -0,0 +1,140 @@
+/*
+ * 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
@@ -0,0 +1,61 @@
+/*
+ * 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,5 +1,6 @@
 /*
 * Copyright (C) 2024 EPIRB Decoder Implementation
+ * Copyright (C) 2026 Frederic BORRY - ADRASEC 31
 *
 * This file is part of PortaPack.
 *
@@ -29,267 +30,293 @@
 #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 <cstdint>
-#include <cstddef>
-#include <string>
-#include <array> */
+#include "audio.hpp"
+
+#include "beacon.hpp"
+#include "beacon_db.hpp"
+#include "ui_beaconlist.hpp"
+#include "resources.hpp"

 namespace ui::external_app::epirb_rx {

-// 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) {}
-};
-
+/**
+ * Status of a packet
+ */
 enum class PacketStatus : uint8_t {
    Valid = 0,
    Corrected = 1,
    Error = 2
 };

-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);
-};
+// 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))

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

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

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

-// 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 {
+/**
+ * Dedicated TextArea component used to optimize application code size
+ */
+class TextArea : public Widget {
   public:
-    std::function<void(void)> on_close{};
+    TextArea(Rect parent_rect);

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

-    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; }
+    void set_content(std::string_view value);
+    void paint(Painter& painter) override;

   private:
-    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);
+    std::string content{};
 };

-class EPIRBAppView : public ui::View {
+// 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 {
   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};
+        "rx_epirb",
+        app_settings::Mode::RX,
+        {
+            {"epirb_squelch"sv, &squelch},
+            {"countdown"sv, &countdown},
+        }};

    ui::NavigationView& nav_;

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

-    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)},
+    OptionsField options_frequency{
+        {UI_POS_X(0), 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{
-        {13 * 8, UI_POS_Y(0)}};
+        {UI_POS_X(8), UI_POS_Y(0)}};

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

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

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

    ui::Channel channel{
-        {UI_POS_X(21), 5, UI_POS_WIDTH_REMAINING(24), 4}};
+        {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::AudioVolumeField field_volume{
-        {screen_width - 2 * 8, UI_POS_Y(0)}};
+        {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

    // Status display
-    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"};
-
+    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)}};
    SignalToken signal_token_tick_second{};
-    uint32_t beacons_received = 0;
-    uint32_t packets_valid = 0;
-    uint32_t packets_corrected = 0;
-    uint32_t packets_error = 0;
+    // 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;

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

-    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();
+    static void decode_packet(const baseband::Packet& packet, Beacon& beacon);
+    void on_packet(Message* const p);
+    void update_map();
    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
@@ -24,7 +24,6 @@
 #include "portapack.hpp"
 #include "ui_epirb_tx.hpp"
 #include <cmath>
-#include <cctype>
 #include <cstdio>

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

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

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

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

    if (sec == 60) {
        sec = 0;
@@ -68,8 +67,8 @@ static void decimal_to_dms(double value, bool& negative, uint16_t& deg, uint8_t&
 * @param sec seconds value
 * @return value the decimal value
 */
-static double dms_to_decimal(bool negative, uint16_t deg, uint8_t min, uint8_t sec) {
-    double v = deg + min / 60.0 + sec / 3600.0;
+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;
    return negative ? -v : v;
 }

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

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

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

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

-    for (int i = 0; i < pairs; i++) {
-        char c1 = std::toupper(loc[i * 2]);
-        char c2 = std::toupper(loc[i * 2 + 1]);
+    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');

-        double lon_size = lon_step[i];
-        double lat_size = lat_step[i];
+            float lon_size = lon_step[i];
+            float 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';
+            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;
        }

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

 /**
@@ -138,9 +142,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(double lat, double lon, int precision = 8) {
-    lon += 180.0;
-    lat += 90.0;
+static std::string decimal_to_maidenhead(float lat, float lon, int precision = 8) {
+    lon += 180.0f;
+    lat += 90.0f;

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

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

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

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

    std::string locator;

@@ -247,9 +251,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[16];
+    char buffer[20];
    // Format :  <xxx°yy'zz"N>
-    snprintf(buffer, sizeof(buffer), "%3d\260%02d'%02d\"%c", location.lat_deg, location.lat_min, location.lat_sec, location.south ? 'S' : 'N');
+    sprintf(buffer, "%3d\260%02d'%02d\"%c", location.lat_deg, location.lat_min, location.lat_sec, location.south ? 'S' : 'N');
    return std::string(buffer);
 }

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

@@ -353,7 +357,16 @@ set(EXTCPPSRC

 	#two_tone_rx
 	external/two_tone_rx/main.cpp
-	external/two_tone_rx/ui_two_tone_rx.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
 )

 set(EXTAPPLIST
@@ -442,6 +455,8 @@ set(EXTAPPLIST
 	p25_tx
 	two_tone_pager
 	two_tone_rx
+	hard_reset
+	secplustx
 )

 # sdusb has type conflicts with PRALINE (HackRF Pro) - add only for non-PRALINE builds
@@ -109,6 +109,8 @@ MEMORY
    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
 }

 SECTIONS
@@ -628,4 +630,16 @@ SECTIONS
        KEEP(*(.external_app.app_flex_tx.application_information));
        *(*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));
+        *(*ui*external_app*hard_reset*);
+    } > ram_external_app_hard_reset
+
+    .external_app_secplustx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_secplustx.application_information));
+        *(*ui*external_app*secplustx*);
+    } > ram_external_app_secplustx
 }
@@ -0,0 +1,87 @@
+/*
+ * 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"
@@ -0,0 +1,239 @@
+/*
+ * 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
@@ -0,0 +1,69 @@
+/*
+ * 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__
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2026 Synray
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_secplustx.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::ui_secplustx {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<SecplusTXView>();
+}
+}  // namespace ui::external_app::ui_secplustx
+
+extern "C" {
+
+__attribute__((section(".external_app.app_secplustx.application_information"), used)) application_information_t _application_information_secplustx = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::ui_secplustx::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+    /*.app_name = */ "Security+",
+    /*.bitmap_data = */ {
+        0b00100000,
+        0b00000000,
+        0b00100000,
+        0b00100000,
+        0b00100000,
+        0b01110000,
+        0b00100000,
+        0b00100000,
+        0b11100000,
+        0b00000111,
+        0b11110000,
+        0b00001111,
+        0b00110000,
+        0b00001100,
+        0b00110000,
+        0b00001100,
+        0b11110000,
+        0b00001111,
+        0b11110000,
+        0b00001111,
+        0b01110000,
+        0b00001101,
+        0b10110000,
+        0b00001110,
+        0b01110000,
+        0b00001101,
+        0b10110000,
+        0b00001110,
+        0b11110000,
+        0b00001111,
+        0b11100000,
+        0b00000111,
+    },
+    /*.icon_color = */ ui::Color::yellow().v,
+    /*.menu_location = */ app_location_t::TX,
+    /*.desired_menu_position = */ -1,
+    /*.m4_app_tag = portapack::spi_flash::image_tag_ook */ {'P', 'O', 'O', 'K'},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2022 Clayton Smith (argilo@gmail.com)
+ *
+ * This file is part of secplus.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+
+#include "secplustx.hpp"
+
+namespace ui::external_app::ui_secplustx {
+
+static void v2_calc_parity(const uint64_t fixed, uint32_t* data) {
+    uint32_t parity = (fixed >> 32) & 0xf;
+    int8_t offset;
+
+    *data &= 0xffff0fff;
+    for (offset = 0; offset < 32; offset += 4) {
+        parity ^= ((*data >> offset) & 0xf);
+    }
+    *data |= (parity << 12);
+}
+
+static void encode_v2_rolling(const uint32_t rolling,
+                              uint32_t* rolling_halves) {
+    uint32_t rolling_reversed = 0;
+    int8_t i, half;
+
+    for (i = 0; i < 28; i++) {
+        rolling_reversed |= ((rolling >> i) & 1) << (28 - i - 1);
+    }
+
+    rolling_halves[0] = 0;
+    rolling_halves[1] = 0;
+
+    for (half = 0; half < 2; half++) {
+        for (i = 0; i < 8; i += 2) {
+            rolling_halves[half] |= rolling_reversed % 3 << i;
+            rolling_reversed /= 3;
+        }
+    }
+
+    for (half = 0; half < 2; half++) {
+        for (i = 10; i < 18; i += 2) {
+            rolling_halves[half] |= rolling_reversed % 3 << i;
+            rolling_reversed /= 3;
+        }
+    }
+
+    rolling_halves[0] |= (rolling_reversed % 3) << 8;
+    rolling_reversed /= 3;
+
+    rolling_halves[1] |= (rolling_reversed % 3) << 8;
+}
+
+static const int8_t ORDER[16] = {9, 33, 6, -1, 24, 18, 36, -1,
+                                 24, 36, 6, -1, -1, -1, -1, -1};
+static const int8_t INVERT[16] = {6, 2, 1, -1, 7, 5, 3, -1,
+                                  4, 0, 5, -1, -1, -1, -1, -1};
+
+static void v2_scramble(const uint32_t* parts, const uint8_t frame_type, uint8_t* packet_half) {
+    const int8_t order = ORDER[packet_half[0] >> 4];
+    const int8_t invert = INVERT[packet_half[0] & 0xf];
+    int8_t i;
+    uint8_t out_offset = 10;
+    int8_t end;
+    uint32_t parts_permuted[3];
+
+    end = (frame_type == 0 ? 5 : 8);
+    for (i = 1; i < end; i++) {
+        packet_half[i] = 0;
+    }
+
+    parts_permuted[0] =
+        (invert & 4) ? ~parts[(order >> 4) & 3] : parts[(order >> 4) & 3];
+    parts_permuted[1] =
+        (invert & 2) ? ~parts[(order >> 2) & 3] : parts[(order >> 2) & 3];
+    parts_permuted[2] = (invert & 1) ? ~parts[order & 3] : parts[order & 3];
+
+    end = (frame_type == 0 ? 8 : 0);
+    for (i = 18 - 1; i >= end; i--) {
+        packet_half[out_offset >> 3] |= ((parts_permuted[0] >> i) & 1)
+                                        << (7 - (out_offset % 8));
+        out_offset++;
+        packet_half[out_offset >> 3] |= ((parts_permuted[1] >> i) & 1)
+                                        << (7 - (out_offset % 8));
+        out_offset++;
+        packet_half[out_offset >> 3] |= ((parts_permuted[2] >> i) & 1)
+                                        << (7 - (out_offset % 8));
+        out_offset++;
+    }
+}
+
+static void encode_v2_half_parts(const uint32_t rolling, const uint32_t fixed, const uint16_t data, const uint8_t frame_type, uint8_t* packet_half) {
+    uint32_t parts[3];
+
+    parts[0] = ((fixed >> 10) << 8) | (data >> 8);
+    parts[1] = ((fixed & 0x3ff) << 8) | (data & 0xff);
+    parts[2] = rolling;
+
+    packet_half[0] = (uint8_t)rolling;
+
+    v2_scramble(parts, frame_type, packet_half);
+}
+
+static int8_t v2_check_limits(const uint32_t rolling, const uint64_t fixed) {
+    if ((rolling >> 28) != 0) {
+        return -1;
+    }
+
+    if ((fixed >> 40) != 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+static void encode_v2_half(const uint32_t rolling, const uint32_t fixed, const uint16_t data, const uint8_t frame_type, uint8_t* packet_half) {
+    encode_v2_half_parts(rolling, fixed, data, frame_type, packet_half);
+
+    /* shift indicator two bits to the right */
+    packet_half[1] |= (packet_half[0] & 0x3) << 6;
+    packet_half[0] >>= 2;
+
+    /* set frame type */
+    packet_half[0] |= (frame_type << 6);
+}
+
+int8_t encode_v2(const uint32_t rolling, const uint64_t fixed, uint32_t data, const uint8_t frame_type, uint8_t* packet1, uint8_t* packet2) {
+    int8_t err = 0;
+    uint32_t rolling_halves[2];
+
+    err = v2_check_limits(rolling, fixed);
+    if (err < 0) {
+        return err;
+    }
+
+    encode_v2_rolling(rolling, rolling_halves);
+    v2_calc_parity(fixed, &data);
+
+    encode_v2_half(rolling_halves[0], fixed >> 20, data >> 16, frame_type,
+                   packet1);
+    encode_v2_half(rolling_halves[1], fixed & 0xfffff, data & 0xffff, frame_type,
+                   packet2);
+
+    return 0;
+}
+
+};  // namespace ui::external_app::ui_secplustx
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 Clayton Smith (argilo@gmail.com)
+ *
+ * This file is part of secplus.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+
+#ifndef __SECPLUSTX__
+#define __SECPLUSTX__
+
+#include <cstdint>
+
+namespace ui::external_app::ui_secplustx {
+int8_t encode_v2(const uint32_t rolling, const uint64_t fixed, uint32_t data, const uint8_t frame_type, uint8_t* packet1, uint8_t* packet2);
+};
+
+#endif
@@ -0,0 +1,227 @@
+#include "ui_secplustx.hpp"
+
+#include <string_view>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "secplustx.hpp"
+#include "ui_fileman.hpp"
+#include "file_reader.hpp"
+#include "baseband_api.hpp"
+#include "string_format.hpp"
+#include "optional.hpp"
+
+using namespace portapack;
+using namespace ui;
+
+namespace fs = std::filesystem;
+
+namespace ui::external_app::ui_secplustx {
+
+static constexpr uint8_t secplus_repeat_count = 3;
+static constexpr float secplus_sample_rate = OOK_SAMPLERATE / 4000.0f;
+
+Optional<SecplusData> SecplusTXView::read_secplus_file(const fs::path& file_path) {
+    File file{};
+    if (auto error = file.open(file_path)) return {};
+
+    std::string raw = *FileLineReader{file}.begin();
+    std::vector chunks = split_string(raw, ';');
+    if (chunks.empty()) return {};
+
+    SecplusData data{};
+    data.version = static_cast<SecplusVersion>(std::strtoul(chunks[0].data(), NULL, 10));
+    switch (data.version) {
+        case SecplusVersion::V1:
+            return {};  // unimplemented
+        case SecplusVersion::V2: {
+            if (chunks.size() != 6) return {};
+            data.name = std::string{chunks[1]};
+            if (data.name.empty()) data.name = "Remote";
+            data.has_data = std::strtoul(chunks[2].data(), NULL, 10);
+            data.fixed_code = std::strtoull(chunks[3].data(), NULL, 16);
+            data.rolling_code = std::strtoul(chunks[4].data(), NULL, 16);
+            data.data = std::strtoul(chunks[5].data(), NULL, 16);
+            return data;
+        }
+        default:
+            return {};
+    }
+}
+
+bool SecplusTXView::write_secplus_file(const fs::path& file_path, const SecplusData& data) {
+    ensure_directory(secplus_dir);
+    File file{};
+    if (auto error = file.create(file_path)) {
+        return false;
+    }
+
+    switch (data.version) {
+        case SecplusVersion::V1:
+            return false;  // unimplemented
+        case SecplusVersion::V2: {
+            std::string formatted = to_string_dec_uint(static_cast<uint8_t>(data.version));
+            formatted += ';';
+            formatted += data.name;
+            formatted += ';';
+            formatted += to_string_dec_uint(data.has_data);
+            formatted += ';';
+            formatted += to_string_hex(data.fixed_code);
+            formatted += ';';
+            formatted += to_string_hex(data.rolling_code);
+            formatted += ';';
+            formatted += to_string_hex(data.data);
+            file.write_line(formatted);
+            file.close();
+            return true;
+        }
+        default:
+            return false;
+    }
+}
+
+SecplusTXView::SecplusTXView(NavigationView& nav)
+    : nav_{nav} {
+    if (!fs::file_exists(file_path)) write_secplus_file(file_path, data);
+    baseband::run_image(portapack::spi_flash::image_tag_ook);
+
+    add_children({&button_open,
+                  &button_save,
+                  &field_name,
+                  &labels,
+                  &field_fixed,
+                  &field_rolling,
+                  &has_data,
+                  &field_data,
+                  &learn_mode,
+                  &autosave,
+                  &progressbar,
+                  &tx_view});
+
+    button_open.on_select = [this](const Button&) {
+        ensure_directory(secplus_dir);
+        auto open_view = nav_.push<FileLoadView>(".SECPLUS");
+        open_view->push_dir(secplus_dir);
+        open_view->on_changed = [this](fs::path path) { file_path = path.string(); };
+        nav_.set_on_pop([this]() { reload_data(); });
+    };
+    button_save.on_select = [this](const Button&) { write_secplus_file(file_path, data); };
+
+    field_name.on_select = [this, &nav](TextField&) {
+        buffer = data.name;
+        text_prompt(nav_, buffer, field_name.parent_rect().width() / UI_POS_DEFAULT_WIDTH, ENTER_KEYBOARD_MODE_ALPHA, [this](std::string& new_name) {
+            data.name = new_name;
+            field_name.set_text(new_name);
+            save_data();
+        });
+    };
+    field_fixed.on_change = [this](SymField& field) { data.fixed_code = field.to_integer(); };
+    field_rolling.on_change = [this](SymField& field) { data.rolling_code = field.to_integer(); };
+    field_data.on_change = [this](SymField& field) { data.data = field.to_integer(); };
+    has_data.on_select = [this](Checkbox& checkbox, bool value) {
+        data.has_data = value;
+        // fade if inactive, otherwise use default style
+        const Style* new_style = value ? &style() : Theme::getInstance()->fg_medium;
+        checkbox.set_style(new_style);
+        field_data.set_style(new_style);
+        field_data.set_focusable(value);
+    };
+    tx_view.on_edit_frequency = [this]() {
+        auto new_view = nav_.push<FrequencyKeypadView>(transmitter_model.target_frequency());
+        new_view->on_changed = [](rf::Frequency f) {
+            transmitter_model.set_target_frequency(f);
+        };
+    };
+
+    tx_view.on_start = [this]() { start_tx(); };
+    tx_view.on_stop = [this]() {
+        baseband::kill_ook();
+        stop_tx();
+    };
+
+    autosave.set_value(true);
+    reload_data();
+}
+
+void SecplusTXView::save_data() {
+    if (autosave.value()) write_secplus_file(file_path, data);
+}
+
+void SecplusTXView::reload_data() {
+    if (auto result = read_secplus_file(file_path)) data = std::move(*result);
+    // always update data, use default values if read failed
+    field_name.set_text(data.name);
+    has_data.set_value(data.has_data);
+    field_rolling.set_value(data.rolling_code);
+    field_fixed.set_value(data.fixed_code);
+    field_data.set_value(data.data);
+}
+
+void SecplusTXView::start_tx() {
+    uint8_t packet1[8]{};
+    uint8_t packet2[8]{};
+    size_t bitstream_length = 0;
+
+    constexpr uint8_t packet1_indicator = 0b00;
+    constexpr uint8_t packet2_indicator = 0b01;
+    auto encode_packet = [&bitstream_length](uint8_t indicator, auto& packet, bool has_data) {
+        constexpr uint32_t preamble = 0b0000000000000000'1111;
+        constexpr uint32_t blank_size = 24;
+        auto manchester_encode = [&bitstream_length](auto& x, uint32_t size) {
+            for (uint32_t i = 0; i < size; ++i) {
+                bool bit = (x >> (size - 1 - i)) & 1;
+                encoders::bitstream_append(bitstream_length, 2, bit ? 0b01 : 0b10);
+            }
+        };
+        manchester_encode(preamble, 20);
+        manchester_encode(indicator, 2);
+        for (uint8_t byte = 0; byte < (has_data ? 8 : 5); ++byte) manchester_encode(packet[byte], 8);
+        encoders::bitstream_append(bitstream_length, blank_size, 0);
+    };
+
+    if (encode_v2(data.rolling_code, data.fixed_code, data.data, data.has_data, packet1, packet2) < 0) {
+        nav_.display_modal("Error", "Invalid rolling/fixed code");
+        return;
+    }
+    encode_packet(packet1_indicator, packet1, has_data.value());
+    encode_packet(packet2_indicator, packet2, has_data.value());
+
+    if (!learn_mode.value()) {
+        field_rolling.set_value(++data.rolling_code);
+        field_rolling.set_dirty();
+    }
+
+    progressbar.set_max(secplus_repeat_count);
+    progressbar.set_value(1);
+
+    tx_view.set_transmitting(true);
+    transmitter_model.enable();
+    baseband::set_ook_data(
+        bitstream_length,
+        secplus_sample_rate,
+        secplus_repeat_count,
+        0);
+}
+
+void SecplusTXView::stop_tx() {
+    transmitter_model.disable();
+    progressbar.set_value(0);
+    tx_view.set_transmitting(false);
+}
+
+void SecplusTXView::on_tx_progress(uint32_t progress, bool done) {
+    progressbar.set_value(progress + 1);
+    if (done) {
+        stop_tx();
+        save_data();
+    }
+}
+
+SecplusTXView::~SecplusTXView() {
+    transmitter_model.disable();
+    baseband::shutdown();
+    save_data();
+}
+
+}  // namespace ui::external_app::ui_secplustx
@@ -0,0 +1,96 @@
+#ifndef __UI_SECPLUSTX__
+#define __UI_SECPLUSTX__
+
+#include <cstdint>
+#include <string>
+
+#include "ui.hpp"
+#include "file.hpp"
+#include "ui_transmitter.hpp"
+#include "transmitter_model.hpp"
+#include "file_path.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "encoders.hpp"
+#include "string_format.hpp"
+
+namespace ui::external_app::ui_secplustx {
+
+enum class SecplusVersion : uint8_t {
+    V1,
+    V2,
+};
+
+struct SecplusData {
+    SecplusVersion version;
+    std::string name;
+    bool has_data;
+    uint64_t fixed_code;
+    uint32_t rolling_code;
+    uint32_t data;
+};
+
+class SecplusTXView : public View {
+   public:
+    void focus() override { button_open.focus(); }
+    SecplusTXView(NavigationView& nav);
+    ~SecplusTXView();
+
+    std::string title() const override {
+        return "Security+";
+    }
+
+   private:
+    std::string file_path = (secplus_dir / "DEFAULT.SECPLUS").string();
+    SecplusData data{SecplusVersion::V2, "Remote", false, 0, 0, 0};
+    std::string buffer{};
+
+    NavigationView& nav_;
+    TxRadioState radio_state_{
+        315000000,
+        1750000,
+        OOK_SAMPLERATE};
+
+    app_settings::SettingsManager settings_{"tx_secplus", app_settings::Mode::TX, {{"file_path"sv, &file_path}}};
+
+    Button button_open{{UI_POS_X(1), UI_POS_Y(1), screen_width / 2 - UI_POS_X(1), UI_POS_HEIGHT(2)}, "Open"};
+    Button button_save{{screen_width / 2, UI_POS_Y(1), screen_width / 2 - UI_POS_X(1), UI_POS_HEIGHT(2)}, "Save"};
+
+    // remote data
+    TextField field_name{{UI_POS_X(1), UI_POS_Y(3), UI_POS_WIDTH_REMAINING(2), UI_POS_HEIGHT(1)}, "Remote"};
+    Labels labels{
+        {{UI_POS_X(1), UI_POS_Y(4)}, "Fixed:", Theme::getInstance()->fg_medium->foreground},
+        {{UI_POS_X(1), UI_POS_Y(5)}, "Rolling:", Theme::getInstance()->fg_medium->foreground}};
+    SymField field_fixed{{UI_POS_X(10), UI_POS_Y(4)}, 10, SymField::Type::Hex, true};
+    SymField field_rolling{{UI_POS_X(10), UI_POS_Y(5)}, 7, SymField::Type::Hex, true};
+    Checkbox has_data{{UI_POS_X(1), UI_POS_Y(6)}, 5, "Data:", true};
+    SymField field_data{{UI_POS_X(10), UI_POS_Y(6)}, 8, SymField::Type::Hex, true};
+
+    // options
+    Checkbox learn_mode{{UI_POS_X(1), UI_POS_Y(7)}, 5, "Learn", true};
+    Checkbox autosave{{UI_POS_X(1), UI_POS_Y(8)}, 8, "Autosave", true};
+
+    ProgressBar progressbar{{UI_POS_X(2), UI_POS_Y_BOTTOM(5.75), UI_POS_WIDTH_REMAINING(4), UI_POS_HEIGHT(1)}};
+
+    TransmitterView tx_view{UI_POS_Y_BOTTOM(4), 1000000, 0};
+
+    Optional<SecplusData> read_secplus_file(const std::filesystem::path& file_path);
+    bool write_secplus_file(const std::filesystem::path& file_path, const SecplusData& data);
+    void save_data();
+    void reload_data();
+    void start_tx();
+    void stop_tx();
+
+    void on_tx_progress(uint32_t progress, bool done);
+
+    MessageHandlerRegistration message_handler_tx_progress{
+        Message::ID::TXProgress,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
+            this->on_tx_progress(message.progress, message.done);
+        }};
+};
+
+}  // namespace ui::external_app::ui_secplustx
+
+#endif
@@ -193,15 +193,12 @@ void WaterfallDesignerView::on_profile_changed(std::filesystem::path new_profile
    auto reader = FileLineReader(playlist_file);

    for (const auto& line : reader) {
+        // remove empty lines
+        if (line == "\n" || line == "\r\n" || line == "\r") continue;
        profile_levels.push_back(line);
    }

    for (auto& line : profile_levels) {
-        // remove empty lines
-        if (line == "\n" || line == "\r\n" || line == "\r") {
-            profile_levels.erase(std::remove(profile_levels.begin(), profile_levels.end(), line), profile_levels.end());
-        }
-
        // remove line end \n etc
        if (line.length() > 0 && (line[line.length() - 1] == '\n' || line[line.length() - 1] == '\r')) {
            line = line.substr(0, line.length() - 1);
@@ -30,6 +30,7 @@

 namespace fs = std::filesystem;
 static const fs::path c8_ext{u".C8"};
+static const fs::path cu8_ext{u".CU8"};
 static const fs::path c16_ext{u".C16"};

 Optional<File::Error> File::open_fatfs(const std::filesystem::path& filename, BYTE mode) {
@@ -543,12 +544,14 @@ bool path_iequal(

 bool is_cxx_capture_file(const path& filename) {
    auto ext = filename.extension();
-    return path_iequal(c8_ext, ext) || path_iequal(c16_ext, ext);
+    return path_iequal(c8_ext, ext) || path_iequal(cu8_ext, ext) || path_iequal(c16_ext, ext);
 }

 uint8_t capture_file_sample_size(const path& filename) {
    if (path_iequal(filename.extension(), c8_ext))
        return sizeof(complex8_t);
+    if (path_iequal(filename.extension(), cu8_ext))
+        return sizeof(complexu8_t);
    if (path_iequal(filename.extension(), c16_ext))
        return sizeof(complex16_t);
    return 0;
@@ -57,4 +57,5 @@ const std::filesystem::path macaddress_dir = u"MACADDRESS";
 const std::filesystem::path splash_dot_bmp = u"/splash.bmp";
 const std::filesystem::path keeloq_keys_dir = u"KEELOQKEYS";
 const std::filesystem::path keeloq_remotes_dir = u"KEELOQREMOTES";
+const std::filesystem::path secplus_dir = u"SECPLUS";
 const std::filesystem::path epirb_dir = u"EPIRB";
@@ -58,6 +58,7 @@ extern const std::filesystem::path waterfalls_dir;
 extern const std::filesystem::path macaddress_dir;
 extern const std::filesystem::path keeloq_keys_dir;
 extern const std::filesystem::path keeloq_remotes_dir;
+extern const std::filesystem::path secplus_dir;
 extern const std::filesystem::path epirb_dir;

 extern const std::filesystem::path splash_dot_bmp;
@@ -28,13 +28,11 @@ namespace fs = std::filesystem;
 const std::filesystem::path default_gradient_file = u"waterfall.txt";

 Gradient::Gradient() {
-    prev_index = 0;
-    prev_r = 0;
-    prev_g = 0;
-    prev_b = 0;
+    step(0, 0, 0, 0);
 }

 void Gradient::set_default() {
+    step(0, 0, 0, 0);
    step(86, 0, 0, 255);
    step(171, 0, 255, 0);
    step(255, 255, 0, 0);
@@ -47,6 +45,9 @@ bool Gradient::load_file(const std::filesystem::path& file_path) {
    if (error)
        return false;

+    // make sure the table starts at 0
+    step(0, 0, 0, 0);
+
    auto reader = FileLineReader(gradient_file);
    for (const auto& line : reader) {
        if (line.length() == 0 || line[0] == '#')
@@ -73,17 +74,24 @@ bool Gradient::load_file(const std::filesystem::path& file_path) {
        }
    }

+    // extend the gradient from the current index to the end of the table
+    step(255, prev_r, prev_g, prev_b);
+
    return true;
 }

 void Gradient::step(int16_t index, int16_t r, int16_t g, int16_t b) {
-    for (int16_t i = prev_index; i <= index; i++) {
-        float x = (float)(i - prev_index) / (index - prev_index);
-        float y = 1.0f - x;
+    // prevent division by 0 if index == prev_index
+    int16_t range = index - prev_index;
+    if (range == 0) range = 1;
+
+    for (int16_t i = prev_index; i <= index; i++) {
+        int16_t t = i - prev_index;
+
+        int16_t new_r = prev_r + (t * (r - prev_r) + range / 2) / range;
+        int16_t new_g = prev_g + (t * (g - prev_g) + range / 2) / range;
+        int16_t new_b = prev_b + (t * (b - prev_b) + range / 2) / range;

-        int16_t new_r = prev_r * y + r * x;
-        int16_t new_g = prev_g * y + g * x;
-        int16_t new_b = prev_b * y + b * x;
        if (i <= 255) lut[i] = ui::Color(new_r, new_g, new_b);
    }

@@ -1,5 +1,6 @@
 #include "gpio_lpc.h"
 #include "gpio.h"
+#include "delay.h"

 typedef enum {
    LED1 = 0,
@@ -34,6 +35,15 @@ void delay_us_at_mhz(uint32_t us, uint32_t mhz) {
    delay((uint32_t)cycles64);
 }

+/* The application M0 core runs from BASE_M4_CLK at 200MHz. */
+void delay_us(uint32_t us) {
+    delay_us_at_mhz(us, 200);
+}
+
+void delay_ms(uint32_t ms) {
+    delay_us_at_mhz(ms * 1000, 200);
+}
+
 void led_on(const led_t led) {
    gpio_set(&gpio_led[led]);
 }
@@ -103,12 +103,6 @@ void MAX2831::flush_dirty() {
 void MAX2831::init() {
    set_mode(Mode::Shutdown);

-    /* Configure GPIO pins for MAX2831 control */
-    gpio_max283x_enable.output();
-    gpio_max2831_rx_enable.output();
-    gpio_max2831_rxhp.output();
-    gpio_max2831_rxhp.write(0); /* RXHP low = 100 Hz HPF (default) */
-
    /* Reset to default register values */
    std::memcpy(_regs.data(), default_regs.data(), sizeof(_regs));
    _regs_dirty = 0xFFFF;
@@ -348,6 +342,16 @@ void MAX2831::set_lpf_rf_bandwidth_rx(const uint32_t bandwidth_minimum) {
 #ifdef PRALINE
    uint32_t actual_bw = bandwidth_minimum;

+    /* The MAX2831 internal analog low-pass filter cannot go below 1.75 MHz.
+     * For narrow-band signals (bandwidth < 1.75 MHz), we enable the custom
+     * external Anti-Aliasing (AA) filter on pin P1_14 to prevent aliasing.
+     */
+    if (actual_bw <= 1750000) {
+        gpio_control::aa_en.setActive();  // Enable external narrow AA filter
+    } else {
+        gpio_control::aa_en.setInactive();  // Disable external AA filter for wideband operations
+    }
+
    _desired_lpf_bw = actual_bw;
    if (_mode == Mode::Receive || _mode == Mode::Rx_Calibration) {
        set_lpf_bandwidth_internal(actual_bw);
@@ -361,6 +365,9 @@ void MAX2831::set_lpf_rf_bandwidth_rx(const uint32_t bandwidth_minimum) {

 void MAX2831::set_lpf_rf_bandwidth_tx(const uint32_t bandwidth_minimum) {
    _desired_lpf_bw = bandwidth_minimum;
+#ifdef PRALINE
+    gpio_control::aa_en.clear();  // Disable external AA filter for wideband operations
+#endif
    if (_mode == Mode::Transmit || _mode == Mode::Tx_Calibration) {
        set_lpf_bandwidth_internal(bandwidth_minimum);
    }
@@ -99,9 +99,11 @@ constexpr uint32_t pll_factor = 1.0 / (4.0 / 3.0 / reference_frequency) + 0.5;
 void MAX2837::init() {
    set_mode(Mode::Shutdown);

+#ifndef PRALINE
    gpio_max283x_enable.output();
    gpio_max2837_rxenable.output();
    gpio_max2837_txenable.output();
+#endif

    _map.r.tx_gain.TXVGA_GAIN_SPI_EN = 1;
    _map.r.tx_gain.TXVGA_GAIN_MSB_SPI_EN = 1;
@@ -157,9 +159,11 @@ void MAX2837::set_tx_LO_iq_phase_calibration(const size_t v) {
    // TX calibration , Logic pins , ENABLE, RXENABLE, TXENABLE = 1,0,1 (5dec), and  Reg address 16, D1 (CAL mode 1):DO (CHIP ENABLE 1)
    set_mode(Mode::Tx_Calibration);  // write to ram 3 LOGIC Pins .

+#ifndef PRALINE
    gpio_max283x_enable.output();
    gpio_max2837_rxenable.output();
    gpio_max2837_txenable.output();
+#endif

    _map.r.spi_en.CAL_SPI = 1;  // Register Settings reg address 16,  D1 (CAL mode 1)
    _map.r.spi_en.EN_SPI = 1;   // Register Settings reg address 16,  DO (CHIP ENABLE 1)
@@ -348,9 +352,11 @@ void MAX2837::set_rx_LO_iq_phase_calibration(const size_t v) {
    // RX calibration , Logic pins , ENABLE, RXENABLE, TXENABLE = 1,1,0 (3dec), and  Reg address 16, D1 (CAL mode 1):DO (CHIP ENABLE 1)
    set_mode(Mode::Rx_Calibration);  // write to ram 3 LOGIC Pins .

+#ifndef PRALINE
    gpio_max283x_enable.output();
    gpio_max2837_rxenable.output();
    gpio_max2837_txenable.output();
+#endif

    _map.r.spi_en.CAL_SPI = 1;  // Register Settings reg address 16,  D1 (CAL mode 1)
    _map.r.spi_en.EN_SPI = 1;   // Register Settings reg address 16,  DO (CHIP ENABLE 1)
@@ -100,8 +100,10 @@ static int_fast8_t requested_rx_vga_gain = 0;
 void MAX2839::init() {
    set_mode(Mode::Shutdown);

+#ifndef PRALINE
    gpio_max283x_enable.output();
    gpio_max2839_rxtx.output();
+#endif

    _map.r.rxrf_1.MIMOmode = 1; /* enable RXINB */

@@ -129,6 +131,8 @@ void MAX2839::init() {

    _map.r.rssi_vga.RSSI_MODE = 1; /* RSSI independent of RXHP */

+    _map.r.rssi_vga.RSSI_INPUT = 0; /* Measure RSSI at VGA Output (stronger signal) */
+
    /*
     * There are two LNA band settings, but we only use one of them.
     * Switching to the other one doesn't make the overall spectrum any
@@ -150,8 +154,10 @@ void MAX2839::set_tx_LO_iq_phase_calibration(const size_t v) {
    // TX calibration , 2 x Logic pins , ENABLE, RXENABLE = 1,0, (2dec), and  Reg address 16, D1 (CAL mode 1):DO (CHIP ENABLE 1)
    set_mode(Mode::Tx_Calibration);  // write to ram 3 LOGIC Pins .

+#ifndef PRALINE
    gpio_max283x_enable.output();  // max2839 has only 2 x pins + regs to decide mode.
    gpio_max2839_rxtx.output();    // Here is combined rx & tx pin in one port.
+#endif

    _map.r.spi_en.CAL_SPI = 1;  // Register Settings reg address 16,  D1 (CAL mode 1)
    _map.r.spi_en.EN_SPI = 1;   // Register Settings reg address 16,  DO (CHIP ENABLE 1)
@@ -301,9 +307,8 @@ void MAX2839::configure_rx_gain() {
    }

    _map.r.lpf_vga_2.L = lna::gain_ordinal(lna_gain);
-    _dirty[Register::RXRF_2] = 1;
    _map.r.lpf_vga_2.VGA = vga::gain_ordinal(vga_gain);
-    _dirty[Register::LPF_VGA_2] = 1;
+    _dirty[Register::LPF_VGA_2] = 1; /* both L (LNA) and VGA live in LPF_VGA_2 */
    flush();
 }

@@ -390,8 +395,10 @@ void MAX2839::set_rx_LO_iq_phase_calibration(const size_t v) {
    // RX calibration , Logic pins , ENABLE, RXENABLE, TXENABLE = 1,1,0 (3dec), and  Reg address 16, D1 (CAL mode 1):DO (CHIP ENABLE 1)
    set_mode(Mode::Rx_Calibration);  // write to ram 3 LOGIC Pins .

+#ifndef PRALINE
    gpio_max283x_enable.output();  // max2839 has only 2 x pins + regs to decide mode.
    gpio_max2839_rxtx.output();    // Here is combined rx & tx pin in one port.
+#endif

    _map.r.spi_en.CAL_SPI = 1;  // Register Settings reg address 16,  D1 (CAL mode 1)
    _map.r.spi_en.EN_SPI = 1;   // Register Settings reg address 16,  DO (CHIP ENABLE 1)
@@ -175,8 +175,14 @@ struct SynthConfig {
 */

 void RFFC507x::init() {
+#ifdef PRALINE
+    gpio_control::rf5072_mix_en.setActive();  // RF5072_MIX_EN
+#endif
+
    gpio_rffc5072_resetx.set();
+#ifndef PRALINE
    gpio_rffc5072_resetx.output();
+#endif
    reset();

    _bus.init();
@@ -33,8 +33,10 @@ void SPI::init() {
    gpio_rffc5072_select.set();
    gpio_rffc5072_clock.clear();

+#ifndef PRALINE
    gpio_rffc5072_select.output();
    gpio_rffc5072_clock.output();
+#endif
    gpio_rffc5072_data.input();

    gpio_rffc5072_data.clear();
@@ -24,6 +24,7 @@

 namespace fs = std::filesystem;
 static const fs::path c8_ext = u".C8";
+static const fs::path cu8_ext = u".CU8";

 namespace file_convert {

@@ -59,21 +60,42 @@ void c8_to_c16(const void* buffer, File::Size bytes) {
    }
 }

+// Convert cu8 buffer to c16 buffer.
+// Same buffer used for input & output; input size is bytes; output size is 2*bytes.
+void cu8_to_c16(const void* buffer, File::Size bytes) {
+    complexu8_t* src = (complexu8_t*)buffer;
+    complex16_t* dest = (complex16_t*)buffer;
+    uint32_t i = bytes / sizeof(complexu8_t);
+
+    if (i != 0) {
+        do {
+            i--;
+            int16_t re_out = ((int16_t)src[i].real() - 128) * 256;
+            int16_t im_out = ((int16_t)src[i].imag() - 128) * 256;
+            dest[i] = {(int16_t)re_out, (int16_t)im_out};
+        } while (i != 0);
+    }
+}
+
 } /* namespace file_convert */

 // Automatically enables C8/C16 conversion based on file extension
 Optional<File::Error> FileConvertReader::open(const std::filesystem::path& filename) {
    convert_c8_to_c16 = path_iequal(filename.extension(), c8_ext);
+    convert_cu8_to_c16 = path_iequal(filename.extension(), cu8_ext);
    return file_.open(filename);
 }

 // If C8 conversion enabled, half the number of bytes are read from the file & expanded to fill the whole buffer.
 File::Result<File::Size> FileConvertReader::read(void* const buffer, const File::Size bytes) {
-    auto read_result = file_.read(buffer, convert_c8_to_c16 ? bytes / 2 : bytes);
+    auto read_result = file_.read(buffer, (convert_c8_to_c16 || convert_cu8_to_c16) ? bytes / 2 : bytes);
    if (read_result.is_ok()) {
        if (convert_c8_to_c16) {
            file_convert::c8_to_c16(buffer, read_result.value());
            read_result = read_result.value() * 2;
+        } else if (convert_cu8_to_c16) {
+            file_convert::cu8_to_c16(buffer, read_result.value());
+            read_result = read_result.value() * 2;
        }
        bytes_read_ += read_result.value();
    }
@@ -52,6 +52,7 @@ class FileConvertReader : public stream::Reader {
    const File& file() const& { return file_; }

    bool convert_c8_to_c16{};
+    bool convert_cu8_to_c16{};

   protected:
    File file_{};
@@ -132,7 +132,6 @@ Continuous (Fox-oring)
 #include "spi_image.hpp"

 #include "debug.hpp"
-#include "led.hpp"

 #include "gcc.hpp"

@@ -144,6 +143,9 @@ Continuous (Fox-oring)
 #include "lpc43xx.inc"

 #include "rffc507x.hpp" /* c/m, avoiding initial short ON Ant_DC_Bias pulse, from cold reset  */
+
+#include "gpio.hpp"
+
 rffc507x::RFFC507x first_if;
 ui::SystemView* system_view_ptr;

@@ -185,6 +187,8 @@ static void event_loop() {
 int main(void) {
    rtc_reset_default();

+    power_control::vaa_power_on();
+
 #ifndef PRALINE      // Do not perform quick set up of GP01_RFF507X = 1 for PRALINE
    first_if.init(); /* To avoid initial short Ant_DC_Bias pulse ,we need quick set up GP01_RFF507X =1 */
 #endif
@@ -56,11 +56,14 @@ using asahi_kasei::ak4951::AK4951;
 #include "i2cdevmanager.hpp"
 #include "battery.hpp"

+#include "gpio.hpp"
+
 extern "C" {
 #include "platform_detect.h"

 #ifdef PRALINE
 #include "fpga_bridge.h"
+#include "board.h"
 #endif
 }

@@ -360,19 +363,12 @@ static void set_cpu_clock_speed() {

    /* Step into the 90-110MHz M4 clock range */
 #ifdef PRALINE
-    /* PRALINE: Enable and use 12MHz XTAL directly (no GP_CLKIN from Si5351) */
-
-    /* Step 1: Enable the crystal oscillator */
-    LPC_CGU->XTAL_OSC_CTRL.ENABLE = 0;  // 0 = enable (active low)
-    LPC_CGU->XTAL_OSC_CTRL.HF = 0;      // 0 = low frequency mode (1-20MHz)
-
-    /* Step 2: Wait for oscillator to stabilize (~250us at IRC speed) */
-    volatile uint32_t delay = 3000;  // ~250us at 12MHz IRC
-    while (delay--);
-
-    /* Step 3: Configure PLL1 from XTAL
-     *   Fclkin = 12M, /N=1 = 12M, Fcco = 12M * 17 = 204M
-     *   Fclk = Fcco / (2*(P=1)) = 102M
+    /* PRALINE: source PLL1 from GP_CLKIN, which is driven by the Si5351
+     * CLK2/MCU_CLK output at 40MHz (see ClockManager Si5351 setup). The
+     * on-chip 12MHz XTAL bootstrap path is intentionally not used here.
+     *
+     *   Fclkin = 40M (GP_CLKIN), /N=2 = 20M, Fcco = 20M * 10 = 200M
+     *   Fclk = Fcco / (2*(P=1)) = 100M
     */
    cgu::pll1::ctrl({
        .pd = 1,
@@ -381,10 +377,11 @@ static void set_cpu_clock_speed() {
        .direct = 0,
        .psel = 0,
        .autoblock = 1,
-        .nsel = 0,   // N = 1
-        .msel = 16,  // M = 17, so 12MHz * 17 = 204MHz
-        .clk_sel = cgu::CLK_SEL::XTAL,
+        .nsel = 1UL,  // N = 2
+        .msel = 9UL,  // M = 10
+        .clk_sel = cgu::CLK_SEL::GP_CLKIN,
    });
+
 #else
    /* OG:
     * 	Fclkin = 40M, /N=2 = 20M, Fcco = 20M * 10 = 200M
@@ -567,12 +564,6 @@ static void initialize_boot_splash_screen() {
 */

 init_status_t init() {
-#ifdef PRALINE
-    /* 1. HOLD FPGA IN RESET (Active Low) */
-    // P5_2 is GPIO2[11] (FPGA CRESET)
-    palClearPad(GPIO2, 11);
-#endif
-
    set_idivc_base_clocks(cgu::CLK_SEL::IDIVC);

    i2c0.start(i2c_config_boot_clock);
@@ -600,9 +591,12 @@ init_status_t init() {
    }

    /* Cache some configuration data from persistent memory. */
+
    rtc_time::dst_init();
    chThdSleepMilliseconds(10);

+    power_control::core_power_on();
+
    clock_manager.init_clock_generator();

    i2c0.stop();
@@ -613,6 +607,7 @@ init_status_t init() {
    cgu::pll1::disable();

    set_cpu_clock_speed();
+
    /* sample max: 1023 sample_t AKA uint16_t
     * touch_sensitivity: range: 1 to 128
     * threshold range: 1023/1 to 1023/128  =  1023 to 8
@@ -67,7 +67,6 @@ extern ReceiverModel receiver_model;
 extern TransmitterModel transmitter_model;

 extern uint32_t bl_tick_counter;
-extern bool antenna_bias;
 extern uint16_t touch_threshold;

 extern TemperatureLogger temperature_logger;
@@ -50,9 +50,12 @@ using namespace hackrf::one;

 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
-
+#include "baseband_api.hpp"
 #include "hal.h"  // For LPC_SGPIO

+#include "gpio.hpp"
+using namespace gpio_control;
+
 #include <array>

 /* Direct access to the radio. Setting values incorrectly can damage
@@ -280,9 +283,9 @@ void set_direction(const rf::Direction new_direction) {
    baseband_codec.set_mode((direction == rf::Direction::Transmit) ? max5864::Mode::Transmit : max5864::Mode::Receive);

    if (direction == rf::Direction::Receive)
-        led_rx.on();
+        led_rx.setActive();
    else
-        led_tx.on();
+        led_tx.setActive();
 }

 bool set_tuning_frequency(const rf::Frequency frequency) {
@@ -390,11 +393,9 @@ void set_baseband_rate(const uint32_t rate) {
 }

 void set_antenna_bias(const bool on) {
-    /* Pull MOSFET gate low to turn on antenna bias. */
 #ifdef PRALINE
-    // Praline: P2_12 = GPIO1[12], ANT_BIAS_EN_N (active LOW)
-    LPC_GPIO->CLR[1] = on ? (1 << 12) : 0;
-    LPC_GPIO->SET[1] = on ? 0 : (1 << 12);
+    /* Praline: P2_12 = GPIO1[12], ANT_BIAS_EN_N (active LOW) */
+    rf_path.set_ant_bias(on);
 #else
    if (hackrf_r9) {
        gpio_r9_not_ant_pwr.write(on ? 0 : 1);
@@ -404,6 +405,14 @@ void set_antenna_bias(const bool on) {
 #endif
 }

+bool get_mixer_invert() {
+    return mixer_invert;
+}
+
+bool get_baseband_invert() {
+    return baseband_invert;
+}
+
 void set_tx_max283x_iq_phase_calibration(const size_t v) {
    second_if->set_tx_LO_iq_phase_calibration(v);
 }
@@ -413,6 +422,19 @@ void set_rx_max283x_iq_phase_calibration(const size_t v) {
 }

 void disable() {
+    if (direction == rf::Direction::Transmit && baseband::is_image_running()) {
+        static constexpr uint32_t radio_tx_drain_timeout_ms = 100;
+        shared_memory.radio_tx_drain = 1;  // Request drain of the current DMA queue.
+        for (uint32_t waited_ms = 0;
+             shared_memory.radio_tx_drain && (waited_ms < radio_tx_drain_timeout_ms);
+             ++waited_ms) {
+            chThdSleepMilliseconds(1);
+        }
+    }
+    /* Never allow shutdown to block indefinitely waiting for a drain
+     * acknowledgement that may never arrive in normal operation. */
+    shared_memory.radio_tx_drain = 0;
+
    set_antenna_bias(false);
    baseband_codec.set_mode(max5864::Mode::Shutdown);
 #ifdef PRALINE
@@ -423,8 +445,8 @@ void disable() {
    first_if.disable();
    set_rf_amp(false);

-    led_rx.off();
-    led_tx.off();
+    led_rx.setInactive();
+    led_tx.setInactive();
 }

 #ifdef PRALINE
@@ -606,4 +628,4 @@ uint32_t register_read(const size_t register_number) {

 } /* namespace debug */

-} /* namespace radio */
+} /* namespace radio */
@@ -54,6 +54,8 @@ void set_baseband_filter_bandwidth_rx(const uint32_t bandwidth_minimum);
 void set_baseband_filter_bandwidth_tx(const uint32_t bandwidth_minimum);
 void set_baseband_rate(const uint32_t rate);
 void set_antenna_bias(const bool on);
+bool get_mixer_invert();
+bool get_baseband_invert();
 void set_tx_max283x_iq_phase_calibration(const size_t v);
 void set_rx_max283x_iq_phase_calibration(const size_t v);

@@ -46,14 +46,6 @@ struct PralineConfig {
    bool rf_amp_en;
    bool ant_bias_en_n;  // Inverted: 0 = bias enabled

-    static void gpio_init() {
-        gpio_tx_enable.output();
-        gpio_mix_bypass.output();
-        gpio_lpf_enable.output();
-        gpio_rf_amp_enable.output();
-        gpio_ant_bias_disable.output();
-    }
-
    void apply() const {
        gpio_tx_enable.write(tx_en);
        gpio_mix_bypass.write(mix_bypass);  // Control RF path mixer
@@ -231,7 +223,6 @@ constexpr Config get_config(

 void Path::init() {
 #ifdef PRALINE
-    PralineConfig::gpio_init();
    /* Set safe initial state: RX mode, mixer enabled, LPF on, amp off, no bias */
    PralineConfig config = {
        .tx_en = false,
@@ -263,6 +254,15 @@ void Path::set_rf_amp(const bool new_rf_amp) {
    update();
 }

+void Path::set_ant_bias(const bool new_ant_bias) {
+    ant_bias = new_ant_bias;
+    update();
+}
+
+bool Path::get_ant_bias() const {
+    return ant_bias;
+}
+
 void Path::update() {
    /* 0 ^ 0 => 0 & 0 = 0 ^ 0 = 0 (no change)
     * 0 ^ 1 => 1 & 0 = 0 ^ 0 = 0 (ignore change to 1)
@@ -301,8 +301,8 @@ void Path::update() {
    /* RF amp when amplification requested */
    config.rf_amp_en = rf_amp;

-    /* Antenna bias off by default */
-    config.ant_bias_en_n = true;
+    /* Antenna bias */
+    config.ant_bias_en_n = !ant_bias;

    config.apply();

@@ -65,13 +65,15 @@ class Path {
    void set_direction(const Direction direction);
    void set_band(const Band band);
    void set_rf_amp(const bool rf_amp);
-
+    void set_ant_bias(const bool ant_bias);
+    bool get_ant_bias() const;
    Band get_band() const { return _band; }  //_band is used solely for debugging purposes.

   private:
    Direction direction{Direction::Receive};
    Band band{Band::Mid};
    bool rf_amp{false};
+    bool ant_bias{false};

    void update();

@@ -27,6 +27,7 @@

 #include "lpc43xx_cpp.hpp"
 #include "portapack_persistent_memory.hpp"
+#include <ctime>

 namespace rtc_time {

@@ -26,7 +26,9 @@
 #include "audio.hpp"
 #include "baseband_api.hpp"
 #include "event_m0.hpp"
-#include "hackrf_gpio.hpp"
+#include "gpio.hpp"
+using namespace gpio_control;
+
 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "radio.hpp"
@@ -72,19 +74,31 @@ void TransmitterModel::set_channel_bandwidth(uint32_t v) {
 }

 uint8_t TransmitterModel::tx_gain() const {
+    if (persistent_memory::config_tx_disabled()) {
+        return 0;
+    }
    return std::min(settings_.tx_gain_db, portapack::persistent_memory::config_tx_gain_max_db());
 }

 void TransmitterModel::set_tx_gain(uint8_t v_db) {
-    settings_.tx_gain_db = v_db;
+    uint8_t newgain = v_db;
+    if (persistent_memory::config_tx_disabled()) {
+        newgain = 0;
+    } else if (v_db > portapack::persistent_memory::config_tx_gain_max_db()) {
+        newgain = portapack::persistent_memory::config_tx_gain_max_db();
+    }
+    settings_.tx_gain_db = newgain;
    update_tx_gain();
 }

 bool TransmitterModel::rf_amp() const {
-    return settings_.rf_amp && !portapack::persistent_memory::config_tx_amp_disabled();
+    return settings_.rf_amp && !portapack::persistent_memory::config_tx_amp_disabled() && !portapack::persistent_memory::config_tx_disabled();
 }

 void TransmitterModel::set_rf_amp(bool enabled) {
+    if (enabled && (portapack::persistent_memory::config_tx_amp_disabled() || portapack::persistent_memory::config_tx_disabled())) {
+        return;
+    }
    settings_.rf_amp = enabled;
    update_rf_amp();
 }
@@ -28,6 +28,7 @@
 #include <cstddef>

 #include "app_settings.hpp"
+#include "hackrf_hal.hpp"
 #include "max2837.hpp"
 #include "message.hpp"
 #include "receiver_model.hpp"
@@ -40,8 +41,9 @@ class TransmitterModel {
        uint32_t baseband_bandwidth = max283x::filter::bandwidth_minimum;
        uint32_t sampling_rate = 3'072'000;
        uint32_t channel_bandwidth = 1;
-        /* 35 should give approx 1m transmission range. */
-        uint8_t tx_gain_db = 35;
+        /* Platform default chosen to avoid PRALINE MAX2831 overdrive while
+         * preserving legacy HackRF One behavior. */
+        uint8_t tx_gain_db = hackrf::one::default_tx_gain_db;
        bool rf_amp = false;
    };

@@ -28,7 +28,6 @@
 #include "rtc_time.hpp"
 #include "sd_card.hpp"
 #include <algorithm>
-#include "ui_external_items_menu_loader.hpp"

 namespace ui {

@@ -61,7 +60,6 @@ BtnGridView::BtnGridView(
 }

 BtnGridView::~BtnGridView() {
-    ExternalItemsMenuLoader::unload_external_items();
 }

 void BtnGridView::set_max_rows(int rows) {
@@ -89,7 +87,6 @@ void BtnGridView::set_parent_rect(const Rect new_parent_rect) {
            remove_child(item.get());

        menu_item_views.clear();
-        menu_item_views.shrink_to_fit();
    }

    button_w = screen_width / rows_;
@@ -138,17 +135,15 @@ void BtnGridView::set_arrow_down_enabled(bool enabled) {
 };

 void BtnGridView::clear() {
-    // clear vector and release memory, not using swap since it's causing capture to glitch/fault
+    // clear vector, not using swap since it's causing capture to glitch/fault
    menu_items.clear();
-    menu_items.shrink_to_fit();

    // TODO(u-foka): Clean up my mess, move this somewhere to clear memory when the view is not visible, but not to be confused with clearing the menu items...
    for (auto& item : menu_item_views)
        remove_child(item.get());

-    // clear vector and release memory, not using swap since it's causing capture to glitch/fault
+    // clear vector, not using swap since it's causing capture to glitch/fault
    menu_item_views.clear();
-    menu_item_views.shrink_to_fit();
 }

 void BtnGridView::add_items(std::initializer_list<GridItem> new_items, bool inhibit_update) {
@@ -36,10 +36,14 @@ void Channel::paint(Painter& painter) {
    const range_t<int> x_max_range{0, r.width() - 1};
    const auto x_max = x_max_range.clip((max_db_ - db_min) * r.width() / db_delta);

+    const auto bar_style = (max_db_ >= overload_threshold_)
+                               ? Theme::getInstance()->fg_red
+                               : Theme::getInstance()->fg_blue;
+
    const Rect r0{r.left(), r.top(), x_max, r.height()};
    painter.fill_rectangle(
        r0,
-        Theme::getInstance()->fg_blue->foreground);
+        bar_style->foreground);

    const Rect r1{r.left() + x_max, r.top(), 1, r.height()};
    painter.fill_rectangle(
@@ -44,8 +44,19 @@ class Channel : public Widget {

    void paint(Painter& painter) override;

+    // Opt-in receiver-overload tint: when the channel power (peak IQ magnitude
+    // in dBFS, 0 = full scale) reaches this threshold the bar is drawn red
+    // instead of blue, flagging that the analog gain is too high and the ADC is
+    // clipping. Default is disabled (threshold above the 0 dBFS ceiling) so
+    // existing users are unaffected.
+    void set_overload_threshold(int32_t db) {
+        overload_threshold_ = db;
+        set_dirty();
+    }
+
   private:
    int32_t max_db_;
+    int32_t overload_threshold_{INT32_MAX};

    MessageHandlerRegistration message_handler_stats{
        Message::ID::ChannelStatistics,
@@ -237,26 +237,69 @@ void GeoMap::map_read_line_bin(ui::Color* buffer, uint16_t pixels) {
    if (map_zoom == 1) {
        map_file.read(buffer, pixels << 1);
    } else if (map_zoom > 1) {
-        map_file.read(buffer, (pixels / map_zoom) << 1);
-
-        // Zoom in: Expand each pixel to "map_zoom" number of pixels.
-        // Future TODO:  Add dithering to smooth out the pixelation.
-        // As long as MOD(width,map_zoom)==0 then we don't need to check buffer overflow case when stretching last pixel;
-        // For 240 width, than means no check is needed for map_zoom values up to 6.
-        // (Rectangle height must also divide evenly into map_zoom or we get black lines at end of screen)
-        // Note that zooming in results in a map offset of (1/map_zoom) pixels to the right & downward directions (see zoom_pixel_offset).
-        for (int i = (width / map_zoom) - 1; i >= 0; i--) {
-            for (int j = 0; j < map_zoom; j++) {
-                buffer[(i * map_zoom) + j] = buffer[i];
+        // Calculate how many source pixels we actually need from the file
+        uint16_t src_pixels_needed = (pixels + map_zoom - 1) / map_zoom;
+        if (src_pixels_needed == 0) src_pixels_needed = 1;
+        // Position the source data at the very END of the buffer.
+        // This allows us to overwrite the buffer from left-to-right safely.
+        uint16_t src_offset = pixels - src_pixels_needed;
+        // Read directly into the tail of the target buffer. Zero extra RAM needed.
+        map_file.read(&buffer[src_offset], src_pixels_needed << 1);
+        // Process forwards. Because `dst` grows by 1 and the source index grows by 1/map_zoom,
+        // `dst` will never catch up to overwrite a source pixel before we are done with it.
+        for (uint16_t dst = 0; dst < pixels; ++dst) {
+            uint16_t i0 = dst / map_zoom;
+            uint16_t i1 = i0 + 1;
+            // Clamp the right-hand pixel to avoid reading out of bounds on the last iteration
+            if (i1 >= src_pixels_needed) {
+                i1 = src_pixels_needed - 1;
+            }
+            // 'frac' represents the integer distance from the left pixel (0 to map_zoom - 1)
+            uint16_t frac = dst % map_zoom;
+            // Fetch colors from the tail of our buffer
+            ui::Color c0 = buffer[src_offset + i0];
+            ui::Color c1 = buffer[src_offset + i1];
+            if (frac == 0) {
+                // Exact pixel match, bypass the math entirely for a speed boost
+                buffer[dst] = c0;
+            } else {
+                uint32_t inv_frac = map_zoom - frac;
+                uint8_t r = ((uint32_t)c0.r() * inv_frac + (uint32_t)c1.r() * frac) / map_zoom;
+                uint8_t g = ((uint32_t)c0.g() * inv_frac + (uint32_t)c1.g() * frac) / map_zoom;
+                uint8_t b = ((uint32_t)c0.b() * inv_frac + (uint32_t)c1.b() * frac) / map_zoom;
+                buffer[dst] = ui::Color(r, g, b);
            }
        }
    } else {
-        ui::Color zoom_out_buffer[(pixels * (-map_zoom))];
-        map_file.read(zoom_out_buffer, (pixels * (-map_zoom)) << 1);
-        // Zoom out:  Collapse each group of "-map_zoom" pixels into one pixel.
-        // Future TODO: Average each group of pixels (in both X & Y directions if possible).
-        for (int i = 0; i < width; i++) {
-            buffer[i] = zoom_out_buffer[i * (-map_zoom)];
+        const int skip = -map_zoom;
+        const int MAX_BUFFER_ELEMENTS = 256;
+        // Fixed-size local array avoids VLA crashes.
+        ui::Color zoom_out_buffer[MAX_BUFFER_ELEMENTS];
+        const int total_elements_needed = pixels * skip;
+        // Use the default size, but strictly cap it at 256 to protect the stack
+        const int chunk_size = total_elements_needed < MAX_BUFFER_ELEMENTS ? total_elements_needed : MAX_BUFFER_ELEMENTS;
+        int target_i = 0;
+        int current_file_offset = 0;
+        // Sequentially read through the required portion of the file in chunks
+        while (target_i < width && current_file_offset < total_elements_needed) {
+            // Calculate how many pixels we can read in this specific pass
+            int read_size = chunk_size < (total_elements_needed - current_file_offset) ? chunk_size : (total_elements_needed - current_file_offset);
+            // Read the chunk (<< 1 converts pixel count to byte count)
+            map_file.read(zoom_out_buffer, read_size << 1);
+            // Determine where the first valid "zoomed" pixel is located inside this specific chunk
+            int first_valid_index = 0;
+            int offset_modulo = current_file_offset % skip;
+            if (offset_modulo != 0) {
+                first_valid_index = skip - offset_modulo;
+            }
+            // Extract only the pixels we need, skipping the rest
+            for (int j = first_valid_index; j < read_size; j += skip) {
+                if (target_i < width) {
+                    buffer[target_i] = zoom_out_buffer[j];
+                    target_i++;
+                }
+            }
+            current_file_offset += read_size;
        }
    }
 }
@@ -415,8 +458,7 @@ bool GeoMap::draw_osm_file(int zoom, int tile_x, int tile_y, int relative_x, int
        return true;
    }

-    BMPFile bmp{};
-    bmp.open("/OSM/" + to_string_dec_int(zoom) + "/" + to_string_dec_int(tile_x) + "/" + to_string_dec_int(tile_y) + ".bmp", true);
+    BMPFile* bmp = bmp_cache.get(zoom, tile_x, tile_y);
    // 1. Define the source and destination areas, starting with the full tile.
    int src_x = 0;
    int src_y = 0;
@@ -449,7 +491,7 @@ bool GeoMap::draw_osm_file(int zoom, int tile_x, int tile_y, int relative_x, int
        return true;
    }

-    if (!bmp.is_loaded()) {
+    if (!bmp || !bmp->is_loaded()) {
        // Draw an error rectangle using the calculated clipped dimensions
        ui::Rect error_rect{{dest_x + r.left(), dest_y + r.top()}, {clip_w, clip_h}};
        display.fill_rectangle(error_rect, Theme::getInstance()->bg_darkest->background);
@@ -458,20 +500,20 @@ bool GeoMap::draw_osm_file(int zoom, int tile_x, int tile_y, int relative_x, int

    map_line_buffer.resize(clip_w);

-    if (bmp.is_bottomup()) {
+    if (bmp->is_bottomup()) {
        for (int y = clip_h - 1; y >= 0; --y) {
            int source_row = src_y + y;
            int dest_row = dest_y + y;
-            bmp.seek(src_x, source_row);
-            bmp.read_next_px_cnt(map_line_buffer.data(), clip_w, false);
+            bmp->seek(src_x, source_row);
+            bmp->read_next_px_cnt(map_line_buffer.data(), clip_w, false);
            display.draw_pixels({dest_x + r.left(), dest_row + r.top(), clip_w, 1}, map_line_buffer);
        }
    } else {
        for (int y = 0; y < clip_h; ++y) {
            int source_row = src_y + y;
            int dest_row = dest_y + y;
-            bmp.seek(src_x, source_row);
-            bmp.read_next_px_cnt(map_line_buffer.data(), clip_w, false);
+            bmp->seek(src_x, source_row);
+            bmp->read_next_px_cnt(map_line_buffer.data(), clip_w, false);
            display.draw_pixels({dest_x + r.left(), dest_row + r.top(), clip_w, 1}, map_line_buffer);
        }
    }
@@ -30,13 +30,16 @@
 #include "bmpfile.hpp"
 #include "mathdef.hpp"

+#include <array>
+#include <cstdio>
+#include <inttypes.h>
 #include "portapack.hpp"

 namespace ui {

 #define MAX_MAP_ZOOM_IN 4000
-#define MAX_MAP_ZOOM_OUT 10
-#define MAP_ZOOM_RESOLUTION_LIMIT 5  // Max zoom-in to show map; rect height & width must divide into this evenly
+#define MAX_MAP_ZOOM_OUT 15
+#define MAP_ZOOM_RESOLUTION_LIMIT 10  // Max zoom-in to show map;

 #define INVALID_LAT_LON 200
 #define INVALID_ANGLE 400
@@ -74,6 +77,101 @@ struct GeoMarker {
    }
 };

+class BMPFileCache {
+   public:
+    static constexpr uint8_t SlotsCount = 9;
+
+    BMPFileCache() {
+    }
+
+    ~BMPFileCache() {
+        clear();
+    }
+
+    BMPFile* get(const int32_t z, const int32_t x, const int32_t y) {
+        // Cache hit.
+        for (auto& slot : slots_) {
+            if (slot.used && slot.x == x && slot.y == y && slot.z == z) {
+                slot.last_used = next_stamp();
+                return &slot.bmp;
+            }
+        }
+
+        // Select free slot first, otherwise LRU slot.
+        Slot* target = nullptr;
+        uint16_t oldest = 0xFFFFu;
+        for (auto& slot : slots_) {
+            if (!slot.used) {
+                target = &slot;
+                break;
+            }
+            if (slot.last_used < oldest) {
+                oldest = slot.last_used;
+                target = &slot;
+            }
+        }
+
+        if (!target) {
+            return nullptr;
+        }
+
+        if (target->used) {
+            target->bmp.close();
+            target->used = false;
+        }
+
+        // OSM tile path convention: <base>/<z>/<x>/<y>.bmp
+        char path_buffer[64];
+        snprintf(path_buffer, sizeof(path_buffer), "/OSM/%" PRId32 "/%" PRId32 "/%" PRId32 ".bmp", z, x, y);
+
+        if (!target->bmp.open(path_buffer, true)) {
+            target->bmp.close();
+            return nullptr;
+        }
+
+        target->x = x;
+        target->y = y;
+        target->z = z;
+        target->last_used = next_stamp();
+        target->used = true;
+        return &target->bmp;
+    }
+
+    void clear() {
+        for (auto& slot : slots_) {
+            if (slot.used) {
+                slot.bmp.close();
+                slot.used = false;
+            }
+        }
+    }
+
+   private:
+    struct Slot {
+        BMPFile bmp{};
+        int32_t x{};
+        int32_t y{};
+        int32_t z{};
+        uint16_t last_used{};
+        bool used{false};
+    };
+
+    uint16_t next_stamp() {
+        if (++stamp_ == 0) {
+            uint16_t v = 1;
+            for (auto& slot : slots_) {
+                if (slot.used) {
+                    slot.last_used = v++;
+                }
+            }
+            stamp_ = v;
+        }
+        return stamp_;
+    }
+    std::array<Slot, SlotsCount> slots_{};
+    uint16_t stamp_{0};
+};
+
 class GeoPos : public View {
   public:
    enum alt_unit {
@@ -276,6 +374,7 @@ class GeoMap : public Widget {
    bool hide_center_marker_{false};
    GeoMapMode mode_{};
    File map_file{};
+    BMPFileCache bmp_cache{};
    bool map_opened{};
    bool map_visible{};
    uint16_t map_width{}, map_height{};
@@ -22,6 +22,7 @@

 #include "ui_menu.hpp"
 #include "rtc_time.hpp"
+#include <string_view>

 namespace ui {

@@ -29,57 +30,112 @@ namespace ui {

 void MenuItemView::set_item(MenuItem* item_) {
    item = item_;
+    scroll_offset = 0;
+    can_scroll = false;
 }

 void MenuItemView::highlight() {
    set_highlighted(true);
+    scroll_offset = 0;
    set_dirty();
 }

 void MenuItemView::unhighlight() {
    set_highlighted(false);
+    scroll_offset = 0;
    set_dirty();
 }

-void MenuItemView::paint(Painter& painter) {
-    Coord offset_x{};
+void MenuItemView::set_scroll_offset(size_t offset) {
+    if (can_scroll && scroll_offset != offset) {
+        scroll_offset = offset;
+        set_dirty();
+    }
+}

+void MenuItemView::paint(Painter& painter) {
    if (!item) return;

-    const auto r = screen_rect();
-
+    const auto rect = screen_rect();
    const auto paint_style = (highlighted() && (parent()->has_focus() || keep_highlight)) ? style().invert() : style();

-    const auto font_height = paint_style.font.line_height();
+    const int char_width = paint_style.font.char_width();
+    const int line_height = paint_style.font.line_height();
+
+    if (char_width == 0 || line_height == 0) return;
+
+    const int margin_x = char_width / 2;

    ui::Color final_item_color = (highlighted() && (parent()->has_focus() || keep_highlight)) ? paint_style.foreground : item->color;
    ui::Color final_bg_color = (highlighted() && (parent()->has_focus() || keep_highlight)) ? item->color : paint_style.background;

    if (final_item_color.v == final_bg_color.v) final_item_color = paint_style.foreground;

-    painter.fill_rectangle(
-        r,
-        final_bg_color);
+    painter.fill_rectangle(rect, final_bg_color);
+
+    Coord offset_x = 0;

    if (item->bitmap) {
        painter.draw_bitmap(
-            {r.location().x() + 4, r.location().y() + 4},
+            {rect.location().x() + 4, rect.location().y() + 4},
            *item->bitmap,
            final_item_color,
            final_bg_color);
        offset_x = 26;
-    } else
+    } else {
        offset_x = 0;
+    }

-    Style text_style{
-        .font = paint_style.font,
-        .background = final_bg_color,
-        .foreground = final_item_color};
+    Style text_style{.font = paint_style.font, .background = final_bg_color, .foreground = final_item_color};

-    painter.draw_string(
-        {r.location().x() + offset_x, r.location().y() + (r.size().height() - font_height) / 2},
-        text_style,
-        item->text);
+    std::string_view full_text = item->text;
+    std::string_view file_name = full_text;
+    std::string_view file_size_text = "";
+
+    auto tab_pos = full_text.find('\t');
+    if (tab_pos != std::string_view::npos) {
+        file_size_text = full_text.substr(tab_pos + 1);
+        file_name = full_text.substr(0, tab_pos);
+    }
+
+    int available_width_px = rect.width() - offset_x;
+    if (available_width_px <= 0) return;
+
+    size_t max_name_chars = available_width_px / char_width;
+    if (max_name_chars == 0) return;
+
+    if (!file_size_text.empty() && max_name_chars > file_size_text.length()) {
+        max_name_chars = max_name_chars - file_size_text.length() - 1;
+    }
+
+    if (max_name_chars == 0) return;
+
+    can_scroll = (file_name.length() > max_name_chars);
+
+    std::string_view display_name = file_name;
+    if (file_name.length() > max_name_chars) {
+        if (highlighted()) {
+            size_t max_scroll = file_name.length() - max_name_chars;
+            size_t actual_offset = scroll_offset % (max_scroll + 1);
+            display_name = file_name.substr(actual_offset, max_name_chars);
+        } else {
+            display_name = file_name.substr(0, max_name_chars);
+        }
+    }
+
+    Coord text_y = rect.location().y() + (rect.height() - line_height) / 2;
+
+    painter.draw_string({rect.location().x() + offset_x, text_y}, text_style, display_name);
+
+    if (!file_size_text.empty()) {
+        int file_size_width = static_cast<int>(file_size_text.length()) * char_width;
+        int file_size_x = rect.width() - file_size_width - margin_x;
+
+        // Csak akkor rajzoljuk ki, ha pozitív koordinátára esik és nem takarja el az ikont/nevet
+        if (file_size_x > offset_x) {
+            painter.draw_string({rect.location().x() + static_cast<Coord>(file_size_x), text_y}, text_style, file_size_text);
+        }
+    }
 }

 /* MenuView **************************************************************/
@@ -134,6 +190,20 @@ void MenuView::set_parent_rect(const Rect new_parent_rect) {
    update_items();
 }

+void MenuView::increment_scroll() {
+    if (menu_items.empty()) return;
+    const size_t view_index = highlighted_item - offset;
+    if (view_index >= menu_item_views.size()) {
+        return;
+    }
+    // The MenuView checks if the currently highlighted item needs scrolling
+    scroll_offset++;
+    auto* view = item_view(view_index);
+    if (view) {
+        view->set_scroll_offset(scroll_offset);
+    }
+}
+
 void MenuView::on_tick_second() {
    if (more && blink)
        arrow_more.set_foreground(Theme::getInstance()->bg_darkest->foreground);
@@ -141,8 +211,9 @@ void MenuView::on_tick_second() {
        arrow_more.set_foreground(Theme::getInstance()->bg_darkest->background);

    blink = !blink;
-
    arrow_more.set_dirty();
+
+    increment_scroll();
 }

 void MenuView::clear() {
@@ -153,22 +224,22 @@ void MenuView::clear() {
    menu_items.shrink_to_fit();
    highlighted_item = 0;
    offset = 0;
+    reset_scroll();
 }

 size_t MenuView::item_count() const {
    return menu_items.size();
 }

-void MenuView::add_item(MenuItem new_item) {
-    menu_items.push_back(new_item);
+void MenuView::add_item(MenuItem&& new_item) {
+    menu_items.push_back(std::move(new_item));

    update_items();
 }

 void MenuView::add_items(std::initializer_list<MenuItem> new_items) {
-    for (auto item : new_items) {
-        add_item(item);
-    }
+    menu_items.insert(menu_items.end(), new_items);
+    update_items();
 }

 void MenuView::update_items() {
@@ -226,6 +297,8 @@ bool MenuView::set_highlighted(int32_t new_value) {
        item_view(highlighted_item - offset)->highlight();
    }

+    reset_scroll();
+
    if (on_highlight)
        on_highlight();

@@ -67,9 +67,13 @@ class MenuItemView : public Widget {
    void highlight();
    void unhighlight();

+    void set_scroll_offset(size_t offset);
+
   private:
    MenuItem* item{nullptr};
    bool keep_highlight = false;
+    size_t scroll_offset{0};
+    bool can_scroll{false};
 };

 class MenuView : public View {
@@ -83,7 +87,10 @@ class MenuView : public View {

    ~MenuView();

-    void add_item(MenuItem new_item);
+    // This function takes a temporary to avoid copies and heap allocations.
+    // To pass a variable 'item', use add_item(std::move(item)),
+    // or construct the MenuItem in the call, add_item(MenuItem{...})
+    void add_item(MenuItem&& new_item);
    void add_items(std::initializer_list<MenuItem> new_items);
    void clear();
    size_t item_count() const;
@@ -105,6 +112,10 @@ class MenuView : public View {
    void update_items();
    void on_tick_second();

+    // SCROLLING
+    void increment_scroll();
+    inline void reset_scroll() { scroll_offset = 0; }
+
    bool keep_highlight{false};

    SignalToken signal_token_tick_second{};
@@ -123,6 +134,8 @@ class MenuView : public View {
    size_t displayed_max{0};
    size_t highlighted_item{0};
    size_t offset{0};
+
+    size_t scroll_offset{0};
 };

 } /* namespace ui */
@@ -39,7 +39,13 @@ using namespace portapack;
 namespace ui {

 /* Gets a style indicating total TX gain level. */
-static const Style* get_style_for_gain(uint8_t tot_gain) {
+static const Style* get_style_for_gain(uint8_t tot_gain, uint8_t gain) {
+    if (persistent_memory::config_tx_disabled()) {
+        return Theme::getInstance()->fg_dark;  // disabled color
+    }
+    if (gain == persistent_memory::config_tx_gain_max_db() && gain != max2837::tx::gain_db_range.maximum) {  // only if limited
+        return Theme::getInstance()->fg_cyan;
+    }
    if (tot_gain > POWER_THRESHOLD_HIGH) return Theme::getInstance()->fg_red;

    if (tot_gain > POWER_THRESHOLD_MED)
@@ -50,7 +56,21 @@ static const Style* get_style_for_gain(uint8_t tot_gain) {

    return nullptr;  // Uses default.
 }
+static const Style* get_style_for_amp(uint8_t tot_gain) {
+    if (persistent_memory::config_tx_disabled() || persistent_memory::config_tx_amp_disabled()) {
+        return Theme::getInstance()->fg_dark;  // disabled color
+    }

+    if (tot_gain > POWER_THRESHOLD_HIGH) return Theme::getInstance()->fg_red;
+
+    if (tot_gain > POWER_THRESHOLD_MED)
+        return Theme::getInstance()->fg_orange;
+
+    if (tot_gain > POWER_THRESHOLD_LOW)
+        return Theme::getInstance()->fg_yellow;
+
+    return nullptr;  // Uses default.
+}
 /* TransmitterView *******************************************************/

 void TransmitterView::paint(Painter& painter) {
@@ -95,12 +115,12 @@ void TransmitterView::on_tx_amp_changed(bool rf_amp) {

 void TransmitterView::update_gainlevel_styles() {
    int8_t tot_gain = transmitter_model.tx_gain() + (transmitter_model.rf_amp() ? 14 : 0);
-    auto style = get_style_for_gain(tot_gain);
-
+    auto style = get_style_for_gain(tot_gain, transmitter_model.tx_gain());
+    auto styleamp = get_style_for_amp(tot_gain);
    field_gain.set_style(style);
    text_gain.set_style(style);
-    field_amp.set_style(style);
-    text_amp.set_style(style);
+    field_amp.set_style(styleamp);
+    text_amp.set_style(styleamp);
 }

 void TransmitterView::set_transmitting(const bool transmitting) {
@@ -199,6 +219,24 @@ TransmitterView::TransmitterView(
                on_start();
        }
    };
+
+    if (persistent_memory::config_tx_amp_disabled() || persistent_memory::config_tx_disabled()) {  // amp disabled / tx disabled
+        field_amp.set_value(0);
+        field_amp.set_focusable(false);
+    }
+
+    if (persistent_memory::config_tx_disabled()) {  // tx disabled
+        field_gain.set_value(0);
+        field_gain.set_focusable(false);
+    } else {
+        if (persistent_memory::config_tx_gain_max_db() < max2837::tx::gain_db_range.maximum) {
+            field_gain.set_range(max2837::tx::gain_db_range.minimum, persistent_memory::config_tx_gain_max_db());
+            if (field_gain.value() > persistent_memory::config_tx_gain_max_db()) {
+                field_gain.set_value(persistent_memory::config_tx_gain_max_db());
+            }
+        }
+    }
+    update_gainlevel_styles();
 }

 TransmitterView::~TransmitterView() {
@@ -252,16 +290,34 @@ TransmitterView2::TransmitterView2(Point pos, bool short_ui) {
        update_gainlevel_styles();
    };

+    if (persistent_memory::config_tx_amp_disabled() || persistent_memory::config_tx_disabled()) {  // amp disabled / tx disabled
+        field_amp.set_value(0);
+        field_amp.set_focusable(false);
+    }
+
+    if (persistent_memory::config_tx_disabled()) {  // tx disabled
+        field_gain.set_value(0);
+        field_gain.set_focusable(false);
+    } else {
+        if (persistent_memory::config_tx_gain_max_db() < max2837::tx::gain_db_range.maximum) {
+            field_gain.set_range(max2837::tx::gain_db_range.minimum, persistent_memory::config_tx_gain_max_db());
+            if (field_gain.value() > persistent_memory::config_tx_gain_max_db()) {
+                field_gain.set_value(persistent_memory::config_tx_gain_max_db());
+            }
+        }
+    }
+
    update_gainlevel_styles();
 }

 void TransmitterView2::update_gainlevel_styles() {
    int8_t tot_gain = transmitter_model.tx_gain() + (transmitter_model.rf_amp() ? 14 : 0);
-    auto style = get_style_for_gain(tot_gain);
+    auto style = get_style_for_gain(tot_gain, transmitter_model.tx_gain());
+    auto styleamp = get_style_for_amp(tot_gain);

    text_labels.set_style(style);
    field_gain.set_style(style);
-    field_amp.set_style(style);
+    field_amp.set_style(styleamp);
 }

 } /* namespace ui */
@@ -9,13 +9,7 @@

 namespace ui {

-/* static */ std::vector<std::unique_ptr<DynamicBitmap<16, 16>>> ExternalItemsMenuLoader::bitmaps;
-
-// to save ram when entering an app
-void ExternalItemsMenuLoader::unload_external_items() {
-    bitmaps.clear();
-    bitmaps.shrink_to_fit();
-}
+/* static */ std::vector<DynamicBitmap<16, 16>> ExternalItemsMenuLoader::bitmaps;

 // iterates over all possible ext apps-s, and if it is runnable on the current system, it'll call the callback, and pass minimal info. used to print to console, and for autostart setting's app list. where the minimal info is enough
 // please keep in sync with load_external_items
@@ -103,9 +97,8 @@ void ExternalItemsMenuLoader::unload_external_items() {
    }
 }

-std::vector<ExternalItemsMenuLoader::GridItemEx> ExternalItemsMenuLoader::load_external_items(app_location_t app_location, NavigationView& nav) {
+/* static */ std::vector<ExternalItemsMenuLoader::GridItemEx> ExternalItemsMenuLoader::load_external_items(app_location_t app_location, NavigationView& nav) {
    bitmaps.clear();
-    bitmaps.shrink_to_fit();

    std::vector<GridItemEx> external_apps;

@@ -133,8 +126,8 @@ std::vector<ExternalItemsMenuLoader::GridItemEx> ExternalItemsMenuLoader::load_e

                gridItem.color = Color((uint16_t)appInfo->icon_color);

-                auto dyn_bmp = std::make_unique<DynamicBitmap<16, 16>>(appInfo->bitmap_data);
-                gridItem.bitmap = dyn_bmp->bitmap();
+                auto dyn_bmp = DynamicBitmap<16, 16>{appInfo->bitmap_data};
+                gridItem.bitmap = dyn_bmp.bitmap();
                bitmaps.push_back(std::move(dyn_bmp));

                gridItem.on_select = [&nav, appInfo, i]() {
@@ -211,8 +204,8 @@ std::vector<ExternalItemsMenuLoader::GridItemEx> ExternalItemsMenuLoader::load_e
        if (versionMatches) {
            gridItem.color = Color((uint16_t)application_information.icon_color);

-            auto dyn_bmp = std::make_unique<DynamicBitmap<16, 16>>(application_information.bitmap_data);
-            gridItem.bitmap = dyn_bmp->bitmap();
+            auto dyn_bmp = DynamicBitmap<16, 16>{application_information.bitmap_data};
+            gridItem.bitmap = dyn_bmp.bitmap();
            bitmaps.push_back(std::move(dyn_bmp));

            gridItem.on_select = [&nav, app_location, filePath]() {
@@ -262,8 +255,8 @@ std::vector<ExternalItemsMenuLoader::GridItemEx> ExternalItemsMenuLoader::load_e

        gridItem.color = Color((uint16_t)application_information.icon_color);

-        auto dyn_bmp = std::make_unique<DynamicBitmap<16, 16>>(application_information.bitmap_data);
-        gridItem.bitmap = dyn_bmp->bitmap();
+        auto dyn_bmp = DynamicBitmap<16, 16>{application_information.bitmap_data};
+        gridItem.bitmap = dyn_bmp.bitmap();
        bitmaps.push_back(std::move(dyn_bmp));

        gridItem.on_select = [&nav, app_location, filePath]() {
@@ -357,8 +350,6 @@ std::vector<ExternalItemsMenuLoader::GridItemEx> ExternalItemsMenuLoader::load_e
    if (checksum != EXT_APP_EXPECTED_CHECKSUM)
        return false;

-    nav.pop();
-    nav.set_last_menu_went_deeper(true);
    application_information.externalAppEntry(nav);
    return true;
 }
@@ -395,8 +386,7 @@ std::vector<ExternalItemsMenuLoader::GridItemEx> ExternalItemsMenuLoader::load_e
        }
    }

-    nav.set_last_menu_went_deeper(true);
-    nav.replace<StandaloneView>(app_image);
+    nav.push<StandaloneView>(app_image);
    return true;
 }

@@ -410,8 +400,7 @@ std::vector<ExternalItemsMenuLoader::GridItemEx> ExternalItemsMenuLoader::load_e
        }
    }

-    nav.set_last_menu_went_deeper(true);
-    nav.replace<StandaloneView>(app_image);
+    nav.push<StandaloneView>(app_image);
    return true;
 }

@@ -33,38 +33,24 @@
 #define EXT_APP_EXPECTED_CHECKSUM 0x00000000

 namespace ui {
+
 template <size_t Width, size_t Height>
 class DynamicBitmap {
   public:
-    static constexpr size_t buffer_size = Width * Height / (sizeof(uint8_t) * 8);
+    static constexpr size_t buffer_size = Width * Height / (sizeof(uint8_t) * 8);  // one bit per pixel

-    // Main constructor
    DynamicBitmap(const uint8_t data[buffer_size])
-        : _bitmap{{Width, Height}, _buffer.data()} {
-        std::memcpy(_buffer.data(), data, buffer_size);
+        : _buffer(buffer_size, 0),
+          _bitmap{new Bitmap{{Width, Height}, &_buffer[0]}} {
+        memcpy(&_buffer[0], data, buffer_size);
    }

-    DynamicBitmap(const DynamicBitmap& other)
-        : _buffer(other._buffer),
-          _bitmap{{Width, Height}, _buffer.data()} {}
-
-    DynamicBitmap(DynamicBitmap&& other) noexcept
-        : _buffer(std::move(other._buffer)),
-          _bitmap{{Width, Height}, _buffer.data()} {}
-
-    DynamicBitmap& operator=(const DynamicBitmap& other) = delete;
-    DynamicBitmap& operator=(DynamicBitmap&& other) noexcept = delete;
-
-    // Destructor (Default is fine, no heap memory to free manually)
-    ~DynamicBitmap() = default;
-
-    const Bitmap* bitmap() const { return &_bitmap; }
+    const Bitmap* bitmap() { return _bitmap.get(); }

   private:
-    // Order matters: _buffer must be declared before _bitmap
-    // so it is initialized first and its .data() pointer is valid.
-    std::array<uint8_t, buffer_size> _buffer{};
-    Bitmap _bitmap{};
+    // Allocating both members so the class is movable without invalidation.
+    std::vector<uint8_t> _buffer;
+    std::unique_ptr<Bitmap> _bitmap;
 };

 class ExternalItemsMenuLoader {
@@ -79,10 +65,9 @@ class ExternalItemsMenuLoader {
    static bool run_standalone_app(ui::NavigationView&, std::filesystem::path);
    static bool run_module_app(ui::NavigationView&, uint8_t*, size_t);
    static void load_all_external_items_callback(std::function<void(AppInfoConsole&)> callback, bool module_included = false);
-    static void unload_external_items();

   private:
-    static std::vector<std::unique_ptr<DynamicBitmap<16, 16>>> bitmaps;
+    static std::vector<DynamicBitmap<16, 16>> bitmaps;
 };

 }  // namespace ui
@@ -73,6 +73,8 @@
 #include "file_path.hpp"
 #include "ff.h"

+#include "i2cdev_max17055.hpp"
+
 #include <locale>
 #include <codecvt>

@@ -85,47 +87,44 @@ namespace ui {
 // TODO(u-foka): Check consistency of command names (where we add rx/tx postfix)
 const NavigationView::AppList NavigationView::appList = {
    /* HOME ******************************************************************/
-    {nullptr, "Receive", HOME, Color::cyan(), &bitmap_icon_receivers, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<ReceiversMenuView>(nav); }},
-    {nullptr, "Transmit", HOME, Color::cyan(), &bitmap_icon_transmit, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<TransmittersMenuView>(nav); }},
-    {nullptr, "Transceiver", HOME, Color::cyan(), &bitmap_icon_transceivers, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<TransceiversMenuView>(nav); }},
-    {"recon", "Recon", HOME, Color::green(), &bitmap_icon_scanner, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<ReconView>(nav); }},
-    {"capture", "Capture", HOME, Color::red(), &bitmap_icon_capture, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<CaptureAppView>(nav); }},
-    {"replay", "Replay", HOME, Color::green(), &bitmap_icon_replay, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<PlaylistView>(nav); }},
-    {"lookingglass", "Looking Glass", HOME, Color::green(), &bitmap_icon_looking, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<GlassView>(nav); }},
-    {nullptr, "Utilities", HOME, Color::cyan(), &bitmap_icon_utilities, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<UtilitiesMenuView>(nav); }},
-    {nullptr, "Games", HOME, Color::cyan(), &bitmap_icon_games, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<GamesMenuView>(nav); }},
-    {nullptr, "Settings", HOME, Color::cyan(), &bitmap_icon_setup, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<SettingsMenuView>(nav); }},
-
+    {nullptr, "Receive", HOME, Color::cyan(), &bitmap_icon_receivers, new ViewFactory<ReceiversMenuView>()},
+    {nullptr, "Transmit", HOME, Color::cyan(), &bitmap_icon_transmit, new ViewFactory<TransmittersMenuView>()},
+    {nullptr, "Transceiver", HOME, Color::cyan(), &bitmap_icon_transceivers, new ViewFactory<TransceiversMenuView>()},
+    {"recon", "Recon", HOME, Color::green(), &bitmap_icon_scanner, new ViewFactory<ReconView>()},
+    {"capture", "Capture", HOME, Color::red(), &bitmap_icon_capture, new ViewFactory<CaptureAppView>()},
+    {"replay", "Replay", HOME, Color::green(), &bitmap_icon_replay, new ViewFactory<PlaylistView>()},
+    {"lookingglass", "Looking Glass", HOME, Color::green(), &bitmap_icon_looking, new ViewFactory<GlassView>()},
+    {nullptr, "Utilities", HOME, Color::cyan(), &bitmap_icon_utilities, new ViewFactory<UtilitiesMenuView>()},
+    {nullptr, "Games", HOME, Color::cyan(), &bitmap_icon_games, new ViewFactory<GamesMenuView>()},
+    {nullptr, "Settings", HOME, Color::cyan(), &bitmap_icon_setup, new ViewFactory<SettingsMenuView>()},
    /* RX ********************************************************************/
-    {"adsbrx", "ADS-B", RX, Color::green(), &bitmap_icon_adsb, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<ADSBRxView>(nav); }},
-    {"ais", "AIS Boats", RX, Color::green(), &bitmap_icon_ais, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<AISAppView>(nav); }},
-    {"aprsrx", "APRS", RX, Color::green(), &bitmap_icon_aprs, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<APRSRXView>(nav); }},
-    {"audio", "Audio", RX, Color::green(), &bitmap_icon_speaker, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<AnalogAudioView>(nav); }},
-    {"blerx", "BLE Rx", RX, Color::green(), &bitmap_icon_btle, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<BLERxView>(nav); }},
-    {"pocsag", "POCSAG", RX, Color::green(), &bitmap_icon_pocsag, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<POCSAGAppView>(nav); }},
-    {"radiosonde", "Radiosnde", RX, Color::green(), &bitmap_icon_sonde, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<SondeView>(nav); }},
-    {"search", "Search", RX, Color::yellow(), &bitmap_icon_search, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<SearchView>(nav); }},
-    {"subghzd", "SubGhzD", RX, Color::yellow(), &bitmap_icon_remote, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<SubGhzDView>(nav); }},
-    {"weather", "Weather", RX, Color::green(), &bitmap_icon_thermometer, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<WeatherView>(nav); }},
-
+    {"adsbrx", "ADS-B", RX, Color::green(), &bitmap_icon_adsb, new ViewFactory<ADSBRxView>()},
+    {"ais", "AIS Boats", RX, Color::green(), &bitmap_icon_ais, new ViewFactory<AISAppView>()},
+    {"aprsrx", "APRS", RX, Color::green(), &bitmap_icon_aprs, new ViewFactory<APRSRXView>()},
+    {"audio", "Audio", RX, Color::green(), &bitmap_icon_speaker, new ViewFactory<AnalogAudioView>()},
+    {"blerx", "BLE Rx", RX, Color::green(), &bitmap_icon_btle, new ViewFactory<BLERxView>()},
+    {"pocsag", "POCSAG", RX, Color::green(), &bitmap_icon_pocsag, new ViewFactory<POCSAGAppView>()},
+    {"radiosonde", "Radiosnde", RX, Color::green(), &bitmap_icon_sonde, new ViewFactory<SondeView>()},
+    {"search", "Search", RX, Color::yellow(), &bitmap_icon_search, new ViewFactory<SearchView>()},
+    {"subghzd", "SubGhzD", RX, Color::yellow(), &bitmap_icon_remote, new ViewFactory<SubGhzDView>()},
+    {"weather", "Weather", RX, Color::green(), &bitmap_icon_thermometer, new ViewFactory<WeatherView>()},
    /* TX ********************************************************************/
-    {"aprstx", "APRS TX", TX, ui::Color::green(), &bitmap_icon_aprs, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<APRSTXView>(nav); }},
-    {"bletx", "BLE Tx", TX, ui::Color::green(), &bitmap_icon_btle, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<BLETxView>(nav); }},
-    {"ooktx", "OOK", TX, ui::Color::yellow(), &bitmap_icon_remote, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<EncodersView>(nav); }},
-    {"rdstx", "RDS", TX, ui::Color::green(), &bitmap_icon_rds, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<RDSView>(nav); }},
-    {"touchtune", "TouchTune", TX, ui::Color::green(), &bitmap_icon_touchtunes, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<TouchTunesView>(nav); }},
-
+    {"aprstx", "APRS TX", TX, ui::Color::green(), &bitmap_icon_aprs, new ViewFactory<APRSTXView>()},
+    {"bletx", "BLE Tx", TX, ui::Color::green(), &bitmap_icon_btle, new ViewFactory<BLETxView>()},
+    {"ooktx", "OOK", TX, ui::Color::yellow(), &bitmap_icon_remote, new ViewFactory<EncodersView>()},
+    {"rdstx", "RDS", TX, ui::Color::green(), &bitmap_icon_rds, new ViewFactory<RDSView>()},
+    {"touchtune", "TouchTune", TX, ui::Color::green(), &bitmap_icon_touchtunes, new ViewFactory<TouchTunesView>()},
    /* TRX ********************************************************************/
-    {"microphone", "Mic", TRX, Color::green(), &bitmap_icon_microphone, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<MicTXView>(nav); }},
-
+    {"microphone", "Mic", TRX, Color::green(), &bitmap_icon_microphone, new ViewFactory<MicTXView>()},
    /* UTILITIES *************************************************************/
-    {"filemanager", "File Manager", UTILITIES, Color::green(), &bitmap_icon_dir, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<FileManagerView>(nav); }},
-    {"freqman", "Freq. Manager", UTILITIES, Color::green(), &bitmap_icon_freqman, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<FrequencyManagerView>(nav); }},
-    {"iqtrim", "IQ Trim", UTILITIES, Color::orange(), &bitmap_icon_trim, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<IQTrimView>(nav); }},
-    {"notepad", "Notepad", UTILITIES, Color::dark_cyan(), &bitmap_icon_notepad, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<TextEditorView>(nav); }},
-    {nullptr, "Debug", UTILITIES, Color::light_grey(), &bitmap_icon_debug, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<DebugMenuView>(nav); }},
+    {"filemanager", "File Manager", UTILITIES, Color::green(), &bitmap_icon_dir, new ViewFactory<FileManagerView>()},
+    {"freqman", "Freq. Manager", UTILITIES, Color::green(), &bitmap_icon_freqman, new ViewFactory<FrequencyManagerView>()},
+    {"iqtrim", "IQ Trim", UTILITIES, Color::orange(), &bitmap_icon_trim, new ViewFactory<IQTrimView>()},
+    {"notepad", "Notepad", UTILITIES, Color::dark_cyan(), &bitmap_icon_notepad, new ViewFactory<TextEditorView>()},
+    {nullptr, "Debug", UTILITIES, Color::light_grey(), &bitmap_icon_debug, new ViewFactory<DebugMenuView>()},
+    //{"testapp", "Test App", UTILITIES, Color::dark_grey(), nullptr, new ViewFactory<TestView>()},
    // Dangerous apps.
-    {nullptr, "Flash Utility", UTILITIES, Color::red(), &bitmap_icon_peripherals_details, [](NavigationView& nav) -> std::unique_ptr<View> { return std::make_unique<FlashUtilityView>(nav); }},
+    {nullptr, "Flash Utility", UTILITIES, Color::red(), &bitmap_icon_peripherals_details, new ViewFactory<FlashUtilityView>()},
 };

 bool NavigationView::StartAppByName(const char* name) {
@@ -133,7 +132,7 @@ bool NavigationView::StartAppByName(const char* name) {

    for (const auto& app : appList) {
        if (app.id != nullptr && strcmp(app.id, name) == 0) {
-            push_view(app.producer(*this));
+            push_view(app.viewFactory->produce(*this));
            return true;
        }
    }
@@ -337,10 +336,10 @@ void SystemStatusView::on_battery_data(const BatteryStateMessage* msg) {
    was_charging = msg->on_charger;

    if (!pmem::ui_hide_numeric_battery()) {
-        battery_text.set_battery(msg->valid_mask, msg->percent, msg->on_charger);
+        battery_text.set_battery(msg->valid_mask, msg->percent, msg->on_charger, msg->battMayChanged);
    }
    if (!pmem::ui_hide_battery_icon()) {
-        battery_icon.set_battery(msg->valid_mask, msg->percent, msg->on_charger);
+        battery_icon.set_battery(msg->valid_mask, msg->percent, msg->on_charger, msg->battMayChanged);
    }
 }

@@ -633,7 +632,6 @@ void NavigationView::pop(bool trigger_update) {

    free_view();
    view_stack.pop_back();
-    view_stack.shrink_to_fit();

    // NB: These are executed _after_ the view has been
    // destroyed. The old view MUST NOT be referenced in
@@ -757,22 +755,10 @@ void NavigationView::handle_autostart() {
 void add_apps(NavigationView& nav, BtnGridView& grid, app_location_t loc) {
    for (auto& app : NavigationView::appList) {
        if (app.menuLocation == loc) {
-            const AppInfo* p_app = &app;
            grid.add_item({app.displayName, app.iconColor, app.icon,
-                           [&nav, p_app]() {
-                               NavigationView& local_nav = nav;
-                               if (p_app->menuLocation == HOME) {
-                                   local_nav.store_last_menu_name(p_app->displayName);
-                                   local_nav.set_last_menu_went_deeper(false);
-                                   auto new_view = p_app->producer(local_nav);
-                                   local_nav.push_view(std::move(new_view));
-                               } else {
-                                   auto new_view = p_app->producer(local_nav);
-                                   local_nav.pop();
-                                   local_nav.set_last_menu_went_deeper(true);
-                                   local_nav.push_view(std::move(new_view));
-                               }
-                           }},
+                           [&nav, &app]() {
+                            i2cdev::I2CDevManager::set_autoscan_interval(0); //if i navigate away from any menu, turn off autoscan
+                            nav.push_view(app.viewFactory->produce(nav)); }},
                          true);
        }
    };
@@ -799,7 +785,7 @@ void add_external_items(NavigationView& nav, app_location_t location, BtnGridVie
            return a.desired_position < b.desired_position;
        });

-        for (auto & gridItem : externalItems) {
+        for (auto const& gridItem : externalItems) {
            if (gridItem.desired_position < 0) {
                grid.add_item(std::move(gridItem), true);
            } else {
@@ -896,6 +882,10 @@ void SystemMenuView::hackrf_mode(NavigationView& nav) {
        YESNO,
        [this](bool choice) {
            if (choice) {
+                i2cdev::I2cDev_MAX17055* dev = (i2cdev::I2cDev_MAX17055*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055);
+                if (dev) {
+                    dev->sleep_config(false);  // don't enable sleep even if no i2c communication. so we won't lose any data. on reboot (like exit hackrf mode) we set it to true again.
+                }
                EventDispatcher::request_stop();
            }
        });
@@ -931,27 +921,6 @@ SystemView::SystemView(
        {{0, 0},
         {parent_rect.width(), status_view_height}});
    status_view.on_back = [this]() {
-        if (this->navigation_view.view_stack_size() == 2) {
-            const AppInfo* lastmenu = nullptr;
-            const auto last_menu_name = this->navigation_view.get_last_menu_name();
-            this->navigation_view.store_last_menu_name("");
-            if (!last_menu_name.empty()) {
-                for (const auto& app : NavigationView::appList) {
-                    if (app.displayName == last_menu_name) {
-                        lastmenu = &app;
-                        break;
-                    }
-                }
-
-                if (lastmenu && this->navigation_view.get_last_menu_went_deeper()) {
-                    this->navigation_view.pop();
-                    this->navigation_view.push_view(lastmenu->producer(this->navigation_view));
-                    this->navigation_view.store_last_menu_name(lastmenu->displayName);  // since we opened it again, store it again
-                    this->navigation_view.set_last_menu_went_deeper(false);             // not yet
-                    return;
-                }
-            }
-        }
        this->navigation_view.pop();
    };

@@ -968,7 +937,6 @@ SystemView::SystemView(
    navigation_view.on_view_changed = [this](const View& new_view) {
        if (!this->navigation_view.is_top()) {
            remove_child(&info_view);
-            i2cdev::I2CDevManager::set_autoscan_interval(0);
        } else {
            add_child(&info_view);
            info_view.refresh();
@@ -1029,15 +997,16 @@ void SystemView::toggle_overlay() {
            this->set_dirty();
            shared_memory.request_m4_performance_counter = last_perf_counter_status;
            overlay_active = 0;
-            break;
    }
 }

 void SystemView::paint_overlay() {
    static bool last_paint_state = false;
    if (overlay_active) {
+        // paint background only every other second
        if ((((chTimeNow() >> 10) & 0x01) == 0x01) == last_paint_state)
            return;
+
        last_paint_state = !last_paint_state;
        if (overlay_active == 1 && overlay)
            overlay->set_dirty();
@@ -50,6 +50,7 @@
 #include "lfsr_random.hpp"
 #include "sd_card.hpp"
 #include "external_app.hpp"
+#include "view_factory.hpp"
 #include "battery.hpp"

 // for incrementing fake date when RTC battery is dead
@@ -59,9 +60,6 @@ using namespace sd_card;

 namespace ui {

-class NavigationView;
-using ViewProducer = std::unique_ptr<View> (*)(NavigationView&);
-
 void add_apps(NavigationView& nav, BtnGridView& grid, app_location_t loc);
 void add_external_items(NavigationView& nav, app_location_t location, BtnGridView& grid, uint8_t error_tile_pos, bool show_error_tile = true);

@@ -71,7 +69,7 @@ enum modal_t {
    ABORT
 };

-// Should only be used as part of the appList in NavigationView.
+// Should only be used as part of the appList in NavigationView, the viewFactory will never be destroyed.
 class AppInfo {
   public:
    const char* id;  // MUST be unique! Used by serial command to start the app so it also has to make sense
@@ -79,7 +77,7 @@ class AppInfo {
    app_location_t menuLocation;
    Color iconColor;
    const Bitmap* icon;
-    ViewProducer producer;
+    ViewFactoryBase* viewFactory;  // Never destroyed, and I believe it's ok ;) Having a unique_ptr here breaks the initializer list of appList
 };

 struct AppInfoConsole {
@@ -140,13 +138,6 @@ class NavigationView : public View {
    bool StartAppByName(const char* name);  // Starts a View  (app) by name stored in appListFC. This is to start apps from console
    void handle_autostart();

-    void store_last_menu_name(const std::string& name) { last_menu_name_ = name; }
-    std::string get_last_menu_name() const { return last_menu_name_; }
-    size_t view_stack_size() const { return view_stack.size(); }
-
-    bool get_last_menu_went_deeper() { return last_menu_went_deeper; }
-    void set_last_menu_went_deeper(bool went_deeper) { last_menu_went_deeper = went_deeper; }
-
   private:
    struct ViewState {
        std::unique_ptr<View> view;
@@ -159,8 +150,6 @@ class NavigationView : public View {

    void free_view();
    void update_view();
-    std::string last_menu_name_{};  // this stores the last menu name, when we replace the menu with the app, we'll know, where to navigate back
-    bool last_menu_went_deeper = false;
 };

 /* Holds widgets and grows dynamically toward the left.
@@ -20,9 +20,31 @@
 */

 #include "usb_serial_cdc.h"
+#include "usb_serial_descriptor.h"
 #include "usb_serial_endpoints.h"
 #include "usb_serial_event.hpp"

+#include <string.h>
+
+/* Defined in hackrf/firmware/hackrf_usb/usb_device.c. After upstream commit
+ * 85dfacf6 ("Universalize: firmware/hackrf_usb"), the global `usb_device` is
+ * left zero-initialized and is populated at runtime from per-board
+ * `usb_device_*` constants inside hackrf_usb.c. Mayhem does not link
+ * hackrf_usb.c, so we must populate `usb_device` ourselves before usb_run().
+ * The descriptor fields are const-qualified, so we follow the upstream
+ * pattern of memcpy from a const template. */
+extern usb_configuration_t* usb_configurations[];
+
+static const usb_device_t usb_device_mayhem = {
+    .descriptor = usb_descriptor_device,
+    .descriptor_strings = usb_descriptor_strings,
+    .qualifier_descriptor = usb_descriptor_device_qualifier,
+    .configurations = &usb_configurations,
+    .configuration = 0,
+    .wcid_string_descriptor = wcid_string_descriptor,
+    .wcid_feature_descriptor = wcid_feature_descriptor,
+};
+
 uint32_t EVT_MASK_USB = EVENT_MASK(8);

 extern void usb0_isr(void);
@@ -85,6 +107,8 @@ void usb_configuration_changed(usb_device_t* const device) {
 }

 void setup_usb_serial_controller(void) {
+    memcpy(&usb_device, &usb_device_mayhem, sizeof(usb_device_mayhem));
+
    usb_set_configuration_changed_cb(usb_configuration_changed);
    usb_peripheral_reset();

@@ -97,7 +121,10 @@ void setup_usb_serial_controller(void) {
    usb_queue_init(&usb_endpoint_bulk_in_queue);

    usb_endpoint_init(&usb_endpoint_control_out, false);
-    usb_endpoint_init(&usb_endpoint_control_in, false);
+    /* Control IN needs ZLP for descriptor reads whose length is a multiple of
+     * the max packet size (otherwise the host hangs waiting for the transfer
+     * to terminate). Matches upstream hackrf_usb.c after commit db73ecbf. */
+    usb_endpoint_init(&usb_endpoint_control_in, true);

    usb_run(&usb_device);
 }
@@ -157,8 +157,7 @@ static void cmd_flash(BaseSequentialStream* chp, int argc, char* argv[]) {
    // call nav with flash
    auto open_view = nav->push<ui::FlashUtilityView>();
    chprintf(chp, "Flashing started\r\n");
-    chThdSleepMilliseconds(50);     // to give display some time to paint the screen
-    open_view->wait_till_loaded();  // also wait for first frame sync
+    chThdSleepMilliseconds(150);  // to give display some time to paint the screen
    if (!open_view->flash_firmware(path.native())) {
        chprintf(chp, "error\r\n");
    }
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 Tamas Eisenberger <e.tamas@iwstudio.hu>
+ *
+ * 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 __VIEW_FACTORY_HPP__
+#define __VIEW_FACTORY_HPP__
+
+#include "view_factory_base.hpp"
+
+namespace ui {
+
+template <typename T>
+class ViewFactory : public ViewFactoryBase {
+   public:
+    virtual std::unique_ptr<View> produce(NavigationView& nav) const override {
+        return std::unique_ptr<View>(new T(nav));
+    }
+};
+
+}  // namespace ui
+
+#endif  //__VIEW_FACTORY_HPP__
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024 Tamas Eisenberger <e.tamas@iwstudio.hu>
+ *
+ * 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 "view_factory_base.hpp"
+
+namespace ui {
+
+ViewFactoryBase::~ViewFactoryBase() {}
+
+}  // namespace ui
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Totoo	9c74a1f392	fix mbt build on rare errors (#3242 )	2026-07-01 14:42:25 +02:00
gullradriel	abadf35e06	Lna investigations and fix (#3240 ) * The LNA gain field 'L' lives in LPF_VGA_2 (reg 6), not RXRF_2 (reg 2). RXRF_2 only holds LNAgain_SPI_EN. The configure_rx_gain() function wrote 'L' into lpf_vga_2 but marked RXRF_2 dirty => the LNA value only got flushed incidentally because the following VGA write marks LPF_VGA_2 dirty. Drop the stray RXRF_2 dirty flag and rely on the LPF_VGA_2 flag, which carries both L and VGA. * The baseband build defined IS_H1_R9 as the compile-time constant 0, on the (now incorrect) assumption that detected_platform() isn't linked. The sd_over_usb image is the only baseband target that compiles the IS_H1_R9-gated upstream files (rf_path.c, si5351c.c, sgpio.c, platform_gpio.c, platform_scu.c), and it does link platform_detect.c and call detect_hardware_platform() at startup. Forcing IS_H1_R9=0 dead-stripped every 'if (IS_H1_R9)' branch, so a real HackRF One r9 was set up with the OG clock/GPIO/RF-path config in that image. Define IS_H1_R9 as the runtime '(detected_platform()==BOARD_ID_HACKRF1_R9)', mirroring upstream platform-detect.cmake for HACKRF_ONE. All usages are '#ifdef IS_H1_R9' + 'if (IS_H1_R9)' (no arithmetic '#if'), so a function-call expression is safe, single-quoted -D with no internal spaces keeps it intact through the shell-split DDEFS blob. --------- Co-authored-by: gullradriel <gullradriel@users.noreply.github.com>	2026-07-01 08:47:07 +02:00
Totoo	288e87537a	MAX 17055 sleep bug fixes.	2026-06-25 09:08:44 +02:00
gullradriel	d25899de10	Upgrade subm plus warning fix (#3235 )	2026-06-25 08:46:36 +02:00
Totoo	8a16ec829c	fix clock source change on praline (#3233 ) * fix clock source change on praline * whoops	2026-06-22 16:50:16 +02:00
Totoo	f6d6e3be4c	Fix battery display bug, and the flash time (#3232 ) * battfix * por again, but nicer	2026-06-22 16:20:49 +02:00
Pezsma	c16bac24c7	Add RSSI input configuration for VGA output measurement (#3231 )	2026-06-21 11:17:09 +02:00
Payalo64	4e6a2cc934	Add 3.3GHz Analog FPV Channels to FPV_ANALOG.TXT (#3230 )	2026-06-20 18:28:02 +02:00
Pezsma	cafe62564e	Gpio modify (#3229 ) * Refactor GPIO configuration for PRALINE and non-PRALINE setups - Updated PinMap structure to include gpio_mode for better flexibility. - Added new GPIO mappings for SGPIO pins with appropriate configurations. - Commented out unused GPIO definitions in hackrf_gpio.hpp to improve code clarity. - Adjusted GPIO initialization for control pins to utilize the new PinMap structure. - Ensured compatibility for both PRALINE and non-PRALINE configurations by using preprocessor directives. * Refactor GPIO handling and remove LED abstraction - Updated GPIO class to support logical polarity, enabling/disabling features based on their configured state. - Replaced direct GPIO manipulation in power control functions with new GPIO methods for better readability and maintainability. - Removed the LED class and its associated functionality, as it was deemed unnecessary for the current implementation. - Adjusted GPIO initialization for various components, ensuring correct polarity settings for VAA and power enable pins. - Cleaned up unused includes and commented-out code in hackrf_gpio.hpp. * Refactor GPIO LED control methods to use setActive() and setInactive() for improved clarity * Refactor GPIO control methods to use setActive() and setInactive() for improved clarity and consistency * copilot * Update GPIO control logic and pin definitions for clarity and consistency * Refactor GPIO methods for improved naming consistency and clarity	2026-06-19 07:48:55 +02:00
gullradriel	960e5b8329	Upgrade subm plus warning fix (#3227 ) * fix compilation warning * update submodule	2026-06-17 11:34:00 +02:00
Totoo	f5a5e8e5e8	Map improv. (#3226 )	2026-06-16 17:54:32 +02:00
Synray	d8a1e2530a	Add Security+ 2.0 TX App (#3217 ) * Add U64 BoundSetting * Add secplus-tx * Add secplus license * Update icon * UI update * Add filesystem::path BoundSetting * Add file UI * Rename file * Add save button * Fix warnings, add integer conversions to UI macros * UI update * Copilot suggestions, name edit UI * Fix buffer length * Style update * Avoid recursion in Widget::style() * Apply suggestions from code review * Move secplustx.cpp to external * Shorten title * Space optimizations, remove FilePath setting * Remove assertions * Change namespace * Change title to match	2026-06-15 19:28:47 +02:00
Totoo	b84a424875	MBT update	2026-06-13 09:50:25 +08:00
gullradriel	62d0e598d4	Update submodule (#3222 ) * update submodule to latest GSG modifications * build: fix delay function * update submodule to include praline fix * fix dep to rebuild/reinclude hackrf_usb_ram.bin	2026-06-12 22:15:44 +02:00
Synray	a93f2ff583	Remove sine table lookup from proc_ook (#3201 )	2026-06-12 16:26:13 +02:00
Totoo	e2586ceb22	proper fix for flasher (#3223 )	2026-06-12 16:25:43 +02:00
未来方舟	5a2b0cdc2a	build tool and agent.md (#2993 ) * init * note * detect arch Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix typo Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update mbt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * protect rm -rf * remove wrong ai code * Update mbt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * add agent file * remove empty file * agent.md rewrite * agent.md rewrite * fix on ubuntu * err check * add make * add python3-yaml * add binutils * fix the build order to avoid some compile bugs * mg * remove trash --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: gullradriel <3157857+gullradriel@users.noreply.github.com> Co-authored-by: HTotoo <ttotoo@gmail.com>	2026-06-12 16:52:13 +08:00
Totoo	f852900cd0	Epirbrx sizefix (#3221 )	2026-06-11 17:18:05 +02:00
Pezsma	9ab367f2e0	Add praline gpio (#3218 ) * Implement antenna bias control for Praline and update GPIO configurations * Add GPIO power management functions and update board initialization for Praline * Refactor power management functions for Praline and update GPIO configurations * Update GPIO configurations for Praline and enable power control pins. AA_EN enabled * Refactor GPIO configuration for Praline: update array size definitions and clean up comments * Add P1 and P2 control functions for PRALINE * Introduced P1_Function and P2_Function enums in ClockManager to manage multiplexer control. * mplemented set_p1_control and set_p2_control methods for configuring P1 and P2 control pins based on specified functions. * Updated clock_manager.hpp and clock_manager.cpp to include new functionality. * Modified MAX2837 and MAX2839 initialization to conditionally configure GPIO based on PRALINE. * Adjusted RFFC507x and RFFC507x_SPI initialization to include GPIO setup for PRALINE. - Refactored RF path initialization to remove unnecessary GPIO setup. - Updated board configuration for PRALINE to reflect new GPIO settings and pin configurations. - Cleaned up FPGA bridge code by removing unused pin configuration functions. - Adjusted SCU array size in pal_lld.h for PRALINE. - Enhanced hackrf_gpio.hpp to define multiplexer control pins for PRALINE. - Modified LED setup to accommodate active-low configuration for PRALINE. * Refactor GPIO and power control functions - Removed unused power control function declarations from board.h. - Enhanced gpio.hpp with new pin setup functions and GPIO control structures for PRALINE. - Consolidated multiplexer control pin definitions into gpio_control namespace. - Moved power control function implementations to gpio.cpp, including detailed VAA power management logic. - Updated power control functions to handle both PRALINE and HackRF R9 configurations. - Cleaned up hackrf_gpio.hpp by removing redundant multiplexer control definitions. * Refactor GPIO control for PRALINE: update MAX2831 and RFFC507x configurations, add new GPIO mappings * Refactor GPIO configurations for PRALINE: update anti-aliasing filter pin mapping, enhance LED setup logic, and add placeholder GPIO entries. * Refactor GPIO configurations for PRALINE: update LED mappings and remove unused anti-aliasing filter GPIO entry.	2026-06-11 13:24:42 +02:00
Arne Luehrs	c7a0846645	EPIRB RX: add receiver-overload indicator on channel bar (#3212 ) * EPIRB RX: add receiver-overload indicator on channel bar Tint the channel-power bar red when the front-end overloads (ADC near full scale). EPIRB demodulation relies on the constant-envelope carrier and the +/-1.1 rad biphase phase jumps; ADC clipping distorts both, so a visible cue to reduce RF-amp/LNA/VGA gain is useful. Implemented in the shared ui::Channel widget via an opt-in set_overload_threshold(): when the last ChannelStatistics max_db reaches the threshold the bar is drawn red instead of blue. Default threshold is above the 0 dBFS ceiling, so all existing users are unaffected. The EPIRB view enables it at -3 dBFS. Done in the widget (main firmware) rather than the EPIRB app because the epirb_rx external app is already at the 32 KB flash limit; the app only pays for a single setter call.	2026-06-11 11:10:23 +02:00
Arne Luehrs	569bcaad22	Epirb afc wide capture (#3213 ) * EPIRB RX: widen AFC capture range to +/-5 kHz The AFC estimate was only applied after carrier lock, so carrier acquisition ran on raw phase deltas and could only tolerate offsets of a few hundred Hz before the 0.6/0.7/1.6 rad detection thresholds (on the 12-sample accumulator) broke down. Track the carrier offset continuously in the IDLE state with a first-order loop (AFC_TRACK_ALPHA), so the de-biased accumulator self-centers for any offset within the discriminator Nyquist (~24 kHz) before the thresholds run. ALPHA = 0.005 pulls a +/-5 kHz offset under the 0.6 rad lock threshold in ~11 ms, well inside the 160 ms preamble / 80 ms stability window. The IDLE rise-detect threshold is also made symmetric (fabsf) now that the bias is removed. Also add the missing <cstdint> include to test_convert.cpp so the application_test suite compiles under the current toolchain. Verified: baseband_epirb_rx.elf builds (flash 53%, RAM 12%) and baseband_test passes.	2026-06-11 11:01:54 +02:00
Totoo	6b5955e0b5	Enhance battery detection and configuration handling (#3197 ) * indicate batt changed event * added sleep config, and use it. * reinit if new batt detected. * more detect * repl batt setting * disabled some things * copilot fixes	2026-06-11 10:52:20 +02:00
Synray	9042d1c433	Use UI_ macros in looking glass (#3208 )	2026-06-09 20:46:35 +02:00
未来方舟	378b2808ba	Looking Glass frequency list now supports muiti file loads (#3215 )	2026-06-08 15:22:29 +02:00
Erwin Ried	5b363b79aa	Update links and images in README.md	2026-05-31 22:56:20 +02:00
Brumi-2021	0d51787099	Clean_gcc_14_2_1_compiler_errors (#3206 ) * Clean_gcc_14_2_1_compiler_errors * format issues	2026-05-31 17:34:30 +02:00
gullradriel	8f5b25b10d	PRALINE Tx and clock fix (Pr 3192 takeover (#3198 ) ) * fix clock init and add mayhem tx capacity * aligned external clock and RX config * fix(clock): cap TX interpolation to x16 to prevent doubled waveform speed The TX gateware only implements interpolation factors x1..x16 (tx_intrp 0..4), but the rate search could select n==5 (x32) for very low TX sample rates. That left the AFE/CLK0/CLK1 running at the x32 rate while the FPGA only interpolated by x16, clocking the TX datapath at twice the gateware output rate. Cap afe_rate and _resampling_n to the x16 limit in TX so the clocks stay aligned with the interpolation setting. * fix(praline): source PLL1 from 40MHz GP_CLKIN instead of 12MHz XTAL For the intermediate 90-110MHz PLL1 stepping stage, source PLL1 from GP_CLKIN (Si5351 CLK2/MCU_CLK at 40MHz) giving N=2, M=10, Fclk=100MHz, rather than the on-chip 12MHz XTAL bootstrap path. This matches the non-PRALINE path. Remove the dead commented-out XTAL enable/PLL code. * docs(fpga_bridge): correct register 0x03 description for PRALINE gateware Register 0x03 is RX_DIGITAL_GAIN in RX and TX_NCO_CTRL in TX, not RX_PSTEP. * Fix fpga_tx_set_nco_enable to use FPGA_REG3_TX_NCO_CTRL (0x03)	2026-05-31 12:44:40 +02:00
Synray	4e56d0f420	Add RSSI toggle button to looking glass (#3204 )	2026-05-31 11:24:24 +02:00
gullradriel	2bb3b415d1	update submodule (#3199 )	2026-05-30 20:31:01 +02:00
Pezsma	6e0394fb6b	Filename scroll (#3193 )	2026-05-30 08:24:20 +02:00
Totoo	da21ea7866	Fix flashing (#3188 ) Fixed some bugs	2026-05-30 01:49:49 +02:00
未来方舟	2c434946cd	Display if IQ inverted in DFU overlay menu while the algo decides to (#3196 ) * init * expose more info * copilot suggest	2026-05-29 12:06:17 +02:00
gullradriel	f3aee44e3b	update submodule (#3187 ) * update submodule * fix iwyu CI errors * fix sd over usb with hackrf submodule si5351c refactored functions	2026-05-21 17:48:53 +02:00
未来方舟	165c190d92	Use html comments to make som text only visible by PR creator (#3186 ) * Use html comments to make som text only visible by PR creator * reformat a bit	2026-05-21 15:51:56 +02:00
Totoo	8f9246c1ea	Enhance transmitter model and UI for better handling of TX and RF ampstates (#3185 )	2026-05-21 15:50:47 +02:00
Pezsma	f1d52ae78f	expanding channels (#3183 )	2026-05-21 15:50:10 +02:00
qwer123	865bdee9b3	add external clock detect method (#3180 )	2026-05-20 22:40:39 +02:00
Totoo	314e910cbc	make battleship smaller (#3181 )	2026-05-20 18:39:21 +02:00
Pezsma	ec6c7eff86	Hard reset app (#3182 )	2026-05-20 18:38:13 +02:00
Pezsma	95b2e9fbc3	Charge sleep bug (#3177 )	2026-05-15 09:24:30 +00:00
未来方舟	52ff442fcc	Tune pull_request_template a bit (#3176 )	2026-05-14 00:48:27 +08:00
gullradriel	95d246a020	Update hackrf submodule (#3174 ) * updated submodule * usb_serial: populate usb_device before usb_run. Upstream now leaves the global usb_device zero-initialized and expects hackrf_usb.c to memcpy a per-board const into it. We don't link hackrf_usb.c, so do the memcpy here. Also flip control_in to enable_zlp=true to match the new endpoint API. * baseband: derive IS_* board defines from BOARD. Upstream moved platform IS_* macros from platform_detect.h to cmake. Set them per BOARD here since we don't include platform-detect.cmake. Drop the duplicate clkin.c entry. * sd_over_usb: drop duplicate driver objects, fix setup callback. Upstream now defines i2c0/i2c1, spi_bus_ssp0/1, sgpio_config and rf_path in the common driver files, so stop redefining them here and patch the runtime fields in pin_setup() instead. Update si5351c_reset_pll() call to the two-arg form. Replace the no-op transceiver_usb_setup_complete stub with one that delegates to usb_setup_complete. * sd_over_usb: populate usb_device before usb_run. Same fix as the application side: memcpy a const template into usb_device before usb_device_init/usb_run, otherwise the descriptor pointer is NULL. Also pass enable_zlp=true on control_in to match the new endpoint API. * fix unicode in comment * remove lz4 bufs reservation in M0	2026-05-13 14:53:54 +02:00
Frederic BORRY	c34a6940ca	EPIRB RX app rework + EPIRB TX app fixes (#3172 ) * First step to EPIRB rx app fix * Added spike filtering on carrier detection for more robustness. * Created dedicated packet builder * First step to fixing UI. * First step to epirb-rx ui rework. * Made static methods static members * Code optim * Code cleanup + first step to new UI * Fixed display * Added BeaconList widget + BeaconDB * Epirb TX app memory optim * Fixed OOM when opening Map Display or Locator editor on EPIRB TX app * First step to tabs + code cleanup to free some space... * Added spectrum analyzer + fixed display * Fixed display refresh issue after leaving spectrum. * More code optim + first step to detail view. * Fixed float coord display. * Fixed protocol names * Fixed location display * Externalized country base to sd card + more code optim * Fixed country display * Fixed path * Added protocol description and resource manager * Added main/aux loc device * Removed specan to save space * First step to adding QR code * Used a custom TextArea component instead of Console * Fixed QR code display for map URL * Added beacon selection management + fixes * First step to map/data qr. * QR tab : added data + detail/map toggle * Removed sqhelch to save space * Removed audio to save space * Removed freq label to save space * Removed packet timestamp to save space * Moved frequency values to resource file * Fixed detection parameters to suite real beacons (slower phase shift time). * Fixed countdown field size * Fixed frequency list. * Fixed detail view on select. * First step to fix settings. * Fixed squelch for a 0-99 range. * Added bch code correction (single bit error). * More code optim, disable country cache, removed inline from location to reduce code size. * Removed inline, code formatting. * Added bch code correction display. * Fixed focus bug, fixed packet size check. Added BCH1/BCH2 correction test cases in BEACONS.TXT file for EPIRB TX application. * Fixed merge * Added countdown setting. * Added selection display to beacon list * Restored squelch control. Added countdown reset. * Code optim on formatSummary * More code optim * Made ResourceManager methods static * Externalized beacon strings to res file Removed frame parameter from methods Added test beacons for emergency. Removed old res file. * Fixed resource manager * Fixed resources. Added emergency display. * BCH + res fixes * Fixed beacons * Fixed app color. Fixed HexId and Serial calculation. * Fixed frequency list. Comments. * Code cleanup and comments * Added slideshow mode to EPIRB TX application. Code comments / cleanup. * Fixed frame end after wrong code cleanup * More code optim and comments. Removed touch from beacon list. * Added beacon selection with encoder on detail view. * Added beacon paging in header. Fixed timeout display * Fixed build for PRALINE * Fixed formatting * Potential fix for pull request finding * stop on carriage return * empty string if unknown * zeroing data buffer before use * fix typo * add include * fix case if pair == 0 * fix scpectrum_on to spectrum_on * fix typos * replaced 3 inlined offset blocks with apply_offset calls * set_beacon consolidation	2026-05-12 14:00:47 +02:00
Synray	33330e4c34	Use gradient for level view, fix height scaling (#3173 ) * Use gradient for level view, fix height scaling * Add RSSI indicators	2026-05-12 12:48:17 +02:00
Pezsma	66f1835232	Wait tx complete (#3165 ) * Implement radio transmission drain mechanism and update shared memory structure * don't wait for timeout if baseband already in shut down state	2026-05-12 12:45:02 +02:00
Synray	4dfbf666d0	Add more waterfalls (#3170 )	2026-05-10 09:37:08 +02:00
Synray	245a36459f	UI and bug fixes (#3164 ) * Fix BLE RX RSSI and Channel scale * Properly reset gradient index 0 * Use move constructor in MenuView::add_item * Avoid erasing during iteration * Fix gradient rounding. Extend to end of table * Add comment to add_item	2026-05-10 00:08:05 +02:00
janhaverkamp	590f19062b	Add support for larger battery capacities (#3168 )	2026-05-09 20:54:25 +02:00
Totoo	f38ef4ebc8	Added CU8 playback support (#3166 )	2026-05-09 12:23:43 +02:00
gullradriel	900d2f2482	fix missing header (#3167 )	2026-05-09 12:23:10 +02:00
Totoo	5aff5ac277	Fix text color multiline handling (#3161 )	2026-05-08 09:57:06 +02:00
Totoo	cf4d245964	Fixes #3159 (#3160 )	2026-05-07 23:54:30 +08:00
Pezsma	c7f7173958	sleep warning fix (#3162 )	2026-05-07 15:26:34 +02:00