devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

(1) Remapped BUTTON_CANCEL->BUTTON_OFF for gmini better representing its function, and for consistency. (2) Removed TAB chars, prettified formatting

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5634 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-01-23 00:27:21 +00:00
parent 756e7404d8
commit 9794cd449b
2 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

14
firmware/drivers/button.c
View file

@ -465,20 +465,20 @@ static int button_read(void)
#elif CONFIG_KEYPAD == GMINI100_PAD #elif CONFIG_KEYPAD == GMINI100_PAD
if (adc_read(7) < 0x80) if (adc_read(7) < 0x80)
btn |= BUTTON_LEFT; btn |= BUTTON_LEFT;
else if (adc_read(7) < 0x168) else if (adc_read(7) < 0x168)
btn |= BUTTON_DOWN; btn |= BUTTON_DOWN;
else if (adc_read(7) < 0x260) else if (adc_read(7) < 0x260)
btn |= BUTTON_RIGHT; btn |= BUTTON_RIGHT;
else if (adc_read(7) < 0x360) else if (adc_read(7) < 0x360)
btn |= BUTTON_UP; btn |= BUTTON_UP;
if (adc_read(6) < 0x240) if (adc_read(6) < 0x240)
btn |= BUTTON_CANCEL; btn |= BUTTON_OFF;
else if (adc_read(6) < 0x280) else if (adc_read(6) < 0x280)
btn |= BUTTON_PLAY; btn |= BUTTON_PLAY;
else if (adc_read(6) < 0x300) else if (adc_read(6) < 0x300)
btn |= BUTTON_MENU; btn |= BUTTON_MENU;
#endif /* CONFIG_KEYPAD */ #endif /* CONFIG_KEYPAD */

88
firmware/export/button.h
View file

@ -30,7 +30,7 @@ int button_get (bool block);
int button_get_w_tmo(int ticks); int button_get_w_tmo(int ticks);
int button_status(void); int button_status(void);
void button_clear_queue(void); void button_clear_queue(void);
#if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD #ifdef HAVE_LCD_BITMAP
void button_set_flip(bool flip); /* turn 180 degrees */ void button_set_flip(bool flip); /* turn 180 degrees */
#endif #endif
@ -38,76 +38,76 @@ void button_set_flip(bool flip); /* turn 180 degrees */
bool button_hold(void); bool button_hold(void);
#endif #endif
#define BUTTON_NONE 0x0000 #define BUTTON_NONE 0x0000
/* Shared button codes */ /* Shared button codes */
#define BUTTON_LEFT 0x0040 #define BUTTON_LEFT 0x0040
#define BUTTON_RIGHT 0x0080 #define BUTTON_RIGHT 0x0080
/* Button modifiers */ /* Button modifiers */
#define BUTTON_REMOTE 0x2000 #define BUTTON_REMOTE 0x2000
#define BUTTON_REPEAT 0x4000 #define BUTTON_REPEAT 0x4000
#define BUTTON_REL 0x8000 #define BUTTON_REL 0x8000
/* remote control buttons */ /* remote control buttons */
#define BUTTON_RC_VOL_UP (0x0008 | BUTTON_REMOTE) #define BUTTON_RC_VOL_UP (0x0008 | BUTTON_REMOTE)
#define BUTTON_RC_VOL_DOWN (0x0800 | BUTTON_REMOTE) #define BUTTON_RC_VOL_DOWN (0x0800 | BUTTON_REMOTE)
#define BUTTON_RC_LEFT (BUTTON_LEFT | BUTTON_REMOTE) #define BUTTON_RC_LEFT (BUTTON_LEFT | BUTTON_REMOTE)
#define BUTTON_RC_RIGHT (BUTTON_RIGHT| BUTTON_REMOTE) #define BUTTON_RC_RIGHT (BUTTON_RIGHT| BUTTON_REMOTE)
#if CONFIG_KEYPAD == IRIVER_H100_PAD #if CONFIG_KEYPAD == IRIVER_H100_PAD
/* iRiver H100 specific button codes */ /* iRiver H100 specific button codes */
#define BUTTON_SELECT 0x0100 #define BUTTON_SELECT 0x0100
#define BUTTON_MODE 0x0200 #define BUTTON_MODE 0x0200
#define BUTTON_REC 0x0400 #define BUTTON_REC 0x0400
#define BUTTON_ON 0x0001 #define BUTTON_ON 0x0001
#define BUTTON_OFF 0x0002 #define BUTTON_OFF 0x0002
#define BUTTON_UP 0x0010 #define BUTTON_UP 0x0010
#define BUTTON_DOWN 0x0020 #define BUTTON_DOWN 0x0020
#elif CONFIG_KEYPAD == RECORDER_PAD #elif CONFIG_KEYPAD == RECORDER_PAD
/* Recorder specific button codes */ /* Recorder specific button codes */
#define BUTTON_ON 0x0001 #define BUTTON_ON 0x0001
#define BUTTON_OFF 0x0002 #define BUTTON_OFF 0x0002
#define BUTTON_PLAY 0x0004 #define BUTTON_PLAY 0x0004
#define BUTTON_UP 0x0010 #define BUTTON_UP 0x0010
#define BUTTON_DOWN 0x0020 #define BUTTON_DOWN 0x0020
#define BUTTON_F1 0x0100 #define BUTTON_F1 0x0100
#define BUTTON_F2 0x0200 #define BUTTON_F2 0x0200
#define BUTTON_F3 0x0400 #define BUTTON_F3 0x0400
#define BUTTON_RC_PLAY (BUTTON_PLAY | BUTTON_REMOTE) #define BUTTON_RC_PLAY (BUTTON_PLAY | BUTTON_REMOTE)
#define BUTTON_RC_STOP (BUTTON_OFF | BUTTON_REMOTE) #define BUTTON_RC_STOP (BUTTON_OFF | BUTTON_REMOTE)
#elif CONFIG_KEYPAD == PLAYER_PAD #elif CONFIG_KEYPAD == PLAYER_PAD
/* Jukebox 6000 and Studio specific button codes */ /* Jukebox 6000 and Studio specific button codes */
#define BUTTON_ON 0x0001 #define BUTTON_ON 0x0001
#define BUTTON_MENU 0x0002 #define BUTTON_MENU 0x0002
#define BUTTON_PLAY 0x0010 #define BUTTON_PLAY 0x0010
#define BUTTON_STOP 0x0020 #define BUTTON_STOP 0x0020
#define BUTTON_RC_PLAY (BUTTON_PLAY | BUTTON_REMOTE) #define BUTTON_RC_PLAY (BUTTON_PLAY | BUTTON_REMOTE)
#define BUTTON_RC_STOP (BUTTON_STOP | BUTTON_REMOTE) #define BUTTON_RC_STOP (BUTTON_STOP | BUTTON_REMOTE)
#elif CONFIG_KEYPAD == ONDIO_PAD #elif CONFIG_KEYPAD == ONDIO_PAD
/* Ondio specific button codes */ /* Ondio specific button codes */
#define BUTTON_OFF 0x0002 #define BUTTON_OFF 0x0002
#define BUTTON_UP 0x0010 #define BUTTON_UP 0x0010
#define BUTTON_DOWN 0x0020 #define BUTTON_DOWN 0x0020
#define BUTTON_MENU 0x0100 #define BUTTON_MENU 0x0100
#elif CONFIG_KEYPAD == GMINI100_PAD #elif CONFIG_KEYPAD == GMINI100_PAD
#define BUTTON_ON 0x0001 #define BUTTON_ON 0x0001
#define BUTTON_CANCEL 0x0002 #define BUTTON_OFF 0x0002
#define BUTTON_PLAY 0x0004 #define BUTTON_PLAY 0x0004
#define BUTTON_UP 0x0010 #define BUTTON_UP 0x0010
#define BUTTON_DOWN 0x0020 #define BUTTON_DOWN 0x0020
#define BUTTON_MENU 0x0100 #define BUTTON_MENU 0x0100
#endif /* RECORDER/PLAYER/ONDIO/GMINI KEYPAD */ #endif /* RECORDER/PLAYER/ONDIO/GMINI KEYPAD */