From 728bb6454370be1c761005aed3fd150d4dcba771 Mon Sep 17 00:00:00 2001 From: furrtek Date: Sat, 12 Aug 2017 19:28:57 +0100 Subject: [PATCH] BW setting in TX view should now be used everywhere Jammer center and width value editing bugfix --- firmware/application/main.cpp | 1 - firmware/application/transmitter_model.cpp | 8 ++++---- firmware/application/transmitter_model.hpp | 6 +++--- firmware/application/ui_bht_tx.cpp | 4 ++-- firmware/application/ui_jammer.cpp | 4 ++-- firmware/application/ui_mictx.cpp | 4 ++-- firmware/application/ui_morse.cpp | 2 +- firmware/application/ui_nuoptix.cpp | 2 +- firmware/application/ui_siggen.cpp | 2 +- firmware/application/ui_transmitter.cpp | 14 +++++++------- firmware/application/ui_transmitter.hpp | 8 ++++---- 11 files changed, 27 insertions(+), 28 deletions(-) diff --git a/firmware/application/main.cpp b/firmware/application/main.cpp index 6138ff75..5cfe7939 100755 --- a/firmware/application/main.cpp +++ b/firmware/application/main.cpp @@ -50,7 +50,6 @@ Continuous (Fox-oring) 60s transmit, 240s space (Classic 1/5 min) 60s transmit, 360s space (Classic 1/7 min) */ -//TODO: Use transmittermodel bw setting //TODO: Use TransmitterView in TEDI/LCR, Numbers, ... //TODO: FreqMan: Remove and rename categories //TODO: Wav visualizer diff --git a/firmware/application/transmitter_model.cpp b/firmware/application/transmitter_model.cpp index 71af7be6..16dab39a 100644 --- a/firmware/application/transmitter_model.cpp +++ b/firmware/application/transmitter_model.cpp @@ -79,12 +79,12 @@ void TransmitterModel::set_vga(int32_t v_db) { update_vga(); } -uint32_t TransmitterModel::bandwidth() const { - return bandwidth_; +uint32_t TransmitterModel::channel_bandwidth() const { + return channel_bandwidth_; } -void TransmitterModel::set_bandwidth(uint32_t v) { - bandwidth_ = v; +void TransmitterModel::set_channel_bandwidth(uint32_t v) { + channel_bandwidth_ = v; } uint32_t TransmitterModel::sampling_rate() const { diff --git a/firmware/application/transmitter_model.hpp b/firmware/application/transmitter_model.hpp index 669c254f..91176732 100644 --- a/firmware/application/transmitter_model.hpp +++ b/firmware/application/transmitter_model.hpp @@ -53,8 +53,8 @@ public: int32_t tx_gain() const; void set_tx_gain(int32_t v_db); - uint32_t bandwidth() const; - void set_bandwidth(uint32_t v); + uint32_t channel_bandwidth() const; + void set_channel_bandwidth(uint32_t v); uint32_t sampling_rate() const; void set_sampling_rate(uint32_t v); @@ -66,7 +66,7 @@ private: bool enabled_ { false }; bool rf_amp_ { true }; int32_t lna_gain_db_ { 0 }; - uint32_t bandwidth_ { 1 }; + uint32_t channel_bandwidth_ { 1 }; uint32_t baseband_bandwidth_ { max2837::filter::bandwidth_minimum }; int32_t vga_gain_db_ { 8 }; int32_t tx_gain_db_ { 47 }; diff --git a/firmware/application/ui_bht_tx.cpp b/firmware/application/ui_bht_tx.cpp index b2a5741d..5494644e 100644 --- a/firmware/application/ui_bht_tx.cpp +++ b/firmware/application/ui_bht_tx.cpp @@ -61,7 +61,7 @@ void BHTView::start_tx() { for (c = 0; c < 16; c++) baseband::set_tone(c, ccir_deltas[c], XY_TONE_LENGTH); - baseband::set_tones_config(transmitter_model.bandwidth(), XY_SILENCE, 20, false, false); + baseband::set_tones_config(transmitter_model.channel_bandwidth(), XY_SILENCE, 20, false, false); } void BHTView::on_tx_progress(const int progress, const bool done) { @@ -279,7 +279,7 @@ BHTView::BHTView(NavigationView& nav) { tx_view.on_edit_frequency = [this, &nav]() { auto new_view = nav.push(receiver_model.tuning_frequency()); new_view->on_changed = [this](rf::Frequency f) { - receiver_model.set_tuning_frequency(f); + transmitter_model.set_tuning_frequency(f); }; }; diff --git a/firmware/application/ui_jammer.cpp b/firmware/application/ui_jammer.cpp index 69b2194f..0ee7016f 100644 --- a/firmware/application/ui_jammer.cpp +++ b/firmware/application/ui_jammer.cpp @@ -153,7 +153,7 @@ RangeView::RangeView(NavigationView& nav) { }; button_center.on_select = [this, &nav](Button& button) { - auto new_view = nav.push(frequency_range.max); + auto new_view = nav.push(center); new_view->on_changed = [this, &button](rf::Frequency f) { update_center(f); }; @@ -162,7 +162,7 @@ RangeView::RangeView(NavigationView& nav) { }; button_width.on_select = [this, &nav](Button& button) { - auto new_view = nav.push(frequency_range.max); + auto new_view = nav.push(width); new_view->on_changed = [this, &button](rf::Frequency f) { update_width(f); }; diff --git a/firmware/application/ui_mictx.cpp b/firmware/application/ui_mictx.cpp index 3510e8f9..4b74bea8 100644 --- a/firmware/application/ui_mictx.cpp +++ b/firmware/application/ui_mictx.cpp @@ -67,7 +67,7 @@ void MicTXView::set_tx(bool enable) { baseband::set_audiotx_data( 1536000U / 20, // 20Hz level update - transmitter_model.bandwidth(), + transmitter_model.channel_bandwidth(), mic_gain_x10, ctcss_enabled, (uint32_t)((ctcss_tones[ctcss_index].frequency / 1536000.0) * 0xFFFFFFFFULL) @@ -181,7 +181,7 @@ MicTXView::MicTXView( }; field_bw.on_change = [this](uint32_t v) { - transmitter_model.set_bandwidth(v * 1000); + transmitter_model.set_channel_bandwidth(v * 1000); }; field_bw.set_value(10); diff --git a/firmware/application/ui_morse.cpp b/firmware/application/ui_morse.cpp index 426ab901..195cde88 100644 --- a/firmware/application/ui_morse.cpp +++ b/firmware/application/ui_morse.cpp @@ -108,7 +108,7 @@ bool MorseView::start_tx() { if (modulation == CW) { ookthread = chThdCreateStatic(ookthread_wa, sizeof(ookthread_wa), NORMALPRIO + 10, ookthread_fn, this); } else if (modulation == FM) { - baseband::set_tones_config(transmitter_model.bandwidth(), 0, symbol_count, false, false); + baseband::set_tones_config(transmitter_model.channel_bandwidth(), 0, symbol_count, false, false); } return true; diff --git a/firmware/application/ui_nuoptix.cpp b/firmware/application/ui_nuoptix.cpp index 8efe4dba..b003868b 100644 --- a/firmware/application/ui_nuoptix.cpp +++ b/firmware/application/ui_nuoptix.cpp @@ -131,7 +131,7 @@ void NuoptixView::transmit(bool setup) { shared_memory.bb_data.tones_data.silence = NUOPTIX_TONE_LENGTH; // 49ms tone, 49ms space audio::set_rate(audio::Rate::Hz_24000); - baseband::set_tones_config(transmitter_model.bandwidth(), 0, 6 * 2, true, true); + baseband::set_tones_config(transmitter_model.channel_bandwidth(), 0, 6 * 2, true, true); timecode++; } diff --git a/firmware/application/ui_siggen.cpp b/firmware/application/ui_siggen.cpp index 57936b58..dfc28028 100644 --- a/firmware/application/ui_siggen.cpp +++ b/firmware/application/ui_siggen.cpp @@ -53,7 +53,7 @@ void SigGenView::start_tx() { auto duration = field_stop.value(); if (!checkbox_auto.value()) duration = 0; - baseband::set_siggen_config(transmitter_model.bandwidth(), options_shape.selected_index_value(), duration); + baseband::set_siggen_config(transmitter_model.channel_bandwidth(), options_shape.selected_index_value(), duration); } void SigGenView::update_tone() { diff --git a/firmware/application/ui_transmitter.cpp b/firmware/application/ui_transmitter.cpp index 543daad8..3a7a861d 100644 --- a/firmware/application/ui_transmitter.cpp +++ b/firmware/application/ui_transmitter.cpp @@ -75,8 +75,8 @@ void TransmitterView::on_tuning_frequency_changed(rf::Frequency f) { receiver_model.set_tuning_frequency(f); } -void TransmitterView::on_bandwidth_changed(uint32_t bandwidth) { - //transmitter_model.set_bandwidth(bandwidth); +void TransmitterView::on_channel_bandwidth_changed(uint32_t channel_bandwidth) { + transmitter_model.set_channel_bandwidth(channel_bandwidth); } void TransmitterView::set_transmitting(const bool transmitting) { @@ -100,7 +100,7 @@ void TransmitterView::focus() { } TransmitterView::TransmitterView( - const Coord y, const uint64_t frequency_step, const uint32_t bandwidth, const bool lock + const Coord y, const uint64_t frequency_step, const uint32_t channel_bandwidth, const bool lock ) : lock_ { lock } { set_parent_rect({ 0, y, 30 * 8, 6 * 8 }); @@ -118,16 +118,16 @@ TransmitterView::TransmitterView( field_frequency.set_focusable(false); field_frequency.set_style(&style_locked); } else { - if (bandwidth) { + if (channel_bandwidth) { add_children({ &text_bw, &field_bw }); - field_bw.on_change = [this](int32_t bandwidth) { - on_bandwidth_changed(bandwidth * 1000); + field_bw.on_change = [this](int32_t v) { + on_channel_bandwidth_changed(v * 1000); }; - field_bw.set_value(bandwidth); + field_bw.set_value(channel_bandwidth); } } diff --git a/firmware/application/ui_transmitter.hpp b/firmware/application/ui_transmitter.hpp index 7090f7cc..de21f993 100644 --- a/firmware/application/ui_transmitter.hpp +++ b/firmware/application/ui_transmitter.hpp @@ -52,10 +52,10 @@ public: std::function on_start { }; std::function on_stop { }; - TransmitterView(const Coord y, const uint64_t frequency_step, const uint32_t bandwidth, const bool lock); + TransmitterView(const Coord y, const uint64_t frequency_step, const uint32_t channel_bandwidth, const bool lock); TransmitterView( - const Coord y, const uint32_t frequency_step, const uint32_t bandwidth - ) : TransmitterView { y, frequency_step, bandwidth, false } + const Coord y, const uint32_t frequency_step, const uint32_t channel_bandwidth + ) : TransmitterView { y, frequency_step, channel_bandwidth, false } { } @@ -117,7 +117,7 @@ private: }; void on_tuning_frequency_changed(rf::Frequency f); - void on_bandwidth_changed(uint32_t bandwidth); + void on_channel_bandwidth_changed(uint32_t channel_bandwidth); }; } /* namespace ui */