diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-04-10 17:28:26 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-04-10 17:28:26 +0000 |
commit | e6cbad69745455d0ad23004c609a909a2cdabcf4 (patch) | |
tree | f512eab0f41420969f750138b76b46931bf57956 | |
parent | ec797ed62225a5f78f37e9342ac6e183332f795b (diff) | |
download | rockbox-e6cbad69745455d0ad23004c609a909a2cdabcf4.tar.gz rockbox-e6cbad69745455d0ad23004c609a909a2cdabcf4.zip |
FS#10075 - FUZE: QUIT Plugin by selecting BUTTON_HOME by Johannes Schwarz. Updates the plugin keymap to use Long Home to exit plugins to be more inline with the core keymap.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20680 a1c6a512-1295-4272-9138-f99709370657
55 files changed, 294 insertions, 116 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 74fc39a693..ed7eaab7de 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -99,13 +99,18 @@ PLUGIN_HEADER | |||
99 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 99 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
100 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 100 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
101 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 101 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
102 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 102 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
103 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
104 | #define BATTERY_ON BUTTON_SELECT | 103 | #define BATTERY_ON BUTTON_SELECT |
105 | #define BATTERY_OFF BUTTON_POWER | 104 | #define BATTERY_OFF BUTTON_POWER |
106 | #define BATTERY_ON_TXT "SELECT - start" | 105 | #define BATTERY_ON_TXT "SELECT - start" |
107 | #define BATTERY_OFF_TXT "POWER" | 106 | #define BATTERY_OFF_TXT "POWER" |
108 | 107 | ||
108 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
109 | #define BATTERY_ON BUTTON_SELECT | ||
110 | #define BATTERY_OFF (BUTTON_HOME|BUTTON_REPEAT) | ||
111 | #define BATTERY_ON_TXT "SELECT - start" | ||
112 | #define BATTERY_OFF_TXT "Hold HOME" | ||
113 | |||
109 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 114 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
110 | 115 | ||
111 | #define BATTERY_ON BUTTON_PLAY | 116 | #define BATTERY_ON BUTTON_PLAY |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 10782f75b1..1424a0130e 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -177,7 +177,7 @@ PLUGIN_HEADER | |||
177 | 177 | ||
178 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 178 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
179 | #define BJACK_START BUTTON_SELECT | 179 | #define BJACK_START BUTTON_SELECT |
180 | #define BJACK_QUIT BUTTON_POWER | 180 | #define BJACK_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
181 | #define BJACK_MAX (BUTTON_SELECT|BUTTON_UP) | 181 | #define BJACK_MAX (BUTTON_SELECT|BUTTON_UP) |
182 | #define BJACK_MIN (BUTTON_SELECT|BUTTON_DOWN) | 182 | #define BJACK_MIN (BUTTON_SELECT|BUTTON_DOWN) |
183 | #define BJACK_HIT (BUTTON_SELECT|BUTTON_REL) | 183 | #define BJACK_HIT (BUTTON_SELECT|BUTTON_REL) |
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 83b56debe5..e7a214dcbb 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -92,8 +92,7 @@ PLUGIN_HEADER | |||
92 | #define BOUNCE_QUIT BUTTON_POWER | 92 | #define BOUNCE_QUIT BUTTON_POWER |
93 | #define BOUNCE_MODE BUTTON_A | 93 | #define BOUNCE_MODE BUTTON_A |
94 | 94 | ||
95 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 95 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
96 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
97 | #define BOUNCE_LEFT BUTTON_LEFT | 96 | #define BOUNCE_LEFT BUTTON_LEFT |
98 | #define BOUNCE_RIGHT BUTTON_RIGHT | 97 | #define BOUNCE_RIGHT BUTTON_RIGHT |
99 | #define BOUNCE_UP BUTTON_SCROLL_BACK | 98 | #define BOUNCE_UP BUTTON_SCROLL_BACK |
@@ -101,6 +100,14 @@ PLUGIN_HEADER | |||
101 | #define BOUNCE_QUIT BUTTON_POWER | 100 | #define BOUNCE_QUIT BUTTON_POWER |
102 | #define BOUNCE_MODE BUTTON_SELECT | 101 | #define BOUNCE_MODE BUTTON_SELECT |
103 | 102 | ||
103 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
104 | #define BOUNCE_LEFT BUTTON_LEFT | ||
105 | #define BOUNCE_RIGHT BUTTON_RIGHT | ||
106 | #define BOUNCE_UP BUTTON_SCROLL_BACK | ||
107 | #define BOUNCE_DOWN BUTTON_SCROLL_FWD | ||
108 | #define BOUNCE_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
109 | #define BOUNCE_MODE BUTTON_SELECT | ||
110 | |||
104 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ | 111 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ |
105 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | 112 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ |
106 | CONFIG_KEYPAD == SANSA_M200_PAD | 113 | CONFIG_KEYPAD == SANSA_M200_PAD |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 6d667323c2..96098a1f31 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -103,8 +103,7 @@ PLUGIN_HEADER | |||
103 | #define DOWN BUTTON_DOWN | 103 | #define DOWN BUTTON_DOWN |
104 | 104 | ||
105 | 105 | ||
106 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 106 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
107 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
108 | 107 | ||
109 | #define QUIT BUTTON_POWER | 108 | #define QUIT BUTTON_POWER |
110 | #define LEFT BUTTON_LEFT | 109 | #define LEFT BUTTON_LEFT |
@@ -117,6 +116,19 @@ PLUGIN_HEADER | |||
117 | #define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK) | 116 | #define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK) |
118 | 117 | ||
119 | 118 | ||
119 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
120 | |||
121 | #define QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
122 | #define LEFT BUTTON_LEFT | ||
123 | #define RIGHT BUTTON_RIGHT | ||
124 | #define SELECT BUTTON_SELECT | ||
125 | #define UP BUTTON_SCROLL_BACK | ||
126 | #define DOWN BUTTON_SCROLL_FWD | ||
127 | |||
128 | #define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_FWD) | ||
129 | #define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK) | ||
130 | |||
131 | |||
120 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ | 132 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ |
121 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | 133 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ |
122 | CONFIG_KEYPAD == SANSA_M200_PAD | 134 | CONFIG_KEYPAD == SANSA_M200_PAD |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index df9fb9b18b..6414de645c 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -192,27 +192,40 @@ PLUGIN_HEADER | |||
192 | #define CALCULATOR_CALC BUTTON_MENU | 192 | #define CALCULATOR_CALC BUTTON_MENU |
193 | #define CALCULATOR_CLEAR BUTTON_A | 193 | #define CALCULATOR_CLEAR BUTTON_A |
194 | 194 | ||
195 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 195 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
196 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | ||
197 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
198 | #define CALCULATOR_LEFT BUTTON_LEFT | 196 | #define CALCULATOR_LEFT BUTTON_LEFT |
199 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 197 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
200 | #define CALCULATOR_UP BUTTON_UP | 198 | #define CALCULATOR_UP BUTTON_UP |
201 | #define CALCULATOR_DOWN BUTTON_DOWN | 199 | #define CALCULATOR_DOWN BUTTON_DOWN |
202 | #if defined(HAVE_SCROLLWHEEL) | ||
203 | /* c200 does not have a scroll wheel */ | ||
204 | #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK | 200 | #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK |
205 | #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD | 201 | #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD |
206 | #endif | ||
207 | #define CALCULATOR_QUIT BUTTON_POWER | 202 | #define CALCULATOR_QUIT BUTTON_POWER |
208 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT | 203 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT |
209 | #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) | 204 | #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) |
210 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) | 205 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) |
211 | #if (CONFIG_KEYPAD == SANSA_E200_PAD) | ||
212 | #define CALCULATOR_CLEAR BUTTON_REC | 206 | #define CALCULATOR_CLEAR BUTTON_REC |
207 | |||
208 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | ||
209 | #define CALCULATOR_LEFT BUTTON_LEFT | ||
210 | #define CALCULATOR_RIGHT BUTTON_RIGHT | ||
211 | #define CALCULATOR_UP BUTTON_UP | ||
212 | #define CALCULATOR_DOWN BUTTON_DOWN | ||
213 | #define CALCULATOR_QUIT BUTTON_POWER | ||
214 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT | ||
215 | #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) | ||
216 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) | ||
217 | |||
213 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 218 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
214 | #define CALCULATOR_CLEAR BUTTON_HOME | 219 | #define CALCULATOR_LEFT BUTTON_LEFT |
215 | #endif | 220 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
221 | #define CALCULATOR_UP BUTTON_UP | ||
222 | #define CALCULATOR_DOWN BUTTON_DOWN | ||
223 | #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK | ||
224 | #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD | ||
225 | #define CALCULATOR_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
226 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT | ||
227 | #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) | ||
228 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) | ||
216 | 229 | ||
217 | 230 | ||
218 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) | 231 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index f0537e204f..5bcb6afc4b 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -90,8 +90,7 @@ PLUGIN_HEADER | |||
90 | #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN | 90 | #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN |
91 | #define CALENDAR_PREV_MONTH BUTTON_VOL_UP | 91 | #define CALENDAR_PREV_MONTH BUTTON_VOL_UP |
92 | 92 | ||
93 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ | 93 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
94 | CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
95 | #define CALENDAR_QUIT BUTTON_POWER | 94 | #define CALENDAR_QUIT BUTTON_POWER |
96 | #define CALENDAR_SELECT BUTTON_SELECT | 95 | #define CALENDAR_SELECT BUTTON_SELECT |
97 | #define CALENDAR_NEXT_WEEK BUTTON_SCROLL_FWD | 96 | #define CALENDAR_NEXT_WEEK BUTTON_SCROLL_FWD |
@@ -101,6 +100,16 @@ PLUGIN_HEADER | |||
101 | #define CALENDAR_NEXT_MONTH BUTTON_DOWN | 100 | #define CALENDAR_NEXT_MONTH BUTTON_DOWN |
102 | #define CALENDAR_PREV_MONTH BUTTON_UP | 101 | #define CALENDAR_PREV_MONTH BUTTON_UP |
103 | 102 | ||
103 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
104 | #define CALENDAR_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
105 | #define CALENDAR_SELECT BUTTON_SELECT | ||
106 | #define CALENDAR_NEXT_WEEK BUTTON_SCROLL_FWD | ||
107 | #define CALENDAR_PREV_WEEK BUTTON_SCROLL_BACK | ||
108 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | ||
109 | #define CALENDAR_PREV_DAY BUTTON_LEFT | ||
110 | #define CALENDAR_NEXT_MONTH BUTTON_DOWN | ||
111 | #define CALENDAR_PREV_MONTH BUTTON_UP | ||
112 | |||
104 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ | 113 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ |
105 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | 114 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ |
106 | CONFIG_KEYPAD == SANSA_M200_PAD | 115 | CONFIG_KEYPAD == SANSA_M200_PAD |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 3e36c815bd..16358e1a40 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -210,7 +210,7 @@ | |||
210 | #define CB_PLAY (BUTTON_SELECT | BUTTON_RIGHT) | 210 | #define CB_PLAY (BUTTON_SELECT | BUTTON_RIGHT) |
211 | #define CB_LEVEL (BUTTON_SELECT|BUTTON_LEFT) | 211 | #define CB_LEVEL (BUTTON_SELECT|BUTTON_LEFT) |
212 | #define CB_RESTART (BUTTON_SELECT | BUTTON_REPEAT) | 212 | #define CB_RESTART (BUTTON_SELECT | BUTTON_REPEAT) |
213 | #define CB_MENU BUTTON_POWER | 213 | #define CB_MENU (BUTTON_HOME|BUTTON_REPEAT) |
214 | 214 | ||
215 | #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) | 215 | #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) |
216 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) | 216 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 53180fe271..f3210f29c8 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -124,8 +124,7 @@ PLUGIN_HEADER | |||
124 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 124 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
125 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 125 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
126 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 126 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
127 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 127 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
128 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
129 | #define CHC_QUIT BUTTON_POWER | 128 | #define CHC_QUIT BUTTON_POWER |
130 | #define CHC_STARTSTOP BUTTON_SELECT | 129 | #define CHC_STARTSTOP BUTTON_SELECT |
131 | #define CHC_RESET BUTTON_DOWN | 130 | #define CHC_RESET BUTTON_DOWN |
@@ -135,6 +134,16 @@ PLUGIN_HEADER | |||
135 | #define CHC_SETTINGS_OK BUTTON_SELECT | 134 | #define CHC_SETTINGS_OK BUTTON_SELECT |
136 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | 135 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
137 | 136 | ||
137 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
138 | #define CHC_QUIT BUTTON_POWER | ||
139 | #define CHC_STARTSTOP BUTTON_SELECT | ||
140 | #define CHC_RESET BUTTON_DOWN | ||
141 | #define CHC_MENU BUTTON_UP | ||
142 | #define CHC_SETTINGS_INC BUTTON_RIGHT | ||
143 | #define CHC_SETTINGS_DEC BUTTON_LEFT | ||
144 | #define CHC_SETTINGS_OK BUTTON_SELECT | ||
145 | #define CHC_SETTINGS_CANCEL (BUTTON_HOME|BUTTON_REPEAT) | ||
146 | |||
138 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 147 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
139 | #define CHC_QUIT BUTTON_POWER | 148 | #define CHC_QUIT BUTTON_POWER |
140 | #define CHC_STARTSTOP BUTTON_PLAY | 149 | #define CHC_STARTSTOP BUTTON_PLAY |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index e3bf0205f3..9997d204d8 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -70,12 +70,16 @@ Still To do: | |||
70 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 70 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
71 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 71 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
72 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 72 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
73 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 73 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
74 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
75 | #define QUIT BUTTON_POWER | 74 | #define QUIT BUTTON_POWER |
76 | #define ACTION BUTTON_SELECT | 75 | #define ACTION BUTTON_SELECT |
77 | #define ACTIONTEXT "SELECT" | 76 | #define ACTIONTEXT "SELECT" |
78 | 77 | ||
78 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
79 | #define QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
80 | #define ACTION BUTTON_SELECT | ||
81 | #define ACTIONTEXT "SELECT" | ||
82 | |||
79 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 83 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
80 | #define QUIT BUTTON_MENU | 84 | #define QUIT BUTTON_MENU |
81 | #define ACTION BUTTON_SELECT | 85 | #define ACTION BUTTON_SELECT |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 2f100b2f79..1cd8740b1a 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -130,8 +130,7 @@ PLUGIN_HEADER | |||
130 | #define CUBE_PAUSE BUTTON_SELECT | 130 | #define CUBE_PAUSE BUTTON_SELECT |
131 | #define CUBE_HIGHSPEED BUTTON_A | 131 | #define CUBE_HIGHSPEED BUTTON_A |
132 | 132 | ||
133 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 133 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
134 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
135 | #define CUBE_QUIT BUTTON_POWER | 134 | #define CUBE_QUIT BUTTON_POWER |
136 | #define CUBE_NEXT BUTTON_RIGHT | 135 | #define CUBE_NEXT BUTTON_RIGHT |
137 | #define CUBE_PREV BUTTON_LEFT | 136 | #define CUBE_PREV BUTTON_LEFT |
@@ -141,6 +140,16 @@ PLUGIN_HEADER | |||
141 | #define CUBE_PAUSE BUTTON_UP | 140 | #define CUBE_PAUSE BUTTON_UP |
142 | #define CUBE_HIGHSPEED BUTTON_SELECT | 141 | #define CUBE_HIGHSPEED BUTTON_SELECT |
143 | 142 | ||
143 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
144 | #define CUBE_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
145 | #define CUBE_NEXT BUTTON_RIGHT | ||
146 | #define CUBE_PREV BUTTON_LEFT | ||
147 | #define CUBE_INC BUTTON_SCROLL_FWD | ||
148 | #define CUBE_DEC BUTTON_SCROLL_BACK | ||
149 | #define CUBE_MODE BUTTON_DOWN | ||
150 | #define CUBE_PAUSE BUTTON_UP | ||
151 | #define CUBE_HIGHSPEED BUTTON_SELECT | ||
152 | |||
144 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 153 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
145 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 154 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
146 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 155 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index aa35fb628d..5c57f7b2a5 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -121,8 +121,7 @@ long reverse (long N) { | |||
121 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 121 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
122 | #define LP_QUIT BUTTON_POWER | 122 | #define LP_QUIT BUTTON_POWER |
123 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 123 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
124 | /* TODO: #define LP_QUIT BUTTOM_HOME */ | 124 | #define LP_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
125 | #define LP_QUIT BUTTON_POWER | ||
126 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 125 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
127 | #define LP_QUIT BUTTON_POWER | 126 | #define LP_QUIT BUTTON_POWER |
128 | #elif CONFIG_KEYPAD == MROBE500_PAD | 127 | #elif CONFIG_KEYPAD == MROBE500_PAD |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 418fcd4404..2f0c9b42fd 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -207,10 +207,10 @@ void I_ShutdownGraphics(void) | |||
207 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 207 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
208 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 208 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
209 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | 209 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT |
210 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | 210 | #define DOOMBUTTON_SHOOT (BUTTON_SELECT | BUTTON_REL) |
211 | #define DOOMBUTTON_OPEN BUTTON_HOME | 211 | #define DOOMBUTTON_OPEN (BUTTON_SELECT | BUTTON_HOME) |
212 | #define DOOMBUTTON_ESC BUTTON_POWER | 212 | #define DOOMBUTTON_ESC (BUTTON_HOME|BUTTON_REPEAT) |
213 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 213 | #define DOOMBUTTON_ENTER (BUTTON_SELECT | BUTTON_REL) |
214 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW | 214 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW |
215 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 215 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
216 | #define DOOMBUTTON_UP BUTTON_UP | 216 | #define DOOMBUTTON_UP BUTTON_UP |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index f1a30e7b50..726b3eb381 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -74,7 +74,7 @@ PLUGIN_HEADER | |||
74 | #define BTN_FIRE BUTTON_SELECT | 74 | #define BTN_FIRE BUTTON_SELECT |
75 | 75 | ||
76 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 76 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
77 | #define BTN_MENU BUTTON_DOWN | 77 | #define BTN_MENU (BUTTON_HOME|BUTTON_REPEAT) |
78 | #define BTN_FIRE BUTTON_SELECT | 78 | #define BTN_FIRE BUTTON_SELECT |
79 | 79 | ||
80 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 80 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 77c197e3aa..3c7d543882 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -152,7 +152,7 @@ PLUGIN_HEADER | |||
152 | #define FLIPIT_DOWN BUTTON_DOWN | 152 | #define FLIPIT_DOWN BUTTON_DOWN |
153 | #define FLIPIT_NEXT BUTTON_SCROLL_FWD | 153 | #define FLIPIT_NEXT BUTTON_SCROLL_FWD |
154 | #define FLIPIT_PREV BUTTON_SCROLL_BACK | 154 | #define FLIPIT_PREV BUTTON_SCROLL_BACK |
155 | #define FLIPIT_QUIT (BUTTON_SELECT | BUTTON_UP) | 155 | #define FLIPIT_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
156 | #define FLIPIT_SHUFFLE (BUTTON_SELECT | BUTTON_LEFT) | 156 | #define FLIPIT_SHUFFLE (BUTTON_SELECT | BUTTON_LEFT) |
157 | #define FLIPIT_SOLVE (BUTTON_SELECT | BUTTON_DOWN) | 157 | #define FLIPIT_SOLVE (BUTTON_SELECT | BUTTON_DOWN) |
158 | #define FLIPIT_STEP_BY_STEP (BUTTON_SELECT | BUTTON_RIGHT) | 158 | #define FLIPIT_STEP_BY_STEP (BUTTON_SELECT | BUTTON_RIGHT) |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index 8c7ca9a603..9a77221586 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -97,10 +97,10 @@ | |||
97 | #define GBN_BUTTON_RIGHT BUTTON_RIGHT | 97 | #define GBN_BUTTON_RIGHT BUTTON_RIGHT |
98 | #define GBN_BUTTON_RETREAT BUTTON_SCROLL_BACK | 98 | #define GBN_BUTTON_RETREAT BUTTON_SCROLL_BACK |
99 | #define GBN_BUTTON_ADVANCE BUTTON_SCROLL_FWD | 99 | #define GBN_BUTTON_ADVANCE BUTTON_SCROLL_FWD |
100 | #define GBN_BUTTON_MENU BUTTON_POWER | 100 | #define GBN_BUTTON_MENU (BUTTON_HOME|BUTTON_REPEAT) |
101 | #define GBN_BUTTON_PLAY BUTTON_SELECT | BUTTON_REL | 101 | #define GBN_BUTTON_PLAY BUTTON_SELECT | BUTTON_REL |
102 | #define GBN_BUTTON_CONTEXT BUTTON_SELECT | BUTTON_REPEAT | 102 | #define GBN_BUTTON_CONTEXT BUTTON_SELECT | BUTTON_REPEAT |
103 | #define GBN_BUTTON_NEXT_VAR BUTTON_HOME | 103 | /* No next var */ |
104 | 104 | ||
105 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 105 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
106 | #define GBN_BUTTON_UP BUTTON_UP | 106 | #define GBN_BUTTON_UP BUTTON_UP |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 1526409687..6c3d52206e 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -93,14 +93,20 @@ PLUGIN_HEADER | |||
93 | #define RIGHT BUTTON_RIGHT | 93 | #define RIGHT BUTTON_RIGHT |
94 | #define FIRE BUTTON_SELECT | 94 | #define FIRE BUTTON_SELECT |
95 | 95 | ||
96 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ | 96 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
97 | CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
98 | 97 | ||
99 | #define QUIT BUTTON_POWER | 98 | #define QUIT BUTTON_POWER |
100 | #define LEFT BUTTON_LEFT | 99 | #define LEFT BUTTON_LEFT |
101 | #define RIGHT BUTTON_RIGHT | 100 | #define RIGHT BUTTON_RIGHT |
102 | #define FIRE BUTTON_SELECT | 101 | #define FIRE BUTTON_SELECT |
103 | 102 | ||
103 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
104 | |||
105 | #define QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
106 | #define LEFT BUTTON_LEFT | ||
107 | #define RIGHT BUTTON_RIGHT | ||
108 | #define FIRE BUTTON_SELECT | ||
109 | |||
104 | #elif CONFIG_KEYPAD == ELIO_TPJ1022_PAD | 110 | #elif CONFIG_KEYPAD == ELIO_TPJ1022_PAD |
105 | 111 | ||
106 | /* TODO: Figure out which buttons to use for Tatung Elio TPJ-1022 */ | 112 | /* TODO: Figure out which buttons to use for Tatung Elio TPJ-1022 */ |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 0c5fb49546..922f32dd8b 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -98,8 +98,7 @@ PLUGIN_HEADER | |||
98 | #define JEWELS_SELECT BUTTON_SELECT | 98 | #define JEWELS_SELECT BUTTON_SELECT |
99 | #define JEWELS_CANCEL BUTTON_POWER | 99 | #define JEWELS_CANCEL BUTTON_POWER |
100 | 100 | ||
101 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ | 101 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
102 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
103 | #define JEWELS_SCROLLWHEEL | 102 | #define JEWELS_SCROLLWHEEL |
104 | #define JEWELS_UP BUTTON_UP | 103 | #define JEWELS_UP BUTTON_UP |
105 | #define JEWELS_DOWN BUTTON_DOWN | 104 | #define JEWELS_DOWN BUTTON_DOWN |
@@ -110,6 +109,17 @@ PLUGIN_HEADER | |||
110 | #define JEWELS_SELECT BUTTON_SELECT | 109 | #define JEWELS_SELECT BUTTON_SELECT |
111 | #define JEWELS_CANCEL BUTTON_POWER | 110 | #define JEWELS_CANCEL BUTTON_POWER |
112 | 111 | ||
112 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
113 | #define JEWELS_SCROLLWHEEL | ||
114 | #define JEWELS_UP BUTTON_UP | ||
115 | #define JEWELS_DOWN BUTTON_DOWN | ||
116 | #define JEWELS_LEFT BUTTON_LEFT | ||
117 | #define JEWELS_RIGHT BUTTON_RIGHT | ||
118 | #define JEWELS_PREV BUTTON_SCROLL_BACK | ||
119 | #define JEWELS_NEXT BUTTON_SCROLL_FWD | ||
120 | #define JEWELS_SELECT BUTTON_SELECT | ||
121 | #define JEWELS_CANCEL (BUTTON_HOME|BUTTON_REPEAT) | ||
122 | |||
113 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ | 123 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ |
114 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | 124 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ |
115 | CONFIG_KEYPAD == SANSA_M200_PAD | 125 | CONFIG_KEYPAD == SANSA_M200_PAD |
diff --git a/apps/plugins/jpeg/jpeg.h b/apps/plugins/jpeg/jpeg.h index 0947b576e9..e9c9b2d383 100644 --- a/apps/plugins/jpeg/jpeg.h +++ b/apps/plugins/jpeg/jpeg.h | |||
@@ -141,7 +141,7 @@ | |||
141 | #define JPEG_DOWN BUTTON_DOWN | 141 | #define JPEG_DOWN BUTTON_DOWN |
142 | #define JPEG_LEFT BUTTON_LEFT | 142 | #define JPEG_LEFT BUTTON_LEFT |
143 | #define JPEG_RIGHT BUTTON_RIGHT | 143 | #define JPEG_RIGHT BUTTON_RIGHT |
144 | #define JPEG_MENU BUTTON_POWER | 144 | #define JPEG_MENU (BUTTON_HOME|BUTTON_REPEAT) |
145 | #define JPEG_NEXT BUTTON_SCROLL_FWD | 145 | #define JPEG_NEXT BUTTON_SCROLL_FWD |
146 | #define JPEG_NEXT_REPEAT (BUTTON_SCROLL_FWD|BUTTON_REPEAT) | 146 | #define JPEG_NEXT_REPEAT (BUTTON_SCROLL_FWD|BUTTON_REPEAT) |
147 | #define JPEG_PREVIOUS BUTTON_SCROLL_BACK | 147 | #define JPEG_PREVIOUS BUTTON_SCROLL_BACK |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 5b4aa60c73..773b1032bd 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -375,13 +375,18 @@ const struct button_mapping generic_actions[] = | |||
375 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ | 375 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ |
376 | CONFIG_KEYPAD == SANSA_C200_PAD || \ | 376 | CONFIG_KEYPAD == SANSA_C200_PAD || \ |
377 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | 377 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ |
378 | CONFIG_KEYPAD == SANSA_M200_PAD || \ | 378 | CONFIG_KEYPAD == SANSA_M200_PAD |
379 | CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
380 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 379 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
381 | {PLA_START, BUTTON_UP, BUTTON_NONE}, | 380 | {PLA_START, BUTTON_UP, BUTTON_NONE}, |
382 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, | 381 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, |
383 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 382 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
384 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 383 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
384 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
385 | {PLA_QUIT, (BUTTON_HOME|BUTTON_REPEAT), BUTTON_NONE}, | ||
386 | {PLA_START, BUTTON_UP, BUTTON_NONE}, | ||
387 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, | ||
388 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | ||
389 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | ||
385 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 390 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
386 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 391 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
387 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, | 392 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 5438ca7b8d..2ec1b38271 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -106,6 +106,13 @@ const unsigned char rockbox16x7[] = { | |||
106 | #define LP_DEC_Y BUTTON_DOWN | 106 | #define LP_DEC_Y BUTTON_DOWN |
107 | #define LP_INC_Y BUTTON_UP | 107 | #define LP_INC_Y BUTTON_UP |
108 | 108 | ||
109 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
110 | #define LP_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
111 | #define LP_DEC_X BUTTON_LEFT | ||
112 | #define LP_INC_X BUTTON_RIGHT | ||
113 | #define LP_DEC_Y BUTTON_DOWN | ||
114 | #define LP_INC_Y BUTTON_UP | ||
115 | |||
109 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 116 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
110 | #define LP_QUIT BUTTON_POWER | 117 | #define LP_QUIT BUTTON_POWER |
111 | #define LP_DEC_X BUTTON_LEFT | 118 | #define LP_DEC_X BUTTON_LEFT |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index 931777632e..82d694e293 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -139,7 +139,7 @@ PLUGIN_HEADER | |||
139 | #define MANDELBROT_RESET BUTTON_REC | 139 | #define MANDELBROT_RESET BUTTON_REC |
140 | 140 | ||
141 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 141 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
142 | #define MANDELBROT_QUIT BUTTON_POWER | 142 | #define MANDELBROT_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
143 | #define MANDELBROT_UP BUTTON_UP | 143 | #define MANDELBROT_UP BUTTON_UP |
144 | #define MANDELBROT_DOWN BUTTON_DOWN | 144 | #define MANDELBROT_DOWN BUTTON_DOWN |
145 | #define MANDELBROT_LEFT BUTTON_LEFT | 145 | #define MANDELBROT_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index 5559c0091c..060dd2efe6 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -89,7 +89,7 @@ extern const fb_data matrix_normal[]; | |||
89 | #define MATRIX_PAUSE BUTTON_SELECT | 89 | #define MATRIX_PAUSE BUTTON_SELECT |
90 | 90 | ||
91 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 91 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
92 | #define MATRIX_EXIT BUTTON_DOWN | 92 | #define MATRIX_EXIT (BUTTON_HOME|BUTTON_REPEAT) |
93 | #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT | 93 | #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT |
94 | #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT | 94 | #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT |
95 | #define MATRIX_PAUSE BUTTON_SELECT | 95 | #define MATRIX_PAUSE BUTTON_SELECT |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index fea5e99aab..fe9bc230c9 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -66,8 +66,7 @@ PLUGIN_IRAM_DECLARE | |||
66 | #define BTN_PLAY BUTTON_PLAY | 66 | #define BTN_PLAY BUTTON_PLAY |
67 | 67 | ||
68 | 68 | ||
69 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) \ | 69 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
70 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
71 | #define BTN_QUIT BUTTON_POWER | 70 | #define BTN_QUIT BUTTON_POWER |
72 | #define BTN_RIGHT BUTTON_RIGHT | 71 | #define BTN_RIGHT BUTTON_RIGHT |
73 | #define BTN_LEFT BUTTON_LEFT | 72 | #define BTN_LEFT BUTTON_LEFT |
@@ -75,6 +74,14 @@ PLUGIN_IRAM_DECLARE | |||
75 | #define BTN_DOWN BUTTON_SCROLL_BACK | 74 | #define BTN_DOWN BUTTON_SCROLL_BACK |
76 | #define BTN_PLAY BUTTON_UP | 75 | #define BTN_PLAY BUTTON_UP |
77 | 76 | ||
77 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
78 | #define BTN_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
79 | #define BTN_RIGHT BUTTON_RIGHT | ||
80 | #define BTN_LEFT BUTTON_LEFT | ||
81 | #define BTN_UP BUTTON_SCROLL_FWD | ||
82 | #define BTN_DOWN BUTTON_SCROLL_BACK | ||
83 | #define BTN_PLAY BUTTON_UP | ||
84 | |||
78 | 85 | ||
79 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 86 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
80 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 87 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index a29900ced3..e4eaacbbdc 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -141,7 +141,7 @@ enum minesweeper_status { | |||
141 | # define MINESWP_RIGHT BUTTON_RIGHT | 141 | # define MINESWP_RIGHT BUTTON_RIGHT |
142 | # define MINESWP_UP BUTTON_UP | 142 | # define MINESWP_UP BUTTON_UP |
143 | # define MINESWP_DOWN BUTTON_DOWN | 143 | # define MINESWP_DOWN BUTTON_DOWN |
144 | # define MINESWP_QUIT BUTTON_POWER | 144 | # define MINESWP_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
145 | # define MINESWP_TOGGLE BUTTON_SCROLL_FWD | 145 | # define MINESWP_TOGGLE BUTTON_SCROLL_FWD |
146 | # define MINESWP_DISCOVER BUTTON_SELECT | 146 | # define MINESWP_DISCOVER BUTTON_SELECT |
147 | # define MINESWP_INFO BUTTON_SCROLL_BACK | 147 | # define MINESWP_INFO BUTTON_SCROLL_BACK |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index dcbbf523ec..de2a6c441f 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -96,12 +96,16 @@ PLUGIN_HEADER | |||
96 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 96 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
97 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 97 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
98 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 98 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
99 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 99 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
100 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
101 | #define MOSAIQUE_QUIT BUTTON_POWER | 100 | #define MOSAIQUE_QUIT BUTTON_POWER |
102 | #define MOSAIQUE_SPEED BUTTON_DOWN | 101 | #define MOSAIQUE_SPEED BUTTON_DOWN |
103 | #define MOSAIQUE_RESTART BUTTON_SELECT | 102 | #define MOSAIQUE_RESTART BUTTON_SELECT |
104 | 103 | ||
104 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
105 | #define MOSAIQUE_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
106 | #define MOSAIQUE_SPEED BUTTON_DOWN | ||
107 | #define MOSAIQUE_RESTART BUTTON_SELECT | ||
108 | |||
105 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 109 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
106 | #define MOSAIQUE_QUIT BUTTON_POWER | 110 | #define MOSAIQUE_QUIT BUTTON_POWER |
107 | #define MOSAIQUE_SPEED BUTTON_FF | 111 | #define MOSAIQUE_SPEED BUTTON_FF |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 5b6d83e022..6e69c3ccf0 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -112,7 +112,7 @@ PLUGIN_HEADER | |||
112 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_BACK | 112 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_BACK |
113 | 113 | ||
114 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 114 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
115 | #define OSCILLOSCOPE_QUIT BUTTON_DOWN | 115 | #define OSCILLOSCOPE_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
116 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL) | 116 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL) |
117 | #define OSCILLOSCOPE_ADVMODE (BUTTON_SELECT | BUTTON_RIGHT) | 117 | #define OSCILLOSCOPE_ADVMODE (BUTTON_SELECT | BUTTON_RIGHT) |
118 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_SELECT | BUTTON_LEFT) | 118 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_SELECT | BUTTON_LEFT) |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 593179c44e..66bc9bee93 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -121,7 +121,7 @@ | |||
121 | #define PACMAN_1UP BUTTON_SELECT | 121 | #define PACMAN_1UP BUTTON_SELECT |
122 | #define PACMAN_COIN_PRE BUTTON_SELECT | 122 | #define PACMAN_COIN_PRE BUTTON_SELECT |
123 | #define PACMAN_COIN (BUTTON_SELECT | BUTTON_DOWN) | 123 | #define PACMAN_COIN (BUTTON_SELECT | BUTTON_DOWN) |
124 | #define PACMAN_MENU BUTTON_POWER | 124 | #define PACMAN_MENU (BUTTON_HOME|BUTTON_REPEAT) |
125 | 125 | ||
126 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 126 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
127 | 127 | ||
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index b1e1738999..137b2e36f8 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -194,9 +194,7 @@ PLUGIN_HEADER | |||
194 | 194 | ||
195 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 195 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
196 | #define PEGBOX_SAVE BUTTON_SELECT|BUTTON_REL | 196 | #define PEGBOX_SAVE BUTTON_SELECT|BUTTON_REL |
197 | #define PEGBOX_QUIT BUTTON_POWER | 197 | #define PEGBOX_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
198 | /* FIXME: | ||
199 | #define PEGBOX_RESTART BUTTON_HOME */ | ||
200 | #define PEGBOX_RESTART BUTTON_SELECT|BUTTON_LEFT | 198 | #define PEGBOX_RESTART BUTTON_SELECT|BUTTON_LEFT |
201 | #define PEGBOX_LVL_UP BUTTON_SCROLL_BACK | 199 | #define PEGBOX_LVL_UP BUTTON_SCROLL_BACK |
202 | #define PEGBOX_LVL_DOWN BUTTON_SCROLL_FWD | 200 | #define PEGBOX_LVL_DOWN BUTTON_SCROLL_FWD |
@@ -206,7 +204,7 @@ PLUGIN_HEADER | |||
206 | #define PEGBOX_LEFT BUTTON_LEFT | 204 | #define PEGBOX_LEFT BUTTON_LEFT |
207 | 205 | ||
208 | #define SAVE_TEXT "SELECT" | 206 | #define SAVE_TEXT "SELECT" |
209 | #define QUIT_TEXT "POWER" | 207 | #define QUIT_TEXT "HOME" |
210 | #define RESTART_TEXT "SELECT & LEFT" | 208 | #define RESTART_TEXT "SELECT & LEFT" |
211 | #define LVL_UP_TEXT "SCROLL BACK" | 209 | #define LVL_UP_TEXT "SCROLL BACK" |
212 | #define LVL_DOWN_TEXT "SCROLL FWD" | 210 | #define LVL_DOWN_TEXT "SCROLL FWD" |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 44c7add0dd..2a3e43e6b8 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -69,12 +69,16 @@ static int plasma_frequency; | |||
69 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 69 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
70 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 70 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
71 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 71 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
72 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 72 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
73 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
74 | #define PLASMA_QUIT BUTTON_POWER | 73 | #define PLASMA_QUIT BUTTON_POWER |
75 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 74 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
76 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 75 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
77 | 76 | ||
77 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
78 | #define PLASMA_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
79 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | ||
80 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | ||
81 | |||
78 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) | 82 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
79 | #define PLASMA_QUIT BUTTON_POWER | 83 | #define PLASMA_QUIT BUTTON_POWER |
80 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 84 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index ae6a1b5f1c..e2b4befe82 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -104,8 +104,7 @@ PLUGIN_HEADER | |||
104 | 104 | ||
105 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 105 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
106 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 106 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
107 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 107 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
108 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
109 | #define PONG_QUIT BUTTON_POWER | 108 | #define PONG_QUIT BUTTON_POWER |
110 | #define PONG_PAUSE BUTTON_SELECT | 109 | #define PONG_PAUSE BUTTON_SELECT |
111 | #define PONG_LEFT_UP BUTTON_LEFT | 110 | #define PONG_LEFT_UP BUTTON_LEFT |
@@ -113,6 +112,14 @@ PLUGIN_HEADER | |||
113 | #define PONG_RIGHT_UP BUTTON_UP | 112 | #define PONG_RIGHT_UP BUTTON_UP |
114 | #define PONG_RIGHT_DOWN BUTTON_RIGHT | 113 | #define PONG_RIGHT_DOWN BUTTON_RIGHT |
115 | 114 | ||
115 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
116 | #define PONG_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
117 | #define PONG_PAUSE BUTTON_SELECT | ||
118 | #define PONG_LEFT_UP BUTTON_LEFT | ||
119 | #define PONG_LEFT_DOWN BUTTON_DOWN | ||
120 | #define PONG_RIGHT_UP BUTTON_UP | ||
121 | #define PONG_RIGHT_DOWN BUTTON_RIGHT | ||
122 | |||
116 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 123 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
117 | #define PONG_QUIT BUTTON_POWER | 124 | #define PONG_QUIT BUTTON_POWER |
118 | #define PONG_PAUSE BUTTON_SELECT | 125 | #define PONG_PAUSE BUTTON_SELECT |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 7dd04bf464..99ab130108 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -109,8 +109,7 @@ | |||
109 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 109 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
110 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 110 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
111 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 111 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
112 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 112 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
113 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
114 | #define REVERSI_BUTTON_QUIT BUTTON_POWER | 113 | #define REVERSI_BUTTON_QUIT BUTTON_POWER |
115 | #define REVERSI_BUTTON_UP BUTTON_UP | 114 | #define REVERSI_BUTTON_UP BUTTON_UP |
116 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | 115 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN |
@@ -119,6 +118,15 @@ | |||
119 | #define REVERSI_BUTTON_MAKE_MOVE (BUTTON_SELECT|BUTTON_REL) | 118 | #define REVERSI_BUTTON_MAKE_MOVE (BUTTON_SELECT|BUTTON_REL) |
120 | #define REVERSI_BUTTON_MENU (BUTTON_SELECT|BUTTON_REPEAT) | 119 | #define REVERSI_BUTTON_MENU (BUTTON_SELECT|BUTTON_REPEAT) |
121 | 120 | ||
121 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
122 | #define REVERSI_BUTTON_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
123 | #define REVERSI_BUTTON_UP BUTTON_UP | ||
124 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | ||
125 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | ||
126 | #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT | ||
127 | #define REVERSI_BUTTON_MAKE_MOVE (BUTTON_SELECT|BUTTON_REL) | ||
128 | #define REVERSI_BUTTON_MENU (BUTTON_SELECT|BUTTON_REPEAT) | ||
129 | |||
122 | #elif CONFIG_KEYPAD == MROBE500_PAD | 130 | #elif CONFIG_KEYPAD == MROBE500_PAD |
123 | #define REVERSI_QUIT BUTTON_POWER | 131 | #define REVERSI_QUIT BUTTON_POWER |
124 | #define REVERSI_BUTTON_UP BUTTON_RC_PLAY | 132 | #define REVERSI_BUTTON_UP BUTTON_RC_PLAY |
diff --git a/apps/plugins/robotfindskitten.c b/apps/plugins/robotfindskitten.c index 7ae572152a..1010531951 100644 --- a/apps/plugins/robotfindskitten.c +++ b/apps/plugins/robotfindskitten.c | |||
@@ -485,7 +485,7 @@ static char* messages[] = | |||
485 | 485 | ||
486 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 486 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
487 | # undef __PLUGINLIB_ACTIONS_H__ | 487 | # undef __PLUGINLIB_ACTIONS_H__ |
488 | # define RFK_QUIT (BUTTON_SELECT | BUTTON_REPEAT) | 488 | # define RFK_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
489 | # define RFK_RIGHT BUTTON_RIGHT | 489 | # define RFK_RIGHT BUTTON_RIGHT |
490 | # define RFK_LEFT BUTTON_LEFT | 490 | # define RFK_LEFT BUTTON_LEFT |
491 | # define RFK_UP BUTTON_UP | 491 | # define RFK_UP BUTTON_UP |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index cea5e8a3c7..1c23663cdb 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -124,15 +124,15 @@ PLUGIN_HEADER | |||
124 | 124 | ||
125 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 125 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
126 | 126 | ||
127 | #define ROCKBLOX_OFF BUTTON_POWER | 127 | #define ROCKBLOX_OFF (BUTTON_HOME|BUTTON_REPEAT) |
128 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK | 128 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK |
129 | #define ROCKBLOX_ROTATE_RIGHT2 BUTTON_UP | 129 | #define ROCKBLOX_ROTATE_RIGHT2 BUTTON_UP |
130 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD | 130 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD |
131 | #define ROCKBLOX_DOWN BUTTON_DOWN | 131 | #define ROCKBLOX_DOWN BUTTON_DOWN |
132 | #define ROCKBLOX_LEFT BUTTON_LEFT | 132 | #define ROCKBLOX_LEFT BUTTON_LEFT |
133 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | 133 | #define ROCKBLOX_RIGHT BUTTON_RIGHT |
134 | #define ROCKBLOX_DROP BUTTON_SELECT | 134 | #define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL) |
135 | #define ROCKBLOX_RESTART BUTTON_HOME | 135 | #define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_UP) |
136 | 136 | ||
137 | 137 | ||
138 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 138 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index f024a004a7..6b745fbb73 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -61,11 +61,14 @@ PLUGIN_HEADER | |||
61 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ | 61 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ |
62 | CONFIG_KEYPAD == SANSA_C200_PAD || \ | 62 | CONFIG_KEYPAD == SANSA_C200_PAD || \ |
63 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | 63 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ |
64 | CONFIG_KEYPAD == SANSA_M200_PAD || \ | 64 | CONFIG_KEYPAD == SANSA_M200_PAD |
65 | CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
66 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | 65 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT |
67 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | 66 | #define ONEDROCKBLOX_QUIT BUTTON_POWER |
68 | 67 | ||
68 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
69 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
70 | #define ONEDROCKBLOX_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
71 | |||
69 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 72 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
70 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY | 73 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY |
71 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | 74 | #define ONEDROCKBLOX_QUIT BUTTON_POWER |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 26b05c41df..38f4fe1aa1 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -158,10 +158,10 @@ static void setoptions (void) | |||
158 | options.DOWN=BUTTON_DOWN; | 158 | options.DOWN=BUTTON_DOWN; |
159 | 159 | ||
160 | options.A=BUTTON_SELECT; | 160 | options.A=BUTTON_SELECT; |
161 | options.B=BUTTON_HOME; | 161 | options.B=BUTTON_LEFT; |
162 | options.START=BUTTON_SCROLL_BACK; | 162 | options.START=BUTTON_SCROLL_BACK; |
163 | options.SELECT=BUTTON_SCROLL_FWD; | 163 | options.SELECT=BUTTON_SCROLL_FWD; |
164 | options.MENU=BUTTON_POWER; | 164 | options.MENU=BUTTON_HOME; |
165 | 165 | ||
166 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 166 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
167 | options.UP=BUTTON_UP; | 167 | options.UP=BUTTON_UP; |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 3027141dbd..4db36a085c 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -96,12 +96,9 @@ PLUGIN_HEADER | |||
96 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | 96 | #define ROCKPAINT_RIGHT BUTTON_RIGHT |
97 | 97 | ||
98 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 98 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
99 | #define ROCKPAINT_QUIT BUTTON_POWER | 99 | #define ROCKPAINT_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
100 | #define ROCKPAINT_DRAW BUTTON_SELECT | 100 | #define ROCKPAINT_DRAW BUTTON_SELECT |
101 | #define ROCKPAINT_MENU ( BUTTON_SELECT | BUTTON_DOWN ) | 101 | #define ROCKPAINT_MENU ( BUTTON_SELECT | BUTTON_DOWN ) |
102 | /* FIXME: | ||
103 | #define ROCKPAINT_TOOLBAR BUTTON_HOME | ||
104 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_HOME | BUTTON_LEFT ) */ | ||
105 | #define ROCKPAINT_TOOLBAR ( BUTTON_SELECT | BUTTON_LEFT ) | 102 | #define ROCKPAINT_TOOLBAR ( BUTTON_SELECT | BUTTON_LEFT ) |
106 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_SELECT | BUTTON_RIGHT ) | 103 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_SELECT | BUTTON_RIGHT ) |
107 | #define ROCKPAINT_UP BUTTON_UP | 104 | #define ROCKPAINT_UP BUTTON_UP |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index f9288d5488..994b8fc15b 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -104,13 +104,11 @@ PLUGIN_HEADER | |||
104 | #define PUZZLE_PICTURE BUTTON_SELECT | 104 | #define PUZZLE_PICTURE BUTTON_SELECT |
105 | 105 | ||
106 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 106 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
107 | #define PUZZLE_QUIT BUTTON_POWER | 107 | #define PUZZLE_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
108 | #define PUZZLE_LEFT BUTTON_LEFT | 108 | #define PUZZLE_LEFT BUTTON_LEFT |
109 | #define PUZZLE_RIGHT BUTTON_RIGHT | 109 | #define PUZZLE_RIGHT BUTTON_RIGHT |
110 | #define PUZZLE_UP BUTTON_UP | 110 | #define PUZZLE_UP BUTTON_UP |
111 | #define PUZZLE_DOWN BUTTON_DOWN | 111 | #define PUZZLE_DOWN BUTTON_DOWN |
112 | /* FIXME: | ||
113 | #define PUZZLE_SHUFFLE BUTTON_HOME */ | ||
114 | #define PUZZLE_SHUFFLE BUTTON_SELECT|BUTTON_DOWN | 112 | #define PUZZLE_SHUFFLE BUTTON_SELECT|BUTTON_DOWN |
115 | #define PUZZLE_PICTURE BUTTON_SELECT | 113 | #define PUZZLE_PICTURE BUTTON_SELECT |
116 | 114 | ||
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 488de00586..5def0df1f4 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -102,8 +102,7 @@ PLUGIN_HEADER | |||
102 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 102 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
103 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 103 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
104 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 104 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
105 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 105 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
106 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
107 | #define SNAKE_QUIT BUTTON_POWER | 106 | #define SNAKE_QUIT BUTTON_POWER |
108 | #define SNAKE_LEFT BUTTON_LEFT | 107 | #define SNAKE_LEFT BUTTON_LEFT |
109 | #define SNAKE_RIGHT BUTTON_RIGHT | 108 | #define SNAKE_RIGHT BUTTON_RIGHT |
@@ -111,6 +110,14 @@ PLUGIN_HEADER | |||
111 | #define SNAKE_DOWN BUTTON_DOWN | 110 | #define SNAKE_DOWN BUTTON_DOWN |
112 | #define SNAKE_PLAYPAUSE BUTTON_SELECT | 111 | #define SNAKE_PLAYPAUSE BUTTON_SELECT |
113 | 112 | ||
113 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
114 | #define SNAKE_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
115 | #define SNAKE_LEFT BUTTON_LEFT | ||
116 | #define SNAKE_RIGHT BUTTON_RIGHT | ||
117 | #define SNAKE_UP BUTTON_UP | ||
118 | #define SNAKE_DOWN BUTTON_DOWN | ||
119 | #define SNAKE_PLAYPAUSE BUTTON_SELECT | ||
120 | |||
114 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 121 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
115 | #define SNAKE_QUIT BUTTON_POWER | 122 | #define SNAKE_QUIT BUTTON_POWER |
116 | #define SNAKE_LEFT BUTTON_LEFT | 123 | #define SNAKE_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 9ebe4afc8d..eb2746ab7f 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -254,7 +254,7 @@ PLUGIN_HEADER | |||
254 | #define SNAKE2_RIGHT BUTTON_RIGHT | 254 | #define SNAKE2_RIGHT BUTTON_RIGHT |
255 | #define SNAKE2_UP BUTTON_UP | 255 | #define SNAKE2_UP BUTTON_UP |
256 | #define SNAKE2_DOWN BUTTON_DOWN | 256 | #define SNAKE2_DOWN BUTTON_DOWN |
257 | #define SNAKE2_QUIT BUTTON_POWER | 257 | #define SNAKE2_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
258 | #define SNAKE2_LEVEL_UP BUTTON_UP | 258 | #define SNAKE2_LEVEL_UP BUTTON_UP |
259 | #define SNAKE2_LEVEL_DOWN BUTTON_DOWN | 259 | #define SNAKE2_LEVEL_DOWN BUTTON_DOWN |
260 | #define SNAKE2_MAZE_NEXT BUTTON_RIGHT | 260 | #define SNAKE2_MAZE_NEXT BUTTON_RIGHT |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 05a5637f7e..63db9ab453 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -54,7 +54,7 @@ PLUGIN_HEADER | |||
54 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 54 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
55 | #define SNOW_QUIT BUTTON_POWER | 55 | #define SNOW_QUIT BUTTON_POWER |
56 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 56 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
57 | #define SNOW_QUIT BUTTON_DOWN | 57 | #define SNOW_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
58 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 58 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
59 | #define SNOW_QUIT BUTTON_POWER | 59 | #define SNOW_QUIT BUTTON_POWER |
60 | #elif CONFIG_KEYPAD == MROBE500_PAD | 60 | #elif CONFIG_KEYPAD == MROBE500_PAD |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index ea104eca39..d027794127 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -225,7 +225,7 @@ PLUGIN_HEADER | |||
225 | #define SOKOBAN_RIGHT BUTTON_RIGHT | 225 | #define SOKOBAN_RIGHT BUTTON_RIGHT |
226 | #define SOKOBAN_UP BUTTON_UP | 226 | #define SOKOBAN_UP BUTTON_UP |
227 | #define SOKOBAN_DOWN BUTTON_DOWN | 227 | #define SOKOBAN_DOWN BUTTON_DOWN |
228 | #define SOKOBAN_MENU BUTTON_POWER | 228 | #define SOKOBAN_MENU (BUTTON_HOME|BUTTON_REPEAT) |
229 | #define SOKOBAN_UNDO_PRE BUTTON_SELECT | 229 | #define SOKOBAN_UNDO_PRE BUTTON_SELECT |
230 | #define SOKOBAN_UNDO (BUTTON_SELECT | BUTTON_REL) | 230 | #define SOKOBAN_UNDO (BUTTON_SELECT | BUTTON_REL) |
231 | #define SOKOBAN_REDO (BUTTON_SELECT | BUTTON_LEFT) | 231 | #define SOKOBAN_REDO (BUTTON_SELECT | BUTTON_LEFT) |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index a2b4cb84a2..619051fb92 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -201,7 +201,7 @@ PLUGIN_HEADER | |||
201 | # define HK_REM2STACK "RIGHT" | 201 | # define HK_REM2STACK "RIGHT" |
202 | 202 | ||
203 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 203 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
204 | # define SOL_QUIT BUTTON_POWER | 204 | # define SOL_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
205 | # define SOL_UP BUTTON_UP | 205 | # define SOL_UP BUTTON_UP |
206 | # define SOL_DOWN BUTTON_DOWN | 206 | # define SOL_DOWN BUTTON_DOWN |
207 | # define SOL_LEFT BUTTON_SCROLL_BACK | 207 | # define SOL_LEFT BUTTON_SCROLL_BACK |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 44f6272199..6277c57524 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -135,8 +135,8 @@ PLUGIN_HEADER | |||
135 | #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) | 135 | #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) |
136 | 136 | ||
137 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 137 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
138 | #define AST_PAUSE BUTTON_HOME | 138 | #define AST_PAUSE (BUTTON_SELECT | BUTTON_UP) |
139 | #define AST_QUIT BUTTON_POWER | 139 | #define AST_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
140 | #define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT) | 140 | #define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT) |
141 | #define AST_THRUST BUTTON_UP | 141 | #define AST_THRUST BUTTON_UP |
142 | #define AST_HYPERSPACE BUTTON_DOWN | 142 | #define AST_HYPERSPACE BUTTON_DOWN |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 9a6dff134f..d7524516f4 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -160,13 +160,27 @@ PLUGIN_HEADER | |||
160 | #define STAR_LEVEL_REPEAT BUTTON_A | 160 | #define STAR_LEVEL_REPEAT BUTTON_A |
161 | #define STAR_MENU_RUN BUTTON_SELECT | 161 | #define STAR_MENU_RUN BUTTON_SELECT |
162 | 162 | ||
163 | |||
163 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 164 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
164 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 165 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
165 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 166 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
166 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 167 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
167 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 168 | |
169 | #define STAR_QUIT BUTTON_POWER | ||
170 | #define STAR_LEFT BUTTON_LEFT | ||
171 | #define STAR_RIGHT BUTTON_RIGHT | ||
172 | #define STAR_UP BUTTON_UP | ||
173 | #define STAR_DOWN BUTTON_DOWN | ||
174 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT | ||
175 | #define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) | ||
176 | #define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) | ||
177 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_DOWN) | ||
178 | #define STAR_MENU_RUN BUTTON_SELECT | ||
179 | |||
180 | |||
181 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
168 | 182 | ||
169 | #define STAR_QUIT BUTTON_POWER | 183 | #define STAR_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
170 | #define STAR_LEFT BUTTON_LEFT | 184 | #define STAR_LEFT BUTTON_LEFT |
171 | #define STAR_RIGHT BUTTON_RIGHT | 185 | #define STAR_RIGHT BUTTON_RIGHT |
172 | #define STAR_UP BUTTON_UP | 186 | #define STAR_UP BUTTON_UP |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 1153689fed..5c714b59ee 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -64,8 +64,7 @@ PLUGIN_HEADER | |||
64 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 64 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
65 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 65 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
66 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 66 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
67 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 67 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
68 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
69 | #define STARFIELD_QUIT BUTTON_POWER | 68 | #define STARFIELD_QUIT BUTTON_POWER |
70 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP | 69 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP |
71 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN | 70 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN |
@@ -73,6 +72,14 @@ PLUGIN_HEADER | |||
73 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT | 72 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT |
74 | #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT | 73 | #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT |
75 | 74 | ||
75 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
76 | #define STARFIELD_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
77 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP | ||
78 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN | ||
79 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT | ||
80 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT | ||
81 | #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT | ||
82 | |||
76 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 83 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) |
77 | #define STARFIELD_QUIT BUTTON_BACK | 84 | #define STARFIELD_QUIT BUTTON_BACK |
78 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP | 85 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 5675458f24..659f3e6763 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -61,9 +61,7 @@ static bool abort; | |||
61 | #define STATS_STOP BUTTON_POWER | 61 | #define STATS_STOP BUTTON_POWER |
62 | 62 | ||
63 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 63 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
64 | /* FIXME: | 64 | #define STATS_STOP BUTTON_HOME |
65 | #define STATS_STOP BUTTON_HOME */ | ||
66 | #define STATS_STOP BUTTON_DOWN | ||
67 | 65 | ||
68 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 66 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
69 | #define STATS_STOP BUTTON_POWER | 67 | #define STATS_STOP BUTTON_POWER |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 1b6a148caa..19ccc5006d 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -123,7 +123,7 @@ PLUGIN_HEADER | |||
123 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 123 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
124 | 124 | ||
125 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 125 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
126 | #define STOPWATCH_QUIT BUTTON_POWER | 126 | #define STOPWATCH_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
127 | #define STOPWATCH_START_STOP BUTTON_RIGHT | 127 | #define STOPWATCH_START_STOP BUTTON_RIGHT |
128 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT | 128 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT |
129 | #define STOPWATCH_LAP_TIMER BUTTON_SELECT | 129 | #define STOPWATCH_LAP_TIMER BUTTON_SELECT |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 1524416342..0a2197c1f0 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -135,15 +135,15 @@ | |||
135 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC | 135 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC |
136 | 136 | ||
137 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 137 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
138 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 138 | #define SUDOKU_BUTTON_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
139 | #define SUDOKU_BUTTON_UP BUTTON_UP | 139 | #define SUDOKU_BUTTON_UP BUTTON_UP |
140 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | 140 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN |
141 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | 141 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT |
142 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | 142 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT |
143 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_BACK | 143 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_BACK |
144 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_FWD | 144 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_FWD |
145 | #define SUDOKU_BUTTON_MENU BUTTON_SELECT | 145 | #define SUDOKU_BUTTON_MENU (BUTTON_POWER | BUTTON_REL) |
146 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_HOME | 146 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_SELECT | BUTTON_UP) |
147 | 147 | ||
148 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 148 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
149 | #define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER | 149 | #define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 87621861d9..a3e671cd8b 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -113,8 +113,7 @@ char buf[255]; | |||
113 | #define SUPERDOM_RIGHT BUTTON_RIGHT | 113 | #define SUPERDOM_RIGHT BUTTON_RIGHT |
114 | #define SUPERDOM_CANCEL BUTTON_POWER | 114 | #define SUPERDOM_CANCEL BUTTON_POWER |
115 | 115 | ||
116 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ | 116 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
117 | CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
118 | #define SUPERDOM_OK BUTTON_SELECT | 117 | #define SUPERDOM_OK BUTTON_SELECT |
119 | #define SUPERDOM_UP BUTTON_SCROLL_BACK | 118 | #define SUPERDOM_UP BUTTON_SCROLL_BACK |
120 | #define SUPERDOM_DOWN BUTTON_SCROLL_FWD | 119 | #define SUPERDOM_DOWN BUTTON_SCROLL_FWD |
@@ -122,6 +121,14 @@ char buf[255]; | |||
122 | #define SUPERDOM_RIGHT BUTTON_RIGHT | 121 | #define SUPERDOM_RIGHT BUTTON_RIGHT |
123 | #define SUPERDOM_CANCEL BUTTON_POWER | 122 | #define SUPERDOM_CANCEL BUTTON_POWER |
124 | 123 | ||
124 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
125 | #define SUPERDOM_OK BUTTON_SELECT | ||
126 | #define SUPERDOM_UP BUTTON_SCROLL_BACK | ||
127 | #define SUPERDOM_DOWN BUTTON_SCROLL_FWD | ||
128 | #define SUPERDOM_LEFT BUTTON_LEFT | ||
129 | #define SUPERDOM_RIGHT BUTTON_RIGHT | ||
130 | #define SUPERDOM_CANCEL (BUTTON_HOME|BUTTON_REPEAT) | ||
131 | |||
125 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | 132 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD |
126 | #define SUPERDOM_OK BUTTON_SELECT | 133 | #define SUPERDOM_OK BUTTON_SELECT |
127 | #define SUPERDOM_UP BUTTON_UP | 134 | #define SUPERDOM_UP BUTTON_UP |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 403213ef80..e17033fcd1 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -187,7 +187,7 @@ PLUGIN_HEADER | |||
187 | 187 | ||
188 | /* Sansa Fuze keys */ | 188 | /* Sansa Fuze keys */ |
189 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 189 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
190 | #define VIEWER_QUIT BUTTON_POWER | 190 | #define VIEWER_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
191 | #define VIEWER_PAGE_UP BUTTON_UP | 191 | #define VIEWER_PAGE_UP BUTTON_UP |
192 | #define VIEWER_PAGE_DOWN BUTTON_DOWN | 192 | #define VIEWER_PAGE_DOWN BUTTON_DOWN |
193 | #define VIEWER_SCREEN_LEFT BUTTON_LEFT | 193 | #define VIEWER_SCREEN_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 4124b94563..b5e9afa5bf 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -124,9 +124,7 @@ PLUGIN_HEADER | |||
124 | #define LABEL_VOLUME "Wheel" | 124 | #define LABEL_VOLUME "Wheel" |
125 | 125 | ||
126 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 126 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
127 | /* FIXME: | 127 | #define VUMETER_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
128 | #define VUMETER_QUIT BUTTON_HOME */ | ||
129 | #define VUMETER_QUIT BUTTON_DOWN | ||
130 | #define VUMETER_HELP BUTTON_SELECT|BUTTON_REPEAT | 128 | #define VUMETER_HELP BUTTON_SELECT|BUTTON_REPEAT |
131 | #define VUMETER_MENU BUTTON_SELECT|BUTTON_REL | 129 | #define VUMETER_MENU BUTTON_SELECT|BUTTON_REL |
132 | #define VUMETER_MENU_EXIT BUTTON_SELECT | 130 | #define VUMETER_MENU_EXIT BUTTON_SELECT |
@@ -134,7 +132,7 @@ PLUGIN_HEADER | |||
134 | #define VUMETER_UP BUTTON_SCROLL_FWD | 132 | #define VUMETER_UP BUTTON_SCROLL_FWD |
135 | #define VUMETER_DOWN BUTTON_SCROLL_BACK | 133 | #define VUMETER_DOWN BUTTON_SCROLL_BACK |
136 | #define LABEL_HELP "Hold Select" | 134 | #define LABEL_HELP "Hold Select" |
137 | #define LABEL_QUIT "Down" | 135 | #define LABEL_QUIT "HOME" |
138 | #define LABEL_MENU "Select" | 136 | #define LABEL_MENU "Select" |
139 | #define LABEL_VOLUME "Scrollwheel" | 137 | #define LABEL_VOLUME "Scrollwheel" |
140 | 138 | ||
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 52b7566e40..cc8bf07d91 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -165,9 +165,7 @@ PLUGIN_HEADER | |||
165 | #define PLAYERS_TEXT "Up/Down" | 165 | #define PLAYERS_TEXT "Up/Down" |
166 | #define WORMS_TEXT "Left/Right" | 166 | #define WORMS_TEXT "Left/Right" |
167 | 167 | ||
168 | 168 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) | |
169 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | ||
170 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
171 | 169 | ||
172 | #define BTN_DIR_UP BUTTON_UP | 170 | #define BTN_DIR_UP BUTTON_UP |
173 | #define BTN_DIR_DOWN BUTTON_DOWN | 171 | #define BTN_DIR_DOWN BUTTON_DOWN |
@@ -180,6 +178,19 @@ PLUGIN_HEADER | |||
180 | #define PLAYERS_TEXT "Up/Down" | 178 | #define PLAYERS_TEXT "Up/Down" |
181 | #define WORMS_TEXT "Left/Right" | 179 | #define WORMS_TEXT "Left/Right" |
182 | 180 | ||
181 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
182 | |||
183 | #define BTN_DIR_UP BUTTON_UP | ||
184 | #define BTN_DIR_DOWN BUTTON_DOWN | ||
185 | #define BTN_DIR_LEFT BUTTON_LEFT | ||
186 | #define BTN_DIR_RIGHT BUTTON_RIGHT | ||
187 | #define BTN_STARTPAUSE BUTTON_SELECT | ||
188 | #define BTN_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
189 | #define BTN_STOPRESET (BUTTON_SELECT | BUTTON_UP) | ||
190 | |||
191 | #define PLAYERS_TEXT "Up/Down" | ||
192 | #define WORMS_TEXT "Left/Right" | ||
193 | |||
183 | #elif (CONFIG_KEYPAD == SANSA_M200_PAD) | 194 | #elif (CONFIG_KEYPAD == SANSA_M200_PAD) |
184 | 195 | ||
185 | #define BTN_DIR_UP BUTTON_UP | 196 | #define BTN_DIR_UP BUTTON_UP |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 704ffb0df0..96a68b1447 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -87,9 +87,7 @@ PLUGIN_HEADER | |||
87 | #define DOWN BUTTON_DOWN | 87 | #define DOWN BUTTON_DOWN |
88 | #define PAUSE BUTTON_REC | 88 | #define PAUSE BUTTON_REC |
89 | 89 | ||
90 | 90 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) | |
91 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | ||
92 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
93 | 91 | ||
94 | #define QUIT BUTTON_POWER | 92 | #define QUIT BUTTON_POWER |
95 | #define LEFT BUTTON_LEFT | 93 | #define LEFT BUTTON_LEFT |
@@ -98,6 +96,15 @@ PLUGIN_HEADER | |||
98 | #define DOWN BUTTON_DOWN | 96 | #define DOWN BUTTON_DOWN |
99 | #define PAUSE BUTTON_HOME | 97 | #define PAUSE BUTTON_HOME |
100 | 98 | ||
99 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
100 | |||
101 | #define QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
102 | #define LEFT BUTTON_LEFT | ||
103 | #define RIGHT BUTTON_RIGHT | ||
104 | #define UP BUTTON_UP | ||
105 | #define DOWN BUTTON_DOWN | ||
106 | #define PAUSE BUTTON_SELECT | ||
107 | |||
101 | #elif (CONFIG_KEYPAD == SANSA_M200_PAD) | 108 | #elif (CONFIG_KEYPAD == SANSA_M200_PAD) |
102 | 109 | ||
103 | #define QUIT BUTTON_POWER | 110 | #define QUIT BUTTON_POWER |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index ab5073fb7a..965cfea048 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -89,8 +89,7 @@ | |||
89 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 89 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
90 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 90 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
91 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 91 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
92 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 92 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
93 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
94 | #define ZX_SELECT BUTTON_SELECT | 93 | #define ZX_SELECT BUTTON_SELECT |
95 | #define ZX_MENU BUTTON_POWER | 94 | #define ZX_MENU BUTTON_POWER |
96 | #define ZX_LEFT BUTTON_LEFT | 95 | #define ZX_LEFT BUTTON_LEFT |
@@ -98,6 +97,14 @@ | |||
98 | #define ZX_UP BUTTON_UP | 97 | #define ZX_UP BUTTON_UP |
99 | #define ZX_DOWN BUTTON_DOWN | 98 | #define ZX_DOWN BUTTON_DOWN |
100 | 99 | ||
100 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
101 | #define ZX_SELECT BUTTON_SELECT | ||
102 | #define ZX_MENU (BUTTON_HOME|BUTTON_REPEAT) | ||
103 | #define ZX_LEFT BUTTON_LEFT | ||
104 | #define ZX_RIGHT BUTTON_RIGHT | ||
105 | #define ZX_UP BUTTON_UP | ||
106 | #define ZX_DOWN BUTTON_DOWN | ||
107 | |||
101 | #elif CONFIG_KEYPAD == MROBE500_PAD | 108 | #elif CONFIG_KEYPAD == MROBE500_PAD |
102 | #define ZX_UP BUTTON_RC_PLAY | 109 | #define ZX_UP BUTTON_RC_PLAY |
103 | #define ZX_DOWN BUTTON_RC_DOWN | 110 | #define ZX_DOWN BUTTON_RC_DOWN |
diff --git a/docs/CREDITS b/docs/CREDITS index 3db0a792df..a6479b7513 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -459,6 +459,7 @@ Michaƫl Burtin | |||
459 | Sasha Khamkov | 459 | Sasha Khamkov |
460 | Kai Posadowsky | 460 | Kai Posadowsky |
461 | Jack Halpin | 461 | Jack Halpin |
462 | Johannes Schwarz | ||
462 | 463 | ||
463 | The libmad team | 464 | The libmad team |
464 | The wavpack team | 465 | The wavpack team |