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

keymaps: cleanup

Browse source 
- remove useles define in pegbox
- improve keymap of nwz in mpegplayer
- fix whitespace alignement

Change-Id: I0d5e3c59f89ed8e0e02c386255286cfbb8693230
This commit is contained in:
Amaury Pouly 2014-07-17 10:29:18 +02:00
parent 8e8671a73e
commit 2387d92c9c
4 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/plugins/fft/fft.c
View file

@ -311,6 +311,7 @@ GREY_INFO_STRUCT
# define FFT_ORIENTATION BUTTON_POWER # define FFT_ORIENTATION BUTTON_POWER
# define FFT_WINDOW BUTTON_PLAY # define FFT_WINDOW BUTTON_PLAY
#elif !defined(HAVE_TOUCHSCREEN) #elif !defined(HAVE_TOUCHSCREEN)
#error No keymap defined! #error No keymap defined!
#endif #endif

9
apps/plugins/mpegplayer/mpegplayer.c
View file

@ -403,10 +403,11 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define MPEG_MENU BUTTON_BACK #define MPEG_MENU BUTTON_BACK
#define MPEG_PAUSE BUTTON_PLAY #define MPEG_PAUSE BUTTON_PLAY
#define MPEG_STOP BUTTON_POWER #define MPEG_STOP BUTTON_POWER
#define MPEG_VOLDOWN BUTTON_LEFT #define MPEG_VOLDOWN BUTTON_UP
#define MPEG_VOLUP BUTTON_RIGHT #define MPEG_VOLUP BUTTON_DOWN
#define MPEG_RW BUTTON_UP #define MPEG_RW BUTTON_LEFT
#define MPEG_FF BUTTON_DOWN #define MPEG_FF BUTTON_RIGHT
#else #else
#error No keymap defined! #error No keymap defined!

15
apps/plugins/pegbox.c
View file

@ -425,7 +425,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_LEFT #define PEGBOX_LEFT BUTTON_LEFT
#define PEGBOX_SELECT BUTTON_PLAY #define PEGBOX_SELECT BUTTON_PLAY
#define SAVE_TEXT "FFWD"
#define QUIT_TEXT "REC" #define QUIT_TEXT "REC"
#define RESTART_TEXT "REW" #define RESTART_TEXT "REW"
#define LVL_UP_TEXT "PLAY+FFWD" #define LVL_UP_TEXT "PLAY+FFWD"
@ -443,7 +442,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_LEFT #define PEGBOX_LEFT BUTTON_LEFT
#define PEGBOX_SELECT BUTTON_PLAY #define PEGBOX_SELECT BUTTON_PLAY
#define SAVE_TEXT "REC + FFWD"
#define QUIT_TEXT "REC + PLAY" #define QUIT_TEXT "REC + PLAY"
#define RESTART_TEXT "REC + REW" #define RESTART_TEXT "REC + REW"
#define LVL_UP_TEXT "FFWD" #define LVL_UP_TEXT "FFWD"
@ -461,7 +459,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_PREV #define PEGBOX_LEFT BUTTON_PREV
#define PEGBOX_SELECT BUTTON_PLAY #define PEGBOX_SELECT BUTTON_PLAY
#define SAVE_TEXT "REC + OK"
#define QUIT_TEXT "REC" #define QUIT_TEXT "REC"
#define RESTART_TEXT "MENU" #define RESTART_TEXT "MENU"
#define LVL_UP_TEXT "OK" #define LVL_UP_TEXT "OK"
@ -479,7 +476,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_VOL_DOWN #define PEGBOX_LEFT BUTTON_VOL_DOWN
#define PEGBOX_SELECT BUTTON_FUNC #define PEGBOX_SELECT BUTTON_FUNC
#define SAVE_TEXT "PLAY + FUNC"
#define QUIT_TEXT "REC + PLAY" #define QUIT_TEXT "REC + PLAY"
#define RESTART_TEXT "REC" #define RESTART_TEXT "REC"
#define LVL_UP_TEXT "REW" #define LVL_UP_TEXT "REW"
@ -497,7 +493,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_REW #define PEGBOX_LEFT BUTTON_REW
#define PEGBOX_SELECT (BUTTON_ENTER | BUTTON_REL) #define PEGBOX_SELECT (BUTTON_ENTER | BUTTON_REL)
#define SAVE_TEXT "Long ENTER"
#define QUIT_TEXT "Long MENU" #define QUIT_TEXT "Long MENU"
#define RESTART_TEXT "MENU" #define RESTART_TEXT "MENU"
#define LVL_UP_TEXT "PLAY" #define LVL_UP_TEXT "PLAY"
@ -515,7 +510,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_LEFT #define PEGBOX_LEFT BUTTON_LEFT
#define PEGBOX_SELECT BUTTON_SELECT #define PEGBOX_SELECT BUTTON_SELECT
#define SAVE_TEXT "PLAYPAUSE"
#define QUIT_TEXT "POWER" #define QUIT_TEXT "POWER"
#define RESTART_TEXT "BACK" #define RESTART_TEXT "BACK"
#define LVL_UP_TEXT "Vol+" #define LVL_UP_TEXT "Vol+"
@ -533,7 +527,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_RIGHT BUTTON_RIGHT #define PEGBOX_RIGHT BUTTON_RIGHT
#define PEGBOX_LEFT BUTTON_LEFT #define PEGBOX_LEFT BUTTON_LEFT
#define SAVE_TEXT "Vol+"
#define QUIT_TEXT "POWER" #define QUIT_TEXT "POWER"
#define RESTART_TEXT "Vol-" #define RESTART_TEXT "Vol-"
#define LVL_UP_TEXT "NEXT" #define LVL_UP_TEXT "NEXT"
@ -551,7 +544,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_RIGHT BUTTON_RIGHT #define PEGBOX_RIGHT BUTTON_RIGHT
#define PEGBOX_LEFT BUTTON_LEFT #define PEGBOX_LEFT BUTTON_LEFT
#define SAVE_TEXT "PLAYPAUSE"
#define QUIT_TEXT "POWER" #define QUIT_TEXT "POWER"
#define RESTART_TEXT "BACK" #define RESTART_TEXT "BACK"
#define LVL_UP_TEXT "Vol+" #define LVL_UP_TEXT "Vol+"
@ -569,7 +561,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_RIGHT BUTTON_RIGHT #define PEGBOX_RIGHT BUTTON_RIGHT
#define PEGBOX_LEFT BUTTON_LEFT #define PEGBOX_LEFT BUTTON_LEFT
#define SAVE_TEXT "POWER + SELECT"
#define QUIT_TEXT "POWER" #define QUIT_TEXT "POWER"
#define RESTART_TEXT "POWER + LEFT" #define RESTART_TEXT "POWER + LEFT"
#define LVL_UP_TEXT "POWER + UP" #define LVL_UP_TEXT "POWER + UP"
@ -587,7 +578,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_RIGHT BUTTON_RIGHT #define PEGBOX_RIGHT BUTTON_RIGHT
#define PEGBOX_LEFT BUTTON_LEFT #define PEGBOX_LEFT BUTTON_LEFT
#define SAVE_TEXT "PLAY"
#define QUIT_TEXT "POWER" #define QUIT_TEXT "POWER"
#define RESTART_TEXT "POWER + PREV" #define RESTART_TEXT "POWER + PREV"
#define LVL_UP_TEXT "NEXT" #define LVL_UP_TEXT "NEXT"
@ -603,11 +593,10 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_SELECT BUTTON_PLAY #define PEGBOX_SELECT BUTTON_PLAY
#define PEGBOX_RESTART BUTTON_BACK #define PEGBOX_RESTART BUTTON_BACK
#define SAVE_TEXT "BACK+PLAY"
#define QUIT_TEXT "POWER" #define QUIT_TEXT "POWER"
#define RESTART_TEXT "BACK+POWER" #define RESTART_TEXT "BACK+POWER"
#define LVL_UP_TEXT "BACK+RIGHT" #define LVL_UP_TEXT ""
#define LVL_DOWN_TEXT "BACK+LEFT" #define LVL_DOWN_TEXT ""
#define SELECT_TEXT "PLAY" #define SELECT_TEXT "PLAY"

1
apps/plugins/sudoku/sudoku.h
View file

@ -380,7 +380,6 @@
#define SUDOKU_BUTTON_POSSIBLE (BUTTON_POWER | BUTTON_SELECT) #define SUDOKU_BUTTON_POSSIBLE (BUTTON_POWER | BUTTON_SELECT)
#define SUDOKU_BUTTON_ALTTOGGLE BUTTON_SELECT #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_SELECT
#elif CONFIG_KEYPAD == SONY_NWZ_PAD #elif CONFIG_KEYPAD == SONY_NWZ_PAD
#define SUDOKU_BUTTON_MENU BUTTON_BACK #define SUDOKU_BUTTON_MENU BUTTON_BACK
#define SUDOKU_BUTTON_UP BUTTON_UP #define SUDOKU_BUTTON_UP BUTTON_UP