len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Few Fuze/e200v2 button fixes. Don't read the scrollwheel when the hold button is active and rename a variable to describe better what it is for.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20701 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-04-13 17:10:52 +00:00
parent c48f4c6be4
commit 42f5973177
5 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
firmware/target/arm/as3525/sansa-fuze/button-fuze.c
View file

@ -56,7 +56,7 @@ static void scrollwheel(short dbop_din)
unsigned btn = BUTTON_NONE;
/* old wheel values */
static unsigned old_wheel_value = 0;
static unsigned wheel_repeat = BUTTON_NONE;
static unsigned old_btn = BUTTON_NONE;
/* getting BUTTON_REPEAT works like this: We increment repeat by 2 if the
* wheel was turned, and decrement it by 1 each tick,
@ -76,6 +76,13 @@ static void scrollwheel(short dbop_din)
{ 2, 0, 3, 1 }, /* Clockwise rotation */
{ 1, 3, 0, 2 }, /* Counter-clockwise */
};
if(hold_button)
{
repeat = counter = 0;
return;
}
wheel_value = dbop_din & (1<<13|1<<14);
wheel_value >>= 13;
@ -86,10 +93,10 @@ static void scrollwheel(short dbop_din)
if (btn != BUTTON_NONE)
{
if (btn != wheel_repeat)
if (btn != old_btn)
{
/* direction reversals nullify repeats */
wheel_repeat = btn;
old_btn = btn;
repeat = counter = 0;
}
if (btn != BUTTON_NONE)

2
firmware/target/arm/as3525/sansa-fuze/button-target.h
View file

@ -30,7 +30,7 @@
void button_init_device(void);
bool button_hold(void);
int button_read_device(void);
short button_read_dbop(void);
/* Sandisk Sansa Fuze button codes */
/* Main unit's buttons */