Search cleanup, more binder support (#1467 )

Add Binder helper methods (#1465 )
* Add binder, fix focus on remote btn delete * Use binder for freqman edit
2026-09-16 03:22:59 +00:00 · 2023-10-01 09:04:37 -07:00 · 2023-09-29 18:55:27 +02:00 · 2023-09-27 21:03:02 +02:00 · 2023-09-23 21:56:37 +02:00 · 2023-09-21 17:43:10 +02:00
111 changed files with 4479 additions and 2144 deletions
@@ -182,6 +182,7 @@ set(CPPSRC
 	io_convert.cpp
 	io_file.cpp
 	io_wave.cpp
+	iq_trim.cpp
 	irq_controls.cpp
 	irq_lcd_frame.cpp
 	irq_rtc.cpp
@@ -238,43 +239,64 @@ set(CPPSRC
 	ui/ui_textentry.cpp
 	ui/ui_tone_key.cpp
 	ui/ui_transmitter.cpp
+	apps/acars_app.cpp
+	apps/ais_app.cpp
+	apps/analog_audio_app.cpp
+	apps/analog_tv_app.cpp
+	apps/capture_app.cpp
+	apps/ert_app.cpp
+	apps/gps_sim_app.cpp
+	apps/lge_app.cpp
+	apps/lge_app.cpp
+	apps/pocsag_app.cpp
+	# apps/replay_app.cpp
+	apps/soundboard_app.cpp
+	apps/tpms_app.cpp
+	apps/tpms_app.cpp
 	apps/ui_about_simple.cpp
 	apps/ui_adsb_rx.cpp
 	apps/ui_adsb_tx.cpp
 	apps/ui_afsk_rx.cpp
 	apps/ui_aprs_rx.cpp
-	apps/ui_btle_rx.cpp
-	apps/ui_nrf_rx.cpp
 	apps/ui_aprs_tx.cpp
 	apps/ui_bht_tx.cpp
-	apps/ui_dfu_menu.cpp
+	apps/ui_btle_rx.cpp
 	apps/ui_coasterp.cpp
 	apps/ui_debug.cpp
+	apps/ui_dfu_menu.cpp
 	apps/ui_encoders.cpp
 	apps/ui_fileman.cpp
 	apps/ui_flash_utility.cpp
-	apps/ui_sd_over_usb.cpp
 	apps/ui_freqman.cpp
+	apps/ui_iq_trim.cpp
 	apps/ui_jammer.cpp
-    #apps/ui_keyfob.cpp
+    # apps/ui_keyfob.cpp
 	apps/ui_lcr.cpp
-	apps/lge_app.cpp
+	apps/ui_level.cpp  
 	apps/ui_looking_glass_app.cpp
 	apps/ui_mictx.cpp
 	apps/ui_modemsetup.cpp
 	apps/ui_morse.cpp
+	apps/ui_nrf_rx.cpp
 	# apps/ui_nuoptix.cpp
+	apps/ui_playlist.cpp
 	apps/ui_pocsag_tx.cpp
 	apps/ui_rds.cpp
+	apps/ui_recon_settings.cpp
+	apps/ui_recon.cpp  
 	apps/ui_remote.cpp
 	apps/ui_scanner.cpp
-	apps/ui_search.cpp
+	apps/ui_sd_over_usb.cpp
 	apps/ui_sd_wipe.cpp
+	apps/ui_search.cpp
 	apps/ui_settings.cpp
 	apps/ui_siggen.cpp
 	apps/ui_sonde.cpp
-	apps/ui_sstvtx.cpp
+	apps/ui_spectrum_painter_image.cpp
+	apps/ui_spectrum_painter_text.cpp
+	apps/ui_spectrum_painter.cpp
 	apps/ui_ss_viewer.cpp
+	apps/ui_sstvtx.cpp
 	# apps/ui_test.cpp
 	apps/ui_text_editor.cpp
 	apps/ui_tone_search.cpp
@@ -282,26 +304,6 @@ set(CPPSRC
 	apps/ui_touchtunes.cpp
 	apps/ui_view_wav.cpp
 	apps/ui_whipcalc.cpp
-	apps/acars_app.cpp
-	apps/ais_app.cpp
-	apps/analog_audio_app.cpp
-	apps/analog_tv_app.cpp
-	apps/capture_app.cpp
-	apps/ert_app.cpp
-	apps/lge_app.cpp
-	apps/pocsag_app.cpp
-	# apps/replay_app.cpp
-	apps/ui_playlist.cpp
-	apps/gps_sim_app.cpp
-	apps/soundboard_app.cpp
-	apps/ui_recon.cpp  
-	apps/ui_recon_settings.cpp
-	apps/ui_level.cpp  
-	apps/tpms_app.cpp
-	apps/tpms_app.cpp
-	apps/ui_spectrum_painter.cpp
-	apps/ui_spectrum_painter_image.cpp
-	apps/ui_spectrum_painter_text.cpp
 	protocols/aprs.cpp
 	protocols/ax25.cpp
 	protocols/bht.cpp
@@ -316,6 +318,7 @@ set(CPPSRC
 	# ui_replay_view.cpp
 	# ui_script.cpp
 	ui_sd_card_debug.cpp
+	config_mode.cpp
 	${CPLD_20150901_DATA_CPP}
 	${CPLD_20170522_DATA_CPP}
 	${HACKRF_CPLD_DATA_CPP}
@@ -244,55 +244,64 @@ SettingsManager::SettingsManager(
    : app_name_{app_name},
      settings_{},
      bindings_{},
-      loaded_{false} {
+      loaded_{false},
+      radio_loaded_{false} {
    settings_.mode = mode;
    settings_.options = options;

-    if (!portapack::persistent_memory::load_app_settings())
-        return;
-
    // Pre-alloc enough for app settings and additional settings.
    additional_settings.reserve(17 + additional_settings.size());
    bindings_ = std::move(additional_settings);

-    // Transmitter model settings.
-    if (flags_enabled(mode, Mode::TX)) {
-        bindings_.emplace_back("tx_frequency"sv, &settings_.tx_frequency);
-        bindings_.emplace_back("tx_amp"sv, &settings_.tx_amp);
-        bindings_.emplace_back("tx_gain"sv, &settings_.tx_gain);
-        bindings_.emplace_back("channel_bandwidth"sv, &settings_.channel_bandwidth);
-    }
+    // Additional settings should always be loaded because apps now rely
+    // on being able to store UI settings, config, etc. The radio settings
+    // are only loaded if the global option has been enabled.
+    // Add the radio setting bindings if either load or save are enabled.
+    if (portapack::persistent_memory::load_app_settings() ||
+        portapack::persistent_memory::save_app_settings()) {
+        // Transmitter model settings.
+        if (flags_enabled(mode, Mode::TX)) {
+            bindings_.emplace_back("tx_frequency"sv, &settings_.tx_frequency);
+            bindings_.emplace_back("tx_amp"sv, &settings_.tx_amp);
+            bindings_.emplace_back("tx_gain"sv, &settings_.tx_gain);
+            bindings_.emplace_back("channel_bandwidth"sv, &settings_.channel_bandwidth);
+        }

-    // Receiver model settings.
-    if (flags_enabled(mode, Mode::RX)) {
-        bindings_.emplace_back("rx_frequency"sv, &settings_.rx_frequency);
-        bindings_.emplace_back("lna"sv, &settings_.lna);
-        bindings_.emplace_back("vga"sv, &settings_.vga);
-        bindings_.emplace_back("rx_amp"sv, &settings_.rx_amp);
-        bindings_.emplace_back("modulation"sv, &settings_.modulation);
-        bindings_.emplace_back("am_config_index"sv, &settings_.am_config_index);
-        bindings_.emplace_back("nbfm_config_index"sv, &settings_.nbfm_config_index);
-        bindings_.emplace_back("wfm_config_index"sv, &settings_.wfm_config_index);
-        bindings_.emplace_back("squelch"sv, &settings_.squelch);
-    }
+        // Receiver model settings.
+        if (flags_enabled(mode, Mode::RX)) {
+            bindings_.emplace_back("rx_frequency"sv, &settings_.rx_frequency);
+            bindings_.emplace_back("lna"sv, &settings_.lna);
+            bindings_.emplace_back("vga"sv, &settings_.vga);
+            bindings_.emplace_back("rx_amp"sv, &settings_.rx_amp);
+            bindings_.emplace_back("modulation"sv, &settings_.modulation);
+            bindings_.emplace_back("am_config_index"sv, &settings_.am_config_index);
+            bindings_.emplace_back("nbfm_config_index"sv, &settings_.nbfm_config_index);
+            bindings_.emplace_back("wfm_config_index"sv, &settings_.wfm_config_index);
+            bindings_.emplace_back("squelch"sv, &settings_.squelch);
+        }

-    // Common model settings.
-    bindings_.emplace_back("baseband_bandwidth"sv, &settings_.baseband_bandwidth);
-    bindings_.emplace_back("sampling_rate"sv, &settings_.sampling_rate);
-    bindings_.emplace_back("step"sv, &settings_.step);
-    bindings_.emplace_back("volume"sv, &settings_.volume);
+        // Common model settings.
+        bindings_.emplace_back("baseband_bandwidth"sv, &settings_.baseband_bandwidth);
+        bindings_.emplace_back("sampling_rate"sv, &settings_.sampling_rate);
+        bindings_.emplace_back("step"sv, &settings_.step);
+        bindings_.emplace_back("volume"sv, &settings_.volume);
+    }

    loaded_ = load_settings(app_name_, bindings_);

-    if (loaded_)
+    // Only copy to the radio if load was successful.
+    if (loaded_ && portapack::persistent_memory::load_app_settings()) {
+        radio_loaded_ = true;
        copy_to_radio_model(settings_);
-}
-
-SettingsManager::~SettingsManager() {
-    if (portapack::persistent_memory::save_app_settings()) {
-        copy_from_radio_model(settings_);
-        save_settings(app_name_, bindings_);
    }
 }

+SettingsManager::~SettingsManager() {
+    // Only save radio settings when the option is enabled.
+    if (portapack::persistent_memory::save_app_settings())
+        copy_from_radio_model(settings_);
+
+    save_settings(app_name_, bindings_);
+}
+
 }  // namespace app_settings
@@ -150,7 +150,9 @@ void copy_to_radio_model(const AppSettings& settings);
 /* Copies common values from the receiver/transmitter models. */
 void copy_from_radio_model(AppSettings& settings);

-/* RAII wrapper for automatically loading and saving radio settings for an app.
+/* RAII wrapper for automatically loading and saving settings for an app.
+ * "Additional" settings are always loaded, but radio settings are conditionally
+ * saved/loaded if the global app settings options are enabled.
 * NB: This should be added to a class before any LNA/VGA controls so that
 * the receiver/transmitter models are set before the control ctors run. */
 class SettingsManager {
@@ -167,6 +169,9 @@ class SettingsManager {

    /* True if settings were successfully loaded from file. */
    bool loaded() const { return loaded_; }
+
+    /* True if radio settings were successfully loaded from file. */
+    bool radio_loaded() const { return radio_loaded_; }
    Mode mode() const { return settings_.mode; }

    AppSettings& raw() { return settings_; }
@@ -176,6 +181,7 @@ class SettingsManager {
    AppSettings settings_;
    SettingBindings bindings_;
    bool loaded_;
+    bool radio_loaded_;
 };

 }  // namespace app_settings
@@ -382,7 +382,7 @@ AISAppView::AISAppView(NavigationView& nav)

    recent_entry_detail_view.hidden(true);

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

    receiver_model.enable();
@@ -44,6 +44,7 @@ CaptureAppView::CaptureAppView(NavigationView& nav)
        &field_vga,
        &option_bandwidth,
        &option_format,
+        &check_trim,
        &record_view,
        &waterfall,
    });
@@ -59,6 +60,10 @@ CaptureAppView::CaptureAppView(NavigationView& nav)
        record_view.set_file_type((RecordView::FileType)file_type);
    };

+    check_trim.on_select = [this](Checkbox&, bool v) {
+        record_view.set_auto_trim(v);
+    };
+
    freqman_set_bandwidth_option(SPEC_MODULATION, option_bandwidth);
    option_bandwidth.on_change = [this](size_t, uint32_t bandwidth) {
        /* Nyquist would imply a sample rate of 2x bandwidth, but because the ADC
@@ -92,7 +97,7 @@ CaptureAppView::CaptureAppView(NavigationView& nav)
    };

    receiver_model.enable();
-    option_bandwidth.set_by_value(500000);  // better by_value than by option_bandwidth.set_selected_index(4), Preselected default option 500kHz.
+    option_bandwidth.set_by_value(500000);

    record_view.on_error = [&nav](std::string message) {
        nav.display_modal("Error", message);
@@ -92,6 +92,12 @@ class CaptureAppView : public View {
        {{"C16", RecordView::FileType::RawS16},
         {"C8", RecordView::FileType::RawS8}}};

+    Checkbox check_trim{
+        {23 * 8, 1 * 16},
+        4,
+        "Trim",
+        /*small*/ true};
+
    RecordView record_view{
        {0 * 8, 2 * 16, 30 * 8, 1 * 16},
        u"BBD_????.*",
@@ -110,7 +110,7 @@ ERTAppView::ERTAppView(NavigationView&) {
        &recent_entries_view,
    });

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

    receiver_model.enable();
@@ -173,7 +173,7 @@ GpsSimAppView::GpsSimAppView(
        &waterfall,
    });

-    if (!settings_.loaded()) {
+    if (!settings_.radio_loaded()) {
        field_frequency.set_value(initial_target_frequency);
        transmitter_model.set_sampling_rate(2600000);
    }
@@ -24,9 +24,6 @@
 #ifndef __GPS_SIM_APP_HPP__
 #define __GPS_SIM_APP_HPP__

-#define SHORT_UI true
-#define NORMAL_UI false
-
 #include "app_settings.hpp"
 #include "radio_state.hpp"
 #include "ui_widget.hpp"
@@ -109,10 +106,8 @@ class GpsSimAppView : public View {
        nav_};

    TransmitterView2 tx_view{
-        // new handling of NumberField field_rfgain, NumberField field_rfamp
-        74, 1 * 8, SHORT_UI  // x(columns), y (line) position. (Used in Replay / GPS Simul / Playlist App)
-                             //		10*8, 2*8, NORMAL_UI				// x(columns), y (line) position. (Used in Mic App)
-    };
+        {11 * 8, 2 * 16},
+        /*short_ui*/ true};

    Checkbox check_loop{
        {21 * 8, 2 * 16},
@@ -54,34 +54,32 @@ POCSAGSettingsView::POCSAGSettingsView(
    POCSAGSettings& settings)
    : settings_{settings} {
    add_children(
-        {&check_beta,
+        {&labels,
         &check_log,
         &check_log_raw,
         &check_small_font,
         &check_hide_bad,
         &check_hide_addr_only,
-         &check_ignore,
-         &field_ignore,
+         &opt_filter_mode,
+         &field_filter_address,
         &button_save});

-    check_beta.set_value(settings_.use_new_proc);
    check_log.set_value(settings_.enable_logging);
    check_log_raw.set_value(settings_.enable_raw_log);
    check_small_font.set_value(settings_.enable_small_font);
    check_hide_bad.set_value(settings_.hide_bad_data);
    check_hide_addr_only.set_value(settings_.hide_addr_only);
-    check_ignore.set_value(settings_.enable_ignore);
-    field_ignore.set_value(settings_.address_to_ignore);
+    opt_filter_mode.set_by_value(settings_.filter_mode);
+    field_filter_address.set_value(settings_.filter_address);

    button_save.on_select = [this, &nav](Button&) {
-        settings_.use_new_proc = check_beta.value();
        settings_.enable_logging = check_log.value();
        settings_.enable_raw_log = check_log_raw.value();
        settings_.enable_small_font = check_small_font.value();
        settings_.hide_bad_data = check_hide_bad.value();
        settings_.hide_addr_only = check_hide_addr_only.value();
-        settings_.enable_ignore = check_ignore.value();
-        settings_.address_to_ignore = field_ignore.value();
+        settings_.filter_mode = opt_filter_mode.selected_index_value();
+        settings_.filter_address = field_filter_address.to_integer();

        nav.pop();
    };
@@ -89,10 +87,7 @@ POCSAGSettingsView::POCSAGSettingsView(

 POCSAGAppView::POCSAGAppView(NavigationView& nav)
    : nav_{nav} {
-    if (settings_.use_new_proc)
-        baseband::run_image(portapack::spi_flash::image_tag_pocsag2);
-    else
-        baseband::run_image(portapack::spi_flash::image_tag_pocsag);
+    baseband::run_image(portapack::spi_flash::image_tag_pocsag2);

    add_children(
        {&rssi,
@@ -105,15 +100,22 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav)
         &field_volume,
         &image_status,
         &text_packet_count,
-         &button_ignore_last,
+         &widget_baud,
+         &widget_bits,
+         &widget_frames,
+         &button_filter_last,
         &button_config,
         &console});

-    // No app settings, use fallbacks.
+    // No app settings, use fallbacks from pmem.
    if (!app_settings_.loaded()) {
+        settings_.filter_address = pmem::pocsag_ignore_address();
+        settings_.filter_mode = (settings_.filter_address == 0)
+                                    ? FILTER_NONE
+                                    : FILTER_DROP;
+    }
+    if (!app_settings_.radio_loaded()) {
        field_frequency.set_value(initial_target_frequency);
-        settings_.address_to_ignore = pmem::pocsag_ignore_address();
-        settings_.enable_ignore = settings_.address_to_ignore > 0;
    }

    logger.append(LOG_ROOT_DIR "/POCSAG.TXT");
@@ -123,9 +125,11 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav)
        receiver_model.set_squelch_level(v);
    };

-    button_ignore_last.on_select = [this](Button&) {
-        settings_.enable_ignore = true;
-        settings_.address_to_ignore = last_address;
+    button_filter_last.on_select = [this](Button&) {
+        if (settings_.filter_mode == FILTER_NONE)
+            settings_.filter_mode = FILTER_DROP;
+        settings_.filter_address = last_address;
+        refresh_ui();
    };

    button_config.on_select = [this](Button&) {
@@ -148,16 +152,49 @@ POCSAGAppView::~POCSAGAppView() {
    receiver_model.disable();
    baseband::shutdown();

-    // Save pmem settings. TODO: Even needed anymore?
-    pmem::set_pocsag_ignore_address(settings_.address_to_ignore);
-    pmem::set_pocsag_last_address(pocsag_state.address);  // For POCSAG TX.
+    // Save pmem settings.
+    pmem::set_pocsag_ignore_address(settings_.filter_address);
+    pmem::set_pocsag_last_address(last_address);  // For POCSAG TX.
 }

 void POCSAGAppView::refresh_ui() {
+    // Set console font style.
    console.set_style(
        settings_.enable_small_font
            ? &Styles::white_small
            : &Styles::white);
+
+    // Update filter button text.
+    std::string btn_text = "Filter Last";
+    switch (settings_.filter_mode) {
+        case FILTER_DROP:
+            btn_text = "Ignore Last";
+            break;
+
+        case FILTER_KEEP:
+            btn_text = "Keep Last";
+            break;
+
+        case FILTER_NONE:
+        default:
+            btn_text = "Filter Last";
+            break;
+    }
+    button_filter_last.set_text(btn_text);
+}
+
+bool POCSAGAppView::ignore_address(uint32_t address) const {
+    switch (settings_.filter_mode) {
+        case FILTER_DROP:
+            return address == settings_.filter_address;
+
+        case FILTER_KEEP:
+            return address != settings_.filter_address;
+
+        case FILTER_NONE:
+        default:
+            return false;
+    }
 }

 void POCSAGAppView::handle_decoded(Timestamp timestamp, const std::string& prefix) {
@@ -170,8 +207,8 @@ void POCSAGAppView::handle_decoded(Timestamp timestamp, const std::string& prefi
        return;
    }

-    // Ignored address.
-    if (ignore() && pocsag_state.address == settings_.address_to_ignore) {
+    // Ignore address? TODO: could filter earlier.
+    if (ignore_address(pocsag_state.address)) {
        console.write("\n" STR_COLOR_CYAN + prefix + " Ignored: " + to_string_dec_uint(pocsag_state.address));
        last_address = pocsag_state.address;
        return;
@@ -271,7 +308,47 @@ void POCSAGAppView::on_packet(const POCSAGPacketMessage* message) {
    image_status.set_foreground(get_status_color(pocsag_state));
 }

-void POCSAGAppView::on_stats(const POCSAGStatsMessage*) {
+void POCSAGAppView::on_stats(const POCSAGStatsMessage* stats) {
+    widget_baud.set_rate(stats->baud_rate);
+    widget_bits.set_bits(stats->current_bits);
+    widget_frames.set_frames(stats->current_frames);
+    widget_frames.set_sync(stats->has_sync);
+}
+
+void BaudIndicator::paint(Painter& painter) {
+    auto p = screen_pos();
+    char top = '-';
+    char bot = '-';
+
+    if (rate_ > 0) {
+        auto r = rate_ / 100;
+        top = (r / 10) + '0';
+        bot = (r % 10) + '0';
+    }
+
+    painter.draw_char(p, Styles::white_small, top);
+    painter.draw_char({p.x(), p.y() + 8}, Styles::white_small, bot);
+}
+
+void BitsIndicator::paint(Painter&) {
+    auto p = screen_pos();
+    for (size_t i = 0; i < sizeof(bits_) * 8; ++i) {
+        auto is_set = ((bits_ >> i) & 0x1) == 1;
+
+        int x = p.x() + (i / height);
+        int y = p.y() + (i % height);
+        display.draw_pixel({x, y}, is_set ? Color::white() : Color::black());
+    }
+}
+
+void FrameIndicator::paint(Painter& painter) {
+    auto p = screen_pos();
+    painter.draw_rectangle({p, {2, height}}, has_sync_ ? Color::green() : Color::grey());
+
+    for (size_t i = 0; i < height; ++i) {
+        auto p2 = p + Point{2, 15 - (int)i};
+        painter.draw_hline(p2, 2, i < frame_count_ ? Color::white() : Color::black());
+    }
 }

 } /* namespace ui */
@@ -52,15 +52,82 @@ class POCSAGLogger {

 namespace ui {

+class BaudIndicator : public Widget {
+   public:
+    BaudIndicator(Point position)
+        : Widget{{position, {5, height}}} {}
+
+    void paint(Painter& painter) override;
+    void set_rate(uint16_t rate) {
+        if (rate != rate_) {
+            rate_ = rate;
+            set_dirty();
+        }
+    }
+
+   private:
+    static constexpr uint8_t height = 16;
+    uint16_t rate_ = 0;
+};
+
+class BitsIndicator : public Widget {
+   public:
+    BitsIndicator(Point position)
+        : Widget{{position, {2, height}}} {}
+
+    void paint(Painter& painter) override;
+    void set_bits(uint32_t bits) {
+        if (bits != bits_) {
+            bits_ = bits;
+            set_dirty();
+        }
+    }
+
+   private:
+    static constexpr uint8_t height = 16;
+    uint32_t bits_ = 0;
+};
+
+class FrameIndicator : public Widget {
+   public:
+    FrameIndicator(Point position)
+        : Widget{{position, {4, height}}} {}
+
+    void paint(Painter& painter) override;
+    void set_frames(uint8_t frame_count) {
+        if (frame_count != frame_count_) {
+            frame_count_ = frame_count;
+            set_dirty();
+        }
+    }
+
+    void set_sync(bool has_sync) {
+        if (has_sync != has_sync_) {
+            has_sync_ = has_sync;
+            set_dirty();
+        }
+    }
+
+   private:
+    static constexpr uint8_t height = 16;
+    uint8_t frame_count_ = 0;
+    bool has_sync_ = false;
+};
+
+enum POCSAGFilter : uint8_t {
+    FILTER_NONE,
+    FILTER_DROP,
+    FILTER_KEEP
+};
+
 struct POCSAGSettings {
    bool enable_small_font = false;
    bool enable_logging = false;
    bool enable_raw_log = false;
-    bool enable_ignore = false;
    bool hide_bad_data = false;
    bool hide_addr_only = false;
-    uint32_t address_to_ignore = 0;
-    bool use_new_proc = false;
+    uint8_t filter_mode = false;
+    uint32_t filter_address = 0;
 };

 class POCSAGSettingsView : public View {
@@ -73,11 +140,10 @@ class POCSAGSettingsView : public View {
   private:
    POCSAGSettings& settings_;

-    Checkbox check_beta{
-        {0 * 8 + 2, 18 * 16 - 4},
-        6,
-        "Beta",
-        true /*small*/};
+    Labels labels{
+        {{2 * 8, 12 * 16}, "Filter Mode:", Color::light_grey()},
+        {{2 * 8, 13 * 16}, "Filter Addr:", Color::light_grey()},
+    };

    Checkbox check_log{
        {2 * 8, 2 * 16},
@@ -104,17 +170,18 @@ class POCSAGSettingsView : public View {
        22,
        "Hide Addr Only"};

-    Checkbox check_ignore{
-        {2 * 8, 12 * 16},
-        22,
-        "Enable Ignored Address"};
+    OptionsField opt_filter_mode{
+        {15 * 8, 12 * 16},
+        4,
+        {{"None", FILTER_NONE},
+         {"Drop", FILTER_DROP},
+         {"Keep", FILTER_KEEP}}};

-    NumberField field_ignore{
-        {7 * 8, 13 * 16 + 8},
+    SymField field_filter_address{
+        {15 * 8, 13 * 16},
        7,
-        {0, 9999999},
-        1,
-        '0'};
+        SymField::Type::Dec,
+        true /*explicit_edit*/};

    Button button_save{
        {11 * 8, 16 * 16, 10 * 8, 2 * 16},
@@ -133,7 +200,6 @@ class POCSAGAppView : public View {
    static constexpr uint32_t initial_target_frequency = 466'175'000;
    bool logging() const { return settings_.enable_logging; };
    bool logging_raw() const { return settings_.enable_raw_log; };
-    bool ignore() const { return settings_.enable_ignore; };
    bool hide_bad_data() const { return settings_.hide_bad_data; };
    bool hide_addr_only() const { return settings_.hide_addr_only; };

@@ -148,19 +214,20 @@ class POCSAGAppView : public View {
        {
            {"small_font"sv, &settings_.enable_small_font},
            {"enable_logging"sv, &settings_.enable_logging},
-            {"enable_ignore"sv, &settings_.enable_ignore},
-            {"address_to_ignore"sv, &settings_.address_to_ignore},
+            {"enable_raw_log"sv, &settings_.enable_raw_log},
+            {"filter_mode"sv, &settings_.filter_mode},
+            {"filter_address"sv, &settings_.filter_address},
            {"hide_bad_data"sv, &settings_.hide_bad_data},
            {"hide_addr_only"sv, &settings_.hide_addr_only},
-            {"use_new_proc"sv, &settings_.use_new_proc},
        }};

    void refresh_ui();
+    bool ignore_address(uint32_t address) const;
    void handle_decoded(Timestamp timestamp, const std::string& prefix);
    void on_packet(const POCSAGPacketMessage* message);
    void on_stats(const POCSAGStatsMessage* stats);

-    uint32_t last_address = 0xFFFFFFFF;
+    uint32_t last_address = 0;
    pocsag::EccContainer ecc{};
    pocsag::POCSAGState pocsag_state{&ecc};
    POCSAGLogger logger{};
@@ -187,7 +254,8 @@ class POCSAGAppView : public View {
        2,
        {0, 99},
        1,
-        ' '};
+        ' ',
+        true /*wrap*/};
    AudioVolumeField field_volume{
        {28 * 8, 0 * 16}};

@@ -201,16 +269,26 @@ class POCSAGAppView : public View {
        {3 * 8, 1 * 16 + 2, 5 * 8, 16},
        "0"};

-    Button button_ignore_last{
+    BitsIndicator widget_bits{
+        {8 * 8 + 1, 1 * 16 + 2}};
+
+    FrameIndicator widget_frames{
+        {8 * 8 + 4, 1 * 16 + 2}};
+
+    BaudIndicator widget_baud{
+        {8 * 9 + 1, 1 * 16 + 2}};
+
+    Button button_filter_last{
        {10 * 8, 1 * 16, 12 * 8, 20},
-        "Ignore Last"};
+        "Filter Last"};

    Button button_config{
        {22 * 8, 1 * 16, 8 * 8, 20},
        "Config"};

+    // 54 == status bar (16) + top controls (2 * 16 + 6).
    Console console{
-        {0, 2 * 16 + 6, screen_width, screen_height - 56}};
+        {0, 2 * 16 + 6, screen_width, screen_height - 54}};

    MessageHandlerRegistration message_handler_packet{
        Message::ID::POCSAGPacket,
@@ -203,9 +203,6 @@ ReplayAppView::ReplayAppView(

 ReplayAppView::~ReplayAppView() {
    transmitter_model.disable();
-
-    display.fill_rectangle({0, 0, 240, 320}, Color::black());  // Solving sometimes visible bottom waterfall artifacts, clearing all LCD  pixels.
-    chThdSleepMilliseconds(40);                                // (that happened sometimes if we interrupt the waterfall play at the beggining of the play  around 25% and exit )
    baseband::shutdown();
 }

@@ -23,9 +23,6 @@
 #ifndef __REPLAY_APP_HPP__
 #define __REPLAY_APP_HPP__

-#define SHORT_UI true
-#define NORMAL_UI false
-
 #include "app_settings.hpp"
 #include "radio_state.hpp"
 #include "ui_widget.hpp"
@@ -99,16 +96,13 @@ class ReplayAppView : public View {
    ProgressBar progressbar{
        {18 * 8, 1 * 16, 12 * 8, 16}};

-    // 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
-        74, 1 * 8, SHORT_UI  // x(columns), y (line) position. (Uused in Repay / GPS Simul / Playlist App)
-                             //		10*8, 2*8, NORMAL_UI				// x(columns), y (line) position. (Used in Mic App)
-    };
+        {11 * 8, 2 * 16},
+        /*short_ui*/ true};

    Checkbox check_loop{
        {21 * 8, 2 * 16},
@@ -157,7 +157,7 @@ TPMSAppView::TPMSAppView(NavigationView&) {
                  &field_vga,
                  &recent_entries_view});

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

    receiver_model.enable();
@@ -186,13 +186,12 @@ ADSBSquawkView::ADSBSquawkView(
                  &field_squawk});
 }

-void ADSBSquawkView::collect_frames(const uint32_t ICAO_address, std::vector<ADSBFrame>& frame_list) {
+void ADSBSquawkView::collect_frames(const uint32_t /*ICAO_address*/, std::vector<ADSBFrame>& frame_list) {
    if (!enabled) return;

    ADSBFrame temp_frame;
-    (void)ICAO_address;

-    encode_frame_squawk(temp_frame, field_squawk.concatenate_4_octal_u16());
+    encode_frame_squawk(temp_frame, field_squawk.to_integer());

    frame_list.emplace_back(temp_frame);
 }
@@ -277,7 +276,7 @@ ADSBTxView::~ADSBTxView() {
 }

 void ADSBTxView::generate_frames() {
-    const uint32_t ICAO_address = sym_icao.value_hex_u64();
+    const uint32_t ICAO_address = sym_icao.to_integer();

    frames.clear();

@@ -135,7 +135,7 @@ class ADSBSquawkView : public OptionTabView {
    SymField field_squawk{
        {10 * 8, 2 * 16},
        4,
-        SymField::SYMFIELD_OCT};
+        SymField::Type::Oct};
 };

 class ADSBTXThread {
@@ -235,7 +235,7 @@ class ADSBTxView : public View {
    SymField sym_icao{
        {10 * 8, 4 * 8},
        6,
-        SymField::SYMFIELD_HEX};
+        SymField::Type::Hex};

    Text text_frame{
        {1 * 8, 29 * 8, 14 * 8, 16},
@@ -94,15 +94,15 @@ class AFSKRxView : public View {
        false};

    Text text_debug{
-        {0 * 8, 12 + 2 * 16, 240, 16},
+        {0 * 8, 12 + 2 * 16, screen_width, 16},
        "DEBUG"};

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

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

    void on_data_afsk(const AFSKDataMessage& message);

@@ -48,9 +48,10 @@ APRSTXView::~APRSTXView() {
 }

 void APRSTXView::start_tx() {
+    // TODO: Clean up this API to take string_views to avoid allocations.
    make_aprs_frame(
-        sym_source.value_string().c_str(), num_ssid_source.value(),
-        sym_dest.value_string().c_str(), num_ssid_dest.value(),
+        sym_source.to_string().c_str(), num_ssid_source.value(),
+        sym_dest.to_string().c_str(), num_ssid_dest.value(),
        payload);

    // uint8_t * bb_data_ptr = shared_memory.bb_data.data;
@@ -68,7 +68,8 @@ class APRSTXView : public View {
    SymField sym_source{
        {7 * 8, 1 * 16},
        6,
-        SymField::SYMFIELD_ALPHANUM};
+        SymField::Type::Alpha};
+
    NumberField num_ssid_source{
        {19 * 8, 1 * 16},
        2,
@@ -79,7 +80,7 @@ class APRSTXView : public View {
    SymField sym_dest{
        {7 * 8, 2 * 16},
        6,
-        SymField::SYMFIELD_ALPHANUM};
+        SymField::Type::Alpha};

    NumberField num_ssid_dest{
        {19 * 8, 2 * 16},
@@ -42,12 +42,12 @@ CoasterPagerView::~CoasterPagerView() {
 }

 void CoasterPagerView::generate_frame() {
-    uint8_t frame[19];
-    uint32_t c;
+    constexpr uint8_t frame_bytes = 19;
+    uint8_t frame[frame_bytes];

    // Preamble (8 bytes)
-    for (c = 0; c < 8; c++)
-        frame[c] = 0x55;  // Isn't this 0xAA ?
+    for (uint8_t c = 0; c < 8; c++)
+        frame[c] = 0x55;

    // Sync word
    frame[8] = 0x2D;
@@ -57,11 +57,11 @@ void CoasterPagerView::generate_frame() {
    frame[10] = 8;

    // Data
-    for (c = 0; c < 8; c++)
-        frame[c + 11] = (sym_data.get_sym(c * 2) << 4) | sym_data.get_sym(c * 2 + 1);
+    auto data_bytes = to_byte_array(sym_data.to_integer());
+    memcpy(&frame[11], data_bytes.data(), data_bytes.size());

    // Copy for baseband
-    memcpy(shared_memory.bb_data.data, frame, 19);
+    memcpy(shared_memory.bb_data.data, frame, frame_bytes);
 }

 void CoasterPagerView::start_tx() {
@@ -72,12 +72,7 @@ void CoasterPagerView::start_tx() {
    baseband::set_fsk_data(19 * 8, 2280000 / 1000, 5000, 32);
 }

-void CoasterPagerView::on_tx_progress(const uint32_t progress, const bool done) {
-    (void)progress;
-
-    uint16_t address = 0;
-    uint32_t c;
-
+void CoasterPagerView::on_tx_progress(const uint32_t /*progress*/, const bool done) {
    if (done) {
        if (tx_mode == SINGLE) {
            transmitter_model.disable();
@@ -85,18 +80,12 @@ void CoasterPagerView::on_tx_progress(const uint32_t progress, const bool done)
            tx_view.set_transmitting(false);
        } else if (tx_mode == SCAN) {
            // Increment address
-
-            for (c = 0; c < 4; c++) {
-                address <<= 4;
-                address |= sym_data.get_sym(12 + c);
-            }
+            uint64_t data = sym_data.to_integer();
+            uint16_t address = data & 0xFFFF;

            address++;
-
-            for (c = 0; c < 4; c++) {
-                sym_data.set_sym(15 - c, address & 0x0F);
-                address >>= 4;
-            }
+            data = (data & 0xFFFFFFFFFFFF0000) + address;
+            sym_data.set_value(data);

            start_tx();
        }
@@ -104,9 +93,6 @@ void CoasterPagerView::on_tx_progress(const uint32_t progress, const bool done)
 }

 CoasterPagerView::CoasterPagerView(NavigationView& nav) {
-    const uint8_t data_init[8] = {0x44, 0x01, 0x3B, 0x30, 0x30, 0x30, 0x34, 0xBC};
-    uint32_t c;
-
    baseband::run_image(portapack::spi_flash::image_tag_fsktx);

    add_children({&labels,
@@ -115,9 +101,7 @@ CoasterPagerView::CoasterPagerView(NavigationView& nav) {
                  &text_message,
                  &tx_view});

-    // Bytes to nibbles
-    for (c = 0; c < 16; c++)
-        sym_data.set_sym(c, (data_init[c >> 1] >> ((c & 1) ? 0 : 4)) & 0x0F);
+    sym_data.set_value(0x44013B30303034BC);

    checkbox_scan.set_value(false);

@@ -68,17 +68,19 @@ class CoasterPagerView : public View {

    SymField sym_data{
        {7 * 8, 8 * 8},
-        16,  // 14 ? 12 ?
-        SymField::SYMFIELD_HEX};
+        16,
+        SymField::Type::Hex};

    Checkbox checkbox_scan{
        {10 * 8, 14 * 8},
        4,
        "Scan"};

-    /*ProgressBar progressbar {
-                { 5 * 8, 12 * 16, 20 * 8, 16 },
-        };*/
+    /*
+    ProgressBar progressbar {
+        { 5 * 8, 12 * 16, 20 * 8, 16 }};
+    */
+
    Text text_message{
        {5 * 8, 13 * 16, 20 * 8, 16},
        ""};
@@ -398,17 +398,17 @@ DebugMenuView::DebugMenuView(NavigationView& nav) {
        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
+        {"Buttons Test", ui::Color::dark_cyan(), &bitmap_icon_controls, [&nav]() { nav.push<DebugControlsView>(); }},
+        {"Debug Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { portapack::persistent_memory::debug_dump(); }},
+        //{"Fonts Viewer", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugFontsView>(); }},  // temporarily disabled to conserve ROM space
+        {"M0 Stack Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { stack_dump(); }},
        {"Memory", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugMemoryView>(); }},
+        {"P.Memory", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugPmemView>(); }},
+        {"Peripherals", ui::Color::dark_cyan(), &bitmap_icon_peripherals, [&nav]() { nav.push<DebugPeripheralsMenuView>(); }},
        //{ "Radio State",	ui::Color::white(),	nullptr,	[&nav](){ nav.push<NotImplementedView>(); } },
        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [&nav]() { nav.push<SDCardDebugView>(); }},
-        {"Peripherals", ui::Color::dark_cyan(), &bitmap_icon_peripherals, [&nav]() { nav.push<DebugPeripheralsMenuView>(); }},
        {"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>(); }},
        {"Touch Test", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugScreenTest>(); }},
-        {"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(); }},
-        {"M0 Stack Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { stack_dump(); }},
-        //{"Fonts Viewer", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugFontsView>(); }},  // temporarily disabled to conserve ROM space
    });
    set_max_rows(2);  // allow wider buttons
 }
@@ -49,7 +49,6 @@ EncodersConfigView::EncodersConfigView(
                  &field_clk_step,
                  &field_frameduration,
                  &field_frameduration_step,
-                  &symfield_word,
                  &text_format,
                  &waveform});

@@ -64,10 +63,6 @@ EncodersConfigView::EncodersConfigView(
    options_enctype.set_options(enc_options);
    options_enctype.set_selected_index(0);

-    symfield_word.on_change = [this]() {
-        generate_frame();
-    };
-
    // Selecting input clock changes symbol and word duration
    field_clk.on_change = [this](int32_t value) {
        // value is in kHz, new_value is in us
@@ -98,33 +93,46 @@ void EncodersConfigView::focus() {
 }

 void EncodersConfigView::on_type_change(size_t index) {
-    std::string format_string = "";
-    size_t word_length;
-    char symbol_type;
+    // Remove existing SymField controls.
+    for (auto& symfield : symfields_word)
+        remove_child(symfield.get());
+    symfields_word.clear();

    encoder_def = &encoder_defs[index];
-
    field_clk.set_value(encoder_def->default_speed / 1000);
    field_repeat_min.set_value(encoder_def->repeat_min);

-    // SymField setup
-    word_length = encoder_def->word_length;
-    symfield_word.set_length(word_length);
-    size_t n = 0, i = 0;
-    while (n < word_length) {
-        symbol_type = encoder_def->word_format[i++];
-        if (symbol_type == 'A') {
-            symfield_word.set_symbol_list(n++, encoder_def->address_symbols);
-            format_string += 'A';
-        } else if (symbol_type == 'D') {
-            symfield_word.set_symbol_list(n++, encoder_def->data_symbols);
-            format_string += 'D';
+    // Add new SymFields.
+    Point pos{2 * 8, 9 * 8};
+    std::string format_string;
+    uint8_t word_length = encoder_def->word_length;
+    auto on_change_handler = [this](SymField&) {
+        generate_frame();
+    };
+
+    for (uint8_t i = 0; i < word_length; i++) {
+        auto symbol_type = encoder_def->word_format[i];
+        symfields_word.push_back(std::make_unique<SymField>(pos, 1));
+        auto& symfield = symfields_word.back();
+        symfield->on_change = on_change_handler;
+
+        switch (symbol_type) {
+            case 'A':
+                symfield->set_symbol_list(encoder_def->address_symbols);
+                format_string += 'A';
+                break;
+            case 'D':
+                symfield->set_symbol_list(encoder_def->data_symbols);
+                format_string += 'D';
+                break;
        }
+
+        add_child(symfield.get());
+        pos += Point{8, 0};
    }

    // Ugly :( Pad to erase
    format_string.append(24 - format_string.size(), ' ');
-
    text_format.set(format_string);

    generate_frame();
@@ -146,17 +154,18 @@ void EncodersConfigView::draw_waveform() {
 }

 void EncodersConfigView::generate_frame() {
-    size_t i = 0;
-
    frame_fragments.clear();

+    size_t i = 0;
    for (auto c : encoder_def->word_format) {
        if (c == 'S')
            frame_fragments += encoder_def->sync;
-        else if (!c)
+        else if (c == '\0')
            break;
-        else
-            frame_fragments += encoder_def->bit_format[symfield_word.get_sym(i++)];
+        else {
+            auto offset = symfields_word[i++]->get_offset(0);
+            frame_fragments += encoder_def->bit_format[offset];
+        }
    }

    draw_waveform();
@@ -29,6 +29,9 @@
 #include "app_settings.hpp"
 #include "radio_state.hpp"

+#include <memory>
+#include <vector>
+
 using namespace encoders;

 namespace ui {
@@ -113,10 +116,7 @@ class EncodersConfigView : public View {
         {"100", 100},
         {"1000", 1000}}};

-    SymField symfield_word{
-        {2 * 8, 9 * 8},
-        20,
-        SymField::SYMFIELD_DEF};
+    std::vector<std::unique_ptr<SymField>> symfields_word{};

    Text text_format{
        {2 * 8, 11 * 8, 24 * 8, 16},
@@ -27,6 +27,7 @@
 #include <algorithm>
 #include "ui_fileman.hpp"
 #include "ui_playlist.hpp"
+#include "ui_remote.hpp"
 #include "ui_ss_viewer.hpp"
 #include "ui_text_editor.hpp"
 #include "string_format.hpp"
@@ -44,6 +45,7 @@ static const fs::path c16_ext{u".C16"};
 static const fs::path cxx_ext{u".C*"};
 static const fs::path png_ext{u".PNG"};
 static const fs::path bmp_ext{u".BMP"};
+static const fs::path rem_ext{u".REM"};
 }  // namespace ui

 namespace {
@@ -106,14 +108,17 @@ bool partner_file_prompt(
    if (partner.empty())
        return false;

-    nav.push_under_current<ModalMessageView>(
-        "Partner File",
-        partner.filename().string() + "\n" + action_name + " this file too?",
-        YESNO,
-        [&nav, partner, on_partner_action](bool choice) {
-            if (on_partner_action)
-                on_partner_action(partner, choice);
-        });
+    // Display the continuation UI once the current has been popped.
+    nav.set_on_pop([&nav, partner, action_name, on_partner_action] {
+        nav.display_modal(
+            "Partner File",
+            partner.filename().string() + "\n" + action_name + " this file too?",
+            YESNO,
+            [&nav, partner, on_partner_action](bool choice) {
+                if (on_partner_action)
+                    on_partner_action(partner, choice);
+            });
+    });

    return true;
 }
@@ -187,8 +192,8 @@ FileManBaseView::FileManBaseView(
                  &text_current,
                  &button_exit});

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

    if (!sdcIsCardInserted(&SDCD1)) {
@@ -323,9 +328,9 @@ FileLoadView::FileLoadView(
        if (get_selected_entry().is_directory) {
            push_dir(get_selected_entry().path);
        } else {
-            nav_.pop();
            if (on_changed)
                on_changed(get_selected_full_path());
+            nav_.pop();
        }
    };
 }
@@ -525,6 +530,9 @@ bool FileManagerView::handle_file_open() {
        nav_.push<SplashViewer>(path);
        reload_current();
        return true;
+    } else if (path_iequal(rem_ext, ext)) {
+        nav_.push<RemoteView>(path);
+        return true;
    }

    return false;
@@ -629,7 +637,7 @@ FileManagerView::FileManagerView(
    button_open_notepad.on_select = [this]() {
        if (selected_is_valid() && !get_selected_entry().is_directory) {
            auto path = get_selected_full_path();
-            nav_.replace<TextEditorView>(path);
+            nav_.push<TextEditorView>(path);
        } else
            nav_.display_modal("Open in Notepad", "Can't open that in Notepad.");
    };
@@ -77,7 +77,8 @@ class FileManBaseView : public View {
        {u".C8", &bitmap_icon_file_iq, ui::Color::dark_cyan()},
        {u".C16", &bitmap_icon_file_iq, ui::Color::dark_cyan()},
        {u".WAV", &bitmap_icon_file_wav, ui::Color::dark_magenta()},
-        {u".PPL", &bitmap_icon_file_iq, ui::Color::white()},  // PPL is the file extension for playlist app
+        {u".PPL", &bitmap_icon_file_iq, ui::Color::white()},  // Playlist/Replay
+        {u".REM", &bitmap_icon_remote, ui::Color::orange()},  // Remote
        {u"", &bitmap_icon_file, ui::Color::light_grey()}     // NB: Must be last.
    };

@@ -269,7 +270,8 @@ class FileManagerView : public FileManBaseView {
        {4 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_options_datetime,
-        Color::orange()};
+        Color::orange(),
+        /*vcenter*/ true};
 };

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

 #include "ui_freqman.hpp"

+#include "binder.hpp"
 #include "event_m0.hpp"
 #include "portapack.hpp"
 #include "rtc_time.hpp"
@@ -92,9 +93,9 @@ void FreqManBaseView::focus() {

    // TODO: Shouldn't be on focus.
    if (error_ == ERROR_ACCESS) {
-        nav_.display_modal("Error", "File access error", ABORT, nullptr);
+        nav_.display_modal("Error", "File access error", ABORT);
    } else if (error_ == ERROR_NOFILES) {
-        nav_.display_modal("Error", "No database files\nin /FREQMAN", ABORT, nullptr);
+        nav_.display_modal("Error", "No database files\nin /FREQMAN", ABORT);
    } else {
        options_category.focus();
    }
@@ -152,28 +153,14 @@ FrequencySaveView::FrequencySaveView(
    add_children(
        {&labels,
         &big_display,
-         &button_clear,
-         &button_edit,
         &button_save,
-         &text_description});
+         &field_description});

    entry_.type = freqman_type::Single;
    entry_.frequency_a = value;
    entry_.description = to_string_timestamp(rtc_time::now());
-    refresh_ui();

-    button_clear.on_select = [this, &nav](Button&) {
-        entry_.description = "";
-        refresh_ui();
-    };
-
-    button_edit.on_select = [this, &nav](Button&) {
-        temp_buffer_ = entry_.description;
-        text_prompt(nav_, temp_buffer_, desc_edit_max, [this](std::string& new_desc) {
-            entry_.description = new_desc;
-            refresh_ui();
-        });
-    };
+    bind(field_description, entry_.description, nav);

    button_save.on_select = [this, &nav](Button&) {
        db_.insert_entry(db_.entry_count(), entry_);
@@ -181,9 +168,13 @@ FrequencySaveView::FrequencySaveView(
    };
 }

+void FrequencySaveView::focus() {
+    refresh_ui();
+    FreqManBaseView::focus();
+}
+
 void FrequencySaveView::refresh_ui() {
    big_display.set(entry_.frequency_a);
-    text_description.set(entry_.description);
 }

 /* FrequencyLoadView *************************************/
@@ -376,69 +367,26 @@ FrequencyEditView::FrequencyEditView(
    field_step.options().insert(
        field_step.options().begin(), {"None", -1});

-    field_type.set_by_value((int32_t)entry_.type);
-    field_type.on_change = [this](size_t, auto value) {
-        entry_.type = static_cast<freqman_type>(value);
+    bind(field_type, entry_.type, [this](auto) {
        refresh_ui();
-    };
+    });

-    // TODO: this pattern should be able to be wrapped up.
-    field_freq_a.set_value(entry_.frequency_a);
-    field_freq_a.on_change = [this](rf::Frequency f) {
-        entry_.frequency_a = f;
+    bind(field_freq_a, entry_.frequency_a, nav, [this](auto) {
        refresh_ui();
-    };
-    field_freq_a.on_edit = [this]() {
-        auto freq_view = nav_.push<FrequencyKeypadView>(field_freq_a.value());
-        freq_view->on_changed = [this](rf::Frequency f) {
-            field_freq_a.set_value(f);
-        };
-    };
+    });

-    field_freq_b.set_value(entry_.frequency_b);
-    field_freq_b.on_change = [this](rf::Frequency f) {
-        entry_.frequency_b = f;
+    bind(field_freq_b, entry_.frequency_b, nav, [this](auto) {
        refresh_ui();
-    };
-    field_freq_b.on_edit = [this]() {
-        auto freq_view = nav_.push<FrequencyKeypadView>(field_freq_b.value());
-        freq_view->on_changed = [this](rf::Frequency f) {
-            field_freq_b.set_value(f);
-        };
-    };
+    });

-    field_modulation.set_by_value((int32_t)entry_.modulation);
-    field_modulation.on_change = [this](size_t, auto value) {
-        entry_.modulation = static_cast<freqman_index_t>(value);
+    bind(field_modulation, entry_.modulation, [this](auto) {
        populate_bandwidth_options();
-    };
+    });

-    field_bandwidth.set_by_value((int32_t)entry_.bandwidth);
-    field_bandwidth.on_change = [this](size_t, auto value) {
-        entry_.bandwidth = static_cast<freqman_index_t>(value);
-    };
-
-    field_step.set_by_value((int32_t)entry_.step);
-    field_step.on_change = [this](size_t, auto value) {
-        entry_.step = static_cast<freqman_index_t>(value);
-    };
-
-    field_tone.set_by_value((int32_t)entry_.tone);
-    field_tone.on_change = [this](size_t, auto value) {
-        entry_.tone = static_cast<freqman_index_t>(value);
-    };
-
-    field_description.set_text(entry_.description);
-    field_description.on_change = [this](TextField& tf) {
-        entry_.description = tf.get_text();
-    };
-    field_description.on_select = [this](TextField& tf) {
-        temp_buffer_ = tf.get_text();
-        text_prompt(nav_, temp_buffer_, FreqManBaseView::desc_edit_max,
-                    [this, &tf](std::string& new_desc) {
-                        tf.set_text(new_desc);
-                    });
-    };
+    bind(field_bandwidth, entry_.bandwidth);
+    bind(field_step, entry_.step);
+    bind(field_tone, entry_.tone);
+    bind(field_description, entry_.description, nav_);

    button_save.on_select = [this](Button&) {
        if (on_save)
@@ -87,9 +87,9 @@ class FrequencySaveView : public FreqManBaseView {
   public:
    FrequencySaveView(NavigationView& nav, const rf::Frequency value);
    std::string title() const override { return "Save freq"; }
+    void focus() override;

   private:
-    std::string temp_buffer_{};
    freqman_entry entry_{};

    void refresh_ui();
@@ -101,15 +101,9 @@ class FrequencySaveView : public FreqManBaseView {
    Labels labels{
        {{0 * 8, 6 * 16}, "Description:", Color::white()}};

-    Text text_description{{0 * 8, 7 * 16, 30 * 8, 1 * 16}};
-
-    Button button_clear{
-        {4 * 8, 10 * 16, 10 * 8, 2 * 16},
-        "Clear"};
-
-    Button button_edit{
-        {16 * 8, 10 * 16, 10 * 8, 2 * 16},
-        "Edit"};
+    TextField field_description{
+        {0 * 8, 7 * 16, 30 * 8, 1 * 16},
+        ""};

    Button button_save{
        {0 * 8, 17 * 16, 15 * 8, 2 * 16},
@@ -0,0 +1,194 @@
+/*
+ * 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 "ui_iq_trim.hpp"
+
+#include "complex.hpp"
+#include "portapack.hpp"
+#include "ui_fileman.hpp"
+
+using namespace portapack;
+namespace fs = std::filesystem;
+
+namespace ui {
+
+IQTrimView::IQTrimView(NavigationView& nav)
+    : nav_{nav} {
+    add_children({
+        &labels,
+        &field_path,
+        &field_start,
+        &field_end,
+        &text_samples,
+        &text_max,
+        &field_cutoff,
+        &button_trim,
+    });
+
+    field_path.on_select = [this](TextField&) {
+        auto open_view = nav_.push<FileLoadView>(".C*");
+        open_view->push_dir(u"CAPTURES");
+        open_view->on_changed = [this](fs::path path) {
+            path_ = std::move(path);
+            profile_capture();
+            compute_range();
+            refresh_ui();
+        };
+    };
+
+    text_samples.set_style(&Styles::light_grey);
+    text_max.set_style(&Styles::light_grey);
+
+    field_start.on_change = [this](int32_t v) {
+        if (field_end.value() < v)
+            field_end.set_value(v, false);
+        set_dirty();
+    };
+
+    field_end.on_change = [this](int32_t v) {
+        if (field_start.value() > v)
+            field_start.set_value(v, false);
+        set_dirty();
+    };
+
+    field_cutoff.set_value(7);  // 7% of max is a good default.
+    field_cutoff.on_change = [this](int32_t) {
+        compute_range();
+        refresh_ui();
+    };
+
+    button_trim.on_select = [this](Button&) {
+        if (trim_capture()) {
+            profile_capture();
+            compute_range();
+            refresh_ui();
+        }
+    };
+}
+
+void IQTrimView::paint(Painter& painter) {
+    if (info_) {
+        uint32_t power_cutoff = field_cutoff.value() * static_cast<uint64_t>(info_->max_power) / 100;
+
+        // Draw power buckets.
+        for (size_t i = 0; i < power_buckets_.size(); ++i) {
+            auto power = power_buckets_[i].power;
+            uint8_t amp = 0;
+
+            if (power > power_cutoff && info_->max_power > 0)
+                amp = (255ULL * power) / info_->max_power;
+
+            painter.draw_vline(
+                pos_lines + Point{(int)i, 0},
+                height_lines,
+                Color(amp, amp, amp));
+        }
+
+        // Draw trim range edges.
+        int start_x = screen_width * field_start.value() / info_->sample_count;
+        int end_x = screen_width * field_end.value() / info_->sample_count;
+
+        painter.draw_vline(
+            pos_lines + Point{start_x, 0},
+            height_lines,
+            Color::dark_green());
+        painter.draw_vline(
+            pos_lines + Point{end_x, 0},
+            height_lines,
+            Color::dark_red());
+    }
+}
+
+void IQTrimView::focus() {
+    field_path.focus();
+}
+
+void IQTrimView::refresh_ui() {
+    field_path.set_text(path_.filename().string());
+    text_samples.set(to_string_dec_uint(info_->sample_count));
+    text_max.set(to_string_dec_uint(info_->max_power));
+    set_dirty();
+}
+
+void IQTrimView::update_range_controls(iq::TrimRange trim_range) {
+    auto max_range = info_ ? info_->sample_count : 0;
+    auto step = info_ ? info_->sample_count / screen_width : 0;
+
+    field_start.set_range(0, max_range);
+    field_start.set_step(step);
+    field_end.set_range(0, max_range);
+    field_end.set_step(step);
+
+    field_start.set_value(trim_range.start_sample, false);
+    field_end.set_value(trim_range.end_sample, false);
+}
+
+void IQTrimView::profile_capture() {
+    power_buckets_ = {};
+    iq::PowerBuckets buckets{
+        .p = power_buckets_.data(),
+        .size = power_buckets_.size()};
+
+    progress_ui.show_reading();
+    info_ = iq::profile_capture(path_, buckets);
+    progress_ui.clear();
+}
+
+void IQTrimView::compute_range() {
+    if (!info_)
+        return;
+
+    iq::PowerBuckets buckets{
+        .p = power_buckets_.data(),
+        .size = power_buckets_.size()};
+    auto trim_range = iq::compute_trim_range(*info_, buckets, field_cutoff.value());
+
+    update_range_controls(trim_range);
+}
+
+bool IQTrimView::trim_capture() {
+    if (!info_) {
+        nav_.display_modal("Error", "Open a file first.");
+        return false;
+    }
+
+    bool trimmed = false;
+    iq::TrimRange trim_range{
+        static_cast<uint32_t>(field_start.value()),
+        static_cast<uint32_t>(field_end.value()),
+        info_->sample_size};
+
+    if (trim_range.start_sample >= trim_range.end_sample) {
+        nav_.display_modal("Error", "Invalid trimming range.");
+        return false;
+    }
+
+    progress_ui.show_trimming();
+    trimmed = iq::trim_capture_with_range(path_, trim_range, progress_ui.get_callback());
+    progress_ui.clear();
+
+    if (!trimmed)
+        nav_.display_modal("Error", "Trimming failed.");
+
+    return trimmed;
+}
+
+}  // namespace ui
@@ -0,0 +1,152 @@
+/*
+ * 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_IQ_TRIM_H__
+#define __UI_IQ_TRIM_H__
+
+#include "file.hpp"
+#include "iq_trim.hpp"
+#include "optional.hpp"
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_styles.hpp"
+#include "ui_widget.hpp"
+
+#include <array>
+
+namespace ui {
+
+/* Helper for drawing progress related to IQ trimming. */
+/* TODO: Ideally this would all be done on second thread. */
+class TrimProgressUI {
+   public:
+    void show_reading() {
+        clear();
+        p.draw_string({6 * 8, 5 * 16}, Styles::yellow, "Reading Capture...");
+    }
+
+    void show_trimming() {
+        clear();
+        p.draw_string({5 * 8, 5 * 16}, Styles::yellow, "Trimming Capture...");
+    }
+
+    void show_progress(uint8_t percent) {
+        auto width = percent * screen_width / 100;
+        p.draw_hline({0, 6 * 16 + 2}, width, Color::yellow());
+    }
+
+    void clear() {
+        p.fill_rectangle({0 * 8, 4 * 16, screen_width, 3 * 16}, Color::black());
+    }
+
+    auto get_callback() {
+        return [this](uint8_t percent) { show_progress(percent); };
+    }
+
+   private:
+    Painter p{};
+};
+
+class IQTrimView : public View {
+   public:
+    IQTrimView(NavigationView& nav);
+
+    std::string title() const override { return "IQ Trim"; }
+    void paint(Painter& painter) override;
+    void focus() override;
+
+   private:
+    /* Update controls with latest values. */
+    void refresh_ui();
+
+    /* Update the start/end controls with trim range info. */
+    void update_range_controls(iq::TrimRange trim_range);
+
+    /* Collect capture info and samples to draw the UI. */
+    void profile_capture();
+
+    /* Determine the start and end buckets based on the cutoff. */
+    void compute_range();
+
+    /* Trims the capture file based on the settings. */
+    bool trim_capture();
+
+    NavigationView& nav_;
+
+    std::filesystem::path path_{};
+    Optional<iq::CaptureInfo> info_{};
+    std::array<iq::PowerBuckets::Bucket, screen_width> power_buckets_{};
+    TrimProgressUI progress_ui{};
+
+    Labels labels{
+        {{0 * 8, 0 * 16}, "Capture File:", Color::light_grey()},
+        {{0 * 8, 6 * 16}, "Start  :", Color::light_grey()},
+        {{0 * 8, 7 * 16}, "End    :", Color::light_grey()},
+        {{0 * 8, 8 * 16}, "Samples:", Color::light_grey()},
+        {{0 * 8, 9 * 16}, "Max Pwr:", Color::light_grey()},
+        {{0 * 8, 10 * 16}, "Cutoff :", Color::light_grey()},
+        {{12 * 8, 10 * 16}, "%", Color::light_grey()},
+    };
+
+    TextField field_path{
+        {0 * 8, 1 * 16, 30 * 8, 1 * 16},
+        "Open File..."};
+
+    Point pos_lines{0 * 8, 4 * 16};
+    Dim height_lines{2 * 16};
+
+    NumberField field_start{
+        {9 * 8, 6 * 16},
+        10,
+        {0, 0},
+        1,
+        ' '};
+
+    NumberField field_end{
+        {9 * 8, 7 * 16},
+        10,
+        {0, 0},
+        1,
+        ' '};
+
+    Text text_samples{
+        {9 * 8, 8 * 16, 10 * 8, 1 * 16},
+        "0"};
+
+    Text text_max{
+        {9 * 8, 9 * 16, 10 * 8, 1 * 16},
+        "0"};
+
+    NumberField field_cutoff{
+        {9 * 8, 10 * 16},
+        3,
+        {1, 100},
+        1,
+        ' '};
+
+    Button button_trim{
+        {20 * 8, 16 * 16, 8 * 8, 2 * 16},
+        "Trim"};
+};
+
+} /* namespace ui */
+
+#endif /*__UI_IQ_TRIM_H__*/
@@ -97,12 +97,12 @@ size_t KeyfobView::generate_frame() {
    uint64_t payload;

    // Symfield word to frame
-    payload = field_payload_a.value_hex_u64();
+    payload = field_payload_a.to_integer();
    for (size_t i = 0; i < 5; i++) {
        frame[4 - i] = payload & 0xFF;
        payload >>= 8;
    }
-    payload = field_payload_b.value_hex_u64();
+    payload = field_payload_b.to_integer();
    for (size_t i = 0; i < 5; i++) {
        frame[9 - i] = payload & 0xFF;
        payload >>= 8;
@@ -136,9 +136,6 @@ void KeyfobView::focus() {
 }

 KeyfobView::~KeyfobView() {
-    // save app settings
-    settings.save("tx_keyfob", &app_settings);
-
    transmitter_model.disable();
    baseband::shutdown();
 }
@@ -167,12 +164,12 @@ void KeyfobView::on_make_change(size_t index) {
 // DEBUG
 void KeyfobView::update_symfields() {
    for (size_t i = 0; i < 5; i++) {
-        field_payload_a.set_sym(i << 1, frame[i] >> 4);
-        field_payload_a.set_sym((i << 1) + 1, frame[i] & 0x0F);
+        field_payload_a.set_offset(i << 1, frame[i] >> 4);
+        field_payload_a.set_offset((i << 1) + 1, frame[i] & 0x0F);
    }
    for (size_t i = 0; i < 5; i++) {
-        field_payload_b.set_sym(i << 1, frame[5 + i] >> 4);
-        field_payload_b.set_sym((i << 1) + 1, frame[5 + i] & 0x0F);
+        field_payload_b.set_offset(i << 1, frame[5 + i] >> 4);
+        field_payload_b.set_offset((i << 1) + 1, frame[5 + i] & 0x0F);
    }
 }

@@ -212,13 +209,6 @@ KeyfobView::KeyfobView(
                  &progressbar,
                  &tx_view});

-    // load app settings
-    auto rc = settings.load("tx_keyfob", &app_settings);
-    if (rc == SETTINGS_OK) {
-        transmitter_model.set_rf_amp(app_settings.tx_amp);
-        transmitter_model.set_tx_gain(app_settings.tx_gain);
-    }
-
    frame[0] = 0x55;
    update_symfields();

@@ -48,7 +48,7 @@ class KeyfobView : public View {
        OOK_SAMPLERATE /* sampling rate */
    };
    app_settings::SettingsManager settings_{
-        "tx_keyfob", , app_settings::Mode::TX};
+        "tx_keyfob", app_settings::Mode::TX};

    // 1013210ns / bit
    static constexpr uint32_t subaru_samples_per_bit = (OOK_SAMPLERATE * 0.00101321);
@@ -98,11 +98,11 @@ class KeyfobView : public View {
    SymField field_payload_a{
        {2 * 8, 5 * 16},
        10,
-        SymField::SYMFIELD_HEX};
+        SymField::Type::Hex};
    SymField field_payload_b{
        {13 * 8, 5 * 16},
        10,
-        SymField::SYMFIELD_HEX};
+        SymField::Type::Hex};

    Text text_status{
        {2 * 8, 13 * 16, 128, 16},
@@ -633,7 +633,7 @@ MicTXView::MicTXView(

 MicTXView::~MicTXView() {
    audio::input::stop();
-    transmitter_model.set_target_frequency(tx_frequency);  // Save Tx frequency instead of Rx. Or maybe we need some "System Wide" changes to seperate Tx and Rx frequency.
+    transmitter_model.set_target_frequency(tx_frequency);
    transmitter_model.disable();
    if (rx_enabled)  // Also turn off audio rx if enabled
        rxaudio(false);
@@ -25,9 +25,6 @@
 #ifndef __UI_MICTX_H__
 #define __UI_MICTX_H__

-#define SHORT_UI true
-#define NORMAL_UI false
-
 #include "app_settings.hpp"
 #include "radio_state.hpp"
 #include "ui.hpp"
@@ -219,10 +216,8 @@ class MicTXView : public View {
        ' '};

    TransmitterView2 tx_view{
-        // new handling of NumberField field_rfgain, NumberField field_rfamp
-        //	3*8, 2*8, SHORT_UI					// x(columns), y (line) position. (used in Replay / GPS Simul / Playlist App's)
-        3 * 8, 2 * 8, NORMAL_UI  // x(columns), y (line) position. (used in Mic App)
-    };
+        {3 * 8, 5 * 8},
+        /*short_ui*/ false};

    OptionsField options_mode{
        {24 * 8, 5 * 8},
@@ -23,7 +23,6 @@
 #include "ui_modemsetup.hpp"

 #include "portapack.hpp"
-
 #include "portapack_persistent_memory.hpp"

 using namespace portapack;
@@ -41,15 +40,20 @@ ModemSetupView::ModemSetupView(
    using options_t = std::vector<option_t>;
    options_t modem_options;

-    add_children({&labels,
-                  &field_baudrate,
-                  &field_mark,
-                  &field_space,
-                  &field_repeat,
-                  &options_modem,
-                  &button_set_modem,
-                  &sym_format,
-                  &button_save});
+    add_children({
+        &labels,
+        &field_baudrate,
+        &field_mark,
+        &field_space,
+        &field_repeat,
+        &options_modem,
+        &button_set_modem,
+        &sym_format_data,
+        &sym_format_parity,
+        &sym_format_stop,
+        &sym_format_msb,
+        &button_save,
+    });

    // Only list AFSK modems for now
    for (size_t i = 0; i < MODEM_DEF_COUNT; i++) {
@@ -59,15 +63,10 @@ ModemSetupView::ModemSetupView(
    options_modem.set_options(modem_options);
    options_modem.set_selected_index(0);

-    sym_format.set_symbol_list(0, "6789");  // Data bits
-    sym_format.set_symbol_list(1, "NEo");   // Parity
-    sym_format.set_symbol_list(2, "012");   // Stop bits
-    sym_format.set_symbol_list(3, "ML");    // MSB/LSB first
-
-    sym_format.set_sym(0, persistent_memory::serial_format().data_bits - 6);
-    sym_format.set_sym(1, persistent_memory::serial_format().parity);
-    sym_format.set_sym(2, persistent_memory::serial_format().stop_bits);
-    sym_format.set_sym(3, persistent_memory::serial_format().bit_order);
+    sym_format_data.set_offset(0, persistent_memory::serial_format().data_bits - 6);
+    sym_format_parity.set_offset(0, persistent_memory::serial_format().parity);
+    sym_format_stop.set_offset(0, persistent_memory::serial_format().stop_bits);
+    sym_format_msb.set_offset(0, persistent_memory::serial_format().bit_order);

    field_mark.set_value(persistent_memory::afsk_mark_freq());
    field_space.set_value(persistent_memory::afsk_space_freq());
@@ -84,18 +83,17 @@ ModemSetupView::ModemSetupView(
    };

    button_save.on_select = [this, &nav](Button&) {
-        serial_format_t serial_format;
-
        persistent_memory::set_afsk_mark(field_mark.value());
        persistent_memory::set_afsk_space(field_space.value());

        persistent_memory::set_modem_baudrate(field_baudrate.value());
        persistent_memory::set_modem_repeat(field_repeat.value());

-        serial_format.data_bits = sym_format.get_sym(0) + 6;
-        serial_format.parity = (parity_enum)sym_format.get_sym(1);
-        serial_format.stop_bits = sym_format.get_sym(2);
-        serial_format.bit_order = (order_enum)sym_format.get_sym(3);
+        serial_format_t serial_format{};
+        serial_format.data_bits = sym_format_data.get_offset(0) + 6;
+        serial_format.parity = (parity_enum)sym_format_parity.get_offset(0);
+        serial_format.stop_bits = sym_format_stop.get_offset(0);
+        serial_format.bit_order = (order_enum)sym_format_msb.get_offset(0);

        persistent_memory::set_serial_format(serial_format);

@@ -79,10 +79,25 @@ class ModemSetupView : public View {
        7,
        {}};

-    SymField sym_format{
+    SymField sym_format_data{
        {16 * 8, 22 * 8},
-        4,
-        SymField::SYMFIELD_DEF};
+        1,
+        "6789"};
+
+    SymField sym_format_parity{
+        {17 * 8, 22 * 8},
+        1,
+        "NEo"};
+
+    SymField sym_format_stop{
+        {18 * 8, 22 * 8},
+        1,
+        "012"};
+
+    SymField sym_format_msb{
+        {19 * 8, 22 * 8},
+        1,
+        "ML"};

    Button button_set_modem{
        {23 * 8, 6 * 8 - 4, 6 * 8, 24},
@@ -21,6 +21,7 @@
 */

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

 #include "portapack.hpp"
@@ -38,7 +39,7 @@ namespace ui {

 void NumbersStationView::focus() {
    if (file_error)
-        nav_.display_modal("No voices", "No valid voices found in\nthe /numbers directory.", ABORT, nullptr);
+        nav_.display_modal("No voices", "No valid voices found in\nthe /numbers directory.", ABORT);
    else
        button_exit.focus();
 }
@@ -75,7 +76,7 @@ void NumbersStationView::prepare_audio() {
                return;
            }

-            code = symfield_code.get_sym(code_index);
+            code = symfield_code.get_offset(code_index);

            if (code >= 10) {
                memset(audio_buffer, 0, 1024);
@@ -144,7 +145,7 @@ void NumbersStationView::on_tick_second() {
    armed_blink = not armed_blink;

    if (armed_blink)
-        check_armed.set_style(&style_red);
+        check_armed.set_style(&Styles::red);
    else
        check_armed.set_style(&style());

@@ -152,14 +153,12 @@ void NumbersStationView::on_tick_second() {
 }

 void NumbersStationView::on_voice_changed(size_t index) {
-    std::string code_list = "";
+    std::string code_list;

    for (const auto& wavs : voices[index].available_wavs)
        code_list += wavs.code;

-    for (uint32_t c = 0; c < 25; c++)
-        symfield_code.set_symbol_list(c, code_list);
-
+    symfield_code.set_symbol_list(code_list);
    current_voice = &voices[index];
 }

@@ -265,17 +264,17 @@ NumbersStationView::NumbersStationView(
    };

    // DEBUG
-    symfield_code.set_sym(0, 10);
-    symfield_code.set_sym(1, 3);
-    symfield_code.set_sym(2, 4);
-    symfield_code.set_sym(3, 11);
-    symfield_code.set_sym(4, 6);
-    symfield_code.set_sym(5, 1);
-    symfield_code.set_sym(6, 9);
-    symfield_code.set_sym(7, 7);
-    symfield_code.set_sym(8, 8);
-    symfield_code.set_sym(9, 0);
-    symfield_code.set_sym(10, 12);  // End
+    symfield_code.set_offset(0, 10);
+    symfield_code.set_offset(1, 3);
+    symfield_code.set_offset(2, 4);
+    symfield_code.set_offset(3, 11);
+    symfield_code.set_offset(4, 6);
+    symfield_code.set_offset(5, 1);
+    symfield_code.set_offset(6, 9);
+    symfield_code.set_offset(7, 7);
+    symfield_code.set_offset(8, 8);
+    symfield_code.set_offset(9, 0);
+    symfield_code.set_offset(10, 12);  // End

    /*
        rtc::RTC datetime;
@@ -142,16 +142,19 @@ class NumbersStationView : public View {
    SymField symfield_code{
        {1 * 8, 10 * 8},
        25,
-        SymField::SYMFIELD_DEF};
+        SymField::Type::Custom};

    Checkbox check_armed{
        {2 * 8, 13 * 16},
        5,
        "Armed"};
-    /*Button button_tx_now {
-                { 18 * 8, 13 * 16, 10 * 8, 32 },
-                "TX now"
-        };*/
+
+    /*
+    Button button_tx_now {
+        { 18 * 8, 13 * 16, 10 * 8, 32 },
+        "TX now"};
+    */
+
    Button button_exit{
        {21 * 8, 16 * 16, 64, 32},
        "Exit"};
@@ -386,6 +386,7 @@ PlaylistView::PlaylistView(
        &waterfall,
    });

+    ensure_directory(u"PLAYLIST");
    waterfall.show_audio_spectrum_view(false);

    field_frequency.set_value(100'000'000);
@@ -21,9 +21,6 @@
 * Boston, MA 02110-1301, USA.
 */

-#define SHORT_UI true
-#define NORMAL_UI false
-
 #include "app_settings.hpp"
 #include "bitmap.hpp"
 #include "file.hpp"
@@ -63,7 +60,7 @@ class PlaylistView : public View {

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

    struct playlist_entry {
        std::filesystem::path path{};
@@ -118,14 +115,11 @@ class PlaylistView : public View {
    Text text_sample_rate{
        {10 * 8, 1 * 16, 7 * 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 + 1}};

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

@@ -135,7 +129,8 @@ class PlaylistView : public View {
    // TODO: delay duration field.

    TransmitterView2 tx_view{
-        9 * 8, 1 * 8, SHORT_UI};
+        {11 * 8, 2 * 16},
+        /*short_ui*/ true};

    Checkbox check_loop{
        {21 * 8, 2 * 16},
@@ -56,7 +56,7 @@ bool POCSAGTXView::start_tx() {
    pocsag::BitRate bitrate;
    std::vector<uint32_t> codewords;

-    address = field_address.value_dec_u32();
+    address = field_address.to_integer();
    if (address > 0x1FFFFFU) {
        nav_.display_modal("Bad address", "Address must be less\nthan 2097152.");
        return false;
@@ -137,12 +137,7 @@ POCSAGTXView::POCSAGTXView(
    options_bitrate.set_selected_index(1);  // 1200bps
    options_type.set_selected_index(0);     // Address only

-    // TODO: set_value for whole symfield
-    uint32_t reload_address = persistent_memory::pocsag_last_address();
-    for (uint32_t c = 0; c < 7; c++) {
-        field_address.set_sym(6 - c, reload_address % 10);
-        reload_address /= 10;
-    }
+    field_address.set_value(persistent_memory::pocsag_last_address());

    options_type.on_change = [this](size_t, int32_t i) {
        if (i == 2)
@@ -94,8 +94,7 @@ class POCSAGTXView : public View {

    SymField field_address{
        {11 * 8, 6 * 8},
-        7,
-        SymField::SYMFIELD_DEC};
+        7};

    OptionsField options_type{
        {11 * 8, 8 * 8},
@@ -164,7 +164,7 @@ RDSView::~RDSView() {
 }

 void RDSView::start_tx() {
-    rds_flags.PI_code = sym_pi_code.value_hex_u64();
+    rds_flags.PI_code = sym_pi_code.to_integer();
    rds_flags.PTY = options_pty.selected_index_value();
    rds_flags.DI = view_PSN.mono_stereo ? 1 : 0;
    rds_flags.TP = check_TP.value();
@@ -212,12 +212,9 @@ RDSView::RDSView(

    check_TP.set_value(true);

-    sym_pi_code.set_sym(0, 0xF);
-    sym_pi_code.set_sym(1, 0x3);
-    sym_pi_code.set_sym(2, 0xE);
-    sym_pi_code.set_sym(3, 0x0);
-    sym_pi_code.on_change = [this]() {
-        rds_flags.PI_code = sym_pi_code.value_hex_u64();
+    sym_pi_code.set_value(0xF3E0);
+    sym_pi_code.on_change = [this](SymField&) {
+        rds_flags.PI_code = sym_pi_code.to_integer();
    };

    options_pty.set_selected_index(0);  // None
@@ -287,7 +287,7 @@ class RDSView : public View {
    SymField sym_pi_code{
        {13 * 8, 28 + 16},
        4,
-        SymField::SYMFIELD_HEX};
+        SymField::Type::Hex};

    /*OptionsField options_coverage {
                { 17 * 8, 32 + 8 },
@@ -459,8 +459,7 @@ ReconView::ReconView(NavigationView& nav)
    rssi.set_focusable(true);
    rssi.set_peak(true, 500);
    rssi.on_select = [this](RSSI&) {
-        nav_.pop();
-        nav_.push<LevelView>();
+        nav_.replace<LevelView>();
    };

    // TODO: *BUG* Both transmitter_model and receiver_model share the same pmem setting for target_frequency.
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2018 Furrtek
+ * Copyright (C) 2023 Kyle Reed
 *
 * This file is part of PortaPack.
 *
@@ -22,30 +21,591 @@

 #include "ui_remote.hpp"

-#include "baseband_api.hpp"
+#include "binder.hpp"
+#include "convert.hpp"
+#include "file_reader.hpp"
+#include "io_convert.hpp"
+#include "irq_controls.hpp"
+#include "oversample.hpp"
 #include "string_format.hpp"
+#include "ui_fileman.hpp"
+#include "ui_receiver.hpp"
+#include "ui_textentry.hpp"
+#include "utility.hpp"

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

 namespace ui {

-void RemoteView::focus() {
-    button.focus();
+static constexpr uint8_t text_edit_max = 30;
+
+/* RemoteEntryModel **************************************/
+
+std::string RemoteEntryModel::to_string() const {
+    return join(',', {path.string(),
+                      name,
+                      to_string_dec_uint(icon),
+                      to_string_dec_uint(bg_color),
+                      to_string_dec_uint(fg_color),
+                      to_string_dec_uint(metadata.center_frequency),
+                      to_string_dec_uint(metadata.sample_rate)});
 }

-RemoteView::~RemoteView() {
-    // transmitter_model.disable();
-    // baseband::shutdown();
+Optional<RemoteEntryModel> RemoteEntryModel::parse(std::string_view line) {
+    auto cols = split_string(line, ',');
+
+    if (cols.size() < 7)
+        return {};
+
+    RemoteEntryModel entry{};
+
+    entry.path = cols[0];
+    entry.name = std::string{cols[1]};
+    parse_int(cols[2], entry.icon);
+    parse_int(cols[3], entry.bg_color);
+    parse_int(cols[4], entry.fg_color);
+    parse_int(cols[5], entry.metadata.center_frequency);
+    parse_int(cols[6], entry.metadata.sample_rate);
+
+    return entry;
 }

-RemoteView::RemoteView(
-    NavigationView& nav) {
-    add_children({&labels,
-                  &button});
+/* RemoteModel *******************************************/

-    button.on_select = [this, &nav](Button&) {
-        nav.pop();
+bool RemoteModel::delete_entry(const RemoteEntryModel* entry) {
+    // NB: expecting 'entry' to be a pointer to an entry in vector.
+    auto it = std::find_if(
+        entries.begin(), entries.end(),
+        [entry](auto& item) { return entry == &item; });
+    if (it == entries.end())
+        return false;
+
+    entries.erase(it);
+    return true;
+}
+
+bool RemoteModel::load(const std::filesystem::path& path) {
+    File f;
+    auto error = f.open(path);
+    if (error)
+        return false;
+
+    entries.clear();
+
+    bool first = true;
+    auto reader = FileLineReader(f);
+    for (const auto& line : reader) {
+        if (line.length() == 0 || line[0] == '#')
+            continue;  // Empty or comment line.
+
+        // First line is the "name" field.
+        if (first) {
+            name = trim(line);
+            first = false;
+            continue;
+        }
+
+        // All the other lines are button entries.
+        auto entry = RemoteEntryModel::parse(line);
+        if (entry)
+            entries.push_back(*std::move(entry));
+    }
+
+    return true;
+}
+
+bool RemoteModel::save(const std::filesystem::path& path) {
+    File f;
+    auto error = f.create(path);
+    if (error)
+        return false;
+
+    f.write_line(name);
+    for (auto& entry : entries)
+        f.write_line(entry.to_string());
+
+    return true;
+}
+
+/* RemoteButton ******************************************/
+
+RemoteButton::RemoteButton(Rect parent_rect, RemoteEntryModel* entry)
+    : NewButton{parent_rect, {}, nullptr},
+      entry_{nullptr} {
+    set_entry(entry);
+    // Forward to on_select2 -- this isn't ideal, but works for now.
+    on_select = [this]() {
+        if (on_select2)
+            on_select2(*this);
    };
 }

+void RemoteButton::on_focus() {
+    // Enable long press on "Select".
+    SwitchesState config;
+    config[toUType(Switch::Sel)] = true;
+    set_switches_long_press_config(config);
+}
+
+void RemoteButton::on_blur() {
+    // Reset long press.
+    SwitchesState config{};
+    set_switches_long_press_config(config);
+}
+
+bool RemoteButton::on_key(KeyEvent key) {
+    if (key == KeyEvent::Select) {
+        if (key_is_long_pressed(key) && on_long_select) {
+            on_long_select(*this);
+            return true;
+        }
+
+        if (on_select2) {
+            on_select2(*this);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void RemoteButton::paint(Painter& painter) {
+    NewButton::paint(painter);
+
+    // Add a border on the highlighted button.
+    if (has_focus() || highlighted()) {
+        auto r = screen_rect();
+        painter.draw_rectangle(r, Color::white());
+
+        auto p = r.location() + Point{1, 1};
+        auto s = Size{r.size().width() - 2, r.size().height() - 2};
+        painter.draw_rectangle({p, s}, Color::light_grey());
+    }
+};
+
+RemoteEntryModel* RemoteButton::entry() {
+    return entry_;
+}
+
+void RemoteButton::set_entry(RemoteEntryModel* entry) {
+    entry_ = entry;
+    set_focusable(entry_ != nullptr);
+    hidden(entry_ == nullptr);
+
+    if (entry_) {
+        set_text(entry_->name);
+        set_bitmap(RemoteIcons::get(entry_->icon));
+    }
+
+    set_dirty();
+}
+
+Style RemoteButton::paint_style() {
+    if (!entry_)
+        return style();
+
+    MutableStyle s{style()};
+    s.foreground = RemoteColors::get(entry_->fg_color);
+    s.background = RemoteColors::get(entry_->bg_color);
+
+    if (has_focus() || highlighted())
+        s.invert();
+
+    // It's kind of a hack to set 'color_' here, but the base
+    // class' paint logic is kind of convoluted but isn't worth
+    // the extra bytes to copy and paste a paint override.
+    color_ = s.foreground;
+
+    return s;
+}
+
+/* RemoteEntryEditView ***********************************/
+
+RemoteEntryEditView::RemoteEntryEditView(
+    NavigationView& nav,
+    RemoteEntryModel& entry)
+    : entry_{entry} {
+    add_children({
+        &labels,
+        &field_name,
+        &field_path,
+        &field_freq,
+        &text_rate,
+        &field_icon_index,
+        &field_fg_color_index,
+        &field_bg_color_index,
+        &button_preview,
+        &button_delete,
+        &button_done,
+    });
+
+    bind(field_name, entry_.name, nav, [this](auto& v) {
+        button_preview.set_text(v);
+    });
+
+    field_path.on_select = [this, &nav](TextField&) {
+        auto open_view = nav.push<FileLoadView>(".C*");
+        open_view->push_dir(u"CAPTURES");
+        open_view->on_changed = [this](fs::path path) {
+            load_path(std::move(path));
+            refresh_ui();
+        };
+    };
+
+    bind(field_freq, entry_.metadata.center_frequency, nav);
+    bind(field_icon_index, entry_.icon, [this](auto v) {
+        button_preview.set_bitmap(RemoteIcons::get(v));
+    });
+    bind(field_fg_color_index, entry_.fg_color, [this](auto v) {
+        button_preview.set_color(RemoteColors::get(v));
+    });
+    bind(field_bg_color_index, entry_.bg_color, [this](auto) {
+        button_preview.set_dirty();
+    });
+
+    button_delete.on_select = [this, &nav]() {
+        nav.display_modal(
+            "Delete?", "    Delete this button?", YESNO,
+            [this, &nav](bool choice) {
+                if (choice) {
+                    if (on_delete)
+                        on_delete(entry_);
+
+                    // Exit the edit view upon delete.
+                    nav.set_on_pop([&nav]() { nav.pop(); });
+                }
+            });
+    };
+
+    button_done.on_select = [&nav](Button&) {
+        nav.pop();
+    };
+
+    refresh_ui();
+}
+
+void RemoteEntryEditView::focus() {
+    button_done.focus();
+}
+
+void RemoteEntryEditView::refresh_ui() {
+    field_path.set_text(entry_.path.filename().string());
+    field_freq.set_value(entry_.metadata.center_frequency);
+    text_rate.set(unit_auto_scale(entry_.metadata.sample_rate, 3, 0) + "Hz");
+}
+
+void RemoteEntryEditView::load_path(std::filesystem::path&& path) {
+    // Read metafile if it exists.
+    auto metadata_path = get_metadata_path(path);
+    auto metadata = read_metadata_file(metadata_path);
+    entry_.path = std::move(path);
+
+    // Use metadata if found, otherwise fallback to the TX frequency.
+    if (metadata)
+        entry_.metadata = *metadata;
+    else
+        entry_.metadata = {transmitter_model.target_frequency(), 500'000};
+}
+
+/* RemoteView ********************************************/
+
+RemoteView::RemoteView(
+    NavigationView& nav)
+    : nav_{nav} {
+    baseband::run_image(portapack::spi_flash::image_tag_replay);
+
+    add_children({
+        &field_title,
+        &tx_view,
+        &check_loop,
+        &field_filename,
+        &button_add,
+        &button_new,
+        &button_open,
+        &waterfall,
+    });
+
+    create_buttons();
+
+    field_title.on_select = [this, &nav](TextField&) {
+        temp_buffer_ = model_.name;
+        text_prompt(nav_, temp_buffer_, text_edit_max, [this](std::string& new_name) {
+            model_.name = new_name;
+            refresh_ui();
+            set_needs_save();
+        });
+    };
+
+    field_filename.on_select = [this, &nav](TextField&) {
+        temp_buffer_ = remote_path_.stem().string();
+        text_prompt(nav_, temp_buffer_, text_edit_max, [this](std::string& new_name) {
+            rename_remote(new_name);
+            refresh_ui();
+        });
+    };
+
+    button_add.on_select = [this]() { add_button(); };
+    button_new.on_select = [this]() { new_remote(); };
+    button_open.on_select = [this]() { open_remote(); };
+
+    // Fill in the area between the remote buttons and bottom UI with waterfall.
+    Dim waterfall_top = buttons_top_.y() + button_area_height;
+    Dim waterfall_bottom = button_add.parent_rect().top();
+    Dim waterfall_height = waterfall_bottom - waterfall_top;
+    waterfall.set_parent_rect({0, waterfall_top, screen_width, waterfall_height});
+
+    ensure_directory(u"REMOTES");
+
+    // Load the previously loaded remote if exists.
+    if (!load_remote(settings_.remote_path))
+        init_remote();
+
+    refresh_ui();
+}
+
+RemoteView::RemoteView(NavigationView& nav, fs::path path)
+    : RemoteView(nav) {
+    load_remote(std::move(path));
+    refresh_ui();
+}
+
+RemoteView::~RemoteView() {
+    stop();
+    baseband::shutdown();
+
+    save_remote(/*show_error*/ false);
+}
+
+void RemoteView::focus() {
+    if (model_.entries.empty())
+        button_add.focus();
+    else
+        buttons_[0]->focus();
+}
+
+void RemoteView::create_buttons() {
+    // Handler callbacks.
+    auto handle_send = [this](RemoteButton& btn) {
+        if (btn.entry()->path.empty())
+            // No path set? Go to edit mode instead.
+            edit_button(btn);
+        else if (is_sending() && &btn == current_btn_)
+            // Pressed the same button again? Stop.
+            stop();
+        else
+            // Start sending.
+            send_button(btn);
+    };
+
+    auto handle_edit = [this](RemoteButton& btn) {
+        edit_button(btn);
+    };
+
+    // Create and add RemoteButtons for the whole grid.
+    for (size_t i = 0; i < max_buttons; ++i) {
+        Coord x = i % button_cols;
+        Coord y = i / button_cols;
+        Point pos = Point{x * button_width, y * button_height} + buttons_top_;
+
+        auto btn = std::make_unique<RemoteButton>(
+            Rect{pos, {button_width, button_height}},
+            nullptr);
+        btn->on_select2 = handle_send;
+        btn->on_long_select = handle_edit;
+
+        add_child(btn.get());
+        buttons_.push_back(std::move(btn));
+    }
+}
+
+void RemoteView::reset_buttons() {
+    // Whever the model's entries instance is invalidated,
+    // all the pointers in the buttons will end up dangling.
+    // TODO: This is pretty lame. Could maybe static alloc?
+    for (auto& btn : buttons_)
+        btn->set_entry(nullptr);
+}
+
+void RemoteView::refresh_ui() {
+    field_title.set_text(model_.name);
+    field_filename.set_text(remote_path_.stem().string());
+
+    // Update buttons from the model.
+    for (size_t i = 0; i < buttons_.size(); ++i) {
+        if (i < model_.entries.size())
+            buttons_[i]->set_entry(&model_.entries[i]);
+        else
+            buttons_[i]->set_entry(nullptr);
+    }
+}
+
+void RemoteView::add_button() {
+    if (model_.entries.size() >= max_buttons)
+        return;
+
+    // Don't let replay thread read the model while editing.
+    stop();
+
+    model_.entries.push_back({{}, "<EMPTY>", 0, 3, 1});
+    reset_buttons();
+    refresh_ui();
+    set_needs_save();
+}
+
+void RemoteView::edit_button(RemoteButton& btn) {
+    // Don't let replay thread read the model while editing.
+    stop();
+
+    auto edit_view = nav_.push<RemoteEntryEditView>(*btn.entry());
+    nav_.set_on_pop([this]() {
+        refresh_ui();
+        set_needs_save();
+        focus();  // Need to refocus after refreshing the buttons.
+    });
+
+    edit_view->on_delete = [this](RemoteEntryModel& to_delete) {
+        model_.delete_entry(&to_delete);
+        reset_buttons();
+    };
+}
+
+void RemoteView::send_button(RemoteButton& btn) {
+    // TODO: If this is called while is_sending() == true,
+    // it just stops and doesn't start the new button?
+
+    // Reset everything to prepare to send a file.
+    stop();
+    current_btn_ = &btn;  // Stash for looping.
+
+    // Open the sample file to send.
+    auto reader = std::make_unique<FileConvertReader>();
+    auto error = reader->open(btn.entry()->path);
+    if (error) {
+        show_error("Can't open file:\n" + btn.entry()->path.stem().string());
+        return;
+    }
+
+    // Update the sample rate in proc_replay baseband.
+    baseband::set_sample_rate(
+        btn.entry()->metadata.sample_rate,
+        get_oversample_rate(btn.entry()->metadata.sample_rate));
+
+    // ReplayThread starts immediately on construction; must be set before creating.
+    transmitter_model.set_target_frequency(btn.entry()->metadata.center_frequency);
+    transmitter_model.set_sampling_rate(get_actual_sample_rate(btn.entry()->metadata.sample_rate));
+    transmitter_model.set_baseband_bandwidth(baseband_bandwidth);
+    transmitter_model.enable();
+
+    // ReplayThread reads the file and sends to the baseband.
+    replay_thread_ = std::make_unique<ReplayThread>(
+        std::move(reader),
+        /* read_size */ 0x4000,
+        /* buffer_count */ 3,
+        &ready_signal_,
+        [](uint32_t return_code) {
+            ReplayThreadDoneMessage message{return_code};
+            EventDispatcher::send_message(message);
+        });
+}
+
+void RemoteView::stop() {
+    // This terminates the underlying chThread.
+    replay_thread_.reset();
+    transmitter_model.disable();
+    ready_signal_ = false;
+}
+
+void RemoteView::new_remote() {
+    save_remote();
+    init_remote();
+    refresh_ui();
+
+    // View needs to redraw to hide old buttons.
+    set_dirty();
+}
+
+void RemoteView::open_remote() {
+    auto open_view = nav_.push<FileLoadView>(".REM");
+    open_view->push_dir(u"REMOTES");
+    open_view->on_changed = [this](fs::path path) {
+        save_remote();
+        load_remote(std::move(path));
+        refresh_ui();
+    };
+}
+
+void RemoteView::init_remote() {
+    model_ = {"<Unnamed Remote>", {}};
+    reset_buttons();
+    set_remote_path(next_filename_matching_pattern(u"/REMOTES/REMOTE_????.REM"));
+    set_needs_save(false);
+
+    if (remote_path_.empty())
+        show_error("Couldn't make new remote file.");
+}
+
+bool RemoteView::load_remote(fs::path&& path) {
+    set_remote_path(std::move(path));
+    set_needs_save(false);
+    reset_buttons();
+    return model_.load(remote_path_);
+}
+
+void RemoteView::save_remote(bool show_errors) {
+    if (!needs_save_)
+        return;
+
+    bool ok = model_.save(remote_path_);
+    if (!ok && show_errors)
+        show_error("Save failed for:\n" + remote_path_.stem().string());
+
+    set_needs_save(false);
+}
+
+void RemoteView::rename_remote(const std::string& new_name) {
+    auto folder = remote_path_.parent_path();
+    auto ext = remote_path_.extension();
+    auto new_path = folder / new_name + ext;
+
+    if (file_exists(new_path)) {
+        show_error("Remote " + new_name + " already exists");
+        return;
+    }
+
+    // Rename file if there is one.
+    if (fs::file_exists(remote_path_))
+        rename_file(remote_path_, new_path);
+
+    set_remote_path(std::move(new_path));
+}
+
+void RemoteView::handle_replay_thread_done(uint32_t return_code) {
+    if (return_code == ReplayThread::END_OF_FILE) {
+        if (check_loop.value() && current_btn_) {
+            send_button(*current_btn_);
+            return;
+        }
+    }
+
+    /*
+    // TODO: This can happen when stopping an in-progress Tx.
+    if (return_code == ReplayThread::READ_ERROR)
+        show_error("Bad capture file.");
+    */
+
+    stop();
+}
+
+void RemoteView::set_remote_path(fs::path&& path) {
+    // Unfortunately, have to keep these two in sync because
+    // settings doesn't know about fs::path.
+    remote_path_ = std::move(path);
+    settings_.remote_path = remote_path_.string();
+}
+
+void RemoteView::show_error(const std::string& msg) const {
+    nav_.display_modal("Error", msg);
+}
+
 } /* namespace ui */
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2018 Furrtek
+ * Copyright (C) 2023 Kyle Reed
 *
 * This file is part of PortaPack.
 *
@@ -21,42 +20,369 @@
 */

 #include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "ui_spectrum.hpp"
 #include "ui_transmitter.hpp"
-#include "transmitter_model.hpp"
+
+#include "app_settings.hpp"
+#include "baseband_api.hpp"
+#include "bitmap.hpp"
+#include "file.hpp"
+#include "metadata_file.hpp"
+#include "optional.hpp"
+#include "radio_state.hpp"
+#include "replay_thread.hpp"
+
+#include <algorithm>
+#include <functional>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <vector>

 namespace ui {

+/* Maps icon index to bitmap. */
+class RemoteIcons {
+   public:
+    static constexpr const Bitmap* get(uint8_t index) {
+        if (index >= std::size(bitmaps_))
+            return bitmaps_[0];
+
+        return bitmaps_[index];
+    }
+
+    static constexpr size_t size() {
+        return std::size(bitmaps_);
+    }
+
+   private:
+    // NB: Icons need to be 16x16 or they won't fit corrently.
+    static constexpr std::array<const Bitmap*, 25> bitmaps_{
+        nullptr,
+        &bitmap_icon_fox,
+        &bitmap_icon_adsb,
+        &bitmap_icon_ais,
+        &bitmap_icon_aprs,
+        &bitmap_icon_btle,
+        &bitmap_icon_burger,
+        &bitmap_icon_camera,
+        &bitmap_icon_cwgen,
+        &bitmap_icon_dmr,
+        &bitmap_icon_file_image,
+        &bitmap_icon_lge,
+        &bitmap_icon_looking,
+        &bitmap_icon_memory,
+        &bitmap_icon_morse,
+        &bitmap_icon_nrf,
+        &bitmap_icon_notepad,
+        &bitmap_icon_rds,
+        &bitmap_icon_remote,
+        &bitmap_icon_setup,
+        &bitmap_icon_sleep,
+        &bitmap_icon_sonde,
+        &bitmap_icon_stealth,
+        &bitmap_icon_tetra,
+        &bitmap_icon_temperature};
+};
+
+// TODO: Use RGB colors instead?
+/* Maps color index to color. */
+class RemoteColors {
+   public:
+    static constexpr Color get(uint8_t index) {
+        if (index >= std::size(colors_))
+            return colors_[0];
+
+        return colors_[index];
+    }
+
+    static constexpr size_t size() {
+        return std::size(colors_);
+    }
+
+   private:
+    static constexpr std::array<Color, 21> colors_{
+        Color::black(),         // 0
+        Color::white(),         // 1
+        Color::darker_grey(),   // 2
+        Color::dark_grey(),     // 3
+        Color::grey(),          // 4
+        Color::light_grey(),    // 5
+        Color::red(),           // 6
+        Color::orange(),        // 7
+        Color::yellow(),        // 8
+        Color::green(),         // 9
+        Color::blue(),          // 10
+        Color::cyan(),          // 11
+        Color::magenta(),       // 12
+        Color::dark_red(),      // 13
+        Color::dark_orange(),   // 14
+        Color::dark_yellow(),   // 15
+        Color::dark_green(),    // 16
+        Color::dark_blue(),     // 17
+        Color::dark_cyan(),     // 18
+        Color::dark_magenta(),  // 19
+        Color::purple()};       // 20
+};
+
+/* Data model for a remote entry. */
+struct RemoteEntryModel {
+    std::filesystem::path path{};
+    std::string name{};
+    uint8_t icon = 0;
+    uint8_t bg_color = 0;
+    uint8_t fg_color = 0;
+    capture_metadata metadata{};
+    // TODO: start/end position for trimming.
+
+    std::string to_string() const;
+    static Optional<RemoteEntryModel> parse(std::string_view line);
+};
+
+/* Data model for a remote. */
+struct RemoteModel {
+    std::string name{};
+    std::vector<RemoteEntryModel> entries{};
+
+    bool delete_entry(const RemoteEntryModel* entry);
+    bool load(const std::filesystem::path& path);
+    bool save(const std::filesystem::path& path);
+};
+
+/* Button for the remote UI. */
+class RemoteButton : public NewButton {
+   public:
+    std::function<void(RemoteButton&)> on_select2{};
+    std::function<void(RemoteButton&)> on_long_select{};
+
+    RemoteButton(Rect parent_rect, RemoteEntryModel* entry);
+    RemoteButton(const RemoteButton&) = delete;
+    RemoteButton& operator=(const RemoteButton&) = delete;
+
+    void on_focus() override;
+    void on_blur() override;
+    bool on_key(KeyEvent key) override;
+    void paint(Painter& painter) override;
+
+    RemoteEntryModel* entry();
+    void set_entry(RemoteEntryModel* entry);
+
+   protected:
+    Style paint_style() override;
+
+   private:
+    // Hide because it's not used.
+    using NewButton::on_select;
+    RemoteEntryModel* entry_;
+};
+
+/* Settings container for remote. */
+struct RemoteSettings {
+    std::string remote_path{};
+};
+
+/* View for editing a remote entry button. */
+class RemoteEntryEditView : public View {
+   public:
+    std::function<void(RemoteEntryModel&)> on_delete{};
+
+    RemoteEntryEditView(NavigationView& nav, RemoteEntryModel& entry);
+
+    std::string title() const override { return "Edit Button"; };
+    void focus() override;
+
+   private:
+    RemoteEntryModel& entry_;
+
+    void refresh_ui();
+    void load_path(std::filesystem::path&& path);
+
+    Labels labels{
+        {{2 * 8, 1 * 16}, "Name:", Color::light_grey()},
+        {{2 * 8, 2 * 16}, "Path:", Color::light_grey()},
+        {{2 * 8, 3 * 16}, "Freq:", Color::light_grey()},
+        {{17 * 8, 3 * 16}, "MHz", Color::light_grey()},
+        {{2 * 8, 4 * 16}, "Rate:", Color::light_grey()},
+        {{2 * 8, 5 * 16}, "Icon:", Color::light_grey()},
+        {{2 * 8, 6 * 16}, "FG Color:", Color::light_grey()},
+        {{2 * 8, 7 * 16}, "BG Color:", Color::light_grey()},
+        {{8 * 8, 9 * 16}, "Button preview", Color::light_grey()},
+    };
+
+    TextField field_name{{8 * 8, 1 * 16, 20 * 8, 1 * 16}, {}};
+
+    TextField field_path{{8 * 8, 2 * 16, 20 * 8, 1 * 16}, {}};
+
+    FrequencyField field_freq{{8 * 8, 3 * 16}};
+
+    Text text_rate{{8 * 8, 4 * 16, 20 * 8, 1 * 16}, {}};
+
+    NumberField field_icon_index{
+        {8 * 8, 5 * 16},
+        2,
+        {0, RemoteIcons::size() - 1},
+        /*step*/ 1,
+        /*fill*/ ' ',
+        /*loop*/ true};
+
+    NumberField field_fg_color_index{
+        {11 * 8, 6 * 16},
+        2,
+        {0, RemoteColors::size() - 1},
+        /*step*/ 1,
+        /*fill*/ ' ',
+        /*loop*/ true};
+
+    NumberField field_bg_color_index{
+        {11 * 8, 7 * 16},
+        2,
+        {0, RemoteColors::size() - 1},
+        /*step*/ 1,
+        /*fill*/ ' ',
+        /*loop*/ true};
+
+    RemoteButton button_preview{
+        {10 * 8, 11 * 16 - 8, 10 * 8, 50},
+        &entry_};
+
+    NewButton button_delete{
+        {2 * 8, 16 * 16, 4 * 8, 2 * 16},
+        {},
+        &bitmap_icon_trash,
+        Color::red()};
+
+    Button button_done{{11 * 8, 16 * 16, 8 * 8, 2 * 16}, "Done"};
+};
+
+/* App that allows for buttons to be bound to captures for playback. */
 class RemoteView : public View {
   public:
    RemoteView(NavigationView& nav);
+    RemoteView(NavigationView& nav, std::filesystem::path path);
    ~RemoteView();

+    RemoteView(const RemoteView&) = delete;
+    RemoteView& operator=(const RemoteView&) = delete;
+
+    std::string title() const override { return "Remote"; };
    void focus() override;

-    std::string title() const override { return "Custom remote"; };
-
   private:
-    /*enum tx_modes {
-                IDLE = 0,
-                SINGLE,
-                SCAN
-        };
+    /* Creates the dynamic buttons. */
+    void create_buttons();
+    /* Resets all the pointers to null entries. */
+    void reset_buttons();
+    void refresh_ui();

-        tx_modes tx_mode = IDLE;
+    void add_button();
+    void edit_button(RemoteButton& btn);
+    void send_button(RemoteButton& btn);
+    void stop();
+    void new_remote();
+    void open_remote();
+    void init_remote();
+    bool load_remote(std::filesystem::path&& path);
+    void save_remote(bool show_errors = true);
+    void rename_remote(const std::string& new_name);
+    void handle_replay_thread_done(uint32_t return_code);
+    void set_needs_save(bool v = true) { needs_save_ = v; }
+    void set_remote_path(std::filesystem::path&& path);
+    bool is_sending() const { return replay_thread_ != nullptr; }
+    void show_error(const std::string& msg) const;

-        struct remote_layout_t {
-                Point position;
-                std::string text;
-        };
+    static constexpr Dim button_rows = 4;
+    static constexpr Dim button_cols = 3;
+    static constexpr uint8_t max_buttons = button_rows * button_cols;
+    static constexpr Dim button_area_height = 200;
+    static constexpr Dim button_width = screen_width / button_cols;
+    static constexpr Dim button_height = button_area_height / button_rows;

-        const std::array<remote_layout_t, 32> remote_layout { };*/
+    // This value is mysterious... why?
+    static constexpr uint32_t baseband_bandwidth = 2'500'000;

-    Labels labels{
-        {{1 * 8, 0}, "Work in progress...", Color::light_grey()}};
+    NavigationView& nav_;
+    RxRadioState radio_state_{};

-    Button button{
-        {60, 64, 120, 32},
-        "Exit"};
+    // Settings
+    RemoteSettings settings_{};
+    app_settings::SettingsManager app_settings_{
+        "tx_remote"sv,
+        app_settings::Mode::TX,
+        {
+            {"remote_path"sv, &settings_.remote_path},
+        }};
+
+    RemoteModel model_{};
+
+    bool needs_save_ = false;
+    std::string temp_buffer_{};
+    std::filesystem::path remote_path_{};
+    RemoteButton* current_btn_{};
+
+    const Point buttons_top_{0, 20};
+    std::vector<std::unique_ptr<RemoteButton>> buttons_{};
+
+    std::unique_ptr<ReplayThread> replay_thread_{};
+    bool ready_signal_{};  // Used to signal ReplayThread ready.
+
+    TextField field_title{
+        {0 * 8, 0 * 16 + 2, 30 * 8, 1 * 16},
+        {}};
+
+    TransmitterView2 tx_view{
+        {0 * 8, 17 * 16},
+        /*short_ui*/ true};
+
+    Checkbox check_loop{
+        {10 * 8, 17 * 16},
+        4,
+        "Loop",
+        /*small*/ true};
+
+    TextField field_filename{
+        {0 * 8, 18 * 16, 17 * 8, 1 * 16},
+        {}};
+
+    NewButton button_add{
+        {17 * 8 + 4, 17 * 16, 4 * 8, 2 * 16},
+        "",
+        &bitmap_icon_add,
+        Color::orange(),
+        /*vcenter*/ true};
+
+    NewButton button_new{
+        {22 * 8, 17 * 16, 4 * 8, 2 * 16},
+        "",
+        &bitmap_icon_new_file,
+        Color::dark_blue(),
+        /*vcenter*/ true};
+
+    NewButton button_open{
+        {26 * 8, 17 * 16, 4 * 8, 2 * 16},
+        "",
+        &bitmap_icon_load,
+        Color::dark_blue(),
+        /*vcenter*/ true};
+
+    spectrum::WaterfallView waterfall{};
+
+    MessageHandlerRegistration message_handler_replay_thread_error{
+        Message::ID::ReplayThreadDone,
+        [this](const Message* p) {
+            auto message = *reinterpret_cast<const ReplayThreadDoneMessage*>(p);
+            handle_replay_thread_done(message.return_code);
+        }};
+
+    MessageHandlerRegistration message_handler_fifo_signal{
+        Message::ID::RequestSignal,
+        [this](const Message* p) {
+            auto message = static_cast<const RequestSignalMessage*>(p);
+            if (message->signal == RequestSignalMessage::Signal::FillRequest) {
+                ready_signal_ = true;
+            }
+        }};
 };

 } /* namespace ui */
@@ -44,15 +44,21 @@ void WipeSDView::focus() {
    dummy.focus();

    if (!confirmed) {
-        nav_.push<ModalMessageView>("Warning !", "Wipe FAT of SD card?", YESCANCEL, [this](bool choice) {
-            if (choice)
-                confirmed = true;
-        });
+        nav_.push<ModalMessageView>(
+            "Warning !",
+            "Wipe FAT of SD card?",
+            YESNO,
+            [this](bool choice) {
+                if (choice)
+                    confirmed = true;
+                else
+                    nav_.pop(false);  // Pop w/o update so the modal will pop off the app.
+            });
    } else {
        if (sdcGetInfo(&SDCD1, &block_device_info) == CH_SUCCESS) {
            thread = chThdCreateFromHeap(NULL, 2048, NORMALPRIO, WipeSDView::static_fn, this);
        } else {
-            nav_.pop();  // Just silently abort for now
+            nav_.pop();  // Just silently abort for now.
        }
    }
 }
@@ -38,7 +38,7 @@ class WipeSDView : public View {
    ~WipeSDView();
    void focus() override;

-    std::string title() const override { return "Wipe sdcard"; };
+    std::string title() const override { return "Wipe SD Card"; };

   private:
    NavigationView& nav_;
@@ -23,7 +23,9 @@
 #include "ui_search.hpp"

 #include "baseband_api.hpp"
+#include "binder.hpp"
 #include "string_format.hpp"
+#include "ui_freqman.hpp"

 using namespace portapack;

@@ -47,8 +49,61 @@ void RecentEntriesTable<SearchRecentEntries>::draw(
    painter.draw_string(target_rect.location(), style, to_string_short_freq(entry.frequency) + " " + entry.time + " " + str_duration);
 }

-void SearchView::focus() {
-    field_frequency_min.focus();
+/* SearchView ********************************************/
+
+SearchView::SearchView(
+    NavigationView& nav)
+    : nav_(nav) {
+    baseband::run_image(portapack::spi_flash::image_tag_wideband_spectrum);
+
+    add_children({&labels,
+                  &field_frequency_min,
+                  &field_frequency_max,
+                  &field_lna,
+                  &field_vga,
+                  &field_threshold,
+                  &text_mean,
+                  &text_slices,
+                  &text_rate,
+                  &text_infos,
+                  &vu_max,
+                  &progress_timers,
+                  &check_snap,
+                  &options_snap,
+                  &big_display,
+                  &recent_entries_view});
+
+    baseband::set_spectrum(SEARCH_SLICE_WIDTH, 31);
+
+    recent_entries_view.set_parent_rect({0, 28 * 8, screen_width, 12 * 8});
+    recent_entries_view.on_select = [this, &nav](const SearchRecentEntry& entry) {
+        nav.push<FrequencySaveView>(entry.frequency);
+    };
+
+    text_mean.set_style(&Styles::grey);
+    text_slices.set_style(&Styles::grey);
+    text_rate.set_style(&Styles::grey);
+    progress_timers.set_style(&Styles::grey);
+    big_display.set_style(&Styles::grey);
+
+    field_frequency_min.set_step(100'000);
+    bind(field_frequency_min, settings_.freq_min, nav, [this](auto) {
+        on_range_changed();
+    });
+
+    field_frequency_max.set_step(100'000);
+    bind(field_frequency_max, settings_.freq_max, nav, [this](auto) {
+        on_range_changed();
+    });
+
+    bind(field_threshold, settings_.power_threshold);
+    bind(check_snap, settings_.snap_search);
+    bind(options_snap, settings_.snap_step);
+
+    progress_timers.set_max(DETECT_DELAY);
+
+    on_range_changed();
+    receiver_model.enable();
 }

 SearchView::~SearchView() {
@@ -56,6 +111,18 @@ SearchView::~SearchView() {
    baseband::shutdown();
 }

+void SearchView::on_show() {
+    baseband::spectrum_streaming_start();
+}
+
+void SearchView::on_hide() {
+    baseband::spectrum_streaming_stop();
+}
+
+void SearchView::focus() {
+    field_frequency_min.focus();
+}
+
 void SearchView::do_detection() {
    uint8_t power_max = 0;
    int32_t bin_max = -1;
@@ -83,7 +150,7 @@ void SearchView::do_detection() {
        if (power > overall_power_max)
            overall_power_max = power;

-        if ((power >= mean_power + power_threshold) && (power > power_max)) {
+        if ((power >= mean_power + settings_.power_threshold) && (power > power_max)) {
            power_max = power;
            bin_max = slices[slice].max_index;
            slice_max = slice;
@@ -104,7 +171,7 @@ void SearchView::do_detection() {
                    }

                    // Check range
-                    if ((resolved_frequency >= f_min) && (resolved_frequency <= f_max)) {
+                    if ((resolved_frequency >= settings_.freq_min) && (resolved_frequency <= settings_.freq_max)) {
                        duration = 0;

                        auto& entry = ::on_packet(recent, resolved_frequency);
@@ -159,16 +226,47 @@ void SearchView::do_detection() {
    }
 }

-void SearchView::add_spectrum_pixel(Color color) {
-    // Is avoiding floats really necessary ?
-    bin_skip_acc += bin_skip_frac;
-    if (bin_skip_acc < 0x10000)
-        return;
+void SearchView::do_timers() {
+    if (timing_div >= 60) {
+        // ~1Hz

-    bin_skip_acc -= 0x10000;
+        timing_div = 0;

-    if (pixel_index < 240)
-        spectrum_row[pixel_index++] = color;
+        // Update scan rate
+        text_rate.set(to_string_dec_uint(search_counter, 3));
+        search_counter = 0;
+    }
+
+    if (timing_div % 12 == 0) {
+        // ~5Hz
+
+        // Update power levels
+        text_mean.set(to_string_dec_uint(mean_power, 3));
+
+        vu_max.set_value(overall_power_max);
+        vu_max.set_mark(mean_power + settings_.power_threshold);
+    }
+
+    if (timing_div % 6 == 0) {
+        // ~10Hz
+
+        // Update timing indicator
+        if (locked) {
+            progress_timers.set_max(RELEASE_DELAY);
+            progress_timers.set_value(RELEASE_DELAY - release_timer);
+        } else {
+            progress_timers.set_max(DETECT_DELAY);
+            progress_timers.set_value(detect_timer);
+        }
+
+        // Increment timers
+        if (detect_timer < DETECT_DELAY) detect_timer++;
+        if (release_timer < RELEASE_DELAY) release_timer++;
+
+        if (locked) duration++;
+    }
+
+    timing_div++;
 }

 void SearchView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
@@ -221,22 +319,14 @@ void SearchView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
    baseband::spectrum_streaming_start();
 }

-void SearchView::on_show() {
-    baseband::spectrum_streaming_start();
-}
-
-void SearchView::on_hide() {
-    baseband::spectrum_streaming_stop();
-}
-
 void SearchView::on_range_changed() {
-    rf::Frequency slices_span, center_frequency;
+    rf::Frequency slices_span;
+    rf::Frequency center_frequency;
    int64_t offset;
    size_t slice;

-    f_min = field_frequency_min.value();
-    f_max = field_frequency_max.value();
-    search_span = abs(f_max - f_min);
+    // TODO: enforce min < max?
+    search_span = abs(settings_.freq_max - settings_.freq_min);

    if (search_span > SEARCH_SLICE_WIDTH) {
        // ex: 100M~115M (15M span):
@@ -253,14 +343,14 @@ void SearchView::on_range_changed() {
        // offset = 0 + 2.5/2 = 1.25M
        offset = ((search_span - slices_span) / 2) + (SEARCH_SLICE_WIDTH / 2);
        // slice_start = 100M + 1.25M = 101.25M
-        center_frequency = std::min(f_min, f_max) + offset;
+        center_frequency = std::min(settings_.freq_min, settings_.freq_max) + offset;

        for (slice = 0; slice < slices_nb; slice++) {
            slices[slice].center_frequency = center_frequency;
            center_frequency += SEARCH_SLICE_WIDTH;
        }
    } else {
-        slices[0].center_frequency = (f_max + f_min) / 2;
+        slices[0].center_frequency = (settings_.freq_max + settings_.freq_min) / 2;
        receiver_model.set_target_frequency(slices[0].center_frequency);

        slices_nb = 1;
@@ -272,139 +362,16 @@ void SearchView::on_range_changed() {
    slice_counter = 0;
 }

-void SearchView::on_lna_changed(int32_t v_db) {
-    receiver_model.set_lna(v_db);
-}
+void SearchView::add_spectrum_pixel(Color color) {
+    // Is avoiding floats really necessary?
+    bin_skip_acc += bin_skip_frac;
+    if (bin_skip_acc < 0x10000)
+        return;

-void SearchView::on_vga_changed(int32_t v_db) {
-    receiver_model.set_vga(v_db);
-}
+    bin_skip_acc -= 0x10000;

-void SearchView::do_timers() {
-    if (timing_div >= 60) {
-        // ~1Hz
-
-        timing_div = 0;
-
-        // Update scan rate
-        text_rate.set(to_string_dec_uint(search_counter, 3));
-        search_counter = 0;
-    }
-
-    if (timing_div % 12 == 0) {
-        // ~5Hz
-
-        // Update power levels
-        text_mean.set(to_string_dec_uint(mean_power, 3));
-
-        vu_max.set_value(overall_power_max);
-        vu_max.set_mark(mean_power + power_threshold);
-    }
-
-    if (timing_div % 6 == 0) {
-        // ~10Hz
-
-        // Update timing indicator
-        if (locked) {
-            progress_timers.set_max(RELEASE_DELAY);
-            progress_timers.set_value(RELEASE_DELAY - release_timer);
-        } else {
-            progress_timers.set_max(DETECT_DELAY);
-            progress_timers.set_value(detect_timer);
-        }
-
-        // Increment timers
-        if (detect_timer < DETECT_DELAY) detect_timer++;
-        if (release_timer < RELEASE_DELAY) release_timer++;
-
-        if (locked) duration++;
-    }
-
-    timing_div++;
-}
-
-SearchView::SearchView(
-    NavigationView& nav)
-    : nav_(nav) {
-    baseband::run_image(portapack::spi_flash::image_tag_wideband_spectrum);
-
-    add_children({&labels,
-                  &field_frequency_min,
-                  &field_frequency_max,
-                  &field_lna,
-                  &field_vga,
-                  &field_threshold,
-                  &text_mean,
-                  &text_slices,
-                  &text_rate,
-                  &text_infos,
-                  &vu_max,
-                  &progress_timers,
-                  &check_snap,
-                  &options_snap,
-                  &big_display,
-                  &recent_entries_view});
-
-    baseband::set_spectrum(SEARCH_SLICE_WIDTH, 31);
-
-    recent_entries_view.set_parent_rect({0, 28 * 8, 240, 12 * 8});
-    recent_entries_view.on_select = [this, &nav](const SearchRecentEntry& entry) {
-        nav.push<FrequencyKeypadView>(entry.frequency);
-    };
-
-    text_mean.set_style(&Styles::grey);
-    text_slices.set_style(&Styles::grey);
-    text_rate.set_style(&Styles::grey);
-    progress_timers.set_style(&Styles::grey);
-    big_display.set_style(&Styles::grey);
-
-    check_snap.set_value(true);
-    options_snap.set_selected_index(1);  // 12.5kHz
-
-    field_threshold.set_value(80);
-    field_threshold.on_change = [this](int32_t value) {
-        power_threshold = value;
-    };
-
-    field_frequency_min.set_value(receiver_model.target_frequency() - 1000000);
-    field_frequency_min.set_step(100000);
-    field_frequency_min.on_change = [this](rf::Frequency) {
-        this->on_range_changed();
-    };
-    field_frequency_min.on_edit = [this, &nav]() {
-        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);
-        };
-    };
-
-    field_frequency_max.set_value(receiver_model.target_frequency() + 1000000);
-    field_frequency_max.set_step(100000);
-    field_frequency_max.on_change = [this](rf::Frequency) {
-        this->on_range_changed();
-    };
-    field_frequency_max.on_edit = [this, &nav]() {
-        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);
-        };
-    };
-
-    field_lna.set_value(receiver_model.lna());
-    field_lna.on_change = [this](int32_t v) {
-        this->on_lna_changed(v);
-    };
-
-    field_vga.set_value(receiver_model.vga());
-    field_vga.on_change = [this](int32_t v_db) {
-        this->on_vga_changed(v_db);
-    };
-
-    progress_timers.set_max(DETECT_DELAY);
-
-    on_range_changed();
-
-    receiver_model.enable();
+    if (pixel_index < screen_width)
+        spectrum_row[pixel_index++] = color;
 }

 } /* namespace ui */
@@ -20,14 +20,13 @@
 * Boston, MA 02110-1301, USA.
 */

+#include "app_settings.hpp"
 #include "receiver_model.hpp"
+#include "recent_entries.hpp"
 #include "radio_state.hpp"
-
 #include "spectrum_color_lut.hpp"
-
 #include "ui_receiver.hpp"
 #include "ui_styles.hpp"
-#include "recent_entries.hpp"

 namespace ui {

@@ -95,6 +94,26 @@ class SearchView : public View {
        SEARCH_SLICE_WIDTH /* sampling rate */,
        ReceiverModel::Mode::SpectrumAnalysis};

+    // Settings
+    struct SearchSettings {
+        uint32_t power_threshold = 80;
+        rf::Frequency freq_min = 100'000'000;
+        rf::Frequency freq_max = 400'000'000;
+        bool snap_search = true;
+        uint32_t snap_step = 12'500;
+    };
+    SearchSettings settings_{};
+    app_settings::SettingsManager app_settings_{
+        "rx_search"sv,
+        app_settings::Mode::RX,
+        {
+            {"power_threshold"sv, &settings_.power_threshold},
+            {"freq_min"sv, &settings_.freq_min},
+            {"freq_max"sv, &settings_.freq_max},
+            {"snap_search"sv, &settings_.snap_search},
+            {"snap_step"sv, &settings_.snap_step},
+        }};
+
    struct slice_t {
        rf::Frequency center_frequency;
        uint8_t max_power;
@@ -103,33 +122,36 @@ class SearchView : public View {
        int16_t index;
    } slices[32];

-    uint32_t bin_skip_acc{0}, bin_skip_frac{};
-    uint32_t pixel_index{0};
-    std::array<Color, 240> spectrum_row = {0};
-    ChannelSpectrumFIFO* fifo{nullptr};
-    rf::Frequency f_min{0}, f_max{0};
-    uint8_t detect_timer{0}, release_timer{0}, timing_div{0};
-    uint8_t overall_power_max{0};
-    uint32_t mean_power{0}, mean_acc{0};
-    uint32_t duration{0};
-    uint32_t power_threshold{80};  // Todo: Put this in persistent / settings
-    rf::Frequency slice_start{0};
-    uint8_t slices_nb{0};
-    uint8_t slice_counter{0};
-    int16_t last_bin{0};
-    uint32_t last_slice{0};
-    Coord last_tick_pos{0};
-    rf::Frequency search_span{0}, resolved_frequency{0};
-    uint16_t locked_bin{0};
-    uint8_t search_counter{0};
-    bool locked{false};
+    uint32_t bin_skip_acc = 0;
+    uint32_t bin_skip_frac = 0;
+    uint32_t pixel_index = 0;
+    std::array<Color, 240> spectrum_row{};
+    ChannelSpectrumFIFO* fifo = nullptr;

+    uint8_t detect_timer = 0;
+    uint8_t release_timer = 0;
+    uint8_t timing_div = 0;
+    uint8_t overall_power_max{0};
+    uint32_t mean_power = 0;
+    uint32_t mean_acc = 0;
+    uint32_t duration = 0;
+
+    rf::Frequency slice_start = 0;
+    uint8_t slices_nb = 0;
+    uint8_t slice_counter = 0;
+    int16_t last_bin = 0;
+    uint32_t last_slice = 0;
+    Coord last_tick_pos = 0;
+    rf::Frequency search_span = 0;
+    rf::Frequency resolved_frequency = 0;
+    uint16_t locked_bin = 0;
+    uint8_t search_counter = 0;
+    bool locked = false;
+
+    void do_detection();
+    void do_timers();
    void on_channel_spectrum(const ChannelSpectrum& spectrum);
    void on_range_changed();
-    void do_detection();
-    void on_lna_changed(int32_t v_db);
-    void on_vga_changed(int32_t v_db);
-    void do_timers();
    void add_spectrum_pixel(Color color);

    const RecentEntriesColumns columns{{{"Frequency", 9},
@@ -150,6 +172,7 @@ class SearchView : public View {
        {1 * 8, 1 * 16}};
    FrequencyField field_frequency_max{
        {11 * 8, 1 * 16}};
+
    LNAGainField field_lna{
        {22 * 8, 1 * 16}};
    VGAGainField field_vga{
@@ -191,10 +214,10 @@ class SearchView : public View {
        {17 * 8, 15 * 8},  // Position
        7,                 // Length
        {                  // Options
-         {"25kHz  ", 25000},
-         {"12.5kHz", 12500},
-         {"8.33kHz", 8333},
-         {"2.5kHz", 2500},
+         {"25kHz  ", 25'000},
+         {"12.5kHz", 12'500},
+         {"8.33kHz", 8'333},
+         {"2.5kHz", 2'500},
         {"500Hz", 500}}};

    BigFrequency big_display{
@@ -207,6 +230,7 @@ class SearchView : public View {
            const auto message = *reinterpret_cast<const ChannelSpectrumConfigMessage*>(p);
            this->fifo = message.fifo;
        }};
+
    MessageHandlerRegistration message_handler_frame_sync{
        Message::ID::DisplayFrameSync,
        [this](const Message* const) {
@@ -2,6 +2,7 @@
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
 * Copyright (C) 2023 gullradriel, Nilorea Studio Inc.
+ * Copyright (C) 2023 Kyle Reed
 *
 * This file is part of PortaPack.
 *
@@ -125,8 +126,30 @@ SetRadioView::SetRadioView(
        nav.pop();
    };

+    add_children({
+        &label_source,
+        &value_source,
+        &value_source_frequency,
+        &check_clkout,
+        &field_clkout_freq,
+        &labels_clkout_khz,
+        &value_freq_step,
+        &labels_bias,
+        &check_bias,
+        &disable_external_tcxo,  // TODO: always show?
+        &button_save,
+        &button_cancel,
+    });
+
    const auto reference = clock_manager.get_reference();

+    if (reference.source == ClockManager::ReferenceSource::Xtal) {
+        add_children({
+            &labels_correction,
+            &field_ppm,
+        });
+    }
+
    std::string source_name("---");
    switch (reference.source) {
        case ClockManager::ReferenceSource::Xtal:
@@ -141,34 +164,15 @@ SetRadioView::SetRadioView(
    }

    value_source.set(source_name);
-    value_source_frequency.set(to_string_dec_uint(reference.frequency / 1000000, 2) + "." + to_string_dec_uint((reference.frequency % 1000000) / 100, 4, '0') + " MHz");
+    value_source_frequency.set(
+        to_string_dec_uint(reference.frequency / 1000000, 2) + "." +
+        to_string_dec_uint((reference.frequency % 1000000) / 100, 4, '0') + " MHz");

+    // Make these Text controls look like Labels.
    label_source.set_style(&Styles::light_grey);
    value_source.set_style(&Styles::light_grey);
    value_source_frequency.set_style(&Styles::light_grey);

-    add_children({
-        &label_source,
-        &value_source,
-        &value_source_frequency,
-    });
-
-    if (reference.source == ClockManager::ReferenceSource::Xtal) {
-        add_children({
-            &labels_correction,
-            &field_ppm,
-        });
-    }
-
-    add_children({&check_clkout,
-                  &field_clkout_freq,
-                  &labels_clkout_khz,
-                  &value_freq_step,
-                  &labels_bias,
-                  &check_bias,
-                  &button_save,
-                  &button_cancel});
-
    SetFrequencyCorrectionModel model{
        static_cast<int8_t>(pmem::correction_ppb() / 1000), 0};

@@ -221,10 +225,13 @@ SetRadioView::SetRadioView(
        send_system_refresh();
    };

+    disable_external_tcxo.set_value(pmem::config_disable_external_tcxo());
+
    button_save.on_select = [this, &nav](Button&) {
        const auto model = this->form_collect();
        pmem::set_correction_ppb(model.ppm * 1000);
        pmem::set_clkout_freq(model.freq);
+        pmem::set_config_disable_external_tcxo(disable_external_tcxo.value());
        clock_manager.enable_clock_output(pmem::clkout_enabled());
        nav.pop();
    };
@@ -339,10 +346,13 @@ void SetUIView::focus() {
 /* SetAppSettingsView ************************************/

 SetAppSettingsView::SetAppSettingsView(NavigationView& nav) {
-    add_children({&checkbox_load_app_settings,
-                  &checkbox_save_app_settings,
-                  &button_save,
-                  &button_cancel});
+    add_children({
+        &labels,
+        &checkbox_load_app_settings,
+        &checkbox_save_app_settings,
+        &button_save,
+        &button_cancel,
+    });

    checkbox_load_app_settings.set_value(pmem::load_app_settings());
    checkbox_save_app_settings.set_value(pmem::save_app_settings());
@@ -364,11 +374,14 @@ void SetAppSettingsView::focus() {
 /* SetConverterSettingsView ******************************/

 SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) {
-    add_children({&check_show_converter,
-                  &check_converter,
-                  &converter_mode,
-                  &button_converter_freq,
-                  &button_return});
+    add_children({
+        &labels,
+        &check_show_converter,
+        &check_converter,
+        &opt_converter_mode,
+        &field_converter_freq,
+        &button_return,
+    });

    check_show_converter.set_value(!pmem::ui_hide_converter());
    check_show_converter.on_select = [this](Checkbox&, bool v) {
@@ -378,7 +391,7 @@ SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) {
        }
        // Retune to take converter change in account.
        receiver_model.set_target_frequency(receiver_model.target_frequency());
-        // Refresh status bar with/out converter
+        // Refresh status bar converter icon.
        send_system_refresh();
    };

@@ -389,27 +402,30 @@ SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) {
            pmem::set_ui_hide_converter(false);
        }
        pmem::set_config_converter(v);
-        // Retune to take converter change in account
+        // Retune to take converter change in account.
        receiver_model.set_target_frequency(receiver_model.target_frequency());
-        // Refresh status bar with/out converter
+        // Refresh status bar converter icon.
        send_system_refresh();
    };

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

-    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>(pmem::config_converter_freq());
-        new_view->on_changed = [this, &button](rf::Frequency 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>");
+    field_converter_freq.set_step(1'000'000);
+    field_converter_freq.set_value(pmem::config_converter_freq());
+    field_converter_freq.on_change = [this](rf::Frequency f) {
+        pmem::set_config_converter_freq(f);
+        // Retune to take converter change in account.
+        receiver_model.set_target_frequency(receiver_model.target_frequency());
+    };
+    field_converter_freq.on_edit = [this, &nav]() {
+        auto new_view = nav.push<FrequencyKeypadView>(field_converter_freq.value());
+        new_view->on_changed = [this](rf::Frequency f) {
+            field_converter_freq.set_value(f);
        };
    };

@@ -425,46 +441,50 @@ void SetConverterSettingsView::focus() {
 /* SetFrequencyCorrectionView ****************************/

 SetFrequencyCorrectionView::SetFrequencyCorrectionView(NavigationView& nav) {
-    add_children({&text_freqCorrection_about,
-                  &frequency_rx_correction_mode,
-                  &frequency_tx_correction_mode,
-                  &button_freq_rx_correction,
-                  &button_freq_tx_correction,
-                  &button_return});
+    add_children({
+        &labels,
+        &opt_rx_correction_mode,
+        &field_rx_correction,
+        &opt_tx_correction_mode,
+        &field_tx_correction,
+        &button_return,
+    });

-    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) {
+    opt_rx_correction_mode.set_by_value(pmem::config_freq_rx_correction_updown());
+    opt_rx_correction_mode.on_change = [this](size_t, OptionsField::value_t v) {
        pmem::set_freq_rx_correction_updown(v);
    };

-    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) {
+    opt_tx_correction_mode.set_by_value(pmem::config_freq_rx_correction_updown());
+    opt_tx_correction_mode.on_change = [this](size_t, OptionsField::value_t v) {
        pmem::set_freq_tx_correction_updown(v);
    };

-    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>(pmem::config_converter_freq());
-        new_view->on_changed = [this, &button](rf::Frequency f) {
-            if (f >= MAX_FREQ_CORRECTION)
-                f = MAX_FREQ_CORRECTION;
-            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>");
+    field_rx_correction.set_step(100'000);
+    field_rx_correction.set_value(pmem::config_freq_rx_correction());
+    field_rx_correction.on_change = [this](rf::Frequency f) {
+        pmem::set_config_freq_rx_correction(f);
+        // Retune to take converter change in account.
+        receiver_model.set_target_frequency(receiver_model.target_frequency());
+    };
+    field_rx_correction.on_edit = [this, &nav]() {
+        auto new_view = nav.push<FrequencyKeypadView>(field_rx_correction.value());
+        new_view->on_changed = [this](rf::Frequency f) {
+            field_rx_correction.set_value(f);
        };
    };

-    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>(pmem::config_converter_freq());
-        new_view->on_changed = [this, &button](rf::Frequency f) {
-            if (f >= MAX_FREQ_CORRECTION)
-                f = MAX_FREQ_CORRECTION;
-            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>");
+    field_tx_correction.set_step(100'000);
+    field_tx_correction.set_value(pmem::config_freq_tx_correction());
+    field_tx_correction.on_change = [this](rf::Frequency f) {
+        pmem::set_config_freq_tx_correction(f);
+        // Retune to take converter change in account. NB: receiver_model.
+        receiver_model.set_target_frequency(receiver_model.target_frequency());
+    };
+    field_tx_correction.on_edit = [this, &nav]() {
+        auto new_view = nav.push<FrequencyKeypadView>(field_tx_correction.value());
+        new_view->on_changed = [this](rf::Frequency f) {
+            field_tx_correction.set_value(f);
        };
    };

@@ -480,49 +500,52 @@ void SetFrequencyCorrectionView::focus() {
 /* SetPersistentMemoryView *******************************/

 SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
-    add_children({&text_pmem_about,
-                  &text_pmem_informations,
-                  &text_pmem_status,
-                  &check_use_sdcard_for_pmem,
-                  &button_save_mem_to_file,
-                  &button_load_mem_from_file,
-                  &button_load_mem_defaults,
-                  &button_return});
+    add_children({
+        &labels,
+        &text_pmem_status,
+        &check_use_sdcard_for_pmem,
+        &button_save_mem_to_file,
+        &button_load_mem_from_file,
+        &button_load_mem_defaults,
+        &button_return,
+    });
+
+    text_pmem_status.set_style(&Styles::yellow);

    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;
        if (v) {
            if (fs::file_exists(PMEM_FILEFLAG)) {
-                text_pmem_status.set("pmem flag already present");
+                text_pmem_status.set("P.Mem flag file present.");
            } else {
                auto error = pmem_flag_file_handle.create(PMEM_FILEFLAG);
                if (error)
-                    text_pmem_status.set("!err. creating pmem flagfile!");
+                    text_pmem_status.set("Error creating P.Mem File!");
                else
-                    text_pmem_status.set("pmem flag file created");
+                    text_pmem_status.set("P.Mem flag file created.");
            }
        } else {
            auto result = delete_file(PMEM_FILEFLAG);
            if (result.code() != FR_OK)
-                text_pmem_status.set("!err. deleting pmem flagfile!");
+                text_pmem_status.set("Error deleting P.Mem flag!");
            else
-                text_pmem_status.set("pmem flag file deleted");
+                text_pmem_status.set("P.Mem flag file deleted.");
        }
    };

    button_save_mem_to_file.on_select = [&nav, this](Button&) {
        if (!pmem::save_persistent_settings_to_file())
-            text_pmem_status.set("!problem saving settings!");
+            text_pmem_status.set("Error saving settings!");
        else
-            text_pmem_status.set("settings saved");
+            text_pmem_status.set("Settings saved.");
    };

    button_load_mem_from_file.on_select = [&nav, this](Button&) {
        if (!pmem::load_persistent_settings_from_file()) {
-            text_pmem_status.set("!problem loading settings!");
+            text_pmem_status.set("Error loading settings!");
        } else {
-            text_pmem_status.set("settings loaded");
+            text_pmem_status.set("Settings loaded.");
            // Refresh status bar with icon up or down
            send_system_refresh();
        }
@@ -531,7 +554,7 @@ SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
    button_load_mem_defaults.on_select = [&nav, this](Button&) {
        nav.push<ModalMessageView>(
            "Warning!",
-            "This will reset the p.mem\nand set the default settings",
+            "This will reset the P.Mem\nto default settings.",
            YESNO,
            [this](bool choice) {
                if (choice) {
@@ -577,9 +600,12 @@ void SetAudioView::focus() {
 /* SetQRCodeView *****************************************/

 SetQRCodeView::SetQRCodeView(NavigationView& nav) {
-    add_children({&checkbox_bigger_qr,
-                  &button_save,
-                  &button_cancel});
+    add_children({
+        &labels,
+        &checkbox_bigger_qr,
+        &button_save,
+        &button_cancel,
+    });

    checkbox_bigger_qr.set_value(pmem::show_bigger_qr_code());

@@ -628,17 +654,17 @@ SettingsMenuView::SettingsMenuView(NavigationView& nav) {
        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
+        {"App Settings", ui::Color::dark_cyan(), &bitmap_icon_setup, [&nav]() { nav.push<SetAppSettingsView>(); }},
        {"Audio", ui::Color::dark_cyan(), &bitmap_icon_speaker, [&nav]() { nav.push<SetAudioView>(); }},
+        {"Calibration", ui::Color::dark_cyan(), &bitmap_icon_options_touch, [&nav]() { nav.push<TouchCalibrationView>(); }},
+        {"Converter", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetConverterSettingsView>(); }},
+        {"Date/Time", ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [&nav]() { nav.push<SetDateTimeView>(); }},
+        {"Encoder Dial", ui::Color::dark_cyan(), &bitmap_icon_setup, [&nav]() { nav.push<SetEncoderDialView>(); }},
+        {"Freq. Correct", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetFrequencyCorrectionView>(); }},
+        {"P.Memory Mgmt", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<SetPersistentMemoryView>(); }},
+        {"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [&nav]() { nav.push<SetQRCodeView>(); }},
        {"Radio", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetRadioView>(); }},
        {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [&nav]() { nav.push<SetUIView>(); }},
-        {"Date/Time", ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [&nav]() { nav.push<SetDateTimeView>(); }},
-        {"Calibration", ui::Color::dark_cyan(), &bitmap_icon_options_touch, [&nav]() { nav.push<TouchCalibrationView>(); }},
-        {"App Settings", ui::Color::dark_cyan(), &bitmap_icon_setup, [&nav]() { nav.push<SetAppSettingsView>(); }},
-        {"Converter", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetConverterSettingsView>(); }},
-        {"FreqCorrection", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav]() { nav.push<SetFrequencyCorrectionView>(); }},
-        {"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [&nav]() { nav.push<SetQRCodeView>(); }},
-        {"P.Memory Mgmt", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<SetPersistentMemoryView>(); }},
-        {"Encoder Dial", ui::Color::dark_cyan(), &bitmap_icon_setup, [&nav]() { nav.push<SetEncoderDialView>(); }},
    });
    set_max_rows(2);  // allow wider buttons
 }
@@ -2,6 +2,7 @@
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
 * Copyright (C) 2023 gullradriel, Nilorea Studio Inc.
+ * Copyright (C) 2023 Kyle Reed
 *
 * This file is part of PortaPack.
 *
@@ -26,6 +27,7 @@

 #include "ui_widget.hpp"
 #include "ui_menu.hpp"
+#include "ui_receiver.hpp"
 #include "ui_navigation.hpp"
 #include "bitmap.hpp"
 #include "ff.h"
@@ -35,8 +37,6 @@

 namespace ui {

-#define MAX_FREQ_CORRECTION INT32_MAX
-
 struct SetDateTimeModel {
    uint16_t year;
    uint8_t month;
@@ -56,25 +56,28 @@ class SetDateTimeView : public View {

   private:
    Labels labels{
-        {{6 * 8, 7 * 16}, "YYYY-MM-DD HH:MM:SS", Color::grey()},
-        {{10 * 8, 9 * 16}, "-  -     :  :", Color::light_grey()}};
+        {{1 * 8, 1 * 16}, "Adjust the RTC clock date &", Color::light_grey()},
+        {{1 * 8, 2 * 16}, "time. If clock resets after", Color::light_grey()},
+        {{1 * 8, 3 * 16}, "reboot, coin batt. is dead. ", Color::light_grey()},
+        {{5 * 8, 8 * 16 - 2}, "YYYY-MM-DD HH:MM:SS", Color::grey()},
+        {{9 * 8, 9 * 16}, "-  -     :  :", Color::light_grey()}};

    NumberField field_year{
-        {6 * 8, 9 * 16},
+        {5 * 8, 9 * 16},
        4,
        {2015, 2099},
        1,
        '0',
    };
    NumberField field_month{
-        {11 * 8, 9 * 16},
+        {10 * 8, 9 * 16},
        2,
        {1, 12},
        1,
        '0',
    };
    NumberField field_day{
-        {14 * 8, 9 * 16},
+        {13 * 8, 9 * 16},
        2,
        {1, 31},
        1,
@@ -82,21 +85,21 @@ class SetDateTimeView : public View {
    };

    NumberField field_hour{
-        {17 * 8, 9 * 16},
+        {16 * 8, 9 * 16},
        2,
        {0, 23},
        1,
        '0',
    };
    NumberField field_minute{
-        {20 * 8, 9 * 16},
+        {19 * 8, 9 * 16},
        2,
        {0, 59},
        1,
        '0',
    };
    NumberField field_second{
-        {23 * 8, 9 * 16},
+        {22 * 8, 9 * 16},
        2,
        {0, 59},
        1,
@@ -131,22 +134,30 @@ class SetRadioView : public View {
    uint8_t freq_step_khz = 3;

    Text label_source{
-        {0, 1 * 16, 17 * 8, 16},
+        {1 * 8, 1 * 16, 17 * 8, 16},
        "Reference Source:"};

    Text value_source{
-        {(240 - 11 * 8), 1 * 16, 11 * 8, 16},
-        "---"};
+        {18 * 8, 1 * 16, 11 * 8, 16},
+        ""};

    Text value_source_frequency{
-        {(240 - 11 * 8), 2 * 16, 11 * 8, 16},
-        "---"};
+        {18 * 8, 2 * 16, 11 * 8, 16},
+        ""};

    Labels labels_correction{
        {{2 * 8, 3 * 16}, "Frequency correction:", Color::light_grey()},
        {{6 * 8, 4 * 16}, "PPM", Color::light_grey()},
    };

+    NumberField field_ppm{
+        {2 * 8, 4 * 16},
+        3,
+        {-50, 50},
+        1,
+        '0',
+    };
+
    Checkbox check_clkout{
        {18, (6 * 16 - 4)},
        13,
@@ -167,23 +178,20 @@ class SetRadioView : public View {
        "|   "};

    Labels labels_bias{
-        {{24, 8 * 16}, "CAUTION: Ensure that all", Color::red()},
-        {{28, 9 * 16}, "devices attached to the", Color::red()},
-        {{8, 10 * 16}, "antenna connector can accept", Color::red()},
-        {{68, 11 * 16}, "a DC voltage!", Color::red()}};
-
-    NumberField field_ppm{
-        {2 * 8, 4 * 16},
-        3,
-        {-50, 50},
-        1,
-        '0',
-    };
+        {{4 * 8 + 4, 8 * 16}, "CAUTION: Ensure that all", Color::red()},
+        {{5 * 8 + 0, 9 * 16}, "devices attached to the", Color::red()},
+        {{6 * 8 + 0, 10 * 16}, "antenna connector can", Color::red()},
+        {{6 * 8 + 4, 11 * 16}, "accept a DC voltage!", Color::red()}};

    Checkbox check_bias{
        {18, 12 * 16},
        5,
-        "Turn on bias voltage"};
+        "Enable DC bias voltage"};
+
+    Checkbox disable_external_tcxo{
+        {18, 14 * 16},
+        5,
+        "Disable external TCXO"};

    Button button_save{
        {2 * 8, 16 * 16, 12 * 8, 32},
@@ -307,19 +315,25 @@ class SetAppSettingsView : public View {
    SetAppSettingsView(NavigationView& nav);

    void focus() override;
-
-    std::string title() const override { return "AppSettings"; };
+    std::string title() const override { return "App Settings"; };

   private:
+    Labels labels{
+        {{1 * 8, 1 * 16}, "App settings are saved to", Color::light_grey()},
+        {{1 * 8, 2 * 16}, "the SD card in /SETTINGS.", Color::light_grey()},
+        {{1 * 8, 3 * 16}, "Radio settings may also be", Color::light_grey()},
+        {{1 * 8, 4 * 16}, "loaded or saved per app.", Color::light_grey()},
+    };
+
    Checkbox checkbox_load_app_settings{
-        {3 * 8, 2 * 16},
+        {3 * 8, 6 * 16},
        25,
-        "Load app settings"};
+        "Load radio settings"};

    Checkbox checkbox_save_app_settings{
-        {3 * 8, 4 * 16},
+        {3 * 8, 8 * 16},
        25,
-        "Save app settings"};
+        "Save radio settings"};

    Button button_save{
        {2 * 8, 16 * 16, 12 * 8, 32},
@@ -340,32 +354,38 @@ class SetConverterSettingsView : public View {
    std::string title() const override { return "Converter"; };

   private:
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Options for working with", Color::light_grey()},
+        {{1 * 8, 2 * 16}, "up/down converter hardware", Color::light_grey()},
+        {{1 * 8, 3 * 16}, "like a Ham It Up.", Color::light_grey()},
+        {{2 * 8, 9 * 16 - 2}, "Conversion frequency:", Color::light_grey()},
+        {{18 * 8, 10 * 16}, "MHz", Color::light_grey()},
+    };
+
    Checkbox check_show_converter{
-        {18, 4 * 16},
+        {2 * 8, 5 * 16},
        19,
-        "show/hide converter"};
+        "Show converter icon"};

    Checkbox check_converter{
-        {18, 6 * 16},
-        7,
-        "enable/disable converter"};
+        {2 * 8, 7 * 16},
+        16,
+        "Enable converter"};

-    OptionsField converter_mode{
-        {18, 8 * 16 + 4},
-        0,
+    OptionsField opt_converter_mode{
+        {5 * 8, 10 * 16},
+        3,
        {
            {" + ", 0},  // up converter
-            {" - ", 1}   // down converter
+            {" - ", 1},  // down converter
        }};

-    Button button_converter_freq{
-        {18 + 4 * 8, 8 * 16, 16 * 8, 24},
-        "",
-    };
+    FrequencyField field_converter_freq{
+        {8 * 8, 10 * 16}};

    Button button_return{
        {16 * 8, 16 * 16, 12 * 8, 32},
-        "return",
+        "Return",
    };
 };

@@ -375,33 +395,36 @@ class SetFrequencyCorrectionView : public View {

    void focus() override;

-    std::string title() const override { return "FreqCorrect"; };
+    std::string title() const override { return "Freq Correct"; };

   private:
-    Text text_freqCorrection_about{
-        {0, 2 * 16, 240, 16},
-        "Set Frequency correction:"};
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Frequency correction allows", Color::light_grey()},
+        {{1 * 8, 2 * 16}, "RX and TX frequencies to be", Color::light_grey()},
+        {{1 * 8, 3 * 16}, "adjusted for all apps.", Color::light_grey()},
+        {{2 * 8, 6 * 16}, "RX Adjustment Frequency", Color::light_grey()},
+        {{18 * 8, 7 * 16}, "MHz", Color::light_grey()},
+        {{2 * 8, 9 * 16}, "TX Adjustment Frequency", Color::light_grey()},
+        {{18 * 8, 10 * 16}, "MHz", Color::light_grey()},
+    };

-    OptionsField frequency_rx_correction_mode{
-        {18, 5 * 16 + 4},
-        0,
+    OptionsField opt_rx_correction_mode{
+        {5 * 8, 7 * 16},
+        3,
        {{" + ", 0},
         {" - ", 1}}};

-    OptionsField frequency_tx_correction_mode{
-        {18, 9 * 16 + 4},
-        0,
+    FrequencyField field_rx_correction{
+        {8 * 8, 7 * 16}};
+
+    OptionsField opt_tx_correction_mode{
+        {5 * 8, 10 * 16},
+        3,
        {{" + ", 0},
         {" - ", 1}}};

-    Button button_freq_rx_correction{
-        {18 + 4 * 8, 5 * 16, 20 * 8, 24},
-        "",
-    };
-    Button button_freq_tx_correction{
-        {18 + 4 * 8, 9 * 16, 20 * 8, 24},
-        "",
-    };
+    FrequencyField field_tx_correction{
+        {8 * 8, 10 * 16}};

    Button button_return{
        {16 * 8, 16 * 16, 12 * 8, 32},
@@ -419,11 +442,14 @@ class SetAudioView : public View {

   private:
    Labels labels{
-        {{2 * 8, 3 * 16}, "Tone key mix:   %", Color::light_grey()},
+        {{1 * 8, 1 * 16}, "Controls the volume of the", Color::light_grey()},
+        {{1 * 8, 2 * 16}, "tone when transmitting in", Color::light_grey()},
+        {{1 * 8, 3 * 16}, "Soundboard or Mic apps.", Color::light_grey()},
+        {{2 * 8, 5 * 16}, "Tone key mix:   %", Color::light_grey()},
    };

    NumberField field_tone_mix{
-        {16 * 8, 3 * 16},
+        {16 * 8, 5 * 16},
        2,
        {10, 99},
        1,
@@ -448,8 +474,13 @@ class SetQRCodeView : public View {
    std::string title() const override { return "QR Code"; };

   private:
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Change the size of the QR", Color::light_grey()},
+        {{1 * 8, 2 * 16}, "code shown in Radiosonde.", Color::light_grey()},
+    };
+
    Checkbox checkbox_bigger_qr{
-        {3 * 8, 9 * 16},
+        {3 * 8, 4 * 16},
        20,
        "Show large QR code"};

@@ -475,11 +506,13 @@ class SetEncoderDialView : public View {

   private:
    Labels labels{
-        {{2 * 8, 3 * 16}, "Dial sensitivity:", Color::light_grey()},
+        {{1 * 8, 1 * 16}, "Adjusts how many steps to", Color::light_grey()},
+        {{1 * 8, 2 * 16}, "change the encoder value.", Color::light_grey()},
+        {{2 * 8, 4 * 16}, "Dial sensitivity:", Color::light_grey()},
    };

    OptionsField field_encoder_dial_sensitivity{
-        {20 * 8, 3 * 16},
+        {20 * 8, 4 * 16},
        6,
        {{"LOW", encoder_dial_sensitivity::DIAL_SENSITIVITY_LOW},
         {"NORMAL", encoder_dial_sensitivity::DIAL_SENSITIVITY_NORMAL},
@@ -504,34 +537,32 @@ class SetPersistentMemoryView : public View {
    std::string title() const override { return "P.Mem Mgmt"; };

   private:
-    Text text_pmem_about{
-        {0, 1 * 16, 240, 16},
-        "Persistent Memory from/to SD"};
-
-    Text text_pmem_informations{
-        {0, 2 * 16, 240, 16},
-        "use: when no/dead coin bat."};
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Save persistent memory on SD", Color::light_grey()},
+        {{1 * 8, 2 * 16}, "card. Needed when device has", Color::light_grey()},
+        {{1 * 8, 3 * 16}, "dead/missing coin battery.", Color::light_grey()},
+    };

    Text text_pmem_status{
-        {0, 3 * 16, 240, 16},
+        {1 * 8, 4 * 16 + 8, 28 * 8, 16},
        ""};

    Checkbox check_use_sdcard_for_pmem{
-        {18, 6 * 16},
-        19,
-        "use sdcard for p.mem"};
+        {2 * 8, 6 * 16},
+        21,
+        "Use SD card for P.Mem"};

    Button button_save_mem_to_file{
-        {0, 8 * 16, 240, 32},
-        "save p.mem to sdcard"};
+        {1 * 8, 8 * 16, 28 * 8, 2 * 16},
+        "Save P.Mem to SD card"};

    Button button_load_mem_from_file{
-        {0, 10 * 16 + 4, 240, 32},
-        "load p.mem from sdcard"};
+        {1 * 8, 10 * 16 + 2, 28 * 8, 2 * 16},
+        "Load P.Mem from SD Card"};

    Button button_load_mem_defaults{
-        {0, 12 * 16 + 8, 240, 32},
-        "! reset p.mem, load defaults !"};
+        {1 * 8, 12 * 16 + 4, 28 * 8, 2 * 16},
+        "Reset P.Mem to defaults"};

    Button button_return{
        {16 * 8, 16 * 16, 12 * 8, 32},
@@ -50,7 +50,7 @@ void SigGenView::update_config() {
 }

 void SigGenView::update_tone() {
-    baseband::set_siggen_tone(symfield_tone.value_dec_u32());
+    baseband::set_siggen_tone(symfield_tone.to_integer());
 }

 void SigGenView::start_tx() {
@@ -97,8 +97,8 @@ SigGenView::SigGenView(

    field_stop.set_value(1);

-    symfield_tone.set_sym(1, 1);  // Default: 1000 Hz
-    symfield_tone.on_change = [this]() {
+    symfield_tone.set_value(1000);  // Default: 1000 Hz
+    symfield_tone.on_change = [this](SymField&) {
        if (auto_update)
            update_tone();
    };
@@ -92,9 +92,8 @@ class SigGenView : public View {
        ""};

    SymField symfield_tone{
-        {13 * 8, 7 * 8},
-        5,
-        SymField::SYMFIELD_DEC};
+        {12 * 8, 7 * 8},
+        5};

    Button button_update{
        {5 * 8, 10 * 8, 8 * 8, 3 * 8},
@@ -66,7 +66,7 @@ SondeView::SondeView(NavigationView& nav)
                  &button_see_qr,
                  &button_see_map});

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

    field_frequency.set_step(500);  // euquiq: was 10000, but we are using this for fine-tunning
@@ -40,17 +40,13 @@ SpectrumInputImageView::SpectrumInputImageView(NavigationView& nav) {
        auto open_view = nav.push<FileLoadView>(".bmp");

        constexpr auto data_directory = u"SPECTRUM";
-        if (std::filesystem::is_directory(data_directory) == false) {
-            if (make_new_directory(data_directory).ok())
-                open_view->push_dir(data_directory);
-        } else
-            open_view->push_dir(data_directory);
+        ensure_directory(data_directory);
+        open_view->push_dir(data_directory);

        open_view->on_changed = [this](std::filesystem::path new_file_path) {
            this->file = new_file_path.string();
            painted = false;
            this->set_dirty();
-
            this->on_input_avaliable();
        };
    };
@@ -35,7 +35,7 @@ namespace ui {

 void SSTVTXView::focus() {
    if (file_error)
-        nav_.display_modal("No files", "No valid bitmaps\nin /sstv directory.", ABORT, nullptr);
+        nav_.display_modal("No files", "No valid bitmaps\nin /sstv directory.", ABORT);
    else
        options_bitmaps.focus();
 }
@@ -29,14 +29,6 @@
 using namespace portapack;
 namespace fs = std::filesystem;

-namespace {
-/*void log(const std::string& msg) {
-    LogFile log{};
-    log.append("LOGS/Notepad.txt");
-    log.write_entry(msg);
-}*/
-}  // namespace
-
 namespace ui {

 /* TextViewer *******************************************************/
@@ -413,16 +405,9 @@ TextEditorView::TextEditorView(NavigationView& nav)
    };

    menu.on_open() = [this]() {
-        /*show_save_prompt([this]() {
+        show_save_prompt([this]() {
            show_file_picker();
-        });*/
-        // HACK: above should work but it's faulting.
-        if (!file_dirty_) {
-            show_file_picker();
-        } else {
-            show_save_prompt(nullptr);
-            show_file_picker(false);
-        }
+        });
    };

    menu.on_save() = [this]() {
@@ -530,16 +515,16 @@ void TextEditorView::hide_menu(bool hidden) {
    set_dirty();
 }

-void TextEditorView::show_file_picker(bool immediate) {
-    // TODO: immediate is a hack until nav_.on_pop is fixed.
-    auto open_view = immediate ? nav_.push<FileLoadView>("") : nav_.push_under_current<FileLoadView>("");
-
-    if (open_view) {
-        open_view->on_changed = [this](std::filesystem::path path) {
-            open_file(path);
+void TextEditorView::show_file_picker() {
+    auto open_view = nav_.push<FileLoadView>("");
+    open_view->on_changed = [this](std::filesystem::path path) {
+        // Can't update the UI focus while the FileLoadView is still up.
+        // Do this on a continuation instead of in on_changed.
+        nav_.set_on_pop([this, p = std::move(path)]() {
+            open_file(p);
            hide_menu();
-        };
-    }
+        });
+    };
 }

 void TextEditorView::show_edit_line() {
@@ -19,10 +19,6 @@
 * Boston, MA 02110-1301, USA.
 */

-/* TODO:
- * - Busy indicator while reading files.
- */
-
 #ifndef __UI_TEXT_EDITOR_H__
 #define __UI_TEXT_EDITOR_H__

@@ -238,7 +234,7 @@ class TextEditorView : public View {
    void refresh_ui();
    void update_position();
    void hide_menu(bool hidden = true);
-    void show_file_picker(bool immediate = true);
+    void show_file_picker();
    void show_edit_line();
    void show_save_prompt(std::function<void()> continuation);

@@ -252,8 +248,8 @@ class TextEditorView : public View {
    bool has_temp_file_{false};

    TextViewer viewer{
-        /* 272 = 320 - 16 (top bar) - 32 (bottom controls) */
-        {0, 0, 240, 272}};
+        /* 272 = screen_height - 16 (top bar) - 32 (bottom controls) */
+        {0, 0, screen_width, 272}};

    TextEditorMenu menu{};

@@ -261,7 +257,8 @@ class TextEditorView : public View {
        {26 * 8, 34 * 8, 4 * 8, 4 * 8},
        {},
        &bitmap_icon_controls,
-        Color::dark_grey()};
+        Color::dark_grey(),
+        /*vcenter*/ true};

    Text text_position{
        {0 * 8, 34 * 8, 26 * 8, 2 * 8},
@@ -138,17 +138,20 @@ ViewWavView::ViewWavView(
    reset_controls();
    button_open.on_select = [this, &nav](Button&) {
        auto open_view = nav.push<FileLoadView>(".WAV");
-        open_view->on_changed = [this](std::filesystem::path file_path) {
-            if (!wav_reader->open(file_path)) {
-                nav_.display_modal("Error", "Couldn't open file.");
-                return;
-            }
-            if ((wav_reader->channels() != 1) || (wav_reader->bits_per_sample() != 16)) {
-                nav_.display_modal("Error", "Wrong format.\nWav viewer only accepts\n16-bit mono files.");
-                return;
-            }
-            load_wav(file_path);
-            field_pos_seconds.focus();
+        open_view->on_changed = [this, &nav](std::filesystem::path file_path) {
+            // Can't show new dialogs in an on_changed handler, so use continuation.
+            nav.set_on_pop([this, &nav, file_path]() {
+                if (!wav_reader->open(file_path)) {
+                    nav_.display_modal("Error", "Couldn't open file.");
+                    return;
+                }
+                if ((wav_reader->channels() != 1) || (wav_reader->bits_per_sample() != 16)) {
+                    nav_.display_modal("Error", "Wrong format.\nWav viewer only accepts\n16-bit mono files.");
+                    return;
+                }
+                load_wav(file_path);
+                field_pos_seconds.focus();
+            });
        };
    };

@@ -189,7 +189,16 @@ void kill_afsk() {
    send_message(&message);
 }

-void set_audiotx_config(const uint32_t divider, const float deviation_hz, const float audio_gain, uint8_t audio_shift_bits_s16, const uint32_t tone_key_delta, const bool am_enabled, const bool dsb_enabled, const bool usb_enabled, const bool lsb_enabled) {
+void set_audiotx_config(
+    const uint32_t divider,
+    const float deviation_hz,
+    const float audio_gain,
+    uint8_t audio_shift_bits_s16,
+    const uint32_t tone_key_delta,
+    const bool am_enabled,
+    const bool dsb_enabled,
+    const bool usb_enabled,
+    const bool lsb_enabled) {
    const AudioTXConfigMessage message{
        divider,
        deviation_hz,
@@ -0,0 +1,117 @@
+/*
+ * 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 __BINDER_H__
+#define __BINDER_H__
+
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_widget.hpp"
+
+namespace ui {
+
+/* Default no-op binding callback. */
+struct NoOp {
+    NoOp() {}
+    template <typename T>
+    void operator()(T) const {}
+};
+
+/* The gist of the bind functions is to bind a control
+ * to a value.
+ *     bind(control, value)
+ *
+ * An optional callback can be specified which will be called
+ * when the control's value is changed.
+ *    bind(control, value, [](auto new_val) { ... });
+ *
+ * Some controls need a reference to the NavigationView so
+ * edit dialogs (like text_prompt) can be launched.
+ *    bind(control, value, nav, [](auto new_val) { ... });
+ *
+ * Be careful with lifetime of captured objects. Most things
+ * are captured by reference so the caller will need to ensure
+ * adequate lifetime of the referenced instances.
+ */
+
+template <typename T, typename Fn = NoOp>
+void bind(Checkbox& check, T& value, Fn fn = Fn{}) {
+    check.set_value(value);
+    check.on_select = [&value, fn](Checkbox&, bool b) {
+        value = b;
+        fn(value);
+    };
+}
+
+template <typename T, typename Fn = NoOp>
+void bind(NumberField& field, T& value, Fn fn = Fn{}) {
+    field.set_value(value);
+    field.on_change = [&value, fn](int32_t v) {
+        value = v;
+        fn(value);
+    };
+}
+
+template <typename T, typename Fn = NoOp>
+void bind(OptionsField& field, T& value, Fn fn = Fn{}) {
+    field.set_by_value(static_cast<int32_t>(value));
+    field.on_change = [&value, fn](size_t, auto v) {
+        value = static_cast<T>(v);
+        fn(value);
+    };
+}
+
+template <typename T, typename Fn = NoOp>
+void bind(FrequencyField& field, T& value, NavigationView& nav, Fn fn = Fn{}) {
+    field.set_value(value);
+    field.on_change = [&value, fn](rf::Frequency f) {
+        value = f;
+        fn(value);
+    };
+    field.on_edit = [&field, &value, &nav]() {
+        auto freq_view = nav.push<FrequencyKeypadView>(value);
+        freq_view->on_changed = [&field](rf::Frequency f) {
+            field.set_value(f);
+        };
+    };
+}
+
+template <typename T, typename Fn = NoOp>
+void bind(TextField& field, T& value, NavigationView& nav, Fn fn = Fn{}) {
+    field.set_text(value);
+    field.on_change = [&value, fn](TextField& tf) {
+        value = tf.get_text();
+        fn(value);
+    };
+    // text_prompt needs a mutable working buffer.
+    // Capture a new string and make the lambda mutable so it can be modified.
+    field.on_select = [&nav, buf = std::string{}](TextField& tf) mutable {
+        buf = tf.get_text();
+        text_prompt(nav, buf, /*max_length*/ 255,
+                    [&tf](std::string& str) {
+                        tf.set_text(str);
+                    });
+    };
+}
+
+}  // namespace ui
+
+#endif /*__BINDER_H__*/
@@ -325,12 +325,18 @@ uint32_t ClockManager::measure_gp_clkin_frequency() {
 }

 bool ClockManager::loss_of_signal() {
-    return hackrf_r9
-               ? clock_generator.plla_loss_of_signal()
-               : clock_generator.clkin_loss_of_signal();
+    if (hackrf_r9) {
+        const auto frequency = measure_gp_clkin_frequency();
+        return (frequency < 9850000) || (frequency > 10150000);
+    } else {
+        return clock_generator.clkin_loss_of_signal();
+    }
 }

 ClockManager::ReferenceSource ClockManager::detect_reference_source() {
+    if (portapack::persistent_memory::config_disable_external_tcxo())
+        return ReferenceSource::Xtal;
+
    if (loss_of_signal()) {
        // No external reference. Turn on PortaPack reference (if present).
        portapack_tcxo_enable();
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2023 Bernd Herzog
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config_mode.hpp"
+#include "core_control.hpp"
+#include "hackrf_gpio.hpp"
+#include "portapack_hal.hpp"
+
+void config_mode_blink_until_dfu();
+
+void config_mode_set() {
+    portapack::persistent_memory::set_config_mode_storage(CONFIG_MODE_GUARD_VALUE);
+}
+
+bool config_mode_should_enter() {
+    return portapack::persistent_memory::config_mode_storage() == CONFIG_MODE_GUARD_VALUE;
+}
+
+void config_mode_clear() {
+    portapack::persistent_memory::set_config_mode_storage(CONFIG_MODE_NORMAL_VALUE);
+}
+
+uint32_t blink_patterns[] = {
+    0x00000000,  // 0 Off
+    0xFFFFFFFF,  // 1 On
+    0xF0F0F0F0,  // 2 blink fast
+    0x00FF00FF,  // 3 blink slow
+    0xFFF3FFF3   // 4 inverse blink slow
+};
+
+void config_mode_run() {
+    configure_pins_portapack();
+    portapack::gpio_dfu.input();
+    portapack::persistent_memory::cache::init();
+
+    if (hackrf_r9) {
+        // When this runs on the hackrf r9 there likely was a crash during the last boot
+        // caused by the external tcxo. So we disable it unless the user is intentially
+        // running the config mode by pressing reset twice followed by pressing DFU.
+        auto old_disable_external_tcxo = portapack::persistent_memory::config_disable_external_tcxo();
+        portapack::persistent_memory::set_config_disable_external_tcxo(true);
+        portapack::persistent_memory::cache::persist();
+
+        config_mode_blink_until_dfu();
+
+        portapack::persistent_memory::set_config_disable_external_tcxo(old_disable_external_tcxo);
+        portapack::persistent_memory::cache::persist();
+    } else {
+        config_mode_blink_until_dfu();
+    }
+
+    auto last_dfu_btn = portapack::gpio_dfu.read();
+
+    int32_t counter = 0;
+    int8_t blink_pattern_value = portapack::persistent_memory::config_cpld() +
+                                 (portapack::persistent_memory::config_disable_external_tcxo() ? 5 : 0);
+
+    while (true) {
+        auto dfu_btn = portapack::gpio_dfu.read();
+        auto dfu_clicked = last_dfu_btn == true && dfu_btn == false;
+        last_dfu_btn = dfu_btn;
+
+        if (dfu_clicked) {
+            int8_t value = portapack::persistent_memory::config_cpld() +
+                           (portapack::persistent_memory::config_disable_external_tcxo() ? 5 : 0);
+
+            blink_pattern_value = value = (value + 1) % 10;
+
+            portapack::persistent_memory::set_config_cpld(value % 5);
+            portapack::persistent_memory::set_config_disable_external_tcxo((value / 5) == 1);
+
+            portapack::persistent_memory::cache::persist();
+        }
+
+        auto tx_blink_pattern = blink_patterns[blink_pattern_value % 5];
+        auto rx_blink_pattern = blink_patterns[blink_pattern_value / 5];
+
+        auto tx_value = ((tx_blink_pattern >> ((counter >> 0) & 31)) & 0x1) == 0x1;
+        if (tx_value) {
+            hackrf::one::led_tx.on();
+        } else {
+            hackrf::one::led_tx.off();
+        }
+
+        auto rx_value = ((rx_blink_pattern >> ((counter >> 0) & 31)) & 0x1) == 0x1;
+        if (rx_value) {
+            hackrf::one::led_rx.on();
+        } else {
+            hackrf::one::led_rx.off();
+        }
+
+        chThdSleepMilliseconds(100);
+        counter++;
+    }
+}
+
+void config_mode_blink_until_dfu() {
+    while (true) {
+        hackrf::one::led_tx.on();
+        hackrf::one::led_rx.on();
+        hackrf::one::led_usb.on();
+        chThdSleepMilliseconds(10);
+
+        hackrf::one::led_tx.off();
+        hackrf::one::led_rx.off();
+        hackrf::one::led_usb.off();
+        chThdSleepMilliseconds(115);
+
+        auto dfu_btn = portapack::gpio_dfu.read();
+        if (dfu_btn)
+            break;
+    }
+
+    while (true) {
+        chThdSleepMilliseconds(10);
+
+        auto dfu_btn = portapack::gpio_dfu.read();
+        if (!dfu_btn)
+            break;
+    }
+
+    chThdSleepMilliseconds(10);
+}
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2023 Bernd Herzog
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __CONFIG_MODE_H__
+#define __CONFIG_MODE_H__
+
+#include "ch.h"
+
+#include "portapack.hpp"
+#include "portapack_shared_memory.hpp"
+#include "portapack_persistent_memory.hpp"
+
+void config_mode_set();
+bool config_mode_should_enter();
+void config_mode_clear();
+
+void config_mode_run();
+
+#endif /* __CONFIG_MODE_H__ */
@@ -292,8 +292,7 @@ std::filesystem::filesystem_error rename_file(
 std::filesystem::filesystem_error copy_file(
    const std::filesystem::path& file_path,
    const std::filesystem::path& dest_path) {
-    // 512 seems to be the largest block size FatFS likes.
-    constexpr size_t buffer_size = 512;
+    constexpr size_t buffer_size = std::filesystem::max_file_block_size;
    uint8_t buffer[buffer_size];
    File src;
    File dst;
@@ -173,6 +173,9 @@ uint8_t capture_file_sample_size(const path& filename);

 using file_status = BYTE;

+/* The largest block that can be read/written to a file. */
+constexpr uint16_t max_file_block_size = 512;
+
 static_assert(sizeof(path::value_type) == 2, "sizeof(std::filesystem::path::value_type) != 2");
 static_assert(sizeof(path::value_type) == sizeof(TCHAR), "FatFs TCHAR size != std::filesystem::path::value_type");

@@ -298,6 +301,7 @@ static_assert(sizeof(FIL::err) == 1, "FatFs FIL::err size not expected.");
 #define FR_BAD_SEEK (0x102)
 #define FR_UNEXPECTED (0x103)

+/* NOTE: sizeof(File) == 556 bytes because of the FIL's buf member. */
 class File {
   public:
    using Size = uint64_t;
@@ -0,0 +1,195 @@
+/*
+ * 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 "iq_trim.hpp"
+
+#include <memory>
+#include "string_format.hpp"
+
+namespace fs = std::filesystem;
+
+namespace iq {
+
+/* Trimming helpers based on the sample type (complex8 or complex16). */
+template <typename T>
+uint32_t power(T value) {
+    auto real = value.real();
+    auto imag = value.imag();
+    return (real * real) + (imag * imag);
+}
+
+/* Collects capture file metadata and sample power buckets. */
+template <typename T>
+Optional<CaptureInfo> profile_capture(
+    const std::filesystem::path& path,
+    PowerBuckets& buckets,
+    uint8_t samples_per_bucket) {
+    File f;
+    auto error = f.open(path);
+    if (error)
+        return {};
+
+    CaptureInfo info{
+        .file_size = f.size(),
+        .sample_count = f.size() / sizeof(T),
+        .sample_size = sizeof(T),
+        .max_power = 0};
+
+    auto profile_samples = buckets.size * samples_per_bucket;
+    auto sample_interval = info.sample_count / profile_samples;
+    uint32_t bucket_width = std::max(1ULL, info.sample_count / buckets.size);
+    uint64_t sample_index = 0;
+    T value{};
+
+    while (true) {
+        f.seek(sample_index * info.sample_size);
+        auto result = f.read(&value, info.sample_size);
+        if (!result) return {};  // Read failed.
+
+        if (*result != info.sample_size)
+            break;  // EOF
+
+        auto mag_squared = power(value);
+
+        if (mag_squared > info.max_power)
+            info.max_power = mag_squared;
+
+        auto bucket_index = sample_index / bucket_width;
+        buckets.add(bucket_index, mag_squared);
+        sample_index += sample_interval;
+    }
+
+    return info;
+}
+
+Optional<CaptureInfo> profile_capture(
+    const fs::path& path,
+    PowerBuckets& buckets,
+    uint8_t samples_per_bucket) {
+    auto sample_size = fs::capture_file_sample_size(path);
+
+    switch (sample_size) {
+        case sizeof(complex16_t):
+            return profile_capture<complex16_t>(path, buckets, samples_per_bucket);
+
+        case sizeof(complex8_t):
+            return profile_capture<complex8_t>(path, buckets, samples_per_bucket);
+
+        default:
+            return {};
+    };
+}
+
+TrimRange compute_trim_range(
+    CaptureInfo info,
+    const PowerBuckets& buckets,
+    uint8_t cutoff_percent) {
+    bool has_start = false;
+    uint8_t start_bucket = 0;
+    uint8_t end_bucket = 0;
+
+    uint32_t power_cutoff = cutoff_percent * static_cast<uint64_t>(info.max_power) / 100;
+
+    for (size_t i = 0; i < buckets.size; ++i) {
+        auto power = buckets.p[i].power;
+
+        if (power > power_cutoff) {
+            if (has_start)
+                end_bucket = i;
+            else {
+                start_bucket = i;
+                end_bucket = i;
+                has_start = true;
+            }
+        }
+    }
+
+    // End should be the first bucket after the last with signal.
+    // This makes the math downstream simpler. NB: may be > buckets.size.
+    end_bucket++;
+
+    auto samples_per_bucket = info.sample_count / buckets.size;
+    return {
+        start_bucket * samples_per_bucket,
+        end_bucket * samples_per_bucket,
+        info.sample_size};
+}
+
+bool trim_capture_with_range(
+    const fs::path& path,
+    TrimRange range,
+    const std::function<void(uint8_t)>& on_progress) {
+    constexpr size_t buffer_size = std::filesystem::max_file_block_size;
+    uint8_t buffer[buffer_size];
+    auto temp_path = path + u"-tmp";
+
+    // end_sample is the first sample to _not_ include.
+    auto start_byte = range.start_sample * range.sample_size;
+    auto end_byte = (range.end_sample * range.sample_size);
+    auto length = end_byte - start_byte;
+
+    // 'File' is 556 bytes! Heap alloc to avoid overflowing the stack.
+    auto src = std::make_unique<File>();
+    auto dst = std::make_unique<File>();
+
+    auto error = src->open(path);
+    if (error) return false;
+
+    error = dst->create(temp_path);
+    if (error) return false;
+
+    src->seek(start_byte);
+    auto processed = 0UL;
+    auto next_report = 0UL;
+    auto report_interval = length / 20UL;
+
+    while (true) {
+        auto result = src->read(buffer, buffer_size);
+        if (result.is_error()) return false;
+
+        auto remaining = length - processed;
+        auto to_write = std::min(remaining, *result);
+
+        result = dst->write(buffer, to_write);
+        if (result.is_error()) return false;
+
+        processed += *result;
+
+        if (*result < buffer_size || processed >= length)
+            break;
+
+        if (processed >= next_report) {
+            on_progress(100 * processed / length);
+            next_report += report_interval;
+        }
+    }
+
+    // Close files before renaming/deleting.
+    src.reset();
+    dst.reset();
+
+    // Delete original and overwrite with temp file.
+    delete_file(path);
+    rename_file(temp_path, path);
+    return true;
+}
+
+}  // namespace iq
@@ -0,0 +1,93 @@
+/*
+ * 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 __IQ_TRIM_H__
+#define __IQ_TRIM_H__
+
+#include "complex.hpp"
+#include "file.hpp"
+#include "optional.hpp"
+
+#include <functional>
+#include <limits>
+
+namespace iq {
+
+/* Information about a capture. */
+struct CaptureInfo {
+    uint64_t file_size;
+    uint64_t sample_count;
+    uint8_t sample_size;
+    uint32_t max_power;
+};
+
+/* Holds sample average power by bucket. */
+struct PowerBuckets {
+    struct Bucket {
+        uint32_t power = 0;
+        uint8_t count = 0;
+    };
+
+    Bucket* p = nullptr;
+    const size_t size = 0;
+
+    /* Add the power to the bucket average at index. */
+    void add(size_t index, uint32_t power) {
+        if (index < size) {
+            auto& b = p[index];
+            auto avg = static_cast<uint64_t>(b.power) * b.count;
+
+            b.count++;
+            b.power = (power + avg) / b.count;
+        }
+    }
+};
+
+/* Data needed to trim a capture by sample range.
+ * end_sample is the sample *after* the last to keep. */
+struct TrimRange {
+    uint64_t start_sample;
+    uint64_t end_sample;
+    uint8_t sample_size;
+};
+
+/* Collects capture file metadata and samples power buckets. */
+Optional<CaptureInfo> profile_capture(
+    const std::filesystem::path& path,
+    PowerBuckets& buckets,
+    uint8_t samples_per_bucket = 10);
+
+/* Computes the trimming range given profiling info.
+ * Cutoff percent is a number 1-100. */
+TrimRange compute_trim_range(
+    CaptureInfo info,
+    const PowerBuckets& buckets,
+    uint8_t cutoff_percent);
+
+/* Trims the capture file with the specified range. */
+bool trim_capture_with_range(
+    const std::filesystem::path& path,
+    TrimRange range,
+    const std::function<void(uint8_t)>& on_progress);
+
+}  // namespace iq
+
+#endif /*__IQ_TRIM_H__*/
@@ -115,6 +115,7 @@ Continuous (Fox-oring)

 #include "portapack.hpp"
 #include "portapack_shared_memory.hpp"
+#include "config_mode.hpp"

 #include "message_queue.hpp"

@@ -161,9 +162,17 @@ static void event_loop() {
 }

 int main(void) {
+    if (config_mode_should_enter()) {
+        config_mode_clear();
+        config_mode_run();
+    }
+
+    config_mode_set();
+
    first_if.init(); /* To avoid initial short Ant_DC_Bias pulse ,we need quick set up GP01_RFF507X =1 */
    if (portapack::init()) {
        portapack::display.init();
+        config_mode_clear();

        // sdcStart(&SDCD1, nullptr); // Commented out as now happens in portapack.cpp

@@ -408,6 +408,10 @@ bool init() {

    portapack::io.init();

+    /* Cache some configuration data from persistent memory. */
+    persistent_memory::cache::init();
+    chThdSleepMilliseconds(10);
+
    clock_manager.init_clock_generator();

    i2c0.stop();
@@ -467,9 +471,6 @@ bool init() {
    controls_init();
    chThdSleepMilliseconds(10);

-    /* Cache some configuration data from persistent memory. */
-    persistent_memory::cache::init();
-
    clock_manager.set_reference_ppb(persistent_memory::correction_ppb());
    clock_manager.enable_if_clocks();
    clock_manager.enable_codec_clocks();
@@ -21,6 +21,8 @@

 #include "string_format.hpp"

+using namespace std::literals;
+
 /* This takes a pointer to the end of a buffer
 * and fills it backwards towards the front.
 * The return value 'q' is a pointer to the start.
@@ -230,29 +232,31 @@ std::string to_string_time_ms(const uint32_t ms) {
    return final_str;
 }

-static void to_string_hex_internal(char* p, const uint64_t n, const int32_t l) {
-    const uint32_t d = n & 0xf;
-    p[l] = (d > 9) ? (d + 55) : (d + 48);
-    if (l > 0) {
-        to_string_hex_internal(p, n >> 4, l - 1);
-    }
+static char* to_string_hex_internal(char* ptr, uint64_t value, uint8_t length) {
+    if (length == 0)
+        return ptr;
+
+    *(--ptr) = uint_to_char(value & 0xF, 16);
+    return to_string_hex_internal(ptr, value >> 4, length - 1);
 }

-std::string to_string_hex(const uint64_t n, int32_t l) {
-    char p[32];
+std::string to_string_hex(uint64_t value, int32_t length) {
+    constexpr uint8_t buffer_length = 33;
+    char buffer[buffer_length];

-    l = std::min<int32_t>(l, 31);
-    to_string_hex_internal(p, n, l - 1);
-    p[l] = 0;
-    return p;
+    char* ptr = &buffer[buffer_length - 1];
+    *ptr = '\0';
+
+    length = std::min<uint8_t>(buffer_length - 1, length);
+    return to_string_hex_internal(ptr, value, length);
 }

-std::string to_string_hex_array(uint8_t* const array, const int32_t l) {
-    std::string str_return = "";
-    uint8_t bytes;
+std::string to_string_hex_array(uint8_t* array, int32_t length) {
+    std::string str_return;
+    str_return.reserve(length);

-    for (bytes = 0; bytes < l; bytes++)
-        str_return += to_string_hex(array[bytes], 2);
+    for (uint8_t i = 0; i < length; i++)
+        str_return += to_string_hex(array[i], 2);

    return str_return;
 }
@@ -307,10 +311,10 @@ std::string to_string_file_size(uint32_t file_size) {
    return to_string_dec_uint(file_size) + suffix[suffix_index];
 }

-std::string unit_auto_scale(double n, const uint32_t base_nano, uint32_t precision) {
+std::string unit_auto_scale(double n, const uint32_t base_unit, uint32_t precision) {
    const uint32_t powers_of_ten[5] = {1, 10, 100, 1000, 10000};
    std::string string{""};
-    uint32_t prefix_index = base_nano;
+    uint32_t prefix_index = base_unit;
    double integer_part;
    double fractional_part;

@@ -364,3 +368,26 @@ 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)};
 }
+
+uint8_t char_to_uint(char c, uint8_t radix) {
+    uint8_t v = 0;
+
+    if (c >= '0' && c <= '9')
+        v = c - '0';
+    else if (c >= 'A' && c <= 'F')
+        v = c - 'A' + 10;  // A is dec: 10
+    else if (c >= 'a' && c <= 'f')
+        v = c - 'a' + 10;  // A is dec: 10
+
+    return v < radix ? v : 0;
+}
+
+char uint_to_char(uint8_t val, uint8_t radix) {
+    if (val >= radix)
+        return 0;
+
+    if (val < 10)
+        return '0' + val;
+    else
+        return 'A' + val - 10;  // A is dec: 10
+}
@@ -50,14 +50,19 @@ char* to_string_dec_uint(uint64_t n, StringFormatBuffer& buffer, size_t& length)
 std::string to_string_dec_int(int64_t n);
 std::string to_string_dec_uint(uint64_t n);

-// TODO: Allow l=0 to not fill/justify? Already using this way in ui_spectrum.hpp...
 std::string to_string_bin(const uint32_t n, const uint8_t l = 0);
 std::string to_string_dec_uint(const uint32_t n, const int32_t l, const char fill = ' ');
 std::string to_string_dec_int(const int32_t n, const int32_t l, const char fill = 0);
 std::string to_string_decimal(float decimal, int8_t precision);

-std::string to_string_hex(const uint64_t n, const int32_t l = 0);
-std::string to_string_hex_array(uint8_t* const array, const int32_t l = 0);
+std::string to_string_hex(uint64_t n, int32_t length);
+std::string to_string_hex_array(uint8_t* array, int32_t length);
+
+/* Helper to select length based on type size. */
+template <typename T>
+std::string to_string_hex(T n) {
+    return to_string_hex(n, sizeof(T) * 2);  // Two digits/byte.
+}

 std::string to_string_freq(const uint64_t f);
 std::string to_string_short_freq(const uint64_t f);
@@ -71,11 +76,21 @@ std::string to_string_FAT_timestamp(const FATTimestamp& timestamp);
 // Gets a human readable file size string.
 std::string to_string_file_size(uint32_t file_size);

-std::string unit_auto_scale(double n, const uint32_t base_nano, uint32_t precision);
+/* Scales 'n' to be a value less than 1000. 'base_unit' is the index of the unit from
+ * 'unit_prefix' that 'n' is in initially. 3 is the index of the '1s' unit. */
+std::string unit_auto_scale(double n, const uint32_t base_unit, uint32_t precision);
 double get_decimals(double num, int16_t mult, bool round = false);

 std::string trim(std::string_view str);   // Remove whitespace at ends.
 std::string trimr(std::string_view str);  // Remove trailing spaces
 std::string truncate(std::string_view, size_t length);

+/* Gets the int value for a character given the radix.
+ * e.g. '5' => 5, 'D' => 13. Out of bounds => 0. */
+uint8_t char_to_uint(char c, uint8_t radix = 10);
+
+/* Gets the int value for a character given the radix.
+ * e.g. 5 => '5', 13 => 'D'. Out of bounds => '\0'. */
+char uint_to_char(uint8_t val, uint8_t radix = 10);
+
 #endif /*__STRING_FORMAT_H__*/
@@ -82,7 +82,8 @@ class AlphanumView : public TextEntryView {
        {192, 214, screen_width / 5, 38},
        {},
        &bitmap_icon_shift,
-        Color::dark_grey()};
+        Color::dark_grey(),
+        /*vcenter*/ true};

    Labels labels{
        {{1 * 8, 33 * 8}, "Raw:", Color::light_grey()},
@@ -413,7 +413,7 @@ void GeoMapView::focus() {
    geopos.focus();

    if (!map_opened)
-        nav_.display_modal("No map", "No world_map.bin file in\n/ADSB/ directory", ABORT, nullptr);
+        nav_.display_modal("No map", "No world_map.bin file in\n/ADSB/ directory", ABORT);
 }

 void GeoMapView::update_position(float lat, float lon, uint16_t angle, int32_t altitude) {
@@ -273,9 +273,8 @@ FrequencyKeypadView::FrequencyKeypadView(
    };

    button_close.on_select = [this, &nav](Button&) {
-        if (on_changed) {
+        if (on_changed)
            on_changed(this->value());
-        }
        nav.pop();
    };

@@ -41,20 +41,12 @@ void text_prompt(
    uint32_t cursor_pos,
    size_t max_length,
    std::function<void(std::string&)> on_done) {
-    // if (persistent_memory::ui_config_textentry() == 0) {
    auto te_view = nav.push<AlphanumView>(str, max_length);
    te_view->set_cursor(cursor_pos);
    te_view->on_changed = [on_done](std::string& value) {
        if (on_done)
            on_done(value);
    };
-    /*} else {
-                auto te_view = nav.push<HandWriteView>(str, max_length);
-                te_view->on_changed = [on_done](std::string * value) {
-                        if (on_done)
-                                on_done(value);
-                };
-        }*/
 }

 /* TextEntryView ***********************************************************/
@@ -32,8 +32,25 @@

 using namespace portapack;

+#define POWER_THRESHOLD_HIGH 47
+#define POWER_THRESHOLD_MED 38
+#define POWER_THRESHOLD_LOW 17
+
 namespace ui {

+/* Gets a style indicating total TX gain level. */
+static const Style* get_style_for_gain(uint8_t tot_gain) {
+    if (tot_gain > POWER_THRESHOLD_HIGH) return &Styles::red;
+
+    if (tot_gain > POWER_THRESHOLD_MED)
+        return &Styles::orange;
+
+    if (tot_gain > POWER_THRESHOLD_LOW)
+        return &Styles::yellow;
+
+    return nullptr;  // Uses default.
+}
+
 /* TransmitterView *******************************************************/

 void TransmitterView::paint(Painter& painter) {
@@ -73,21 +90,13 @@ void TransmitterView::on_tx_amp_changed(bool rf_amp) {
 }

 void TransmitterView::update_gainlevel_styles() {
-    const Style* new_style_ptr = NULL;
    int8_t tot_gain = transmitter_model.tx_gain() + (transmitter_model.rf_amp() ? 14 : 0);
+    auto style = get_style_for_gain(tot_gain);

-    if (tot_gain > POWER_THRESHOLD_HIGH) {
-        new_style_ptr = &style_power_high;
-    } else if (tot_gain > POWER_THRESHOLD_MED) {
-        new_style_ptr = &style_power_med;
-    } else if (tot_gain > POWER_THRESHOLD_LOW) {
-        new_style_ptr = &style_power_low;
-    }
-
-    field_gain.set_style(new_style_ptr);
-    text_gain.set_style(new_style_ptr);
-    field_amp.set_style(new_style_ptr);
-    text_amp.set_style(new_style_ptr);
+    field_gain.set_style(style);
+    text_gain.set_style(style);
+    field_amp.set_style(style);
+    text_amp.set_style(style);
 }

 void TransmitterView::set_transmitting(const bool transmitting) {
@@ -186,89 +195,66 @@ TransmitterView::TransmitterView(
 }

 TransmitterView::~TransmitterView() {
+    // TODO: Does this make sense? Seems wrong to have
+    // what's basically a widget control the radio.
    audio::output::stop();
    transmitter_model.disable();
    baseband::shutdown();
 }

 /* TransmitterView2 *******************************************************/
-/* Simpler transmitter view that only renders TX Gain and Amp.
- * There are two modes, NORMAL_UI and SHORT_UI. SHORT_UI abbreviates control labels. */
-void TransmitterView2::paint(Painter&) {
-    // All widgets paint themselves. Don't let base paint.
-}

-void TransmitterView2::on_tx_gain_changed(int32_t tx_gain) {
-    transmitter_model.set_tx_gain(tx_gain);
-    update_gainlevel_styles();
-}
+TransmitterView2::TransmitterView2(Point pos, bool short_ui) {
+    // There are two modes, short and !short
+    // Short:  "G:XX A:YY"
+    // !Short: "Gain:XX Amp:YY"
+
+    Dim width = short_ui ? (9 * 8) : (14 * 8);
+    set_parent_rect({pos, {width, 16}});
+
+    add_children({
+        &text_labels,
+        &field_gain,
+        &field_amp,
+    });
+
+    // Set up controls depending UI mode.
+    text_labels.set(short_ui ? "G:   A:" : "Gain:   Amp:");
+    text_labels.set_parent_rect(
+        short_ui
+            ? Rect{0 * 8, 0 * 16, 7 * 8, 1 * 16}
+            : Rect{0 * 8, 0 * 16, 12 * 8, 1 * 16});
+    field_gain.set_parent_rect(
+        short_ui
+            ? Rect{2 * 8, 0 * 16, 2 * 8, 1 * 16}
+            : Rect{5 * 8, 0 * 16, 2 * 8, 1 * 16});
+    field_amp.set_parent_rect(
+        short_ui
+            ? Rect{7 * 8, 0 * 16, 2 * 8, 1 * 16}
+            : Rect{12 * 8, 0 * 16, 2 * 8, 1 * 16});
+
+    field_gain.set_value(transmitter_model.tx_gain());
+    field_gain.on_change = [this](uint32_t tx_gain) {
+        transmitter_model.set_tx_gain(tx_gain);
+        update_gainlevel_styles();
+    };
+
+    field_amp.set_value(transmitter_model.rf_amp() ? 14 : 0);
+    field_amp.on_change = [this](uint32_t rf_amp) {
+        transmitter_model.set_rf_amp(rf_amp > 0);
+        update_gainlevel_styles();
+    };

-void TransmitterView2::on_tx_amp_changed(bool rf_amp) {
-    transmitter_model.set_rf_amp(rf_amp);
    update_gainlevel_styles();
 }

 void TransmitterView2::update_gainlevel_styles() {
-    const Style* new_style_ptr = NULL;
    int8_t tot_gain = transmitter_model.tx_gain() + (transmitter_model.rf_amp() ? 14 : 0);
+    auto style = get_style_for_gain(tot_gain);

-    if (tot_gain > POWER_THRESHOLD_HIGH) {
-        new_style_ptr = &style_power_high;
-    } else if (tot_gain > POWER_THRESHOLD_MED) {
-        new_style_ptr = &style_power_med;
-    } else if (tot_gain > POWER_THRESHOLD_LOW) {
-        new_style_ptr = &style_power_low;
-    }
-
-    field_gain.set_style(new_style_ptr);
-    text_gain_amp.set_style(new_style_ptr);
-    field_amp.set_style(new_style_ptr);
-
-    field_gain_short_UI.set_style(new_style_ptr);
-    text_gain_amp_short_UI.set_style(new_style_ptr);
-    field_amp_short_UI.set_style(new_style_ptr);
-}
-
-void TransmitterView2::on_show() {
-    field_gain.set_value(transmitter_model.tx_gain());
-    field_amp.set_value(transmitter_model.rf_amp() ? 14 : 0);
-
-    field_gain_short_UI.set_value(transmitter_model.tx_gain());
-    field_amp_short_UI.set_value(transmitter_model.rf_amp() ? 14 : 0);
-
-    update_gainlevel_styles();
-}
-
-TransmitterView2::TransmitterView2(const Coord x, const Coord y, bool short_UI) {
-    set_parent_rect({x, y, 20 * 8, 1 * 8});
-
-    add_children({
-        &(short_UI ? text_gain_amp_short_UI : text_gain_amp),
-        &(short_UI ? field_gain_short_UI : field_gain),
-        &(short_UI ? field_amp_short_UI : field_amp),
-    });
-
-    if (short_UI) {
-        field_gain_short_UI.on_change = [this](uint32_t tx_gain) {
-            on_tx_gain_changed(tx_gain);
-        };
-        field_amp_short_UI.on_change = [this](uint32_t rf_amp) {
-            on_tx_amp_changed((bool)rf_amp);
-        };
-    } else {
-        field_gain.on_change = [this](uint32_t tx_gain) {
-            on_tx_gain_changed(tx_gain);
-        };
-        field_amp.on_change = [this](uint32_t rf_amp) {
-            on_tx_amp_changed((bool)rf_amp);
-        };
-    }
-}
-
-TransmitterView2::~TransmitterView2() {
-    audio::output::stop();
-    transmitter_model.disable();
-    baseband::shutdown();
+    text_labels.set_style(style);
+    field_gain.set_style(style);
+    field_amp.set_style(style);
 }

 } /* namespace ui */
@@ -26,9 +26,9 @@
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_painter.hpp"
+#include "ui_receiver.hpp"
 #include "ui_styles.hpp"
 #include "ui_widget.hpp"
-#include "ui_receiver.hpp"

 #include "rf_path.hpp"

@@ -37,10 +37,6 @@
 #include <algorithm>
 #include <functional>

-#define POWER_THRESHOLD_HIGH 47
-#define POWER_THRESHOLD_MED 38
-#define POWER_THRESHOLD_LOW 17
-
 namespace ui {

 class TXGainField : public NumberField {
@@ -74,11 +70,8 @@ class TransmitterView : public View {

   private:
    const Style& style_start = Styles::green;
-    const Style style_stop = Styles::red;
-    const Style style_locked = Styles::dark_grey;
-    const Style style_power_low = Styles::yellow;
-    const Style style_power_med = Styles::orange;
-    const Style style_power_high = Styles::red;
+    const Style& style_stop = Styles::red;
+    const Style& style_locked = Styles::dark_grey;

    bool lock_{false};
    bool transmitting_{false};
@@ -134,60 +127,32 @@ class TransmitterView : public View {
    void update_gainlevel_styles(void);
 };

+/* Simpler transmitter view that only renders TX Gain and Amp.
+ * When short_UI is set it abbreviates control labels. */
 class TransmitterView2 : public View {
   public:
-    TransmitterView2(const Coord x, const Coord y, bool short_UI);
-
-    ~TransmitterView2();
-
-    void on_show() override;
-    void paint(Painter& painter) override;
+    TransmitterView2(Point pos, bool short_ui);

   private:
-    const Style& style_power_low = Styles::yellow;
-    const Style& style_power_med = Styles::orange;
-    const Style& style_power_high = Styles::red;
-
-    Text text_gain_amp{
-        {0, 3 * 8, 5 * 8, 1 * 16},
-        "Gain:   Amp:"};
+    Text text_labels{
+        {},  // Set in ctor.
+        {}};

    NumberField field_gain{
-        {5 * 8, 3 * 8},
+        {},  // Set in ctor.
        2,
        {max2837::tx::gain_db_range.minimum, max2837::tx::gain_db_range.maximum},
        max2837::tx::gain_db_step,
        ' '};

    NumberField field_amp{
-        {12 * 8, 3 * 8},
+        {},  // Set in ctor.
        2,
        {0, 14},
        14,
        ' '};

-    Text text_gain_amp_short_UI{
-        {0, (3 * 8), 5 * 8, 1 * 16},
-        "Gain   A:"};
-
-    NumberField field_gain_short_UI{
-        {(4 * 8) + 2, 3 * 8},
-        2,
-        {max2837::tx::gain_db_range.minimum, max2837::tx::gain_db_range.maximum},
-        max2837::tx::gain_db_step,
-        ' '};
-
-    NumberField field_amp_short_UI{
-        {(9 * 8) - 2, 3 * 8},
-        2,
-        {0, 14},
-        14,
-        ' '};
-
-    void on_tx_gain_changed(int32_t tx_gain);
-    void on_tx_amp_changed(bool rf_amp);
-
-    void update_gainlevel_styles(void);
+    void update_gainlevel_styles();
 };

 } /* namespace ui */
@@ -24,60 +24,62 @@

 // #include "modules.h"

-#include "portapack.hpp"
-#include "event_m0.hpp"
-#include "bmp_splash.hpp"
 #include "bmp_modal_warning.hpp"
+#include "bmp_splash.hpp"
+#include "event_m0.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "portapack_shared_memory.hpp"
+#include "portapack.hpp"

 #include "ui_about_simple.hpp"
 #include "ui_adsb_rx.hpp"
 #include "ui_adsb_tx.hpp"
 #include "ui_afsk_rx.hpp"
 #include "ui_aprs_rx.hpp"
-#include "ui_btle_rx.hpp"
-#include "ui_nrf_rx.hpp"
 #include "ui_aprs_tx.hpp"
 #include "ui_bht_tx.hpp"
+#include "ui_btle_rx.hpp"
 #include "ui_coasterp.hpp"
 #include "ui_debug.hpp"
 #include "ui_encoders.hpp"
 #include "ui_fileman.hpp"
+#include "ui_flash_utility.hpp"
 #include "ui_font_fixed_8x16.hpp"
 #include "ui_freqman.hpp"
+#include "ui_iq_trim.hpp"
 #include "ui_jammer.hpp"
 // #include "ui_keyfob.hpp"
 #include "ui_lcr.hpp"
+#include "ui_level.hpp"
+#include "ui_looking_glass_app.hpp"
 #include "ui_mictx.hpp"
 #include "ui_morse.hpp"
+#include "ui_nrf_rx.hpp"
 // #include "ui_numbers.hpp"
 // #include "ui_nuoptix.hpp"
 // #include "ui_playdead.hpp"
+#include "ui_playlist.hpp"
 #include "ui_pocsag_tx.hpp"
 #include "ui_rds.hpp"
+#include "ui_recon.hpp"
 #include "ui_remote.hpp"
 #include "ui_scanner.hpp"
-#include "ui_search.hpp"
-#include "ui_recon.hpp"
-#include "ui_level.hpp"
+#include "ui_sd_over_usb.hpp"
 #include "ui_sd_wipe.hpp"
+#include "ui_search.hpp"
 #include "ui_settings.hpp"
 #include "ui_siggen.hpp"
 #include "ui_sonde.hpp"
+#include "ui_spectrum_painter.hpp"
+#include "ui_ss_viewer.hpp"
 #include "ui_sstvtx.hpp"
 #include "ui_styles.hpp"
 // #include "ui_test.hpp"
 #include "ui_text_editor.hpp"
 #include "ui_tone_search.hpp"
 #include "ui_touchtunes.hpp"
-#include "ui_playlist.hpp"
 #include "ui_view_wav.hpp"
 #include "ui_whipcalc.hpp"
-#include "ui_flash_utility.hpp"
-#include "ui_sd_over_usb.hpp"
-#include "ui_spectrum_painter.hpp"
-#include "ui_ss_viewer.hpp"

 // #include "acars_app.hpp"
 #include "ais_app.hpp"
@@ -85,16 +87,16 @@
 #include "analog_tv_app.hpp"
 #include "capture_app.hpp"
 #include "ert_app.hpp"
+#include "gps_sim_app.hpp"
 #include "lge_app.hpp"
 #include "pocsag_app.hpp"
 #include "replay_app.hpp"
-#include "gps_sim_app.hpp"
 #include "soundboard_app.hpp"
 #include "tpms_app.hpp"

 #include "core_control.hpp"
-#include "ui_looking_glass_app.hpp"
 #include "file.hpp"
+#include "file_reader.hpp"
 #include "png_writer.hpp"

 using portapack::receiver_model;
@@ -302,17 +304,18 @@ void SystemStatusView::on_converter() {

 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();
@@ -404,15 +407,21 @@ View* NavigationView::push_view(std::unique_ptr<View> new_view) {
    return p;
 }

-void NavigationView::pop() {
-    pop(true);
-}
+void NavigationView::pop(bool trigger_update) {
+    // Don't pop off the NavView.
+    if (view_stack.size() <= 1)
+        return;

-void NavigationView::pop_modal() {
-    // Pop modal view + underlying app view.
-    // TODO: this shouldn't be necessary.
-    pop(false);
-    pop(true);
+    auto on_pop = view_stack.back().on_pop;
+
+    free_view();
+    view_stack.pop_back();
+
+    // NB: These are executed _after_ the view has been
+    // destroyed. The old view MUST NOT be referenced in
+    // these callbacks or it will cause crashes.
+    if (trigger_update) update_view();
+    if (on_pop) on_pop();
 }

 void NavigationView::display_modal(
@@ -424,49 +433,33 @@ void NavigationView::display_modal(
 void NavigationView::display_modal(
    const std::string& title,
    const std::string& message,
-    const modal_t type,
-    const std::function<void(bool)> on_choice) {
-    /* If a modal view is already visible, don't display another */
-    if (!modal_view) {
-        modal_view = push<ModalMessageView>(title, message, type, on_choice);
-    }
-}
-
-void NavigationView::pop(bool update) {
-    if (view() == modal_view) {
-        modal_view = nullptr;
-    }
-
-    // Can't pop last item from stack.
-    if (view_stack.size() > 1) {
-        auto on_pop = view_stack.back().on_pop;
-
-        free_view();
-        view_stack.pop_back();
-
-        if (update)
-            update_view();
-
-        if (on_pop) on_pop();
-    }
+    modal_t type,
+    std::function<void(bool)> on_choice) {
+    push<ModalMessageView>(title, message, type, on_choice);
 }

 void NavigationView::free_view() {
+    // The focus_manager holds a raw pointer to the currently focused Widget.
+    // It then tries to call blur() on that instance when the focus is changed.
+    // This causes crashes if focused_widget has been deleted (as is the case
+    // when a view is popped). Calling blur() here resets the focus_manager's
+    // focus_widget pointer so focus can be called safely.
+    this->blur();
    remove_child(view());
 }

 void NavigationView::update_view() {
-    const auto new_view = view_stack.back().view.get();
+    const auto& top = view_stack.back();
+    auto top_view = top.view.get();

-    add_child(new_view);
-    new_view->set_parent_rect({{0, 0}, size()});
+    add_child(top_view);
+    top_view->set_parent_rect({{0, 0}, size()});

    focus();
    set_dirty();

-    if (on_view_changed) {
-        on_view_changed(*new_view);
-    }
+    if (on_view_changed)
+        on_view_changed(*top_view);
 }

 Widget* NavigationView::view() const {
@@ -474,9 +467,8 @@ Widget* NavigationView::view() const {
 }

 void NavigationView::focus() {
-    if (view()) {
+    if (view())
        view()->focus();
-    }
 }

 bool NavigationView::set_on_pop(std::function<void()> on_pop) {
@@ -498,30 +490,28 @@ ReceiversMenuView::ReceiversMenuView(NavigationView& nav) {
        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
+        // {"ACARS", Color::yellow(), &bitmap_icon_adsb, [&nav](){ nav.push<ACARSAppView>(); }},
        {"ADS-B", Color::green(), &bitmap_icon_adsb, [&nav]() { nav.push<ADSBRxView>(); }},
-        //{ "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>(); }},
+        {"AIS Boats", Color::green(), &bitmap_icon_ais, [&nav]() { nav.push<AISAppView>(); }},
        {"Analog TV", Color::yellow(), &bitmap_icon_sstv, [&nav]() { nav.push<AnalogTvView>(); }},
+        {"APRS", Color::green(), &bitmap_icon_aprs, [&nav]() { nav.push<APRSRXView>(); }},
+        {"Audio", Color::green(), &bitmap_icon_speaker, [&nav]() { nav.push<AnalogAudioView>(); }},
+        {"BTLE", Color::yellow(), &bitmap_icon_btle, [&nav]() { nav.push<BTLERxView>(); }},
        {"ERT Meter", Color::green(), &bitmap_icon_ert, [&nav]() { nav.push<ERTAppView>(); }},
+        {"Level", Color::green(), &bitmap_icon_options_radio, [&nav]() { nav.push<LevelView>(); }},
+        {"NRF", Color::yellow(), &bitmap_icon_nrf, [&nav]() { nav.push<NRFRxView>(); }},
        {"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", 		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>(); } },*/
+        {"Search", Color::yellow(), &bitmap_icon_search, [&nav]() { nav.push<SearchView>(); }},
+        {"TPMS Cars", Color::green(), &bitmap_icon_tpms, [&nav]() { nav.push<TPMSAppView>(); }},
+        // {"DMR", Color::dark_grey(), &bitmap_icon_dmr, [&nav](){ nav.push<NotImplementedView>(); }},
+        // {"SIGFOX", Color::dark_grey(), &bitmap_icon_fox, [&nav](){ nav.push<NotImplementedView>(); }},
+        // {"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"
 }

 /* TransmittersMenuView **************************************************/
@@ -531,26 +521,24 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
-        {"ADS-B [S]", ui::Color::green(), &bitmap_icon_adsb, [&nav]() { nav.push<ADSBTxView>(); }},
+        {"ADS-B", 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>(); }},
+        {"BurgerPgr", ui::Color::yellow(), &bitmap_icon_burger, [&nav]() { nav.push<CoasterPagerView>(); }},
        {"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>(); }},
+        // { "Key fob", ui::Color::orange(), &bitmap_icon_keyfob, [&nav](){ nav.push<KeyfobView>(); }},
+        {"LGE", ui::Color::yellow(), &bitmap_icon_lge, [&nav]() { nav.push<LGEView>(); }},
        {"Morse", ui::Color::green(), &bitmap_icon_morse, [&nav]() { nav.push<MorseView>(); }},
-        {"BurgerPgr", ui::Color::yellow(), &bitmap_icon_burger, [&nav]() { nav.push<CoasterPagerView>(); }},
-        //{ "Nuoptix DTMF", 	ui::Color::green(),		&bitmap_icon_nuoptix,	[&nav](){ nav.push<NuoptixView>(); } },
+        // { "Nuoptix DTMF", ui::Color::green(), &bitmap_icon_nuoptix, [&nav](){ nav.push<NuoptixView>(); }},
        {"OOK", ui::Color::yellow(), &bitmap_icon_remote, [&nav]() { nav.push<EncodersView>(); }},
        {"POCSAG", ui::Color::green(), &bitmap_icon_pocsag, [&nav]() { nav.push<POCSAGTXView>(); }},
        {"RDS", ui::Color::green(), &bitmap_icon_rds, [&nav]() { nav.push<RDSView>(); }},
        {"Soundbrd", ui::Color::green(), &bitmap_icon_soundboard, [&nav]() { nav.push<SoundBoardView>(); }},
+        {"S.Painter", ui::Color::orange(), &bitmap_icon_paint, [&nav]() { nav.push<SpectrumPainterView>(); }},
        {"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::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>(); } },
    });
 }

@@ -561,41 +549,47 @@ UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav) {
        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
-        //{ "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>(); }},
+        {"Antenna Length", Color::green(), &bitmap_icon_tools_antenna, [&nav]() { nav.push<WhipCalcView>(); }},
+        {"File Manager", Color::green(), &bitmap_icon_dir, [&nav]() { nav.push<FileManagerView>(); }},
+        {"Freq. Manager", Color::green(), &bitmap_icon_freqman, [&nav]() { nav.push<FrequencyManagerView>(); }},
        {"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>(); }},
+        {"IQ Trim", Color::orange(), &bitmap_icon_cut, [&nav]() { nav.push<IQTrimView>(); }},
+        {"SD Over USB", Color::yellow(), &bitmap_icon_hackrf, [&nav]() { nav.push<SdOverUsbView>(); }},
+        {"Signal Gen", Color::green(), &bitmap_icon_cwgen, [&nav]() { nav.push<SigGenView>(); }},
+        // {"Test App", Color::dark_grey(), nullptr, [&nav](){ nav.push<TestView>(); }},
+        // {"Tone Search", Color::dark_grey(), nullptr, [&nav](){ nav.push<ToneSearchView>(); }},
+        {"Wav View", Color::yellow(), &bitmap_icon_soundboard, [&nav]() { nav.push<ViewWavView>(); }},

-        {"Wipe SD card", Color::red(), &bitmap_icon_tools_wipesd, [&nav]() { nav.push<WipeSDView>(); }},
+        // Dangerous apps.
        {"Flash Utility", Color::red(), &bitmap_icon_temperature, [&nav]() { nav.push<FlashUtilityView>(); }},
-        {"SD over USB", Color::yellow(), &bitmap_icon_hackrf, [&nav]() { nav.push<SdOverUsbView>(); }},
+        {"Wipe SD card", Color::red(), &bitmap_icon_tools_wipesd, [&nav]() { nav.push<WipeSDView>(); }},
    });
+
    set_max_rows(2);  // allow wider buttons
 }

 /* SystemMenuView ********************************************************/

 void SystemMenuView::hackrf_mode(NavigationView& nav) {
-    nav.push<ModalMessageView>("HackRF mode", " This mode enables HackRF\n functionality. To return,\n  press the reset button.\n\n  Switch to HackRF mode?", YESNO,
-                               [this](bool choice) {
-                                   if (choice) {
-                                       EventDispatcher::request_stop();
-                                   }
-                               });
+    nav.push<ModalMessageView>(
+        "HackRF mode",
+        " This mode enables HackRF\n functionality. To return,\n  press the reset button.\n\n  Switch to HackRF mode?",
+        YESNO,
+        [this](bool choice) {
+            if (choice) {
+                EventDispatcher::request_stop();
+            }
+        });
 }

 SystemMenuView::SystemMenuView(NavigationView& nav) {
    add_items({
-        //{ "Play dead",				Color::red(),		&bitmap_icon_playdead,	[&nav](){ nav.push<PlayDeadView>(); } },
+        // {"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>(); }},
+        {"Remote", ui::Color::green(), &bitmap_icon_remote, [&nav]() { nav.push<RemoteView>(); }},
        {"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>(); }},
@@ -603,11 +597,11 @@ SystemMenuView::SystemMenuView(NavigationView& nav) {
        {"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>(); } }
+        // {"About", Color::cyan(), nullptr, [&nav]() { nav.push<AboutView>(); }},
    });
+
    set_max_rows(2);  // allow wider buttons
    set_arrow_enabled(false);
-    // set_highlighted(1);		// Startup selection
 }

 /* SystemView ************************************************************/
@@ -623,19 +617,22 @@ SystemView::SystemView(
    constexpr Dim info_view_height = 16;

    add_child(&status_view);
-    status_view.set_parent_rect({{0, 0},
-                                 {parent_rect.width(), status_view_height}});
+    status_view.set_parent_rect(
+        {{0, 0},
+         {parent_rect.width(), status_view_height}});
    status_view.on_back = [this]() {
        this->navigation_view.pop();
    };

    add_child(&navigation_view);
-    navigation_view.set_parent_rect({{0, status_view_height},
-                                     {parent_rect.width(), static_cast<Dim>(parent_rect.height() - status_view_height)}});
+    navigation_view.set_parent_rect(
+        {{0, 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},
-                               {parent_rect.width(), info_view_height}});
+    info_view.set_parent_rect(
+        {{0, 19 * 16},
+         {parent_rect.width(), info_view_height}});

    navigation_view.on_view_changed = [this](const View& new_view) {
        if (!this->navigation_view.is_top()) {
@@ -651,14 +648,6 @@ SystemView::SystemView(
        this->status_view.set_dirty();
    };

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

    if (pmem::config_splash()) {
@@ -667,10 +656,6 @@ SystemView::SystemView(
    status_view.set_back_enabled(false);
    status_view.set_title_image_enabled(true);
    status_view.set_dirty();
-    // else
-    //	navigation_view.push<SystemMenuView>();
-
-    //}
 }

 Context& SystemView::context() const {
@@ -758,21 +743,19 @@ ModalMessageView::ModalMessageView(
    NavigationView& nav,
    const std::string& title,
    const std::string& message,
-    const modal_t type,
-    const std::function<void(bool)> on_choice)
+    modal_t type,
+    std::function<void(bool)> on_choice)
    : title_{title},
      message_{message},
      type_{type},
      on_choice_{on_choice} {
    if (type == INFO) {
        add_child(&button_ok);
-
        button_ok.on_select = [this, &nav](Button&) {
-            if (on_choice_)
-                on_choice_(true);  // Assumes handler will pop.
-            else
-                nav.pop();
+            if (on_choice_) on_choice_(true);
+            nav.pop();
        };
+
    } else if (type == YESNO) {
        add_children({&button_yes,
                      &button_no});
@@ -785,50 +768,33 @@ ModalMessageView::ModalMessageView(
            if (on_choice_) on_choice_(false);
            nav.pop();
        };
-    } else if (type == YESCANCEL) {
-        add_children({&button_yes,
-                      &button_no});

-        button_yes.on_select = [this, &nav](Button&) {
-            if (on_choice_) on_choice_(true);
-            nav.pop();
-        };
-        button_no.on_select = [this, &nav](Button&) {
-            // if (on_choice_) on_choice_(false);
-            nav.pop_modal();
-        };
    } else {  // ABORT
        add_child(&button_ok);

        button_ok.on_select = [this, &nav](Button&) {
            if (on_choice_) on_choice_(true);
-            nav.pop_modal();
+            nav.pop(false);  // Pop the modal.
+            nav.pop();       // Pop the underlying view.
        };
    }
 }

 void ModalMessageView::paint(Painter& painter) {
-    size_t pos, i = 0, start = 0;
-
    portapack::display.drawBMP({100, 48}, modal_warning_bmp, false);

-    // Terrible...
-    while ((pos = message_.find("\n", start)) != std::string::npos) {
+    // Break lines.
+    auto lines = split_string(message_, '\n');
+    for (size_t i = 0; i < lines.size(); ++i) {
        painter.draw_string(
            {1 * 8, (Coord)(120 + (i * 16))},
            style(),
-            message_.substr(start, pos - start));
-        i++;
-        start = pos + 1;
+            lines[i]);
    }
-    painter.draw_string(
-        {1 * 8, (Coord)(120 + (i * 16))},
-        style(),
-        message_.substr(start, pos));
 }

 void ModalMessageView::focus() {
-    if ((type_ == YESNO) || (type_ == YESCANCEL)) {
+    if ((type_ == YESNO)) {
        button_yes.focus();
    } else {
        button_ok.focus();
@@ -51,7 +51,6 @@ namespace ui {
 enum modal_t {
    INFO = 0,
    YESNO,
-    YESCANCEL,
    ABORT
 };

@@ -73,15 +72,6 @@ class NavigationView : public View {
        return reinterpret_cast<T*>(push_view(std::unique_ptr<View>(new T(*this, std::forward<Args>(args)...))));
    }

-    // Pushes a new view under the current on the stack so the current view returns into this new one.
-    template <class T, class... Args>
-    T* push_under_current(Args&&... args) {
-        auto new_view = std::unique_ptr<View>(new T(*this, std::forward<Args>(args)...));
-        auto new_view_ptr = new_view.get();
-        view_stack.insert(view_stack.end() - 1, ViewState{std::move(new_view), {}});
-        return reinterpret_cast<T*>(new_view_ptr);
-    }
-
    template <class T, class... Args>
    T* replace(Args&&... args) {
        pop();
@@ -90,12 +80,14 @@ class NavigationView : public View {

    void push(View* v);
    void replace(View* v);
-
-    void pop();
-    void pop_modal();
+    void pop(bool trigger_update = true);

    void display_modal(const std::string& title, const std::string& message);
-    void display_modal(const std::string& title, const std::string& message, const modal_t type, const std::function<void(bool)> on_choice = nullptr);
+    void display_modal(
+        const std::string& title,
+        const std::string& message,
+        modal_t type,
+        std::function<void(bool)> on_choice = nullptr);

    void focus() override;

@@ -110,11 +102,9 @@ class NavigationView : public View {
    };

    std::vector<ViewState> view_stack{};
-    Widget* modal_view{nullptr};

    Widget* view() const;

-    void pop(bool update);
    void free_view();
    void update_view();
    View* push_view(std::unique_ptr<View> new_view);
@@ -362,8 +352,8 @@ class ModalMessageView : public View {
        NavigationView& nav,
        const std::string& title,
        const std::string& message,
-        const modal_t type,
-        const std::function<void(bool)> on_choice);
+        modal_t type,
+        std::function<void(bool)> on_choice);

    void paint(Painter& painter) override;
    void focus() override;
@@ -36,6 +36,7 @@ using namespace portapack;
 #include "utility.hpp"

 #include <cstdint>
+#include <vector>

 namespace ui {

@@ -163,6 +164,7 @@ void RecordView::start() {

    text_record_filename.set("");
    text_record_dropped.set("");
+    trim_path = {};

    if (sampling_rate == 0) {
        return;
@@ -217,7 +219,8 @@ void RecordView::start() {
            }

            auto p = std::make_unique<FileConvertWriter>();
-            auto create_error = p->create(base_path.replace_extension((file_type == FileType::RawS8) ? u".C8" : u".C16"));
+            trim_path = base_path.replace_extension((file_type == FileType::RawS8) ? u".C8" : u".C16");
+            auto create_error = p->create(trim_path);
            if (create_error.is_valid()) {
                handle_error(create_error.value());
            } else {
@@ -257,6 +260,7 @@ void RecordView::stop() {
    if (is_active()) {
        capture_thread.reset();
        button_record.set_bitmap(&bitmap_record);
+        trim_capture();
    }

    update_status_display();
@@ -299,6 +303,34 @@ void RecordView::update_status_display() {
    }
 }

+void RecordView::trim_capture() {
+    using bucket_t = iq::PowerBuckets::Bucket;
+
+    if (file_type != FileType::WAV && auto_trim && !trim_path.empty()) {
+        // Need to heap alloc the buckets in this case. The large static buffer overflows the stack.
+        std::vector<bucket_t> buckets(size_t(255), bucket_t{});
+        ;
+        iq::PowerBuckets power_buckets{
+            .p = &buckets[0],
+            .size = buckets.size()};
+
+        trim_ui.show_reading();
+        auto info = iq::profile_capture(trim_path, power_buckets);
+
+        if (info) {
+            // 7% - decent trimming without being too aggressive.
+            auto trim_range = iq::compute_trim_range(*info, power_buckets, 7);
+
+            trim_ui.show_trimming();
+            iq::trim_capture_with_range(trim_path, trim_range, trim_ui.get_callback());
+        }
+
+        trim_ui.clear();
+    }
+
+    trim_path = {};
+}
+
 void RecordView::handle_capture_thread_done(const File::Error error) {
    stop();
    if (error.code()) {
@@ -22,12 +22,13 @@
 #ifndef __UI_RECORD_VIEW_H__
 #define __UI_RECORD_VIEW_H__

+#include "ui_iq_trim.hpp"
 #include "ui_widget.hpp"

-#include "capture_thread.hpp"
-#include "signal.hpp"
-
 #include "bitmap.hpp"
+#include "capture_thread.hpp"
+#include "iq_trim.hpp"
+#include "signal.hpp"

 #include <cstddef>
 #include <string>
@@ -63,6 +64,7 @@ class RecordView : public View {
    uint32_t set_sampling_rate(uint32_t new_sampling_rate);

    void set_file_type(const FileType v) { file_type = v; }
+    void set_auto_trim(bool v) { auto_trim = v; }

    void start();
    void stop();
@@ -78,6 +80,7 @@ class RecordView : public View {

    void on_tick_second();
    void update_status_display();
+    void trim_capture();

    void handle_capture_thread_done(const File::Error error);
    void handle_error(const File::Error error);
@@ -98,6 +101,10 @@ class RecordView : public View {
    uint32_t sampling_rate{0};
    SignalToken signal_token_tick_second{};

+    bool auto_trim = false;
+    std::filesystem::path trim_path{};
+    TrimProgressUI trim_ui{};
+
    Rectangle rect_background{
        Color::black()};

@@ -437,19 +437,19 @@ set(MODE_CPPSRC
 )
 DeclareTargets(POOK ook)

-### POCSAG RX
-
-set(MODE_CPPSRC
-	proc_pocsag.cpp
-)
-DeclareTargets(PPOC pocsag)
+#### POCSAG RX
+#
+#set(MODE_CPPSRC
+#	proc_pocsag.cpp
+#)
+#DeclareTargets(PPOC pocsag)

 ### POCSAG2 RX

 set(MODE_CPPSRC
 	proc_pocsag2.cpp
 )
-DeclareTargets(PPOC pocsag2)
+DeclareTargets(PPO2 pocsag2)

 ### RDS

@@ -29,20 +29,19 @@ bool FMSquelch::execute(const buffer_f32_t& audio) {
        return true;
    }

-    // TODO: No hard-coded array size.
-    std::array<float, N> squelch_energy_buffer;
-    const buffer_f32_t squelch_energy{
-        squelch_energy_buffer.data(),
-        squelch_energy_buffer.size()};
+    // TODO: alloca temp buffer, assert audio.count
+    std::array<float, 32> squelch_energy_buffer;
+    const buffer_f32_t squelch_energy{squelch_energy_buffer.data(), audio.count};
    non_audio_hpf.execute(audio, squelch_energy);

    // "Non-audio" implies "noise" here. Find the loudest noise sample.
    float non_audio_max_squared = 0;
-    for (const auto sample : squelch_energy_buffer) {
-        const float sample_squared = sample * sample;
-        if (sample_squared > non_audio_max_squared) {
+    for (size_t i = 0; i < squelch_energy.count; ++i) {
+        auto sample = squelch_energy.p[i];
+        float sample_squared = sample * sample;
+
+        if (sample_squared > non_audio_max_squared)
            non_audio_max_squared = sample_squared;
-        }
    }

    // Is the noise less than the threshold?
@@ -39,7 +39,6 @@ class FMSquelch {
    bool enabled() const;

   private:
-    static constexpr size_t N = 32;
    float threshold_squared{0.0f};

    IIRBiquadFilter non_audio_hpf{non_audio_hpf_config};
@@ -56,6 +56,12 @@ void POCSAGProcessor::execute(const buffer_c8_t& buffer) {
    processDemodulatedSamples(audio.p, 16);
    extractFrames();

+    samples_processed += buffer.count;
+    if (samples_processed >= stat_update_threshold) {
+        send_stats();
+        samples_processed = 0;
+    }
+
    // Clear the output before sending to audio chip.
    // Only clear the audio buffer when there hasn't been any audio for a while.
    if (squelch_.enabled() && squelch_history == 0) {
@@ -137,6 +143,11 @@ void POCSAGProcessor::configure() {
    configured = true;
 }

+void POCSAGProcessor::send_stats() const {
+    POCSAGStatsMessage message(m_fifo.codeword, m_numCode, m_gotSync, getRate());
+    shared_memory.application_queue.push(message);
+}
+
 // -----------------------------
 // Frame extractraction methods
 // -----------------------------
@@ -511,7 +522,7 @@ int POCSAGProcessor::getNoOfBits() {
 // ====================================================================
 //
 // ====================================================================
-uint32_t POCSAGProcessor::getRate() {
+uint32_t POCSAGProcessor::getRate() const {
    return ((m_samplesPerSec << 10) + 512) / m_lastStableSymbolLen_1024;
 }

@@ -137,6 +137,9 @@ class POCSAGProcessor : public BasebandProcessor {

   private:
    static constexpr size_t baseband_fs = 3072000;
+    static constexpr uint8_t stat_update_interval = 10;
+    static constexpr uint32_t stat_update_threshold =
+        baseband_fs / stat_update_interval;

    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
@@ -158,7 +161,10 @@ class POCSAGProcessor : public BasebandProcessor {
    bool configured = false;
    pocsag::POCSAGPacket packet{};

+    uint32_t samples_processed = 0;
+
    void configure();
+    void send_stats() const;

    // ----------------------------------------
    // Frame extractraction methods and members
@@ -181,7 +187,7 @@ class POCSAGProcessor : public BasebandProcessor {
    short getBit();

    int getNoOfBits();
-    uint32_t getRate();
+    uint32_t getRate() const;

    uint32_t m_averageSymbolLen_1024{0};
    uint32_t m_lastStableSymbolLen_1024{0};
@@ -3,7 +3,7 @@
 * Copyright (C) 2012-2014 Elias Oenal (multimon-ng@eliasoenal.com)
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
- * Copyright (C) 2016 Kyle Reed
+ * Copyright (C) 2023 Kyle Reed
 *
 * This file is part of PortaPack.
 *
@@ -25,7 +25,6 @@

 #include "proc_pocsag2.hpp"

-#include "dsp_iir_config.hpp"
 #include "event_m4.hpp"

 #include <algorithm>
@@ -33,59 +32,320 @@
 #include <cstdint>
 #include <cstddef>

+using namespace std;
+
+namespace {
+/* Count of bits that differ between the two values. */
+uint8_t diff_bit_count(uint32_t left, uint32_t right) {
+    uint32_t diff = left ^ right;
+    uint8_t count = 0;
+    for (size_t i = 0; i < sizeof(diff) * 8; ++i) {
+        if (((diff >> i) & 0x1) == 1)
+            ++count;
+    }
+
+    return count;
+}
+}  // namespace
+
+/* AudioNormalizer ***************************************/
+
+void AudioNormalizer::execute_in_place(const buffer_f32_t& audio) {
+    // Decay min/max every second (@24kHz).
+    if (counter_ >= 24'000) {
+        // 90% decay factor seems to work well.
+        // This keeps large transients from wrecking the filter.
+        max_ *= 0.9f;
+        min_ *= 0.9f;
+        counter_ = 0;
+        calculate_thresholds();
+    }
+
+    counter_ += audio.count;
+
+    for (size_t i = 0; i < audio.count; ++i) {
+        auto& val = audio.p[i];
+
+        if (val > max_) {
+            max_ = val;
+            calculate_thresholds();
+        }
+        if (val < min_) {
+            min_ = val;
+            calculate_thresholds();
+        }
+
+        if (val >= t_hi_)
+            val = 1.0f;
+        else if (val <= t_lo_)
+            val = -1.0f;
+        else
+            val = 0.0;
+    }
+}
+
+void AudioNormalizer::calculate_thresholds() {
+    auto center = (max_ + min_) / 2.0f;
+    auto range = (max_ - min_) / 2.0f;
+
+    // 10% off center force either +/-1.0f.
+    // Higher == larger dead zone.
+    // Lower == more false positives.
+    auto threshold = range * 0.1;
+    t_hi_ = center + threshold;
+    t_lo_ = center - threshold;
+}
+
+/* BitQueue **********************************************/
+
+void BitQueue::push(bool bit) {
+    data_ = (data_ << 1) | (bit ? 1 : 0);
+    if (count_ < max_size_) ++count_;
+}
+
+bool BitQueue::pop() {
+    if (count_ == 0) return false;
+
+    --count_;
+    return (data_ & (1 << count_)) != 0;
+}
+
+void BitQueue::reset() {
+    data_ = 0;
+    count_ = 0;
+}
+
+uint8_t BitQueue::size() const {
+    return count_;
+}
+
+uint32_t BitQueue::data() const {
+    return data_;
+}
+
+/* BitExtractor ******************************************/
+
+void BitExtractor::extract_bits(const buffer_f32_t& audio) {
+    // Assumes input has been normalized +/- 1.0f.
+    // Positive == 0, Negative == 1.
+    for (size_t i = 0; i < audio.count; ++i) {
+        auto sample = audio.p[i];
+
+        if (current_rate_) {
+            if (current_rate_->handle_sample(sample)) {
+                auto value = (current_rate_->bits.data() & 1) == 1;
+                bits_.push(value);
+            }
+        } else {
+            // Feed sample to all known rates for clock detection.
+            for (auto& rate : known_rates_) {
+                if (rate.handle_sample(sample) &&
+                    diff_bit_count(rate.bits.data(), clock_magic_number) <= 3) {
+                    // Clock detected, continue with this rate.
+                    rate.is_stable = true;
+                    current_rate_ = &rate;
+                }
+            }
+        }
+    }
+}
+
+void BitExtractor::configure(uint32_t sample_rate) {
+    sample_rate_ = sample_rate;
+
+    // Build the baud rate info table based on the sample rate.
+    // Sampling at 2x the baud rate to synchronize to bit transitions
+    // without needing to know exact transition boundaries.
+    for (auto& rate : known_rates_)
+        rate.sample_interval = sample_rate / (2.0 * rate.baud_rate);
+}
+
+void BitExtractor::reset() {
+    current_rate_ = nullptr;
+
+    for (auto& rate : known_rates_)
+        rate.reset();
+}
+
+uint16_t BitExtractor::baud_rate() const {
+    return current_rate_ ? current_rate_->baud_rate : 0;
+}
+
+bool BitExtractor::RateInfo::handle_sample(float sample) {
+    samples_until_next -= 1;
+
+    // Time to process a sample?
+    if (samples_until_next > 0)
+        return false;
+
+    bool value = signbit(sample);  // NB: negative == '1'
+    bool bit_pushed = false;
+
+    switch (state) {
+        case State::WaitForSample:
+            // Just need to wait for the first sample of the bit.
+            state = State::ReadyToSend;
+            break;
+
+        case State::ReadyToSend:
+            if (!is_stable && prev_value != value) {
+                // Still looking for the clock signal but found a transition.
+                // Nudge the next sample a bit to try avoiding pulse edges.
+                samples_until_next += (sample_interval / 8.0);
+            } else {
+                // Either the clock has been found or both samples were
+                // (probably) in the same pulse. Send the bit.
+                // TODO: Wider/more samples for noise reduction?
+                state = State::WaitForSample;
+                bit_pushed = true;
+                bits.push(value);
+            }
+            break;
+    }
+
+    // How long until the next sample?
+    samples_until_next += sample_interval;
+    prev_value = value;
+
+    return bit_pushed;
+}
+
+void BitExtractor::RateInfo::reset() {
+    state = State::WaitForSample;
+    samples_until_next = 0.0;
+    prev_value = false;
+    is_stable = false;
+    bits.reset();
+}
+
+/* CodewordExtractor *************************************/
+
+void CodewordExtractor::process_bits() {
+    // Process all of the bits in the bits queue.
+    while (bits_.size() > 0) {
+        take_one_bit();
+
+        // Wait until data_ is full.
+        if (bit_count_ < data_bit_count)
+            continue;
+
+        // Wait for the sync frame.
+        if (!has_sync_) {
+            if (diff_bit_count(data_, sync_codeword) <= 2)
+                handle_sync(/*inverted=*/false);
+            else if (diff_bit_count(data_, ~sync_codeword) <= 2)
+                handle_sync(/*inverted=*/true);
+            continue;
+        }
+
+        save_current_codeword();
+
+        if (word_count_ == pocsag::batch_size)
+            handle_batch_complete();
+    }
+}
+
+void CodewordExtractor::flush() {
+    // Don't bother flushing if there's no pending data.
+    if (word_count_ == 0) return;
+
+    pad_idle();
+    handle_batch_complete();
+}
+
+void CodewordExtractor::reset() {
+    clear_data_bits();
+    has_sync_ = false;
+    inverted_ = false;
+    word_count_ = 0;
+}
+
+void CodewordExtractor::clear_data_bits() {
+    data_ = 0;
+    bit_count_ = 0;
+}
+
+void CodewordExtractor::take_one_bit() {
+    data_ = (data_ << 1) | bits_.pop();
+    if (bit_count_ < data_bit_count)
+        ++bit_count_;
+}
+
+void CodewordExtractor::handle_sync(bool inverted) {
+    clear_data_bits();
+    has_sync_ = true;
+    inverted_ = inverted;
+    word_count_ = 0;
+}
+
+void CodewordExtractor::save_current_codeword() {
+    batch_[word_count_++] = inverted_ ? ~data_ : data_;
+    clear_data_bits();
+}
+
+void CodewordExtractor::handle_batch_complete() {
+    on_batch_(*this);
+    has_sync_ = false;
+    word_count_ = 0;
+}
+
+void CodewordExtractor::pad_idle() {
+    while (word_count_ < pocsag::batch_size)
+        batch_[word_count_++] = idle_codeword;
+}
+
+/* POCSAGProcessor ***************************************/
+
 void POCSAGProcessor::execute(const buffer_c8_t& buffer) {
    if (!configured) return;

+    // buffer has 2048 samples
+    // decim0 out: 2048/8 = 256 samples
+    // decim1 out: 256/8 = 32 samples
+    // channel out: 32/2 = 16 samples
+
    // Get 24kHz audio
    const auto decim_0_out = decim_0.execute(buffer, dst_buffer);
    const auto decim_1_out = decim_1.execute(decim_0_out, dst_buffer);
    const auto channel_out = channel_filter.execute(decim_1_out, dst_buffer);
    auto audio = demod.execute(channel_out, audio_buffer);

-    // If squelching, check for audio before smoothing because smoothing
-    // causes the squelch noise detection to fail. Likely because squelch
-    // looks for HF noise and smoothing is basically a lowpass filter.
-    // NB: Squelch in this processor is only for the the audio output.
-    // Squelching will likely drop data "noise" and break processing.
-    if (squelch_.enabled()) {
-        bool has_audio = squelch_.execute(audio);
-        squelch_history = (squelch_history << 1) | (has_audio ? 1 : 0);
-    }
+    // Check if there's any signal in the audio buffer.
+    bool has_audio = squelch.execute(audio);
+    squelch_history = (squelch_history << 1) | (has_audio ? 1 : 0);

-    smooth.Process(audio.p, audio.count);
-    processDemodulatedSamples(audio.p, 16);
-    extractFrames();
-
-    // Clear the output before sending to audio chip.
-    if (squelch_.enabled() && squelch_history == 0) {
-        for (size_t i = 0; i < audio.count; ++i) {
-            audio.p[i] = 0.0;
+    // Has there been any signal recently?
+    if (squelch_history == 0) {
+        // No recent signal, flush and prepare for next message.
+        if (word_extractor.current() > 0) {
+            flush();
+            reset();
+            send_stats();
        }
+
+        // Clear the audio stream before sending.
+        for (size_t i = 0; i < audio.count; ++i)
+            audio.p[i] = 0.0;
+
+        audio_output.write(audio);
+        return;
    }

+    // Filter out high-frequency noise then normalize.
+    lpf.execute_in_place(audio);
+    normalizer.execute_in_place(audio);
    audio_output.write(audio);
-}

-// ====================================================================
-//
-// ====================================================================
-int POCSAGProcessor::OnDataWord(uint32_t word, int pos) {
-    packet.set(pos, word);
-    return 0;
-}
+    // Decode the messages from the audio.
+    bit_extractor.extract_bits(audio);
+    word_extractor.process_bits();

-// ====================================================================
-//
-// ====================================================================
-int POCSAGProcessor::OnDataFrame(int len, int baud) {
-    if (len > 0) {
-        packet.set_bitrate(baud);
-        packet.set_flag(pocsag::PacketFlag::NORMAL);
-        packet.set_timestamp(Timestamp::now());
-        const POCSAGPacketMessage message(packet);
-        shared_memory.application_queue.push(message);
+    // Update the status.
+    samples_processed += buffer.count;
+    if (samples_processed >= stat_update_threshold) {
+        send_stats();
+        samples_processed -= stat_update_threshold;
    }
-    return 0;
 }

 void POCSAGProcessor::on_message(const Message* const message) {
@@ -96,7 +356,7 @@ void POCSAGProcessor::on_message(const Message* const message) {

        case Message::ID::NBFMConfigure: {
            auto config = reinterpret_cast<const NBFMConfigureMessage*>(message);
-            squelch_.set_threshold(config->squelch_level / 100.0);
+            squelch.set_threshold(config->squelch_level / 99.0);
            break;
        }

@@ -106,417 +366,55 @@ void POCSAGProcessor::on_message(const Message* const message) {
 }

 void POCSAGProcessor::configure() {
-    constexpr size_t decim_0_input_fs = baseband_fs;
-    constexpr size_t decim_0_output_fs = decim_0_input_fs / decim_0.decimation_factor;
-
-    constexpr size_t decim_1_input_fs = decim_0_output_fs;
-    constexpr size_t decim_1_output_fs = decim_1_input_fs / decim_1.decimation_factor;
-
-    constexpr size_t channel_filter_input_fs = decim_1_output_fs;
-    const size_t channel_filter_output_fs = channel_filter_input_fs / 2;
-
-    const size_t demod_input_fs = channel_filter_output_fs;
+    constexpr size_t decim_0_output_fs = baseband_fs / decim_0.decimation_factor;
+    constexpr size_t decim_1_output_fs = decim_0_output_fs / decim_1.decimation_factor;
+    constexpr size_t channel_filter_output_fs = decim_1_output_fs / 2;
+    constexpr size_t demod_input_fs = channel_filter_output_fs;

    decim_0.configure(taps_11k0_decim_0.taps);
    decim_1.configure(taps_11k0_decim_1.taps);
    channel_filter.configure(taps_11k0_channel.taps, 2);
    demod.configure(demod_input_fs, 4'500);  // FSK +/- 4k5Hz.

-    // Smoothing should be roughly sample rate over max baud
-    // 24k / 3.2k = 7.5
-    smooth.SetSize(8);
-
-    // Don't have audio process the stream.
+    // Don't process the audio stream.
    audio_output.configure(false);

-    // Set up the frame extraction, limits of baud
-    setFrameExtractParams(demod_input_fs, 4000, 300, 32);
+    bit_extractor.configure(demod_input_fs);

-    // Mark the class as ready to accept data
+    // Set ready to process data.
    configured = true;
 }

-// -----------------------------
-// Frame extractraction methods
-// -----------------------------
-#define BAUD_STABLE (104)
-#define MAX_CONSEC_SAME (32)
-#define MAX_WITHOUT_SINGLE (64)
-#define MAX_BAD_TRANS (10)
-
-#define M_SYNC (0x7cd215d8)
-#define M_NOTSYNC (0x832dea27)
-
-#define M_IDLE (0x7a89c197)
-
-// ====================================================================
-//
-// ====================================================================
-inline int bitsDiff(unsigned long left, unsigned long right) {
-    unsigned long xord = left ^ right;
-    int count = 0;
-    for (int i = 0; i < 32; i++) {
-        if ((xord & 0x01) != 0) ++count;
-        xord = xord >> 1;
-    }
-    return (count);
+void POCSAGProcessor::flush() {
+    word_extractor.flush();
 }

-// ====================================================================
-//
-// ====================================================================
-void POCSAGProcessor::initFrameExtraction() {
-    m_averageSymbolLen_1024 = m_maxSymSamples_1024;
-    m_lastStableSymbolLen_1024 = m_minSymSamples_1024;
-
-    m_badTransitions = 0;
-    m_bitsStart = 0;
-    m_bitsEnd = 0;
-    m_inverted = false;
-
-    resetVals();
+void POCSAGProcessor::reset() {
+    bits.reset();
+    bit_extractor.reset();
+    word_extractor.reset();
+    samples_processed = 0;
 }

-// ====================================================================
-//
-// ====================================================================
-void POCSAGProcessor::resetVals() {
-    // Reset the parameters
-    // --------------------
-    m_goodTransitions = 0;
-    m_badTransitions = 0;
-    m_averageSymbolLen_1024 = m_maxSymSamples_1024;
-    m_shortestGoodTrans_1024 = m_maxSymSamples_1024;
-    m_valMid = 0;
-
-    // And reset the counts
-    // --------------------
-    m_lastTransPos_1024 = 0;
-    m_lastBitPos_1024 = 0;
-    m_lastSample = 0;
-    m_sampleNo = 0;
-    m_nextBitPos_1024 = m_maxSymSamples_1024;
-    m_nextBitPosInt = (long)m_nextBitPos_1024;
-
-    // Extraction
-    m_fifo.numBits = 0;
-    m_gotSync = false;
-    m_numCode = 0;
+void POCSAGProcessor::send_stats() const {
+    POCSAGStatsMessage message(
+        word_extractor.current(), word_extractor.count(),
+        word_extractor.has_sync(), bit_extractor.baud_rate());
+    shared_memory.application_queue.push(message);
 }

-// ====================================================================
-//
-// ====================================================================
-void POCSAGProcessor::setFrameExtractParams(long a_samplesPerSec, long a_maxBaud, long a_minBaud, long maxRunOfSameValue) {
-    m_samplesPerSec = a_samplesPerSec;
-    m_minSymSamples_1024 = (uint32_t)(1024.0f * (float)a_samplesPerSec / (float)a_maxBaud);
-    m_maxSymSamples_1024 = (uint32_t)(1024.0f * (float)a_samplesPerSec / (float)a_minBaud);
-    m_maxRunOfSameValue = maxRunOfSameValue;
+void POCSAGProcessor::send_packet() {
+    packet.set_flag(pocsag::PacketFlag::NORMAL);
+    packet.set_timestamp(Timestamp::now());
+    packet.set_bitrate(bit_extractor.baud_rate());
+    packet.set(word_extractor.batch());

-    m_shortestGoodTrans_1024 = m_maxSymSamples_1024;
-    m_averageSymbolLen_1024 = m_maxSymSamples_1024;
-    m_lastStableSymbolLen_1024 = m_minSymSamples_1024;
-
-    m_nextBitPos_1024 = m_averageSymbolLen_1024 / 2;
-    m_nextBitPosInt = m_nextBitPos_1024 >> 10;
-
-    initFrameExtraction();
+    POCSAGPacketMessage message(packet);
+    shared_memory.application_queue.push(message);
 }

-// ====================================================================
-//
-// ====================================================================
-int POCSAGProcessor::processDemodulatedSamples(float* sampleBuff, int noOfSamples) {
-    bool transition = false;
-    uint32_t samplePos_1024 = 0;
-    uint32_t len_1024 = 0;
+/* main **************************************************/

-    // Loop through the block of data
-    // ------------------------------
-    for (int pos = 0; pos < noOfSamples; ++pos) {
-        m_sample = sampleBuff[pos];
-        m_valMid += (m_sample - m_valMid) / 1024.0f;
-
-        ++m_sampleNo;
-
-        // Detect Transition
-        // -----------------
-        transition = !((m_lastSample < m_valMid) ^ (m_sample >= m_valMid));  // use XOR for speed
-
-        // If this is a transition
-        // -----------------------
-        if (transition) {
-            // Calculate samples since last trans
-            // ----------------------------------
-            int32_t fractional_1024 = (int32_t)(((m_sample - m_valMid) * 1024) / (m_sample - m_lastSample));
-            if (fractional_1024 < 0) {
-                fractional_1024 = -fractional_1024;
-            }
-
-            samplePos_1024 = (m_sampleNo << 10) - fractional_1024;
-            len_1024 = samplePos_1024 - m_lastTransPos_1024;
-            m_lastTransPos_1024 = samplePos_1024;
-
-            // If symbol is large enough to be valid
-            // -------------------------------------
-            if (len_1024 > m_minSymSamples_1024) {
-                // Check for shortest good transition
-                // ----------------------------------
-                if ((len_1024 < m_shortestGoodTrans_1024) &&
-                    (m_goodTransitions < BAUD_STABLE))  // detect change of symbol size
-                {
-                    int32_t fractionOfShortest_1024 = (len_1024 << 10) / m_shortestGoodTrans_1024;
-
-                    // If currently at half the baud rate
-                    // ----------------------------------
-                    if ((fractionOfShortest_1024 > 410) && (fractionOfShortest_1024 < 614))  // 0.4 and 0.6
-                    {
-                        m_averageSymbolLen_1024 /= 2;
-                        m_shortestGoodTrans_1024 = len_1024;
-                    }
-                    // If currently at the wrong baud rate
-                    // -----------------------------------
-                    else if (fractionOfShortest_1024 < 768)  // 0.75
-                    {
-                        m_averageSymbolLen_1024 = len_1024;
-                        m_shortestGoodTrans_1024 = len_1024;
-                        m_goodTransitions = 0;
-                        m_lastSingleBitPos_1024 = samplePos_1024 - len_1024;
-                    }
-                }
-
-                // Calc the number of bits since events
-                // ------------------------------------
-                int32_t halfSymbol_1024 = m_averageSymbolLen_1024 / 2;
-                int bitsSinceLastTrans = max((uint32_t)1, (len_1024 + halfSymbol_1024) / m_averageSymbolLen_1024);
-                int bitsSinceLastSingle = (((m_sampleNo << 10) - m_lastSingleBitPos_1024) + halfSymbol_1024) / m_averageSymbolLen_1024;
-
-                // Check for single bit
-                // --------------------
-                if (bitsSinceLastTrans == 1) {
-                    m_lastSingleBitPos_1024 = samplePos_1024;
-                }
-
-                // If too long since last transition
-                // ---------------------------------
-                if (bitsSinceLastTrans > MAX_CONSEC_SAME) {
-                    resetVals();
-                }
-                // If too long sice last single bit
-                // --------------------------------
-                else if (bitsSinceLastSingle > MAX_WITHOUT_SINGLE) {
-                    resetVals();
-                } else {
-                    // If this is a good transition
-                    // ----------------------------
-                    int32_t offsetFromExtectedTransition_1024 = len_1024 - (bitsSinceLastTrans * m_averageSymbolLen_1024);
-                    if (offsetFromExtectedTransition_1024 < 0) {
-                        offsetFromExtectedTransition_1024 = -offsetFromExtectedTransition_1024;
-                    }
-                    if (offsetFromExtectedTransition_1024 < ((int32_t)m_averageSymbolLen_1024 / 4))  // Has to be within 1/4 of symbol to be good
-                    {
-                        ++m_goodTransitions;
-                        uint32_t bitsCount = min((uint32_t)BAUD_STABLE, m_goodTransitions);
-
-                        uint32_t propFromPrevious = m_averageSymbolLen_1024 * bitsCount;
-                        uint32_t propFromCurrent = (len_1024 / bitsSinceLastTrans);
-                        m_averageSymbolLen_1024 = (propFromPrevious + propFromCurrent) / (bitsCount + 1);
-                        m_badTransitions = 0;
-                        // if ( len < m_shortestGoodTrans ){m_shortestGoodTrans = len;}
-                        //  Store the old symbol size
-                        if (m_goodTransitions >= BAUD_STABLE) {
-                            m_lastStableSymbolLen_1024 = m_averageSymbolLen_1024;
-                        }
-                    }
-                }
-
-                // Set the point of the last bit if not yet stable
-                // -----------------------------------------------
-                if ((m_goodTransitions < BAUD_STABLE) || (m_badTransitions > 0)) {
-                    m_lastBitPos_1024 = samplePos_1024 - (m_averageSymbolLen_1024 / 2);
-                }
-
-                // Calculate the exact positiom of the next bit
-                // --------------------------------------------
-                int32_t thisPlusHalfsymbol_1024 = samplePos_1024 + (m_averageSymbolLen_1024 / 2);
-                int32_t lastPlusSymbol = m_lastBitPos_1024 + m_averageSymbolLen_1024;
-                m_nextBitPos_1024 = lastPlusSymbol + ((thisPlusHalfsymbol_1024 - lastPlusSymbol) / 16);
-
-                // Check for bad pos error
-                // -----------------------
-                if (m_nextBitPos_1024 < samplePos_1024) m_nextBitPos_1024 += m_averageSymbolLen_1024;
-
-                // Calculate integer sample after next bit
-                // ---------------------------------------
-                m_nextBitPosInt = (m_nextBitPos_1024 >> 10) + 1;
-
-            }  // symbol is large enough to be valid
-            else {
-                // Bad transition, so reset the counts
-                // -----------------------------------
-                ++m_badTransitions;
-                if (m_badTransitions > MAX_BAD_TRANS) {
-                    resetVals();
-                }
-            }
-        }  // end of if transition
-
-        // Reached the point of the next bit
-        // ---------------------------------
-        if (m_sampleNo >= m_nextBitPosInt) {
-            // Everything is good so extract a bit
-            // -----------------------------------
-            if (m_goodTransitions > 20) {
-                // Store value at the center of bit
-                // --------------------------------
-                storeBit();
-            }
-            // Check for long 1 or zero
-            // ------------------------
-            uint32_t bitsSinceLastTrans = ((m_sampleNo << 10) - m_lastTransPos_1024) / m_averageSymbolLen_1024;
-            if (bitsSinceLastTrans > m_maxRunOfSameValue) {
-                resetVals();
-            }
-
-            // Store the point of the last bit
-            // -------------------------------
-            m_lastBitPos_1024 = m_nextBitPos_1024;
-
-            // Calculate the exact point of the next bit
-            // -----------------------------------------
-            m_nextBitPos_1024 += m_averageSymbolLen_1024;
-
-            // Look for the bit after the next bit pos
-            // ---------------------------------------
-            m_nextBitPosInt = (m_nextBitPos_1024 >> 10) + 1;
-
-        }  // Reached the point of the next bit
-
-        m_lastSample = m_sample;
-
-    }  // Loop through the block of data
-
-    return getNoOfBits();
-}
-
-// ====================================================================
-//
-// ====================================================================
-void POCSAGProcessor::storeBit() {
-    if (++m_bitsStart >= BIT_BUF_SIZE) {
-        m_bitsStart = 0;
-    }
-
-    // Calculate the bit value
-    float sample = (m_sample + m_lastSample) / 2;
-    // int32_t sample_1024 = m_sample_1024;
-    bool bit = sample > m_valMid;
-
-    // If buffer not full
-    if (m_bitsStart != m_bitsEnd) {
-        // Decide on output val
-        if (bit) {
-            m_bits[m_bitsStart] = 0;
-        } else {
-            m_bits[m_bitsStart] = 1;
-        }
-    }
-    // Throw away bits if the buffer is full
-    else {
-        if (--m_bitsStart <= -1) {
-            m_bitsStart = BIT_BUF_SIZE - 1;
-        }
-    }
-}
-
-// ====================================================================
-//
-// ====================================================================
-int POCSAGProcessor::extractFrames() {
-    int msgCnt = 0;
-    // While there is unread data in the bits buffer
-    //----------------------------------------------
-    while (getNoOfBits() > 0) {
-        m_fifo.codeword = (m_fifo.codeword << 1) + getBit();
-        m_fifo.numBits++;
-
-        // If number of bits in fifo equals 32
-        //------------------------------------
-        if (m_fifo.numBits >= 32) {
-            // Not got sync
-            // ------------
-            if (!m_gotSync) {
-                if (bitsDiff(m_fifo.codeword, M_SYNC) <= 2) {
-                    m_inverted = false;
-                    m_gotSync = true;
-                    m_numCode = -1;
-                    m_fifo.numBits = 0;
-                } else if (bitsDiff(m_fifo.codeword, M_NOTSYNC) <= 2) {
-                    m_inverted = true;
-                    m_gotSync = true;
-                    m_numCode = -1;
-                    m_fifo.numBits = 0;
-                } else {
-                    // Cause it to load one more bit
-                    m_fifo.numBits = 31;
-                }
-            }  // Not got sync
-            else {
-                // Increment the word count
-                // ------------------------
-                ++m_numCode;  // It got set to -1 when a sync was found, now count the 16 words
-                uint32_t val = m_inverted ? ~m_fifo.codeword : m_fifo.codeword;
-                OnDataWord(val, m_numCode);
-
-                // If at the end of a 16 word block
-                // --------------------------------
-                if (m_numCode >= 15) {
-                    msgCnt += OnDataFrame(m_numCode + 1, (m_samplesPerSec << 10) / m_lastStableSymbolLen_1024);
-                    m_gotSync = false;
-                    m_numCode = -1;
-                }
-                m_fifo.numBits = 0;
-            }
-        }  // If number of bits in fifo equals 32
-    }      // While there is unread data in the bits buffer
-    return msgCnt;
-}  // extractFrames
-
-// ====================================================================
-//
-// ====================================================================
-short POCSAGProcessor::getBit() {
-    if (m_bitsEnd != m_bitsStart) {
-        if (++m_bitsEnd >= BIT_BUF_SIZE) {
-            m_bitsEnd = 0;
-        }
-        return m_bits[m_bitsEnd];
-    } else {
-        return -1;
-    }
-}
-
-// ====================================================================
-//
-// ====================================================================
-int POCSAGProcessor::getNoOfBits() {
-    int bits = m_bitsEnd - m_bitsStart;
-    if (bits < 0) {
-        bits += BIT_BUF_SIZE;
-    }
-    return bits;
-}
-
-// ====================================================================
-//
-// ====================================================================
-uint32_t POCSAGProcessor::getRate() {
-    return ((m_samplesPerSec << 10) + 512) / m_lastStableSymbolLen_1024;
-}
-
-// ====================================================================
-//
-// ====================================================================
 int main() {
    EventDispatcher event_dispatcher{std::make_unique<POCSAGProcessor>()};
    event_dispatcher.run();
@@ -26,199 +26,246 @@
 #ifndef __PROC_POCSAG2_H__
 #define __PROC_POCSAG2_H__

+/* https://www.aaroncake.net/schoolpage/pocsag.htm */
+
+#include "audio_output.hpp"
 #include "baseband_processor.hpp"
 #include "baseband_thread.hpp"
-#include "rssi_thread.hpp"
-
 #include "dsp_decimate.hpp"
 #include "dsp_demodulate.hpp"
-
-#include "pocsag_packet.hpp"
-
-#include "pocsag.hpp"
+#include "dsp_iir_config.hpp"
 #include "message.hpp"
-#include "audio_output.hpp"
+#include "pocsag.hpp"
+#include "pocsag_packet.hpp"
 #include "portapack_shared_memory.hpp"
+#include "rssi_thread.hpp"

+#include <array>
 #include <cstdint>
-#include <bitset>
-using namespace std;
-
-// Class used to smooth demodulated waveform prior to decoding
-// -----------------------------------------------------------
-template <class ValType, class CalcType>
-class SmoothVals {
-   protected:
-    ValType* m_lastVals;  // Previous N values
-    int m_size;           // The size N
-    CalcType m_sumVal;    // Running sum of lastVals
-    int m_pos;            // Current position in last vals ring buffer
-    int m_count;          //
+#include <functional>

+/* Normalizes audio stream to +/-1.0f */
+class AudioNormalizer {
   public:
-    SmoothVals()
-        : m_lastVals(NULL), m_size(1), m_sumVal(0), m_pos(0), m_count(0) {
-        m_lastVals = new ValType[m_size];
-    }
+    void execute_in_place(const buffer_f32_t& audio);

-    // --------------------------------------------------
-    // --------------------------------------------------
-    virtual ~SmoothVals() {
-        delete[] m_lastVals;
-    }
+   private:
+    void calculate_thresholds();

-    SmoothVals(const SmoothVals<float, float>&) {
-    }
-
-    SmoothVals& operator=(const SmoothVals<float, float>&) {
-        return *this;
-    }
-
-    // --------------------------------------------------
-    // Set size of smoothing
-    // --------------------------------------------------
-    void SetSize(int size) {
-        m_size = std::max(size, 1);
-        m_pos = 0;
-        delete[] m_lastVals;
-        m_lastVals = new ValType[m_size];
-        m_sumVal = 0;
-    }
-
-    // --------------------------------------------------
-    // Get size of smoothing
-    // --------------------------------------------------
-    int Size() { return m_size; }
-
-    // --------------------------------------------------
-    // In place processing
-    // --------------------------------------------------
-    void Process(ValType* valBuff, int numVals) {
-        ValType tmpVal;
-
-        if (m_count > (1024 * 10)) {
-            // Recalculate the sum value occasionaly, stops accumulated errors when using float
-            m_count = 0;
-            m_sumVal = 0;
-            for (int i = 0; i < m_size; ++i) {
-                m_sumVal += (CalcType)m_lastVals[i];
-            }
-        }
-
-        // Use a rolling smoothed value while processing the buffer
-        for (int buffPos = 0; buffPos < numVals; ++buffPos) {
-            m_pos++;
-            if (m_pos >= m_size) {
-                m_pos = 0;
-            }
-
-            m_sumVal -= (CalcType)m_lastVals[m_pos];  // Subtract the oldest value
-            m_lastVals[m_pos] = valBuff[buffPos];     // Store the new value
-            m_sumVal += (CalcType)m_lastVals[m_pos];  // Add on the new value
-
-            tmpVal = (ValType)(m_sumVal / m_size);  // Scale by number of values smoothed
-            valBuff[buffPos] = tmpVal;
-        }
-
-        m_count += numVals;
-    }
+    uint32_t counter_ = 0;
+    float min_ = 99.0f;
+    float max_ = -99.0f;
+    float t_hi_ = 1.0;
+    float t_lo_ = 1.0;
 };

-// --------------------------------------------------
-// Class to process base band data to pocsag frames
-// --------------------------------------------------
+/* FIFO wrapper over a uint32_t's bits. */
+class BitQueue {
+   public:
+    void push(bool bit);
+    bool pop();
+    void reset();
+    uint8_t size() const;
+    uint32_t data() const;
+
+   private:
+    uint32_t data_ = 0;
+    uint8_t count_ = 0;
+
+    static constexpr uint8_t max_size_ = sizeof(data_) * 8;
+};
+
+/* Extracts bits and bitrate from audio stream. */
+class BitExtractor {
+   public:
+    BitExtractor(BitQueue& bits)
+        : bits_{bits} {}
+
+    void extract_bits(const buffer_f32_t& audio);
+    void configure(uint32_t sample_rate);
+    void reset();
+    uint16_t baud_rate() const;
+
+   private:
+    /* Clock signal detection magic number. */
+    static constexpr uint32_t clock_magic_number = 0xAAAAAAAA;
+
+    struct RateInfo {
+        enum class State : uint8_t {
+            WaitForSample,
+            ReadyToSend
+        };
+
+        const int16_t baud_rate = 0;
+        float sample_interval = 0.0;
+
+        State state = State::WaitForSample;
+        float samples_until_next = 0.0;
+        bool prev_value = false;
+        bool is_stable = false;
+        BitQueue bits{};
+
+        /* Updates a rate info with the given sample.
+         * Returns true if the rate info has a new bit in its queue. */
+        bool handle_sample(float sample);
+        void reset();
+    };
+
+    std::array<RateInfo, 3> known_rates_{
+        RateInfo{512},
+        RateInfo{1200},
+        RateInfo{2400}};
+
+    BitQueue& bits_;
+
+    uint32_t sample_rate_ = 0;
+    RateInfo* current_rate_ = nullptr;
+};
+
+/* Extracts codeword batches from the BitQueue. */
+class CodewordExtractor {
+   public:
+    using batch_t = pocsag::batch_t;
+    using batch_handler_t = std::function<void(CodewordExtractor&)>;
+
+    CodewordExtractor(BitQueue& bits, batch_handler_t on_batch)
+        : bits_{bits}, on_batch_{on_batch} {}
+
+    /* Process the BitQueue to extract codeword batches. */
+    void process_bits();
+
+    /* Pad then send any pending frames. */
+    void flush();
+
+    /* Completely reset to prepare for a new message. */
+    void reset();
+
+    /* Gets the underlying batch array. */
+    const batch_t& batch() const { return batch_; }
+
+    /* Gets in-progress codeword. */
+    uint32_t current() const { return data_; }
+
+    /* Gets the count of completed codewords. */
+    uint8_t count() const { return word_count_; }
+
+    /* Returns true if the batch has as sync frame. */
+    bool has_sync() const { return has_sync_; }
+
+   private:
+    /* Sync frame codeword. */
+    static constexpr uint32_t sync_codeword = 0x7cd215d8;
+
+    /* Idle codeword used to pad a 16 codeword "batch". */
+    static constexpr uint32_t idle_codeword = 0x7a89c197;
+
+    /* Number of bits in 'data_' member. */
+    static constexpr uint8_t data_bit_count = sizeof(uint32_t) * 8;
+
+    /* Clears data_ and bit_count_ to prepare for next codeword. */
+    void clear_data_bits();
+
+    /* Pop a bit off the queue and add it to data_. */
+    void take_one_bit();
+
+    /* Handles receiving the sync frame codeword, start of batch. */
+    void handle_sync(bool inverted);
+
+    /* Saves the current codeword in data_ to the batch. */
+    void save_current_codeword();
+
+    /* Sends the batch to the handler, resets for next batch. */
+    void handle_batch_complete();
+
+    /* Fill the rest of the batch with 'idle' codewords. */
+    void pad_idle();
+
+    BitQueue& bits_;
+    batch_handler_t on_batch_{};
+
+    /* When true, sync frame has been received. */
+    bool has_sync_ = false;
+
+    /* When true, bit vales are flipped in the codewords. */
+    bool inverted_ = false;
+
+    uint32_t data_ = 0;
+    uint8_t bit_count_ = 0;
+    uint8_t word_count_ = 0;
+    batch_t batch_{};
+};
+
+/* Processes POCSAG signal into codeword batches. */
 class POCSAGProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
    void on_message(const Message* const message) override;

-    int OnDataFrame(int len, int baud);
-    int OnDataWord(uint32_t word, int pos);
-
   private:
    static constexpr size_t baseband_fs = 3072000;
-
-    std::array<complex16_t, 512> dst{};
-    const buffer_c16_t dst_buffer{
-        dst.data(),
-        dst.size()};
-    std::array<float, 32> audio{};
-    const buffer_f32_t audio_buffer{
-        audio.data(),
-        audio.size()};
-
-    dsp::decimate::FIRC8xR16x24FS4Decim8 decim_0{};
-    dsp::decimate::FIRC16xR16x32Decim8 decim_1{};
-    dsp::decimate::FIRAndDecimateComplex channel_filter{};
-    dsp::demodulate::FM demod{};
-    SmoothVals<float, float> smooth = {};
-
-    AudioOutput audio_output{};
-
-    bool configured = false;
-    pocsag::POCSAGPacket packet{};
+    static constexpr uint8_t stat_update_interval = 10;
+    static constexpr uint32_t stat_update_threshold =
+        baseband_fs / stat_update_interval;

    void configure();
+    void flush();
+    void reset();
+    void send_stats() const;
+    void send_packet();

-    // ----------------------------------------
-    // Frame extractraction methods and members
-    // ----------------------------------------
-    void initFrameExtraction();
-    struct FIFOStruct {
-        unsigned long codeword;
-        int numBits;
-    };
+    /* Set once app is ready to receive messages. */
+    bool configured = false;

-#define BIT_BUF_SIZE (64)
+    /* Buffer for decimated IQ data. */
+    std::array<complex16_t, 256> dst{};
+    const buffer_c16_t dst_buffer{dst.data(), dst.size()};

-    void resetVals();
-    void setFrameExtractParams(long a_samplesPerSec, long a_maxBaud = 8000, long a_minBaud = 200, long maxRunOfSameValue = 32);
+    /* Buffer for demodulated audio. */
+    std::array<float, 16> audio{};
+    const buffer_f32_t audio_buffer{audio.data(), audio.size()};

-    int processDemodulatedSamples(float* sampleBuff, int noOfSamples);
-    int extractFrames();
+    /* Decimate to 48kHz. */
+    dsp::decimate::FIRC8xR16x24FS4Decim8 decim_0{};
+    dsp::decimate::FIRC16xR16x32Decim8 decim_1{};

-    void storeBit();
-    short getBit();
+    /* Filter to 24kHz and demodulate. */
+    dsp::decimate::FIRAndDecimateComplex channel_filter{};
+    dsp::demodulate::FM demod{};

-    int getNoOfBits();
-    uint32_t getRate();
-
-    uint32_t m_averageSymbolLen_1024{0};
-    uint32_t m_lastStableSymbolLen_1024{0};
-
-    uint32_t m_samplesPerSec{0};
-    uint32_t m_goodTransitions{0};
-    uint32_t m_badTransitions{0};
-
-    uint32_t m_sampleNo{0};
-    float m_sample{0};
-    float m_valMid{0.0f};
-    float m_lastSample{0.0f};
-
-    uint32_t m_lastTransPos_1024{0};
-    uint32_t m_lastSingleBitPos_1024{0};
-
-    uint32_t m_nextBitPosInt{0};  // Integer rounded up version to save on ops
-    uint32_t m_nextBitPos_1024{0};
-    uint32_t m_lastBitPos_1024{0};
-
-    uint32_t m_shortestGoodTrans_1024{0};
-    uint32_t m_minSymSamples_1024{0};
-    uint32_t m_maxSymSamples_1024{0};
-    uint32_t m_maxRunOfSameValue{0};
-
-    bitset<(size_t)BIT_BUF_SIZE> m_bits{0};
-    long m_bitsStart{0};
-    long m_bitsEnd{0};
-
-    FIFOStruct m_fifo{0, 0};
-    bool m_gotSync{false};
-    int m_numCode{0};
-    bool m_inverted{false};
-
-    FMSquelch squelch_{};
+    /* Squelch to ignore noise. */
+    FMSquelch squelch{};
    uint64_t squelch_history = 0;

+    /* LPF to reduce noise. POCSAG supports 2400 baud, but that falls
+     * nicely into the transition band of this 1800Hz filter.
+     * scipy.signal.butter(2, 1800, "lowpass", fs=24000, analog=False) */
+    IIRBiquadFilter lpf{{{0.04125354f, 0.082507070f, 0.04125354f},
+                         {1.00000000f, -1.34896775f, 0.51398189f}}};
+
+    /* Attempts to de-noise and normalize signal. */
+    AudioNormalizer normalizer{};
+
+    /* Handles writing audio stream to hardware. */
+    AudioOutput audio_output{};
+
+    /* Holds the data sent to the app. */
+    pocsag::POCSAGPacket packet{};
+
+    /* Used to keep track of how many samples were processed
+     * between status update messages. */
+    uint32_t samples_processed = 0;
+
+    BitQueue bits{};
+
+    /* Processes audio into bits. */
+    BitExtractor bit_extractor{bits};
+
+    /* Processes bits into codewords. */
+    CodewordExtractor word_extractor{
+        bits, [this](CodewordExtractor&) {
+            send_packet();
+        }};
+
    /* NB: Threads should be the last members in the class definition. */
    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
    RSSIThread rssi_thread{};
@@ -77,12 +77,6 @@ constexpr iir_biquad_config_t audio_24k_deemph_300_6_config{
    {0.03780475f, 0.03780475f, 0.00000000f},
    {1.00000000f, -0.92439049f, 0.00000000f}};

-// scipy.signal.butter(1, 2400 / 12000.0, 'lowpass', analog=False)
-// NOTE: Technically, order-1 filter, b[2] = a[2] = 0.
-constexpr iir_biquad_config_t audio_24k_lpf_2400hz_config{
-    {0.03780475f, 0.03780475f, 0.00000000f},
-    {1.00000000f, -0.92439049f, 0.00000000f}};
-
 // scipy.signal.butter(1, 300 / 8000.0, 'lowpass', analog=False)
 // NOTE: Technically, order-1 filter, b[2] = a[2] = 0.
 constexpr iir_biquad_config_t audio_16k_deemph_300_6_config{
@@ -405,13 +405,12 @@ void ILI9341::drawBMP(const ui::Point p, const uint8_t* bitmap, const bool trans
    }
 }

-/*
-        Draw BMP from SD card.
-        Currently supported formats:
-                16bpp ARGB, RGB565
-                24bpp RGB
-                32bpp ARGB
-*/
+/* Draw BMP from SD card.
+ * Currently supported formats:
+ *     16bpp ARGB, RGB565
+ *     24bpp RGB
+ *     32bpp ARGB
+ */
 bool ILI9341::drawBMP2(const ui::Point p, const std::filesystem::path& file) {
    File bmpimage;
    size_t file_pos = 0;
@@ -90,14 +90,52 @@ class ILI9341 {
        const ui::Color foreground,
        const ui::Color background);

+    /*** Scrolling ***
+     * Scrolling support is implemented in the ILI9341 driver. Basically a region
+     * of the screen is set up to act as a circular buffer. The VSA (vertical scroll
+     * address) is the line that defines the "start" of the circular buffer. In our
+     * case, the driver is set up for "bottom-up" scrolling. In this mode, drawing
+     * starts at the bottom of the scroll region and draws the buffer upward.
+     * However, the whole display's address space is inverted (the screen is actually
+     * upside down in the PortaPack) so this bottom-up drawing appears to be top-down.
+     *
+     * What this means is that the line pointed to by VSA will be drawn at the top
+     * of the scroll region and the line at VSA - 1 (wrapped) will be the bottom.
+     * Consider the following screen buffers and VSA pointers.
+     *
+     * Buffer:  Display:    Buffer:  Display:
+     * VSA > A      A           A       C       NB: VSA points to the "Top"
+     *       B      B           B       D           of the rendered output.
+     *       C      C     VSA > C       A
+     *       D      D           D       B
+     */
+
+    /* Sets the top and bottom lines of the scrolling region. */
    void scroll_set_area(const ui::Coord top_y, const ui::Coord bottom_y);
-    ui::Coord scroll_set_position(const ui::Coord position);
-    ui::Coord scroll(const int32_t delta);
-    ui::Coord scroll_area_y(const ui::Coord y) const;
    void scroll_disable();

-    constexpr ui::Dim width() const { return 240; }
-    constexpr ui::Dim height() const { return 320; }
+    /* Sets VSA. This an offset from top_y not a screen coordinate. */
+    ui::Coord scroll_set_position(const ui::Coord position);
+
+    /* Relative adjustment to VSA. Positive value will cause output
+     * to scoll "down", negative values will cause the output to scroll "up". */
+    ui::Coord scroll(const int32_t delta);
+
+    /* Gets a screen coordinate from a scroll region offset. Values are wrapped
+     * so the offset is wrapped within the bounds of the scroll region. The
+     * specified offset is applied to VSA and then offset by the scroll region
+     * top to produce a screen coordinate.
+     * Consider the following screen buffers and VSA pointer. Note the offsets.
+     *
+     * VSA > A = +0          A = +2
+     *       B = +1          B = +3   NB: As before, VSA is always the "top"
+     *       C = +2    VSA > C = +0       and line at VSA - 1 will be the
+     *       D = +3          D = +1       "bottom" or the max 'y' offset.
+     */
+    ui::Coord scroll_area_y(const ui::Coord y) const;
+
+    constexpr ui::Dim width() const { return ui::screen_width; }
+    constexpr ui::Dim height() const { return ui::screen_height; }
    constexpr ui::Rect screen_rect() const { return {0, 0, width(), height()}; }

    void draw_pixels(const ui::Rect r, const ui::Color* const colors, const size_t count);
@@ -344,12 +344,21 @@ class POCSAGPacketMessage : public Message {
 class POCSAGStatsMessage : public Message {
   public:
    constexpr POCSAGStatsMessage(
+        uint32_t current_bits,
+        uint8_t current_frames,
+        bool has_sync,
        uint16_t baud_rate)
        : Message{ID::POCSAGStats},
-          baud_rate_{baud_rate} {
+          current_bits{current_bits},
+          current_frames{current_frames},
+          has_sync{has_sync},
+          baud_rate{baud_rate} {
    }

-    uint16_t baud_rate_;
+    uint32_t current_bits = 0;
+    uint8_t current_frames = 0;
+    bool has_sync = false;
+    uint16_t baud_rate = 0;
 };

 class ACARSPacketMessage : public Message {
@@ -57,10 +57,10 @@
 * The oversample rate is used to increase the sample rate to improve SNR and quality.
 * This is also used as the interpolation rate when replaying captures. */
 inline OversampleRate get_oversample_rate(uint32_t sample_rate) {
-    if (sample_rate < 30'000) return OversampleRate::x64;    // 25k, 16k, 12k5.
-    if (sample_rate < 80'000) return OversampleRate::x32;    // 75k, 50k, 32k.
+    if (sample_rate < 25'000) return OversampleRate::x64;    // 12k5, 16k.
+    if (sample_rate < 80'000) return OversampleRate::x32;    // 25k,  32k, 50k, 75k.
    if (sample_rate < 250'000) return OversampleRate::x16;   // 100k, 150k.
-    if (sample_rate < 1'250'000) return OversampleRate::x8;  // 250k, 500k, 600k, 650k, 750k, 1Mhz.
+    if (sample_rate < 1'250'000) return OversampleRate::x8;  // 250k, 500k, 600k, 750k, 1Mhz.

    return OversampleRate::x4;  // Top range (1.25Mhz ... 5.5Mhz).
 }
@@ -412,7 +412,7 @@ bool pocsag_decode_batch(const POCSAGPacket& batch, POCSAGState& state) {
                    state.ascii_idx -= 7;
                    char ascii_char = (state.ascii_data >> state.ascii_idx) & 0x7F;

-                    // Bottom's up (reverse the bits).
+                    // Reverse the bits. (TODO: __RBIT?)
                    ascii_char = (ascii_char & 0xF0) >> 4 | (ascii_char & 0x0F) << 4;  // 01234567 -> 45670123
                    ascii_char = (ascii_char & 0xCC) >> 2 | (ascii_char & 0x33) << 2;  // 45670123 -> 67452301
                    ascii_char = (ascii_char & 0xAA) >> 2 | (ascii_char & 0x55);       // 67452301 -> 76543210
@@ -45,6 +45,10 @@ enum PacketFlag : uint32_t {
    TOO_LONG
 };

+/* Number of codewords in a batch. */
+constexpr uint8_t batch_size = 16;
+using batch_t = std::array<uint32_t, batch_size>;
+
 class POCSAGPacket {
   public:
    void set_timestamp(const Timestamp& value) {
@@ -55,16 +59,20 @@ class POCSAGPacket {
        return timestamp_;
    }

-    void set(const size_t index, const uint32_t data) {
-        if (index < 16)
+    void set(size_t index, uint32_t data) {
+        if (index < batch_size)
            codewords[index] = data;
    }

-    uint32_t operator[](const size_t index) const {
-        return (index < 16) ? codewords[index] : 0;
+    void set(const batch_t& batch) {
+        codewords = batch;
    }

-    void set_bitrate(const uint16_t bitrate) {
+    uint32_t operator[](size_t index) const {
+        return (index < batch_size) ? codewords[index] : 0;
+    }
+
+    void set_bitrate(uint16_t bitrate) {
        bitrate_ = bitrate;
    }

@@ -72,7 +80,7 @@ class POCSAGPacket {
        return bitrate_;
    }

-    void set_flag(const PacketFlag flag) {
+    void set_flag(PacketFlag flag) {
        flag_ = flag;
    }

@@ -89,7 +97,7 @@ class POCSAGPacket {
   private:
    uint16_t bitrate_{0};
    PacketFlag flag_{NORMAL};
-    std::array<uint32_t, 16> codewords{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    batch_t codewords{};
    Timestamp timestamp_{};
 };

@@ -142,7 +142,7 @@ static_assert(sizeof(ui_config2_t) == sizeof(uint32_t));
 struct misc_config_t {
    bool mute_audio : 1;
    bool disable_speaker : 1;
-    bool UNUSED_2 : 1;
+    bool config_disable_external_tcxo : 1;
    bool UNUSED_3 : 1;
    bool UNUSED_4 : 1;
    bool UNUSED_5 : 1;
@@ -226,6 +226,9 @@ struct data_t {
    // Additional UI settings.
    ui_config2_t ui_config2;

+    // recovery mode magic value storage
+    uint32_t config_mode_storage;
+
    constexpr data_t()
        : structure_version(data_structure_version_enum::VERSION_CURRENT),
          target_frequency(target_frequency_reset_value),
@@ -273,7 +276,8 @@ struct data_t {
          UNUSED_8(0),
          headphone_volume_cb(-600),
          misc_config(),
-          ui_config2() {
+          ui_config2(),
+          config_mode_storage(CONFIG_MODE_NORMAL_VALUE) {
    }
 };

@@ -363,6 +367,7 @@ void defaults() {

    set_config_backlight_timer(backlight_config_t{});
    set_config_splash(true);
+    set_config_disable_external_tcxo(false);
    set_encoder_dial_sensitivity(DIAL_SENSITIVITY_NORMAL);
    set_config_speaker_disable(true);  // Disable AK4951 speaker by default (in case of OpenSourceSDRLab H2)

@@ -380,6 +385,10 @@ void defaults() {

 void init() {
    const auto switches_state = get_switches_state();
+
+    // ignore for valid check
+    auto config_mode_backup = config_mode_storage();
+    set_config_mode_storage(CONFIG_MODE_NORMAL_VALUE);
    if (!(switches_state[(size_t)ui::KeyEvent::Left] && switches_state[(size_t)ui::KeyEvent::Right]) && backup_ram->is_valid()) {
        // Copy valid persistent data into cache.
        cached_backup_ram = *backup_ram;
@@ -395,6 +404,7 @@ void init() {
        // Copy defaults into cache.
        defaults();
    }
+    set_config_mode_storage(config_mode_backup);
 }

 void persist() {
@@ -550,6 +560,10 @@ bool config_speaker_disable() {
    return data->misc_config.disable_speaker;
 }

+bool config_disable_external_tcxo() {
+    return data->misc_config.config_disable_external_tcxo;
+}
+
 bool stealth_mode() {
    return data->ui_config.stealth_mode;
 }
@@ -611,6 +625,10 @@ void set_config_speaker_disable(bool v) {
    data->misc_config.disable_speaker = v;
 }

+void set_config_disable_external_tcxo(bool v) {
+    data->misc_config.config_disable_external_tcxo = v;
+}
+
 void set_stealth_mode(bool v) {
    data->ui_config.stealth_mode = v;
 }
@@ -840,6 +858,16 @@ void set_encoder_dial_sensitivity(uint8_t v) {
    data->encoder_dial_sensitivity = v;
 }

+// Recovery mode magic value storage
+static data_t* data_direct_access = reinterpret_cast<data_t*>(memory::map::backup_ram.base());
+
+uint32_t config_mode_storage() {
+    return data_direct_access->config_mode_storage;
+}
+void set_config_mode_storage(uint32_t v) {
+    data_direct_access->config_mode_storage = v;
+}
+
 // PMem to sdcard settings

 bool should_use_sdcard_for_pmem() {
@@ -965,6 +993,8 @@ bool debug_dump() {
    // misc_config bits
    pmem_dump_file.write_line("misc_config config_audio_mute: " + to_string_dec_int(config_audio_mute()));
    pmem_dump_file.write_line("misc_config config_speaker_disable: " + to_string_dec_int(config_speaker_disable()));
+    pmem_dump_file.write_line("ui_config config_disable_external_tcxo: " + to_string_dec_uint(config_disable_external_tcxo()));
+
    // receiver_model
    pmem_dump_file.write_line("\n[Receiver Model]");
    pmem_dump_file.write_line("target_frequency: " + to_string_dec_uint(receiver_model.target_frequency()));
@@ -173,6 +173,7 @@ void set_stealth_mode(const bool v);
 uint8_t config_cpld();
 void set_config_cpld(uint8_t i);

+bool config_disable_external_tcxo();
 bool config_splash();
 bool config_converter();
 bool config_updown_converter();
@@ -193,6 +194,7 @@ void set_gui_return_icon(bool v);
 void set_load_app_settings(bool v);
 void set_save_app_settings(bool v);
 void set_show_bigger_qr_code(bool v);
+void set_config_disable_external_tcxo(bool v);
 void set_config_splash(bool v);
 bool config_converter();
 bool config_updown_converter();
@@ -218,6 +220,11 @@ void set_disable_touchscreen(bool v);
 uint8_t config_encoder_dial_sensitivity();
 void set_encoder_dial_sensitivity(uint8_t v);

+#define CONFIG_MODE_GUARD_VALUE 2001
+#define CONFIG_MODE_NORMAL_VALUE 1999
+uint32_t config_mode_storage();
+void set_config_mode_storage(uint32_t v);
+
 uint32_t pocsag_last_address();
 void set_pocsag_last_address(uint32_t address);

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kyle Reed	78713cc2af	Search cleanup, more binder support (#1467 )	2023-10-01 09:04:37 -07:00
Kyle Reed	951890eaff	Add Binder helper methods (#1465 ) * Add binder, fix focus on remote btn delete * Use binder for freqman edit	2023-09-29 18:55:27 +02:00
Kyle Reed	fb00bfac3f	Nav stack cleanup (#1460 ) * Minor nav stack fixes * Nav stack cleanup * Additional cleanup, fix notepad crash * Fix abort/cancel * Fix for nasty focus bug * Format	2023-09-27 21:03:02 +02:00
Kyle Reed	a6a1483083	Improved trimming (#1458 ) * Add threshold UI * WIP Better trimming * Rewrite mostly done WIP * WIP - trim idea * WIP threshold trimming * WIP with new design * Cleanup	2023-09-23 21:56:37 +02:00
Kyle Reed	ef03f020ce	IQ Trim app and Capture auto-trim (#1456 ) * Add IQ Trim app WIP * Add 'trim' checkbox to capture * Implement trimming * Finish auto-trim * Stray //	2023-09-21 17:43:10 +02:00
Kyle Reed	070eb4003e	Remove proc pocsag & add keep/drop filtering (#1453 ) * Remove proc_pocsag from build, use new proc in app * Add support for keep/drop filtering	2023-09-19 11:46:30 +02:00
Kyle Reed	fca373d936	Add Remote App & UI updates. (#1451 ) * Alpha order sub-menus * WIP Getting Remote types outlined * WIP building UI * WIP adding RemoteButton control * WIP Fix build * WIP Basic editing support * Border on the active button * Make TxView2 sane * Add easier RGB color creation from uint32 * Center some button icons * WIP Remote - main UI * WIP main UI mostly working, can send * Add 'join' utility * WIP save/load * Pre-alloc buttons to prevent focus dangling * Alpha order settings/debug pages * Add UI for picking capture and set frequency * WIP Getting really close now * Fix path for init name * Some fit & finish	2023-09-18 23:22:46 +02:00
Kyle Reed	537cf2e79b	Fix console scroll - comment on how scrolling works (#1448 ) * Force console scroll area to be multiple of line height. Tons of comments. * Resize POCSAG console to fill height. * Make scoll behavior comment clearer	2023-09-14 20:20:40 +02:00
Kyle Reed	af424aa5f8	SymField rewrite (#1444 ) * First WIP symfield * Cleanup widget code * Rebase and format * Fix 'to_integer' bug, fix siggen UI. * to_string_hex fix, unit tests for string code * Pass instance in callback * Fix on_change callbacks * Fix keyfob (not active) * to_byte_array, coaster tx cleanup * Add to_byte_array tests * Changes in ui_numbers * Fix ui_encoders * Format * Fix modemsetup view's symfields * Remove header * Format	2023-09-12 12:38:19 -07:00
Kyle Reed	70e0f2913f	App Settings w/out radio settings, Settings UI cleanup (#1443 ) * Make app settings more consistent * Allow app settings to always work for custom settings	2023-09-10 17:04:20 -07:00
Kyle Reed	b28283271b	POCSAG clock detection 🐋 improvement(?) (#1442 ) * WIP convergence * Tighter code, allow for sample nudges during clock discovery.	2023-09-09 17:49:22 +02:00
Kyle Reed	4926cf8df5	POCSAG2 Revised bit extractor (#1439 ) * Better bit extraction WIP * Parallel clock signal detection for bit extraction * Relax clock detection accuracy. * Reset RateInfo state. TODOs	2023-09-09 15:18:42 +02:00
Kyle Reed	b3312a704a	Save 'raw log' setting (#1438 )	2023-09-08 21:20:26 +02:00
Kyle Reed	31e8019642	POCSAG Processor Rewrite (#1437 ) * WIP Refactoring * WordExtractor building * Fix buffer sizes and squelch execute * Move impls to cpp file * Baud indicator * WIP new bit extractor * New approach for bit extraction. * Code fit and finish * Fix case on button * Cleanup * Adjust rate miss threshold * Fix count bits error calculation.	2023-09-08 19:41:09 +02:00
Bernd Herzog	9525738118	Config mode hackrf r9 disable external tcxo fallback (#1434 ) * implemented auto disable of external tcxo if r9 crash during boot	2023-09-05 10:32:44 +02:00
Bernd Herzog	62310ad9a9	Config mode (#1433 ) * Allow code to run without a token * Reverted submodule change by mistake * WIP force tcxo * Added check to hide if not an R9 * Fixed comments * Updated name * Fixed crashing on TCXO switching * Fixed the reboot issue * Updated boot order * Cleaned up comments * added new recovery mode * added IO * implemented cpld mode change * whitespace change * renamed config mode * inverted logic * removed r9 dependency * added disable external tcxo option to config mode * fixed CLKIN detection for r9 * integrated tcxo setting into clock selection Co-authored-by @jLynx	2023-09-04 17:46:07 +02:00
Kyle Reed	4819a2f4e2	Decode status widget (#1431 ) * Initial cleanup of pocsag beta, using DSP filters * Better filter params * Better filter * Add signal diagnostics widgets * POCSAG procs sends stats messages * Only draw 32 bits * Add AudioNormalizer filter	2023-09-03 21:49:44 -07:00
Brumi-2021	2435ee780f	Small fine tuning xOVS selection for BW 25k (#1430 ) * Small fine tuning xOVS selection for BW 25k * Comments , same growing order ending with dot.	2023-09-02 00:35:43 +02:00