From f19a9f9f3d420b0e9e786710f7ddd63d17a96a2d Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Mon, 1 Feb 2021 15:17:41 +0100 Subject: [PATCH 1/3] 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; } From 05c85e8fcdb9db3aabacb359efcfb35f426ab824 Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Mon, 1 Feb 2021 16:36:55 +0100 Subject: [PATCH 2/3] Text correction --- ui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui.c b/ui.c index 15e1d4f..8af2a06 100644 --- a/ui.c +++ b/ui.c @@ -1995,7 +1995,7 @@ menu_select_touch(int i, int pos) uistat.value = setting.slider_span; set_keypad_value(keypad); #if 1 - plot_printf(center_text, sizeof center_text, "WIDTH: %%s"); + plot_printf(center_text, sizeof center_text, "RANGE: %%s"); #else center_text[0] = 'S'; center_text[1] = 'P'; From 0dadd2e2db9e323505a59bdd87bdc4c47f6db888 Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Wed, 3 Feb 2021 08:20:20 +0100 Subject: [PATCH 3/3] Solved hangup bug when modulation was active --- ui.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui.c b/ui.c index 8af2a06..7dbf96d 100644 --- a/ui.c +++ b/ui.c @@ -2022,7 +2022,6 @@ menu_select_touch(int i, int pos) apply_step: set_keypad_value(keypad); apply: - perform(false, 0, get_sweep_frequency(ST_CENTER), false); draw_menu(); // } // } else if (MT_MASK(menu[i].type) == MT_ADV_CALLBACK && menu[i].reference == menu_sdrive_acb) { @@ -2511,7 +2510,7 @@ ui_process_menu(void) //activate: ensure_selection(); draw_menu(); - chThdSleepMilliseconds(100); // Add delay for not move so fast in menu + chThdSleepMilliseconds(50); // Add delay for not move so fast in menu status = btn_wait_release(); } while (status != 0); }