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

Fuzev2: Scrollwheel works like a charm :)

Browse source 
Move scrollwheel parsing function into separate file as it's reused.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25425 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-04-01 16:07:56 +00:00
parent 47dcf58e28
commit f376fd2f4a
9 changed files with 187 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

3
firmware/SOURCES
View file

@ -408,6 +408,9 @@ target/arm/pnx0101/timer-pnx0101.c
target/arm/as3525/system-as3525.c
target/arm/as3525/kernel-as3525.c
target/arm/as3525/timer-as3525.c
#ifdef HAVE_SCROLLWHEEL
target/arm/as3525/scrollwheel-as3525.c
#endif
#if CONFIG_CPU == AS3525
target/arm/as3525/sd-as3525.c
#else /* AS3535v2 */

8
firmware/export/config/sansafuzev2.h
View file

@ -127,13 +127,13 @@
#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING
/* define this if the unit uses a scrollwheel for navigation */
//#define HAVE_SCROLLWHEEL
#define HAVE_SCROLLWHEEL
/* define to activate advanced wheel acceleration code */
//#define HAVE_WHEEL_ACCELERATION
#define HAVE_WHEEL_ACCELERATION
/* define from which rotation speed [degree/sec] on the acceleration starts */
//#define WHEEL_ACCEL_START 540
#define WHEEL_ACCEL_START 540
/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */
//#define WHEEL_ACCELERATION 1
#define WHEEL_ACCELERATION 1
/* define this if you have a flash memory storage */
#define HAVE_FLASH_STORAGE

108
firmware/target/arm/as3525/button-e200v2-fuze.c
View file

@ -27,21 +27,14 @@
#include "backlight.h"
#include "dbop-as3525.h"
extern void scrollwheel(unsigned wheel_value);
#if defined(SANSA_FUZE) || defined(SANSA_FUZEV2)
#if defined(SANSA_FUZE)
#define DBOP_BIT15_BUTTON BUTTON_HOME
#define WHEEL_REPEAT_INTERVAL (HZ/5)
#define WHEEL_COUNTER_DIV 4
#define ACCEL_INCREMENT 2
#define ACCEL_SHIFT 2
#endif
#ifdef SANSA_E200V2
#define DBOP_BIT15_BUTTON BUTTON_REC
#define WHEEL_REPEAT_INTERVAL (HZ/5)
#define WHEEL_COUNTER_DIV 2
#define ACCEL_INCREMENT 3
#define ACCEL_SHIFT 1
#endif
/* Buttons */
@ -56,103 +49,6 @@ void button_init_device(void)
GPIOA_PIN(1) = (1<<1);
}
#if !defined(BOOTLOADER) && defined(HAVE_SCROLLWHEEL)
static void scrollwheel(unsigned int wheel_value)
{
/* current wheel values, parsed from dbop and the resulting button */
unsigned btn = BUTTON_NONE;
/* old wheel values */
static unsigned old_wheel_value = 0;
static unsigned old_btn = BUTTON_NONE;
/*
* Getting BUTTON_REPEAT works like this: Remember when the btn value was
* posted to the button_queue last, and if it was recent enough, generate
* BUTTON_REPEAT
*/
static long last_wheel_post = 0;
/*
* Providing wheel acceleration works as follows: We increment accel
* by 2 if the wheel was turned, and decrement it by 1 each tick
* (no matter if it was turned), that means: the longer and faster you turn,
* the higher accel will be. accel>>2 will actually posted to the button_queue
*/
static int accel = 0;
/* We only post every 4th action, as this matches better with the physical
* clicks of the wheel */
static int counter = 0;
/* Read wheel
* Bits 13 and 14 of DBOP_DIN change as follows (Gray Code):
* Clockwise rotation 00 -> 01 -> 11 -> 10 -> 00
* Counter-clockwise 00 -> 10 -> 11 -> 01 -> 00
*
* For easy look-up, actual wheel values act as indicies also,
* which is why the table seems to be not ordered correctly
*/
static const unsigned char wheel_tbl[2][4] =
{
{ 2, 0, 3, 1 }, /* Clockwise rotation */
{ 1, 3, 0, 2 }, /* Counter-clockwise */
};
if(hold_button)
{
accel = counter = 0;
return;
}
if (old_wheel_value == wheel_tbl[0][wheel_value])
btn = BUTTON_SCROLL_FWD;
else if (old_wheel_value == wheel_tbl[1][wheel_value])
btn = BUTTON_SCROLL_BACK;
else if (old_wheel_value != wheel_value && accel > ACCEL_INCREMENT)
{ /* if no button is read and wheel_value changed, assume old_btn */
btn = old_btn;
}
/* else btn = BUTTON_NONE */
if (btn != BUTTON_NONE)
{
if (btn != old_btn)
{
/* direction reversals nullify acceleration and counters */
old_btn = btn;
accel = counter = 0;
}
/* wheel_delta will cause lists to jump over items,
* we want this for fast scrolling, but we must keep it accurate
* for slow scrolling */
int wheel_delta = 0;
/* generate BUTTON_REPEAT if quick enough, scroll slightly faster too*/
if (TIME_BEFORE(current_tick, last_wheel_post + WHEEL_REPEAT_INTERVAL))
{
btn |= BUTTON_REPEAT;
wheel_delta = accel>>ACCEL_SHIFT;
}
accel += ACCEL_INCREMENT;
/* the wheel is more reliable if we don't send every change,
* every WHEEL_COUNTER_DIVth is basically one "physical click"
* which should make up 1 item in lists */
if (++counter >= WHEEL_COUNTER_DIV && queue_empty(&button_queue))
{
buttonlight_on();
backlight_on();
queue_post(&button_queue, btn, ((wheel_delta+1)<<24));
/* message posted - reset count and remember post */
counter = 0;
last_wheel_post = current_tick;
}
}
if (accel > 0)
accel--;
old_wheel_value = wheel_value;
}
#endif /* !defined(BOOTLOADER) && defined(SCROLLWHEEL) */
bool button_hold(void)
{
return hold_button;

2
firmware/target/arm/as3525/kernel-as3525.c
View file

@ -44,7 +44,7 @@ static inline void do_scrollwheel(void)
else
{
if (!button_hold())
button_read_dbop(); /* Read the scrollwheel */
get_scrollwheel(); /* Read the scrollwheel */
}
poll_scrollwheel ^= 1;

6
firmware/target/arm/as3525/sansa-e200v2/button-target.h
View file

@ -31,6 +31,12 @@ bool button_hold(void);
void button_init_device(void);
int button_read_device(void);
unsigned short button_read_dbop(void);
#define get_scrollwheel button_read_dbop
#define WHEEL_REPEAT_INTERVAL (HZ/5)
#define WHEEL_COUNTER_DIV 2
#define ACCEL_INCREMENT 3
#define ACCEL_SHIFT 1
/* Sandisk Sansa E200 button codes */

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

@ -31,6 +31,13 @@ void button_init_device(void);
bool button_hold(void);
int button_read_device(void);
unsigned short button_read_dbop(void);
#define get_scrollwheel button_read_dbop
#define WHEEL_REPEAT_INTERVAL (HZ/5)
#define WHEEL_COUNTER_DIV 4
#define ACCEL_INCREMENT 2
#define ACCEL_SHIFT 2
/* Sandisk Sansa Fuze button codes */
/* Main unit's buttons */

36
firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
View file

@ -24,21 +24,50 @@
#include "button.h"
#include "backlight.h"
/*
* TODO: Scrollwheel!
*/
extern void scrollwheel(unsigned wheel_value);
#ifdef HAS_BUTTON_HOLD
static bool hold_button = false;
#endif
void button_init_device(void)
{ /* activate the wheel */
volatile int i;
GPIOB_DIR |= 1<<4;
for(i = 20; i; i--) nop;
GPIOB_PIN(4) = 0x10;
}
unsigned read_GPIOA_67(void)
{
unsigned ret = 0;
volatile int i;
DBOP_CTRL |= 1<<19;
for(i = 20; i; i--) nop;
GPIOA_DIR &= ~0xc0;
for(i = 20; i; i--) nop;
if (GPIOA_PIN(6) != 0)
ret = 1<<0;
for(i = 20; i; i--) nop;
if (GPIOA_PIN(7) != 0)
ret |= 1<<1;
DBOP_CTRL &= ~(1<<19);
for(i = 20; i; i--) nop;
return ret;
}
void get_scrollwheel(void)
{
#if defined(HAVE_SCROLLWHEEL) && !defined(BOOTLOADER)
/* scroll wheel handling */
scrollwheel(read_GPIOA_67());
#endif
}
/*
* Get button pressed from hardware
*/
int button_read_device(void)
{
int btn = 0;
@ -48,6 +77,7 @@ int button_read_device(void)
unsigned gpiod = GPIOD_DATA;
unsigned gpioa_dir = GPIOA_DIR;
unsigned gpiod6;
get_scrollwheel();
for(delay = 500; delay; delay--) nop;
CCU_IO &= ~(1<<12);
for(delay=8;delay;delay--) nop;

6
firmware/target/arm/as3525/sansa-fuzev2/button-target.h
View file

@ -31,6 +31,12 @@ void button_init_device(void);
bool button_hold(void);
int button_read_device(void);
unsigned short button_read_dbop(void);
void get_scrollwheel(void);
#define WHEEL_REPEAT_INTERVAL (HZ/5)
#define WHEEL_COUNTER_DIV 4
#define ACCEL_INCREMENT 2
#define ACCEL_SHIFT 2
/* Sandisk Sansa Fuze button codes */
/* Main unit's buttons */

124
firmware/target/arm/as3525/scrollwheel-as3525.c Normal file
View file

@ -0,0 +1,124 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2009-2010 by Thomas Martitz
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include "config.h"
#include "button.h"
#include "kernel.h"
#include "backlight.h"
void scrollwheel(unsigned int wheel_value)
{
#ifndef BOOTLOADER
/* current wheel values, parsed from dbop and the resulting button */
unsigned btn = BUTTON_NONE;
/* old wheel values */
static unsigned old_wheel_value = 0;
static unsigned old_btn = BUTTON_NONE;
/*
* Getting BUTTON_REPEAT works like this: Remember when the btn value was
* posted to the button_queue last, and if it was recent enough, generate
* BUTTON_REPEAT
*/
static long last_wheel_post = 0;
/*
* Providing wheel acceleration works as follows: We increment accel
* by 2 if the wheel was turned, and decrement it by 1 each tick
* (no matter if it was turned), that means: the longer and faster you turn,
* the higher accel will be. accel>>2 will actually posted to the button_queue
*/
static int accel = 0;
/* We only post every 4th action, as this matches better with the physical
* clicks of the wheel */
static int counter = 0;
/* Read wheel
* Bits 13 and 14 of DBOP_DIN change as follows (Gray Code):
* Clockwise rotation 00 -> 01 -> 11 -> 10 -> 00
* Counter-clockwise 00 -> 10 -> 11 -> 01 -> 00
*
* For easy look-up, actual wheel values act as indicies also,
* which is why the table seems to be not ordered correctly
*/
static const unsigned char wheel_tbl[2][4] =
{
{ 2, 0, 3, 1 }, /* Clockwise rotation */
{ 1, 3, 0, 2 }, /* Counter-clockwise */
};
if(button_hold())
{
accel = counter = 0;
return;
}
if (old_wheel_value == wheel_tbl[0][wheel_value])
btn = BUTTON_SCROLL_FWD;
else if (old_wheel_value == wheel_tbl[1][wheel_value])
btn = BUTTON_SCROLL_BACK;
else if (old_wheel_value != wheel_value && accel > ACCEL_INCREMENT)
{ /* if no button is read and wheel_value changed, assume old_btn */
btn = old_btn;
}
/* else btn = BUTTON_NONE */
if (btn != BUTTON_NONE)
{
if (btn != old_btn)
{
/* direction reversals nullify acceleration and counters */
old_btn = btn;
accel = counter = 0;
}
/* wheel_delta will cause lists to jump over items,
* we want this for fast scrolling, but we must keep it accurate
* for slow scrolling */
int wheel_delta = 0;
/* generate BUTTON_REPEAT if quick enough, scroll slightly faster too*/
if (TIME_BEFORE(current_tick, last_wheel_post + WHEEL_REPEAT_INTERVAL))
{
btn |= BUTTON_REPEAT;
wheel_delta = accel>>ACCEL_SHIFT;
}
accel += ACCEL_INCREMENT;
/* the wheel is more reliable if we don't send every change,
* every WHEEL_COUNTER_DIVth is basically one "physical click"
* which should make up 1 item in lists */
if (++counter >= WHEEL_COUNTER_DIV && queue_empty(&button_queue))
{
buttonlight_on();
backlight_on();
queue_post(&button_queue, btn, ((wheel_delta+1)<<24));
/* message posted - reset count and remember post */
counter = 0;
last_wheel_post = current_tick;
}
}
if (accel > 0)
accel--;
old_wheel_value = wheel_value;
#else
(void)wheel_value
#endif
}