Radiosonde QR code fixes (#2021 )

* Increase size of small QR Code * Fixed QR code lat/lon for iPhone * Show current geopos location on map * Deprecate large QR code
Radiosonde beep tone tweaks (#2020 )
2026-08-24 00:19:02 +00:00 · 2024-03-21 10:56:06 -05:00 · 2024-03-21 10:14:54 +01:00 · 2024-03-19 21:33:53 +01:00 · 2024-03-19 15:30:05 -05:00 · 2024-03-19 18:23:06 +01:00
110 changed files with 2131 additions and 763 deletions
@@ -0,0 +1,48 @@
+name: Bug report
+description: File a bug reports regarding the firmware.
+labels: ['bug']
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thank you for taking the time to fill out an issue, this template is meant for any issues related to the Mayhem firmware.
+      Please try the latest nightly release before submitting this. You can find the latest nightly version here: https://github.com/portapack-mayhem/mayhem-firmware/releases
+- type: textarea
+  id: description
+  attributes:
+    label: Describe the bug.
+    description: "A clear and concise description of what the bug is."
+  validations:
+    required: true
+- type: textarea
+  id: repro
+  attributes: 
+    label: Reproduction
+    description: "How can this bug be reproduced?"
+    placeholder: |
+      1. Switch on...
+      2. Press button '....'
+      3. Wait for the end of the universe
+      4. It burns
+  validations:
+    required: true
+- type: textarea
+  id: expected
+  attributes: 
+    label: Expected behavior
+    description: "A clear and concise description of what you expected to happen"
+    placeholder: |
+      1. Generates file on...
+      2. I get a cheeseburger...
+  validations:
+    required: true
+- type: input
+  id: target
+  attributes:
+    label: Environment/versions
+    description: Specify extra details about versions and environments affected
+- type: textarea
+  id: anything-else
+  attributes:
+    label: Anything else?
+    description: Let us know if you have anything else to share.
@@ -0,0 +1,24 @@
+name: Feature Request
+description: For feature requests regarding the firmware.
+labels: ['feature request']
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thank you for taking the time to fill out an issue, this template is meant for any feature suggestions.
+      Please try the latest nightly release before submitting this, make sure it has not been implemented already. You can find the latest nightly version here: https://github.com/portapack-mayhem/mayhem-firmware/releases
+- type: textarea
+  id: proposal
+  attributes:
+    label: "Description of the feature you're suggesting."
+    description: |
+      Please describe your feature request in as many details as possible.
+        - Describe what it should do.
+        - Note whether it is to extend existing functionality or introduce new functionality.
+  validations:
+    required: true
+- type: textarea
+  id: anything-else
+  attributes:
+    label: Anything else?
+    description: Let us know if you have anything else to share.
@@ -1,35 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve the software
-title: ''
-labels: bug
-assignees: ''
-
---
-
----
-
-(Please try the latest nightly release before submitting this. You can find the latest nightly version here: https://github.com/portapack-mayhem/mayhem-firmware/releases)
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is. 
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Tap on '....'
-3. 
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Affected versions**
-Please write any difference related with the Expected behavior, on the following versions:
-* Latest Stable release:
-* Latest Nightly release:
-* Previous working release:
-
-**Additional**
-If the bug is difficult to explain, additionally to the text please include images and videos.
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Need more help?
+    url: https://discord.com/invite/tuwVMv3
+    about: For any question that does not fit as an issue, check our discord.
@@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen. Remember that adding stuff is always possible, but time is a limited resource for everyone. Check the wiki for more information how to compile the firmware and try to explore modifying the code yourself.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional**
-If the suggestion is difficult to explain, additionally to the text please include images and videos.
@@ -68,9 +68,15 @@ CMakeFiles/
 .DS_Store
 /firmware/CMakeCache.txt

-# Python env/ venv
+# Python env/ venv and cache
 env/
 venv/
+**/__pycache__/
+*.pyc

 # Other
 *.bak
+
+# generated bitmap arr file
+# TODO: generate bitmap during build, since we use python during build anyway, lemme know if this is a bad idea @zxkmm
+/firmware/tools/bitmap.hpp
@@ -1,5 +1,6 @@
-> [!IMPORTANT]  
-> this repository **has just been moved** from my personal GitHub [eried/portapack-mayhem](https://github.com/eried/portapack-mayhem) to an organization: [portapack-mayhem](https://github.com/portapack-mayhem/mayhem-firmware). Please keep this in mind to **update your links** accordingly.
+> [!WARNING]
+> __IF YOU'VE PAID FOR MAYHEM OR ANY PREPACKAGED PACKAGES, YOU'RE BEING SCAMMED.__ 
+> The only legitimate link leading to our repositories is the organization [portapack-mayhem](https://github.com/portapack-mayhem/mayhem-firmware).

 # PortaPack Mayhem

@@ -13,11 +14,11 @@ This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmw

 # What is this?

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

-[![Beginner's Guide To The HackRF & Portapak With Mayhem](https://img.youtube.com/vi/H-bqdWfbhpg/0.jpg)](https://www.youtube.com/watch?v=H-bqdWfbhpg)
+[<img alt="HackRF 101 : Everything You Need to Know to Get Started!" src="https://img.youtube.com/vi/xGR_PMD9LeU/maxresdefault.jpg" width="512">](https://grabify.link/C0J6ZR)

-For people familiar with the [Flipper Zero](https://github.com/flipperdevices/flipperzero-firmware), this one might be interesting:<br>[What is the HackRF One Portapack H2+?](https://www.youtube.com/watch?v=alrFbY5vxt4)
+[<img alt="Beginner's Guide To The HackRF & Portapak With Mayhem" src="https://img.youtube.com/vi/H-bqdWfbhpg/maxresdefault.jpg" width="254">](https://grabify.link/5MU2VH) [<img alt="What is the HackRF One Portapack H2+?" src="https://img.youtube.com/vi/alrFbY5vxt4/maxresdefault.jpg" width="254">](https://grabify.link/9UZGEW)

 # Frequently Asked Questions

@@ -30,6 +30,7 @@
 #include "string_format.hpp"
 #include "ui_freqman.hpp"
 #include "utility.hpp"
+#include "radio.hpp"

 using namespace portapack;
 using namespace tonekey;
@@ -112,10 +113,14 @@ SPECOptionsView::SPECOptionsView(
    : View{parent_rect} {
    set_style(style);

-    add_children({&label_config,
-                  &options_config,
-                  &text_speed,
-                  &field_speed});
+    add_children({
+        &label_config,
+        &options_config,
+        &text_speed,
+        &field_speed,
+        &text_rx_cal,
+        &field_rx_iq_phase_cal,
+    });

    options_config.set_selected_index(view->get_spec_bw_index());
    options_config.on_change = [this, view](size_t n, OptionsField::value_t bw) {
@@ -126,6 +131,14 @@ SPECOptionsView::SPECOptionsView(
    field_speed.on_change = [this, view](int32_t v) {
        view->set_spec_trigger(v);
    };
+
+    field_rx_iq_phase_cal.set_range(0, hackrf_r9 ? 63 : 31);                       // max2839 has 6 bits [0..63],  max2837 has 5 bits [0..31]
+    field_rx_iq_phase_cal.set_value(view->get_spec_iq_phase_calibration_value());  // using  accessor function of AnalogAudioView to read iq_phase_calibration_value from rx_audio.ini
+    field_rx_iq_phase_cal.on_change = [this, view](int32_t v) {
+        view->set_spec_iq_phase_calibration_value(v);  // using  accessor function of AnalogAudioView to write inside SPEC submenu, register value to max283x and save it to rx_audio.ini
+    };
+
+    view->set_spec_iq_phase_calibration_value(view->get_spec_iq_phase_calibration_value());  // initialize iq_phase_calibration in radio
 }

 /* AnalogAudioView *******************************************************/
@@ -213,6 +226,15 @@ void AnalogAudioView::set_spec_bw(size_t index, uint32_t bw) {
    receiver_model.set_baseband_bandwidth(bw / 2);
 }

+uint8_t AnalogAudioView::get_spec_iq_phase_calibration_value() {  // define accessor functions inside AnalogAudioView to read & write real iq_phase_calibration_value
+    return iq_phase_calibration_value;
+}
+
+void AnalogAudioView::set_spec_iq_phase_calibration_value(uint8_t cal_value) {  // define accessor functions
+    iq_phase_calibration_value = cal_value;
+    radio::set_rx_max283x_iq_phase_calibration(iq_phase_calibration_value);
+}
+
 uint16_t AnalogAudioView::get_spec_trigger() {
    return spec_trigger;
 }
@@ -133,6 +133,16 @@ class SPECOptionsView : public View {
        1,
        ' ',
    };
+    Text text_rx_cal{
+        {19 * 8, 0 * 16, 11 * 8, 1 * 16},  // 18 (x col.) x char_size,  12 (length) x 8 blanking space to delete previous chars.
+        "Rx_IQ_CAL  "};
+    NumberField field_rx_iq_phase_cal{
+        {28 * 8, 0 * 16},
+        2,
+        {0, 63},  // 5 or 6 bits IQ CAL phase adjustment (range updated later)
+        1,
+        ' ',
+    };
 };

 class AnalogAudioView : public View {
@@ -152,14 +162,22 @@ class AnalogAudioView : public View {
    uint16_t get_spec_trigger();
    void set_spec_trigger(uint16_t trigger);

+    uint8_t get_spec_iq_phase_calibration_value();
+    void set_spec_iq_phase_calibration_value(uint8_t cal_value);
+
   private:
    static constexpr ui::Dim header_height = 3 * 16;

    NavigationView& nav_;
    RxRadioState radio_state_{};
+    uint8_t iq_phase_calibration_value{15};  // initial default RX IQ phase calibration value , used for both max2837 & max2839
    app_settings::SettingsManager settings_{
-        "rx_audio", app_settings::Mode::RX,
-        app_settings::Options::UseGlobalTargetFrequency};
+        "rx_audio",
+        app_settings::Mode::RX,
+        app_settings::Options::UseGlobalTargetFrequency,
+        {
+            {"iq_phase_calibration"sv, &iq_phase_calibration_value},  // we are saving and restoring that CAL from Settings.
+        }};

    const Rect options_view_rect{0 * 8, 1 * 16, 30 * 8, 1 * 16};
    const Rect nbfm_view_rect{0 * 8, 1 * 16, 18 * 8, 1 * 16};
@@ -13,7 +13,7 @@ AboutView::AboutView(NavigationView& nav) {
 }

 void AboutView::update() {
-    if (++timer > 200) {
+    if (++timer > 400) {
        timer = 0;

        switch (++frame) {
@@ -23,7 +23,7 @@ void AboutView::update() {
                console.writeln(STR_COLOR_DARK_YELLOW "Mayhem:");
                console.writeln("eried,euquiq,gregoryfenton");
                console.writeln("johnelder,jwetzell,nnemanjan00");
-                console.writeln("N0vaPixel,klockee,GullCode");
+                console.writeln("N0vaPixel,klockee,gullradriel");
                console.writeln("jamesshao8,ITAxReal,rascafr");
                console.writeln("mcules,dqs105,strijar");
                console.writeln("zhang00963,RedFox-Fr,aldude999");
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2024 Mark Thompson
+ * Copyright (C) 2024 u-foka
 *
 * This file is part of PortaPack.
 *
@@ -445,14 +446,19 @@ void DebugControlsView::focus() {

 /* DebugPeripheralsMenuView **********************************************/

-DebugPeripheralsMenuView::DebugPeripheralsMenuView(NavigationView& nav) {
+DebugPeripheralsMenuView::DebugPeripheralsMenuView(NavigationView& nav)
+    : nav_(nav) {
+    set_max_rows(2);  // allow wider buttons
+}
+
+void DebugPeripheralsMenuView::on_populate() {
    const char* max283x = hackrf_r9 ? "MAX2839" : "MAX2837";
    const char* si5351x = hackrf_r9 ? "Si5351A" : "Si5351C";
    add_items({
-        {"RFFC5072", ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav]() { nav.push<RegistersView>("RFFC5072", RegistersWidgetConfig{CT_RFFC5072, 31, 31, 16}); }},
-        {max283x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav, max283x]() { nav.push<RegistersView>(max283x, RegistersWidgetConfig{CT_MAX283X, 32, 32, 10}); }},
-        {si5351x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav, si5351x]() { nav.push<RegistersView>(si5351x, RegistersWidgetConfig{CT_SI5351, 188, 96, 8}); }},
-        {audio::debug::codec_name(), ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav]() { nav.push<RegistersView>(audio::debug::codec_name(), RegistersWidgetConfig{CT_AUDIO, audio::debug::reg_count(), audio::debug::reg_count(), audio::debug::reg_bits()}); }},
+        {"RFFC5072", ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this]() { nav_.push<RegistersView>("RFFC5072", RegistersWidgetConfig{CT_RFFC5072, 31, 31, 16}); }},
+        {max283x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this, max283x]() { nav_.push<RegistersView>(max283x, RegistersWidgetConfig{CT_MAX283X, 32, 32, 10}); }},
+        {si5351x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this, si5351x]() { nav_.push<RegistersView>(si5351x, RegistersWidgetConfig{CT_SI5351, 188, 96, 8}); }},
+        {audio::debug::codec_name(), ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this]() { nav_.push<RegistersView>(audio::debug::codec_name(), RegistersWidgetConfig{CT_AUDIO, audio::debug::reg_count(), audio::debug::reg_count(), audio::debug::reg_bits()}); }},
    });
    set_max_rows(2);  // allow wider buttons
 }
@@ -468,32 +474,38 @@ DebugReboot::DebugReboot(NavigationView& nav) {
        __WFE();
 }

+void DebugReboot::on_populate() {
+}
+
 /* DebugMenuView *********************************************************/

-DebugMenuView::DebugMenuView(NavigationView& nav) {
+DebugMenuView::DebugMenuView(NavigationView& nav)
+    : nav_(nav) {
+    set_max_rows(2);  // allow wider buttons
+}
+
+void DebugMenuView::on_populate() {
    if (portapack::persistent_memory::show_gui_return_icon()) {
-        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
+        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [this]() { nav_.pop(); }}});
    }
    add_items({
-        {"Buttons Test", ui::Color::dark_cyan(), &bitmap_icon_controls, [&nav]() { nav.push<DebugControlsView>(); }},
-        {"Debug Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { portapack::persistent_memory::debug_dump(); }},
-        {"M0 Stack Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { stack_dump(); }},
-        {"Memory Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugMemoryDumpView>(); }},
-        {"Memory Usage", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugMemoryView>(); }},
-        {"Peripherals", ui::Color::dark_cyan(), &bitmap_icon_peripherals, [&nav]() { nav.push<DebugPeripheralsMenuView>(); }},
-        {"Pers. Memory", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugPmemView>(); }},
-        //{ "Radio State",	ui::Color::white(),	nullptr,	[&nav](){ nav.push<NotImplementedView>(); } },
-        {"Reboot", ui::Color::dark_cyan(), &bitmap_icon_setup, [&nav]() { nav.push<DebugReboot>(); }},
-        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [&nav]() { nav.push<SDCardDebugView>(); }},
-        {"Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [&nav]() { nav.push<TemperatureView>(); }},
-        {"Touch Test", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugScreenTest>(); }},
+        {"Buttons Test", ui::Color::dark_cyan(), &bitmap_icon_controls, [this]() { nav_.push<DebugControlsView>(); }},
+        {"Debug Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { portapack::persistent_memory::debug_dump(); }},
+        {"M0 Stack Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { stack_dump(); }},
+        {"Memory Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<DebugMemoryDumpView>(); }},
+        //{"Memory Usage", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<DebugMemoryView>(); }},
+        {"Peripherals", ui::Color::dark_cyan(), &bitmap_icon_peripherals, [this]() { nav_.push<DebugPeripheralsMenuView>(); }},
+        {"Pers. Memory", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<DebugPmemView>(); }},
+        //{ "Radio State",	ui::Color::white(),	nullptr,	[this](){ nav_.push<NotImplementedView>(); } },
+        {"Reboot", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<DebugReboot>(); }},
+        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [this]() { nav_.push<SDCardDebugView>(); }},
+        {"Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [this]() { nav_.push<TemperatureView>(); }},
+        {"Touch Test", ui::Color::dark_cyan(), &bitmap_icon_notepad, [this]() { nav_.push<DebugScreenTest>(); }},
    });

-    for (auto const& gridItem : ExternalItemsMenuLoader::load_external_items(app_location_t::DEBUG, nav)) {
+    for (auto const& gridItem : ExternalItemsMenuLoader::load_external_items(app_location_t::DEBUG, nav_)) {
        add_item(gridItem);
    };
-
-    set_max_rows(2);  // allow wider buttons
 }

 /* DebugMemoryDumpView *********************************************************/
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2024 Mark Thompson
+ * Copyright (C) 2024 u-foka
 *
 * This file is part of PortaPack.
 *
@@ -422,17 +423,28 @@ class DebugPeripheralsMenuView : public BtnGridView {
   public:
    DebugPeripheralsMenuView(NavigationView& nav);
    std::string title() const override { return "Peripherals"; };
+
+   private:
+    NavigationView& nav_;
+    void on_populate() override;
 };

 class DebugReboot : public BtnGridView {
   public:
    DebugReboot(NavigationView& nav);
+
+   private:
+    void on_populate() override;
 };

 class DebugMenuView : public BtnGridView {
   public:
    DebugMenuView(NavigationView& nav);
    std::string title() const override { return "Debug"; };
+
+   private:
+    NavigationView& nav_;
+    void on_populate() override;
 };

 } /* namespace ui */
@@ -38,23 +38,29 @@ DfuMenu::DfuMenu(NavigationView& nav)
                  &text_info_line_5,
                  &text_info_line_6,
                  &text_info_line_7,
-                  &text_info_line_8});
+                  &text_info_line_8,
+                  &text_info_line_9,
+                  &text_info_line_10});
 }

 void DfuMenu::paint(Painter& painter) {
    auto utilisation = get_cpu_utilisation_in_percent();
+    size_t m0_fragmented_free_space = 0;
+    const auto m0_fragments = chHeapStatus(NULL, &m0_fragmented_free_space);

    text_info_line_1.set(to_string_dec_uint(chCoreStatus(), 6));
-    text_info_line_2.set(to_string_dec_uint((uint32_t)get_free_stack_space(), 6));
-    text_info_line_3.set(to_string_dec_uint(utilisation, 6));
-    text_info_line_4.set(to_string_dec_uint(shared_memory.m4_heap_usage, 6));
-    text_info_line_5.set(to_string_dec_uint(shared_memory.m4_stack_usage, 6));
-    text_info_line_6.set(to_string_dec_uint(shared_memory.m4_performance_counter, 6));
-    text_info_line_7.set(to_string_dec_uint(shared_memory.m4_buffer_missed, 6));
-    text_info_line_8.set(to_string_dec_uint(chTimeNow() / 1000, 6));
+    text_info_line_2.set(to_string_dec_uint(m0_fragmented_free_space, 6));
+    text_info_line_3.set(to_string_dec_uint(m0_fragments, 6));
+    text_info_line_4.set(to_string_dec_uint((uint32_t)get_free_stack_space(), 6));
+    text_info_line_5.set(to_string_dec_uint(utilisation, 6));
+    text_info_line_6.set(to_string_dec_uint(shared_memory.m4_heap_usage, 6));
+    text_info_line_7.set(to_string_dec_uint(shared_memory.m4_stack_usage, 6));
+    text_info_line_8.set(to_string_dec_uint(shared_memory.m4_performance_counter, 6));
+    text_info_line_9.set(to_string_dec_uint(shared_memory.m4_buffer_missed, 6));
+    text_info_line_10.set(to_string_dec_uint(chTimeNow() / 1000, 6));

    constexpr auto margin = 5;
-    constexpr auto lines = 8 + 2;
+    constexpr auto lines = 10 + 2;

    painter.fill_rectangle(
        {{6 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
@@ -49,14 +49,16 @@ class DfuMenu : public View {
    Text text_head{{6 * CHARACTER_WIDTH, 3 * LINE_HEIGHT, 11 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, "Performance"};

    Labels labels{
-        {{6 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "M0 heap:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "M0 stack:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "M0 cpu %:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 8 * LINE_HEIGHT}, "M4 heap:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 9 * LINE_HEIGHT}, "M4 stack:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 10 * LINE_HEIGHT}, "M4 cpu %:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 11 * LINE_HEIGHT}, "M4 miss:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "uptime:", Color::dark_cyan()}};
+        {{6 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "M0 core:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "M0 heap:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "M0 frags:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 8 * LINE_HEIGHT}, "M0 stack:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 9 * LINE_HEIGHT}, "M0 cpu %:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 10 * LINE_HEIGHT}, "M4 heap:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 11 * LINE_HEIGHT}, "M4 stack:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "M4 cpu %:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 13 * LINE_HEIGHT}, "M4 miss:", Color::dark_cyan()},
+        {{6 * CHARACTER_WIDTH, 14 * LINE_HEIGHT}, "uptime:", Color::dark_cyan()}};

    Text text_info_line_1{{15 * CHARACTER_WIDTH, 5 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_2{{15 * CHARACTER_WIDTH, 6 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
@@ -66,6 +68,8 @@ class DfuMenu : public View {
    Text text_info_line_6{{15 * CHARACTER_WIDTH, 10 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_7{{15 * CHARACTER_WIDTH, 11 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_8{{15 * CHARACTER_WIDTH, 12 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_9{{15 * CHARACTER_WIDTH, 13 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_10{{15 * CHARACTER_WIDTH, 14 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
 };

 class DfuMenu2 : public View {
@@ -402,6 +402,7 @@ void FileSaveView::refresh_widgets() {
 void FileManagerView::refresh_widgets(const bool v) {
    button_rename.hidden(v);
    button_delete.hidden(v);
+    button_clean.hidden(v);
    button_cut.hidden(v);
    button_copy.hidden(v);
    button_paste.hidden(v);
@@ -449,7 +450,7 @@ void FileManagerView::on_rename(std::string_view hint) {

 void FileManagerView::on_delete() {
    if (is_directory(get_selected_full_path()) && !is_empty_directory(get_selected_full_path())) {
-        nav_.display_modal("Delete", "Directory not empty!");
+        nav_.display_modal("Delete", " Folder is not empty;\n Use \"Clean\" button to\n empty it first.");
        return;
    }

@@ -474,6 +475,31 @@ void FileManagerView::on_delete() {
        });
 }

+void FileManagerView::on_clean() {
+    if (is_empty_directory(get_selected_full_path())) {
+        nav_.display_modal("Clean", "Folder is Empty;\nUse \"Delete\" button instead\nof \"Clean\" button to delete\nit.");
+        return;
+    }
+
+    auto path_name = is_directory(get_selected_full_path()) ? get_selected_full_path() : get_selected_full_path().parent_path();
+
+    // selected either a single file (delete files in this directory) or a directory that is not empty (del sub files)
+    nav_.push<ModalMessageView>(
+        "Clean", " ALL FILES in this folder\n (excluding sub-folders)\n will be DELETED!\n\n Delete all files?", YESNO,
+        [this, path_name](bool choice) {
+            if (choice) {
+                std::vector<std::filesystem::path> file_list;
+                file_list = scan_root_files(path_name, u"*");
+
+                for (const auto& file_name : file_list) {
+                    std::filesystem::path current_full_path = path_name / file_name;
+                    delete_file(current_full_path);
+                }
+                reload_current();
+            }
+        });
+}
+
 void FileManagerView::on_new_dir() {
    name_buffer = "";
    text_prompt(nav_, name_buffer, max_filename_length, [this](std::string& dir_name) {
@@ -560,6 +586,7 @@ FileManagerView::FileManagerView(
        &text_date,
        &button_rename,
        &button_delete,
+        &button_clean,
        &button_cut,
        &button_copy,
        &button_paste,
@@ -606,6 +633,11 @@ FileManagerView::FileManagerView(
            on_delete();
    };

+    button_clean.on_select = [this]() {
+        if (selected_is_valid())
+            on_clean();
+    };
+
    button_cut.on_select = [this]() {
        if (selected_is_valid() && !get_selected_entry().is_directory) {
            clipboard_path = get_selected_full_path();
@@ -662,7 +694,7 @@ FileManagerView::FileManagerView(

    button_show_hidden_files.on_select = [this]() {
        show_hidden_files = !show_hidden_files;
-        button_show_hidden_files.set_color(show_hidden_files ? Color::green() : Color::dark_grey());
+        button_show_hidden_files.set_color(show_hidden_files ? Color::dark_green() : Color::dark_grey());
        reload_current();
    };
 }
@@ -207,6 +207,7 @@ class FileManagerView : public FileManBaseView {
    void refresh_widgets(const bool v);
    void on_rename(std::string_view hint);
    void on_delete();
+    void on_clean();
    void on_paste();
    void on_new_dir();
    void on_new_file();
@@ -227,11 +228,17 @@ class FileManagerView : public FileManBaseView {
        Color::dark_blue()};

    NewButton button_delete{
-        {4 * 8, 29 * 8, 4 * 8, 32},
+        {9 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_trash,
        Color::red()};

+    NewButton button_clean{
+        {13 * 8, 34 * 8, 4 * 8, 32},
+        {},
+        &bitmap_icon_clean,
+        Color::red()};
+
    NewButton button_cut{
        {9 * 8, 29 * 8, 4 * 8, 32},
        {},
@@ -254,35 +261,37 @@ class FileManagerView : public FileManBaseView {
        {22 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_new_dir,
-        Color::green()};
+        Color::dark_green()};

    NewButton button_new_file{
        {26 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_new_file,
-        Color::green()};
+        Color::dark_green()};

    NewButton button_open_notepad{
        {0 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_notepad,
-        Color::orange()};
+        Color::dark_orange()};

    NewButton button_rename_timestamp{
-        {4 * 8, 34 * 8, 4 * 8, 32},
+
+        {4 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_options_datetime,
-        Color::orange(),
+        Color::dark_blue(),
        /*vcenter*/ true};

    NewButton button_open_iq_trim{
-        {9 * 8, 34 * 8, 4 * 8, 32},
+
+        {4 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_trim,
-        Color::orange()};
+        Color::dark_orange()};

    NewButton button_show_hidden_files{
-        {13 * 8, 34 * 8, 4 * 8, 32},
+        {17 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_hide,
        Color::dark_grey()};
@@ -26,29 +26,51 @@

 namespace ui {

-static const char16_t* firmware_folder = u"/FIRMWARE";
+static const std::filesystem::path firmware_path = u"/FIRMWARE";
+
+// Firmware image validation
+static const char* hackrf_magic = "HACKRFFW";
+#define FIRMWARE_INFO_AREA_OFFSET 0x400
+#define FIRST_CHECKSUM_NIGHTLY 240125

 Thread* FlashUtilityView::thread{nullptr};
 static constexpr size_t max_filename_length = 26;

 bool valid_firmware_file(std::filesystem::path::string_type path) {
    File firmware_file;
+    bool require_checksum{false};
    uint32_t read_buffer[128];
-    uint32_t checksum{(uint32_t)~FLASH_EXPECTED_CHECKSUM};  // initializing to invalid checksum in case file can't be read
+    uint32_t checksum{FLASH_CHECKSUM_ERROR};  // initializing to invalid checksum in case file can't be read
+
+    static_assert((FIRMWARE_INFO_AREA_OFFSET % sizeof(read_buffer)) == 0, "Read buffer size must divide evenly into FIRMWARE_INFO_AREA_OFFSET");

    // test read of the whole file just to validate checksum (baseband flash code will re-read when flashing)
    auto result = firmware_file.open(path.c_str());
    if (!result.is_valid()) {
        checksum = 0;
-        for (uint32_t i = 0; i < FLASH_ROM_SIZE / sizeof(read_buffer); i++) {
+        for (uint32_t offset = 0; offset < FLASH_ROM_SIZE; offset += sizeof(read_buffer)) {
            auto readResult = firmware_file.read(&read_buffer, sizeof(read_buffer));

-            // if file is smaller than 1MB, assume it's a downgrade to an old FW version and ignore the checksum
            if ((!readResult) || (readResult.value() != sizeof(read_buffer))) {
-                checksum = FLASH_EXPECTED_CHECKSUM;
+                // File was smaller than 1MB:
+                // If version is such that the file SHOULD have been 1MB, call it a checksum error (otherwise say it's OK).
+                checksum = (require_checksum) ? FLASH_CHECKSUM_ERROR : FLASH_EXPECTED_CHECKSUM;
                break;
            }

+            // Did we just read the firmware info area?
+            if (offset == FIRMWARE_INFO_AREA_OFFSET) {
+                // If there's no info area (missing HACKRFFW signature), it could be an ancient FW version (so skipping check)
+                if (memcmp(read_buffer, hackrf_magic, 8) == 0) {
+                    char* version_string = (char*)&read_buffer[4];
+
+                    // Require a 1MB firmware image with a valid checksum if release version >=v2.x or nightly >n_240125
+                    if (((version_string[0] == 'v') && (std::atoi(&version_string[1]) >= 2)) ||
+                        ((version_string[0] == 'n') && (version_string[1] == '_') && (std::atoi(&version_string[2]) >= FIRST_CHECKSUM_NIGHTLY)))
+                        require_checksum = true;
+                }
+            }
+
            checksum += simple_checksum((uint32_t)read_buffer, sizeof(read_buffer));
        }
    }
@@ -62,30 +84,29 @@ FlashUtilityView::FlashUtilityView(NavigationView& nav)

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

-    ensure_directory(firmware_folder);
+    ensure_directory(firmware_path);

-    for (const auto& entry : std::filesystem::directory_iterator(firmware_folder, u"*.bin")) {
-        auto filename = entry.path().filename();
-        auto path = entry.path().native();
+    auto add_firmware_items = [&](
+                                  const std::filesystem::path& folder_path,
+                                  const std::filesystem::path& wild,
+                                  ui::Color color) {
+        for (const auto& entry : std::filesystem::directory_iterator(folder_path, wild)) {
+            auto filename = entry.path().filename();
+            auto path = entry.path().native();

-        menu_view.add_item({filename.string().substr(0, max_filename_length),
-                            ui::Color::red(),
-                            &bitmap_icon_temperature,
-                            [this, path](KeyEvent) {
-                                this->firmware_selected(path);
-                            }});
-    }
-    for (const auto& entry : std::filesystem::directory_iterator(firmware_folder, u"*.tar")) {
-        auto filename = entry.path().filename();
-        auto path = entry.path().native();
+            menu_view.add_item({filename.string().substr(0, max_filename_length),
+                                color,
+                                &bitmap_icon_temperature,
+                                [this, path](KeyEvent) {
+                                    this->firmware_selected(path);
+                                }});
+        }
+    };

-        menu_view.add_item({filename.string().substr(0, max_filename_length),
-                            ui::Color::purple(),
-                            &bitmap_icon_temperature,
-                            [this, path](KeyEvent) {
-                                this->firmware_selected(path);
-                            }});
-    }
+    add_firmware_items(firmware_path, u"*.bin", ui::Color::red());
+    add_firmware_items(firmware_path, u"*.tar", ui::Color::purple());
+
+    // add_firmware_items(user_firmware_folder,u"*.bin", ui::Color::purple());
 }

 void FlashUtilityView::firmware_selected(std::filesystem::path::string_type path) {
@@ -157,4 +178,4 @@ void FlashUtilityView::focus() {
    menu_view.focus();
 }

-} /* namespace ui */
+} /* namespace ui */
@@ -35,6 +35,7 @@
 #define FLASH_ROM_SIZE 1048576
 #define FLASH_STARTING_ADDRESS 0x00000000
 #define FLASH_EXPECTED_CHECKSUM 0x00000000
+#define FLASH_CHECKSUM_ERROR 0xFFFFFFFF

 namespace ui {

@@ -228,7 +228,7 @@ void FrequencyManagerView::on_edit_freq() {

 void FrequencyManagerView::on_edit_desc() {
    temp_buffer_ = current_entry().description;
-    text_prompt(nav_, temp_buffer_, desc_edit_max, [this](std::string& new_desc) {
+    text_prompt(nav_, temp_buffer_, freqman_max_desc_size, [this](std::string& new_desc) {
        auto entry = current_entry();
        entry.description = std::move(new_desc);
        db_.replace_entry(current_index(), entry);
@@ -40,8 +40,6 @@ class FreqManBaseView : public View {

    void focus() override;

-    static constexpr size_t desc_edit_max = 0x80;
-
   protected:
    using options_t = OptionsField::options_t;

@@ -63,11 +61,11 @@ class FreqManBaseView : public View {

    /* The top section (category) is 20px tall. */
    Labels label_category{
-        {{0, 2}, "Category:", Color::light_grey()}};
+        {{0, 2}, "F:", Color::light_grey()}};

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

    FreqManUIList freqlist_view{
@@ -27,6 +27,7 @@
 #include "baseband_api.hpp"
 #include "file.hpp"
 #include "oversample.hpp"
+#include "ui_font_fixed_8x16.hpp"

 using namespace portapack;
 using namespace tonekey;
@@ -39,6 +40,8 @@ void LevelView::focus() {
 }

 LevelView::~LevelView() {
+    // reset performance counters request to default
+    shared_memory.request_m4_performance_counter = 0;
    receiver_model.disable();
    baseband::shutdown();
 }
@@ -58,12 +61,16 @@ LevelView::LevelView(NavigationView& nav)
                  &text_ctcss,
                  &freq_stats_rssi,
                  &freq_stats_db,
+                  &freq_stats_rx,
                  &audio_mode,
                  &peak_mode,
                  &rssi,
                  &rssi_graph});

+    // activate vertical bar mode
    rssi.set_vertical_rssi(true);
+    // activate counters for RxSat
+    shared_memory.request_m4_performance_counter = 2;

    change_mode(NFM_MODULATION);              // Start on AM
    field_mode.set_by_value(NFM_MODULATION);  // Reflect the mode into the manual selector
@@ -139,13 +146,15 @@ LevelView::LevelView(NavigationView& nav)
    freqman_set_step_option_short(step_mode);
    freq_stats_rssi.set_style(&Styles::white);
    freq_stats_db.set_style(&Styles::white);
+    freq_stats_rx.set_style(&Styles::white);
 }

 void LevelView::on_statistics_update(const ChannelStatistics& statistics) {
-    static int16_t last_max_db = -1000;
-    static int16_t last_min_rssi = -1000;
-    static int16_t last_avg_rssi = -1000;
-    static int16_t last_max_rssi = -1000;
+    static int16_t last_max_db = 0;
+    static uint8_t last_min_rssi = 0;
+    static uint8_t last_avg_rssi = 0;
+    static uint8_t last_max_rssi = 0;
+    static uint8_t last_rx_sat = 0;

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

@@ -159,8 +168,31 @@ void LevelView::on_statistics_update(const ChannelStatistics& statistics) {
        last_min_rssi = rssi_graph.get_graph_min();
        last_avg_rssi = rssi_graph.get_graph_avg();
        last_max_rssi = rssi_graph.get_graph_max();
-        freq_stats_rssi.set("RSSI: " + to_string_dec_int(last_min_rssi) + "/" + to_string_dec_int(last_avg_rssi) + "/" + to_string_dec_int(last_max_rssi) + ",dt: " + to_string_dec_int(rssi_graph.get_graph_delta()));
+        freq_stats_rssi.set("RSSI: " + to_string_dec_uint(last_min_rssi) + "/" + to_string_dec_uint(last_avg_rssi) + "/" + to_string_dec_uint(last_max_rssi) + ", dt: " + to_string_dec_uint(rssi_graph.get_graph_delta()));
    }
+    // refresh sat
+    uint8_t rx_sat = ((uint32_t)shared_memory.m4_performance_counter) * 100 / 127;
+    if (last_rx_sat != rx_sat) {
+        last_rx_sat = rx_sat;
+        freq_stats_rx.set("RxSat: " + to_string_dec_uint(rx_sat) + "%");
+        uint8_t br = 0;
+        uint8_t bg = 0;
+        uint8_t bb = 0;
+        if (rx_sat <= 80) {
+            bg = (255 * rx_sat) / 80;
+            bb = 255 - bg;
+        } else if (rx_sat > 80) {
+            br = (255 * (rx_sat - 80)) / 20;
+            bg = 255 - br;
+        }
+        Style style_freq_stats_rx{
+            .font = font::fixed_8x16,
+            .background = {br, bg, bb},
+            .foreground = {255, 255, 255},
+        };
+        freq_stats_rx.set_style(&style_freq_stats_rx);
+    }
+
 } /* on_statistic_updates */

 size_t LevelView::change_mode(freqman_index_t new_mod) {
@@ -62,8 +62,6 @@ class LevelView : public View {
    void on_statistics_update(const ChannelStatistics& statistics);
    void set_display_freq(int64_t freq);

-    // TODO: needed?
-    int32_t db{0};
    rf::Frequency freq_ = {0};

    Labels labels{
@@ -118,12 +116,12 @@ class LevelView : public View {

    // RSSI: XX/XX/XXX,dt: XX
    Text freq_stats_rssi{
-        {0 * 8, 3 * 16 + 4, 22 * 8, 14},
+        {0 * 8, 3 * 16 + 4, 22 * 8, 1 * 16},
    };

    // Power: -XXX db
    Text freq_stats_db{
-        {0 * 8, 4 * 16 + 4, 14 * 8, 14},
+        {0 * 8, 4 * 16 + 4, 15 * 8, 1 * 16},
    };

    OptionsField peak_mode{
@@ -138,6 +136,7 @@ class LevelView : public View {
            {"peak:5s", 5000},
            {"peak:10s", 10000},
        }};
+
    OptionsField rssi_resolution{
        {44 + 20 * 8, 4 * 16 + 4},
        4,
@@ -149,14 +148,19 @@ class LevelView : public View {
            {"240x", 240},
        }};

+    // RxSat: XX%
+    Text freq_stats_rx{
+        {0 * 8, 5 * 16 + 4, 10 * 8, 1 * 16},
+    };
+
    RSSIGraph rssi_graph{
        // 240x320  =>
-        {0, 5 * 16 + 4, 240 - 5 * 8, 320 - (5 * 16 + 4)},
+        {0, 6 * 16 + 4, 240 - 5 * 8, 320 - (6 * 16 + 4)},
    };

    RSSI rssi{
        // 240x320  =>
-        {240 - 5 * 8, 5 * 16 + 4, 5 * 8, 320 - (5 * 16 + 4)},
+        {240 - 5 * 8, 6 * 16 + 4, 5 * 8, 320 - (6 * 16 + 4)},
    };

    void handle_coded_squelch(const uint32_t value);
@@ -338,6 +338,7 @@ GlassView::GlassView(
                  &field_trigger,
                  &button_jump,
                  &button_rst,
+                  &field_rx_iq_phase_cal,
                  &freq_stats});

    load_presets();  // Load available presets from TXT files (or default).
@@ -474,6 +475,13 @@ GlassView::GlassView(
        reset_live_view();
    };

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

    // trigger:
@@ -491,6 +499,15 @@ GlassView::GlassView(
    receiver_model.enable();
 }

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

+    uint8_t get_spec_iq_phase_calibration_value();
+    void set_spec_iq_phase_calibration_value(uint8_t cal_value);
+
   private:
    NavigationView& nav_;
    RxRadioState radio_state_{ReceiverModel::Mode::SpectrumAnalysis};
@@ -79,8 +82,9 @@ class GlassView : public View {
    uint8_t filter_index = 0;  // OFF
    uint8_t trigger = 32;
    uint8_t mode = LOOKING_GLASS_FASTSCAN;
-    uint8_t live_frequency_view = 0;       // Spectrum
-    uint8_t live_frequency_integrate = 3;  // Default (3 * old value + new_value) / 4
+    uint8_t live_frequency_view = 0;         // Spectrum
+    uint8_t live_frequency_integrate = 3;    // Default (3 * old value + new_value) / 4
+    uint8_t iq_phase_calibration_value{15};  // initial default RX IQ phase calibration value , used for both max2837 & max2839
    app_settings::SettingsManager settings_{
        "rx_glass"sv,
        app_settings::Mode::RX,
@@ -93,6 +97,7 @@ class GlassView : public View {
            {"scan_mode"sv, &mode},
            {"freq_view"sv, &live_frequency_view},
            {"freq_integrate"sv, &live_frequency_integrate},
+            {"iq_phase_calibration"sv, &iq_phase_calibration_value},  // we are saving and restoring that CAL from Settings.
        }};

    struct preset_entry {
@@ -160,7 +165,7 @@ class GlassView : public View {
        {{0, 0 * 16}, "MIN:     MAX:     LNA   VGA  ", Color::light_grey()},
        {{0, 1 * 16}, "RANGE:       FILTER:     AMP:", Color::light_grey()},
        {{0, 2 * 16}, "PRESET:", Color::light_grey()},
-        {{0, 3 * 16}, "MARKER:          MHz", Color::light_grey()},
+        {{0, 3 * 16}, "MARKER:          MHz RXIQCAL", Color::light_grey()},
        {{0, 4 * 16}, "RES:    STEP:", Color::light_grey()}};

    NumberField field_frequency_min{
@@ -208,6 +213,14 @@ class GlassView : public View {
        {7 * 8, 3 * 16, 9 * 8, 16},
        ""};

+    NumberField field_rx_iq_phase_cal{
+        {28 * 8, 3 * 16},
+        2,
+        {0, 63},  // 5 or 6 bits IQ CAL phase adjustment (range updated later)
+        1,
+        ' ',
+    };
+
    NumberField field_trigger{
        {4 * 8, 4 * 16},
        3,
@@ -130,9 +130,9 @@ void MicTXView::set_tx(bool enable) {
        portapack::pin_i2s0_rx_sda.mode(3);  // This is already done in audio::init but gets changed by the CPLD overlay reprogramming
    } else {
        if (transmitting && rogerbeep_enabled) {
-            baseband::request_beep();  // Transmit the roger beep
-            transmitting = false;      // And flag the end of the transmission so ...
-        } else {                       // (if roger beep was enabled, this will be executed after the beep ends transmitting.
+            baseband::request_roger_beep();  // Transmit the roger beep
+            transmitting = false;            // Flag the end of the transmission (transmitter will be disabled after the beep)
+        } else {
            transmitting = false;
            configure_baseband();
            transmitter_model.disable();
@@ -338,7 +338,7 @@ MicTXView::MicTXView(
                  &field_rxlna,
                  &field_rxvga,
                  &field_rxamp,
-                  hackrf_r9 ? &field_tx_iq_phase_cal_2839 : &field_tx_iq_phase_cal_2837,
+                  &field_tx_iq_phase_cal,
                  &tx_button,
                  &tx_icon});

@@ -372,19 +372,12 @@ MicTXView::MicTXView(
    };

    radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value);
-    if (hackrf_r9) {  // MAX2839 has 6 bits IQ CAL phasse adjustment.
-        field_tx_iq_phase_cal_2839.set_value(iq_phase_calibration_value);
-        field_tx_iq_phase_cal_2839.on_change = [this](int32_t v) {
-            iq_phase_calibration_value = v;
-            radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value);
-        };
-    } else {  // MAX2837 has 5 bits IQ CAL phase adjustment.
-        field_tx_iq_phase_cal_2837.set_value(iq_phase_calibration_value);
-        field_tx_iq_phase_cal_2837.on_change = [this](int32_t v) {
-            iq_phase_calibration_value = v;
-            radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value);
-        };
-    }
+    field_tx_iq_phase_cal.set_range(0, hackrf_r9 ? 63 : 31);  // max2839 has 6 bits [0..63],  max2837 has 5 bits [0..31]
+    field_tx_iq_phase_cal.set_value(iq_phase_calibration_value);
+    field_tx_iq_phase_cal.on_change = [this](int32_t v) {
+        iq_phase_calibration_value = v;
+        radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value);
+    };

    options_gain.on_change = [this](size_t, int32_t v) {
        mic_gain_x10 = v;
@@ -342,18 +342,10 @@ class MicTXView : public View {
        ' ',
    };

-    NumberField field_tx_iq_phase_cal_2837{
+    NumberField field_tx_iq_phase_cal{
        {24 * 8, (33 * 8)},
        2,
-        {0, 31},  // 5 bits IQ CAL phase adjustment.
-        1,
-        ' ',
-    };
-
-    NumberField field_tx_iq_phase_cal_2839{
-        {24 * 8, (33 * 8)},
-        2,
-        {0, 63},  // 6 bits IQ CAL phasse adjustment.
+        {0, 63},  // 5 or 6 bits IQ CAL phase adjustment (range updated later)
        1,
        ' ',
    };
@@ -49,7 +49,13 @@ namespace fs = std::filesystem;
 namespace ui {

 void ReconView::reload_restart_recon() {
+    // force reload of current
+    change_mode(field_mode.selected_index_value());
+    uint8_t previous_index = current_index;
+    reset_indexes();
    frequency_file_load();
+    current_index = previous_index;
+    handle_retune();
    if (frequency_list.size() > 0) {
        if (fwd) {
            button_dir.set_text("FW>");
@@ -104,18 +110,19 @@ void ReconView::set_loop_config(bool v) {

 void ReconView::recon_stop_recording(bool exiting) {
    if (is_recording) {
-        if (field_mode.selected_index_value() == SPEC_MODULATION)
-            button_audio_app.set_text("RAW");
-        else
-            button_audio_app.set_text("AUDIO");
-        button_audio_app.set_style(&Styles::white);
        record_view->stop();
-        button_config.set_style(&Styles::white);
        is_recording = false;
-        // repeater mode
-        if (!exiting && persistent_memory::recon_repeat_recorded()) {
-            start_repeat();
+        if (field_mode.selected_index_value() == SPEC_MODULATION) {
+            button_audio_app.set_text("RAW");
+            // repeater mode
+            if (!exiting && persistent_memory::recon_repeat_recorded()) {
+                start_repeat();
+            }
+        } else {
+            button_audio_app.set_text("AUDIO");
        }
+        button_audio_app.set_style(&Styles::white);
+        button_config.set_style(&Styles::white);
    }
 }

@@ -1148,7 +1155,7 @@ void ReconView::on_stepper_delta(int32_t v) {
 }

 size_t ReconView::change_mode(freqman_index_t new_mod) {
-    if (recon_tx || is_repeat_active())
+    if (recon_tx || is_repeat_active() || is_recording)
        return 0;
    field_mode.on_change = [this](size_t, OptionsField::value_t) {};
    field_bw.on_change = [this](size_t, OptionsField::value_t) {};
@@ -1157,16 +1164,21 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
        remove_child(record_view.get());
        record_view.reset();
    }
-    if (persistent_memory::recon_repeat_recorded()) {
-        record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
-                                                   u"RECON_REPEAT.C16", u"CAPTURES",
-                                                   RecordView::FileType::RawS16, 16384, 3);
-        record_view->set_filename_as_is(true);
-    } else if (new_mod == SPEC_MODULATION) {
+    if (field_mode.selected_index_value() != SPEC_MODULATION) {
        audio::output::stop();
-        record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
-                                                   u"AUTO_RAW", u"CAPTURES",
-                                                   RecordView::FileType::RawS16, 16384, 3);
+    }
+    if (new_mod == SPEC_MODULATION) {
+        if (persistent_memory::recon_repeat_recorded()) {
+            record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
+                                                       u"RECON_REPEAT.C16", u"CAPTURES",
+                                                       RecordView::FileType::RawS16, 16384, 3);
+            record_view->set_filename_as_is(true);
+        } else {
+            record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
+                                                       u"AUTO_RAW", u"CAPTURES",
+                                                       RecordView::FileType::RawS16, 16384, 3);
+            record_view->set_filename_date_frequency(true);
+        }
    } else {
        record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
                                                   u"AUTO_AUDIO", u"AUDIO",
@@ -1314,9 +1326,6 @@ bool ReconView::is_repeat_active() const {

 void ReconView::start_repeat() {
    // Prepare to send a file.
-    std::filesystem::path rawfile = u"/" + repeat_rec_path + u"/" + repeat_rec_file;
-    std::filesystem::path rawmeta = u"/" + repeat_rec_path + u"/" + repeat_rec_meta;
-
    if (recon_tx == false) {
        recon_tx = true;

@@ -1434,6 +1443,12 @@ void ReconView::stop_repeat(const bool do_loop) {
    } else {
        repeat_cur_rep = 0;
        recon_tx = false;
+        if (persistent_memory::recon_repeat_recorded_file_mode() == RECON_REPEAT_AND_KEEP) {
+            // rename file here to keep
+            std::filesystem::path base_path = next_filename_matching_pattern(repeat_rec_path / u"REC_????.*");
+            rename_file(rawfile, base_path.replace_extension(u".C16"));
+            rename_file(rawmeta, base_path.replace_extension(u".TXT"));
+        }
        reload_restart_recon();
        progressbar.hidden(true);
        set_dirty();  // fix progressbar no hiding
@@ -198,6 +198,9 @@ class ReconView : public View {
    bool repeat_ready_signal{false};
    bool recon_tx{false};

+    std::filesystem::path rawfile = u"/" + repeat_rec_path + u"/" + repeat_rec_file;
+    std::filesystem::path rawmeta = u"/" + repeat_rec_path + u"/" + repeat_rec_meta;
+
    // Persisted settings.
    SettingsStore ui_settings{
        "recon"sv,
@@ -103,6 +103,7 @@ void ReconSetupViewMore::save() {
    persistent_memory::set_recon_update_ranges_when_recon(checkbox_update_ranges_when_recon.value());
    persistent_memory::set_recon_auto_record_locked(checkbox_auto_record_locked.value());
    persistent_memory::set_recon_repeat_recorded(checkbox_repeat_recorded.value());
+    persistent_memory::set_recon_repeat_recorded_file_mode(field_repeat_file_mode.selected_index_value());
    persistent_memory::set_recon_repeat_nb(field_repeat_nb.value());
    persistent_memory::set_recon_repeat_amp(checkbox_repeat_amp.value());
    persistent_memory::set_recon_repeat_gain(field_repeat_gain.value());
@@ -125,6 +126,7 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)
                  &checkbox_update_ranges_when_recon,
                  &checkbox_auto_record_locked,
                  &checkbox_repeat_recorded,
+                  &field_repeat_file_mode,
                  &text_repeat_nb,
                  &field_repeat_nb,
                  &checkbox_repeat_amp,
@@ -135,6 +137,7 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)

    // tx options have to be in yellow to inform the users that activating them will make the device transmit
    checkbox_repeat_recorded.set_style(&Styles::yellow);
+    field_repeat_file_mode.set_style(&Styles::yellow);
    text_repeat_nb.set_style(&Styles::yellow);
    field_repeat_nb.set_style(&Styles::yellow);
    checkbox_repeat_amp.set_style(&Styles::yellow);
@@ -150,6 +153,7 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)
    checkbox_update_ranges_when_recon.set_value(persistent_memory::recon_update_ranges_when_recon());
    checkbox_auto_record_locked.set_value(persistent_memory::recon_auto_record_locked());
    checkbox_repeat_recorded.set_value(persistent_memory::recon_repeat_recorded());
+    field_repeat_file_mode.set_selected_index(persistent_memory::recon_repeat_recorded_file_mode());
    checkbox_repeat_amp.set_value(persistent_memory::recon_repeat_amp());
    field_repeat_nb.set_value(persistent_memory::recon_repeat_nb());
    field_repeat_gain.set_value(persistent_memory::recon_repeat_gain());
@@ -38,16 +38,19 @@
 #endif
 #define OneMHz 1000000

-// modes
+// main app mode
 #define RECON_MATCH_CONTINUOUS 0
 #define RECON_MATCH_SPARSE 1

+// repeater mode
+#define RECON_REPEAT_AND_DELETE 0
+#define RECON_REPEAT_AND_KEEP 1
+
 // statistics update interval in ms (change here if the statistics API is changing it's pace)
 #define STATS_UPDATE_INTERVAL 100

 // maximum lock duration
 #define RECON_MAX_LOCK_DURATION 9900
-
 #define RECON_DEF_SQUELCH -14

 // default number of match to have a lock
@@ -150,15 +153,21 @@ class ReconSetupViewMore : public View {

    Checkbox checkbox_repeat_recorded{
        {1 * 8, 162},
-        3,
-        "repeater,"};
+        0,
+        ""};
+
+    OptionsField field_repeat_file_mode{
+        {4 * 8 + 3, 165},
+        13,
+        {{"repeat,delete", RECON_REPEAT_AND_DELETE},
+         {"repeat,keep  ", RECON_REPEAT_AND_KEEP}}};

    Text text_repeat_nb{
-        {14 * 8, 165, 3 * 8, 22},
+        {20 * 8, 165, 3 * 8, 22},
        "nb:"};

    NumberField field_repeat_nb{
-        {17 * 8, 165},
+        {23 * 8, 165},
        2,
        {1, 99},
        1,
@@ -4,6 +4,7 @@
 * Copyright (C) 2023 gullradriel, Nilorea Studio Inc.
 * Copyright (C) 2023 Kyle Reed
 * Copyright (C) 2024 Mark Thompson
+ * Copyright (C) 2024 u-foka
 * Copyleft (ɔ) 2024 zxkmm under GPL license
 *
 * This file is part of PortaPack.
@@ -835,28 +836,32 @@ void SetMenuColorView::focus() {

 /* SettingsMenuView **************************************/

-SettingsMenuView::SettingsMenuView(NavigationView& nav) {
-    if (pmem::show_gui_return_icon()) {
-        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
-    }
-    add_items({
-        {"App Settings", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<AppSettingsView>(); }},
-        {"Audio", ui::Color::dark_cyan(), &bitmap_icon_speaker, [&nav]() { nav.push<SetAudioView>(); }},
-        {"Calibration", ui::Color::dark_cyan(), &bitmap_icon_options_touch, [&nav]() { nav.push<TouchCalibrationView>(); }},
-        {"Config Mode", ui::Color::dark_cyan(), &bitmap_icon_clk_ext, [&nav]() { nav.push<SetConfigModeView>(); }},
-        {"Converter", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetConverterSettingsView>(); }},
-        {"Date/Time", ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [&nav]() { nav.push<SetDateTimeView>(); }},
-        {"Encoder Dial", ui::Color::dark_cyan(), &bitmap_icon_setup, [&nav]() { nav.push<SetEncoderDialView>(); }},
-        {"Freq. Correct", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetFrequencyCorrectionView>(); }},
-        {"P.Memory Mgmt", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<SetPersistentMemoryView>(); }},
-        {"Radio", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetRadioView>(); }},
-        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [&nav]() { nav.push<SetSDCardView>(); }},
-        {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [&nav]() { nav.push<SetUIView>(); }},
-        {"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [&nav]() { nav.push<SetQRCodeView>(); }},
-        {"Brightness", ui::Color::dark_cyan(), &bitmap_icon_brightness, [&nav]() { nav.push<SetFakeBrightnessView>(); }},
-        {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [&nav]() { nav.push<SetMenuColorView>(); }},
-    });
+SettingsMenuView::SettingsMenuView(NavigationView& nav)
+    : nav_(nav) {
    set_max_rows(2);  // allow wider buttons
 }

+void SettingsMenuView::on_populate() {
+    if (pmem::show_gui_return_icon()) {
+        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [this]() { nav_.pop(); }}});
+    }
+    add_items({
+        {"App Settings", ui::Color::dark_cyan(), &bitmap_icon_notepad, [this]() { nav_.push<AppSettingsView>(); }},
+        {"Audio", ui::Color::dark_cyan(), &bitmap_icon_speaker, [this]() { nav_.push<SetAudioView>(); }},
+        {"Calibration", ui::Color::dark_cyan(), &bitmap_icon_options_touch, [this]() { nav_.push<TouchCalibrationView>(); }},
+        {"Config Mode", ui::Color::dark_cyan(), &bitmap_icon_clk_ext, [this]() { nav_.push<SetConfigModeView>(); }},
+        {"Converter", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetConverterSettingsView>(); }},
+        {"Date/Time", ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [this]() { nav_.push<SetDateTimeView>(); }},
+        {"Encoder Dial", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetEncoderDialView>(); }},
+        {"Freq. Correct", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetFrequencyCorrectionView>(); }},
+        {"P.Memory Mgmt", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<SetPersistentMemoryView>(); }},
+        {"Radio", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetRadioView>(); }},
+        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [this]() { nav_.push<SetSDCardView>(); }},
+        {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [this]() { nav_.push<SetUIView>(); }},
+        //{"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [this]() { nav_.push<SetQRCodeView>(); }},
+        {"Brightness", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetFakeBrightnessView>(); }},
+        {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetMenuColorView>(); }},
+    });
+}
+
 } /* namespace ui */
@@ -4,6 +4,7 @@
 * Copyright (C) 2023 gullradriel, Nilorea Studio Inc.
 * Copyright (C) 2023 Kyle Reed
 * Copyright (C) 2024 Mark Thompson
+ * Copyright (C) 2024 u-foka
 * Copyleft (ɔ) 2024 zxkmm under GPL license
 *
 * This file is part of PortaPack.
@@ -792,8 +793,11 @@ class SetMenuColorView : public View {
 class SettingsMenuView : public BtnGridView {
   public:
    SettingsMenuView(NavigationView& nav);
-
    std::string title() const override { return "Settings"; };
+
+   private:
+    NavigationView& nav_;
+    void on_populate() override;
 };

 } /* namespace ui */
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -70,14 +71,19 @@ SondeView::SondeView(NavigationView& nav)

    geopos.set_read_only(true);

+    check_beep.set_value(beep);
    check_beep.on_select = [this](Checkbox&, bool v) {
        beep = v;
+        if (beep)
+            baseband::request_audio_beep(1000, 60);  // 1khz tone for 60ms to acknowledge enablement
    };

+    check_log.set_value(logging);
    check_log.on_select = [this](Checkbox&, bool v) {
        logging = v;
    };

+    check_crc.set_value(use_crc);
    check_crc.on_select = [this](Checkbox&, bool v) {
        use_crc = v;
    };
@@ -86,17 +92,18 @@ SondeView::SondeView(NavigationView& nav)

    // QR code with geo URI
    button_see_qr.on_select = [this, &nav](Button&) {
-        nav.push<QRCodeView>(geo_uri);
+        std::string geo_uri = "geo:" + to_string_decimal(geopos.lat(), 5) + "," + to_string_decimal(geopos.lon(), 5);  // 5 decimal digits for ~1 meter accuracy
+        nav.push<QRCodeView>(geo_uri.data());
    };

    button_see_map.on_select = [this, &nav](Button&) {
        geomap_view_ = nav.push<GeoMapView>(
            sonde_id,
-            gps_info.alt,
+            geopos.altitude(),
            GeoPos::alt_unit::METERS,
            GeoPos::spd_unit::HIDDEN,
-            gps_info.lat,
-            gps_info.lon,
+            geopos.lat(),
+            geopos.lon(),
            999);  // set a dummy heading out of range to draw a cross...probably not ideal?
        nav.set_on_pop([this]() {
            geomap_view_ = nullptr;
@@ -142,51 +149,9 @@ void SondeView::focus() {
    field_frequency.focus();
 }

-// used to convert float to character pointer, since unfortunately function like
-// sprintf and c_str aren't supported.
-char* SondeView::float_to_char(float x, char* p) {
-    char* s = p + 9;                             // go to end of buffer
-    uint16_t decimals;                           // variable to store the decimals
-    int units;                                   // variable to store the units (part to left of decimal place)
-    if (x < 0) {                                 // take care of negative numbers
-        decimals = (int)(x * -100000) % 100000;  // make 1000 for 3 decimals etc.
-        units = (int)(-1 * x);
-    } else {  // positive numbers
-        decimals = (int)(x * 100000) % 100000;
-        units = (int)x;
-    }
-
-    // TODO: more elegant solution (loop?)
-    *--s = (decimals % 10) + '0';
-    decimals /= 10;
-    *--s = (decimals % 10) + '0';
-    decimals /= 10;
-    *--s = (decimals % 10) + '0';
-    decimals /= 10;
-    *--s = (decimals % 10) + '0';
-    decimals /= 10;
-    *--s = (decimals % 10) + '0';
-    *--s = '.';
-
-    while (units > 0) {
-        *--s = (units % 10) + '0';
-        units /= 10;
-    }
-    if (x < 0) *--s = '-';  // unary minus sign for negative numbers
-    return s;
-}
-
 void SondeView::on_packet(const sonde::Packet& packet) {
    if (!use_crc || packet.crc_ok())  // euquiq: Reject bad packet if crc is on
    {
-        char buffer_lat[10] = {};
-        char buffer_lon[10] = {};
-
-        strcpy(geo_uri, "geo:");
-        strcat(geo_uri, float_to_char(gps_info.lat, buffer_lat));
-        strcat(geo_uri, ",");
-        strcat(geo_uri, float_to_char(gps_info.lon, buffer_lon));
-
        text_signature.set(packet.type_string());

        sonde_id = packet.serial_number();  // used also as tag on the geomap
@@ -220,7 +185,7 @@ void SondeView::on_packet(const sonde::Packet& packet) {
        }

        if (beep) {
-            baseband::request_beep();
+            baseband::request_rssi_beep();
        }
    }
 }
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -74,15 +75,19 @@ class SondeView : public View {
        1750000 /* bandwidth */,
        2457600 /* sampling rate */
    };
-    app_settings::SettingsManager settings_{
-        "rx_sonde", app_settings::Mode::RX};
-
-    std::unique_ptr<SondeLogger> logger{};
+    bool beep{false};
    bool logging{false};
    bool use_crc{false};
-    bool beep{false};
+    app_settings::SettingsManager settings_{
+        "rx_sonde",
+        app_settings::Mode::RX,
+        {
+            {"beep"sv, &beep},
+            {"logging"sv, &logging},
+            {"use_crc"sv, &use_crc},
+        }};

-    char geo_uri[32] = {};
+    std::unique_ptr<SondeLogger> logger{};

    sonde::GPS_data gps_info{};
    sonde::temp_humid temp_humid_info{};
@@ -201,7 +206,6 @@ class SondeView : public View {
    void on_gps(const GPSPosDataMessage* msg);
    void on_orientation(const OrientationDataMessage* msg);
    void on_packet(const sonde::Packet& packet);
-    char* float_to_char(float x, char* p);
 };

 } /* namespace ui */
@@ -27,8 +27,6 @@
 #include "log_file.hpp"
 #include "string_format.hpp"

-#include "portapack_persistent_memory.hpp"
-
 using namespace portapack;
 namespace fs = std::filesystem;

@@ -556,8 +554,6 @@ void TextEditorView::open_file(const fs::path& path) {
        viewer.set_file(*file_);
    }

-    portapack::persistent_memory::set_apply_fake_brightness(false);  // work around to resolve the display issue in notepad app. not elegant i know, so TODO.
-
    refresh_ui();
 }

@@ -428,8 +428,25 @@ void replay_stop() {
    send_message(&message);
 }

-void request_beep() {
-    RequestSignalMessage message{RequestSignalMessage::Signal::BeepRequest};
+void request_beep(RequestSignalMessage::Signal beep_type) {
+    RequestSignalMessage message{beep_type};
+    send_message(&message);
+}
+
+void request_roger_beep() {
+    request_beep(RequestSignalMessage::Signal::RogerBeepRequest);
+}
+
+void request_rssi_beep() {
+    request_beep(RequestSignalMessage::Signal::RSSIBeepRequest);
+}
+
+void request_beep_stop() {
+    request_beep(RequestSignalMessage::Signal::BeepStopRequest);
+}
+
+void request_audio_beep(uint32_t freq, uint32_t duration_ms) {
+    AudioBeepMessage message{freq, duration_ms};
    send_message(&message);
 }

@@ -89,7 +89,11 @@ void set_siggen_tone(const uint32_t tone);
 void set_siggen_config(const uint32_t bw, const uint32_t shape, const uint32_t duration);
 void set_spectrum_painter_config(const uint16_t width, const uint16_t height, bool update, int32_t bw);
 void set_subghzd_config(uint8_t modulation, uint32_t sampling_rate);
-void request_beep();
+
+void request_roger_beep();
+void request_rssi_beep();
+void request_beep_stop();
+void request_audio_beep(uint32_t freq, uint32_t duration_ms);

 void run_image(const portapack::spi_flash::image_tag_t image_tag);
 void run_prepared_image(const uint32_t m4_code);
@@ -5764,8 +5764,8 @@ static constexpr uint8_t bitmap_icon_brightness_data[] = {
    0x00,
    0x80,
    0x01,
-    0x80,
-    0x01,
+    0x84,
+    0x21,
    0x08,
    0x10,
    0xC0,
@@ -5786,8 +5786,8 @@ static constexpr uint8_t bitmap_icon_brightness_data[] = {
    0x03,
    0x08,
    0x10,
-    0x80,
-    0x01,
+    0x84,
+    0x21,
    0x80,
    0x01,
    0x00,
@@ -5797,6 +5797,44 @@ static constexpr Bitmap bitmap_icon_brightness{
    {16, 16},
    bitmap_icon_brightness_data};

+static constexpr uint8_t bitmap_icon_clean_data[] = {
+    0x00,
+    0x00,
+    0xC0,
+    0x01,
+    0x20,
+    0x02,
+    0xFC,
+    0x1F,
+    0x00,
+    0x00,
+    0x08,
+    0x08,
+    0xE8,
+    0x08,
+    0xA8,
+    0x09,
+    0xA8,
+    0x0B,
+    0x28,
+    0x0A,
+    0x28,
+    0x0A,
+    0x28,
+    0x0A,
+    0xE8,
+    0x0B,
+    0x08,
+    0x08,
+    0xF0,
+    0x07,
+    0x00,
+    0x00,
+};
+static constexpr Bitmap bitmap_icon_clean{
+    {16, 16},
+    bitmap_icon_clean_data};
+
 } /* namespace ui */

 #endif /*__BITMAP_HPP__*/
@@ -20,7 +20,7 @@
 * Boston, MA 02110-1301, USA.
 */

-// Code from https://github.com/Flipper-XFW/Xtreme-Apps/tree/04c3a60093e2c2378e79498b4505aa8072980a42/ble_spam/protocols
+// Code from https://github.com/Next-Flip/Momentum-Apps/blob/dev/ble_spam/
 // Thanks for the work of the original creators!

 #include "ui_blespam.hpp"
@@ -109,7 +109,8 @@ BLESpamView::BLESpamView(NavigationView& nav)
    console.writeln("Based on work of:");
    console.writeln("@Willy-JL, @ECTO-1A,");
    console.writeln("@Spooks4576, @iNetro");
-    console.writeln("");
+    console.writeln("---");
+    console.writeln("iOS crash + Android\nattacks are patched\non new devices.");
 #endif
    changePacket(true);  // init
 }
@@ -293,6 +294,39 @@ void BLESpamView::createWindowsPacket() {
    std::copy(res.begin(), res.end(), advertisementData);
 }

+void BLESpamView::createNameSpamPacket() {
+    const char* names[] = {"PortaHack", "PwnBt", "iSpam", "GenericFoodVagon", "SignalSnoop", "ByteBandit", "RadioRogue", "RadioRebel", "ByteBlast"};
+
+    const char* name = names[rand() % 9];  //"PortaHack";
+    uint8_t name_len = strlen(name);
+
+    uint8_t size = 12 + name_len;
+    uint8_t i = 0;
+
+    packet[i++] = 2;     // Size
+    packet[i++] = 0x01;  // AD Type (Flags)
+    packet[i++] = 0x06;  // Flags
+
+    packet[i++] = name_len + 1;          // Size
+    packet[i++] = 0x09;                  // AD Type (Complete Local Name)
+    memcpy(&packet[i], name, name_len);  // Device Name
+    i += name_len;
+
+    packet[i++] = 3;     // Size
+    packet[i++] = 0x02;  // AD Type (Incomplete Service UUID List)
+    packet[i++] = 0x12;  // Service UUID (Human Interface Device)
+    packet[i++] = 0x18;  // ...
+
+    packet[i++] = 2;     // Size
+    packet[i++] = 0x0A;  // AD Type (Tx Power Level)
+    packet[i++] = 0x00;  // 0dBm
+
+    // size, packet
+    std::string res = to_string_hex_array(packet, size);
+    memset(advertisementData, 0, sizeof(advertisementData));
+    std::copy(res.begin(), res.end(), advertisementData);
+}
+
 void BLESpamView::createIosPacket(bool crash = false) {
    uint8_t ios_packet_sizes[18] = {0, 0, 0, 0, 0, 24, 0, 31, 0, 12, 0, 0, 20, 0, 12, 11, 11, 17};
    ContinuityType type;
@@ -509,6 +543,48 @@ void BLESpamView::createFastPairPacket() {
    std::copy(res.begin(), res.end(), advertisementData);
 }

+void BLESpamView::createAnyPacket(bool safe) {
+    ATK_TYPE type[] = {
+        ATK_ANDROID,
+        ATK_IOS,
+        ATK_WINDOWS,
+        ATK_SAMSUNG,
+        ATK_NAMESPAM,
+        ATK_IOS_CRASH};
+    ATK_TYPE attackType = type[rand() % (COUNT_OF(type) - (1 ? safe : 0))];
+    createPacket(attackType);
+}
+
+void BLESpamView::createPacket(ATK_TYPE attackType) {
+    switch (attackType) {
+        case ATK_IOS_CRASH:
+            createIosPacket(true);
+            break;
+        case ATK_IOS:
+            createIosPacket(false);
+            break;
+        case ATK_SAMSUNG:
+            createSamsungPacket();
+            break;
+        case ATK_WINDOWS:
+            createWindowsPacket();
+            break;
+        case ATK_NAMESPAM:
+            createNameSpamPacket();
+            break;
+        case ATK_ALL_SAFE:
+            createAnyPacket(true);
+            break;
+        case ATK_ALL:
+            createAnyPacket(false);
+            break;
+        default:
+        case ATK_ANDROID:
+            createFastPairPacket();
+            break;
+    }
+}
+
 void BLESpamView::changePacket(bool forced = false) {
    counter++;  // need to send it multiple times to be accepted
    if (counter >= 4 || forced) {
@@ -517,24 +593,7 @@ void BLESpamView::changePacket(bool forced = false) {
        randomizeMac();
        randomChn();
        if (randomDev || forced) {
-            switch (attackType) {
-                case ATK_IOS_CRASH:
-                    createIosPacket(true);
-                    break;
-                case ATK_IOS:
-                    createIosPacket(false);
-                    break;
-                case ATK_SAMSUNG:
-                    createSamsungPacket();
-                    break;
-                case ATK_WINDOWS:
-                    createWindowsPacket();
-                    break;
-                default:
-                case ATK_ANDROID:
-                    createFastPairPacket();
-                    break;
-            }
+            createPacket(attackType);
        }
 // rate limit console display
 #ifdef BLESPMUSECONSOLE
@@ -49,7 +49,10 @@ enum ATK_TYPE {
    ATK_IOS,
    ATK_IOS_CRASH,
    ATK_WINDOWS,
-    ATK_SAMSUNG
+    ATK_SAMSUNG,
+    ATK_NAMESPAM,
+    ATK_ALL_SAFE,
+    ATK_ALL
 };
 enum PKT_TYPE {
    PKT_TYPE_INVALID_TYPE,
@@ -124,7 +127,10 @@ class BLESpamView : public View {
         {"iOs", 1},
         {"iOs crash", 2},
         {"Windows", 3},
-         {"Samsung", 4}}};
+         {"Samsung", 4},
+         {"NameSpam", 5},
+         {"All-Safe", 6},
+         {"All", 7}}};

    bool is_running{false};

@@ -148,6 +154,9 @@ class BLESpamView : public View {
    void createIosPacket(bool crash);
    void createSamsungPacket();
    void createWindowsPacket();
+    void createNameSpamPacket();
+    void createAnyPacket(bool safe);
+    void createPacket(ATK_TYPE attackType);
    void changePacket(bool forced);
    void on_tx_progress(const bool done);

@@ -1867,7 +1867,7 @@ static byte menuselect(byte lines) {  // Selection (1 line = 16 items)
 // *** S T A C K

 static void floatstack() {
-    memcpy(ds, &ds[1], (DATASTACKSIZE - 1) * sizeof(double));
+    memmove(ds, &ds[1], (DATASTACKSIZE - 1) * sizeof(double));
    dp--;
 }

@@ -76,7 +76,7 @@ __attribute__((section(".external_app.app_calculator.application_information"),
    /*.icon_color = */ ui::Color::yellow().v,
    /*.menu_location = */ app_location_t::UTILITIES,

-    /*.m4_app_tag = portapack::spi_flash::image_tag_noop */ {'\0', '\0', '\0', '\0'},  // optional
-    /*.m4_app_offset = */ 0x00000000,                                                  // will be filled at compile time
+    /*.m4_app_tag = portapack::spi_flash::image_tag_none */ {0, 0, 0, 0},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
 };
 }
@@ -62,6 +62,17 @@ set(EXTCPPSRC
 	external/keyfob/main.cpp
 	external/keyfob/ui_keyfob.cpp
 	external/keyfob/ui_keyfob.hpp
+
+	#extsensors
+	external/extsensors/main.cpp
+	external/extsensors/ui_extsensors.cpp
+	external/extsensors/ui_extsensors.hpp
+
+	#foxhunt
+	external/foxhunt/main.cpp
+	external/foxhunt/ui_foxhunt_rx.cpp
+	external/foxhunt/ui_foxhunt_rx.hpp
+
 )

 set(EXTAPPLIST
@@ -80,4 +91,6 @@ set(EXTAPPLIST
 	spainter
 	keyfob
 	tetris
+	extsensors
+	foxhunt_rx
 )
@@ -38,6 +38,8 @@ MEMORY
    ram_external_app_spainter(rwx) : org = 0xADBC0000, len = 32k
    ram_external_app_keyfob(rwx) : org = 0xADBD0000, len = 32k
    ram_external_app_tetris(rwx) : org = 0xADBE0000, len = 32k
+    ram_external_app_extsensors(rwx) : org = 0xADBF0000, len = 32k
+    ram_external_app_foxhunt_rx(rwx) : org = 0xADC00000, len = 32k
 }

 SECTIONS
@@ -132,4 +134,18 @@ SECTIONS
        *(*ui*external_app*tetris*);
    } > ram_external_app_tetris

+   .external_app_extsensors : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_extsensors.application_information));
+        *(*ui*external_app*extsensors*);
+    } > ram_external_app_extsensors
+
+   .external_app_foxhunt_rx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_foxhunt_rx.application_information));
+        *(*ui*external_app*foxhunt_rx*);
+    } > ram_external_app_foxhunt_rx
+
+
+
 }
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2023 Bernd Herzog
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui.hpp"
+#include "ui_extsensors.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::extsensors {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<ExtSensorsView>();
+}
+}  // namespace ui::external_app::extsensors
+
+extern "C" {
+
+__attribute__((section(".external_app.app_extsensors.application_information"), used)) application_information_t _application_information_extsensors = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::extsensors::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "ExtSensor",
+    /*.bitmap_data = */ {
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x04,
+        0x20,
+        0x12,
+        0x48,
+        0x8A,
+        0x51,
+        0xCA,
+        0x53,
+        0xCA,
+        0x53,
+        0x8A,
+        0x51,
+        0x12,
+        0x48,
+        0x84,
+        0x21,
+        0xC0,
+        0x03,
+        0x40,
+        0x02,
+        0x60,
+        0x06,
+        0x20,
+        0x04,
+        0x30,
+        0x0C,
+        0xF0,
+        0x0F,
+    },
+    /*.icon_color = */ ui::Color::orange().v,
+    /*.menu_location = */ app_location_t::DEBUG,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_none */ {0, 0, 0, 0},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}
@@ -0,0 +1,86 @@
+/*
+ * 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_extsensors.hpp"
+
+#include "rtc_time.hpp"
+#include "string_format.hpp"
+#include "portapack_persistent_memory.hpp"
+
+using namespace portapack;
+using namespace ui;
+
+namespace ui::external_app::extsensors {
+
+void ExtSensorsView::focus() {
+    text_info.focus();
+}
+
+ExtSensorsView::ExtSensorsView(NavigationView& nav)
+    : nav_{nav} {
+    add_children({&labels,
+                  &text_info,
+                  &text_gps,
+                  &text_orientation,
+                  &text_envl1,
+                  &text_envl2});
+}
+
+ExtSensorsView::~ExtSensorsView() {
+}
+
+void ExtSensorsView::on_any() {
+    if (has_data == false) {
+        // update text
+        text_info.set("Found ext module.");  // todo do an ext module check for type
+    }
+    has_data = true;
+}
+
+void ExtSensorsView::on_gps(const GPSPosDataMessage* msg) {
+    on_any();
+    std::string tmp = to_string_decimal(msg->lat, 5);
+    tmp += "; ";
+    tmp += to_string_decimal(msg->lon, 5);
+    text_gps.set(tmp);
+}
+
+void ExtSensorsView::on_orientation(const OrientationDataMessage* msg) {
+    on_any();
+    std::string tmp = to_string_dec_uint(msg->angle);
+    tmp += (char)176;  // °
+    if (msg->tilt < 400) {
+        tmp += "; T: " + to_string_dec_int(msg->tilt);
+    }
+    text_orientation.set(tmp);
+}
+
+void ExtSensorsView::on_environment(const EnvironmentDataMessage* msg) {
+    on_any();
+    std::string tmp = "T: " + to_string_decimal(msg->temperature, 2);  // temperature
+    tmp += (char)176;                                                  // °
+    tmp += "C";
+    tmp += "; H: " + to_string_decimal(msg->humidity, 1) + "%";  // humidity
+    text_envl1.set(tmp);
+    tmp = "P: " + to_string_decimal(msg->pressure, 1) + " hPa; L:";  // pressure
+    tmp += to_string_dec_int(msg->light) + " LUX";                   // light
+    text_envl2.set(tmp);
+}
+
+}  // namespace ui::external_app::extsensors
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 Furrtek
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// Code from https://github.com/Flipper-XFW/Xtreme-Apps/tree/04c3a60093e2c2378e79498b4505aa8072980a42/ble_spam/protocols
+// Thanks for the work of the original creators!
+// Saying thanks in the main view!
+
+#ifndef __UI_EXTSENSORS_H__
+#define __UI_EXTSENSORS_H__
+
+#include "ui.hpp"
+#include "ui_language.hpp"
+#include "ui_navigation.hpp"
+#include "ui_record_view.hpp"
+#include "app_settings.hpp"
+#include "utility.hpp"
+
+using namespace ui;
+
+namespace ui::external_app::extsensors {
+
+class ExtSensorsView : public View {
+   public:
+    ExtSensorsView(NavigationView& nav);
+    ~ExtSensorsView();
+
+    void focus() override;
+
+    std::string title() const override {
+        return "ExtSensor";
+    };
+
+   private:
+    NavigationView& nav_;
+
+    bool has_data = false;
+
+    Labels labels{
+        {{0 * 8, 3 * 16}, "GPS:", Color::light_grey()},
+        {{0 * 8, 5 * 16}, "ORI:", Color::light_grey()},
+        {{0 * 8, 7 * 16}, "ENV:", Color::light_grey()}};
+
+    Text text_info{{0 * 8, 0 * 8, 30 * 8, 16 * 1}, "Connect a compatible module..."};
+    Text text_gps{{5 * 8, 3 * 16, 24 * 8, 16}, "-"};
+    Text text_orientation{{5 * 8, 5 * 16, 24 * 8, 16}, "-"};
+    Text text_envl1{{5 * 8, 7 * 16, 24 * 8, 16}, "-"};
+    Text text_envl2{{1 * 8, 9 * 16, 24 * 8, 16}, "-"};
+
+    void on_any();
+
+    void on_gps(const GPSPosDataMessage* msg);
+    void on_orientation(const OrientationDataMessage* msg);
+    void on_environment(const EnvironmentDataMessage* msg);
+
+    MessageHandlerRegistration message_handler_gps{
+        Message::ID::GPSPosData,
+        [this](Message* const p) {
+            const auto message = static_cast<const GPSPosDataMessage*>(p);
+            this->on_gps(message);
+        }};
+    MessageHandlerRegistration message_handler_orientation{
+        Message::ID::OrientationData,
+        [this](Message* const p) {
+            const auto message = static_cast<const OrientationDataMessage*>(p);
+            this->on_orientation(message);
+        }};
+
+    MessageHandlerRegistration message_handler_environment{
+        Message::ID::EnvironmentData,
+        [this](Message* const p) {
+            const auto message = static_cast<const EnvironmentDataMessage*>(p);
+            this->on_environment(message);
+        }};
+};
+};  // namespace ui::external_app::extsensors
+
+#endif /*__UI_EXTSENSORS_H__*/
@@ -76,7 +76,7 @@ __attribute__((section(".external_app.app_font_viewer.application_information"),
    /*.icon_color = */ ui::Color::cyan().v,
    /*.menu_location = */ app_location_t::DEBUG,

-    /*.m4_app_tag = portapack::spi_flash::image_tag_noop */ {'\0', '\0', '\0', '\0'},
+    /*.m4_app_tag = portapack::spi_flash::image_tag_none */ {0, 0, 0, 0},
    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
 };
 }
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2024 HTotoo
+ *
+ * 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_foxhunt_rx.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::foxhunt_rx {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<FoxhuntRxView>();
+}
+}  // namespace ui::external_app::foxhunt_rx
+
+extern "C" {
+
+__attribute__((section(".external_app.app_foxhunt_rx.application_information"), used)) application_information_t _application_information_foxhunt_rx = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::foxhunt_rx::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "Fox hunt",
+    /*.bitmap_data = */ {
+        0x18,
+        0x18,
+        0x28,
+        0x14,
+        0x68,
+        0x16,
+        0x68,
+        0x16,
+        0xC8,
+        0x13,
+        0x88,
+        0x11,
+        0x04,
+        0x20,
+        0x24,
+        0x24,
+        0x22,
+        0x44,
+        0x01,
+        0x80,
+        0x06,
+        0x60,
+        0x98,
+        0x19,
+        0x20,
+        0x04,
+        0x40,
+        0x02,
+        0x80,
+        0x01,
+        0x00,
+        0x00,
+    },
+    /*.icon_color = */ ui::Color::yellow().v,
+    /*.menu_location = */ app_location_t::RX,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_am_audio */ {'P', 'A', 'M', 'A'},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2024 HTotoo
+ *
+ * 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_foxhunt_rx.hpp"
+
+#include "audio.hpp"
+#include "rtc_time.hpp"
+#include "baseband_api.hpp"
+#include "string_format.hpp"
+#include "portapack_persistent_memory.hpp"
+
+using namespace portapack;
+using namespace modems;
+using namespace ui;
+
+namespace ui::external_app::foxhunt_rx {
+
+void FoxhuntRxView::focus() {
+    field_frequency.focus();
+}
+
+FoxhuntRxView::FoxhuntRxView(NavigationView& nav)
+    : nav_{nav} {
+    baseband::run_image(portapack::spi_flash::image_tag_am_audio);
+
+    add_children({&rssi,
+                  &field_rf_amp,
+                  &field_lna,
+                  &field_vga,
+                  &field_volume,
+                  &field_frequency,
+                  &freq_stats_db,
+                  &rssi_graph,
+                  &geomap,
+                  &clear_markers,
+                  &add_current_marker});
+
+    clear_markers.on_select = [this](Button&) {
+        geomap.clear_markers();
+    };
+    add_current_marker.on_select = [this](Button&) {
+        GeoMarker tmp{my_lat, my_lon, my_orientation};
+        geomap.store_marker(tmp);
+    };
+    geomap.set_mode(DISPLAY);
+    geomap.set_manual_panning(false);
+    // geomap.set_enable_additional_zoom(true);
+    // geomap.set_hide_center_marker(true); //todo hide again after testing
+    geomap.set_focusable(true);
+    geomap.clear_markers();
+    receiver_model.set_modulation(ReceiverModel::Mode::AMAudio);
+    field_frequency.set_step(100);
+    receiver_model.enable();
+    audio::output::start();
+    rssi_graph.set_nb_columns(64);
+    geomap.init();
+}
+
+FoxhuntRxView::~FoxhuntRxView() {
+    receiver_model.disable();
+    baseband::shutdown();
+    audio::output::stop();
+}
+
+void FoxhuntRxView::on_statistics_update(const ChannelStatistics& statistics) {
+    static int16_t last_max_db = -1000;
+    rssi_graph.add_values(rssi.get_min(), rssi.get_avg(), rssi.get_max(), statistics.max_db);
+    // refresh db
+    if (last_max_db != statistics.max_db) {
+        last_max_db = statistics.max_db;
+        freq_stats_db.set("Power: " + to_string_dec_int(statistics.max_db) + " db");
+    }
+
+} /* on_statistic_updates */
+
+void FoxhuntRxView::on_gps(const GPSPosDataMessage* msg) {
+    my_lat = msg->lat;
+    my_lon = msg->lon;
+    geomap.update_my_position(msg->lat, msg->lon, msg->altitude);
+    geomap.move(my_lon, my_lat);
+    geomap.set_dirty();
+}
+void FoxhuntRxView::on_orientation(const OrientationDataMessage* msg) {
+    my_orientation = msg->angle;
+    geomap.set_angle(msg->angle);
+    geomap.update_my_orientation(msg->angle, true);
+}
+
+}  // namespace ui::external_app::foxhunt_rx
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2024 HTotoo
+ *
+ * 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_FOXHUNT_RX_H__
+#define __UI_FOXHUNT_RX_H__
+
+#include "ui.hpp"
+#include "ui_language.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "ui_geomap.hpp"
+#include "ui_freq_field.hpp"
+#include "ui_record_view.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "log_file.hpp"
+#include "utility.hpp"
+
+using namespace ui;
+
+namespace ui::external_app::foxhunt_rx {
+
+class FoxhuntRxView : public View {
+   public:
+    FoxhuntRxView(NavigationView& nav);
+    ~FoxhuntRxView();
+
+    void focus() override;
+
+    std::string title() const override { return "Fox hunt"; };
+
+   private:
+    NavigationView& nav_;
+    RxRadioState radio_state_{};
+    app_settings::SettingsManager settings_{
+        "rx_foxhunt", app_settings::Mode::RX};
+
+    RFAmpField field_rf_amp{
+        {13 * 8, 0 * 16}};
+    LNAGainField field_lna{
+        {15 * 8, 0 * 16}};
+    VGAGainField field_vga{
+        {18 * 8, 0 * 16}};
+    RSSI rssi{
+        {21 * 8, 0, 6 * 8, 4}};
+    AudioVolumeField field_volume{
+        {28 * 8, 0 * 16}};
+
+    RxFrequencyField field_frequency{
+        {0 * 8, 0 * 16},
+        nav_};
+
+    // Power: -XXX db
+    Text freq_stats_db{
+        {0 * 8, 2 * 16 + 4, 14 * 8, 14},
+    };
+    RSSIGraph rssi_graph{
+        {0, 50, 240, 30},
+    };
+
+    Button clear_markers{
+        {10 * 8, 18, 8 * 8, 16},
+        LanguageHelper::currentMessages[LANG_CLEAR]};
+
+    Button add_current_marker{
+        {2, 18, 7 * 8, 16},
+        "Mark"};
+
+    GeoMap geomap{{0, 80, 240, 240}};
+
+    MessageHandlerRegistration message_handler_gps{
+        Message::ID::GPSPosData,
+        [this](Message* const p) {
+            const auto message = static_cast<const GPSPosDataMessage*>(p);
+            this->on_gps(message);
+        }};
+    MessageHandlerRegistration message_handler_orientation{
+        Message::ID::OrientationData,
+        [this](Message* const p) {
+            const auto message = static_cast<const OrientationDataMessage*>(p);
+            this->on_orientation(message);
+        }};
+    MessageHandlerRegistration message_handler_stats{
+        Message::ID::ChannelStatistics,
+        [this](const Message* const p) {
+            this->on_statistics_update(static_cast<const ChannelStatisticsMessage*>(p)->statistics);
+        }};
+
+    float my_lat = 200;
+    float my_lon = 200;
+    uint16_t my_orientation = 400;
+
+    void on_gps(const GPSPosDataMessage* msg);
+    void on_orientation(const OrientationDataMessage* msg);
+    void on_statistics_update(const ChannelStatistics& statistics);
+};
+
+}  // namespace ui::external_app::foxhunt_rx
+
+#endif /*__UI_FOXHUNT_RX_H__*/
@@ -76,7 +76,7 @@ __attribute__((section(".external_app.app_pacman.application_information"), used
    /*.icon_color = */ ui::Color::yellow().v,
    /*.menu_location = */ app_location_t::UTILITIES,

-    /*.m4_app_tag = portapack::spi_flash::image_tag_noop */ {'\0', '\0', '\0', '\0'},  // optional
-    /*.m4_app_offset = */ 0x00000000,                                                  // will be filled at compile time
+    /*.m4_app_tag = portapack::spi_flash::image_tag_none */ {0, 0, 0, 0},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
 };
 }
@@ -43,6 +43,16 @@ boolean but_DOWN = false;   // 50
 boolean but_LEFT = false;   // 48
 boolean but_RIGHT = false;  // 46

+enum cheat_code_keymap {
+    UP,
+    DOWN,
+    LEFT,
+    RIGHT
+};
+
+enum cheat_code_keymap cheat_code[] = {UP, DOWN, UP, DOWN, RIGHT, LEFT, RIGHT, LEFT};
+byte cheat_code_index = 0;
+
 /******************************************************************************/
 /*   GAME VARIABLES AND DEFINITIONS                                           */
 /******************************************************************************/
@@ -1280,29 +1290,64 @@ class Playfield {
            but_A = false;
            GAMEPAUSED = 1;
        } else if (but_LEFT && DEMO == 1 && GAMEPAUSED == 0) {  // -level
-            cheat_level = true;
+
+            if ((cheat_code[cheat_code_index] == 2) && (cheat_code_index <= 8)) {
+                cheat_code_index++;
+            }
+
+            if (cheat_code_index == 8) {
+                cheat_level = true;
+                if (LEVEL > 1) {
+                    LEVEL--;
+                }
+                Init();
+            }
+
            but_LEFT = false;
-            if (LEVEL > 1) {
-                LEVEL--;
-            }
-            Init();
+
        } else if (but_RIGHT && DEMO == 1 && GAMEPAUSED == 0) {  // +level
-            cheat_level = true;
-            but_RIGHT = false;
-            if (LEVEL < 255) {
-                LEVEL++;
+
+            if ((cheat_code[cheat_code_index] == 3) && (cheat_code_index <= 8)) {
+                cheat_code_index++;
            }
-            Init();
+
+            if (cheat_code_index == 8) {
+                cheat_level = true;
+                if (LEVEL < 255) {
+                    LEVEL++;
+                }
+                Init();
+            }
+
+            but_RIGHT = false;
+
        } else if (but_UP && DEMO == 1 && GAMEPAUSED == 0) {  // full of lifes
-            cheat_lifes = true;
+
+            if ((cheat_code[cheat_code_index] == 0) && (cheat_code_index <= 8)) {
+                cheat_code_index++;
+            }
+
+            if (cheat_code_index == 8) {
+                cheat_lifes = true;
+                Init();
+            }
+
            but_UP = false;
-            Init();
+
        } else if (but_DOWN && DEMO == 1 && GAMEPAUSED == 0) {  // reset
-            cheat_level = false;
-            cheat_lifes = false;
-            but_DOWN = false;
-            LIFES = START_LIFES;
-            Init();
+
+            if ((cheat_code[cheat_code_index] == 1) && (cheat_code_index <= 8)) {
+                cheat_code_index++;
+            }
+
+            if (cheat_code_index == 8) {
+                cheat_level = false;
+                cheat_lifes = false;
+                but_DOWN = false;
+                LIFES = START_LIFES;
+                cheat_code_index = 0;
+                Init();
+            }
        }

        if (GAMEPAUSED && but_A && DEMO == 0) {
@@ -76,7 +76,7 @@ __attribute__((section(".external_app.app_tetris.application_information"), used
    /*.icon_color = */ ui::Color::orange().v,
    /*.menu_location = */ app_location_t::UTILITIES,

-    /*.m4_app_tag = portapack::spi_flash::image_tag_noop */ {'\0', '\0', '\0', '\0'},  // optional
-    /*.m4_app_offset = */ 0x00000000,                                                  // will be filled at compile time
+    /*.m4_app_tag = portapack::spi_flash::image_tag_none */ {0, 0, 0, 0},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
 };
 }
@@ -461,6 +461,15 @@ std::string path::string() const {
    return conv.to_bytes(native());
 }

+// appends a string to the end of filename, but leaves the extension asd.txt + "fg" -> asdfg.txt
+path& path::append_filename(const string_type& str) {
+    const auto t = extension().native();
+    _s.erase(_s.size() - t.size());  // remove extension
+    _s += str;                       // append string
+    _s += t;                         // add back extension
+    return *this;
+}
+
 path& path::replace_extension(const path& replacement) {
    const auto t = extension().native();
    _s.erase(_s.size() - t.size());
@@ -155,6 +155,8 @@ struct path {

    path& replace_extension(const path& replacement = path());

+    path& append_filename(const string_type& str);
+
   private:
    string_type _s;
 };
@@ -376,7 +376,7 @@ bool parse_freqman_entry(std::string_view str, freqman_entry& entry) {
        } else if (key == "c") {
            entry.tone = parse_tone_key(value);
        } else if (key == "d") {
-            entry.description = trim(value);
+            entry.description = trim(value).substr(0, freqman_max_desc_size);
        } else if (key == "f") {
            entry.type = freqman_type::Single;
            parse_int(value, entry.frequency_a);
@@ -492,7 +492,7 @@ freqman_entry FreqmanDB::operator[](Index index) const {
            return entry;
        else if (read_raw_) {
            entry.type = freqman_type::Raw;
-            entry.description = trim(*line_text);
+            entry.description = trim(*line_text).substr(0, freqman_max_desc_size);
            return entry;
        }
    }
@@ -162,6 +162,9 @@ std::string freqman_entry_get_step_string_short(freqman_index_t step);
 * ensure app memory stability. */
 constexpr size_t freqman_default_max_entries = 150;

+/* Limiting description to 30 as specified by the format */
+constexpr size_t freqman_max_desc_size = 30;
+
 struct freqman_load_options {
    /* Loads all entries when set to 0. */
    size_t max_entries{freqman_default_max_entries};
@@ -150,7 +150,9 @@ void MAX2837::init() {
 }

 void MAX2837::set_tx_LO_iq_phase_calibration(const size_t v) {
-    /*  IQ phase deg CAL adj  (+4 ...-4)  in 32 steps (5 bits), 00000 = +4deg (Q lags I by 94degs, default), 01111 = +0deg, 11111 = -4deg (Q lags I by 86degs) */
+    Mode saved_mode = get_mode();
+
+    /* TX IQ phase deg CAL adj  (+4 ...-4)  in 32 steps (5 bits), 00000 = +4deg (Q lags I by 94degs, default), 01111 = +0deg, 11111 = -4deg (Q lags I by 86degs) */

    // 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 .
@@ -172,7 +174,7 @@ void MAX2837::set_tx_LO_iq_phase_calibration(const size_t v) {
    _map.r.spi_en.EN_SPI = 1;   // Register Settings reg address 16,  DO (1 = Chip select enable )
    flush_one(Register::SPI_EN);

-    set_mode(Mode::Standby);  // Back 3  logic pins CALIBRATION mode -> Standby.
+    set_mode(saved_mode);  // restore original mode
 }

 enum class Mask {  // There are class Mask ,and class mode with same names, but they are not same.
@@ -205,12 +207,18 @@ Mask mode_mask(const Mode mode) {  // based on enum Mode cases, we set up the co
 }

 void MAX2837::set_mode(const Mode mode) {  // We set up the 3 Logic Pins ENABLE, RXENABLE, TXENABLE accordingly to the max2837 mode case,  that we want to set up .
+    _mode = mode;
+
    Mask mask = mode_mask(mode);
    gpio_max283x_enable.write(toUType(mask) & toUType(Mask::Enable));
    gpio_max2837_rxenable.write(toUType(mask) & toUType(Mask::RxEnable));
    gpio_max2837_txenable.write(toUType(mask) & toUType(Mask::TxEnable));
 }

+Mode MAX2837::get_mode() {
+    return _mode;
+}
+
 void MAX2837::flush() {
    if (_dirty) {
        for (size_t n = 0; n < reg_count; n++) {
@@ -324,14 +332,41 @@ bool MAX2837::set_frequency(const rf::Frequency lo_frequency) {

    return true;
 }
-
-void MAX2837::set_rx_lo_iq_calibration(const size_t v) {
+/*
+void MAX2837::set_rx_lo_iq_calibration(const size_t v) {        // Original code , rewritten below
    _map.r.rx_top_rx_bias.RX_IQERR_SPI_EN = 1;
    _dirty[Register::RX_TOP_RX_BIAS] = 1;
    _map.r.rxrf_2.iqerr_trim = v;
    _dirty[Register::RXRF_2] = 1;
    flush();
 }
+*/
+
+void MAX2837::set_rx_LO_iq_phase_calibration(const size_t v) {
+    /*  RX IQ phase deg CAL adj  (+4 ...-4)  in 32 steps (5 bits), 00000 = +4deg (Q lags I by 94degs, default), 01111 = +0deg, 11111 = -4deg (Q lags I by 86degs) */
+
+    // 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 .
+
+    gpio_max283x_enable.output();
+    gpio_max2837_rxenable.output();
+    gpio_max2837_txenable.output();
+
+    _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)
+    flush_one(Register::SPI_EN);
+
+    _map.r.rx_top_rx_bias.RX_IQERR_SPI_EN = 1;  // reg 8 D9, RX LO IQ Phase calibration SPI control. Active when Address 8 D<9> = 1.
+    flush_one(Register::RX_TOP_RX_BIAS);
+
+    _map.r.rxrf_2.iqerr_trim = v;  // reg 1  D9:D5, RX LO I/Q Phase SPI 5 bits Adjust
+    flush_one(Register::RXRF_2);
+
+    // Exit  Calibration mode,  Go back to reg 16, D1:D0 , Out of CALIBRATION , back to default conditions, but keep CS activated.
+    _map.r.spi_en.CAL_SPI = 0;  // Register Settings reg address 16,  D1 (0 = Normal operation (default)
+    _map.r.spi_en.EN_SPI = 1;   // Register Settings reg address 16,  DO (1 = Chip select enable )
+    flush_one(Register::SPI_EN);
+}

 void MAX2837::set_rx_bias_trim(const size_t v) {
    _map.r.rx_top_rx_bias.EN_Bias_Trim = 1;
@@ -828,7 +828,7 @@ class MAX2837 : public MAX283x {

    bool set_frequency(const rf::Frequency lo_frequency) override;

-    void set_rx_lo_iq_calibration(const size_t v) override;
+    void set_rx_LO_iq_phase_calibration(const size_t v) override;
    void set_tx_LO_iq_phase_calibration(const size_t v) override;
    void set_rx_bias_trim(const size_t v);
    void set_vco_bias(const size_t v);
@@ -841,6 +841,7 @@ class MAX2837 : public MAX283x {

   private:
    spi::arbiter::Target& _target;
+    Mode _mode{Mode::Standby};

    RegisterMap _map{initial_register_values};
    DirtyRegisters<Register, reg_count> _dirty{};
@@ -851,6 +852,7 @@ class MAX2837 : public MAX283x {
    reg_t read(const Register reg);

    void flush();
+    Mode get_mode();
 };

 }  // namespace max2837
@@ -143,6 +143,8 @@ void MAX2839::init() {
 }

 void MAX2839::set_tx_LO_iq_phase_calibration(const size_t v) {
+    Mode saved_mode = get_mode();
+
    /* IQ phase deg CAL adj (+4 ...-4)  This IC  in 64 steps (6 bits), 000000 = +4deg (Q lags I by 94degs, default), 011111 = +0deg, 111111 = -4deg (Q lags I by 86degs) */

    // TX calibration , 2 x Logic pins , ENABLE, RXENABLE = 1,0, (2dec), and  Reg address 16, D1 (CAL mode 1):DO (CHIP ENABLE 1)
@@ -164,7 +166,7 @@ void MAX2839::set_tx_LO_iq_phase_calibration(const size_t v) {
    _map.r.spi_en.EN_SPI = 1;   // Register Settings reg address 16,  DO (1 = Chip select enable )
    flush_one(Register::SPI_EN);

-    set_mode(Mode::Standby);  // Back 3  logic pins CALIBRATION mode -> Standby.
+    set_mode(saved_mode);  // restore original mode
 }

 enum class Mask {
@@ -196,11 +198,17 @@ Mask mode_mask(const Mode mode) {
 }

 void MAX2839::set_mode(const Mode mode) {
+    _mode = mode;
+
    Mask mask = mode_mask(mode);
    gpio_max283x_enable.write(toUType(mask) & toUType(Mask::Enable));
    gpio_max2839_rxtx.write(toUType(mask) & toUType(Mask::RxTx));
 }

+Mode MAX2839::get_mode() {
+    return _mode;
+}
+
 void MAX2839::flush() {
    if (_dirty) {
        for (size_t n = 0; n < reg_count; n++) {
@@ -367,13 +375,38 @@ bool MAX2839::set_frequency(const rf::Frequency lo_frequency) {

    return true;
 }
-
-void MAX2839::set_rx_lo_iq_calibration(const size_t v) {
+/*
+void MAX2839::set_rx_LO_iq_phase_calibration(const size_t v) {   // Original code , rewritten below
    _map.r.rxrf_2.RX_IQERR_SPI_EN = 1;
    _dirty[Register::RXRF_2] = 1;
    _map.r.rxrf_1.iqerr_trim = v;
    _dirty[Register::RXRF_1] = 1;
    flush();
+}*/
+
+void MAX2839::set_rx_LO_iq_phase_calibration(const size_t v) {
+    /*  RX IQ phase deg CAL adj  (+4 ...-4)  in 64 steps (6 bits), 000000 = +4deg (Q lags I by 94degs, default), 011111 = +0deg, 111111 = -4deg (Q lags I by 86degs) */
+
+    // 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 .
+
+    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.
+
+    _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)
+    flush_one(Register::SPI_EN);
+
+    _map.r.rxrf_2.RX_IQERR_SPI_EN = 1;  // reg 2 D<2> = 1, RX LO IQ calibration SPI control. Active when Address 2 D<2> = 1.
+    _dirty[Register::RXRF_2] = 1;
+
+    _map.r.rxrf_1.iqerr_trim = v;
+    _dirty[Register::RXRF_1] = 1;
+    flush();
+
+    _map.r.spi_en.CAL_SPI = 0;  // 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)
+    flush_one(Register::SPI_EN);
 }

 void MAX2839::set_rx_buff_vcm(const size_t v) {
@@ -82,11 +82,11 @@ struct RXENABLE_Type {
 static_assert(sizeof(RXENABLE_Type) == sizeof(reg_t), "RXENABLE_Type wrong size");

 struct RXRF_1_Type {
-    reg_t LNAband : 1;
+    reg_t LNAband : 2;  // Datasheet says D1:D0 , 2 bits, maybe  D1 Rx_B,  D0 Rx_A  , (original code said wrongly ,reg_t LNAband : 1; that was of for max2837, not max2839 )
    reg_t RESERVED0 : 1;
    reg_t MIMOmode : 1;
-    reg_t iqerr_trim : 5;
-    reg_t RESERVED1 : 6;
+    reg_t iqerr_trim : 6;  // Datasheet says D9_D4 , that means 6 bits,  (original code said wrongly ,reg_t iqerr_trim : 5;  )
+    reg_t RESERVED1 : 6;   // we are using 16 bits , even top part mapping  is not used
 };

 static_assert(sizeof(RXRF_1_Type) == sizeof(reg_t), "RXRF_1_Type wrong size");
@@ -689,7 +689,7 @@ class MAX2839 : public MAX283x {
    void set_lpf_rf_bandwidth_rx(const uint32_t bandwidth_minimum) override;
    void set_lpf_rf_bandwidth_tx(const uint32_t bandwidth_minimum) override;
    bool set_frequency(const rf::Frequency lo_frequency) override;
-    void set_rx_lo_iq_calibration(const size_t v) override;
+    void set_rx_LO_iq_phase_calibration(const size_t v) override;
    void set_tx_LO_iq_phase_calibration(const size_t v) override;
    void set_rx_buff_vcm(const size_t v) override;

@@ -700,6 +700,7 @@ class MAX2839 : public MAX283x {

   private:
    spi::arbiter::Target& _target;
+    Mode _mode{Mode::Standby};

    RegisterMap _map{initial_register_values};
    DirtyRegisters<Register, reg_count> _dirty{};
@@ -712,6 +713,7 @@ class MAX2839 : public MAX283x {
    void flush();

    void configure_rx_gain();
+    Mode get_mode();
 };

 }  // namespace max2839
@@ -125,7 +125,7 @@ class MAX283x {

    virtual bool set_frequency(const rf::Frequency lo_frequency);

-    virtual void set_rx_lo_iq_calibration(const size_t v);
+    virtual void set_rx_LO_iq_phase_calibration(const size_t v);
    virtual void set_tx_LO_iq_phase_calibration(const size_t v);

    virtual void set_rx_buff_vcm(const size_t v);
@@ -31,6 +31,9 @@ using namespace std::literals;

 const std::string_view center_freq_name = "center_frequency"sv;
 const std::string_view sample_rate_name = "sample_rate"sv;
+const std::string_view latitude_name = "latitude"sv;
+const std::string_view longitude_name = "longitude"sv;
+const std::string_view satinuse_name = "satinuse"sv;

 fs::path get_metadata_path(const fs::path& capture_path) {
    auto temp = capture_path;
@@ -54,6 +57,23 @@ Optional<File::Error> write_metadata_file(const fs::path& path, capture_metadata
    if (error)
        return error;

+    // add gps data if available
+    if (metadata.latitude != 0 && metadata.longitude != 0 && metadata.latitude < 200 && metadata.longitude < 200) {
+        error = f.write_line(std::string{latitude_name} + "=" +
+                             to_string_decimal(metadata.latitude, 7));
+        if (error)
+            return error;
+
+        error = f.write_line(std::string{longitude_name} + "=" +
+                             to_string_decimal(metadata.longitude, 7));
+        if (error)
+            return error;
+
+        error = f.write_line(std::string{satinuse_name} + "=" +
+                             to_string_dec_uint(metadata.satinuse));
+        if (error)
+            return error;
+    }
    return {};
 }

@@ -77,6 +97,12 @@ Optional<capture_metadata> read_metadata_file(const fs::path& path) {
            parse_int(cols[1], metadata.center_frequency);
        else if (cols[0] == sample_rate_name)
            parse_int(cols[1], metadata.sample_rate);
+        else if (cols[0] == latitude_name)
+            parse_float_meta(cols[1], metadata.latitude);
+        else if (cols[0] == longitude_name)
+            parse_float_meta(cols[1], metadata.longitude);
+        else if (cols[0] == satinuse_name)
+            parse_int(cols[1], metadata.satinuse);
        else
            continue;
    }
@@ -86,3 +112,18 @@ Optional<capture_metadata> read_metadata_file(const fs::path& path) {

    return metadata;
 }
+
+bool parse_float_meta(std::string_view str, float& out_val) {
+    out_val = {};
+
+    if (str.size() > max_parse_int_length)
+        return false;
+
+    // Copy onto the stack and null terminate.
+    char zstr[max_parse_int_length + 1];
+    std::memcpy(zstr, str.data(), str.size());
+    zstr[str.size()] = '\0';
+    errno = 0;
+    out_val = strtod(zstr, nullptr);
+    return (errno == 0);
+}
@@ -29,6 +29,9 @@
 struct capture_metadata {
    rf::Frequency center_frequency;
    uint32_t sample_rate;
+    float latitude = 0;
+    float longitude = 0;
+    uint8_t satinuse = 0;
 };

 std::filesystem::path get_metadata_path(const std::filesystem::path& capture_path);
@@ -36,4 +39,5 @@ std::filesystem::path get_metadata_path(const std::filesystem::path& capture_pat
 Optional<File::Error> write_metadata_file(const std::filesystem::path& path, capture_metadata metadata);
 Optional<capture_metadata> read_metadata_file(const std::filesystem::path& path);

+bool parse_float_meta(std::string_view str, float& out_val);
 #endif  // __METADATA_FILE_HPP__
@@ -253,6 +253,10 @@ void set_tx_max283x_iq_phase_calibration(const size_t v) {
    second_if->set_tx_LO_iq_phase_calibration(v);
 }

+void set_rx_max283x_iq_phase_calibration(const size_t v) {
+    second_if->set_rx_LO_iq_phase_calibration(v);
+}
+
 /*void enable(Configuration configuration) {
    configure(configuration);
 }
@@ -55,6 +55,7 @@ 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);
 void set_tx_max283x_iq_phase_calibration(const size_t v);
+void set_rx_max283x_iq_phase_calibration(const size_t v);

 /* Use ReceiverModel or TransmitterModel instead. */
 // void enable(Configuration configuration);
@@ -3,6 +3,7 @@
 * Copyright (C) 2016 Furrtek
 * Copyright (C) 2019 Elia Yehuda (z4ziggy)
 * Copyright (C) 2023 Mark Thompson
+ * Copyright (C) 2024 u-foka
 *
 * This file is part of PortaPack.
 *
@@ -106,7 +107,14 @@ void BtnGridView::on_tick_second() {
 }

 void BtnGridView::clear() {
+    // clear vector and release memory, not using swap since it's causing capture to glitch/fault
    menu_items.clear();
+
+    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
+    menu_item_views.clear();
 }

 void BtnGridView::add_items(std::initializer_list<GridItem> new_items) {
@@ -207,11 +215,23 @@ void BtnGridView::on_focus() {

 void BtnGridView::on_blur() {
 #if 0
-	if (!keep_highlight)
-		item_view(highlighted_item - offset)->unhighlight();
+    if (!keep_highlight)
+        item_view(highlighted_item - offset)->unhighlight();
 #endif
 }

+void BtnGridView::on_show() {
+    on_populate();
+
+    View::on_show();
+}
+
+void BtnGridView::on_hide() {
+    View::on_hide();
+
+    clear();
+}
+
 bool BtnGridView::on_key(const KeyEvent key) {
    switch (key) {
        case KeyEvent::Up:
@@ -2,6 +2,7 @@
 * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
 * Copyright (C) 2019 Elia Yehuda (z4ziggy)
+ * Copyright (C) 2024 u-foka
 *
 * This file is part of PortaPack.
 *
@@ -73,10 +74,15 @@ class BtnGridView : public View {
    void set_arrow_enabled(bool enabled);
    void on_focus() override;
    void on_blur() override;
+    void on_show() override;
+    void on_hide() override;
    bool on_key(const KeyEvent event) override;
    bool on_encoder(const EncoderEvent event) override;
    bool blacklisted_app(GridItem new_item);

+   protected:
+    virtual void on_populate() = 0;
+
   private:
    int rows_{3};
    void update_items();
@@ -59,43 +59,19 @@ void QRCodeImage::paint(Painter& painter) {
    // The structure to manage the QR code
    QRCode qrcode;

-    // Either small or large QR code can be shown..
+    int qr_version = 10;

-    if (portapack::persistent_memory::show_bigger_qr_code()) {  // show large QR code
-        int qr_version = 2;
+    // Allocate a chunk of memory to store the QR code
+    uint8_t qrcodeBytes[qrcode_getBufferSize(qr_version)];

-        // Allocate a chunk of memory to store the QR code
-        uint8_t qrcodeBytes[qrcode_getBufferSize(qr_version)];
+    qrcode_initText(&qrcode, qrcodeBytes, qr_version, ECC_HIGH, qr_text_);

-        qrcode_initText(&qrcode, qrcodeBytes, qr_version, ECC_HIGH, qr_text_);
+    display.fill_rectangle(Rect(57, 65, 126, 127), Color::white());

-        display.fill_rectangle(Rect(10, 30, 220, 220), Color::white());
-
-        for (uint8_t y = 0; y < qrcode.size; y++) {
-            for (uint8_t x = 0; x < qrcode.size; x++) {
-                if (qrcode_getModule(&qrcode, x, y)) {
-                    display.fill_rectangle(Rect(20 + (x * 8), 40 + (y * 8), 8, 8), Color::black());
-                }
-            }
-        }
-
-    }
-
-    else {  // show small QR code
-        int qr_version = 10;
-
-        // Allocate a chunk of memory to store the QR code
-        uint8_t qrcodeBytes[qrcode_getBufferSize(qr_version)];
-
-        qrcode_initText(&qrcode, qrcodeBytes, qr_version, ECC_HIGH, qr_text_);
-
-        display.fill_rectangle(Rect(92, 97, 63, 63), Color::white());
-
-        for (uint8_t y = 0; y < qrcode.size; y++) {
-            for (uint8_t x = 0; x < qrcode.size; x++) {
-                if (qrcode_getModule(&qrcode, x, y)) {
-                    display.draw_pixel(Point(95 + x, 100 + y), Color::black());
-                }
+    for (uint8_t y = 0; y < qrcode.size; y++) {
+        for (uint8_t x = 0; x < qrcode.size; x++) {
+            if (qrcode_getModule(&qrcode, x, y)) {
+                display.fill_rectangle(Rect(63 + (x * 2), 71 + (y * 2), 2, 2), Color::black());
            }
        }
    }
@@ -163,19 +163,19 @@ void RSSI::paint(Painter& painter) {
    }
 }

-int16_t RSSI::get_min() {
+uint8_t RSSI::get_min() {
    return min_;
 }

-int16_t RSSI::get_avg() {
+uint8_t RSSI::get_avg() {
    return avg_;
 }

-int16_t RSSI::get_max() {
+uint8_t RSSI::get_max() {
    return max_;
 }

-int16_t RSSI::get_delta() {
+uint8_t RSSI::get_delta() {
    return max_ - min_;
 }

@@ -213,19 +213,19 @@ void RSSI::on_statistics_update(const RSSIStatistics& statistics) {
    set_dirty();
 }

-int16_t RSSIGraph::get_graph_min() {
+uint8_t RSSIGraph::get_graph_min() {
    return graph_min_;
 }

-int16_t RSSIGraph::get_graph_avg() {
+uint8_t RSSIGraph::get_graph_avg() {
    return graph_avg_;
 }

-int16_t RSSIGraph::get_graph_max() {
+uint8_t RSSIGraph::get_graph_max() {
    return graph_max_;
 }

-int16_t RSSIGraph::get_graph_delta() {
+uint8_t RSSIGraph::get_graph_delta() {
    return graph_max_ - graph_min_;
 }

@@ -50,10 +50,10 @@ class RSSI : public Widget {
    }

    // get last used/received min/avg/max/delta
-    int16_t get_min();
-    int16_t get_avg();
-    int16_t get_max();
-    int16_t get_delta();
+    uint8_t get_min();
+    uint8_t get_avg();
+    uint8_t get_max();
+    uint8_t get_delta();
    void set_vertical_rssi(bool enabled);
    void set_peak(bool enabled, size_t duration);

@@ -63,10 +63,10 @@ class RSSI : public Widget {
    bool on_touch(const TouchEvent event) override;

   private:
-    int16_t min_ = 0;
-    int16_t avg_ = 0;
-    int16_t max_ = 0;
-    int16_t peak_ = 0;
+    int8_t min_ = 0;
+    int8_t avg_ = 0;
+    int8_t max_ = 0;
+    int8_t peak_ = 0;
    size_t peak_duration_ = 0;
    bool instant_exec_{false};

@@ -115,10 +115,10 @@ class RSSIGraph : public Widget {
    void on_hide() override;
    void on_show() override;
    // get whole graph_list min/avg/max/delta
-    int16_t get_graph_min();
-    int16_t get_graph_avg();
-    int16_t get_graph_max();
-    int16_t get_graph_delta();
+    uint8_t get_graph_min();
+    uint8_t get_graph_avg();
+    uint8_t get_graph_max();
+    uint8_t get_graph_delta();

   private:
    int16_t graph_min_ = 0;
@@ -740,40 +740,49 @@ void addExternalItems(NavigationView& nav, app_location_t location, BtnGridView&

 /* ReceiversMenuView *****************************************************/

-ReceiversMenuView::ReceiversMenuView(NavigationView& nav) {
+ReceiversMenuView::ReceiversMenuView(NavigationView& nav)
+    : nav_(nav) {}
+
+void ReceiversMenuView::on_populate() {
    if (pmem::show_gui_return_icon()) {
-        add_item({"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }});
+        add_item({"..", Color::light_grey(), &bitmap_icon_previous, [this]() { nav_.pop(); }});
    }

-    add_apps(nav, *this, RX);
+    add_apps(nav_, *this, RX);

-    addExternalItems(nav, app_location_t::RX, *this);
+    addExternalItems(nav_, app_location_t::RX, *this);
 }

 /* TransmittersMenuView **************************************************/

-TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
+TransmittersMenuView::TransmittersMenuView(NavigationView& nav)
+    : nav_(nav) {}
+
+void TransmittersMenuView::on_populate() {
    if (pmem::show_gui_return_icon()) {
-        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
+        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [this]() { nav_.pop(); }}});
    }

-    add_apps(nav, *this, TX);
+    add_apps(nav_, *this, TX);

-    addExternalItems(nav, app_location_t::TX, *this);
+    addExternalItems(nav_, app_location_t::TX, *this);
 }

 /* UtilitiesMenuView *****************************************************/

-UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav) {
+UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav)
+    : nav_(nav) {
+    set_max_rows(2);  // allow wider buttons
+}
+
+void UtilitiesMenuView::on_populate() {
    if (pmem::show_gui_return_icon()) {
-        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
+        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [this]() { nav_.pop(); }}});
    }

-    add_apps(nav, *this, UTILITIES);
+    add_apps(nav_, *this, UTILITIES);

-    addExternalItems(nav, app_location_t::UTILITIES, *this);
-
-    set_max_rows(2);  // allow wider buttons
+    addExternalItems(nav_, app_location_t::UTILITIES, *this);
 }

 /* SystemMenuView ********************************************************/
@@ -790,15 +799,18 @@ void SystemMenuView::hackrf_mode(NavigationView& nav) {
        });
 }

-SystemMenuView::SystemMenuView(NavigationView& nav) {
-    add_apps(nav, *this, HOME);
-
-    add_item({"HackRF", Color::cyan(), &bitmap_icon_hackrf, [this, &nav]() { hackrf_mode(nav); }});
-
+SystemMenuView::SystemMenuView(NavigationView& nav)
+    : nav_(nav) {
    set_max_rows(2);  // allow wider buttons
    set_arrow_enabled(false);
 }

+void SystemMenuView::on_populate() {
+    add_apps(nav_, *this, HOME);
+
+    add_item({"HackRF", Color::cyan(), &bitmap_icon_hackrf, [this]() { hackrf_mode(nav_); }});
+}
+
 /* SystemView ************************************************************/

 SystemView::SystemView(
@@ -861,6 +873,7 @@ NavigationView* SystemView::get_navigation_view() {
 }

 void SystemView::toggle_overlay() {
+    static uint8_t last_perf_counter_status = shared_memory.request_m4_performance_counter;
    switch (++overlay_active) {
        case 1:
            this->add_child(&this->overlay);
@@ -879,7 +892,7 @@ void SystemView::toggle_overlay() {
        case 3:
            this->remove_child(&this->overlay2);
            this->set_dirty();
-            shared_memory.request_m4_performance_counter = 0;
+            shared_memory.request_m4_performance_counter = last_perf_counter_status;
            overlay_active = 0;
            break;
    }
@@ -320,10 +320,6 @@ class BMPView : public View {
    void focus() override;

   private:
-    Text text_info{
-        {4 * 8, 284, 20 * 8, 16},
-        "Version " VERSION_STRING};
-
    Button button_done{
        {240, 0, 1, 1},
        ""};
@@ -333,18 +329,30 @@ class ReceiversMenuView : public BtnGridView {
   public:
    ReceiversMenuView(NavigationView& nav);
    std::string title() const override { return "Receive"; };
+
+   private:
+    NavigationView& nav_;
+    void on_populate() override;
 };

 class TransmittersMenuView : public BtnGridView {
   public:
    TransmittersMenuView(NavigationView& nav);
    std::string title() const override { return "Transmit"; };
+
+   private:
+    NavigationView& nav_;
+    void on_populate() override;
 };

 class UtilitiesMenuView : public BtnGridView {
   public:
    UtilitiesMenuView(NavigationView& nav);
    std::string title() const override { return "Utilities"; };
+
+   private:
+    NavigationView& nav_;
+    void on_populate() override;
 };

 class SystemMenuView : public BtnGridView {
@@ -352,6 +360,8 @@ class SystemMenuView : public BtnGridView {
    SystemMenuView(NavigationView& nav);

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

@@ -205,6 +205,11 @@ void RecordView::start() {
        return;
    }

+    // check for geo data, if present append filename with _GEO
+    if (latitude != 0 && longitude != 0 && latitude < 200 && longitude < 200) {
+        base_path.append_filename(u"_GEO");
+    }
+
    std::unique_ptr<stream::Writer> writer;
    switch (file_type) {
        case FileType::WAV: {
@@ -223,7 +228,7 @@ void RecordView::start() {
        case FileType::RawS8:
        case FileType::RawS16: {
            const auto metadata_file_error = write_metadata_file(
-                get_metadata_path(base_path), {receiver_model.target_frequency(), sampling_rate});
+                get_metadata_path(base_path), {receiver_model.target_frequency(), sampling_rate, latitude, longitude, satinuse});
            if (metadata_file_error.is_valid()) {
                handle_error(metadata_file_error.value());
                return;
@@ -342,6 +347,12 @@ void RecordView::trim_capture() {
    trim_path = {};
 }

+void RecordView::on_gps(const GPSPosDataMessage* msg) {
+    latitude = msg->lat;
+    longitude = msg->lon;
+    satinuse = msg->satinuse;
+}
+
 void RecordView::handle_capture_thread_done(const File::Error error) {
    stop();
    if (error.code()) {
@@ -88,6 +88,7 @@ class RecordView : public View {

    OversampleRate get_oversample_rate(uint32_t sample_rate);

+    void on_gps(const GPSPosDataMessage* msg);
    // bool pitch_rssi_enabled = false;

    // Time Stamp
@@ -95,6 +96,10 @@ class RecordView : public View {
    bool filename_as_is = false;
    rtc::RTC datetime{};

+    float latitude = 0;  // for wardriwing with ext module
+    float longitude = 0;
+    uint8_t satinuse = 0;  // to see if there was enough sats used or not
+
    const std::filesystem::path filename_stem_pattern;
    const std::filesystem::path folder;
    FileType file_type;
@@ -147,6 +152,13 @@ class RecordView : public View {
            const auto message = *reinterpret_cast<const CaptureThreadDoneMessage*>(p);
            this->handle_capture_thread_done(message.error);
        }};
+
+    MessageHandlerRegistration message_handler_gps{
+        Message::ID::GPSPosData,
+        [this](Message* const p) {
+            const auto message = static_cast<const GPSPosDataMessage*>(p);
+            this->on_gps(message);
+        }};
 };

 } /* namespace ui */
@@ -211,6 +211,7 @@ static void cmd_screenframe(BaseSequentialStream* chp, int argc, char* argv[]) {
    chprintf(chp, "ok\r\n");
 }

+// calculates the 1 byte rgb value, and add 32 to it, so it can be a printable character.
 static char getChrFromRgb(uint8_t r, uint8_t g, uint8_t b) {
    uint8_t chR = r >> 6;  // 3bit
    uint8_t chG = g >> 6;  // 3bit
@@ -220,26 +221,36 @@ static char getChrFromRgb(uint8_t r, uint8_t g, uint8_t b) {
    return res;
 }

+// keep track of a buffer, and sends only if full. not only line by line
+static void screenbuffer_helper_add(BaseSequentialStream* chp, char* buffer, size_t& wp, char ch) {
+    buffer[wp++] = ch;
+    if (wp > USBSERIAL_BUFFERS_SIZE - 1) {
+        fillOBuffer(&((SerialUSBDriver*)chp)->oqueue, (const uint8_t*)buffer, USBSERIAL_BUFFERS_SIZE);
+        wp = 0;
+    }
+}
+
 // sends only 1 byte (printable only) per pixel, so around 96 colors
 static void cmd_screenframeshort(BaseSequentialStream* chp, int argc, char* argv[]) {
    (void)argc;
    (void)argv;
-
    auto evtd = getEventDispatcherInstance();
    evtd->enter_shell_working_mode();
-
+    char buffer[USBSERIAL_BUFFERS_SIZE];
+    size_t wp = 0;
    for (int y = 0; y < ui::screen_height; y++) {
        std::array<ui::ColorRGB888, ui::screen_width> row;
        portapack::display.read_pixels({0, y, ui::screen_width, 1}, row);
-        char buffer[242];
        for (int i = 0; i < 240; ++i) {
-            buffer[i] = getChrFromRgb(row[i].r, row[i].g, row[i].b);
+            screenbuffer_helper_add(chp, buffer, wp, getChrFromRgb(row[i].r, row[i].g, row[i].b));
        }
-        buffer[240] = '\r';
-        buffer[241] = '\n';
-        fillOBuffer(&((SerialUSBDriver*)chp)->oqueue, (const uint8_t*)buffer, 242);
+        screenbuffer_helper_add(chp, buffer, wp, '\r');
+        screenbuffer_helper_add(chp, buffer, wp, '\n');
+    }
+    if (wp > 0) {
+        // send remaining
+        fillOBuffer(&((SerialUSBDriver*)chp)->oqueue, (const uint8_t*)buffer, wp);
    }
-
    evtd->exit_shell_working_mode();
    chprintf(chp, "\r\nok\r\n");
 }
@@ -894,8 +905,8 @@ static void cmd_cpld_read(BaseSequentialStream* chp, int argc, char* argv[]) {
 }

 static void cmd_gotgps(BaseSequentialStream* chp, int argc, char* argv[]) {
-    const char* usage = "usage: gotgps <lat> <lon> [altitude] [speed]\r\n";
-    if (argc < 2 || argc > 4) {
+    const char* usage = "usage: gotgps <lat> <lon> [altitude] [speed] [satinuse]\r\n";
+    if (argc < 2 || argc > 5) {
        chprintf(chp, usage);
        return;
    }
@@ -903,21 +914,43 @@ static void cmd_gotgps(BaseSequentialStream* chp, int argc, char* argv[]) {
    float lon = atof(argv[1]);
    int32_t altitude = 0;
    int32_t speed = 0;
+    uint8_t satinuse = 0;
    if (argc >= 3) altitude = strtol(argv[2], NULL, 10);
    if (argc >= 4) speed = strtol(argv[3], NULL, 10);
-    GPSPosDataMessage msg{lat, lon, altitude, speed};
+    if (argc >= 5) satinuse = strtol(argv[4], NULL, 10);
+    GPSPosDataMessage msg{lat, lon, altitude, speed, satinuse};
    EventDispatcher::send_message(msg);
    chprintf(chp, "ok\r\n");
 }

 static void cmd_gotorientation(BaseSequentialStream* chp, int argc, char* argv[]) {
-    const char* usage = "usage: gotorientation <angle>\r\n";
-    if (argc != 1) {
+    const char* usage = "usage: gotorientation <angle> [tilt]\r\n";
+    if (argc != 1 && argc != 2) {
        chprintf(chp, usage);
        return;
    }
    uint16_t angle = strtol(argv[0], NULL, 10);
-    OrientationDataMessage msg{angle};
+    int16_t tilt = 400;
+    if (argc >= 2) tilt = strtol(argv[1], NULL, 10);
+    OrientationDataMessage msg{angle, tilt};
+    EventDispatcher::send_message(msg);
+    chprintf(chp, "ok\r\n");
+}
+
+static void cmd_gotenv(BaseSequentialStream* chp, int argc, char* argv[]) {
+    const char* usage = "usage: gotenv <temperature> [humidity] [pressure]  [light]\r\n";
+    if (argc < 1 || argc > 4) {
+        chprintf(chp, usage);
+        return;
+    }
+    float temp = atof(argv[0]);
+    float humi = 0;
+    float pressure = 0;
+    uint16_t light = 0;
+    if (argc > 1) humi = atof(argv[1]);
+    if (argc > 2) pressure = atof(argv[2]);
+    if (argc > 3) light = strtol(argv[3], NULL, 10);
+    EnvironmentDataMessage msg{temp, humi, pressure, light};
    EventDispatcher::send_message(msg);
    chprintf(chp, "ok\r\n");
 }
@@ -1044,6 +1077,7 @@ static const ShellCommand commands[] = {
    {"appstart", cmd_appstart},
    {"gotgps", cmd_gotgps},
    {"gotorientation", cmd_gotorientation},
+    {"gotenv", cmd_gotenv},
    {"sysinfo", cmd_sysinfo},
    {"radioinfo", cmd_radioinfo},
    {"pmemreset", cmd_pmemreset},
@@ -26,6 +26,8 @@
 #include "string_format.hpp"
 #include <cstring>

+#include "crc.hpp"
+
 static File* shell_file = nullptr;

 static bool report_on_error(BaseSequentialStream* chp, File::Error& error) {
@@ -97,7 +99,7 @@ void cmd_sd_mkdir(BaseSequentialStream* chp, int argc, char* argv[]) {

    auto path = path_from_string8(argv[0]);

-    if (!std::filesystem::is_directory(path)) {
+    if (std::filesystem::is_directory(path)) {
        chprintf(chp, "directory already exists.\r\n");
        return;
    }
@@ -371,3 +373,34 @@ void cmd_sd_write_binary(BaseSequentialStream* chp, int argc, char* argv[]) {

    chprintf(chp, "ok\r\n");
 }
+
+void cmd_sd_crc32(BaseSequentialStream* chp, int argc, char* argv[]) {
+    if (argc != 1) {
+        chprintf(chp, "usage: crc32 <path>\r\n");
+        return;
+    }
+
+    auto path = path_from_string8(argv[0]);
+    File* crc_file = new File();
+    auto error = crc_file->open(path, true, false);
+    if (report_on_error(chp, error)) return;
+
+    uint8_t buffer[64];
+    CRC<32> crc{0x04c11db7, 0xffffffff, 0xffffffff};
+
+    while (true) {
+        auto bytes_read = crc_file->read(buffer, 64);
+        if (report_on_error(chp, bytes_read)) return;
+
+        if (bytes_read.value() > 0) {
+            crc.process_bytes((void*)buffer, bytes_read.value());
+        }
+
+        if (64 != bytes_read.value()) {
+            chprintf(chp, "CRC32: 0x%08X\r\n", crc.checksum());
+            return;
+        }
+    }
+
+    delete crc_file;
+}
@@ -42,6 +42,7 @@ void cmd_sd_read(BaseSequentialStream* chp, int argc, char* argv[]);
 void cmd_sd_read_binary(BaseSequentialStream* chp, int argc, char* argv[]);
 void cmd_sd_write(BaseSequentialStream* chp, int argc, char* argv[]);
 void cmd_sd_write_binary(BaseSequentialStream* chp, int argc, char* argv[]);
+void cmd_sd_crc32(BaseSequentialStream* chp, int argc, char* argv[]);

 static std::filesystem::path path_from_string8(char* path) {
    std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> conv;
@@ -62,6 +63,7 @@ static std::filesystem::path path_from_string8(char* path) {
    {"ftell", cmd_sd_tell},            \
    {"fread", cmd_sd_read},            \
    {"frb", cmd_sd_read_binary},       \
-    {"fwrite", cmd_sd_write},           \
-    {"fwb", cmd_sd_write_binary}
+    {"fwrite", cmd_sd_write},          \
+    {"fwb", cmd_sd_write_binary},      \
+    {"crc32", cmd_sd_crc32}
 // clang-format on
@@ -290,7 +290,7 @@ macro(DeclareTargets chunk_tag name)
 			DEPENDS ${PROJECT_NAME}.elf ${MAKE_IMAGE_CHUNK}
 			VERBATIM
 		)
-		
+
 		set(BASEBAND_IMAGES ${BASEBAND_IMAGES} ${PROJECT_NAME}.img)

 	else()
@@ -434,12 +434,12 @@ set(MODE_CPPSRC
 )
 DeclareTargets(PNFM nfm_audio)

-### No op
-
-set(MODE_CPPSRC
-	proc_noop.cpp
-)
-DeclareTargets(PNOP no_operation)
+#### No op
+#
+#set(MODE_CPPSRC
+#	proc_noop.cpp
+#)
+#DeclareTargets(PNOP no_operation)

 ### OOK

@@ -519,7 +519,7 @@ set(MODE_CPPSRC
 )
 DeclareTargets(PWFM wfm_audio)

-### SubGhz Decoders 
+### SubGhz Decoders

 set(MODE_CPPSRC
 	proc_subghzd.cpp
@@ -554,7 +554,7 @@ set(MODE_INCDIR
 )
 set(MODE_CPPSRC
 	sd_over_usb/proc_sd_over_usb.cpp
-	
+
 	sd_over_usb/scsi.c
 	sd_over_usb/diskio.c
 	sd_over_usb/sd_over_usb.c
@@ -672,7 +672,7 @@ set(BASEBAND_IMAGES ${BASEBAND_IMAGES} terminator.img)
 #######################################################################

 project(baseband)
-	
+
 add_custom_command(
 	OUTPUT ${PROJECT_NAME}.img
 	COMMAND cat ${BASEBAND_IMAGES} > ${PROJECT_NAME}.img
@@ -25,9 +25,11 @@
 #include <cstdint>
 #include <cstddef>
 #include <array>
+#include <cstring>

 #include "hal.h"
 #include "gpdma.hpp"
+#include "tone_gen.hpp"

 using namespace lpc43xx;

@@ -36,6 +38,8 @@ using namespace lpc43xx;
 namespace audio {
 namespace dma {

+ToneGen tone_gen{};
+
 constexpr uint32_t gpdma_ahb_master_peripheral = 1;
 constexpr uint32_t gpdma_ahb_master_memory = 0;
 constexpr uint32_t gpdma_ahb_master_lli_fetch = 0;
@@ -145,9 +149,14 @@ static volatile const gpdma::channel::LLI* tx_next_lli = nullptr;
 static volatile const gpdma::channel::LLI* rx_next_lli = nullptr;

 static bool single_tx_buffer = false;
+static uint32_t beep_duration_downcounter = 0;

 static void tx_transfer_complete() {
    tx_next_lli = gpdma_channel_i2s0_tx.next_lli();
+
+    if (beep_duration_downcounter != 0)
+        if (--beep_duration_downcounter == 0)
+            beep_stop();
 }

 static void tx_error() {
@@ -162,14 +171,6 @@ static void rx_error() {
    disable();
 }

-void init() {
-    gpdma_channel_i2s0_tx.set_handlers(tx_transfer_complete, tx_error);
-    gpdma_channel_i2s0_rx.set_handlers(rx_transfer_complete, rx_error);
-
-    // LPC_GPDMA->SYNC |= (1 << gpdma_rx_peripheral);
-    // LPC_GPDMA->SYNC |= (1 << gpdma_tx_peripheral);
-}
-
 static void configure_tx() {
    const auto peripheral = reinterpret_cast<uint32_t>(&LPC_I2S0->TXFIFO);
    const auto control_value = control_tx(transfer_bytes);
@@ -194,22 +195,32 @@ static void configure_rx() {
    }
 }

-void configure() {
-    configure_tx();
-    configure_rx();
+static void enable_tx() {
+    const auto gpdma_config_tx = config_tx();
+    gpdma_channel_i2s0_tx.configure(lli_tx_loop[0], gpdma_config_tx);
+    gpdma_channel_i2s0_tx.enable();
 }

-void enable() {
-    const auto gpdma_config_tx = config_tx();
+static void enable_rx() {
    const auto gpdma_config_rx = config_rx();
-
-    gpdma_channel_i2s0_tx.configure(lli_tx_loop[0], gpdma_config_tx);
    gpdma_channel_i2s0_rx.configure(lli_rx_loop[0], gpdma_config_rx);
-
-    gpdma_channel_i2s0_tx.enable();
    gpdma_channel_i2s0_rx.enable();
 }

+void init_audio_out() {
+    gpdma_channel_i2s0_tx.set_handlers(tx_transfer_complete, tx_error);
+    // LPC_GPDMA->SYNC |= (1 << gpdma_tx_peripheral);
+    configure_tx();
+    enable_tx();
+}
+
+void init_audio_in() {
+    gpdma_channel_i2s0_rx.set_handlers(rx_transfer_complete, rx_error);
+    // LPC_GPDMA->SYNC |= (1 << gpdma_rx_peripheral);
+    configure_rx();
+    enable_rx();
+}
+
 void disable() {
    gpdma_channel_i2s0_tx.disable();
    gpdma_channel_i2s0_rx.disable();
@@ -217,12 +228,54 @@ void disable() {

 void shrink_tx_buffer(bool shrink) {
    single_tx_buffer = shrink;
+
+    if (transfers_per_buffer == 1)
+        return;
+
    if (single_tx_buffer)
        lli_tx_loop[0].lli = lli_pointer(&lli_tx_loop[0]);
    else
        lli_tx_loop[0].lli = lli_pointer(&lli_tx_loop[1]);
 }

+void beep_start(uint32_t freq, uint32_t sample_rate, uint32_t beep_duration_ms) {
+    // Prevent divide-by-0
+    if (freq == 0 || sample_rate == 0)
+        return;
+
+    // Fill entire buffer with sine waves
+    tone_gen.configure_beep(freq, sample_rate);
+    for (size_t i = 0; i < buffer_samples; i++)
+        buffer_tx[i].left = buffer_tx[i].right = tone_gen.process_beep();
+
+    // Try to adjust DMA transfer count to align with full sine waves for a better tone
+    float samples_per_sine_wave = float(sample_rate) / freq;
+    uint32_t sine_waves_per_buffer = buffer_samples / samples_per_sine_wave;
+    size_t sample_count = (sine_waves_per_buffer == 0) ? buffer_samples : sine_waves_per_buffer * samples_per_sine_wave + 0.5;
+
+    // Use single larger transfer buffer with sample count determined above
+    lli_tx_loop[0].lli = lli_pointer(&lli_tx_loop[0]);
+    lli_tx_loop[0].control = control_tx(sample_count * sizeof(sample_t));
+
+    // Convert duration ms to number of buffers to send before stopping
+    // NB: beep_duration_ms==0 means beep continuously until stopped
+    uint32_t beep_interrupt_count = beep_duration_ms * sample_rate / (1000 * sample_count);
+    if ((beep_duration_ms != 0) && (beep_interrupt_count == 0))
+        beep_interrupt_count = 1;
+    beep_duration_downcounter = beep_interrupt_count;
+}
+
+void beep_stop() {
+    // Clear audio DMA buffer
+    memset(&buffer_tx, 0, buffer_bytes);
+
+    // Restore DMA linked list to use multiple smaller buffers
+    lli_tx_loop[0].control = control_tx(transfer_bytes);
+    if (!single_tx_buffer && (transfers_per_buffer > 1)) {
+        lli_tx_loop[0].lli = lli_pointer(&lli_tx_loop[1]);
+    }
+}
+
 buffer_t tx_empty_buffer() {
    const auto next_lli = tx_next_lli;
    if (next_lli) {
@@ -43,11 +43,12 @@ using buffer_t = buffer_t<sample_t>;

 namespace dma {

-void init();
-void configure();
-void enable();
+void init_audio_in();
+void init_audio_out();
 void disable();
 void shrink_tx_buffer(bool shrink);
+void beep_start(uint32_t freq, uint32_t sample_rate, uint32_t beep_duration_ms);
+void beep_stop();

 audio::buffer_t tx_empty_buffer();
 audio::buffer_t rx_empty_buffer();
@@ -27,14 +27,10 @@
 #include "portapack_dma.hpp"

 #include "gpdma.hpp"
-
 #include "audio_dma.hpp"

 static void init() {
-    audio::dma::init();
-    audio::dma::configure();
-    audio::dma::enable();
-
+    // Audio DMA initialization was moved to baseband proc's that actually use DMA audio, to save memory.
    nvicEnableVector(DMA_IRQn, CORTEX_PRIORITY_MASK(LPC_DMA_IRQ_PRIORITY));
 }

@@ -70,6 +66,8 @@ void __late_init(void) {
 void _default_exit(void) {
    // TODO: Is this complete?

+    audio::dma::disable();
+
    nvicDisableVector(DMA_IRQn);

    chSysDisable();
@@ -23,6 +23,8 @@
 #include "proc_afskrx.hpp"
 #include "portapack_shared_memory.hpp"

+#include "audio_dma.hpp"
+
 #include "event_m4.hpp"

 void AFSKRxProcessor::execute(const buffer_c8_t& buffer) {
@@ -181,6 +183,8 @@ void AFSKRxProcessor::configure(const AFSKRxConfigureMessage& message) {
 }

 int main() {
+    audio::dma::init_audio_out();
+
    EventDispatcher event_dispatcher{std::make_unique<AFSKRxProcessor>()};
    event_dispatcher.run();
    return 0;
@@ -22,6 +22,7 @@
 #include "proc_am_audio.hpp"

 #include "audio_output.hpp"
+#include "audio_dma.hpp"

 #include "event_m4.hpp"

@@ -112,6 +113,8 @@ void NarrowbandAMAudio::capture_config(const CaptureConfigMessage& message) {
 }

 int main() {
+    audio::dma::init_audio_out();
+
    EventDispatcher event_dispatcher{std::make_unique<NarrowbandAMAudio>()};
    event_dispatcher.run();
    return 0;
@@ -23,6 +23,8 @@
 #include "proc_aprsrx.hpp"
 #include "portapack_shared_memory.hpp"

+#include "audio_dma.hpp"
+
 #include "event_m4.hpp"

 #include "stdio.h"
@@ -244,6 +246,8 @@ void APRSRxProcessor::configure(const APRSRxConfigureMessage& message) {
 }

 int main() {
+    audio::dma::init_audio_out();
+
    EventDispatcher event_dispatcher{std::make_unique<APRSRxProcessor>()};
    event_dispatcher.run();
    return 0;
@@ -24,6 +24,7 @@
 #include "portapack_shared_memory.hpp"
 #include "sine_table_int8.hpp"
 #include "event_m4.hpp"
+#include "audio_dma.hpp"

 #include <cstdint>

@@ -139,6 +140,8 @@ void AudioTXProcessor::sample_rate_config(const SampleRateConfigMessage& message
 }

 int main() {
+    audio::dma::init_audio_out();
+
    EventDispatcher event_dispatcher{std::make_unique<AudioTXProcessor>()};
    event_dispatcher.run();
    return 0;
@@ -25,6 +25,7 @@
 #include "sine_table_int8.hpp"
 #include "tonesets.hpp"
 #include "event_m4.hpp"
+#include "audio_dma.hpp"

 #include <cstdint>

@@ -154,7 +155,7 @@ void MicTXProcessor::on_message(const Message* const msg) {
            break;

        case Message::ID::RequestSignal:
-            if (request_message.signal == RequestSignalMessage::Signal::BeepRequest) {
+            if (request_message.signal == RequestSignalMessage::Signal::RogerBeepRequest) {
                beep_index = 0;
                beep_timer = 0;
                play_beep = true;
@@ -167,6 +168,8 @@ void MicTXProcessor::on_message(const Message* const msg) {
 }

 int main() {
+    audio::dma::init_audio_in();
+
    EventDispatcher event_dispatcher{std::make_unique<MicTXProcessor>()};
    event_dispatcher.run();
    return 0;
@@ -24,6 +24,8 @@
 #include "sine_table_int8.hpp"
 #include "portapack_shared_memory.hpp"

+#include "audio_dma.hpp"
+
 #include "event_m4.hpp"

 #include <cstdint>
@@ -174,6 +176,8 @@ void NarrowbandFMAudio::capture_config(const CaptureConfigMessage& message) {
 }

 int main() {
+    audio::dma::init_audio_out();
+
    EventDispatcher event_dispatcher{std::make_unique<NarrowbandFMAudio>()};
    event_dispatcher.run();
    return 0;
@@ -27,6 +27,7 @@

 #include "dsp_iir_config.hpp"
 #include "event_m4.hpp"
+#include "audio_dma.hpp"

 #include <algorithm>
 #include <cmath>
@@ -530,6 +531,8 @@ uint32_t POCSAGProcessor::getRate() const {
 //
 // ====================================================================
 int main() {
+    audio::dma::init_audio_out();
+
    EventDispatcher event_dispatcher{std::make_unique<POCSAGProcessor>()};
    event_dispatcher.run();
    return 0;
@@ -26,6 +26,7 @@
 #include "proc_pocsag2.hpp"

 #include "event_m4.hpp"
+#include "audio_dma.hpp"

 #include <algorithm>
 #include <cmath>
@@ -416,6 +417,8 @@ void POCSAGProcessor::send_packet() {
 /* main **************************************************/

 int main() {
+    audio::dma::init_audio_out();
+
    EventDispatcher event_dispatcher{std::make_unique<POCSAGProcessor>()};
    event_dispatcher.run();
    return 0;
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -26,15 +27,12 @@

 #include "event_m4.hpp"

-#include "audio_output.hpp"
+#include "audio_dma.hpp"

 SondeProcessor::SondeProcessor() {
    decim_0.configure(taps_11k0_decim_0.taps);
    decim_1.configure(taps_11k0_decim_1.taps);

-    audio_output.configure(false);
-
-    tone_gen.configure(BEEP_BASE_FREQ, 1.0, ToneGen::tone_type::sine, AUDIO_SAMPLE_RATE);
    baseband_thread.start();
 }

@@ -54,48 +52,20 @@ void SondeProcessor::execute(const buffer_c8_t& buffer) {
            clock_recovery_fsk_4800(mf.get_output());
        }
    }
-
-    if (pitch_rssi_enabled) {
-        if (beep_play) {
-            // if we let the buffer underrun, for some reason
-            // once it starts looping it ignores zero (silence)
-            // samples, so we need to keep feeding the buffer
-            // and not be able to take advantage of the circular
-            // buffer loop:
-            // beep_play = false;
-            generate_beep();
-        }
-
-        if (silence_play) {
-            // silence_play = false;
-            generate_silence();
-        }
-    }
 }

 void SondeProcessor::on_message(const Message* const msg) {
    switch (msg->id) {
        case Message::ID::RequestSignal:
-            if ((*reinterpret_cast<const RequestSignalMessage*>(msg)).signal == RequestSignalMessage::Signal::BeepRequest) {
-                float rssi_ratio = (float)last_rssi / (float)RSSI_CEILING;
-                int beep_duration = 0;
+            on_signal_message(*reinterpret_cast<const RequestSignalMessage*>(msg));
+            break;

-                if (rssi_ratio <= PROPORTIONAL_BEEP_THRES) {
-                    beep_duration = BEEP_MIN_DURATION;
-                } else if (rssi_ratio < 1) {
-                    beep_duration = (int)rssi_ratio * BEEP_DURATION_RANGE + BEEP_MIN_DURATION;
-                } else {
-                    beep_duration = BEEP_DURATION_RANGE + BEEP_MIN_DURATION;
-                }
-
-                play_beep();
-                chThdSleepMilliseconds(beep_duration);
-                stop_beep();
-            }
+        case Message::ID::AudioBeep:
+            on_beep_message(*reinterpret_cast<const AudioBeepMessage*>(msg));
            break;

        case Message::ID::PitchRSSIConfigure:
-            pitch_rssi_config(*reinterpret_cast<const PitchRSSIConfigureMessage*>(msg));
+            on_pitch_rssi_config(*reinterpret_cast<const PitchRSSIConfigureMessage*>(msg));
            break;

        default:
@@ -103,44 +73,37 @@ void SondeProcessor::on_message(const Message* const msg) {
    }
 }

-void SondeProcessor::play_beep() {
-    beep_play = true;
-    silence_play = false;
-}
+void SondeProcessor::on_signal_message(const RequestSignalMessage& message) {
+    if (message.signal == RequestSignalMessage::Signal::RSSIBeepRequest) {
+        float rssi_ratio = (float)last_rssi / RSSI_CEILING;
+        uint32_t beep_duration = 0;

-void SondeProcessor::stop_beep() {
-    beep_play = false;
-    silence_play = true;
-}
+        if (rssi_ratio <= PROPORTIONAL_BEEP_THRES) {
+            beep_duration = BEEP_MIN_DURATION;
+        } else if (rssi_ratio < 1) {
+            beep_duration = rssi_ratio * BEEP_DURATION_RANGE + BEEP_MIN_DURATION;
+        } else {
+            beep_duration = BEEP_DURATION_RANGE + BEEP_MIN_DURATION;
+        }

-void SondeProcessor::generate_beep() {
-    // here we let the samples be created using the ToneGen class:
-
-    for (uint8_t i = 0; i < sizeof(audio_buffer.p); i++) {
-        audio_buffer.p[i] = (int16_t)((tone_gen.process(0) >> 16) & 0x0000FFFF);
+        audio::dma::beep_start(beep_freq, AUDIO_SAMPLE_RATE, beep_duration);
    }
-
-    audio_output.write(audio_buffer);
 }

-void SondeProcessor::generate_silence() {
-    for (uint8_t i = 0; i < sizeof(audio_buffer.p); i++) {
-        audio_buffer.p[i] = 0;
-    }
-
-    audio_output.write(audio_buffer);
+void SondeProcessor::on_beep_message(const AudioBeepMessage& message) {
+    audio::dma::beep_start(message.freq, AUDIO_SAMPLE_RATE, message.duration_ms);
 }

-void SondeProcessor::pitch_rssi_config(const PitchRSSIConfigureMessage& message) {
+void SondeProcessor::on_pitch_rssi_config(const PitchRSSIConfigureMessage& message) {
    pitch_rssi_enabled = message.enabled;

-    uint32_t freq = (int)((float)message.rssi * (float)RSSI_PITCH_WEIGHT + (float)BEEP_BASE_FREQ);
-
+    beep_freq = message.rssi * RSSI_PITCH_WEIGHT + BEEP_BASE_FREQ;
    last_rssi = message.rssi;
-    tone_gen.configure(freq, 1.0, ToneGen::tone_type::sine, AUDIO_SAMPLE_RATE);
 }

 int main() {
+    audio::dma::init_audio_out();
+
    EventDispatcher event_dispatcher{std::make_unique<SondeProcessor>()};
    event_dispatcher.run();

@@ -2,6 +2,7 @@
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
 * Copyright (C) 2014 zilog80
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -88,9 +89,6 @@
 #include "message.hpp"
 #include "portapack_shared_memory.hpp"

-#include "audio_output.hpp"
-#include "tone_gen.hpp"
-
 #include "buffer.hpp"

 #include <cstdint>
@@ -99,10 +97,12 @@

 #define BEEP_MIN_DURATION 60
 #define BEEP_DURATION_RANGE 100
-#define BEEP_BASE_FREQ 200
+#define BEEP_BASE_FREQ 400  // Lowest audible freq for some PortaPack speakers
+#define BEEP_MAX_FREQ 8000  // Highest audible freq for some PortaPack speakers
+#define BEEP_SIMPLE_FREQ 1000
 #define RSSI_CEILING 1000
 #define PROPORTIONAL_BEEP_THRES 0.8
-#define RSSI_PITCH_WEIGHT 0.5
+#define RSSI_PITCH_WEIGHT (float(BEEP_MAX_FREQ - BEEP_BASE_FREQ) / RSSI_CEILING)
 #define AUDIO_SAMPLE_RATE 24000

 class SondeProcessor : public BasebandProcessor {
@@ -115,21 +115,10 @@ class SondeProcessor : public BasebandProcessor {
   private:
    static constexpr size_t baseband_fs = 2457600;

-    std::array<int16_t, 32> audio{};
-
-    const buffer_s16_t audio_buffer{
-        (int16_t*)audio.data(),
-        sizeof(audio) / sizeof(int16_t)};
-
-    AudioOutput audio_output{};
-
-    bool beep_play{false};
-    bool silence_play{false};
    bool pitch_rssi_enabled{false};

    uint32_t last_rssi{0};
-
-    ToneGen tone_gen{};
+    uint32_t beep_freq{0};

    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
@@ -181,22 +170,9 @@ class SondeProcessor : public BasebandProcessor {
        baseband_fs, this, baseband::Direction::Receive, /*auto_start*/ false};
    RSSIThread rssi_thread{};

-    void play_beep();
-    void stop_beep();
-
-    /**
-     * Used for filling the audio buffer with the waveform
-     * generated by the ToneGen class:
-     *
-     */
-    void generate_beep();
-
-    /**
-     * Used for filling the audio buffer with silence:
-     */
-    void generate_silence();
-
-    void pitch_rssi_config(const PitchRSSIConfigureMessage& message);
+    void on_signal_message(const RequestSignalMessage& message);
+    void on_beep_message(const AudioBeepMessage& message);
+    void on_pitch_rssi_config(const PitchRSSIConfigureMessage& message);
 };

 #endif /*__PROC_ERT_H__*/
@@ -23,6 +23,7 @@
 #include "proc_tones.hpp"
 #include "sine_table_int8.hpp"
 #include "event_m4.hpp"
+#include "audio_dma.hpp"

 #include <cstdint>

@@ -154,6 +155,8 @@ void TonesProcessor::on_message(const Message* const p) {
 }

 int main() {
+    audio::dma::init_audio_out();
+
    EventDispatcher event_dispatcher{std::make_unique<TonesProcessor>()};
    event_dispatcher.run();
    return 0;
@@ -26,6 +26,7 @@
 #include "audio_output.hpp"
 #include "dsp_fft.hpp"
 #include "event_m4.hpp"
+#include "audio_dma.hpp"

 #include <cstdint>

@@ -188,6 +189,8 @@ void WidebandFMAudio::capture_config(const CaptureConfigMessage& message) {
 }

 int main() {
+    audio::dma::init_audio_out();
+
    EventDispatcher event_dispatcher{std::make_unique<WidebandFMAudio>()};
    event_dispatcher.run();
    return 0;
@@ -20,6 +20,7 @@
 */

 #include "proc_wideband_spectrum.hpp"
+#include "audio_dma.hpp"

 #include "event_m4.hpp"

@@ -82,6 +83,8 @@ void WidebandSpectrum::on_message(const Message* const msg) {
 }

 int main() {
+    audio::dma::init_audio_out();  // for AudioRX app (enables audio output while this baseband image is running)
+
    EventDispatcher event_dispatcher{std::make_unique<WidebandSpectrum>()};
    event_dispatcher.run();
    return 0;
@@ -22,12 +22,12 @@
 #ifndef __RSSI_STATS_COLLECTOR_H__
 #define __RSSI_STATS_COLLECTOR_H__

-#include "rssi.hpp"
-#include "message.hpp"
-
 #include <cstdint>
 #include <cstddef>

+#include "rssi.hpp"
+#include "message.hpp"
+
 class RSSIStatisticsCollector {
   public:
    template <typename Callback>
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2024 Mark Thompson
 *
 * This file is part of PortaPack.
 *
@@ -23,53 +24,19 @@
 #include "tone_gen.hpp"
 #include "sine_table_int8.hpp"

-/*
-int32_t ToneGen::tone_sine() {
-        //  TODO :  Added for Sonde App. We keep it by now , but it needs to be reviewed in Sonde
-        //  Hoepfully we can manage without it , same as previous fw  1.3.1
-        int32_t tone_sample = sine_table_i8[tone_phase_] * 0x1000000;
-        tone_phase_ += delta_;
-
-        return tone_sample;
+// Functions for audio beep (used by Sonde RSSI)
+void ToneGen::configure_beep(const uint32_t freq, const uint32_t sample_rate) {
+    f_delta_ = (float)(freq * sizeof(sine_table_i8)) / sample_rate;
+    f_tone_phase_ = 0.0;
 }
-*/

-int32_t ToneGen::tone_square() {
-    // TODO :  Added for Sonde App. We keep it by now , but it needs to be reviewed in Sonde
-    int32_t tone_sample = 0;
-
-    if (tone_phase_ < (UINT32_MAX / 2)) {
-        tone_sample = INT32_MAX;
-    } else {
-        tone_sample = INT32_MIN;
-    }
-
-    tone_phase_ += delta_;
+int16_t ToneGen::process_beep() {
+    int16_t tone_sample = sine_table_i8[(uint32_t)f_tone_phase_ & 0xFF] * 256;
+    f_tone_phase_ += f_delta_;

    return tone_sample;
 }

-/*
-void ToneGen::configure(const uint32_t delta, const float tone_mix_weight) {
-        //  Confirmed !  It is not working well in the fw 1.4.4  Mic App , CTCSS generation, (but added for Sonde App)
-        //  I Think it should be deleted or modified but not use it as it is in Mic App .
-
-        delta_ = (uint8_t) ((delta & 0xFF000000U) >> 24);
-        delta_ = delta;
-        tone_mix_weight_ = tone_mix_weight;
-        input_mix_weight_ = 1.0 - tone_mix_weight;
-        current_tone_type_ = sine;
-}
-*/
-
-void ToneGen::configure(const uint32_t freq, const float tone_mix_weight, const tone_type tone_type, const uint32_t sample_rate) {
-    // TODO :  Added for Sonde App. We keep it by now to avoid compile errors, but it needs to be reviewed in Sonde
-    delta_ = (uint8_t)((freq * sizeof(sine_table_i8)) / sample_rate);
-    tone_mix_weight_ = tone_mix_weight;
-    input_mix_weight_ = 1.0 - tone_mix_weight;
-    current_tone_type_ = tone_type;
-}
-
 // ----Original available core SW code from fw 1.3.1 ,  Working also well in Mic App CTCSS Gen from fw 1.4.0 onwards

 // Original direct-look-up synthesis algorithm with Fractional delta phase. It is OK
@@ -78,6 +45,7 @@ void ToneGen::configure(const uint32_t freq, const float tone_mix_weight, const

 void ToneGen::configure(const uint32_t delta, const float tone_mix_weight) {
    delta_ = delta;
+    tone_phase_ = 0;
    tone_mix_weight_ = tone_mix_weight;
    input_mix_weight_ = 1.0 - tone_mix_weight;
 }
@@ -90,17 +58,4 @@ int32_t ToneGen::process(const int32_t sample_in) {
    tone_phase_ += delta_;

    return (sample_in * input_mix_weight_) + (tone_sample * tone_mix_weight_);
-}
-// -------------------------------------------------------------
-
-int32_t ToneGen::process_square(const int32_t sample_in) {
-    // TODO :  Added for Sonde App. We keep it by now , but it needs to be reviewed in Sonde
-    if (!delta_)
-        return sample_in;
-
-    int32_t tone_sample = 0;
-
-    tone_sample = tone_square();
-
-    return (sample_in * input_mix_weight_) + (tone_sample * tone_mix_weight_);
-}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Thompson	692644d214	Radiosonde QR code fixes (#2021 ) * Increase size of small QR Code * Fixed QR code lat/lon for iPhone * Show current geopos location on map * Deprecate large QR code	2024-03-21 10:56:06 -05:00
Mark Thompson	4aeaf94d2d	Radiosonde beep tone tweaks (#2020 ) * Tweak RSSI audio beep frequency range * Clang & changed min freq * Save beep/log/crc settings in .ini file * Update copyright string * Added generic audio_beep message	2024-03-21 10:14:54 +01:00
Totoo	8391ca8052	Fox hunt (#2015 ) * foxhunt_rx	2024-03-19 21:33:53 +01:00
Mark Thompson	807c76346b	Improved audio beep tone (#2014 ) * Improved sine wave beep tone * Prevent divide-by-zero	2024-03-19 15:30:05 -05:00
Mark Thompson	308573918c	Added a beep duration parameter (#2013 )	2024-03-19 18:23:06 +01:00
Mark Thompson	74442f197d	Fixed Sonde RSSI "Beep" (#2012 )	2024-03-19 10:53:55 +01:00
Mark Thompson	b53c8e1f80	Stop audio DMA in baseband::shutdown() (#2011 )	2024-03-19 05:58:23 +01:00
Mark Thompson	c5f73cf8f4	Darken FileMan button colors for visibility (#2010 )	2024-03-19 05:56:23 +01:00
Totoo	c1bf2620c7	Bt namespam (#2009 ) * Add random names	2024-03-18 21:45:45 +01:00
Mark Thompson	8383363e74	Preserve radio mode when updating iq_tx_phase_cal (#2008 )	2024-03-18 21:45:02 +01:00
Alexandros Andreou	6e34343bde	added all and all-safe attack types to blespam (#2003 )	2024-03-18 09:13:10 +01:00
gullradriel	01e4ff65a2	fix butngrid/capture and fix contributor name (#1995 ) * fixing contributor name * used clear instead of swap --------- Co-authored-by: GullCode <gullradriel@hotmail.com>	2024-03-16 00:39:34 +08:00
Totoo	9e40e38f07	Record gps lat, lon, satinuse from recorder app if there was gps signal. (#1992 ) * Record gps lat, lon, satinuse from recorder app if there was gps signal. * Add _GEO to filename that has geotag	2024-03-15 21:56:20 +08:00
not tre mann	181624daf1	lambda the flash util menu add item code (#1993 ) * lambda the flash util menu add code * clean up	2024-03-14 22:56:55 -05:00
Mark Thompson	f0614c882b	File manager "Clean" button tweaks (#1990 ) * File Manager "clean" button tweaks * Add files via upload	2024-03-13 22:42:40 +01:00
not tre mann	14f42d1fe8	support "clean" files (#1983 ) * init for clean files * textual * icons position	2024-03-13 18:06:14 +01:00
Mark Thompson	999f9e2ded	Fix #1982 (enable DMA interrupt for all apps) (#1987 )	2024-03-13 16:57:35 +01:00
Mark Thompson	61dc8a0225	Disabled unused baseband "no-op" process (#1986 )	2024-03-13 16:08:52 +01:00
Mark Thompson	0b2d5f75cc	Start audio DMA only in apps that use audio (#1982 ) * Start audio DMA only in apps that use audio * Rename main.cpp to main.cpp.unuse * shrink_tx_buffer fix for transfers_per_buffer==1 scenario	2024-03-13 16:07:44 +01:00
Erwin Ried	3c489e1a81	Steamlining the warning (#1984 ) I think it is enough to note nobody should pay for the download	2024-03-13 19:30:05 +08:00
gullradriel	910fd82051	freqman: limiting description size to 30, and minor fix (#1977 ) * Limiting description size to 30 as it was documented before * cosmetic adjustement --------- Co-authored-by: GullCode <gullradriel@hotmail.com>	2024-03-11 16:40:47 +01:00
gullradriel	866e12fbc5	added RXIQCALC (#1974 ) Co-authored-by: GullCode <gullradriel@hotmail.com>	2024-03-10 23:25:18 +01:00
Mark Thompson	ccd71d9593	Set iq_phase_cal in radio when starting SPEC mode (#1972 )	2024-03-10 20:50:48 +01:00
Mark Thompson	e9b9ba4602	Deallocate menu buttons to save memory (#1971 ) * Deallocate hidden menu buttons * Added Copyright * Added comments	2024-03-10 20:49:36 +01:00
gullradriel	986e37a3c9	fix unused warning (#1970 )	2024-03-10 20:05:05 +01:00
gullradriel	2ac36d2d0b	Level app: coloration of RxSat value (#1969 )	2024-03-10 18:29:21 +01:00
Mark Thompson	3b79549129	Added enums for recon_config bits (#1965 )	2024-03-10 08:30:05 +01:00
gullradriel	160a778104	Recon repeat auto recorded file mode (#1960 ) * added everything needed to have a repeated file mode option to keep or delete files * automatic filename for keep file * fixing restart after replay * fixed auto record replay/repeat restart --------- Co-authored-by: GullCode <gullradriel@hotmail.com>	2024-03-10 08:45:54 +08:00
Mark Thompson	e496f8ecc2	Eliminate unnecessary NumberField to save code space (#1964 ) * Eliminate extra NumberField to save code space * Clang	2024-03-09 17:36:48 -06:00
Brumi-2021	9d8132978f	Adding Rx IQ error phase CAL to SPEC Audio_App (#1963 )	2024-03-09 23:46:38 +01:00
Mark Thompson	73c29f666f	Commented out Debug -> Memory Usage app (#1962 )	2024-03-09 22:03:07 +01:00
Mark Thompson	d895c9fa91	Show true M0 free heap space in DFU overlay (#1961 )	2024-03-09 21:39:06 +01:00
gullradriel	b5e66387c3	Rxsat in Level app (#1959 ) * added Rx Saturation * testing reducing values to uint8_t * clang format * refactorisation * cleanings * cleanings * set back request_m4_performance_counter to zero on app exit --------- Co-authored-by: GullCode <gullradriel@hotmail.com>	2024-03-09 22:26:56 +08:00
Mark Thompson	1fbfdbccf8	Remove unused text_info widget (#1955 )	2024-03-08 01:29:13 +08:00
Totoo	2648f18b12	External sensor tester app (#1949 ) * added tilt * added extsensors app * added icon * Added EnvironmentData to ExtSensor app and message.hpp * Added gotenv command	2024-03-07 17:22:24 +01:00
Mark Thompson	908c0e2cd5	Fix compiler warning (#1952 )	2024-03-07 17:18:08 +01:00
Mark Thompson	4f3530db5e	Update FPV_ANALOG.TXT (#1951 ) * Include FPV in freq description * Added comment referencing source of this data	2024-03-08 00:00:53 +08:00
not tre mann	73137891c4	change sun bitmap to make it more like a sun (#1946 )	2024-03-07 07:50:49 +01:00
not tre mann	c28087ac44	cheat code protect in pacman app (#1945 )	2024-03-07 07:49:17 +01:00
Totoo	9e9dd3a521	Dynamic usb buffer fill for screenframeshort (#1935 ) * fully fill usb serial buffer * Update usb_serial_shell.cpp * Added a comment, to trigger wf	2024-03-07 07:42:58 +01:00
Dima Danylevskyi	3bf689f339	Add FPV analog frequenies to FREQMAN (#1940 )	2024-03-07 07:37:41 +01:00
Erwin Ried	86c326ef12	Update README.md (#1937 ) Adding a warning	2024-02-26 17:50:11 +01:00
jLynx	5ae97d47f1	Fixed existing dir check (#1933 )	2024-02-25 08:28:44 +01:00
Erwin Ried	762512b7dc	Rename problem-upgrading-the-firmware.md to 03_problem-upgrading-the-firmware.md	2024-02-23 14:13:54 +01:00
Erwin Ried	9c848a6215	Update config.yml	2024-02-23 14:13:23 +01:00
Erwin Ried	9c86e15ddb	Rename feature_request.yml to 02_feature_request.yml	2024-02-23 14:12:20 +01:00
Erwin Ried	57ccdb0044	Update and rename feature_request.md to feature_request.yml	2024-02-23 14:11:13 +01:00
Erwin Ried	1172175cc8	Rename bug_report.md to 01_bug_report.yml	2024-02-23 14:06:04 +01:00
Erwin Ried	9ed8ad5903	Create config.yml	2024-02-23 14:04:52 +01:00
Erwin Ried	e4da8b979e	Update bug_report.md (#1929 )	2024-02-23 14:02:11 +01:00
Erwin Ried	4b83fd8a40	Updating the videos from people about hackrf (#1918 ) The latest series from sasquash looks promising to engage beginners :) also will do some tracking with grabify to check engagement	2024-02-19 19:30:14 +08:00
Mark Thompson	cd80da58d8	Improved flash image validation (#1916 )	2024-02-18 19:02:42 +01:00
Mark Thompson	a1f7010e08	Optimized fake brightness code (#1915 )	2024-02-17 18:44:06 -06:00
Noah Axon	3499d2fa75	Fix Recon Modulation/Bandwidth presets (#1913 )	2024-02-17 19:24:11 +01:00
notComposer	948e039574	fix shift back in screenshot and mayhem hub (#1910 ) * fix_shift_back * clean up * gitignore * remove the workaround in notpad cuz it's been fixed in this PR * format * add credit for mark * 2024	2024-02-18 00:44:31 +08:00
Bernd Herzog	27dc37713b	added crc32 command to usb shell (#1911 )	2024-02-17 10:38:09 +01:00