From d3c9dc1f102edc0ae1ca6f379eea939312496a8b Mon Sep 17 00:00:00 2001 From: Brumi-2021 <86470699+Brumi-2021@users.noreply.github.com> Date: Sat, 24 May 2025 18:18:24 +0200 Subject: [PATCH] Storing_selected_NOAA_filter_in_settings_file (#2665) * Storing_selected_NOAA_filter_in_settings_file * format_issues --- firmware/application/app_settings.cpp | 3 +++ firmware/application/app_settings.hpp | 1 + firmware/application/receiver_model.cpp | 2 ++ firmware/application/receiver_model.hpp | 1 + 4 files changed, 7 insertions(+) diff --git a/firmware/application/app_settings.cpp b/firmware/application/app_settings.cpp index 505ed456c..acf93b0ff 100644 --- a/firmware/application/app_settings.cpp +++ b/firmware/application/app_settings.cpp @@ -188,6 +188,7 @@ void copy_to_radio_model(const AppSettings& settings) { settings.am_config_index, settings.nbfm_config_index, settings.wfm_config_index, + settings.wfmam_config_index, settings.squelch); } @@ -218,6 +219,7 @@ void copy_from_radio_model(AppSettings& settings) { settings.am_config_index = receiver_model.am_configuration(); settings.nbfm_config_index = receiver_model.nbfm_configuration(); settings.wfm_config_index = receiver_model.wfm_configuration(); + settings.wfmam_config_index = receiver_model.wfmam_configuration(); } settings.step = receiver_model.frequency_step(); @@ -271,6 +273,7 @@ SettingsManager::SettingsManager( bindings_.emplace_back("am_config_index"sv, &settings_.am_config_index); bindings_.emplace_back("nbfm_config_index"sv, &settings_.nbfm_config_index); bindings_.emplace_back("wfm_config_index"sv, &settings_.wfm_config_index); + bindings_.emplace_back("wfmam_config_index"sv, &settings_.wfmam_config_index); bindings_.emplace_back("squelch"sv, &settings_.squelch); } diff --git a/firmware/application/app_settings.hpp b/firmware/application/app_settings.hpp index dd83c405e..d0c30d5a3 100644 --- a/firmware/application/app_settings.hpp +++ b/firmware/application/app_settings.hpp @@ -139,6 +139,7 @@ struct AppSettings { uint8_t am_config_index = 0; uint8_t nbfm_config_index = 0; uint8_t wfm_config_index = 0; + uint8_t wfmam_config_index = 0; uint8_t squelch = 80; uint8_t volume; // NOTE: update COMMON_APP_SETTINGS_COUNT when adding to this diff --git a/firmware/application/receiver_model.cpp b/firmware/application/receiver_model.cpp index 497f03642..a03d61965 100644 --- a/firmware/application/receiver_model.cpp +++ b/firmware/application/receiver_model.cpp @@ -274,12 +274,14 @@ void ReceiverModel::set_configuration_without_update( size_t new_am_config_index, size_t new_nbfm_config_index, size_t new_wfm_config_index, + size_t new_wfmam_config_index, uint8_t new_squelch_level) { settings_.mode = new_mode; settings_.frequency_step = new_frequency_step; settings_.am_config_index = new_am_config_index; settings_.nbfm_config_index = new_nbfm_config_index; settings_.wfm_config_index = new_wfm_config_index; + settings_.wfmam_config_index = new_wfmam_config_index; settings_.squelch_level = new_squelch_level; } diff --git a/firmware/application/receiver_model.hpp b/firmware/application/receiver_model.hpp index 27e8e8dfa..ea9317bf5 100644 --- a/firmware/application/receiver_model.hpp +++ b/firmware/application/receiver_model.hpp @@ -129,6 +129,7 @@ class ReceiverModel { size_t new_am_config_index, size_t new_nbfm_config_index, size_t new_wfm_config_index, + size_t new_wfmam_config_index, uint8_t new_squelch_level); void configure_from_app_settings(const app_settings::AppSettings& settings);