Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-01-12 07:49:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

ReceiverModel: Use Mode instead of integer.

Browse Source
This commit is contained in:
Jared Boone 2016-07-27 14:51:37 -07:00
parent 371c6e0906
commit f05d917a7c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/application/analog_audio_app.cpp
View File

@ -119,7 +119,7 @@ AnalogAudioView::AnalogAudioView(
}; };
const auto modulation = receiver_model.modulation(); const auto modulation = receiver_model.modulation();
options_modulation.set_by_value(modulation); options_modulation.set_by_value(toUType(modulation));
options_modulation.on_change = [this](size_t, OptionsField::value_t v) { options_modulation.on_change = [this](size_t, OptionsField::value_t v) {
this->on_modulation_changed(static_cast<ReceiverModel::Mode>(v)); this->on_modulation_changed(static_cast<ReceiverModel::Mode>(v));
}; };
@ -286,7 +286,7 @@ void AnalogAudioView::update_modulation(const ReceiverModel::Mode modulation) {
baseband::run_image(image_tag); baseband::run_image(image_tag);
const auto is_wideband_spectrum_mode = (modulation == ReceiverModel::Mode::SpectrumAnalysis); const auto is_wideband_spectrum_mode = (modulation == ReceiverModel::Mode::SpectrumAnalysis);
receiver_model.set_modulation(toUType(modulation)); receiver_model.set_modulation(modulation);
receiver_model.set_sampling_rate(is_wideband_spectrum_mode ? 20000000 : 3072000); receiver_model.set_sampling_rate(is_wideband_spectrum_mode ? 20000000 : 3072000);
receiver_model.set_baseband_bandwidth(is_wideband_spectrum_mode ? 12000000 : 1750000); receiver_model.set_baseband_bandwidth(is_wideband_spectrum_mode ? 12000000 : 1750000);
receiver_model.enable(); receiver_model.enable();

8
firmware/application/receiver_model.cpp
View File

@ -124,11 +124,11 @@ void ReceiverModel::set_sampling_rate(uint32_t v) {
update_sampling_rate(); update_sampling_rate();
} }
uint32_t ReceiverModel::modulation() const { ReceiverModel::Mode ReceiverModel::modulation() const {
return mode_; return mode_;
} }
void ReceiverModel::set_modulation(const uint32_t v) { void ReceiverModel::set_modulation(const Mode v) {
mode_ = v; mode_ = v;
update_modulation(); update_modulation();
} }
@ -171,7 +171,7 @@ void ReceiverModel::disable() {
} }
int32_t ReceiverModel::tuning_offset() { int32_t ReceiverModel::tuning_offset() {
if( (modulation() == 4) ) { if( (modulation() == Mode::SpectrumAnalysis) ) {
return 0; return 0;
} else { } else {
return -(sampling_rate() / 4); return -(sampling_rate() / 4);
@ -242,7 +242,7 @@ void ReceiverModel::update_headphone_volume() {
} }
void ReceiverModel::update_modulation() { void ReceiverModel::update_modulation() {
switch(static_cast<Mode>(modulation())) { switch(modulation()) {
default: default:
case Mode::AMAudio: case Mode::AMAudio:
update_am_configuration(); update_am_configuration();

6
firmware/application/receiver_model.hpp
View File

@ -64,8 +64,8 @@ public:
uint32_t sampling_rate() const; uint32_t sampling_rate() const;
void set_sampling_rate(uint32_t v); void set_sampling_rate(uint32_t v);
uint32_t modulation() const; Mode modulation() const;
void set_modulation(uint32_t v); void set_modulation(Mode v);
volume_t headphone_volume() const; volume_t headphone_volume() const;
void set_headphone_volume(volume_t v); void set_headphone_volume(volume_t v);
@ -92,7 +92,7 @@ private:
int32_t lna_gain_db_ { 32 }; int32_t lna_gain_db_ { 32 };
uint32_t baseband_bandwidth_ { max2837::filter::bandwidth_minimum }; uint32_t baseband_bandwidth_ { max2837::filter::bandwidth_minimum };
int32_t vga_gain_db_ { 32 }; int32_t vga_gain_db_ { 32 };
uint32_t mode_ { 1 }; Mode mode_ { Mode::NarrowbandFMAudio };
uint32_t sampling_rate_ { 3072000 }; uint32_t sampling_rate_ { 3072000 };
size_t decimation_factor_ { 1 }; size_t decimation_factor_ { 1 };
size_t am_config_index = 0; size_t am_config_index = 0;