diff options
author | Michael Giacomelli <giac2000@hotmail.com> | 2009-01-04 23:33:15 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2009-01-04 23:33:15 +0000 |
commit | 6d5823f964d8cc2b030d7a713d355f3132e41c45 (patch) | |
tree | 4ca09cc6020717948fd21bccdd29265ed2c454fc /apps | |
parent | d32ebec9dadb053ab6d63aaa581465ad18ec572e (diff) | |
download | rockbox-6d5823f964d8cc2b030d7a713d355f3132e41c45.tar.gz rockbox-6d5823f964d8cc2b030d7a713d355f3132e41c45.zip |
Commit FS#9617 - Keymaps for Plugins fuze by Thomas Martitz.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19673 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
64 files changed, 475 insertions, 88 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 6559f535af..7c18dc74dd 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -98,9 +98,10 @@ PLUGIN_HEADER | |||
98 | #define BATTERY_OFF_TXT "PLAY" | 98 | #define BATTERY_OFF_TXT "PLAY" |
99 | 99 | ||
100 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 100 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
101 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 101 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
102 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 102 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
103 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 103 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ |
104 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
104 | #define BATTERY_ON BUTTON_SELECT | 105 | #define BATTERY_ON BUTTON_SELECT |
105 | #define BATTERY_OFF BUTTON_POWER | 106 | #define BATTERY_OFF BUTTON_POWER |
106 | #define BATTERY_ON_TXT "SELECT - start" | 107 | #define BATTERY_ON_TXT "SELECT - start" |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 237bd31abd..2aed40fd9e 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -160,16 +160,17 @@ PLUGIN_HEADER | |||
160 | #define BJACK_RIGHT BUTTON_RIGHT | 160 | #define BJACK_RIGHT BUTTON_RIGHT |
161 | #define BJACK_LEFT BUTTON_LEFT | 161 | #define BJACK_LEFT BUTTON_LEFT |
162 | 162 | ||
163 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 163 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ |
164 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
164 | #define BJACK_START BUTTON_SELECT | 165 | #define BJACK_START BUTTON_SELECT |
165 | #define BJACK_QUIT BUTTON_POWER | 166 | #define BJACK_QUIT BUTTON_POWER |
166 | #define BJACK_MAX (BUTTON_REC|BUTTON_UP) | 167 | #define BJACK_MAX (BUTTON_SELECT|BUTTON_UP) |
167 | #define BJACK_MIN (BUTTON_REC|BUTTON_DOWN) | 168 | #define BJACK_MIN (BUTTON_SELECT|BUTTON_DOWN) |
168 | #define BJACK_HIT BUTTON_SELECT | 169 | #define BJACK_HIT (BUTTON_SELECT|BUTTON_REL) |
169 | #define BJACK_STAY BUTTON_RIGHT | 170 | #define BJACK_STAY BUTTON_RIGHT |
170 | #define BJACK_DOUBLEDOWN BUTTON_LEFT | 171 | #define BJACK_DOUBLEDOWN BUTTON_LEFT |
171 | #define BJACK_SCORES BUTTON_UP | 172 | #define BJACK_SCORES BUTTON_DOWN |
172 | #define BJACK_RESUME BUTTON_REC | 173 | #define BJACK_RESUME BUTTON_UP |
173 | #define BJACK_UP BUTTON_SCROLL_FWD | 174 | #define BJACK_UP BUTTON_SCROLL_FWD |
174 | #define BJACK_DOWN BUTTON_SCROLL_BACK | 175 | #define BJACK_DOWN BUTTON_SCROLL_BACK |
175 | #define BJACK_RIGHT BUTTON_RIGHT | 176 | #define BJACK_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 54b6714990..755f7f7338 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -92,7 +92,8 @@ 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) | ||
96 | #define BOUNCE_LEFT BUTTON_LEFT | 97 | #define BOUNCE_LEFT BUTTON_LEFT |
97 | #define BOUNCE_RIGHT BUTTON_RIGHT | 98 | #define BOUNCE_RIGHT BUTTON_RIGHT |
98 | #define BOUNCE_UP BUTTON_SCROLL_BACK | 99 | #define BOUNCE_UP BUTTON_SCROLL_BACK |
@@ -101,8 +102,8 @@ PLUGIN_HEADER | |||
101 | #define BOUNCE_MODE BUTTON_SELECT | 102 | #define BOUNCE_MODE BUTTON_SELECT |
102 | 103 | ||
103 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ | 104 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ |
104 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | 105 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ |
105 | CONFIG_KEYPAD == SANSA_M200_PAD | 106 | CONFIG_KEYPAD == SANSA_M200_PAD |
106 | #define BOUNCE_LEFT BUTTON_LEFT | 107 | #define BOUNCE_LEFT BUTTON_LEFT |
107 | #define BOUNCE_RIGHT BUTTON_RIGHT | 108 | #define BOUNCE_RIGHT BUTTON_RIGHT |
108 | #define BOUNCE_UP BUTTON_UP | 109 | #define BOUNCE_UP BUTTON_UP |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index f9e071aaae..35823b6b99 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -103,7 +103,8 @@ 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) | ||
107 | 108 | ||
108 | #define QUIT BUTTON_POWER | 109 | #define QUIT BUTTON_POWER |
109 | #define LEFT BUTTON_LEFT | 110 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index ecd9096870..0894c75d4a 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -59,8 +59,11 @@ PLUGIN_HEADER | |||
59 | #define MAX_SHOTTIME 1000 | 59 | #define MAX_SHOTTIME 1000 |
60 | 60 | ||
61 | /* keyboard layouts */ | 61 | /* keyboard layouts */ |
62 | #if CONFIG_KEYPAD != SANSA_E200_PAD | 62 | /* FIXME: shouldn't the below be #ifdef HAVE_SCROLLWHEEL rather? */ |
63 | /* sansa uses the wheel instead of left/right */ | 63 | |
64 | #if (CONFIG_KEYPAD != SANSA_E200_PAD) && \ | ||
65 | (CONFIG_KEYPAD != SANSA_FUZE_PAD) | ||
66 | /* sansas use the wheel instead of left/right if available */ | ||
64 | #define BUBBLES_LEFT PLA_LEFT | 67 | #define BUBBLES_LEFT PLA_LEFT |
65 | #define BUBBLES_LEFT_REP PLA_LEFT_REPEAT | 68 | #define BUBBLES_LEFT_REP PLA_LEFT_REPEAT |
66 | #define BUBBLES_RIGHT PLA_RIGHT | 69 | #define BUBBLES_RIGHT PLA_RIGHT |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 214932e0a9..7e6eb92b0e 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -193,12 +193,13 @@ PLUGIN_HEADER | |||
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) | 196 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
197 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
197 | #define CALCULATOR_LEFT BUTTON_LEFT | 198 | #define CALCULATOR_LEFT BUTTON_LEFT |
198 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 199 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
199 | #define CALCULATOR_UP BUTTON_UP | 200 | #define CALCULATOR_UP BUTTON_UP |
200 | #define CALCULATOR_DOWN BUTTON_DOWN | 201 | #define CALCULATOR_DOWN BUTTON_DOWN |
201 | #if CONFIG_KEYPAD == SANSA_E200_PAD | 202 | #if defined(HAVE_SCROLLWHEEL) |
202 | /* c200 does not have a scroll wheel */ | 203 | /* c200 does not have a scroll wheel */ |
203 | #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK | 204 | #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK |
204 | #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD | 205 | #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD |
@@ -207,7 +208,13 @@ PLUGIN_HEADER | |||
207 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT | 208 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT |
208 | #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) | 209 | #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) |
209 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) | 210 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) |
211 | #if (CONFIG_KEYPAD == SANSA_E200_PAD) | ||
210 | #define CALCULATOR_CLEAR BUTTON_REC | 212 | #define CALCULATOR_CLEAR BUTTON_REC |
213 | /* FIXME: define as soon as HOME works | ||
214 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
215 | #define CALCULATOR_CLEAR BUTTON_HOME */ | ||
216 | #endif | ||
217 | |||
211 | 218 | ||
212 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) | 219 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) |
213 | #define CALCULATOR_LEFT BUTTON_LEFT | 220 | #define CALCULATOR_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 55771de919..866adceaee 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -90,7 +90,8 @@ 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 | ||
94 | #define CALENDAR_QUIT BUTTON_POWER | 95 | #define CALENDAR_QUIT BUTTON_POWER |
95 | #define CALENDAR_SELECT BUTTON_SELECT | 96 | #define CALENDAR_SELECT BUTTON_SELECT |
96 | #define CALENDAR_NEXT_WEEK BUTTON_SCROLL_FWD | 97 | #define CALENDAR_NEXT_WEEK BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 970bcc466a..351a32ac57 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -201,6 +201,22 @@ | |||
201 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 201 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
202 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 202 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
203 | 203 | ||
204 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
205 | #define CB_SELECT BUTTON_SELECT | ||
206 | #define CB_UP BUTTON_UP | ||
207 | #define CB_DOWN BUTTON_DOWN | ||
208 | #define CB_LEFT BUTTON_LEFT | ||
209 | #define CB_RIGHT BUTTON_RIGHT | ||
210 | #define CB_PLAY (BUTTON_SELECT | BUTTON_RIGHT) | ||
211 | #define CB_LEVEL (BUTTON_SELECT|BUTTON_LEFT) | ||
212 | #define CB_RESTART (BUTTON_SELECT | BUTTON_REPEAT) | ||
213 | #define CB_MENU BUTTON_POWER | ||
214 | |||
215 | #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) | ||
216 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) | ||
217 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
218 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
219 | |||
204 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD | 220 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD |
205 | #define CB_SELECT BUTTON_SELECT | 221 | #define CB_SELECT BUTTON_SELECT |
206 | #define CB_UP BUTTON_UP | 222 | #define CB_UP BUTTON_UP |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 725a5cd037..86bcce01db 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -122,9 +122,10 @@ PLUGIN_HEADER | |||
122 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | 122 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
123 | 123 | ||
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) | ||
128 | #define CHC_QUIT BUTTON_POWER | 129 | #define CHC_QUIT BUTTON_POWER |
129 | #define CHC_STARTSTOP BUTTON_SELECT | 130 | #define CHC_STARTSTOP BUTTON_SELECT |
130 | #define CHC_RESET BUTTON_DOWN | 131 | #define CHC_RESET BUTTON_DOWN |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 29262e481a..ceab1431dd 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1022,7 +1022,8 @@ STATIC void chip8 (void) | |||
1022 | #define CHIP8_KEY8 BUTTON_DOWN | 1022 | #define CHIP8_KEY8 BUTTON_DOWN |
1023 | #define CHIP8_KEY9 BUTTON_A | 1023 | #define CHIP8_KEY9 BUTTON_A |
1024 | 1024 | ||
1025 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 1025 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ |
1026 | CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
1026 | #define CHIP8_OFF BUTTON_POWER | 1027 | #define CHIP8_OFF BUTTON_POWER |
1027 | #define CHIP8_KEY2 BUTTON_SCROLL_BACK | 1028 | #define CHIP8_KEY2 BUTTON_SCROLL_BACK |
1028 | #define CHIP8_KEY4 BUTTON_LEFT | 1029 | #define CHIP8_KEY4 BUTTON_LEFT |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index f30aed4aa5..5c82b1eeea 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -67,9 +67,10 @@ Still To do: | |||
67 | #define ACTIONTEXT "RIGHT" | 67 | #define ACTIONTEXT "RIGHT" |
68 | 68 | ||
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) | ||
73 | #define QUIT BUTTON_POWER | 74 | #define QUIT BUTTON_POWER |
74 | #define ACTION BUTTON_SELECT | 75 | #define ACTION BUTTON_SELECT |
75 | #define ACTIONTEXT "SELECT" | 76 | #define ACTIONTEXT "SELECT" |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 7c651fca8c..d43f06f4b8 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -130,7 +130,8 @@ 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) | ||
134 | #define CUBE_QUIT BUTTON_POWER | 135 | #define CUBE_QUIT BUTTON_POWER |
135 | #define CUBE_NEXT BUTTON_RIGHT | 136 | #define CUBE_NEXT BUTTON_RIGHT |
136 | #define CUBE_PREV BUTTON_LEFT | 137 | #define CUBE_PREV BUTTON_LEFT |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index e263afebb2..7e176e67a5 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -104,6 +104,7 @@ long reverse (long N) { | |||
104 | } | 104 | } |
105 | #endif | 105 | #endif |
106 | 106 | ||
107 | /* TODO: Clean up, most use BUTTON_POWER, could be the #else case */ | ||
107 | /* Button definitions */ | 108 | /* Button definitions */ |
108 | #if CONFIG_KEYPAD == PLAYER_PAD | 109 | #if CONFIG_KEYPAD == PLAYER_PAD |
109 | #define LP_QUIT BUTTON_STOP | 110 | #define LP_QUIT BUTTON_STOP |
@@ -118,9 +119,12 @@ long reverse (long N) { | |||
118 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 119 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
119 | #define LP_QUIT BUTTON_POWER | 120 | #define LP_QUIT BUTTON_POWER |
120 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 121 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
121 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 122 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
122 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 123 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
123 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 124 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
125 | #define LP_QUIT BUTTON_POWER | ||
126 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
127 | /* TODO: #define LP_QUIT BUTTOM_HOME */ | ||
124 | #define LP_QUIT BUTTON_POWER | 128 | #define LP_QUIT BUTTON_POWER |
125 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 129 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
126 | #define LP_QUIT BUTTON_POWER | 130 | #define LP_QUIT BUTTON_POWER |
@@ -143,6 +147,7 @@ long reverse (long N) { | |||
143 | #endif | 147 | #endif |
144 | 148 | ||
145 | /* data files */ | 149 | /* data files */ |
150 | /* FIXME: use "PLUGIN_APPS_DIR" */ | ||
146 | #define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index" | 151 | #define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index" |
147 | #define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc" | 152 | #define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc" |
148 | 153 | ||
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 3e41cab460..1d533d40ec 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -193,6 +193,19 @@ void I_ShutdownGraphics(void) | |||
193 | #define DOOMBUTTON_ESC BUTTON_POWER | 193 | #define DOOMBUTTON_ESC BUTTON_POWER |
194 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 194 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
195 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW | 195 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW |
196 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
197 | #define DOOMBUTTON_SCROLLWHEEL | ||
198 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK | ||
199 | #define DOOMBUTTON_SCROLLWHEEL_CW BUTTON_SCROLL_FWD | ||
200 | #define DOOMBUTTON_UP BUTTON_UP | ||
201 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
202 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
203 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
204 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | ||
205 | #define DOOMBUTTON_OPEN BUTTON_HOME | ||
206 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
207 | #define DOOMBUTTON_ENTER BUTTON_SELECT | ||
208 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW | ||
196 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 209 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
197 | #define DOOMBUTTON_UP BUTTON_UP | 210 | #define DOOMBUTTON_UP BUTTON_UP |
198 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 211 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -628,11 +641,11 @@ void I_FinishUpdate (void) | |||
628 | /* ASM screen update (drops ~230 tics) */ | 641 | /* ASM screen update (drops ~230 tics) */ |
629 | asm volatile ( | 642 | asm volatile ( |
630 | "clr.w (%[LCD]) \n" /* Setup the LCD controller */ | 643 | "clr.w (%[LCD]) \n" /* Setup the LCD controller */ |
631 | "move.w #(33<<1), (%[LCD]) \n" | 644 | "move.w #(33<<1), (%[LCD]) \n" |
632 | "clr.w (%[LCD2]) \n" | 645 | "clr.w (%[LCD2]) \n" |
633 | "clr.w (%[LCD2]) \n" | 646 | "clr.w (%[LCD2]) \n" |
634 | "clr.w (%[LCD]) \n" /* End LCD controller setup */ | 647 | "clr.w (%[LCD]) \n" /* End LCD controller setup */ |
635 | "move.w #(34<<1), (%[LCD]) \n" | 648 | "move.w #(34<<1), (%[LCD]) \n" |
636 | "clr.l %%d1 \n" | 649 | "clr.l %%d1 \n" |
637 | ".loop: \n" | 650 | ".loop: \n" |
638 | "move.l (%[scrp])+, %%d0 \n" | 651 | "move.l (%[scrp])+, %%d0 \n" |
@@ -686,7 +699,7 @@ void I_FinishUpdate (void) | |||
686 | if(rotate_screen) | 699 | if(rotate_screen) |
687 | { | 700 | { |
688 | int y; | 701 | int y; |
689 | 702 | ||
690 | for (y = 1; y <= SCREENHEIGHT; y++) | 703 | for (y = 1; y <= SCREENHEIGHT; y++) |
691 | { | 704 | { |
692 | fb_data *dst = rb->lcd_framebuffer + LCD_WIDTH - y; | 705 | fb_data *dst = rb->lcd_framebuffer + LCD_WIDTH - y; |
diff --git a/apps/plugins/euroconverter.c b/apps/plugins/euroconverter.c index 02617abc39..827c7db586 100644 --- a/apps/plugins/euroconverter.c +++ b/apps/plugins/euroconverter.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | #include "lib/configfile.h" | 22 | #include "lib/configfile.h" |
23 | 23 | ||
24 | /* FIXME: Only for LCD_CHARCELL ?? */ | ||
24 | #ifdef HAVE_LCD_CHARCELLS | 25 | #ifdef HAVE_LCD_CHARCELLS |
25 | 26 | ||
26 | /* Euro converter for the player */ | 27 | /* Euro converter for the player */ |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index eee72906a4..64b30dc36e 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -62,9 +62,12 @@ static const struct plugin_api* rb; | |||
62 | #define BTN_MENU BUTTON_MENU | 62 | #define BTN_MENU BUTTON_MENU |
63 | #define BTN_FIRE BUTTON_SELECT | 63 | #define BTN_FIRE BUTTON_SELECT |
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 | #define BTN_MENU BUTTON_POWER | 66 | #define BTN_MENU BUTTON_POWER |
67 | #define BTN_FIRE BUTTON_SELECT | 67 | #define BTN_FIRE BUTTON_SELECT |
68 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
69 | #define BTN_MENU BUTTON_DOWN | ||
70 | #define BTN_FIRE BUTTON_SELECT | ||
68 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 71 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
69 | #define BTN_MENU BUTTON_POWER | 72 | #define BTN_MENU BUTTON_POWER |
70 | #define BTN_FIRE BUTTON_PLAY | 73 | #define BTN_FIRE BUTTON_PLAY |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index e5863bd4b1..f4725e4fa0 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -143,6 +143,22 @@ PLUGIN_HEADER | |||
143 | #define FLIPIT_STEP_BY_STEP (BUTTON_REC | BUTTON_SELECT) | 143 | #define FLIPIT_STEP_BY_STEP (BUTTON_REC | BUTTON_SELECT) |
144 | #define FLIPIT_TOGGLE BUTTON_SELECT | 144 | #define FLIPIT_TOGGLE BUTTON_SELECT |
145 | 145 | ||
146 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
147 | |||
148 | #define FLIPIT_SCROLLWHEEL | ||
149 | #define FLIPIT_LEFT BUTTON_LEFT | ||
150 | #define FLIPIT_RIGHT BUTTON_RIGHT | ||
151 | #define FLIPIT_UP BUTTON_UP | ||
152 | #define FLIPIT_DOWN BUTTON_DOWN | ||
153 | #define FLIPIT_NEXT BUTTON_SCROLL_FWD | ||
154 | #define FLIPIT_PREV BUTTON_SCROLL_BACK | ||
155 | #define FLIPIT_QUIT (BUTTON_SELECT | BUTTON_UP) | ||
156 | #define FLIPIT_SHUFFLE (BUTTON_SELECT | BUTTON_LEFT) | ||
157 | #define FLIPIT_SOLVE (BUTTON_SELECT | BUTTON_DOWN) | ||
158 | #define FLIPIT_STEP_BY_STEP (BUTTON_SELECT | BUTTON_RIGHT) | ||
159 | #define FLIPIT_TOGGLE_PRE BUTTON_SELECT | ||
160 | #define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL) | ||
161 | |||
146 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 162 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
147 | 163 | ||
148 | #define FLIPIT_LEFT BUTTON_LEFT | 164 | #define FLIPIT_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index ae89985f91..0d50c67e73 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -93,7 +93,8 @@ 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 | ||
97 | 98 | ||
98 | #define QUIT BUTTON_POWER | 99 | #define QUIT BUTTON_POWER |
99 | #define LEFT BUTTON_LEFT | 100 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 8c53ddcaab..645135a918 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -97,7 +97,8 @@ PLUGIN_HEADER | |||
97 | #define JEWELS_SELECT BUTTON_SELECT | 97 | #define JEWELS_SELECT BUTTON_SELECT |
98 | #define JEWELS_CANCEL BUTTON_POWER | 98 | #define JEWELS_CANCEL BUTTON_POWER |
99 | 99 | ||
100 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 100 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ |
101 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
101 | #define JEWELS_SCROLLWHEEL | 102 | #define JEWELS_SCROLLWHEEL |
102 | #define JEWELS_UP BUTTON_UP | 103 | #define JEWELS_UP BUTTON_UP |
103 | #define JEWELS_DOWN BUTTON_DOWN | 104 | #define JEWELS_DOWN BUTTON_DOWN |
@@ -1585,6 +1586,7 @@ static int jewels_main(struct game_context* bj) { | |||
1585 | #elif CONFIG_KEYPAD == SANSA_E200_PAD \ | 1586 | #elif CONFIG_KEYPAD == SANSA_E200_PAD \ |
1586 | || CONFIG_KEYPAD == SANSA_C200_PAD \ | 1587 | || CONFIG_KEYPAD == SANSA_C200_PAD \ |
1587 | || CONFIG_KEYPAD == SANSA_CLIP_PAD \ | 1588 | || CONFIG_KEYPAD == SANSA_CLIP_PAD \ |
1589 | || CONFIG_KEYPAD == SANSA_FUZE_PAD \ | ||
1588 | || CONFIG_KEYPAD == SANSA_M200_PAD | 1590 | || CONFIG_KEYPAD == SANSA_M200_PAD |
1589 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); | 1591 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); |
1590 | rb->lcd_puts(0, 3, "form connected segments"); | 1592 | rb->lcd_puts(0, 3, "form connected segments"); |
diff --git a/apps/plugins/jpeg/jpeg.h b/apps/plugins/jpeg/jpeg.h index 23347b9e2a..ee93694955 100644 --- a/apps/plugins/jpeg/jpeg.h +++ b/apps/plugins/jpeg/jpeg.h | |||
@@ -133,6 +133,21 @@ | |||
133 | #define JPEG_PREVIOUS BUTTON_SCROLL_BACK | 133 | #define JPEG_PREVIOUS BUTTON_SCROLL_BACK |
134 | #define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_BACK|BUTTON_REPEAT) | 134 | #define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_BACK|BUTTON_REPEAT) |
135 | 135 | ||
136 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
137 | #define JPEG_ZOOM_PRE BUTTON_SELECT | ||
138 | #define JPEG_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) | ||
139 | #define JPEG_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) | ||
140 | #define JPEG_UP BUTTON_UP | ||
141 | #define JPEG_DOWN BUTTON_DOWN | ||
142 | #define JPEG_LEFT BUTTON_LEFT | ||
143 | #define JPEG_RIGHT BUTTON_RIGHT | ||
144 | #define JPEG_MENU BUTTON_POWER | ||
145 | #define JPEG_SLIDE_SHOW BUTTON_RECd | ||
146 | #define JPEG_NEXT BUTTON_SCROLL_FWD | ||
147 | #define JPEG_NEXT_REPEAT (BUTTON_SCROLL_FWD|BUTTON_REPEAT) | ||
148 | #define JPEG_PREVIOUS BUTTON_SCROLL_BACK | ||
149 | #define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_BACK|BUTTON_REPEAT) | ||
150 | |||
136 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 151 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
137 | #define JPEG_ZOOM_PRE BUTTON_SELECT | 152 | #define JPEG_ZOOM_PRE BUTTON_SELECT |
138 | #define JPEG_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) | 153 | #define JPEG_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) |
diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c index 6ec86f6950..0e657f3bcc 100644 --- a/apps/plugins/keybox.c +++ b/apps/plugins/keybox.c | |||
@@ -22,6 +22,8 @@ | |||
22 | #include "lib/md5.h" | 22 | #include "lib/md5.h" |
23 | PLUGIN_HEADER | 23 | PLUGIN_HEADER |
24 | 24 | ||
25 | |||
26 | /* FIXME: use "PLUGIN_APPS_DIR" */ | ||
25 | #define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat" | 27 | #define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat" |
26 | #define BLOCK_SIZE 8 | 28 | #define BLOCK_SIZE 8 |
27 | #define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */ | 29 | #define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */ |
diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c index b5e25daa65..337ea85f43 100644 --- a/apps/plugins/lamp.c +++ b/apps/plugins/lamp.c | |||
@@ -52,7 +52,8 @@ PLUGIN_HEADER | |||
52 | # define LAMP_LEFT BUTTON_LEFT | 52 | # define LAMP_LEFT BUTTON_LEFT |
53 | # define LAMP_RIGHT BUTTON_RIGHT | 53 | # define LAMP_RIGHT BUTTON_RIGHT |
54 | 54 | ||
55 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 55 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
56 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
56 | # define LAMP_LEFT BUTTON_LEFT | 57 | # define LAMP_LEFT BUTTON_LEFT |
57 | # define LAMP_RIGHT BUTTON_RIGHT | 58 | # define LAMP_RIGHT BUTTON_RIGHT |
58 | # define LAMP_NEXT BUTTON_SCROLL_FWD | 59 | # define LAMP_NEXT BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index af6dc55f80..2ec6cf6cf2 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -101,8 +101,9 @@ const struct button_mapping generic_directions[] = | |||
101 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 101 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
102 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ | 102 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ |
103 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | 103 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
104 | || (CONFIG_KEYPAD == IPOD_4G_PAD) \ | ||
104 | || (CONFIG_KEYPAD == SANSA_E200_PAD) \ | 105 | || (CONFIG_KEYPAD == SANSA_E200_PAD) \ |
105 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | 106 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
106 | { PLA_UP, BUTTON_SCROLL_BACK, BUTTON_NONE}, | 107 | { PLA_UP, BUTTON_SCROLL_BACK, BUTTON_NONE}, |
107 | { PLA_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE}, | 108 | { PLA_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE}, |
108 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 109 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
@@ -236,7 +237,8 @@ const struct button_mapping generic_left_right_fire[] = | |||
236 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 237 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
237 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 238 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
238 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, | 239 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, |
239 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 240 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) \ |
241 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
240 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 242 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
241 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | 243 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, |
242 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 244 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
@@ -365,15 +367,11 @@ const struct button_mapping generic_actions[] = | |||
365 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | 367 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, |
366 | {PLA_FIRE, BUTTON_ON, BUTTON_NONE}, | 368 | {PLA_FIRE, BUTTON_ON, BUTTON_NONE}, |
367 | {PLA_FIRE_REPEAT, BUTTON_ON|BUTTON_REPEAT, BUTTON_NONE}, | 369 | {PLA_FIRE_REPEAT, BUTTON_ON|BUTTON_REPEAT, BUTTON_NONE}, |
368 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 370 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ |
369 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 371 | CONFIG_KEYPAD == SANSA_C200_PAD || \ |
370 | {PLA_START, BUTTON_UP, BUTTON_NONE}, | 372 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ |
371 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, | 373 | CONFIG_KEYPAD == SANSA_M200_PAD || \ |
372 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 374 | CONFIG_KEYPAD == SANSA_FUZE_PAD |
373 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | ||
374 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ | ||
375 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | ||
376 | CONFIG_KEYPAD == SANSA_M200_PAD | ||
377 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 375 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
378 | {PLA_START, BUTTON_UP, BUTTON_NONE}, | 376 | {PLA_START, BUTTON_UP, BUTTON_NONE}, |
379 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, | 377 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, |
@@ -472,8 +470,9 @@ const struct button_mapping generic_increase_decrease[] = | |||
472 | {PLA_DEC_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 470 | {PLA_DEC_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
473 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ | 471 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ |
474 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | 472 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
473 | || (CONFIG_KEYPAD == IPOD_4G_PAD) \ | ||
475 | || (CONFIG_KEYPAD == SANSA_E200_PAD) \ | 474 | || (CONFIG_KEYPAD == SANSA_E200_PAD) \ |
476 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | 475 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
477 | {PLA_INC, BUTTON_SCROLL_FWD, BUTTON_NONE}, | 476 | {PLA_INC, BUTTON_SCROLL_FWD, BUTTON_NONE}, |
478 | {PLA_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE}, | 477 | {PLA_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE}, |
479 | {PLA_INC_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, | 478 | {PLA_INC_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 5fd87a6bb7..c96b45adf0 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -96,9 +96,10 @@ const unsigned char rockbox16x7[] = { | |||
96 | #define LP_INC_Y BUTTON_UP | 96 | #define LP_INC_Y BUTTON_UP |
97 | 97 | ||
98 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 98 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
99 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 99 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
100 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 100 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
101 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 101 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ |
102 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
102 | #define LP_QUIT BUTTON_POWER | 103 | #define LP_QUIT BUTTON_POWER |
103 | #define LP_DEC_X BUTTON_LEFT | 104 | #define LP_DEC_X BUTTON_LEFT |
104 | #define LP_INC_X BUTTON_RIGHT | 105 | #define LP_INC_X BUTTON_RIGHT |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index 536ef09e60..379022ec96 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -138,6 +138,18 @@ PLUGIN_HEADER | |||
138 | #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) | 138 | #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) |
139 | #define MANDELBROT_RESET BUTTON_REC | 139 | #define MANDELBROT_RESET BUTTON_REC |
140 | 140 | ||
141 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
142 | #define MANDELBROT_QUIT BUTTON_POWER | ||
143 | #define MANDELBROT_UP BUTTON_UP | ||
144 | #define MANDELBROT_DOWN BUTTON_DOWN | ||
145 | #define MANDELBROT_LEFT BUTTON_LEFT | ||
146 | #define MANDELBROT_RIGHT BUTTON_RIGHT | ||
147 | #define MANDELBROT_ZOOM_IN BUTTON_SCROLL_FWD | ||
148 | #define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_BACK | ||
149 | #define MANDELBROT_MAXITER_INC (BUTTON_SELECT | BUTTON_RIGHT) | ||
150 | #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) | ||
151 | #define MANDELBROT_RESET (BUTTON_SELECT | BUTTON_REPEAT) | ||
152 | |||
141 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 153 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
142 | #define MANDELBROT_QUIT BUTTON_POWER | 154 | #define MANDELBROT_QUIT BUTTON_POWER |
143 | #define MANDELBROT_UP BUTTON_UP | 155 | #define MANDELBROT_UP BUTTON_UP |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index c7d797e09d..986eb72e48 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -49,6 +49,7 @@ extern const fb_data matrix_normal[]; | |||
49 | #define LEFTMARGIN (LCD_WIDTH-(COLS*COL_W))/2 | 49 | #define LEFTMARGIN (LCD_WIDTH-(COLS*COL_W))/2 |
50 | #define TOPMARGIN (LCD_HEIGHT-(ROWS*COL_H))/2 | 50 | #define TOPMARGIN (LCD_HEIGHT-(ROWS*COL_H))/2 |
51 | 51 | ||
52 | /* FIXME: could use plugin lib actions */ | ||
52 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 53 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
53 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 54 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
54 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 55 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
@@ -82,6 +83,11 @@ extern const fb_data matrix_normal[]; | |||
82 | #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT | 83 | #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT |
83 | #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT | 84 | #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT |
84 | #define MATRIX_PAUSE BUTTON_SELECT | 85 | #define MATRIX_PAUSE BUTTON_SELECT |
86 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
87 | #define MATRIX_EXIT BUTTON_DOWN | ||
88 | #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT | ||
89 | #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT | ||
90 | #define MATRIX_PAUSE BUTTON_SELECT | ||
85 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 91 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
86 | #define MATRIX_EXIT BUTTON_POWER | 92 | #define MATRIX_EXIT BUTTON_POWER |
87 | #define MATRIX_SLEEP_MORE BUTTON_UP | 93 | #define MATRIX_SLEEP_MORE BUTTON_UP |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index 40141f496e..5f4613a37b 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -83,7 +83,8 @@ PLUGIN_IRAM_DECLARE | |||
83 | #define BTN_PLAY BUTTON_PLAY | 83 | #define BTN_PLAY BUTTON_PLAY |
84 | 84 | ||
85 | 85 | ||
86 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 86 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) \ |
87 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
87 | #define BTN_QUIT BUTTON_POWER | 88 | #define BTN_QUIT BUTTON_POWER |
88 | #define BTN_RIGHT BUTTON_RIGHT | 89 | #define BTN_RIGHT BUTTON_RIGHT |
89 | #define BTN_LEFT BUTTON_LEFT | 90 | #define BTN_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 071c5d786c..183ce0fd9b 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -120,6 +120,7 @@ enum minesweeper_status { | |||
120 | # define MINESWP_INFO BUTTON_MENU | 120 | # define MINESWP_INFO BUTTON_MENU |
121 | 121 | ||
122 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 122 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
123 | |||
123 | # define MINESWP_SCROLLWHEEL | 124 | # define MINESWP_SCROLLWHEEL |
124 | # define MINESWP_LEFT BUTTON_LEFT | 125 | # define MINESWP_LEFT BUTTON_LEFT |
125 | # define MINESWP_RIGHT BUTTON_RIGHT | 126 | # define MINESWP_RIGHT BUTTON_RIGHT |
@@ -132,6 +133,17 @@ enum minesweeper_status { | |||
132 | # define MINESWP_DISCOVER BUTTON_SELECT | 133 | # define MINESWP_DISCOVER BUTTON_SELECT |
133 | # define MINESWP_INFO (BUTTON_REC|BUTTON_REPEAT) | 134 | # define MINESWP_INFO (BUTTON_REC|BUTTON_REPEAT) |
134 | 135 | ||
136 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
137 | |||
138 | # define MINESWP_LEFT BUTTON_LEFT | ||
139 | # define MINESWP_RIGHT BUTTON_RIGHT | ||
140 | # define MINESWP_UP BUTTON_UP | ||
141 | # define MINESWP_DOWN BUTTON_DOWN | ||
142 | # define MINESWP_QUIT BUTTON_POWER | ||
143 | # define MINESWP_TOGGLE BUTTON_SCROLL_FWD | ||
144 | # define MINESWP_DISCOVER BUTTON_SELECT | ||
145 | # define MINESWP_INFO BUTTON_SCROLL_BACK | ||
146 | |||
135 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 147 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
136 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 148 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
137 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 149 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 4d543e1d36..c8031e8b3b 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -42,6 +42,7 @@ PLUGIN_HEADER | |||
42 | #define GFX_HEIGHT 6 | 42 | #define GFX_HEIGHT 6 |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | /* FIXME: could use plugin lib actions */ | ||
45 | /* variable button definitions */ | 46 | /* variable button definitions */ |
46 | #if CONFIG_KEYPAD == RECORDER_PAD | 47 | #if CONFIG_KEYPAD == RECORDER_PAD |
47 | #define MOSAIQUE_QUIT BUTTON_OFF | 48 | #define MOSAIQUE_QUIT BUTTON_OFF |
@@ -94,9 +95,10 @@ PLUGIN_HEADER | |||
94 | #define MOSAIQUE_RESTART BUTTON_SELECT | 95 | #define MOSAIQUE_RESTART BUTTON_SELECT |
95 | 96 | ||
96 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 97 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
97 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 98 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
98 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 99 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
99 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 100 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ |
101 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
100 | #define MOSAIQUE_QUIT BUTTON_POWER | 102 | #define MOSAIQUE_QUIT BUTTON_POWER |
101 | #define MOSAIQUE_SPEED BUTTON_DOWN | 103 | #define MOSAIQUE_SPEED BUTTON_DOWN |
102 | #define MOSAIQUE_RESTART BUTTON_SELECT | 104 | #define MOSAIQUE_RESTART BUTTON_SELECT |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 8c060799d7..1de89bda97 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2429,6 +2429,7 @@ void get_mp3_filename(const char *wav_name) | |||
2429 | #define MP3ENC_NEXT BUTTON_DOWN | 2429 | #define MP3ENC_NEXT BUTTON_DOWN |
2430 | #define MP3ENC_DONE BUTTON_POWER | 2430 | #define MP3ENC_DONE BUTTON_POWER |
2431 | #define MP3ENC_SELECT BUTTON_SELECT | 2431 | #define MP3ENC_SELECT BUTTON_SELECT |
2432 | /* FIXME: e200 could use scrollwheel */ | ||
2432 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 2433 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
2433 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 2434 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
2434 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 2435 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
@@ -2437,6 +2438,13 @@ void get_mp3_filename(const char *wav_name) | |||
2437 | #define MP3ENC_NEXT BUTTON_DOWN | 2438 | #define MP3ENC_NEXT BUTTON_DOWN |
2438 | #define MP3ENC_DONE BUTTON_POWER | 2439 | #define MP3ENC_DONE BUTTON_POWER |
2439 | #define MP3ENC_SELECT BUTTON_SELECT | 2440 | #define MP3ENC_SELECT BUTTON_SELECT |
2441 | |||
2442 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
2443 | #define MP3ENC_PREV BUTTON_SCROLL_BACK | ||
2444 | #define MP3ENC_NEXT BUTTON_SCROLL_FWD | ||
2445 | #define MP3ENC_DONE BUTTON_UP | ||
2446 | #define MP3ENC_SELECT BUTTON_SELECT | ||
2447 | |||
2440 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 2448 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
2441 | #define MP3ENC_PREV BUTTON_SCROLL_UP | 2449 | #define MP3ENC_PREV BUTTON_SCROLL_UP |
2442 | #define MP3ENC_NEXT BUTTON_SCROLL_DOWN | 2450 | #define MP3ENC_NEXT BUTTON_SCROLL_DOWN |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 2b423d28e9..cf7af09469 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -73,7 +73,8 @@ struct mpeg_settings settings; | |||
73 | #define MPEG_START_TIME_DOWN BUTTON_SCROLL_DOWN | 73 | #define MPEG_START_TIME_DOWN BUTTON_SCROLL_DOWN |
74 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 74 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
75 | 75 | ||
76 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 76 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) \ |
77 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
77 | #define MPEG_START_TIME_SELECT BUTTON_SELECT | 78 | #define MPEG_START_TIME_SELECT BUTTON_SELECT |
78 | #define MPEG_START_TIME_SCROLL_UP BUTTON_SCROLL_BACK | 79 | #define MPEG_START_TIME_SCROLL_UP BUTTON_SCROLL_BACK |
79 | #define MPEG_START_TIME_SCROLL_DOWN BUTTON_SCROLL_FWD | 80 | #define MPEG_START_TIME_SCROLL_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 02eb0863ff..cb5d4edb76 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -180,7 +180,8 @@ PLUGIN_IRAM_DECLARE | |||
180 | #define MPEG_RW BUTTON_REW | 180 | #define MPEG_RW BUTTON_REW |
181 | #define MPEG_FF BUTTON_FF | 181 | #define MPEG_FF BUTTON_FF |
182 | 182 | ||
183 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 183 | #elif CONFIG_KEYPAD == SANSA_E200_PAD \ |
184 | || CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
184 | #define MPEG_MENU BUTTON_SELECT | 185 | #define MPEG_MENU BUTTON_SELECT |
185 | #define MPEG_STOP BUTTON_POWER | 186 | #define MPEG_STOP BUTTON_POWER |
186 | #define MPEG_PAUSE BUTTON_UP | 187 | #define MPEG_PAUSE BUTTON_UP |
diff --git a/apps/plugins/nim.c b/apps/plugins/nim.c index ce61d7a383..1500407f49 100644 --- a/apps/plugins/nim.c +++ b/apps/plugins/nim.c | |||
@@ -20,6 +20,7 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | 22 | ||
23 | /* FIXME: Why only for charcell? */ | ||
23 | #ifdef HAVE_LCD_CHARCELLS | 24 | #ifdef HAVE_LCD_CHARCELLS |
24 | 25 | ||
25 | /* NIM game for the player | 26 | /* NIM game for the player |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index d197272e9a..5915604b74 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -111,6 +111,17 @@ PLUGIN_HEADER | |||
111 | #define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_FWD | 111 | #define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_FWD |
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) | ||
115 | #define OSCILLOSCOPE_QUIT BUTTON_DOWN | ||
116 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL) | ||
117 | #define OSCILLOSCOPE_ADVMODE (BUTTON_SELECT | BUTTON_RIGHT) | ||
118 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_SELECT | BUTTON_LEFT) | ||
119 | #define OSCILLOSCOPE_PAUSE BUTTON_UP | ||
120 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | ||
121 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | ||
122 | #define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_FWD | ||
123 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_BACK | ||
124 | |||
114 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 125 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
115 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 126 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
116 | #define OSCILLOSCOPE_DRAWMODE BUTTON_SELECT | 127 | #define OSCILLOSCOPE_DRAWMODE BUTTON_SELECT |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index e454b17ae7..2d559fd6df 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -112,6 +112,17 @@ | |||
112 | #define PACMAN_COIN (BUTTON_SELECT | BUTTON_DOWN) | 112 | #define PACMAN_COIN (BUTTON_SELECT | BUTTON_DOWN) |
113 | #define PACMAN_MENU BUTTON_POWER | 113 | #define PACMAN_MENU BUTTON_POWER |
114 | 114 | ||
115 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
116 | |||
117 | #define PACMAN_UP BUTTON_UP | ||
118 | #define PACMAN_DOWN BUTTON_DOWN | ||
119 | #define PACMAN_LEFT BUTTON_LEFT | ||
120 | #define PACMAN_RIGHT BUTTON_RIGHT | ||
121 | #define PACMAN_1UP BUTTON_SELECT | ||
122 | #define PACMAN_COIN_PRE BUTTON_SELECT | ||
123 | #define PACMAN_COIN (BUTTON_SELECT | BUTTON_DOWN) | ||
124 | #define PACMAN_MENU BUTTON_POWER | ||
125 | |||
115 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 126 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
116 | 127 | ||
117 | #if defined(IRIVER_H10_5GB) | 128 | #if defined(IRIVER_H10_5GB) |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index bf40032cf8..25f8adfbed 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -41,6 +41,7 @@ PLUGIN_HEADER | |||
41 | #define PB_USB 2 | 41 | #define PB_USB 2 |
42 | #define PB_QUIT 1 | 42 | #define PB_QUIT 1 |
43 | 43 | ||
44 | /* FIXME: USE PLUGIN_GAMES_DIR */ | ||
44 | #define DATA_FILE PLUGIN_DIR "/games/pegbox.data" | 45 | #define DATA_FILE PLUGIN_DIR "/games/pegbox.data" |
45 | #define SAVE_FILE PLUGIN_DIR "/games/pegbox.save" | 46 | #define SAVE_FILE PLUGIN_DIR "/games/pegbox.save" |
46 | 47 | ||
@@ -194,6 +195,25 @@ PLUGIN_HEADER | |||
194 | #define LVL_UP_TEXT "SCROLL BACK" | 195 | #define LVL_UP_TEXT "SCROLL BACK" |
195 | #define LVL_DOWN_TEXT "SCROLL FWD" | 196 | #define LVL_DOWN_TEXT "SCROLL FWD" |
196 | 197 | ||
198 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
199 | #define PEGBOX_SAVE BUTTON_SELECT|BUTTON_REL | ||
200 | #define PEGBOX_QUIT BUTTON_POWER | ||
201 | /* FIXME: | ||
202 | #define PEGBOX_RESTART BUTTON_HOME */ | ||
203 | #define PEGBOX_RESTART BUTTON_SELECT|BUTTON_LEFT | ||
204 | #define PEGBOX_LVL_UP BUTTON_SCROLL_BACK | ||
205 | #define PEGBOX_LVL_DOWN BUTTON_SCROLL_FWD | ||
206 | #define PEGBOX_UP BUTTON_UP | ||
207 | #define PEGBOX_DOWN BUTTON_DOWN | ||
208 | #define PEGBOX_RIGHT BUTTON_RIGHT | ||
209 | #define PEGBOX_LEFT BUTTON_LEFT | ||
210 | |||
211 | #define SAVE_TEXT "SELECT" | ||
212 | #define QUIT_TEXT "POWER" | ||
213 | #define RESTART_TEXT "SELECT & LEFT" | ||
214 | #define LVL_UP_TEXT "SCROLL BACK" | ||
215 | #define LVL_DOWN_TEXT "SCROLL FWD" | ||
216 | |||
197 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 217 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
198 | #define PEGBOX_SAVE BUTTON_SELECT | 218 | #define PEGBOX_SAVE BUTTON_SELECT |
199 | #define PEGBOX_QUIT BUTTON_POWER | 219 | #define PEGBOX_QUIT BUTTON_POWER |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 7c74a86917..8e85bf08c4 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -55,6 +55,7 @@ static size_t gbuf_size = 0; | |||
55 | static unsigned char sp1, sp2, sp3, sp4; /* Speed of plasma */ | 55 | static unsigned char sp1, sp2, sp3, sp4; /* Speed of plasma */ |
56 | static int plasma_frequency; | 56 | static int plasma_frequency; |
57 | 57 | ||
58 | /* FIXME: Could use plugin lib actions */ | ||
58 | /* Key assignement, all bitmapped models */ | 59 | /* Key assignement, all bitmapped models */ |
59 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 60 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
60 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 61 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
@@ -67,10 +68,12 @@ static int plasma_frequency; | |||
67 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 68 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
68 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 69 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
69 | 70 | ||
71 | /* FIXME: Clip/fuze should use HOME instead of POWER */ | ||
70 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 72 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
71 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 73 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
72 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 74 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
73 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 75 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ |
76 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
74 | #define PLASMA_QUIT BUTTON_POWER | 77 | #define PLASMA_QUIT BUTTON_POWER |
75 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 78 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
76 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 79 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
@@ -145,13 +148,15 @@ static int plasma_frequency; | |||
145 | #define PLASMA_RC_QUIT BUTTON_RC_STOP | 148 | #define PLASMA_RC_QUIT BUTTON_RC_STOP |
146 | #endif | 149 | #endif |
147 | 150 | ||
151 | /* FIXME: cleanup */ | ||
148 | #ifdef HAVE_LCD_COLOR | 152 | #ifdef HAVE_LCD_COLOR |
149 | #if CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 153 | #if CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
150 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | 154 | #define PLASMA_REGEN_COLORS BUTTON_PLAY |
151 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 155 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
152 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | 156 | #define PLASMA_REGEN_COLORS BUTTON_PLAY |
153 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 157 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
154 | (CONFIG_KEYPAD == SANSA_C200_PAD) | 158 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
159 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
155 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | 160 | #define PLASMA_REGEN_COLORS BUTTON_SELECT |
156 | #elif CONFIG_KEYPAD == IPOD_4G_PAD | 161 | #elif CONFIG_KEYPAD == IPOD_4G_PAD |
157 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | 162 | #define PLASMA_REGEN_COLORS BUTTON_SELECT |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index eeda405ae4..220bcf641c 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -103,8 +103,9 @@ PLUGIN_HEADER | |||
103 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN | 103 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN |
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) | ||
108 | #define PONG_QUIT BUTTON_POWER | 109 | #define PONG_QUIT BUTTON_POWER |
109 | #define PONG_PAUSE BUTTON_SELECT | 110 | #define PONG_PAUSE BUTTON_SELECT |
110 | #define PONG_LEFT_UP BUTTON_LEFT | 111 | #define PONG_LEFT_UP BUTTON_LEFT |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 2db10fed6a..50effc03a7 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -109,7 +109,8 @@ | |||
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) | ||
113 | #define REVERSI_BUTTON_QUIT BUTTON_POWER | 114 | #define REVERSI_BUTTON_QUIT BUTTON_POWER |
114 | #define REVERSI_BUTTON_UP BUTTON_UP | 115 | #define REVERSI_BUTTON_UP BUTTON_UP |
115 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | 116 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/robotfindskitten.c b/apps/plugins/robotfindskitten.c index d46a7380b0..b4021fe91c 100644 --- a/apps/plugins/robotfindskitten.c +++ b/apps/plugins/robotfindskitten.c | |||
@@ -483,6 +483,18 @@ static char* messages[] = | |||
483 | # define RFK_RUP (BUTTON_MENU | BUTTON_REPEAT) | 483 | # define RFK_RUP (BUTTON_MENU | BUTTON_REPEAT) |
484 | # define RFK_RDOWN (BUTTON_PLAY | BUTTON_REPEAT) | 484 | # define RFK_RDOWN (BUTTON_PLAY | BUTTON_REPEAT) |
485 | 485 | ||
486 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
487 | # undef __PLUGINLIB_ACTIONS_H__ | ||
488 | # define RFK_QUIT (BUTTON_SELECT | BUTTON_REPEAT) | ||
489 | # define RFK_RIGHT BUTTON_RIGHT | ||
490 | # define RFK_LEFT BUTTON_LEFT | ||
491 | # define RFK_UP BUTTON_UP | ||
492 | # define RFK_DOWN BUTTON_DOWN | ||
493 | # define RFK_RRIGHT (BUTTON_RIGHT | BUTTON_REPEAT) | ||
494 | # define RFK_RLEFT (BUTTON_LEFT | BUTTON_REPEAT) | ||
495 | # define RFK_RUP (BUTTON_UP | BUTTON_REPEAT) | ||
496 | # define RFK_RDOWN (BUTTON_DOWN | BUTTON_REPEAT) | ||
497 | |||
486 | #else | 498 | #else |
487 | # define RFK_QUIT PLA_QUIT | 499 | # define RFK_QUIT PLA_QUIT |
488 | # define RFK_RIGHT PLA_RIGHT | 500 | # define RFK_RIGHT PLA_RIGHT |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 6c403e76ed..89971c3153 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -41,6 +41,7 @@ PLUGIN_HEADER | |||
41 | #define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_PLAY) | 41 | #define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_PLAY) |
42 | #define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL) | 42 | #define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL) |
43 | 43 | ||
44 | /* FIXME: use HAVE_SCROLLWHEEL */ | ||
44 | #define SCROLL_WHEEL | 45 | #define SCROLL_WHEEL |
45 | 46 | ||
46 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 47 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
@@ -114,6 +115,7 @@ PLUGIN_HEADER | |||
114 | 115 | ||
115 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 116 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
116 | 117 | ||
118 | /* FIXME: No #define SCROLL_WHEEL here? */ | ||
117 | #define ROCKBLOX_OFF BUTTON_POWER | 119 | #define ROCKBLOX_OFF BUTTON_POWER |
118 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK | 120 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK |
119 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD | 121 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD |
@@ -123,6 +125,21 @@ PLUGIN_HEADER | |||
123 | #define ROCKBLOX_DROP BUTTON_SELECT | 125 | #define ROCKBLOX_DROP BUTTON_SELECT |
124 | #define ROCKBLOX_RESTART BUTTON_REC | 126 | #define ROCKBLOX_RESTART BUTTON_REC |
125 | 127 | ||
128 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
129 | |||
130 | /* FIXME: No #define SCROLL_WHEEL here? */ | ||
131 | #define ROCKBLOX_OFF BUTTON_POWER | ||
132 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK | ||
133 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD | ||
134 | #define ROCKBLOX_DOWN BUTTON_DOWN | ||
135 | #define ROCKBLOX_LEFT BUTTON_LEFT | ||
136 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | ||
137 | #define ROCKBLOX_DROP BUTTON_SELECT | ||
138 | /* FIXME: | ||
139 | #define ROCKBLOX_RESTART BUTTON_HOME */ | ||
140 | #define ROCKBLOX_RESTART BUTTON_SELECT|BUTTON_DOWN | ||
141 | |||
142 | |||
126 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 143 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
127 | 144 | ||
128 | #define ROCKBLOX_OFF BUTTON_POWER | 145 | #define ROCKBLOX_OFF BUTTON_POWER |
@@ -543,8 +560,8 @@ extern const fb_data rockblox_background[]; | |||
543 | % % % %%% - L has 4 orientations | 560 | % % % %%% - L has 4 orientations |
544 | %% %%% % % | 561 | %% %%% % % |
545 | 562 | ||
546 | % %%s | 563 | % %% |
547 | % % % %%% - J has 4 orientations | 564 | % % % %%% - J has 4 orientations |
548 | %% %%% % % | 565 | %% %%% % % |
549 | 566 | ||
550 | % % %%% | 567 | % % %%% |
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index 12f939a319..7c948e2d4f 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -24,6 +24,8 @@ | |||
24 | 24 | ||
25 | PLUGIN_HEADER | 25 | PLUGIN_HEADER |
26 | 26 | ||
27 | /* FIXME: Could use plugin lib action */ | ||
28 | |||
27 | #ifdef HAVE_LCD_BITMAP | 29 | #ifdef HAVE_LCD_BITMAP |
28 | 30 | ||
29 | #if CONFIG_KEYPAD == RECORDER_PAD | 31 | #if CONFIG_KEYPAD == RECORDER_PAD |
@@ -57,9 +59,11 @@ PLUGIN_HEADER | |||
57 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | 59 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT |
58 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | 60 | #define ONEDROCKBLOX_QUIT BUTTON_POWER |
59 | 61 | ||
60 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || CONFIG_KEYPAD == SANSA_C200_PAD || \ | 62 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ |
61 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | 63 | CONFIG_KEYPAD == SANSA_C200_PAD || \ |
62 | CONFIG_KEYPAD == SANSA_M200_PAD | 64 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ |
65 | CONFIG_KEYPAD == SANSA_M200_PAD || \ | ||
66 | CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
63 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | 67 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT |
64 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | 68 | #define ONEDROCKBLOX_QUIT BUTTON_POWER |
65 | 69 | ||
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 5244bf0b3d..6733bf8551 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -163,7 +163,17 @@ static void setoptions (void) | |||
163 | options.START=BUTTON_SCROLL_BACK; | 163 | options.START=BUTTON_SCROLL_BACK; |
164 | options.SELECT=BUTTON_SCROLL_FWD; | 164 | options.SELECT=BUTTON_SCROLL_FWD; |
165 | options.MENU=BUTTON_POWER; | 165 | options.MENU=BUTTON_POWER; |
166 | 166 | ||
167 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
168 | options.UP=BUTTON_UP; | ||
169 | options.DOWN=BUTTON_DOWN; | ||
170 | |||
171 | options.A=BUTTON_SELECT; | ||
172 | options.B=BUTTON_HOME; | ||
173 | options.START=BUTTON_SCROLL_BACK; | ||
174 | options.SELECT=BUTTON_SCROLL_FWD; | ||
175 | options.MENU=BUTTON_POWER; | ||
176 | |||
167 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 177 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
168 | options.UP=BUTTON_UP; | 178 | options.UP=BUTTON_UP; |
169 | options.DOWN=BUTTON_DOWN; | 179 | options.DOWN=BUTTON_DOWN; |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 40d19101fc..b66324c85b 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -95,6 +95,20 @@ PLUGIN_HEADER | |||
95 | #define ROCKPAINT_LEFT BUTTON_LEFT | 95 | #define ROCKPAINT_LEFT BUTTON_LEFT |
96 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | 96 | #define ROCKPAINT_RIGHT BUTTON_RIGHT |
97 | 97 | ||
98 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
99 | #define ROCKPAINT_QUIT BUTTON_POWER | ||
100 | #define ROCKPAINT_DRAW BUTTON_SELECT | ||
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 ) | ||
106 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_SELECT | BUTTON_RIGHT ) | ||
107 | #define ROCKPAINT_UP BUTTON_UP | ||
108 | #define ROCKPAINT_DOWN BUTTON_DOWN | ||
109 | #define ROCKPAINT_LEFT BUTTON_LEFT | ||
110 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | ||
111 | |||
98 | #elif ( CONFIG_KEYPAD == IRIVER_H10_PAD ) | 112 | #elif ( CONFIG_KEYPAD == IRIVER_H10_PAD ) |
99 | #define ROCKPAINT_QUIT BUTTON_POWER | 113 | #define ROCKPAINT_QUIT BUTTON_POWER |
100 | #define ROCKPAINT_DRAW BUTTON_FF | 114 | #define ROCKPAINT_DRAW BUTTON_FF |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 8a607c9272..7aa1ed36a8 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -103,6 +103,17 @@ PLUGIN_HEADER | |||
103 | #define PUZZLE_SHUFFLE BUTTON_REC | 103 | #define PUZZLE_SHUFFLE BUTTON_REC |
104 | #define PUZZLE_PICTURE BUTTON_SELECT | 104 | #define PUZZLE_PICTURE BUTTON_SELECT |
105 | 105 | ||
106 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
107 | #define PUZZLE_QUIT BUTTON_POWER | ||
108 | #define PUZZLE_LEFT BUTTON_LEFT | ||
109 | #define PUZZLE_RIGHT BUTTON_RIGHT | ||
110 | #define PUZZLE_UP BUTTON_UP | ||
111 | #define PUZZLE_DOWN BUTTON_DOWN | ||
112 | /* FIXME: | ||
113 | #define PUZZLE_SHUFFLE BUTTON_HOME */ | ||
114 | #define PUZZLE_SHUFFLE BUTTON_SELECT|BUTTON_DOWN | ||
115 | #define PUZZLE_PICTURE BUTTON_SELECT | ||
116 | |||
106 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) | 117 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) |
107 | #define PUZZLE_QUIT BUTTON_POWER | 118 | #define PUZZLE_QUIT BUTTON_POWER |
108 | #define PUZZLE_LEFT BUTTON_LEFT | 119 | #define PUZZLE_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index b2a592883c..56e8c7854b 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -100,9 +100,10 @@ PLUGIN_HEADER | |||
100 | #define SNAKE_PLAYPAUSE BUTTON_SELECT | 100 | #define SNAKE_PLAYPAUSE BUTTON_SELECT |
101 | 101 | ||
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) | ||
106 | #define SNAKE_QUIT BUTTON_POWER | 107 | #define SNAKE_QUIT BUTTON_POWER |
107 | #define SNAKE_LEFT BUTTON_LEFT | 108 | #define SNAKE_LEFT BUTTON_LEFT |
108 | #define SNAKE_RIGHT BUTTON_RIGHT | 109 | #define SNAKE_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 061fdb2a5d..5b470f5f82 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -249,6 +249,20 @@ PLUGIN_HEADER | |||
249 | #define SNAKE2_PLAYPAUSE BUTTON_SELECT | 249 | #define SNAKE2_PLAYPAUSE BUTTON_SELECT |
250 | #define SNAKE2_PLAYPAUSE_TEXT "Select" | 250 | #define SNAKE2_PLAYPAUSE_TEXT "Select" |
251 | 251 | ||
252 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
253 | #define SNAKE2_LEFT BUTTON_LEFT | ||
254 | #define SNAKE2_RIGHT BUTTON_RIGHT | ||
255 | #define SNAKE2_UP BUTTON_UP | ||
256 | #define SNAKE2_DOWN BUTTON_DOWN | ||
257 | #define SNAKE2_QUIT BUTTON_POWER | ||
258 | #define SNAKE2_LEVEL_UP BUTTON_UP | ||
259 | #define SNAKE2_LEVEL_DOWN BUTTON_DOWN | ||
260 | #define SNAKE2_MAZE_NEXT BUTTON_RIGHT | ||
261 | #define SNAKE2_MAZE_LAST BUTTON_LEFT | ||
262 | #define SNAKE2_SELECT_TYPE BUTTON_SELECT|BUTTON_REL | ||
263 | #define SNAKE2_PLAYPAUSE BUTTON_SELECT|BUTTON_REPEAT | ||
264 | #define SNAKE2_PLAYPAUSE_TEXT "Hold Select" | ||
265 | |||
252 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 266 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
253 | #define SNAKE2_LEFT BUTTON_LEFT | 267 | #define SNAKE2_LEFT BUTTON_LEFT |
254 | #define SNAKE2_RIGHT BUTTON_RIGHT | 268 | #define SNAKE2_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index c73fd2e58b..8e3d712f8f 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -35,6 +35,7 @@ PLUGIN_HEADER | |||
35 | #define MYLCD(fn) pgfx_ ## fn | 35 | #define MYLCD(fn) pgfx_ ## fn |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | /* FIXME: Could use pluginlib actions, or at least cleaned up */ | ||
38 | /* variable button definitions */ | 39 | /* variable button definitions */ |
39 | #if CONFIG_KEYPAD == PLAYER_PAD | 40 | #if CONFIG_KEYPAD == PLAYER_PAD |
40 | #define SNOW_QUIT BUTTON_STOP | 41 | #define SNOW_QUIT BUTTON_STOP |
@@ -53,6 +54,8 @@ PLUGIN_HEADER | |||
53 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 54 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
54 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 55 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
55 | #define SNOW_QUIT BUTTON_POWER | 56 | #define SNOW_QUIT BUTTON_POWER |
57 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
58 | #define SNOW_QUIT BUTTON_DOWN | ||
56 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 59 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
57 | #define SNOW_QUIT BUTTON_POWER | 60 | #define SNOW_QUIT BUTTON_POWER |
58 | #elif CONFIG_KEYPAD == MROBE500_PAD | 61 | #elif CONFIG_KEYPAD == MROBE500_PAD |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 4d2de8aedb..98faf7961f 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -220,6 +220,22 @@ PLUGIN_HEADER | |||
220 | #define BUTTON_SAVE BUTTON_SELECT | 220 | #define BUTTON_SAVE BUTTON_SELECT |
221 | #define BUTTON_SAVE_NAME "SELECT" | 221 | #define BUTTON_SAVE_NAME "SELECT" |
222 | 222 | ||
223 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
224 | #define SOKOBAN_LEFT BUTTON_LEFT | ||
225 | #define SOKOBAN_RIGHT BUTTON_RIGHT | ||
226 | #define SOKOBAN_UP BUTTON_UP | ||
227 | #define SOKOBAN_DOWN BUTTON_DOWN | ||
228 | #define SOKOBAN_MENU BUTTON_POWER | ||
229 | #define SOKOBAN_UNDO_PRE BUTTON_SELECT | ||
230 | #define SOKOBAN_UNDO (BUTTON_SELECT | BUTTON_REL) | ||
231 | #define SOKOBAN_REDO (BUTTON_SELECT | BUTTON_LEFT) | ||
232 | #define SOKOBAN_LEVEL_DOWN (BUTTON_SELECT | BUTTON_DOWN) | ||
233 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_RIGHT) | ||
234 | #define SOKOBAN_LEVEL_UP (BUTTON_SELECT | BUTTON_UP) | ||
235 | #define SOKOBAN_PAUSE BUTTON_SELECT | ||
236 | #define BUTTON_SAVE BUTTON_SELECT | ||
237 | #define BUTTON_SAVE_NAME "SELECT" | ||
238 | |||
223 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 239 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
224 | #define SOKOBAN_LEFT BUTTON_LEFT | 240 | #define SOKOBAN_LEFT BUTTON_LEFT |
225 | #define SOKOBAN_RIGHT BUTTON_RIGHT | 241 | #define SOKOBAN_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 1526cecd47..3a11d02bda 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -201,6 +201,28 @@ static const struct plugin_api* rb; | |||
201 | # define HK_CUR2STACK "DOUBLE SELECT" | 201 | # define HK_CUR2STACK "DOUBLE SELECT" |
202 | # define HK_REM2STACK "RIGHT" | 202 | # define HK_REM2STACK "RIGHT" |
203 | 203 | ||
204 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
205 | # define SOL_QUIT BUTTON_POWER | ||
206 | # define SOL_UP BUTTON_UP | ||
207 | # define SOL_DOWN BUTTON_DOWN | ||
208 | # define SOL_LEFT BUTTON_SCROLL_BACK | ||
209 | # define SOL_RIGHT BUTTON_SCROLL_FWD | ||
210 | # define SOL_MOVE (BUTTON_SELECT|BUTTON_REL) | ||
211 | # define SOL_DRAW (BUTTON_SELECT|BUTTON_UP) | ||
212 | # define SOL_REM2CUR BUTTON_LEFT | ||
213 | /* FIXME: | ||
214 | # define SOL_CUR2STACK_PRE BUTTON_HOME | ||
215 | # define SOL_CUR2STACK (BUTTON_HOME | BUTTON_RIGHT) */ | ||
216 | # define SOL_CUR2STACK_PRE (BUTTON_RIGHT | BUTTON_REPEAT) | ||
217 | # define SOL_CUR2STACK BUTTON_RIGHT | ||
218 | # define SOL_REM2STACK (BUTTON_LEFT|BUTTON_REPEAT) | ||
219 | # define SOL_REM2STACK_PRE BUTTON_LEFT | ||
220 | # define HK_MOVE "SELECT" | ||
221 | # define HK_DRAW "REC" | ||
222 | # define HK_REM2CUR "LEFT" | ||
223 | # define HK_CUR2STACK "DOUBLE SELECT" | ||
224 | # define HK_REM2STACK "RIGHT" | ||
225 | |||
204 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 226 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
205 | # define SOL_QUIT BUTTON_POWER | 227 | # define SOL_QUIT BUTTON_POWER |
206 | # define SOL_UP BUTTON_UP | 228 | # define SOL_UP BUTTON_UP |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 2b22bb491e..6c2496a781 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -135,6 +135,19 @@ static const struct plugin_api* rb; /* global api struct pointer */ | |||
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 | ||
138 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
139 | #define AST_PAUSE BUTTON_HOME | ||
140 | #define AST_QUIT BUTTON_POWER | ||
141 | #define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT) | ||
142 | #define AST_THRUST BUTTON_UP | ||
143 | #define AST_HYPERSPACE BUTTON_DOWN | ||
144 | #define AST_LEFT BUTTON_SCROLL_BACK | ||
145 | #define AST_LEFT_REP (BUTTON_SCROLL_BACK | BUTTON_REPEAT) | ||
146 | #define AST_RIGHT BUTTON_SCROLL_FWD | ||
147 | #define AST_RIGHT_REP (BUTTON_SCROLL_FWD | BUTTON_REPEAT) | ||
148 | #define AST_FIRE BUTTON_SELECT | ||
149 | #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) | ||
150 | |||
138 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 151 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
139 | #define AST_PAUSE BUTTON_REC | 152 | #define AST_PAUSE BUTTON_REC |
140 | #define AST_QUIT BUTTON_POWER | 153 | #define AST_QUIT BUTTON_POWER |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index c217fb922f..2c4be27c34 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -163,18 +163,19 @@ PLUGIN_HEADER | |||
163 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 163 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
164 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 164 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
165 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 165 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
166 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 166 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ |
167 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
167 | 168 | ||
168 | #define STAR_QUIT BUTTON_POWER | 169 | #define STAR_QUIT BUTTON_POWER |
169 | #define STAR_LEFT BUTTON_LEFT | 170 | #define STAR_LEFT BUTTON_LEFT |
170 | #define STAR_RIGHT BUTTON_RIGHT | 171 | #define STAR_RIGHT BUTTON_RIGHT |
171 | #define STAR_UP BUTTON_UP | 172 | #define STAR_UP BUTTON_UP |
172 | #define STAR_DOWN BUTTON_DOWN | 173 | #define STAR_DOWN BUTTON_DOWN |
173 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT | 174 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT |
174 | #define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) | 175 | #define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) |
175 | #define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) | 176 | #define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) |
176 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_DOWN) | 177 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_DOWN) |
177 | #define STAR_MENU_RUN BUTTON_SELECT | 178 | #define STAR_MENU_RUN BUTTON_SELECT |
178 | 179 | ||
179 | 180 | ||
180 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 181 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 6fe01d5509..7f39d5121b 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -62,7 +62,8 @@ static const struct plugin_api* rb; /* global api struct pointer */ | |||
62 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 62 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
63 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 63 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
64 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 64 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
65 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 65 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ |
66 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
66 | #define STARFIELD_QUIT BUTTON_POWER | 67 | #define STARFIELD_QUIT BUTTON_POWER |
67 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP | 68 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP |
68 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN | 69 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 18cd30465e..ff47389e5d 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -27,6 +27,7 @@ static int files, dirs, musicfiles, largestdir; | |||
27 | static int lasttick; | 27 | static int lasttick; |
28 | static bool abort; | 28 | static bool abort; |
29 | 29 | ||
30 | /* FIXME: Could use plugin lib actions or be cleaned up */ | ||
30 | #if CONFIG_KEYPAD == PLAYER_PAD | 31 | #if CONFIG_KEYPAD == PLAYER_PAD |
31 | #define STATS_STOP BUTTON_STOP | 32 | #define STATS_STOP BUTTON_STOP |
32 | 33 | ||
@@ -61,6 +62,11 @@ static bool abort; | |||
61 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 62 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
62 | #define STATS_STOP BUTTON_POWER | 63 | #define STATS_STOP BUTTON_POWER |
63 | 64 | ||
65 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
66 | /* FIXME: | ||
67 | #define STATS_STOP BUTTON_HOME */ | ||
68 | #define STATS_STOP BUTTON_DOWN | ||
69 | |||
64 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 70 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
65 | #define STATS_STOP BUTTON_POWER | 71 | #define STATS_STOP BUTTON_POWER |
66 | 72 | ||
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index debdd5b8b2..d53937acb2 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -32,6 +32,7 @@ PLUGIN_HEADER | |||
32 | #define LAP_Y TIMER_Y+1 | 32 | #define LAP_Y TIMER_Y+1 |
33 | #define MAX_LAPS 64 | 33 | #define MAX_LAPS 64 |
34 | 34 | ||
35 | /* FIXME: Use PLUGIN_APPS_DIR */ | ||
35 | #define STOPWATCH_FILE ROCKBOX_DIR "/apps/stopwatch.dat" | 36 | #define STOPWATCH_FILE ROCKBOX_DIR "/apps/stopwatch.dat" |
36 | 37 | ||
37 | /* variable button definitions */ | 38 | /* variable button definitions */ |
@@ -105,6 +106,7 @@ PLUGIN_HEADER | |||
105 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 106 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
106 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 107 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
107 | 108 | ||
109 | /* FIXME: e200 could use scrollwheel */ | ||
108 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 110 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
109 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 111 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
110 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 112 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
@@ -116,6 +118,15 @@ PLUGIN_HEADER | |||
116 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 118 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
117 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 119 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
118 | 120 | ||
121 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
122 | #define STOPWATCH_QUIT BUTTON_POWER | ||
123 | #define STOPWATCH_START_STOP BUTTON_RIGHT | ||
124 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT | ||
125 | #define STOPWATCH_LAP_TIMER BUTTON_SELECT | ||
126 | /* FIXME: ipods scroll other way around, investigate */ | ||
127 | #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_BACK | ||
128 | #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_FWD | ||
129 | |||
119 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 130 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
120 | #define STOPWATCH_QUIT BUTTON_POWER | 131 | #define STOPWATCH_QUIT BUTTON_POWER |
121 | #define STOPWATCH_START_STOP BUTTON_PLAY | 132 | #define STOPWATCH_START_STOP BUTTON_PLAY |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 1cc996d172..2b3e18f401 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -134,6 +134,17 @@ | |||
134 | #define SUDOKU_BUTTON_MENU BUTTON_SELECT | 134 | #define SUDOKU_BUTTON_MENU BUTTON_SELECT |
135 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC | 135 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC |
136 | 136 | ||
137 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
138 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | ||
139 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
140 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
141 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | ||
142 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | ||
143 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_BACK | ||
144 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_FWD | ||
145 | #define SUDOKU_BUTTON_MENU BUTTON_SELECT | ||
146 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_HOME | ||
147 | |||
137 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 148 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
138 | #define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER | 149 | #define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER |
139 | #define SUDOKU_BUTTON_QUIT (BUTTON_POWER | BUTTON_REPEAT) | 150 | #define SUDOKU_BUTTON_QUIT (BUTTON_POWER | BUTTON_REPEAT) |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index c9ad603d8b..652b474336 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -113,7 +113,8 @@ 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 | ||
117 | #define SUPERDOM_OK BUTTON_SELECT | 118 | #define SUPERDOM_OK BUTTON_SELECT |
118 | #define SUPERDOM_UP BUTTON_SCROLL_BACK | 119 | #define SUPERDOM_UP BUTTON_SCROLL_BACK |
119 | #define SUPERDOM_DOWN BUTTON_SCROLL_FWD | 120 | #define SUPERDOM_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c index 0c291261db..e869d3be12 100644 --- a/apps/plugins/test_scanrate.c +++ b/apps/plugins/test_scanrate.c | |||
@@ -35,7 +35,8 @@ PLUGIN_HEADER | |||
35 | 35 | ||
36 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ | 36 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ |
37 | || (CONFIG_KEYPAD == MROBE100_PAD) \ | 37 | || (CONFIG_KEYPAD == MROBE100_PAD) \ |
38 | || (CONFIG_KEYPAD == SANSA_CLIP_PAD) | 38 | || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \ |
39 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
39 | #define SCANRATE_DONE BUTTON_POWER | 40 | #define SCANRATE_DONE BUTTON_POWER |
40 | #define SCANRATE_FASTINC BUTTON_UP | 41 | #define SCANRATE_FASTINC BUTTON_UP |
41 | #define SCANRATE_FASTDEC BUTTON_DOWN | 42 | #define SCANRATE_FASTDEC BUTTON_DOWN |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 625ab93cc4..9a4b25bffd 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -185,6 +185,18 @@ PLUGIN_HEADER | |||
185 | #define VIEWER_LINE_UP BUTTON_SCROLL_BACK | 185 | #define VIEWER_LINE_UP BUTTON_SCROLL_BACK |
186 | #define VIEWER_LINE_DOWN BUTTON_SCROLL_FWD | 186 | #define VIEWER_LINE_DOWN BUTTON_SCROLL_FWD |
187 | 187 | ||
188 | /* Sansa Fuze keys */ | ||
189 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
190 | #define VIEWER_QUIT BUTTON_POWER | ||
191 | #define VIEWER_PAGE_UP BUTTON_UP | ||
192 | #define VIEWER_PAGE_DOWN BUTTON_DOWN | ||
193 | #define VIEWER_SCREEN_LEFT BUTTON_LEFT | ||
194 | #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT | ||
195 | #define VIEWER_MENU BUTTON_SELECT|BUTTON_REPEAT | ||
196 | #define VIEWER_AUTOSCROLL BUTTON_SELECT|BUTTON_DOWN | ||
197 | #define VIEWER_LINE_UP BUTTON_SCROLL_BACK | ||
198 | #define VIEWER_LINE_DOWN BUTTON_SCROLL_FWD | ||
199 | |||
188 | /* Sansa C200 keys */ | 200 | /* Sansa C200 keys */ |
189 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 201 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
190 | #define VIEWER_QUIT BUTTON_POWER | 202 | #define VIEWER_QUIT BUTTON_POWER |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 7b29589428..bedf0ddc35 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -124,6 +124,21 @@ PLUGIN_HEADER | |||
124 | #define LABEL_MENU "SELECT" | 124 | #define LABEL_MENU "SELECT" |
125 | #define LABEL_VOLUME "Wheel" | 125 | #define LABEL_VOLUME "Wheel" |
126 | 126 | ||
127 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
128 | /* FIXME: | ||
129 | #define VUMETER_QUIT BUTTON_HOME */ | ||
130 | #define VUMETER_QUIT BUTTON_DOWN | ||
131 | #define VUMETER_HELP BUTTON_SELECT|BUTTON_REPEAT | ||
132 | #define VUMETER_MENU BUTTON_SELECT|BUTTON_REL | ||
133 | #define VUMETER_MENU_EXIT BUTTON_SELECT | ||
134 | #define VUMETER_MENU_EXIT2 BUTTON_DOWN | ||
135 | #define VUMETER_UP BUTTON_SCROLL_FWD | ||
136 | #define VUMETER_DOWN BUTTON_SCROLL_BACK | ||
137 | #define LABEL_HELP "Hold Select" | ||
138 | #define LABEL_QUIT "Down" | ||
139 | #define LABEL_MENU "Select" | ||
140 | #define LABEL_VOLUME "Scrollwheel" | ||
141 | |||
127 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 142 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
128 | #define VUMETER_QUIT BUTTON_POWER | 143 | #define VUMETER_QUIT BUTTON_POWER |
129 | #define VUMETER_HELP BUTTON_REC | 144 | #define VUMETER_HELP BUTTON_REC |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 6c44bb486d..42b93c2f2e 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -165,7 +165,8 @@ PLUGIN_HEADER | |||
165 | #define WORMS_TEXT "Left/Right" | 165 | #define WORMS_TEXT "Left/Right" |
166 | 166 | ||
167 | 167 | ||
168 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) | 168 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
169 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
169 | 170 | ||
170 | #define BTN_DIR_UP BUTTON_UP | 171 | #define BTN_DIR_UP BUTTON_UP |
171 | #define BTN_DIR_DOWN BUTTON_DOWN | 172 | #define BTN_DIR_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index dc102b61f5..3cf66637d1 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -87,7 +87,8 @@ PLUGIN_HEADER | |||
87 | #define PAUSE BUTTON_REC | 87 | #define PAUSE BUTTON_REC |
88 | 88 | ||
89 | 89 | ||
90 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) | 90 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
91 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
91 | 92 | ||
92 | #define QUIT BUTTON_POWER | 93 | #define QUIT BUTTON_POWER |
93 | #define LEFT BUTTON_LEFT | 94 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 4d2b4a9384..9262c856cd 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -87,9 +87,10 @@ | |||
87 | #define ZX_DOWN BUTTON_SCROLL_DOWN | 87 | #define ZX_DOWN BUTTON_SCROLL_DOWN |
88 | 88 | ||
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) | ||
93 | #define ZX_SELECT BUTTON_SELECT | 94 | #define ZX_SELECT BUTTON_SELECT |
94 | #define ZX_MENU BUTTON_POWER | 95 | #define ZX_MENU BUTTON_POWER |
95 | #define ZX_LEFT BUTTON_LEFT | 96 | #define ZX_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 36f1d519d9..253ab63655 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -114,6 +114,7 @@ | |||
114 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 114 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
115 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 115 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
116 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ | 116 | (CONFIG_KEYPAD == SANSA_M200_PAD) || \ |
117 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) || \ | ||
117 | (CONFIG_KEYPAD == MROBE100_PAD) | 118 | (CONFIG_KEYPAD == MROBE100_PAD) |
118 | 119 | ||
119 | /* TODO: Check keyboard mappings */ | 120 | /* TODO: Check keyboard mappings */ |