Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sansa Clipv2: use similar button driver to Clipv1

Browse source 
Fixes some buttons not being read (hold is still buggy)

FlySpray: FS#11111
Author: Pascal Below

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25209 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-03-15 23:01:45 +00:00
parent 9db98bb864
commit f74a6ed38a
2 changed files with 71 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/CREDITS
View file

@ -532,6 +532,7 @@ Andrew Engelbrecht
Kevin Schoedel Kevin Schoedel
Jens Theeß Jens Theeß
Alexey Nemtsev Alexey Nemtsev
Pascal Below
The libmad team The libmad team
The wavpack team The wavpack team

103
firmware/target/arm/as3525/sansa-clipv2/button-clip.c
View file

@ -7,6 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2009 Bertrik Sikken
* Copyright (C) 2008 François Dinel * Copyright (C) 2008 François Dinel
* Copyright © 2008-2009 Rafaël Carré * Copyright © 2008-2009 Rafaël Carré
* *
@ -19,11 +20,12 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "system.h"
#include "button-target.h" #include "button-target.h"
#include "as3525v2.h" #include "as3525v2.h"
#include "kernel.h" #ifndef BOOTLOADER
#include "backlight.h"
/* FIXME : use Clipv1 like driver (FS#10285) */ #endif
void button_init_device(void) void button_init_device(void)
{ {
@ -33,11 +35,17 @@ void button_init_device(void)
GPIOD_PIN(4) = 1<<4; GPIOD_PIN(4) = 1<<4;
GPIOD_PIN(5) = 1<<5; GPIOD_PIN(5) = 1<<5;
GPIOD_DIR |= ((1<<5) | (1<<4) | (1<<3)); GPIOD_DIR |= ((1<<5) | (1<<4) | (1<<3));
/* get initial readings */
button_read_device();
button_read_device();
button_read_device();
} }
int button_read_device(void) int button_read_device(void)
{ {
int result = 0; static int row = 0;
static int buttons = 0;
static unsigned power_counter = 0; static unsigned power_counter = 0;
if(button_hold()) if(button_hold())
@ -54,55 +62,84 @@ int button_read_device(void)
power_counter--; power_counter--;
if (GPIOA_PIN(7) && !power_counter) if (GPIOA_PIN(7) && !power_counter)
result |= BUTTON_POWER; buttons |= BUTTON_POWER;
else
buttons &= ~BUTTON_POWER;
/* This is a keypad using D3-D5 as columns and D0-D2 as rows */ /* This is a keypad using D3-D5 as columns and D0-D2 as rows */
switch (row) {
GPIOD_PIN(3) = 0x00; /* activate D3 */ case 0:
asm volatile ("nop\nnop\nnop\nnop\nnop\n"); /* wait a bit for reliable results */ buttons &= ~(BUTTON_VOL_UP | BUTTON_UP);
/* D3D0 is unused */ (void)GPIOD_PIN(0); /* D3D0 is unused */
if (!GPIOD_PIN(1)) if (!GPIOD_PIN(1))
result |= BUTTON_VOL_UP; buttons |= BUTTON_VOL_UP;
if (!GPIOD_PIN(2)) if (!GPIOD_PIN(2))
result |= BUTTON_UP; buttons |= BUTTON_UP;
GPIOD_PIN(3) = 1<<3; GPIOD_PIN(3) = 1<<3;
GPIOD_PIN(4) = 0x00;
row++;
break;
GPIOD_PIN(4) = 0x00; /* activate D4 */ case 1:
asm volatile ("nop\nnop\nnop\nnop\nnop\n"); buttons &= ~(BUTTON_LEFT | BUTTON_SELECT | BUTTON_RIGHT);
if (!GPIOD_PIN(0)) if (!GPIOD_PIN(0))
result |= BUTTON_LEFT; buttons |= BUTTON_LEFT;
if (!GPIOD_PIN(1)) if (!GPIOD_PIN(1))
result |= BUTTON_SELECT; buttons |= BUTTON_SELECT;
if (!GPIOD_PIN(2)) if (!GPIOD_PIN(2))
result |= BUTTON_RIGHT; buttons |= BUTTON_RIGHT;
GPIOD_PIN(4) = 1<<4; GPIOD_PIN(4) = 1<<4;
GPIOD_PIN(5) = 0x00;
row++;
break;
GPIOD_PIN(5) = 0x00; /* activate D5 */ case 2:
asm volatile ("nop\nnop\nnop\nnop\nnop\n"); buttons &= ~(BUTTON_DOWN | BUTTON_VOL_DOWN | BUTTON_HOME);
if (!GPIOD_PIN(0)) if (!GPIOD_PIN(0))
result |= BUTTON_DOWN; buttons |= BUTTON_DOWN;
if (!GPIOD_PIN(1)) if (!GPIOD_PIN(1))
result |= BUTTON_VOL_DOWN; buttons |= BUTTON_VOL_DOWN;
if (!GPIOD_PIN(2)) if (!GPIOD_PIN(2))
result |= BUTTON_HOME; buttons |= BUTTON_HOME;
GPIOD_PIN(5) = 1<<5; GPIOD_PIN(5) = 1<<5;
GPIOD_PIN(3) = 0x00;
return result; default:
row = 0;
break;
}
return buttons;
} }
bool button_hold(void) bool button_hold(void)
{ {
return (GPIOA_PIN(3) != 0); #ifndef BOOTLOADER
static bool hold_button_old = false;
#endif
bool hold_button = (GPIOA_PIN(3) != 0);
#ifndef BOOTLOADER
/* light handling */
if (hold_button != hold_button_old)
{
hold_button_old = hold_button;
backlight_hold_changed(hold_button);
}
#endif /* BOOTLOADER */
return hold_button;
} }