From 17f6475506ed5b05ad82491ac3af0d5230fcc496 Mon Sep 17 00:00:00 2001 From: GullCode Date: Sun, 20 Nov 2022 17:44:11 +0100 Subject: [PATCH 1/3] Added/Renamed AM bandwidth modes --- firmware/application/apps/ui_recon.cpp | 2 +- firmware/application/apps/ui_recon.hpp | 10 +++++----- firmware/application/apps/ui_scanner.cpp | 11 +++++++---- firmware/application/apps/ui_scanner.hpp | 6 +++--- firmware/application/freqman.cpp | 9 +++++---- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/firmware/application/apps/ui_recon.cpp b/firmware/application/apps/ui_recon.cpp index 9109becde..5cb8ea1a8 100644 --- a/firmware/application/apps/ui_recon.cpp +++ b/firmware/application/apps/ui_recon.cpp @@ -1690,7 +1690,7 @@ namespace ui { break; case WFM_MODULATION: freqman_set_bandwidth_option( new_mod , field_bw ); - //bw 16k (0) only/default + //bw 200k (0) only/default field_bw.set_selected_index(0); baseband::run_image(portapack::spi_flash::image_tag_wfm_audio); receiver_model.set_modulation(ReceiverModel::Mode::WidebandFMAudio); diff --git a/firmware/application/apps/ui_recon.hpp b/firmware/application/apps/ui_recon.hpp index 6adacc022..1bfaf6e0c 100644 --- a/firmware/application/apps/ui_recon.hpp +++ b/firmware/application/apps/ui_recon.hpp @@ -207,7 +207,7 @@ namespace ui { Labels labels { { { 0 * 8 , 0 * 16 }, "LNA: VGA: AMP: VOL: ", Color::light_grey() }, - { { 0 * 8 , 1 * 16 }, "BW: SQ: W,L: , ", Color::light_grey() }, + { { 0 * 8 , 1 * 16 }, "BW: SQ: W,L: , ", Color::light_grey() }, { { 3 * 8 , 10 * 16 }, "START END MANUAL", Color::light_grey() }, { { 0 * 8 , (26 * 8) + 4 }, "MODE:", Color::light_grey() }, { { 11 * 8 , (26 * 8) + 4 }, "STEP:", Color::light_grey() }, @@ -235,12 +235,12 @@ namespace ui { OptionsField field_bw { { 3 * 8, 1 * 16 }, - 4, + 6, { } }; NumberField field_squelch { - { 10 * 8, 1 * 16 }, + { 12 * 8, 1 * 16 }, 3, { -90, 20 }, 1, @@ -248,7 +248,7 @@ namespace ui { }; NumberField field_wait { - { 18 * 8, 1 * 16 }, + { 20 * 8, 1 * 16 }, 5, { -9000, 9000 }, 100, @@ -256,7 +256,7 @@ namespace ui { }; NumberField field_lock_wait { - { 24 * 8, 1 * 16 }, + { 26 * 8, 1 * 16 }, 4, { 100 , 9000 }, 100, diff --git a/firmware/application/apps/ui_scanner.cpp b/firmware/application/apps/ui_scanner.cpp index 27fb2b965..bfac89fab 100644 --- a/firmware/application/apps/ui_scanner.cpp +++ b/firmware/application/apps/ui_scanner.cpp @@ -529,10 +529,13 @@ size_t ScannerView::change_mode(uint8_t new_mod) { //Before this, do a scan_thre receiver_model.set_sampling_rate(3072000); receiver_model.set_baseband_bandwidth(1750000); break; case AM: - bw.emplace_back("DSB", 0); - bw.emplace_back("USB", 0); - bw.emplace_back("LSB", 0); - bw.emplace_back("CW ", 0); + bw.emplace_back("DSB+9k" , 0 ); + bw.emplace_back("DSB+6k" , 1 ); + bw.emplace_back("USB+3k" , 2 ); + bw.emplace_back("LSB-3k" , 3 ); + bw.emplace_back("LSB-3k" , 4 ); + bw.emplace_back("CW " , 5 ); + field_bw.set_options(bw); baseband::run_image(portapack::spi_flash::image_tag_am_audio); diff --git a/firmware/application/apps/ui_scanner.hpp b/firmware/application/apps/ui_scanner.hpp index 888d565b9..59f408c2c 100644 --- a/firmware/application/apps/ui_scanner.hpp +++ b/firmware/application/apps/ui_scanner.hpp @@ -143,7 +143,7 @@ private: Labels labels { { { 0 * 8, 0 * 16 }, "LNA: VGA: AMP: VOL:", Color::light_grey() }, - { { 0 * 8, 1* 16 }, "BW: SQUELCH: db WAIT:", Color::light_grey() }, + { { 0 * 8, 1* 16 }, "BW: SQLCH: db WAIT:", Color::light_grey() }, { { 3 * 8, 10 * 16 }, "START END MANUAL", Color::light_grey() }, { { 0 * 8, (26 * 8) + 4 }, "MODE:", Color::light_grey() }, { { 11 * 8, (26 * 8) + 4 }, "STEP:", Color::light_grey() }, @@ -176,7 +176,7 @@ private: }; NumberField field_squelch { - { 15 * 8, 1 * 16 }, + { 18 * 8, 1 * 16 }, 3, { -90, 20 }, 1, @@ -184,7 +184,7 @@ private: }; NumberField field_wait { - { 26 * 8, 1 * 16 }, + { 27 * 8, 1 * 16 }, 2, { 0, 99 }, 1, diff --git a/firmware/application/freqman.cpp b/firmware/application/freqman.cpp index 5869d460c..3ecb2517c 100644 --- a/firmware/application/freqman.cpp +++ b/firmware/application/freqman.cpp @@ -34,10 +34,11 @@ options_t freqman_entry_modulations = { options_t freqman_entry_bandwidths[ 4 ] = { { //AM - { "DSB", 0 }, - { "USB", 1 }, - { "LSB", 2 }, - { "CW" , 3 } + { "DSB+9k" , 0 }, + { "DSB+6k" , 1 }, + { "USB+3k" , 2 }, + { "LSB-3k" , 3 }, + { "CW" , 4 } }, { //NFM { "8k5" , 0 }, From 5f62926af3e538b99394deea4a99d0d89f1e22fe Mon Sep 17 00:00:00 2001 From: GullCode Date: Sun, 20 Nov 2022 18:02:54 +0100 Subject: [PATCH 2/3] Fixed typo --- firmware/application/apps/ui_scanner.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/firmware/application/apps/ui_scanner.cpp b/firmware/application/apps/ui_scanner.cpp index bfac89fab..337716d38 100644 --- a/firmware/application/apps/ui_scanner.cpp +++ b/firmware/application/apps/ui_scanner.cpp @@ -533,8 +533,7 @@ size_t ScannerView::change_mode(uint8_t new_mod) { //Before this, do a scan_thre bw.emplace_back("DSB+6k" , 1 ); bw.emplace_back("USB+3k" , 2 ); bw.emplace_back("LSB-3k" , 3 ); - bw.emplace_back("LSB-3k" , 4 ); - bw.emplace_back("CW " , 5 ); + bw.emplace_back("CW " , 4 ); field_bw.set_options(bw); From 7f6aebbe53d2a2996f3c177e9ccb703c91998b26 Mon Sep 17 00:00:00 2001 From: GullCode Date: Sun, 20 Nov 2022 18:29:20 +0100 Subject: [PATCH 3/3] Fixed typos --- firmware/application/apps/ui_scanner.cpp | 4 ++-- firmware/application/freqman.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/application/apps/ui_scanner.cpp b/firmware/application/apps/ui_scanner.cpp index 337716d38..0ad706cd2 100644 --- a/firmware/application/apps/ui_scanner.cpp +++ b/firmware/application/apps/ui_scanner.cpp @@ -529,8 +529,8 @@ size_t ScannerView::change_mode(uint8_t new_mod) { //Before this, do a scan_thre receiver_model.set_sampling_rate(3072000); receiver_model.set_baseband_bandwidth(1750000); break; case AM: - bw.emplace_back("DSB+9k" , 0 ); - bw.emplace_back("DSB+6k" , 1 ); + bw.emplace_back("DSB 9k" , 0 ); + bw.emplace_back("DSB 6k" , 1 ); bw.emplace_back("USB+3k" , 2 ); bw.emplace_back("LSB-3k" , 3 ); bw.emplace_back("CW " , 4 ); diff --git a/firmware/application/freqman.cpp b/firmware/application/freqman.cpp index 3ecb2517c..467782e34 100644 --- a/firmware/application/freqman.cpp +++ b/firmware/application/freqman.cpp @@ -34,8 +34,8 @@ options_t freqman_entry_modulations = { options_t freqman_entry_bandwidths[ 4 ] = { { //AM - { "DSB+9k" , 0 }, - { "DSB+6k" , 1 }, + { "DSB 9k" , 0 }, + { "DSB 6k" , 1 }, { "USB+3k" , 2 }, { "LSB-3k" , 3 }, { "CW" , 4 }