going back to WFM as main baseband in main.cpp as NFM is now making the apps crashing. Looks like last additions to WFM made it bigger. (#2646 )

Adding_WFM_AM_mode_to_Audio_App (#2644 )
* Adding_WFM_AM_mode_to_Audio_App * more precise values for cos and sin theta, fix sen_theta to sin_theta * fix sen_theta to sin_theta
2026-09-14 02:29:29 +00:00 · 2025-05-06 16:50:59 +08:00 · 2025-05-05 17:48:01 +02:00 · 2025-05-02 04:19:41 +00:00 · 2025-04-25 13:01:54 +02:00 · 2025-04-22 21:14:31 +08:00
71 changed files with 6545 additions and 5651 deletions
@@ -28,7 +28,7 @@ This repository expands upon the previous work by many people and aims to consta
 ## What to buy?

 <!---not direct to h4m but to opensourcesdrlab https://share.hackrf.app/TUOLYI---> 
-:heavy_check_mark: ![Static Badge](https://img.shields.io/badge/NEW-yellow) The fabulous H4M [complete](https://share.hackrf.app/ABDO6H) or [upgrade](https://share.hackrf.app/FPLM1H), featuring numerous improvements and accessories. Sold by our friends at [OpenSourceSDRLab](https://share.hackrf.app/99SAMT). Join their giveaways on discord (check the badge on top). _EU customers_ can purchase via [Lab401](https://share.hackrf.app/0CI2CR).
+:heavy_check_mark: ![Static Badge](https://img.shields.io/badge/NEW-yellow) The fabulous H4M [complete](https://share.hackrf.app/9UMBN5) or [upgrade](https://share.hackrf.app/30CQ55), featuring numerous improvements and accessories. Sold by our friends at [OpenSourceSDRLab](https://share.hackrf.app/99SAMT). Join their giveaways on discord (check the badge on top). _EU customers_ can purchase via [Lab401](https://share.hackrf.app/0CI2CR).

 :heavy_check_mark: A recommended one is this [PortaPack H2](https://www.ebay.com/itm/116382397447), that includes everything you need with the plastic case "inspired" on [this](https://github.com/portapack-mayhem/mayhem-firmware/wiki/3d-printed-enclosure).

@@ -191,6 +191,7 @@ set(CPPSRC
 	clock_manager.cpp
 	core_control.cpp
 	database.cpp
+	gradient.cpp
 	rfm69.cpp
 	event_m0.cpp
 	file_reader.cpp
@@ -114,6 +114,26 @@ WFMOptionsView::WFMOptionsView(
    };
 }

+/* WFMAMAptOptionsView *******************************************************/
+
+WFMAMAptOptionsView::WFMAMAptOptionsView(
+    Rect parent_rect,
+    const Style* style)
+    : View{parent_rect} {
+    set_style(style);
+
+    add_children({
+        &label_config,
+        &options_config,
+    });
+
+    freqman_set_bandwidth_option(WFMAM_MODULATION, options_config);  // adding the common message from freqman.cpp to the options_config
+    options_config.set_by_value(receiver_model.wfmam_configuration());
+    options_config.on_change = [this](size_t, OptionsField::value_t n) {
+        receiver_model.set_wfmam_configuration(n);
+    };
+}
+
 /* AMFMAptOptionsView *********************************************************/

 AMFMAptOptionsView::AMFMAptOptionsView(
@@ -415,6 +435,12 @@ void AnalogAudioView::on_show_options_modulation() {
            text_ctcss.hidden(true);
            break;

+        case ReceiverModel::Mode::WFMAudioAMApt:
+            widget = std::make_unique<WFMAMAptOptionsView>(options_view_rect, Theme::getInstance()->option_active);
+            waterfall.show_audio_spectrum_view(true);
+            text_ctcss.hidden(true);
+            break;
+
        case ReceiverModel::Mode::AMAudioFMApt:
            widget = std::make_unique<AMFMAptOptionsView>(this, options_view_rect, Theme::getInstance()->option_active);
            waterfall.show_audio_spectrum_view(false);
@@ -462,7 +488,10 @@ void AnalogAudioView::update_modulation(ReceiverModel::Mode modulation) {
        case ReceiverModel::Mode::WidebandFMAudio:
            image_tag = portapack::spi_flash::image_tag_wfm_audio;
            break;
-        case ReceiverModel::Mode::AMAudioFMApt:  // TODO pending to update it.
+        case ReceiverModel::Mode::WFMAudioAMApt:
+            image_tag = portapack::spi_flash::image_tag_wfm_audio;
+            break;
+        case ReceiverModel::Mode::AMAudioFMApt:
            image_tag = portapack::spi_flash::image_tag_am_audio;
            break;
        case ReceiverModel::Mode::SpectrumAnalysis:
@@ -501,7 +530,10 @@ void AnalogAudioView::update_modulation(ReceiverModel::Mode modulation) {
        case ReceiverModel::Mode::WidebandFMAudio:
            sampling_rate = 48000;
            break;
-        case ReceiverModel::Mode::AMAudioFMApt:  // TODO  Wefax mode.
+        case ReceiverModel::Mode::WFMAudioAMApt:
+            sampling_rate = 12000;
+            break;
+        case ReceiverModel::Mode::AMAudioFMApt:
            sampling_rate = 12000;
            break;
        default:
@@ -74,7 +74,7 @@ class AMFMAptOptionsView : public View {

    OptionsField options_config{
        {3 * 8, 0 * 16},
-        6,  // Max option length chars
+        6,  // Max option length chars  "USB+FM"
        {
            // Using common messages from freqman_ui.cpp In HF USB , Here  we only need USB Audio demod, + post-FM demod fsubcarrier FM tone to get APT signal.
        }};
@@ -132,6 +132,23 @@ class WFMOptionsView : public View {
        }};
 };

+class WFMAMAptOptionsView : public View {
+   public:
+    WFMAMAptOptionsView(Rect parent_rect, const Style* style);
+
+   private:
+    Text label_config{
+        {0 * 8, 0 * 16, 2 * 8, 1 * 16},
+        "BW",
+    };
+    OptionsField options_config{
+        {3 * 8, 0 * 16},
+        10,  // Max option char length  "FM+AM(DSB)"
+        {
+            // Using common messages from freqman_ui.cpp
+        }};
+};
+
 class SPECOptionsView : public View {
   public:
    SPECOptionsView(AnalogAudioView* view, Rect parent_rect, const Style* style);
@@ -215,7 +232,7 @@ class AnalogAudioView : public View {
    uint8_t zoom_factor_amfm{0};             // initial zoom factor in AMFM mode
    uint8_t previous_AM_mode_option{0};      // GUI 5 AM modes :  (0..4 ) (DSB9K, DSB6K, USB,LSB, CW). Used to select proper FIR filter (0..11) AM mode  + offset 0 (zoom+1) or +6 (if zoom+2)
    uint8_t previous_zoom{0};                // GUI ZOOM+1, ZOOM+2 , equivalent to two values offset 0 (zoom+1) or +6 (if zoom+2)
-                                             //
+
    app_settings::SettingsManager settings_{
        "rx_audio",
        app_settings::Mode::RX,
@@ -261,7 +278,8 @@ class AnalogAudioView : public View {
            {"NFM ", toUType(ReceiverModel::Mode::NarrowbandFMAudio)},
            {"WFM ", toUType(ReceiverModel::Mode::WidebandFMAudio)},
            {"SPEC", toUType(ReceiverModel::Mode::SpectrumAnalysis)},
-            {"AMFM", toUType(ReceiverModel::Mode::AMAudioFMApt)}  // Added to handle  HF  WeatherFax , SSB (USB demod) + Tone_Subcarrier FM demod
+            {"AMFM", toUType(ReceiverModel::Mode::AMAudioFMApt)},  // Added to handle  HF  WeatherFax , SSB (USB demod) + Tone_Subcarrier FM demod
+            {"FMAM", toUType(ReceiverModel::Mode::WFMAudioAMApt)}  // Added to handle  SAT NOAA APT
        }};

    AudioVolumeField field_volume{
@@ -21,7 +21,6 @@
 * Boston, MA 02110-1301, USA.
 */

-#include "ble_rx_app.hpp"
 #include "ble_rx_app.hpp"
 #include "ui_modemsetup.hpp"

@@ -91,10 +91,6 @@ void SoundBoardView::start_tx(const uint32_t id) {

    auto reader = std::make_unique<WAVFileReader>();

-    uint32_t tone_key_index = options_tone_key.selected_index();
-    uint32_t sample_rate;
-    uint8_t bits_per_sample;
-
    stop();

    if (!reader->open(u"/WAV/" + file_list[id].native())) {
@@ -108,7 +104,9 @@ void SoundBoardView::start_tx(const uint32_t id) {

    // button_play.set_bitmap(&bitmap_stop);

-    sample_rate = reader->sample_rate();
+    uint32_t sample_rate = reader->sample_rate();
+
+    tone_key_index = options_tone_key.selected_index();
    bits_per_sample = reader->bits_per_sample();

    replay_thread = std::make_unique<ReplayThread>(
@@ -155,6 +153,23 @@ void SoundBoardView::on_tx_progress(const uint32_t progress) {
    progressbar.set_value(progress);
 }

+void SoundBoardView::update_config() {
+    // NB: this were called by the on_bandwidth_changed() callback,
+    // so other val would be updated too when bw changed. currently it's safe but be careful.
+    baseband::set_audiotx_config(
+        1536000 / 20,  // Update vu-meter at 20Hz
+        transmitter_model.channel_bandwidth(),
+        0,  // Gain is unused
+        8,  // shift_bits_s16, default 8 bits, but also unused
+        bits_per_sample,
+        TONES_F2D(tone_key_frequency(tone_key_index), TONES_SAMPLERATE),
+        false,  // AM
+        false,  // DSB
+        false,  // USB
+        false   // LSB
+    );
+}
+
 void SoundBoardView::on_select_entry() {
    tx_view.focus();
 }
@@ -289,6 +304,10 @@ SoundBoardView::SoundBoardView(
        };
    };

+    tx_view.on_bandwidth_changed = [this]() {
+        update_config();
+    };
+
    tx_view.on_start = [this]() {
        start_tx(menu_view.highlighted_index());
    };
@@ -70,6 +70,8 @@ class SoundBoardView : public View {
    uint32_t playing_id{};
    uint32_t page = 1;
    uint32_t c_page = 1;
+    uint32_t tone_key_index = 1;
+    uint8_t bits_per_sample = 1;

    std::vector<std::filesystem::path> file_list{};

@@ -90,6 +92,7 @@ class SoundBoardView : public View {
    void on_tx_progress(const uint32_t progress);
    void refresh_list();
    void on_select_entry();
+    void update_config();

    Labels labels{
        {{24 * 8, 180}, "Vol:", Theme::getInstance()->fg_light->foreground},
@@ -92,6 +92,9 @@ void ExternalModuleView::on_tick_second() {
            case app_location_t::TX:
                btnText += " (TX)";
                break;
+            case app_location_t::TRX:
+                btnText += " (TRX)";
+                break;
            case app_location_t::SETTINGS:
                btnText += " (Settings)";
                break;
@@ -419,6 +419,17 @@ void FileManBaseView::reload_current(bool reset_pagination) {
    refresh_list();
 }

+void FileManBaseView::copy_waterfall(std::filesystem::path path) {
+    nav_.push<ModalMessageView>(
+        "Install", " Use this gradient file\n for all waterfalls?", YESNO,
+        [this, path](bool choice) {
+            if (choice) {
+                delete_file(default_gradient_file);
+                copy_file(path, default_gradient_file);
+            }
+        });
+}
+
 const FileManBaseView::file_assoc_t& FileManBaseView::get_assoc(
    const fs::path& ext) const {
    size_t index = 0;
@@ -685,7 +696,11 @@ bool FileManagerView::handle_file_open() {
    auto ext = path.extension();

    if (path_iequal(txt_ext, ext)) {
-        nav_.push<TextEditorView>(path);
+        if (path_iequal(current_path, u"/" + waterfalls_dir)) {
+            copy_waterfall(path);
+        } else {
+            nav_.push<TextEditorView>(path);
+        }
        return true;
    } else if (is_cxx_capture_file(path) || path_iequal(ppl_ext, ext)) {
        // TODO: Enough memory to push?
@@ -96,6 +96,7 @@ class FileManBaseView : public View {
    void load_directory_contents(const std::filesystem::path& dir_path);
    void load_directory_contents_unordered(const std::filesystem::path& dir_path, size_t file_cnt);
    const file_assoc_t& get_assoc(const std::filesystem::path& ext) const;
+    void copy_waterfall(std::filesystem::path path);

    NavigationView& nav_;

@@ -45,8 +45,8 @@ using option_db_t = std::pair<std::string_view, int32_t>;
 using options_db_t = std::vector<option_db_t>;

 extern options_db_t freqman_modulations;
-extern options_db_t freqman_bandwidths[5];
-extern options_db_t freqman_steps;
+extern options_db_t freqman_bandwidths[6];
+// extern options_db_t freqman_steps; // now included via ui_receiver.hpp
 extern options_db_t freqman_steps_short;

 options_t dboptions_to_options(const options_db_t& dboptions) {
@@ -126,7 +126,7 @@ void GlassView::reset_live_view() {
 }

 void GlassView::add_spectrum_pixel(uint8_t power) {
-    spectrum_row[pixel_index] = spectrum_rgb3_lut[power];                                                                           // row of colors
+    spectrum_row[pixel_index] = gradient.lut[power];                                                                                // row of colors
    spectrum_data[pixel_index] = (live_frequency_integrate * spectrum_data[pixel_index] + power) / (live_frequency_integrate + 1);  // smoothing
    pixel_index++;

@@ -359,6 +359,10 @@ GlassView::GlassView(
    : nav_(nav) {
    baseband::run_image(portapack::spi_flash::image_tag_wideband_spectrum);

+    if (!gradient.load_file(default_gradient_file)) {
+        gradient.set_default();
+    }
+
    add_children({&labels,
                  &field_frequency_min,
                  &field_frequency_max,
@@ -35,7 +35,7 @@
 #include "ui_receiver.hpp"
 #include "string_format.hpp"
 #include "analog_audio_app.hpp"
-#include "spectrum_color_lut.hpp"
+#include "gradient.hpp"

 namespace ui {

@@ -74,6 +74,7 @@ class GlassView : public View {

   private:
    NavigationView& nav_;
+    Gradient gradient{};
    RxRadioState radio_state_{ReceiverModel::Mode::SpectrumAnalysis};
    // Settings
    rf::Frequency f_min = 260 * MHZ_DIV;  // Default to 315/433 remote range.
@@ -56,6 +56,10 @@ SearchView::SearchView(
    : nav_(nav) {
    baseband::run_image(portapack::spi_flash::image_tag_wideband_spectrum);

+    if (!gradient.load_file(default_gradient_file)) {
+        gradient.set_default();
+    }
+
    add_children({&labels,
                  &field_frequency_min,
                  &field_frequency_max,
@@ -290,7 +294,7 @@ void SearchView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
                power = spectrum.db[bin - 128];
        }

-        add_spectrum_pixel(spectrum_rgb3_lut[power]);
+        add_spectrum_pixel(gradient.lut[power]);

        mean_acc += power;
        if (power > max_power) {
@@ -24,7 +24,7 @@
 #include "receiver_model.hpp"
 #include "recent_entries.hpp"
 #include "radio_state.hpp"
-#include "spectrum_color_lut.hpp"
+#include "gradient.hpp"
 #include "ui_receiver.hpp"

 namespace ui {
@@ -88,6 +88,7 @@ class SearchView : public View {

   private:
    NavigationView& nav_;
+    Gradient gradient{};
    RxRadioState radio_state_{
        100'000'000 /* frequency */,
        2500000 /* bandwidth */,
@@ -810,30 +810,29 @@ SetDisplayView::SetDisplayView(NavigationView& nav) {
                  &field_fake_brightness,
                  &button_save,
                  &button_cancel,
-                  &checkbox_invert_switch,
+                  &checkbox_ips_screen_switch,
                  &checkbox_brightness_switch});

    field_fake_brightness.set_by_value(pmem::fake_brightness_level());
    checkbox_brightness_switch.set_value(pmem::apply_fake_brightness());
-    checkbox_invert_switch.set_value(pmem::config_lcd_inverted_mode());
+    checkbox_ips_screen_switch.set_value(pmem::config_lcd_normally_black());

    button_save.on_select = [&nav, this](Button&) {
        pmem::set_apply_fake_brightness(checkbox_brightness_switch.value());
        pmem::set_fake_brightness_level(field_fake_brightness.selected_index_value());
-        if (checkbox_invert_switch.value() != pmem::config_lcd_inverted_mode()) {
-            display.set_inverted(checkbox_invert_switch.value());
-            pmem::set_lcd_inverted_mode(checkbox_invert_switch.value());
+        if (checkbox_ips_screen_switch.value() != pmem::config_lcd_normally_black()) {
+            pmem::set_lcd_normally_black(checkbox_ips_screen_switch.value());
        }
        send_system_refresh();
        nav.pop();
    };

    // only enable invert OR fake brightness
-    checkbox_invert_switch.on_select = [this](Checkbox&, bool v) {
+    checkbox_ips_screen_switch.on_select = [this](Checkbox&, bool v) {
        if (v) checkbox_brightness_switch.set_value(false);
    };
    checkbox_brightness_switch.on_select = [this](Checkbox&, bool v) {
-        if (v) checkbox_invert_switch.set_value(false);
+        if (v) checkbox_ips_screen_switch.set_value(false);
    };

    button_cancel.on_select = [&nav, this](Button&) {
@@ -762,6 +762,8 @@ class SetDisplayView : public View {
        {{1 * 8, 2 * 16}, "(has a small performance", Theme::getInstance()->fg_light->foreground},
        {{1 * 8, 3 * 16}, "impact when enabled).", Theme::getInstance()->fg_light->foreground},
        {{2 * 8, 8 * 16}, "Brightness:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 10 * 16}, "REBOOT TO APPLY SCREEN TYPE", Theme::getInstance()->fg_light->foreground},
+
    };

    OptionsField field_fake_brightness{
@@ -776,10 +778,10 @@ class SetDisplayView : public View {
        16,
        "Enable brightness adjust"};

-    Checkbox checkbox_invert_switch{
-        {1 * 8, 10 * 16},
+    Checkbox checkbox_ips_screen_switch{
+        {1 * 8, 12 * 16},
        23,
-        "Invert colors (For IPS)"};
+        "IPS Screen"};

    Button button_save{
        {2 * 8, 16 * 16, 12 * 8, 32},
@@ -154,6 +154,13 @@ SigGenView::SigGenView(
        };
    };

+    tx_view.on_bandwidth_changed = [this]() {
+        // we don't protect here with auto_update because other field of tx_view obj isn't protected too
+        // to remains the design logic same
+
+        update_config();
+    };
+
    tx_view.on_start = [this]() {
        start_tx();
        tx_view.set_transmitting(true);
@@ -165,4 +172,4 @@ SigGenView::SigGenView(
    };
 }

-} /* namespace ui */
+} /* namespace ui */
@@ -93,9 +93,9 @@ void NBFMConfig::apply(const uint8_t squelch_level) const {

 void WFMConfig::apply() const {
    const WFMConfigureMessage message{
-        decim_0,  // 	taps_200k_decim_0 , 	taps_180k_wfm_decim_0, taps_40k_wfm_decim_0
-        decim_1,  // 	taps_200k_decim_1 or 	taps_180k_wfm_decim_1, taps_40k_wfm_decim_1
-        taps_64_lp_156_198,
+        decim_0,             // 	Dynamic array 24 taps : taps_200k_decim_0 , 	taps_180k_wfm_decim_0, taps_40k_wfm_decim_0
+        decim_1,             // 	Dynamic array 16 taps : taps_200k_decim_1 or 	taps_180k_wfm_decim_1, taps_40k_wfm_decim_1
+        taps_64_lp_156_198,  // Fixed channel audio filter 15khz
        75000,
        audio_48k_hpf_30hz_config,
        audio_48k_deemph_2122_6_config};
@@ -103,6 +103,18 @@ void WFMConfig::apply() const {
    audio::set_rate(audio::Rate::Hz_48000);
 }

+void WFMAMConfig::apply() const {
+    const WFMAMConfigureMessage message{
+        decim_0,               // 	Fixed 24 taps array : taps_16k0_decim_0
+        decim_1,               // 	Fixed 32 taps array : taps_84k_wfm_decim_1
+        taps_64_lp_1875_2166,  // Fixed channel audio filter , 64 taps array , to filter DSB AM 2k4 carrier before demod. AM .
+        17000,                 // NOAA satellite tx , FM deviation = +-17Khz.
+        apt_audio_12k_notch_2k4_config,
+        apt_audio_12k_lpf_2000hz_config};
+    send_message(&message);
+    audio::set_rate(audio::Rate::Hz_12000);
+}
+
 void set_tone(const uint32_t index, const uint32_t delta, const uint32_t duration) {
    shared_memory.bb_data.tones_data.tone_defs[index].delta = delta;
    shared_memory.bb_data.tones_data.tone_defs[index].duration = duration;
@@ -56,12 +56,19 @@ struct NBFMConfig {
 };

 struct WFMConfig {
-    const fir_taps_real<24> decim_0;  // To handle both WFM filters , 200k and 40K for NOAA APT
+    const fir_taps_real<24> decim_0;  // To handle all 3 WFM filters , 200k, 180k and 40K-
    const fir_taps_real<16> decim_1;

    void apply() const;
 };

+struct WFMAMConfig {
+    const fir_taps_real<24> decim_0;  // To handle WFM filter   BW=40K for NOAA APT
+    const fir_taps_real<32> decim_1;
+
+    void apply() const;
+};
+
 void set_tone(const uint32_t index, const uint32_t delta, const uint32_t duration);
 void set_tones_config(const uint32_t bw, const uint32_t pre_silence, const uint16_t tone_count, const bool dual_tone, const bool audio_out);
 void kill_tone();
@@ -80,7 +80,7 @@ bool DebugDumpView::debug_dump_func() {
    pmem_dump_file.write_line("updown_converter: " + to_string_dec_int(config_updown_converter()));
    pmem_dump_file.write_line("updown_frequency_rx_correction: " + to_string_dec_int(config_freq_rx_correction_updown()));
    pmem_dump_file.write_line("updown_frequency_tx_correction: " + to_string_dec_int(config_freq_tx_correction_updown()));
-    pmem_dump_file.write_line("lcd_inverted_mode: " + to_string_dec_uint(config_lcd_inverted_mode()));
+    pmem_dump_file.write_line("lcd_normally_black: " + to_string_dec_uint(config_lcd_normally_black()));
    pmem_dump_file.write_line("converter_frequency_offset: " + to_string_dec_int(config_converter_freq()));
    pmem_dump_file.write_line("frequency_rx_correction: " + to_string_dec_uint(config_freq_rx_correction()));
    pmem_dump_file.write_line("frequency_tx_correction: " + to_string_dec_uint(config_freq_tx_correction()));
@@ -157,6 +157,9 @@ bool DebugDumpView::debug_dump_func() {
        case ReceiverModel::Mode::WidebandFMAudio:
            pmem_dump_file.write_line("modulation: Mode::WidebandFMAudio");
            break;
+        case ReceiverModel::Mode::WFMAudioAMApt:
+            pmem_dump_file.write_line("modulation: Mode::WFMAudioAMApt");
+            break;
        case ReceiverModel::Mode::SpectrumAnalysis:
            pmem_dump_file.write_line("modulation: Mode::SpectrumAnalysis");
            break;
@@ -203,6 +203,10 @@ set(EXTCPPSRC
 	#level
 	external/level/main.cpp
 	external/level/ui_level.cpp
+
+	#gfxEQ
+	external/gfxeq/main.cpp
+	external/gfxeq/ui_gfxeq.cpp	
 )

 set(EXTAPPLIST
@@ -255,4 +259,5 @@ set(EXTAPPLIST
 	debug_pmem
 	scanner
 	level
+	gfxeq
 )
@@ -72,6 +72,7 @@ MEMORY
    ram_external_app_debug_pmem (rwx) : org = 0xADDF0000, len = 32k
    ram_external_app_scanner    (rwx) : org = 0xADE00000, len = 32k
    ram_external_app_level      (rwx) : org = 0xADE10000, len = 32k
+    ram_external_app_gfxeq      (rwx) : org = 0xADE20000, len = 32k
 }

 SECTIONS
@@ -368,4 +369,10 @@ SECTIONS
        KEEP(*(.external_app.app_level.application_information));
        *(*ui*external_app*level*);
    } > ram_external_app_level
+
+    .external_app_gfxeq : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_gfxeq.application_information));
+        *(*ui*external_app*gfxeq*);
+    } > ram_external_app_gfxeq
 }
@@ -0,0 +1,36 @@
+/*
+ * ------------------------------------------------------------
+ * |  Made by RocketGod                                       |
+ * |  Find me at https://betaskynet.com                       |
+ * |  Argh matey!                                             |
+ * ------------------------------------------------------------
+ */
+
+#include "ui_gfxeq.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::gfxeq {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<gfxEQView>();
+}
+}  // namespace ui::external_app::gfxeq
+
+extern "C" {
+__attribute__((section(".external_app.app_gfxeq.application_information"), used)) application_information_t _application_information_gfxeq = {
+    (uint8_t*)0x00000000,
+    ui::external_app::gfxeq::initialize_app,
+    CURRENT_HEADER_VERSION,
+    VERSION_MD5,
+    "gfxEQ",
+    {0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+    ui::Color::green().v,
+    app_location_t::RX,
+    -1,
+    {'P', 'W', 'F', 'M'},
+    0x00000000,
+};
+
+}  // namespace ui::external_app::gfxeq
@@ -0,0 +1,196 @@
+/*
+ * ------------------------------------------------------------
+ * |  Made by RocketGod                                       |
+ * |  Find me at https://betaskynet.com                       |
+ * |  Argh matey!                                             |
+ * ------------------------------------------------------------
+ */
+
+#include "ui_gfxeq.hpp"
+#include "ui.hpp"
+#include "ui_freqman.hpp"
+#include "tone_key.hpp"
+#include "analog_audio_app.hpp"
+#include "portapack.hpp"
+#include "audio.hpp"
+#include "baseband_api.hpp"
+#include "dsp_fir_taps.hpp"
+
+using namespace portapack;
+
+namespace ui::external_app::gfxeq {
+
+gfxEQView::gfxEQView(NavigationView& nav)
+    : nav_{nav}, bar_heights(NUM_BARS, 0), prev_bar_heights(NUM_BARS, 0) {
+    add_children({&button_frequency, &field_rf_amp, &field_lna, &field_vga,
+                  &button_mood, &field_volume});
+
+    audio::output::stop();
+    receiver_model.disable();
+    baseband::shutdown();
+
+    baseband::run_image(portapack::spi_flash::image_tag_wfm_audio);
+
+    receiver_model.set_modulation(ReceiverModel::Mode::WidebandFMAudio);
+    receiver_model.set_wfm_configuration(1);  // 200k => 0 , 180k => 1 , 40k => 2. Set to 1 or 2 for better reception
+    receiver_model.set_sampling_rate(3072000);
+    receiver_model.set_baseband_bandwidth(1750000);
+
+    audio::set_rate(audio::Rate::Hz_48000);
+    audio::output::start();
+    receiver_model.set_headphone_volume(receiver_model.headphone_volume());  // WM8731 hack
+                                                                             //
+    receiver_model.enable();
+
+    receiver_model.set_target_frequency(frequency_value);  // Retune to actual freq
+    button_frequency.set_text("<" + to_string_short_freq(frequency_value) + ">");
+
+    button_frequency.on_select = [this, &nav](ButtonWithEncoder& button) {
+        auto new_view = nav_.push<FrequencyKeypadView>(frequency_value);
+        new_view->on_changed = [this, &button](rf::Frequency f) {
+            frequency_value = f;
+            receiver_model.set_target_frequency(f);  // Retune to actual freq
+            button_frequency.set_text("<" + to_string_short_freq(frequency_value) + ">");
+        };
+    };
+
+    button_frequency.on_change = [this]() {
+        int64_t def_step = 25000;
+        frequency_value = frequency_value + (button_frequency.get_encoder_delta() * def_step);
+        if (frequency_value < 1) {
+            frequency_value = 1;
+        }
+        if (frequency_value > (MAX_UFREQ - def_step)) {
+            frequency_value = MAX_UFREQ;
+        }
+        button_frequency.set_encoder_delta(0);
+        receiver_model.set_target_frequency(frequency_value);  // Retune to actual freq
+        button_frequency.set_text("<" + to_string_short_freq(frequency_value) + ">");
+    };
+
+    button_mood.on_select = [this](Button&) { this->cycle_theme(); };
+}
+
+// needed to answer usb serial frequency set
+void gfxEQView::on_freqchg(int64_t freq) {
+    receiver_model.set_target_frequency(freq);  // Retune to actual freq
+    button_frequency.set_text("<" + to_string_short_freq(freq) + ">");
+}
+
+gfxEQView::~gfxEQView() {
+    audio::output::stop();
+    receiver_model.disable();
+    baseband::shutdown();
+}
+
+void gfxEQView::focus() {
+    button_frequency.focus();
+}
+
+void gfxEQView::on_show() {
+    needs_background_redraw = true;
+}
+
+void gfxEQView::on_hide() {
+    needs_background_redraw = true;
+}
+
+void gfxEQView::update_audio_spectrum(const AudioSpectrum& spectrum) {
+    const float bin_frequency_size = 48000.0f / 128;
+
+    for (int bar = 0; bar < NUM_BARS; bar++) {
+        float start_freq = FREQUENCY_BANDS[bar];
+        float end_freq = FREQUENCY_BANDS[bar + 1];
+
+        int start_bin = std::max(1, (int)(start_freq / bin_frequency_size));
+        int end_bin = std::min(127, (int)(end_freq / bin_frequency_size));
+
+        if (start_bin >= end_bin) {
+            end_bin = start_bin + 1;
+        }
+
+        float total_energy = 0;
+        int bin_count = 0;
+
+        for (int bin = start_bin; bin <= end_bin; bin++) {
+            total_energy += spectrum.db[bin];
+            bin_count++;
+        }
+
+        float avg_db = bin_count > 0 ? (total_energy / bin_count) : 0;
+
+        // Manually boost highs for better visual balance
+        float treble_boost = 1.0f;
+        if (bar == 10)
+            treble_boost = 1.7f;
+        else if (bar >= 9)
+            treble_boost = 1.3f;
+        else if (bar >= 7)
+            treble_boost = 1.3f;
+
+        // Mid emphasis for a V-shape effect
+        float mid_boost = 1.0f;
+        if (bar == 4 || bar == 5 || bar == 6) mid_boost = 1.2f;
+
+        float amplified_db = avg_db * treble_boost * mid_boost;
+
+        if (amplified_db > 255) amplified_db = 255;
+
+        float band_scale = 1.0f;
+        int target_height = (amplified_db * RENDER_HEIGHT * band_scale) / 255;
+
+        if (target_height > RENDER_HEIGHT) {
+            target_height = RENDER_HEIGHT;
+        }
+
+        // Adjusted to look nice to my eyes
+        float rise_speed = 0.8f;
+        float fall_speed = 1.0f;
+
+        if (target_height > bar_heights[bar]) {
+            bar_heights[bar] = bar_heights[bar] * (1.0f - rise_speed) + target_height * rise_speed;
+        } else {
+            bar_heights[bar] = bar_heights[bar] * (1.0f - fall_speed) + target_height * fall_speed;
+        }
+    }
+}
+
+void gfxEQView::render_equalizer(Painter& painter) {
+    const int num_segments = RENDER_HEIGHT / SEGMENT_HEIGHT;
+    const ColorTheme& theme = themes[current_theme];
+
+    for (int bar = 0; bar < NUM_BARS; bar++) {
+        int x = HORIZONTAL_OFFSET + bar * (BAR_WIDTH + BAR_SPACING);
+        int active_segments = (bar_heights[bar] * num_segments) / RENDER_HEIGHT;
+
+        if (prev_bar_heights[bar] > active_segments) {
+            int clear_height = (prev_bar_heights[bar] - active_segments) * SEGMENT_HEIGHT;
+            int clear_y = SCREEN_HEIGHT - prev_bar_heights[bar] * SEGMENT_HEIGHT;
+            painter.fill_rectangle({x, clear_y, BAR_WIDTH, clear_height}, Color(0, 0, 0));
+        }
+
+        for (int seg = 0; seg < active_segments; seg++) {
+            int y = SCREEN_HEIGHT - (seg + 1) * SEGMENT_HEIGHT;
+            if (y < header_height) break;
+
+            Color segment_color = (seg >= active_segments - 2 && seg < active_segments) ? theme.peak_color : theme.base_color;
+            painter.fill_rectangle({x, y, BAR_WIDTH, SEGMENT_HEIGHT - 1}, segment_color);
+        }
+
+        prev_bar_heights[bar] = active_segments;
+    }
+}
+
+void gfxEQView::paint(Painter& painter) {
+    if (needs_background_redraw) {
+        painter.fill_rectangle({0, header_height, SCREEN_WIDTH, RENDER_HEIGHT}, Color(0, 0, 0));
+        needs_background_redraw = false;
+    }
+    render_equalizer(painter);
+}
+
+void gfxEQView::cycle_theme() {
+    current_theme = (current_theme + 1) % themes.size();
+}
+
+}  // namespace ui::external_app::gfxeq
@@ -0,0 +1,138 @@
+/*
+ * ------------------------------------------------------------
+ * |  Made by RocketGod                                       |
+ * |  Find me at https://betaskynet.com                       |
+ * |  Argh matey!                                             |
+ * ------------------------------------------------------------
+ */
+
+#ifndef __UI_GFXEQ_HPP__
+#define __UI_GFXEQ_HPP__
+
+#include "ui_widget.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "message.hpp"
+#include "baseband_api.hpp"
+#include "portapack.hpp"
+#include "ui_spectrum.hpp"
+#include "ui_freq_field.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+
+namespace ui::external_app::gfxeq {
+
+class gfxEQView : public View {
+   public:
+    gfxEQView(NavigationView& nav);
+    ~gfxEQView();
+
+    gfxEQView(const gfxEQView&) = delete;
+    gfxEQView& operator=(const gfxEQView&) = delete;
+
+    void focus() override;
+    std::string title() const override { return "gfxEQ"; }
+    void on_show() override;
+    void on_hide() override;
+
+    void paint(Painter& painter) override;
+    void on_freqchg(int64_t freq);
+
+   private:
+    static constexpr ui::Dim header_height = 2 * 16;
+    static constexpr int SCREEN_WIDTH = 240;
+    static constexpr int SCREEN_HEIGHT = 320;
+    static constexpr int RENDER_HEIGHT = 288;
+    static constexpr int NUM_BARS = 11;
+    static constexpr int BAR_SPACING = 2;
+    static constexpr int BAR_WIDTH = (SCREEN_WIDTH - (BAR_SPACING * (NUM_BARS - 1))) / NUM_BARS;
+    static constexpr int HORIZONTAL_OFFSET = 2;
+    static constexpr int SEGMENT_HEIGHT = 10;
+
+    static constexpr std::array<int, NUM_BARS + 1> FREQUENCY_BANDS = {
+        375,    // Bass warmth and low rumble (e.g., deep basslines, kick drum body)
+        750,    // Upper bass punch (e.g., bass guitar punch, kick drum attack)
+        1500,   // Lower midrange fullness (e.g., warmth in vocals, guitar body)
+        2250,   // Midrange clarity (e.g., vocal presence, snare crack)
+        3375,   // Upper midrange bite (e.g., instrument definition, vocal articulation)
+        4875,   // Presence and edge (e.g., guitar bite, vocal sibilance start)
+        6750,   // Lower brilliance (e.g., cymbal shimmer, vocal clarity)
+        9375,   // Brilliance and air (e.g., hi-hat crispness, breathy vocals)
+        13125,  // High treble sparkle (e.g., subtle overtones, synth shimmer)
+        16875,  // Upper treble airiness (e.g., faint harmonics, room ambiance)
+        20625,  // Top-end sheen (e.g., ultra-high harmonics, noise floor)
+        24375   // Extreme treble limit (e.g., inaudible overtones, signal cutoff, static)
+    };
+
+    struct ColorTheme {
+        Color base_color;
+        Color peak_color;
+    };
+
+    NavigationView& nav_;
+    bool needs_background_redraw{false};
+    std::vector<int> bar_heights;
+    std::vector<int> prev_bar_heights;
+    uint32_t current_theme{0};
+    const std::array<ColorTheme, 20> themes{
+        ColorTheme{Color(255, 0, 255), Color(255, 255, 255)},
+        ColorTheme{Color(0, 255, 0), Color(255, 0, 0)},
+        ColorTheme{Color(0, 0, 255), Color(255, 255, 0)},
+        ColorTheme{Color(255, 128, 0), Color(255, 0, 128)},
+        ColorTheme{Color(128, 0, 255), Color(0, 255, 255)},
+        ColorTheme{Color(255, 255, 0), Color(0, 255, 128)},
+        ColorTheme{Color(255, 0, 0), Color(0, 128, 255)},
+        ColorTheme{Color(0, 255, 128), Color(255, 128, 255)},
+        ColorTheme{Color(128, 128, 128), Color(255, 255, 255)},
+        ColorTheme{Color(255, 64, 0), Color(0, 255, 64)},
+        ColorTheme{Color(0, 128, 128), Color(255, 192, 0)},
+        ColorTheme{Color(0, 255, 0), Color(0, 128, 0)},
+        ColorTheme{Color(32, 64, 32), Color(0, 255, 0)},
+        ColorTheme{Color(64, 0, 128), Color(255, 0, 255)},
+        ColorTheme{Color(0, 64, 0), Color(0, 255, 128)},
+        ColorTheme{Color(255, 255, 255), Color(0, 0, 255)},
+        ColorTheme{Color(128, 0, 0), Color(255, 128, 0)},
+        ColorTheme{Color(0, 128, 255), Color(255, 255, 128)},
+        ColorTheme{Color(64, 64, 64), Color(255, 0, 0)},
+        ColorTheme{Color(255, 192, 0), Color(0, 64, 128)}};
+
+    ButtonWithEncoder button_frequency{{0 * 8, 0 * 16 + 4, 11 * 8, 1 * 8}, ""};
+    RFAmpField field_rf_amp{{13 * 8, 0 * 16}};
+    LNAGainField field_lna{{15 * 8, 0 * 16}};
+    VGAGainField field_vga{{18 * 8, 0 * 16}};
+    Button button_mood{{21 * 8, 0, 6 * 8, 16}, "MOOD"};
+    AudioVolumeField field_volume{{28 * 8, 0 * 16}};
+
+    rf::Frequency frequency_value{93100000};
+
+    RxRadioState rx_radio_state_{};
+
+    app_settings::SettingsManager settings_{
+        "rx_gfx_eq",
+        app_settings::Mode::RX,
+        {{"theme", &current_theme},
+         {"frequency", &frequency_value}}};
+
+    void update_audio_spectrum(const AudioSpectrum& spectrum);
+    void render_equalizer(Painter& painter);
+    void cycle_theme();
+
+    MessageHandlerRegistration message_handler_audio_spectrum{
+        Message::ID::AudioSpectrum,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const AudioSpectrumMessage*>(p);
+            this->update_audio_spectrum(*message.data);
+            this->set_dirty();
+        }};
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
+};
+
+}  // namespace ui::external_app::gfxeq
+
+#endif
@@ -77,8 +77,8 @@ __attribute__((section(".external_app.app_level.application_information"), used)
    /*.menu_location = */ app_location_t::RX,
    /*.desired_menu_position = */ -1,

-    // this has to be the biggest baseband used by the app. Level is using AM,WFM,NFM,AMFM,SPEC and NFM is the biggest
-    /*.m4_app_tag = portapack::spi_flash::image_tag_nfm */ {'P', 'N', 'F', 'M'},
+    // this has to be the biggest baseband used by the app. Level is using AM,WFM,NFM,AMFM,SPEC and WFM is the biggest
+    /*.m4_app_tag = portapack::spi_flash::image_tag_nfm */ {'P', 'W', 'F', 'M'},
    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
 };
 }
@@ -75,7 +75,7 @@ __attribute__((section(".external_app.app_remote.application_information"), used
    },
    /*.icon_color = */ ui::Color::green().v,
    /*.menu_location = */ app_location_t::HOME,
-    /*.desired_menu_position = */ 4,
+    /*.desired_menu_position = */ 6,

    /*.m4_app_tag = portapack::spi_flash::image_tag_replay */ {'P', 'R', 'E', 'P'},
    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
@@ -44,8 +44,8 @@ __attribute__((section(".external_app.app_scanner.application_information"), use
    /*.menu_location = */ app_location_t::RX,
    /*.desired_menu_position = */ -1,

-    // this has to be the biggest baseband used by the app. Scanner is using AM,WFM,NFM and NFM is the biggest
-    /*.m4_app_tag = portapack::spi_flash::image_tag_scanner */ {'P', 'N', 'F', 'M'},
+    // this has to be the biggest baseband used by the app. Scanner is using AM,WFM,NFM and WFM is the biggest
+    /*.m4_app_tag = portapack::spi_flash::image_tag_scanner */ {'P', 'W', 'F', 'M'},
    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
 };
 }
@@ -51,3 +51,4 @@ const std::filesystem::path whipcalc_dir = u"WHIPCALC";
 const std::filesystem::path ook_editor_dir = u"OOKFILES";
 const std::filesystem::path hopper_dir = u"HOPPER";
 const std::filesystem::path subghz_dir = u"SUBGHZ";
+const std::filesystem::path waterfalls_dir = u"WATERFALLS";
@@ -53,5 +53,6 @@ extern const std::filesystem::path whipcalc_dir;
 extern const std::filesystem::path ook_editor_dir;
 extern const std::filesystem::path hopper_dir;
 extern const std::filesystem::path subghz_dir;
+extern const std::filesystem::path waterfalls_dir;

 #endif /* __FILE_PATH_H__ */
@@ -42,7 +42,8 @@ enum freqman_entry_modulation : uint8_t {
    NFM_MODULATION,
    WFM_MODULATION,
    SPEC_MODULATION,
-    AMFM_MODULATION  // Added for Wefax.
+    AMFM_MODULATION,  // Added for HF Wefax.demod APT signal
+    WFMAM_MODULATION  // Added for NOAA 137 Mhz satellite band,  demod APT signal.
 };

 // TODO: Can these be removed after Recon is migrated to FreqmanDB?
@@ -49,10 +49,11 @@ options_t freqman_modulations = {
    {"NFM", 1},
    {"WFM", 2},
    {"SPEC", 3},
-    {"AMFM", 4},
+    {"AMFM", 4},  // To handle HF Wefax AM and FM demod. inside Audio App.
+    {"FMAM", 5},  // To handle NOAA 137 Mhz Sat FM and AM demod inside Audio App.
 };

-options_t freqman_bandwidths[5] = {
+options_t freqman_bandwidths[6] = {
    {
        // AM
        {"DSB 9k", 0},
@@ -103,7 +104,11 @@ options_t freqman_bandwidths[5] = {
    },
    {
        // AMFM for Wefax-
-        {"USB+FM", 5},  // Fixed RX demodul AM config Index 5 : USB+FM for Audio Weather fax (WFAX) tones.
+        {"USB+FM", 5},  // Fixed RX demod. AM config Index 5 : USB+FM for Audio Weather fax (WFAX) tones.
+    },
+    {
+        // WFMAM for NOAA satellites,  137 Mhz band
+        {"FM+AM(DSB)", 1},  // Fixed RX demod- WFM config Index 1 : FM+AM  for Audio NOAA APT ones.
    },
 };

@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2025 Belousov Oleg
+ *
+ * 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 "gradient.hpp"
+
+#include "convert.hpp"
+#include "file_reader.hpp"
+namespace fs = std::filesystem;
+
+const std::filesystem::path default_gradient_file = u"waterfall.txt";
+
+Gradient::Gradient() {
+    prev_index = 0;
+    prev_r = 0;
+    prev_g = 0;
+    prev_b = 0;
+}
+
+void Gradient::set_default() {
+    step(86, 0, 0, 255);
+    step(171, 0, 255, 0);
+    step(255, 255, 0, 0);
+}
+
+bool Gradient::load_file(const std::filesystem::path& file_path) {
+    File gradient_file;
+    auto error = gradient_file.open(file_path.string());
+
+    if (error)
+        return false;
+
+    auto reader = FileLineReader(gradient_file);
+    for (const auto& line : reader) {
+        if (line.length() == 0 || line[0] == '#')
+            continue;  // Empty or comment line.
+
+        auto cols = split_string(line, ',');
+
+        if (cols.size() == 4) {
+            int16_t index, r, g, b;
+
+            if (!parse_int(cols[0], index) || index < 0 || index > 255)
+                continue;
+
+            if (!parse_int(cols[1], r) || r < 0 || r > 255)
+                continue;
+
+            if (!parse_int(cols[2], g) || g < 0 || g > 255)
+                continue;
+
+            if (!parse_int(cols[3], b) || b < 0 || b > 255)
+                continue;
+
+            step(index, r, g, b);
+        }
+    }
+
+    return true;
+}
+
+void Gradient::step(int16_t index, int16_t r, int16_t g, int16_t b) {
+    for (int16_t i = prev_index; i <= index; i++) {
+        float x = (float)(i - prev_index) / (index - prev_index);
+        float y = 1.0f - x;
+
+        int16_t new_r = prev_r * y + r * x;
+        int16_t new_g = prev_g * y + g * x;
+        int16_t new_b = prev_b * y + b * x;
+
+        lut[i] = ui::Color(new_r, new_g, new_b);
+    }
+
+    prev_index = index;
+    prev_r = r;
+    prev_g = g;
+    prev_b = b;
+}
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2025 Belousov Oleg
+ *
+ * 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 __GRADIENT_H__
+#define __GRADIENT_H__
+
+#include "ui.hpp"
+#include "file.hpp"
+
+#include <array>
+#include <cstdint>
+
+extern const std::filesystem::path default_gradient_file;
+
+class Gradient {
+   public:
+    std::array<ui::Color, 256> lut{};
+
+    Gradient();
+
+    void set_default();
+    bool load_file(const std::filesystem::path& file_path);
+
+   private:
+    int16_t prev_index = 0;
+    int16_t prev_r = 0;
+    int16_t prev_g = 0;
+    int16_t prev_b = 0;
+
+    void step(int16_t index, int16_t r, int16_t g, int16_t b);
+};
+
+#endif /* __GRADIENT_H__ */
@@ -538,7 +538,6 @@ init_status_t init() {

    set_cpu_clock_speed();

-    if (persistent_memory::config_lcd_inverted_mode()) display.set_inverted(true);
    /* sample max: 1023 sample_t AKA uint16_t
     * touch_sensitivity: range: 1 to 128
     * threshold range: 1023/1 to 1023/128  =  1023 to 8
@@ -41,20 +41,20 @@ namespace {

 static constexpr std::array<baseband::AMConfig, 12> am_configs{{
    // we config here all the non COMMON parameters to each AM modulation type in RX.
-    {taps_6k0_decim_1, taps_9k0_decim_2, taps_9k0_dsb_channel, AMConfigureMessage::Modulation::DSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},            // AM DSB-C  BW 9khz  (+-4k5)  commercial EU bandwidth .
-    {taps_6k0_decim_1, taps_6k0_decim_2, taps_6k0_dsb_channel, AMConfigureMessage::Modulation::DSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},            // AM DSB-C  BW 6khz  (+-3k0)  narrow AM , ham equipments.
-    {taps_6k0_decim_1, taps_6k0_decim_2, taps_2k8_usb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},            // SSB USB   BW 2K8   (+ 2K8)  SSB ham equipments.
-    {taps_6k0_decim_1, taps_6k0_decim_2, taps_2k8_lsb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},            // SSB LSB   BW 2K8   (- 2K8)  SSB ham equipments.
-    {taps_6k0_decim_1, taps_6k0_decim_2, taps_0k7_usb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},            // SSB USB   BW 0K7   (+ 0K7)  To get audio tone from CW Morse, assuming tx shifted +700hz aprox
-    {taps_6k0_decim_1, taps_6k0_decim_2, taps_2k6_usb_wefax_channel, AMConfigureMessage::Modulation::SSB_FM, audio_12k_lpf_1500hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},  // SSB USB+FM  to demod. Subcarrier FM Audio Tones to get APT Weather Fax.
+    {taps_6k0_decim_1, taps_9k0_decim_2, taps_9k0_dsb_channel, AMConfigureMessage::Modulation::DSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},                // AM DSB-C  BW 9khz  (+-4k5)  commercial EU bandwidth .
+    {taps_6k0_decim_1, taps_6k0_decim_2, taps_6k0_dsb_channel, AMConfigureMessage::Modulation::DSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},                // AM DSB-C  BW 6khz  (+-3k0)  narrow AM , ham equipments.
+    {taps_6k0_decim_1, taps_6k0_decim_2, taps_2k8_usb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},                // SSB USB   BW 2K8   (+ 2K8)  SSB ham equipments.
+    {taps_6k0_decim_1, taps_6k0_decim_2, taps_2k8_lsb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},                // SSB LSB   BW 2K8   (- 2K8)  SSB ham equipments.
+    {taps_6k0_decim_1, taps_6k0_decim_2, taps_0k7_usb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},                // SSB USB   BW 0K7   (+ 0K7)  To get audio tone from CW Morse, assuming tx shifted +700hz aprox
+    {taps_6k0_decim_1, taps_6k0_decim_2, taps_2k6_usb_wefax_channel, AMConfigureMessage::Modulation::SSB_FM, apt_audio_12k_lpf_1500hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_1},  // SSB USB+FM  to demod. Subcarrier FM Audio Tones to get APT Weather Fax.

    // below options for Waterfall zoom x 2
-    {taps_6k0_narrow_decim_1, taps_9k0_decim_2, taps_9k0_dsb_channel, AMConfigureMessage::Modulation::DSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},            // AM DSB-C  BW 9khz  (+-4k5)  commercial EU bandwidth .
-    {taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_6k0_dsb_channel, AMConfigureMessage::Modulation::DSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},            // AM DSB-C  BW 6khz  (+-3k0)  narrow AM , ham equipments.
-    {taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_2k8_usb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},            // SSB USB   BW 2K8   (+ 2K8)  SSB ham equipments.
-    {taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_2k8_lsb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},            // SSB LSB   BW 2K8   (- 2K8)  SSB ham equipments.
-    {taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_0k7_usb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},            // SSB USB   BW 0K7   (+ 0K7)  To get audio tone from CW Morse, assuming tx shifted +700hz aprox
-    {taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_2k6_usb_wefax_channel, AMConfigureMessage::Modulation::SSB_FM, audio_12k_lpf_1500hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},  // SSB USB+FM  to demod. Subcarrier FM Audio Tones to get APT Weather Fax with waterfall zoom x 2 (we need taps_6k0_narrow_decim_1 to minimize aliasing)
+    {taps_6k0_narrow_decim_1, taps_9k0_decim_2, taps_9k0_dsb_channel, AMConfigureMessage::Modulation::DSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},                // AM DSB-C  BW 9khz  (+-4k5)  commercial EU bandwidth .
+    {taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_6k0_dsb_channel, AMConfigureMessage::Modulation::DSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},                // AM DSB-C  BW 6khz  (+-3k0)  narrow AM , ham equipments.
+    {taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_2k8_usb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},                // SSB USB   BW 2K8   (+ 2K8)  SSB ham equipments.
+    {taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_2k8_lsb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},                // SSB LSB   BW 2K8   (- 2K8)  SSB ham equipments.
+    {taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_0k7_usb_channel, AMConfigureMessage::Modulation::SSB, audio_12k_hpf_300hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},                // SSB USB   BW 0K7   (+ 0K7)  To get audio tone from CW Morse, assuming tx shifted +700hz aprox
+    {taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_2k6_usb_wefax_channel, AMConfigureMessage::Modulation::SSB_FM, apt_audio_12k_lpf_1500hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2},  // SSB USB+FM  to demod. Subcarrier FM Audio Tones to get APT Weather Fax with waterfall zoom x 2 (we need taps_6k0_narrow_decim_1 to minimize aliasing)
 }};

 static constexpr std::array<baseband::NBFMConfig, 3> nbfm_configs{{
@@ -69,6 +69,10 @@ static constexpr std::array<baseband::WFMConfig, 3> wfm_configs{{
    {taps_40k_wfm_decim_0, taps_40k_wfm_decim_1},
 }};

+static constexpr std::array<baseband::WFMAMConfig, 1> wfmam_configs{{
+    {taps_16k0_decim_0, taps_84k_wfmam_decim_1},
+}};
+
 } /* namespace */

 rf::Frequency ReceiverModel::target_frequency() const {
@@ -187,6 +191,17 @@ void ReceiverModel::set_wfm_configuration(uint8_t n) {
    }
 }

+uint8_t ReceiverModel::wfmam_configuration() const {
+    return settings_.wfmam_config_index;
+}
+
+void ReceiverModel::set_wfmam_configuration(uint8_t n) {
+    if (n < wfmam_configs.size()) {
+        settings_.wfmam_config_index = n;
+        update_modulation();
+    }
+}
+
 uint8_t ReceiverModel::squelch_level() const {
    return settings_.squelch_level;
 }
@@ -340,6 +355,10 @@ void ReceiverModel::update_modulation() {
            update_wfm_configuration();
            break;

+        case Mode::WFMAudioAMApt:
+            update_wfmam_configuration();
+            break;
+
        case Mode::SpectrumAnalysis:
        case Mode::Capture:
            break;
@@ -362,6 +381,10 @@ void ReceiverModel::update_wfm_configuration() {
    wfm_configs[wfm_configuration()].apply();
 }

+void ReceiverModel::update_wfmam_configuration() {
+    wfmam_configs[wfmam_configuration()].apply();  // update with different index for Wefax.
+}
+
 void ReceiverModel::update_antenna_bias() {
    if (enabled_)
        radio::set_antenna_bias(portapack::get_antenna_bias());
@@ -41,8 +41,9 @@ class ReceiverModel {
        NarrowbandFMAudio = 1,
        WidebandFMAudio = 2,
        SpectrumAnalysis = 3,
-        AMAudioFMApt = 4,  // Added to handle  HF  WeatherFax , SSB (USB demod) + Tone_Subcarrier FM demod
-        Capture = 5,
+        AMAudioFMApt = 4,   // Added to handle  HF  WeatherFax , SSB (USB demod) + Tone_Subcarrier FM demod
+        WFMAudioAMApt = 5,  // Added to handle SAT Weather map , NOAA 137 Mhz.
+        Capture = 6,
    };

    struct settings_t {
@@ -56,6 +57,7 @@ class ReceiverModel {
        Mode mode = Mode::NarrowbandFMAudio;
        uint8_t am_config_index = 0;
        uint8_t amfm_config_index = 0;
+        uint8_t wfmam_config_index = 0;
        uint8_t nbfm_config_index = 0;
        uint8_t wfm_config_index = 0;
        uint8_t squelch_level = 80;
@@ -98,6 +100,9 @@ class ReceiverModel {
    uint8_t wfm_configuration() const;
    void set_wfm_configuration(uint8_t n);

+    uint8_t wfmam_configuration() const;
+    void set_wfmam_configuration(uint8_t n);
+
    uint8_t squelch_level() const;
    void set_squelch_level(uint8_t v);

@@ -151,6 +156,7 @@ class ReceiverModel {
    void update_amfm_configuration();
    void update_nbfm_configuration();
    void update_wfm_configuration();
+    void update_wfmam_configuration();

    void update_antenna_bias();
    void update_headphone_volume();
@@ -280,265 +280,6 @@ const std::array<ui::Color, 256> spectrum_rgb2_lut{{
    {132, 0, 0},
 }};

-const std::array<ui::Color, 256> spectrum_rgb3_lut{{
-    {0, 0, 0},
-    {0, 0, 3},
-    {0, 0, 6},
-    {0, 0, 9},
-    {0, 0, 12},
-    {0, 0, 15},
-    {0, 0, 18},
-    {0, 0, 21},
-    {0, 0, 24},
-    {0, 0, 27},
-    {0, 0, 30},
-    {0, 0, 33},
-    {0, 0, 36},
-    {0, 0, 39},
-    {0, 0, 42},
-    {0, 0, 45},
-    {0, 0, 48},
-    {0, 0, 51},
-    {0, 0, 54},
-    {0, 0, 57},
-    {0, 0, 60},
-    {0, 0, 63},
-    {0, 0, 66},
-    {0, 0, 69},
-    {0, 0, 72},
-    {0, 0, 75},
-    {0, 0, 78},
-    {0, 0, 81},
-    {0, 0, 84},
-    {0, 0, 87},
-    {0, 0, 90},
-    {0, 0, 93},
-    {0, 0, 96},
-    {0, 0, 99},
-    {0, 0, 102},
-    {0, 0, 105},
-    {0, 0, 108},
-    {0, 0, 111},
-    {0, 0, 114},
-    {0, 0, 117},
-    {0, 0, 120},
-    {0, 0, 123},
-    {0, 0, 126},
-    {0, 0, 129},
-    {0, 0, 132},
-    {0, 0, 135},
-    {0, 0, 138},
-    {0, 0, 141},
-    {0, 0, 144},
-    {0, 0, 147},
-    {0, 0, 150},
-    {0, 0, 153},
-    {0, 0, 156},
-    {0, 0, 159},
-    {0, 0, 162},
-    {0, 0, 165},
-    {0, 0, 168},
-    {0, 0, 171},
-    {0, 0, 174},
-    {0, 0, 177},
-    {0, 0, 180},
-    {0, 0, 183},
-    {0, 0, 186},
-    {0, 0, 189},
-    {0, 0, 192},
-    {0, 0, 195},
-    {0, 0, 198},
-    {0, 0, 201},
-    {0, 0, 204},
-    {0, 0, 207},
-    {0, 0, 210},
-    {0, 0, 213},
-    {0, 0, 216},
-    {0, 0, 219},
-    {0, 0, 222},
-    {0, 0, 225},
-    {0, 0, 228},
-    {0, 0, 231},
-    {0, 0, 234},
-    {0, 0, 237},
-    {0, 0, 240},
-    {0, 0, 243},
-    {0, 0, 246},
-    {0, 0, 249},
-    {0, 0, 252},
-    {0, 0, 255},
-    {0, 3, 252},
-    {0, 6, 249},
-    {0, 9, 246},
-    {0, 12, 243},
-    {0, 15, 240},
-    {0, 18, 237},
-    {0, 21, 234},
-    {0, 24, 231},
-    {0, 27, 228},
-    {0, 30, 225},
-    {0, 33, 222},
-    {0, 36, 219},
-    {0, 39, 216},
-    {0, 42, 213},
-    {0, 45, 210},
-    {0, 48, 207},
-    {0, 51, 204},
-    {0, 54, 201},
-    {0, 57, 198},
-    {0, 60, 195},
-    {0, 63, 192},
-    {0, 66, 189},
-    {0, 69, 186},
-    {0, 72, 183},
-    {0, 75, 180},
-    {0, 78, 177},
-    {0, 81, 174},
-    {0, 84, 171},
-    {0, 87, 168},
-    {0, 90, 165},
-    {0, 93, 162},
-    {0, 96, 159},
-    {0, 99, 156},
-    {0, 102, 153},
-    {0, 105, 150},
-    {0, 108, 147},
-    {0, 111, 144},
-    {0, 114, 141},
-    {0, 117, 138},
-    {0, 120, 135},
-    {0, 123, 132},
-    {0, 126, 129},
-    {0, 129, 126},
-    {0, 132, 123},
-    {0, 135, 120},
-    {0, 138, 117},
-    {0, 141, 114},
-    {0, 144, 111},
-    {0, 147, 108},
-    {0, 150, 105},
-    {0, 153, 102},
-    {0, 156, 99},
-    {0, 159, 96},
-    {0, 162, 93},
-    {0, 165, 90},
-    {0, 168, 87},
-    {0, 171, 84},
-    {0, 174, 81},
-    {0, 177, 78},
-    {0, 180, 75},
-    {0, 183, 72},
-    {0, 186, 69},
-    {0, 189, 66},
-    {0, 192, 63},
-    {0, 195, 60},
-    {0, 198, 57},
-    {0, 201, 54},
-    {0, 204, 51},
-    {0, 207, 48},
-    {0, 210, 45},
-    {0, 213, 42},
-    {0, 216, 39},
-    {0, 219, 36},
-    {0, 222, 33},
-    {0, 225, 30},
-    {0, 228, 27},
-    {0, 231, 24},
-    {0, 234, 21},
-    {0, 237, 18},
-    {0, 240, 15},
-    {0, 243, 12},
-    {0, 246, 9},
-    {0, 249, 6},
-    {0, 252, 3},
-    {0, 255, 0},
-    {3, 252, 0},
-    {6, 249, 0},
-    {9, 246, 0},
-    {12, 243, 0},
-    {15, 240, 0},
-    {18, 237, 0},
-    {21, 234, 0},
-    {24, 231, 0},
-    {27, 228, 0},
-    {30, 225, 0},
-    {33, 222, 0},
-    {36, 219, 0},
-    {39, 216, 0},
-    {42, 213, 0},
-    {45, 210, 0},
-    {48, 207, 0},
-    {51, 204, 0},
-    {54, 201, 0},
-    {57, 198, 0},
-    {60, 195, 0},
-    {63, 192, 0},
-    {66, 189, 0},
-    {69, 186, 0},
-    {72, 183, 0},
-    {75, 180, 0},
-    {78, 177, 0},
-    {81, 174, 0},
-    {84, 171, 0},
-    {87, 168, 0},
-    {90, 165, 0},
-    {93, 162, 0},
-    {96, 159, 0},
-    {99, 156, 0},
-    {102, 153, 0},
-    {105, 150, 0},
-    {108, 147, 0},
-    {111, 144, 0},
-    {114, 141, 0},
-    {117, 138, 0},
-    {120, 135, 0},
-    {123, 132, 0},
-    {126, 129, 0},
-    {129, 126, 0},
-    {132, 123, 0},
-    {135, 120, 0},
-    {138, 117, 0},
-    {141, 114, 0},
-    {144, 111, 0},
-    {147, 108, 0},
-    {150, 105, 0},
-    {153, 102, 0},
-    {156, 99, 0},
-    {159, 96, 0},
-    {162, 93, 0},
-    {165, 90, 0},
-    {168, 87, 0},
-    {171, 84, 0},
-    {174, 81, 0},
-    {177, 78, 0},
-    {180, 75, 0},
-    {183, 72, 0},
-    {186, 69, 0},
-    {189, 66, 0},
-    {192, 63, 0},
-    {195, 60, 0},
-    {198, 57, 0},
-    {201, 54, 0},
-    {204, 51, 0},
-    {207, 48, 0},
-    {210, 45, 0},
-    {213, 42, 0},
-    {216, 39, 0},
-    {219, 36, 0},
-    {222, 33, 0},
-    {225, 30, 0},
-    {228, 27, 0},
-    {231, 24, 0},
-    {234, 21, 0},
-    {237, 18, 0},
-    {240, 15, 0},
-    {243, 12, 0},
-    {246, 9, 0},
-    {249, 6, 0},
-    {252, 3, 0},
-    {255, 0, 0},
-}};
-
 const std::array<ui::Color, 256> spectrum_rgb4_lut{{
    {0, 0, 0},
    {1, 1, 1},
@@ -27,7 +27,6 @@
 #include <array>

 extern const std::array<ui::Color, 256> spectrum_rgb2_lut;
-extern const std::array<ui::Color, 256> spectrum_rgb3_lut;
 extern const std::array<ui::Color, 256> spectrum_rgb4_lut;

 #endif /*__SPECTRUM_COLOR_LUT_H__*/
@@ -29,6 +29,7 @@

 #include "irq_controls.hpp"
 #include "rf_path.hpp"
+#include "freqman_db.hpp"

 #include <cstddef>
 #include <cstdint>
@@ -37,6 +38,10 @@

 #define MAX_UFREQ 7200000000  // maximum usable frequency

+using option_db_t = std::pair<std::string_view, int32_t>;
+using options_db_t = std::vector<option_db_t>;
+extern options_db_t freqman_steps;
+
 namespace ui {

 class FrequencyField : public Widget {
@@ -263,22 +268,12 @@ class FrequencyStepView : public OptionsField {
        : OptionsField{
              parent_pos,
              5,
-              {
-                  {"   10", 10}, /* Fine tuning SSB voice pitch,in HF and QO-100 sat #669 */
-                  {"   50", 50}, /* added 50Hz/10Hz,but we do not increase GUI digit decimal */
-                  {"  100", 100},
-                  {"  1k ", 1000},
-                  {"  3k ", 3000}, /* Approximate SSB bandwidth */
-                  {"  5k ", 5000},
-                  {"  6k3", 6250},
-                  {"  9k ", 9000}, /* channel spacing for LF, MF in some regions */
-                  {" 10k ", 10000},
-                  {" 12k5", 12500},
-                  {" 25k ", 25000},
-                  {"100k ", 100000},
-                  {"  1M ", 1000000},
-                  {" 10M ", 10000000},
-              }} {
+              {}} {
+        options_t options;
+        for (const auto& step : freqman_steps) {
+            options.emplace_back(step.first, step.second);
+        }
+        set_options(options);
    }
 };

@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyleft Mr. Robot 2025
 *
 * This file is part of PortaPack.
 *
@@ -21,8 +22,6 @@

 #include "ui_spectrum.hpp"

-#include "spectrum_color_lut.hpp"
-
 #include "portapack.hpp"
 using namespace portapack;

@@ -102,6 +101,15 @@ void FrequencyScale::set_channel_filter(
    }
 }

+void FrequencyScale::set_cursor_position(const int32_t position) {
+    cursor_position = position;
+
+    cursor_position = std::min<int32_t>(cursor_position, 119);
+    cursor_position = std::max<int32_t>(cursor_position, -120);
+
+    set_dirty();
+}
+
 void FrequencyScale::paint(Painter& painter) {
    const auto r = screen_rect();

@@ -115,14 +123,12 @@ void FrequencyScale::paint(Painter& painter) {
    draw_filter_ranges(painter, r);
    draw_frequency_ticks(painter, r);

-    if (_blink) {
-        const Rect r_cursor{
-            118 + cursor_position, r.bottom() - filter_band_height,
-            5, filter_band_height};
-        painter.fill_rectangle(
-            r_cursor,
-            Color::red());
-    }
+    const Rect r_cursor{
+        118 + cursor_position, r.bottom() - filter_band_height,
+        5, filter_band_height};
+    painter.fill_rectangle(
+        r_cursor,
+        Color::red());
 }

 void FrequencyScale::clear() {
@@ -206,16 +212,10 @@ void FrequencyScale::draw_filter_ranges(Painter& painter, const Rect r) {
 }

 void FrequencyScale::on_focus() {
-    _blink = true;
-    on_tick_second();
-    signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
-        this->on_tick_second();
-    };
+    set_dirty();
 }

 void FrequencyScale::on_blur() {
-    rtc_time::signal_tick_second -= signal_token_tick_second;
-    _blink = false;
    set_dirty();
 }

@@ -235,6 +235,7 @@ bool FrequencyScale::on_key(const KeyEvent key) {
        if (on_select) {
            on_select((cursor_position * spectrum_sampling_rate) / 240);
            cursor_position = 0;
+            set_dirty();
            return true;
        }
    }
@@ -242,9 +243,13 @@ bool FrequencyScale::on_key(const KeyEvent key) {
    return false;
 }

-void FrequencyScale::on_tick_second() {
-    set_dirty();
-    _blink = !_blink;
+bool FrequencyScale::on_touch(const TouchEvent touch) {
+    if (touch.type == TouchEvent::Type::Start) {
+        if (on_select) {
+            on_select((touch.point.x() * spectrum_sampling_rate) / 240);
+        }
+    }
+    return true;
 }

 /* WaterfallWidget *********************************************************/
@@ -271,12 +276,12 @@ void WaterfallWidget::on_channel_spectrum(

    std::array<Color, 240> pixel_row;
    for (size_t i = 0; i < 120; i++) {
-        const auto pixel_color = spectrum_rgb3_lut[spectrum.db[256 - 120 + i]];
+        const auto pixel_color = gradient.lut[spectrum.db[256 - 120 + i]];
        pixel_row[i] = pixel_color;
    }

    for (size_t i = 120; i < 240; i++) {
-        const auto pixel_color = spectrum_rgb3_lut[spectrum.db[i - 120]];
+        const auto pixel_color = gradient.lut[spectrum.db[i - 120]];
        pixel_row[i] = pixel_color;
    }

@@ -287,6 +292,15 @@ void WaterfallWidget::on_channel_spectrum(
        pixel_row);
 }

+bool WaterfallWidget::on_touch(const TouchEvent event) {
+    if (event.type == TouchEvent::Type::Start) {
+        if (on_touch_select) {
+            on_touch_select(event.point.x(), event.point.y());
+        }
+    }
+    return true;
+}
+
 void WaterfallWidget::clear() {
    display.fill_rectangle(
        screen_rect(),
@@ -305,6 +319,22 @@ WaterfallView::WaterfallView(const bool cursor) {
    frequency_scale.on_select = [this](int32_t offset) {
        if (on_select) on_select(offset);
    };
+
+    waterfall_widget.on_touch_select = [this](int32_t x, int32_t y) {
+        if (y > screen_height - screen_height * 0.1) return;  // prevent ghost touch
+
+        frequency_scale.focus();  // focus on frequency scale to show cursor
+
+        if (sampling_rate) {
+            // screen x to frequency scale x, NB we need two widgets align
+            int32_t cursor_position = x - (screen_width / 2);
+            frequency_scale.set_cursor_position(cursor_position);
+        }
+    };
+
+    if (!waterfall_widget.gradient.load_file(default_gradient_file)) {
+        waterfall_widget.gradient.set_default();
+    }
 }

 void WaterfallView::on_show() {
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyleft Mr. Robot 2025
 *
 * This file is part of PortaPack.
 *
@@ -24,6 +25,7 @@

 #include "ui.hpp"
 #include "ui_widget.hpp"
+#include "gradient.hpp"

 #include "event_m0.hpp"

@@ -78,18 +80,17 @@ class FrequencyScale : public Widget {

    bool on_encoder(const EncoderEvent delta) override;
    bool on_key(const KeyEvent key) override;
+    bool on_touch(const TouchEvent touch) override;

    void set_spectrum_sampling_rate(const int new_sampling_rate);
    void set_channel_filter(const int low_frequency, const int high_frequency, const int transition);
+    void set_cursor_position(const int32_t position);

    void paint(Painter& painter) override;

   private:
    static constexpr int filter_band_height = 4;

-    void on_tick_second();
-
-    bool _blink{false};
    int32_t cursor_position{0};
    SignalToken signal_token_tick_second{};
    int spectrum_sampling_rate{0};
@@ -111,9 +112,14 @@ class FrequencyScale : public Widget {

 class WaterfallWidget : public Widget {
   public:
+    std::function<void(int32_t offset, int32_t y)> on_touch_select{};
+
+    Gradient gradient{};
+
    void on_show() override;
    void on_hide() override;
    void paint(Painter&) override {}
+    bool on_touch(const TouchEvent event) override;

    void on_channel_spectrum(const ChannelSpectrum& spectrum);

@@ -155,6 +155,9 @@ TransmitterView::TransmitterView(

            field_bw.on_change = [this](int32_t v) {
                on_channel_bandwidth_changed(v * 1000);
+                if (on_bandwidth_changed) {
+                    on_bandwidth_changed();
+                }
            };
            field_bw.set_value(channel_bandwidth);
        }
@@ -257,4 +260,4 @@ void TransmitterView2::update_gainlevel_styles() {
    field_amp.set_style(style);
 }

-} /* namespace ui */
+} /* namespace ui */
@@ -50,6 +50,10 @@ class TransmitterView : public View {
    std::function<void(void)> on_edit_frequency{};
    std::function<void(void)> on_start{};
    std::function<void(void)> on_stop{};
+    std::function<void(void)> on_bandwidth_changed{};
+    // TODO: this is a workaround because in the message system,
+    // we change bw by different message for different m4 bb, so have to callback
+    // and change in the instance(for instance SigGen app) with calling the instance's bb opration func

    TransmitterView(const Coord y, const uint64_t frequency_step, const uint32_t channel_bandwidth, const bool lock);
    TransmitterView(
@@ -156,4 +160,4 @@ class TransmitterView2 : public View {

 } /* namespace ui */

-#endif /*__UI_TRANSMITTER_H__*/
+#endif /*__UI_TRANSMITTER_H__*/
@@ -117,10 +117,10 @@ const NavigationView::AppList NavigationView::appList = {
    /* HOME ******************************************************************/
    {nullptr, "Receive", HOME, Color::cyan(), &bitmap_icon_receivers, new ViewFactory<ReceiversMenuView>()},
    {nullptr, "Transmit", HOME, Color::cyan(), &bitmap_icon_transmit, new ViewFactory<TransmittersMenuView>()},
+    {nullptr, "Tranceiver", HOME, Color::cyan(), &bitmap_icon_tranceivers, new ViewFactory<TranceiversMenuView>()},
+    {"recon", "Recon", HOME, Color::green(), &bitmap_icon_scanner, new ViewFactory<ReconView>()},
    {"capture", "Capture", HOME, Color::red(), &bitmap_icon_capture, new ViewFactory<CaptureAppView>()},
    {"replay", "Replay", HOME, Color::green(), &bitmap_icon_replay, new ViewFactory<PlaylistView>()},
-    {"recon", "Recon", HOME, Color::green(), &bitmap_icon_scanner, new ViewFactory<ReconView>()},
-    {"microphone", "Microphone", HOME, Color::green(), &bitmap_icon_microphone, new ViewFactory<MicTXView>()},
    {"lookingglass", "Looking Glass", HOME, Color::green(), &bitmap_icon_looking, new ViewFactory<GlassView>()},
    {nullptr, "Utilities", HOME, Color::cyan(), &bitmap_icon_utilities, new ViewFactory<UtilitiesMenuView>()},
    {nullptr, "Games", HOME, Color::cyan(), &bitmap_icon_games, new ViewFactory<GamesMenuView>()},
@@ -147,6 +147,8 @@ const NavigationView::AppList NavigationView::appList = {
    {"soundbrd", "Soundbrd", TX, ui::Color::green(), &bitmap_icon_soundboard, new ViewFactory<SoundBoardView>()},
    {"touchtune", "TouchTune", TX, ui::Color::green(), &bitmap_icon_touchtunes, new ViewFactory<TouchTunesView>()},
    {"signalgen", "SignalGen", TX, Color::green(), &bitmap_icon_cwgen, new ViewFactory<SigGenView>()},
+    /* TRX ********************************************************************/
+    {"microphone", "Mic", TRX, Color::green(), &bitmap_icon_microphone, new ViewFactory<MicTXView>()},
    /* UTILITIES *************************************************************/
    {"filemanager", "File Manager", UTILITIES, Color::green(), &bitmap_icon_dir, new ViewFactory<FileManagerView>()},
    {"freqman", "Freq. Manager", UTILITIES, Color::green(), &bitmap_icon_freqman, new ViewFactory<FrequencyManagerView>()},
@@ -380,7 +382,7 @@ void SystemStatusView::refresh() {
    // Display "Disable speaker" icon only if AK4951 Codec which has separate speaker/headphone control
    if (audio::speaker_disable_supported() && !pmem::ui_hide_speaker()) status_icons.add(&toggle_speaker);

-    if (!pmem::ui_hide_fake_brightness() && !pmem::config_lcd_inverted_mode()) status_icons.add(&button_fake_brightness);
+    if (!pmem::ui_hide_fake_brightness()) status_icons.add(&button_fake_brightness);
    if (battery::BatteryManagement::isDetected()) {
        batt_was_inited = true;
        if (!pmem::ui_hide_battery_icon()) {
@@ -414,7 +416,7 @@ void SystemStatusView::refresh() {
    button_converter.set_foreground(pmem::config_converter() ? Theme::getInstance()->fg_red->foreground : Theme::getInstance()->fg_light->foreground);

    // Fake Brightness
-    button_fake_brightness.set_foreground((pmem::apply_fake_brightness() & (!pmem::config_lcd_inverted_mode())) ? *Theme::getInstance()->status_active : Theme::getInstance()->fg_light->foreground);
+    button_fake_brightness.set_foreground(pmem::apply_fake_brightness() ? *Theme::getInstance()->status_active : Theme::getInstance()->fg_light->foreground);

    set_dirty();
 }
@@ -841,6 +843,22 @@ void TransmittersMenuView::on_populate() {
    add_external_items(nav_, app_location_t::TX, *this, return_icon ? 1 : 0);
 }

+/* TranceiversMenuView **************************************************/
+
+TranceiversMenuView::TranceiversMenuView(NavigationView& nav)
+    : nav_(nav) {}
+
+void TranceiversMenuView::on_populate() {
+    bool return_icon = pmem::show_gui_return_icon();
+    if (return_icon) {
+        add_items({{"..", Theme::getInstance()->fg_light->foreground, &bitmap_icon_previous, [this]() { nav_.pop(); }}});
+    }
+    add_apps(nav_, *this, TRX);
+    // add_external_items(nav_, app_location_t::TRX, *this, return_icon ? 1 : 0);
+    // this folder doesn't have external apps, comment to prevent pop the err msg.
+    // NB: when has external app someday, uncomment this.
+}
+
 /* UtilitiesMenuView *****************************************************/

 UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav)
@@ -379,6 +379,16 @@ class TransmittersMenuView : public BtnGridView {
    void on_populate() override;
 };

+class TranceiversMenuView : public BtnGridView {
+   public:
+    TranceiversMenuView(NavigationView& nav);
+    std::string title() const override { return "Tranceiver"; };
+
+   private:
+    NavigationView& nav_;
+    void on_populate() override;
+};
+
 class UtilitiesMenuView : public BtnGridView {
   public:
    UtilitiesMenuView(NavigationView& nav);
@@ -691,6 +691,9 @@ static void printAppInfo(BaseSequentialStream* chp, ui::AppInfoConsole& element)
        case TX:
            chprintf(chp, "[TX]\r\n");
            break;
+        case TRX:
+            chprintf(chp, "[TRX]\r\n");
+            break;
        case UTILITIES:
            chprintf(chp, "[UTIL]\r\n");
            break;
@@ -715,6 +718,9 @@ static void printAppInfo(BaseSequentialStream* chp, const ui::AppInfo& element)
        case TX:
            chprintf(chp, "[TX]\r\n");
            break;
+        case TRX:
+            chprintf(chp, "[TRX]\r\n");
+            break;
        case UTILITIES:
            chprintf(chp, "[UTIL]\r\n");
            break;
@@ -52,6 +52,19 @@ void AudioOutput::write_unprocessed(const buffer_s16_t& audio) {
        });
 }

+void AudioOutput::apt_write(const buffer_s16_t& audio) {
+    std::array<float, 32> audio_f;
+    for (size_t i = 0; i < audio.count; i++) {
+        cur = audio.p[i];
+        cur2 = cur * cur;
+        mag_am = sqrtf(prev2 + cur2 - (2 * prev * cur * cos_theta)) / sin_theta;
+        audio_f[i] = mag_am * ki;  // normalize.
+        prev = cur;
+        prev2 = cur2;
+    }
+    write(buffer_f32_t{audio_f.data(), audio.count, audio.sampling_rate});
+}
+
 void AudioOutput::write(const buffer_s16_t& audio) {
    std::array<float, 32> audio_f;
    for (size_t i = 0; i < audio.count; i++) {
@@ -72,8 +85,8 @@ void AudioOutput::on_block(const buffer_f32_t& audio) {
    if (do_processing) {
        const auto audio_present_now = squelch.execute(audio);

-        hpf.execute_in_place(audio);  // IIRBiquadFilter name is "hpf", but we will call with "hpf-coef" for all  except AMFM (WFAX) with "lpf-coef"
-        deemph.execute_in_place(audio);
+        hpf.execute_in_place(audio);     // IIRBiquadFilter name is "hpf", but we will call with "hpf-coef" for all  except AMFM (WFAX) with "lpf-coef" and notch for WFMAM (NOAA)
+        deemph.execute_in_place(audio);  // IIRBiquadFilter name is "deemph", but we will call LPF de-emphasis or  other LPF for WFAM (NOAA).

        audio_present_history = (audio_present_history << 1) | (audio_present_now ? 1 : 0);
        audio_present = (audio_present_history != 0);
@@ -46,6 +46,7 @@ class AudioOutput {
        const float squelch_threshold = 0.0f);

    void write_unprocessed(const buffer_s16_t& audio);
+    void apt_write(const buffer_s16_t& audio);
    void write(const buffer_s16_t& audio);
    void write(const buffer_f32_t& audio);

@@ -58,6 +59,10 @@ class AudioOutput {
   private:
    static constexpr float k = 32768.0f;
    static constexpr float ki = 1.0f / k;
+    static constexpr float cos_theta = 0.30901699437494742410f;
+    static constexpr float sin_theta = 0.95105651629515357212f;
+
+    float cur = 0.0f, cur2 = 0.0f, prev = 0.0f, prev2 = 0.0f, mag_am = 0.0f;

    BlockDecimator<int16_t, 32> block_buffer_s16{1};
    BlockDecimator<float, 32> block_buffer{1};
@@ -161,7 +161,7 @@ void WeFaxRx::configure(const WeFaxRxConfigureMessage& message) {
    channel_filter_high_f = taps_2k6_usb_wefax_channel.high_frequency_normalized * channel_filter_input_fs;
    channel_filter_transition = taps_2k6_usb_wefax_channel.transition_normalized * channel_filter_input_fs;
    channel_spectrum.set_decimation_factor(1.0f);
-    audio_output.configure(audio_12k_lpf_1500hz_config);  // hpf in all AM demod modes (AM-6K/9K, USB/LSB,DSB), except Wefax (lpf there).
+    audio_output.configure(apt_audio_12k_lpf_1500hz_config);  // hpf in all AM demod modes (AM-6K/9K, USB/LSB,DSB), except Wefax (lpf there).

    lpm = message.lpm;
    ioc_mode = message.ioc;
@@ -47,23 +47,37 @@ void WidebandFMAudio::execute(const buffer_c8_t& buffer) {
        channel_spectrum.feed(channel, channel_filter_low_f, channel_filter_high_f, channel_filter_transition);
    }

-    /* 384kHz complex<int16_t>[256]
+    /* 384kHz complex<int16_t>[256]  for wfm
     * -> FM demodulation
     * -> 384kHz int16_t[256] */
    /* TODO: To improve adjacent channel rejection, implement complex channel filter:
     *		pass < +/- 100kHz, stop > +/- 200kHz
     */

-    auto audio_oversampled = demod.execute(channel, work_audio_buffer);
+    /* 96kHz complex<int16_t>[64]  for wfmam NOAA
+     * -> FM demodulation
+     * -> 96kHz int16_t[64] */

-    /* 384kHz int16_t[256]
+    auto audio_oversampled = demod.execute(channel, work_audio_buffer);  // fs 384khz wfm , 96khz wfmam for NOAA
+
+    /* 384kHz int16_t[256]     for wfm
     * -> 4th order CIC decimation by 2, gain of 1
     * -> 192kHz int16_t[128] */
+
+    /* 96kHz int16_t[64]     for wfam
+     * -> 4th order CIC decimation by 2, gain of 1
+     * -> 48kHz int16_t[32] */
+
    auto audio_4fs = audio_dec_1.execute(audio_oversampled, work_audio_buffer);

-    /* 192kHz int16_t[128]
+    /* 192kHz int16_t[128]   for wfm
     * -> 4th order CIC decimation by 2, gain of 1
     * -> 96kHz int16_t[64] */
+
+    /* 48kHz int16_t[32]     for wfman
+     * -> 4th order CIC decimation by 2, gain of 1
+     * -> 24kHz int16_t[16] */
+
    auto audio_2fs = audio_dec_2.execute(audio_4fs, work_audio_buffer);

    // Input: 96kHz int16_t[64]
@@ -118,13 +132,24 @@ void WidebandFMAudio::execute(const buffer_c8_t& buffer) {
            break;
    }

-    /* 96kHz int16_t[64]
+    /* 96kHz int16_t[64]         for wfm
     * -> FIR filter, <15kHz (0.156fs) pass, >19kHz (0.198fs) stop, gain of 1
     * -> 48kHz int16_t[32] */
+
+    /* 24kHz int16_t[16]          for wfmam
+     * -> FIR filter, <4.5kHz (0.1875fs) pass, >5.2kHz (0.2166fs) stop, gain of 1
+     * -> 12kHz int16_t[8] */
+
    auto audio = audio_filter.execute(audio_2fs, work_audio_buffer);

-    /* -> 48kHz int16_t[32] */
-    audio_output.write(audio);
+    /* -> 48kHz int16_t[32]  for wfm  ,   */
+    /* -> 12kHz int16_t[8]   for wfmam ,  */
+
+    if (decim_1.decimation_factor() == 2) {
+        audio_output.write(audio);  // we are in original wfm , decim_1.decimation_factor == 2
+    } else {
+        audio_output.apt_write(audio);  // we are in added wfmam (noaa), decim_1.decimation_factor == 8
+    }
 }

 void WidebandFMAudio::post_message(const buffer_c16_t& data) {
@@ -142,7 +167,11 @@ void WidebandFMAudio::on_message(const Message* const message) {
            break;

        case Message::ID::WFMConfigure:
-            configure(*reinterpret_cast<const WFMConfigureMessage*>(message));
+            configure_wfm(*reinterpret_cast<const WFMConfigureMessage*>(message));
+            break;
+
+        case Message::ID::WFMAMConfigure:
+            configure_wfmam(*reinterpret_cast<const WFMAMConfigureMessage*>(message));
            break;

        case Message::ID::CaptureConfig:
@@ -154,20 +183,56 @@ void WidebandFMAudio::on_message(const Message* const message) {
    }
 }

-void WidebandFMAudio::configure(const WFMConfigureMessage& message) {
+void WidebandFMAudio::configure_wfm(const WFMConfigureMessage& message) {
    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 demod_input_fs = decim_1_output_fs;
+    decim_0.configure(message.decim_0_filter.taps);
+    // decim_1.configure(message.decim_1_filter.taps);  // Original .
+
+    // TODO dynamic decim1 ,  with decimation 2 / 8 and  16 x taps , / 32 taps .
+    // Temptatively , I splitted, in two WidebandFMAudio::configure_wfm / WidebandFMAudio::configure_wfmam and dynamically /2, /8  (here /2)
+    // decim_1.set<dsp::decimate::FIRC16xR16x16Decim2>().configure(message.decim_1_filter.taps);   // for wfm
+    // decim_1.set<dsp::decimate::FIRC16xR16x32Decim8>().configure(taps_84k_wfmam_decim_1.taps); // for wfmam
+    decim_1.set<dsp::decimate::FIRC16xR16x16Decim2>().configure(message.decim_1_filter.taps);  // for wfm
+    size_t decim_1_output_fs = decim_1_input_fs / decim_1.decimation_factor();                 // wfm , decim_1.decimation_factor() = /2 , if applied after the line : decim_1.set<dsp::decimate::FIRC16xR16x16Decim2>().configure(message.decim_1_filter.taps);
+    size_t demod_input_fs = decim_1_output_fs;

    spectrum_interval_samples = decim_1_output_fs / spectrum_rate_hz;
    spectrum_samples = 0;

+    channel_filter_low_f = message.decim_1_filter.low_frequency_normalized * decim_1_input_fs;
+    channel_filter_high_f = message.decim_1_filter.high_frequency_normalized * decim_1_input_fs;
+    channel_filter_transition = message.decim_1_filter.transition_normalized * decim_1_input_fs;
+    demod.configure(demod_input_fs, message.deviation);
+    audio_filter.configure(message.audio_filter.taps);
+    audio_output.configure(message.audio_hpf_config, message.audio_deemph_config);
+
+    channel_spectrum.set_decimation_factor(1);
+
+    configured = true;
+}
+
+void WidebandFMAudio::configure_wfmam(const WFMAMConfigureMessage& message) {
+    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;
+
    decim_0.configure(message.decim_0_filter.taps);
-    decim_1.configure(message.decim_1_filter.taps);
+
+    // decim_1.configure(message.decim_1_filter.taps);  // Original .
+    // TODO dynamic decim1 ,  with decimation 2 / 8 and  16 x taps , / 32 taps .
+    // Temptatively , I splitted, in two WidebandFMAudio::configure_wfm / WidebandFMAudio::configure_wfmam  and dynamically /2, /8 . (here /8)
+    // decim_1.set<dsp::decimate::FIRC16xR16x16Decim2>().configure(message.decim_1_filter.taps);  // for wfm
+    // decim_1.set<dsp::decimate::FIRC16xR16x32Decim8>().configure(message.decim_1_filter.taps);    // for wfmam
+    decim_1.set<dsp::decimate::FIRC16xR16x32Decim8>().configure(message.decim_1_filter.taps);  // for wfmam
+    size_t decim_1_output_fs = decim_1_input_fs / decim_1.decimation_factor();                 // wfmam,  decim_1.decimation_factor() = /8 ,if applied after the line, decim_1.set<dsp::decimate::FIRC16xR16x16Decim2>().configure(message.decim_1_filter.taps);
+    size_t demod_input_fs = decim_1_output_fs;
+
+    spectrum_interval_samples = decim_1_output_fs / spectrum_rate_hz;
+    spectrum_samples = 0;
+
    channel_filter_low_f = message.decim_1_filter.low_frequency_normalized * decim_1_input_fs;
    channel_filter_high_f = message.decim_1_filter.high_frequency_normalized * decim_1_input_fs;
    channel_filter_transition = message.decim_1_filter.transition_normalized * decim_1_input_fs;
@@ -35,6 +35,46 @@
 #include "audio_output.hpp"
 #include "spectrum_collector.hpp"

+#include <array>
+#include <memory>
+#include <tuple>
+#include <variant>
+
+template <typename... Args>
+class MultiDecimator {
+   public:
+    /* Dispatches to the underlying type's execute. */
+    template <typename Source, typename Destination>
+    Destination execute(
+        const Source& src,
+        const Destination& dst) {
+        return std::visit(
+            [&src, &dst](auto&& arg) -> Destination {
+                return arg.execute(src, dst);
+            },
+            decimator_);
+    }
+
+    size_t decimation_factor() const {
+        return std::visit(
+            [](auto&& arg) -> size_t {
+                return arg.decimation_factor;
+            },
+            decimator_);
+    }
+
+    /* Sets this decimator to a new instance of the specified decimator type.
+     * NB: The instance is returned by-ref so 'configure' can easily be called. */
+    template <typename Decimator>
+    Decimator& set() {
+        decimator_ = Decimator{};
+        return std::get<Decimator>(decimator_);
+    }
+
+   private:
+    std::variant<Args...> decimator_{};
+};
+
 class WidebandFMAudio : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
@@ -59,7 +99,16 @@ class WidebandFMAudio : public BasebandProcessor {
        complex_audio.size()};

    dsp::decimate::FIRC8xR16x24FS4Decim4 decim_0{};
-    dsp::decimate::FIRC16xR16x16Decim2 decim_1{};
+    // dsp::decimate::FIRC16xR16x16Decim2 decim_1{};   //original condition , before adding wfmam
+
+    // decim_1 will handle different types of FIR filters depending on selection.
+    MultiDecimator<
+        dsp::decimate::FIRC16xR16x16Decim2,
+        dsp::decimate::FIRC16xR16x32Decim8>
+        decim_1{};
+
+    // dsp::decimate::FIRC16xR16x32Decim8 decim_1{}; // For FMAM
+
    int32_t channel_filter_low_f = 0;
    int32_t channel_filter_high_f = 0;
    int32_t channel_filter_transition = 0;
@@ -94,7 +143,8 @@ class WidebandFMAudio : public BasebandProcessor {
    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
    RSSIThread rssi_thread{};

-    void configure(const WFMConfigureMessage& message);
+    void configure_wfm(const WFMConfigureMessage& message);
+    void configure_wfmam(const WFMAMConfigureMessage& message);
    void capture_config(const CaptureConfigMessage& message);
    void post_message(const buffer_c16_t& data);
 };
@@ -1325,6 +1325,128 @@ constexpr fir_taps_real<16> taps_40k_wfm_decim_1 = {
    }},
 };

+// WFMAM decimation filters  ////////////////////////////////////////////////
+// Used for NOAA 137 Mhz APT sat demod.
+// IFIR prototype filter: fs=768000, pass=42000, stop=95000, decim=8, fout=96000
+constexpr fir_taps_real<32> taps_84k_wfmam_decim_1 = {
+    .low_frequency_normalized = -42000.0f / 768000.0f,
+    .high_frequency_normalized = 42000.0f / 768000.0f,
+    .transition_normalized = 53000.0f / 768000.0f,
+    .taps = {{
+        13,
+        -6,
+        -47,
+        -116,
+        -207,
+        -294,
+        -332,
+        -266,
+        -39,
+        386,
+        1012,
+        1795,
+        2648,
+        3452,
+        4079,
+        4423,
+        4423,
+        4079,
+        3452,
+        2648,
+        1795,
+        1012,
+        386,
+        -39,
+        -266,
+        -332,
+        -294,
+        -207,
+        -116,
+        -47,
+        -6,
+        13,
+    }},
+};
+
+/* 1st Wideband FM demod baseband filter of audio AM tones ,
+   to pass all DSB band of  AM  fsubcarrier 2.4Khz mod. with APT */
+/* 24kHz int16_t input
+ * -> FIR filter, <4.5kHz (0.1875fs) pass, >5.2kHz (0.2166fs) stop
+ * -> 12kHz int16_t output, gain of 1.0 (I think).
+ * sum(abs(taps)): 125152         , before <125270>, very similar.
+ */
+constexpr fir_taps_real<64> taps_64_lp_1875_2166{
+    .low_frequency_normalized = -0.1875f,
+    .high_frequency_normalized = 0.1875f,
+    .transition_normalized = 0.03f,
+    .taps = {{
+        38,
+        -21,
+        -51,
+        -9,
+        77,
+        82,
+        -50,
+        -168,
+        -67,
+        190,
+        253,
+        -61,
+        -403,
+        -243,
+        356,
+        616,
+        15,
+        -814,
+        -671,
+        550,
+        1335,
+        334,
+        -1527,
+        -1689,
+        725,
+        2978,
+        1455,
+        -3277,
+        -5361,
+        830,
+        13781,
+        24549,
+        24549,
+        13781,
+        830,
+        -5361,
+        -3277,
+        1455,
+        2978,
+        725,
+        -1689,
+        -1527,
+        334,
+        1335,
+        550,
+        -671,
+        -814,
+        15,
+        616,
+        356,
+        -243,
+        -403,
+        -61,
+        253,
+        190,
+        -67,
+        -168,
+        -50,
+        82,
+        77,
+        -9,
+        -51,
+        -21,
+        38,
+    }},
+};
+
 // TPMS decimation filters ////////////////////////////////////////////////

 // IFIR image-reject filter: fs=2457600, pass=100000, stop=407200, decim=4, fout=614400
@@ -56,8 +56,8 @@ constexpr iir_biquad_config_t audio_12k_hpf_300hz_config{
    {1.00000000f, -1.77863178f, 0.80080265f}};

 // scipy.signal.butter(2, 1500 / 6000.0, 'low', analog=False)
-constexpr iir_biquad_config_t audio_12k_lpf_1500hz_config{
-    // Added to lpf the audio in wefax mode , before sending to SD card or spk.
+constexpr iir_biquad_config_t apt_audio_12k_lpf_1500hz_config{
+    // Added to lpf the apt audio in wefax mode , before sending to SD card or spk.
    {0.09763107f, 0.19526215f, 0.09763107f},
    {1.00000000f, -0.94280904f, 0.33333333f}};

@@ -108,4 +108,15 @@ constexpr iir_biquad_config_t audio_48k_deemph_2122_6_config{
    {0.12264116f, 0.12264116f, 0.00000000f},
    {1.00000000f, -0.75471767f, 0.00000000f}};

+// scipy.signal.iirnotch(f0, Q, fs) = signal.iirnotch(2400, 15, 12000)
+constexpr iir_biquad_config_t apt_audio_12k_notch_2k4_config{
+    {0.95977357f, -0.59317269f, 0.95977357f},
+    {1.00000000f, -0.59317269f, 0.91954714f}};
+
+// scipy.signal.butter(2, 2000 / 6000.0, 'low', analog=False)
+constexpr iir_biquad_config_t apt_audio_12k_lpf_2000hz_config{
+    // Added to lpf the apt audio in NOAA mode , before sending to SD card or spk.
+    {0.15505103f, 0.31010205f, 0.15505103f},
+    {1.00000000f, -0.6202041f, 0.24040821f}};
+
 #endif /*__DSP_IIR_CONFIG_H__*/
@@ -33,6 +33,8 @@ using namespace portapack;

 #include "file.hpp"

+#include "portapack_persistent_memory.hpp"
+
 #include <complex>

 #include <cstring>
@@ -143,7 +145,13 @@ void lcd_init() {
    // REV = 1 (normally white)
    // NL = 0b100111 (default)
    // PCDIV = 0b000000 (default?)
-    io.lcd_data_write_command_and_data(0xB6, {0x0A, 0xA2, 0x27, 0x00});
+
+    /*as per the datasheet chapter 8.3.7, addr B6h,
+    data "REV" bit, liquid crystal type:*/
+    if (portapack::persistent_memory::config_lcd_normally_black())
+        io.lcd_data_write_command_and_data(0xB6, {0x0A, 0x22, 0x27, 0x00});  // IPS : normally black : 0
+    else
+        io.lcd_data_write_command_and_data(0xB6, {0x0A, 0xA2, 0x27, 0x00});  // TFT : normally white : 1

    // Power Control 1
    // VRH[5:0]
@@ -309,14 +317,6 @@ void ILI9341::wake() {
    lcd_wake();
 }

-void ILI9341::set_inverted(bool invert) {
-    if (invert) {
-        io.lcd_data_write_command_and_data(0x21, {});
-    } else {
-        io.lcd_data_write_command_and_data(0x20, {});
-    }
-}
-
 void ILI9341::fill_rectangle(ui::Rect r, const ui::Color c) {
    const auto r_clipped = r.intersect(screen_rect());
    if (!r_clipped.is_empty()) {
@@ -50,8 +50,6 @@ class ILI9341 {
    void sleep();
    void wake();

-    void set_inverted(bool invert);
-
    void fill_rectangle(ui::Rect r, const ui::Color c);
    void fill_rectangle_unrolled8(ui::Rect r, const ui::Color c);
    void draw_line(const ui::Point start, const ui::Point end, const ui::Color color);
@@ -130,7 +130,7 @@ class Message {
        WeFaxRxConfigure = 73,
        WeFaxRxStatusData = 74,
        WeFaxRxImageData = 75,
-
+        WFMAMConfigure = 76,
        MAX
    };

@@ -584,6 +584,32 @@ class WFMConfigureMessage : public Message {
    const iir_biquad_config_t audio_deemph_config;
 };

+class WFMAMConfigureMessage : public Message {
+   public:
+    constexpr WFMAMConfigureMessage(
+        const fir_taps_real<24> decim_0_filter,
+        const fir_taps_real<32> decim_1_filter,
+        const fir_taps_real<64> audio_filter,
+        const size_t deviation,
+        const iir_biquad_config_t audio_hpf_config,
+        const iir_biquad_config_t audio_deemph_config)
+        : Message{ID::WFMAMConfigure},
+          decim_0_filter(decim_0_filter),
+          decim_1_filter(decim_1_filter),
+          audio_filter(audio_filter),
+          deviation{deviation},
+          audio_hpf_config(audio_hpf_config),
+          audio_deemph_config(audio_deemph_config) {
+    }
+
+    const fir_taps_real<24> decim_0_filter;
+    const fir_taps_real<32> decim_1_filter;
+    const fir_taps_real<64> audio_filter;
+    const size_t deviation;
+    const iir_biquad_config_t audio_hpf_config;
+    const iir_biquad_config_t audio_deemph_config;
+};
+
 class AMConfigureMessage : public Message {
   public:
    enum class Modulation : int32_t {
@@ -78,11 +78,11 @@ void IO::reference_oscillator(const bool enable) {
 }

 bool IO::get_dark_cover() {
-    return portapack::persistent_memory::apply_fake_brightness() & (!portapack::persistent_memory::config_lcd_inverted_mode());
+    return portapack::persistent_memory::apply_fake_brightness();
 }

-bool IO::get_is_inverted() {
-    return portapack::persistent_memory::config_lcd_inverted_mode();
+bool IO::get_is_normally_black() {
+    return portapack::persistent_memory::config_lcd_normally_black();
 }

 uint8_t IO::get_brightness() {
@@ -90,7 +90,7 @@ uint8_t IO::get_brightness() {
 }

 void IO::update_cached_values() {
-    inverted_enabled = get_is_inverted();
+    lcd_normally_black = get_is_normally_black();
    dark_cover_enabled = get_dark_cover();
    brightness = get_brightness();
 }
@@ -231,10 +231,10 @@ class IO {

        return switches_raw;
    }
-    bool inverted_enabled = false;
+    bool lcd_normally_black = false;
    bool dark_cover_enabled = false;
    uint8_t brightness = 0;
-    bool get_is_inverted();
+    bool get_is_normally_black();
    bool get_dark_cover();
    uint8_t get_brightness();
    void update_cached_values();
@@ -419,7 +419,7 @@ class IO {
        const auto value_low = data_read();
        uint32_t original_value = (value_high << 8) | value_low;

-        if (inverted_enabled) return original_value;
+        if (lcd_normally_black) return original_value;

        if (dark_cover_enabled) {
            // this is read data, so if the fake brightness is enabled AKA get_dark_cover() == true,
@@ -211,7 +211,7 @@ struct data_t {
    bool updown_converter;
    bool updown_frequency_rx_correction;
    bool updown_frequency_tx_correction;
-    bool lcd_inverted_mode : 1;
+    bool lcd_normally_black : 1;
    bool encoder_dial_direction : 1;  // false = normal, true = reverse
    bool UNUSED_6 : 1;
    bool UNUSED_7 : 1;
@@ -289,7 +289,7 @@ struct data_t {
          updown_converter(false),
          updown_frequency_rx_correction(false),
          updown_frequency_tx_correction(false),
-          lcd_inverted_mode(false),
+          lcd_normally_black(false),
          encoder_dial_direction(false),
          UNUSED_6(false),
          UNUSED_7(false),
@@ -1090,12 +1090,12 @@ void set_config_freq_rx_correction(uint32_t v) {
    data->frequency_rx_correction = v;
 }

-// LCD invert
-bool config_lcd_inverted_mode() {
-    return data->lcd_inverted_mode;
+// IPS vs TFT
+bool config_lcd_normally_black() {
+    return data->lcd_normally_black;
 }
-void set_lcd_inverted_mode(bool v) {
-    data->lcd_inverted_mode = v;
+void set_lcd_normally_black(bool v) {
+    data->lcd_normally_black = v;
 }

 // Rotary encoder dial settings
@@ -1164,7 +1164,6 @@ void set_fake_brightness_level(uint8_t v) {
 // Cycle through 4 brightness options: disabled -> enabled/50% -> enabled/25% -> enabled/12.5% -> disabled
 void toggle_fake_brightness_level() {
    bool fbe = apply_fake_brightness();
-    if (config_lcd_inverted_mode()) return;  // for now only inverted mode OR fake brightness
    if ((!fbe) || (data->fake_brightness_level >= BRIGHTNESS_12p5)) {
        set_apply_fake_brightness(!fbe);
        data->fake_brightness_level = BRIGHTNESS_50;
@@ -249,8 +249,8 @@ void set_config_audio_mute(bool v);
 void set_config_speaker_disable(bool v);
 void set_config_backlight_timer(const backlight_config_t& new_value);
 void set_disable_touchscreen(bool v);
-bool config_lcd_inverted_mode();
-void set_lcd_inverted_mode(bool v);
+bool config_lcd_normally_black();
+void set_lcd_normally_black(bool v);

 uint8_t encoder_dial_sensitivity();
 void set_encoder_dial_sensitivity(uint8_t v);
@@ -73,7 +73,8 @@ enum app_location_t : uint32_t {
    DEBUG,
    HOME,
    SETTINGS,
-    GAMES
+    GAMES,
+    TRX
 };

 struct standalone_application_information_t {
@@ -98,12 +98,12 @@ f.write("/*\n"
 	"#include \"ui.hpp\"\n\n"
 	"namespace ui {\n\n")

-for file in listdir(graphics_path):
+for file in sorted(listdir(graphics_path)):
    if file.endswith(".png") and path.isfile(graphics_path + file):
        convert_png(graphics_path + file)
        count += 1

 f.write("} /* namespace ui */\n\n")
-f.write("#endif/*__BITMAP_HPP__*/\n")
+f.write("#endif /*__BITMAP_HPP__*/\n")

 print(("Converted " + str(count) + " files"))
@@ -0,0 +1,14 @@
+# 0% black
+0,0,0,0
+
+# 25% blue
+64,0,0,255
+
+# 50% magenta
+128,255,0,255
+
+# 75% green
+192,0,255,0
+
+# 100% white
+255,255,255,255
@@ -0,0 +1,12 @@
+#lines are index,r,g,b
+#if index 0 is not set, it's starting at 0,0,0,0
+#all values are ranging from 0 to 255
+
+#pure blue
+86,0,0,255
+
+#bright green
+171,0,255,0
+
+#pure red 
+255,255,0,0
@@ -0,0 +1,11 @@
+# 0% black
+0,0,0,0
+
+# 33% red
+84,255,0,0
+
+# 66% yellow
+168,255,255,0
+
+# 100% white
+255,255,255,255
@@ -0,0 +1,8 @@
+# 0% black
+0,0,0,0
+
+# 50% green
+128,0,255,0
+
+# 100% white
+255,255,255,255
@@ -0,0 +1,14 @@
+# 0% black
+0,0,0,0
+
+# 25% blue
+64,0,0,255
+
+# 50% red
+128,255,0,0
+
+# 75% yellow
+192,255,255,0
+
+# 100% white
+255,255,255,255
Author	SHA1	Message	Date
gullradriel	d4342e01a4	going back to WFM as main baseband in main.cpp as NFM is now making the apps crashing. Looks like last additions to WFM made it bigger. (#2646 )	2025-05-06 16:50:59 +08:00
Brumi-2021	4342f5c0ee	Adding_WFM_AM_mode_to_Audio_App (#2644 ) * Adding_WFM_AM_mode_to_Audio_App * more precise values for cos and sin theta, fix sen_theta to sin_theta * fix sen_theta to sin_theta	2025-05-05 17:48:01 +02:00
Richard	bd781ce37b	Fix for #2538 (#2635 ) * Fix for #2538 Fix for #2538 Added on_bandwidth_changed Callback to ui_transmitter.hpp Modified the field_bw.on_change lambda in the TransmitterView constructor to trigger the on_bandwidth_changed callback Connected the Callback in ui_siggen.cpp I am not a C++ programmer so this change was proposed by Gemini AI. I have built and tested the App and it works as expected and I don't think the change will have any unexpected side effects. * Fix clang issues Fix clang issues * Update ui_transmitter.cpp typo * Revised change The proposed change mirrors the way a change to the frequency (on_edit_frequency) is triggered in ui_siggen by the tx_view. The bw parameter is not passed because it is stored in _setting in the tx_view and will be read by update_config. A change to the bw is not checked against auto_update to keep its behaviour consistent with a change to the gain, amplitude or frequency. * Make changes to the channel_bandwidth dynamic whist playing Behaviour of channel bandwidth is now consistent with frequency, amp and gain. * comment edit * revert hackrf submodule checkpoint to the repo * comment --------- Co-authored-by: zxkmm <zxkmm@hotmail.com>	2025-05-02 04:19:41 +00:00
Erwin Ried	c2e05dea48	Update README.md Links were dead for opensourcesdrlab	2025-04-25 13:01:54 +02:00
sommermorgentraum	de3212cba5	spectrum cursor opt again (#2634 ) * spectrum cursor opt * fmt * remove blink * remove End event * cleanup	2025-04-22 21:14:31 +08:00
sommermorgentraum	9aff3f4121	Fix bug that created by PR "Added menu group for transceivers" (#2630 )	2025-04-17 07:42:05 +02:00
sommermorgentraum	6b6a00d511	Support IPS screen & brightness set for IPS screen (#2629 ) * _ * format * format * format	2025-04-17 07:40:28 +02:00
Oleg Belousov	806219f46e	Added menu group for transceivers (#2623 ) * Added menu group for transceivers * Reorder apps icons	2025-04-15 16:46:49 +08:00
Luca	a153cbf30b	Adding 8.33KHz spacing (#2628 ) * Adding 8.33KHz spacing * remove extern options_db_t freqman_steps which is now brought by ui_receiver.hpp * use freqman db steps instead of static array Co-authored-by: gullradriel <gullradriel@no-mail.com>	2025-04-14 18:59:50 +00:00
sommermorgentraum	584af02dba	Touch on waterfall to set cursor pos (#2624 ) * init * fix typo that found by Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-04-14 20:47:41 +02:00
gullradriel	f344a1ca40	fix comments (#2622 )	2025-04-11 11:48:07 +00:00
gullradriel	511675c9a1	Fix default waterfall file (#2621 ) * correct default settings from file * correct colors names	2025-04-11 19:30:18 +08:00
haruk	7bbd608c90	Delete dead code in ble_rx_app.cpp (#2620 ) Duplicate include on line 24 removed.	2025-04-11 10:49:09 +00:00
Oleg Belousov	f941ae871a	Custom waterfall colors (#2617 ) * Custom waterfall gradient * Installing a custom waterfall gradient via fileman * default file for user friendly swap Co-authored-by: gullradriel <gullradriel@no-mail.com>	2025-04-11 10:46:04 +00:00
RocketGod	eff214cc79	Enhance Graphic Equalizer Visualization with Improved Frequency Bands and Response (#2614 )	2025-04-10 22:16:18 +02:00
Oleg Belousov	319ed3e7b4	Improved make_bitmap tool (#2615 )	2025-04-10 12:21:19 +08:00
RocketGod	288f6bd517	GFX EQ App (#2607 ) * Make the beginnings of rf3d * Name change... * Add mood button * Remove forced amp settings and add persistent user settings * Fix options bar layout and SettingsManager * Make the background paint to black again after opening fq modal * fix audio/mod/settings and cleaned unneeded parts * Mapped bars to audio spectrum * Improved frequency response... still needs work i think * add on_freqchg to be able to answer to serial frequency change command * Made calculations for 14 bars to fit screen and little adjustments * Visual improvements Co-authored-by: gullradriel	2025-04-09 14:27:51 +02:00