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

FS#10151 - e200v2: scrollwheel acceleration by Dustin Skoracki. Improves the scroll wheel acceleration on the e200v2 mainly by not decrementing the counter which which causes the acceleration if a wheel read was missed due to lcd operation.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20822 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-04-29 20:50:12 +00:00
parent 0a1baa36b1
commit 3c5e67516b
1 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

50
firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c
View file

@ -32,8 +32,11 @@ static bool hold_button = false;
static bool hold_button_old = false; static bool hold_button_old = false;
#endif #endif
static unsigned short _dbop_din = 0; static unsigned short _dbop_din = 0;
/* read_missed is true if buttons could not
* be read (see lcd_button_support) */
static bool read_missed = false;
#define WHEEL_REPEAT_INTERVAL (HZ/5) #define WHEEL_REPEAT_INTERVAL (HZ/4)
/* in the lcd driver */ /* in the lcd driver */
extern bool lcd_button_support(void); extern bool lcd_button_support(void);
@ -104,14 +107,14 @@ static void scrollwheel(unsigned short dbop_din)
* we want this for fast scrolling, but we must keep it accurate * we want this for fast scrolling, but we must keep it accurate
* for slow scrolling */ * for slow scrolling */
int wheel_delta = 0; int wheel_delta = 0;
/* generate repeats if quick enough, scroll slightly too*/ /* generate repeats if quick enough, scroll slightly too */
if (TIME_BEFORE(current_tick, last_wheel_post + WHEEL_REPEAT_INTERVAL)) if (TIME_BEFORE(current_tick, last_wheel_post + WHEEL_REPEAT_INTERVAL))
{ {
btn |= BUTTON_REPEAT; btn |= BUTTON_REPEAT;
wheel_delta = repeat>>2; wheel_delta = repeat>>1;
} }
repeat += 2; repeat += 3;
/* the wheel is more reliable if we don't send ever change, /* the wheel is more reliable if we don't send ever change,
* every 2th is basically one "physical click" is * every 2th is basically one "physical click" is
* 1 item in the rockbox menus */ * 1 item in the rockbox menus */
@ -125,7 +128,7 @@ static void scrollwheel(unsigned short dbop_din)
last_wheel_post = current_tick; last_wheel_post = current_tick;
} }
} }
if (repeat > 0) if (repeat > 0 && !read_missed)
repeat--; repeat--;
old_wheel_value = wheel_value; old_wheel_value = wheel_value;
@ -136,28 +139,33 @@ unsigned short button_read_dbop(void)
{ {
/*write a red pixel */ /*write a red pixel */
if (!lcd_button_support()) if (!lcd_button_support())
return _dbop_din; {
read_missed = true;
}
if (!read_missed)
{
/* Set up dbop for input */
while (!(DBOP_STAT & (1<<10))); /* Wait for fifo to empty */
DBOP_CTRL |= (1<<19); /* Tri-state DBOP on read cycle */
DBOP_CTRL &= ~(1<<16); /* disable output (1:write enabled) */
DBOP_TIMPOL_01 = 0xe167e167; /* Set Timing & Polarity regs 0 & 1 */
DBOP_TIMPOL_23 = 0xe167006e; /* Set Timing & Polarity regs 2 & 3 */
/* Set up dbop for input */ DBOP_CTRL |= (1<<15); /* start read */
while (!(DBOP_STAT & (1<<10))); /* Wait for fifo to empty */ while (!(DBOP_STAT & (1<<16))); /* wait for valid data */
DBOP_CTRL |= (1<<19); /* Tri-state DBOP on read cycle */
DBOP_CTRL &= ~(1<<16); /* disable output (1:write enabled) */
DBOP_TIMPOL_01 = 0xe167e167; /* Set Timing & Polarity regs 0 & 1 */
DBOP_TIMPOL_23 = 0xe167006e; /* Set Timing & Polarity regs 2 & 3 */
DBOP_CTRL |= (1<<15); /* start read */ _dbop_din = DBOP_DIN; /* Read dbop data*/
while (!(DBOP_STAT & (1<<16))); /* wait for valid data */
_dbop_din = DBOP_DIN; /* Read dbop data*/ /* Reset dbop for output */
DBOP_TIMPOL_01 = 0x6e167; /* Set Timing & Polarity regs 0 & 1 */
/* Reset dbop for output */ DBOP_TIMPOL_23 = 0xa167e06f; /* Set Timing & Polarity regs 2 & 3 */
DBOP_TIMPOL_01 = 0x6e167; /* Set Timing & Polarity regs 0 & 1 */ DBOP_CTRL |= (1<<16); /* Enable output (0:write disable) */
DBOP_TIMPOL_23 = 0xa167e06f; /* Set Timing & Polarity regs 2 & 3 */ DBOP_CTRL &= ~(1<<19); /* Tri-state when no active write */
DBOP_CTRL |= (1<<16); /* Enable output (0:write disable) */ }
DBOP_CTRL &= ~(1<<19); /* Tri-state when no active write */
#if !defined(BOOTLOADER) && defined(HAVE_SCROLLWHEEL) #if !defined(BOOTLOADER) && defined(HAVE_SCROLLWHEEL)
scrollwheel(_dbop_din); scrollwheel(_dbop_din);
#endif #endif
read_missed = false;
return _dbop_din; return _dbop_din;
} }