From 0e6dd7efcd21d48665b5a799fe081a75cdcb960f Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 27 Nov 2006 02:16:32 +0000 Subject: Moved archos button reading to target tree. * Cleanup of button.[ch]. * Deactivated serial remote code for recorder FM/V2 as there is no remote pin, saving ~500 bytes of code. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11612 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/coldfire/iriver/button-target.h | 1 + firmware/target/sh/archos/fm_v2/button-fm_v2.c | 97 ++++++++++++++++++ firmware/target/sh/archos/fm_v2/button-target.h | 53 ++++++++++ firmware/target/sh/archos/ondio/button-ondio.c | 65 +++++++++++++ firmware/target/sh/archos/ondio/button-target.h | 45 +++++++++ firmware/target/sh/archos/player/button-player.c | 74 ++++++++++++++ firmware/target/sh/archos/player/button-target.h | 56 +++++++++++ .../target/sh/archos/recorder/button-recorder.c | 108 +++++++++++++++++++++ firmware/target/sh/archos/recorder/button-target.h | 63 ++++++++++++ 9 files changed, 562 insertions(+) create mode 100755 firmware/target/sh/archos/fm_v2/button-fm_v2.c create mode 100755 firmware/target/sh/archos/fm_v2/button-target.h create mode 100755 firmware/target/sh/archos/ondio/button-ondio.c create mode 100755 firmware/target/sh/archos/ondio/button-target.h create mode 100755 firmware/target/sh/archos/player/button-player.c create mode 100755 firmware/target/sh/archos/player/button-target.h create mode 100755 firmware/target/sh/archos/recorder/button-recorder.c create mode 100755 firmware/target/sh/archos/recorder/button-target.h (limited to 'firmware/target') diff --git a/firmware/target/coldfire/iriver/button-target.h b/firmware/target/coldfire/iriver/button-target.h index 3d3247ab80..1702706ce4 100644 --- a/firmware/target/coldfire/iriver/button-target.h +++ b/firmware/target/coldfire/iriver/button-target.h @@ -80,6 +80,7 @@ bool button_scan_enabled(void); |BUTTON_RC_SOURCE) #define POWEROFF_BUTTON BUTTON_OFF +#define RC_POWEROFF_BUTTON BUTTON_RC_STOP #define POWEROFF_COUNT 10 #endif /* _BUTTON_TARGET_H_ */ diff --git a/firmware/target/sh/archos/fm_v2/button-fm_v2.c b/firmware/target/sh/archos/fm_v2/button-fm_v2.c new file mode 100755 index 0000000000..c430cf864b --- /dev/null +++ b/firmware/target/sh/archos/fm_v2/button-fm_v2.c @@ -0,0 +1,97 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Jens Arnold + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "config.h" +#include "system.h" +#include "button.h" +#include "backlight.h" +#include "adc.h" + +/* + Recorder FM/V2 hardware button hookup + ===================================== + + F1, F2, F3, UP: connected to AN4 through a resistor network + DOWN, PLAY, LEFT, RIGHT: likewise connected to AN5 + + The voltage on AN4/ AN5 depends on which keys (or key combo) is pressed + FM/V2 has PLAY and RIGHT switched compared to plain recorder + + ON: AN3, low active + OFF: AN2, high active +*/ + +void button_init_device(void) +{ + /* Set PB4 and PB8 as input pins */ + PBCR1 &= 0xfffc; /* PB8MD = 00 */ + PBCR2 &= 0xfcff; /* PB4MD = 00 */ + PBIOR &= ~0x0110; /* Inputs */ +} + +int button_read_device(void) +{ + int btn = BUTTON_NONE; + int data; + + /* check F1..F3 and UP */ + data = adc_read(ADC_BUTTON_ROW1); + if (data >= 150) + { + if (data >= 545) + if (data >= 700) + btn = BUTTON_F3; + else + btn = BUTTON_UP; + else + if (data >= 385) + btn = BUTTON_F2; + else + btn = BUTTON_F1; + } + + /* Some units have mushy keypads, so pressing UP also activates + the Left/Right buttons. Let's combat that by skipping the AN5 + checks when UP is pressed. */ + if(!(btn & BUTTON_UP)) + { + /* check DOWN, PLAY, LEFT, RIGHT */ + data = adc_read(ADC_BUTTON_ROW2); + if (data >= 150) + { + if (data >= 545) + if (data >= 700) + btn |= BUTTON_DOWN; + else + btn |= BUTTON_RIGHT; + else + if (data >= 385) + btn |= BUTTON_LEFT; + else + btn |= BUTTON_PLAY; + } + } + + if ( adc_read(ADC_BUTTON_ON) < 512 ) + btn |= BUTTON_ON; + if ( adc_read(ADC_BUTTON_OFF) > 512 ) + btn |= BUTTON_OFF; + + return btn; +} diff --git a/firmware/target/sh/archos/fm_v2/button-target.h b/firmware/target/sh/archos/fm_v2/button-target.h new file mode 100755 index 0000000000..3e7b7c6801 --- /dev/null +++ b/firmware/target/sh/archos/fm_v2/button-target.h @@ -0,0 +1,53 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Jens Arnold + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef _BUTTON_TARGET_H_ +#define _BUTTON_TARGET_H_ + +#include +#include "config.h" + +void button_init_device(void); +int button_read_device(void); + + /* Main unit's buttons */ +#define BUTTON_ON 0x00000001 +#define BUTTON_OFF 0x00000002 + +#define BUTTON_LEFT 0x00000004 +#define BUTTON_RIGHT 0x00000008 +#define BUTTON_UP 0x00000010 +#define BUTTON_DOWN 0x00000020 + +#define BUTTON_PLAY 0x00000040 + +#define BUTTON_F1 0x00000080 +#define BUTTON_F2 0x00000100 +#define BUTTON_F3 0x00000200 + +#define BUTTON_MAIN (BUTTON_ON|BUTTON_OFF|BUTTON_LEFT|BUTTON_RIGHT\ + |BUTTON_UP|BUTTON_DOWN|BUTTON_PLAY\ + |BUTTON_F1|BUTTON_F2|BUTTON_F3) + +#define BUTTON_REMOTE 0 + +#define POWEROFF_BUTTON BUTTON_OFF +#define POWEROFF_COUNT 10 + +#endif /* _BUTTON_TARGET_H_ */ diff --git a/firmware/target/sh/archos/ondio/button-ondio.c b/firmware/target/sh/archos/ondio/button-ondio.c new file mode 100755 index 0000000000..c8797f743d --- /dev/null +++ b/firmware/target/sh/archos/ondio/button-ondio.c @@ -0,0 +1,65 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Jens Arnold + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "config.h" +#include "system.h" +#include "button.h" +#include "backlight.h" +#include "adc.h" + +/* + Ondio hardware button hookup + ============================ + + LEFT, RIGHT, UP, DOWN: connected to AN4 through a resistor network + + The voltage on AN4 depends on which keys (or key combo) is pressed + + OPTION: AN2, high active (assigned as MENU) + ON/OFF: AN3, low active (assigned as OFF) +*/ + +int button_read_device(void) +{ + int btn = BUTTON_NONE; + int data; + + /* Check the 4 direction keys */ + data = adc_read(ADC_BUTTON_ROW1); + if (data >= 165) + { + if (data >= 585) + if (data >= 755) + btn = BUTTON_LEFT; + else + btn = BUTTON_RIGHT; + else + if (data >= 415) + btn = BUTTON_UP; + else + btn = BUTTON_DOWN; + } + + if(adc_read(ADC_BUTTON_OPTION) > 0x200) /* active high */ + btn |= BUTTON_MENU; + if(adc_read(ADC_BUTTON_ONOFF) < 0x120) /* active low */ + btn |= BUTTON_OFF; + + return btn; +} diff --git a/firmware/target/sh/archos/ondio/button-target.h b/firmware/target/sh/archos/ondio/button-target.h new file mode 100755 index 0000000000..8cb24b92b0 --- /dev/null +++ b/firmware/target/sh/archos/ondio/button-target.h @@ -0,0 +1,45 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Jens Arnold + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef _BUTTON_TARGET_H_ +#define _BUTTON_TARGET_H_ + +#include +#include "config.h" + +#define button_init_device() +int button_read_device(void); + +#define BUTTON_OFF 0x00000001 +#define BUTTON_MENU 0x00000002 + +#define BUTTON_LEFT 0x00000004 +#define BUTTON_RIGHT 0x00000008 +#define BUTTON_UP 0x00000010 +#define BUTTON_DOWN 0x00000020 + +#define BUTTON_MAIN (BUTTON_OFF|BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT\ + |BUTTON_UP|BUTTON_DOWN) + +#define BUTTON_REMOTE 0 + +#define POWEROFF_BUTTON BUTTON_OFF +#define POWEROFF_COUNT 10 + +#endif /* _BUTTON_TARGET_H_ */ diff --git a/firmware/target/sh/archos/player/button-player.c b/firmware/target/sh/archos/player/button-player.c new file mode 100755 index 0000000000..fbc940f7de --- /dev/null +++ b/firmware/target/sh/archos/player/button-player.c @@ -0,0 +1,74 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Jens Arnold + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "config.h" +#include "system.h" +#include "button.h" +#include "backlight.h" +#include "adc.h" + +/* + Player hardware button hookup + ============================= + + Player + ------ + LEFT: AN0 + MENU: AN1 + RIGHT: AN2 + PLAY: AN3 + + STOP: PA11 + ON: PA5 + + All buttons are low active +*/ + +void button_init_device(void) +{ + /* set PA5 and PA11 as input pins */ + PACR1 &= 0xff3f; /* PA11MD = 00 */ + PACR2 &= 0xfbff; /* PA5MD = 0 */ + PAIOR &= ~0x0820; /* Inputs */ +} + +int button_read_device(void) +{ + int btn = BUTTON_NONE; + int data; + + /* buttons are active low */ + if (adc_read(0) < 0x180) + btn = BUTTON_LEFT; + if (adc_read(1) < 0x180) + btn |= BUTTON_MENU; + if (adc_read(2) < 0x180) + btn |= BUTTON_RIGHT; + if (adc_read(3) < 0x180) + btn |= BUTTON_PLAY; + + /* check port A pins for ON and STOP */ + data = PADR; + if ( !(data & 0x0020) ) + btn |= BUTTON_ON; + if ( !(data & 0x0800) ) + btn |= BUTTON_STOP; + + return btn; +} diff --git a/firmware/target/sh/archos/player/button-target.h b/firmware/target/sh/archos/player/button-target.h new file mode 100755 index 0000000000..c1e0e6646b --- /dev/null +++ b/firmware/target/sh/archos/player/button-target.h @@ -0,0 +1,56 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Jens Arnold + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef _BUTTON_TARGET_H_ +#define _BUTTON_TARGET_H_ + +#include +#include "config.h" + +#define HAS_SERIAL_REMOTE + +void button_init_device(void); +int button_read_device(void); + + /* Main unit's buttons */ +#define BUTTON_ON 0x00000001 +#define BUTTON_STOP 0x00000002 + +#define BUTTON_LEFT 0x00000004 +#define BUTTON_RIGHT 0x00000008 +#define BUTTON_PLAY 0x00000010 +#define BUTTON_MENU 0x00000020 + +#define BUTTON_MAIN (BUTTON_ON|BUTTON_STOP|BUTTON_LEFT|BUTTON_RIGHT\ + |BUTTON_PLAY|BUTTON_MENU) + + /* Remote control's buttons */ +#define BUTTON_RC_PLAY 0x00100000 +#define BUTTON_RC_STOP 0x00080000 + +#define BUTTON_RC_LEFT 0x00040000 +#define BUTTON_RC_RIGHT 0x00020000 +#define BUTTON_RC_VOL_UP 0x00010000 +#define BUTTON_RC_VOL_DOWN 0x00008000 + +#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\ + |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\ + |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN) + +#endif /* _BUTTON_TARGET_H_ */ diff --git a/firmware/target/sh/archos/recorder/button-recorder.c b/firmware/target/sh/archos/recorder/button-recorder.c new file mode 100755 index 0000000000..dc43cce0e0 --- /dev/null +++ b/firmware/target/sh/archos/recorder/button-recorder.c @@ -0,0 +1,108 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Jens Arnold + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "config.h" +#include "system.h" +#include "button.h" +#include "backlight.h" +#include "adc.h" + +/* + Recorder hardware button hookup + =============================== + + F1, F2, F3, UP: connected to AN4 through a resistor network + DOWN, PLAY, LEFT, RIGHT: likewise connected to AN5 + + The voltage on AN4/ AN5 depends on which keys (or key combo) is pressed + + ON: PB8, low active + OFF: PB4, low active +*/ + +void button_init_device(void) +{ + /* Set PB4 and PB8 as input pins */ + PBCR1 &= 0xfffc; /* PB8MD = 00 */ + PBCR2 &= 0xfcff; /* PB4MD = 00 */ + PBIOR &= ~0x0110; /* Inputs */ +} + +int button_read_device(void) +{ + int btn = BUTTON_NONE; + int data; + static int off_button_count = 0; + + /* check F1..F3 and UP */ + data = adc_read(ADC_BUTTON_ROW1); + if (data >= 250) + { + if (data >= 700) + if (data >= 900) + btn = BUTTON_F3; + else + btn = BUTTON_UP; + else + if (data >= 500) + btn = BUTTON_F2; + else + btn = BUTTON_F1; + } + + /* Some units have mushy keypads, so pressing UP also activates + the Left/Right buttons. Let's combat that by skipping the AN5 + checks when UP is pressed. */ + if(!(btn & BUTTON_UP)) + { + /* check DOWN, PLAY, LEFT, RIGHT */ + data = adc_read(ADC_BUTTON_ROW2); + if (data >= 250) + { + if (data >= 700) + if (data >= 900) + btn |= BUTTON_DOWN; + else + btn |= BUTTON_PLAY; + else + if (data >= 500) + btn |= BUTTON_LEFT; + else + btn |= BUTTON_RIGHT; + } + } + + /* check port B pins for ON and OFF */ + data = PBDR; + if ((data & 0x0100) == 0) + btn |= BUTTON_ON; + + if ((data & 0x0010) == 0) + { + /* When the batteries are low, the low-battery shutdown logic causes + * spurious OFF events due to voltage fluctuation on some units. + * Only accept OFF when read several times in sequence. */ + if (++off_button_count > 3) + btn |= BUTTON_OFF; + } + else + off_button_count = 0; + + return btn; +} diff --git a/firmware/target/sh/archos/recorder/button-target.h b/firmware/target/sh/archos/recorder/button-target.h new file mode 100755 index 0000000000..77665c0ad5 --- /dev/null +++ b/firmware/target/sh/archos/recorder/button-target.h @@ -0,0 +1,63 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Jens Arnold + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef _BUTTON_TARGET_H_ +#define _BUTTON_TARGET_H_ + +#include +#include "config.h" + +#define HAS_SERIAL_REMOTE + +void button_init_device(void); +int button_read_device(void); + + /* Main unit's buttons */ +#define BUTTON_ON 0x00000001 +#define BUTTON_OFF 0x00000002 + +#define BUTTON_LEFT 0x00000004 +#define BUTTON_RIGHT 0x00000008 +#define BUTTON_UP 0x00000010 +#define BUTTON_DOWN 0x00000020 + +#define BUTTON_PLAY 0x00000040 + +#define BUTTON_F1 0x00000080 +#define BUTTON_F2 0x00000100 +#define BUTTON_F3 0x00000200 + +#define BUTTON_MAIN (BUTTON_ON|BUTTON_OFF|BUTTON_LEFT|BUTTON_RIGHT\ + |BUTTON_UP|BUTTON_DOWN|BUTTON_PLAY\ + |BUTTON_F1|BUTTON_F2|BUTTON_F3) + + /* Remote control's buttons */ +#define BUTTON_RC_PLAY 0x00100000 +#define BUTTON_RC_STOP 0x00080000 + +#define BUTTON_RC_LEFT 0x00040000 +#define BUTTON_RC_RIGHT 0x00020000 +#define BUTTON_RC_VOL_UP 0x00010000 +#define BUTTON_RC_VOL_DOWN 0x00008000 + +#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\ + |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\ + |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN) + +#endif /* _BUTTON_TARGET_H_ */ -- cgit v1.2.3