diff options
author | Vitja Makarov <vitja.makarov@gmail.com> | 2008-10-07 16:38:28 +0000 |
---|---|---|
committer | Vitja Makarov <vitja.makarov@gmail.com> | 2008-10-07 16:38:28 +0000 |
commit | 2f84f699c0df4a82dfdcb2244e1c7bf4af99fc72 (patch) | |
tree | 179ebbbea6f2f234850e42b668813852d10817cb | |
parent | 981bd1cb3e65fdf86db03d9328232e58cf14ff1e (diff) | |
download | rockbox-2f84f699c0df4a82dfdcb2244e1c7bf4af99fc72.tar.gz rockbox-2f84f699c0df4a82dfdcb2244e1c7bf4af99fc72.zip |
IAUDIO67_PAD: Add keymaps for most of the plugins, they are not all tested yet.
IAUDIO7: Define MODEL_NAME in config
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18730 a1c6a512-1295-4272-9138-f99709370657
34 files changed, 252 insertions, 0 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index a5c4277528..0a91d94619 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -261,6 +261,19 @@ PLUGIN_HEADER | |||
261 | #define CALCULATOR_QUIT BUTTON_POWER | 261 | #define CALCULATOR_QUIT BUTTON_POWER |
262 | #define CALCULATOR_CLEAR BUTTON_MENU | 262 | #define CALCULATOR_CLEAR BUTTON_MENU |
263 | 263 | ||
264 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
265 | |||
266 | #define CALCULATOR_LEFT BUTTON_LEFT | ||
267 | #define CALCULATOR_RIGHT BUTTON_RIGHT | ||
268 | #define CALCULATOR_UP BUTTON_VOLUP | ||
269 | #define CALCULATOR_DOWN BUTTON_VOLDOWN | ||
270 | #define CALCULATOR_QUIT BUTTON_POWER | ||
271 | #define CALCULATOR_INPUT BUTTON_PLAY | ||
272 | #define CALCULATOR_CALC BUTTON_MENU | ||
273 | #define CALCULATOR_CLEAR BUTTON_STOP | ||
274 | |||
275 | #define CALCULATOR_RC_QUIT (BUTTON_MENU|BUTTON_PLAY) | ||
276 | |||
264 | #else | 277 | #else |
265 | #error No keymap defined! | 278 | #error No keymap defined! |
266 | #endif | 279 | #endif |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index b4d2ed0547..3acb5f3ccf 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -190,6 +190,17 @@ PLUGIN_HEADER | |||
190 | #define CHC_SETTINGS_DEC BUTTON_MINUS | 190 | #define CHC_SETTINGS_DEC BUTTON_MINUS |
191 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | 191 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
192 | 192 | ||
193 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
194 | #define CHC_QUIT BUTTON_POWER | ||
195 | #define CHC_STARTSTOP BUTTON_PLAY | ||
196 | #define CHC_RESET BUTTON_LEFT | ||
197 | #define CHC_MENU BUTTON_MENU | ||
198 | #define CHC_SETTINGS_INC BUTTON_VOLUP | ||
199 | #define CHC_SETTINGS_DEC BUTTON_VOLDOWN | ||
200 | #define CHC_SETTINGS_OK BUTTON_PLAY | ||
201 | #define CHC_SETTINGS_OK2 BUTTON_LEFT | ||
202 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | ||
203 | |||
193 | #else | 204 | #else |
194 | #error No keymap defined! | 205 | #error No keymap defined! |
195 | #endif | 206 | #endif |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index c61d012898..132977753a 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -108,6 +108,12 @@ Still To do: | |||
108 | #elif CONFIG_KEYPAD == COWOND2_PAD | 108 | #elif CONFIG_KEYPAD == COWOND2_PAD |
109 | #define QUIT BUTTON_POWER | 109 | #define QUIT BUTTON_POWER |
110 | 110 | ||
111 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
112 | #define QUIT BUTTON_POWER | ||
113 | #define ACTION BUTTON_PLAY | ||
114 | #define ACTION2 BUTTON_STOP | ||
115 | #define ACTIONTEXT "PLAY" | ||
116 | |||
111 | #else | 117 | #else |
112 | #error No keymap defined! | 118 | #error No keymap defined! |
113 | #endif | 119 | #endif |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 37c74f6ff3..8be304e808 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -205,6 +205,16 @@ PLUGIN_HEADER | |||
205 | #elif CONFIG_KEYPAD == COWOND2_PAD | 205 | #elif CONFIG_KEYPAD == COWOND2_PAD |
206 | #define CUBE_QUIT BUTTON_POWER | 206 | #define CUBE_QUIT BUTTON_POWER |
207 | 207 | ||
208 | #elif (CONFIG_KEYPAD == IAUDIO67_PAD) | ||
209 | #define CUBE_QUIT BUTTON_POWER | ||
210 | #define CUBE_NEXT BUTTON_RIGHT | ||
211 | #define CUBE_PREV BUTTON_LEFT | ||
212 | #define CUBE_INC BUTTON_VOLUP | ||
213 | #define CUBE_DEC BUTTON_VOLDOWN | ||
214 | #define CUBE_MODE BUTTON_MENU | ||
215 | #define CUBE_PAUSE BUTTON_PLAY | ||
216 | #define CUBE_HIGHSPEED BUTTON_STOP | ||
217 | |||
208 | #else | 218 | #else |
209 | #error No keymap defined! | 219 | #error No keymap defined! |
210 | #endif | 220 | #endif |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index db121f7510..0f75463946 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -132,6 +132,8 @@ long reverse (long N) { | |||
132 | #define LP_QUIT BUTTON_RC_REC | 132 | #define LP_QUIT BUTTON_RC_REC |
133 | #elif CONFIG_KEYPAD == COWOND2_PAD | 133 | #elif CONFIG_KEYPAD == COWOND2_PAD |
134 | #define LP_QUIT BUTTON_POWER | 134 | #define LP_QUIT BUTTON_POWER |
135 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
136 | #define LP_QUIT BUTTON_POWER | ||
135 | #else | 137 | #else |
136 | #define LP_QUIT BUTTON_OFF | 138 | #define LP_QUIT BUTTON_OFF |
137 | #endif | 139 | #endif |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 43cd04a985..e79f0ff377 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -73,6 +73,9 @@ static const struct plugin_api* rb; | |||
73 | #define BTN_FIRE BUTTON_RC_PLAY | 73 | #define BTN_FIRE BUTTON_RC_PLAY |
74 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 74 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
75 | #define BTN_MENU (BUTTON_MENU|BUTTON_REL) | 75 | #define BTN_MENU (BUTTON_MENU|BUTTON_REL) |
76 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
77 | #define BTN_MENU BUTTON_MENU | ||
78 | #define BTN_FIRE BUTTON_PLAY | ||
76 | #else | 79 | #else |
77 | #error No keymap defined! | 80 | #error No keymap defined! |
78 | #endif | 81 | #endif |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index a46580ad95..0f8b92d9b3 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -120,6 +120,13 @@ PLUGIN_HEADER | |||
120 | 120 | ||
121 | #define QUIT BUTTON_POWER | 121 | #define QUIT BUTTON_POWER |
122 | 122 | ||
123 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
124 | |||
125 | #define QUIT BUTTON_POWER | ||
126 | #define LEFT BUTTON_LEFT | ||
127 | #define RIGHT BUTTON_RIGHT | ||
128 | #define FIRE BUTTON_PLAY | ||
129 | |||
123 | #else | 130 | #else |
124 | #error INVADROX: Unsupported keypad | 131 | #error INVADROX: Unsupported keypad |
125 | #endif | 132 | #endif |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 6f547fdf39..075edfda33 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -153,6 +153,14 @@ PLUGIN_HEADER | |||
153 | #elif CONFIG_KEYPAD == COWOND2_PAD | 153 | #elif CONFIG_KEYPAD == COWOND2_PAD |
154 | #define JEWELS_CANCEL BUTTON_POWER | 154 | #define JEWELS_CANCEL BUTTON_POWER |
155 | 155 | ||
156 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
157 | #define JEWELS_UP BUTTON_STOP | ||
158 | #define JEWELS_DOWN BUTTON_PLAY | ||
159 | #define JEWELS_LEFT BUTTON_LEFT | ||
160 | #define JEWELS_RIGHT BUTTON_RIGHT | ||
161 | #define JEWELS_SELECT BUTTON_MENU | ||
162 | #define JEWELS_CANCEL BUTTON_POWER | ||
163 | |||
156 | #else | 164 | #else |
157 | #error No keymap defined! | 165 | #error No keymap defined! |
158 | #endif | 166 | #endif |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 142e982d0b..b43dee5d74 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -214,6 +214,17 @@ PLUGIN_HEADER | |||
214 | 214 | ||
215 | #elif CONFIG_KEYPAD == COWOND2_PAD | 215 | #elif CONFIG_KEYPAD == COWOND2_PAD |
216 | 216 | ||
217 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
218 | #define JPEG_ZOOM_IN BUTTON_VOLUP | ||
219 | #define JPEG_ZOOM_OUT BUTTON_VOLDOWN | ||
220 | #define JPEG_UP BUTTON_STOP | ||
221 | #define JPEG_DOWN BUTTON_PLAY | ||
222 | #define JPEG_LEFT BUTTON_LEFT | ||
223 | #define JPEG_RIGHT BUTTON_RIGHT | ||
224 | #define JPEG_MENU BUTTON_MENU | ||
225 | #define JPEG_NEXT (BUTTON_PLAY|BUTTON_VOLUP) | ||
226 | #define JPEG_PREVIOUS (BUTTON_PLAY|BUTTON_VOLDOWN) | ||
227 | |||
217 | #else | 228 | #else |
218 | #error No keymap defined! | 229 | #error No keymap defined! |
219 | #endif | 230 | #endif |
diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c index a938d7a7f2..94f48eae30 100644 --- a/apps/plugins/lamp.c +++ b/apps/plugins/lamp.c | |||
@@ -74,6 +74,10 @@ PLUGIN_HEADER | |||
74 | 74 | ||
75 | #elif CONFIG_KEYPAD == COWOND2_PAD | 75 | #elif CONFIG_KEYPAD == COWOND2_PAD |
76 | 76 | ||
77 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
78 | # define LAMP_LEFT BUTTON_LEFT | ||
79 | # define LAMP_RIGHT BUTTON_RIGHT | ||
80 | |||
77 | #else | 81 | #else |
78 | # error Missing key definitions for this keypad | 82 | # error Missing key definitions for this keypad |
79 | #endif | 83 | #endif |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 779ce8845d..4d4263ee79 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -141,6 +141,13 @@ const unsigned char rockbox16x7[] = { | |||
141 | #elif CONFIG_KEYPAD == COWOND2_PAD | 141 | #elif CONFIG_KEYPAD == COWOND2_PAD |
142 | #define LP_QUIT BUTTON_POWER | 142 | #define LP_QUIT BUTTON_POWER |
143 | 143 | ||
144 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
145 | #define LP_QUIT BUTTON_POWER | ||
146 | #define LP_DEC_X BUTTON_LEFT | ||
147 | #define LP_INC_X BUTTON_RIGHT | ||
148 | #define LP_DEC_Y BUTTON_PLAY | ||
149 | #define LP_INC_Y BUTTON_STOP | ||
150 | |||
144 | #else | 151 | #else |
145 | #define LP_QUIT BUTTON_OFF | 152 | #define LP_QUIT BUTTON_OFF |
146 | #define LP_DEC_X BUTTON_LEFT | 153 | #define LP_DEC_X BUTTON_LEFT |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index fe54b2938a..93565596dd 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -99,6 +99,11 @@ extern const fb_data matrix_normal[]; | |||
99 | #define MATRIX_PAUSE BUTTON_RC_PLAY | 99 | #define MATRIX_PAUSE BUTTON_RC_PLAY |
100 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 100 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
101 | #define MATRIX_EXIT BUTTON_POWER | 101 | #define MATRIX_EXIT BUTTON_POWER |
102 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
103 | #define MATRIX_EXIT BUTTON_POWER | ||
104 | #define MATRIX_SLEEP_MORE BUTTON_VOLUP | ||
105 | #define MATRIX_SLEEP_LESS BUTTON_VOLDOWN | ||
106 | #define MATRIX_PAUSE BUTTON_PLAY | ||
102 | #else | 107 | #else |
103 | #error Unsupported keypad | 108 | #error Unsupported keypad |
104 | #endif | 109 | #endif |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index d76e0382ad..55dc4d6849 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -149,6 +149,13 @@ PLUGIN_IRAM_DECLARE | |||
149 | #elif CONFIG_KEYPAD == COWOND2_PAD | 149 | #elif CONFIG_KEYPAD == COWOND2_PAD |
150 | #define BTN_QUIT BUTTON_POWER | 150 | #define BTN_QUIT BUTTON_POWER |
151 | 151 | ||
152 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
153 | #define BTN_QUIT BUTTON_POWER | ||
154 | #define BTN_RIGHT BUTTON_RIGHT | ||
155 | #define BTN_LEFT BUTTON_LEFT | ||
156 | #define BTN_UP BUTTON_STOP | ||
157 | #define BTN_DOWN BUTTON_PLAY | ||
158 | #define BTN_PLAY BUTTON_MENU | ||
152 | 159 | ||
153 | #else | 160 | #else |
154 | #error No keymap defined! | 161 | #error No keymap defined! |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index b750efb6b3..90ffa37e07 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -127,6 +127,11 @@ PLUGIN_HEADER | |||
127 | #elif CONFIG_KEYPAD == COWOND2_PAD | 127 | #elif CONFIG_KEYPAD == COWOND2_PAD |
128 | #define MOSAIQUE_QUIT BUTTON_POWER | 128 | #define MOSAIQUE_QUIT BUTTON_POWER |
129 | 129 | ||
130 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
131 | #define MOSAIQUE_QUIT BUTTON_POWER | ||
132 | #define MOSAIQUE_SPEED BUTTON_PLAY | ||
133 | #define MOSAIQUE_RESTART BUTTON_MENU | ||
134 | |||
130 | #else | 135 | #else |
131 | #error No keymap defined! | 136 | #error No keymap defined! |
132 | #endif | 137 | #endif |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 7b799d2ef8..e04d3d0357 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2457,6 +2457,11 @@ void get_mp3_filename(const char *wav_name) | |||
2457 | #define MP3ENC_SELECT BUTTON_RC_FF | 2457 | #define MP3ENC_SELECT BUTTON_RC_FF |
2458 | #elif CONFIG_KEYPAD == COWOND2_PAD | 2458 | #elif CONFIG_KEYPAD == COWOND2_PAD |
2459 | #define MP3ENC_DONE BUTTON_POWER | 2459 | #define MP3ENC_DONE BUTTON_POWER |
2460 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
2461 | #define MP3ENC_PREV BUTTON_LEFT | ||
2462 | #define MP3ENC_NEXT BUTTON_RIGHT | ||
2463 | #define MP3ENC_DONE BUTTON_POWER | ||
2464 | #define MP3ENC_SELECT BUTTON_PLAY | ||
2460 | #else | 2465 | #else |
2461 | #error No keymap defined! | 2466 | #error No keymap defined! |
2462 | #endif | 2467 | #endif |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index e53b37f810..519fd0f059 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -124,6 +124,14 @@ struct mpeg_settings settings; | |||
124 | #elif CONFIG_KEYPAD == COWOND2_PAD | 124 | #elif CONFIG_KEYPAD == COWOND2_PAD |
125 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 125 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
126 | 126 | ||
127 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
128 | #define MPEG_START_TIME_SELECT BUTTON_MENU | ||
129 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | ||
130 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | ||
131 | #define MPEG_START_TIME_UP BUTTON_STOP | ||
132 | #define MPEG_START_TIME_DOWN BUTTON_PLAY | ||
133 | #define MPEG_START_TIME_EXIT BUTTON_POWER | ||
134 | |||
127 | #else | 135 | #else |
128 | #error No keymap defined! | 136 | #error No keymap defined! |
129 | #endif | 137 | #endif |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index fd6d3dbd1a..cb8c0d2133 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -231,6 +231,15 @@ PLUGIN_IRAM_DECLARE | |||
231 | #define MPEG_VOLDOWN BUTTON_MINUS | 231 | #define MPEG_VOLDOWN BUTTON_MINUS |
232 | #define MPEG_VOLUP BUTTON_PLUS | 232 | #define MPEG_VOLUP BUTTON_PLUS |
233 | 233 | ||
234 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
235 | #define MPEG_MENU BUTTON_MENU | ||
236 | #define MPEG_STOP BUTTON_STOP | ||
237 | #define MPEG_PAUSE BUTTON_PLAY | ||
238 | #define MPEG_VOLDOWN BUTTON_VOLDOWN | ||
239 | #define MPEG_VOLUP BUTTON_VOLUP | ||
240 | #define MPEG_RW BUTTON_LEFT | ||
241 | #define MPEG_FF BUTTON_RIGHT | ||
242 | |||
234 | #else | 243 | #else |
235 | #error No keymap defined! | 244 | #error No keymap defined! |
236 | #endif | 245 | #endif |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 4e51e3c868..f38831e608 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -147,6 +147,18 @@ | |||
147 | 147 | ||
148 | #define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) | 148 | #define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) |
149 | 149 | ||
150 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
151 | |||
152 | #define PACMAN_UP BUTTON_STOP | ||
153 | #define PACMAN_DOWN BUTTON_PLAY | ||
154 | #define PACMAN_LEFT BUTTON_LEFT | ||
155 | #define PACMAN_RIGHT BUTTON_RIGHT | ||
156 | #define PACMAN_1UP BUTTON_VOLDOWN | ||
157 | #define PACMAN_2UP BUTTON_VOLUP | ||
158 | #define PACMAN_COIN_PRE BUTTON_MENU | ||
159 | #define PACMAN_COIN (BUTTON_MENU | BUTTON_PLAY) | ||
160 | #define PACMAN_MENU BUTTON_POWER | ||
161 | |||
150 | #else | 162 | #else |
151 | 163 | ||
152 | #error Keymap not defined! | 164 | #error Keymap not defined! |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index e1527e1907..22d67b6775 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -102,6 +102,13 @@ static int plasma_frequency; | |||
102 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 102 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
103 | #define PLASMA_QUIT BUTTON_POWER | 103 | #define PLASMA_QUIT BUTTON_POWER |
104 | 104 | ||
105 | #elif (CONFIG_KEYPAD == IAUDIO67_PAD) | ||
106 | #define PLASMA_QUIT BUTTON_POWER | ||
107 | #define PLASMA_INCREASE_FREQUENCY BUTTON_RIGHT | ||
108 | #define PLASMA_DECREASE_FREQUENCY BUTTON_LEFT | ||
109 | #define PLASMA_RC_QUIT BUTTON_STOP | ||
110 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | ||
111 | |||
105 | #endif | 112 | #endif |
106 | 113 | ||
107 | #ifdef HAVE_TOUCHSCREEN | 114 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 27721fcfab..53edb90c00 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -151,6 +151,14 @@ PLUGIN_HEADER | |||
151 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 151 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
152 | #define PONG_QUIT BUTTON_POWER | 152 | #define PONG_QUIT BUTTON_POWER |
153 | 153 | ||
154 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
155 | #define PONG_QUIT BUTTON_POWER | ||
156 | #define PONG_PAUSE BUTTON_MENU | ||
157 | #define PONG_LEFT_UP BUTTON_VOLUP | ||
158 | #define PONG_LEFT_DOWN BUTTON_VOLDOWN | ||
159 | #define PONG_RIGHT_UP BUTTON_RIGHT | ||
160 | #define PONG_RIGHT_DOWN BUTTON_LEFT | ||
161 | |||
154 | #else | 162 | #else |
155 | #error No keymap defined! | 163 | #error No keymap defined! |
156 | #endif | 164 | #endif |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index a03be8ee70..4c86d275ae 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -147,6 +147,15 @@ | |||
147 | #define REVERSI_QUIT BUTTON_POWER | 147 | #define REVERSI_QUIT BUTTON_POWER |
148 | #define REVERSI_BUTTON_MENU BUTTON_MENU | 148 | #define REVERSI_BUTTON_MENU BUTTON_MENU |
149 | 149 | ||
150 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
151 | #define REVERSI_BUTTON_QUIT BUTTON_POWER | ||
152 | #define REVERSI_BUTTON_UP BUTTON_STOP | ||
153 | #define REVERSI_BUTTON_DOWN BUTTON_PLAY | ||
154 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | ||
155 | #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT | ||
156 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_VOLUP | ||
157 | #define REVERSI_BUTTON_MENU BUTTON_MENU | ||
158 | |||
150 | #else | 159 | #else |
151 | #error No keymap defined! | 160 | #error No keymap defined! |
152 | #endif | 161 | #endif |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index c4580665ab..5ff220f2f1 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -217,6 +217,17 @@ PLUGIN_HEADER | |||
217 | #define ROCKBLOX_OFF BUTTON_POWER | 217 | #define ROCKBLOX_OFF BUTTON_POWER |
218 | #define ROCKBLOX_RESTART BUTTON_MENU | 218 | #define ROCKBLOX_RESTART BUTTON_MENU |
219 | 219 | ||
220 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
221 | |||
222 | #define ROCKBLOX_OFF BUTTON_POWER | ||
223 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_VOLDOWN | ||
224 | #define ROCKBLOX_ROTATE_LEFT BUTTON_VOLUP | ||
225 | #define ROCKBLOX_DOWN BUTTON_STOP | ||
226 | #define ROCKBLOX_LEFT BUTTON_LEFT | ||
227 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | ||
228 | #define ROCKBLOX_DROP BUTTON_PLAY | ||
229 | #define ROCKBLOX_RESTART BUTTON_MENU | ||
230 | |||
220 | #else | 231 | #else |
221 | #error No keymap defined! | 232 | #error No keymap defined! |
222 | #endif | 233 | #endif |
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index 7232e365ed..b0fa6919b4 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -82,6 +82,10 @@ PLUGIN_HEADER | |||
82 | #define ONEDROCKBLOX_DOWN BUTTON_MENU | 82 | #define ONEDROCKBLOX_DOWN BUTTON_MENU |
83 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | 83 | #define ONEDROCKBLOX_QUIT BUTTON_POWER |
84 | 84 | ||
85 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
86 | #define ONEDROCKBLOX_DOWN BUTTON_MENU | ||
87 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
88 | |||
85 | #else | 89 | #else |
86 | #error No keymap defined! | 90 | #error No keymap defined! |
87 | #endif | 91 | #endif |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index be36d950d5..056ab7818b 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -64,6 +64,8 @@ PLUGIN_HEADER | |||
64 | #define SNOW_RC_QUIT BUTTON_RC_REC | 64 | #define SNOW_RC_QUIT BUTTON_RC_REC |
65 | #elif CONFIG_KEYPAD == COWOND2_PAD | 65 | #elif CONFIG_KEYPAD == COWOND2_PAD |
66 | #define SNOW_QUIT BUTTON_POWER | 66 | #define SNOW_QUIT BUTTON_POWER |
67 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
68 | #define SNOW_QUIT BUTTON_POWER | ||
67 | #else | 69 | #else |
68 | #define SNOW_QUIT BUTTON_OFF | 70 | #define SNOW_QUIT BUTTON_OFF |
69 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | 71 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index f8e73682dc..9ac98fe49f 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -276,6 +276,20 @@ PLUGIN_HEADER | |||
276 | #define SOKOBAN_MENU BUTTON_MENU | 276 | #define SOKOBAN_MENU BUTTON_MENU |
277 | #define SOKOBAN_MENU_NAME "[MENU]" | 277 | #define SOKOBAN_MENU_NAME "[MENU]" |
278 | 278 | ||
279 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
280 | #define SOKOBAN_LEFT BUTTON_LEFT | ||
281 | #define SOKOBAN_RIGHT BUTTON_RIGHT | ||
282 | #define SOKOBAN_UP BUTTON_STOP | ||
283 | #define SOKOBAN_DOWN BUTTON_PLAY | ||
284 | #define SOKOBAN_MENU BUTTON_MENU | ||
285 | #define SOKOBAN_UNDO BUTTON_VOLDOWN | ||
286 | #define SOKOBAN_REDO BUTTON_VOLUP | ||
287 | #define SOKOBAN_PAUSE (BUTTON_MENU|BUTTON_LEFT) | ||
288 | #define BUTTON_SAVE (BUTTON_MENU|BUTTON_PLAY) | ||
289 | #define BUTTON_SAVE_NAME "MENU+PLAY" | ||
290 | |||
291 | #define SOKOBAN_RC_MENU (BUTTON_MENU|BUTTON_STOP) | ||
292 | |||
279 | #else | 293 | #else |
280 | #error No keymap defined! | 294 | #error No keymap defined! |
281 | #endif | 295 | #endif |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 53198d0a5f..f8f24b93d4 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -88,6 +88,13 @@ static const struct plugin_api* rb; /* global api struct pointer */ | |||
88 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RC_FF | 88 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RC_FF |
89 | #define STARFIELD_DECREASE_NB_STARS BUTTON_RC_REW | 89 | #define STARFIELD_DECREASE_NB_STARS BUTTON_RC_REW |
90 | #define STARFIELD_TOGGLE_COLOR BUTTON_RC_MODE | 90 | #define STARFIELD_TOGGLE_COLOR BUTTON_RC_MODE |
91 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
92 | #define STARFIELD_QUIT BUTTON_POWER | ||
93 | #define STARFIELD_INCREASE_ZMOVE BUTTON_STOP | ||
94 | #define STARFIELD_DECREASE_ZMOVE BUTTON_PLAY | ||
95 | #define STARFIELD_INCREASE_NB_STARS BUTTON_LEFT | ||
96 | #define STARFIELD_DECREASE_NB_STARS BUTTON_RIGHT | ||
97 | #define STARFIELD_TOGGLE_COLOR BUTTON_MENU | ||
91 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 98 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
92 | #define STARFIELD_QUIT BUTTON_POWER | 99 | #define STARFIELD_QUIT BUTTON_POWER |
93 | #endif | 100 | #endif |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 21d7862541..d77f04408b 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -78,6 +78,9 @@ static bool abort; | |||
78 | #elif CONFIG_KEYPAD == COWOND2_PAD | 78 | #elif CONFIG_KEYPAD == COWOND2_PAD |
79 | #define STATS_STOP BUTTON_POWER | 79 | #define STATS_STOP BUTTON_POWER |
80 | 80 | ||
81 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
82 | #define STATS_STOP BUTTON_POWER | ||
83 | |||
81 | #else | 84 | #else |
82 | #error No keymap defined! | 85 | #error No keymap defined! |
83 | #endif | 86 | #endif |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index ae71a12f80..b78225488d 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -150,6 +150,14 @@ PLUGIN_HEADER | |||
150 | #define STOPWATCH_RC_QUIT BUTTON_REC | 150 | #define STOPWATCH_RC_QUIT BUTTON_REC |
151 | #elif CONFIG_KEYPAD == COWOND2_PAD | 151 | #elif CONFIG_KEYPAD == COWOND2_PAD |
152 | #define STOPWATCH_QUIT BUTTON_POWER | 152 | #define STOPWATCH_QUIT BUTTON_POWER |
153 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
154 | #define STOPWATCH_QUIT BUTTON_MENU | ||
155 | #define STOPWATCH_START_STOP BUTTON_PLAY | ||
156 | #define STOPWATCH_RESET_TIMER BUTTON_STOP | ||
157 | #define STOPWATCH_LAP_TIMER BUTTON_LEFT | ||
158 | #define STOPWATCH_SCROLL_UP BUTTON_VOLUP | ||
159 | #define STOPWATCH_SCROLL_DOWN BUTTON_VOLDOWN | ||
160 | #define STOPWATCH_RC_QUIT BUTTON_POWER | ||
153 | #else | 161 | #else |
154 | #error No keymap defined! | 162 | #error No keymap defined! |
155 | #endif | 163 | #endif |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index fb64ef9a66..75230dde60 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -186,6 +186,16 @@ | |||
186 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 186 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |
187 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 187 | #define SUDOKU_BUTTON_MENU BUTTON_MENU |
188 | 188 | ||
189 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
190 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | ||
191 | #define SUDOKU_BUTTON_UP BUTTON_STOP | ||
192 | #define SUDOKU_BUTTON_DOWN BUTTON_PLAY | ||
193 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | ||
194 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | ||
195 | #define SUDOKU_BUTTON_TOGGLE BUTTON_VOLUP | ||
196 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | ||
197 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_VOLDOWN | ||
198 | |||
189 | #else | 199 | #else |
190 | #error No keymap defined! | 200 | #error No keymap defined! |
191 | #endif | 201 | #endif |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 806688514e..51fb791b1d 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -258,6 +258,16 @@ PLUGIN_HEADER | |||
258 | #define VIEWER_QUIT BUTTON_POWER | 258 | #define VIEWER_QUIT BUTTON_POWER |
259 | #define VIEWER_MENU BUTTON_MENU | 259 | #define VIEWER_MENU BUTTON_MENU |
260 | 260 | ||
261 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
262 | #define VIEWER_QUIT BUTTON_POWER | ||
263 | #define VIEWER_PAGE_UP BUTTON_VOLUP | ||
264 | #define VIEWER_PAGE_DOWN BUTTON_VOLDOWN | ||
265 | #define VIEWER_SCREEN_LEFT BUTTON_LEFT | ||
266 | #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT | ||
267 | #define VIEWER_MENU BUTTON_MENU | ||
268 | #define VIEWER_AUTOSCROLL BUTTON_PLAY | ||
269 | #define VIEWER_RC_QUIT BUTTON_STOP | ||
270 | |||
261 | #else | 271 | #else |
262 | #error No keymap defined! | 272 | #error No keymap defined! |
263 | #endif | 273 | #endif |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index f5d10578cd..59e080d2e0 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -145,6 +145,15 @@ PLUGIN_HEADER | |||
145 | 145 | ||
146 | #define QUIT BUTTON_POWER | 146 | #define QUIT BUTTON_POWER |
147 | 147 | ||
148 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
149 | |||
150 | #define QUIT BUTTON_POWER | ||
151 | #define LEFT BUTTON_LEFT | ||
152 | #define RIGHT BUTTON_RIGHT | ||
153 | #define UP BUTTON_STOP | ||
154 | #define DOWN BUTTON_PLAY | ||
155 | #define PAUSE BUTTON_MENU | ||
156 | |||
148 | #else | 157 | #else |
149 | #error No keymap defined! | 158 | #error No keymap defined! |
150 | #endif | 159 | #endif |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 777ddccac3..fec6e38d27 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -122,6 +122,14 @@ | |||
122 | #elif CONFIG_KEYPAD == COWOND2_PAD | 122 | #elif CONFIG_KEYPAD == COWOND2_PAD |
123 | #define ZX_MENU (BUTTON_MENU|BUTTON_REL) | 123 | #define ZX_MENU (BUTTON_MENU|BUTTON_REL) |
124 | 124 | ||
125 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
126 | #define ZX_UP BUTTON_STOP | ||
127 | #define ZX_DOWN BUTTON_PLAY | ||
128 | #define ZX_LEFT BUTTON_LEFT | ||
129 | #define ZX_RIGHT BUTTON_RIGHT | ||
130 | #define ZX_SELECT BUTTON_VOLUP | ||
131 | #define ZX_MENU BUTTON_MENU | ||
132 | |||
125 | #else | 133 | #else |
126 | #error Keymap not defined! | 134 | #error Keymap not defined! |
127 | 135 | ||
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index f57b8e4f16..1e9ee10bb5 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -136,6 +136,14 @@ | |||
136 | 136 | ||
137 | #define KBD_ABORT BUTTON_POWER | 137 | #define KBD_ABORT BUTTON_POWER |
138 | 138 | ||
139 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
140 | |||
141 | #define KBD_SELECT BUTTON_MENU | ||
142 | #define KBD_ABORT BUTTON_POWER | ||
143 | #define KBD_LEFT BUTTON_LEFT | ||
144 | #define KBD_RIGHT BUTTON_RIGHT | ||
145 | #define KBD_UP BUTTON_STOP | ||
146 | #define KBD_DOWN BUTTON_PLAY | ||
139 | #endif | 147 | #endif |
140 | 148 | ||
141 | #ifdef HAVE_TOUCHSCREEN | 149 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/firmware/export/config-iaudio7.h b/firmware/export/config-iaudio7.h index 881dc0d1b2..3d6f239085 100644 --- a/firmware/export/config-iaudio7.h +++ b/firmware/export/config-iaudio7.h | |||
@@ -5,6 +5,7 @@ | |||
5 | 5 | ||
6 | /* For Rolo and boot loader */ | 6 | /* For Rolo and boot loader */ |
7 | #define MODEL_NUMBER 32 | 7 | #define MODEL_NUMBER 32 |
8 | #define MODEL_NAME "Cowon iAudio7" | ||
8 | 9 | ||
9 | /* define this if you have recording possibility */ | 10 | /* define this if you have recording possibility */ |
10 | #define HAVE_RECORDING | 11 | #define HAVE_RECORDING |