TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-05-03 17:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wfm freqm options (#966)

Browse Source 
* added WFM 180K and 40K options in freqman
* Make audio app use freqman funcs to load modulations bandwidths
This commit is contained in:
gullradriel 2023-05-10 13:16:23 +02:00 committed by GitHub
parent 04e77e0ee8
commit 58e731c56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/application/apps/analog_audio_app.cpp
View File

@ -36,6 +36,8 @@ using namespace tonekey;
#include "string_format.hpp" #include "string_format.hpp"
#include "freqman.hpp"
namespace ui { namespace ui {
/* AMOptionsView *********************************************************/ /* AMOptionsView *********************************************************/
@ -51,6 +53,7 @@ AMOptionsView::AMOptionsView(
&options_config, &options_config,
}); });
freqman_set_bandwidth_option( AM_MODULATION , options_config );
options_config.set_selected_index(receiver_model.am_configuration()); options_config.set_selected_index(receiver_model.am_configuration());
options_config.on_change = [this](size_t n, OptionsField::value_t) { options_config.on_change = [this](size_t n, OptionsField::value_t) {
receiver_model.set_am_configuration(n); receiver_model.set_am_configuration(n);
@ -72,6 +75,7 @@ NBFMOptionsView::NBFMOptionsView(
&field_squelch &field_squelch
}); });
freqman_set_bandwidth_option( NFM_MODULATION , options_config );
options_config.set_selected_index(receiver_model.nbfm_configuration()); options_config.set_selected_index(receiver_model.nbfm_configuration());
options_config.on_change = [this](size_t n, OptionsField::value_t) { options_config.on_change = [this](size_t n, OptionsField::value_t) {
receiver_model.set_nbfm_configuration(n); receiver_model.set_nbfm_configuration(n);
@ -96,6 +100,7 @@ WFMOptionsView::WFMOptionsView(
&options_config, &options_config,
}); });
freqman_set_bandwidth_option( WFM_MODULATION , options_config );
options_config.set_selected_index(receiver_model.wfm_configuration()); options_config.set_selected_index(receiver_model.wfm_configuration());
options_config.on_change = [this](size_t n, OptionsField::value_t) { options_config.on_change = [this](size_t n, OptionsField::value_t) {
receiver_model.set_wfm_configuration(n); receiver_model.set_wfm_configuration(n);

11
firmware/application/apps/analog_audio_app.hpp
View File

@ -55,11 +55,6 @@ private:
{ 3 * 8, 0 * 16 }, { 3 * 8, 0 * 16 },
5, 5,
{ {
{ "DSB 9k ", 0 },
{ "DSB 6k ", 0 },
{ "USB+3k ", 0 },
{ "LSB-3k ", 0 },
{ "CW ", 0 },
} }
}; };
}; };
@ -77,9 +72,6 @@ private:
{ 3 * 8, 0 * 16 }, { 3 * 8, 0 * 16 },
4, 4,
{ {
{ " 8k5", 0 },
{ "11k ", 0 },
{ "16k ", 0 },
} }
}; };
@ -110,9 +102,6 @@ private:
{ 3 * 8, 0 * 16 }, { 3 * 8, 0 * 16 },
3, 3,
{ {
{ "200K", 0 },
{ "180K", 1 },
{ " 40K", 2 },
} }
}; };
}; };

2
firmware/application/freqman.cpp
View File

@ -47,6 +47,8 @@ options_t freqman_entry_bandwidths[ 4 ] = {
}, },
{ //WFM { //WFM
{ "200k" , 0 }, { "200k" , 0 },
{ "180K" , 1 },
{ "40K" , 2 },
} }
}; };