Freq quick buttons corrected

master
erikkaashoek 5 years ago
parent 876b832a44
commit f19a9f9f3d

15
ui.c

@ -1832,10 +1832,10 @@ draw_menu_buttons(const menuitem_t *menu)
if (MT_MASK(menu[i].type) == MT_KEYPAD) { if (MT_MASK(menu[i].type) == MT_KEYPAD) {
if (menu[i].data == KM_CENTER) { if (menu[i].data == KM_CENTER) {
local_slider_positions = LCD_WIDTH/2+setting.slider_position; 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[0], sizeof step_text_freq[0], "-%3.0FHz", (float)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[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.1qHz", 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.1qHz", setting.slider_span); plot_printf(step_text_freq[4], sizeof step_text_freq[4], "+%3.0FHz", (float)setting.slider_span);
for (int i=0; i <= 4; i++) { 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); 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; step = setting.slider_span;
break; 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; do_exit = true;
setting.slider_position = 0; // reset slider after step
check_frequency_slider(uistat.value);
goto apply_step; goto apply_step;
} }

Loading…
Cancel
Save

Powered by TurnKey Linux.