Stable v1.7.3 (#1224)

* Update past_version.txt

* Update version.txt

.github/workflows/past_version.txt

@@ -1 +1 @@
-v1.7.1
+v1.7.2

.github/workflows/version.txt

@@ -1 +1 @@
-v1.7.2
+v1.7.3

firmware/application/CMakeLists.txt

@@ -44,7 +44,7 @@ if(cpp20_supported)
 else()
 	set(USE_CPPOPT "-std=c++17")
 endif()
-set(USE_CPPOPT "${USE_CPPOPT} -flto -fno-rtti -fno-exceptions -Weffc++ -Wuninitialized -Wno-volatile")
+set(USE_CPPOPT "${USE_CPPOPT} -fno-rtti -fno-exceptions -Weffc++ -Wuninitialized -Wno-volatile")
 
 # Enable this if you want the linker to remove unused code and data
 set(USE_LINK_GC yes)

firmware/application/apps/analog_audio_app.cpp

@@ -404,22 +404,9 @@ void AnalogAudioView::update_modulation(ReceiverModel::Mode modulation) {
 }
 
 void AnalogAudioView::handle_coded_squelch(uint32_t value) {
-    float diff, min_diff = value;
-    size_t min_idx{0};
-    size_t c;
-
-    // Find nearest match
-    for (c = 0; c < tone_keys.size(); c++) {
-        diff = abs(((float)value / 100.0) - tone_keys[c].second);
-        if (diff < min_diff) {
-            min_idx = c;
-            min_diff = diff;
-        }
-    }
-
-    // Arbitrary confidence threshold
-    if (min_diff < 40)
-        text_ctcss.set("CTCSS " + tone_keys[min_idx].first);
+    tone_index idx = tone_key_index_by_value(value);
+    if (idx >= 0)
+        text_ctcss.set("CTCSS " + tone_key_string(idx));
     else
         text_ctcss.set("???");
 }

firmware/application/apps/analog_audio_app.hpp

@@ -213,7 +213,7 @@ class AnalogAudioView : public View {
         4096,
         4};
 
-    spectrum::WaterfallWidget waterfall{true};
+    spectrum::WaterfallView waterfall{true};
 
     void on_baseband_bandwidth_changed(uint32_t bandwidth_hz);
     void on_modulation_changed(ReceiverModel::Mode modulation);

firmware/application/apps/capture_app.cpp

@@ -60,41 +60,8 @@ CaptureAppView::CaptureAppView(NavigationView& nav)
         /* ex. recording 500kHz BW to .C16 file, base_rate clock 500kHz x2(I,Q) x 2 bytes (int signed) =2MB/sec rate SD Card  */
         waterfall.on_hide();
 
-        /* Set up proper anti aliasing BPF bandwith in MAX2837 before ADC sampling according to the new added BW Options . */
-        switch (sampling_rate) {  // we use the var fs (sampling_rate) , to set up BPF aprox < fs_max/2 by Nyquist theorem.
-
-            case 0 ... 2000000:                                  // BW Captured range  (0 <= 250kHz max )  fs = 8 x 250 kHz
-                anti_alias_baseband_bandwidth_filter = 1750000;  // Minimum BPF MAX2837 for all those lower BW options.
-                break;
-
-            case 4000000 ... 6000000:                            // BW capture  range (500k ... 750kHz max )  fs_max = 8 x 750kHz = 6Mhz
-                                                                 //  BW 500k ... 750kHz   ,  ex. 500kHz   (fs = 8*BW =  4Mhz) , BW 600kHz (fs = 4,8Mhz) , BW  750 kHz (fs = 6Mhz)
-                anti_alias_baseband_bandwidth_filter = 2500000;  // in some IC MAX2837 appear 2250000 , but both works similar.
-                break;
-
-            case 8800000:  // BW capture 1,1Mhz  fs = 8 x 1,1Mhz = 8,8Mhz . (1Mhz showed slightly higher noise background).
-                anti_alias_baseband_bandwidth_filter = 3500000;
-                break;
-
-            case 14000000:  // BW capture 1,75Mhz  , fs = 8 x 1,75Mhz = 14Mhz
-                            // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                anti_alias_baseband_bandwidth_filter = 5000000;
-                break;
-
-            case 16000000:  // BW capture 2Mhz  , fs = 8 x 2Mhz = 16Mhz
-                            // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                anti_alias_baseband_bandwidth_filter = 6000000;
-                break;
-
-            case 20000000:  // BW capture 2,5Mhz  , fs= 8 x 2,5 Mhz = 20Mhz
-                            // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                anti_alias_baseband_bandwidth_filter = 7000000;
-                break;
-
-            default:  // BW capture 2,75Mhz, fs = 8 x 2,75Mhz= 22Mhz max ADC sampling) and others.
-                      //  We tested also 9Mhz FPB stightly too much noise floor, better 8Mhz
-                anti_alias_baseband_bandwidth_filter = 8000000;
-        }
+        /* Set up proper anti aliasing BPF bandwith in MAX2837 before ADC sampling according to the new added BW Options. */
+        auto anti_alias_baseband_bandwidth_filter = filter_bandwidth_for_sampling_rate(sampling_rate);
 
         record_view.set_sampling_rate(sampling_rate);
         receiver_model.set_sampling_rate(sampling_rate);

firmware/application/apps/capture_app.hpp

@@ -56,7 +56,6 @@ class CaptureAppView : public View {
         app_settings::Options::UseGlobalTargetFrequency};
 
     uint32_t sampling_rate = 0;
-    uint32_t anti_alias_baseband_bandwidth_filter = 2500000;
 
     Labels labels{
         {{0 * 8, 1 * 16}, "Rate:", Color::light_grey()},
@@ -97,7 +96,7 @@ class CaptureAppView : public View {
         16384,
         3};
 
-    spectrum::WaterfallWidget waterfall{};
+    spectrum::WaterfallView waterfall{};
 };
 
 } /* namespace ui */

firmware/application/apps/gps_sim_app.hpp

@@ -124,7 +124,7 @@ class GpsSimAppView : public View {
         Color::green(),
         Color::black()};
 
-    spectrum::WaterfallWidget waterfall{};
+    spectrum::WaterfallView waterfall{};
 
     MessageHandlerRegistration message_handler_replay_thread_error{
         Message::ID::ReplayThreadDone,

firmware/application/apps/replay_app.hpp

@@ -121,7 +121,7 @@ class ReplayAppView : public View {
         Color::green(),
         Color::black()};
 
-    spectrum::WaterfallWidget waterfall{};
+    spectrum::WaterfallView waterfall{};
 
     MessageHandlerRegistration message_handler_replay_thread_error{
         Message::ID::ReplayThreadDone,

firmware/application/apps/spectrum_analysis_app.hpp

@@ -32,7 +32,7 @@ class SpectrumAnalysisModel {
 
 namespace ui {
 
-class SpectrumAnalysisView : public spectrum::WaterfallWidget {
+class SpectrumAnalysisView : public spectrum::WaterfallView {
    public:
    private:
     SpectrumAnalysisModel model;

firmware/application/apps/ui_level.cpp

@@ -205,34 +205,7 @@ size_t LevelView::change_mode(freqman_index_t new_mod) {
             receiver_model.set_modulation(ReceiverModel::Mode::Capture);
             field_bw.set_by_value(0);
             field_bw.on_change = [this](size_t, OptionsField::value_t sampling_rate) {
-                uint32_t anti_alias_baseband_bandwidth_filter = 2500000;
-                switch (sampling_rate) {                                 // we use the var fs (sampling_rate) , to set up BPF aprox < fs_max/2 by Nyquist theorem.
-                    case 0 ... 2000000:                                  // BW Captured range  (0 <= 250kHz max )  fs = 8 x 250 kHz
-                        anti_alias_baseband_bandwidth_filter = 1750000;  // Minimum BPF MAX2837 for all those lower BW options.
-                        break;
-                    case 4000000 ... 6000000:                            // BW capture  range (500k ... 750kHz max )  fs_max = 8 x 750kHz = 6Mhz
-                                                                         // BW 500k ... 750kHz   ,  ex. 500kHz   (fs = 8*BW =  4Mhz) , BW 600kHz (fs = 4,8Mhz) , BW  750 kHz (fs = 6Mhz)
-                        anti_alias_baseband_bandwidth_filter = 2500000;  // in some IC MAX2837 appear 2250000 , but both works similar.
-                        break;
-                    case 8800000:  // BW capture 1,1Mhz  fs = 8 x 1,1Mhz = 8,8Mhz . (1Mhz showed slightly higher noise background).
-                        anti_alias_baseband_bandwidth_filter = 3500000;
-                        break;
-                    case 14000000:  // BW capture 1,75Mhz  , fs = 8 x 1,75Mhz = 14Mhz
-                                    // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                        anti_alias_baseband_bandwidth_filter = 5000000;
-                        break;
-                    case 16000000:  // BW capture 2Mhz  , fs = 8 x 2Mhz = 16Mhz
-                                    // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                        anti_alias_baseband_bandwidth_filter = 6000000;
-                        break;
-                    case 20000000:  // BW capture 2,5Mhz  , fs= 8 x 2,5 Mhz = 20Mhz
-                                    // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                        anti_alias_baseband_bandwidth_filter = 7000000;
-                        break;
-                    default:  // BW capture 2,75Mhz, fs = 8 x 2,75Mhz= 22Mhz max ADC sampling) and others.
-                              //  We tested also 9Mhz FPB stightly too much noise floor, better 8Mhz
-                        anti_alias_baseband_bandwidth_filter = 8000000;
-                }
+                auto anti_alias_baseband_bandwidth_filter = filter_bandwidth_for_sampling_rate(sampling_rate);
                 receiver_model.set_sampling_rate(sampling_rate);
                 receiver_model.set_baseband_bandwidth(anti_alias_baseband_bandwidth_filter);
             };
@@ -243,34 +216,23 @@ size_t LevelView::change_mode(freqman_index_t new_mod) {
 }
 
 void LevelView::handle_coded_squelch(const uint32_t value) {
-    static int32_t last_idx = -1;
+    static tone_index last_squelch_index = -1;
 
-    float diff, min_diff = value;
-    size_t min_idx{0};
-    size_t c;
+    if (field_mode.selected_index() == NFM_MODULATION) {
+        tone_index idx = tone_key_index_by_value(value);
 
-    if (field_mode.selected_index() != NFM_MODULATION) {
-        text_ctcss.set("             ");
-        return;
-    }
-
-    // Find nearest match
-    for (c = 0; c < tone_keys.size(); c++) {
-        diff = abs(((float)value / 100.0) - tone_keys[c].second);
-        if (diff < min_diff) {
-            min_idx = c;
-            min_diff = diff;
+        if ((last_squelch_index < 0) || (last_squelch_index != idx)) {
+            last_squelch_index = idx;
+            if (idx >= 0) {
+                text_ctcss.set("T: " + tone_key_string(idx));
+                return;
+            }
+        } else {
+            return;
         }
     }
 
-    // Arbitrary confidence threshold
-    if (last_idx < 0 || (unsigned)last_idx != min_idx) {
-        last_idx = min_idx;
-        if (min_diff < 40)
-            text_ctcss.set("T: " + tone_keys[min_idx].first);
-        else
-            text_ctcss.set("             ");
-    }
+    text_ctcss.set("             ");
 }
 
 } /* namespace ui */

firmware/application/apps/ui_playlist.hpp

@@ -188,7 +188,7 @@ class PlaylistView : public View {
         &bitmap_icon_save,
         Color::dark_blue()};
 
-    spectrum::WaterfallWidget waterfall{};
+    spectrum::WaterfallView waterfall{};
 
     MessageHandlerRegistration message_handler_replay_thread_error{
         Message::ID::ReplayThreadDone,

firmware/application/apps/ui_recon.cpp

@@ -1399,34 +1399,7 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
             receiver_model.set_modulation(ReceiverModel::Mode::Capture);
             field_bw.set_by_value(0);
             field_bw.on_change = [this](size_t, OptionsField::value_t sampling_rate) {
-                uint32_t anti_alias_baseband_bandwidth_filter = 2500000;
-                switch (sampling_rate) {                                 // we use the var fs (sampling_rate) , to set up BPF aprox < fs_max/2 by Nyquist theorem.
-                    case 0 ... 2000000:                                  // BW Captured range  (0 <= 250kHz max )  fs = 8 x 250 kHz
-                        anti_alias_baseband_bandwidth_filter = 1750000;  // Minimum BPF MAX2837 for all those lower BW options.
-                        break;
-                    case 4000000 ... 6000000:                            // BW capture  range (500k ... 750kHz max )  fs_max = 8 x 750kHz = 6Mhz
-                                                                         // BW 500k ... 750kHz   ,  ex. 500kHz   (fs = 8*BW =  4Mhz) , BW 600kHz (fs = 4,8Mhz) , BW  750 kHz (fs = 6Mhz)
-                        anti_alias_baseband_bandwidth_filter = 2500000;  // in some IC MAX2837 appear 2250000 , but both works similar.
-                        break;
-                    case 8800000:  // BW capture 1,1Mhz  fs = 8 x 1,1Mhz = 8,8Mhz . (1Mhz showed slightly higher noise background).
-                        anti_alias_baseband_bandwidth_filter = 3500000;
-                        break;
-                    case 14000000:  // BW capture 1,75Mhz  , fs = 8 x 1,75Mhz = 14Mhz
-                                    // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                        anti_alias_baseband_bandwidth_filter = 5000000;
-                        break;
-                    case 16000000:  // BW capture 2Mhz  , fs = 8 x 2Mhz = 16Mhz
-                                    // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                        anti_alias_baseband_bandwidth_filter = 6000000;
-                        break;
-                    case 20000000:  // BW capture 2,5Mhz  , fs= 8 x 2,5 Mhz = 20Mhz
-                                    // good BPF, good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture
-                        anti_alias_baseband_bandwidth_filter = 7000000;
-                        break;
-                    default:  // BW capture 2,75Mhz, fs = 8 x 2,75Mhz= 22Mhz max ADC sampling) and others.
-                              //  We tested also 9Mhz FPB stightly too much noise floor, better 8Mhz
-                        anti_alias_baseband_bandwidth_filter = 8000000;
-                }
+                auto anti_alias_baseband_bandwidth_filter = filter_bandwidth_for_sampling_rate(sampling_rate);
                 record_view->set_sampling_rate(sampling_rate);
                 receiver_model.set_sampling_rate(sampling_rate);
                 receiver_model.set_baseband_bandwidth(anti_alias_baseband_bandwidth_filter);
@@ -1453,32 +1426,20 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
 }
 
 void ReconView::handle_coded_squelch(const uint32_t value) {
-    float diff{0.0};
-    float min_diff{(float)value};
-    size_t min_idx{0};
-    size_t c{0};
+    if (field_mode.selected_index() == NFM_MODULATION) {
+        tone_index idx = tone_key_index_by_value(value);
 
-    if (field_mode.selected_index() != NFM_MODULATION) {
-        text_ctcss.set("        ");
-        return;
-    }
-
-    // Find nearest match
-    for (c = 0; c < tone_keys.size(); c++) {
-        diff = abs(((float)value / 100.0) - tone_keys[c].second);
-        if (diff < min_diff) {
-            min_idx = c;
-            min_diff = diff;
+        if ((last_squelch_index < 0) || (last_squelch_index != idx)) {
+            last_squelch_index = idx;
+            if (idx >= 0) {
+                text_ctcss.set("T: " + tone_key_string(idx));
+                return;
+            }
+        } else {
+            return;
         }
     }
-
-    // Arbitrary confidence threshold
-    if (last_squelch_index < 0 || (unsigned)last_squelch_index != min_idx) {
-        last_squelch_index = min_idx;
-        if (min_diff < 40)
-            text_ctcss.set("T: " + tone_keys[min_idx].first);
-        else
-            text_ctcss.set("        ");
-    }
+    text_ctcss.set("        ");
 }
+
 } /* namespace ui */

firmware/application/apps/ui_recon.hpp

@@ -139,7 +139,7 @@ class ReconView : public View {
     int8_t last_rssi_med{-127};
     int8_t last_rssi_max{-127};
     int32_t last_index{-1};
-    int32_t last_squelch_index{-1};
+    tone_index last_squelch_index{-1};
     int64_t last_freq{0};
     std::string freq_file_path{};
     systime_t chrono_start{};

firmware/application/apps/ui_text_editor.hpp

@@ -161,7 +161,7 @@ class TextEditorMenu : public View {
         {15 * 8, 1 * 8, 7 * 8, 7 * 8},
         "Zoom",
         &bitmap_icon_search,
-        Color::dark_green()};
+        Color::orange()};
 
     NewButton button_delline{
         {1 * 8, 8 * 8, 7 * 8, 7 * 8},

firmware/application/tone_key.cpp

@@ -73,9 +73,9 @@ const tone_key_t tone_keys = {
     {"34 M3", 218.100},
     {"35 M4", 225.700},
     {"49 9Z", 229.100},
-    {"36 --", 233.600},
-    {"37 --", 241.800},
-    {"38 --", 250.300},
+    {"36 M5", 233.600},
+    {"37 M6", 241.800},
+    {"38 M7", 250.300},
     {"50 0Z", 254.100},
     {"Axient 28kHz", 28000.0},
     {"Senn. 32.768k", 32768.0},
@@ -113,6 +113,36 @@ std::string tone_key_string(tone_index index) {
     return tone_keys[index].first;
 }
 
+std::string tone_key_string_by_value(uint32_t value) {
+    return tone_key_string(tone_key_index_by_value(value));
+}
+
+tone_index tone_key_index_by_value(uint32_t value) {
+    float diff;
+    float min_diff{(float)value};
+    float fvalue{(float)((min_diff + 50.0) / 100.0)};
+    tone_index min_idx{-1};
+    tone_index idx;
+
+    // Find nearest match
+    for (idx = 0; idx < (tone_index)tone_keys.size(); idx++) {
+        diff = abs(fvalue - tone_keys[idx].second);
+        if (diff < min_diff) {
+            min_idx = idx;
+            min_diff = diff;
+        } else {
+            // list is sorted in frequency order; if diff is getting larger than we've passed it
+            break;
+        }
+    }
+
+    // Arbitrary confidence threshold
+    if (min_diff < 40.0)
+        return min_idx;
+    else
+        return -1;
+}
+
 tone_index tone_key_index_by_string(char* str) {
     if (!str)
         return -1;
@@ -123,9 +153,4 @@ tone_index tone_key_index_by_string(char* str) {
     return -1;
 }
 
-/* tone_index tone_key_index_by_value( int32_t freq )
-{
-        return -1 ;
-} */
-
 }  // namespace tonekey

firmware/application/tone_key.hpp

@@ -30,7 +30,7 @@ using namespace ui;
 
 namespace tonekey {
 
-typedef int16_t tone_index;
+typedef int32_t tone_index;
 
 using tone_key_t = std::vector<std::pair<std::string, float>>;
 
@@ -40,8 +40,8 @@ void tone_keys_populate(OptionsField& field);
 float tone_key_frequency(const tone_index index);
 
 std::string tone_key_string(const tone_index index);
-tone_index tone_key_index_by_string(char* str);
-// tone_index tone_key_index_by_value( int32_t freq );
+std::string tone_key_string_by_value(uint32_t value);
+tone_index tone_key_index_by_value(uint32_t value);
 
 }  // namespace tonekey
 

firmware/application/ui/ui_alphanum.hpp

@@ -76,11 +76,11 @@ class AlphanumView : public TextEntryView {
         "0"};
 
     Button button_delete{
-        {10 * 8 - 2, 33 * 8, 4 * 8 + 2, 32},
+        {9 * 8, 33 * 8, 6 * 8, 32},
         "<DEL"};
 
     Button button_mode{
-        {16 * 8 - 2, 33 * 8, 4 * 8 + 2, 32},
+        {16 * 8, 33 * 8, 5 * 8, 32},
         ""};
 };
 

firmware/application/ui/ui_spectrum.cpp

@@ -36,7 +36,7 @@ using namespace portapack;
 namespace ui {
 namespace spectrum {
 
-/* AudioSpectrumView******************************************************/
+/* AudioSpectrumView ******************************************************/
 
 AudioSpectrumView::AudioSpectrumView(
     const Rect parent_rect)
@@ -247,28 +247,25 @@ void FrequencyScale::on_tick_second() {
     _blink = !_blink;
 }
 
-/* WaterfallView *********************************************************/
+/* WaterfallWidget *********************************************************/
+// TODO: buffer and use "paint" instead of immediate drawing would help with
+// preventing flicker from drawing. Would use more RAM however.
 
-void WaterfallView::on_show() {
+void WaterfallWidget::on_show() {
     clear();
 
     const auto screen_r = screen_rect();
     display.scroll_set_area(screen_r.top(), screen_r.bottom());
 }
 
-void WaterfallView::on_hide() {
+void WaterfallWidget::on_hide() {
     /* TODO: Clear region to eliminate brief flash of content at un-shifted
      * position?
      */
     display.scroll_disable();
 }
 
-void WaterfallView::paint(Painter& painter) {
-    // Do nothing.
-    (void)painter;
-}
-
-void WaterfallView::on_channel_spectrum(
+void WaterfallWidget::on_channel_spectrum(
     const ChannelSpectrum& spectrum) {
     /* TODO: static_assert that message.spectrum.db.size() >= pixel_row.size() */
 
@@ -290,16 +287,16 @@ void WaterfallView::on_channel_spectrum(
         pixel_row);
 }
 
-void WaterfallView::clear() {
+void WaterfallWidget::clear() {
     display.fill_rectangle(
         screen_rect(),
         Color::black());
 }
 
-/* WaterfallWidget *******************************************************/
+/* WaterfallView *******************************************************/
 
-WaterfallWidget::WaterfallWidget(const bool cursor) {
-    add_children({&waterfall_view,
+WaterfallView::WaterfallView(const bool cursor) {
+    add_children({&waterfall_widget,
                   &frequency_scale});
 
     frequency_scale.set_focusable(cursor);
@@ -310,17 +307,17 @@ WaterfallWidget::WaterfallWidget(const bool cursor) {
     };
 }
 
-void WaterfallWidget::on_show() {
+void WaterfallView::on_show() {
     // TODO: Assert that baseband is not shutdown.
     baseband::spectrum_streaming_start();
 }
 
-void WaterfallWidget::on_hide() {
+void WaterfallView::on_hide() {
     // TODO: Assert that baseband is not shutdown.
     baseband::spectrum_streaming_stop();
 }
 
-void WaterfallWidget::show_audio_spectrum_view(const bool show) {
+void WaterfallView::show_audio_spectrum_view(const bool show) {
     if ((audio_spectrum_view && show) || (!audio_spectrum_view && !show)) return;
 
     if (show) {
@@ -335,18 +332,18 @@ void WaterfallWidget::show_audio_spectrum_view(const bool show) {
     }
 }
 
-void WaterfallWidget::update_widgets_rect() {
+void WaterfallView::update_widgets_rect() {
     if (audio_spectrum_view) {
         frequency_scale.set_parent_rect({0, audio_spectrum_height, screen_rect().width(), scale_height});
-        waterfall_view.set_parent_rect(waterfall_reduced_rect);
+        waterfall_widget.set_parent_rect(waterfall_reduced_rect);
     } else {
         frequency_scale.set_parent_rect({0, 0, screen_rect().width(), scale_height});
-        waterfall_view.set_parent_rect(waterfall_normal_rect);
+        waterfall_widget.set_parent_rect(waterfall_normal_rect);
     }
-    waterfall_view.on_show();
+    waterfall_widget.on_show();
 }
 
-void WaterfallWidget::set_parent_rect(const Rect new_parent_rect) {
+void WaterfallView::set_parent_rect(const Rect new_parent_rect) {
     View::set_parent_rect(new_parent_rect);
 
     waterfall_normal_rect = {0, scale_height, new_parent_rect.width(), new_parent_rect.height() - scale_height};
@@ -355,13 +352,8 @@ void WaterfallWidget::set_parent_rect(const Rect new_parent_rect) {
     update_widgets_rect();
 }
 
-void WaterfallWidget::paint(Painter& painter) {
-    // TODO:
-    (void)painter;
-}
-
-void WaterfallWidget::on_channel_spectrum(const ChannelSpectrum& spectrum) {
-    waterfall_view.on_channel_spectrum(spectrum);
+void WaterfallView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
+    waterfall_widget.on_channel_spectrum(spectrum);
     sampling_rate = spectrum.sampling_rate;
     frequency_scale.set_spectrum_sampling_rate(sampling_rate);
     frequency_scale.set_channel_filter(
@@ -370,9 +362,40 @@ void WaterfallWidget::on_channel_spectrum(const ChannelSpectrum& spectrum) {
         spectrum.channel_filter_transition);
 }
 
-void WaterfallWidget::on_audio_spectrum() {
+void WaterfallView::on_audio_spectrum() {
     audio_spectrum_view->on_audio_spectrum(audio_spectrum_data);
 }
 
 } /* namespace spectrum */
+
+uint32_t filter_bandwidth_for_sampling_rate(int32_t sampling_rate) {
+    switch (sampling_rate) {  // Use the var fs (sampling_rate) to set up BPF aprox < fs_max / 2 by Nyquist theorem.
+        case 0 ... 2000000:   // BW Captured range (0 <= 250kHz max)  fs = 8 x 250 kHz.
+            return 1750000;   // Minimum BPF MAX2837 for all those lower BW options.
+
+        case 4000000 ... 6000000:  // BW capture range (500k...750kHz max)  fs_max = 8 x 750kHz = 6Mhz
+                                   // BW 500k...750kHz, ex. 500kHz (fs = 8 x BW = 4Mhz), BW 600kHz (fs = 4,8Mhz), BW 750 kHz (fs = 6Mhz).
+            return 2500000;        // In some IC, MAX2837 appears as 2250000, but both work similarly.
+
+        case 8800000:  // BW capture 1,1Mhz fs = 8 x 1,1Mhz = 8,8Mhz. (1Mhz showed slightly higher noise background).
+            return 3500000;
+
+        case 14000000:  // BW capture 1,75Mhz, fs = 8 x 1,75Mhz = 14Mhz
+                        // Good BPF, good matching, but LCD flickers, refresh rate should be < 20 Hz, reasonable picture.
+            return 5000000;
+
+        case 16000000:  // BW capture 2Mhz, fs = 8 x 2Mhz = 16Mhz
+                        // Good BPF, good matching, but LCD flickers, refresh rate should be < 20 Hz, reasonable picture.
+            return 6000000;
+
+        case 20000000:  // BW capture 2,5Mhz, fs = 8 x 2,5 Mhz = 20Mhz
+                        // Good BPF, good matching, but LCD flickers, refresh rate should be < 20 Hz, reasonable picture.
+            return 7000000;
+
+        default:  // BW capture 2,75Mhz, fs = 8 x 2,75Mhz = 22Mhz max ADC sampling and others.
+                  // We tested also 9Mhz FPB slightly too much noise floor, better at 8Mhz.
+            return 8000000;
+    }
+}
+
 } /* namespace ui */

firmware/application/ui/ui_spectrum.hpp

@@ -108,12 +108,11 @@ class FrequencyScale : public Widget {
  * If the baseband is shutdown or otherwise not running when interacting
  * with these, they will almost certainly hang the device. */
 
-class WaterfallView : public Widget {
+class WaterfallWidget : public Widget {
    public:
     void on_show() override;
     void on_hide() override;
-
-    void paint(Painter& painter) override;
+    void paint(Painter&) override {}
 
     void on_channel_spectrum(const ChannelSpectrum& spectrum);
 
@@ -121,16 +120,16 @@ class WaterfallView : public Widget {
     void clear();
 };
 
-class WaterfallWidget : public View {
+class WaterfallView : public View {
    public:
     std::function<void(int32_t offset)> on_select{};
 
-    WaterfallWidget(const bool cursor = false);
+    WaterfallView(const bool cursor = false);
 
-    WaterfallWidget(const WaterfallWidget&) = delete;
-    WaterfallWidget(WaterfallWidget&&) = delete;
-    WaterfallWidget& operator=(const WaterfallWidget&) = delete;
-    WaterfallWidget& operator=(WaterfallWidget&&) = delete;
+    WaterfallView(const WaterfallView&) = delete;
+    WaterfallView(WaterfallView&&) = delete;
+    WaterfallView& operator=(const WaterfallView&) = delete;
+    WaterfallView& operator=(WaterfallView&&) = delete;
 
     void on_show() override;
     void on_hide() override;
@@ -139,8 +138,6 @@ class WaterfallWidget : public View {
 
     void show_audio_spectrum_view(const bool show);
 
-    void paint(Painter& painter) override;
-
    private:
     void update_widgets_rect();
 
@@ -148,7 +145,7 @@ class WaterfallWidget : public View {
     static constexpr Dim audio_spectrum_height = 16 * 2 + 20;
     static constexpr Dim scale_height = 20;
 
-    WaterfallView waterfall_view{};
+    WaterfallWidget waterfall_widget{};
     FrequencyScale frequency_scale{};
 
     ChannelSpectrumFIFO* channel_fifo{nullptr};
@@ -195,6 +192,10 @@ class WaterfallWidget : public View {
 };
 
 } /* namespace spectrum */
+
+/* Calculates the best anti_alias_baseband_bandwidth_filter for the given sampling rate. */
+uint32_t filter_bandwidth_for_sampling_rate(int32_t sampling_rate);
+
 } /* namespace ui */
 
 #endif /*__UI_SPECTRUM_H__*/

firmware/baseband/CMakeLists.txt

@@ -44,7 +44,7 @@ if(cpp20_supported)
 else()
 	set(USE_CPPOPT "-std=c++17")
 endif()
-set(USE_CPPOPT "${USE_CPPOPT} -flto -fno-rtti -fno-exceptions -Weffc++ -Wuninitialized -Wno-volatile")
+set(USE_CPPOPT "${USE_CPPOPT} -fno-rtti -fno-exceptions -Weffc++ -Wuninitialized -Wno-volatile")
 
 # Enable this if you want the linker to remove unused code and data
 set(USE_LINK_GC yes)