Stable v1.7.3 (#1224 )

* Update past_version.txt * Update version.txt
Use a common function for finding Tone Key index from received Tone Frequency (#1218 )
2026-08-21 23:19:02 +00:00 · 2023-06-30 20:45:20 +12:00 · 2023-06-30 07:37:43 +02:00 · 2023-06-30 07:35:35 +02:00 · 2023-06-30 07:34:19 +02:00 · 2023-06-30 07:33:33 +02:00
121 changed files with 3004 additions and 1604 deletions
@@ -1 +1 @@
-v1.7.1
+v1.7.2
@@ -1 +1 @@
-v1.7.2
+v1.7.3
@@ -184,6 +184,7 @@ set(CPPSRC
 	irq_lcd_frame.cpp
 	irq_rtc.cpp
 	log_file.cpp
+	metadata_file.cpp
 	portapack.cpp
 	qrcodegen.cpp
 	radio.cpp
@@ -286,7 +287,7 @@ set(CPPSRC
 	apps/ert_app.cpp
 	apps/lge_app.cpp
 	apps/pocsag_app.cpp
-	apps/replay_app.cpp
+	# apps/replay_app.cpp
 	apps/ui_playlist.cpp
 	apps/gps_sim_app.cpp
 	apps/soundboard_app.cpp
@@ -55,7 +55,8 @@ void ACARSLogger::log_raw_data(const acars::Packet& packet, const uint32_t frequ

 namespace ui {

-ACARSAppView::ACARSAppView(NavigationView& nav) {
+ACARSAppView::ACARSAppView(NavigationView& nav)
+    : nav_{nav} {
    baseband::run_image(portapack::spi_flash::image_tag_acars);

    add_children({&rssi,
@@ -69,19 +70,6 @@ ACARSAppView::ACARSAppView(NavigationView& nav) {

    receiver_model.enable();

-    field_frequency.set_value(receiver_model.target_frequency());
-    field_frequency.set_step(receiver_model.frequency_step());
-    field_frequency.on_change = [this](rf::Frequency f) {
-        receiver_model.set_target_frequency(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        // TODO: Provide separate modal method/scheme?
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };
-
    check_log.set_value(logging);
    check_log.on_select = [this](Checkbox&, bool v) {
        logging = v;
@@ -27,6 +27,7 @@
 #include "radio_state.hpp"
 #include "ui_widget.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_rssi.hpp"
 #include "log_file.hpp"

@@ -57,6 +58,7 @@ class ACARSAppView : public View {
    std::string title() const override { return "ACARS (WIP)"; };

   private:
+    NavigationView& nav_;
    RxRadioState radio_state_{
        1750000 /* bandwidth */,
        2457600 /* sampling rate */
@@ -74,15 +76,13 @@ class ACARSAppView : public View {
    VGAGainField field_vga{
        {18 * 8, 0 * 16}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4},
-    };
+        {21 * 8, 0, 6 * 8, 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4},
-    };
+        {21 * 8, 5, 6 * 8, 4}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {0 * 8, 0 * 8},
-    };
+        nav_};
    Checkbox check_log{
        {22 * 8, 21},
        3,
@@ -22,21 +22,19 @@

 #include "analog_audio_app.hpp"

+#include "audio.hpp"
 #include "baseband_api.hpp"
-
+#include "file.hpp"
+#include "freqman.hpp"
 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
-using namespace portapack;
-using namespace tonekey;
-
-#include "audio.hpp"
-#include "file.hpp"
-
+#include "string_format.hpp"
 #include "utility.hpp"

-#include "string_format.hpp"
+#include "debug.hpp"

-#include "freqman.hpp"
+using namespace portapack;
+using namespace tonekey;

 namespace ui {

@@ -45,8 +43,8 @@ namespace ui {
 static const Style& style_options_group = Styles::bg_blue;

 AMOptionsView::AMOptionsView(
-    const Rect parent_rect,
-    const Style* const style)
+    Rect parent_rect,
+    const Style* style)
    : View{parent_rect} {
    set_style(style);

@@ -65,8 +63,8 @@ AMOptionsView::AMOptionsView(
 /* NBFMOptionsView *******************************************************/

 NBFMOptionsView::NBFMOptionsView(
-    const Rect parent_rect,
-    const Style* const style)
+    Rect parent_rect,
+    const Style* style)
    : View{parent_rect} {
    set_style(style);

@@ -90,8 +88,8 @@ NBFMOptionsView::NBFMOptionsView(
 /* WFMOptionsView *******************************************************/

 WFMOptionsView::WFMOptionsView(
-    const Rect parent_rect,
-    const Style* const style)
+    Rect parent_rect,
+    const Style* style)
    : View{parent_rect} {
    set_style(style);

@@ -111,8 +109,8 @@ WFMOptionsView::WFMOptionsView(

 SPECOptionsView::SPECOptionsView(
    AnalogAudioView* view,
-    const Rect parent_rect,
-    const Style* const style)
+    Rect parent_rect,
+    const Style* style)
    : View{parent_rect} {
    set_style(style);

@@ -137,6 +135,10 @@ SPECOptionsView::SPECOptionsView(
 AnalogAudioView::AnalogAudioView(
    NavigationView& nav)
    : nav_(nav) {
+    // A baseband image _must_ be running before
+    // interacting with the waterfall view.
+    baseband::run_image(portapack::spi_flash::image_tag_wideband_spectrum);
+
    add_children({&rssi,
                  &channel,
                  &audio,
@@ -152,19 +154,6 @@ AnalogAudioView::AnalogAudioView(
    // Filename Datetime and Frequency
    record_view.set_filename_date_frequency(true);

-    field_frequency.set_value(receiver_model.target_frequency());
-    field_frequency.on_change = [this](rf::Frequency f) {
-        receiver_model.set_target_frequency(f);
-    };
-    field_frequency.set_step(receiver_model.frequency_step());
-    field_frequency.on_edit = [this, &nav]() {
-        // TODO: Provide separate modal method/scheme?
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };
-
    field_frequency.on_show_options = [this]() {
        this->on_show_options_frequency();
    };
@@ -177,9 +166,12 @@ AnalogAudioView::AnalogAudioView(
        this->on_show_options_rf_gain();
    };

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

+    options_modulation.set_by_value(toUType(modulation));
    options_modulation.on_change = [this](size_t, OptionsField::value_t v) {
        this->on_modulation_changed(static_cast<ReceiverModel::Mode>(v));
    };
@@ -197,8 +189,9 @@ AnalogAudioView::AnalogAudioView(

    audio::output::start();

-    update_modulation(static_cast<ReceiverModel::Mode>(modulation));
-    on_modulation_changed(static_cast<ReceiverModel::Mode>(modulation));
+    // This call starts the correct baseband image to run
+    // and sets the radio up as necessary for the given modulation.
+    on_modulation_changed(modulation);
 }

 size_t AnalogAudioView::get_spec_bw_index() {
@@ -225,40 +218,15 @@ void AnalogAudioView::set_spec_trigger(uint16_t trigger) {
 }

 AnalogAudioView::~AnalogAudioView() {
-    // // save app settings
-    // app_settings.rx_frequency = field_frequency.value();
-    // app_settings.lna = receiver_model.lna();
-    // app_settings.vga = receiver_model.vga();
-    // app_settings.rx_amp = receiver_model.rf_amp();
-    // app_settings.step = receiver_model.frequency_step();
-    // app_settings.modulation = (uint8_t)receiver_model.modulation();
-    // app_settings.am_config_index = receiver_model.am_configuration();
-    // app_settings.nbfm_config_index = receiver_model.nbfm_configuration();
-    // app_settings.wfm_config_index = receiver_model.wfm_configuration();
-    // app_settings.squelch = receiver_model.squelch_level();
-    // settings.save("rx_audio", &app_settings);
-
-    // TODO: Manipulating audio codec here, and in ui_receiver.cpp. Good to do
-    // both?
    audio::output::stop();
-
-    receiver_model.set_sampling_rate(3072000);  // Just a hack to avoid hanging other apps if the last modulation was SPEC
    receiver_model.disable();
-
    baseband::shutdown();
 }

-void AnalogAudioView::on_hide() {
-    // TODO: Terrible kludge because widget system doesn't notify Waterfall that
-    // it's being shown or hidden.
-    waterfall.on_hide();
-    View::on_hide();
-}
-
-void AnalogAudioView::set_parent_rect(const Rect new_parent_rect) {
+void AnalogAudioView::set_parent_rect(Rect new_parent_rect) {
    View::set_parent_rect(new_parent_rect);

-    const ui::Rect waterfall_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height};
+    ui::Rect waterfall_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height};
    waterfall.set_parent_rect(waterfall_rect);
 }

@@ -270,13 +238,15 @@ void AnalogAudioView::on_baseband_bandwidth_changed(uint32_t bandwidth_hz) {
    receiver_model.set_baseband_bandwidth(bandwidth_hz);
 }

-void AnalogAudioView::on_modulation_changed(const ReceiverModel::Mode modulation) {
-    // TODO: Terrible kludge because widget system doesn't notify Waterfall that
-    // it's being shown or hidden.
-    waterfall.on_hide();
+void AnalogAudioView::on_modulation_changed(ReceiverModel::Mode modulation) {
+    // This app doesn't know what to do with "Capture" mode.
+    if (modulation > ReceiverModel::Mode::SpectrumAnalysis)
+        modulation = ReceiverModel::Mode::SpectrumAnalysis;
+
+    baseband::spectrum_streaming_stop();
    update_modulation(modulation);
    on_show_options_modulation();
-    waterfall.on_show();
+    baseband::spectrum_streaming_start();
 }

 void AnalogAudioView::remove_options_widget() {
@@ -328,7 +298,7 @@ void AnalogAudioView::on_show_options_rf_gain() {
 void AnalogAudioView::on_show_options_modulation() {
    std::unique_ptr<Widget> widget;

-    const auto modulation = static_cast<ReceiverModel::Mode>(receiver_model.modulation());
+    const auto modulation = receiver_model.modulation();
    switch (modulation) {
        case ReceiverModel::Mode::AMAudio:
            widget = std::make_unique<AMOptionsView>(options_view_rect, &style_options_group);
@@ -355,6 +325,7 @@ void AnalogAudioView::on_show_options_modulation() {
            break;

        default:
+            chDbgPanic("Unhandled Mode");
            break;
    }

@@ -371,7 +342,7 @@ void AnalogAudioView::on_reference_ppm_correction_changed(int32_t v) {
    persistent_memory::set_correction_ppb(v * 1000);
 }

-void AnalogAudioView::update_modulation(const ReceiverModel::Mode modulation) {
+void AnalogAudioView::update_modulation(ReceiverModel::Mode modulation) {
    audio::output::mute();
    record_view.stop();

@@ -392,7 +363,8 @@ void AnalogAudioView::update_modulation(const ReceiverModel::Mode modulation) {
            image_tag = portapack::spi_flash::image_tag_wideband_spectrum;
            break;
        default:
-            return;
+            chDbgPanic("Unhandled Mode");
+            break;
    }

    baseband::run_image(image_tag);
@@ -431,23 +403,10 @@ void AnalogAudioView::update_modulation(const ReceiverModel::Mode modulation) {
    }
 }

-void AnalogAudioView::handle_coded_squelch(const uint32_t value) {
-    float diff, min_diff = value;
-    size_t min_idx{0};
-    size_t c;
-
-    // Find nearest match
-    for (c = 0; c < tone_keys.size(); c++) {
-        diff = abs(((float)value / 100.0) - tone_keys[c].second);
-        if (diff < min_diff) {
-            min_idx = c;
-            min_diff = diff;
-        }
-    }
-
-    // Arbitrary confidence threshold
-    if (min_diff < 40)
-        text_ctcss.set("CTCSS " + tone_keys[min_idx].first);
+void AnalogAudioView::handle_coded_squelch(uint32_t value) {
+    tone_index idx = tone_key_index_by_value(value);
+    if (idx >= 0)
+        text_ctcss.set("CTCSS " + tone_key_string(idx));
    else
        text_ctcss.set("???");
 }
@@ -26,6 +26,7 @@
 #include "receiver_model.hpp"

 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_spectrum.hpp"
 #include "ui_record_view.hpp"
 #include "ui_styles.hpp"
@@ -37,7 +38,7 @@ namespace ui {

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

   private:
    Text label_config{
@@ -55,7 +56,7 @@ class AMOptionsView : public View {

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

   private:
    Text label_config{
@@ -83,7 +84,7 @@ class NBFMOptionsView : public View {

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

   private:
    Text label_config{
@@ -102,7 +103,7 @@ class AnalogAudioView;

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

   private:
    Text label_config{
@@ -139,10 +140,7 @@ class AnalogAudioView : public View {
    AnalogAudioView(NavigationView& nav);
    ~AnalogAudioView();

-    void on_hide() override;
-
-    void set_parent_rect(const Rect new_parent_rect) override;
-
+    void set_parent_rect(Rect new_parent_rect) override;
    void focus() override;

    std::string title() const override { return "Audio RX"; };
@@ -156,6 +154,7 @@ class AnalogAudioView : public View {
   private:
    static constexpr ui::Dim header_height = 3 * 16;

+    NavigationView& nav_;
    RxRadioState radio_state_{};
    app_settings::SettingsManager settings_{
        "rx_audio", app_settings::Mode::RX,
@@ -168,24 +167,18 @@ class AnalogAudioView : public View {
    uint32_t spec_bw = 20000000;
    uint16_t spec_trigger = 63;

-    NavigationView& nav_;
-    // bool exit_on_squelch { false };
-
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4},
-    };
+        {21 * 8, 0, 6 * 8, 4}};

    Channel channel{
-        {21 * 8, 5, 6 * 8, 4},
-    };
+        {21 * 8, 5, 6 * 8, 4}};

    Audio audio{
-        {21 * 8, 10, 6 * 8, 4},
-    };
+        {21 * 8, 10, 6 * 8, 4}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {5 * 8, 0 * 16},
-    };
+        nav_};

    LNAGainField field_lna{
        {15 * 8, 0 * 16}};
@@ -220,36 +213,26 @@ class AnalogAudioView : public View {
        4096,
        4};

-    spectrum::WaterfallWidget waterfall{true};
+    spectrum::WaterfallView waterfall{true};

    void on_baseband_bandwidth_changed(uint32_t bandwidth_hz);
-    void on_modulation_changed(const ReceiverModel::Mode modulation);
+    void on_modulation_changed(ReceiverModel::Mode modulation);
    void on_show_options_frequency();
    void on_show_options_rf_gain();
    void on_show_options_modulation();
    void on_frequency_step_changed(rf::Frequency f);
    void on_reference_ppm_correction_changed(int32_t v);
-    void on_edit_frequency();

    void remove_options_widget();
    void set_options_widget(std::unique_ptr<Widget> new_widget);

-    void update_modulation(const ReceiverModel::Mode modulation);
+    void update_modulation(ReceiverModel::Mode modulation);

-    // void squelched();
-    void handle_coded_squelch(const uint32_t value);
-
-    /*MessageHandlerRegistration message_handler_squelch_signal {
-                Message::ID::RequestSignal,
-                [this](const Message* const p) {
-                        (void)p;
-                        this->squelched();
-                }
-        };*/
+    void handle_coded_squelch(uint32_t value);

    MessageHandlerRegistration message_handler_coded_squelch{
        Message::ID::CodedSquelch,
-        [this](const Message* const p) {
+        [this](const Message* p) {
            const auto message = *reinterpret_cast<const CodedSquelchMessage*>(p);
            this->handle_coded_squelch(message.value);
        }};
@@ -56,22 +56,6 @@ AnalogTvView::AnalogTvView(
                  &field_volume,
                  &tv});

-    // Set on_change before initialising the field
-    field_frequency.on_change = [this](rf::Frequency f) {
-        this->on_target_frequency_changed(f);
-    };
-
-    field_frequency.set_value(receiver_model.target_frequency());
-    field_frequency.set_step(receiver_model.frequency_step());
-    field_frequency.on_edit = [this, &nav]() {
-        // TODO: Provide separate modal method/scheme?
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            this->on_target_frequency_changed(f);
-            this->field_frequency.set_value(f);
-        };
-    };
-
    field_frequency.on_show_options = [this]() {
        this->on_show_options_frequency();
    };
@@ -125,10 +109,6 @@ void AnalogTvView::focus() {
    field_frequency.focus();
 }

-void AnalogTvView::on_target_frequency_changed(rf::Frequency f) {
-    receiver_model.set_target_frequency(f);
-}
-
 void AnalogTvView::on_baseband_bandwidth_changed(uint32_t bandwidth_hz) {
    receiver_model.set_baseband_bandwidth(bandwidth_hz);
 }
@@ -27,6 +27,7 @@
 #include "receiver_model.hpp"

 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_tv.hpp"
 #include "ui_record_view.hpp"
 #include "ui_styles.hpp"
@@ -53,6 +54,7 @@ class AnalogTvView : public View {
   private:
    static constexpr ui::Dim header_height = 3 * 16;

+    NavigationView& nav_;
    RxRadioState radio_state_{};
    app_settings::SettingsManager settings_{
        "rx_tv", app_settings::Mode::RX};
@@ -60,23 +62,18 @@ class AnalogTvView : public View {
    const Rect options_view_rect{0 * 8, 1 * 16, 30 * 8, 1 * 16};
    const Rect nbfm_view_rect{0 * 8, 1 * 16, 18 * 8, 1 * 16};

-    NavigationView& nav_;
-
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4},
-    };
+        {21 * 8, 0, 6 * 8, 4}};

    Channel channel{
-        {21 * 8, 5, 6 * 8, 4},
-    };
+        {21 * 8, 5, 6 * 8, 4}};

    Audio audio{
-        {21 * 8, 10, 6 * 8, 4},
-    };
+        {21 * 8, 10, 6 * 8, 4}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {5 * 8, 0 * 16},
-    };
+        nav_};

    LNAGainField field_lna{
        {15 * 8, 0 * 16}};
@@ -100,7 +97,6 @@ class AnalogTvView : public View {

    tv::TVWidget tv{};

-    void on_target_frequency_changed(rf::Frequency f);
    void on_baseband_bandwidth_changed(uint32_t bandwidth_hz);
    void on_modulation_changed(const ReceiverModel::Mode modulation);
    void on_show_options_frequency();
@@ -108,7 +104,6 @@ class AnalogTvView : public View {
    void on_show_options_modulation();
    void on_frequency_step_changed(rf::Frequency f);
    void on_reference_ppm_correction_changed(int32_t v);
-    void on_edit_frequency();

    void remove_options_widget();
    void set_options_widget(std::unique_ptr<Widget> new_widget);
@@ -28,7 +28,9 @@ using namespace portapack;

 namespace ui {

-CaptureAppView::CaptureAppView(NavigationView& nav) {
+CaptureAppView::CaptureAppView(NavigationView& nav)
+    : nav_{nav} {
+    freqman_set_bandwidth_option(SPEC_MODULATION, option_bandwidth);
    baseband::run_image(portapack::spi_flash::image_tag_capture);

    add_children({
@@ -45,19 +47,6 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
        &waterfall,
    });

-    field_frequency.set_value(receiver_model.target_frequency());
-    field_frequency.set_step(receiver_model.frequency_step());
-    field_frequency.on_change = [this](rf::Frequency f) {
-        receiver_model.set_target_frequency(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        // TODO: Provide separate modal method/scheme?
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            this->field_frequency.set_value(f);
-        };
-    };
-
    field_frequency_step.set_by_value(receiver_model.frequency_step());
    field_frequency_step.on_change = [this](size_t, OptionsField::value_t v) {
        receiver_model.set_frequency_step(v);
@@ -71,41 +60,8 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
        /* ex. recording 500kHz BW to .C16 file, base_rate clock 500kHz x2(I,Q) x 2 bytes (int signed) =2MB/sec rate SD Card  */
        waterfall.on_hide();

-        /* Set up proper anti aliasing BPF bandwith in MAX2837 before ADC sampling according to the new added BW Options . */
-        switch (sampling_rate) {  // we use the var fs (sampling_rate) , to set up BPF aprox < fs_max/2 by Nyquist theorem.
-
-            case 0 ... 2000000:                                  // BW Captured range  (0 <= 250kHz max )  fs = 8 x 250 kHz
-                anti_alias_baseband_bandwidth_filter = 1750000;  // Minimum BPF MAX2837 for all those lower BW options.
-                break;
-
-            case 4000000 ... 6000000:                            // BW capture  range (500k ... 750kHz max )  fs_max = 8 x 750kHz = 6Mhz
-                                                                 //  BW 500k ... 750kHz   ,  ex. 500kHz   (fs = 8*BW =  4Mhz) , BW 600kHz (fs = 4,8Mhz) , BW  750 kHz (fs = 6Mhz)
-                anti_alias_baseband_bandwidth_filter = 2500000;  // in some IC MAX2837 appear 2250000 , but both works similar.
-                break;
-
-            case 8800000:  // BW capture 1,1Mhz  fs = 8 x 1,1Mhz = 8,8Mhz . (1Mhz showed slightly higher noise background).
-                anti_alias_baseband_bandwidth_filter = 3500000;
-                break;
-
-            case 14000000:  // BW capture 1,75Mhz  , fs = 8 x 1,75Mhz = 14Mhz
-                            // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                anti_alias_baseband_bandwidth_filter = 5000000;
-                break;
-
-            case 16000000:  // BW capture 2Mhz  , fs = 8 x 2Mhz = 16Mhz
-                            // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                anti_alias_baseband_bandwidth_filter = 6000000;
-                break;
-
-            case 20000000:  // BW capture 2,5Mhz  , fs= 8 x 2,5 Mhz = 20Mhz
-                            // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                anti_alias_baseband_bandwidth_filter = 7000000;
-                break;
-
-            default:  // BW capture 2,75Mhz, fs = 8 x 2,75Mhz= 22Mhz max ADC sampling) and others.
-                      //  We tested also 9Mhz FPB stightly too much noise floor, better 8Mhz
-                anti_alias_baseband_bandwidth_filter = 8000000;
-        }
+        /* Set up proper anti aliasing BPF bandwith in MAX2837 before ADC sampling according to the new added BW Options. */
+        auto anti_alias_baseband_bandwidth_filter = filter_bandwidth_for_sampling_rate(sampling_rate);

        record_view.set_sampling_rate(sampling_rate);
        receiver_model.set_sampling_rate(sampling_rate);
@@ -125,6 +81,8 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
 }

 CaptureAppView::~CaptureAppView() {
+    // Most other apps can't handle "Capture" mode, set to something standard.
+    receiver_model.set_modulation(ReceiverModel::Mode::WidebandFMAudio);
    receiver_model.disable();
    baseband::shutdown();
 }
@@ -26,27 +26,12 @@
 #include "ui_widget.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_record_view.hpp"
 #include "ui_spectrum.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
-
-#define BW_OPTIONS                                                                                                             \
-    {"  8k5", 8500},                                                                                                           \
-        {"  11k", 11000},                                                                                                      \
-        {"  16k", 16000},                                                                                                      \
-        {"  25k", 25000},                                                                                                      \
-        {"  50k", 50000},                                                                                                      \
-        {" 100k", 100000},                                                                                                     \
-        {" 250k", 250000},                                                                                                     \
-        {" 500k", 500000}, /* Previous Limit bandwith Option with perfect micro SD write .C16 format operaton.*/               \
-        {" 600k", 600000}, /* That extended option is still possible to record with FW version Mayhem v1.41 (< 2,5MB/sec) */   \
-        {" 750k", 750000}, /* From this BW onwards, the LCD is ok, but the recorded file is decimated, (not real file size) */ \
-        {"1100k", 1100000},                                                                                                    \
-        {"1750k", 1750000},                                                                                                    \
-        {"2000k", 2000000},                                                                                                    \
-        {"2500k", 2500000},                                                                                                    \
-        {"2750k", 2750000},  // That is our max Capture option, to keep using later / 8 decimation (22Mhz sampling  ADC)
+#include "freqman.hpp"

 namespace ui {

@@ -64,35 +49,30 @@ class CaptureAppView : public View {
   private:
    static constexpr ui::Dim header_height = 3 * 16;

+    NavigationView& nav_;
    RxRadioState radio_state_{};
    app_settings::SettingsManager settings_{
        "rx_capture", app_settings::Mode::RX,
        app_settings::Options::UseGlobalTargetFrequency};

    uint32_t sampling_rate = 0;
-    uint32_t anti_alias_baseband_bandwidth_filter = 2500000;
-
-    void on_target_frequency_changed(rf::Frequency f);

    Labels labels{
        {{0 * 8, 1 * 16}, "Rate:", Color::light_grey()},
    };

    RSSI rssi{
-        {24 * 8, 0, 6 * 8, 4},
-    };
+        {24 * 8, 0, 6 * 8, 4}};

    Channel channel{
-        {24 * 8, 5, 6 * 8, 4},
-    };
+        {24 * 8, 5, 6 * 8, 4}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {0 * 8, 0 * 16},
-    };
+        nav_};

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

    RFAmpField field_rf_amp{
        {16 * 8, 0 * 16}};
@@ -106,7 +86,7 @@ class CaptureAppView : public View {
    OptionsField option_bandwidth{
        {5 * 8, 1 * 16},
        5,
-        {BW_OPTIONS}};
+        {}};

    RecordView record_view{
        {0 * 8, 2 * 16, 30 * 8, 1 * 16},
@@ -116,7 +96,7 @@ class CaptureAppView : public View {
        16384,
        3};

-    spectrum::WaterfallWidget waterfall{};
+    spectrum::WaterfallView waterfall{};
 };

 } /* namespace ui */
@@ -26,6 +26,7 @@

 #include "ui_fileman.hpp"
 #include "io_file.hpp"
+#include "metadata_file.hpp"
 #include "utility.hpp"

 #include "baseband_api.hpp"
@@ -33,6 +34,7 @@
 #include "portapack_persistent_memory.hpp"

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

 namespace ui {

@@ -40,51 +42,38 @@ void GpsSimAppView::set_ready() {
    ready_signal = true;
 }

-void GpsSimAppView::on_file_changed(std::filesystem::path new_file_path) {
-    File data_file, info_file;
-    char file_data[257];
+void GpsSimAppView::on_file_changed(const fs::path& new_file_path) {
+    file_path = fs::path(u"/") + new_file_path;
+    File::Size file_size{};

-    // Get file size
-    auto data_open_error = data_file.open("/" + new_file_path.string());
-    if (data_open_error.is_valid()) {
-        file_error();
-        return;
-    }
-
-    file_path = new_file_path;
-
-    // Get original record frequency if available
-    std::filesystem::path info_file_path = file_path;
-    info_file_path.replace_extension(u".TXT");
-
-    sample_rate = 500000;
-
-    auto info_open_error = info_file.open("/" + info_file_path.string());
-    if (!info_open_error.is_valid()) {
-        memset(file_data, 0, 257);
-        auto read_size = info_file.read(file_data, 256);
-        if (!read_size.is_error()) {
-            auto pos1 = strstr(file_data, "center_frequency=");
-            if (pos1) {
-                pos1 += 17;
-                field_frequency.set_value(strtoll(pos1, nullptr, 10));
-            }
-
-            auto pos2 = strstr(file_data, "sample_rate=");
-            if (pos2) {
-                pos2 += 12;
-                sample_rate = strtoll(pos2, nullptr, 10);
-            }
+    {  // Get the size of the data file.
+        File data_file;
+        auto error = data_file.open(file_path);
+        if (error) {
+            file_error();
+            return;
        }
+
+        file_size = data_file.size();
    }

+    // Get original record frequency if available.
+    auto metadata_path = get_metadata_path(file_path);
+    auto metadata = read_metadata_file(metadata_path);
+
+    if (metadata) {
+        field_frequency.set_value(metadata->center_frequency);
+        sample_rate = metadata->sample_rate;
+    } else {
+        sample_rate = 500000;
+    }
+
+    // UI Fixup.
    text_sample_rate.set(unit_auto_scale(sample_rate, 3, 1) + "Hz");
-
-    auto file_size = data_file.size();
-    auto duration = ms_duration(file_size, sample_rate, 2);
-
    progressbar.set_max(file_size / 1024);
-    text_filename.set(file_path.filename().string().substr(0, 12));
+    text_filename.set(truncate(file_path.filename().string(), 12));
+
+    auto duration = ms_duration(file_size, sample_rate, 2);
    text_duration.set(to_string_time_ms(duration));

    button_play.focus();
@@ -187,18 +176,7 @@ GpsSimAppView::GpsSimAppView(
        &waterfall,
    });

-    field_frequency.set_value(transmitter_model.target_frequency());
    field_frequency.set_step(5000);
-    field_frequency.on_change = [this](rf::Frequency f) {
-        transmitter_model.set_target_frequency(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        // TODO: Provide separate modal method/scheme?
-        auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            this->field_frequency.set_value(f);
-        };
-    };

    button_play.on_select = [this](ImageButton&) {
        this->toggle();
@@ -32,6 +32,7 @@
 #include "ui_widget.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "replay_thread.hpp"
 #include "ui_spectrum.hpp"
 #include "ui_transmitter.hpp"
@@ -70,7 +71,7 @@ class GpsSimAppView : public View {
    const size_t read_size{16384};
    const size_t buffer_count{3};

-    void on_file_changed(std::filesystem::path new_file_path);
+    void on_file_changed(const std::filesystem::path& new_file_path);
    void on_tx_progress(const uint32_t progress);

    void toggle();
@@ -102,9 +103,9 @@ class GpsSimAppView : public View {
    ProgressBar progressbar{
        {18 * 8, 1 * 16, 12 * 8, 16}};

-    FrequencyField field_frequency{
+    TxFrequencyField field_frequency{
        {0 * 8, 2 * 16},
-    };
+        nav_};

    TransmitterView2 tx_view{
        // new handling of NumberField field_rfgain, NumberField field_rfamp
@@ -123,7 +124,7 @@ class GpsSimAppView : public View {
        Color::green(),
        Color::black()};

-    spectrum::WaterfallWidget waterfall{};
+    spectrum::WaterfallView waterfall{};

    MessageHandlerRegistration message_handler_replay_thread_error{
        Message::ID::ReplayThreadDone,
@@ -51,9 +51,8 @@ void POCSAGLogger::log_decoded(

 namespace ui {

-POCSAGAppView::POCSAGAppView(NavigationView& nav) {
-    uint32_t ignore_address;
-
+POCSAGAppView::POCSAGAppView(NavigationView& nav)
+    : nav_{nav} {
    baseband::run_image(portapack::spi_flash::image_tag_pocsag);

    add_children({&rssi,
@@ -70,28 +69,16 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav) {
                  &console});

    if (!settings_.loaded())
-        receiver_model.set_target_frequency(initial_target_frequency);
+        field_frequency.set_value(initial_target_frequency);

    receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
    receiver_model.enable();

-    field_frequency.set_value(receiver_model.target_frequency());
-    field_frequency.on_change = [this](rf::Frequency f) {
-        receiver_model.set_target_frequency(f);
-    };
-    field_frequency.set_step(receiver_model.frequency_step());
-    field_frequency.on_edit = [this, &nav]() {
-        // TODO: Provide separate modal method/scheme?
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };
-
-    // TODO app setting instead?
+    // TODO: app setting instead?
+    uint32_t ignore_address;
    ignore_address = persistent_memory::pocsag_ignore_address();

-    // TODO is this common enough for a helper?
+    // TODO: is this common enough for a helper?
    for (size_t c = 0; c < 7; c++) {
        sym_ignore.set_sym(6 - c, ignore_address % 10);
        ignore_address /= 10;
@@ -107,7 +94,7 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav) {
 }

 void POCSAGAppView::focus() {
-    check_log.focus();
+    field_frequency.focus();
 }

 POCSAGAppView::~POCSAGAppView() {
@@ -156,9 +143,10 @@ void POCSAGAppView::on_packet(const POCSAGPacketMessage* message) {
            console.write(console_info);

            if (logger && logging()) {
-                logger->log_decoded(message->packet, to_string_dec_uint(pocsag_state.address) +
-                                                         " F" + to_string_dec_uint(pocsag_state.function) +
-                                                         " Address only");
+                logger->log_decoded(
+                    message->packet, to_string_dec_uint(pocsag_state.address) +
+                                         " F" + to_string_dec_uint(pocsag_state.function) +
+                                         " Address only");
            }

            last_address = pocsag_state.address;
@@ -175,16 +163,17 @@ void POCSAGAppView::on_packet(const POCSAGPacketMessage* message) {
            }

            if (logger && logging())
-                logger->log_decoded(message->packet, to_string_dec_uint(pocsag_state.address) +
-                                                         " F" + to_string_dec_uint(pocsag_state.function) +
-                                                         " Alpha: " + pocsag_state.output);
+                logger->log_decoded(
+                    message->packet, to_string_dec_uint(pocsag_state.address) +
+                                         " F" + to_string_dec_uint(pocsag_state.function) +
+                                         " Alpha: " + pocsag_state.output);
        }
    }

    // TODO: make setting.
    // Log raw data whatever it contains
-    if (logger && logging())
-        logger->log_raw_data(message->packet, receiver_model.target_frequency());
+    /*if (logger && logging())
+        logger->log_raw_data(message->packet, receiver_model.target_frequency());*/
 }

 } /* namespace ui */
@@ -24,6 +24,7 @@
 #define __POCSAG_APP_H__

 #include "ui_widget.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_receiver.hpp"
 #include "ui_rssi.hpp"

@@ -61,6 +62,7 @@ class POCSAGAppView : public View {
    bool logging() const { return check_log.value(); };
    bool ignore() const { return check_ignore.value(); };

+    NavigationView& nav_;
    RxRadioState radio_state_{};
    app_settings::SettingsManager settings_{
        "rx_pocsag", app_settings::Mode::RX};
@@ -75,18 +77,15 @@ class POCSAGAppView : public View {
    VGAGainField field_vga{
        {18 * 8, 0 * 16}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4},
-    };
+        {21 * 8, 0, 6 * 8, 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4},
-    };
+        {21 * 8, 5, 6 * 8, 4}};
    Audio audio{
-        {21 * 8, 10, 6 * 8, 4},
-    };
+        {21 * 8, 10, 6 * 8, 4}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {0 * 8, 0 * 8},
-    };
+        nav_};

    AudioVolumeField field_volume{
        {28 * 8, 0 * 16}};
@@ -27,11 +27,13 @@
 #include "ui_fileman.hpp"
 #include "io_file.hpp"
 #include "baseband_api.hpp"
+#include "metadata_file.hpp"
 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "utility.hpp"

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

 namespace ui {

@@ -39,51 +41,41 @@ void ReplayAppView::set_ready() {
    ready_signal = true;
 }

-void ReplayAppView::on_file_changed(std::filesystem::path new_file_path) {
-    File data_file, info_file;
-    char file_data[257];
+void ReplayAppView::on_file_changed(const fs::path& new_file_path) {
+    file_path = fs::path(u"/") + new_file_path;
+    File::Size file_size{};

-    // Get file size
-    auto data_open_error = data_file.open("/" + new_file_path.string());
-    if (data_open_error.is_valid()) {
-        file_error();
-        return;
-    }
-
-    file_path = new_file_path;
-
-    // Get original record frequency if available
-    std::filesystem::path info_file_path = file_path;
-    info_file_path.replace_extension(u".TXT");
-
-    sample_rate = 500000;
-
-    auto info_open_error = info_file.open("/" + info_file_path.string());
-    if (!info_open_error.is_valid()) {
-        memset(file_data, 0, 257);
-        auto read_size = info_file.read(file_data, 256);
-        if (!read_size.is_error()) {
-            auto pos1 = strstr(file_data, "center_frequency=");
-            if (pos1) {
-                pos1 += 17;
-                field_frequency.set_value(strtoll(pos1, nullptr, 10));
-            }
-
-            auto pos2 = strstr(file_data, "sample_rate=");
-            if (pos2) {
-                pos2 += 12;
-                sample_rate = strtoll(pos2, nullptr, 10);
-            }
+    {  // Get the size of the data file.
+        File data_file;
+        auto error = data_file.open(file_path);
+        if (error) {
+            file_error();
+            return;
        }
+
+        file_size = data_file.size();
    }

+    // Get original record frequency if available.
+    auto metadata_path = get_metadata_path(file_path);
+    auto metadata = read_metadata_file(metadata_path);
+
+    if (metadata) {
+        field_frequency.set_value(metadata->center_frequency);
+        sample_rate = metadata->sample_rate;
+    } else {
+        // TODO: This is interesting because it implies that the
+        // The capture will just be replayed at the freq set on the
+        // FrequencyField. Is that an intentional behavior?
+        sample_rate = 500000;
+    }
+
+    // UI Fixup.
    text_sample_rate.set(unit_auto_scale(sample_rate, 3, 0) + "Hz");
-
-    auto file_size = data_file.size();
-    auto duration = ms_duration(file_size, sample_rate, 4);
-
    progressbar.set_max(file_size);
-    text_filename.set(file_path.filename().string().substr(0, 12));
+    text_filename.set(truncate(file_path.filename().string(), 12));
+
+    auto duration = ms_duration(file_size, sample_rate, 4);
    text_duration.set(to_string_time_ms(duration));

    button_play.focus();
@@ -188,34 +180,19 @@ ReplayAppView::ReplayAppView(
        &text_duration,
        &progressbar,
        &field_frequency,
-        &tx_view,  // now it handles previous rfgain , rfamp.
+        &tx_view,  // now it handles previous rfgain, rfamp.
        &check_loop,
        &button_play,
        &waterfall,
    });

-    field_frequency.set_value(transmitter_model.target_frequency());
-    field_frequency.set_step(receiver_model.frequency_step());
-    field_frequency.on_change = [this](rf::Frequency f) {
-        transmitter_model.set_target_frequency(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        // TODO: Provide separate modal method/scheme?
-        auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };
-
-    field_frequency.set_step(5000);
-
    button_play.on_select = [this](ImageButton&) {
        this->toggle();
    };

    button_open.on_select = [this, &nav](Button&) {
        auto open_view = nav.push<FileLoadView>(".C16");
-        open_view->on_changed = [this](std::filesystem::path new_file_path) {
+        open_view->on_changed = [this](fs::path new_file_path) {
            on_file_changed(new_file_path);
        };
    };
@@ -31,6 +31,7 @@
 #include "ui_widget.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "replay_thread.hpp"
 #include "ui_spectrum.hpp"
 #include "ui_transmitter.hpp"
@@ -66,7 +67,7 @@ class ReplayAppView : public View {
    const size_t read_size{16384};
    const size_t buffer_count{3};

-    void on_file_changed(std::filesystem::path new_file_path);
+    void on_file_changed(const std::filesystem::path& new_file_path);
    void on_tx_progress(const uint32_t progress);

    void toggle();
@@ -98,9 +99,10 @@ class ReplayAppView : public View {
    ProgressBar progressbar{
        {18 * 8, 1 * 16, 12 * 8, 16}};

-    FrequencyField field_frequency{
+    // TODO: Does this need to be a frequency field at all?
+    TxFrequencyField field_frequency{
        {0 * 8, 2 * 16},
-    };
+        nav_};

    TransmitterView2 tx_view{
        // new handling of NumberField field_rfgain, NumberField field_rfamp
@@ -119,7 +121,7 @@ class ReplayAppView : public View {
        Color::green(),
        Color::black()};

-    spectrum::WaterfallWidget waterfall{};
+    spectrum::WaterfallView waterfall{};

    MessageHandlerRegistration message_handler_replay_thread_error{
        Message::ID::ReplayThreadDone,
@@ -32,7 +32,7 @@ class SpectrumAnalysisModel {

 namespace ui {

-class SpectrumAnalysisView : public spectrum::WaterfallWidget {
+class SpectrumAnalysisView : public spectrum::WaterfallView {
   public:
   private:
    SpectrumAnalysisModel model;
@@ -468,7 +468,8 @@ void ADSBRxView::updateDetailsAndMap(int ageStep) {
                details_view->update(entry);
            }
            // Store if the view is present and the list isn't full
-            else if (otherMarkersCanBeSent && (markerStored != MARKER_LIST_FULL) && entry.pos.valid && (entry.age_state <= 2)) {
+            // Note -- Storing the selected entry too, in case map panning occurs
+            if (otherMarkersCanBeSent && (markerStored != MARKER_LIST_FULL) && entry.pos.valid && (entry.age_state <= 2)) {
                marker.lon = entry.pos.longitude;
                marker.lat = entry.pos.latitude;
                marker.angle = entry.velo.heading;
@@ -43,11 +43,8 @@ void AFSKRxView::focus() {
    field_frequency.focus();
 }

-void AFSKRxView::update_freq(rf::Frequency f) {
-    receiver_model.set_target_frequency(f);
-}
-
-AFSKRxView::AFSKRxView(NavigationView& nav) {
+AFSKRxView::AFSKRxView(NavigationView& nav)
+    : nav_{nav} {
    baseband::run_image(portapack::spi_flash::image_tag_afsk_rx);

    add_children({&rssi,
@@ -62,8 +59,8 @@ AFSKRxView::AFSKRxView(NavigationView& nav) {
                  &button_modem_setup,
                  &console});

-    // Auto-configure modem for LCR RX (will be removed later)
-    update_freq(467225500);  // 462713300
+    // Auto-configure modem for LCR RX (TODO remove)
+    field_frequency.set_value(467225500);
    auto def_bell202 = &modem_defs[0];
    persistent_memory::set_modem_baudrate(def_bell202->baudrate);
    serial_format_t serial_format;
@@ -73,17 +70,7 @@ AFSKRxView::AFSKRxView(NavigationView& nav) {
    serial_format.bit_order = LSB_FIRST;
    persistent_memory::set_serial_format(serial_format);

-    field_frequency.set_value(receiver_model.target_frequency());
    field_frequency.set_step(100);
-    field_frequency.on_change = [this](rf::Frequency f) {
-        update_freq(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };

    check_log.set_value(logging);
    check_log.on_select = [this](Checkbox&, bool v) {
@@ -26,7 +26,8 @@
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
-#include "ui_record_view.hpp"  // DEBUG
+#include "ui_freq_field.hpp"
+#include "ui_record_view.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
 #include "log_file.hpp"
@@ -58,6 +59,7 @@ class AFSKRxView : public View {
   private:
    void on_data(uint32_t value, bool is_data);

+    NavigationView& nav_;
    RxRadioState radio_state_{};
    app_settings::SettingsManager settings_{
        "rx_afsk", app_settings::Mode::RX};
@@ -74,18 +76,16 @@ class AFSKRxView : public View {
    VGAGainField field_vga{
        {18 * 8, 0 * 16}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4},
-    };
+        {21 * 8, 0, 6 * 8, 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4},
-    };
+        {21 * 8, 5, 6 * 8, 4}};

    AudioVolumeField field_volume{
        {28 * 8, 0 * 16}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {0 * 8, 0 * 16},
-    };
+        nav_};

    Checkbox check_log{
        {0 * 8, 1 * 16},
@@ -104,7 +104,6 @@ class AFSKRxView : public View {
    Console console{
        {0, 4 * 16, 240, 240}};

-    void update_freq(rf::Frequency f);
    void on_data_afsk(const AFSKDataMessage& message);

    std::unique_ptr<AFSKLogger> logger{};
@@ -73,12 +73,8 @@ void APRSRxView::focus() {
    options_region.focus();
 }

-void APRSRxView::update_freq(rf::Frequency f) {
-    receiver_model.set_target_frequency(f);
-}
-
 APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect)
-    : View(parent_rect) {
+    : View(parent_rect), nav_{nav} {
    baseband::run_image(portapack::spi_flash::image_tag_aprs_rx);

    add_children({&rssi,
@@ -111,18 +107,7 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect)
        }
    };

-    field_frequency.set_value(receiver_model.target_frequency());
    field_frequency.set_step(100);
-    field_frequency.on_change = [this](rf::Frequency f) {
-        update_freq(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };
-
    options_region.set_selected_index(0, true);

    logger = std::make_unique<APRSLogger>();
@@ -26,7 +26,8 @@
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
-#include "ui_record_view.hpp"  // DEBUG
+#include "ui_freq_field.hpp"
+#include "ui_record_view.hpp"
 #include "ui_geomap.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
@@ -188,6 +189,7 @@ class APRSRxView : public View {
    void on_data(uint32_t value, bool is_data);
    bool reset_console = false;

+    NavigationView& nav_;
    RxRadioState radio_state_{};
    app_settings::SettingsManager settings_{
        "rx_aprs", app_settings::Mode::RX};
@@ -202,11 +204,9 @@ class APRSRxView : public View {
    VGAGainField field_vga{
        {18 * 8, 0 * 16}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4},
-    };
+        {21 * 8, 0, 6 * 8, 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4},
-    };
+        {21 * 8, 5, 6 * 8, 4}};

    AudioVolumeField field_volume{
        {28 * 8, 0 * 16}};
@@ -219,9 +219,9 @@ class APRSRxView : public View {
         {"AUS", 2},
         {"NZ ", 3}}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {3 * 8, 0 * 16},
-    };
+        nav_};

    // DEBUG
    RecordView record_view{
@@ -235,8 +235,6 @@ class APRSRxView : public View {
    Console console{
        {0, 2 * 16, 240, 240}};

-    void update_freq(rf::Frequency f);
-
    std::unique_ptr<APRSLogger> logger{};
 };

@@ -40,11 +40,8 @@ void BTLERxView::focus() {
    field_frequency.focus();
 }

-void BTLERxView::update_freq(rf::Frequency f) {
-    receiver_model.set_target_frequency(f);
-}
-
-BTLERxView::BTLERxView(NavigationView& nav) {
+BTLERxView::BTLERxView(NavigationView& nav)
+    : nav_{nav} {
    baseband::run_image(portapack::spi_flash::image_tag_btle_rx);

    add_children({&rssi,
@@ -56,8 +53,8 @@ BTLERxView::BTLERxView(NavigationView& nav) {
                  &button_modem_setup,
                  &console});

-    // Auto-configure modem for LCR RX (will be removed later)
-    update_freq(2426000000);
+    // Auto-configure modem for LCR RX (TODO: remove later)
+    field_frequency.set_value(2426000000);
    auto def_bell202 = &modem_defs[0];
    persistent_memory::set_modem_baudrate(def_bell202->baudrate);
    serial_format_t serial_format;
@@ -67,17 +64,7 @@ BTLERxView::BTLERxView(NavigationView& nav) {
    serial_format.bit_order = LSB_FIRST;
    persistent_memory::set_serial_format(serial_format);

-    field_frequency.set_value(receiver_model.target_frequency());
    field_frequency.set_step(100);
-    field_frequency.on_change = [this](rf::Frequency f) {
-        update_freq(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };

    button_modem_setup.on_select = [&nav](Button&) {
        nav.push<ModemSetupView>();
@@ -27,9 +27,10 @@
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
-#include "ui_record_view.hpp"  // DEBUG
+#include "ui_record_view.hpp"

 #include "utility.hpp"

@@ -47,6 +48,7 @@ class BTLERxView : public View {
   private:
    void on_data(uint32_t value, bool is_data);

+    NavigationView& nav_;
    RxRadioState radio_state_{
        4000000 /* bandwidth */,
        4000000 /* sampling rate */
@@ -64,15 +66,13 @@ class BTLERxView : public View {
    VGAGainField field_vga{
        {18 * 8, 0 * 16}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4},
-    };
+        {21 * 8, 0, 6 * 8, 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4},
-    };
+        {21 * 8, 5, 6 * 8, 4}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {0 * 8, 0 * 16},
-    };
+        nav_};

    Button button_modem_setup{
        {240 - 12 * 8, 1 * 16, 96, 24},
@@ -81,9 +81,6 @@ class BTLERxView : public View {
    Console console{
        {0, 4 * 16, 240, 240}};

-    void update_freq(rf::Frequency f);
-    // void on_data_afsk(const AFSKDataMessage& message);
-
    MessageHandlerRegistration message_handler_packet{
        Message::ID::AFSKData,
        [this](Message* const p) {
@@ -248,6 +248,7 @@ void ControlsSwitchesWidget::on_show() {

 bool ControlsSwitchesWidget::on_key(const KeyEvent key) {
    key_event_mask = 1 << toUType(key);
+    long_press_key_event_mask = switch_long_press_occurred((size_t)key) ? key_event_mask : 0;
    return true;
 }

@@ -325,6 +326,14 @@ void ControlsSwitchesWidget::paint(Painter& painter) {

        switches_event >>= 1;
    }
+
+    switches_event = long_press_key_event_mask;
+    for (const auto r : events_rects) {
+        if (switches_event & 1)
+            painter.fill_rectangle(r + pos, Color::cyan());
+
+        switches_event >>= 1;
+    }
 }

 void ControlsSwitchesWidget::on_frame_sync() {
@@ -335,12 +344,21 @@ void ControlsSwitchesWidget::on_frame_sync() {

 DebugControlsView::DebugControlsView(NavigationView& nav) {
    add_children({
-        &text_title,
+        &labels,
        &switches_widget,
+        &options_switches_mode,
        &button_done,
    });

-    button_done.on_select = [&nav](Button&) { nav.pop(); };
+    button_done.on_select = [&nav](Button&) {
+        switches_long_press_enable(0);
+        nav.pop();
+    };
+
+    options_switches_mode.on_change = [this](size_t, OptionsField::value_t v) {
+        (void)v;
+        switches_long_press_enable(options_switches_mode.selected_index_value());
+    };
 }

 void DebugControlsView::focus() {
@@ -383,6 +401,7 @@ DebugMenuView::DebugMenuView(NavigationView& nav) {
        {"Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [&nav]() { nav.push<TemperatureView>(); }},
        {"Buttons Test", ui::Color::dark_cyan(), &bitmap_icon_controls, [&nav]() { nav.push<DebugControlsView>(); }},
        {"P.Memory", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugPmemView>(); }},
+        {"Debug Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { portapack::persistent_memory::debug_dump(); }},
    });
    set_max_rows(2);  // allow wider buttons
 }
@@ -31,6 +31,7 @@
 #include "rffc507x.hpp"
 #include "portapack.hpp"
 #include "memory_map.hpp"
+#include "irq_controls.hpp"

 #include <functional>
 #include <utility>
@@ -220,7 +221,8 @@ class ControlsSwitchesWidget : public Widget {
    ControlsSwitchesWidget(
        Rect parent_rect)
        : Widget{parent_rect},
-          key_event_mask(0) {
+          key_event_mask(0),
+          long_press_key_event_mask{0} {
        set_focusable(true);
    }

@@ -231,6 +233,7 @@ class ControlsSwitchesWidget : public Widget {

   private:
    uint8_t key_event_mask;
+    uint8_t long_press_key_event_mask;

    MessageHandlerRegistration message_handler_frame_sync{
        Message::ID::DisplayFrameSync,
@@ -250,15 +253,22 @@ class DebugControlsView : public View {
    std::string title() const override { return "Buttons Test"; };

   private:
-    Text text_title{
-        {64, 16, 184, 16},
-        "Controls State",
-    };
+    Labels labels{
+        {{8 * 8, 1 * 16}, "Controls State", Color::white()},
+        {{0 * 8, 14 * 16}, "Long-Press Mode:", Color::grey()}};

    ControlsSwitchesWidget switches_widget{
        {80, 80, 80, 112},
    };

+    OptionsField options_switches_mode{
+        {17 * 8, 14 * 16},
+        8,
+        {
+            {"Disabled", 0},
+            {"Enabled", 0xFF},  // all KeyEvent bits to long-press mode
+        }};
+
    Button button_done{
        {72, 264, 96, 24},
        "Done"};
@@ -22,6 +22,7 @@
 #include "ui_dfu_menu.hpp"
 #include "portapack_shared_memory.hpp"
 #include "performance_counter.hpp"
+#include "portapack.hpp"

 namespace ui {

@@ -80,4 +81,57 @@ void DfuMenu::paint(Painter& painter) {
        ui::Color::dark_cyan());
 }

+DfuMenu2::DfuMenu2(NavigationView& nav)
+    : nav_(nav) {
+    add_children({&text_head,
+                  &labels,
+                  &text_info_line_1,
+                  &text_info_line_2,
+                  &text_info_line_3,
+                  &text_info_line_4,
+                  &text_info_line_5,
+                  &text_info_line_6,
+                  &text_info_line_7,
+                  &text_info_line_8});
+}
+
+void DfuMenu2::paint(Painter& painter) {
+    text_info_line_1.set(to_string_dec_uint(portapack::receiver_model.target_frequency(), 10));
+    text_info_line_2.set(to_string_dec_uint(portapack::receiver_model.baseband_bandwidth(), 10));
+    text_info_line_3.set(to_string_dec_uint(portapack::receiver_model.sampling_rate(), 10));
+    text_info_line_4.set(to_string_dec_uint((uint32_t)portapack::receiver_model.modulation(), 10));
+    text_info_line_5.set(to_string_dec_uint(portapack::receiver_model.am_configuration(), 10));
+    text_info_line_6.set(to_string_dec_uint(portapack::receiver_model.nbfm_configuration(), 10));
+    text_info_line_7.set(to_string_dec_uint(portapack::receiver_model.wfm_configuration(), 10));
+    text_info_line_8.set("");
+
+    constexpr auto margin = 5;
+    constexpr auto lines = 8 + 2;
+
+    painter.fill_rectangle(
+        {{5 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
+         {19 * CHARACTER_WIDTH + margin * 2, lines * LINE_HEIGHT + margin * 2}},
+        ui::Color::black());
+
+    painter.fill_rectangle(
+        {{4 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
+         {CHARACTER_WIDTH, lines * LINE_HEIGHT + margin * 2}},
+        ui::Color::dark_cyan());
+
+    painter.fill_rectangle(
+        {{24 * CHARACTER_WIDTH + margin, 3 * LINE_HEIGHT - margin},
+         {CHARACTER_WIDTH, lines * LINE_HEIGHT + margin * 2}},
+        ui::Color::dark_cyan());
+
+    painter.fill_rectangle(
+        {{4 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin - 8},
+         {21 * CHARACTER_WIDTH + margin * 2, 8}},
+        ui::Color::dark_cyan());
+
+    painter.fill_rectangle(
+        {{4 * CHARACTER_WIDTH - margin, (lines + 3) * LINE_HEIGHT + margin},
+         {21 * CHARACTER_WIDTH + margin * 2, 8}},
+        ui::Color::dark_cyan());
+}
+
 } /* namespace ui */
@@ -67,6 +67,38 @@ class DfuMenu : public View {
    Text text_info_line_8{{15 * CHARACTER_WIDTH, 12 * LINE_HEIGHT, 5 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
 };

+class DfuMenu2 : public View {
+   public:
+    DfuMenu2(NavigationView& nav);
+    ~DfuMenu2() = default;
+
+    void paint(Painter& painter) override;
+
+   private:
+    NavigationView& nav_;
+
+    Text text_head{{6 * CHARACTER_WIDTH, 3 * LINE_HEIGHT, 8 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, "Receiver"};
+
+    Labels labels{
+        {{5 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "Tgt freq:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "Bandwidt:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "Sampl Rt:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 8 * LINE_HEIGHT}, "Modulatn:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 9 * LINE_HEIGHT}, "AM cfg:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 10 * LINE_HEIGHT}, "NBFM cfg:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 11 * LINE_HEIGHT}, "WFM cfg:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "", Color::dark_cyan()}};
+
+    Text text_info_line_1{{14 * CHARACTER_WIDTH, 5 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_2{{14 * CHARACTER_WIDTH, 6 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_3{{14 * CHARACTER_WIDTH, 7 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_4{{14 * CHARACTER_WIDTH, 8 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_5{{14 * CHARACTER_WIDTH, 9 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_6{{14 * CHARACTER_WIDTH, 10 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_7{{14 * CHARACTER_WIDTH, 11 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+    Text text_info_line_8{{14 * CHARACTER_WIDTH, 12 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
+};
+
 } /* namespace ui */

 #endif /*__UI_DFU_MENU_H__*/
@@ -26,6 +26,7 @@

 #include <algorithm>
 #include "ui_fileman.hpp"
+#include "ui_playlist.hpp"
 #include "ui_ss_viewer.hpp"
 #include "ui_text_editor.hpp"
 #include "string_format.hpp"
@@ -35,6 +36,13 @@
 using namespace portapack;
 namespace fs = std::filesystem;

+namespace ui {
+static const fs::path txt_ext{u".TXT"};
+static const fs::path ppl_ext{u".PPL"};
+static const fs::path c16_ext{u".C16"};
+static const fs::path png_ext{u".PNG"};
+}  // namespace ui
+
 namespace {
 using namespace ui;

@@ -47,25 +55,6 @@ std::string truncate(const fs::path& path, size_t max_length) {
    return ::truncate(path.string(), max_length);
 }

-// Case insensitive path equality on underlying "native" string.
-bool iequal(
-    const fs::path& lhs,
-    const fs::path& rhs) {
-    const auto& lhs_str = lhs.native();
-    const auto& rhs_str = rhs.native();
-
-    // NB: Not correct for Unicode/locales.
-    if (lhs_str.length() == rhs_str.length()) {
-        for (size_t i = 0; i < lhs_str.length(); ++i)
-            if (towupper(lhs_str[i]) != towupper(rhs_str[i]))
-                return false;
-
-        return true;
-    }
-
-    return false;
-}
-
 // Inserts the entry into the entry list sorted directories first then by file name.
 void insert_sorted(std::vector<fileman_entry>& entries, fileman_entry&& entry) {
    auto it = std::lower_bound(
@@ -86,15 +75,12 @@ void insert_sorted(std::vector<fileman_entry>& entries, fileman_entry&& entry) {
 fs::path get_partner_file(fs::path path) {
    if (fs::is_directory(path))
        return {};
-
-    const fs::path txt_path{u".TXT"};
-    const fs::path c16_path{u".C16"};
    auto ext = path.extension();

-    if (iequal(ext, txt_path))
-        ext = c16_path;
-    else if (iequal(ext, c16_path))
-        ext = txt_path;
+    if (path_iequal(ext, txt_ext))
+        ext = c16_ext;
+    else if (path_iequal(ext, c16_ext))
+        ext = txt_ext;
    else
        return {};

@@ -163,7 +149,7 @@ void FileManBaseView::load_directory_contents(const fs::path& dir_path) {
            continue;

        if (fs::is_regular_file(entry.status())) {
-            if (!filtering || iequal(entry.path().extension(), extension_filter))
+            if (!filtering || path_iequal(entry.path().extension(), extension_filter))
                insert_sorted(entry_list, {entry.path(), (uint32_t)entry.size(), false});
        } else if (fs::is_directory(entry.status())) {
            insert_sorted(entry_list, {entry.path(), 0, true});
@@ -301,7 +287,7 @@ const FileManBaseView::file_assoc_t& FileManBaseView::get_assoc(
    size_t index = 0;

    for (; index < file_types.size() - 1; ++index)
-        if (iequal(ext, file_types[index].extension))
+        if (path_iequal(ext, file_types[index].extension))
            return file_types[index];

    // Default to last entry in the list.
@@ -507,10 +493,14 @@ bool FileManagerView::handle_file_open() {
    auto path = get_selected_full_path();
    auto ext = path.extension();

-    if (iequal(u".TXT", ext) || iequal(u".PPL", ext)) {
+    if (path_iequal(txt_ext, ext)) {
        nav_.push<TextEditorView>(path);
        return true;
-    } else if (iequal(u".PNG", ext)) {
+    } else if (path_iequal(c16_ext, ext) || path_iequal(ppl_ext, ext)) {
+        // TODO: Enough memory to push?
+        nav_.push<PlaylistView>(path);
+        return true;
+    } else if (path_iequal(png_ext, ext)) {
        nav_.push<ScreenshotViewer>(path);
        return true;
    }
@@ -25,6 +25,8 @@

 namespace ui {

+static const char16_t* firmware_folder = u"/FIRMWARE";
+
 Thread* FlashUtilityView::thread{nullptr};
 static constexpr size_t max_filename_length = 26;

@@ -35,7 +37,9 @@ FlashUtilityView::FlashUtilityView(NavigationView& nav)

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

-    for (const auto& entry : std::filesystem::directory_iterator(u"FIRMWARE", u"*.bin")) {
+    ensure_directory(firmware_folder);
+
+    for (const auto& entry : std::filesystem::directory_iterator(firmware_folder, u"*.bin")) {
        auto filename = entry.path().filename();
        auto path = entry.path().native();

@@ -40,7 +40,7 @@ class FlashUtilityView : public View {

    void focus() override;

-    std::string title() const override { return "FlashUtility"; };  // Removed the space because the title and speaker icon overlapped.
+    std::string title() const override { return "Flash Utility"; };

   private:
    NavigationView& nav_;
@@ -81,14 +81,11 @@ void FreqManBaseView::change_category(int32_t category_id) {

    if (file_list.empty()) return;

-    std::vector<freqman_entry>().swap(database);
-
    if (!load_freqman_file(file_list[categories[category_id].second], database)) {
        error_ = ERROR_ACCESS;
    }
-    menu_view.set_db(database);
+    freqlist_view.set_db(database);
    text_empty.hidden(!database.empty());
-    menu_view.set_dirty();
    set_dirty();
 }

@@ -162,10 +159,14 @@ FrequencySaveView::FrequencySaveView(
    };
 }

+FrequencyLoadView::~FrequencyLoadView() {
+    std::vector<freqman_entry>().swap(database);
+}
+
 void FrequencyLoadView::refresh_widgets(const bool v) {
-    menu_view.hidden(v);
+    freqlist_view.hidden(v);
    text_empty.hidden(!v);
-    // display.fill_rectangle(menu_view.screen_rect(), Color::black());
+    // display.fill_rectangle(freqlist_view.screen_rect(), Color::black());
    set_dirty();
 }

@@ -176,17 +177,14 @@ FrequencyLoadView::FrequencyLoadView(
        refresh_widgets(v);
    };

-    add_children({&menu_view,
+    add_children({&freqlist_view,
                  &text_empty});

    // Resize menu view to fill screen
-    menu_view.set_parent_rect({0, 3 * 8, 240, 30 * 8});
-
-    menu_view.on_select = [&nav, this](FreqManUIList&) {
-        nav_.pop();
-
-        auto& entry = database[menu_view.get_index()];
+    freqlist_view.set_parent_rect({0, 3 * 8, 240, 30 * 8});

+    freqlist_view.on_select = [&nav, this](FreqManUIList&) {
+        auto& entry = database[freqlist_view.get_index()];
        if (entry.type == RANGE) {
            // User chose a frequency range entry
            if (on_range_loaded)
@@ -199,18 +197,21 @@ FrequencyLoadView::FrequencyLoadView(
            if (on_frequency_loaded)
                on_frequency_loaded(entry.frequency_a);
        }
+        // swap with empty vector to ensure memory is immediately released
+        std::vector<freqman_entry>().swap(database);
+        nav_.pop();
    };
 }

 void FrequencyManagerView::on_edit_freq(rf::Frequency f) {
-    database[menu_view.get_index()].frequency_a = f;
+    database[freqlist_view.get_index()].frequency_a = f;
    save_freqman_file(file_list[categories[current_category_id].second], database);
    change_category(current_category_id);
 }

 void FrequencyManagerView::on_edit_desc(NavigationView& nav) {
    text_prompt(nav, desc_buffer, 28, [this](std::string& buffer) {
-        database[menu_view.get_index()].description = buffer;
+        database[freqlist_view.get_index()].description = buffer;
        save_freqman_file(file_list[categories[current_category_id].second], database);
        change_category(current_category_id);
    });
@@ -230,7 +231,7 @@ void FrequencyManagerView::on_delete() {
        delete_freqman_file(file_list[categories[current_category_id].second]);
        refresh_list();
    } else {
-        database.erase(database.begin() + menu_view.get_index());
+        database.erase(database.begin() + freqlist_view.get_index());
        save_freqman_file(file_list[categories[current_category_id].second], database);
    }
    change_category(current_category_id);
@@ -241,10 +242,9 @@ void FrequencyManagerView::refresh_widgets(const bool v) {
    button_edit_desc.hidden(v);
    button_delete.hidden(v);
    text_empty.hidden(!v);
-    menu_view.hidden(v);
-    menu_view.set_dirty();
+    freqlist_view.hidden(v);
    labels.hidden(v);
-    // display.fill_rectangle(menu_view.screen_rect(), Color::black());
+    // display.fill_rectangle(freqlist_view.screen_rect(), Color::black());
    set_dirty();
 }

@@ -261,13 +261,13 @@ FrequencyManagerView::FrequencyManagerView(

    add_children({&labels,
                  &button_new_category,
-                  &menu_view,
+                  &freqlist_view,
                  &text_empty,
                  &button_edit_freq,
                  &button_edit_desc,
                  &button_delete});

-    menu_view.on_select = [this](FreqManUIList&) {
+    freqlist_view.on_select = [this](FreqManUIList&) {
        button_edit_freq.focus();
    };

@@ -280,7 +280,7 @@ FrequencyManagerView::FrequencyManagerView(
        if (database.empty()) {
            database.push_back({0, 0, "", SINGLE});
        }
-        auto new_view = nav.push<FrequencyKeypadView>(database[menu_view.get_index()].frequency_a);
+        auto new_view = nav.push<FrequencyKeypadView>(database[freqlist_view.get_index()].frequency_a);
        new_view->on_changed = [this](rf::Frequency f) {
            on_edit_freq(f);
        };
@@ -290,7 +290,7 @@ FrequencyManagerView::FrequencyManagerView(
        if (database.empty()) {
            database.push_back({0, 0, "", SINGLE});
        }
-        desc_buffer = database[menu_view.get_index()].description;
+        desc_buffer = database[freqlist_view.get_index()].description;
        on_edit_desc(nav);
    };

@@ -64,7 +64,7 @@ class FreqManBaseView : public View {
        14,
        {}};

-    FreqManUIList menu_view{
+    FreqManUIList freqlist_view{
        {0, 3 * 8, 240, 23 * 8}};

    Text text_empty{
@@ -116,6 +116,7 @@ class FrequencyLoadView : public FreqManBaseView {
    std::function<void(rf::Frequency, rf::Frequency)> on_range_loaded{};

    FrequencyLoadView(NavigationView& nav);
+    ~FrequencyLoadView();

    std::string title() const override { return "Load freq."; };

@@ -199,6 +199,16 @@ size_t LevelView::change_mode(freqman_index_t new_mod) {
            field_bw.on_change = [this](size_t, OptionsField::value_t n) { receiver_model.set_wfm_configuration(n); };
            text_ctcss.set("             ");
            break;
+        case SPEC_MODULATION:
+            freqman_set_bandwidth_option(new_mod, field_bw);
+            baseband::run_image(portapack::spi_flash::image_tag_capture);
+            receiver_model.set_modulation(ReceiverModel::Mode::Capture);
+            field_bw.set_by_value(0);
+            field_bw.on_change = [this](size_t, OptionsField::value_t sampling_rate) {
+                auto anti_alias_baseband_bandwidth_filter = filter_bandwidth_for_sampling_rate(sampling_rate);
+                receiver_model.set_sampling_rate(sampling_rate);
+                receiver_model.set_baseband_bandwidth(anti_alias_baseband_bandwidth_filter);
+            };
        default:
            break;
    }
@@ -206,34 +216,23 @@ size_t LevelView::change_mode(freqman_index_t new_mod) {
 }

 void LevelView::handle_coded_squelch(const uint32_t value) {
-    static int32_t last_idx = -1;
+    static tone_index last_squelch_index = -1;

-    float diff, min_diff = value;
-    size_t min_idx{0};
-    size_t c;
+    if (field_mode.selected_index() == NFM_MODULATION) {
+        tone_index idx = tone_key_index_by_value(value);

-    if (field_mode.selected_index() != NFM_MODULATION) {
-        text_ctcss.set("             ");
-        return;
-    }
-
-    // Find nearest match
-    for (c = 0; c < tone_keys.size(); c++) {
-        diff = abs(((float)value / 100.0) - tone_keys[c].second);
-        if (diff < min_diff) {
-            min_idx = c;
-            min_diff = diff;
+        if ((last_squelch_index < 0) || (last_squelch_index != idx)) {
+            last_squelch_index = idx;
+            if (idx >= 0) {
+                text_ctcss.set("T: " + tone_key_string(idx));
+                return;
+            }
+        } else {
+            return;
        }
    }

-    // Arbitrary confidence threshold
-    if (last_idx < 0 || (unsigned)last_idx != min_idx) {
-        last_idx = min_idx;
-        if (min_diff < 40)
-            text_ctcss.set("T: " + tone_keys[min_idx].first);
-        else
-            text_ctcss.set("             ");
-    }
+    text_ctcss.set("             ");
 }

 } /* namespace ui */
@@ -91,7 +91,7 @@ class LevelView : public View {

    OptionsField field_mode{
        {15 * 8, 1 * 16},
-        3,
+        4,
        {}};

    OptionsField step_mode{
@@ -30,7 +30,7 @@ using namespace portapack;

 namespace ui {
 void GlassView::focus() {
-    button_marker.focus();
+    range_presets.focus();
 }

 GlassView::~GlassView() {
@@ -26,6 +26,7 @@

 #include "ui.hpp"
 #include "portapack.hpp"
+#include "app_settings.hpp"
 #include "baseband_api.hpp"
 #include "radio_state.hpp"
 #include "receiver_model.hpp"
@@ -62,7 +63,7 @@ class GlassView : public View {
    GlassView& operator=(const GlassView& nav);

    ~GlassView();
-    std::string title() const override { return "LookingGlass"; };
+    std::string title() const override { return "Looking Glass"; };

    void on_show() override;
    void on_hide() override;
@@ -71,6 +72,8 @@ class GlassView : public View {
   private:
    NavigationView& nav_;
    RxRadioState radio_state_{};
+    app_settings::SettingsManager settings_{
+        "rx_glass", app_settings::Mode::RX};

    struct preset_entry {
        rf::Frequency min{};
@@ -204,6 +204,7 @@ class MicTXView : public View {
            {"OFF-08dB", 4},  // WM8731 Mic Boost OFF to avoid ADC sat in high voice  ,relative  G =  -12 dB's (respect ref level)
        }};

+    // TODO: Use TxFrequencyField
    FrequencyField field_frequency{
        {5 * 8, 3 * 8},
    };
@@ -309,6 +310,7 @@ class MicTXView : public View {
        ' ',
    };

+    // TODO: Use RxFrequencyField
    FrequencyField field_rxfrequency{
        {10 * 8, (25 * 8) + 2},
    };
@@ -38,8 +38,6 @@ class ModemSetupView : public View {
    std::string title() const override { return "Modem setup"; };

   private:
-    void update_freq(rf::Frequency f);
-
    Labels labels{
        {{2 * 8, 11 * 8}, "Baudrate:", Color::light_grey()},
        {{2 * 8, 13 * 8}, "Mark:      Hz", Color::light_grey()},
@@ -40,11 +40,8 @@ void NRFRxView::focus() {
    field_frequency.focus();
 }

-void NRFRxView::update_freq(rf::Frequency f) {
-    receiver_model.set_target_frequency(f);
-}
-
-NRFRxView::NRFRxView(NavigationView& nav) {
+NRFRxView::NRFRxView(NavigationView& nav)
+    : nav_{nav} {
    baseband::run_image(portapack::spi_flash::image_tag_nrf_rx);

    add_children({&rssi,
@@ -57,7 +54,7 @@ NRFRxView::NRFRxView(NavigationView& nav) {
                  &console});

    // Auto-configure modem for LCR RX (will be removed later)
-    update_freq(2480000000);
+    field_frequency.set_value(2480000000);
    auto def_bell202 = &modem_defs[0];
    persistent_memory::set_modem_baudrate(def_bell202->baudrate);
    serial_format_t serial_format;
@@ -67,17 +64,7 @@ NRFRxView::NRFRxView(NavigationView& nav) {
    serial_format.bit_order = LSB_FIRST;
    persistent_memory::set_serial_format(serial_format);

-    field_frequency.set_value(receiver_model.target_frequency());
    field_frequency.set_step(100);
-    field_frequency.on_change = [this](rf::Frequency f) {
-        update_freq(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };

    button_modem_setup.on_select = [&nav](Button&) {
        nav.push<ModemSetupView>();
@@ -27,6 +27,7 @@
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
 #include "ui_record_view.hpp"  // DEBUG
@@ -47,6 +48,7 @@ class NRFRxView : public View {
   private:
    void on_data(uint32_t value, bool is_data);

+    NavigationView& nav_;
    RxRadioState radio_state_{
        4000000 /* bandwidth */,
        4000000 /* sampling rate */
@@ -64,15 +66,13 @@ class NRFRxView : public View {
    VGAGainField field_vga{
        {18 * 8, 0 * 16}};
    RSSI rssi{
-        {21 * 8, 0, 6 * 8, 4},
-    };
+        {21 * 8, 0, 6 * 8, 4}};
    Channel channel{
-        {21 * 8, 5, 6 * 8, 4},
-    };
+        {21 * 8, 5, 6 * 8, 4}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {0 * 8, 0 * 16},
-    };
+        nav_};

    Button button_modem_setup{
        {240 - 12 * 8, 1 * 16, 96, 24},
@@ -81,9 +81,6 @@ class NRFRxView : public View {
    Console console{
        {0, 4 * 16, 240, 240}};

-    void update_freq(rf::Frequency f);
-    // void on_data_afsk(const AFSKDataMessage& message);
-
    MessageHandlerRegistration message_handler_packet{
        Message::ID::AFSKData,
        [this](Message* const p) {
@@ -23,11 +23,12 @@
 */

 #include "ui_playlist.hpp"
+
 #include "convert.hpp"
 #include "file_reader.hpp"
+#include "io_file.hpp"
 #include "string_format.hpp"
 #include "ui_fileman.hpp"
-#include "io_file.hpp"
 #include "utility.hpp"

 #include "baseband_api.hpp"
@@ -39,11 +40,17 @@
 using namespace portapack;
 namespace fs = std::filesystem;

-/* TODO: wouldn't it be easier if the playlist were just a list of C16 files
- * (and maybe delays) and then read the data file next to the C16 file? */
+/* TODO
+ * - Should frequency overrides be saved in the playlist?
+ * - Start playing from current track (vs start over)?
+ */

 namespace ui {

+// TODO: consolidate extesions into a shared header?
+static const fs::path c16_ext = u".C16";
+static const fs::path ppl_ext = u".PPL";
+
 void PlaylistView::load_file(const fs::path& playlist_path) {
    File playlist_file;
    auto error = playlist_file.open(playlist_path.string());
@@ -57,57 +64,154 @@ void PlaylistView::load_file(const fs::path& playlist_path) {
            continue;  // Empty or comment line.

        auto cols = split_string(line, ',');
-        if (cols.size() < 3)
-            continue;  // Line doesn't have enough columns.
+        auto entry = load_entry(trim(cols[0]));

-        playlist_entry entry{};
+        if (!entry)
+            continue;

-        parse_int(cols[0], entry.replay_frequency);
-        parse_int(cols[2], entry.sample_rate);
-        if (entry.replay_frequency == 0 || entry.sample_rate == 0)
-            continue;  // Invalid freq or rate.
+        // Read optional delay value.
+        if (cols.size() > 1)
+            parse_int(cols[1], entry->ms_delay);

-        entry.replay_file = fs::path{u"/"} + std::string{cols[1]};
-
-        if (cols.size() == 4)  // Optional delay value.
-            parse_int(cols[3], entry.initial_delay);
-
-        playlist_db_.emplace_back(std::move(entry));
+        playlist_db_.emplace_back(*std::move(entry));
    }
 }

+Optional<PlaylistView::playlist_entry> PlaylistView::load_entry(fs::path&& path) {
+    File capture_file;
+
+    auto error = capture_file.open(path);
+    if (error)
+        return {};
+
+    // Read metafile if it exists.
+    auto metadata_path = get_metadata_path(path);
+    auto metadata = read_metadata_file(metadata_path);
+
+    // If no metadata found, fallback to the TX frequency.
+    if (!metadata)
+        metadata = {transmitter_model.target_frequency(), 500'000};
+
+    return playlist_entry{
+        std::move(path),
+        *metadata,
+        capture_file.size(),
+        0u};
+}
+
 void PlaylistView::on_file_changed(const fs::path& new_file_path) {
    stop();
-    reset();

+    current_index_ = 0;
    playlist_path_ = new_file_path;
    playlist_db_.clear();
    load_file(playlist_path_);

    update_ui();
-    button_play.focus();
+
+    // TODO: fix in UI framework with 'try_focus()'?
+    // Hack around focus getting called by ctor before parent is set.
+    if (parent())
+        button_play.focus();
 }

-void PlaylistView::reset() {
-    current_track_ = 0;
-    current_entry_ = nullptr;
-    current_entry_size_ = 0;
+void PlaylistView::open_file(bool prompt_save) {
+    if (playlist_dirty_ && prompt_save) {
+        nav_.display_modal(
+            "Save?", "Save changes?", YESNO,
+            [this](bool choice) {
+                if (choice)
+                    save_file(false);
+            });
+        nav_.set_on_pop([this]() { open_file(false); });
+        return;
+    }
+
+    auto open_view = nav_.push<FileLoadView>(".PPL");
+    open_view->push_dir(u"PLAYLIST");
+    open_view->on_changed = [this](fs::path new_file_path) {
+        on_file_changed(new_file_path);
+    };
+}
+
+void PlaylistView::save_file(bool show_dialogs) {
+    if (!playlist_dirty_ || playlist_path_.empty())
+        return;
+
+    ensure_directory(playlist_path_.parent_path());
+
+    File playlist_file;
+    auto error = playlist_file.create(playlist_path_.string());
+
+    if (error) {
+        if (show_dialogs)
+            nav_.display_modal(
+                "Save Error",
+                "Could not save file\n" + playlist_path_.string());
+        return;
+    }
+
+    for (const auto& entry : playlist_db_) {
+        playlist_file.write_line(
+            entry.path.string() + "," +
+            to_string_dec_uint(entry.ms_delay));
+    }
+
+    playlist_dirty_ = false;
+
+    if (show_dialogs)
+        nav_.display_modal(
+            "Save",
+            "Saved playlist\n" + playlist_path_.string());
+}
+
+void PlaylistView::add_entry(fs::path&& path) {
+    if (playlist_path_.empty()) {
+        playlist_path_ = next_filename_matching_pattern(u"/PLAYLIST/PLAY_????.PPL");
+
+        // Hack around focus getting called by ctor before parent is set.
+        if (parent())
+            button_play.focus();
+    }
+
+    auto entry = load_entry(std::move(path));
+    if (entry) {
+        playlist_db_.emplace_back(*std::move(entry));
+        current_index_ = playlist_db_.size() - 1;
+        playlist_dirty_ = true;
+    }
+
+    update_ui();
+}
+
+void PlaylistView::delete_entry() {
+    if (playlist_db_.empty())
+        return;
+
+    // Ugh, the STL is gross.
+    playlist_db_.erase(playlist_db_.begin() + current_index_);
+
+    if (current_index_ > 0)
+        --current_index_;
+
+    playlist_dirty_ = true;
+    update_ui();
 }

 void PlaylistView::show_file_error(const fs::path& path, const std::string& message) {
    nav_.display_modal("Error", "Error opening file \n" + path.string() + "\n" + message);
 }

+PlaylistView::playlist_entry* PlaylistView::current() {
+    return playlist_db_.empty() ? nullptr : &playlist_db_[current_index_];
+}
+
 bool PlaylistView::is_active() const {
    return replay_thread_ != nullptr;
 }

-bool PlaylistView::loop() const {
-    return check_loop.value();
-}
-
-bool PlaylistView::is_done() const {
-    return current_track_ >= playlist_db_.size();
+bool PlaylistView::at_end() const {
+    return current_index_ >= playlist_db_.size();
 }

 void PlaylistView::toggle() {
@@ -118,60 +222,63 @@ void PlaylistView::toggle() {
 }

 void PlaylistView::start() {
-    reset();
-
    if (playlist_db_.empty())
        return;  // Nothing to do.

-    if (next_track())
-        send_current_track();
+    current_index_ = 0u;
+    send_current_track();
 }

 /* Advance to the next track in the playlist. */
 bool PlaylistView::next_track() {
-    if (is_done()) {
-        if (loop())
-            current_track_ = 0;
-        else
-            return false;  // All done.
+    ++current_index_;
+
+    // Reset to the 0 once at the end to prevent current_index_
+    // from being outside the bounds of playlist_db_ when painting.
+    if (at_end()) {
+        current_index_ = 0;
+        return check_loop.value();  // Keep going if looping.
    }
-    current_entry_ = &playlist_db_[current_track_];
-    current_track_++;
+
    return true;
 }

 /* Transmits the current_entry_ */
 void PlaylistView::send_current_track() {
+    // Prepare to send a file.
    replay_thread_.reset();
+    transmitter_model.disable();
    ready_signal_ = false;

-    if (!current_entry_)
+    if (!current())
        return;

+    // TODO: Use a timer so the UI isn't frozen.
+    if (current()->ms_delay > 0)
+        chThdSleepMilliseconds(current()->ms_delay);
+
    // Open the sample file to send.
    auto reader = std::make_unique<FileReader>();
-    auto error = reader->open(current_entry_->replay_file);
+    auto error = reader->open(current()->path);
    if (error) {
-        show_file_error(current_entry_->replay_file, "Can't open file to send.");
+        show_file_error(current()->path, "Can't open file to send.");
        return;
    }

-    // Get the sample file size for the progress bar.
-    current_entry_size_ = reader->file().size();
-    progressbar_transmit.set_value(0);
-
-    // Wait a bit before sending if specified.
-    // TODO: this pauses the main thread, move into ReplayThread instead.
-    if (current_entry_->initial_delay > 0)
-        chThdSleepMilliseconds(current_entry_->initial_delay);
-
-    // ReplayThread starts immediately on contruction so
+    // ReplayThread starts immediately on construction so
    // these need to be set before creating the ReplayThread.
-    transmitter_model.set_target_frequency(current_entry_->replay_frequency);
-    transmitter_model.set_sampling_rate(current_entry_->sample_rate * 8);
+    transmitter_model.set_target_frequency(current()->metadata.center_frequency);
+    transmitter_model.set_sampling_rate(current()->metadata.sample_rate * 8);
    transmitter_model.set_baseband_bandwidth(baseband_bandwidth);
    transmitter_model.enable();

+    // Set baseband sample rate too for waterfall to be correct.
+    // TODO: Why doesn't the transmitter_model just handle this?
+    baseband::set_sample_rate(transmitter_model.sampling_rate());
+
+    // Reset the transmit progress bar.
+    progressbar_transmit.set_value(0);
+
    // Use the ReplayThread class to send the data.
    replay_thread_ = std::make_unique<ReplayThread>(
        std::move(reader),
@@ -191,37 +298,48 @@ void PlaylistView::stop() {
    // This terminates the underlying chThread.
    replay_thread_.reset();
    transmitter_model.disable();
+
+    // Reset the transmit progress bar.
+    progressbar_transmit.set_value(0);
    update_ui();
 }

 void PlaylistView::update_ui() {
    if (playlist_db_.empty()) {
-        text_track.set("Open a playlist file.");
-    } else {
-        text_track.set(
-            to_string_dec_uint(current_track_) + "/" +
-            to_string_dec_uint(playlist_db_.size()) + " " +
-            playlist_path_.filename().string());
-    }
-
-    button_play.set_bitmap(is_active() ? &bitmap_stop : &bitmap_play);
-
-    progressbar_track.set_value(current_track_);
-    progressbar_track.set_max(playlist_db_.size());
-    progressbar_transmit.set_max(current_entry_size_);
-
-    if (current_entry_) {
-        auto duration = ms_duration(current_entry_size_, current_entry_->sample_rate, 4);
-        text_filename.set(truncate(current_entry_->replay_file.filename().string(), 12));
-        text_sample_rate.set(unit_auto_scale(current_entry_->sample_rate, 3, 0) + "Hz");
-        text_duration.set(to_string_time_ms(duration));
-        text_frequency.set(to_string_short_freq(current_entry_->replay_frequency));
-    } else {
        text_filename.set("-");
        text_sample_rate.set("-");
        text_duration.set("-");
-        text_frequency.set("-");
+
+        if (playlist_path_.empty())
+            text_track.set("Open playlist or add capture.");
+        else
+            text_track.set(playlist_path_.filename().string());
+
+        progressbar_track.set_value(0);
+        progressbar_track.set_max(0);
+        progressbar_transmit.set_max(0);
+
+    } else {
+        chDbgAssert(!at_end(), "update_ui #1", "current_index_ invalid");
+
+        text_filename.set(current()->path.filename().string());
+        text_sample_rate.set(unit_auto_scale(current()->metadata.sample_rate, 3, 0) + "Hz");
+
+        auto duration = ms_duration(current()->file_size, current()->metadata.sample_rate, 4);
+        text_duration.set(to_string_time_ms(duration));
+        field_frequency.set_value(current()->metadata.center_frequency);
+
+        text_track.set(
+            to_string_dec_uint(current_index_ + 1) + "/" +
+            to_string_dec_uint(playlist_db_.size()) + " " +
+            playlist_path_.filename().string());
+
+        progressbar_track.set_max(playlist_db_.size() - 1);
+        progressbar_track.set_value(current_index_);
+        progressbar_transmit.set_max(current()->file_size);
    }
+
+    button_play.set_bitmap(is_active() ? &bitmap_stop : &bitmap_play);
 }

 void PlaylistView::on_tx_progress(uint32_t progress) {
@@ -237,7 +355,7 @@ void PlaylistView::handle_replay_thread_done(uint32_t return_code) {
    }

    if (return_code == ReplayThread::READ_ERROR)
-        show_file_error(current_entry_->replay_file, "Replay read failed.");
+        show_file_error(current()->path, "Replay read failed.");

    stop();
 }
@@ -248,36 +366,103 @@ PlaylistView::PlaylistView(
    baseband::run_image(portapack::spi_flash::image_tag_replay);

    add_children({
-        &button_open,
        &text_filename,
        &text_sample_rate,
        &text_duration,
        &progressbar_track,
        &progressbar_transmit,
-        &text_frequency,
+        &field_frequency,
        &tx_view,
        &check_loop,
        &button_play,
        &text_track,
+        &button_prev,
+        &button_add,
+        &button_delete,
+        &button_open,
+        &button_save,
+        &button_next,
        &waterfall,
    });

    waterfall.show_audio_spectrum_view(false);

+    field_frequency.set_value(100'000'000);
+    field_frequency.on_change = [this](rf::Frequency f) {
+        if (current())
+            current()->metadata.center_frequency = f;
+    };
+    field_frequency.on_edit = [this]() {
+        auto freq_view = nav_.push<FrequencyKeypadView>(field_frequency.value());
+        freq_view->on_changed = [this](rf::Frequency f) {
+            field_frequency.set_value(f);
+        };
+    };
+
    button_play.on_select = [this](ImageButton&) {
        toggle();
    };

-    button_open.on_select = [this, &nav](Button&) {
-        auto open_view = nav.push<FileLoadView>(".PPL");
-        open_view->on_changed = [this](std::filesystem::path new_file_path) {
-            on_file_changed(new_file_path);
+    button_add.on_select = [this, &nav]() {
+        if (is_active())
+            return;
+        auto open_view = nav_.push<FileLoadView>(".C16");
+        open_view->push_dir(u"CAPTURES");
+        open_view->on_changed = [this](fs::path path) {
+            add_entry(std::move(path));
        };
    };

+    button_delete.on_select = [this, &nav]() {
+        if (is_active())
+            return;
+        delete_entry();
+    };
+
+    button_open.on_select = [this, &nav]() {
+        if (is_active())
+            stop();
+        open_file();
+    };
+
+    button_save.on_select = [this]() {
+        if (is_active())
+            stop();
+        save_file();
+    };
+
+    button_prev.on_select = [this]() {
+        if (is_active())
+            return;
+        --current_index_;
+        if (at_end())
+            current_index_ = playlist_db_.size() - 1;
+        update_ui();
+    };
+
+    button_next.on_select = [this]() {
+        if (is_active())
+            return;
+        ++current_index_;
+        if (at_end())
+            current_index_ = 0;
+        update_ui();
+    };
+
    update_ui();
 }

+PlaylistView::PlaylistView(
+    NavigationView& nav,
+    const fs::path& path)
+    : PlaylistView(nav) {
+    auto ext = path.extension();
+    if (path_iequal(ext, ppl_ext))
+        on_file_changed(path);
+    else if (path_iequal(ext, c16_ext))
+        add_entry(fs::path{path});
+}
+
 PlaylistView::~PlaylistView() {
    transmitter_model.disable();
    baseband::shutdown();
@@ -286,20 +471,23 @@ PlaylistView::~PlaylistView() {
 void PlaylistView::set_parent_rect(Rect new_parent_rect) {
    View::set_parent_rect(new_parent_rect);

-    const ui::Rect waterfall_rect{
+    ui::Rect waterfall_rect{
        0, header_height, new_parent_rect.width(),
        new_parent_rect.height() - header_height};
    waterfall.set_parent_rect(waterfall_rect);
 }

+void PlaylistView::focus() {
+    if (playlist_path_.empty())
+        button_add.focus();
+    else
+        button_play.focus();
+}
+
 void PlaylistView::on_hide() {
    stop();
    waterfall.on_hide();
    View::on_hide();
 }

-void PlaylistView::focus() {
-    button_open.focus();
-}
-
 } /* namespace ui */
@@ -25,13 +25,16 @@
 #define NORMAL_UI false

 #include "app_settings.hpp"
+#include "bitmap.hpp"
+#include "file.hpp"
+#include "metadata_file.hpp"
 #include "radio_state.hpp"
-#include "ui_widget.hpp"
+#include "replay_thread.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
-#include "replay_thread.hpp"
 #include "ui_spectrum.hpp"
 #include "ui_transmitter.hpp"
+#include "ui_widget.hpp"

 #include <string>
 #include <memory>
@@ -42,17 +45,15 @@ namespace ui {
 class PlaylistView : public View {
   public:
    PlaylistView(NavigationView& nav);
+    PlaylistView(NavigationView& nav, const std::filesystem::path& path);
    ~PlaylistView();

-    // Disable copy to make -Weffc++ happy.
-    PlaylistView(const PlaylistView&) = delete;
-    PlaylistView& operator=(const PlaylistView&) = delete;
-
+    // Following 2 called by 'NavigationView::update_view' after view is created.
    void set_parent_rect(Rect new_parent_rect) override;
-    void on_hide() override;
    void focus() override;
+    void on_hide() override;

-    std::string title() const override { return "Playlist"; };
+    std::string title() const override { return "Replay"; };

   private:
    NavigationView& nav_;
@@ -61,35 +62,40 @@ class PlaylistView : public View {
        "tx_playlist", app_settings::Mode::TX};

    // More header == less spectrum view.
-    static constexpr ui::Dim header_height = 4 * 16;
+    static constexpr ui::Dim header_height = 6 * 16;
    static constexpr uint32_t baseband_bandwidth = 2500000;

    struct playlist_entry {
-        rf::Frequency replay_frequency{0};
-        std::filesystem::path replay_file{};
-        uint32_t sample_rate{};
-        uint32_t initial_delay{};
+        std::filesystem::path path{};
+        capture_metadata metadata{};
+        File::Size file_size{};
+        uint32_t ms_delay{};
    };

    std::unique_ptr<ReplayThread> replay_thread_{};
    bool ready_signal_{};  // Used to signal the ReplayThread.

-    size_t current_track_{0};
-    const playlist_entry* current_entry_{};
-    size_t current_entry_size_{0};
+    size_t current_index_{0};
+    bool playlist_dirty_{};
    std::vector<playlist_entry> playlist_db_{};
    std::filesystem::path playlist_path_{};

    void load_file(const std::filesystem::path& path);
+    Optional<playlist_entry> load_entry(std::filesystem::path&& path);
    void on_file_changed(const std::filesystem::path& path);
+    void open_file(bool prompt_save = true);
+    void save_file(bool show_dialogs = true);
+    void add_entry(std::filesystem::path&& path);
+    void delete_entry();
    void reset();
    void show_file_error(
        const std::filesystem::path& path,
        const std::string& message);

+    playlist_entry* current();
+
    bool is_active() const;
-    bool loop() const;
-    bool is_done() const;
+    bool at_end() const;

    void toggle();
    void start();
@@ -103,31 +109,33 @@ class PlaylistView : public View {
    void on_tx_progress(uint32_t progress);
    void handle_replay_thread_done(uint32_t return_code);

-    Button button_open{
-        {0 * 8, 0 * 16, 10 * 8, 2 * 16},
-        "Open PPL"};
-
    Text text_filename{
-        {11 * 8, 0 * 16, 12 * 8, 16}};
+        {0 * 8, 0 * 16, 30 * 8, 16}};
+
+    FrequencyField field_frequency{
+        {0 * 8, 1 * 16}};

    Text text_sample_rate{
-        {24 * 8, 0 * 16, 6 * 8, 16}};
+        {10 * 8, 1 * 16, 7 * 8, 16}};

-    Text text_duration{
-        {11 * 8, 1 * 16, 6 * 8, 16}};
+    /*v making there's 1px line (instead of two) between two progress bars,
+     * by letting 1px overlapped.
+     * So, since they overlapped 1px, they are visually same, and looks better.
+     */

    ProgressBar progressbar_track{
-        {18 * 8, 1 * 16, 12 * 8, 8}};
+        {18 * 8, 1 * 16, 12 * 8, 8 + 1}};

    ProgressBar progressbar_transmit{
-        {18 * 8, 3 * 8, 12 * 8, 8}};
+        {18 * 8, 3 * 8 - 1, 12 * 8, 8}};

-    Text text_frequency{
-        {0 * 8, 2 * 16, 9 * 8, 16}};
+    Text text_duration{
+        {0 * 8, 2 * 16, 5 * 8, 16}};
+
+    // TODO: delay duration field.

    TransmitterView2 tx_view{
-        74, 1 * 8, SHORT_UI  // x(columns), y (line) position.
-    };
+        9 * 8, 1 * 8, SHORT_UI};

    Checkbox check_loop{
        {21 * 8, 2 * 16},
@@ -144,7 +152,43 @@ class PlaylistView : public View {
    Text text_track{
        {0 * 8, 3 * 16, 30 * 8, 16}};

-    spectrum::WaterfallWidget waterfall{};
+    NewButton button_prev{
+        {2 * 8, 4 * 16, 4 * 8, 2 * 16},
+        "",
+        &bitmap_arrow_left,
+        Color::dark_grey()};
+
+    NewButton button_next{
+        {6 * 8, 4 * 16, 4 * 8, 2 * 16},
+        "",
+        &bitmap_arrow_right,
+        Color::dark_grey()};
+
+    NewButton button_add{
+        {11 * 8, 4 * 16, 4 * 8, 2 * 16},
+        "",
+        &bitmap_icon_new_file,
+        Color::orange()};
+
+    NewButton button_delete{
+        {15 * 8, 4 * 16, 4 * 8, 2 * 16},
+        "",
+        &bitmap_icon_delete,
+        Color::orange()};
+
+    NewButton button_open{
+        {20 * 8, 4 * 16, 4 * 8, 2 * 16},
+        "",
+        &bitmap_icon_load,
+        Color::dark_blue()};
+
+    NewButton button_save{
+        {24 * 8, 4 * 16, 4 * 8, 2 * 16},
+        "",
+        &bitmap_icon_save,
+        Color::dark_blue()};
+
+    spectrum::WaterfallView waterfall{};

    MessageHandlerRegistration message_handler_replay_thread_error{
        Message::ID::ReplayThreadDone,
@@ -36,18 +36,27 @@ void ReconView::set_loop_config(bool v) {
    persistent_memory::set_recon_continuous(continuous);
 }

+void ReconView::recon_stop_recording() {
+    if (is_recording) {
+        button_audio_app.set_style(&Styles::white);
+        record_view->stop();
+        button_config.set_style(&Styles::white);  // disable config while recording as it's causing an IO error pop up at exit
+        is_recording = false;
+    }
+}
+
 void ReconView::clear_freqlist_for_ui_action() {
-    audio::output::stop();
+    recon_stop_recording();
+    if (field_mode.selected_index_value() != SPEC_MODULATION)
+        audio::output::stop();
    // flag to detect and reload frequency_list
-    freqlist_cleared_for_ui_action = true;
-    // if in manual mode, there is enough memory to load freqman files, else we have to unload/reload
    if (!manual_mode) {
        // clear and shrink_to_fit are not enough to really start with a new, clean, empty vector
        // swap is the only way to achieve a perfect memory liberation
        std::vector<freqman_entry>().swap(frequency_list);
-    } else {
+    } else
        frequency_list.shrink_to_fit();
-    }
+    freqlist_cleared_for_ui_action = true;
 }

 void ReconView::reset_indexes() {
@@ -234,8 +243,8 @@ bool ReconView::recon_save_config_to_sd() {

    make_new_directory(u"SETTINGS");

-    auto result = settings_file.create(RECON_CFG_FILE);
-    if (result.is_valid())
+    auto error = settings_file.create(RECON_CFG_FILE);
+    if (error)
        return false;
    settings_file.write_line(input_file);
    settings_file.write_line(output_file);
@@ -248,7 +257,8 @@ bool ReconView::recon_save_config_to_sd() {
 }

 void ReconView::audio_output_start() {
-    audio::output::start();
+    if (field_mode.selected_index_value() != SPEC_MODULATION)
+        audio::output::start();
    receiver_model.set_headphone_volume(receiver_model.headphone_volume());  // WM8731 hack.
 }

@@ -281,10 +291,6 @@ void ReconView::recon_redraw() {
        } else if (freq_lock >= recon_lock_nb_match) {
            big_display.set_style(&Styles::green);
            button_pause.set_text("<UNLOCK>");
-            // FREQ IS STRONG: GREEN and recon will pause when on_statistics_update()
-            if ((!scanner_mode) && autosave && frequency_list.size() > 0) {
-                recon_save_freq(freq_file_path, current_index, false);
-            }
        }
    }
    if (last_db != db || last_list_size != frequency_list.size()) {
@@ -356,16 +362,21 @@ void ReconView::focus() {
 }

 ReconView::~ReconView() {
-    // Save recon config.
+    recon_stop_recording();
    recon_save_config_to_sd();
-
-    audio::output::stop();
+    if (field_mode.selected_index_value() != SPEC_MODULATION)
+        audio::output::stop();
+    receiver_model.set_modulation(ReceiverModel::Mode::WidebandFMAudio);
    receiver_model.disable();
    baseband::shutdown();
 }

 ReconView::ReconView(NavigationView& nav)
    : nav_{nav} {
+    chrono_start = chTimeNow();
+    record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
+                                               u"AUTO_AUDIO_", u"AUDIO",
+                                               RecordView::FileType::WAV, 4096, 4);
    add_children({&labels,
                  &field_lna,
                  &field_vga,
@@ -401,7 +412,14 @@ ReconView::ReconView(NavigationView& nav)
                  &button_dir,
                  &button_restart,
                  &button_mic_app,
-                  &button_remove});
+                  &button_remove,
+                  record_view.get()});
+
+    record_view->hidden(true);
+    record_view->set_filename_date_frequency(true);
+    record_view->on_error = [&nav](std::string message) {
+        nav.display_modal("Error", message);
+    };

    def_step = 0;
    // HELPER: Pre-setting a manual range, based on stored frequency
@@ -426,6 +444,7 @@ ReconView::ReconView(NavigationView& nav)
    load_ranges = persistent_memory::recon_load_ranges();
    load_hamradios = persistent_memory::recon_load_hamradios();
    update_ranges = persistent_memory::recon_update_ranges_when_recon();
+    auto_record_locked = persistent_memory::recon_auto_record_locked();

    button_manual_start.on_select = [this, &nav](ButtonWithEncoder& button) {
        clear_freqlist_for_ui_action();
@@ -682,8 +701,8 @@ ReconView::ReconView(NavigationView& nav)
        } else if (frequency_range.min > frequency_range.max) {
            nav_.display_modal("Error", "END freq\nis lower than START");
        } else {
-            audio::output::stop();
-
+            if (field_mode.selected_index_value() != SPEC_MODULATION)
+                audio::output::stop();
            // clear and shrink_to_fit are not enough to really start with a new, clean, empty vector
            // swap is the only way to achieve a perfect memory liberation
            std::vector<freqman_entry>().swap(frequency_list);
@@ -763,6 +782,9 @@ ReconView::ReconView(NavigationView& nav)
            button_scanner_mode.set_style(&Styles::blue);
            button_scanner_mode.set_text("RECON");
        }
+        if (frequency_list.size() > FREQMAN_MAX_PER_FILE) {
+            file_name.set_style(&Styles::yellow);
+        }
    };

    button_add.on_select = [this](ButtonWithEncoder&) {  // frequency_list[current_index]
@@ -798,11 +820,13 @@ ReconView::ReconView(NavigationView& nav)
    };

    button_config.on_select = [this, &nav](Button&) {
+        if (is_recording)  // disabling config while recording
+            return;
        clear_freqlist_for_ui_action();
-
+        freq_lock = 0;
+        timer = 0;
        auto open_view = nav.push<ReconSetupView>(input_file, output_file);
        open_view->on_changed = [this](std::vector<std::string> result) {
-            freqlist_cleared_for_ui_action = false;
            input_file = result[0];
            output_file = result[1];
            freq_file_path = "/FREQMAN/" + output_file + ".TXT";
@@ -815,8 +839,10 @@ ReconView::ReconView(NavigationView& nav)
            load_ranges = persistent_memory::recon_load_ranges();
            load_hamradios = persistent_memory::recon_load_hamradios();
            update_ranges = persistent_memory::recon_update_ranges_when_recon();
+            auto_record_locked = persistent_memory::recon_auto_record_locked();

            frequency_file_load(false);
+            freqlist_cleared_for_ui_action = false;

            if (autostart) {
                recon_resume();
@@ -833,6 +859,9 @@ ReconView::ReconView(NavigationView& nav)

    field_wait.on_change = [this](int32_t v) {
        wait = v;
+        // replacing -100 by 200 else it's freezing the device
+        if (wait == -100)
+            wait = -200;
        colorize_waits();
    };

@@ -891,40 +920,36 @@ ReconView::ReconView(NavigationView& nav)

 void ReconView::frequency_file_load(bool stop_all_before) {
    (void)(stop_all_before);
-    audio::output::stop();
+    if (field_mode.selected_index_value() != SPEC_MODULATION)
+        audio::output::stop();

    def_step = step_mode.selected_index();  // use def_step from manual selector
-    // clear and shrink_to_fit are not enough to really start with a new, clean, empty vector
-    // swap is the only way to achieve a perfect memory liberation
-    std::vector<freqman_entry>().swap(frequency_list);  // clear the existing frequency list (expected behavior)
-    std::string file_input = input_file;                // default recon mode
+    std::string file_input = input_file;    // default recon mode
    if (scanner_mode) {
        file_input = output_file;
        file_name.set_style(&Styles::red);
        button_scanner_mode.set_style(&Styles::red);
+        desc_cycle.set_style(&Styles::red);
        button_scanner_mode.set_text("SCANNER");
    } else {
        file_name.set_style(&Styles::blue);
        button_scanner_mode.set_style(&Styles::blue);
+        desc_cycle.set_style(&Styles::blue);
        button_scanner_mode.set_text("RECON");
    }
-    desc_cycle.set_style(&Styles::white);
-    if (!load_freqman_file_ex(file_input, frequency_list, load_freqs, load_ranges, load_hamradios, RECON_FREQMAN_MAX_PER_FILE)) {
+    if (!load_freqman_file(file_input, frequency_list, load_freqs, load_ranges, load_hamradios)) {
        file_name.set_style(&Styles::red);
-        desc_cycle.set_style(&Styles::red);
        desc_cycle.set(" NO " + file_input + ".TXT FILE ...");
        file_name.set("=> NO DATA");
    } else {
        file_name.set(file_input + "=>" + output_file);
        if (frequency_list.size() == 0) {
            file_name.set_style(&Styles::red);
-            desc_cycle.set_style(&Styles::red);
            desc_cycle.set("/0 no entries in list");
            file_name.set("BadOrEmpty " + file_input);
        } else {
-            if (frequency_list.size() > RECON_FREQMAN_MAX_PER_FILE) {
+            if (frequency_list.size() > FREQMAN_MAX_PER_FILE) {
                file_name.set_style(&Styles::yellow);
-                desc_cycle.set_style(&Styles::yellow);
            }
        }
    }
@@ -998,6 +1023,14 @@ void ReconView::frequency_file_load(bool stop_all_before) {
 }

 void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
+    systime_t time_interval = 100;
+
+    if (field_mode.selected_index_value() == SPEC_MODULATION) {
+        chrono_end = chTimeNow();
+        time_interval = chrono_end - chrono_start;
+        chrono_start = chrono_end;
+    }
+
    // hack to reload the list if it was cleared by going into CONFIG
    if (freqlist_cleared_for_ui_action) {
        if (!manual_mode) {
@@ -1024,7 +1057,9 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
            if (status != 1) {
                status = 1;
                if (wait != 0) {
-                    audio::output::stop();
+                    recon_stop_recording();
+                    if (field_mode.selected_index_value() != SPEC_MODULATION)
+                        audio::output::stop();
                }
            }
            if (db > squelch)  // MATCHING LEVEL
@@ -1046,8 +1081,24 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
            if (status != 2) {
                continuous_lock = false;
                status = 2;
+                // FREQ IS STRONG: GREEN and recon will pause when on_statistics_update()
+                if ((!scanner_mode) && autosave && frequency_list.size() > 0) {
+                    recon_save_freq(freq_file_path, current_index, false);
+                }
                if (wait != 0) {
-                    audio_output_start();
+                    if (field_mode.selected_index_value() != SPEC_MODULATION)
+                        audio_output_start();
+                    // contents of a possible recon_start_recording(), but not yet since it's only called once
+                    if (auto_record_locked && !is_recording) {
+                        button_audio_app.set_style(&Styles::red);
+                        record_view->start();
+                        button_config.set_style(&Styles::light_grey);  // disable config while recording as it's causing an IO error pop up at exit
+                        is_recording = true;
+                    }
+                    // FREQ IS STRONG: GREEN and recon will pause when on_statistics_update()
+                    if ((!scanner_mode) && autosave && frequency_list.size() > 0) {
+                        recon_save_freq(freq_file_path, current_index, false);
+                    }
                }
                if (wait >= 0) {
                    timer = wait;
@@ -1066,8 +1117,9 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
        text_timer.set("TIMER: " + to_string_dec_int(timer));
    }
    if (timer) {
-        if (!continuous_lock || recon_match_mode == RECON_MATCH_SPARSE)
-            timer -= STATS_UPDATE_INTERVAL;
+        if (!continuous_lock || recon_match_mode == RECON_MATCH_SPARSE) {
+            timer -= time_interval;
+        }
        if (timer < 0) {
            timer = 0;
        }
@@ -1078,7 +1130,6 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
            if (frequency_list.size() > 0) {
                has_looped = false;
                entry_has_changed = false;
-
                if (recon || stepper != 0 || index_stepper != 0) {
                    if (index_stepper == 0) {
                        /* we are doing a range */
@@ -1178,7 +1229,8 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {

                        entry_has_changed = true;

-                        if (!recon)  // for some motive, audio output gets stopped.
+                        // for some motive, audio output gets stopped.
+                        if (!recon && field_mode.selected_index_value() != SPEC_MODULATION)
                            audio_output_start();
                    }
                    // reload entry if changed
@@ -1230,7 +1282,8 @@ void ReconView::recon_pause() {
    continuous_lock = false;
    recon = false;

-    audio_output_start();
+    if (field_mode.selected_index_value() != SPEC_MODULATION)
+        audio_output_start();

    big_display.set_style(&Styles::white);
    button_pause.set_text("<RESUME>");  // PAUSED, show resume
@@ -1242,7 +1295,8 @@ void ReconView::recon_resume() {
    continuous_lock = false;
    recon = true;

-    audio::output::stop();
+    if (field_mode.selected_index_value() != SPEC_MODULATION)
+        audio::output::stop();

    big_display.set_style(&Styles::white);
    button_pause.set_text("<PAUSE>");
@@ -1283,10 +1337,28 @@ void ReconView::on_stepper_delta(int32_t v) {
 size_t ReconView::change_mode(freqman_index_t new_mod) {
    field_mode.on_change = [this](size_t, OptionsField::value_t) {};
    field_bw.on_change = [this](size_t, OptionsField::value_t) {};
-
+    recon_stop_recording();
+    remove_child(record_view.get());
+    record_view.reset();
+    if (new_mod == 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);
+    } else {
+        record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
+                                                   u"AUTO_AUDIO_", u"AUDIO",
+                                                   RecordView::FileType::WAV, 4096, 4);
+    }
+    add_child(record_view.get());
+    record_view->hidden(true);
+    record_view->set_filename_date_frequency(true);
+    record_view->on_error = [this](std::string message) {
+        nav_.display_modal("Error", message);
+    };
    receiver_model.disable();
    baseband::shutdown();
-
+    size_t recording_sampling_rate = 0;
    switch (new_mod) {
        case AM_MODULATION:
            freqman_set_bandwidth_option(new_mod, field_bw);
@@ -1297,6 +1369,7 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
            receiver_model.set_am_configuration(field_bw.selected_index_value());
            field_bw.on_change = [this](size_t, OptionsField::value_t n) { receiver_model.set_am_configuration(n); };
            text_ctcss.set("        ");
+            recording_sampling_rate = 12000;
            break;
        case NFM_MODULATION:
            freqman_set_bandwidth_option(new_mod, field_bw);
@@ -1306,6 +1379,7 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
            receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
            receiver_model.set_nbfm_configuration(field_bw.selected_index_value());
            field_bw.on_change = [this](size_t, OptionsField::value_t n) { receiver_model.set_nbfm_configuration(n); };
+            recording_sampling_rate = 24000;
            break;
        case WFM_MODULATION:
            freqman_set_bandwidth_option(new_mod, field_bw);
@@ -1316,18 +1390,35 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
            receiver_model.set_wfm_configuration(field_bw.selected_index_value());
            field_bw.on_change = [this](size_t, OptionsField::value_t n) { receiver_model.set_wfm_configuration(n); };
            text_ctcss.set("        ");
+            recording_sampling_rate = 48000;
+            break;
+        case SPEC_MODULATION:
+            freqman_set_bandwidth_option(new_mod, field_bw);
+            // bw 200k (0) default
+            baseband::run_image(portapack::spi_flash::image_tag_capture);
+            receiver_model.set_modulation(ReceiverModel::Mode::Capture);
+            field_bw.set_by_value(0);
+            field_bw.on_change = [this](size_t, OptionsField::value_t sampling_rate) {
+                auto anti_alias_baseband_bandwidth_filter = filter_bandwidth_for_sampling_rate(sampling_rate);
+                record_view->set_sampling_rate(sampling_rate);
+                receiver_model.set_sampling_rate(sampling_rate);
+                receiver_model.set_baseband_bandwidth(anti_alias_baseband_bandwidth_filter);
+            };
+            text_ctcss.set("        ");
            break;
        default:
            break;
    }
+    if (new_mod != SPEC_MODULATION)
+        record_view->set_sampling_rate(recording_sampling_rate);
    field_mode.set_selected_index(new_mod);
    field_mode.on_change = [this](size_t, OptionsField::value_t v) {
        if (v != -1) {
            change_mode(v);
        }
    };
-
-    if (!recon)                  // for some motive, audio output gets stopped.
+    // for some motive, audio output gets stopped.
+    if (!recon && field_mode.selected_index_value() != SPEC_MODULATION)
        audio::output::start();  // so if recon was stopped we resume audio
    receiver_model.enable();

@@ -1335,32 +1426,20 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
 }

 void ReconView::handle_coded_squelch(const uint32_t value) {
-    float diff{0.0};
-    float min_diff{(float)value};
-    size_t min_idx{0};
-    size_t c{0};
+    if (field_mode.selected_index() == NFM_MODULATION) {
+        tone_index idx = tone_key_index_by_value(value);

-    if (field_mode.selected_index() != NFM_MODULATION) {
-        text_ctcss.set("        ");
-        return;
-    }
-
-    // Find nearest match
-    for (c = 0; c < tone_keys.size(); c++) {
-        diff = abs(((float)value / 100.0) - tone_keys[c].second);
-        if (diff < min_diff) {
-            min_idx = c;
-            min_diff = diff;
+        if ((last_squelch_index < 0) || (last_squelch_index != idx)) {
+            last_squelch_index = idx;
+            if (idx >= 0) {
+                text_ctcss.set("T: " + tone_key_string(idx));
+                return;
+            }
+        } else {
+            return;
        }
    }
-
-    // Arbitrary confidence threshold
-    if (last_squelch_index < 0 || (unsigned)last_squelch_index != min_idx) {
-        last_squelch_index = min_idx;
-        if (min_diff < 40)
-            text_ctcss.set("T: " + tone_keys[min_idx].first);
-        else
-            text_ctcss.set("        ");
-    }
+    text_ctcss.set("        ");
 }
+
 } /* namespace ui */
@@ -45,7 +45,6 @@
 namespace ui {

 #define RECON_CFG_FILE "SETTINGS/recon.cfg"
-#define RECON_FREQMAN_MAX_PER_FILE 99  // maximum tested limit for load frequency from freqman to work

 class ReconView : public View {
   public:
@@ -85,6 +84,8 @@ class ReconView : public View {
    bool recon_load_config_from_sd();
    bool recon_save_config_to_sd();
    bool recon_save_freq(const std::string& freq_file_path, size_t index, bool warn_if_exists);
+    // placeholder for possible void recon_start_recording();
+    void recon_stop_recording();

    jammer::jammer_range_t frequency_range{false, 0, MAX_UFREQ};  // perfect for manual recon task too...
    int32_t squelch{0};
@@ -109,6 +110,8 @@ class ReconView : public View {
    bool fwd{true};
    bool recon{true};
    bool user_pause{false};
+    bool auto_record_locked{false};
+    bool is_recording{false};
    uint32_t recon_lock_nb_match{3};
    uint32_t recon_lock_duration{RECON_MIN_LOCK_DURATION};
    uint32_t recon_match_mode{RECON_MATCH_CONTINUOUS};
@@ -119,10 +122,7 @@ class ReconView : public View {
    int32_t index_stepper{0};
    int64_t freq{0};
    uint32_t step{0};
-    freqman_index_t def_modulation{0};
-    freqman_index_t def_bandwidth{0};
    freqman_index_t def_step{0};
-    tone_index tone{0};
    freqman_entry last_entry{};
    bool entry_has_changed{false};
    uint32_t freq_lock{0};
@@ -139,16 +139,20 @@ class ReconView : public View {
    int8_t last_rssi_med{-127};
    int8_t last_rssi_max{-127};
    int32_t last_index{-1};
-    int32_t last_squelch_index{-1};
+    tone_index last_squelch_index{-1};
    int64_t last_freq{0};
    std::string freq_file_path{};
+    systime_t chrono_start{};
+    systime_t chrono_end{};
+
+    std::unique_ptr<RecordView> record_view{};

    Labels labels{
        {{0 * 8, 0 * 16}, "LNA:   VGA:   AMP:  VOL:     ", Color::light_grey()},
        {{3 * 8, 8 * 16}, "START       END", Color::light_grey()},
        {{0 * 8, (22 * 8)}, "                S:          ", Color::light_grey()},
        {{0 * 8, (24 * 8) + 4}, "NBLCKS:x      W,L:      ,     ", Color::light_grey()},
-        {{0 * 8, (26 * 8) + 4}, "MODE:    ,       SQUELCH:    ", Color::light_grey()}};
+        {{0 * 8, (26 * 8) + 4}, "MODE:     ,      SQUELCH:    ", Color::light_grey()}};

    LNAGainField field_lna{
        {4 * 8, 0 * 16}};
@@ -273,11 +277,11 @@ class ReconView : public View {

    OptionsField field_mode{
        {6 * 8, (26 * 8) + 4},
-        3,
+        4,
        {}};

    OptionsField field_bw{
-        {10 * 8, (26 * 8) + 4},
+        {11 * 8, (26 * 8) + 4},
        6,
        {}};

@@ -103,6 +103,7 @@ void ReconSetupViewMore::save() {
    persistent_memory::set_recon_load_ranges(checkbox_load_ranges.value());
    persistent_memory::set_recon_load_hamradios(checkbox_load_hamradios.value());
    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());
 };

 void ReconSetupViewMain::focus() {
@@ -117,12 +118,14 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)
    add_children({&checkbox_load_freqs,
                  &checkbox_load_ranges,
                  &checkbox_load_hamradios,
-                  &checkbox_update_ranges_when_recon});
+                  &checkbox_update_ranges_when_recon,
+                  &checkbox_auto_record_locked});

    checkbox_load_freqs.set_value(persistent_memory::recon_load_freqs());
    checkbox_load_ranges.set_value(persistent_memory::recon_load_ranges());
    checkbox_load_hamradios.set_value(persistent_memory::recon_load_hamradios());
    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());
 };

 void ReconSetupViewMore::focus() {
@@ -132,6 +132,10 @@ class ReconSetupViewMore : public View {
        {1 * 8, 102},
        3,
        "auto update m-ranges"};
+    Checkbox checkbox_auto_record_locked{
+        {1 * 8, 132},
+        3,
+        "auto record locked periods"};
 };

 class ReconSetupView : public View {
@@ -239,7 +239,7 @@ void ScannerView::handle_retune(int64_t freq, uint32_t freq_idx) {
 }

 void ScannerView::focus() {
-    field_mode.focus();
+    button_load.focus();
 }

 ScannerView::~ScannerView() {
@@ -447,6 +447,16 @@ ScannerView::ScannerView(

    // Mode field was changed (AM/NFM/WFM)
    field_mode.on_change = [this](size_t, OptionsField::value_t v) {
+        static freqman_index_t last_mode = AM_MODULATION;
+        // unsupported SPEC mode fix
+        if (v == SPEC_MODULATION) {
+            if (last_mode == AM_MODULATION)
+                v = WFM_MODULATION;
+            else
+                v = AM_MODULATION;
+            field_mode.set_selected_index(v);
+        }
+        last_mode = v;
        receiver_model.disable();
        baseband::shutdown();
        change_mode((freqman_index_t)v);
@@ -96,7 +96,7 @@ class ScannerView : public View {

   private:
    app_settings::SettingsManager settings_{
-        "scanner", app_settings::Mode::RX};
+        "rx_scanner", app_settings::Mode::RX};

    NavigationView& nav_;
    RxRadioState radio_state_{};
@@ -382,7 +382,7 @@ SearchView::SearchView(
        this->on_range_changed();
    };
    field_frequency_min.on_edit = [this, &nav]() {
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
+        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency() - 1000000);
        new_view->on_changed = [this](rf::Frequency f) {
            this->field_frequency_min.set_value(f);
        };
@@ -394,7 +394,7 @@ SearchView::SearchView(
        this->on_range_changed();
    };
    field_frequency_max.on_edit = [this, &nav]() {
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
+        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency() + 1000000);
        new_view->on_changed = [this](rf::Frequency f) {
            this->field_frequency_max.set_value(f);
        };
@@ -147,11 +147,9 @@ class SearchView : public View {
        {{26 * 8, 25 * 8}, "MHz", Color::light_grey()}};

    FrequencyField field_frequency_min{
-        {1 * 8, 1 * 16},
-    };
+        {1 * 8, 1 * 16}};
    FrequencyField field_frequency_max{
-        {11 * 8, 1 * 16},
-    };
+        {11 * 8, 1 * 16}};
    LNAGainField field_lna{
        {22 * 8, 1 * 16}};
    VGAGainField field_vga{
@@ -24,6 +24,7 @@
 #include "ui_settings.hpp"

 #include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
 #include "ui_touch_calibration.hpp"

 #include "portapack_persistent_memory.hpp"
@@ -32,16 +33,24 @@ using namespace lpc43xx;

 #include "audio.hpp"
 #include "portapack.hpp"
-using portapack::receiver_model;
 using namespace portapack;

 #include "string_format.hpp"
 #include "ui_styles.hpp"
 #include "cpld_update.hpp"

-#include "freqman.hpp"
+namespace pmem = portapack::persistent_memory;

 namespace ui {
+
+/* Sends a UI refresh message to cause the status bar to redraw. */
+static void send_system_refresh() {
+    StatusRefreshMessage message{};
+    EventDispatcher::send_message(message);
+}
+
+/* SetDateTimeView ***************************************/
+
 SetDateTimeView::SetDateTimeView(
    NavigationView& nav) {
    button_save.on_select = [&nav, this](Button&) {
@@ -105,13 +114,15 @@ SetDateTimeModel SetDateTimeView::form_collect() {
        .second = static_cast<uint8_t>(field_second.value())};
 }

+/* SetRadioView ******************************************/
+
 SetRadioView::SetRadioView(
    NavigationView& nav) {
    button_cancel.on_select = [&nav](Button&) {
        nav.pop();
    };

-    const auto reference = portapack::clock_manager.get_reference();
+    const auto reference = clock_manager.get_reference();

    std::string source_name("---");
    switch (reference.source) {
@@ -156,19 +167,18 @@ SetRadioView::SetRadioView(
                  &button_cancel});

    SetFrequencyCorrectionModel model{
-        static_cast<int8_t>(portapack::persistent_memory::correction_ppb() / 1000), 0};
+        static_cast<int8_t>(pmem::correction_ppb() / 1000), 0};

    form_init(model);

-    check_clkout.set_value(portapack::persistent_memory::clkout_enabled());
+    check_clkout.set_value(pmem::clkout_enabled());
    check_clkout.on_select = [this](Checkbox&, bool v) {
        clock_manager.enable_clock_output(v);
-        portapack::persistent_memory::set_clkout_enabled(v);
-        StatusRefreshMessage message{};
-        EventDispatcher::send_message(message);
+        pmem::set_clkout_enabled(v);
+        send_system_refresh();
    };

-    field_clkout_freq.set_value(portapack::persistent_memory::clkout_freq());
+    field_clkout_freq.set_value(pmem::clkout_freq());
    value_freq_step.set_style(&Styles::light_grey);

    field_clkout_freq.on_select = [this](NumberField&) {
@@ -193,9 +203,9 @@ SetRadioView::SetRadioView(
        field_clkout_freq.set_step(pow(10, freq_step_khz));
    };

-    check_bias.set_value(portapack::get_antenna_bias());
+    check_bias.set_value(get_antenna_bias());
    check_bias.on_select = [this](Checkbox&, bool v) {
-        portapack::set_antenna_bias(v);
+        set_antenna_bias(v);

        // Update the radio.
        receiver_model.set_antenna_bias();
@@ -205,15 +215,14 @@ SetRadioView::SetRadioView(
        if (!v)
            radio::set_antenna_bias(false);

-        StatusRefreshMessage message{};
-        EventDispatcher::send_message(message);
+        send_system_refresh();
    };

    button_save.on_select = [this, &nav](Button&) {
        const auto model = this->form_collect();
-        portapack::persistent_memory::set_correction_ppb(model.ppm * 1000);
-        portapack::persistent_memory::set_clkout_freq(model.freq);
-        clock_manager.enable_clock_output(portapack::persistent_memory::clkout_enabled());
+        pmem::set_correction_ppb(model.ppm * 1000);
+        pmem::set_clkout_freq(model.freq);
+        clock_manager.enable_clock_output(pmem::clkout_enabled());
        nav.pop();
    };
 }
@@ -233,6 +242,8 @@ SetFrequencyCorrectionModel SetRadioView::form_collect() {
    };
 }

+/* SetUIView *********************************************/
+
 SetUIView::SetUIView(NavigationView& nav) {
    add_children({&checkbox_disable_touchscreen,
                  &checkbox_bloff,
@@ -241,39 +252,76 @@ SetUIView::SetUIView(NavigationView& nav) {
                  &checkbox_showclock,
                  &options_clockformat,
                  &checkbox_guireturnflag,
+                  &labels,
+                  &toggle_camera,
+                  &toggle_sleep,
+                  &toggle_stealth,
+                  &toggle_converter,
+                  &toggle_bias_tee,
+                  &toggle_clock,
+                  &toggle_mute,
+                  &toggle_sd_card,
                  &button_save,
                  &button_cancel});

-    checkbox_disable_touchscreen.set_value(persistent_memory::disable_touchscreen());
-    checkbox_showsplash.set_value(persistent_memory::config_splash());
-    checkbox_showclock.set_value(!persistent_memory::hide_clock());
-    checkbox_guireturnflag.set_value(persistent_memory::show_gui_return_icon());
+    // Display "Disable speaker" option only if AK4951 Codec which has separate speaker/headphone control
+    if (audio::speaker_disable_supported()) {
+        add_child(&toggle_speaker);
+    }

-    const auto backlight_config = persistent_memory::config_backlight_timer();
+    checkbox_disable_touchscreen.set_value(pmem::disable_touchscreen());
+    checkbox_showsplash.set_value(pmem::config_splash());
+    checkbox_showclock.set_value(!pmem::hide_clock());
+    checkbox_guireturnflag.set_value(pmem::show_gui_return_icon());
+
+    const auto backlight_config = pmem::config_backlight_timer();
    checkbox_bloff.set_value(backlight_config.timeout_enabled());
    options_bloff.set_by_value(backlight_config.timeout_enum());

-    if (persistent_memory::clock_with_date()) {
+    if (pmem::clock_with_date()) {
        options_clockformat.set_selected_index(1);
    } else {
        options_clockformat.set_selected_index(0);
    }

+    // NB: Invert so "active" == "not hidden"
+    toggle_camera.set_value(!pmem::ui_hide_camera());
+    toggle_sleep.set_value(!pmem::ui_hide_sleep());
+    toggle_stealth.set_value(!pmem::ui_hide_stealth());
+    toggle_converter.set_value(!pmem::ui_hide_converter());
+    toggle_bias_tee.set_value(!pmem::ui_hide_bias_tee());
+    toggle_clock.set_value(!pmem::ui_hide_clock());
+    toggle_speaker.set_value(!pmem::ui_hide_speaker());
+    toggle_mute.set_value(!pmem::ui_hide_mute());
+    toggle_sd_card.set_value(!pmem::ui_hide_sd_card());
+
    button_save.on_select = [&nav, this](Button&) {
-        persistent_memory::set_config_backlight_timer({(persistent_memory::backlight_timeout_t)options_bloff.selected_index_value(),
-                                                       checkbox_bloff.value()});
+        pmem::set_config_backlight_timer({(pmem::backlight_timeout_t)options_bloff.selected_index_value(),
+                                          checkbox_bloff.value()});

        if (checkbox_showclock.value()) {
            if (options_clockformat.selected_index() == 1)
-                persistent_memory::set_clock_with_date(true);
+                pmem::set_clock_with_date(true);
            else
-                persistent_memory::set_clock_with_date(false);
+                pmem::set_clock_with_date(false);
        }

-        persistent_memory::set_config_splash(checkbox_showsplash.value());
-        persistent_memory::set_clock_hidden(!checkbox_showclock.value());
-        persistent_memory::set_gui_return_icon(checkbox_guireturnflag.value());
-        persistent_memory::set_disable_touchscreen(checkbox_disable_touchscreen.value());
+        pmem::set_config_splash(checkbox_showsplash.value());
+        pmem::set_clock_hidden(!checkbox_showclock.value());
+        pmem::set_gui_return_icon(checkbox_guireturnflag.value());
+        pmem::set_disable_touchscreen(checkbox_disable_touchscreen.value());
+
+        pmem::set_ui_hide_camera(!toggle_camera.value());
+        pmem::set_ui_hide_sleep(!toggle_sleep.value());
+        pmem::set_ui_hide_stealth(!toggle_stealth.value());
+        pmem::set_ui_hide_converter(!toggle_converter.value());
+        pmem::set_ui_hide_bias_tee(!toggle_bias_tee.value());
+        pmem::set_ui_hide_clock(!toggle_clock.value());
+        pmem::set_ui_hide_speaker(!toggle_speaker.value());
+        pmem::set_ui_hide_mute(!toggle_mute.value());
+        pmem::set_ui_hide_sd_card(!toggle_sd_card.value());
+        send_system_refresh();
+
        nav.pop();
    };
    button_cancel.on_select = [&nav, this](Button&) {
@@ -285,21 +333,20 @@ void SetUIView::focus() {
    button_save.focus();
 }

-// ---------------------------------------------------------
-// Appl. Settings
-// ---------------------------------------------------------
+/* SetAppSettingsView ************************************/
+
 SetAppSettingsView::SetAppSettingsView(NavigationView& nav) {
    add_children({&checkbox_load_app_settings,
                  &checkbox_save_app_settings,
                  &button_save,
                  &button_cancel});

-    checkbox_load_app_settings.set_value(persistent_memory::load_app_settings());
-    checkbox_save_app_settings.set_value(persistent_memory::save_app_settings());
+    checkbox_load_app_settings.set_value(pmem::load_app_settings());
+    checkbox_save_app_settings.set_value(pmem::save_app_settings());

    button_save.on_select = [&nav, this](Button&) {
-        persistent_memory::set_load_app_settings(checkbox_load_app_settings.value());
-        persistent_memory::set_save_app_settings(checkbox_save_app_settings.value());
+        pmem::set_load_app_settings(checkbox_load_app_settings.value());
+        pmem::set_save_app_settings(checkbox_save_app_settings.value());
        nav.pop();
    };
    button_cancel.on_select = [&nav, this](Button&) {
@@ -311,9 +358,8 @@ void SetAppSettingsView::focus() {
    button_save.focus();
 }

-// ---------------------------------------------------------
-// Converter Settings
-// ---------------------------------------------------------
+/* SetConverterSettingsView ******************************/
+
 SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) {
    add_children({&check_show_converter,
                  &check_converter,
@@ -321,46 +367,43 @@ SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) {
                  &button_converter_freq,
                  &button_return});

-    check_show_converter.set_value(!portapack::persistent_memory::config_hide_converter());
+    check_show_converter.set_value(!pmem::ui_hide_converter());
    check_show_converter.on_select = [this](Checkbox&, bool v) {
-        portapack::persistent_memory::set_config_hide_converter(!v);
+        pmem::set_ui_hide_converter(!v);
        if (!v) {
            check_converter.set_value(false);
        }
        // Retune to take converter change in account.
        receiver_model.set_target_frequency(receiver_model.target_frequency());
        // Refresh status bar with/out converter
-        StatusRefreshMessage message{};
-        EventDispatcher::send_message(message);
+        send_system_refresh();
    };

-    check_converter.set_value(portapack::persistent_memory::config_converter());
+    check_converter.set_value(pmem::config_converter());
    check_converter.on_select = [this](Checkbox&, bool v) {
        if (v) {
            check_show_converter.set_value(true);
-            portapack::persistent_memory::set_config_hide_converter(false);
+            pmem::set_ui_hide_converter(false);
        }
-        portapack::persistent_memory::set_config_converter(v);
+        pmem::set_config_converter(v);
        // Retune to take converter change in account
        receiver_model.set_target_frequency(receiver_model.target_frequency());
        // Refresh status bar with/out converter
-        StatusRefreshMessage message{};
-        EventDispatcher::send_message(message);
+        send_system_refresh();
    };

-    converter_mode.set_by_value(portapack::persistent_memory::config_updown_converter());
+    converter_mode.set_by_value(pmem::config_updown_converter());
    converter_mode.on_change = [this](size_t, OptionsField::value_t v) {
-        portapack::persistent_memory::set_config_updown_converter(v);
+        pmem::set_config_updown_converter(v);
        // Refresh status bar with icon up or down
-        StatusRefreshMessage message{};
-        EventDispatcher::send_message(message);
+        send_system_refresh();
    };

-    button_converter_freq.set_text(to_string_short_freq(portapack::persistent_memory::config_converter_freq()) + "MHz");
+    button_converter_freq.set_text(to_string_short_freq(pmem::config_converter_freq()) + "MHz");
    button_converter_freq.on_select = [this, &nav](Button& button) {
-        auto new_view = nav.push<FrequencyKeypadView>(portapack::persistent_memory::config_converter_freq());
+        auto new_view = nav.push<FrequencyKeypadView>(pmem::config_converter_freq());
        new_view->on_changed = [this, &button](rf::Frequency f) {
-            portapack::persistent_memory::set_config_converter_freq(f);
+            pmem::set_config_converter_freq(f);
            // Retune to take converter change in account
            receiver_model.set_target_frequency(receiver_model.target_frequency());
            button_converter_freq.set_text("<" + to_string_short_freq(f) + " MHz>");
@@ -376,9 +419,8 @@ void SetConverterSettingsView::focus() {
    button_return.focus();
 }

-// ---------------------------------------------------------
-// Frequency Correction Settings
-// ---------------------------------------------------------
+/* SetFrequencyCorrectionView ****************************/
+
 SetFrequencyCorrectionView::SetFrequencyCorrectionView(NavigationView& nav) {
    add_children({&text_freqCorrection_about,
                  &frequency_rx_correction_mode,
@@ -387,36 +429,36 @@ SetFrequencyCorrectionView::SetFrequencyCorrectionView(NavigationView& nav) {
                  &button_freq_tx_correction,
                  &button_return});

-    frequency_rx_correction_mode.set_by_value(portapack::persistent_memory::config_freq_rx_correction_updown());
+    frequency_rx_correction_mode.set_by_value(pmem::config_freq_rx_correction_updown());
    frequency_rx_correction_mode.on_change = [this](size_t, OptionsField::value_t v) {
-        portapack::persistent_memory::set_freq_rx_correction_updown(v);
+        pmem::set_freq_rx_correction_updown(v);
    };

-    frequency_tx_correction_mode.set_by_value(portapack::persistent_memory::config_freq_rx_correction_updown());
+    frequency_tx_correction_mode.set_by_value(pmem::config_freq_rx_correction_updown());
    frequency_tx_correction_mode.on_change = [this](size_t, OptionsField::value_t v) {
-        portapack::persistent_memory::set_freq_tx_correction_updown(v);
+        pmem::set_freq_tx_correction_updown(v);
    };

-    button_freq_rx_correction.set_text(to_string_short_freq(portapack::persistent_memory::config_freq_rx_correction()) + "MHz (Rx)");
+    button_freq_rx_correction.set_text(to_string_short_freq(pmem::config_freq_rx_correction()) + "MHz (Rx)");
    button_freq_rx_correction.on_select = [this, &nav](Button& button) {
-        auto new_view = nav.push<FrequencyKeypadView>(portapack::persistent_memory::config_converter_freq());
+        auto new_view = nav.push<FrequencyKeypadView>(pmem::config_converter_freq());
        new_view->on_changed = [this, &button](rf::Frequency f) {
            if (f >= MAX_FREQ_CORRECTION)
                f = MAX_FREQ_CORRECTION;
-            portapack::persistent_memory::set_config_freq_rx_correction(f);
+            pmem::set_config_freq_rx_correction(f);
            // Retune to take converter change in account
            receiver_model.set_target_frequency(receiver_model.target_frequency());
            button_freq_rx_correction.set_text("<" + to_string_short_freq(f) + " MHz>");
        };
    };

-    button_freq_tx_correction.set_text(to_string_short_freq(portapack::persistent_memory::config_freq_tx_correction()) + "MHz (Tx)");
+    button_freq_tx_correction.set_text(to_string_short_freq(pmem::config_freq_tx_correction()) + "MHz (Tx)");
    button_freq_tx_correction.on_select = [this, &nav](Button& button) {
-        auto new_view = nav.push<FrequencyKeypadView>(portapack::persistent_memory::config_converter_freq());
+        auto new_view = nav.push<FrequencyKeypadView>(pmem::config_converter_freq());
        new_view->on_changed = [this, &button](rf::Frequency f) {
            if (f >= MAX_FREQ_CORRECTION)
                f = MAX_FREQ_CORRECTION;
-            portapack::persistent_memory::set_config_freq_tx_correction(f);
+            pmem::set_config_freq_tx_correction(f);
            // Retune to take converter change in account
            receiver_model.set_target_frequency(receiver_model.target_frequency());
            button_freq_tx_correction.set_text("<" + to_string_short_freq(f) + " MHz>");
@@ -432,9 +474,8 @@ void SetFrequencyCorrectionView::focus() {
    button_return.focus();
 }

-// ---------------------------------------------------------
-// Persistent Memory Settings
-// ---------------------------------------------------------
+/* SetPersistentMemoryView *******************************/
+
 SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
    add_children({&text_pmem_about,
                  &text_pmem_informations,
@@ -445,7 +486,7 @@ SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
                  &button_load_mem_defaults,
                  &button_return});

-    check_use_sdcard_for_pmem.set_value(portapack::persistent_memory::should_use_sdcard_for_pmem());
+    check_use_sdcard_for_pmem.set_value(pmem::should_use_sdcard_for_pmem());
    check_use_sdcard_for_pmem.on_select = [this](Checkbox&, bool v) {
        File pmem_flag_file_handle;
        std::string pmem_flag_file = PMEM_FILEFLAG;
@@ -472,7 +513,7 @@ SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
    };

    button_save_mem_to_file.on_select = [&nav, this](Button&) {
-        if (!portapack::persistent_memory::save_persistent_settings_to_file()) {
+        if (!pmem::save_persistent_settings_to_file()) {
            text_pmem_status.set("!problem saving settings!");
        } else {
            text_pmem_status.set("settings saved");
@@ -480,13 +521,12 @@ SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
    };

    button_load_mem_from_file.on_select = [&nav, this](Button&) {
-        if (!portapack::persistent_memory::load_persistent_settings_from_file()) {
+        if (!pmem::load_persistent_settings_from_file()) {
            text_pmem_status.set("!problem loading settings!");
        } else {
            text_pmem_status.set("settings loaded");
            // Refresh status bar with icon up or down
-            StatusRefreshMessage message{};
-            EventDispatcher::send_message(message);
+            send_system_refresh();
        }
    };

@@ -497,7 +537,7 @@ SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
            YESNO,
            [this](bool choice) {
                if (choice) {
-                    portapack::persistent_memory::cache::defaults();
+                    pmem::cache::defaults();
                }
            });
    };
@@ -511,22 +551,19 @@ void SetPersistentMemoryView::focus() {
    button_return.focus();
 }

-// ---------------------------------------------------------
-// Audio Settings
-// ---------------------------------------------------------
+/* SetAudioView ******************************************/
+
 SetAudioView::SetAudioView(NavigationView& nav) {
    add_children({&labels,
                  &field_tone_mix,
-                  &checkbox_speaker_disable,
                  &button_save,
                  &button_cancel});

-    field_tone_mix.set_value(persistent_memory::tone_mix());
-    checkbox_speaker_disable.set_value(persistent_memory::config_speaker_disable());
+    field_tone_mix.set_value(pmem::tone_mix());

    button_save.on_select = [&nav, this](Button&) {
-        persistent_memory::set_tone_mix(field_tone_mix.value());
-        persistent_memory::set_config_speaker_disable(checkbox_speaker_disable.value());
+        pmem::set_tone_mix(field_tone_mix.value());
+        audio::output::update_audio_mute();
        nav.pop();
    };

@@ -539,18 +576,17 @@ void SetAudioView::focus() {
    button_save.focus();
 }

-// ---------------------------------------------------------
-// QR Code Settings
-// ------------------------------------------------------
+/* SetQRCodeView *****************************************/
+
 SetQRCodeView::SetQRCodeView(NavigationView& nav) {
    add_children({&checkbox_bigger_qr,
                  &button_save,
                  &button_cancel});

-    checkbox_bigger_qr.set_value(persistent_memory::show_bigger_qr_code());
+    checkbox_bigger_qr.set_value(pmem::show_bigger_qr_code());

    button_save.on_select = [&nav, this](Button&) {
-        persistent_memory::set_show_bigger_qr_code(checkbox_bigger_qr.value());
+        pmem::set_show_bigger_qr_code(checkbox_bigger_qr.value());
        nav.pop();
    };

@@ -563,19 +599,18 @@ void SetQRCodeView::focus() {
    button_save.focus();
 }

-// ---------------------------------------------------------
-// Rotary Encoder Dial Settings
-// ---------------------------------------------------------
+/* SetEncoderDialView ************************************/
+
 SetEncoderDialView::SetEncoderDialView(NavigationView& nav) {
    add_children({&labels,
                  &field_encoder_dial_sensitivity,
                  &button_save,
                  &button_cancel});

-    field_encoder_dial_sensitivity.set_by_value(persistent_memory::config_encoder_dial_sensitivity());
+    field_encoder_dial_sensitivity.set_by_value(pmem::config_encoder_dial_sensitivity());

    button_save.on_select = [&nav, this](Button&) {
-        persistent_memory::set_encoder_dial_sensitivity(field_encoder_dial_sensitivity.selected_index_value());
+        pmem::set_encoder_dial_sensitivity(field_encoder_dial_sensitivity.selected_index_value());
        nav.pop();
    };

@@ -588,11 +623,10 @@ void SetEncoderDialView::focus() {
    button_save.focus();
 }

-// ---------------------------------------------------------
-// Settings main menu
-// ---------------------------------------------------------
+/* SettingsMenuView **************************************/
+
 SettingsMenuView::SettingsMenuView(NavigationView& nav) {
-    if (portapack::persistent_memory::show_gui_return_icon()) {
+    if (pmem::show_gui_return_icon()) {
        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
@@ -27,6 +27,7 @@
 #include "ui_widget.hpp"
 #include "ui_menu.hpp"
 #include "ui_navigation.hpp"
+#include "bitmap.hpp"
 #include "ff.h"
 #include "portapack_persistent_memory.hpp"

@@ -34,7 +35,7 @@

 namespace ui {

-#define MAX_FREQ_CORRECTION 4294967295  // maximum possible for an uint32_t
+#define MAX_FREQ_CORRECTION INT32_MAX

 struct SetDateTimeModel {
    uint16_t year;
@@ -208,16 +209,16 @@ class SetUIView : public View {

   private:
    Checkbox checkbox_disable_touchscreen{
-        {3 * 8, 2 * 16},
+        {3 * 8, 1 * 16},
        20,
        "Disable touchscreen"};

    Checkbox checkbox_bloff{
-        {3 * 8, 4 * 16},
+        {3 * 8, 3 * 16},
        20,
        "Backlight off after:"};
    OptionsField options_bloff{
-        {60, 5 * 16 + 8},
+        {60, 4 * 16 + 8},
        20,
        {
            {"5 seconds", backlight_timeout_t::Timeout5Sec},
@@ -231,25 +232,65 @@ class SetUIView : public View {
        }};

    Checkbox checkbox_showsplash{
-        {3 * 8, 7 * 16},
+        {3 * 8, 6 * 16},
        20,
        "Show splash"};

    Checkbox checkbox_showclock{
-        {3 * 8, 9 * 16},
+        {3 * 8, 8 * 16},
        20,
        "Show clock with:"};

    OptionsField options_clockformat{
-        {60, 10 * 16 + 8},
+        {60, 9 * 16 + 8},
        20,
        {{"time only", 0},
         {"time and date", 1}}};

    Checkbox checkbox_guireturnflag{
-        {3 * 8, 12 * 16},
-        25,
-        "Show return icon in GUI"};
+        {3 * 8, 11 * 16},
+        20,
+        "Back button in menu"};
+
+    Labels labels{
+        {{3 * 8, 13 * 16}, "Show/Hide Status Icons", Color::light_grey()},
+    };
+
+    ImageToggle toggle_camera{
+        {7 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_icon_camera};
+
+    ImageToggle toggle_sleep{
+        {9 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_icon_sleep};
+
+    ImageToggle toggle_stealth{
+        {11 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_icon_stealth};
+
+    ImageToggle toggle_converter{
+        {13 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_icon_upconvert};
+
+    ImageToggle toggle_bias_tee{
+        {15 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_icon_biast_off};
+
+    ImageToggle toggle_clock{
+        {17 * 8, 14 * 16 + 2, 8, 16},
+        &bitmap_icon_clk_ext};
+
+    ImageToggle toggle_mute{
+        {18 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_icon_speaker_and_headphones_mute};
+
+    ImageToggle toggle_speaker{
+        {20 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_icon_speaker_mute};
+
+    ImageToggle toggle_sd_card{
+        {22 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_sd_card_ok};

    Button button_save{
        {2 * 8, 16 * 16, 12 * 8, 32},
@@ -388,11 +429,6 @@ class SetAudioView : public View {
        1,
        '0'};

-    Checkbox checkbox_speaker_disable{
-        {2 * 8, 6 * 16},
-        25,
-        "Disable AK speaker amp"};
-
    Button button_save{
        {2 * 8, 16 * 16, 12 * 8, 32},
        "Save"};
@@ -41,7 +41,8 @@ void SondeLogger::on_packet(const sonde::Packet& packet) {

 namespace ui {

-SondeView::SondeView(NavigationView& nav) {
+SondeView::SondeView(NavigationView& nav)
+    : nav_{nav} {
    baseband::run_image(portapack::spi_flash::image_tag_sonde);

    add_children({&labels,
@@ -66,20 +67,9 @@ SondeView::SondeView(NavigationView& nav) {
                  &button_see_map});

    if (!settings_.loaded())
-        receiver_model.set_target_frequency(initial_target_frequency);
+        field_frequency.set_value(initial_target_frequency);

-    field_frequency.set_value(receiver_model.target_frequency());
    field_frequency.set_step(500);  // euquiq: was 10000, but we are using this for fine-tunning
-    field_frequency.on_change = [this](rf::Frequency f) {
-        receiver_model.set_target_frequency(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        // TODO: Provide separate modal method/scheme?
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };

    geopos.set_read_only(true);

@@ -137,7 +127,7 @@ SondeView::~SondeView() {
 }

 void SondeView::focus() {
-    field_vga.focus();
+    field_frequency.focus();
 }

 // used to convert float to character pointer, since unfortunately function like
@@ -25,6 +25,7 @@

 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_rssi.hpp"
 #include "ui_qrcode.hpp"
 #include "ui_geomap.hpp"
@@ -65,6 +66,7 @@ class SondeView : public View {
    std::string title() const override { return "Radiosnd RX"; };

   private:
+    NavigationView& nav_;
    RxRadioState radio_state_{
        1750000 /* bandwidth */,
        2457600 /* sampling rate */
@@ -96,9 +98,9 @@ class SondeView : public View {
        {{4 * 8, 7 * 16}, "Temp:", Color::light_grey()},
        {{0 * 8, 8 * 16}, "Humidity:", Color::light_grey()}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {0 * 8, 0 * 8},
-    };
+        nav_};

    RFAmpField field_rf_amp{
        {13 * 8, 0 * 16}};
@@ -110,8 +112,7 @@ class SondeView : public View {
        {18 * 8, 0 * 16}};

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

    AudioVolumeField field_volume{
        {28 * 8, 0 * 16}};
@@ -57,17 +57,9 @@ SpectrumPainterView::SpectrumPainterView(
    input_image.set_parent_rect(view_rect);
    input_text.set_parent_rect(view_rect);

-    field_frequency.set_value(transmitter_model.target_frequency());
+    freqman_set_bandwidth_option(SPEC_MODULATION, option_bandwidth);
+
    field_frequency.set_step(5000);
-    field_frequency.on_change = [this](rf::Frequency f) {
-        transmitter_model.set_target_frequency(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };

    tx_gain = transmitter_model.tx_gain();
    field_rfgain.set_value(tx_gain);              // Initial default  value (-12 dB's max ).
@@ -94,9 +94,9 @@ class SpectrumPainterView : public View {
        {{1 * 8, footer_location + 2 * 16}, "BW:      Du:    P:", Color::light_grey()},
    };

-    FrequencyField field_frequency{
+    TxFrequencyField field_frequency{
        {0 * 8, footer_location + 1 * 16},
-    };
+        nav_};

    NumberField field_rfgain{
        {14 * 8, footer_location + 1 * 16},
@@ -127,7 +127,7 @@ class SpectrumPainterView : public View {
    OptionsField option_bandwidth{
        {4 * 8, footer_location + 2 * 16},
        5,
-        {BW_OPTIONS}};
+        {}};

    NumberField field_duration{
        {13 * 8, footer_location + 2 * 16},
@@ -40,7 +40,8 @@ void TestLogger::log_raw_data(const testapp::Packet& packet, const int32_t alt)

 namespace ui {

-TestView::TestView(NavigationView& nav) {
+TestView::TestView(NavigationView& nav)
+    : nav_{nav} {
    baseband::run_image(portapack::spi_flash::image_tag_test);

    add_children({&labels,
@@ -54,18 +55,7 @@ TestView::TestView(NavigationView& nav) {
                  &button_cal,
                  &check_log});

-    field_frequency.set_value(receiver_model.target_frequency());
    field_frequency.set_step(10000);
-    field_frequency.on_change = [this](rf::Frequency f) {
-        receiver_model.set_target_frequency(f);
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        // TODO: Provide separate modal method/scheme?
-        auto new_view = nav.push<FrequencyKeypadView>(receiver_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            field_frequency.set_value(f);
-        };
-    };

    check_log.on_select = [this](Checkbox&, bool v) {
        logging = v;
@@ -25,6 +25,7 @@

 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_rssi.hpp"

 #include "event_m0.hpp"
@@ -59,6 +60,7 @@ class TestView : public View {
    std::string title() const override { return "Test app"; };

   private:
+    NavigationView& nav_;
    RxRadioState radio_state_{
        1750000 /* bandwidth */,
        2457600 * 2 /* sampling rate */
@@ -75,9 +77,9 @@ class TestView : public View {
    Labels labels{
        {{0 * 8, 1 * 16}, "Data:", Color::light_grey()}};

-    FrequencyField field_frequency{
+    RxFrequencyField field_frequency{
        {0 * 8, 0 * 8},
-    };
+        nav_};
    RFAmpField field_rf_amp{
        {13 * 8, 0 * 16}};

@@ -42,10 +42,9 @@ namespace ui {
 /* TextViewer *******************************************************/

 TextViewer::TextViewer(Rect parent_rect)
-    : Widget(parent_rect),
-      max_line{static_cast<uint8_t>(parent_rect.height() / char_height)},
-      max_col{static_cast<uint8_t>(parent_rect.width() / char_width)} {
+    : Widget(parent_rect) {
    set_focusable(true);
+    set_font_zoom(false);
 }

 void TextViewer::paint(Painter& painter) {
@@ -138,6 +137,16 @@ uint32_t TextViewer::offset() const {
    return 0;
 }

+void TextViewer::cursor_home() {
+    cursor_.col = 0;
+    redraw();
+}
+
+void TextViewer::cursor_end() {
+    cursor_.col = line_length() - 1;
+    redraw();
+}
+
 uint16_t TextViewer::line_length() {
    return file_->line_length(cursor_.line);
 }
@@ -158,18 +167,14 @@ bool TextViewer::apply_scrolling_constraints(int16_t delta_line, int16_t delta_c
        ++new_line;
    }

-    // Snap to first/last to make navigating easier.
-    if (new_line < 0 && new_col > 0) {
+    // Snap to first/last line to make navigating easier.
+    if (new_line < 0 && cursor_.line > 0) {
        new_line = 0;
-        new_col = 0;
    } else if (new_line >= (int32_t)file_->line_count()) {
        auto last_line = file_->line_count() - 1;
-        int32_t last_col = file_->line_length(last_line) - 1;

-        if (new_col < last_col) {
+        if (cursor_.line < last_line)
            new_line = last_line;
-            new_col = last_col;
-        }
    }

    if (new_line < 0 || (uint32_t)new_line >= file_->line_count())
@@ -177,7 +182,6 @@ bool TextViewer::apply_scrolling_constraints(int16_t delta_line, int16_t delta_c

    new_line_length = file_->line_length(new_line);

-    // TODO: don't wrap with encoder?
    // Wrap or clamp column.
    if (new_line_length == 0)
        new_col = 0;
@@ -207,7 +211,7 @@ void TextViewer::paint_text(Painter& painter, uint32_t line, uint16_t col) {
        if (result && *result > 0)
            painter.draw_string(
                {0, r.top() + (int)i * char_height},
-                Styles::white_small, {buffer, *result});
+                style(), {buffer, *result});

        // Clear empty line sections. This is less visually jarring than full clear.
        int32_t clear_width = max_col - (result ? *result : 0);
@@ -216,7 +220,7 @@ void TextViewer::paint_text(Painter& painter, uint32_t line, uint16_t col) {
                {(max_col - clear_width) * char_width,
                 r.top() + (int)i * char_height,
                 clear_width * char_width, char_height},
-                Styles::white_small.background);
+                style().background);
    }
 }

@@ -237,8 +241,8 @@ void TextViewer::paint_cursor(Painter& painter) {
    };

    // Clear old cursor. CONSIDER: XOR cursor?
-    draw_cursor(paint_state_.line, paint_state_.col, Styles::white_small.background);
-    draw_cursor(cursor_.line, cursor_.col, Styles::white_small.foreground);
+    draw_cursor(paint_state_.line, paint_state_.col, style().background);
+    draw_cursor(cursor_.line, cursor_.col, style().foreground);
    paint_state_.line = cursor_.line;
    paint_state_.col = cursor_.col;
 }
@@ -252,6 +256,15 @@ void TextViewer::reset_file(FileWrapper* file) {
    redraw(true);
 }

+void TextViewer::set_font_zoom(bool zoom) {
+    font_zoom = zoom;
+    font_style = font_zoom ? &Styles::white : &Styles::white_small;
+    char_height = style().font.line_height();
+    char_width = style().font.char_width();
+    max_line = (uint8_t)(parent_rect().height() / char_height);
+    max_col = (uint8_t)(parent_rect().width() / char_width);
+}
+
 /* TextEditorMenu ***************************************************/

 TextEditorMenu::TextEditorMenu()
@@ -259,9 +272,9 @@ TextEditorMenu::TextEditorMenu()
    add_children(
        {
            &rect_frame,
-            &button_cut,
-            &button_paste,
-            &button_copy,
+            &button_home,
+            &button_end,
+            &button_zoom,
            &button_delline,
            &button_edit,
            &button_addline,
@@ -310,14 +323,20 @@ TextEditorView::TextEditorView(NavigationView& nav)
    };

    menu.hidden(true);
-    menu.on_cut() = [this]() {
-        show_nyi();
+    menu.on_home() = [this]() {
+        viewer.cursor_home();
+        hide_menu(true);
    };
-    menu.on_paste() = [this]() {
-        show_nyi();
+
+    menu.on_end() = [this]() {
+        viewer.cursor_end();
+        hide_menu(true);
    };
-    menu.on_copy() = [this]() {
-        show_nyi();
+
+    menu.on_zoom() = [this]() {
+        viewer.toggle_font_zoom();
+        refresh_ui();
+        hide_menu(true);
    };

    menu.on_delete_line() = [this]() {
@@ -490,10 +509,6 @@ void TextEditorView::show_edit_line() {
    });
 }

-void TextEditorView::show_nyi() {
-    nav_.display_modal("Soon...", "Coming soon.");
-}
-
 void TextEditorView::show_save_prompt(std::function<void()> continuation) {
    if (!file_dirty_) {
        if (continuation)
@@ -72,15 +72,23 @@ class TextViewer : public Widget {
    uint32_t col() const { return cursor_.col; }
    uint32_t offset() const;

+    void cursor_home();
+    void cursor_end();
+
    // Gets the length of the current line.
    uint16_t line_length();

-   private:
-    static constexpr int8_t char_width = 5;
-    static constexpr int8_t char_height = 8;
+    const Style& style() { return *font_style; }
+    void set_font_zoom(bool zoom);
+    void toggle_font_zoom() { set_font_zoom(!font_zoom); };

-    const uint8_t max_line = 32;
-    const uint8_t max_col = 48;
+   private:
+    bool font_zoom{};
+    const Style* font_style{};
+    int8_t char_width{};
+    int8_t char_height{};
+    uint8_t max_line{};
+    uint8_t max_col{};

    /* Returns true if the cursor was updated. */
    bool apply_scrolling_constraints(
@@ -120,14 +128,12 @@ class TextEditorMenu : public View {
    void on_show() override;
    void on_hide() override;

-    std::function<void()>& on_cut() { return button_cut.on_select; }
-    std::function<void()>& on_paste() { return button_paste.on_select; }
-    std::function<void()>& on_copy() { return button_copy.on_select; }
-
+    std::function<void()>& on_home() { return button_home.on_select; }
+    std::function<void()>& on_end() { return button_end.on_select; }
+    std::function<void()>& on_zoom() { return button_zoom.on_select; }
    std::function<void()>& on_delete_line() { return button_delline.on_select; }
    std::function<void()>& on_edit_line() { return button_edit.on_select; }
    std::function<void()>& on_add_line() { return button_addline.on_select; }
-
    std::function<void()>& on_open() { return button_open.on_select; }
    std::function<void()>& on_save() { return button_save.on_select; }
    std::function<void()>& on_exit() { return button_exit.on_select; }
@@ -139,23 +145,23 @@ class TextEditorMenu : public View {
        {0 * 8, 0 * 8, 23 * 8, 23 * 8},
        Color::dark_grey()};

-    NewButton button_cut{
+    NewButton button_home{
        {1 * 8, 1 * 8, 7 * 8, 7 * 8},
-        "Cut",
-        &bitmap_icon_cut,
+        "Home",
+        &bitmap_arrow_left,
        Color::dark_grey()};

-    NewButton button_paste{
+    NewButton button_end{
        {8 * 8, 1 * 8, 7 * 8, 7 * 8},
-        "Paste",
-        &bitmap_icon_paste,
+        "End",
+        &bitmap_arrow_right,
        Color::dark_grey()};

-    NewButton button_copy{
+    NewButton button_zoom{
        {15 * 8, 1 * 8, 7 * 8, 7 * 8},
-        "Copy",
-        &bitmap_icon_copy,
-        Color::dark_grey()};
+        "Zoom",
+        &bitmap_icon_search,
+        Color::orange()};

    NewButton button_delline{
        {1 * 8, 8 * 8, 7 * 8, 7 * 8},
@@ -220,7 +226,6 @@ class TextEditorView : public View {
    void hide_menu(bool hidden = true);
    void show_file_picker(bool immediate = true);
    void show_edit_line();
-    void show_nyi();
    void show_save_prompt(std::function<void()> continuation);

    void prepare_for_write();
@@ -258,4 +263,4 @@ class TextEditorView : public View {

 }  // namespace ui

-#endif  // __UI_TEXT_EDITOR_H__
+#endif  // __UI_TEXT_EDITOR_H__
@@ -23,8 +23,10 @@
 #include "ui_whipcalc.hpp"

 #include "ch.h"
-#include "portapack.hpp"
+#include "convert.hpp"
 #include "event_m0.hpp"
+#include "file_reader.hpp"
+#include "portapack.hpp"

 #include <cstring>

@@ -102,7 +104,8 @@ void WhipCalcView::update_result() {
    }
 }

-WhipCalcView::WhipCalcView(NavigationView& nav) {
+WhipCalcView::WhipCalcView(NavigationView& nav)
+    : nav_{nav} {
    add_children({&labels,
                  //&antennas_on_memory,
                  &field_frequency,
@@ -112,28 +115,12 @@ WhipCalcView::WhipCalcView(NavigationView& nav) {
                  &console,
                  &button_exit});

-    File antennas_file;
-    auto error = antennas_file.open("WHIPCALC/ANTENNAS.TXT");
-
-    if (!error.is_valid()) {
-        std::string line;
-        char one_char[1];
-        for (size_t pointer = 0; pointer < antennas_file.size(); pointer++) {
-            antennas_file.seek(pointer);
-            antennas_file.read(one_char, 1);
-            if ((int)one_char[0] >= ' ')
-                line += one_char[0];         // Add it to the textline
-            else if (one_char[0] == '\n') {  // New Line
-                txtline_process(line);       // make sense of this textline
-                line.clear();                // Ready for next textline
-            }
-        }
-        if (line.length() > 0)
-            txtline_process(line);  // Last line had no newline at end ?
-    }
+    // Try loading antennas from file.
+    load_antenna_db();

    if (!antenna_db.size())
        add_default_antenna();
+
    // antennas_on_memory.set(to_string_dec_int(antenna_db.size(),0) + " antennas");	//tell user

    options_type.set_selected_index(2);  // Quarter wave
@@ -142,56 +129,50 @@ WhipCalcView::WhipCalcView(NavigationView& nav) {
    };

    field_frequency.set_step(1000000);  // 1MHz step
-    field_frequency.on_change = [this](rf::Frequency) {
-        this->update_result();
-    };
-    field_frequency.on_edit = [this, &nav]() {
-        // TODO: Provide separate modal method/scheme?
-        auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            this->field_frequency.set_value(f);
-            this->update_result();
-        };
+    field_frequency.updated = [this](rf::Frequency) {
+        update_result();
    };

    button_exit.on_select = [this, &nav](Button&) {
        nav.pop();
    };

-    field_frequency.set_value(transmitter_model.target_frequency());
+    update_result();
 }

-void ui::WhipCalcView::txtline_process(std::string& line) {
-    if (line.find("#") != std::string::npos)
-        return;  // Line is just a comment
+void WhipCalcView::load_antenna_db() {
+    File antennas_file;
+    auto error = antennas_file.open("/WHIPCALC/ANTENNAS.TXT");

-    char separator = ',';
-    size_t previous = 0;
-    uint16_t value = 0;
-    antenna_entry new_antenna;
-    size_t current = line.find(separator);
+    if (error)
+        return;

-    while (current != std::string::npos) {
-        if (!previous)
-            new_antenna.label.assign(line, 0, current);  // antenna label
-        else {
-            value = std::stoi(line.substr(previous, current - previous));
-            if (!value) return;                     // No element length? abort antenna
-            new_antenna.elements.push_back(value);  // Store this new element
+    auto reader = FileLineReader(antennas_file);
+    for (const auto& line : reader) {
+        if (line.length() == 0 || line[0] == '#')
+            continue;  // Empty or comment line.
+
+        auto cols = split_string(line, ',');
+        if (cols.size() < 2)
+            continue;  // Line doesn't have enough columns.
+
+        antenna_entry new_antenna{
+            std::string{cols[0]}};
+
+        // Add antenna elements.
+        for (auto i = 1ul; i < cols.size(); ++i) {
+            uint16_t length = 0;
+            if (parse_int(cols[i], length)) {
+                new_antenna.elements.push_back(length);
+            }
        }
-        previous = current + 1;
-        current = line.find(separator, previous);  // Search for next space delimiter
+
+        if (!new_antenna.elements.empty())
+            antenna_db.push_back(std::move(new_antenna));
    }
-
-    if (!previous) return;                                         // Not even a label ? drop this antenna!
-    value = std::stoi(line.substr(previous, current - previous));  // Last element
-
-    if (!value) return;
-    new_antenna.elements.push_back(value);
-    antenna_db.push_back(new_antenna);  // Add this antenna
 }

-void ui::WhipCalcView::add_default_antenna() {
+void WhipCalcView::add_default_antenna() {
    antenna_db.push_back({"ANT500", {185, 315, 450, 586, 724, 862}});  // store a default ant500
 }
 }  // namespace ui
@@ -26,6 +26,7 @@
 #include "ui.hpp"
 #include "ui_widget.hpp"
 #include "ui_receiver.hpp"
+#include "ui_freq_field.hpp"
 #include "ui_navigation.hpp"
 #include "string_format.hpp"
 #include <vector>
@@ -47,10 +48,10 @@ class WhipCalcView : public View {
        std::vector<uint16_t> elements{};
    };

+    NavigationView& nav_;
    std::vector<antenna_entry> antenna_db{};
    void update_result();
-    uint16_t string_to_number(std::string);
-    void txtline_process(std::string&);
+    void load_antenna_db();
    void add_default_antenna();

    Labels labels{
@@ -59,9 +60,9 @@ class WhipCalcView : public View {
        {{5 * 8, 3 * 16}, "Metric:", Color::light_grey()},
        {{3 * 8, 4 * 16}, "Imperial:", Color::light_grey()}};

-    FrequencyField field_frequency{
+    TxFrequencyField field_frequency{
        {13 * 8, 1 * 16},
-    };
+        nav_};

    OptionsField options_type{
        {13 * 8, 2 * 16},
@@ -166,15 +166,6 @@ void unmute() {
    }
 }

-void speaker_disable() {
-    cfg_speaker_disable = true;
-    audio_codec->speaker_disable();
-}
-
-void speaker_enable() {
-    cfg_speaker_disable = false;
-}
-
 // The following functions are used by the navigation-bar Speaker Mute only,
 // and override all other audio mute/unmute requests from apps
 void speaker_mute() {
@@ -191,6 +182,18 @@ void speaker_unmute() {
    }
 }

+void update_audio_mute() {
+    cfg_speaker_disable = portapack::persistent_memory::config_speaker_disable();
+    if (cfg_speaker_disable) {
+        audio_codec->speaker_disable();
+    }
+
+    if (portapack::persistent_memory::config_audio_mute())
+        speaker_mute();
+    else
+        speaker_unmute();
+}
+
 } /* namespace output */

 namespace input {
@@ -269,4 +272,8 @@ void set_rate(const Rate rate) {
    clock_manager.set_base_audio_clock_divider(toUType(rate));
 }

+bool speaker_disable_supported() {
+    return audio_codec->speaker_disable_supported();
+}
+
 } /* namespace audio */
@@ -43,6 +43,7 @@ class Codec {

    virtual void speaker_enable() = 0;
    virtual void speaker_disable() = 0;
+    virtual bool speaker_disable_supported() const = 0;

    virtual void headphone_enable() = 0;
    virtual void headphone_disable() = 0;
@@ -69,6 +70,7 @@ void speaker_disable();
 void speaker_enable();
 void speaker_mute();
 void speaker_unmute();
+void update_audio_mute();

 } /* namespace output */

@@ -106,6 +108,7 @@ size_t reg_bits();

 void init(audio::Codec* const codec);
 void shutdown();
+bool speaker_disable_supported();

 enum class Rate {
    Hz_12000 = 4,
@@ -5341,6 +5341,234 @@ static constexpr Bitmap bitmap_icon_new_dir{
    {16, 16},
    bitmap_icon_new_dir_data};

+static constexpr uint8_t bitmap_icon_paint_data[] = {
+    0xFE,
+    0x3F,
+    0xFF,
+    0x3F,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xBF,
+    0xFE,
+    0xBF,
+    0x00,
+    0x80,
+    0x80,
+    0xFF,
+    0x80,
+    0x00,
+    0x80,
+    0x00,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+};
+static constexpr Bitmap bitmap_icon_paint{
+    {16, 16},
+    bitmap_icon_paint_data};
+
+static constexpr uint8_t bitmap_icon_touchtunes_data[] = {
+    0xE0,
+    0x07,
+    0x30,
+    0x0C,
+    0x7C,
+    0x3E,
+    0xC4,
+    0x23,
+    0x26,
+    0x64,
+    0x12,
+    0x48,
+    0x0F,
+    0xF3,
+    0x09,
+    0x95,
+    0x0F,
+    0xF1,
+    0x09,
+    0x91,
+    0x0F,
+    0xF1,
+    0xC9,
+    0x91,
+    0xE9,
+    0x91,
+    0xC9,
+    0x90,
+    0x0F,
+    0xF0,
+    0xFF,
+    0xFF,
+};
+static constexpr Bitmap bitmap_icon_touchtunes{
+    {16, 16},
+    bitmap_icon_touchtunes_data};
+
+static constexpr uint8_t bitmap_arrow_left_data[] = {
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x20,
+    0x00,
+    0x30,
+    0x00,
+    0x38,
+    0x00,
+    0xFC,
+    0x7F,
+    0xFE,
+    0x7F,
+    0xFC,
+    0x7F,
+    0x38,
+    0x00,
+    0x30,
+    0x00,
+    0x20,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+};
+static constexpr Bitmap bitmap_arrow_left{
+    {16, 16},
+    bitmap_arrow_left_data};
+
+static constexpr uint8_t bitmap_arrow_right_data[] = {
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x04,
+    0x00,
+    0x0C,
+    0x00,
+    0x1C,
+    0xFE,
+    0x3F,
+    0xFE,
+    0x7F,
+    0xFE,
+    0x3F,
+    0x00,
+    0x1C,
+    0x00,
+    0x0C,
+    0x00,
+    0x04,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+};
+static constexpr Bitmap bitmap_arrow_right{
+    {16, 16},
+    bitmap_arrow_right_data};
+
+static constexpr uint8_t bitmap_icon_speaker_and_headphones_data[] = {
+    0x20,
+    0x10,
+    0x30,
+    0x20,
+    0x38,
+    0x44,
+    0x3E,
+    0x48,
+    0x3E,
+    0x91,
+    0x3E,
+    0x92,
+    0x38,
+    0x92,
+    0x30,
+    0x92,
+    0x20,
+    0x92,
+    0x00,
+    0x92,
+    0x30,
+    0x91,
+    0x48,
+    0x48,
+    0x84,
+    0x44,
+    0x84,
+    0x20,
+    0x86,
+    0x11,
+    0x86,
+    0x01,
+};
+static constexpr Bitmap bitmap_icon_speaker_and_headphones{
+    {16, 16},
+    bitmap_icon_speaker_and_headphones_data};
+
+static constexpr uint8_t bitmap_icon_speaker_and_headphones_mute_data[] = {
+    0x40,
+    0x00,
+    0x60,
+    0x44,
+    0x70,
+    0x6C,
+    0x7C,
+    0x38,
+    0x7C,
+    0x10,
+    0x7C,
+    0x38,
+    0x70,
+    0x6C,
+    0x60,
+    0x44,
+    0x40,
+    0x00,
+    0x00,
+    0x44,
+    0x30,
+    0x6C,
+    0x48,
+    0x38,
+    0x84,
+    0x10,
+    0x84,
+    0x38,
+    0x86,
+    0x6D,
+    0x86,
+    0x45,
+};
+static constexpr Bitmap bitmap_icon_speaker_and_headphones_mute{
+    {16, 16},
+    bitmap_icon_speaker_and_headphones_mute_data};
+
 } /* namespace ui */

 #endif /*__BITMAP_HPP__*/
@@ -488,6 +488,24 @@ path operator/(const path& lhs, const path& rhs) {
    return result;
 }

+bool path_iequal(
+    const path& lhs,
+    const path& rhs) {
+    const auto& lhs_str = lhs.native();
+    const auto& rhs_str = rhs.native();
+
+    // NB: Not correct for Unicode/locales.
+    if (lhs_str.length() == rhs_str.length()) {
+        for (size_t i = 0; i < lhs_str.length(); ++i)
+            if (towupper(lhs_str[i]) != towupper(rhs_str[i]))
+                return false;
+
+        return true;
+    }
+
+    return false;
+}
+
 directory_iterator::directory_iterator(
    std::filesystem::path path,
    std::filesystem::path wild)
@@ -168,6 +168,9 @@ bool operator>(const path& lhs, const path& rhs);
 path operator+(const path& lhs, const path& rhs);
 path operator/(const path& lhs, const path& rhs);

+/* Case insensitive path equality on underlying "native" string. */
+bool path_iequal(const path& lhs, const path& rhs);
+
 using file_status = BYTE;

 static_assert(sizeof(path::value_type) == 2, "sizeof(std::filesystem::path::value_type) != 2");
@@ -30,7 +30,8 @@ using options_t = std::vector<option_t>;
 options_t freqman_entry_modulations = {
    {"AM", 0},
    {"NFM", 1},
-    {"WFM", 2}};
+    {"WFM", 2},
+    {"SPEC", 3}};

 options_t freqman_entry_bandwidths[4] = {
    {// AM
@@ -48,6 +49,25 @@ options_t freqman_entry_bandwidths[4] = {
        {"40k", 2},
        {"180k", 1},
        {"200k", 0},
+    },
+    {
+        // SPEC
+        {"8k5", 8500},
+        {"11k", 11000},
+        {"16k", 16000},
+        {"25k", 25000},
+        {"50k", 50000},
+        {"100k", 100000},
+        {"250k", 250000},
+        {"500k", 500000}, /* Previous Limit bandwith Option with perfect micro SD write .C16 format operaton.*/
+        {"600k", 600000}, /* That extended option is still possible to record with FW version Mayhem v1.41 (< 2,5MB/sec) */
+        {"650k", 650000},
+        {"750k", 750000}, /* From this BW onwards, the LCD is ok, but the recorded file is decimated, (not real file size) */
+        {"1100k", 1100000},
+        {"1750k", 1750000},
+        {"2000k", 2000000},
+        {"2500k", 2500000},
+        {"2750k", 2750000},  // That is our max Capture option, to keep using later / 8 decimation (22Mhz sampling  ADC)
    }};

 options_t freqman_entry_steps = {
@@ -86,27 +106,22 @@ options_t freqman_entry_steps_short = {
    {"500kHz", 500000},
    {"1MHz", 1000000}};

-bool load_freqman_file(std::string& file_stem, freqman_db& db) {
-    return load_freqman_file_ex(file_stem, db, true, true, true, FREQMAN_MAX_PER_FILE);
-}
-
-bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freqs, bool load_ranges, bool load_hamradios, uint8_t max_num_freqs = FREQMAN_MAX_PER_FILE) {
+bool load_freqman_file(std::string& file_stem, freqman_db& db, bool load_freqs, bool load_ranges, bool load_hamradios, uint8_t max_num_freqs) {
    // swap with empty vector to ensure memory is immediately released
    std::vector<freqman_entry>().swap(db);
-
-    File freqman_file;
-    size_t length, n = 0, file_position = 0;
-    char* pos;
-    char* line_start;
-    char* line_end;
-    std::string description;
-    rf::Frequency frequency_a, frequency_b;
-    char file_data[FREQMAN_READ_BUF_SIZE + 1];
-    freqman_entry_type type;
-    freqman_index_t modulation = 0;
-    freqman_index_t bandwidth = 0;
-    freqman_index_t step = 0;
-    freqman_index_t tone = 0;
+    File freqman_file{};
+    size_t length = 0, n = 0, file_position = 0;
+    char* pos = NULL;
+    char* line_start = NULL;
+    char* line_end = NULL;
+    std::string description{NULL};
+    rf::Frequency frequency_a = 0, frequency_b = 0;
+    char file_data[FREQMAN_READ_BUF_SIZE + 1] = {0};
+    freqman_entry_type type = NOTYPE;
+    freqman_index_t modulation = -1;
+    freqman_index_t bandwidth = -1;
+    freqman_index_t step = -1;
+    freqman_index_t tone = -1;

    auto result = freqman_file.open("FREQMAN/" + file_stem + ".TXT");
    if (result.is_valid())
@@ -137,7 +152,7 @@ bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freq
            bandwidth = -1;
            step = -1;
            tone = -1;
-            type = ERROR_TYPE;
+            type = NOTYPE;

            frequency_a = frequency_b = 0;
            // Read frequency
@@ -207,9 +222,11 @@ bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freq
                pos += 2;
                length = std::min(strcspn(pos, ",\x0A"), (size_t)FREQMAN_DESC_MAX_LEN);
                description = string(pos, length);
+                description.shrink_to_fit();
            }
            if ((type == SINGLE && load_freqs) || (type == RANGE && load_ranges) || (type == HAMRADIO && load_hamradios)) {
-                db.push_back({frequency_a, frequency_b, description, type, modulation, bandwidth, step, tone});
+                freqman_entry entry = {frequency_a, frequency_b, std::move(description), type, modulation, bandwidth, step, tone};
+                db.emplace_back(entry);
                n++;
                if (n > max_num_freqs) return true;
            }
@@ -243,6 +260,7 @@ bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freq
            }
        }
    }
+    db.shrink_to_fit();
    return true;
 }

@@ -32,11 +32,11 @@
 #include "string_format.hpp"
 #include "ui_widget.hpp"

-#define FREQMAN_DESC_MAX_LEN 24        // This is the number of characters that can be drawn in front of "R: TEXT..." before taking a full screen line
-#define FREQMAN_MAX_PER_FILE 60        // Maximum of entries we can read. This is a hardware limit
-                                       // It was tested and lowered to leave a bit of space to the caller
-#define FREQMAN_MAX_PER_FILE_STR "60"  // STRING OF FREQMAN_MAX_PER_FILE
-#define FREQMAN_READ_BUF_SIZE 96       // max freqman line size including desc is 90, +6 for a bit of space
+#define FREQMAN_DESC_MAX_LEN 24  // This is the number of characters that can be drawn in front of "R: TEXT..." before taking a full screen line
+#define FREQMAN_MAX_PER_FILE 90  // Maximum of entries we can read. This is a hardware limit
+                                 // It was tested and lowered to leave a bit of space to the caller
+
+#define FREQMAN_READ_BUF_SIZE 96  // max freqman line size including desc is 90, + a bit of space

 using namespace ui;
 using namespace std;
@@ -45,58 +45,54 @@ using namespace tonekey;
 // needs to be signed as -1 means not set
 typedef int8_t freqman_index_t;

-enum freqman_error {
+enum freqman_error : int8_t {
    NO_ERROR = 0,
    ERROR_ACCESS,
    ERROR_NOFILES,
    ERROR_DUPLICATE
 };

-enum freqman_entry_type {
+enum freqman_entry_type : int8_t {
    SINGLE = 0,  // f=
    RANGE,       // a=,b=
    HAMRADIO,    // r=,t=
-    ERROR_TYPE
+    NOTYPE       // undetected
 };

-enum freqman_entry_modulation {
+enum freqman_entry_modulation : uint8_t {
    AM_MODULATION = 0,
    NFM_MODULATION,
    WFM_MODULATION,
-    MODULATION_DEF,
-    ERROR_MODULATION
+    SPEC_MODULATION,
 };

 // Entry step placed for AlainD freqman version (or any other enhanced version)
-enum freqman_entry_step {
-    STEP_DEF = -1,  // default
-    AM_US,          // 10 kHz   AM/CB
-    AM_EUR,         // 9 kHz	LW/MW
-    NFM_1,          // 12,5 kHz (Analogic PMR 446)
-    NFM_2,          // 6,25 kHz  (Digital PMR 446)
-    FM_1,           // 100 kHz
-    FM_2,           // 50 kHz
-    N_1,            // 25 kHz
-    N_2,            // 250 kHz
-    AIRBAND,        // AIRBAND 8,33 kHz
-    ERROR_STEP
+enum freqman_entry_step : int8_t {
+    AM_US,    // 10 kHz   AM/CB
+    AM_EUR,   // 9 kHz	LW/MW
+    NFM_1,    // 12,5 kHz (Analogic PMR 446)
+    NFM_2,    // 6,25 kHz  (Digital PMR 446)
+    FM_1,     // 100 kHz
+    FM_2,     // 50 kHz
+    N_1,      // 25 kHz
+    N_2,      // 250 kHz
+    AIRBAND,  // AIRBAND 8,33 kHz
 };

 struct freqman_entry {
-    rf::Frequency frequency_a{0};  // 'f=freq' or 'a=freq_start' or 'r=recv_freq'
-    rf::Frequency frequency_b{0};  // 'b=freq_end' or 't=tx_freq'
-    std::string description{};     // 'd=desc'
-    freqman_entry_type type{};     // SINGLE,RANGE,HAMRADIO
-    freqman_index_t modulation{};  // AM,NFM,WFM
-    freqman_index_t bandwidth{};   // AM_DSB, ...
-    freqman_index_t step{};        // 5khz (SA AM,...
-    tone_index tone{};             // 0XZ, 11 1ZB,...
+    rf::Frequency frequency_a{0};               // 'f=freq' or 'a=freq_start' or 'r=recv_freq'
+    rf::Frequency frequency_b{0};               // 'b=freq_end' or 't=tx_freq'
+    std::string description{NULL};              // 'd=desc'
+    freqman_entry_type type{SINGLE};            // SINGLE,RANGE,HAMRADIO
+    freqman_index_t modulation{AM_MODULATION};  // AM,NFM,WFM
+    freqman_index_t bandwidth{0};               // AM_DSB, ...
+    freqman_index_t step{0};                    // 5khz (SA AM,...
+    tone_index tone{0};                         // 0XZ, 11 1ZB,...
 };

 using freqman_db = std::vector<freqman_entry>;

-bool load_freqman_file(std::string& file_stem, freqman_db& db);
-bool load_freqman_file_ex(std::string& file_stem, freqman_db& db, bool load_freqs, bool load_ranges, bool load_hamradios, uint8_t limit);
+bool load_freqman_file(std::string& file_stem, freqman_db& db, bool load_freqs = true, bool load_ranges = true, bool load_hamradios = true, uint8_t max_num_freqs = FREQMAN_MAX_PER_FILE);
 bool get_freq_string(freqman_entry& entry, std::string& item_string);
 bool delete_freqman_file(std::string& file_stem);
 bool save_freqman_file(std::string& file_stem, freqman_db& db);
@@ -30,7 +30,7 @@ bool Debounce::feed(const uint8_t bit) {
    // "Repeat" handling - simulated button release
    if (repeat_ctr_) {
        // Make sure the button is still being held continuously
-        if (history_ == 0xFF) {
+        if ((history_ == 0xFF) && !long_press_enabled_) {
            // Simulate button press every REPEAT_SUBSEQUENT_DELAY ticks
            if (--repeat_ctr_ == 0) {
                state_ = !state_;
@@ -49,29 +49,59 @@ bool Debounce::feed(const uint8_t bit) {
        if ((history_ & DEBOUNCE_MASK) == DEBOUNCE_MASK) {
            state_ = 1;
            held_time_ = 0;
+
+            // If long_press_enabled_, state() function masks the button press until it's released
+            // or until LONG_PRESS_DELAY is reached
+            if (long_press_enabled_) {
+                pulse_upon_release_ = true;
+                return false;
+            }
            return true;
        }
    } else {
        // Previous button state was 1 (pressed);
        // Has button been released for DEBOUNCE_COUNT ticks?
        if ((history_ & DEBOUNCE_MASK) == 0) {
-            state_ = 0;
+            // Button has been released when long_press_enabled_ and before LONG_PRESS_DELAY was reached;
+            // allow state() function to finally return a single press indication
+            // (in long press mode, apps won't see button press until the button is released)
+            if (pulse_upon_release_) {
+                // leaving state_==1 for one cycle
+                pulse_upon_release_ = 0;
+            } else {
+                state_ = 0;
+            }
+
+            // Reset long_press_occurred_ flag after button is released
+            long_press_occurred_ = false;
            return true;
        }

-        // Repeat support is limited to the 4 directional buttons
-        if (repeat_enabled_) {
-            // Has button been held continuously for DEBOUNCE_REPEAT_DELAY?
-            if (history_ == 0xFF) {
-                if (++held_time_ == REPEAT_INITIAL_DELAY) {
+        // Has button been held continuously?
+        if (history_ == 0xFF) {
+            held_time_++;
+            if (pulse_upon_release_) {
+                // Button is being held down and long_press support is enabled for this key:
+                // if LONG_PRESS_DELAY is reached then finally report that switch is pressed and set flag
+                // indicating it was a LONG press
+                // (note that repease_support and long_press support are mutually exclusive)
+                if (held_time_ == LONG_PRESS_DELAY) {
+                    long_press_occurred_ = true;
+                    pulse_upon_release_ = 0;
+                    held_time_ = 0;
+                    return true;
+                }
+            } else if (repeat_enabled_ && !long_press_enabled_) {
+                // Repeat support -- 4 directional buttons only (unless long_press is enabled)
+                if (held_time_ == REPEAT_INITIAL_DELAY) {
                    // Delay reached; trigger repeat code on NEXT tick
                    repeat_ctr_ = 1;
                    held_time_ = 0;
                }
-            } else {
-                // Button not continuously pressed; reset counter
-                held_time_ = 0;
            }
+        } else {
+            // Button not continuously pressed; reset counter
+            held_time_ = 0;
        }
    }
    return false;
@@ -31,25 +31,39 @@
 // # of timer0 ticks before a held button starts being counted as repeated presses
 #define REPEAT_INITIAL_DELAY 250
 #define REPEAT_SUBSEQUENT_DELAY 92
+#define LONG_PRESS_DELAY 1000

 class Debounce {
   public:
    bool feed(const uint8_t bit);

    uint8_t state() const {
-        return state_;
+        return (pulse_upon_release_) ? 0 : state_;
    }

    void enable_repeat() {
        repeat_enabled_ = true;
    }

+    void set_long_press_support(bool v) {
+        long_press_enabled_ = v;
+    }
+
+    bool long_press_occurred() {
+        bool v = long_press_occurred_;
+        long_press_occurred_ = false;
+        return v;
+    }
+
   private:
    uint8_t history_{0};
    uint8_t state_{0};
    bool repeat_enabled_{0};
    uint16_t repeat_ctr_{0};
    uint16_t held_time_{0};
+    bool pulse_upon_release_{0};
+    bool long_press_enabled_{0};
+    bool long_press_occurred_{0};
 };

 #endif /*__DEBOUNCE_H__*/
@@ -195,16 +195,33 @@ void controls_init() {

 SwitchesState get_switches_state() {
    SwitchesState result;
+
+    // Right, Left, Down, Up, & Select switches
    for (size_t i = 0; i < result.size() - 1; i++) {
        // TODO: Ignore multiple keys at the same time?
        result[i] = switch_debounce[i].state();
    }

-    result[result.size() - 1] = switch_debounce[switch_debounce.size() - 1].state();
-
+    // Grab Dfu switch from bit 7 and return in bit 5 so that all switches are grouped together in this 6-bit result
+    result[(size_t)Switch::Dfu] = switch_debounce[7].state();
    return result;
 }

+// Configure which switches support long press (note those switches will not support Repeat function)
+void switches_long_press_enable(SwitchesState switches_long_press_enabled) {
+    // Right, Left, Down, Up, & Select switches
+    for (size_t i = 0; i < switches_long_press_enabled.size() - 1; i++) {
+        switch_debounce[i].set_long_press_support(switches_long_press_enabled[i]);
+    }
+
+    // Dfu switch
+    switch_debounce[7].set_long_press_support(switches_long_press_enabled[(size_t)Switch::Dfu]);
+}
+
+bool switch_long_press_occurred(size_t v) {
+    return (v == (size_t)Switch::Dfu) ? switch_debounce[7].long_press_occurred() : switch_debounce[v].long_press_occurred();
+}
+
 EncoderPosition get_encoder_position() {
    return encoder_position;
 }
@@ -27,6 +27,7 @@

 #include "touch.hpp"

+// Must be same values as in ui::KeyEvent
 enum class Switch {
    Right = 0,
    Left = 1,
@@ -44,6 +45,8 @@ void controls_init();
 SwitchesState get_switches_state();
 EncoderPosition get_encoder_position();
 touch::Frame get_touch_frame();
+void switches_long_press_enable(SwitchesState v);
+bool switch_long_press_occurred(size_t v);

 namespace control {
 namespace debug {
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2023 Kyle Reed
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "metadata_file.hpp"
+
+#include "convert.hpp"
+#include "file_reader.hpp"
+#include "string_format.hpp"
+#include <string_view>
+
+namespace fs = std::filesystem;
+using namespace std::literals;
+
+const std::string_view center_freq_name = "center_frequency"sv;
+const std::string_view sample_rate_name = "sample_rate"sv;
+
+fs::path get_metadata_path(const fs::path& capture_path) {
+    auto temp = capture_path;
+    return temp.replace_extension(u".TXT");
+}
+
+Optional<File::Error> write_metadata_file(const fs::path& path, capture_metadata metadata) {
+    File f;
+    auto error = f.create(path);
+
+    if (error)
+        return error;
+
+    error = f.write_line(std::string{center_freq_name} + "=" +
+                         to_string_dec_uint(metadata.center_frequency));
+    if (error)
+        return error;
+
+    error = f.write_line(std::string{sample_rate_name} + "=" +
+                         to_string_dec_uint(metadata.sample_rate));
+    if (error)
+        return error;
+
+    return {};
+}
+
+Optional<capture_metadata> read_metadata_file(const fs::path& path) {
+    File f;
+    auto error = f.open(path);
+
+    if (error)
+        return {};
+
+    capture_metadata metadata{};
+
+    auto reader = FileLineReader(f);
+    for (const auto& line : reader) {
+        auto cols = split_string(line, '=');
+
+        if (cols.size() != 2)
+            continue;  // Bad line.
+
+        if (cols[0] == center_freq_name)
+            parse_int(cols[1], metadata.center_frequency);
+        else if (cols[0] == sample_rate_name)
+            parse_int(cols[1], metadata.sample_rate);
+        else
+            continue;
+    }
+
+    if (metadata.center_frequency == 0 || metadata.sample_rate == 0)
+        return {};  // Parse failed.
+
+    return metadata;
+}
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 Kyle Reed
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __METADATA_FILE_HPP__
+#define __METADATA_FILE_HPP__
+
+#include "file.hpp"
+#include "optional.hpp"
+#include "rf_path.hpp"
+
+struct capture_metadata {
+    rf::Frequency center_frequency;
+    uint32_t sample_rate;
+};
+
+std::filesystem::path get_metadata_path(const std::filesystem::path& capture_path);
+
+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);
+
+#endif  // __METADATA_FILE_HPP__
@@ -96,20 +96,6 @@ bool get_antenna_bias() {
    return antenna_bias;
 }

-void set_audio_mute(const bool v) {
-    if (v)
-        audio::output::speaker_mute();
-    else
-        audio::output::speaker_unmute();
-}
-
-void set_speaker_disable(const bool v) {
-    if (v)
-        audio::output::speaker_disable();
-    else
-        audio::output::speaker_enable();
-}
-
 static constexpr uint32_t systick_count(const uint32_t clock_source_f) {
    return clock_source_f / CH_FREQUENCY;
 }
@@ -53,9 +53,6 @@ extern ClockManager clock_manager;
 extern ReceiverModel receiver_model;
 extern TransmitterModel transmitter_model;

-void set_audio_mute(const bool v);
-void set_speaker_disable(const bool v);
-
 extern uint32_t bl_tick_counter;
 extern bool antenna_bias;

@@ -30,6 +30,12 @@

 /* Stashes current radio bandwidth and sampling rate.
 * Inits to defaults, and restores previous when destroyed.
+ * The idea here is that an app will eventually call enable
+ * on the model which will sync all of the model state into
+ * the radio. We tried lazily setting these using the
+ * set_configuration_without_update function, but there are
+ * still various UI components (mainly Waterfall) that need
+ * the radio set in order to load properly.
 * NB: This member must be added before SettingsManager. */
 template <typename TModel, TModel* model>
 class RadioState {
@@ -41,8 +47,9 @@ class RadioState {
    RadioState(uint32_t new_bandwidth, uint32_t new_sampling_rate)
        : prev_bandwidth_{model->baseband_bandwidth()},
          prev_sampling_rate_{model->sampling_rate()} {
-        model->set_configuration_without_update(
-            new_bandwidth, new_sampling_rate);
+        // Update the new settings in the radio.
+        model->set_sampling_rate(new_sampling_rate);
+        model->set_baseband_bandwidth(new_bandwidth);
    }

    ~RadioState() {
@@ -286,7 +286,7 @@ static const char* whitespace_str = " \t\r\n";
 std::string trim(std::string_view str) {
    auto first = str.find_first_not_of(whitespace_str);
    auto last = str.find_last_not_of(whitespace_str);
-    return std::string{str.substr(first, last - first)};
+    return std::string{str.substr(first, last - first + 1)};
 }

 std::string trimr(std::string_view str) {
@@ -296,4 +296,4 @@ std::string trimr(std::string_view str) {

 std::string truncate(std::string_view str, size_t length) {
    return std::string{str.length() <= length ? str : str.substr(0, length)};
-}
+}
@@ -73,9 +73,9 @@ const tone_key_t tone_keys = {
    {"34 M3", 218.100},
    {"35 M4", 225.700},
    {"49 9Z", 229.100},
-    {"36 --", 233.600},
-    {"37 --", 241.800},
-    {"38 --", 250.300},
+    {"36 M5", 233.600},
+    {"37 M6", 241.800},
+    {"38 M7", 250.300},
    {"50 0Z", 254.100},
    {"Axient 28kHz", 28000.0},
    {"Senn. 32.768k", 32768.0},
@@ -113,6 +113,36 @@ std::string tone_key_string(tone_index index) {
    return tone_keys[index].first;
 }

+std::string tone_key_string_by_value(uint32_t value) {
+    return tone_key_string(tone_key_index_by_value(value));
+}
+
+tone_index tone_key_index_by_value(uint32_t value) {
+    float diff;
+    float min_diff{(float)value};
+    float fvalue{(float)((min_diff + 50.0) / 100.0)};
+    tone_index min_idx{-1};
+    tone_index idx;
+
+    // Find nearest match
+    for (idx = 0; idx < (tone_index)tone_keys.size(); idx++) {
+        diff = abs(fvalue - tone_keys[idx].second);
+        if (diff < min_diff) {
+            min_idx = idx;
+            min_diff = diff;
+        } else {
+            // list is sorted in frequency order; if diff is getting larger than we've passed it
+            break;
+        }
+    }
+
+    // Arbitrary confidence threshold
+    if (min_diff < 40.0)
+        return min_idx;
+    else
+        return -1;
+}
+
 tone_index tone_key_index_by_string(char* str) {
    if (!str)
        return -1;
@@ -123,9 +153,4 @@ tone_index tone_key_index_by_string(char* str) {
    return -1;
 }

-/* tone_index tone_key_index_by_value( int32_t freq )
-{
-        return -1 ;
-} */
-
 }  // namespace tonekey
@@ -30,7 +30,7 @@ using namespace ui;

 namespace tonekey {

-typedef int16_t tone_index;
+typedef int32_t tone_index;

 using tone_key_t = std::vector<std::pair<std::string, float>>;

@@ -40,8 +40,8 @@ void tone_keys_populate(OptionsField& field);
 float tone_key_frequency(const tone_index index);

 std::string tone_key_string(const tone_index index);
-tone_index tone_key_index_by_string(char* str);
-// tone_index tone_key_index_by_value( int32_t freq );
+std::string tone_key_string_by_value(uint32_t value);
+tone_index tone_key_index_by_value(uint32_t value);

 }  // namespace tonekey

@@ -37,9 +37,13 @@ AlphanumView::AlphanumView(
    : TextEntryView(nav, str, max_length) {
    size_t n;

-    add_children({&button_mode,
-                  &text_raw,
-                  &field_raw});
+    add_children({
+        &labels,
+        &field_raw,
+        &text_raw_to_char,
+        &button_delete,
+        &button_mode,
+    });

    const auto button_fn = [this](Button& button) {
        this->on_button(button);
@@ -65,10 +69,19 @@ AlphanumView::AlphanumView(
        set_mode(mode + 1);
    };

+    button_delete.on_select = [this](Button&) {
+        char_delete();
+    };
+
    field_raw.set_value('0');
    field_raw.on_select = [this](NumberField&) {
        char_add(field_raw.value());
    };
+
+    // make text_raw_to_char widget display the char value from field_raw
+    field_raw.on_change = [this](auto) {
+        text_raw_to_char.set(std::string{static_cast<char>(field_raw.value())});
+    };
 }

 void AlphanumView::set_mode(const uint32_t new_mode) {
@@ -96,11 +109,7 @@ void AlphanumView::set_mode(const uint32_t new_mode) {

 void AlphanumView::on_button(Button& button) {
    const auto c = button.text()[0];
-
-    if (c == '<')
-        char_delete();
-    else
-        char_add(c);
+    char_add(c);
 }

 bool AlphanumView::on_encoder(const EncoderEvent delta) {
@@ -43,14 +43,14 @@ class AlphanumView : public TextEntryView {
    bool on_encoder(const EncoderEvent delta) override;

   private:
-    const char* const keys_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ, .<";
-    const char* const keys_lower = "abcdefghijklmnopqrstuvwxyz, .<";
-    const char* const keys_digit = "0123456789!\"#'()*+-/:;=>?@[\\]<";
+    const char* const keys_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ, ._";
+    const char* const keys_lower = "abcdefghijklmnopqrstuvwxyz, ._";
+    const char* const keys_digit = "0123456789!\"#'()*+-/:;=<>@[\\]?";

    const std::pair<std::string, const char*> key_sets[3] = {
-        {"Upper", keys_upper},
-        {"Lower", keys_lower},
-        {"Digit", keys_digit}};
+        {"ABC", keys_upper},
+        {"abc", keys_lower},
+        {"123", keys_digit}};

    int16_t focused_button = 0;
    uint32_t mode = 0;  // Uppercase
@@ -60,13 +60,10 @@ class AlphanumView : public TextEntryView {

    std::array<Button, 30> buttons{};

-    Button button_mode{
-        {21 * 8, 33 * 8, 8 * 8, 32},
-        ""};
+    Labels labels{
+        {{1 * 8, 33 * 8}, "Raw:", Color::light_grey()},
+        {{1 * 8, 35 * 8}, "AKA:", Color::light_grey()}};

-    Text text_raw{
-        {1 * 8, 33 * 8, 4 * 8, 16},
-        "Raw:"};
    NumberField field_raw{
        {5 * 8, 33 * 8},
        3,
@@ -74,9 +71,17 @@ class AlphanumView : public TextEntryView {
        1,
        '0'};

-    Button button_ok{
-        {10 * 8, 33 * 8, 9 * 8, 32},
-        "OK"};
+    Text text_raw_to_char{
+        {5 * 8, 35 * 8, 4 * 8, 16},
+        "0"};
+
+    Button button_delete{
+        {9 * 8, 33 * 8, 6 * 8, 32},
+        "<DEL"};
+
+    Button button_mode{
+        {16 * 8, 33 * 8, 5 * 8, 32},
+        ""};
 };

 } /* namespace ui */
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2023 Kyle Reed
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __UI_FREQ_FIELD_H__
+#define __UI_FREQ_FIELD_H__
+
+#include "portapack.hpp"
+#include "receiver_model.hpp"
+#include "transmitter_model.hpp"
+#include "ui_receiver.hpp"
+
+namespace ui {
+
+/* A frequency field bound directly a radio model
+ * that can manage its own editing UX. */
+template <typename TModel, TModel* model>
+class BoundFrequencyField : public FrequencyField {
+   private:
+    using FrequencyField::on_change;
+    using FrequencyField::on_edit;
+
+   public:
+    decltype(FrequencyField::on_change) updated{};
+
+    BoundFrequencyField(Point parent_pos, NavigationView& nav)
+        : FrequencyField(parent_pos) {
+        // NB: There is no frequency_step on the tx_model.
+        set_step(portapack::receiver_model.frequency_step());
+        set_value(model->target_frequency());
+
+        on_change = [this](rf::Frequency f) {
+            model->set_target_frequency(f);
+            if (updated)
+                updated(f);
+        };
+
+        on_edit = [this, &nav]() {
+            auto freq_view = nav.push<FrequencyKeypadView>(model->target_frequency());
+            freq_view->on_changed = [this](rf::Frequency f) {
+                set_value(f);
+            };
+        };
+    }
+
+    // TODO: override set_step and update the rx model then call base.
+};
+
+using RxFrequencyField = BoundFrequencyField<ReceiverModel, &portapack::receiver_model>;
+using TxFrequencyField = BoundFrequencyField<TransmitterModel, &portapack::transmitter_model>;
+
+}  // namespace ui
+
+#endif  // __UI_FREQ_FIELD_H__
@@ -36,7 +36,7 @@ FreqManUIList::FreqManUIList(
 }

 void FreqManUIList::set_highlighted_index(int index) {
-    if ((unsigned)(current_index + index) >= freqlist_db.size())
+    if (freqlist_db == nullptr || (unsigned)(current_index + index) >= freqlist_db->size())
        return;
    if (index < 0) {
        index = 0;
@@ -45,10 +45,10 @@ void FreqManUIList::set_highlighted_index(int index) {
    }
    if (index >= freqlist_nb_lines) {
        index = freqlist_nb_lines - 1;
-        if ((unsigned)(current_index + index) < freqlist_db.size())
+        if ((unsigned)(current_index + index) < freqlist_db->size())
            current_index++;
        else
-            current_index = freqlist_db.size() - freqlist_nb_lines - 1;
+            current_index = freqlist_db->size() - freqlist_nb_lines - 1;
    }
    highlighted_index = index;
 }
@@ -66,17 +66,17 @@ void FreqManUIList::paint(Painter& painter) {
        r_widget_screen,
        Color::black());
    // only return after clearing the screen so previous entries are not shown anymore
-    if (freqlist_db.size() == 0)
+    if (freqlist_db == nullptr || freqlist_db->size() == 0)
        return;
    // coloration if file is too big
    auto text_color = &Styles::white;
-    if (freqlist_db.size() > FREQMAN_MAX_PER_FILE)
+    if (freqlist_db->size() > FREQMAN_MAX_PER_FILE)
        text_color = &Styles::yellow;
    uint8_t nb_lines = 0;
-    for (uint8_t it = current_index; it < freqlist_db.size(); it++) {
+    for (uint8_t it = current_index; it < freqlist_db->size(); it++) {
        uint8_t line_height = (int)nb_lines * char_height;
        if (line_height < (r.height() - char_height)) {  // line is within the widget
-            std::string description = freqman_item_string(freqlist_db[it], 30);
+            std::string description = freqman_item_string(freqlist_db->at(it), 30);
            if (nb_lines == highlighted_index) {
                const Rect r_highlighted_freq{0, r.location().y() + (int)nb_lines * char_height, 240, char_height};
                painter.fill_rectangle(
@@ -107,7 +107,7 @@ void FreqManUIList::paint(Painter& painter) {
 }

 void FreqManUIList::set_db(freqman_db& db) {
-    freqlist_db = db;
+    freqlist_db = &db;
    if (db.size() == 0) {
        current_index = 0;
        highlighted_index = 0;
@@ -49,6 +49,8 @@ class FreqManUIList : public Widget {
    FreqManUIList()
        : FreqManUIList{{}, {}} {
    }
+    FreqManUIList(const FreqManUIList& other) = delete;
+    FreqManUIList& operator=(const FreqManUIList& other) = delete;

    void paint(Painter& painter) override;
    void on_focus() override;
@@ -64,7 +66,7 @@ class FreqManUIList : public Widget {
   private:
    static constexpr int8_t char_height = 16;
    bool instant_exec_{false};
-    freqman_db freqlist_db{};
+    freqman_db* freqlist_db{nullptr};
    int current_index{0};
    int highlighted_index{0};
    int freqlist_nb_lines{0};
@@ -31,6 +31,7 @@ using namespace portapack;

 #include "string_format.hpp"
 #include "complex.hpp"
+#include "ui_styles.hpp"

 namespace ui {

@@ -80,8 +81,8 @@ GeoPos::GeoPos(
 }

 void GeoPos::set_read_only(bool v) {
-    for (auto child : children_)
-        child->set_focusable(!v);
+    // only setting altitude to read-only (allow manual panning via lat/lon fields)
+    field_altitude.set_focusable(!v);
 }

 // Stupid hack to avoid an event loop
@@ -90,7 +91,15 @@ void GeoPos::set_report_change(bool v) {
 }

 void GeoPos::focus() {
-    field_altitude.focus();
+    if (field_altitude.focusable())
+        field_altitude.focus();
+    else
+        field_lat_degrees.focus();
+}
+
+void GeoPos::hide_altitude() {
+    // Color altitude grey to indicate it's not updated in manual panning mode
+    field_altitude.set_style(&Styles::grey);
 }

 void GeoPos::set_altitude(int32_t altitude) {
@@ -132,11 +141,74 @@ int32_t GeoPos::altitude() {
 GeoMap::GeoMap(
    Rect parent_rect)
    : Widget{parent_rect}, markerListLen(0) {
-    // set_focusable(true);
+}
+
+bool GeoMap::on_encoder(const EncoderEvent delta) {
+    if ((delta > 0) && (map_zoom < 5)) {
+        map_zoom++;
+
+        // Ensure that MOD(240,map_zoom)==0 for the map_zoom_line() function
+        if (240 % map_zoom != 0) {
+            map_zoom--;
+        }
+    } else if ((delta < 0) && (map_zoom > 1)) {
+        map_zoom--;
+    } else {
+        return false;
+    }
+
+    // Trigger map redraw
+    markerListUpdated = true;
+    set_dirty();
+    return true;
+}
+
+void GeoMap::map_zoom_line(ui::Color* buffer) {
+    if (map_zoom <= 1) {
+        return;
+    }
+
+    // As long as MOD(width,map_zoom)==0 then we don't need to check buffer overflow case when stretching last pixel;
+    // For 240 width, than means no check is needed for map_zoom values up to 6
+    for (int i = (240 / map_zoom) - 1; i >= 0; i--) {
+        for (int j = 0; j < map_zoom; j++) {
+            buffer[(i * map_zoom) + j] = buffer[i];
+        }
+    }
+}
+
+void GeoMap::draw_markers(Painter& painter) {
+    const auto r = screen_rect();
+
+    for (int i = 0; i < markerListLen; ++i) {
+        GeoMarker& item = markerList[i];
+        double lat_rad = sin(item.lat * pi / 180);
+        int x = (map_width * (item.lon + 180) / 360) - x_pos;
+        int y = (map_height - ((map_world_lon / 2 * log((1 + lat_rad) / (1 - lat_rad))) - map_offset)) - y_pos;  // Offset added for the GUI
+
+        if (map_zoom != 1) {
+            x = ((x - (r.width() / 2)) * map_zoom) + (r.width() / 2);
+            y = ((y - (r.height() / 2)) * map_zoom) + (r.height() / 2);
+        }
+
+        if ((x >= 0) && (x < r.width()) &&
+            (y > 10) && (y < r.height()))  // Dont draw within symbol size of top
+        {
+            ui::Point itemPoint(x, y + r.top());
+            if (y >= 32) {  // Dont draw text if it would overlap top
+                // Text and symbol
+                draw_marker(painter, itemPoint, item.angle, item.tag, Color::blue(), Color::blue(), Color::magenta());
+            } else {
+                // Only symbol
+                draw_bearing(itemPoint, item.angle, 10, Color::blue());
+            }
+        }
+    }
 }

 void GeoMap::paint(Painter& painter) {
-    uint16_t line;
+    uint16_t line, j;
+    uint32_t zoom_seek_x, zoom_seek_y;
    std::array<ui::Color, 240> map_line_buffer;
    const auto r = screen_rect();

@@ -144,39 +216,41 @@ void GeoMap::paint(Painter& painter) {
    // or the markers list was updated
    int x_diff = abs(x_pos - prev_x_pos);
    int y_diff = abs(y_pos - prev_y_pos);
-    if (markerListUpdated || (x_diff >= 3) || (y_diff >= 3)) {
-        for (line = 0; line < r.height(); line++) {
-            map_file.seek(4 + ((x_pos + (map_width * (y_pos + line))) << 1));
-            map_file.read(map_line_buffer.data(), r.width() << 1);
-            display.draw_pixels({0, r.top() + line, r.width(), 1}, map_line_buffer);
+    if (markerListUpdated || (x_diff >= map_zoom * 3) || (y_diff >= map_zoom * 3)) {
+        if (map_zoom == 1) {
+            zoom_seek_x = zoom_seek_y = 0;
+        } else {
+            zoom_seek_x = (r.width() - (r.width() / map_zoom)) / 2;
+            zoom_seek_y = (r.height() - (r.height() / map_zoom)) / 2;
+        }
+
+        for (line = 0; line < (r.height() / map_zoom); line++) {
+            map_file.seek(4 + ((x_pos + zoom_seek_x + (map_width * (y_pos + line + zoom_seek_y))) << 1));
+            map_file.read(map_line_buffer.data(), (r.width() / map_zoom) << 1);
+            map_zoom_line(map_line_buffer.data());
+            for (j = 0; j < map_zoom; j++) {
+                display.draw_pixels({0, r.top() + (line * map_zoom) + j, r.width(), 1}, map_line_buffer);
+            }
        }
        prev_x_pos = x_pos;
        prev_y_pos = y_pos;

+        // Draw crosshairs in center in manual panning mode
+        if (manual_panning_) {
+            display.fill_rectangle({r.center() - Point(16, 1), {32, 2}}, Color::red());
+            display.fill_rectangle({r.center() - Point(1, 16), {2, 32}}, Color::red());
+        }
+
        // Draw the other markers
-        for (int i = 0; i < markerListLen; ++i) {
-            GeoMarker& item = markerList[i];
-            double lat_rad = sin(item.lat * pi / 180);
-            int x = (map_width * (item.lon + 180) / 360) - x_pos;
-            int y = (map_height - ((map_world_lon / 2 * log((1 + lat_rad) / (1 - lat_rad))) - map_offset)) - y_pos;  // Offset added for the GUI
-            if ((x >= 0) && (x < r.width()) &&
-                (y > 10) && (y < r.height()))  // Dont draw within symbol size of top
-            {
-                ui::Point itemPoint(x, y + r.top());
-                if (y >= 32) {  // Dont draw text if it would overlap top
-                    // Text and symbol
-                    draw_marker(painter, itemPoint, item.angle, item.tag, Color::blue(), Color::blue(), Color::magenta());
-                } else {
-                    // Only symbol
-                    draw_bearing(itemPoint, item.angle, 10, Color::blue());
-                }
-            }
-            markerListUpdated = false;
-        }  // Draw the other markers
+        draw_markers(painter);
+        markerListUpdated = false;
+        set_clean();
    }

    // Draw the marker in the center
-    draw_marker(painter, r.center(), angle_, tag_, Color::red(), Color::white(), Color::black());
+    if (!manual_panning_) {
+        draw_marker(painter, r.center(), angle_, tag_, Color::red(), Color::white(), Color::black());
+    }
 }

 bool GeoMap::on_touch(const TouchEvent event) {
@@ -236,6 +310,14 @@ void GeoMap::set_mode(GeoMapMode mode) {
    mode_ = mode;
 }

+void GeoMap::set_manual_panning(bool v) {
+    manual_panning_ = v;
+}
+
+bool GeoMap::manual_panning() {
+    return manual_panning_;
+}
+
 void GeoMap::draw_bearing(const Point origin, const uint16_t angle, uint32_t size, const Color color) {
    Point arrow_a, arrow_b, arrow_c;

@@ -311,6 +393,11 @@ void GeoMapView::focus() {
 }

 void GeoMapView::update_position(float lat, float lon, uint16_t angle, int32_t altitude) {
+    if (geomap.manual_panning()) {
+        geomap.set_dirty();
+        return;
+    }
+
    lat_ = lat;
    lon_ = lon;
    altitude_ = altitude;
@@ -342,6 +429,8 @@ void GeoMapView::setup() {
        altitude_ = altitude;
        lat_ = lat;
        lon_ = lon;
+        geopos.hide_altitude();
+        geomap.set_manual_panning(true);
        geomap.move(lon_, lat_);
        geomap.set_dirty();
    };
@@ -396,6 +485,7 @@ GeoMapView::GeoMapView(
    geomap.set_tag(tag);
    geomap.set_angle(angle);
    geomap.move(lon_, lat_);
+    geomap.set_focusable(true);

    geopos.set_read_only(true);
 }
@@ -425,6 +515,7 @@ GeoMapView::GeoMapView(

    geomap.set_mode(mode_);
    geomap.move(lon_, lat_);
+    geomap.set_focusable(true);

    button_ok.on_select = [this, on_done, &nav](Button&) {
        if (on_done)
@@ -71,6 +71,7 @@ class GeoPos : public View {
    void set_lat(float lat);
    void set_lon(float lon);
    int32_t altitude();
+    void hide_altitude();
    float lat();
    float lon();

@@ -157,9 +158,12 @@ class GeoMap : public Widget {
    void paint(Painter& painter) override;

    bool on_touch(const TouchEvent event) override;
+    bool on_encoder(const EncoderEvent delta) override;

    bool init();
    void set_mode(GeoMapMode mode);
+    void set_manual_panning(bool v);
+    bool manual_panning();
    void move(const float lon, const float lat);
    void set_tag(std::string new_tag) {
        tag_ = new_tag;
@@ -177,11 +181,15 @@ class GeoMap : public Widget {
   private:
    void draw_bearing(const Point origin, const uint16_t angle, uint32_t size, const Color color);
    void draw_marker(Painter& painter, const ui::Point itemPoint, const uint16_t itemAngle, const std::string itemTag, const Color color = Color::red(), const Color fontColor = Color::white(), const Color backColor = Color::black());
+    void draw_markers(Painter& painter);
+    void map_zoom_line(ui::Color* buffer);

+    bool manual_panning_{false};
    GeoMapMode mode_{};
    File map_file{};
    uint16_t map_width{}, map_height{};
    int32_t map_center_x{}, map_center_y{};
+    int16_t map_zoom{1};
    float lon_ratio{}, lat_ratio{};
    double map_bottom{};
    double map_world_lon{};
@@ -36,7 +36,6 @@

 namespace ui {

-// TODO: build in support for editing.
 class FrequencyField : public Widget {
   public:
    std::function<void(rf::Frequency)> on_change{};
@@ -45,7 +44,7 @@ class FrequencyField : public Widget {

    using range_t = rf::FrequencyRange;

-    FrequencyField(const Point parent_pos);
+    FrequencyField(Point parent_pos);

    rf::Frequency value() const;

@@ -54,9 +53,9 @@ class FrequencyField : public Widget {

    void paint(Painter& painter) override;

-    bool on_key(const ui::KeyEvent event) override;
-    bool on_encoder(const EncoderEvent delta) override;
-    bool on_touch(const TouchEvent event) override;
+    bool on_key(ui::KeyEvent event) override;
+    bool on_encoder(EncoderEvent delta) override;
+    bool on_touch(TouchEvent event) override;
    void on_focus() override;

   private:
@@ -36,7 +36,7 @@ using namespace portapack;
 namespace ui {
 namespace spectrum {

-/* AudioSpectrumView******************************************************/
+/* AudioSpectrumView ******************************************************/

 AudioSpectrumView::AudioSpectrumView(
    const Rect parent_rect)
@@ -247,28 +247,25 @@ void FrequencyScale::on_tick_second() {
    _blink = !_blink;
 }

-/* WaterfallView *********************************************************/
+/* WaterfallWidget *********************************************************/
+// TODO: buffer and use "paint" instead of immediate drawing would help with
+// preventing flicker from drawing. Would use more RAM however.

-void WaterfallView::on_show() {
+void WaterfallWidget::on_show() {
    clear();

    const auto screen_r = screen_rect();
    display.scroll_set_area(screen_r.top(), screen_r.bottom());
 }

-void WaterfallView::on_hide() {
+void WaterfallWidget::on_hide() {
    /* TODO: Clear region to eliminate brief flash of content at un-shifted
     * position?
     */
    display.scroll_disable();
 }

-void WaterfallView::paint(Painter& painter) {
-    // Do nothing.
-    (void)painter;
-}
-
-void WaterfallView::on_channel_spectrum(
+void WaterfallWidget::on_channel_spectrum(
    const ChannelSpectrum& spectrum) {
    /* TODO: static_assert that message.spectrum.db.size() >= pixel_row.size() */

@@ -290,16 +287,16 @@ void WaterfallView::on_channel_spectrum(
        pixel_row);
 }

-void WaterfallView::clear() {
+void WaterfallWidget::clear() {
    display.fill_rectangle(
        screen_rect(),
        Color::black());
 }

-/* WaterfallWidget *******************************************************/
+/* WaterfallView *******************************************************/

-WaterfallWidget::WaterfallWidget(const bool cursor) {
-    add_children({&waterfall_view,
+WaterfallView::WaterfallView(const bool cursor) {
+    add_children({&waterfall_widget,
                  &frequency_scale});

    frequency_scale.set_focusable(cursor);
@@ -310,15 +307,17 @@ WaterfallWidget::WaterfallWidget(const bool cursor) {
    };
 }

-void WaterfallWidget::on_show() {
+void WaterfallView::on_show() {
+    // TODO: Assert that baseband is not shutdown.
    baseband::spectrum_streaming_start();
 }

-void WaterfallWidget::on_hide() {
+void WaterfallView::on_hide() {
+    // TODO: Assert that baseband is not shutdown.
    baseband::spectrum_streaming_stop();
 }

-void WaterfallWidget::show_audio_spectrum_view(const bool show) {
+void WaterfallView::show_audio_spectrum_view(const bool show) {
    if ((audio_spectrum_view && show) || (!audio_spectrum_view && !show)) return;

    if (show) {
@@ -333,18 +332,18 @@ void WaterfallWidget::show_audio_spectrum_view(const bool show) {
    }
 }

-void WaterfallWidget::update_widgets_rect() {
+void WaterfallView::update_widgets_rect() {
    if (audio_spectrum_view) {
        frequency_scale.set_parent_rect({0, audio_spectrum_height, screen_rect().width(), scale_height});
-        waterfall_view.set_parent_rect(waterfall_reduced_rect);
+        waterfall_widget.set_parent_rect(waterfall_reduced_rect);
    } else {
        frequency_scale.set_parent_rect({0, 0, screen_rect().width(), scale_height});
-        waterfall_view.set_parent_rect(waterfall_normal_rect);
+        waterfall_widget.set_parent_rect(waterfall_normal_rect);
    }
-    waterfall_view.on_show();
+    waterfall_widget.on_show();
 }

-void WaterfallWidget::set_parent_rect(const Rect new_parent_rect) {
+void WaterfallView::set_parent_rect(const Rect new_parent_rect) {
    View::set_parent_rect(new_parent_rect);

    waterfall_normal_rect = {0, scale_height, new_parent_rect.width(), new_parent_rect.height() - scale_height};
@@ -353,13 +352,8 @@ void WaterfallWidget::set_parent_rect(const Rect new_parent_rect) {
    update_widgets_rect();
 }

-void WaterfallWidget::paint(Painter& painter) {
-    // TODO:
-    (void)painter;
-}
-
-void WaterfallWidget::on_channel_spectrum(const ChannelSpectrum& spectrum) {
-    waterfall_view.on_channel_spectrum(spectrum);
+void WaterfallView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
+    waterfall_widget.on_channel_spectrum(spectrum);
    sampling_rate = spectrum.sampling_rate;
    frequency_scale.set_spectrum_sampling_rate(sampling_rate);
    frequency_scale.set_channel_filter(
@@ -368,9 +362,40 @@ void WaterfallWidget::on_channel_spectrum(const ChannelSpectrum& spectrum) {
        spectrum.channel_filter_transition);
 }

-void WaterfallWidget::on_audio_spectrum() {
+void WaterfallView::on_audio_spectrum() {
    audio_spectrum_view->on_audio_spectrum(audio_spectrum_data);
 }

 } /* namespace spectrum */
+
+uint32_t filter_bandwidth_for_sampling_rate(int32_t sampling_rate) {
+    switch (sampling_rate) {  // Use the var fs (sampling_rate) to set up BPF aprox < fs_max / 2 by Nyquist theorem.
+        case 0 ... 2000000:   // BW Captured range (0 <= 250kHz max)  fs = 8 x 250 kHz.
+            return 1750000;   // Minimum BPF MAX2837 for all those lower BW options.
+
+        case 4000000 ... 6000000:  // BW capture range (500k...750kHz max)  fs_max = 8 x 750kHz = 6Mhz
+                                   // BW 500k...750kHz, ex. 500kHz (fs = 8 x BW = 4Mhz), BW 600kHz (fs = 4,8Mhz), BW 750 kHz (fs = 6Mhz).
+            return 2500000;        // In some IC, MAX2837 appears as 2250000, but both work similarly.
+
+        case 8800000:  // BW capture 1,1Mhz fs = 8 x 1,1Mhz = 8,8Mhz. (1Mhz showed slightly higher noise background).
+            return 3500000;
+
+        case 14000000:  // BW capture 1,75Mhz, fs = 8 x 1,75Mhz = 14Mhz
+                        // Good BPF, good matching, but LCD flickers, refresh rate should be < 20 Hz, reasonable picture.
+            return 5000000;
+
+        case 16000000:  // BW capture 2Mhz, fs = 8 x 2Mhz = 16Mhz
+                        // Good BPF, good matching, but LCD flickers, refresh rate should be < 20 Hz, reasonable picture.
+            return 6000000;
+
+        case 20000000:  // BW capture 2,5Mhz, fs = 8 x 2,5 Mhz = 20Mhz
+                        // Good BPF, good matching, but LCD flickers, refresh rate should be < 20 Hz, reasonable picture.
+            return 7000000;
+
+        default:  // BW capture 2,75Mhz, fs = 8 x 2,75Mhz = 22Mhz max ADC sampling and others.
+                  // We tested also 9Mhz FPB slightly too much noise floor, better at 8Mhz.
+            return 8000000;
+    }
+}
+
 } /* namespace ui */
@@ -104,12 +104,15 @@ class FrequencyScale : public Widget {
    void draw_filter_ranges(Painter& painter, const Rect r);
 };

-class WaterfallView : public Widget {
+/* NB: These visualizations rely on having a baseband image running.
+ * If the baseband is shutdown or otherwise not running when interacting
+ * with these, they will almost certainly hang the device. */
+
+class WaterfallWidget : public Widget {
   public:
    void on_show() override;
    void on_hide() override;
-
-    void paint(Painter& painter) override;
+    void paint(Painter&) override {}

    void on_channel_spectrum(const ChannelSpectrum& spectrum);

@@ -117,16 +120,16 @@ class WaterfallView : public Widget {
    void clear();
 };

-class WaterfallWidget : public View {
+class WaterfallView : public View {
   public:
    std::function<void(int32_t offset)> on_select{};

-    WaterfallWidget(const bool cursor = false);
+    WaterfallView(const bool cursor = false);

-    WaterfallWidget(const WaterfallWidget&) = delete;
-    WaterfallWidget(WaterfallWidget&&) = delete;
-    WaterfallWidget& operator=(const WaterfallWidget&) = delete;
-    WaterfallWidget& operator=(WaterfallWidget&&) = delete;
+    WaterfallView(const WaterfallView&) = delete;
+    WaterfallView(WaterfallView&&) = delete;
+    WaterfallView& operator=(const WaterfallView&) = delete;
+    WaterfallView& operator=(WaterfallView&&) = delete;

    void on_show() override;
    void on_hide() override;
@@ -135,8 +138,6 @@ class WaterfallWidget : public View {

    void show_audio_spectrum_view(const bool show);

-    void paint(Painter& painter) override;
-
   private:
    void update_widgets_rect();

@@ -144,7 +145,7 @@ class WaterfallWidget : public View {
    static constexpr Dim audio_spectrum_height = 16 * 2 + 20;
    static constexpr Dim scale_height = 20;

-    WaterfallView waterfall_view{};
+    WaterfallWidget waterfall_widget{};
    FrequencyScale frequency_scale{};

    ChannelSpectrumFIFO* channel_fifo{nullptr};
@@ -191,6 +192,10 @@ class WaterfallWidget : public View {
 };

 } /* namespace spectrum */
+
+/* Calculates the best anti_alias_baseband_bandwidth_filter for the given sampling rate. */
+uint32_t filter_bandwidth_for_sampling_rate(int32_t sampling_rate);
+
 } /* namespace ui */

 #endif /*__UI_SPECTRUM_H__*/
@@ -50,7 +50,7 @@ class TextEntryView : public View {

    TextField text_input;
    Button button_ok{
-        {10 * 8, 33 * 8, 9 * 8, 32},
+        {22 * 8, 33 * 8, 7 * 8, 32},
        "OK"};
 };

@@ -98,9 +98,51 @@

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

 namespace ui {

+/* StatusTray ************************************************************/
+
+StatusTray::StatusTray(Point pos)
+    : View{{pos, {0, height}}},
+      pos_(pos) {
+    set_focusable(false);
+}
+
+void StatusTray::add(Widget* child) {
+    width_ += child->parent_rect().width();
+    add_child(child);
+}
+
+void StatusTray::update_layout() {
+    // Widen the tray's parent rect.
+    auto rect = parent_rect();
+    set_parent_rect({{rect.left() - width_, rect.top()}, {rect.right() + width_, height}});
+
+    // Update the children.
+    auto x = 0;
+    for (auto child : children()) {
+        auto size = child->parent_rect().size();
+        child->set_parent_rect({{x, 0}, size});
+        x += size.width();
+    }
+    set_dirty();
+}
+
+void StatusTray::clear() {
+    // More efficient than 'remove_children'.
+    for (auto child : children())
+        child->set_parent(nullptr);
+    children_.clear();
+    width_ = 0;
+    set_parent_rect({pos_, {width_, height}});
+    set_dirty();
+}
+
+void StatusTray::paint(Painter&) {
+}
+
 /* SystemStatusView ******************************************************/

 SystemStatusView::SystemStatusView(
@@ -111,48 +153,19 @@ SystemStatusView::SystemStatusView(
        &button_back,
        &title,
        &button_title,
-        &button_converter,
-        &button_speaker,
-        &button_stealth,
-        //&button_textentry,
-        &button_camera,
-        &button_sleep,
-        &button_bias_tee,
-        &button_clock_status,
-        &sd_card_status_view,
+        &status_icons,
    });

-    if (portapack::persistent_memory::should_use_sdcard_for_pmem()) {
-        portapack::persistent_memory::load_persistent_settings_from_file();
-    }
-
-    if (portapack::persistent_memory::config_hide_converter()) {
-        button_converter.hidden(true);
-    } else {
-        button_converter.hidden(false);
-        if (portapack::persistent_memory::config_converter()) {
-            button_converter.set_foreground(Color::red());
-        } else {
-            button_converter.set_foreground(Color::light_grey());
-        }
+    if (pmem::should_use_sdcard_for_pmem()) {
+        pmem::load_persistent_settings_from_file();
    }

    button_back.id = -1;  // Special ID used by FocusManager
    title.set_style(&Styles::bg_dark_grey);

-    if (portapack::persistent_memory::stealth_mode())
-        button_stealth.set_foreground(ui::Color::green());
-
-    /*if (!portapack::persistent_memory::ui_config_textentry())
-                button_textentry.set_bitmap(&bitmap_icon_keyboard);
-        else
-                button_textentry.set_bitmap(&bitmap_icon_unistroke);*/
-
-    refresh();
-
    button_back.on_select = [this](ImageButton&) {
-        if (portapack::persistent_memory::should_use_sdcard_for_pmem()) {
-            portapack::persistent_memory::save_persistent_settings_to_file();
+        if (pmem::should_use_sdcard_for_pmem()) {
+            pmem::save_persistent_settings_to_file();
        }
        if (this->on_back)
            this->on_back();
@@ -170,6 +183,10 @@ SystemStatusView::SystemStatusView(
        this->on_speaker();
    };

+    button_mute.on_select = [this](ImageButton&) {
+        this->on_mute();
+    };
+
    button_stealth.on_select = [this](ImageButton&) {
        this->on_stealth();
    };
@@ -178,10 +195,6 @@ SystemStatusView::SystemStatusView(
        this->on_bias_tee();
    };

-    /*button_textentry.on_select = [this](ImageButton&) {
-                this->on_textentry();
-        };*/
-
    button_camera.on_select = [this](ImageButton&) {
        this->on_camera();
    };
@@ -194,29 +207,33 @@ SystemStatusView::SystemStatusView(
    button_clock_status.on_select = [this](ImageButton&) {
        this->on_clk();
    };
+
+    audio::output::update_audio_mute();
+    refresh();
 }

 void SystemStatusView::refresh() {
-    if (portapack::persistent_memory::config_hide_converter()) {
-        button_converter.hidden(true);
-    } else {
-        if (portapack::persistent_memory::config_updown_converter()) {
-            button_converter.set_bitmap(&bitmap_icon_downconvert);
-        } else {
-            button_converter.set_bitmap(&bitmap_icon_upconvert);
-        }
-        button_converter.hidden(false);
-        if (portapack::persistent_memory::config_converter()) {
-            button_converter.set_foreground(Color::red());
-        } else {
-            button_converter.set_foreground(Color::light_grey());
-        }
-    }
+    // NB: Order of insertion is the display order Left->Right.
+    // TODO: Might be better to support hide and only add once.
+    status_icons.clear();
+    if (!pmem::ui_hide_camera()) status_icons.add(&button_camera);
+    if (!pmem::ui_hide_sleep()) status_icons.add(&button_sleep);
+    if (!pmem::ui_hide_stealth()) status_icons.add(&button_stealth);
+    if (!pmem::ui_hide_converter()) status_icons.add(&button_converter);
+    if (!pmem::ui_hide_bias_tee()) status_icons.add(&button_bias_tee);
+    if (!pmem::ui_hide_clock()) status_icons.add(&button_clock_status);
+    if (!pmem::ui_hide_mute()) status_icons.add(&button_mute);

-    portapack::set_speaker_disable(portapack::persistent_memory::config_speaker_disable());
-    portapack::set_audio_mute(portapack::persistent_memory::config_audio_mute());
+    // Display "Disable speaker" icon only if AK4951 Codec which has separate speaker/headphone control
+    if (audio::speaker_disable_supported() && !pmem::ui_hide_speaker())
+        status_icons.add(&button_speaker);

-    if (portapack::persistent_memory::config_audio_mute()) {
+    if (!pmem::ui_hide_sd_card()) status_icons.add(&sd_card_status_view);
+    status_icons.update_layout();
+
+    // Update icon display (try to keep all in on place).
+    // Speaker Enable/Disable (AK4951 boards only)
+    if (pmem::config_speaker_disable()) {
        button_speaker.set_foreground(Color::light_grey());
        button_speaker.set_bitmap(&bitmap_icon_speaker_mute);
    } else {
@@ -224,25 +241,38 @@ void SystemStatusView::refresh() {
        button_speaker.set_bitmap(&bitmap_icon_speaker);
    }

+    // Audio Mute (both headphones & speaker)
+    if (pmem::config_audio_mute()) {
+        button_mute.set_foreground(Color::light_grey());
+        button_mute.set_bitmap(&bitmap_icon_speaker_and_headphones_mute);
+    } else {
+        button_mute.set_foreground(Color::green());
+        button_mute.set_bitmap(&bitmap_icon_speaker_and_headphones);
+    }
+
+    // Clock status
+    bool external_clk = portapack::clock_manager.get_reference().source == ClockManager::ReferenceSource::External;
+    button_clock_status.set_bitmap(external_clk ? &bitmap_icon_clk_ext : &bitmap_icon_clk_int);
+    button_clock_status.set_foreground(
+        pmem::clkout_enabled() ? Color::green() : Color::light_grey());
+
+    // Antenna DC Bias
    if (portapack::get_antenna_bias()) {
        button_bias_tee.set_bitmap(&bitmap_icon_biast_on);
-        button_bias_tee.set_foreground(ui::Color::yellow());
+        button_bias_tee.set_foreground(Color::yellow());
    } else {
        button_bias_tee.set_bitmap(&bitmap_icon_biast_off);
-        button_bias_tee.set_foreground(ui::Color::light_grey());
+        button_bias_tee.set_foreground(Color::light_grey());
    }

-    if (portapack::clock_manager.get_reference().source == ClockManager::ReferenceSource::External) {
-        button_clock_status.set_bitmap(&bitmap_icon_clk_ext);
-    } else {
-        button_clock_status.set_bitmap(&bitmap_icon_clk_int);
-    }
+    // Converter
+    button_converter.set_bitmap(
+        pmem::config_updown_converter() ? &bitmap_icon_downconvert : &bitmap_icon_upconvert);
+    button_converter.set_foreground(pmem::config_converter() ? Color::red() : Color::light_grey());

-    if (portapack::persistent_memory::clkout_enabled()) {
-        button_clock_status.set_foreground(ui::Color::green());
-    } else {
-        button_clock_status.set_foreground(ui::Color::light_grey());
-    }
+    // Stealth
+    button_stealth.set_foreground(
+        pmem::stealth_mode() ? Color::green() : Color::light_grey());

    set_dirty();
 }
@@ -267,54 +297,53 @@ void SystemStatusView::set_title(const std::string new_value) {
    if (new_value.empty()) {
        title.set(default_title);
    } else {
-        title.set(new_value);
+        // Limit length of title string to prevent partial characters if too many StatusView icons
+        size_t max_len = (status_icons.parent_rect().left() - title.parent_rect().left()) / 8;
+        title.set(truncate(new_value, max_len));
    }
 }

 void SystemStatusView::on_converter() {
-    if (!portapack::persistent_memory::config_converter()) {
-        portapack::persistent_memory::set_config_converter(true);
-        button_converter.set_foreground(Color::red());
-    } else {
-        portapack::persistent_memory::set_config_converter(false);
-        button_converter.set_foreground(Color::light_grey());
-    }
+    pmem::set_config_converter(!pmem::config_converter());

    // Poke to update tuning
    // NOTE: Code assumes here that a TX app isn't active, since RX & TX have diff tuning offsets
    // (and there's only one tuner in the radio so can't update tuner for both).
+    // TODO: Maybe expose the 'enabled_' flag on models.
    receiver_model.set_target_frequency(receiver_model.target_frequency());
+    refresh();
 }

 void SystemStatusView::on_speaker() {
-    if (portapack::persistent_memory::config_audio_mute()) {
-        portapack::set_audio_mute(false);
-        portapack::persistent_memory::set_config_audio_mute(false);
-    } else {
-        portapack::set_audio_mute(true);
-        portapack::persistent_memory::set_config_audio_mute(true);
-    }
+    pmem::set_config_speaker_disable(!pmem::config_speaker_disable());
+    audio::output::update_audio_mute();
+    refresh();
+}
+
+void SystemStatusView::on_mute() {
+    pmem::set_config_audio_mute(!pmem::config_audio_mute());
+    audio::output::update_audio_mute();
    refresh();
 }

 void SystemStatusView::on_stealth() {
-    bool mode = not portapack::persistent_memory::stealth_mode();
-
-    portapack::persistent_memory::set_stealth_mode(mode);
-
-    button_stealth.set_foreground(mode ? Color::green() : Color::light_grey());
+    pmem::set_stealth_mode(!pmem::stealth_mode());
+    refresh();
 }

 void SystemStatusView::on_bias_tee() {
    if (!portapack::get_antenna_bias()) {
-        nav_.display_modal("Bias voltage", "Enable DC voltage on\nantenna connector?", YESNO, [this](bool v) {
-            if (v) {
-                portapack::set_antenna_bias(true);
-                receiver_model.set_antenna_bias();
-                transmitter_model.set_antenna_bias();
-                refresh();
-            }
-        });
+        nav_.display_modal("Bias voltage",
+                           "Enable DC voltage on\nantenna connector?",
+                           YESNO,
+                           [this](bool v) {
+                               if (v) {
+                                   portapack::set_antenna_bias(true);
+                                   receiver_model.set_antenna_bias();
+                                   transmitter_model.set_antenna_bias();
+                                   refresh();
+                               }
+                           });
    } else {
        portapack::set_antenna_bias(false);
        receiver_model.set_antenna_bias();
@@ -327,48 +356,28 @@ void SystemStatusView::on_bias_tee() {
    }
 }

-/*void SystemStatusView::on_textentry() {
-        uint8_t cfg;
-
-        cfg = portapack::persistent_memory::ui_config_textentry();
-        portapack::persistent_memory::set_config_textentry(cfg ^ 1);
-
-        if (!cfg)
-                button_textentry.set_bitmap(&bitmap_icon_unistroke);
-        else
-                button_textentry.set_bitmap(&bitmap_icon_keyboard);
-}*/
-
 void SystemStatusView::on_camera() {
    ensure_directory("SCREENSHOTS");
    auto path = next_filename_matching_pattern(u"SCREENSHOTS/SCR_????.PNG");

-    if (path.empty()) {
+    if (path.empty())
        return;
-    }

    PNGWriter png;
-    auto create_error = png.create(path);
-    if (create_error.is_valid()) {
+    auto error = png.create(path);
+    if (error)
        return;
-    }

-    for (int i = 0; i < 320; i++) {
-        std::array<ColorRGB888, 240> row;
-        portapack::display.read_pixels({0, i, 240, 1}, row);
+    for (int i = 0; i < screen_height; i++) {
+        std::array<ColorRGB888, screen_width> row;
+        portapack::display.read_pixels({0, i, screen_width, 1}, row);
        png.write_scanline(row);
    }
 }

 void SystemStatusView::on_clk() {
-    bool v = portapack::persistent_memory::clkout_enabled();
-    if (v) {
-        v = false;
-    } else {
-        v = true;
-    }
-    portapack::clock_manager.enable_clock_output(v);
-    portapack::persistent_memory::set_clkout_enabled(v);
+    pmem::set_clkout_enabled(!pmem::clkout_enabled());
+    portapack::clock_manager.enable_clock_output(pmem::clkout_enabled());
    refresh();
 }

@@ -396,17 +405,17 @@ InformationView::InformationView(

    version.set_style(&style_infobar);

-    ltime.set_hide_clock(portapack::persistent_memory::hide_clock());
+    ltime.set_hide_clock(pmem::hide_clock());
    ltime.set_style(&style_infobar);
    ltime.set_seconds_enabled(true);
-    ltime.set_date_enabled(portapack::persistent_memory::clock_with_date());
+    ltime.set_date_enabled(pmem::clock_with_date());
    set_dirty();
 }

 void InformationView::refresh() {
-    ltime.set_hide_clock(portapack::persistent_memory::hide_clock());
+    ltime.set_hide_clock(pmem::hide_clock());
    ltime.set_seconds_enabled(true);
-    ltime.set_date_enabled(portapack::persistent_memory::clock_with_date());
+    ltime.set_date_enabled(pmem::clock_with_date());
 }

 /* Navigation ************************************************************/
@@ -516,36 +525,36 @@ bool NavigationView::set_on_pop(std::function<void()> on_pop) {
 /* ReceiversMenuView *****************************************************/

 ReceiversMenuView::ReceiversMenuView(NavigationView& nav) {
-    if (portapack::persistent_memory::show_gui_return_icon()) {
-        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
+    if (pmem::show_gui_return_icon()) {
+        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
        {
            "ADS-B",
-            ui::Color::green(),
+            Color::green(),
            &bitmap_icon_adsb,
            [&nav]() { nav.push<ADSBRxView>(); },
        },
-        //{ "ACARS",	ui::Color::yellow(),	&bitmap_icon_adsb,			[&nav](){ nav.push<ACARSAppView>(); }, },
-        {"AIS Boats", ui::Color::green(), &bitmap_icon_ais, [&nav]() { nav.push<AISAppView>(); }},
-        {"AFSK", ui::Color::yellow(), &bitmap_icon_modem, [&nav]() { nav.push<AFSKRxView>(); }},
-        {"BTLE", ui::Color::yellow(), &bitmap_icon_btle, [&nav]() { nav.push<BTLERxView>(); }},
-        {"NRF", ui::Color::yellow(), &bitmap_icon_nrf, [&nav]() { nav.push<NRFRxView>(); }},
-        {"Audio", ui::Color::green(), &bitmap_icon_speaker, [&nav]() { nav.push<AnalogAudioView>(); }},
-        {"Analog TV", ui::Color::yellow(), &bitmap_icon_sstv, [&nav]() { nav.push<AnalogTvView>(); }},
-        {"ERT Meter", ui::Color::green(), &bitmap_icon_ert, [&nav]() { nav.push<ERTAppView>(); }},
-        {"POCSAG", ui::Color::green(), &bitmap_icon_pocsag, [&nav]() { nav.push<POCSAGAppView>(); }},
-        {"Radiosnde", ui::Color::green(), &bitmap_icon_sonde, [&nav]() { nav.push<SondeView>(); }},
-        {"TPMS Cars", ui::Color::green(), &bitmap_icon_tpms, [&nav]() { nav.push<TPMSAppView>(); }},
-        {"Recon", ui::Color::green(), &bitmap_icon_scanner, [&nav]() { nav.push<ReconView>(); }},
-        {"Level", ui::Color::green(), &bitmap_icon_options_radio, [&nav]() { nav.push<LevelView>(); }},
-        {"APRS", ui::Color::green(), &bitmap_icon_aprs, [&nav]() { nav.push<APRSRXView>(); }}
+        //{ "ACARS",	Color::yellow(),	&bitmap_icon_adsb,			[&nav](){ nav.push<ACARSAppView>(); }, },
+        {"AIS Boats", Color::green(), &bitmap_icon_ais, [&nav]() { nav.push<AISAppView>(); }},
+        {"AFSK", Color::yellow(), &bitmap_icon_modem, [&nav]() { nav.push<AFSKRxView>(); }},
+        {"BTLE", Color::yellow(), &bitmap_icon_btle, [&nav]() { nav.push<BTLERxView>(); }},
+        {"NRF", Color::yellow(), &bitmap_icon_nrf, [&nav]() { nav.push<NRFRxView>(); }},
+        {"Audio", Color::green(), &bitmap_icon_speaker, [&nav]() { nav.push<AnalogAudioView>(); }},
+        {"Analog TV", Color::yellow(), &bitmap_icon_sstv, [&nav]() { nav.push<AnalogTvView>(); }},
+        {"ERT Meter", Color::green(), &bitmap_icon_ert, [&nav]() { nav.push<ERTAppView>(); }},
+        {"POCSAG", Color::green(), &bitmap_icon_pocsag, [&nav]() { nav.push<POCSAGAppView>(); }},
+        {"Radiosnde", Color::green(), &bitmap_icon_sonde, [&nav]() { nav.push<SondeView>(); }},
+        {"TPMS Cars", Color::green(), &bitmap_icon_tpms, [&nav]() { nav.push<TPMSAppView>(); }},
+        {"Recon", Color::green(), &bitmap_icon_scanner, [&nav]() { nav.push<ReconView>(); }},
+        {"Level", Color::green(), &bitmap_icon_options_radio, [&nav]() { nav.push<LevelView>(); }},
+        {"APRS", Color::green(), &bitmap_icon_aprs, [&nav]() { nav.push<APRSRXView>(); }}
        /*
-                { "DMR", 		ui::Color::dark_grey(),	&bitmap_icon_dmr,		[&nav](){ nav.push<NotImplementedView>(); } },
-                { "SIGFOX", 	ui::Color::dark_grey(),	&bitmap_icon_fox,		[&nav](){ nav.push<NotImplementedView>(); } }, // SIGFRXView
-                { "LoRa", 		ui::Color::dark_grey(),	&bitmap_icon_lora,		[&nav](){ nav.push<NotImplementedView>(); } },
-                { "SSTV", 		ui::Color::dark_grey(), &bitmap_icon_sstv,		[&nav](){ nav.push<NotImplementedView>(); } },
-                { "TETRA", 		ui::Color::dark_grey(),	&bitmap_icon_tetra,		[&nav](){ nav.push<NotImplementedView>(); } },*/
+                { "DMR", 		Color::dark_grey(),	&bitmap_icon_dmr,		[&nav](){ nav.push<NotImplementedView>(); } },
+                { "SIGFOX", 	Color::dark_grey(),	&bitmap_icon_fox,		[&nav](){ nav.push<NotImplementedView>(); } }, // SIGFRXView
+                { "LoRa", 		Color::dark_grey(),	&bitmap_icon_lora,		[&nav](){ nav.push<NotImplementedView>(); } },
+                { "SSTV", 		Color::dark_grey(), &bitmap_icon_sstv,		[&nav](){ nav.push<NotImplementedView>(); } },
+                { "TETRA", 		Color::dark_grey(),	&bitmap_icon_tetra,		[&nav](){ nav.push<NotImplementedView>(); } },*/
    });

    // set_highlighted(0);		// Default selection is "Audio"
@@ -554,14 +563,14 @@ ReceiversMenuView::ReceiversMenuView(NavigationView& nav) {
 /* TransmittersMenuView **************************************************/

 TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
-    if (portapack::persistent_memory::show_gui_return_icon()) {
-        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
+    if (pmem::show_gui_return_icon()) {
+        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
-        {"ADS-B [S]", ui::Color::yellow(), &bitmap_icon_adsb, [&nav]() { nav.push<ADSBTxView>(); }},
+        {"ADS-B [S]", ui::Color::green(), &bitmap_icon_adsb, [&nav]() { nav.push<ADSBTxView>(); }},
        {"APRS", ui::Color::green(), &bitmap_icon_aprs, [&nav]() { nav.push<APRSTXView>(); }},
        {"BHT Xy/EP", ui::Color::green(), &bitmap_icon_bht, [&nav]() { nav.push<BHTView>(); }},
-        {"GPS Sim", ui::Color::yellow(), &bitmap_icon_gps_sim, [&nav]() { nav.push<GpsSimAppView>(); }},
+        {"GPS Sim", ui::Color::green(), &bitmap_icon_gps_sim, [&nav]() { nav.push<GpsSimAppView>(); }},
        {"Jammer", ui::Color::green(), &bitmap_icon_jammer, [&nav]() { nav.push<JammerView>(); }},
        //{ "Key fob",		ui::Color::orange(),	&bitmap_icon_keyfob,	[&nav](){ nav.push<KeyfobView>(); } },
        {"LGE tool", ui::Color::yellow(), &bitmap_icon_lge, [&nav]() { nav.push<LGEView>(); }},
@@ -574,9 +583,9 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
        {"Soundbrd", ui::Color::green(), &bitmap_icon_soundboard, [&nav]() { nav.push<SoundBoardView>(); }},
        {"SSTV", ui::Color::green(), &bitmap_icon_sstv, [&nav]() { nav.push<SSTVTXView>(); }},
        {"TEDI/LCR", ui::Color::yellow(), &bitmap_icon_lcr, [&nav]() { nav.push<LCRView>(); }},
-        {"TouchTune", ui::Color::yellow(), &bitmap_icon_remote, [&nav]() { nav.push<TouchTunesView>(); }},
-        {"Playlist", ui::Color::green(), &bitmap_icon_scanner, [&nav]() { nav.push<PlaylistView>(); }},
-        {"S.Painter", ui::Color::orange(), &bitmap_icon_morse, [&nav]() { nav.push<SpectrumPainterView>(); }},
+        {"TouchTune", ui::Color::green(), &bitmap_icon_touchtunes, [&nav]() { nav.push<TouchTunesView>(); }},
+        //{"Playlist", ui::Color::green(), &bitmap_icon_scanner, [&nav]() { nav.push<PlaylistView>(); }},
+        {"S.Painter", ui::Color::orange(), &bitmap_icon_paint, [&nav]() { nav.push<SpectrumPainterView>(); }},
        //{ "Remote",			ui::Color::dark_grey(),	&bitmap_icon_remote,	[&nav](){ nav.push<RemoteView>(); } },
    });
 }
@@ -584,22 +593,22 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
 /* UtilitiesMenuView *****************************************************/

 UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav) {
-    if (portapack::persistent_memory::show_gui_return_icon()) {
-        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
+    if (pmem::show_gui_return_icon()) {
+        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
-        //{ "Test app", 		ui::Color::dark_grey(),	nullptr,				[&nav](){ nav.push<TestView>(); } },
-        {"Freq. manager", ui::Color::green(), &bitmap_icon_freqman, [&nav]() { nav.push<FrequencyManagerView>(); }},
-        {"File manager", ui::Color::yellow(), &bitmap_icon_dir, [&nav]() { nav.push<FileManagerView>(); }},
-        {"Notepad", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<TextEditorView>(); }},
-        {"Signal gen", ui::Color::green(), &bitmap_icon_cwgen, [&nav]() { nav.push<SigGenView>(); }},
-        //{ "Tone search",	ui::Color::dark_grey(), nullptr,					[&nav](){ nav.push<ToneSearchView>(); } },
-        {"Wav viewer", ui::Color::yellow(), &bitmap_icon_soundboard, [&nav]() { nav.push<ViewWavView>(); }},
-        {"Antenna length", ui::Color::green(), &bitmap_icon_tools_antenna, [&nav]() { nav.push<WhipCalcView>(); }},
+        //{ "Test app", 		Color::dark_grey(),	nullptr,				[&nav](){ nav.push<TestView>(); } },
+        {"Freq. manager", Color::green(), &bitmap_icon_freqman, [&nav]() { nav.push<FrequencyManagerView>(); }},
+        {"File manager", Color::green(), &bitmap_icon_dir, [&nav]() { nav.push<FileManagerView>(); }},
+        {"Notepad", Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<TextEditorView>(); }},
+        {"Signal gen", Color::green(), &bitmap_icon_cwgen, [&nav]() { nav.push<SigGenView>(); }},
+        //{ "Tone search",	Color::dark_grey(), nullptr,					[&nav](){ nav.push<ToneSearchView>(); } },
+        {"Wav viewer", Color::yellow(), &bitmap_icon_soundboard, [&nav]() { nav.push<ViewWavView>(); }},
+        {"Antenna length", Color::green(), &bitmap_icon_tools_antenna, [&nav]() { nav.push<WhipCalcView>(); }},

-        {"Wipe SD card", ui::Color::red(), &bitmap_icon_tools_wipesd, [&nav]() { nav.push<WipeSDView>(); }},
-        {"Flash Utility", ui::Color::red(), &bitmap_icon_temperature, [&nav]() { nav.push<FlashUtilityView>(); }},
-        {"SD over USB", ui::Color::yellow(), &bitmap_icon_hackrf, [&nav]() { nav.push<SdOverUsbView>(); }},
+        {"Wipe SD card", Color::red(), &bitmap_icon_tools_wipesd, [&nav]() { nav.push<WipeSDView>(); }},
+        {"Flash Utility", Color::red(), &bitmap_icon_temperature, [&nav]() { nav.push<FlashUtilityView>(); }},
+        {"SD over USB", Color::yellow(), &bitmap_icon_hackrf, [&nav]() { nav.push<SdOverUsbView>(); }},
    });
    set_max_rows(2);  // allow wider buttons
 }
@@ -617,20 +626,20 @@ void SystemMenuView::hackrf_mode(NavigationView& nav) {

 SystemMenuView::SystemMenuView(NavigationView& nav) {
    add_items({
-        //{ "Play dead",				ui::Color::red(),		&bitmap_icon_playdead,	[&nav](){ nav.push<PlayDeadView>(); } },
-        {"Receive", ui::Color::cyan(), &bitmap_icon_receivers, [&nav]() { nav.push<ReceiversMenuView>(); }},
-        {"Transmit", ui::Color::cyan(), &bitmap_icon_transmit, [&nav]() { nav.push<TransmittersMenuView>(); }},
-        {"Capture", ui::Color::red(), &bitmap_icon_capture, [&nav]() { nav.push<CaptureAppView>(); }},
-        {"Replay", ui::Color::green(), &bitmap_icon_replay, [&nav]() { nav.push<ReplayAppView>(); }},
-        {"Search", ui::Color::yellow(), &bitmap_icon_search, [&nav]() { nav.push<SearchView>(); }},
-        {"Scanner", ui::Color::yellow(), &bitmap_icon_scanner, [&nav]() { nav.push<ScannerView>(); }},
-        {"Microphone", ui::Color::yellow(), &bitmap_icon_microphone, [&nav]() { nav.push<MicTXView>(); }},
-        {"Looking Glass", ui::Color::yellow(), &bitmap_icon_looking, [&nav]() { nav.push<GlassView>(); }},
-        {"Utilities", ui::Color::cyan(), &bitmap_icon_utilities, [&nav]() { nav.push<UtilitiesMenuView>(); }},
-        {"Settings", ui::Color::cyan(), &bitmap_icon_setup, [&nav]() { nav.push<SettingsMenuView>(); }},
-        {"Debug", ui::Color::light_grey(), &bitmap_icon_debug, [&nav]() { nav.push<DebugMenuView>(); }},
-        {"HackRF", ui::Color::cyan(), &bitmap_icon_hackrf, [this, &nav]() { hackrf_mode(nav); }},
-        //{ "About", 		ui::Color::cyan(),			nullptr,				[&nav](){ nav.push<AboutView>(); } }
+        //{ "Play dead",				Color::red(),		&bitmap_icon_playdead,	[&nav](){ nav.push<PlayDeadView>(); } },
+        {"Receive", Color::cyan(), &bitmap_icon_receivers, [&nav]() { nav.push<ReceiversMenuView>(); }},
+        {"Transmit", Color::cyan(), &bitmap_icon_transmit, [&nav]() { nav.push<TransmittersMenuView>(); }},
+        {"Capture", Color::red(), &bitmap_icon_capture, [&nav]() { nav.push<CaptureAppView>(); }},
+        {"Replay", Color::green(), &bitmap_icon_replay, [&nav]() { nav.push<PlaylistView>(); }},
+        {"Search", Color::yellow(), &bitmap_icon_search, [&nav]() { nav.push<SearchView>(); }},
+        {"Scanner", Color::green(), &bitmap_icon_scanner, [&nav]() { nav.push<ScannerView>(); }},
+        {"Microphone", Color::green(), &bitmap_icon_microphone, [&nav]() { nav.push<MicTXView>(); }},
+        {"Looking Glass", Color::green(), &bitmap_icon_looking, [&nav]() { nav.push<GlassView>(); }},
+        {"Utilities", Color::cyan(), &bitmap_icon_utilities, [&nav]() { nav.push<UtilitiesMenuView>(); }},
+        {"Settings", Color::cyan(), &bitmap_icon_setup, [&nav]() { nav.push<SettingsMenuView>(); }},
+        {"Debug", Color::light_grey(), &bitmap_icon_debug, [&nav]() { nav.push<DebugMenuView>(); }},
+        {"HackRF", Color::cyan(), &bitmap_icon_hackrf, [this, &nav]() { hackrf_mode(nav); }},
+        //{ "About", 		Color::cyan(),			nullptr,				[&nav](){ nav.push<AboutView>(); } }
    });
    set_max_rows(2);  // allow wider buttons
    set_arrow_enabled(false);
@@ -644,10 +653,10 @@ SystemView::SystemView(
    const Rect parent_rect)
    : View{parent_rect},
      context_(context) {
-    set_style(&ui::Styles::white);
+    set_style(&Styles::white);

-    constexpr ui::Dim status_view_height = 16;
-    constexpr ui::Dim info_view_height = 16;
+    constexpr Dim status_view_height = 16;
+    constexpr Dim info_view_height = 16;

    add_child(&status_view);
    status_view.set_parent_rect({{0, 0},
@@ -658,7 +667,7 @@ SystemView::SystemView(

    add_child(&navigation_view);
    navigation_view.set_parent_rect({{0, status_view_height},
-                                     {parent_rect.width(), static_cast<ui::Dim>(parent_rect.height() - status_view_height)}});
+                                     {parent_rect.width(), static_cast<Dim>(parent_rect.height() - status_view_height)}});

    add_child(&info_view);
    info_view.set_parent_rect({{0, 19 * 16},
@@ -678,17 +687,17 @@ SystemView::SystemView(
        this->status_view.set_dirty();
    };

-    // portapack::persistent_memory::set_playdead_sequence(0x8D1);
+    // pmem::set_playdead_sequence(0x8D1);

    // Initial view
-    /*if ((portapack::persistent_memory::playing_dead() == 0x5920C1DF) ||		// Enable code
-                (portapack::persistent_memory::ui_config() & 16)) {					// Login option
+    /*if ((pmem::playing_dead() == 0x5920C1DF) ||		// Enable code
+                (pmem::ui_config() & 16)) {					// Login option
                navigation_view.push<PlayDeadView>();
        } else {*/

    navigation_view.push<SystemMenuView>();

-    if (portapack::persistent_memory::config_splash()) {
+    if (pmem::config_splash()) {
        navigation_view.push<BMPView>();
    }
    status_view.set_back_enabled(false);
@@ -705,20 +714,27 @@ Context& SystemView::context() const {
 }

 void SystemView::toggle_overlay() {
-    if (overlay_active) {
-        this->remove_child(&this->overlay);
-        this->set_dirty();
-        shared_memory.request_m4_performance_counter = 0;
-    } else {
-        this->add_child(&this->overlay);
-        this->set_dirty();
-        shared_memory.request_m4_performance_counter = 1;
-        shared_memory.m4_cpu_usage = 0;
-        shared_memory.m4_heap_usage = 0;
-        shared_memory.m4_stack_usage = 0;
+    switch (++overlay_active) {
+        case 1:
+            this->add_child(&this->overlay);
+            this->set_dirty();
+            shared_memory.request_m4_performance_counter = 1;
+            shared_memory.m4_cpu_usage = 0;
+            shared_memory.m4_heap_usage = 0;
+            shared_memory.m4_stack_usage = 0;
+            break;
+        case 2:
+            this->remove_child(&this->overlay);
+            this->add_child(&this->overlay2);
+            this->set_dirty();
+            shared_memory.request_m4_performance_counter = 0;
+            break;
+        case 3:
+            this->remove_child(&this->overlay2);
+            this->set_dirty();
+            overlay_active = 0;
+            break;
    }
-
-    overlay_active = !overlay_active;
 }

 void SystemView::paint_overlay() {
@@ -729,7 +745,10 @@ void SystemView::paint_overlay() {
            return;

        last_paint_state = !last_paint_state;
-        this->overlay.set_dirty();
+        if (overlay_active == 1)
+            this->overlay.set_dirty();
+        else
+            this->overlay2.set_dirty();
    }
 }

@@ -120,6 +120,32 @@ class NavigationView : public View {
    View* push_view(std::unique_ptr<View> new_view);
 };

+/* Holds widgets and grows dynamically toward the left.
+ * 16px tall fixed and right-aligns all children in the
+ * order in which they were added. */
+// TODO: Could make this a generic "StackPanel" control.
+class StatusTray : public View {
+   public:
+    StatusTray(Point pos);
+
+    StatusTray(const StatusTray&) = delete;
+    StatusTray& operator=(const StatusTray&) = delete;
+
+    void add_button(ImageButton* child);
+    void add(Widget* child);
+    void update_layout();
+    void clear();
+    void paint(Painter& painter) override;
+    uint8_t width() { return width_; };
+
+   private:
+    static constexpr uint8_t height = 16;
+    // This control grow to the left, so keep
+    // track of the right edge.
+    const Point pos_{};
+    uint8_t width_{};
+};
+
 class SystemStatusView : public View {
   public:
    std::function<void(void)> on_back{};
@@ -136,7 +162,7 @@ class SystemStatusView : public View {
    NavigationView& nav_;

    Rectangle backdrop{
-        {0 * 8, 0 * 16, 240, 16},
+        {0 * 8, 0 * 16, ui::screen_width, 16},
        Color::dark_grey()};

    ImageButton button_back{
@@ -156,63 +182,65 @@ class SystemStatusView : public View {
        Color::white(),
        Color::dark_grey()};

+    StatusTray status_icons{{screen_width, 0}};
+
+    // TODO: Convert to ImageToggle buttons.
    ImageButton button_speaker{
-        {15 * 8, 0, 2 * 8, 1 * 16},
-        &bitmap_icon_speaker_mute,
+        {0, 0, 2 * 8, 1 * 16},
+        &bitmap_icon_speaker,
+        Color::light_grey(),
+        Color::dark_grey()};
+
+    ImageButton button_mute{
+        {0, 0, 2 * 8, 1 * 16},
+        &bitmap_icon_speaker_and_headphones,
        Color::light_grey(),
        Color::dark_grey()};

    ImageButton button_converter{
-        {17 * 8, 0, 2 * 8, 1 * 16},
+        {0, 0, 2 * 8, 1 * 16},
        &bitmap_icon_upconvert,
        Color::light_grey(),
        Color::dark_grey()};

    ImageButton button_stealth{
-        {19 * 8, 0, 2 * 8, 1 * 16},
+        {0, 0, 2 * 8, 1 * 16},
        &bitmap_icon_stealth,
        Color::light_grey(),
        Color::dark_grey()};

-    /*ImageButton button_textentry {
-                { 170, 0, 2 * 8, 1 * 16 },
-                &bitmap_icon_unistroke,
-                Color::white(),
-                Color::dark_grey()
-        };*/
-
    ImageButton button_camera{
-        {21 * 8, 0, 2 * 8, 1 * 16},
+        {0, 0, 2 * 8, 1 * 16},
        &bitmap_icon_camera,
        Color::white(),
        Color::dark_grey()};

    ImageButton button_sleep{
-        {23 * 8, 0, 2 * 8, 1 * 16},
+        {0, 0, 2 * 8, 1 * 16},
        &bitmap_icon_sleep,
        Color::white(),
        Color::dark_grey()};

    ImageButton button_bias_tee{
-        {25 * 8, 0, 12, 1 * 16},
+        {0, 0, 2 * 8, 1 * 16},
        &bitmap_icon_biast_off,
        Color::light_grey(),
        Color::dark_grey()};

    ImageButton button_clock_status{
-        {27 * 8, 0 * 16, 2 * 8, 1 * 16},
+        {0, 0 * 16, 8, 1 * 16},
        &bitmap_icon_clk_int,
        Color::light_grey(),
        Color::dark_grey()};

    SDCardStatusView sd_card_status_view{
-        {28 * 8, 0 * 16, 2 * 8, 1 * 16}};
+        {0, 0 * 16, 2 * 8, 1 * 16}};

    void on_converter();
    void on_speaker();
+    void on_mute();
    void on_stealth();
    void on_bias_tee();
-    // void on_textentry();
    void on_camera();
    void on_title();
    void refresh();
@@ -300,11 +328,12 @@ class SystemView : public View {
    void paint_overlay();

   private:
-    bool overlay_active{false};
+    uint8_t overlay_active{0};

    SystemStatusView status_view{navigation_view};
    InformationView info_view{navigation_view};
    DfuMenu overlay{navigation_view};
+    DfuMenu2 overlay2{navigation_view};
    NavigationView navigation_view{};
    Context& context_;
 };
@@ -28,6 +28,7 @@ using namespace portapack;
 #include "io_wave.hpp"

 #include "baseband_api.hpp"
+#include "metadata_file.hpp"
 #include "rtc_time.hpp"
 #include "string_format.hpp"
 #include "utility.hpp"
@@ -194,7 +195,10 @@ void RecordView::start() {
        } break;

        case FileType::RawS16: {
-            const auto metadata_file_error = write_metadata_file(base_path.replace_extension(u".TXT"));
+            const auto metadata_file_error =
+                write_metadata_file(get_metadata_path(base_path),
+                                    {receiver_model.target_frequency(), sampling_rate / 8});
+            // Not sure why sample_rate is div. 8, but stored value matches rate settings.
            if (metadata_file_error.is_valid()) {
                handle_error(metadata_file_error.value());
                return;
@@ -246,24 +250,6 @@ void RecordView::stop() {
    update_status_display();
 }

-Optional<File::Error> RecordView::write_metadata_file(const std::filesystem::path& filename) {
-    File file;
-    const auto create_error = file.create(filename);
-    if (create_error.is_valid()) {
-        return create_error;
-    } else {
-        const auto error_line1 = file.write_line("sample_rate=" + to_string_dec_uint(sampling_rate / 8));
-        if (error_line1.is_valid()) {
-            return error_line1;
-        }
-        const auto error_line2 = file.write_line("center_frequency=" + to_string_dec_uint(receiver_model.target_frequency()));
-        if (error_line2.is_valid()) {
-            return error_line2;
-        }
-        return {};
-    }
-}
-
 void RecordView::on_tick_second() {
    update_status_display();
 }
@@ -281,7 +267,7 @@ void RecordView::update_status_display() {

    if (sampling_rate) {
        const auto space_info = std::filesystem::space(u"");
-        const uint32_t bytes_per_second = file_type == FileType::WAV ? (sampling_rate * 2) : (sampling_rate / 8 * 4);
+        const uint32_t bytes_per_second = file_type == FileType::WAV ? (sampling_rate * 2) : (sampling_rate / 8 * 4);  // TODO: Why 8/4??
        const uint32_t available_seconds = space_info.free / bytes_per_second;
        const uint32_t seconds = available_seconds % 60;
        const uint32_t available_minutes = available_seconds / 60;
@@ -68,7 +68,6 @@ class RecordView : public View {
   private:
    void toggle();
    // void toggle_pitch_rssi();
-    Optional<File::Error> write_metadata_file(const std::filesystem::path& filename);

    void on_tick_second();
    void update_status_display();
@@ -175,7 +175,11 @@ void AK4951::headphone_enable() {

 void AK4951::headphone_disable() {
    set_headphone_power(false);
-    set_dac_power(false);
+
+    // Don't power off DAC unless Speaker is disabled also
+    if (map.r.power_management_2.PMSL == 0) {
+        set_dac_power(false);
+    }
 }

 void AK4951::speaker_enable() {
@@ -210,7 +214,11 @@ void AK4951::speaker_disable() {
    update(Register::SignalSelect1);

    // Power down DAC, Programmable Filter and speaker: PMDAC=PMPFIL=PMSL bits= “1”→“0”
-    set_dac_power(false);
+    // Exception: Don't power off DAC unless Headphones are disabled too
+    if (map.r.power_management_2.PMHPL == 0) {
+        set_dac_power(false);
+    }
+
    // map.r.power_management_1.PMPFIL = 0;
    // update(Register::PowerManagement1);
    set_speaker_power(false);
@@ -837,6 +837,10 @@ class AK4951 : public audio::Codec {
    void speaker_enable();
    void speaker_disable();

+    bool speaker_disable_supported() const override {
+        return true;
+    }
+
    void set_headphone_volume(const volume_t volume) override;
    void headphone_mute();

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jLynx	c2279e297c	Stable v1.7.3 (#1224 ) * Update past_version.txt * Update version.txt	2023-06-30 20:45:20 +12:00
Mark Thompson	cdd524b9f3	Use a common function for finding Tone Key index from received Tone Frequency (#1218 ) * Common function for finding CTCSS tone index from freq	2023-06-30 07:37:43 +02:00
Kyle Reed	99809c7919	Consolidate anti_alias BW selection into function (#1217 )	2023-06-30 07:35:35 +02:00
Kyle Reed	2390d79111	Fix up Waterfall control names (#1219 )	2023-06-30 07:34:19 +02:00
Kyle Reed	3b41d73ddd	Remove LTO, minor UI tweaks (#1216 )	2023-06-30 07:33:33 +02:00
gullradriel	3d46c28911	fix build (#1215 ) * fix build * fixing build integrationg zoom --------- Co-authored-by: GullCode <gullradriel@hotmail.com>	2023-06-29 13:58:10 -07:00
Kyle Reed	ca7840557b	Change how scrolling works, add home/end (#1212 ) Conflicts fixed by gull	2023-06-29 22:17:31 +02:00
Mark Thompson	ceaa115025	Revert color of "SD over USB" icon back to yellow (#1210 )	2023-06-29 22:13:33 +02:00
Mark Thompson	8dbcefbc75	Move initializer from .hpp -> .cpp file (#1213 )	2023-06-29 22:07:39 +02:00
Mark Thompson	b28b96fb4a	Notepad text zoom support 5x8 to 8x16 font (#1211 ) * Zoom button 5/8 to 8/16 font * Zoom button 5/8 to 8/16 font * Clang & revert unintended change * Suggested improvements * Suggested code changes * Added char_width function * Added char_width function * Oops copy-paste error * Delete added blank line	2023-06-29 10:55:25 -07:00
Stupid retard noob attention king	e15a8ed2d8	improve keyboard (#1209 ) * init commit for raw input in keyboard * clean up * clean up - 1 * clean up - 2 * can input underline and < now * format fix * textual change * textual change - 2 * textual change - 3 * textual change - 4 * edit for PR comment * edit for PR comment - 2 * edit for PR comment - 3 * edit for PR comment - 4 * edit for PR comment - 5	2023-06-29 09:24:18 -07:00
gullradriel	19b77bf03b	fix recon start and mode change (#1208 )	2023-06-28 22:21:13 +02:00
Kyle Reed	7b1541d2e8	work around calling focus from ctor path. (#1207 )	2023-06-28 21:50:11 +02:00
gullradriel	830fea63ed	Optimize compilation flags (#1206 ) * restoring -O3 on baseband, activating lto on cpp parts	2023-06-28 21:46:49 +02:00
Kyle Reed	3d59de55f8	Remove raw new/delete from Recon (#1203 )	2023-06-28 19:14:30 +02:00
Mark Thompson	5c1f5a7d2e	Second DFU Overlay Screen with Receiver Info (#1204 ) * 2nd DFU overlay with receiver info for debug	2023-06-28 19:04:16 +02:00
Kyle Reed	4e985420d4	Replace Replay with Playlist (#1202 ) * Replace Replay with Playlist * Suggestions from test-drive. Launch from Fileman	2023-06-28 19:02:06 +02:00
Mark Thompson	3e584a9652	Proposed debug dump formatting tweaks (#1200 ) * Debug dump formatting * Added FW version to debug dump	2023-06-28 19:01:09 +02:00
Mark Thompson	39acaf846a	Revised title bar truncation code & removed title widget shading (#1201 ) * Revised title truncate & undo widget shading * Revised title truncation & undo widget shading	2023-06-27 19:34:25 -07:00
Mark Thompson	76948cffa8	Improve visibility of green icons on white background (#1196 )	2023-06-27 10:19:34 +02:00
Mark Thompson	4ea8abb53b	Limit title length when too many status icons & shade background of every other icon (#1195 ) * Shading alternate icon backgrounds on title bar * Shading alternate icons on title bar * Shading alternate icons on title bar * Clang	2023-06-27 10:15:58 +02:00
gullradriel	32085f317b	adding one more character to modulation widget for spec (#1193 ) Co-authored-by: GullCode <gullradriel@hotmail.com>	2023-06-27 10:02:04 +02:00
Kyle Reed	faa4367295	Allow frequency override in Playlist, Folder fixes (#1194 ) * Allow frequency to be changed per-entry * Folder fixes, use TX freq --------- Co-authored-by: kallanreed <kallanreed@noreply.github.com>	2023-06-26 19:44:01 +02:00
Mark Thompson	3f8a4957af	Moved AK Speaker Disable back to a title bar, and modified Mute Icon to differentiate (#1192 ) * Added fn to indicate support for disabling speaker * Support both mute & speaker disable icons * Byte grouping for ui_config2_t bitmap * Fix disabling AK speaker to take effect immediately	2023-06-26 08:08:09 +02:00
gullradriel	b5ea81cf96	fix SPEC mode in app (#1191 ) Co-authored-by: GullCode <gullradriel@hotmail.com>	2023-06-25 16:52:40 -07:00
Kyle Reed	e14fa5eab0	New playlist (#1185 ) * updated playlist file format * fix trim and delay part of item * playlist add/remove tracks * UI Tweak	2023-06-25 20:40:19 +02:00
Mark Thompson	960ecf616c	Update menu icons colors per app state & add contrast to bright icons for improved visibility when Selected (#1189 ) * Orange icons vs yellow * Update app icon colors per current development states * Darken bright icons on white backgrounds * Darken bright icons on white backgrounds	2023-06-25 19:48:51 +02:00
gullradriel	996ccb0e40	Recon capture mod (#1190 ) * Recon: disabling config while recording * Capture and Spectre Painter: using freqman set bandwidth option instead of static define * Recon: light_grey for disable so we can still see the text	2023-06-25 11:33:44 +02:00
Mark Thompson	407fee23b9	Long button press support (#1188 )	2023-06-25 11:32:37 +02:00
gullradriel	199570d4a5	flipper inspired freqlists for recon (#1187 )	2023-06-25 11:30:09 +02:00
gullradriel	5cd9c377d2	Recon record (#1182 ) * added auto record checbox and functions (audio and raw) * Changed baseband compile option from -O3 to -O2. Trying lower gave unexpeted and crashing results. * added 650k SPEC bw * fix hang if wait is -100 * fixing no SPEC support in scanner	2023-06-25 08:16:49 +02:00
Kyle Reed	e08273b8b8	Auto layout of top status icons (#1178 ) * WIP - updated pmem * WIP status tray auto layout * Add settings page for icons * Add ui_config2 to pmem dump --------- Co-authored-by: kallanreed <kallanreed@noreply.github.com>	2023-06-23 16:13:39 -07:00
Kyle Reed	6b0f90c321	Update string_format.cpp (#1184 )	2023-06-24 00:08:11 +02:00
Mark Thompson	0dea488e98	Added TouchTunes jukebox icon (#1183 ) * Added TouchTunes jukebox icon * Added TouchTunes jukebox icon * Added TouchTunes jukebox icon	2023-06-23 15:01:19 -07:00
Mark Thompson	e60c4dc34b	Paint Roller icon for S.Painter & fix make_bitmap.py to generate Clang-compliant code (#1181 ) * Generate Clang-compliant output file * Paint roller icon for Screen Painter app * Paint roller icon for Screen Painter app * Paint roller icon for Spectrum Painter	2023-06-23 07:57:35 -07:00
gullradriel	0c75713820	using emplace_back instead of push_back * using emplace_back instead of push_back is giving better results in regards of the memory management and crashes * we tried with all our best ideas, we don't know why it's better but it outperformed every other allocations method tested	2023-06-22 22:26:15 +02:00
gullradriel	6a28987a36	Debug utilities (#1171 ) -pmem, receiver and transmitter model dumps	2023-06-22 17:35:21 +02:00
gullradriel	7331979107	Freqman memory fix (#1177 ) * Cleanings and setting the limit to a working for all apps one * fixing a guru memory errors, renaming a leftover variable * removed unneeded set_dirty	2023-06-22 17:34:20 +02:00
Mark Thompson	f22808f8ca	Pan & Zoom-in support for GeoMap (#1172 ) * Zoom-in support * Zoom-in support * Clang formatting * Clang formatting * Zoom-in support * Zoom-in support * Zoom-in support * Roll-back wrong file edited * Zoom-in support * Clang formatting * Clang formatting * Zoom-in support * Zoom-in support * Zoom-in support * Oops copy/paste error	2023-06-21 21:56:07 +02:00
E.T	e1c519d71e	Frequman widget gets a non owning reference to the database instead of copying (#1175 ) -Get rid of -Weffc++ pointer member warnings by restricting copy of FreqManUIList -Add null checks -Remove unused macro	2023-06-21 12:05:07 +02:00
Kyle Reed	909f37f89b	whipcalc parsing, bug fixes (#1174 ) * whipcalc parsing, bug fixes	2023-06-20 20:22:58 +02:00
Kyle Reed	63b0093321	Consolidate metadata file parsing (#1173 ) * Add metadata file helper and replace old code * Finish updating metadata read/write	2023-06-20 09:32:37 +02:00
Mark Thompson	fa06df1400	Persistent audio mute support revisions (#1169 ) * Don't disable DAC when other audio output is using it * Persistent audio mute revisions * Moved persistent audio mute code to audio.cpp * Make "Disable AK speaker amp" take effect immediately	2023-06-19 21:06:07 +02:00
Kyle Reed	f83027d451	Re-add MicTX workaround (#1170 )	2023-06-19 21:05:08 +02:00
Kyle Reed	7ebf3d3cdd	Fix hang in Audio when switching from Capture app, & bug fixes. (#1167 ) * Fix hang in Audio when switching from Capture app * Bug fixes	2023-06-19 07:48:29 +02:00
Kyle Reed	5daa0dfbb1	Consolidate frequency field on_edit (#1166 )	2023-06-18 21:11:04 +02:00
Mark Thompson	7b669d7001	Proposed default focus changes (#1165 ) * Changed default focus of pocsag, glass, scanner, sonde	2023-06-18 08:14:29 +02:00