From a153cbf30bdee570653d10e1ff2aae60f686769f Mon Sep 17 00:00:00 2001
From: Luca <61653175+iu2frl@users.noreply.github.com>
Date: Mon, 14 Apr 2025 20:59:50 +0200
Subject: [PATCH] Adding 8.33KHz spacing (#2628)

* Adding 8.33KHz spacing
* remove extern options_db_t freqman_steps which is now brought by ui_receiver.hpp
* use freqman db steps instead of static array
Co-authored-by: gullradriel <gullradriel@no-mail.com>
---
 firmware/application/apps/ui_freqman.cpp |  2 +-
 firmware/application/ui/ui_receiver.hpp  | 27 ++++++++++--------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/firmware/application/apps/ui_freqman.cpp b/firmware/application/apps/ui_freqman.cpp
index c8ba87c3a..8df9c8872 100644
--- a/firmware/application/apps/ui_freqman.cpp
+++ b/firmware/application/apps/ui_freqman.cpp
@@ -46,7 +46,7 @@ using options_db_t = std::vector<option_db_t>;
 
 extern options_db_t freqman_modulations;
 extern options_db_t freqman_bandwidths[5];
-extern options_db_t freqman_steps;
+// extern options_db_t freqman_steps; // now included via ui_receiver.hpp
 extern options_db_t freqman_steps_short;
 
 options_t dboptions_to_options(const options_db_t& dboptions) {
diff --git a/firmware/application/ui/ui_receiver.hpp b/firmware/application/ui/ui_receiver.hpp
index 2b702dd92..45440840d 100644
--- a/firmware/application/ui/ui_receiver.hpp
+++ b/firmware/application/ui/ui_receiver.hpp
@@ -29,6 +29,7 @@
 
 #include "irq_controls.hpp"
 #include "rf_path.hpp"
+#include "freqman_db.hpp"
 
 #include <cstddef>
 #include <cstdint>
@@ -37,6 +38,10 @@
 
 #define MAX_UFREQ 7200000000  // maximum usable frequency
 
+using option_db_t = std::pair<std::string_view, int32_t>;
+using options_db_t = std::vector<option_db_t>;
+extern options_db_t freqman_steps;
+
 namespace ui {
 
 class FrequencyField : public Widget {
@@ -263,22 +268,12 @@ class FrequencyStepView : public OptionsField {
         : OptionsField{
               parent_pos,
               5,
-              {
-                  {"   10", 10}, /* Fine tuning SSB voice pitch,in HF and QO-100 sat #669 */
-                  {"   50", 50}, /* added 50Hz/10Hz,but we do not increase GUI digit decimal */
-                  {"  100", 100},
-                  {"  1k ", 1000},
-                  {"  3k ", 3000}, /* Approximate SSB bandwidth */
-                  {"  5k ", 5000},
-                  {"  6k3", 6250},
-                  {"  9k ", 9000}, /* channel spacing for LF, MF in some regions */
-                  {" 10k ", 10000},
-                  {" 12k5", 12500},
-                  {" 25k ", 25000},
-                  {"100k ", 100000},
-                  {"  1M ", 1000000},
-                  {" 10M ", 10000000},
-              }} {
+              {}} {
+        options_t options;
+        for (const auto& step : freqman_steps) {
+            options.emplace_back(step.first, step.second);
+        }
+        set_options(options);
     }
 };