|
|
|
|
@ -1319,9 +1319,7 @@ void check_frequency_slider(freq_t slider_freq)
|
|
|
|
|
static void
|
|
|
|
|
menu_select_touch(int i, int pos)
|
|
|
|
|
{
|
|
|
|
|
long_t step = 0;
|
|
|
|
|
uint32_t mask = (1<<i);
|
|
|
|
|
if (selection>=0) mask|=1<<selection;
|
|
|
|
|
uint32_t mask = (1<<i)|(1<<selection);
|
|
|
|
|
selection = i;
|
|
|
|
|
draw_menu_mask(mask);
|
|
|
|
|
#if 1 // drag values
|
|
|
|
|
@ -1425,6 +1423,7 @@ menu_select_touch(int i, int pos)
|
|
|
|
|
}
|
|
|
|
|
if (menu_is_form(menu) && MT_MASK(menu[i].type) == MT_KEYPAD){
|
|
|
|
|
bool do_exit = false;
|
|
|
|
|
long_t step = 0;
|
|
|
|
|
if (keypad == KM_LOWOUTLEVEL) {
|
|
|
|
|
switch (pos) {
|
|
|
|
|
case 0:step = -10;break;
|
|
|
|
|
@ -1777,8 +1776,7 @@ ui_process_menu_lever(void)
|
|
|
|
|
menu_invoke(selection);
|
|
|
|
|
} else {
|
|
|
|
|
do {
|
|
|
|
|
uint32_t mask = 0;
|
|
|
|
|
if (selection>=0) mask|=1<<selection;
|
|
|
|
|
uint32_t mask = 1<<selection;
|
|
|
|
|
if (status & EVT_UP) {
|
|
|
|
|
// skip menu item if disabled
|
|
|
|
|
while (menuDisabled(menu[selection+1].type))
|
|
|
|
|
@ -1801,8 +1799,7 @@ ui_process_menu_lever(void)
|
|
|
|
|
}
|
|
|
|
|
//activate:
|
|
|
|
|
ensure_selection();
|
|
|
|
|
if (selection>=0) mask|=1<<selection;
|
|
|
|
|
draw_menu_mask(mask);
|
|
|
|
|
draw_menu_mask(mask|(1<<selection));
|
|
|
|
|
chThdSleepMilliseconds(50); // Add delay for not move so fast in menu
|
|
|
|
|
} while ((status = btn_wait_release()) != 0);
|
|
|
|
|
}
|
|
|
|
|
|