From 1e2bc703b80ab1d3046336b637e5c9b8481b2fd0 Mon Sep 17 00:00:00 2001 From: GullCode Date: Mon, 27 Mar 2023 23:03:09 +0200 Subject: [PATCH 1/2] Fix to force converter icon to be displayed if enabled --- firmware/application/apps/ui_settings.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/firmware/application/apps/ui_settings.cpp b/firmware/application/apps/ui_settings.cpp index 9c4aa7ffc..40e175b96 100644 --- a/firmware/application/apps/ui_settings.cpp +++ b/firmware/application/apps/ui_settings.cpp @@ -337,6 +337,10 @@ SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) { check_show_converter.set_value(!portapack::persistent_memory::config_hide_converter()); check_show_converter.on_select = [this](Checkbox&, bool v) { portapack::persistent_memory::set_config_hide_converter(!v); + if( !v ) + { + check_converter.set_value(false); + } // Retune to take converter change in account receiver_model.set_tuning_frequency( portapack::persistent_memory::tuned_frequency() ); //Refresh status bar with/out converter @@ -346,6 +350,11 @@ SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) { check_converter.set_value(portapack::persistent_memory::config_converter()); check_converter.on_select = [this](Checkbox&, bool v) { + if( v ) + { + check_show_converter.set_value(true); + portapack::persistent_memory::set_config_hide_converter(false); + } portapack::persistent_memory::set_config_converter(v); // Retune to take converter change in account receiver_model.set_tuning_frequency( portapack::persistent_memory::tuned_frequency() ); From b41be47c9deb5cbeb7fb05056d0df94ad25377b1 Mon Sep 17 00:00:00 2001 From: GullCode Date: Mon, 27 Mar 2023 23:05:46 +0200 Subject: [PATCH 2/2] pesky and non consistent indentation is boring --- firmware/application/apps/ui_settings.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/firmware/application/apps/ui_settings.cpp b/firmware/application/apps/ui_settings.cpp index 40e175b96..6e314adb8 100644 --- a/firmware/application/apps/ui_settings.cpp +++ b/firmware/application/apps/ui_settings.cpp @@ -337,10 +337,10 @@ SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) { check_show_converter.set_value(!portapack::persistent_memory::config_hide_converter()); check_show_converter.on_select = [this](Checkbox&, bool v) { portapack::persistent_memory::set_config_hide_converter(!v); - if( !v ) - { - check_converter.set_value(false); - } + if( !v ) + { + check_converter.set_value(false); + } // Retune to take converter change in account receiver_model.set_tuning_frequency( portapack::persistent_memory::tuned_frequency() ); //Refresh status bar with/out converter @@ -350,11 +350,11 @@ SetConverterSettingsView::SetConverterSettingsView(NavigationView& nav) { check_converter.set_value(portapack::persistent_memory::config_converter()); check_converter.on_select = [this](Checkbox&, bool v) { - if( v ) - { - check_show_converter.set_value(true); - portapack::persistent_memory::set_config_hide_converter(false); - } + if( v ) + { + check_show_converter.set_value(true); + portapack::persistent_memory::set_config_hide_converter(false); + } portapack::persistent_memory::set_config_converter(v); // Retune to take converter change in account receiver_model.set_tuning_frequency( portapack::persistent_memory::tuned_frequency() );