diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-01-10 08:08:31 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-01-10 08:08:31 +0000 |
commit | 81ba146706e0a1c21c59f11022767577be7d71b2 (patch) | |
tree | afce479f5133dcfaaaa71b2aa47a2e4f7c1004f3 | |
parent | 4d238c14d70199e3a991db0c3b938eb4b0f6c93a (diff) | |
download | rockbox-81ba146706e0a1c21c59f11022767577be7d71b2.tar.gz rockbox-81ba146706e0a1c21c59f11022767577be7d71b2.zip |
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.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16045 a1c6a512-1295-4272-9138-f99709370657
35 files changed, 131 insertions, 113 deletions
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index 331f26ee2b..748b56d23d 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c | |||
@@ -31,10 +31,10 @@ | |||
31 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 31 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
32 | */ | 32 | */ |
33 | static const struct button_mapping button_context_standard[] = { | 33 | static const struct button_mapping button_context_standard[] = { |
34 | { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, | 34 | { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
35 | { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 35 | { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
36 | { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 36 | { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
37 | { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 37 | { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
38 | 38 | ||
39 | { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 39 | { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
40 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 40 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -67,10 +67,10 @@ static const struct button_mapping button_context_wps[] = { | |||
67 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, | 67 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, |
68 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, | 68 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, |
69 | 69 | ||
70 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 70 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
71 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 71 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
72 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_UP, BUTTON_NONE }, | 72 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
73 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 73 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
74 | 74 | ||
75 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 75 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
76 | 76 | ||
@@ -88,10 +88,10 @@ static const struct button_mapping button_context_wps[] = { | |||
88 | 88 | ||
89 | static const struct button_mapping button_context_settings[] = { | 89 | static const struct button_mapping button_context_settings[] = { |
90 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 90 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
91 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 91 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
92 | { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 92 | { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
93 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_UP, BUTTON_NONE }, | 93 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
94 | { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 94 | { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
95 | 95 | ||
96 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 96 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
97 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 97 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -103,8 +103,8 @@ static const struct button_mapping button_context_settings[] = { | |||
103 | }; /* button_context_settings */ | 103 | }; /* button_context_settings */ |
104 | 104 | ||
105 | static const struct button_mapping button_context_list[] = { | 105 | static const struct button_mapping button_context_list[] = { |
106 | { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_UP, BUTTON_REC }, | 106 | { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_BACK, BUTTON_REC }, |
107 | { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC }, | 107 | { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_FWD, BUTTON_REC }, |
108 | 108 | ||
109 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 109 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
110 | }; /* button_context_list */ | 110 | }; /* button_context_list */ |
@@ -162,10 +162,10 @@ static const struct button_mapping button_context_quickscreen[] = { | |||
162 | }; /* button_context_quickscreen */ | 162 | }; /* button_context_quickscreen */ |
163 | 163 | ||
164 | static const struct button_mapping button_context_settings_right_is_inc[] = { | 164 | static const struct button_mapping button_context_settings_right_is_inc[] = { |
165 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 165 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
166 | { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 166 | { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
167 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_UP, BUTTON_NONE }, | 167 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
168 | { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT,BUTTON_NONE }, | 168 | { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT,BUTTON_NONE }, |
169 | 169 | ||
170 | { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, | 170 | { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, |
171 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 171 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -190,10 +190,10 @@ static const struct button_mapping button_context_settings_time[] = { | |||
190 | }; /* button_context_settings_time */ | 190 | }; /* button_context_settings_time */ |
191 | 191 | ||
192 | static const struct button_mapping button_context_pitchscreen[] = { | 192 | static const struct button_mapping button_context_pitchscreen[] = { |
193 | { ACTION_PS_INC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 193 | { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
194 | { ACTION_PS_INC_BIG, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 194 | { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
195 | { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE }, | 195 | { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
196 | { ACTION_PS_DEC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 196 | { ACTION_PS_DEC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
197 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 197 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
198 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 198 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
199 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 199 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
@@ -215,10 +215,10 @@ static const struct button_mapping button_context_recscreen[] = { | |||
215 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 215 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
216 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 216 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
217 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 217 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
218 | { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, | 218 | { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
219 | { ACTION_STD_PREV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 219 | { ACTION_STD_PREV, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
220 | { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 220 | { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
221 | { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 221 | { ACTION_STD_NEXT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
222 | 222 | ||
223 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 223 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
224 | }; /* button_context_recscreen */ | 224 | }; /* button_context_recscreen */ |
@@ -245,10 +245,10 @@ static const struct button_mapping button_context_keyboard[] = { | |||
245 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, | 245 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, |
246 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 246 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
247 | 247 | ||
248 | { ACTION_KBD_UP, BUTTON_SCROLL_UP, BUTTON_NONE }, | 248 | { ACTION_KBD_UP, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
249 | { ACTION_KBD_UP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 249 | { ACTION_KBD_UP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
250 | { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 250 | { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
251 | { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 251 | { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
252 | { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, | 252 | { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, |
253 | { ACTION_KBD_BACKSPACE, BUTTON_DOWN, BUTTON_NONE }, | 253 | { ACTION_KBD_BACKSPACE, BUTTON_DOWN, BUTTON_NONE }, |
254 | { ACTION_KBD_BACKSPACE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 254 | { ACTION_KBD_BACKSPACE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 421326e9c0..c2d4ea0f09 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -168,8 +168,8 @@ PLUGIN_HEADER | |||
168 | #define BJACK_DOUBLEDOWN BUTTON_LEFT | 168 | #define BJACK_DOUBLEDOWN BUTTON_LEFT |
169 | #define BJACK_SCORES BUTTON_UP | 169 | #define BJACK_SCORES BUTTON_UP |
170 | #define BJACK_RESUME BUTTON_REC | 170 | #define BJACK_RESUME BUTTON_REC |
171 | #define BJACK_UP BUTTON_SCROLL_UP | 171 | #define BJACK_UP BUTTON_SCROLL_FWD |
172 | #define BJACK_DOWN BUTTON_SCROLL_DOWN | 172 | #define BJACK_DOWN BUTTON_SCROLL_BACK |
173 | #define BJACK_RIGHT BUTTON_RIGHT | 173 | #define BJACK_RIGHT BUTTON_RIGHT |
174 | #define BJACK_LEFT BUTTON_LEFT | 174 | #define BJACK_LEFT BUTTON_LEFT |
175 | 175 | ||
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 9373050292..67375021b5 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -77,8 +77,8 @@ PLUGIN_HEADER | |||
77 | #define BOUNCE_MODE BUTTON_A | 77 | #define BOUNCE_MODE BUTTON_A |
78 | 78 | ||
79 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 79 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
80 | #define BOUNCE_UP BUTTON_SCROLL_UP | 80 | #define BOUNCE_UP BUTTON_SCROLL_BACK |
81 | #define BOUNCE_DOWN BUTTON_SCROLL_DOWN | 81 | #define BOUNCE_DOWN BUTTON_SCROLL_FWD |
82 | #define BOUNCE_QUIT BUTTON_POWER | 82 | #define BOUNCE_QUIT BUTTON_POWER |
83 | #define BOUNCE_MODE BUTTON_SELECT | 83 | #define BOUNCE_MODE BUTTON_SELECT |
84 | 84 | ||
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 8a4e07c9d7..52102eb037 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -107,11 +107,11 @@ PLUGIN_HEADER | |||
107 | #define LEFT BUTTON_LEFT | 107 | #define LEFT BUTTON_LEFT |
108 | #define RIGHT BUTTON_RIGHT | 108 | #define RIGHT BUTTON_RIGHT |
109 | #define SELECT BUTTON_SELECT | 109 | #define SELECT BUTTON_SELECT |
110 | #define UP BUTTON_SCROLL_UP | 110 | #define UP BUTTON_SCROLL_BACK |
111 | #define DOWN BUTTON_SCROLL_DOWN | 111 | #define DOWN BUTTON_SCROLL_FWD |
112 | 112 | ||
113 | #define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_DOWN) | 113 | #define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_FWD) |
114 | #define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_UP) | 114 | #define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK) |
115 | 115 | ||
116 | 116 | ||
117 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 117 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index cc31fe067f..f38f761109 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -191,8 +191,8 @@ PLUGIN_HEADER | |||
191 | #define CB_LEVEL BUTTON_REC | 191 | #define CB_LEVEL BUTTON_REC |
192 | #define CB_MENU BUTTON_POWER | 192 | #define CB_MENU BUTTON_POWER |
193 | 193 | ||
194 | #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) | 194 | #define CB_SCROLL_UP (BUTTON_SCROLL_BACK|BUTTON_REPEAT) |
195 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) | 195 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_FWD|BUTTON_REPEAT) |
196 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 196 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
197 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 197 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
198 | 198 | ||
diff --git a/apps/plugins/chessbox/chessbox_pgn.c b/apps/plugins/chessbox/chessbox_pgn.c index 9b09411170..14d93b059f 100644 --- a/apps/plugins/chessbox/chessbox_pgn.c +++ b/apps/plugins/chessbox/chessbox_pgn.c | |||
@@ -163,8 +163,8 @@ | |||
163 | #define CB_RESTART (BUTTON_REW | BUTTON_PLAY) | 163 | #define CB_RESTART (BUTTON_REW | BUTTON_PLAY) |
164 | #define CB_MENU BUTTON_POWER | 164 | #define CB_MENU BUTTON_POWER |
165 | 165 | ||
166 | #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) | 166 | #define CB_SCROLL_UP (BUTTON_SCROLL_BACK|BUTTON_REPEAT) |
167 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) | 167 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_FWD|BUTTON_REPEAT) |
168 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 168 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
169 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 169 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
170 | 170 | ||
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index ae6e3bfd29..4fd28d357a 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1022,11 +1022,11 @@ STATIC void chip8 (void) | |||
1022 | 1022 | ||
1023 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 1023 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
1024 | #define CHIP8_OFF BUTTON_POWER | 1024 | #define CHIP8_OFF BUTTON_POWER |
1025 | #define CHIP8_KEY2 BUTTON_SCROLL_UP | 1025 | #define CHIP8_KEY2 BUTTON_SCROLL_BACK |
1026 | #define CHIP8_KEY4 BUTTON_LEFT | 1026 | #define CHIP8_KEY4 BUTTON_LEFT |
1027 | #define CHIP8_KEY5 BUTTON_SELECT | 1027 | #define CHIP8_KEY5 BUTTON_SELECT |
1028 | #define CHIP8_KEY6 BUTTON_RIGHT | 1028 | #define CHIP8_KEY6 BUTTON_RIGHT |
1029 | #define CHIP8_KEY8 BUTTON_SCROLL_DOWN | 1029 | #define CHIP8_KEY8 BUTTON_SCROLL_FWD |
1030 | 1030 | ||
1031 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 1031 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
1032 | #define CHIP8_OFF BUTTON_POWER | 1032 | #define CHIP8_OFF BUTTON_POWER |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 5eea42f634..73d0630adc 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -153,8 +153,8 @@ PLUGIN_HEADER | |||
153 | #define CUBE_QUIT BUTTON_POWER | 153 | #define CUBE_QUIT BUTTON_POWER |
154 | #define CUBE_X_INC BUTTON_LEFT | 154 | #define CUBE_X_INC BUTTON_LEFT |
155 | #define CUBE_X_DEC BUTTON_RIGHT | 155 | #define CUBE_X_DEC BUTTON_RIGHT |
156 | #define CUBE_Y_INC BUTTON_SCROLL_UP | 156 | #define CUBE_Y_INC BUTTON_SCROLL_FWD |
157 | #define CUBE_Y_DEC BUTTON_SCROLL_DOWN | 157 | #define CUBE_Y_DEC BUTTON_SCROLL_BACK |
158 | #define CUBE_Z_INC BUTTON_UP | 158 | #define CUBE_Z_INC BUTTON_UP |
159 | #define CUBE_Z_DEC BUTTON_DOWN | 159 | #define CUBE_Z_DEC BUTTON_DOWN |
160 | #define CUBE_MODE_PRE BUTTON_SELECT | 160 | #define CUBE_MODE_PRE BUTTON_SELECT |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index fa5f065bbf..cc5036c59d 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -181,8 +181,8 @@ void I_ShutdownGraphics(void) | |||
181 | #define DOOMBUTTON_WEAPON BUTTON_FF | 181 | #define DOOMBUTTON_WEAPON BUTTON_FF |
182 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 182 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
183 | #define DOOMBUTTON_SCROLLWHEEL | 183 | #define DOOMBUTTON_SCROLLWHEEL |
184 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_UP | 184 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK |
185 | #define DOOMBUTTON_SCROLLWHEEL_CW BUTTON_SCROLL_DOWN | 185 | #define DOOMBUTTON_SCROLLWHEEL_CW BUTTON_SCROLL_FWD |
186 | #define DOOMBUTTON_UP BUTTON_UP | 186 | #define DOOMBUTTON_UP BUTTON_UP |
187 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 187 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
188 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 188 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index 2d7a66ea16..6eb66eb4df 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c | |||
@@ -117,8 +117,8 @@ static unsigned char draw_buffer[FIRE_WIDTH]; | |||
117 | #define FIRE_QUIT BUTTON_POWER | 117 | #define FIRE_QUIT BUTTON_POWER |
118 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT | 118 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT |
119 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT | 119 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT |
120 | #define FIRE_INCREASE_MULT BUTTON_SCROLL_UP | 120 | #define FIRE_INCREASE_MULT BUTTON_SCROLL_FWD |
121 | #define FIRE_DECREASE_MULT BUTTON_SCROLL_DOWN | 121 | #define FIRE_DECREASE_MULT BUTTON_SCROLL_BACK |
122 | 122 | ||
123 | #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) | 123 | #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) |
124 | #define FIRE_QUIT BUTTON_PLAY | 124 | #define FIRE_QUIT BUTTON_PLAY |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index adb76cdd3c..d14b03637b 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -136,10 +136,10 @@ PLUGIN_HEADER | |||
136 | #define JPEG_RIGHT BUTTON_RIGHT | 136 | #define JPEG_RIGHT BUTTON_RIGHT |
137 | #define JPEG_MENU BUTTON_POWER | 137 | #define JPEG_MENU BUTTON_POWER |
138 | #define JPEG_SLIDE_SHOW BUTTON_REC | 138 | #define JPEG_SLIDE_SHOW BUTTON_REC |
139 | #define JPEG_NEXT BUTTON_SCROLL_DOWN | 139 | #define JPEG_NEXT BUTTON_SCROLL_FWD |
140 | #define JPEG_NEXT_REPEAT (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) | 140 | #define JPEG_NEXT_REPEAT (BUTTON_SCROLL_FWD|BUTTON_REPEAT) |
141 | #define JPEG_PREVIOUS BUTTON_SCROLL_UP | 141 | #define JPEG_PREVIOUS BUTTON_SCROLL_BACK |
142 | #define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_UP|BUTTON_REPEAT) | 142 | #define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_BACK|BUTTON_REPEAT) |
143 | 143 | ||
144 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 144 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
145 | #define JPEG_ZOOM_PRE BUTTON_SELECT | 145 | #define JPEG_ZOOM_PRE BUTTON_SELECT |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 1063c245a4..baf7440397 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -83,13 +83,14 @@ const struct button_mapping generic_directions[] = | |||
83 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 83 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
84 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ | 84 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ |
85 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | 85 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
86 | || (CONFIG_KEYPAD == SANSA_E200_PAD) \ | ||
86 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | 87 | || (CONFIG_KEYPAD == IPOD_4G_PAD) |
87 | { PLA_UP, BUTTON_SCROLL_FWD, BUTTON_NONE}, | 88 | { PLA_UP, BUTTON_SCROLL_BACK, BUTTON_NONE}, |
88 | { PLA_DOWN, BUTTON_SCROLL_BACK, BUTTON_NONE}, | 89 | { PLA_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE}, |
89 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 90 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
90 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | 91 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, |
91 | { PLA_UP_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, | 92 | { PLA_UP_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, |
92 | { PLA_DOWN_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, | 93 | { PLA_DOWN_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, |
93 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 94 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
94 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 95 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
95 | #elif CONFIG_KEYPAD == ONDIO_PAD | 96 | #elif CONFIG_KEYPAD == ONDIO_PAD |
@@ -110,8 +111,7 @@ const struct button_mapping generic_directions[] = | |||
110 | {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 111 | {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
111 | {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 112 | {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
112 | {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 113 | {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
113 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) \ | 114 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
114 | || (CONFIG_KEYPAD == IRIVER_H10_PAD) | ||
115 | { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, | 115 | { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, |
116 | { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, | 116 | { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, |
117 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 117 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index df1c2030e5..76c5030874 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -130,8 +130,8 @@ PLUGIN_HEADER | |||
130 | #define MANDELBROT_DOWN BUTTON_DOWN | 130 | #define MANDELBROT_DOWN BUTTON_DOWN |
131 | #define MANDELBROT_LEFT BUTTON_LEFT | 131 | #define MANDELBROT_LEFT BUTTON_LEFT |
132 | #define MANDELBROT_RIGHT BUTTON_RIGHT | 132 | #define MANDELBROT_RIGHT BUTTON_RIGHT |
133 | #define MANDELBROT_ZOOM_IN BUTTON_SCROLL_DOWN | 133 | #define MANDELBROT_ZOOM_IN BUTTON_SCROLL_FWD |
134 | #define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_UP | 134 | #define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_BACK |
135 | #define MANDELBROT_MAXITER_INC (BUTTON_SELECT | BUTTON_RIGHT) | 135 | #define MANDELBROT_MAXITER_INC (BUTTON_SELECT | BUTTON_RIGHT) |
136 | #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) | 136 | #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) |
137 | #define MANDELBROT_RESET BUTTON_REC | 137 | #define MANDELBROT_RESET BUTTON_REC |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index 08341c2e05..f936318897 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -77,8 +77,8 @@ extern const fb_data matrix_normal[]; | |||
77 | #define MATRIX_PAUSE BUTTON_SELECT | 77 | #define MATRIX_PAUSE BUTTON_SELECT |
78 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 78 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
79 | #define MATRIX_EXIT BUTTON_POWER | 79 | #define MATRIX_EXIT BUTTON_POWER |
80 | #define MATRIX_SLEEP_MORE BUTTON_SCROLL_UP|BUTTON_REPEAT | 80 | #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT |
81 | #define MATRIX_SLEEP_LESS BUTTON_SCROLL_DOWN|BUTTON_REPEAT | 81 | #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT |
82 | #define MATRIX_PAUSE BUTTON_SELECT | 82 | #define MATRIX_PAUSE BUTTON_SELECT |
83 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 83 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
84 | #define MATRIX_EXIT BUTTON_POWER | 84 | #define MATRIX_EXIT BUTTON_POWER |
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index 6359329179..bd99ce2ce3 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c | |||
@@ -20,12 +20,21 @@ | |||
20 | #include "metronome.h" | 20 | #include "metronome.h" |
21 | 21 | ||
22 | PLUGIN_HEADER | 22 | PLUGIN_HEADER |
23 | |||
24 | #define METRONOME_QUIT PLA_QUIT | 23 | #define METRONOME_QUIT PLA_QUIT |
24 | |||
25 | /* for volume changes, PLA with scrollwheel isn't proper */ | ||
26 | |||
27 | #ifdef HAVE_SCROLLWHEEL | ||
28 | #define METRONOME_VOL_UP PLA_DOWN | ||
29 | #define METRONOME_VOL_DOWN PLA_UP | ||
30 | #define METRONOME_VOL_UP_REP PLA_DOWN_REPEAT | ||
31 | #define METRONOME_VOL_DOWN_REP PLA_UP_REPEAT | ||
32 | #else | ||
25 | #define METRONOME_VOL_UP PLA_UP | 33 | #define METRONOME_VOL_UP PLA_UP |
26 | #define METRONOME_VOL_DOWN PLA_DOWN | 34 | #define METRONOME_VOL_DOWN PLA_DOWN |
27 | #define METRONOME_VOL_UP_REP PLA_UP_REPEAT | 35 | #define METRONOME_VOL_UP_REP PLA_UP_REPEAT |
28 | #define METRONOME_VOL_DOWN_REP PLA_DOWN_REPEAT | 36 | #define METRONOME_VOL_DOWN_REP PLA_DOWN_REPEAT |
37 | #endif | ||
29 | #define METRONOME_LEFT PLA_LEFT | 38 | #define METRONOME_LEFT PLA_LEFT |
30 | #define METRONOME_RIGHT PLA_RIGHT | 39 | #define METRONOME_RIGHT PLA_RIGHT |
31 | #define METRONOME_LEFT_REP PLA_LEFT_REPEAT | 40 | #define METRONOME_LEFT_REP PLA_LEFT_REPEAT |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index 1b0e755c6c..07ecb56934 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -72,8 +72,16 @@ PLUGIN_IRAM_DECLARE | |||
72 | #define BTN_PLAY BUTTON_A | 72 | #define BTN_PLAY BUTTON_A |
73 | 73 | ||
74 | 74 | ||
75 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 75 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
76 | (CONFIG_KEYPAD == SANSA_C200_PAD) | 76 | #define BTN_QUIT BUTTON_POWER |
77 | #define BTN_RIGHT BUTTON_RIGHT | ||
78 | #define BTN_LEFT BUTTON_LEFT | ||
79 | #define BTN_UP BUTTON_SCROLL_FWD | ||
80 | #define BTN_DOWN BUTTON_SCROLL_BACK | ||
81 | #define BTN_PLAY BUTTON_UP | ||
82 | |||
83 | |||
84 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | ||
77 | #define BTN_QUIT BUTTON_POWER | 85 | #define BTN_QUIT BUTTON_POWER |
78 | #define BTN_RIGHT BUTTON_RIGHT | 86 | #define BTN_RIGHT BUTTON_RIGHT |
79 | #define BTN_LEFT BUTTON_LEFT | 87 | #define BTN_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 062ba58368..0fa0bbcde4 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -108,8 +108,8 @@ enum minesweeper_status { | |||
108 | # define MINESWP_UP BUTTON_UP | 108 | # define MINESWP_UP BUTTON_UP |
109 | # define MINESWP_DOWN BUTTON_DOWN | 109 | # define MINESWP_DOWN BUTTON_DOWN |
110 | # define MINESWP_QUIT BUTTON_POWER | 110 | # define MINESWP_QUIT BUTTON_POWER |
111 | # define MINESWP_NEXT BUTTON_SCROLL_DOWN | 111 | # define MINESWP_NEXT BUTTON_SCROLL_FWD |
112 | # define MINESWP_PREV BUTTON_SCROLL_UP | 112 | # define MINESWP_PREV BUTTON_SCROLL_BACK |
113 | # define MINESWP_TOGGLE BUTTON_REC | 113 | # define MINESWP_TOGGLE BUTTON_REC |
114 | # define MINESWP_DISCOVER BUTTON_SELECT | 114 | # define MINESWP_DISCOVER BUTTON_SELECT |
115 | # define MINESWP_INFO (BUTTON_REC|BUTTON_REPEAT) | 115 | # define MINESWP_INFO (BUTTON_REC|BUTTON_REPEAT) |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 720101706c..dee374d957 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -61,8 +61,8 @@ struct mpeg_settings settings; | |||
61 | 61 | ||
62 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 62 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
63 | #define MPEG_SELECT BUTTON_SELECT | 63 | #define MPEG_SELECT BUTTON_SELECT |
64 | #define MPEG_SCROLL_UP BUTTON_SCROLL_UP | 64 | #define MPEG_SCROLL_UP BUTTON_SCROLL_BACK |
65 | #define MPEG_SCROLL_DOWN BUTTON_SCROLL_DOWN | 65 | #define MPEG_SCROLL_DOWN BUTTON_SCROLL_FWD |
66 | #define MPEG_LEFT BUTTON_LEFT | 66 | #define MPEG_LEFT BUTTON_LEFT |
67 | #define MPEG_RIGHT BUTTON_RIGHT | 67 | #define MPEG_RIGHT BUTTON_RIGHT |
68 | #define MPEG_UP BUTTON_UP | 68 | #define MPEG_UP BUTTON_UP |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index a41d3b498a..2ecc2b45a2 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -163,8 +163,8 @@ PLUGIN_IRAM_DECLARE | |||
163 | #define MPEG_MENU BUTTON_SELECT | 163 | #define MPEG_MENU BUTTON_SELECT |
164 | #define MPEG_STOP BUTTON_POWER | 164 | #define MPEG_STOP BUTTON_POWER |
165 | #define MPEG_PAUSE BUTTON_UP | 165 | #define MPEG_PAUSE BUTTON_UP |
166 | #define MPEG_VOLDOWN BUTTON_SCROLL_UP | 166 | #define MPEG_VOLDOWN BUTTON_SCROLL_BACK |
167 | #define MPEG_VOLUP BUTTON_SCROLL_DOWN | 167 | #define MPEG_VOLUP BUTTON_SCROLL_FWD |
168 | #define MPEG_RW BUTTON_LEFT | 168 | #define MPEG_RW BUTTON_LEFT |
169 | #define MPEG_FF BUTTON_RIGHT | 169 | #define MPEG_FF BUTTON_RIGHT |
170 | 170 | ||
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index ee4b089ac1..e96442afd4 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -106,8 +106,8 @@ PLUGIN_HEADER | |||
106 | #define OSCILLOSCOPE_PAUSE BUTTON_REC | 106 | #define OSCILLOSCOPE_PAUSE BUTTON_REC |
107 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | 107 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT |
108 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | 108 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT |
109 | #define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_DOWN | 109 | #define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_FWD |
110 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_UP | 110 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_BACK |
111 | 111 | ||
112 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 112 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
113 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 113 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
diff --git a/apps/plugins/pictureflow.c b/apps/plugins/pictureflow.c index 8f34ca5b8b..6e88138efc 100644 --- a/apps/plugins/pictureflow.c +++ b/apps/plugins/pictureflow.c | |||
@@ -50,10 +50,10 @@ const struct button_mapping *plugin_contexts[] | |||
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | #ifdef SCROLLWHEEL | 52 | #ifdef SCROLLWHEEL |
53 | #define PICTUREFLOW_NEXT_ALBUM PLA_UP | 53 | #define PICTUREFLOW_NEXT_ALBUM PLA_DOWN |
54 | #define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_UP_REPEAT | 54 | #define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_DOWN_REPEAT |
55 | #define PICTUREFLOW_PREV_ALBUM PLA_DOWN | 55 | #define PICTUREFLOW_PREV_ALBUM PLA_UP |
56 | #define PICTUREFLOW_PREV_ALBUM_REPEAT PLA_DOWN_REPEAT | 56 | #define PICTUREFLOW_PREV_ALBUM_REPEAT PLA_UP_REPEAT |
57 | #else | 57 | #else |
58 | #define PICTUREFLOW_NEXT_ALBUM PLA_RIGHT | 58 | #define PICTUREFLOW_NEXT_ALBUM PLA_RIGHT |
59 | #define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_RIGHT_REPEAT | 59 | #define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_RIGHT_REPEAT |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 64c9485bd0..ba8a1480b7 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -113,8 +113,8 @@ PLUGIN_HEADER | |||
113 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 113 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
114 | 114 | ||
115 | #define ROCKBLOX_OFF BUTTON_POWER | 115 | #define ROCKBLOX_OFF BUTTON_POWER |
116 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_UP | 116 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK |
117 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_DOWN | 117 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD |
118 | #define ROCKBLOX_DOWN BUTTON_DOWN | 118 | #define ROCKBLOX_DOWN BUTTON_DOWN |
119 | #define ROCKBLOX_LEFT BUTTON_LEFT | 119 | #define ROCKBLOX_LEFT BUTTON_LEFT |
120 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | 120 | #define ROCKBLOX_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 4ef95b0be9..4ccfdbf872 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -153,8 +153,8 @@ static void setoptions (void) | |||
153 | 153 | ||
154 | options.A=BUTTON_SELECT; | 154 | options.A=BUTTON_SELECT; |
155 | options.B=BUTTON_REC; | 155 | options.B=BUTTON_REC; |
156 | options.START=BUTTON_SCROLL_UP; | 156 | options.START=BUTTON_SCROLL_BACK; |
157 | options.SELECT=BUTTON_SCROLL_DOWN; | 157 | options.SELECT=BUTTON_SCROLL_FWD; |
158 | options.MENU=BUTTON_POWER; | 158 | options.MENU=BUTTON_POWER; |
159 | 159 | ||
160 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 160 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c index 313e8ae46b..bcd795cded 100644 --- a/apps/plugins/rockboy/sys_rockbox.c +++ b/apps/plugins/rockboy/sys_rockbox.c | |||
@@ -26,8 +26,8 @@ | |||
26 | 26 | ||
27 | #if CONFIG_KEYPAD == SANSA_E200_PAD | 27 | #if CONFIG_KEYPAD == SANSA_E200_PAD |
28 | #define ROCKBOY_SCROLLWHEEL | 28 | #define ROCKBOY_SCROLLWHEEL |
29 | #define ROCKBOY_SCROLLWHEEL_CC BUTTON_SCROLL_UP | 29 | #define ROCKBOY_SCROLLWHEEL_CC BUTTON_SCROLL_BACK |
30 | #define ROCKBOY_SCROLLWHEEL_CW BUTTON_SCROLL_DOWN | 30 | #define ROCKBOY_SCROLLWHEEL_CW BUTTON_SCROLL_FWD |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | struct fb fb IBSS_ATTR; | 33 | struct fb fb IBSS_ATTR; |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 89b3966dfd..2176e8cb22 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -185,8 +185,8 @@ static struct plugin_api* rb; | |||
185 | # define SOL_QUIT BUTTON_POWER | 185 | # define SOL_QUIT BUTTON_POWER |
186 | # define SOL_UP BUTTON_UP | 186 | # define SOL_UP BUTTON_UP |
187 | # define SOL_DOWN BUTTON_DOWN | 187 | # define SOL_DOWN BUTTON_DOWN |
188 | # define SOL_LEFT BUTTON_SCROLL_UP | 188 | # define SOL_LEFT BUTTON_SCROLL_BACK |
189 | # define SOL_RIGHT BUTTON_SCROLL_DOWN | 189 | # define SOL_RIGHT BUTTON_SCROLL_FWD |
190 | # define SOL_MOVE BUTTON_SELECT | 190 | # define SOL_MOVE BUTTON_SELECT |
191 | # define SOL_DRAW BUTTON_REC | 191 | # define SOL_DRAW BUTTON_REC |
192 | # define SOL_REM2CUR BUTTON_LEFT | 192 | # define SOL_REM2CUR BUTTON_LEFT |
@@ -1408,7 +1408,7 @@ int solitaire( int skipmenu ) | |||
1408 | /* what to do when a key is pressed ... */ | 1408 | /* what to do when a key is pressed ... */ |
1409 | button = rb->button_get( true ); | 1409 | button = rb->button_get( true ); |
1410 | #if (CONFIG_KEYPAD == SANSA_E200_PAD) | 1410 | #if (CONFIG_KEYPAD == SANSA_E200_PAD) |
1411 | if (button&(BUTTON_SCROLL_UP|BUTTON_SCROLL_DOWN)) | 1411 | if (button&(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD)) |
1412 | button = button & (~BUTTON_REPEAT); | 1412 | button = button & (~BUTTON_REPEAT); |
1413 | #endif | 1413 | #endif |
1414 | switch( button ) | 1414 | switch( button ) |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index d98041da39..2ea1dc84e5 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -128,10 +128,10 @@ static struct plugin_api* rb; /* global api struct pointer */ | |||
128 | #define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT) | 128 | #define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT) |
129 | #define AST_THRUST BUTTON_UP | 129 | #define AST_THRUST BUTTON_UP |
130 | #define AST_HYPERSPACE BUTTON_DOWN | 130 | #define AST_HYPERSPACE BUTTON_DOWN |
131 | #define AST_LEFT BUTTON_SCROLL_UP | 131 | #define AST_LEFT BUTTON_SCROLL_BACK |
132 | #define AST_LEFT_REP (BUTTON_SCROLL_UP | BUTTON_REPEAT) | 132 | #define AST_LEFT_REP (BUTTON_SCROLL_BACK | BUTTON_REPEAT) |
133 | #define AST_RIGHT BUTTON_SCROLL_DOWN | 133 | #define AST_RIGHT BUTTON_SCROLL_FWD |
134 | #define AST_RIGHT_REP (BUTTON_SCROLL_DOWN | BUTTON_REPEAT) | 134 | #define AST_RIGHT_REP (BUTTON_SCROLL_FWD | BUTTON_REPEAT) |
135 | #define AST_FIRE BUTTON_SELECT | 135 | #define AST_FIRE BUTTON_SELECT |
136 | #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) | 136 | #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) |
137 | 137 | ||
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index ce8dfa00f4..87c0f692b5 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -117,8 +117,8 @@ | |||
117 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | 117 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN |
118 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | 118 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT |
119 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | 119 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT |
120 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_UP | 120 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_BACK |
121 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_DOWN | 121 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_FWD |
122 | #define SUDOKU_BUTTON_MENU BUTTON_SELECT | 122 | #define SUDOKU_BUTTON_MENU BUTTON_SELECT |
123 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC | 123 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC |
124 | 124 | ||
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index f963d7f828..b5e780460a 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -113,8 +113,8 @@ char buf[255]; | |||
113 | 113 | ||
114 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 114 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
115 | #define SUPERDOM_OK BUTTON_SELECT | 115 | #define SUPERDOM_OK BUTTON_SELECT |
116 | #define SUPERDOM_UP BUTTON_SCROLL_UP | 116 | #define SUPERDOM_UP BUTTON_SCROLL_BACK |
117 | #define SUPERDOM_DOWN BUTTON_SCROLL_DOWN | 117 | #define SUPERDOM_DOWN BUTTON_SCROLL_FWD |
118 | #define SUPERDOM_LEFT BUTTON_LEFT | 118 | #define SUPERDOM_LEFT BUTTON_LEFT |
119 | #define SUPERDOM_RIGHT BUTTON_RIGHT | 119 | #define SUPERDOM_RIGHT BUTTON_RIGHT |
120 | #define SUPERDOM_CANCEL BUTTON_POWER | 120 | #define SUPERDOM_CANCEL BUTTON_POWER |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 540adb4562..b66c24fd90 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -180,8 +180,8 @@ PLUGIN_HEADER | |||
180 | #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT | 180 | #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT |
181 | #define VIEWER_MENU BUTTON_SELECT | 181 | #define VIEWER_MENU BUTTON_SELECT |
182 | #define VIEWER_AUTOSCROLL BUTTON_REC | 182 | #define VIEWER_AUTOSCROLL BUTTON_REC |
183 | #define VIEWER_LINE_UP BUTTON_SCROLL_UP | 183 | #define VIEWER_LINE_UP BUTTON_SCROLL_FWD |
184 | #define VIEWER_LINE_DOWN BUTTON_SCROLL_DOWN | 184 | #define VIEWER_LINE_DOWN BUTTON_SCROLL_BACK |
185 | 185 | ||
186 | /* Sansa C200 keys */ | 186 | /* Sansa C200 keys */ |
187 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 187 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 9175e1d4d3..810c600d29 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -91,8 +91,8 @@ PLUGIN_HEADER | |||
91 | #define VUMETER_MENU BUTTON_SELECT | 91 | #define VUMETER_MENU BUTTON_SELECT |
92 | #define VUMETER_MENU_EXIT BUTTON_SELECT | 92 | #define VUMETER_MENU_EXIT BUTTON_SELECT |
93 | #define VUMETER_MENU_EXIT2 BUTTON_POWER | 93 | #define VUMETER_MENU_EXIT2 BUTTON_POWER |
94 | #define VUMETER_UP BUTTON_SCROLL_DOWN | 94 | #define VUMETER_UP BUTTON_SCROLL_FWD |
95 | #define VUMETER_DOWN BUTTON_SCROLL_UP | 95 | #define VUMETER_DOWN BUTTON_SCROLL_BACK |
96 | 96 | ||
97 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 97 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
98 | #define VUMETER_QUIT BUTTON_POWER | 98 | #define VUMETER_QUIT BUTTON_POWER |
diff --git a/docs/CREDITS b/docs/CREDITS index 4ec9f4154e..c62c356dda 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -362,6 +362,7 @@ Melba Sitjar | |||
362 | Mehmet Ş. Çatalbaş | 362 | Mehmet Ş. Çatalbaş |
363 | Scott Tinman | 363 | Scott Tinman |
364 | Alexander Kuzmenkov | 364 | Alexander Kuzmenkov |
365 | Thomas Martitz | ||
365 | 366 | ||
366 | The libmad team | 367 | The libmad team |
367 | The wavpack team | 368 | The wavpack team |
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index c7d532ebde..33b708ea5c 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -412,8 +412,8 @@ static int button_flip(int button) | |||
412 | #if defined(BUTTON_UP) && defined(BUTTON_DOWN) | 412 | #if defined(BUTTON_UP) && defined(BUTTON_DOWN) |
413 | | BUTTON_UP | BUTTON_DOWN | 413 | | BUTTON_UP | BUTTON_DOWN |
414 | #endif | 414 | #endif |
415 | #if defined(BUTTON_SCROLL_UP) && defined(BUTTON_SCROLL_DOWN) | 415 | #if defined(BUTTON_SCROLL_BACK) && defined(BUTTON_SCROLL_FWD) |
416 | | BUTTON_SCROLL_UP | BUTTON_SCROLL_DOWN | 416 | | BUTTON_SCROLL_BACK | BUTTON_SCROLL_FWD |
417 | #endif | 417 | #endif |
418 | #if CONFIG_KEYPAD == RECORDER_PAD | 418 | #if CONFIG_KEYPAD == RECORDER_PAD |
419 | | BUTTON_F1 | BUTTON_F3 | 419 | | BUTTON_F1 | BUTTON_F3 |
@@ -430,11 +430,11 @@ static int button_flip(int button) | |||
430 | if (button & BUTTON_DOWN) | 430 | if (button & BUTTON_DOWN) |
431 | newbutton |= BUTTON_UP; | 431 | newbutton |= BUTTON_UP; |
432 | #endif | 432 | #endif |
433 | #if defined(BUTTON_SCROLL_UP) && defined(BUTTON_SCROLL_DOWN) | 433 | #if defined(BUTTON_SCROLL_BACK) && defined(BUTTON_SCROLL_FWD) |
434 | if (button & BUTTON_SCROLL_UP) | 434 | if (button & BUTTON_SCROLL_BACK) |
435 | newbutton |= BUTTON_SCROLL_DOWN; | 435 | newbutton |= BUTTON_SCROLL_FWD; |
436 | if (button & BUTTON_SCROLL_DOWN) | 436 | if (button & BUTTON_SCROLL_FWD) |
437 | newbutton |= BUTTON_SCROLL_UP; | 437 | newbutton |= BUTTON_SCROLL_BACK; |
438 | #endif | 438 | #endif |
439 | #if CONFIG_KEYPAD == RECORDER_PAD | 439 | #if CONFIG_KEYPAD == RECORDER_PAD |
440 | if (button & BUTTON_F1) | 440 | if (button & BUTTON_F1) |
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c index a74d8607c3..117b993763 100644 --- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c | |||
@@ -128,9 +128,9 @@ void clickwheel_int(void) | |||
128 | unsigned int btn = BUTTON_NONE; | 128 | unsigned int btn = BUTTON_NONE; |
129 | 129 | ||
130 | if (old_wheel_value == wheel_tbl[0][wheel_value >> 6]) | 130 | if (old_wheel_value == wheel_tbl[0][wheel_value >> 6]) |
131 | btn = BUTTON_SCROLL_DOWN; | 131 | btn = BUTTON_SCROLL_FWD; |
132 | else if (old_wheel_value == wheel_tbl[1][wheel_value >> 6]) | 132 | else if (old_wheel_value == wheel_tbl[1][wheel_value >> 6]) |
133 | btn = BUTTON_SCROLL_UP; | 133 | btn = BUTTON_SCROLL_BACK; |
134 | 134 | ||
135 | if (btn != BUTTON_NONE) | 135 | if (btn != BUTTON_NONE) |
136 | { | 136 | { |
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-target.h b/firmware/target/arm/sandisk/sansa-e200/button-target.h index ddc86a01fc..c5d14df4c7 100644 --- a/firmware/target/arm/sandisk/sansa-e200/button-target.h +++ b/firmware/target/arm/sandisk/sansa-e200/button-target.h | |||
@@ -40,8 +40,8 @@ int button_read_device(void); | |||
40 | #define BUTTON_UP 0x00000020 | 40 | #define BUTTON_UP 0x00000020 |
41 | #define BUTTON_POWER 0x00000040 | 41 | #define BUTTON_POWER 0x00000040 |
42 | 42 | ||
43 | #define BUTTON_SCROLL_UP 0x00000080 | 43 | #define BUTTON_SCROLL_BACK 0x00000080 |
44 | #define BUTTON_SCROLL_DOWN 0x00000100 | 44 | #define BUTTON_SCROLL_FWD 0x00000100 |
45 | 45 | ||
46 | #define BUTTON_MAIN 0x00000fff | 46 | #define BUTTON_MAIN 0x00000fff |
47 | 47 | ||
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 504533bc3a..5e46cbe7c6 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c | |||
@@ -537,11 +537,11 @@ void button_event(int key, bool pressed) | |||
537 | break; | 537 | break; |
538 | case SDLK_KP8: | 538 | case SDLK_KP8: |
539 | case SDLK_UP: | 539 | case SDLK_UP: |
540 | new_btn = BUTTON_SCROLL_UP; | 540 | new_btn = BUTTON_SCROLL_BACK; |
541 | break; | 541 | break; |
542 | case SDLK_KP2: | 542 | case SDLK_KP2: |
543 | case SDLK_DOWN: | 543 | case SDLK_DOWN: |
544 | new_btn = BUTTON_SCROLL_DOWN; | 544 | new_btn = BUTTON_SCROLL_FWD; |
545 | break; | 545 | break; |
546 | case SDLK_KP9: | 546 | case SDLK_KP9: |
547 | new_btn = BUTTON_UP; | 547 | new_btn = BUTTON_UP; |