KB8PMY
/
tinySA
mirror of https://github.com/erikkaashoek/tinySA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slider ui fix

Browse Source
multi_trace
DiSlord 5 years ago committed by erikkaashoek
parent ee2af4df40
commit 1b7219f7c7
1 changed files with 119 additions and 144 deletions
Show Stats Download Patch File Download Diff File

263
ui.c
Unescape View File

@ -358,16 +358,6 @@ touch_check(void)
} }
#endif #endif
} }
#if 0 // Long press detection
systime_t ticks = chVTGetSystemTimeX();
if (stat && !last_touch_status) { // new button, initialize
prev_touch_time = ticks;
}
dt = ticks - prev_touch_time;
if (stat && stat == last_touch_status && dt > BUTTON_DOWN_LONG_TICKS) {return EVT_TOUCH_LONGPRESS;}
#endif
if (stat != last_touch_status) { if (stat != last_touch_status) {
last_touch_status = stat; last_touch_status = stat;
return stat ? EVT_TOUCH_PRESSED : EVT_TOUCH_RELEASED; return stat ? EVT_TOUCH_PRESSED : EVT_TOUCH_RELEASED;
@ -1326,138 +1316,120 @@ void check_frequency_slider(freq_t slider_freq)
} }
} }
#define TOUCH_DEAD_ZONE 40
static void static void
menu_select_touch(int i, int pos) menu_select_touch(int i, int pos)
{ {
long_t step = 0; long_t step = 0;
int do_exit = false; int do_exit = false;
selection = i; selection = i;
draw_menu(); draw_menu_mask(1<<i);
#if 1 // drag values #if 1 // drag values
const menuitem_t *menu = menu_stack[menu_current_level]; const menuitem_t *menu = menu_stack[menu_current_level];
int old_keypad_mode = keypad_mode; int old_keypad_mode = keypad_mode;
int keypad = menu[i].data; int keypad = menu[i].data;
systime_t prev_touch_time = chVTGetSystemTimeX(); int touch_x, touch_y, prev_touch_x = 0;
systime_t wait = BUTTON_DOWN_LONG_TICKS;
int touch_x, touch_y, prev_touch_x = 0;
// touch_position(&touch_x, &touch_y); // touch_position(&touch_x, &touch_y);
systime_t dt = 0; systime_t dt = 0;
int mode = SL_UNKNOWN; int mode = SL_UNKNOWN;
while (touch_check() != EVT_TOUCH_NONE) { systime_t ticks = chVTGetSystemTimeX();
while (touch_check() != EVT_TOUCH_NONE){
systime_t ticks = chVTGetSystemTimeX(); dt = chVTGetSystemTimeX() - ticks;
dt = ticks - prev_touch_time; if (dt > BUTTON_DOWN_LONG_TICKS) break;
}
if (dt > wait) {
// wait = MS2ST(100); prev_touch_time = ticks; if (menu_is_form(menu) && MT_MASK(menu[i].type) == MT_KEYPAD && dt >= BUTTON_DOWN_LONG_TICKS){
touch_position(&touch_x, &touch_y); // Wait release touch and process it
if (abs(touch_x - prev_touch_x) > 1) { while (touch_check() != EVT_TOUCH_NONE){
fetch_numeric_target(keypad); touch_position(&touch_x, &touch_y);
int new_slider = touch_x - LCD_WIDTH/2; // Can have negative outcome if (abs(touch_x - prev_touch_x) < 2) continue;
if (new_slider < - (MENU_FORM_WIDTH-8)/2 - 1)
new_slider = -(MENU_FORM_WIDTH-8)/2 - 1; fetch_numeric_target(keypad);
if (new_slider > (MENU_FORM_WIDTH-8)/2 + 1) int new_slider = touch_x - LCD_WIDTH/2; // Can have negative outcome
new_slider = (MENU_FORM_WIDTH-8)/2 + 1; if (new_slider < - (MENU_FORM_WIDTH-8)/2 - 1)
if (menu_is_form(menu) && MT_MASK(menu[i].type) == MT_KEYPAD && keypad == KM_CENTER){ new_slider = -(MENU_FORM_WIDTH-8)/2 - 1;
#define TOUCH_DEAD_ZONE 40 if (new_slider > (MENU_FORM_WIDTH-8)/2 + 1)
if (mode == SL_UNKNOWN ) { new_slider = (MENU_FORM_WIDTH-8)/2 + 1;
if (abs(setting.slider_position - new_slider) < TOUCH_DEAD_ZONE) { // Pick up slider if (keypad == KM_CENTER) {
mode = SL_MOVE; if (mode == SL_UNKNOWN ) {
} else { if (abs(setting.slider_position - new_slider) < TOUCH_DEAD_ZONE) // Pick up slider
mode = SL_SPAN; mode = SL_MOVE;
goto first_span; else
} mode = SL_SPAN;
}
if (mode == SL_MOVE ) {
long_t freq_delta = (setting.slider_span/(MENU_FORM_WIDTH-8))*(new_slider - setting.slider_position);
if (freq_delta < 0 && uistat.freq_value < (freq_t)(-freq_delta))
uistat.freq_value = 0;
else
uistat.freq_value+= freq_delta;
if (uistat.freq_value < minFreq)
uistat.freq_value = minFreq;
if (uistat.freq_value > maxFreq)
uistat.freq_value = maxFreq;
setting.slider_position = new_slider;
set_keypad_value(keypad);
dirty = false;
perform(false, 0, uistat.freq_value, false);
draw_menu_mask(1<<i);
}
else if (mode == SL_SPAN ){
freq_t slider_freq;
slider_freq = uistat.freq_value;
int pw=new_slider + LCD_WIDTH/2;
setting.slider_position = pw - LCD_WIDTH/2; // Show delta on slider
setting.slider_span = 10;
while (pw>0) {
setting.slider_span += setting.slider_span;
pw -= 12;
if (pw <=0)
break;
setting.slider_span += setting.slider_span + (setting.slider_span >>1);
pw -= 12;
if (pw<=0)
break;
setting.slider_span *= 2;
pw -= 12;
} }
if (mode == SL_MOVE ) { if ((freq_t)setting.slider_span > (maxFreq - minFreq))
long_t freq_delta = (setting.slider_span/(MENU_FORM_WIDTH-8))*(new_slider - setting.slider_position); setting.slider_span = (maxFreq - minFreq);
if (freq_delta < 0 && uistat.freq_value < (freq_t)(-freq_delta)) freq_t old_minFreq = minFreq; // Save when in high mode
uistat.freq_value = 0; minFreq = 0; // And set minFreq to 0 for span display
else uistat.freq_value = setting.slider_span;
uistat.freq_value+= freq_delta; set_keypad_value(keypad);
if (uistat.freq_value < minFreq) plot_printf(center_text, sizeof center_text, "RANGE: %%s");
uistat.freq_value = minFreq; draw_menu_mask(1<<i); // Show slider span
if (uistat.freq_value > maxFreq) minFreq = old_minFreq; // and restore minFreq
uistat.freq_value = maxFreq; uistat.freq_value = slider_freq; // and restore current slider freq
setting.slider_position = new_slider; set_keypad_value(keypad);
set_keypad_value(keypad); plot_printf(center_text, sizeof center_text, "FREQ: %%s");
dirty = false; setting.slider_position = 0; // reset slider after span change
perform(false, 0, uistat.freq_value, false); check_frequency_slider(slider_freq);
draw_menu_mask(1<<i);
} else if (mode == SL_SPAN ){
freq_t slider_freq;
first_span:
slider_freq = uistat.freq_value;
int pw=new_slider + LCD_WIDTH/2;
setting.slider_position = pw - LCD_WIDTH/2; // Show delta on slider
setting.slider_span = 10;
while (pw>0) {
setting.slider_span += setting.slider_span;
pw -= 12;
if (pw <=0)
break;
setting.slider_span += setting.slider_span + (setting.slider_span >>1);
pw -= 12;
if (pw<=0)
break;
setting.slider_span *= 2;
pw -= 12;
}
if ((freq_t)setting.slider_span > (maxFreq - minFreq))
setting.slider_span = (maxFreq - minFreq);
freq_t old_minFreq = minFreq; // Save when in high mode
minFreq = 0; // And set minFreq to 0 for span display
uistat.freq_value = setting.slider_span;
set_keypad_value(keypad);
#if 1
plot_printf(center_text, sizeof center_text, "RANGE: %%s");
#else
center_text[0] = 'S';
center_text[1] = 'P';
center_text[2] = 'A';
center_text[3] = 'N';
#endif
draw_menu_mask(1<<i); // Show slider span
minFreq = old_minFreq; // and restore minFreq
uistat.freq_value = slider_freq; // and restore current slider freq
set_keypad_value(keypad);
#if 1
plot_printf(center_text, sizeof center_text, "FREQ: %%s");
#else
center_text[0] = 'F';
center_text[1] = 'R';
center_text[2] = 'E';
center_text[3] = 'Q';
#endif
setting.slider_position = 0; // reset slider after span change
check_frequency_slider(slider_freq);
}
} else if (menu_is_form(menu) && MT_MASK(menu[i].type) == MT_KEYPAD && keypad == KM_LOWOUTLEVEL) {
uistat.value = setting.external_gain + ((touch_x - OFFSETX+4) * level_range() ) / (MENU_FORM_WIDTH-8) + level_min() ;
apply_step:
set_keypad_value(keypad);
perform(false, 0, get_sweep_frequency(ST_CENTER), false);
draw_menu_mask(1<<i);
// }
// } else if (MT_MASK(menu[i].type) == MT_ADV_CALLBACK && menu[i].reference == menu_sdrive_acb) {
} else if (menu_is_form(menu) && MT_MASK(menu[i].type) == MT_KEYPAD && keypad == KM_HIGHOUTLEVEL) {
set_level( (touch_x - OFFSETX+4) *(level_range()) / (MENU_FORM_WIDTH-8) + level_min() );
perform(false, 0, get_sweep_frequency(ST_CENTER), false);
draw_menu_mask(1<<i);
} }
keypad_mode = old_keypad_mode; chThdSleepMilliseconds(100);
} } else if (keypad == KM_LOWOUTLEVEL) {
uistat.value = setting.external_gain + ((touch_x - OFFSETX+4) * level_range() ) / (MENU_FORM_WIDTH-8) + level_min() ;
set_keypad_value(keypad);
perform(false, 0, get_sweep_frequency(ST_CENTER), false);
draw_menu_mask(1<<i);
} else if (keypad == KM_HIGHOUTLEVEL) {
set_level( (touch_x - OFFSETX+4) *(level_range()) / (MENU_FORM_WIDTH-8) + level_min() );
perform(false, 0, get_sweep_frequency(ST_CENTER), false);
draw_menu_mask(1<<i);
} }
prev_touch_x = touch_x; prev_touch_x = touch_x;
} }
if (dt > BUTTON_DOWN_LONG_TICKS || do_exit) { keypad_mode = old_keypad_mode;
selection = -1; selection = -1;
draw_menu(); draw_menu();
// redraw_request = 0; // reset all (not need update after) return;
return; }
} // Wait touch release
if (menu_is_form(menu) && MT_MASK(menu[i].type) == MT_KEYPAD && keypad == KM_LOWOUTLEVEL) { touch_wait_release();
switch (pos) { if (menu_is_form(menu) && MT_MASK(menu[i].type) == MT_KEYPAD && keypad == KM_LOWOUTLEVEL) {
switch (pos) {
case 0: case 0:
step = -10; step = -10;
break; break;
@ -1472,12 +1444,11 @@ menu_select_touch(int i, int pos)
case 4: case 4:
step = +10; step = +10;
break; break;
} }
uistat.value = setting.external_gain + get_level() + step; uistat.value = setting.external_gain + get_level() + step;
do_exit = true; do_exit = true;
goto apply_step; } else if (menu_is_form(menu) && MT_MASK(menu[i].type) == MT_KEYPAD && keypad == KM_CENTER) {
} else if (menu_is_form(menu) && MT_MASK(menu[i].type) == MT_KEYPAD && keypad == KM_CENTER) { switch (pos) {
switch (pos) {
case 0: case 0:
step = setting.slider_span; step = setting.slider_span;
step =-step; step =-step;
@ -1494,21 +1465,25 @@ menu_select_touch(int i, int pos)
case 4: case 4:
step = setting.slider_span; step = setting.slider_span;
break; break;
}
if (step < 0 && get_sweep_frequency(ST_CENTER) < (freq_t)(-step))
uistat.freq_value = 0;
else
uistat.freq_value = get_sweep_frequency(ST_CENTER) + step;
do_exit = true;
setting.slider_position = 0; // reset slider after step
check_frequency_slider(uistat.freq_value);
goto apply_step;
} }
if (step < 0 && get_sweep_frequency(ST_CENTER) < (freq_t)(-step))
uistat.freq_value = 0;
else
uistat.freq_value = get_sweep_frequency(ST_CENTER) + step;
do_exit = true;
setting.slider_position = 0; // reset slider after step
check_frequency_slider(uistat.freq_value);
}
if (do_exit){
set_keypad_value(keypad);
perform(false, 0, get_sweep_frequency(ST_CENTER), false);
selection = -1;
draw_menu();
return;
}
nogo: nogo:
setting.slider_position = 0; // Reset slider when entering frequency setting.slider_position = 0; // Reset slider when entering frequency
#endif #endif
// touch_wait_release(); // touch_wait_release();
selection = -1; selection = -1;
menu_invoke(i); menu_invoke(i);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.