Stable v1.8.0 release (#1504 )

* Update version.txt * Update past_version.txt
POCSAG TX default freq (#1503 )
2026-09-05 14:29:08 +00:00 · 2023-10-17 15:20:40 +13:00 · 2023-10-16 21:32:07 +02:00 · 2023-10-15 18:04:26 -05:00 · 2023-10-14 21:08:39 +02:00 · 2023-10-14 11:33:52 -05:00
62 changed files with 152 additions and 197 deletions
@@ -1 +1 @@
-v1.7.3
+v1.7.4
@@ -1 +1 @@
-v1.7.4
+v1.8.0
@@ -244,8 +244,7 @@ SettingsManager::SettingsManager(
    : app_name_{app_name},
      settings_{},
      bindings_{},
-      loaded_{false},
-      radio_loaded_{false} {
+      loaded_{false} {
    settings_.mode = mode;
    settings_.options = options;

@@ -253,53 +252,50 @@ SettingsManager::SettingsManager(
    additional_settings.reserve(17 + additional_settings.size());
    bindings_ = std::move(additional_settings);

-    // 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);
-        }
+    // Settings should always be loaded because apps now rely
+    // on being able to store UI settings, config, etc.

-        // 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);
+    // 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);
+    }
+
+    // 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);
+
+    // RadioState should have initialized default radio parameters before this function;
+    // copy them to settings_ before checking settings .ini file (in case the file doesn't exist
+    // or doesn't include all parameters). Settings in the file can overwrite all, or a subset of parameters.
+    copy_from_radio_model(settings_);
+
    loaded_ = load_settings(app_name_, bindings_);

    // Only copy to the radio if load was successful.
-    if (loaded_ && portapack::persistent_memory::load_app_settings()) {
-        radio_loaded_ = true;
+    if (loaded_)
        copy_to_radio_model(settings_);
-    }
 }

 SettingsManager::~SettingsManager() {
-    // Only save radio settings when the option is enabled.
-    if (portapack::persistent_memory::save_app_settings())
-        copy_from_radio_model(settings_);
+    copy_from_radio_model(settings_);

    save_settings(app_name_, bindings_);
 }
@@ -170,8 +170,6 @@ 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_; }
@@ -181,7 +179,6 @@ class SettingsManager {
    AppSettings settings_;
    SettingBindings bindings_;
    bool loaded_;
-    bool radio_loaded_;
 };

 }  // namespace app_settings
@@ -60,11 +60,12 @@ class ACARSAppView : public View {
   private:
    NavigationView& nav_;
    RxRadioState radio_state_{
+        131550000 /* frequency */,
        1750000 /* bandwidth */,
        2457600 /* sampling rate */
    };
    app_settings::SettingsManager settings_{
-        "rx_acars.hpp", app_settings::Mode::RX};
+        "rx_acars", app_settings::Mode::RX};

    bool logging{false};
    uint32_t packet_counter{0};
@@ -382,9 +382,6 @@ AISAppView::AISAppView(NavigationView& nav)

    recent_entry_detail_view.hidden(true);

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

    options_channel.on_change = [this](size_t, OptionsField::value_t v) {
@@ -162,9 +162,8 @@ class AISAppView : public View {
    std::string title() const override { return "AIS RX"; };

   private:
-    static constexpr uint32_t initial_target_frequency = 162025000;
-
    RxRadioState radio_state_{
+        162025000 /* frequency*/,
        1750000 /* bandwidth */,
        2457600 /* sampling rate */
    };
@@ -110,9 +110,6 @@ ERTAppView::ERTAppView(NavigationView&) {
        &recent_entries_view,
    });

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

    logger = std::make_unique<ERTLogger>();
@@ -123,12 +123,11 @@ class ERTAppView : public View {
    std::string title() const override { return "ERT RX"; };

   private:
-    static constexpr uint32_t initial_target_frequency = 911600000;
-
    ERTRecentEntries recent{};
    std::unique_ptr<ERTLogger> logger{};

    RxRadioState radio_state_{
+        911600000 /* frequency */,
        2500000 /* bandwidth */,
        4194304 /* sampling rate */};
    app_settings::SettingsManager settings_{
@@ -176,13 +176,6 @@ GpsSimAppView::GpsSimAppView(
        &waterfall,
    });

-    transmitter_model.set_baseband_bandwidth(15'000'000);  // GPS L1 signal use to have wide band spectrum, still with lobule energy -30dB's at + - 15 Mhz
-
-    if (!settings_.radio_loaded()) {
-        field_frequency.set_value(initial_target_frequency);
-        transmitter_model.set_sampling_rate(2600000);
-    }
-
    field_frequency.set_step(5000);

    button_play.on_select = [this](ImageButton&) {
@@ -51,21 +51,17 @@ class GpsSimAppView : public View {
    std::string title() const override { return "GPS Sim TX"; };

   private:
-    static constexpr uint32_t initial_target_frequency = 1575420000;
-
    NavigationView& nav_;
-    RxRadioState radio_state_{
-        3000000 /* bandwidth */,
-        500000 /* sampling rate */
+    TxRadioState radio_state_{
+        1575420000 /* frequency */,
+        15000000 /* bandwidth */,
+        2600000 /* sampling rate */
    };
    app_settings::SettingsManager settings_{
        "tx_gps", app_settings::Mode::TX};

    static constexpr ui::Dim header_height = 3 * 16;

-    int32_t tx_gain{47};
-    bool rf_amp{true};                                       // aux private var to store temporal, same as Replay App rf_amp user selection.
-    static constexpr uint32_t baseband_bandwidth = 3000000;  // filter bandwidth
    const size_t read_size{16384};
    const size_t buffer_count{3};

@@ -51,6 +51,7 @@ class LGEView : public View {
    };

    TxRadioState radio_state_{
+        868067000 /* frequency */,
        1750000 /* bandwidth */,
        2280000 /* sampling rate */
    };
@@ -114,9 +114,6 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav)
                                    ? FILTER_NONE
                                    : FILTER_DROP;
    }
-    if (!app_settings_.radio_loaded()) {
-        field_frequency.set_value(initial_target_frequency);
-    }

    logger.append(LOG_ROOT_DIR "/POCSAG.TXT");

@@ -197,14 +197,17 @@ class POCSAGAppView : public View {
    void focus() override;

   private:
-    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 hide_bad_data() const { return settings_.hide_bad_data; };
    bool hide_addr_only() const { return settings_.hide_addr_only; };

    NavigationView& nav_;
-    RxRadioState radio_state_{};
+    RxRadioState radio_state_{
+        466175000 /* frequency*/,
+        max283x::filter::bandwidth_minimum /* bandwidth */,
+        3072000 /* sampling rate */
+    };

    // Settings
    POCSAGSettings settings_{};
@@ -120,7 +120,6 @@ void SoundBoardView::start_tx(const uint32_t id) {
    );
    baseband::set_sample_rate(sample_rate);

-    transmitter_model.set_baseband_bandwidth(1'750'000);  // the Minimum TX LPF  1M75 is fine.
    transmitter_model.enable();

    tx_view.set_transmitting(true);
@@ -50,6 +50,7 @@ class SoundBoardView : public View {

   private:
    TxRadioState radio_state_{
+        0 /* frequency */,
        1750000 /* bandwidth */,
        1536000 /* sampling rate */
    };
@@ -157,9 +157,6 @@ TPMSAppView::TPMSAppView(NavigationView&) {
                  &field_vga,
                  &recent_entries_view});

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

    options_band.on_change = [this](size_t, OptionsField::value_t v) {
@@ -102,9 +102,8 @@ class TPMSAppView : public View {
    std::string title() const override { return "TPMS RX"; };

   private:
-    static constexpr uint32_t initial_target_frequency = 315000000;
-
    RxRadioState radio_state_{
+        315000000 /* frequency*/,
        1750000 /* bandwidth */,
        2457600 /* sampling rate */};
    app_settings::SettingsManager settings_{
@@ -135,7 +134,7 @@ class TPMSAppView : public View {
        3,
        {
            {"315", 315000000},
-            {"433", 433920000},
+            {"434", 433920000},
        }};

    OptionsField options_pressure{
@@ -521,7 +521,6 @@ ADSBRxView::ADSBRxView(NavigationView& nav) {

    baseband::set_adsb();

-    receiver_model.set_target_frequency(1'090'000'000);
    receiver_model.enable();
 }

@@ -342,6 +342,7 @@ class ADSBRxView : public View {

   private:
    RxRadioState radio_state_{
+        1090000000 /* frequency */,
        2500000 /* bandwidth */,
        2000000 /* sampling rate */,
        ReceiverModel::Mode::SpectrumAnalysis};
@@ -299,7 +299,6 @@ void ADSBTxView::start_tx() {
    /* Already tested , with SDR Angel + another Hackrf RX  and dump1090 + SDR RLT. Final conclusion is TX LPF 6 Mhz is
     * the best settings to fulfill ADSB transponder spectrum mask requirements (<=-20 dB's at +-7Mhz , <=-40 dB's at +-23Mhz )
     * and not showing any ADSB data decoding degradation.*/
-    transmitter_model.set_baseband_bandwidth(6'000'000);  // best settings for ADSB TX.
    transmitter_model.enable();

    baseband::set_adsb();
@@ -203,7 +203,8 @@ class ADSBTxView : public View {
        };*/

    TxRadioState radio_state_{
-        10000000 /* bandwidth */,
+        1090000000 /* frequency */,
+        6000000 /* bandwidth */,
        4000000 /* sampling rate */
    };
    app_settings::SettingsManager settings_{
@@ -190,7 +190,11 @@ class APRSRxView : public View {
    bool reset_console = false;

    NavigationView& nav_;
-    RxRadioState radio_state_{};
+    RxRadioState radio_state_{
+        144390000 /* frequency */,
+        1750000 /* bandwidth */,
+        3072000 /* sampling rate */
+    };
    app_settings::SettingsManager settings_{
        "rx_aprs", app_settings::Mode::RX};

@@ -57,7 +57,6 @@ void APRSTXView::start_tx() {
    // uint8_t * bb_data_ptr = shared_memory.bb_data.data;
    // text_payload.set(to_string_hex_array(bb_data_ptr + 56, 15));

-    transmitter_model.set_baseband_bandwidth(1'750'000);  // APRS Automatic Packet Reporting System (APRS).AFSK with NBFM , max BW= 12k5 , then TX LPF min 1M75
    transmitter_model.enable();

    baseband::set_afsk_data(
@@ -46,6 +46,7 @@ class APRSTXView : public View {

   private:
    TxRadioState radio_state_{
+        144390000 /* frequency */,
        1750000 /* bandwidth */,
        AFSK_TX_SAMPLERATE /* sampling rate */
    };
@@ -54,7 +54,6 @@ BTLERxView::BTLERxView(NavigationView& nav)
                  &console});

    // Auto-configure modem for LCR RX (TODO: remove later)
-    field_frequency.set_value(2426000000);
    auto def_bell202 = &modem_defs[0];
    persistent_memory::set_modem_baudrate(def_bell202->baudrate);
    serial_format_t serial_format;
@@ -50,6 +50,7 @@ class BTLERxView : public View {

    NavigationView& nav_;
    RxRadioState radio_state_{
+        2426000000 /* frequency */,
        4000000 /* bandwidth */,
        4000000 /* sampling rate */,
        ReceiverModel::Mode::WidebandFMAudio};
@@ -67,7 +67,6 @@ void CoasterPagerView::generate_frame() {
 void CoasterPagerView::start_tx() {
    generate_frame();

-    transmitter_model.set_baseband_bandwidth(1'750'000);  // AFSK narrowband ,low baud,  max FM dev 150khz , std 10khz. TX LPF=1M75 the min.
    transmitter_model.enable();

    baseband::set_fsk_data(19 * 8, 2280000 / 1000, 5000, 32);
@@ -52,11 +52,12 @@ class CoasterPagerView : public View {
    tx_modes tx_mode = IDLE;

    TxRadioState radio_state_{
+        433920000, /* frequency */
        1750000 /* bandwidth */,
        2280000 /* sampling rate */
    };
    app_settings::SettingsManager settings_{
-        "tx_coaster", app_settings::Mode::TX};
+        "tx_burger", app_settings::Mode::TX};

    void start_tx();
    void generate_frame();
@@ -92,7 +92,9 @@ DfuMenu2::DfuMenu2(NavigationView& nav)
                  &text_info_line_5,
                  &text_info_line_6,
                  &text_info_line_7,
-                  &text_info_line_8});
+                  &text_info_line_8,
+                  &text_info_line_9,
+                  &text_info_line_10});
 }

 void DfuMenu2::paint(Painter& painter) {
@@ -103,10 +105,12 @@ void DfuMenu2::paint(Painter& painter) {
    text_info_line_5.set(to_string_dec_uint(portapack::receiver_model.am_configuration(), 10));
    text_info_line_6.set(to_string_dec_uint(portapack::receiver_model.nbfm_configuration(), 10));
    text_info_line_7.set(to_string_dec_uint(portapack::receiver_model.wfm_configuration(), 10));
-    text_info_line_8.set("");
+    text_info_line_8.set(to_string_dec_uint(portapack::transmitter_model.target_frequency(), 10));
+    text_info_line_9.set(to_string_dec_uint(portapack::transmitter_model.baseband_bandwidth(), 10));
+    text_info_line_10.set(to_string_dec_uint(portapack::transmitter_model.sampling_rate(), 10));

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

    painter.fill_rectangle(
        {{5 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
@@ -77,17 +77,19 @@ class DfuMenu2 : public View {
   private:
    NavigationView& nav_;

-    Text text_head{{6 * CHARACTER_WIDTH, 3 * LINE_HEIGHT, 8 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, "Receiver"};
+    Text text_head{{6 * CHARACTER_WIDTH, 3 * LINE_HEIGHT, 14 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, "Radio Settings"};

    Labels labels{
-        {{5 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "Tgt freq:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "Bandwidt:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "Sampl Rt:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "RX Freq:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "RX BW:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "RX SampR:", Color::dark_cyan()},
        {{5 * CHARACTER_WIDTH, 8 * LINE_HEIGHT}, "Modulatn:", Color::dark_cyan()},
        {{5 * CHARACTER_WIDTH, 9 * LINE_HEIGHT}, "AM cfg:", Color::dark_cyan()},
        {{5 * CHARACTER_WIDTH, 10 * LINE_HEIGHT}, "NBFM cfg:", Color::dark_cyan()},
        {{5 * CHARACTER_WIDTH, 11 * LINE_HEIGHT}, "WFM cfg:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "", Color::dark_cyan()}};
+        {{5 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "TX Freq:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 13 * LINE_HEIGHT}, "TX BW:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 14 * LINE_HEIGHT}, "TX SampR:", Color::dark_cyan()}};

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

 } /* namespace ui */
@@ -272,7 +272,6 @@ void EncodersView::start_tx(const bool scan) {
    /* Setting TX LPF 1M75 in this TX OOK App  , We got same results as fw 1.7.4
     * Looking max BW of this app, we tested , Selecting OOK type 145026 with CLK 455K and max DEV. 150k,
     * and we got BW +-2Mhz , with that TX LPF 1M75, it is fine.*/
-    transmitter_model.set_baseband_bandwidth(1'750'000);  // Min. TX LPF value.
    transmitter_model.enable();

    baseband::set_ook_data(
@@ -185,6 +185,7 @@ class EncodersView : public View {
    };

    TxRadioState radio_state_{
+        433920000 /* frequency */,
        1750000 /* bandwidth */,
        OOK_SAMPLERATE /* sampling rate */
    };
@@ -101,6 +101,7 @@ class JammerView : public View {
   private:
    NavigationView& nav_;
    TxRadioState radio_state_{
+        0 /* frequency */,
        3500000 /* bandwidth */,
        3072000 /* sampling rate */
    };
@@ -222,8 +222,6 @@ KeyfobView::KeyfobView(

    options_make.set_selected_index(0);

-    transmitter_model.set_target_frequency(433920000);  // Fixed 433.92MHz
-
    tx_view.on_edit_frequency = [this, &nav]() {
        auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
        new_view->on_changed = [this](rf::Frequency f) {
@@ -44,6 +44,7 @@ class KeyfobView : public View {
    NavigationView& nav_;

    TxRadioState radio_state_{
+        433920000 /* frequency */,
        1750000 /* bandwidth */,
        OOK_SAMPLERATE /* sampling rate */
    };
@@ -82,6 +82,7 @@ class LCRView : public View {
    };

    TxRadioState radio_state_{
+        0 /* frequency */,
        1750000 /* bandwidth */,
        AFSK_TX_SAMPLERATE /* sampling rate */
    };
@@ -82,6 +82,7 @@ class MicTXView : public View {

    RxRadioState rx_radio_state_{};
    TxRadioState tx_radio_state_{
+        0 /* frequency */,
        1750000 /* bandwidth */,
        sampling_rate /* sampling rate */
    };
@@ -70,6 +70,7 @@ class MorseView : public View {
    uint32_t time_units{0};

    TxRadioState radio_state_{
+        0 /* frequency */,
        1750000 /* bandwidth */,
        1536000 /* sampling rate */
    };
@@ -54,7 +54,6 @@ NRFRxView::NRFRxView(NavigationView& nav)
                  &console});

    // Auto-configure modem for LCR RX (will be removed later)
-    field_frequency.set_value(2480000000);
    auto def_bell202 = &modem_defs[0];
    persistent_memory::set_modem_baudrate(def_bell202->baudrate);
    serial_format_t serial_format;
@@ -50,6 +50,7 @@ class NRFRxView : public View {

    NavigationView& nav_;
    RxRadioState radio_state_{
+        2480000000 /* frequency */,
        4000000 /* bandwidth */,
        4000000 /* sampling rate */,
        ReceiverModel::Mode::WidebandFMAudio};
@@ -56,6 +56,7 @@ class NumbersStationView : public View {
    NavigationView& nav_;

    TxRadioState radio_state_{
+        0 /* frequency */,
        1750000 /* bandwidth */,
        1536000 /* sampling rate */
    };
@@ -56,6 +56,7 @@ class NuoptixView : public View {
    };

    TxRadioState radio_state_{
+        0 /* frequency */,
        1750000 /* bandwidth */,
        1536000 /* sampling rate */
    };
@@ -60,6 +60,7 @@ class POCSAGTXView : public View {
    NavigationView& nav_;

    TxRadioState radio_state_{
+        466175000 /* frequency */,
        1750000 /* bandwidth */,
        2280000 /* sampling rate */
    };
@@ -187,7 +187,6 @@ void RDSView::start_tx() {
    else
        frame_datetime.clear();

-    transmitter_model.set_baseband_bandwidth(1'750'000);  // Big Spectrum harmonics reduction, and now quicker decoding time.
    transmitter_model.enable();

    tx_thread = std::make_unique<RDSThread>(frames);
@@ -142,6 +142,7 @@ class RDSView : public View {
    RDS_flags rds_flags{};

    TxRadioState radio_state_{
+        0 /* frequency */,
        1750000 /* bandwidth */,
        2280000 /* sampling rate */
    };
@@ -90,6 +90,7 @@ class SearchView : public View {
   private:
    NavigationView& nav_;
    RxRadioState radio_state_{
+        100'000'000 /* frequency */,
        2500000 /* bandwidth */,
        SEARCH_SLICE_WIDTH /* sampling rate */,
        ReceiverModel::Mode::SpectrumAnalysis};
@@ -343,34 +343,6 @@ void SetUIView::focus() {
    button_save.focus();
 }

-/* SetAppSettingsView ************************************/
-
-SetAppSettingsView::SetAppSettingsView(NavigationView& nav) {
-    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());
-
-    button_save.on_select = [&nav, this](Button&) {
-        pmem::set_load_app_settings(checkbox_load_app_settings.value());
-        pmem::set_save_app_settings(checkbox_save_app_settings.value());
-        nav.pop();
-    };
-    button_cancel.on_select = [&nav, this](Button&) {
-        nav.pop();
-    };
-}
-
-void SetAppSettingsView::focus() {
-    button_save.focus();
-}
-
 /* SetConverterSettingsView ******************************/

 SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) {
@@ -654,7 +626,6 @@ 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>(); }},
@@ -310,41 +310,6 @@ class SetUIView : public View {
    };
 };

-class SetAppSettingsView : public View {
-   public:
-    SetAppSettingsView(NavigationView& nav);
-
-    void focus() override;
-    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, 6 * 16},
-        25,
-        "Load radio settings"};
-
-    Checkbox checkbox_save_app_settings{
-        {3 * 8, 8 * 16},
-        25,
-        "Save radio settings"};
-
-    Button button_save{
-        {2 * 8, 16 * 16, 12 * 8, 32},
-        "Save"};
-
-    Button button_cancel{
-        {16 * 8, 16 * 16, 12 * 8, 32},
-        "Cancel",
-    };
-};
-
 class SetConverterSettingsView : public View {
   public:
    SetConverterSettingsView(NavigationView& nav);
@@ -51,6 +51,7 @@ class SigGenView : public View {
    void on_tx_progress(const uint32_t progress, const bool done);

    TxRadioState radio_state_{
+        0 /* frequency */,
        1750000 /* bandwidth */,
        1536000 /* sampling rate */
    };
@@ -66,9 +66,6 @@ SondeView::SondeView(NavigationView& nav)
                  &button_see_qr,
                  &button_see_map});

-    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

    geopos.set_read_only(true);
@@ -68,6 +68,7 @@ class SondeView : public View {
   private:
    NavigationView& nav_;
    RxRadioState radio_state_{
+        402700000 /* frequency */,
        1750000 /* bandwidth */,
        2457600 /* sampling rate */
    };
@@ -75,7 +76,6 @@ class SondeView : public View {
        "rx_sonde", app_settings::Mode::RX};

    std::unique_ptr<SondeLogger> logger{};
-    uint32_t target_frequency_{402700000};
    bool logging{false};
    bool use_crc{false};
    bool beep{false};
@@ -62,6 +62,7 @@ class TestView : public View {
   private:
    NavigationView& nav_;
    RxRadioState radio_state_{
+        0 /* frequency */,
        1750000 /* bandwidth */,
        2457600 * 2 /* sampling rate */
    };
@@ -85,7 +85,6 @@ void TouchTunesView::on_tx_progress(const uint32_t progress, const bool done) {
 // transmission events.
 void TouchTunesView::start_ew() {
    // Radio
-    transmitter_model.set_target_frequency(433920000);
    transmitter_model.set_rf_amp(true);
    transmitter_model.set_tx_gain(47);
    transmitter_model.enable();
@@ -151,10 +150,7 @@ void TouchTunesView::start_tx(const uint32_t button_index) {

    size_t bitstream_length = make_bitstream(fragments);

-    transmitter_model.set_target_frequency(433920000);
-    transmitter_model.set_sampling_rate(OOK_SAMPLERATE);
    transmitter_model.set_rf_amp(true);
-    transmitter_model.set_baseband_bandwidth(1750000);
    transmitter_model.enable();

    baseband::set_ook_data(
@@ -25,6 +25,7 @@
 #include "ui_transmitter.hpp"
 #include "transmitter_model.hpp"
 #include "radio_state.hpp"
+#include "encoders.hpp"

 // The coding in notpike's script is quite complex, using multiple LUTs to form the data sent to the YSO.
 // The format is actually very simple if it is rather seen as short and long gaps between pulses (as seen in many OOK remotes).
@@ -115,8 +116,9 @@ class TouchTunesView : public View {

   private:
    TxRadioState radio_state_{
-        3500000 /* bandwidth */,
-        3072000 /* sampling rate */
+        433920000 /* frequency */,
+        1750000 /* bandwidth */,
+        OOK_SAMPLERATE /* sampling rate */
    };

    uint32_t scan_button_index{};
@@ -92,8 +92,8 @@ max2839::MAX2839 second_if_max2839{ssp1_target_max283x};
 static max5864::MAX5864 baseband_codec{ssp1_target_max5864};
 static baseband::CPLD baseband_cpld;

-// Set invalid to force the set_direction CPLD workaround to run.
-static rf::Direction direction{-1};
+// load_sram() is called at boot in portapack.cpp, including verify CPLD part, so default direction is Receive
+static rf::Direction direction{rf::Direction::Receive};
 static bool baseband_invert = false;
 static bool mixer_invert = false;

@@ -41,8 +41,10 @@ class RadioState {
        model->initialize();
    }

-    RadioState(uint32_t new_bandwidth, uint32_t new_sampling_rate) {
+    RadioState(uint32_t new_frequency, uint32_t new_bandwidth, uint32_t new_sampling_rate) {
        model->initialize();
+        if (new_frequency != 0)
+            model->set_target_frequency(new_frequency);
        model->set_sampling_rate(new_sampling_rate);
        model->set_baseband_bandwidth(new_bandwidth);
    }
@@ -61,10 +63,13 @@ class RadioState {
        typename U = TModel,
        typename Mode = std::enable_if_t<sizeof(typename U::Mode), typename U::Mode> >
    RadioState(
+        uint32_t new_frequency,
        uint32_t new_bandwidth,
        uint32_t new_sampling_rate,
        Mode new_mode) {
        model->initialize();
+        if (new_frequency != 0)
+            model->set_target_frequency(new_frequency);
        model->set_sampling_rate(new_sampling_rate);
        model->set_baseband_bandwidth(new_bandwidth);
        model->settings().mode = new_mode;
@@ -110,16 +110,18 @@ void BtnGridView::clear() {

 void BtnGridView::add_items(std::initializer_list<GridItem> new_items) {
    for (auto item : new_items) {
-        menu_items.push_back(item);
+        if (!blacklisted_app(item))
+            menu_items.push_back(item);
    }

    update_items();
 }

 void BtnGridView::add_item(GridItem new_item) {
-    menu_items.push_back(new_item);
-
-    update_items();
+    if (!blacklisted_app(new_item)) {
+        menu_items.push_back(new_item);
+        update_items();
+    }
 }

 void BtnGridView::update_items() {
@@ -232,4 +234,30 @@ bool BtnGridView::on_encoder(const EncoderEvent event) {
    return set_highlighted(highlighted_item + event);
 }

+/* BlackList ******************************************************/
+
+std::unique_ptr<char> blacklist_ptr{};
+size_t blacklist_len{};
+
+void load_blacklist() {
+    File f;
+
+    auto error = f.open(BLACKLIST);
+    if (error)
+        return;
+
+    blacklist_ptr = std::unique_ptr<char>(new char[f.size()]);
+    if (f.read(blacklist_ptr.get(), f.size()))
+        blacklist_len = f.size();
+}
+
+bool BtnGridView::blacklisted_app(GridItem new_item) {
+    std::string app_name = new_item.text;
+
+    if (blacklist_len < app_name.size())
+        return false;
+
+    return std::search(blacklist_ptr.get(), blacklist_ptr.get() + blacklist_len, app_name.begin(), app_name.end()) < blacklist_ptr.get() + blacklist_len;
+}
+
 } /* namespace ui */
@@ -36,6 +36,9 @@
 #include <string>
 #include <vector>

+// file used for listing apps to hide from menu
+#define BLACKLIST u"/SETTINGS/blacklist"
+
 namespace ui {

 struct GridItem {
@@ -47,6 +50,8 @@ struct GridItem {
    // TODO: Prevent default-constructed GridItems.
 };

+void load_blacklist();
+
 class BtnGridView : public View {
   public:
    BtnGridView(Rect new_parent_rect = {0, 0, 240, 304}, bool keep_highlight = false);
@@ -70,6 +75,7 @@ class BtnGridView : public View {
    void on_blur() override;
    bool on_key(const KeyEvent event) override;
    bool on_encoder(const EncoderEvent event) override;
+    bool blacklisted_app(GridItem new_item);

   private:
    int rows_{3};
@@ -161,6 +161,8 @@ SystemStatusView::SystemStatusView(

    rtc_battery_workaround();

+    ui::load_blacklist();
+
    if (pmem::should_use_sdcard_for_pmem()) {
        pmem::load_persistent_settings_from_file();
    }
@@ -572,8 +574,8 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
-        {"ADS-B", ui::Color::green(), &bitmap_icon_adsb, [&nav]() { nav.push<ADSBTxView>(); }},
-        {"APRS", ui::Color::green(), &bitmap_icon_aprs, [&nav]() { nav.push<APRSTXView>(); }},
+        {"ADS-B TX", ui::Color::green(), &bitmap_icon_adsb, [&nav]() { nav.push<ADSBTxView>(); }},
+        {"APRS TX", 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>(); }},
@@ -583,7 +585,7 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
        {"Morse", ui::Color::green(), &bitmap_icon_morse, [&nav]() { nav.push<MorseView>(); }},
        // { "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>(); }},
+        {"POCSAG TX", 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>(); }},
@@ -524,14 +524,6 @@ bool show_gui_return_icon() {  // add return icon in touchscreen menu
    return data->ui_config.show_gui_return_icon != 0;
 }

-bool load_app_settings() {  // load (last saved) app settings on startup of app
-    return data->ui_config.load_app_settings != 0;
-}
-
-bool save_app_settings() {  // save app settings when closing app
-    return data->ui_config.save_app_settings != 0;
-}
-
 bool show_bigger_qr_code() {  // show bigger QR code
    return data->ui_config.show_large_qr_code != 0;
 }
@@ -179,8 +179,6 @@ bool config_converter();
 bool config_updown_converter();
 int64_t config_converter_freq();
 bool show_gui_return_icon();
-bool load_app_settings();
-bool save_app_settings();
 bool show_bigger_qr_code();
 bool hide_clock();
 bool clock_with_date();
Author	SHA1	Message	Date
jLynx	3db8a5ac5b	Stable v1.8.0 release (#1504 ) * Update version.txt * Update past_version.txt	2023-10-17 15:20:40 +13:00
Mark Thompson	266a626acf	POCSAG TX default freq (#1503 ) * Changed name for blacklist * Set default POCSAG TX freq to same as in POCSAG RX	2023-10-16 21:32:07 +02:00
Mark Thompson	411e2fb93a	Hide unwanted apps by naming them in SETTINGS/blacklist file (#1502 ) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Changed some app name strings for blacklist	2023-10-15 18:04:26 -05:00
Mark Thompson	6ed83c08e3	Renamed .ini file for Burger Pager app (#1500 )	2023-10-14 21:08:39 +02:00
Mark Thompson	9929376acf	Added Freq to Radio State, only update specified App Settings, always Load/Save Settings (#1498 ) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload	2023-10-14 11:33:52 -05:00
Mark Thompson	5135b6404d	Prevent unnecessary CPLD SRAM load on first RX operation (#1494 )	2023-10-14 10:28:44 +02:00
Mark Thompson	790669c242	Added Transmitter settings to 2nd DFU overlay screen (#1497 ) * Added Transmitter settings to 2nd DFU overlay	2023-10-14 10:25:40 +02:00