Touch Test tweak & Scanner default squelch (#1295 )

* Leave nav bar visible at start & change seed * Change default Scanner squelch
Fix baseband thread init order bug for all procs. (#1293 )
2026-09-13 18:19:33 +00:00 · 2023-07-23 21:06:19 +02:00 · 2023-07-23 08:54:17 +02:00 · 2023-07-23 08:52:23 +02:00 · 2023-07-22 16:49:28 -05:00 · 2023-07-22 10:06:55 -07:00
70 changed files with 671 additions and 293 deletions
@@ -179,6 +179,7 @@ set(CPPSRC
 	file.cpp
 	freqman_db.cpp
 	freqman.cpp
+	io_convert.cpp
 	io_file.cpp
 	io_wave.cpp
 	irq_controls.cpp
@@ -31,7 +31,6 @@ namespace ui {

 CaptureAppView::CaptureAppView(NavigationView& nav)
    : nav_{nav} {
-    freqman_set_bandwidth_option(SPEC_MODULATION, option_bandwidth);
    baseband::run_image(portapack::spi_flash::image_tag_capture);

    add_children({
@@ -44,43 +43,40 @@ CaptureAppView::CaptureAppView(NavigationView& nav)
        &field_lna,
        &field_vga,
        &option_bandwidth,
+        &option_format,
        &record_view,
        &waterfall,
    });

-    /* THE ONE LINE BELOW IS A TEMPORARY KLUDGE WORKAROUND FOR A MYSTERY M4 BASEBAND HANG ISSUE WHEN THE CAPTURE
-       APP IS THE FIRST APP STARTED AFTER POWER-UP, OR THE CAPTURE APP IS RUN AFTER RUNNING REPLAY WITH A HIGH
-       SAMPLE RATE. IT SHOULD NOT BE NECESSARY SINCE sampling_rate IS ALREADY INITIALIZED BY RADIOSTATE BUT
-       APPARENTLY IS ADDING JUST THE RIGHT AMOUNT OF DELAY.  ISSUE DOES NOT AFFECT ALL PORTAPACK UNITS.
-       INVESTIGATION IS ONGOING, SEE ISSUE #1283. */
-    receiver_model.set_sampling_rate(3072000);
-    /* END MYSTERY HANG WORKAROUND. */
-
    field_frequency_step.set_by_value(receiver_model.frequency_step());
    field_frequency_step.on_change = [this](size_t, OptionsField::value_t v) {
        receiver_model.set_frequency_step(v);
-        this->field_frequency.set_step(v);
    };

+    option_format.set_selected_index(0);  // Default to C16
+    option_format.on_change = [this](size_t, uint32_t file_type) {
+        record_view.set_file_type((RecordView::FileType)file_type);
+    };
+
+    freqman_set_bandwidth_option(SPEC_MODULATION, option_bandwidth);
    option_bandwidth.on_change = [this](size_t, uint32_t base_rate) {
-        sampling_rate = 8 * base_rate;  // Decimation by 8 done on baseband side
-                                        /* base_rate is used for FFT calculation and display LCD, and also in recording writing SD Card rate. */
+        /* base_rate is used for FFT calculation and display LCD, and also in recording writing SD Card rate. */
        /* ex. sampling_rate values, 4Mhz, when recording 500 kHz (BW) and fs 8 Mhz, when selected 1 Mhz BW ... */
        /* 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();
+        auto sampling_rate = 8 * base_rate;  // Decimation by 8 done on baseband side.

        /* 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);

+        waterfall.stop();
        record_view.set_sampling_rate(sampling_rate);
        receiver_model.set_sampling_rate(sampling_rate);
        receiver_model.set_baseband_bandwidth(anti_alias_baseband_bandwidth_filter);
-
-        waterfall.on_show();
+        waterfall.start();
    };

-    option_bandwidth.set_selected_index(7);  // Preselected default option 500kHz.
    receiver_model.enable();
+    option_bandwidth.set_selected_index(7);  // Preselected default option 500kHz.

    record_view.on_error = [&nav](std::string message) {
        nav.display_modal("Error", message);
@@ -92,11 +88,6 @@ CaptureAppView::~CaptureAppView() {
    baseband::shutdown();
 }

-void CaptureAppView::on_hide() {
-    waterfall.on_hide();
-    View::on_hide();
-}
-
 void CaptureAppView::set_parent_rect(const Rect new_parent_rect) {
    View::set_parent_rect(new_parent_rect);

@@ -39,7 +39,6 @@ class CaptureAppView : public View {
    CaptureAppView(NavigationView& nav);
    ~CaptureAppView();

-    void on_hide() override;
    void focus() override;
    void set_parent_rect(const Rect new_parent_rect) override;

@@ -54,10 +53,9 @@ class CaptureAppView : public View {
        "rx_capture", app_settings::Mode::RX,
        app_settings::Options::UseGlobalTargetFrequency};

-    uint32_t sampling_rate = 0;
-
    Labels labels{
        {{0 * 8, 1 * 16}, "Rate:", Color::light_grey()},
+        {{11 * 8, 1 * 16}, "Format:", Color::light_grey()},
    };

    RSSI rssi{
@@ -87,6 +85,12 @@ class CaptureAppView : public View {
        5,
        {}};

+    OptionsField option_format{
+        {18 * 8, 1 * 16},
+        3,
+        {{"C16", RecordView::FileType::RawS16},
+         {"C8", RecordView::FileType::RawS8}}};
+
    RecordView record_view{
        {0 * 8, 2 * 16, 30 * 8, 1 * 16},
        u"BBD_????.*",
@@ -26,6 +26,8 @@

 #include "ui_fileman.hpp"
 #include "io_file.hpp"
+#include "io_convert.hpp"
+
 #include "baseband_api.hpp"
 #include "metadata_file.hpp"
 #include "portapack.hpp"
@@ -75,7 +77,8 @@ void ReplayAppView::on_file_changed(const fs::path& new_file_path) {
    progressbar.set_max(file_size);
    text_filename.set(truncate(file_path.filename().string(), 12));

-    auto duration = ms_duration(file_size, sample_rate, 4);
+    uint8_t sample_size = capture_file_sample_size(current()->path);
+    auto duration = ms_duration(file_size, sample_rate, sample_size);
    text_duration.set(to_string_time_ms(duration));

    button_play.focus();
@@ -110,7 +113,7 @@ void ReplayAppView::start() {

    std::unique_ptr<stream::Reader> reader;

-    auto p = std::make_unique<FileReader>();
+    auto p = std::make_unique<FileConvertReader>();
    auto open_error = p->open(file_path);
    if (open_error.is_valid()) {
        file_error();
@@ -191,7 +194,7 @@ ReplayAppView::ReplayAppView(
    };

    button_open.on_select = [this, &nav](Button&) {
-        auto open_view = nav.push<FileLoadView>(".C16");
+        auto open_view = nav.push<FileLoadView>(".C*");
        open_view->on_changed = [this](fs::path new_file_path) {
            on_file_changed(new_file_path);
        };
@@ -403,9 +403,10 @@ DebugMenuView::DebugMenuView(NavigationView& nav) {
        {"Peripherals", ui::Color::dark_cyan(), &bitmap_icon_peripherals, [&nav]() { nav.push<DebugPeripheralsMenuView>(); }},
        {"Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [&nav]() { nav.push<TemperatureView>(); }},
        {"Buttons Test", ui::Color::dark_cyan(), &bitmap_icon_controls, [&nav]() { nav.push<DebugControlsView>(); }},
+        {"Touch Test", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugScreenTest>(); }},
        {"P.Memory", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugPmemView>(); }},
-        {"Fonts Viewer", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugFontsView>(); }},
        {"Debug Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { portapack::persistent_memory::debug_dump(); }},
+        {"Fonts Viewer", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugFontsView>(); }},
    });
    set_max_rows(2);  // allow wider buttons
 }
@@ -501,6 +502,56 @@ DebugFontsView::DebugFontsView(NavigationView& nav)
    set_focusable(true);
 }

+/* DebugScreenTest ****************************************************/
+
+DebugScreenTest::DebugScreenTest(NavigationView& nav)
+    : nav_{nav} {
+    set_focusable(true);
+}
+
+bool DebugScreenTest::on_key(const KeyEvent key) {
+    Painter painter;
+    switch (key) {
+        case KeyEvent::Select:
+            nav_.pop();
+            break;
+        case KeyEvent::Down:
+            painter.fill_rectangle({0, 0, screen_width, screen_height}, semirand());
+            break;
+        case KeyEvent::Left:
+            pen_color = semirand();
+            break;
+        default:
+            break;
+    }
+    return true;
+}
+
+bool DebugScreenTest::on_encoder(EncoderEvent delta) {
+    pen_size = clip<int32_t>(pen_size + delta, 1, screen_width);
+    return true;
+}
+
+bool DebugScreenTest::on_touch(const TouchEvent event) {
+    Painter painter;
+    pen_pos = event.point;
+    painter.fill_rectangle({pen_pos.x() - pen_size / 2, pen_pos.y() - pen_size / 2, pen_size, pen_size}, pen_color);
+    return true;
+}
+
+uint16_t DebugScreenTest::semirand() {
+    static uint64_t seed{0x0102030405060708};
+    seed = seed * 137;
+    seed = (seed >> 1) | ((seed & 0x01) << 63);
+    return (uint16_t)seed;
+}
+
+void DebugScreenTest::paint(Painter& painter) {
+    painter.fill_rectangle({0, 16, screen_width, screen_height - 16}, Color::white());
+    painter.draw_string({10 * 8, screen_height / 2}, Styles::white, "Use Stylus");
+    pen_color = semirand();
+}
+
 /* DebugLCRView *******************************************************/

 /*DebugLCRView::DebugLCRView(NavigationView& nav, std::string lcr_string) {
@@ -321,6 +321,22 @@ class DebugFontsView : public View {
    NavigationView& nav_;
 };

+class DebugScreenTest : public View {
+   public:
+    DebugScreenTest(NavigationView& nav);
+    bool on_key(KeyEvent key) override;
+    bool on_encoder(EncoderEvent delta) override;
+    bool on_touch(TouchEvent event) override;
+    uint16_t semirand();
+    void paint(Painter& painter) override;
+
+   private:
+    NavigationView& nav_;
+    Point pen_pos{};
+    Color pen_color{0};
+    int16_t pen_size{10};
+};
+
 /*class DebugLCRView : public View {
 public:
        DebugLCRView(NavigationView& nav, std::string lcrstring);
@@ -39,7 +39,9 @@ namespace fs = std::filesystem;
 namespace ui {
 static const fs::path txt_ext{u".TXT"};
 static const fs::path ppl_ext{u".PPL"};
+static const fs::path c8_ext{u".C8"};
 static const fs::path c16_ext{u".C16"};
+static const fs::path cxx_ext{u".C*"};
 static const fs::path png_ext{u".PNG"};
 static const fs::path bmp_ext{u".BMP"};
 }  // namespace ui
@@ -78,14 +80,15 @@ fs::path get_partner_file(fs::path path) {
        return {};
    auto ext = path.extension();

-    if (path_iequal(ext, txt_ext))
-        ext = c16_ext;
-    else if (path_iequal(ext, c16_ext))
-        ext = txt_ext;
-    else
+    if (is_cxx_capture_file(path))
+        path.replace_extension(txt_ext);
+    else if (path_iequal(ext, txt_ext)) {
+        path.replace_extension(c8_ext);
+        if (!fs::file_exists(path))
+            path.replace_extension(c16_ext);
+    } else
        return {};

-    path.replace_extension(ext);
    return fs::file_exists(path) && !fs::is_directory(path) ? path : fs::path{};
 }

@@ -141,6 +144,7 @@ void FileManBaseView::load_directory_contents(const fs::path& dir_path) {
    current_path = dir_path;
    entry_list.clear();
    auto filtering = !extension_filter.empty();
+    bool cxx_file = path_iequal(cxx_ext, extension_filter);

    text_current.set(dir_path.empty() ? "(sd root)" : truncate(dir_path, 24));

@@ -150,7 +154,7 @@ void FileManBaseView::load_directory_contents(const fs::path& dir_path) {
            continue;

        if (fs::is_regular_file(entry.status())) {
-            if (!filtering || path_iequal(entry.path().extension(), extension_filter))
+            if (!filtering || path_iequal(entry.path().extension(), extension_filter) || (cxx_file && is_cxx_capture_file(entry.path())))
                insert_sorted(entry_list, {entry.path(), (uint32_t)entry.size(), false});
        } else if (fs::is_directory(entry.status())) {
            insert_sorted(entry_list, {entry.path(), 0, true});
@@ -497,7 +501,7 @@ bool FileManagerView::handle_file_open() {
    if (path_iequal(txt_ext, ext)) {
        nav_.push<TextEditorView>(path);
        return true;
-    } else if (path_iequal(c16_ext, ext) || path_iequal(ppl_ext, ext)) {
+    } else if (is_cxx_capture_file(path) || path_iequal(ppl_ext, ext)) {
        // TODO: Enough memory to push?
        nav_.push<PlaylistView>(path);
        return true;
@@ -27,6 +27,8 @@
 #include "convert.hpp"
 #include "file_reader.hpp"
 #include "io_file.hpp"
+#include "io_convert.hpp"
+
 #include "string_format.hpp"
 #include "ui_fileman.hpp"
 #include "utility.hpp"
@@ -48,7 +50,6 @@ namespace fs = std::filesystem;
 namespace ui {

 // TODO: consolidate extesions into a shared header?
-static const fs::path c16_ext = u".C16";
 static const fs::path ppl_ext = u".PPL";

 void PlaylistView::load_file(const fs::path& playlist_path) {
@@ -258,7 +259,7 @@ void PlaylistView::send_current_track() {
        chThdSleepMilliseconds(current()->ms_delay);

    // Open the sample file to send.
-    auto reader = std::make_unique<FileReader>();
+    auto reader = std::make_unique<FileConvertReader>();
    auto error = reader->open(current()->path);
    if (error) {
        show_file_error(current()->path, "Can't open file to send.");
@@ -323,9 +324,10 @@ void PlaylistView::update_ui() {
        chDbgAssert(!at_end(), "update_ui #1", "current_index_ invalid");

        text_filename.set(current()->path.filename().string());
-        text_sample_rate.set(unit_auto_scale(current()->metadata.sample_rate, 3, 0) + "Hz");
+        text_sample_rate.set(unit_auto_scale(current()->metadata.sample_rate, 3, (current()->metadata.sample_rate > 1000000) ? 2 : 0) + "Hz");

-        auto duration = ms_duration(current()->file_size, current()->metadata.sample_rate, 4);
+        uint8_t sample_size = capture_file_sample_size(current()->path);
+        auto duration = ms_duration(current()->file_size, current()->metadata.sample_rate, sample_size);
        text_duration.set(to_string_time_ms(duration));
        field_frequency.set_value(current()->metadata.center_frequency);

@@ -336,7 +338,7 @@ void PlaylistView::update_ui() {

        progressbar_track.set_max(playlist_db_.size() - 1);
        progressbar_track.set_value(current_index_);
-        progressbar_transmit.set_max(current()->file_size);
+        progressbar_transmit.set_max(current()->file_size * sizeof(complex16_t) / sample_size);
    }

    button_play.set_bitmap(is_active() ? &bitmap_stop : &bitmap_play);
@@ -406,7 +408,7 @@ PlaylistView::PlaylistView(
    button_add.on_select = [this, &nav]() {
        if (is_active())
            return;
-        auto open_view = nav_.push<FileLoadView>(".C16");
+        auto open_view = nav_.push<FileLoadView>(".C*");
        open_view->push_dir(u"CAPTURES");
        open_view->on_changed = [this](fs::path path) {
            add_entry(std::move(path));
@@ -459,7 +461,7 @@ PlaylistView::PlaylistView(
    auto ext = path.extension();
    if (path_iequal(ext, ppl_ext))
        on_file_changed(path);
-    else if (path_iequal(ext, c16_ext))
+    else if (is_cxx_capture_file(path))
        add_entry(fs::path{path});
 }

@@ -192,7 +192,7 @@ bool ReconView::recon_load_config_from_sd() {
                parse_int(line, recon_match_mode);
                break;
            case 6:
-                parse_int(line, recon_match_mode);
+                parse_int(line, wait);
                complete = true;  // NB: Last entry.
                break;
        }
@@ -890,7 +890,6 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
    if (recon) {
        if (!timer) {
            status = 0;
-            continuous_lock = false;
            freq_lock = 0;
            timer = local_recon_lock_duration;
            big_display.set_style(&Styles::white);
@@ -907,22 +906,19 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
            }
            if (db > squelch)  // MATCHING LEVEL
            {
-                continuous_lock = true;
                freq_lock++;
+                timer += time_interval;  // give some more time for next lock
            } else {
                // continuous, direct cut it if not consecutive match after 1 first match
                if (recon_match_mode == RECON_MATCH_CONTINUOUS) {
-                    if (freq_lock > 0) {
-                        timer = 0;
-                        continuous_lock = false;
-                    }
+                    freq_lock = 0;
+                    timer = 0;
                }
            }
        }
        if (freq_lock >= recon_lock_nb_match)  // LOCKED
        {
            if (status != 2) {
-                continuous_lock = false;
                status = 2;
                // FREQ IS STRONG: GREEN and recon will pause when on_statistics_update()
                if ((!scanner_mode) && autosave && frequency_list.size() > 0) {
@@ -963,10 +959,9 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
        last_timer = timer;
        text_timer.set("TIMER: " + to_string_dec_int(timer));
    }
-    if (timer) {
-        if (!continuous_lock || recon_match_mode == RECON_MATCH_SPARSE) {
-            timer -= time_interval;
-        }
+
+    if (timer != 0) {
+        timer -= time_interval;
        if (timer < 0) {
            timer = 0;
        }
@@ -1126,7 +1121,6 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
 void ReconView::recon_pause() {
    timer = 0;
    freq_lock = 0;
-    continuous_lock = false;
    recon = false;

    if (field_mode.selected_index_value() != SPEC_MODULATION)
@@ -1139,7 +1133,6 @@ void ReconView::recon_pause() {
 void ReconView::recon_resume() {
    timer = 0;
    freq_lock = 0;
-    continuous_lock = false;
    recon = true;

    if (field_mode.selected_index_value() != SPEC_MODULATION)
@@ -564,7 +564,7 @@ ScannerView::ScannerView(
    field_lock_wait.set_value(2);

    field_squelch.on_change = [this](int32_t v) { squelch = v; };
-    field_squelch.set_value(-10);
+    field_squelch.set_value(-30);

    // LEARN FREQUENCIES
    std::string scanner_txt = "SCANNER";
@@ -31,6 +31,16 @@

 #include "core_control.hpp"

+/* Set true to enable additional checks to ensure
+ * M4 and M0 are synchronized before passing messages. */
+static constexpr bool enforce_core_sync = true;
+
+/* Set true to enable check for baseband messages getting stuck.
+ * This implies the baseband thread is not dequeuing and has probably stalled.
+ * NB: This check adds a small amout of overhead to the message sending code
+ * and may impact application perf if it is sending a lot of messages. */
+static constexpr bool check_for_message_hang = true;
+
 using namespace portapack;

 namespace baseband {
@@ -40,8 +50,18 @@ static void send_message(const Message* const message) {
    // another message is present before setting new message.
    shared_memory.baseband_message = message;
    creg::m0apptxevent::assert_event();
-    while (shared_memory.baseband_message)
-        ;
+
+    if constexpr (check_for_message_hang) {
+        auto count = UINT32_MAX;
+        while (shared_memory.baseband_message && --count)
+            /* spin */;
+
+        if (count == 0)
+            chDbgPanic("Baseband Send Fail");
+    } else {
+        while (shared_memory.baseband_message)
+            /* spin */;
+    }
 }

 void AMConfig::apply() const {
@@ -276,17 +296,28 @@ void set_spectrum_painter_config(const uint16_t width, const uint16_t height, bo

 static bool baseband_image_running = false;

-void run_image(const portapack::spi_flash::image_tag_t image_tag) {
+void run_image(const spi_flash::image_tag_t image_tag) {
    if (baseband_image_running) {
        chDbgPanic("BBRunning");
    }

    creg::m4txevent::clear();
+    shared_memory.clear_baseband_ready();

-    m4_init(image_tag, portapack::memory::map::m4_code, false);
+    m4_init(image_tag, memory::map::m4_code, false);
    baseband_image_running = true;

    creg::m4txevent::enable();
+
+    if constexpr (enforce_core_sync) {
+        // Wait up to 3 seconds for baseband to start handling events.
+        auto count = 3'000u;
+        while (!shared_memory.baseband_ready && --count)
+            chThdSleepMilliseconds(1);
+
+        if (count == 0)
+            chDbgPanic("Baseband Sync Fail");
+    }
 }

 void shutdown() {
@@ -20,21 +20,20 @@
 * Boston, MA 02110-1301, USA.
 */

-#include "core_control.hpp"
-
-#include "hal.h"
-
-#include "lpc43xx_cpp.hpp"
-using namespace lpc43xx;
-
-#include "message.hpp"
 #include "baseband_api.hpp"
+#include "core_control.hpp"
+#include "hal.h"
+#include "lpc43xx_cpp.hpp"
 #include "lz4.h"
+#include "message.hpp"

 #include <cstring>

-void m4_init(const portapack::spi_flash::image_tag_t image_tag, const portapack::memory::region_t to, const bool full_reset) {
-    const portapack::spi_flash::chunk_t* chunk = reinterpret_cast<const portapack::spi_flash::chunk_t*>(portapack::spi_flash::images.base());
+using namespace lpc43xx;
+using namespace portapack;
+
+void m4_init(const spi_flash::image_tag_t image_tag, const memory::region_t to, const bool full_reset) {
+    const spi_flash::chunk_t* chunk = reinterpret_cast<const spi_flash::chunk_t*>(spi_flash::images.base());
    while (chunk->tag) {
        if (chunk->tag == image_tag) {
            const void* src = &chunk->data[0];
@@ -49,9 +48,8 @@ void m4_init(const portapack::spi_flash::image_tag_t image_tag, const portapack:
            LPC_CREG->M4MEMMAP = to.base();

            /* Reset M4 core and optionally all peripherals */
-            LPC_RGU->RESET_CTRL[0] = (full_reset) ? (1 << 1)   // PERIPH_RST
-                                                  : (1 << 13)  // M4_RST
-                ;
+            LPC_RGU->RESET_CTRL[0] = (full_reset) ? (1 << 1)    // PERIPH_RST
+                                                  : (1 << 13);  // M4_RST

            return;
        }
@@ -21,12 +21,17 @@
 */

 #include "file.hpp"
+#include "complex.hpp"

 #include <algorithm>
 #include <codecvt>
 #include <cstring>
 #include <locale>

+namespace fs = std::filesystem;
+static const fs::path c8_ext{u".C8"};
+static const fs::path c16_ext{u".C16"};
+
 Optional<File::Error> File::open_fatfs(const std::filesystem::path& filename, BYTE mode) {
    auto result = f_open(&f, reinterpret_cast<const TCHAR*>(filename.c_str()), mode);
    if (result == FR_OK) {
@@ -507,6 +512,19 @@ bool path_iequal(
    return false;
 }

+bool is_cxx_capture_file(const path& filename) {
+    auto ext = filename.extension();
+    return path_iequal(c8_ext, ext) || path_iequal(c16_ext, ext);
+}
+
+uint8_t capture_file_sample_size(const path& filename) {
+    if (path_iequal(filename.extension(), c8_ext))
+        return sizeof(complex8_t);
+    if (path_iequal(filename.extension(), c16_ext))
+        return sizeof(complex16_t);
+    return 0;
+}
+
 directory_iterator::directory_iterator(
    const std::filesystem::path& path,
    const std::filesystem::path& wild)
@@ -168,6 +168,8 @@ path operator/(const path& lhs, const path& rhs);

 /* Case insensitive path equality on underlying "native" string. */
 bool path_iequal(const path& lhs, const path& rhs);
+bool is_cxx_capture_file(const path& filename);
+uint8_t capture_file_sample_size(const path& filename);

 using file_status = BYTE;

@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2023 Mark Thompson
+ *
+ * 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 "io_convert.hpp"
+#include "complex.hpp"
+
+namespace fs = std::filesystem;
+static const fs::path c8_ext = u".C8";
+
+namespace file_convert {
+
+// Convert buffer contents from c16 to c8.
+// Same buffer used for input & output; input size is bytes; output size is bytes/2.
+void c16_to_c8(const void* buffer, File::Size bytes) {
+    complex16_t* src = (complex16_t*)buffer;
+    complex8_t* dest = (complex8_t*)buffer;
+
+    // Shift isn't used here because it would amplify noise at center freq since it's a signed number
+    // i.e. ((-1 >> 8) << 8) = -256, whereas (-1 / 256) * 256 = 0
+    for (File::Size i = 0; i < bytes / sizeof(complex16_t); i++) {
+        auto re_out = src[i].real() / 256;
+        auto im_out = src[i].imag() / 256;
+        dest[i] = {(int8_t)re_out, (int8_t)im_out};
+    }
+}
+
+// Convert c8 buffer to c16 buffer.
+// Same buffer used for input & output; input size is bytes; output size is 2*bytes.
+void c8_to_c16(const void* buffer, File::Size bytes) {
+    complex8_t* src = (complex8_t*)buffer;
+    complex16_t* dest = (complex16_t*)buffer;
+    uint32_t i = bytes / sizeof(complex8_t);
+
+    if (i != 0) {
+        do {
+            i--;
+            auto re_out = (int16_t)src[i].real() * 256;  // C8 to C16 conversion;
+            auto im_out = (int16_t)src[i].imag() * 256;  // Can't shift signed numbers left, so using multiply
+            dest[i] = {(int16_t)re_out, (int16_t)im_out};
+        } while (i != 0);
+    }
+}
+
+} /* namespace file_convert */
+
+// Automatically enables C8/C16 conversion based on file extension
+Optional<File::Error> FileConvertReader::open(const std::filesystem::path& filename) {
+    convert_c8_to_c16 = path_iequal(filename.extension(), c8_ext);
+    return file_.open(filename);
+}
+
+// If C8 conversion enabled, half the number of bytes are read from the file & expanded to fill the whole buffer.
+File::Result<File::Size> FileConvertReader::read(void* const buffer, const File::Size bytes) {
+    auto read_result = file_.read(buffer, convert_c8_to_c16 ? bytes / 2 : bytes);
+    if (read_result.is_ok()) {
+        if (convert_c8_to_c16) {
+            file_convert::c8_to_c16(buffer, read_result.value());
+            read_result = read_result.value() * 2;
+        }
+        bytes_read_ += read_result.value();
+    }
+    return read_result;
+}
+
+// Automatically enables C8/C16 conversion based on file extension
+Optional<File::Error> FileConvertWriter::create(const std::filesystem::path& filename) {
+    convert_c16_to_c8 = path_iequal(filename.extension(), c8_ext);
+    return file_.create(filename);
+}
+
+// If C8 conversion is enabled, half the number of bytes are written to the file.
+File::Result<File::Size> FileConvertWriter::write(const void* const buffer, const File::Size bytes) {
+    if (convert_c16_to_c8) {
+        file_convert::c16_to_c8(buffer, bytes);
+    }
+    auto write_result = file_.write(buffer, convert_c16_to_c8 ? bytes / 2 : bytes);
+    if (write_result.is_ok()) {
+        if (convert_c16_to_c8) {
+            write_result = write_result.value() * 2;
+        }
+        bytes_written_ += write_result.value();
+    }
+    return write_result;
+}
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2023 Mark Thompson
+ *
+ * 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.
+ */
+
+#pragma once
+
+#include "io_file.hpp"
+
+#include "io.hpp"
+#include "file.hpp"
+#include "optional.hpp"
+
+#include <cstdint>
+
+namespace file_convert {
+
+void c8_to_c16(const void* buffer, File::Size bytes);
+void c16_to_c8(const void* buffer, File::Size bytes);
+
+} /* namespace file_convert */
+
+class FileConvertReader : public stream::Reader {
+   public:
+    FileConvertReader() = default;
+
+    FileConvertReader(const FileConvertReader&) = delete;
+    FileConvertReader& operator=(const FileConvertReader&) = delete;
+    FileConvertReader(FileConvertReader&& file) = delete;
+    FileConvertReader& operator=(FileConvertReader&&) = delete;
+
+    Optional<File::Error> open(const std::filesystem::path& filename);
+
+    File::Result<File::Size> read(void* const buffer, const File::Size bytes) override;
+    const File& file() const& { return file_; }
+
+    bool convert_c8_to_c16{};
+
+   protected:
+    File file_{};
+    uint64_t bytes_read_{0};
+};
+
+class FileConvertWriter : public stream::Writer {
+   public:
+    FileConvertWriter() = default;
+
+    FileConvertWriter(const FileConvertWriter&) = delete;
+    FileConvertWriter& operator=(const FileConvertWriter&) = delete;
+    FileConvertWriter(FileConvertWriter&& file) = delete;
+    FileConvertWriter& operator=(FileConvertWriter&&) = delete;
+
+    Optional<File::Error> create(const std::filesystem::path& filename);
+
+    File::Result<File::Size> write(const void* const buffer, const File::Size bytes) override;
+    const File& file() const& { return file_; }
+
+    bool convert_c16_to_c8{};
+
+   protected:
+    File file_{};
+    uint64_t bytes_written_{0};
+};
@@ -238,6 +238,7 @@ void set_baseband_filter_bandwidth(const uint32_t bandwidth_minimum) {

 void set_baseband_rate(const uint32_t rate) {
    portapack::clock_manager.set_sampling_frequency(rate);
+    // TODO: actually set baseband too?
 }

 void set_antenna_bias(const bool on) {
@@ -308,13 +308,25 @@ WaterfallView::WaterfallView(const bool cursor) {
 }

 void WaterfallView::on_show() {
-    // TODO: Assert that baseband is not shutdown.
-    baseband::spectrum_streaming_start();
+    start();
 }

 void WaterfallView::on_hide() {
-    // TODO: Assert that baseband is not shutdown.
-    baseband::spectrum_streaming_stop();
+    stop();
+}
+
+void WaterfallView::start() {
+    if (!running_) {
+        baseband::spectrum_streaming_start();
+        running_ = true;
+    }
+}
+
+void WaterfallView::stop() {
+    if (running_) {
+        baseband::spectrum_streaming_stop();
+        running_ = false;
+    }
 }

 void WaterfallView::show_audio_spectrum_view(const bool show) {
@@ -131,11 +131,14 @@ class WaterfallView : public View {
    WaterfallView& operator=(const WaterfallView&) = delete;
    WaterfallView& operator=(WaterfallView&&) = delete;

+    // TODO: remove these, use start/stop directly instead.
    void on_show() override;
    void on_hide() override;

-    void set_parent_rect(const Rect new_parent_rect) override;
+    void start();
+    void stop();

+    void set_parent_rect(const Rect new_parent_rect) override;
    void show_audio_spectrum_view(const bool show);

   private:
@@ -147,6 +150,7 @@ class WaterfallView : public View {

    WaterfallWidget waterfall_widget{};
    FrequencyScale frequency_scale{};
+    bool running_{false};

    ChannelSpectrumFIFO* channel_fifo{nullptr};
    AudioSpectrum* audio_spectrum_data{nullptr};
@@ -497,13 +497,8 @@ ReceiversMenuView::ReceiversMenuView(NavigationView& nav) {
        add_items({{"..", Color::light_grey(), &bitmap_icon_previous, [&nav]() { nav.pop(); }}});
    }
    add_items({
-        {
-            "ADS-B",
-            Color::green(),
-            &bitmap_icon_adsb,
-            [&nav]() { nav.push<ADSBRxView>(); },
-        },
-        //{ "ACARS",	Color::yellow(),	&bitmap_icon_adsb,			[&nav](){ nav.push<ACARSAppView>(); }, },
+        {"ADS-B", Color::green(), &bitmap_icon_adsb, [&nav]() { nav.push<ADSBRxView>(); }},
+        //{ "ACARS",	Color::yellow(),	&bitmap_icon_adsb,			[&nav](){ nav.push<ACARSAppView>(); }},
        {"AIS Boats", Color::green(), &bitmap_icon_ais, [&nav]() { nav.push<AISAppView>(); }},
        {"AFSK", Color::yellow(), &bitmap_icon_modem, [&nav]() { nav.push<AFSKRxView>(); }},
        {"BTLE", Color::yellow(), &bitmap_icon_btle, [&nav]() { nav.push<BTLERxView>(); }},
@@ -26,6 +26,7 @@ using namespace portapack;

 #include "io_file.hpp"
 #include "io_wave.hpp"
+#include "io_convert.hpp"

 #include "baseband_api.hpp"
 #include "metadata_file.hpp"
@@ -194,6 +195,7 @@ void RecordView::start() {
            }
        } break;

+        case FileType::RawS8:
        case FileType::RawS16: {
            const auto metadata_file_error =
                write_metadata_file(get_metadata_path(base_path),
@@ -204,8 +206,8 @@ void RecordView::start() {
                return;
            }

-            auto p = std::make_unique<RawFileWriter>();
-            auto create_error = p->create(base_path.replace_extension(u".C16"));
+            auto p = std::make_unique<FileConvertWriter>();
+            auto create_error = p->create(base_path.replace_extension((file_type == FileType::RawS8) ? u".C8" : u".C16"));
            if (create_error.is_valid()) {
                handle_error(create_error.value());
            } else {
@@ -40,8 +40,10 @@ class RecordView : public View {
    std::function<void(std::string)> on_error{};

    enum FileType {
+        RawS8 = 1,
        RawS16 = 2,
-        WAV = 3,
+        RawS32 = 3,
+        WAV = 4,
    };

    RecordView(
@@ -57,6 +59,8 @@ class RecordView : public View {

    void set_sampling_rate(const size_t new_sampling_rate);

+    void set_file_type(const FileType v) { file_type = v; }
+
    void start();
    void stop();
    void on_hide() override;
@@ -83,7 +87,7 @@ class RecordView : public View {

    const std::filesystem::path filename_stem_pattern;
    const std::filesystem::path folder;
-    const FileType file_type;
+    FileType file_type;
    const size_t write_size;
    const size_t buffer_count;
    size_t sampling_rate{0};
@@ -46,24 +46,34 @@ Thread* BasebandThread::thread = nullptr;
 BasebandThread::BasebandThread(
    uint32_t sampling_rate,
    BasebandProcessor* const baseband_processor,
-    const tprio_t priority,
-    baseband::Direction direction)
-    : baseband_processor{baseband_processor},
-      _direction{direction},
-      sampling_rate{sampling_rate} {
-    thread = chThdCreateStatic(baseband_thread_wa, sizeof(baseband_thread_wa),
-                               priority, ThreadBase::fn,
-                               this);
+    baseband::Direction direction,
+    bool auto_start,
+    tprio_t priority)
+    : baseband_processor_{baseband_processor},
+      direction_{direction},
+      sampling_rate_{sampling_rate},
+      priority_{priority} {
+    if (auto_start) start();
 }

 BasebandThread::~BasebandThread() {
-    chThdTerminate(thread);
-    chThdWait(thread);
-    thread = nullptr;
+    if (thread) {
+        chThdTerminate(thread);
+        chThdWait(thread);
+        thread = nullptr;
+    }
+}
+
+void BasebandThread::start() {
+    if (!thread) {
+        thread = chThdCreateStatic(
+            baseband_thread_wa, sizeof(baseband_thread_wa),
+            priority_, ThreadBase::fn, this);
+    }
 }

 void BasebandThread::set_sampling_rate(uint32_t new_sampling_rate) {
-    sampling_rate = new_sampling_rate;
+    sampling_rate_ = new_sampling_rate;
 }

 void BasebandThread::run() {
@@ -71,9 +81,7 @@ void BasebandThread::run() {
    baseband::dma::init();

    const auto baseband_buffer = std::make_unique<std::array<baseband::sample_t, 8192>>();
-    baseband::dma::configure(
-        baseband_buffer->data(),
-        direction());
+    baseband::dma::configure(baseband_buffer->data(), direction());
    // baseband::dma::allocate(4, 2048);

    baseband_sgpio.configure(direction());
@@ -85,10 +93,10 @@ void BasebandThread::run() {
        const auto buffer_tmp = baseband::dma::wait_for_buffer();
        if (buffer_tmp) {
            buffer_c8_t buffer{
-                buffer_tmp.p, buffer_tmp.count, sampling_rate};
+                buffer_tmp.p, buffer_tmp.count, sampling_rate_};

-            if (baseband_processor) {
-                baseband_processor->execute(buffer);
+            if (baseband_processor_) {
+                baseband_processor_->execute(buffer);
            }
        }
    }
@@ -28,13 +28,20 @@

 #include <ch.h>

+/* NB: Because ThreadBase threads start when then are initialized (by default),
+ * they should be the last members in a Processor class to ensure the rest of the
+ * members are fully initialized before data handling starts. If the Procressor
+ * needs to do additional initialization (in its ctor), set 'auto_start' to false
+ * and manually call 'start()' on the thread. */
+
 class BasebandThread : public ThreadBase {
   public:
    BasebandThread(
        uint32_t sampling_rate,
        BasebandProcessor* const baseband_processor,
-        const tprio_t priority,
-        const baseband::Direction direction = baseband::Direction::Receive);
+        baseband::Direction direction,
+        bool auto_start = true,
+        tprio_t priority = (NORMALPRIO + 20));
    ~BasebandThread();

    BasebandThread(const BasebandThread&) = delete;
@@ -42,10 +49,12 @@ class BasebandThread : public ThreadBase {
    BasebandThread& operator=(const BasebandThread&) = delete;
    BasebandThread& operator=(BasebandThread&&) = delete;

+    void start() override;
+
    // This getter should die, it's just here to leak information to code that
    // isn't in the right place to begin with.
    baseband::Direction direction() const {
-        return _direction;
+        return direction_;
    }

    void set_sampling_rate(uint32_t new_sampling_rate);
@@ -53,9 +62,10 @@ class BasebandThread : public ThreadBase {
   private:
    static Thread* thread;

-    BasebandProcessor* baseband_processor{nullptr};
-    baseband::Direction _direction{baseband::Direction::Receive};
-    uint32_t sampling_rate{0};
+    BasebandProcessor* baseband_processor_;
+    baseband::Direction direction_;
+    uint32_t sampling_rate_;
+    const tprio_t priority_;

    void run() override;
 };
@@ -19,21 +19,18 @@
 * Boston, MA 02110-1301, USA.
 */

-#include "event_m4.hpp"
-#include "debug.hpp"
-
-#include "portapack_shared_memory.hpp"
-
-#include "message_queue.hpp"
-
 #include "ch.h"
-
+#include "debug.hpp"
+#include "event_m4.hpp"
 #include "lpc43xx_cpp.hpp"
-using namespace lpc43xx;
+#include "message_queue.hpp"
+#include "portapack_shared_memory.hpp"

 #include <cstdint>
 #include <array>

+using namespace lpc43xx;
+
 extern "C" {

 CH_IRQ_HANDLER(MAPP_IRQHandler) {
@@ -61,6 +58,10 @@ void EventDispatcher::run() {

    lpc43xx::creg::m0apptxevent::enable();

+    // Indicate to the M0 thread that
+    // M4 is ready to receive message events.
+    shared_memory.set_baseband_ready();
+
    while (is_running) {
        const auto events = wait();
        dispatch(events);
@@ -32,6 +32,7 @@ ACARSProcessor::ACARSProcessor() {
    decim_0.configure(taps_11k0_decim_0.taps, 33554432);
    decim_1.configure(taps_11k0_decim_1.taps, 131072);
    packet.clear();
+    baseband_thread.start();
 }

 void ACARSProcessor::execute(const buffer_c8_t& buffer) {
@@ -110,9 +110,6 @@ class ACARSProcessor : public BasebandProcessor {
   private:
    static constexpr size_t baseband_fs = 2457600;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -138,6 +135,11 @@ class ACARSProcessor : public BasebandProcessor {
        };*/
    baseband::Packet packet{};

+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{
+        baseband_fs, this, baseband::Direction::Receive, /*auto_start*/ false};
+    RSSIThread rssi_thread{};
+
    void consume_symbol(const float symbol);
    void payload_handler(const baseband::Packet& packet);
 };
@@ -36,15 +36,11 @@ using namespace adsb;
 class ADSBRXProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
    static constexpr size_t baseband_fs = 2000000;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    ADSBFrame frame{};
    bool configured{false};
    uint32_t prev_mag{0};
@@ -58,6 +54,10 @@ class ADSBRXProcessor : public BasebandProcessor {
    uint32_t sample{0};
    int32_t re{}, im{};
    int32_t amp{0};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};
 };

 #endif
@@ -29,14 +29,11 @@
 class ADSBTXProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const p) override;

   private:
    bool configured = false;

-    BasebandThread baseband_thread{4000000, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    const complex8_t am_lut[4] = {
        {127, 0},
        {0, 127},
@@ -48,6 +45,9 @@ class ADSBTXProcessor : public BasebandProcessor {
    uint32_t phase{0};

    TXProgressMessage txprogress_message{};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{4000000, this, baseband::Direction::Transmit};
 };

 #endif
@@ -32,14 +32,11 @@
 class AFSKProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const msg) override;

   private:
    bool configured = false;

-    BasebandThread baseband_thread{AFSK_SAMPLERATE, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    uint32_t afsk_samples_per_bit{0};
    uint32_t afsk_phase_inc_mark{0};
    uint32_t afsk_phase_inc_space{0};
@@ -59,6 +56,9 @@ class AFSKProcessor : public BasebandProcessor {
    int8_t re{0}, im{0};

    TXProgressMessage txprogress_message{};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{AFSK_SAMPLERATE, this, baseband::Direction::Transmit};
 };

 #endif
@@ -38,7 +38,6 @@
 class AFSKRxProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
@@ -53,9 +52,6 @@ class AFSKRxProcessor : public BasebandProcessor {
        RECEIVE
    };

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -93,9 +89,13 @@ class AFSKRxProcessor : public BasebandProcessor {
    bool trigger_word{};
    bool triggered{};

-    void configure(const AFSKRxConfigureMessage& message);
-
    AFSKDataMessage data_message{false, 0};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};
+
+    void configure(const AFSKRxConfigureMessage& message);
 };

 #endif /*__PROC_TPMS_H__*/
@@ -30,6 +30,7 @@
 AISProcessor::AISProcessor() {
    decim_0.configure(taps_11k0_decim_0.taps, 33554432);
    decim_1.configure(taps_11k0_decim_1.taps, 131072);
+    baseband_thread.start();
 }

 void AISProcessor::execute(const buffer_c8_t& buffer) {
@@ -51,9 +51,6 @@ class AISProcessor : public BasebandProcessor {
   private:
    static constexpr size_t baseband_fs = 2457600;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -77,6 +74,11 @@ class AISProcessor : public BasebandProcessor {
            this->payload_handler(packet);
        }};

+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{
+        baseband_fs, this, baseband::Direction::Receive, /*auto_start*/ false};
+    RSSIThread rssi_thread{};
+
    void consume_symbol(const float symbol);
    void payload_handler(const baseband::Packet& packet);
 };
@@ -38,7 +38,6 @@
 class NarrowbandAMAudio : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
@@ -46,9 +45,6 @@ class NarrowbandAMAudio : public BasebandProcessor {
    static constexpr size_t decim_2_decimation_factor = 4;
    static constexpr size_t channel_filter_decimation_factor = 1;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -65,6 +61,7 @@ class NarrowbandAMAudio : public BasebandProcessor {
    int32_t channel_filter_low_f = 0;
    int32_t channel_filter_high_f = 0;
    int32_t channel_filter_transition = 0;
+    bool configured{false};

    bool modulation_ssb = false;
    dsp::demodulate::AM demod_am{};
@@ -74,7 +71,10 @@ class NarrowbandAMAudio : public BasebandProcessor {

    SpectrumCollector channel_spectrum{};

-    bool configured{false};
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};
+
    void configure(const AMConfigureMessage& message);
    void capture_config(const CaptureConfigMessage& message);

@@ -38,15 +38,11 @@
 class WidebandFMAudio : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
    static constexpr size_t baseband_fs = 2000000;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -55,8 +51,12 @@ class WidebandFMAudio : public BasebandProcessor {
    AudioSpectrum audio_spectrum{};
    TvCollector channel_spectrum{};
    std::array<complex16_t, 256> spectrum{};
-
    bool configured{false};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};
+
    void configure(const WFMConfigureMessage& message);
 };

@@ -75,7 +75,6 @@ static uint16_t crc_ccitt_tab[256] = {
 class APRSRxProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
@@ -90,9 +89,6 @@ class APRSRxProcessor : public BasebandProcessor {
        IN_FRAME
    };

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -135,6 +131,10 @@ class APRSRxProcessor : public BasebandProcessor {

    aprs::APRSPacket aprs_packet{};

+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};
+
    void configure(const APRSRxConfigureMessage& message);
    void capture_config(const CaptureConfigMessage& message);
    void parse_packet();
@@ -37,8 +37,6 @@ class AudioTXProcessor : public BasebandProcessor {
   private:
    static constexpr size_t baseband_fs = 1536000;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    std::unique_ptr<StreamOutput> stream{};

    ToneGen tone_gen{};
@@ -61,6 +59,9 @@ class AudioTXProcessor : public BasebandProcessor {

    TXProgressMessage txprogress_message{};
    RequestSignalMessage sig_message{RequestSignalMessage::Signal::FillRequest};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Transmit};
 };

 #endif
@@ -39,16 +39,12 @@
 class BTLERxProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
    static constexpr size_t baseband_fs = 4000000;
    static constexpr size_t audio_fs = baseband_fs / 8 / 8 / 2;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -81,10 +77,13 @@ class BTLERxProcessor : public BasebandProcessor {
    int RB_SIZE{1000};

    bool configured{false};
+    AFSKDataMessage data_message{false, 0};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};

    void configure(const BTLERxConfigureMessage& message);
-
-    AFSKDataMessage data_message{false, 0};
 };

 #endif /*__PROC_BTLERX_H__*/
@@ -23,9 +23,7 @@
 #include "proc_capture.hpp"

 #include "dsp_fir_taps.hpp"
-
 #include "event_m4.hpp"
-
 #include "utility.hpp"

 CaptureProcessor::CaptureProcessor() {
@@ -33,6 +31,7 @@ CaptureProcessor::CaptureProcessor() {
    decim_1.configure(taps_200k_decim_1.taps, 131072);

    channel_spectrum.set_decimation_factor(1);
+    baseband_thread.start();
 }

 void CaptureProcessor::execute(const buffer_c8_t& buffer) {
@@ -28,9 +28,7 @@
 #include "rssi_thread.hpp"

 #include "dsp_decimate.hpp"
-
 #include "spectrum_collector.hpp"
-
 #include "stream_input.hpp"

 #include <array>
@@ -41,17 +39,12 @@ class CaptureProcessor : public BasebandProcessor {
    CaptureProcessor();

    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
-    // TODO: Repeated value needs to be transmitted from application side.
-    size_t baseband_fs = 0;
+    size_t baseband_fs = 3072000;
    static constexpr auto spectrum_rate_hz = 50.0f;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -69,6 +62,11 @@ class CaptureProcessor : public BasebandProcessor {
    size_t spectrum_interval_samples = 0;
    size_t spectrum_samples = 0;

+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{
+        baseband_fs, this, baseband::Direction::Receive, /*auto_start*/ false};
+    RSSIThread rssi_thread{};
+
    void samplerate_config(const SamplerateConfigMessage& message);
    void capture_config(const CaptureConfigMessage& message);
 };
@@ -67,9 +67,6 @@ class ERTProcessor : public BasebandProcessor {
    const size_t samples_per_symbol = channel_sampling_rate / symbol_rate;
    const float clock_recovery_rate = symbol_rate * 2;

-    BasebandThread baseband_thread{baseband_sampling_rate, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    clock_recovery::ClockRecovery<clock_recovery::FixedErrorFilter> clock_recovery{
        clock_recovery_rate,
        symbol_rate,
@@ -116,6 +113,10 @@ class ERTProcessor : public BasebandProcessor {
    float offset_i{0.0f};
    float offset_q{0.0f};

+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_sampling_rate, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};
+
    float abs(const complex8_t& v);
 };

@@ -29,14 +29,11 @@
 class FSKProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const p) override;

   private:
    bool configured = false;

-    BasebandThread baseband_thread{2280000, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    uint32_t samples_per_bit{0};
    uint32_t length{0};

@@ -48,6 +45,9 @@ class FSKProcessor : public BasebandProcessor {
    uint32_t phase{0}, sphase{0};

    TXProgressMessage txprogress_message{};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{2280000, this, baseband::Direction::Transmit};
 };

 #endif
@@ -29,7 +29,7 @@

 #include "utility.hpp"

-ReplayProcessor::ReplayProcessor() {
+GPSReplayProcessor::GPSReplayProcessor() {
    channel_filter_low_f = taps_200k_decim_1.low_frequency_normalized * 1000000;
    channel_filter_high_f = taps_200k_decim_1.high_frequency_normalized * 1000000;
    channel_filter_transition = taps_200k_decim_1.transition_normalized * 1000000;
@@ -39,32 +39,33 @@ ReplayProcessor::ReplayProcessor() {
    channel_spectrum.set_decimation_factor(1);

    configured = false;
+    baseband_thread.start();
 }

-void ReplayProcessor::execute(const buffer_c8_t& buffer) {
+void GPSReplayProcessor::execute(const buffer_c8_t& buffer) {
    /* 2.6MHz, 2048 samples */

-    if (!configured) return;
+    if (!configured || !stream) return;

    // File data is in C8 format, which is what we need
    // File samplerate is 2.6MHz, which is what we need
    // To fill up the 2048-sample C8 buffer @ 2 bytes per sample = 4096 bytes
-    if (stream) {
-        const size_t bytes_to_read = sizeof(*buffer.p) * 1 * (buffer.count);
-        size_t bytes_read_this_iteration = stream->read(iq_buffer.p, bytes_to_read);
-        bytes_read += bytes_read_this_iteration;
+    const size_t bytes_to_read = sizeof(*buffer.p) * 1 * (buffer.count);
+    size_t bytes_read_this_iteration = stream->read(iq_buffer.p, bytes_to_read);
+    size_t samples_read_this_iteration = bytes_read_this_iteration / sizeof(*buffer.p);

-        // NB: Couldn't we have just read the data into buffer.p to start with, or some DMA/cache coherency concern?
-        //
-        // for (size_t i = 0; i < buffer.count; i++) {
-        //     auto re_out = iq_buffer.p[i].real();
-        //     auto im_out = iq_buffer.p[i].imag();
-        //     buffer.p[i] = {(int8_t)re_out, (int8_t)im_out};
-        // }
-        memcpy(buffer.p, iq_buffer.p, bytes_read_this_iteration);  // memcpy should be more efficient than 1 byte at a time
-    }
+    bytes_read += bytes_read_this_iteration;

-    spectrum_samples += buffer.count;
+    // NB: Couldn't we have just read the data into buffer.p to start with, or some DMA/cache coherency concern?
+    //
+    // for (size_t i = 0; i < buffer.count; i++) {
+    //     auto re_out = iq_buffer.p[i].real();
+    //     auto im_out = iq_buffer.p[i].imag();
+    //     buffer.p[i] = {(int8_t)re_out, (int8_t)im_out};
+    // }
+    memcpy(buffer.p, iq_buffer.p, bytes_read_this_iteration);  // memcpy should be more efficient than 1 byte at a time
+
+    spectrum_samples += samples_read_this_iteration;
    if (spectrum_samples >= spectrum_interval_samples) {
        spectrum_samples -= spectrum_interval_samples;

@@ -75,7 +76,7 @@ void ReplayProcessor::execute(const buffer_c8_t& buffer) {
    }
 }

-void ReplayProcessor::on_message(const Message* const message) {
+void GPSReplayProcessor::on_message(const Message* const message) {
    switch (message->id) {
        case Message::ID::UpdateSpectrum:
        case Message::ID::SpectrumStreamingConfig:
@@ -102,13 +103,13 @@ void ReplayProcessor::on_message(const Message* const message) {
    }
 }

-void ReplayProcessor::samplerate_config(const SamplerateConfigMessage& message) {
+void GPSReplayProcessor::samplerate_config(const SamplerateConfigMessage& message) {
    baseband_fs = message.sample_rate;
    baseband_thread.set_sampling_rate(baseband_fs);
    spectrum_interval_samples = baseband_fs / spectrum_rate_hz;
 }

-void ReplayProcessor::replay_config(const ReplayConfigMessage& message) {
+void GPSReplayProcessor::replay_config(const ReplayConfigMessage& message) {
    if (message.config) {
        stream = std::make_unique<StreamOutput>(message.config);

@@ -120,7 +121,7 @@ void ReplayProcessor::replay_config(const ReplayConfigMessage& message) {
 }

 int main() {
-    EventDispatcher event_dispatcher{std::make_unique<ReplayProcessor>()};
+    EventDispatcher event_dispatcher{std::make_unique<GPSReplayProcessor>()};
    event_dispatcher.run();
    return 0;
 }
@@ -34,20 +34,17 @@
 #include <array>
 #include <memory>

-class ReplayProcessor : public BasebandProcessor {
+class GPSReplayProcessor : public BasebandProcessor {
   public:
-    ReplayProcessor();
+    GPSReplayProcessor();

    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
-    size_t baseband_fs = 0;
+    size_t baseband_fs = 3072000;
    static constexpr auto spectrum_rate_hz = 50.0f;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    std::array<complex8_t, 2048> iq{};
    const buffer_c8_t iq_buffer{
        iq.data(),
@@ -72,6 +69,10 @@ class ReplayProcessor : public BasebandProcessor {

    TXProgressMessage txprogress_message{};
    RequestSignalMessage sig_message{RequestSignalMessage::Signal::FillRequest};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{
+        baseband_fs, this, baseband::Direction::Transmit, /*auto_start*/ false};
 };

 #endif /*__PROC_GPS_SIM_HPP__*/
@@ -33,14 +33,11 @@ using namespace jammer;
 class JammerProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const msg) override;

   private:
    bool configured{false};

-    BasebandThread baseband_thread{3072000, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    JammerChannel* jammer_channels{};

    JammerType noise_type{};
@@ -54,6 +51,9 @@ class JammerProcessor : public BasebandProcessor {
    int8_t sample{0};
    int8_t re{0}, im{0};
    RetuneMessage message{};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{3072000, this, baseband::Direction::Transmit};
 };

 #endif
@@ -32,7 +32,6 @@
 class MicTXProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const msg) override;

   private:
@@ -40,8 +39,6 @@ class MicTXProcessor : public BasebandProcessor {

    bool configured{false};

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    int16_t audio_data[64];
    buffer_s16_t audio_buffer{
        audio_data,
@@ -74,6 +71,9 @@ class MicTXProcessor : public BasebandProcessor {

    AudioLevelReportMessage level_message{};
    TXProgressMessage txprogress_message{};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Transmit};
 };

 #endif
@@ -42,15 +42,11 @@
 class NarrowbandFMAudio : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
    static constexpr size_t baseband_fs = 3072000;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -97,12 +93,16 @@ class NarrowbandFMAudio : public BasebandProcessor {
    static constexpr float ki = 1.0f / k;

    bool configured{false};
+    // RequestSignalMessage sig_message { RequestSignalMessage::Signal::Squelched };
+    CodedSquelchMessage ctcss_message{0};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};
+
    void pitch_rssi_config(const PitchRSSIConfigureMessage& message);
    void configure(const NBFMConfigureMessage& message);
    void capture_config(const CaptureConfigMessage& message);
-
-    // RequestSignalMessage sig_message { RequestSignalMessage::Signal::Squelched };
-    CodedSquelchMessage ctcss_message{0};
 };

 #endif /*__PROC_NFM_AUDIO_H__*/
@@ -31,7 +31,8 @@ class NOOPProcessor : public BasebandProcessor {
    void execute(const buffer_c8_t& buffer) override;

   private:
-    BasebandThread baseband_thread{1536000, this, NORMALPRIO + 20, baseband::Direction::Transmit};
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{1536000, this, baseband::Direction::Transmit};
 };

 #endif
@@ -39,16 +39,12 @@
 class NRFRxProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
    static constexpr size_t baseband_fs = 4000000;
    static constexpr size_t audio_fs = baseband_fs / 8 / 8 / 2;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -82,10 +78,13 @@ class NRFRxProcessor : public BasebandProcessor {
    int RB_SIZE{1000};

    bool configured{false};
+    AFSKDataMessage data_message{false, 0};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};

    void configure(const NRFRxConfigureMessage& message);
-
-    AFSKDataMessage data_message{false, 0};
 };

 #endif /*__PROC_NRFRX_H__*/
@@ -29,14 +29,11 @@
 class OOKProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const p) override;

   private:
    bool configured = false;

-    BasebandThread baseband_thread{2280000, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    uint32_t samples_per_bit{0};
    uint8_t repeat{0};
    uint32_t length{0};
@@ -67,6 +64,9 @@ class OOKProcessor : public BasebandProcessor {
    size_t scan_progress{0};
    uint8_t scan_done{true};

+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{2280000, this, baseband::Direction::Transmit};
+
    size_t duval_algo_step();
    void scan_process(const buffer_c8_t& buffer);
    bool scan_init(unsigned int order);
@@ -129,7 +129,6 @@ class SmoothVals {
 class POCSAGProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

    int OnDataFrame(int len, int baud);
@@ -138,9 +137,6 @@ class POCSAGProcessor : public BasebandProcessor {
   private:
    static constexpr size_t baseband_fs = 3072000;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -166,7 +162,6 @@ class POCSAGProcessor : public BasebandProcessor {
    // ----------------------------------------
    // Frame extractraction methods and members
    // ----------------------------------------
-   private:
    void initFrameExtraction();
    struct FIFOStruct {
        unsigned long codeword;
@@ -219,6 +214,10 @@ class POCSAGProcessor : public BasebandProcessor {
    bool m_gotSync{false};
    int m_numCode{0};
    bool m_inverted{false};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};
 };

 #endif /*__PROC_POCSAG_H__*/
@@ -33,14 +33,11 @@
 class RDSProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const msg) override;

   private:
    uint32_t* rdsdata{};

-    BasebandThread baseband_thread{2280000, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    uint16_t message_length{0};
    int8_t re{0}, im{0};
    uint8_t mphase{0}, s{0};
@@ -132,6 +129,9 @@ class RDSProcessor : public BasebandProcessor {
        0, -14, -27, -41, -53, -66, -77, -88,
        -99, -109, -118, -126, -134, -141, -147, -152,
        -157, -160, -163, -166, -167, -168, -168, -167};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{2280000, this, baseband::Direction::Transmit};
 };

 #endif
@@ -38,12 +38,13 @@ ReplayProcessor::ReplayProcessor() {
    channel_spectrum.set_decimation_factor(1);

    configured = false;
+    baseband_thread.start();
 }

 void ReplayProcessor::execute(const buffer_c8_t& buffer) {
    /* 4MHz, 2048 samples */

-    if (!configured) return;
+    if (!configured || !stream) return;

    // File data is in C16 format, we need C8
    // File samplerate is 500kHz, we're at 4MHz
@@ -52,13 +53,14 @@ void ReplayProcessor::execute(const buffer_c8_t& buffer) {
    // 2048 samples * 2 bytes per sample = 4096 bytes
    // Since we're oversampling by 4M/500k = 8, we only need 2048/8 = 256 samples from the file and duplicate them 8 times each
    // So 256 * 4 bytes per sample (C16) = 1024 bytes from the file
-    if (stream) {
-        const size_t bytes_to_read = sizeof(*buffer.p) * 2 * (buffer.count / 8);  // *2 (C16), /8 (oversampling) should be == 1024
-        bytes_read += stream->read(iq_buffer.p, bytes_to_read);
-    }
+    const size_t bytes_to_read = sizeof(*buffer.p) * 2 * (buffer.count / 8);  // *2 (C16), /8 (oversampling) should be == 1024
+    size_t bytes_read_this_iteration = stream->read(iq_buffer.p, bytes_to_read);
+    size_t oversamples_this_iteration = bytes_read_this_iteration * 8 / (sizeof(*buffer.p) * 2);
+
+    bytes_read += bytes_read_this_iteration;

    // Fill and "stretch"
-    for (size_t i = 0; i < buffer.count; i++) {
+    for (size_t i = 0; i < oversamples_this_iteration; i++) {
        if (i & 7) {
            buffer.p[i] = buffer.p[i - 1];
        } else {
@@ -68,7 +70,7 @@ void ReplayProcessor::execute(const buffer_c8_t& buffer) {
        }
    }

-    spectrum_samples += buffer.count;
+    spectrum_samples += oversamples_this_iteration;
    if (spectrum_samples >= spectrum_interval_samples) {
        spectrum_samples -= spectrum_interval_samples;
        channel_spectrum.feed(iq_buffer, channel_filter_low_f, channel_filter_high_f, channel_filter_transition);
@@ -38,15 +38,12 @@ class ReplayProcessor : public BasebandProcessor {
    ReplayProcessor();

    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
-    size_t baseband_fs = 0;
+    size_t baseband_fs = 3072000;
    static constexpr auto spectrum_rate_hz = 50.0f;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    std::array<complex16_t, 256> iq{};
    const buffer_c16_t iq_buffer{
        iq.data(),
@@ -71,6 +68,10 @@ class ReplayProcessor : public BasebandProcessor {

    TXProgressMessage txprogress_message{};
    RequestSignalMessage sig_message{RequestSignalMessage::Signal::FillRequest};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{
+        baseband_fs, this, baseband::Direction::Transmit, /*auto_start*/ false};
 };

 #endif /*__PROC_REPLAY_HPP__*/
@@ -30,14 +30,11 @@
 class SigGenProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const msg) override;

   private:
    bool configured{false};

-    BasebandThread baseband_thread{1536000, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    uint32_t tone_delta{0}, fm_delta{}, tone_phase{0};
    uint8_t tone_shape{};
    uint32_t sample_count{0};
@@ -51,6 +48,9 @@ class SigGenProcessor : public BasebandProcessor {
    // uint8_t lfsr { }, bit { };  						// Finally not used lfsr of 8 bits , bit must be 8-bit to allow bit<<7 later in the code */

    TXProgressMessage txprogress_message{};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{1536000, this, baseband::Direction::Transmit};
 };

 #endif
@@ -35,6 +35,7 @@ SondeProcessor::SondeProcessor() {
    audio_output.configure(false);

    tone_gen.configure(BEEP_BASE_FREQ, 1.0, ToneGen::tone_type::sine, AUDIO_SAMPLE_RATE);
+    baseband_thread.start();
 }

 void SondeProcessor::execute(const buffer_c8_t& buffer) {
@@ -131,9 +131,6 @@ class SondeProcessor : public BasebandProcessor {

    ToneGen tone_gen{};

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -179,6 +176,11 @@ class SondeProcessor : public BasebandProcessor {
            shared_memory.application_queue.push(message);
        }};

+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{
+        baseband_fs, this, baseband::Direction::Receive, /*auto_start*/ false};
+    RSSIThread rssi_thread{};
+
    void play_beep();
    void stop_beep();

@@ -33,7 +33,9 @@ class SpectrumPainterProcessor : public BasebandProcessor {

   private:
    bool configured{false};
-    BasebandThread baseband_thread{3072000, this, NORMALPRIO + 20, baseband::Direction::Transmit};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{3072000, this, baseband::Direction::Transmit};
    Thread* thread{nullptr};

   protected:
@@ -33,7 +33,6 @@ using namespace sstv;
 class SSTVTXProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const p) override;

   private:
@@ -56,8 +55,6 @@ class SSTVTXProcessor : public BasebandProcessor {

    bool configured{false};

-    BasebandThread baseband_thread{3072000, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    uint32_t vis_code_sequence[10]{};
    sstv_scanline scanline_buffer[2]{};
    uint8_t buffer_flip{0}, substep{0};
@@ -76,6 +73,9 @@ class SSTVTXProcessor : public BasebandProcessor {
    int8_t re{}, im{};

    RequestSignalMessage sig_message{RequestSignalMessage::Signal::FillRequest};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{3072000, this, baseband::Direction::Transmit};
 };

 #endif
@@ -29,6 +29,7 @@
 TestProcessor::TestProcessor() {
    decim_0.configure(taps_11k0_decim_0.taps, 33554432);
    decim_1.configure(taps_11k0_decim_1.taps, 131072);
+    baseband_thread.start();
 }

 void TestProcessor::execute(const buffer_c8_t& buffer) {
@@ -52,9 +52,6 @@ class TestProcessor : public BasebandProcessor {
   private:
    static constexpr size_t baseband_fs = 2457600 * 2;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -80,6 +77,11 @@ class TestProcessor : public BasebandProcessor {
            const TestAppPacketMessage message{packet};
            shared_memory.application_queue.push(message);
        }};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{
+        baseband_fs, this, baseband::Direction::Receive, /*auto_start*/ false};
+    RSSIThread rssi_thread{};
 };

 #endif /*__PROC_TEST_H__*/
@@ -31,14 +31,11 @@
 class TonesProcessor : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const p) override;

   private:
    bool configured = false;

-    BasebandThread baseband_thread{1536000, this, NORMALPRIO + 20, baseband::Direction::Transmit};
-
    std::array<int16_t, 32> audio{};  // 2048/64
    const buffer_s16_t audio_buffer{
        (int16_t*)audio.data(),
@@ -63,6 +60,9 @@ class TonesProcessor : public BasebandProcessor {

    TXProgressMessage txprogress_message{};
    AudioOutput audio_output{};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{1536000, this, baseband::Direction::Transmit};
 };

 #endif
@@ -28,6 +28,7 @@
 TPMSProcessor::TPMSProcessor() {
    decim_0.configure(taps_200k_decim_0.taps, 33554432);
    decim_1.configure(taps_200k_decim_1.taps, 131072);
+    baseband_thread.start();
 }

 void TPMSProcessor::execute(const buffer_c8_t& buffer) {
@@ -74,9 +74,6 @@ class TPMSProcessor : public BasebandProcessor {
   private:
    static constexpr size_t baseband_fs = 2457600;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -141,6 +138,11 @@ class TPMSProcessor : public BasebandProcessor {
            const TPMSPacketMessage message{tpms::SignalType::OOK_8k4_Schrader, packet};
            shared_memory.application_queue.push(message);
        }};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{
+        baseband_fs, this, baseband::Direction::Receive, /*auto_start*/ false};
+    RSSIThread rssi_thread{};
 };

 #endif /*__PROC_TPMS_H__*/
@@ -38,16 +38,12 @@
 class WidebandFMAudio : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
    static constexpr size_t baseband_fs = 3072000;
    static constexpr auto spectrum_rate_hz = 50.0f;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    std::array<complex16_t, 512> dst{};
    const buffer_c16_t dst_buffer{
        dst.data(),
@@ -93,6 +89,11 @@ class WidebandFMAudio : public BasebandProcessor {
    size_t spectrum_samples = 0;

    bool configured{false};
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};
+
    void configure(const WFMConfigureMessage& message);
    void capture_config(const CaptureConfigMessage& message);
    void post_message(const buffer_c16_t& data);
@@ -37,22 +37,20 @@
 class WidebandSpectrum : public BasebandProcessor {
   public:
    void execute(const buffer_c8_t& buffer) override;
-
    void on_message(const Message* const message) override;

   private:
    bool configured = false;
-
    size_t baseband_fs = 20000000;

-    BasebandThread baseband_thread{baseband_fs, this, NORMALPRIO + 20};
-    RSSIThread rssi_thread{NORMALPRIO + 10};
-
    SpectrumCollector channel_spectrum{};

    std::array<complex16_t, 256> spectrum{};
-
    size_t phase = 0, trigger = 127;
+
+    /* NB: Threads should be the last members in the class definition. */
+    BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
+    RSSIThread rssi_thread{};
 };

 #endif /*__PROC_WIDEBAND_SPECTRUM_H__*/
@@ -32,16 +32,25 @@ WORKING_AREA(rssi_thread_wa, 128);

 Thread* RSSIThread::thread = nullptr;

-RSSIThread::RSSIThread(const tprio_t priority) {
-    thread = chThdCreateStatic(rssi_thread_wa, sizeof(rssi_thread_wa),
-                               priority, ThreadBase::fn,
-                               this);
+RSSIThread::RSSIThread(bool auto_start, tprio_t priority)
+    : priority_{priority} {
+    if (auto_start) start();
 }

 RSSIThread::~RSSIThread() {
-    chThdTerminate(thread);
-    chThdWait(thread);
-    thread = nullptr;
+    if (thread) {
+        chThdTerminate(thread);
+        chThdWait(thread);
+        thread = nullptr;
+    }
+}
+
+void RSSIThread::start() {
+    if (!thread) {
+        thread = chThdCreateStatic(
+            rssi_thread_wa, sizeof(rssi_thread_wa),
+            priority_, ThreadBase::fn, this);
+    }
 }

 void RSSIThread::run() {
@@ -25,20 +25,32 @@
 #include "thread_base.hpp"

 #include <ch.h>
-
 #include <cstdint>

+/* NB: Because ThreadBase threads start when then are initialized (by default),
+ * they should be the last members in a Processor class to ensure the rest of the
+ * members are fully initialized before data handling starts. If the Procressor
+ * needs to do additional initialization (in its ctor), set 'auto_start' to false
+ * and manually call 'start()' on the thread.
+ * This isn't as relevant for RSSIThread which is entirely self-contained, but
+ * it's good practice to keep all the thread-init together. */
+
 class RSSIThread : public ThreadBase {
   public:
-    RSSIThread(const tprio_t priority);
+    RSSIThread(
+        bool auto_start = true,
+        tprio_t priority = (NORMALPRIO + 10));
    ~RSSIThread();

+    void start() override;
+
   private:
    void run() override;

-    static Thread* thread;
+    const tprio_t priority_;

-    const uint32_t sampling_rate{400000};
+    static Thread* thread;
+    static constexpr uint32_t sampling_rate{400000};
 };

 #endif /*__RSSI_THREAD_H__*/
@@ -65,6 +65,11 @@ struct SharedMemory {
        uint8_t data[512];
    } bb_data{{{{0, 0}}, 0, {0}}};

+    // Set by the M4 to indicate that the baseband app is ready.
+    bool volatile baseband_ready{false};
+    void clear_baseband_ready() { baseband_ready = false; }
+    void set_baseband_ready() { baseband_ready = true; }
+
    uint8_t volatile request_m4_performance_counter{0};
    uint8_t volatile m4_cpu_usage{0};
    uint16_t volatile m4_stack_usage{0};
@@ -28,6 +28,8 @@ class ThreadBase {
   public:
    virtual ~ThreadBase() = default;

+    virtual void start() = 0;
+
   protected:
    static msg_t fn(void* arg) {
        auto obj = static_cast<ThreadBase*>(arg);
Author	SHA1	Message	Date
Mark Thompson	e6ad5efbb7	Touch Test tweak & Scanner default squelch (#1295 ) * Leave nav bar visible at start & change seed * Change default Scanner squelch	2023-07-23 21:06:19 +02:00
Kyle Reed	7bd370b5bc	Fix baseband thread init order bug for all procs. (#1293 )	2023-07-23 08:54:17 +02:00
Mark Thompson	828eb67a52	Remove experimental support for Replaying C32 files (#1294 )	2023-07-23 08:52:23 +02:00
Mark Thompson	c4df2e66be	A Simple Touchscreen Test App (Debug) (#1292 ) * Touchscreen test * Touchscreen test * Touchscreen test * Clang * Moved some Debug menu icons	2023-07-22 16:49:28 -05:00
Kyle Reed	47e95c0c47	Workaround for Capture startup hang (#1285 ) * Attempt to fix Capture startup hang * Pump baseband_queue on M4 startup * Synchronization experiment * Moved SpectrumCapture member, better hang detection for M0 * Prevent execute from working on members until class has been initialized. * Formatting * Remove workaround. * Rebase on next	2023-07-22 10:06:55 -07:00
gullradriel	3b5890d0aa	fix timer and sd settings issue (#1291 )	2023-07-22 16:30:02 +02:00
Mark Thompson	bee2dc17af	Fixes to C8 capture support (#1290 ) * Use divide vs shift in C16->C8 and C32->C16 conversion * Color cyan for .C32 files	2023-07-22 16:12:35 +02:00
Mark Thompson	d6b0173e7a	C8 capture support (#1286 ) * C8 conversion * C8 conversion * C8 support * C8 support * C8 support * C8 support * Don't auto-convert GPS C8 files * C8 support * C8 support * C8 support * Remove hang workaround (different PR) * Comment change * Clang * Clang * Clang * Merged change from PR #1287 * C8 support * C8 support * Improve bandwidth display * Merged minor optimization from PR 1289 * Merge change from PR 1289 * Use complex types for C8/C16 conversion * C8 support * C8 support * C8 support * C8 support * Roll back changes * Roll back C8 changes * C8 support * C8 support * C8 support * C8 support * C8 support * Don't transmit samples past EOF * Don't transmit samples past EOF * Clang * Clang attempt * Clang attempt * C8 support * Clang	2023-07-22 02:20:56 -05:00