len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Accept FS#8341 - rename BUTTON_SCROLL_UP/DOWN to FWD/BACK on the e200 to make it consistant with the ipods. apart from removing a bit of confusion, it fixes the wheel in pictureflow and possibly elsewhere.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16045 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-01-10 08:08:31 +00:00
parent 4d238c14d7
commit 81ba146706
35 changed files with 131 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

60
apps/keymaps/keymap-e200.c
View file

@ -31,10 +31,10 @@
* Insert LAST_ITEM_IN_LIST at the end of each mapping * Insert LAST_ITEM_IN_LIST at the end of each mapping
*/ */
static const struct button_mapping button_context_standard[] = { static const struct button_mapping button_context_standard[] = {
{ ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE },
{ ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
{ ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
@ -67,10 +67,10 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER },
{ ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER },
{ ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE },
{ ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_WPS_VOLDOWN, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE },
{ ACTION_WPS_VOLDOWN, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
@ -88,10 +88,10 @@ static const struct button_mapping button_context_wps[] = {
static const struct button_mapping button_context_settings[] = { static const struct button_mapping button_context_settings[] = {
{ ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
{ ACTION_SETTINGS_INC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
@ -103,8 +103,8 @@ static const struct button_mapping button_context_settings[] = {
}; /* button_context_settings */ }; /* button_context_settings */
static const struct button_mapping button_context_list[] = { static const struct button_mapping button_context_list[] = {
{ ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_UP, BUTTON_REC }, { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_BACK, BUTTON_REC },
{ ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC }, { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_FWD, BUTTON_REC },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_list */ }; /* button_context_list */
@ -162,10 +162,10 @@ static const struct button_mapping button_context_quickscreen[] = {
}; /* button_context_quickscreen */ }; /* button_context_quickscreen */
static const struct button_mapping button_context_settings_right_is_inc[] = { static const struct button_mapping button_context_settings_right_is_inc[] = {
{ ACTION_SETTINGS_INC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT,BUTTON_NONE }, { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT,BUTTON_NONE },
{ ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
{ ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
@ -190,10 +190,10 @@ static const struct button_mapping button_context_settings_time[] = {
}; /* button_context_settings_time */ }; /* button_context_settings_time */
static const struct button_mapping button_context_pitchscreen[] = { static const struct button_mapping button_context_pitchscreen[] = {
{ ACTION_PS_INC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE }, { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE },
{ ACTION_PS_INC_BIG, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_PS_DEC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE },
{ ACTION_PS_DEC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
{ ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
@ -215,10 +215,10 @@ static const struct button_mapping button_context_recscreen[] = {
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE },
{ ACTION_STD_PREV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_PREV, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_recscreen */ }; /* button_context_recscreen */
@ -245,10 +245,10 @@ static const struct button_mapping button_context_keyboard[] = {
{ ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_KBD_UP, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_KBD_UP, BUTTON_SCROLL_BACK, BUTTON_NONE },
{ ACTION_KBD_UP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_UP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE },
{ ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC },
{ ACTION_KBD_BACKSPACE, BUTTON_DOWN, BUTTON_NONE }, { ACTION_KBD_BACKSPACE, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_KBD_BACKSPACE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_BACKSPACE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },

4
apps/plugins/blackjack.c
View file

@ -168,8 +168,8 @@ PLUGIN_HEADER
#define BJACK_DOUBLEDOWN BUTTON_LEFT #define BJACK_DOUBLEDOWN BUTTON_LEFT
#define BJACK_SCORES BUTTON_UP #define BJACK_SCORES BUTTON_UP
#define BJACK_RESUME BUTTON_REC #define BJACK_RESUME BUTTON_REC
#define BJACK_UP BUTTON_SCROLL_UP #define BJACK_UP BUTTON_SCROLL_FWD
#define BJACK_DOWN BUTTON_SCROLL_DOWN #define BJACK_DOWN BUTTON_SCROLL_BACK
#define BJACK_RIGHT BUTTON_RIGHT #define BJACK_RIGHT BUTTON_RIGHT
#define BJACK_LEFT BUTTON_LEFT #define BJACK_LEFT BUTTON_LEFT

4
apps/plugins/bounce.c
View file

@ -77,8 +77,8 @@ PLUGIN_HEADER
#define BOUNCE_MODE BUTTON_A #define BOUNCE_MODE BUTTON_A
#elif CONFIG_KEYPAD == SANSA_E200_PAD #elif CONFIG_KEYPAD == SANSA_E200_PAD
#define BOUNCE_UP BUTTON_SCROLL_UP #define BOUNCE_UP BUTTON_SCROLL_BACK
#define BOUNCE_DOWN BUTTON_SCROLL_DOWN #define BOUNCE_DOWN BUTTON_SCROLL_FWD
#define BOUNCE_QUIT BUTTON_POWER #define BOUNCE_QUIT BUTTON_POWER
#define BOUNCE_MODE BUTTON_SELECT #define BOUNCE_MODE BUTTON_SELECT

8
apps/plugins/brickmania.c
View file

@ -107,11 +107,11 @@ PLUGIN_HEADER
#define LEFT BUTTON_LEFT #define LEFT BUTTON_LEFT
#define RIGHT BUTTON_RIGHT #define RIGHT BUTTON_RIGHT
#define SELECT BUTTON_SELECT #define SELECT BUTTON_SELECT
#define UP BUTTON_SCROLL_UP #define UP BUTTON_SCROLL_BACK
#define DOWN BUTTON_SCROLL_DOWN #define DOWN BUTTON_SCROLL_FWD
#define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_DOWN) #define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_FWD)
#define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_UP) #define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK)
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD

4
apps/plugins/chessbox/chessbox.c
View file

@ -191,8 +191,8 @@ PLUGIN_HEADER
#define CB_LEVEL BUTTON_REC #define CB_LEVEL BUTTON_REC
#define CB_MENU BUTTON_POWER #define CB_MENU BUTTON_POWER
#define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) #define CB_SCROLL_UP (BUTTON_SCROLL_BACK|BUTTON_REPEAT)
#define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) #define CB_SCROLL_DOWN (BUTTON_SCROLL_FWD|BUTTON_REPEAT)
#define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT)
#define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT)

4
apps/plugins/chessbox/chessbox_pgn.c
View file

@ -163,8 +163,8 @@
#define CB_RESTART (BUTTON_REW | BUTTON_PLAY) #define CB_RESTART (BUTTON_REW | BUTTON_PLAY)
#define CB_MENU BUTTON_POWER #define CB_MENU BUTTON_POWER
#define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) #define CB_SCROLL_UP (BUTTON_SCROLL_BACK|BUTTON_REPEAT)
#define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) #define CB_SCROLL_DOWN (BUTTON_SCROLL_FWD|BUTTON_REPEAT)
#define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT)
#define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT)

4
apps/plugins/chip8.c
View file

@ -1022,11 +1022,11 @@ STATIC void chip8 (void)
#elif CONFIG_KEYPAD == SANSA_E200_PAD #elif CONFIG_KEYPAD == SANSA_E200_PAD
#define CHIP8_OFF BUTTON_POWER #define CHIP8_OFF BUTTON_POWER
#define CHIP8_KEY2 BUTTON_SCROLL_UP #define CHIP8_KEY2 BUTTON_SCROLL_BACK
#define CHIP8_KEY4 BUTTON_LEFT #define CHIP8_KEY4 BUTTON_LEFT
#define CHIP8_KEY5 BUTTON_SELECT #define CHIP8_KEY5 BUTTON_SELECT
#define CHIP8_KEY6 BUTTON_RIGHT #define CHIP8_KEY6 BUTTON_RIGHT
#define CHIP8_KEY8 BUTTON_SCROLL_DOWN #define CHIP8_KEY8 BUTTON_SCROLL_FWD
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD
#define CHIP8_OFF BUTTON_POWER #define CHIP8_OFF BUTTON_POWER

4
apps/plugins/cube.c
View file

@ -153,8 +153,8 @@ PLUGIN_HEADER
#define CUBE_QUIT BUTTON_POWER #define CUBE_QUIT BUTTON_POWER
#define CUBE_X_INC BUTTON_LEFT #define CUBE_X_INC BUTTON_LEFT
#define CUBE_X_DEC BUTTON_RIGHT #define CUBE_X_DEC BUTTON_RIGHT
#define CUBE_Y_INC BUTTON_SCROLL_UP #define CUBE_Y_INC BUTTON_SCROLL_FWD
#define CUBE_Y_DEC BUTTON_SCROLL_DOWN #define CUBE_Y_DEC BUTTON_SCROLL_BACK
#define CUBE_Z_INC BUTTON_UP #define CUBE_Z_INC BUTTON_UP
#define CUBE_Z_DEC BUTTON_DOWN #define CUBE_Z_DEC BUTTON_DOWN
#define CUBE_MODE_PRE BUTTON_SELECT #define CUBE_MODE_PRE BUTTON_SELECT

4
apps/plugins/doom/i_video.c
View file

@ -181,8 +181,8 @@ void I_ShutdownGraphics(void)
#define DOOMBUTTON_WEAPON BUTTON_FF #define DOOMBUTTON_WEAPON BUTTON_FF
#elif CONFIG_KEYPAD == SANSA_E200_PAD #elif CONFIG_KEYPAD == SANSA_E200_PAD
#define DOOMBUTTON_SCROLLWHEEL #define DOOMBUTTON_SCROLLWHEEL
#define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_UP #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK
#define DOOMBUTTON_SCROLLWHEEL_CW BUTTON_SCROLL_DOWN #define DOOMBUTTON_SCROLLWHEEL_CW BUTTON_SCROLL_FWD
#define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_UP BUTTON_UP
#define DOOMBUTTON_DOWN BUTTON_DOWN #define DOOMBUTTON_DOWN BUTTON_DOWN
#define DOOMBUTTON_LEFT BUTTON_LEFT #define DOOMBUTTON_LEFT BUTTON_LEFT

4
apps/plugins/fire.c
View file

@ -117,8 +117,8 @@ static unsigned char draw_buffer[FIRE_WIDTH];
#define FIRE_QUIT BUTTON_POWER #define FIRE_QUIT BUTTON_POWER
#define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT #define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT
#define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT
#define FIRE_INCREASE_MULT BUTTON_SCROLL_UP #define FIRE_INCREASE_MULT BUTTON_SCROLL_FWD
#define FIRE_DECREASE_MULT BUTTON_SCROLL_DOWN #define FIRE_DECREASE_MULT BUTTON_SCROLL_BACK
#elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD)
#define FIRE_QUIT BUTTON_PLAY #define FIRE_QUIT BUTTON_PLAY

8
apps/plugins/jpeg.c
View file

@ -136,10 +136,10 @@ PLUGIN_HEADER
#define JPEG_RIGHT BUTTON_RIGHT #define JPEG_RIGHT BUTTON_RIGHT
#define JPEG_MENU BUTTON_POWER #define JPEG_MENU BUTTON_POWER
#define JPEG_SLIDE_SHOW BUTTON_REC #define JPEG_SLIDE_SHOW BUTTON_REC
#define JPEG_NEXT BUTTON_SCROLL_DOWN #define JPEG_NEXT BUTTON_SCROLL_FWD
#define JPEG_NEXT_REPEAT (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) #define JPEG_NEXT_REPEAT (BUTTON_SCROLL_FWD|BUTTON_REPEAT)
#define JPEG_PREVIOUS BUTTON_SCROLL_UP #define JPEG_PREVIOUS BUTTON_SCROLL_BACK
#define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_UP|BUTTON_REPEAT) #define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_BACK|BUTTON_REPEAT)
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD
#define JPEG_ZOOM_PRE BUTTON_SELECT #define JPEG_ZOOM_PRE BUTTON_SELECT

12
apps/plugins/lib/pluginlib_actions.c
View file

@ -83,13 +83,14 @@ const struct button_mapping generic_directions[] =
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
|| (CONFIG_KEYPAD == IPOD_3G_PAD) \ || (CONFIG_KEYPAD == IPOD_3G_PAD) \
|| (CONFIG_KEYPAD == SANSA_E200_PAD) \
|| (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
{ PLA_UP, BUTTON_SCROLL_FWD, BUTTON_NONE}, { PLA_UP, BUTTON_SCROLL_BACK, BUTTON_NONE},
{ PLA_DOWN, BUTTON_SCROLL_BACK, BUTTON_NONE}, { PLA_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE},
{ PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
{ PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
{ PLA_UP_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, { PLA_UP_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_DOWN_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, { PLA_DOWN_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
#elif CONFIG_KEYPAD == ONDIO_PAD #elif CONFIG_KEYPAD == ONDIO_PAD
@ -110,8 +111,7 @@ const struct button_mapping generic_directions[] =
{PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
{PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
{PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) \ #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
|| (CONFIG_KEYPAD == IRIVER_H10_PAD)
{ PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE},
{ PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE},
{ PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},

4
apps/plugins/mandelbrot.c
View file

@ -130,8 +130,8 @@ PLUGIN_HEADER
#define MANDELBROT_DOWN BUTTON_DOWN #define MANDELBROT_DOWN BUTTON_DOWN
#define MANDELBROT_LEFT BUTTON_LEFT #define MANDELBROT_LEFT BUTTON_LEFT
#define MANDELBROT_RIGHT BUTTON_RIGHT #define MANDELBROT_RIGHT BUTTON_RIGHT
#define MANDELBROT_ZOOM_IN BUTTON_SCROLL_DOWN #define MANDELBROT_ZOOM_IN BUTTON_SCROLL_FWD
#define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_UP #define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_BACK
#define MANDELBROT_MAXITER_INC (BUTTON_SELECT | BUTTON_RIGHT) #define MANDELBROT_MAXITER_INC (BUTTON_SELECT | BUTTON_RIGHT)
#define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT)
#define MANDELBROT_RESET BUTTON_REC #define MANDELBROT_RESET BUTTON_REC

4
apps/plugins/matrix.c
View file

@ -77,8 +77,8 @@ extern const fb_data matrix_normal[];
#define MATRIX_PAUSE BUTTON_SELECT #define MATRIX_PAUSE BUTTON_SELECT
#elif CONFIG_KEYPAD == SANSA_E200_PAD #elif CONFIG_KEYPAD == SANSA_E200_PAD
#define MATRIX_EXIT BUTTON_POWER #define MATRIX_EXIT BUTTON_POWER
#define MATRIX_SLEEP_MORE BUTTON_SCROLL_UP|BUTTON_REPEAT #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT
#define MATRIX_SLEEP_LESS BUTTON_SCROLL_DOWN|BUTTON_REPEAT #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT
#define MATRIX_PAUSE BUTTON_SELECT #define MATRIX_PAUSE BUTTON_SELECT
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD
#define MATRIX_EXIT BUTTON_POWER #define MATRIX_EXIT BUTTON_POWER

11
apps/plugins/metronome.c
View file

@ -20,12 +20,21 @@
#include "metronome.h" #include "metronome.h"
PLUGIN_HEADER PLUGIN_HEADER
#define METRONOME_QUIT PLA_QUIT #define METRONOME_QUIT PLA_QUIT
/* for volume changes, PLA with scrollwheel isn't proper */
#ifdef HAVE_SCROLLWHEEL
#define METRONOME_VOL_UP PLA_DOWN
#define METRONOME_VOL_DOWN PLA_UP
#define METRONOME_VOL_UP_REP PLA_DOWN_REPEAT
#define METRONOME_VOL_DOWN_REP PLA_UP_REPEAT
#else
#define METRONOME_VOL_UP PLA_UP #define METRONOME_VOL_UP PLA_UP
#define METRONOME_VOL_DOWN PLA_DOWN #define METRONOME_VOL_DOWN PLA_DOWN
#define METRONOME_VOL_UP_REP PLA_UP_REPEAT #define METRONOME_VOL_UP_REP PLA_UP_REPEAT
#define METRONOME_VOL_DOWN_REP PLA_DOWN_REPEAT #define METRONOME_VOL_DOWN_REP PLA_DOWN_REPEAT
#endif
#define METRONOME_LEFT PLA_LEFT #define METRONOME_LEFT PLA_LEFT
#define METRONOME_RIGHT PLA_RIGHT #define METRONOME_RIGHT PLA_RIGHT
#define METRONOME_LEFT_REP PLA_LEFT_REPEAT #define METRONOME_LEFT_REP PLA_LEFT_REPEAT

12
apps/plugins/midi/midiplay.c
View file

@ -72,8 +72,16 @@ PLUGIN_IRAM_DECLARE
#define BTN_PLAY BUTTON_A #define BTN_PLAY BUTTON_A
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD)
(CONFIG_KEYPAD == SANSA_C200_PAD) #define BTN_QUIT BUTTON_POWER
#define BTN_RIGHT BUTTON_RIGHT
#define BTN_LEFT BUTTON_LEFT
#define BTN_UP BUTTON_SCROLL_FWD
#define BTN_DOWN BUTTON_SCROLL_BACK
#define BTN_PLAY BUTTON_UP
#elif (CONFIG_KEYPAD == SANSA_C200_PAD)
#define BTN_QUIT BUTTON_POWER #define BTN_QUIT BUTTON_POWER
#define BTN_RIGHT BUTTON_RIGHT #define BTN_RIGHT BUTTON_RIGHT
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT

4
apps/plugins/minesweeper.c
View file

@ -108,8 +108,8 @@ enum minesweeper_status {
# define MINESWP_UP BUTTON_UP # define MINESWP_UP BUTTON_UP
# define MINESWP_DOWN BUTTON_DOWN # define MINESWP_DOWN BUTTON_DOWN
# define MINESWP_QUIT BUTTON_POWER # define MINESWP_QUIT BUTTON_POWER
# define MINESWP_NEXT BUTTON_SCROLL_DOWN # define MINESWP_NEXT BUTTON_SCROLL_FWD
# define MINESWP_PREV BUTTON_SCROLL_UP # define MINESWP_PREV BUTTON_SCROLL_BACK
# define MINESWP_TOGGLE BUTTON_REC # define MINESWP_TOGGLE BUTTON_REC
# define MINESWP_DISCOVER BUTTON_SELECT # define MINESWP_DISCOVER BUTTON_SELECT
# define MINESWP_INFO (BUTTON_REC|BUTTON_REPEAT) # define MINESWP_INFO (BUTTON_REC|BUTTON_REPEAT)

4
apps/plugins/mpegplayer/mpeg_settings.c
View file

@ -61,8 +61,8 @@ struct mpeg_settings settings;
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) #elif (CONFIG_KEYPAD == SANSA_E200_PAD)
#define MPEG_SELECT BUTTON_SELECT #define MPEG_SELECT BUTTON_SELECT
#define MPEG_SCROLL_UP BUTTON_SCROLL_UP #define MPEG_SCROLL_UP BUTTON_SCROLL_BACK
#define MPEG_SCROLL_DOWN BUTTON_SCROLL_DOWN #define MPEG_SCROLL_DOWN BUTTON_SCROLL_FWD
#define MPEG_LEFT BUTTON_LEFT #define MPEG_LEFT BUTTON_LEFT
#define MPEG_RIGHT BUTTON_RIGHT #define MPEG_RIGHT BUTTON_RIGHT
#define MPEG_UP BUTTON_UP #define MPEG_UP BUTTON_UP

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

@ -163,8 +163,8 @@ PLUGIN_IRAM_DECLARE
#define MPEG_MENU BUTTON_SELECT #define MPEG_MENU BUTTON_SELECT
#define MPEG_STOP BUTTON_POWER #define MPEG_STOP BUTTON_POWER
#define MPEG_PAUSE BUTTON_UP #define MPEG_PAUSE BUTTON_UP
#define MPEG_VOLDOWN BUTTON_SCROLL_UP #define MPEG_VOLDOWN BUTTON_SCROLL_BACK
#define MPEG_VOLUP BUTTON_SCROLL_DOWN #define MPEG_VOLUP BUTTON_SCROLL_FWD
#define MPEG_RW BUTTON_LEFT #define MPEG_RW BUTTON_LEFT
#define MPEG_FF BUTTON_RIGHT #define MPEG_FF BUTTON_RIGHT

4
apps/plugins/oscilloscope.c
View file

@ -106,8 +106,8 @@ PLUGIN_HEADER
#define OSCILLOSCOPE_PAUSE BUTTON_REC #define OSCILLOSCOPE_PAUSE BUTTON_REC
#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT
#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT
#define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_DOWN #define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_FWD
#define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_UP #define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_BACK
#elif (CONFIG_KEYPAD == SANSA_C200_PAD) #elif (CONFIG_KEYPAD == SANSA_C200_PAD)
#define OSCILLOSCOPE_QUIT BUTTON_POWER #define OSCILLOSCOPE_QUIT BUTTON_POWER

8
apps/plugins/pictureflow.c
View file

@ -50,10 +50,10 @@ const struct button_mapping *plugin_contexts[]
#endif #endif
#ifdef SCROLLWHEEL #ifdef SCROLLWHEEL
#define PICTUREFLOW_NEXT_ALBUM PLA_UP #define PICTUREFLOW_NEXT_ALBUM PLA_DOWN
#define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_UP_REPEAT #define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_DOWN_REPEAT
#define PICTUREFLOW_PREV_ALBUM PLA_DOWN #define PICTUREFLOW_PREV_ALBUM PLA_UP
#define PICTUREFLOW_PREV_ALBUM_REPEAT PLA_DOWN_REPEAT #define PICTUREFLOW_PREV_ALBUM_REPEAT PLA_UP_REPEAT
#else #else
#define PICTUREFLOW_NEXT_ALBUM PLA_RIGHT #define PICTUREFLOW_NEXT_ALBUM PLA_RIGHT
#define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_RIGHT_REPEAT #define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_RIGHT_REPEAT

4
apps/plugins/rockblox.c
View file

@ -113,8 +113,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == SANSA_E200_PAD #elif CONFIG_KEYPAD == SANSA_E200_PAD
#define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_UP #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK
#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_DOWN #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD
#define ROCKBLOX_DOWN BUTTON_DOWN #define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT #define ROCKBLOX_RIGHT BUTTON_RIGHT

4
apps/plugins/rockboy/rockboy.c
View file

@ -153,8 +153,8 @@ static void setoptions (void)
options.A=BUTTON_SELECT; options.A=BUTTON_SELECT;
options.B=BUTTON_REC; options.B=BUTTON_REC;
options.START=BUTTON_SCROLL_UP; options.START=BUTTON_SCROLL_BACK;
options.SELECT=BUTTON_SCROLL_DOWN; options.SELECT=BUTTON_SCROLL_FWD;
options.MENU=BUTTON_POWER; options.MENU=BUTTON_POWER;
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD

4
apps/plugins/rockboy/sys_rockbox.c
View file

@ -26,8 +26,8 @@
#if CONFIG_KEYPAD == SANSA_E200_PAD #if CONFIG_KEYPAD == SANSA_E200_PAD
#define ROCKBOY_SCROLLWHEEL #define ROCKBOY_SCROLLWHEEL
#define ROCKBOY_SCROLLWHEEL_CC BUTTON_SCROLL_UP #define ROCKBOY_SCROLLWHEEL_CC BUTTON_SCROLL_BACK
#define ROCKBOY_SCROLLWHEEL_CW BUTTON_SCROLL_DOWN #define ROCKBOY_SCROLLWHEEL_CW BUTTON_SCROLL_FWD
#endif #endif
struct fb fb IBSS_ATTR; struct fb fb IBSS_ATTR;

6
apps/plugins/solitaire.c
View file

@ -185,8 +185,8 @@ static struct plugin_api* rb;
# define SOL_QUIT BUTTON_POWER # define SOL_QUIT BUTTON_POWER
# define SOL_UP BUTTON_UP # define SOL_UP BUTTON_UP
# define SOL_DOWN BUTTON_DOWN # define SOL_DOWN BUTTON_DOWN
# define SOL_LEFT BUTTON_SCROLL_UP # define SOL_LEFT BUTTON_SCROLL_BACK
# define SOL_RIGHT BUTTON_SCROLL_DOWN # define SOL_RIGHT BUTTON_SCROLL_FWD
# define SOL_MOVE BUTTON_SELECT # define SOL_MOVE BUTTON_SELECT
# define SOL_DRAW BUTTON_REC # define SOL_DRAW BUTTON_REC
# define SOL_REM2CUR BUTTON_LEFT # define SOL_REM2CUR BUTTON_LEFT
@ -1408,7 +1408,7 @@ int solitaire( int skipmenu )
/* what to do when a key is pressed ... */ /* what to do when a key is pressed ... */
button = rb->button_get( true ); button = rb->button_get( true );
#if (CONFIG_KEYPAD == SANSA_E200_PAD) #if (CONFIG_KEYPAD == SANSA_E200_PAD)
if (button&(BUTTON_SCROLL_UP|BUTTON_SCROLL_DOWN)) if (button&(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD))
button = button & (~BUTTON_REPEAT); button = button & (~BUTTON_REPEAT);
#endif #endif
switch( button ) switch( button )

8
apps/plugins/spacerocks.c
View file

@ -128,10 +128,10 @@ static struct plugin_api* rb; /* global api struct pointer */
#define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT) #define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT)
#define AST_THRUST BUTTON_UP #define AST_THRUST BUTTON_UP
#define AST_HYPERSPACE BUTTON_DOWN #define AST_HYPERSPACE BUTTON_DOWN
#define AST_LEFT BUTTON_SCROLL_UP #define AST_LEFT BUTTON_SCROLL_BACK
#define AST_LEFT_REP (BUTTON_SCROLL_UP | BUTTON_REPEAT) #define AST_LEFT_REP (BUTTON_SCROLL_BACK | BUTTON_REPEAT)
#define AST_RIGHT BUTTON_SCROLL_DOWN #define AST_RIGHT BUTTON_SCROLL_FWD
#define AST_RIGHT_REP (BUTTON_SCROLL_DOWN | BUTTON_REPEAT) #define AST_RIGHT_REP (BUTTON_SCROLL_FWD | BUTTON_REPEAT)
#define AST_FIRE BUTTON_SELECT #define AST_FIRE BUTTON_SELECT
#define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT)

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

@ -117,8 +117,8 @@
#define SUDOKU_BUTTON_DOWN BUTTON_DOWN #define SUDOKU_BUTTON_DOWN BUTTON_DOWN
#define SUDOKU_BUTTON_LEFT BUTTON_LEFT #define SUDOKU_BUTTON_LEFT BUTTON_LEFT
#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_UP #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_BACK
#define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_DOWN #define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_FWD
#define SUDOKU_BUTTON_MENU BUTTON_SELECT #define SUDOKU_BUTTON_MENU BUTTON_SELECT
#define SUDOKU_BUTTON_POSSIBLE BUTTON_REC #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC

4
apps/plugins/superdom.c
View file

@ -113,8 +113,8 @@ char buf[255];
#elif CONFIG_KEYPAD == SANSA_E200_PAD #elif CONFIG_KEYPAD == SANSA_E200_PAD
#define SUPERDOM_OK BUTTON_SELECT #define SUPERDOM_OK BUTTON_SELECT
#define SUPERDOM_UP BUTTON_SCROLL_UP #define SUPERDOM_UP BUTTON_SCROLL_BACK
#define SUPERDOM_DOWN BUTTON_SCROLL_DOWN #define SUPERDOM_DOWN BUTTON_SCROLL_FWD
#define SUPERDOM_LEFT BUTTON_LEFT #define SUPERDOM_LEFT BUTTON_LEFT
#define SUPERDOM_RIGHT BUTTON_RIGHT #define SUPERDOM_RIGHT BUTTON_RIGHT
#define SUPERDOM_CANCEL BUTTON_POWER #define SUPERDOM_CANCEL BUTTON_POWER

4
apps/plugins/viewer.c
View file

@ -180,8 +180,8 @@ PLUGIN_HEADER
#define VIEWER_SCREEN_RIGHT BUTTON_RIGHT #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT
#define VIEWER_MENU BUTTON_SELECT #define VIEWER_MENU BUTTON_SELECT
#define VIEWER_AUTOSCROLL BUTTON_REC #define VIEWER_AUTOSCROLL BUTTON_REC
#define VIEWER_LINE_UP BUTTON_SCROLL_UP #define VIEWER_LINE_UP BUTTON_SCROLL_FWD
#define VIEWER_LINE_DOWN BUTTON_SCROLL_DOWN #define VIEWER_LINE_DOWN BUTTON_SCROLL_BACK
/* Sansa C200 keys */ /* Sansa C200 keys */
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD

4
apps/plugins/vu_meter.c
View file

@ -91,8 +91,8 @@ PLUGIN_HEADER
#define VUMETER_MENU BUTTON_SELECT #define VUMETER_MENU BUTTON_SELECT
#define VUMETER_MENU_EXIT BUTTON_SELECT #define VUMETER_MENU_EXIT BUTTON_SELECT
#define VUMETER_MENU_EXIT2 BUTTON_POWER #define VUMETER_MENU_EXIT2 BUTTON_POWER
#define VUMETER_UP BUTTON_SCROLL_DOWN #define VUMETER_UP BUTTON_SCROLL_FWD
#define VUMETER_DOWN BUTTON_SCROLL_UP #define VUMETER_DOWN BUTTON_SCROLL_BACK
#elif (CONFIG_KEYPAD == SANSA_C200_PAD) #elif (CONFIG_KEYPAD == SANSA_C200_PAD)
#define VUMETER_QUIT BUTTON_POWER #define VUMETER_QUIT BUTTON_POWER

1
docs/CREDITS
View file

@ -362,6 +362,7 @@ Melba Sitjar
Mehmet Ş. Çatalbaş Mehmet Ş. Çatalbaş
Scott Tinman Scott Tinman
Alexander Kuzmenkov Alexander Kuzmenkov
Thomas Martitz
The libmad team The libmad team
The wavpack team The wavpack team

14
firmware/drivers/button.c
View file

@ -412,8 +412,8 @@ static int button_flip(int button)
#if defined(BUTTON_UP) && defined(BUTTON_DOWN) #if defined(BUTTON_UP) && defined(BUTTON_DOWN)
| BUTTON_UP | BUTTON_DOWN | BUTTON_UP | BUTTON_DOWN
#endif #endif
#if defined(BUTTON_SCROLL_UP) && defined(BUTTON_SCROLL_DOWN) #if defined(BUTTON_SCROLL_BACK) && defined(BUTTON_SCROLL_FWD)
| BUTTON_SCROLL_UP | BUTTON_SCROLL_DOWN | BUTTON_SCROLL_BACK | BUTTON_SCROLL_FWD
#endif #endif
#if CONFIG_KEYPAD == RECORDER_PAD #if CONFIG_KEYPAD == RECORDER_PAD
| BUTTON_F1 | BUTTON_F3 | BUTTON_F1 | BUTTON_F3
@ -430,11 +430,11 @@ static int button_flip(int button)
if (button & BUTTON_DOWN) if (button & BUTTON_DOWN)
newbutton |= BUTTON_UP; newbutton |= BUTTON_UP;
#endif #endif
#if defined(BUTTON_SCROLL_UP) && defined(BUTTON_SCROLL_DOWN) #if defined(BUTTON_SCROLL_BACK) && defined(BUTTON_SCROLL_FWD)
if (button & BUTTON_SCROLL_UP) if (button & BUTTON_SCROLL_BACK)
newbutton |= BUTTON_SCROLL_DOWN; newbutton |= BUTTON_SCROLL_FWD;
if (button & BUTTON_SCROLL_DOWN) if (button & BUTTON_SCROLL_FWD)
newbutton |= BUTTON_SCROLL_UP; newbutton |= BUTTON_SCROLL_BACK;
#endif #endif
#if CONFIG_KEYPAD == RECORDER_PAD #if CONFIG_KEYPAD == RECORDER_PAD
if (button & BUTTON_F1) if (button & BUTTON_F1)

4
firmware/target/arm/sandisk/sansa-e200/button-e200.c
View file

@ -128,9 +128,9 @@ void clickwheel_int(void)
unsigned int btn = BUTTON_NONE; unsigned int btn = BUTTON_NONE;
if (old_wheel_value == wheel_tbl[0][wheel_value >> 6]) if (old_wheel_value == wheel_tbl[0][wheel_value >> 6])
btn = BUTTON_SCROLL_DOWN; btn = BUTTON_SCROLL_FWD;
else if (old_wheel_value == wheel_tbl[1][wheel_value >> 6]) else if (old_wheel_value == wheel_tbl[1][wheel_value >> 6])
btn = BUTTON_SCROLL_UP; btn = BUTTON_SCROLL_BACK;
if (btn != BUTTON_NONE) if (btn != BUTTON_NONE)
{ {

4
firmware/target/arm/sandisk/sansa-e200/button-target.h
View file

@ -40,8 +40,8 @@ int button_read_device(void);
#define BUTTON_UP 0x00000020 #define BUTTON_UP 0x00000020
#define BUTTON_POWER 0x00000040 #define BUTTON_POWER 0x00000040
#define BUTTON_SCROLL_UP 0x00000080 #define BUTTON_SCROLL_BACK 0x00000080
#define BUTTON_SCROLL_DOWN 0x00000100 #define BUTTON_SCROLL_FWD 0x00000100
#define BUTTON_MAIN 0x00000fff #define BUTTON_MAIN 0x00000fff

4
uisimulator/sdl/button.c
View file

@ -537,11 +537,11 @@ void button_event(int key, bool pressed)
break; break;
case SDLK_KP8: case SDLK_KP8:
case SDLK_UP: case SDLK_UP:
new_btn = BUTTON_SCROLL_UP; new_btn = BUTTON_SCROLL_BACK;
break; break;
case SDLK_KP2: case SDLK_KP2:
case SDLK_DOWN: case SDLK_DOWN:
new_btn = BUTTON_SCROLL_DOWN; new_btn = BUTTON_SCROLL_FWD;
break; break;
case SDLK_KP9: case SDLK_KP9:
new_btn = BUTTON_UP; new_btn = BUTTON_UP;