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
Fix for #2538 (#2635 )
2026-09-15 11:02:58 +00: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 · 2025-04-17 07:42:05 +02:00
43 changed files with 620 additions and 127 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).

@@ -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{
@@ -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;
@@ -45,7 +45,7 @@ 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_bandwidths[6];
 // extern options_db_t freqman_steps; // now included via ui_receiver.hpp
 extern options_db_t freqman_steps_short;

@@ -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();
@@ -4221,6 +4221,44 @@ static constexpr Bitmap bitmap_icon_tpms{
    {16, 16},
    bitmap_icon_tpms_data};

+static constexpr uint8_t bitmap_icon_tranceivers_data[] = {
+    0x80,
+    0x01,
+    0xC0,
+    0x03,
+    0xE0,
+    0x07,
+    0xB0,
+    0x0D,
+    0x98,
+    0x19,
+    0x80,
+    0x01,
+    0x80,
+    0x01,
+    0x80,
+    0x01,
+    0x98,
+    0x19,
+    0xB0,
+    0x0D,
+    0xE0,
+    0x07,
+    0xC0,
+    0x03,
+    0x83,
+    0xC1,
+    0x03,
+    0xC0,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+};
+static constexpr Bitmap bitmap_icon_tranceivers{
+    {16, 16},
+    bitmap_icon_tranceivers_data};
+
 static constexpr uint8_t bitmap_icon_transmit_data[] = {
    0x80,
    0x01,
@@ -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;
@@ -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
@@ -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.
    },
 };

@@ -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();
@@ -123,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() {
@@ -214,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();
 }

@@ -243,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;
        }
    }
@@ -259,11 +252,6 @@ bool FrequencyScale::on_touch(const TouchEvent touch) {
    return true;
 }

-void FrequencyScale::on_tick_second() {
-    set_dirty();
-    _blink = !_blink;
-}
-
 /* WaterfallWidget *********************************************************/
 // TODO: buffer and use "paint" instead of immediate drawing would help with
 // preventing flicker from drawing. Would use more RAM however.
@@ -91,9 +91,6 @@ class FrequencyScale : public Widget {
   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};
@@ -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 {
Author	SHA1	Message	Date
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