From f19a9f9f3d420b0e9e786710f7ddd63d17a96a2d Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Mon, 1 Feb 2021 15:17:41 +0100 Subject: [PATCH] Freq quick buttons corrected --- ui.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ui.c b/ui.c index 8ecd9cb..15e1d4f 100644 --- a/ui.c +++ b/ui.c @@ -1832,10 +1832,10 @@ draw_menu_buttons(const menuitem_t *menu) if (MT_MASK(menu[i].type) == MT_KEYPAD) { if (menu[i].data == KM_CENTER) { local_slider_positions = LCD_WIDTH/2+setting.slider_position; - plot_printf(step_text_freq[0], sizeof step_text_freq[0], "-%3.1qHz", setting.slider_span); - plot_printf(step_text_freq[1], sizeof step_text_freq[1], "-%3.1qHz", setting.slider_span/10); - plot_printf(step_text_freq[3], sizeof step_text_freq[3], "+%3.1qHz", setting.slider_span/10); - plot_printf(step_text_freq[4], sizeof step_text_freq[4], "+%3.1qHz", setting.slider_span); + plot_printf(step_text_freq[0], sizeof step_text_freq[0], "-%3.0FHz", (float)setting.slider_span); + plot_printf(step_text_freq[1], sizeof step_text_freq[1], "-%3.0FHz", (float)setting.slider_span/10); + plot_printf(step_text_freq[3], sizeof step_text_freq[3], "+%3.0FHz", (float)setting.slider_span/10); + plot_printf(step_text_freq[4], sizeof step_text_freq[4], "+%3.0FHz", (float)setting.slider_span); for (int i=0; i <= 4; i++) { ili9341_drawstring(step_text_freq[i], button_start+12 + i * MENU_FORM_WIDTH/5, y+button_height-9); } @@ -2077,8 +2077,13 @@ menu_select_touch(int i, int pos) step = setting.slider_span; break; } - uistat.value = get_sweep_frequency(ST_CENTER) + step; + if (step < 0 && get_sweep_frequency(ST_CENTER) < -step) + uistat.value = 0; + else + uistat.value = get_sweep_frequency(ST_CENTER) + step; do_exit = true; + setting.slider_position = 0; // reset slider after step + check_frequency_slider(uistat.value); goto apply_step; }