From ca3b1a2c5a6c846492556e5aa70e48b853dadcab Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Wed, 27 Jan 2016 14:25:08 -0800 Subject: [PATCH] Remove more commented code. --- firmware/application/ui_receiver.cpp | 31 ---------------------------- firmware/application/ui_receiver.hpp | 22 -------------------- 2 files changed, 53 deletions(-) diff --git a/firmware/application/ui_receiver.cpp b/firmware/application/ui_receiver.cpp index 67026805..f8bdf748 100644 --- a/firmware/application/ui_receiver.cpp +++ b/firmware/application/ui_receiver.cpp @@ -98,25 +98,7 @@ bool FrequencyField::on_key(const ui::KeyEvent event) { } return false; } -/* -bool FrequencyField::on_key(const ui::KeyEvent event) override { - if( event == ui::KeyEvent::Select ) { - // NOTE: For testing sampling rate / decimation combinations - turbo = !turbo; - if( turbo ) { - clock_manager.set_sampling_frequency(18432000); - radio::set_baseband_decimation_by(6); - } else { - clock_manager.set_sampling_frequency(12288000); - radio::set_baseband_decimation_by(4); - } - return true; - } - - return false; -} -*/ bool FrequencyField::on_encoder(const EncoderEvent delta) { set_value(value() + (delta * step)); return true; @@ -310,19 +292,11 @@ RadioGainOptionsView::RadioGainOptionsView( add_children({ { &label_rf_amp, &field_rf_amp, - //&label_agc, - //&field_agc } }); field_rf_amp.on_change = [this](int32_t v) { this->on_rf_amp_changed(v); }; - /* - field_agc.set_value(receiver_model.agc()); - field_agc.on_change = [this](int32_t v) { - this->on_agc_changed(v); - }; - */ } void RadioGainOptionsView::set_rf_amp(int32_t v_db) { @@ -334,11 +308,6 @@ void RadioGainOptionsView::on_rf_amp_changed(bool enable) { on_change_rf_amp(enable); } } -/* -void RadioGainOptionsView::on_agc_changed(bool v) { - receiver_model.set_agc(v); -} -*/ /* LNAGainField **********************************************************/ diff --git a/firmware/application/ui_receiver.hpp b/firmware/application/ui_receiver.hpp index 91950834..78046e76 100644 --- a/firmware/application/ui_receiver.hpp +++ b/firmware/application/ui_receiver.hpp @@ -72,8 +72,6 @@ private: rf::Frequency value_; rf::Frequency step { 25000 }; - //bool turbo { false }; - rf::Frequency clamp_value(rf::Frequency value); }; @@ -113,13 +111,6 @@ public: } void add_digit(const char c) { - /* - if( justify == Justify::Right ) { - push_right(c); - } else { - insert_right(c); - } - */ insert_right(c); } @@ -212,7 +203,6 @@ private: static constexpr int mhz_mod = pow(10, mhz_digits); static constexpr int submhz_base = pow(10, 6 - submhz_digits); - //static constexpr int submhz_mod = pow(10, submhz_digits); static constexpr int text_digits = mhz_digits + 1 + submhz_digits; Text text_value { @@ -321,18 +311,6 @@ private: 1, ' ', }; - /* - Text label_agc { - { 6 * 8, 0 * 16, 3 * 8, 1 * 16 }, - "AGC" - }; - - NumberField field_agc { - { 10 * 8, 0 * 16}, - 1, - { 0, 1 } - }; - */ void on_rf_amp_changed(bool enable); };