devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FiiO M3K: filter touchpad input when it's disabled

Browse source 
I had hoped this would fix FS#13297, but no luck. Might as well
do this change anyway, because it's the "right" thing to do.

Change-Id: I55819c881d2141dd565e1c1f21460578c9114ff6
This commit is contained in:
Aidan MacDonald 2021-06-07 22:16:40 +01:00
parent 4c94c17913
commit 55c95a9cf5
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c
View file

@ -301,16 +301,20 @@ static void ft_step_state(uint32_t t, int evt, int tx, int ty)
int dy = fsm.cur_y - fsm.orig_y; int dy = fsm.cur_y - fsm.orig_y;
int dp = (dx*dx) + (dy*dy); int dp = (dx*dx) + (dy*dy);
if(dp >= ftd.scroll_thresh_sqr) { if(dp >= ftd.scroll_thresh_sqr) {
if(dy < 0) { /* avoid generating events if we're supposed to be inactive...
queue_post(&button_queue, BUTTON_SCROLL_BACK, 0); * should not be necessary but better to be safe. */
} else { if(ftd.active) {
queue_post(&button_queue, BUTTON_SCROLL_FWD, 0); if(dy < 0) {
} queue_post(&button_queue, BUTTON_SCROLL_BACK, 0);
} else {
queue_post(&button_queue, BUTTON_SCROLL_FWD, 0);
}
/* Poke the backlight */ /* Poke the backlight */
backlight_on(); backlight_on();
buttonlight_on(); buttonlight_on();
reset_poweroff_timer(); reset_poweroff_timer();
}
fsm.orig_x = fsm.cur_x; fsm.orig_x = fsm.cur_x;
fsm.orig_y = fsm.cur_y; fsm.orig_y = fsm.cur_y;
@ -475,7 +479,7 @@ int button_read_device(void)
if((b & (1 << 28)) == 0) r |= BUTTON_VOL_DOWN; if((b & (1 << 28)) == 0) r |= BUTTON_VOL_DOWN;
if((b & (1 << 31)) == 0) r |= BUTTON_POWER; if((b & (1 << 31)) == 0) r |= BUTTON_POWER;
return r; return touchpad_filter(r);
} }
bool headphones_inserted(void) bool headphones_inserted(void)