From b50d18eafc4983275e0e09e797b528d5f42d816d Mon Sep 17 00:00:00 2001 From: RocketGod <57732082+RocketGod-git@users.noreply.github.com> Date: Thu, 5 Jun 2025 12:25:09 -0700 Subject: [PATCH] Radio app improvements (#2680) --- .../external/fmradio/ui_fmradio.cpp | 183 ++++++++++++------ .../external/fmradio/ui_fmradio.hpp | 82 ++++++-- 2 files changed, 197 insertions(+), 68 deletions(-) diff --git a/firmware/application/external/fmradio/ui_fmradio.cpp b/firmware/application/external/fmradio/ui_fmradio.cpp index ece1d2119..621e00449 100644 --- a/firmware/application/external/fmradio/ui_fmradio.cpp +++ b/firmware/application/external/fmradio/ui_fmradio.cpp @@ -1,5 +1,6 @@ /* - * Copyright (C) 2024 HTotoo + * Copyright (C) 2024 HT Otto + * Copyright (C) 2025 RocketGod - Added modes from my Flipper Zero RF Jammer App - https://betaskynet.com * * This file is part of PortaPack. * @@ -26,6 +27,7 @@ #include "baseband_api.hpp" #include "string_format.hpp" #include "portapack_persistent_memory.hpp" +#include "oversample.hpp" using namespace portapack; using namespace modems; @@ -37,16 +39,89 @@ void FmRadioView::focus() { field_frequency.focus(); } +void FmRadioView::change_mode(int32_t mod) { + field_bw.on_change = [this](size_t n, OptionsField::value_t) { (void)n; }; + + audio::output::stop(); + receiver_model.disable(); + baseband::shutdown(); + + audio_spectrum_update = false; // Reset spectrum update flag + std::fill(audio_spectrum, audio_spectrum + 128, 0); // Clear spectrum buffer + + ReceiverModel::Mode receiver_mode = static_cast(mod); + bool is_ssb = (mod == static_cast(ReceiverModel::Mode::AMAudio) && + (field_modulation.selected_index() == 3 || field_modulation.selected_index() == 4)); + + switch (mod) { + case static_cast(ReceiverModel::Mode::AMAudio): + audio_sampling_rate = audio::Rate::Hz_24000; // Increased to 24 kHz for better AM/SSB audio + freqman_set_bandwidth_option(0, field_bw); // AM_MODULATION + baseband::run_image(portapack::spi_flash::image_tag_am_audio); + receiver_mode = ReceiverModel::Mode::AMAudio; + field_bw.set_by_value(0); // DSB default + receiver_model.set_modulation(receiver_mode); + if (is_ssb) { + receiver_model.set_am_configuration(field_modulation.selected_index() == 3 ? 1 : 2); // 1=USB, 2=LSB + } else { + receiver_model.set_am_configuration(0); // DSB + } + field_bw.on_change = [this](size_t index, OptionsField::value_t n) { + radio_bw = index; + receiver_model.set_am_configuration(n); + }; + break; + case static_cast(ReceiverModel::Mode::NarrowbandFMAudio): + audio_sampling_rate = audio::Rate::Hz_24000; + freqman_set_bandwidth_option(1, field_bw); // NFM_MODULATION + baseband::run_image(portapack::spi_flash::image_tag_nfm_audio); + receiver_mode = ReceiverModel::Mode::NarrowbandFMAudio; + field_bw.set_by_value(2); // 16k default + receiver_model.set_nbfm_configuration(field_bw.selected_index_value()); + field_bw.on_change = [this](size_t index, OptionsField::value_t n) { + radio_bw = index; + receiver_model.set_nbfm_configuration(n); + }; + break; + case static_cast(ReceiverModel::Mode::WidebandFMAudio): + audio_sampling_rate = audio::Rate::Hz_48000; + freqman_set_bandwidth_option(2, field_bw); // WFM_MODULATION + baseband::run_image(portapack::spi_flash::image_tag_wfm_audio); + receiver_mode = ReceiverModel::Mode::WidebandFMAudio; + field_bw.set_by_value(0); // 200k default + receiver_model.set_wfm_configuration(field_bw.selected_index_value()); + field_bw.on_change = [this](size_t index, OptionsField::value_t n) { + radio_bw = index; + receiver_model.set_wfm_configuration(n); + }; + break; + default: + break; + } + + receiver_model.set_modulation(receiver_mode); + + receiver_model.set_sampling_rate(3072000); + receiver_model.set_baseband_bandwidth(1750000); + audio::set_rate(audio_sampling_rate); + audio::output::start(); + receiver_model.set_headphone_volume(receiver_model.headphone_volume()); // WM8731 hack + + receiver_model.enable(); +} + FmRadioView::FmRadioView(NavigationView& nav) : nav_{nav} { baseband::run_image(portapack::spi_flash::image_tag_wfm_audio); - add_children({&rssi, - &field_rf_amp, + add_children({&field_rf_amp, &field_lna, &field_vga, &field_volume, &field_frequency, + &field_bw, + &text_mode_label, + &field_modulation, &btn_fav_save, &txt_save_help, &btn_fav_0, @@ -60,12 +135,14 @@ FmRadioView::FmRadioView(NavigationView& nav) &btn_fav_8, &btn_fav_9, &audio, - &waveform}); + &waveform, + &rssi}); txt_save_help.visible(false); for (uint8_t i = 0; i < 12; ++i) { - if (freq_fav_list[i] == 0) { - freq_fav_list[i] = 87000000; + if (freq_fav_list[i].frequency == 0) { + freq_fav_list[i].frequency = 87000000; + freq_fav_list[i].modulation = static_cast(ReceiverModel::Mode::WidebandFMAudio); } } @@ -73,42 +150,20 @@ FmRadioView::FmRadioView(NavigationView& nav) field_frequency.set_value(87000000); } - receiver_model.set_modulation(ReceiverModel::Mode::WidebandFMAudio); - field_frequency.set_step(25000); - receiver_model.enable(); - audio::output::start(); + change_mode(static_cast(ReceiverModel::Mode::WidebandFMAudio)); + field_modulation.set_by_value(static_cast(ReceiverModel::Mode::WidebandFMAudio)); - btn_fav_0.on_select = [this](Button&) { - on_btn_clicked(0); - }; - btn_fav_1.on_select = [this](Button&) { - on_btn_clicked(1); - }; - btn_fav_2.on_select = [this](Button&) { - on_btn_clicked(2); - }; - btn_fav_3.on_select = [this](Button&) { - on_btn_clicked(3); - }; - btn_fav_4.on_select = [this](Button&) { - on_btn_clicked(4); - }; - btn_fav_5.on_select = [this](Button&) { - on_btn_clicked(5); - }; - btn_fav_6.on_select = [this](Button&) { - on_btn_clicked(6); - }; - btn_fav_7.on_select = [this](Button&) { - on_btn_clicked(7); - }; - btn_fav_8.on_select = [this](Button&) { - on_btn_clicked(8); - }; - btn_fav_9.on_select = [this](Button&) { - on_btn_clicked(9); - }; + btn_fav_0.on_select = [this](Button&) { on_btn_clicked(0); }; + btn_fav_1.on_select = [this](Button&) { on_btn_clicked(1); }; + btn_fav_2.on_select = [this](Button&) { on_btn_clicked(2); }; + btn_fav_3.on_select = [this](Button&) { on_btn_clicked(3); }; + btn_fav_4.on_select = [this](Button&) { on_btn_clicked(4); }; + btn_fav_5.on_select = [this](Button&) { on_btn_clicked(5); }; + btn_fav_6.on_select = [this](Button&) { on_btn_clicked(6); }; + btn_fav_7.on_select = [this](Button&) { on_btn_clicked(7); }; + btn_fav_8.on_select = [this](Button&) { on_btn_clicked(8); }; + btn_fav_9.on_select = [this](Button&) { on_btn_clicked(9); }; btn_fav_save.on_select = [this](Button&) { save_fav = !save_fav; @@ -117,20 +172,31 @@ FmRadioView::FmRadioView(NavigationView& nav) txt_save_help.set_dirty(); }; + field_modulation.on_change = [this](size_t index, int32_t mod) { + change_mode(mod); + if (index == 3 || index == 4) { // USB or LSB + receiver_model.set_am_configuration(index == 3 ? 1 : 2); // 1=USB, 2=LSB + } + }; + update_fav_btn_texts(); } void FmRadioView::on_btn_clicked(uint8_t i) { if (save_fav) { save_fav = false; - freq_fav_list[i] = field_frequency.value(); + freq_fav_list[i].frequency = field_frequency.value(); + freq_fav_list[i].modulation = field_modulation.selected_index_value(); + freq_fav_list[i].bandwidth = radio_bw; update_fav_btn_texts(); txt_save_help.visible(save_fav); txt_save_help.set_text(""); txt_save_help.set_dirty(); return; } - field_frequency.set_value(freq_fav_list[i]); + field_frequency.set_value(freq_fav_list[i].frequency); + field_modulation.set_by_value(freq_fav_list[i].modulation); + change_mode(freq_fav_list[i].modulation); } std::string FmRadioView::to_nice_freq(rf::Frequency freq) { @@ -141,16 +207,16 @@ std::string FmRadioView::to_nice_freq(rf::Frequency freq) { } void FmRadioView::update_fav_btn_texts() { - btn_fav_0.set_text(to_nice_freq(freq_fav_list[0])); - btn_fav_1.set_text(to_nice_freq(freq_fav_list[1])); - btn_fav_2.set_text(to_nice_freq(freq_fav_list[2])); - btn_fav_3.set_text(to_nice_freq(freq_fav_list[3])); - btn_fav_4.set_text(to_nice_freq(freq_fav_list[4])); - btn_fav_5.set_text(to_nice_freq(freq_fav_list[5])); - btn_fav_6.set_text(to_nice_freq(freq_fav_list[6])); - btn_fav_7.set_text(to_nice_freq(freq_fav_list[7])); - btn_fav_8.set_text(to_nice_freq(freq_fav_list[8])); - btn_fav_9.set_text(to_nice_freq(freq_fav_list[9])); + btn_fav_0.set_text(to_nice_freq(freq_fav_list[0].frequency)); + btn_fav_1.set_text(to_nice_freq(freq_fav_list[1].frequency)); + btn_fav_2.set_text(to_nice_freq(freq_fav_list[2].frequency)); + btn_fav_3.set_text(to_nice_freq(freq_fav_list[3].frequency)); + btn_fav_4.set_text(to_nice_freq(freq_fav_list[4].frequency)); + btn_fav_5.set_text(to_nice_freq(freq_fav_list[5].frequency)); + btn_fav_6.set_text(to_nice_freq(freq_fav_list[6].frequency)); + btn_fav_7.set_text(to_nice_freq(freq_fav_list[7].frequency)); + btn_fav_8.set_text(to_nice_freq(freq_fav_list[8].frequency)); + btn_fav_9.set_text(to_nice_freq(freq_fav_list[9].frequency)); } FmRadioView::~FmRadioView() { @@ -160,9 +226,16 @@ FmRadioView::~FmRadioView() { } void FmRadioView::on_audio_spectrum() { - for (size_t i = 0; i < audio_spectrum_data->db.size(); i++) - audio_spectrum[i] = ((int16_t)audio_spectrum_data->db[i] - 127) * 256; - waveform.set_dirty(); + if (audio_spectrum_data && audio_spectrum_data->db.size() <= 128) { + for (size_t i = 0; i < audio_spectrum_data->db.size(); i++) { + audio_spectrum[i] = ((int16_t)audio_spectrum_data->db[i] - 127) * 256; + } + waveform.set_dirty(); + } else { + // Fallback: Clear waveform if no valid data + std::fill(audio_spectrum, audio_spectrum + 128, 0); + waveform.set_dirty(); + } } } // namespace ui::external_app::fmradio diff --git a/firmware/application/external/fmradio/ui_fmradio.hpp b/firmware/application/external/fmradio/ui_fmradio.hpp index 7deab3bbd..2d3e96f5c 100644 --- a/firmware/application/external/fmradio/ui_fmradio.hpp +++ b/firmware/application/external/fmradio/ui_fmradio.hpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2024 HTotoo + * Copyright (C) 2025 RocketGod - Added modes from my Flipper Zero RF Jammer App - https://betaskynet.com * * This file is part of PortaPack. * @@ -38,6 +39,9 @@ #include "radio_state.hpp" #include "log_file.hpp" #include "utility.hpp" +#include "audio.hpp" +#include "freqman_db.hpp" +#include "ui_freqman.hpp" using namespace ui; @@ -62,23 +66,55 @@ class FmRadioView : public View { int16_t audio_spectrum[128]{0}; bool audio_spectrum_update = false; AudioSpectrum* audio_spectrum_data{nullptr}; - rf::Frequency freq_fav_list[12] = {0}; + struct Favorite { + rf::Frequency frequency = 0; + int32_t modulation = static_cast(ReceiverModel::Mode::WidebandFMAudio); + uint8_t bandwidth = 0; + }; + Favorite freq_fav_list[12]; + audio::Rate audio_sampling_rate = audio::Rate::Hz_48000; + uint8_t radio_bw = 0; app_settings::SettingsManager settings_{ "rx_fmradio", app_settings::Mode::RX, - {{"favlist0"sv, &freq_fav_list[0]}, - {"favlist1"sv, &freq_fav_list[1]}, - {"favlist2"sv, &freq_fav_list[2]}, - {"favlist3"sv, &freq_fav_list[3]}, - {"favlist4"sv, &freq_fav_list[4]}, - {"favlist5"sv, &freq_fav_list[5]}, - {"favlist6"sv, &freq_fav_list[6]}, - {"favlist7"sv, &freq_fav_list[7]}, - {"favlist8"sv, &freq_fav_list[8]}, - {"favlist9"sv, &freq_fav_list[9]}, - {"favlist10"sv, &freq_fav_list[10]}, - {"favlist11"sv, &freq_fav_list[11]}}}; + {{"favlist0_freq"sv, &freq_fav_list[0].frequency}, + {"favlist1_freq"sv, &freq_fav_list[1].frequency}, + {"favlist2_freq"sv, &freq_fav_list[2].frequency}, + {"favlist3_freq"sv, &freq_fav_list[3].frequency}, + {"favlist4_freq"sv, &freq_fav_list[4].frequency}, + {"favlist5_freq"sv, &freq_fav_list[5].frequency}, + {"favlist6_freq"sv, &freq_fav_list[6].frequency}, + {"favlist7_freq"sv, &freq_fav_list[7].frequency}, + {"favlist8_freq"sv, &freq_fav_list[8].frequency}, + {"favlist9_freq"sv, &freq_fav_list[9].frequency}, + {"favlist10_freq"sv, &freq_fav_list[10].frequency}, + {"favlist11_freq"sv, &freq_fav_list[11].frequency}, + {"favlist0_mod"sv, &freq_fav_list[0].modulation}, + {"favlist1_mod"sv, &freq_fav_list[1].modulation}, + {"favlist2_mod"sv, &freq_fav_list[2].modulation}, + {"favlist3_mod"sv, &freq_fav_list[3].modulation}, + {"favlist4_mod"sv, &freq_fav_list[4].modulation}, + {"favlist5_mod"sv, &freq_fav_list[5].modulation}, + {"favlist6_mod"sv, &freq_fav_list[6].modulation}, + {"favlist7_mod"sv, &freq_fav_list[7].modulation}, + {"favlist8_mod"sv, &freq_fav_list[8].modulation}, + {"favlist9_mod"sv, &freq_fav_list[9].modulation}, + {"favlist10_mod"sv, &freq_fav_list[10].modulation}, + {"favlist11_mod"sv, &freq_fav_list[11].modulation}, + {"favlist0_bw"sv, &freq_fav_list[0].bandwidth}, + {"favlist1_bw"sv, &freq_fav_list[1].bandwidth}, + {"favlist2_bw"sv, &freq_fav_list[2].bandwidth}, + {"favlist3_bw"sv, &freq_fav_list[3].bandwidth}, + {"favlist4_bw"sv, &freq_fav_list[4].bandwidth}, + {"favlist5_bw"sv, &freq_fav_list[5].bandwidth}, + {"favlist6_bw"sv, &freq_fav_list[6].bandwidth}, + {"favlist7_bw"sv, &freq_fav_list[7].bandwidth}, + {"favlist8_bw"sv, &freq_fav_list[8].bandwidth}, + {"favlist9_bw"sv, &freq_fav_list[9].bandwidth}, + {"favlist10_bw"sv, &freq_fav_list[10].bandwidth}, + {"favlist11_bw"sv, &freq_fav_list[11].bandwidth}, + {"radio_bw"sv, &radio_bw}}}; RFAmpField field_rf_amp{ {13 * 8, 0 * 16}}; @@ -95,6 +131,24 @@ class FmRadioView : public View { {0 * 8, 0 * 16}, nav_}; + OptionsField field_bw{ + {10 * 8, FMR_BTNGRID_TOP + 6 * 34}, + 6, + {}}; + + Text text_mode_label{ + {20 * 8, FMR_BTNGRID_TOP + 6 * 34, 5 * 8, 1 * 28}, + "MODE:"}; + + OptionsField field_modulation{ + {26 * 8, FMR_BTNGRID_TOP + 6 * 34}, + 4, + {{"AM", static_cast(ReceiverModel::Mode::AMAudio)}, + {"NFM", static_cast(ReceiverModel::Mode::NarrowbandFMAudio)}, + {"WFM", static_cast(ReceiverModel::Mode::WidebandFMAudio)}, + {"USB", static_cast(ReceiverModel::Mode::AMAudio)}, + {"LSB", static_cast(ReceiverModel::Mode::AMAudio)}}}; + TextField txt_save_help{ {2, FMR_BTNGRID_TOP + 6 * 34 - 20, 12 * 8, 16}, " "}; @@ -124,10 +178,12 @@ class FmRadioView : public View { Button btn_fav_save{{2, FMR_BTNGRID_TOP + 6 * 34, 7 * 8, 1 * 28}, "Save"}; bool save_fav = false; + void on_btn_clicked(uint8_t i); void update_fav_btn_texts(); std::string to_nice_freq(rf::Frequency freq); void on_audio_spectrum(); + void change_mode(int32_t mod); MessageHandlerRegistration message_handler_audio_spectrum{ Message::ID::AudioSpectrum,