From 63d0201b71ae6490af0a43f65ffb6fe41f936437 Mon Sep 17 00:00:00 2001 From: GullCode Date: Thu, 16 Mar 2023 11:32:26 +0100 Subject: [PATCH] Fixing set freq and min step value --- firmware/application/apps/ui_looking_glass_app.cpp | 9 +++++++++ firmware/application/apps/ui_looking_glass_app.hpp | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/firmware/application/apps/ui_looking_glass_app.cpp b/firmware/application/apps/ui_looking_glass_app.cpp index 0df793faa..417fc5e48 100644 --- a/firmware/application/apps/ui_looking_glass_app.cpp +++ b/firmware/application/apps/ui_looking_glass_app.cpp @@ -199,7 +199,10 @@ namespace ui field_frequency_min.on_change = [this](int32_t v) { if( v > 7200 - steps ) + { v = 7200 - steps ; + field_frequency_min.set_value( v ); + } if (v >= (field_frequency_max.value() - steps ) ) field_frequency_max.set_value( v + steps ); this->on_range_changed(); @@ -214,6 +217,7 @@ namespace ui field_frequency_min.set_value( freq ); if( field_frequency_max.value() < ( freq + steps ) ) field_frequency_max.set_value( freq + steps ); + this->on_range_changed(); }; }; @@ -222,7 +226,10 @@ namespace ui field_frequency_max.on_change = [this](int32_t v) { if( v < steps ) + { v = steps ; + field_frequency_max.set_value( v ); + } if (v < (field_frequency_min.value() + steps) ) field_frequency_min.set_value(v - steps); this->on_range_changed(); @@ -237,6 +244,7 @@ namespace ui field_frequency_max.set_value( freq ); if( field_frequency_min.value() > ( freq - steps) ) field_frequency_min.set_value( freq - steps ); + this->on_range_changed(); }; }; @@ -258,6 +266,7 @@ namespace ui (void)n; field_frequency_min.set_step( v ); field_frequency_max.set_step( v ); + steps = v ; }; range_presets.on_change = [this](size_t n, OptionsField::value_t v) diff --git a/firmware/application/apps/ui_looking_glass_app.hpp b/firmware/application/apps/ui_looking_glass_app.hpp index f9089b1ed..05f950d13 100644 --- a/firmware/application/apps/ui_looking_glass_app.hpp +++ b/firmware/application/apps/ui_looking_glass_app.hpp @@ -133,7 +133,7 @@ namespace ui { 22 * 8, 4 * 16}, 4, { - {"1", 1}, + {"20", 20}, {"50", 50}, {"100", 100}, {"250", 250},