diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-04-07 23:41:44 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-04-07 23:41:44 +0000 |
commit | fef405c3288fa43572c1ed7a1ab692ff6e190804 (patch) | |
tree | 3e981c7ca050a2f2845ef7e69733d2ceed4279b9 | |
parent | 8b13d87ec3055559ea33ea2b40225ed0cfa00788 (diff) | |
download | rockbox-fef405c3288fa43572c1ed7a1ab692ff6e190804.tar.gz rockbox-fef405c3288fa43572c1ed7a1ab692ff6e190804.zip |
Enable plugins on the Onda VX747
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20647 a1c6a512-1295-4272-9138-f99709370657
62 files changed, 258 insertions, 15 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index e515ac72de..74fc39a693 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -175,6 +175,11 @@ PLUGIN_HEADER | |||
175 | #define BATTERY_ON_TXT "MENU - start" | 175 | #define BATTERY_ON_TXT "MENU - start" |
176 | #define BATTERY_OFF_TXT "POWER" | 176 | #define BATTERY_OFF_TXT "POWER" |
177 | 177 | ||
178 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
179 | |||
180 | #define BATTERY_OFF BUTTON_POWER | ||
181 | #define BATTERY_OFF_TXT "POWER" | ||
182 | |||
178 | #else | 183 | #else |
179 | #error No keymap defined! | 184 | #error No keymap defined! |
180 | #endif | 185 | #endif |
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index 63ac5adf74..daba9bb4ca 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES | |||
@@ -20,7 +20,7 @@ bubbles_bubble.138x110x1.bmp | |||
20 | ((LCD_WIDTH == 176) && (LCD_HEIGHT == 220)) | 20 | ((LCD_WIDTH == 176) && (LCD_HEIGHT == 220)) |
21 | bubbles_bubble.220x176x1.bmp | 21 | bubbles_bubble.220x176x1.bmp |
22 | #elif ((LCD_WIDTH == 320) && (LCD_HEIGHT == 240)) || \ | 22 | #elif ((LCD_WIDTH == 320) && (LCD_HEIGHT == 240)) || \ |
23 | ((LCD_WIDTH == 240) && (LCD_HEIGHT == 320)) | 23 | ((LCD_WIDTH == 240) && (LCD_HEIGHT >= 320)) |
24 | bubbles_bubble.320x240x1.bmp | 24 | bubbles_bubble.320x240x1.bmp |
25 | #endif | 25 | #endif |
26 | 26 | ||
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 92521d7e04..e7d6cd4580 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -17,7 +17,7 @@ brickmania_bricks.220x176x16.bmp | |||
17 | brickmania_pads.220x176x16.bmp | 17 | brickmania_pads.220x176x16.bmp |
18 | brickmania_break.220x176x16.bmp | 18 | brickmania_break.220x176x16.bmp |
19 | brickmania_powerups.220x176x16.bmp | 19 | brickmania_powerups.220x176x16.bmp |
20 | #if LCD_HEIGHT == 320 | 20 | #if LCD_HEIGHT >= 320 |
21 | brickmania_menu_bg.240x320x16.bmp | 21 | brickmania_menu_bg.240x320x16.bmp |
22 | #elif LCD_HEIGHT == 176 | 22 | #elif LCD_HEIGHT == 176 |
23 | brickmania_menu_bg.220x176x16.bmp | 23 | brickmania_menu_bg.220x176x16.bmp |
@@ -325,7 +325,7 @@ jewels.160x128x16.bmp | |||
325 | jewels.220x176x16.bmp | 325 | jewels.220x176x16.bmp |
326 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) | 326 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) |
327 | jewels.220x176x16.bmp | 327 | jewels.220x176x16.bmp |
328 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) | 328 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT >= 320) |
329 | jewels.320x240x16.bmp | 329 | jewels.320x240x16.bmp |
330 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) | 330 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) |
331 | jewels.320x240x16.bmp | 331 | jewels.320x240x16.bmp |
@@ -419,7 +419,7 @@ pegbox_pieces.9x7x1.bmp | |||
419 | #if LCD_DEPTH == 16 /* colour versions*/ | 419 | #if LCD_DEPTH == 16 /* colour versions*/ |
420 | #if (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) | 420 | #if (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) |
421 | rockblox_background.320x240x16.bmp | 421 | rockblox_background.320x240x16.bmp |
422 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) | 422 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT >= 320) |
423 | rockblox_background.240x320x16.bmp | 423 | rockblox_background.240x320x16.bmp |
424 | #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) | 424 | #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) |
425 | rockblox_background.220x176x16.bmp | 425 | rockblox_background.220x176x16.bmp |
@@ -678,7 +678,7 @@ superdom_boarditems.220x176x16.bmp | |||
678 | superdom_boarditems.176x132x16.bmp | 678 | superdom_boarditems.176x132x16.bmp |
679 | #elif (LCD_WIDTH == 320 && LCD_HEIGHT == 240) | 679 | #elif (LCD_WIDTH == 320 && LCD_HEIGHT == 240) |
680 | superdom_boarditems.320x240x16.bmp | 680 | superdom_boarditems.320x240x16.bmp |
681 | #elif (LCD_WIDTH == 240 && LCD_HEIGHT == 320) | 681 | #elif (LCD_WIDTH == 240 && LCD_HEIGHT >= 320) |
682 | superdom_boarditems.240x320x16.bmp | 682 | superdom_boarditems.240x320x16.bmp |
683 | #endif | 683 | #endif |
684 | #endif | 684 | #endif |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 825d5544e2..10782f75b1 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -333,6 +333,11 @@ PLUGIN_HEADER | |||
333 | #define BJACK_RIGHT BUTTON_RIGHT | 333 | #define BJACK_RIGHT BUTTON_RIGHT |
334 | #define BJACK_LEFT BUTTON_LEFT | 334 | #define BJACK_LEFT BUTTON_LEFT |
335 | 335 | ||
336 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
337 | #define BJACK_QUIT BUTTON_POWER | ||
338 | #define BJACK_DOUBLEDOWN BUTTON_VOL_DOWN | ||
339 | #define BJACK_SCORES BUTTON_MENU | ||
340 | |||
336 | #else | 341 | #else |
337 | #error No keymap defined! | 342 | #error No keymap defined! |
338 | #endif | 343 | #endif |
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index e7e88cc876..83b56debe5 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -163,6 +163,10 @@ PLUGIN_HEADER | |||
163 | #define BOUNCE_QUIT BUTTON_POWER | 163 | #define BOUNCE_QUIT BUTTON_POWER |
164 | #define BOUNCE_MODE BUTTON_MENU | 164 | #define BOUNCE_MODE BUTTON_MENU |
165 | 165 | ||
166 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
167 | #define BOUNCE_QUIT BUTTON_POWER | ||
168 | #define BOUNCE_MODE BUTTON_MENU | ||
169 | |||
166 | #else | 170 | #else |
167 | #error No keymap defined! | 171 | #error No keymap defined! |
168 | #endif | 172 | #endif |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 15c1641e3f..6d667323c2 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -190,6 +190,12 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
190 | #define UP BUTTON_UP | 190 | #define UP BUTTON_UP |
191 | #define DOWN BUTTON_DOWN | 191 | #define DOWN BUTTON_DOWN |
192 | 192 | ||
193 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
194 | #define QUIT BUTTON_POWER | ||
195 | #define LEFT BUTTON_VOL_DOWN | ||
196 | #define RIGHT BUTTON_VOL_UP | ||
197 | #define SELECT BUTTON_MENU | ||
198 | |||
193 | #else | 199 | #else |
194 | #error No keymap defined! | 200 | #error No keymap defined! |
195 | #endif | 201 | #endif |
@@ -262,7 +268,7 @@ enum menu_items { | |||
262 | #include "pluginbitmaps/brickmania_break.h" | 268 | #include "pluginbitmaps/brickmania_break.h" |
263 | #endif | 269 | #endif |
264 | 270 | ||
265 | #if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) | 271 | #if ((LCD_WIDTH == 320) || (LCD_WIDTH == 400)) && (LCD_HEIGHT == 240) |
266 | 272 | ||
267 | /* The time (in ms) for one iteration through the game loop - decrease this | 273 | /* The time (in ms) for one iteration through the game loop - decrease this |
268 | to speed up the game - note that current_tick is (currently) only accurate | 274 | to speed up the game - note that current_tick is (currently) only accurate |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index db2439f99d..25f6b893d8 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -120,8 +120,8 @@ PLUGIN_HEADER | |||
120 | #define ROW_INDENT 11 | 120 | #define ROW_INDENT 11 |
121 | #define MAX_FPS 40 | 121 | #define MAX_FPS 40 |
122 | 122 | ||
123 | /* 22x22 bubbles (Gigabeat) */ | 123 | /* 22x22 bubbles (Gigabeat, Onda VX747) */ |
124 | #elif (LCD_HEIGHT == 320) && (LCD_WIDTH == 240) | 124 | #elif ((LCD_HEIGHT == 320) || (LCD_HEIGHT == 400)) && (LCD_WIDTH == 240) |
125 | #define XOFS 64 | 125 | #define XOFS 64 |
126 | #define ROW_HEIGHT 18 | 126 | #define ROW_HEIGHT 18 |
127 | #define ROW_INDENT 11 | 127 | #define ROW_INDENT 11 |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 1795bca7a7..df9fb9b18b 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -324,6 +324,11 @@ PLUGIN_HEADER | |||
324 | #define CALCULATOR_CALC BUTTON_MENU | 324 | #define CALCULATOR_CALC BUTTON_MENU |
325 | #define CALCULATOR_CLEAR BUTTON_VIEW | 325 | #define CALCULATOR_CLEAR BUTTON_VIEW |
326 | 326 | ||
327 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
328 | |||
329 | #define CALCULATOR_QUIT BUTTON_POWER | ||
330 | #define CALCULATOR_CLEAR BUTTON_MENU | ||
331 | |||
327 | #else | 332 | #else |
328 | #error No keymap defined! | 333 | #error No keymap defined! |
329 | #endif | 334 | #endif |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index a570f37508..f0537e204f 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -173,6 +173,16 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
173 | #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN | 173 | #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN |
174 | #define CALENDAR_PREV_MONTH BUTTON_VOL_UP | 174 | #define CALENDAR_PREV_MONTH BUTTON_VOL_UP |
175 | 175 | ||
176 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
177 | #define CALENDAR_QUIT BUTTON_POWER | ||
178 | #define CALENDAR_SELECT BUTTON_MENU | ||
179 | #define CALENDAR_NEXT_WEEK BUTTON_VOL_DOWN | ||
180 | #define CALENDAR_PREV_WEEK BUTTON_VOL_UP | ||
181 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | ||
182 | #define CALENDAR_PREV_DAY BUTTON_LEFT | ||
183 | #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT | ||
184 | #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT | ||
185 | |||
176 | #else | 186 | #else |
177 | #error "No keypad setting." | 187 | #error "No keypad setting." |
178 | #endif | 188 | #endif |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 85b21a551b..3e36c815bd 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -341,6 +341,11 @@ | |||
341 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 341 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
342 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 342 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
343 | 343 | ||
344 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
345 | #define CB_LEVEL BUTTON_VOL_UP | ||
346 | #define CB_RESTART BUTTON_VOL_DOWN | ||
347 | #define CB_MENU (BUTTON_MENU|BUTTON_REL) | ||
348 | |||
344 | #else | 349 | #else |
345 | #error No keymap defined! | 350 | #error No keymap defined! |
346 | #endif | 351 | #endif |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 8b179644f8..53180fe271 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -224,6 +224,14 @@ PLUGIN_HEADER | |||
224 | #define CHC_SETTINGS_OK BUTTON_SELECT | 224 | #define CHC_SETTINGS_OK BUTTON_SELECT |
225 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | 225 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
226 | 226 | ||
227 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
228 | #define CHC_QUIT BUTTON_POWER | ||
229 | #define CHC_RESET (BUTTON_VOL_UP|BUTTON_VOL_DOWN) | ||
230 | #define CHC_MENU BUTTON_MENU | ||
231 | #define CHC_SETTINGS_INC BUTTON_VOL_UP | ||
232 | #define CHC_SETTINGS_DEC BUTTON_VOL_DOWN | ||
233 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | ||
234 | |||
227 | #else | 235 | #else |
228 | #error No keymap defined! | 236 | #error No keymap defined! |
229 | #endif | 237 | #endif |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index f18fccebb4..78ea4e13fd 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1102,6 +1102,9 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
1102 | #define CHIP8_KEY8 BUTTON_DOWN | 1102 | #define CHIP8_KEY8 BUTTON_DOWN |
1103 | #define CHIP8_KEY9 BUTTON_VIEW | 1103 | #define CHIP8_KEY9 BUTTON_VIEW |
1104 | 1104 | ||
1105 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
1106 | #define CHIP8_OFF BUTTON_POWER | ||
1107 | |||
1105 | #else | 1108 | #else |
1106 | #error No keymap defined! | 1109 | #error No keymap defined! |
1107 | #endif | 1110 | #endif |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index c5593d948c..e3bf0205f3 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -130,6 +130,9 @@ Still To do: | |||
130 | #define ACTION2 BUTTON_SELECT | 130 | #define ACTION2 BUTTON_SELECT |
131 | #define ACTIONTEXT "MENU" | 131 | #define ACTIONTEXT "MENU" |
132 | 132 | ||
133 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
134 | #define QUIT BUTTON_POWER | ||
135 | |||
133 | #else | 136 | #else |
134 | #error No keymap defined! | 137 | #error No keymap defined! |
135 | #endif | 138 | #endif |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 2ad25508da..2f100b2f79 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -237,6 +237,10 @@ PLUGIN_HEADER | |||
237 | #define CUBE_MODE BUTTON_MENU | 237 | #define CUBE_MODE BUTTON_MENU |
238 | #define CUBE_PAUSE BUTTON_SELECT | 238 | #define CUBE_PAUSE BUTTON_SELECT |
239 | #define CUBE_HIGHSPEED BUTTON_VIEW | 239 | #define CUBE_HIGHSPEED BUTTON_VIEW |
240 | |||
241 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
242 | #define CUBE_QUIT BUTTON_POWER | ||
243 | |||
240 | #else | 244 | #else |
241 | #error No keymap defined! | 245 | #error No keymap defined! |
242 | #endif | 246 | #endif |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 2018d8cb47..aa35fb628d 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -141,6 +141,8 @@ long reverse (long N) { | |||
141 | #define LP_QUIT BUTTON_BACK | 141 | #define LP_QUIT BUTTON_BACK |
142 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | 142 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD |
143 | #define LP_QUIT BUTTON_POWER | 143 | #define LP_QUIT BUTTON_POWER |
144 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
145 | #define LP_QUIT BUTTON_POWER | ||
144 | #else | 146 | #else |
145 | #define LP_QUIT BUTTON_OFF | 147 | #define LP_QUIT BUTTON_OFF |
146 | #endif | 148 | #endif |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 98666dda5f..c148d17077 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -315,6 +315,11 @@ void I_ShutdownGraphics(void) | |||
315 | #define DOOMBUTTON_ENTER BUTTON_VIEW | 315 | #define DOOMBUTTON_ENTER BUTTON_VIEW |
316 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 316 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
317 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 317 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
318 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
319 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
320 | #define DOOMBUTTON_SHOOT BUTTON_VOL_UP | ||
321 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | ||
322 | #define DOOMBUTTON_MAP BUTTON_MENU | ||
318 | #else | 323 | #else |
319 | #error Keymap not defined! | 324 | #error Keymap not defined! |
320 | #endif | 325 | #endif |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index df2d998210..f1a30e7b50 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -100,6 +100,9 @@ PLUGIN_HEADER | |||
100 | #define BTN_MENU BUTTON_MENU | 100 | #define BTN_MENU BUTTON_MENU |
101 | #define BTN_FIRE BUTTON_SELECT | 101 | #define BTN_FIRE BUTTON_SELECT |
102 | 102 | ||
103 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
104 | #define BTN_MENU (BUTTON_MENU|BUTTON_REL) | ||
105 | |||
103 | #else | 106 | #else |
104 | #error No keymap defined! | 107 | #error No keymap defined! |
105 | #endif | 108 | #endif |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index a1807b4af9..77c197e3aa 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -276,6 +276,10 @@ PLUGIN_HEADER | |||
276 | #define FLIPIT_STEP_BY_STEP BUTTON_PLAYLIST | 276 | #define FLIPIT_STEP_BY_STEP BUTTON_PLAYLIST |
277 | #define FLIPIT_TOGGLE BUTTON_SELECT | 277 | #define FLIPIT_TOGGLE BUTTON_SELECT |
278 | 278 | ||
279 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
280 | |||
281 | #define FLIPIT_QUIT BUTTON_POWER | ||
282 | |||
279 | #else | 283 | #else |
280 | #error No keymap defined! | 284 | #error No keymap defined! |
281 | #endif | 285 | #endif |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 0d9473ffb7..1526409687 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -134,6 +134,10 @@ PLUGIN_HEADER | |||
134 | #define RIGHT BUTTON_RIGHT | 134 | #define RIGHT BUTTON_RIGHT |
135 | #define FIRE BUTTON_SELECT | 135 | #define FIRE BUTTON_SELECT |
136 | 136 | ||
137 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
138 | |||
139 | #define QUIT BUTTON_POWER | ||
140 | |||
137 | #else | 141 | #else |
138 | #error INVADROX: Unsupported keypad | 142 | #error INVADROX: Unsupported keypad |
139 | #endif | 143 | #endif |
@@ -370,7 +374,7 @@ PLUGIN_HEADER | |||
370 | #define MAX_Y 18 | 374 | #define MAX_Y 18 |
371 | 375 | ||
372 | 376 | ||
373 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) | 377 | #elif (LCD_WIDTH == 240) && ((LCD_HEIGHT == 320) || (LCD_HEIGHT == 400)) |
374 | 378 | ||
375 | /* Gigabeat: 240x320x16 | 379 | /* Gigabeat: 240x320x16 |
376 | * ====================== | 380 | * ====================== |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 9fa9a2e413..0c5fb49546 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -182,6 +182,9 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
182 | #define JEWELS_SELECT BUTTON_SELECT | 182 | #define JEWELS_SELECT BUTTON_SELECT |
183 | #define JEWELS_CANCEL BUTTON_POWER | 183 | #define JEWELS_CANCEL BUTTON_POWER |
184 | 184 | ||
185 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
186 | #define JEWELS_CANCEL BUTTON_POWER | ||
187 | |||
185 | #else | 188 | #else |
186 | #error No keymap defined! | 189 | #error No keymap defined! |
187 | #endif | 190 | #endif |
@@ -207,9 +210,10 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
207 | #endif | 210 | #endif |
208 | #endif | 211 | #endif |
209 | 212 | ||
210 | /* use 30x30 tiles (iPod Video, Gigabeat) */ | 213 | /* use 30x30 tiles (iPod Video, Gigabeat, Onda VX747) */ |
211 | #if (LCD_HEIGHT == 240) && (LCD_WIDTH == 320) || \ | 214 | #if (LCD_HEIGHT == 240) && (LCD_WIDTH == 320) || \ |
212 | ((LCD_HEIGHT == 320) && (LCD_WIDTH == 240)) | 215 | ((LCD_HEIGHT == 320) && (LCD_WIDTH == 240)) || \ |
216 | ((LCD_HEIGHT == 400) && (LCD_WIDTH == 240)) | ||
213 | #define TILE_WIDTH 30 | 217 | #define TILE_WIDTH 30 |
214 | #define TILE_HEIGHT 30 | 218 | #define TILE_HEIGHT 30 |
215 | #define YOFS 0 | 219 | #define YOFS 0 |
@@ -1658,6 +1662,8 @@ static int jewels_main(struct game_context* bj) { | |||
1658 | rb->lcd_puts(0, 9, "SELECT/PLAY to select"); | 1662 | rb->lcd_puts(0, 9, "SELECT/PLAY to select"); |
1659 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); | 1663 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); |
1660 | rb->lcd_puts(0, 11, "POWER to cancel"); | 1664 | rb->lcd_puts(0, 11, "POWER to cancel"); |
1665 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
1666 | rb->lcd_puts(0, 11, "POWER to cancel"); | ||
1661 | #else | 1667 | #else |
1662 | #warning: missing help text. | 1668 | #warning: missing help text. |
1663 | #endif | 1669 | #endif |
diff --git a/apps/plugins/jpeg/jpeg.h b/apps/plugins/jpeg/jpeg.h index 4cbbc272d7..0947b576e9 100644 --- a/apps/plugins/jpeg/jpeg.h +++ b/apps/plugins/jpeg/jpeg.h | |||
@@ -285,6 +285,8 @@ | |||
285 | #define JPEG_NEXT BUTTON_VIEW | 285 | #define JPEG_NEXT BUTTON_VIEW |
286 | #define JPEG_PREVIOUS BUTTON_PLAYLIST | 286 | #define JPEG_PREVIOUS BUTTON_PLAYLIST |
287 | 287 | ||
288 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
289 | |||
288 | #else | 290 | #else |
289 | #error No keymap defined! | 291 | #error No keymap defined! |
290 | #endif | 292 | #endif |
diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c index 70094da3f9..c35973bd85 100644 --- a/apps/plugins/lamp.c +++ b/apps/plugins/lamp.c | |||
@@ -82,6 +82,10 @@ PLUGIN_HEADER | |||
82 | # define LAMP_LEFT BUTTON_LEFT | 82 | # define LAMP_LEFT BUTTON_LEFT |
83 | # define LAMP_RIGHT BUTTON_RIGHT | 83 | # define LAMP_RIGHT BUTTON_RIGHT |
84 | 84 | ||
85 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
86 | # define LAMP_LEFT BUTTON_VOL_DOWN | ||
87 | # define LAMP_RIGHT BUTTON_VOL_UP | ||
88 | |||
85 | #else | 89 | #else |
86 | # error Missing key definitions for this keypad | 90 | # error Missing key definitions for this keypad |
87 | #endif | 91 | #endif |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index e5745cda64..5b4aa60c73 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -169,6 +169,7 @@ const struct button_mapping generic_directions[] = | |||
169 | { PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 169 | { PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
170 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 170 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
171 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 171 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
172 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ | ||
172 | #else | 173 | #else |
173 | #error pluginlib_actions: Unsupported keypad | 174 | #error pluginlib_actions: Unsupported keypad |
174 | #endif | 175 | #endif |
@@ -290,6 +291,7 @@ const struct button_mapping generic_left_right_fire[] = | |||
290 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 291 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
291 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 292 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
292 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 293 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
294 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ | ||
293 | #else | 295 | #else |
294 | #error pluginlib_actions: Unsupported keypad | 296 | #error pluginlib_actions: Unsupported keypad |
295 | #endif | 297 | #endif |
@@ -440,6 +442,12 @@ const struct button_mapping generic_actions[] = | |||
440 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | 442 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, |
441 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 443 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
442 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 444 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
445 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
446 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | ||
447 | {PLA_START, BUTTON_VOL_DOWN, BUTTON_NONE}, | ||
448 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | ||
449 | {PLA_FIRE, BUTTON_VOL_UP, BUTTON_NONE}, | ||
450 | {PLA_FIRE_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | ||
443 | #else | 451 | #else |
444 | #error pluginlib_actions: Unsupported keypad | 452 | #error pluginlib_actions: Unsupported keypad |
445 | #endif | 453 | #endif |
@@ -515,6 +523,11 @@ const struct button_mapping generic_increase_decrease[] = | |||
515 | {PLA_DEC, BUTTON_VOLDOWN, BUTTON_NONE}, | 523 | {PLA_DEC, BUTTON_VOLDOWN, BUTTON_NONE}, |
516 | {PLA_INC_REPEAT, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE}, | 524 | {PLA_INC_REPEAT, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE}, |
517 | {PLA_DEC_REPEAT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE}, | 525 | {PLA_DEC_REPEAT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE}, |
526 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
527 | {PLA_INC, BUTTON_VOL_UP, BUTTON_NONE}, | ||
528 | {PLA_DEC, BUTTON_VOL_DOWN, BUTTON_NONE}, | ||
529 | {PLA_INC_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | ||
530 | {PLA_DEC_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | ||
518 | #else | 531 | #else |
519 | #error pluginlib_actions: Unsupported keypad | 532 | #error pluginlib_actions: Unsupported keypad |
520 | #endif | 533 | #endif |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 8dc5db50e0..5438ca7b8d 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -165,6 +165,9 @@ const unsigned char rockbox16x7[] = { | |||
165 | #define LP_DEC_Y BUTTON_DOWN | 165 | #define LP_DEC_Y BUTTON_DOWN |
166 | #define LP_INC_Y BUTTON_UP | 166 | #define LP_INC_Y BUTTON_UP |
167 | 167 | ||
168 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
169 | #define LP_QUIT BUTTON_POWER | ||
170 | |||
168 | #else | 171 | #else |
169 | #define LP_QUIT BUTTON_OFF | 172 | #define LP_QUIT BUTTON_OFF |
170 | #define LP_DEC_X BUTTON_LEFT | 173 | #define LP_DEC_X BUTTON_LEFT |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index c18b1f453a..931777632e 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -283,6 +283,9 @@ PLUGIN_HEADER | |||
283 | #define MANDELBROT_MAXITER_DEC BUTTON_VOL_DOWN | 283 | #define MANDELBROT_MAXITER_DEC BUTTON_VOL_DOWN |
284 | #define MANDELBROT_RESET BUTTON_MENU | 284 | #define MANDELBROT_RESET BUTTON_MENU |
285 | 285 | ||
286 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
287 | #define MANDELBROT_QUIT BUTTON_POWER | ||
288 | |||
286 | #else | 289 | #else |
287 | #error No keymap defined! | 290 | #error No keymap defined! |
288 | #endif | 291 | #endif |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index c446665894..5559c0091c 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -133,6 +133,9 @@ extern const fb_data matrix_normal[]; | |||
133 | #define MATRIX_SLEEP_LESS BUTTON_DOWN | 133 | #define MATRIX_SLEEP_LESS BUTTON_DOWN |
134 | #define MATRIX_PAUSE BUTTON_SELECT | 134 | #define MATRIX_PAUSE BUTTON_SELECT |
135 | 135 | ||
136 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
137 | #define MATRIX_EXIT BUTTON_POWER | ||
138 | |||
136 | #else | 139 | #else |
137 | #error Unsupported keypad | 140 | #error Unsupported keypad |
138 | #endif | 141 | #endif |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index b0024087b6..fea5e99aab 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -159,6 +159,9 @@ PLUGIN_IRAM_DECLARE | |||
159 | #define BTN_DOWN BUTTON_DOWN | 159 | #define BTN_DOWN BUTTON_DOWN |
160 | #define BTN_PLAY BUTTON_MENU | 160 | #define BTN_PLAY BUTTON_MENU |
161 | 161 | ||
162 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
163 | #define BTN_QUIT BUTTON_POWER | ||
164 | |||
162 | #else | 165 | #else |
163 | #error No keymap defined! | 166 | #error No keymap defined! |
164 | #endif | 167 | #endif |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index eeae12be64..a29900ced3 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -224,6 +224,9 @@ enum minesweeper_status { | |||
224 | # define MINESWP_DISCOVER BUTTON_SELECT | 224 | # define MINESWP_DISCOVER BUTTON_SELECT |
225 | # define MINESWP_INFO BUTTON_MENU | 225 | # define MINESWP_INFO BUTTON_MENU |
226 | 226 | ||
227 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
228 | # define MINESWP_QUIT BUTTON_POWER | ||
229 | |||
227 | #else | 230 | #else |
228 | #error No keymap defined! | 231 | #error No keymap defined! |
229 | #endif | 232 | #endif |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 1bb0044c07..dcbbf523ec 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -145,6 +145,9 @@ PLUGIN_HEADER | |||
145 | #define MOSAIQUE_SPEED BUTTON_VIEW | 145 | #define MOSAIQUE_SPEED BUTTON_VIEW |
146 | #define MOSAIQUE_RESTART BUTTON_MENU | 146 | #define MOSAIQUE_RESTART BUTTON_MENU |
147 | 147 | ||
148 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
149 | #define MOSAIQUE_QUIT BUTTON_POWER | ||
150 | |||
148 | #else | 151 | #else |
149 | #error No keymap defined! | 152 | #error No keymap defined! |
150 | #endif | 153 | #endif |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index c0e3cd4aa5..eab53a2a55 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2489,6 +2489,9 @@ void get_mp3_filename(const char *wav_name) | |||
2489 | #define MP3ENC_DONE BUTTON_POWER | 2489 | #define MP3ENC_DONE BUTTON_POWER |
2490 | #define MP3ENC_SELECT BUTTON_SELECT | 2490 | #define MP3ENC_SELECT BUTTON_SELECT |
2491 | 2491 | ||
2492 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
2493 | #define MP3ENC_DONE BUTTON_POWER | ||
2494 | |||
2492 | #else | 2495 | #else |
2493 | #error No keymap defined! | 2496 | #error No keymap defined! |
2494 | #endif | 2497 | #endif |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 3452903b47..3edb2987a1 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -162,6 +162,9 @@ struct mpeg_settings settings; | |||
162 | #define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP | 162 | #define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP |
163 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 163 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
164 | 164 | ||
165 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
166 | #define MPEG_START_TIME_EXIT BUTTON_POWER | ||
167 | |||
165 | #else | 168 | #else |
166 | #error No keymap defined! | 169 | #error No keymap defined! |
167 | #endif | 170 | #endif |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index e9e742a6a5..89c76efd98 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -268,6 +268,12 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
268 | #define MPEG_RW BUTTON_LEFT | 268 | #define MPEG_RW BUTTON_LEFT |
269 | #define MPEG_FF BUTTON_RIGHT | 269 | #define MPEG_FF BUTTON_RIGHT |
270 | 270 | ||
271 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
272 | #define MPEG_MENU (BUTTON_MENU|BUTTON_REL) | ||
273 | //#define MPEG_STOP BUTTON_POWER | ||
274 | #define MPEG_VOLDOWN BUTTON_VOL_DOWN | ||
275 | #define MPEG_VOLUP BUTTON_VOL_UP | ||
276 | |||
271 | #else | 277 | #else |
272 | #error No keymap defined! | 278 | #error No keymap defined! |
273 | #endif | 279 | #endif |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 5d55bb43b9..5b6d83e022 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -243,6 +243,11 @@ PLUGIN_HEADER | |||
243 | #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP | 243 | #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP |
244 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN | 244 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN |
245 | 245 | ||
246 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
247 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | ||
248 | #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP | ||
249 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN | ||
250 | |||
246 | #else | 251 | #else |
247 | #error No keymap defined! | 252 | #error No keymap defined! |
248 | #endif | 253 | #endif |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index d91e8cf98f..593179c44e 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -192,6 +192,10 @@ | |||
192 | #define PACMAN_COIN BUTTON_VIEW | 192 | #define PACMAN_COIN BUTTON_VIEW |
193 | #define PACMAN_MENU BUTTON_MENU | 193 | #define PACMAN_MENU BUTTON_MENU |
194 | 194 | ||
195 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
196 | |||
197 | #define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) | ||
198 | |||
195 | #else | 199 | #else |
196 | 200 | ||
197 | #error Keymap not defined! | 201 | #error Keymap not defined! |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 514b92ebb6..b1e1738999 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -370,6 +370,11 @@ PLUGIN_HEADER | |||
370 | #define LVL_UP_TEXT "VOL+" | 370 | #define LVL_UP_TEXT "VOL+" |
371 | #define LVL_DOWN_TEXT "VOL-" | 371 | #define LVL_DOWN_TEXT "VOL-" |
372 | 372 | ||
373 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
374 | #define PEGBOX_QUIT BUTTON_POWER | ||
375 | |||
376 | #define QUIT_TEXT "POWER" | ||
377 | |||
373 | #else | 378 | #else |
374 | #error Unsupported keymap! | 379 | #error Unsupported keymap! |
375 | #endif | 380 | #endif |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index a172372da4..44c7add0dd 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -123,6 +123,9 @@ static int plasma_frequency; | |||
123 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 123 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
124 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | 124 | #define PLASMA_REGEN_COLORS BUTTON_SELECT |
125 | 125 | ||
126 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
127 | #define PLASMA_QUIT BUTTON_POWER | ||
128 | |||
126 | #endif | 129 | #endif |
127 | 130 | ||
128 | #ifdef HAVE_TOUCHSCREEN | 131 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 148f1a1a1e..ae6a1b5f1c 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -177,6 +177,9 @@ PLUGIN_HEADER | |||
177 | #define PONG_RIGHT_UP BUTTON_VOL_UP | 177 | #define PONG_RIGHT_UP BUTTON_VOL_UP |
178 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN | 178 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN |
179 | 179 | ||
180 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
181 | #define PONG_QUIT BUTTON_POWER | ||
182 | |||
180 | #else | 183 | #else |
181 | #error No keymap defined! | 184 | #error No keymap defined! |
182 | #endif | 185 | #endif |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 27bd3e421b..7dd04bf464 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -177,6 +177,10 @@ | |||
177 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT | 177 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT |
178 | #define REVERSI_BUTTON_MENU BUTTON_MENU | 178 | #define REVERSI_BUTTON_MENU BUTTON_MENU |
179 | 179 | ||
180 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
181 | #define REVERSI_QUIT BUTTON_POWER | ||
182 | #define REVERSI_BUTTON_MENU BUTTON_MENU | ||
183 | |||
180 | #else | 184 | #else |
181 | #error No keymap defined! | 185 | #error No keymap defined! |
182 | #endif | 186 | #endif |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 11fd118dc1..cea5e8a3c7 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -286,6 +286,10 @@ PLUGIN_HEADER | |||
286 | #define ROCKBLOX_DROP BUTTON_SELECT | 286 | #define ROCKBLOX_DROP BUTTON_SELECT |
287 | #define ROCKBLOX_RESTART BUTTON_MENU | 287 | #define ROCKBLOX_RESTART BUTTON_MENU |
288 | 288 | ||
289 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
290 | #define ROCKBLOX_OFF BUTTON_POWER | ||
291 | #define ROCKBLOX_RESTART BUTTON_MENU | ||
292 | |||
289 | #else | 293 | #else |
290 | #error No keymap defined! | 294 | #error No keymap defined! |
291 | #endif | 295 | #endif |
@@ -371,7 +375,7 @@ PLUGIN_HEADER | |||
371 | #define LEVEL_Y 70 | 375 | #define LEVEL_Y 70 |
372 | #define LINES_Y 105 | 376 | #define LINES_Y 105 |
373 | 377 | ||
374 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) | 378 | #elif (LCD_WIDTH == 240) && ((LCD_HEIGHT == 320) || (LCD_HEIGHT == 400)) |
375 | 379 | ||
376 | #define BLOCK_WIDTH 15 | 380 | #define BLOCK_WIDTH 15 |
377 | #define BLOCK_HEIGHT 15 | 381 | #define BLOCK_HEIGHT 15 |
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index d7779fadd6..f024a004a7 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -98,6 +98,10 @@ PLUGIN_HEADER | |||
98 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | 98 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT |
99 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | 99 | #define ONEDROCKBLOX_QUIT BUTTON_POWER |
100 | 100 | ||
101 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
102 | #define ONEDROCKBLOX_DOWN BUTTON_MENU | ||
103 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
104 | |||
101 | #else | 105 | #else |
102 | #error No keymap defined! | 106 | #error No keymap defined! |
103 | #endif | 107 | #endif |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 0352f0beb0..26b05c41df 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -238,6 +238,11 @@ static void setoptions (void) | |||
238 | options.START=BUTTON_VIEW; | 238 | options.START=BUTTON_VIEW; |
239 | options.SELECT=BUTTON_SELECT; | 239 | options.SELECT=BUTTON_SELECT; |
240 | options.MENU=BUTTON_MENU; | 240 | options.MENU=BUTTON_MENU; |
241 | |||
242 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
243 | options.A=BUTTON_VOL_UP; | ||
244 | options.B=BUTTON_VOL_DOWN; | ||
245 | options.MENU=BUTTON_MENU; | ||
241 | #else | 246 | #else |
242 | #error No Keymap Defined! | 247 | #error No Keymap Defined! |
243 | #endif | 248 | #endif |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 32beacbe6e..3027141dbd 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -157,6 +157,10 @@ PLUGIN_HEADER | |||
157 | #define ROCKPAINT_LEFT BUTTON_LEFT | 157 | #define ROCKPAINT_LEFT BUTTON_LEFT |
158 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | 158 | #define ROCKPAINT_RIGHT BUTTON_RIGHT |
159 | 159 | ||
160 | #elif ( CONFIG_KEYPAD == ONDAVX747_PAD ) | ||
161 | #define ROCKPAINT_QUIT BUTTON_POWER | ||
162 | #define ROCKPAINT_MENU BUTTON_MENU | ||
163 | |||
160 | #else | 164 | #else |
161 | #error "Please define keys for this keypad" | 165 | #error "Please define keys for this keypad" |
162 | #endif | 166 | #endif |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index df8e445f93..f9288d5488 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -190,6 +190,10 @@ PLUGIN_HEADER | |||
190 | #define PUZZLE_SHUFFLE BUTTON_VIEW | 190 | #define PUZZLE_SHUFFLE BUTTON_VIEW |
191 | #define PUZZLE_PICTURE BUTTON_MENU | 191 | #define PUZZLE_PICTURE BUTTON_MENU |
192 | 192 | ||
193 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
194 | #define PUZZLE_QUIT BUTTON_POWER | ||
195 | #define PUZZLE_QUIT_TEXT "[POWER]" | ||
196 | |||
193 | #else | 197 | #else |
194 | #error No keymap defined! | 198 | #error No keymap defined! |
195 | #endif | 199 | #endif |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index a80aaa0cff..488de00586 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -164,6 +164,9 @@ PLUGIN_HEADER | |||
164 | #define SNAKE_DOWN BUTTON_DOWN | 164 | #define SNAKE_DOWN BUTTON_DOWN |
165 | #define SNAKE_PLAYPAUSE BUTTON_MENU | 165 | #define SNAKE_PLAYPAUSE BUTTON_MENU |
166 | 166 | ||
167 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
168 | #define SNAKE_QUIT BUTTON_POWER | ||
169 | |||
167 | #else | 170 | #else |
168 | #error No keymap defined! | 171 | #error No keymap defined! |
169 | #endif | 172 | #endif |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index d5ffc9f6d2..9ebe4afc8d 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -350,6 +350,9 @@ PLUGIN_HEADER | |||
350 | #define SNAKE2_PLAYPAUSE BUTTON_VIEW | 350 | #define SNAKE2_PLAYPAUSE BUTTON_VIEW |
351 | #define SNAKE2_PLAYPAUSE_TEXT "View" | 351 | #define SNAKE2_PLAYPAUSE_TEXT "View" |
352 | 352 | ||
353 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
354 | #define SNAKE2_QUIT BUTTON_POWER | ||
355 | |||
353 | #else | 356 | #else |
354 | #error No keymap defined! | 357 | #error No keymap defined! |
355 | #endif | 358 | #endif |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 3df2c0a016..05a5637f7e 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -74,6 +74,8 @@ PLUGIN_HEADER | |||
74 | #define SNOW_QUIT BUTTON_BACK | 74 | #define SNOW_QUIT BUTTON_BACK |
75 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | 75 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD |
76 | #define SNOW_QUIT BUTTON_POWER | 76 | #define SNOW_QUIT BUTTON_POWER |
77 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
78 | #define SNOW_QUIT BUTTON_POWER | ||
77 | #else | 79 | #else |
78 | #define SNOW_QUIT BUTTON_OFF | 80 | #define SNOW_QUIT BUTTON_OFF |
79 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | 81 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index f071af14f4..ea104eca39 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -376,6 +376,10 @@ PLUGIN_HEADER | |||
376 | #define BUTTON_SAVE BUTTON_PLAYLIST | 376 | #define BUTTON_SAVE BUTTON_PLAYLIST |
377 | #define BUTTON_SAVE_NAME "PLAYLIST" | 377 | #define BUTTON_SAVE_NAME "PLAYLIST" |
378 | 378 | ||
379 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
380 | #define SOKOBAN_MENU BUTTON_MENU | ||
381 | #define SOKOBAN_MENU_NAME "[MENU]" | ||
382 | |||
379 | #else | 383 | #else |
380 | #error No keymap defined! | 384 | #error No keymap defined! |
381 | #endif | 385 | #endif |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index c6cf6f0b0c..a2b4cb84a2 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -398,6 +398,9 @@ PLUGIN_HEADER | |||
398 | # define HK_CUR2STACK "SELECT.." | 398 | # define HK_CUR2STACK "SELECT.." |
399 | # define HK_REM2STACK "VIEW+RIGHT" | 399 | # define HK_REM2STACK "VIEW+RIGHT" |
400 | 400 | ||
401 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
402 | # define SOL_QUIT BUTTON_POWER | ||
403 | |||
401 | #else | 404 | #else |
402 | #error No keymap defined! | 405 | #error No keymap defined! |
403 | #endif | 406 | #endif |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 0891906b12..44f6272199 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -267,6 +267,9 @@ PLUGIN_HEADER | |||
267 | #define AST_FIRE BUTTON_PLAYLIST | 267 | #define AST_FIRE BUTTON_PLAYLIST |
268 | #define AST_FIRE_REP (BUTTON_PLAYLIST | BUTTON_REPEAT) | 268 | #define AST_FIRE_REP (BUTTON_PLAYLIST | BUTTON_REPEAT) |
269 | 269 | ||
270 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
271 | #define AST_QUIT BUTTON_POWER | ||
272 | |||
270 | #else | 273 | #else |
271 | #error No keymap defined! | 274 | #error No keymap defined! |
272 | #endif | 275 | #endif |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 344c11bc56..9a6dff134f 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -262,6 +262,12 @@ PLUGIN_HEADER | |||
262 | #define STAR_LEVEL_REPEAT BUTTON_VIEW | 262 | #define STAR_LEVEL_REPEAT BUTTON_VIEW |
263 | #define STAR_MENU_RUN BUTTON_MENU | 263 | #define STAR_MENU_RUN BUTTON_MENU |
264 | 264 | ||
265 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
266 | |||
267 | #define STAR_QUIT BUTTON_POWER | ||
268 | #define STAR_QUIT_NAME "[POWER]" | ||
269 | #define STAR_MENU_RUN BUTTON_MENU | ||
270 | |||
265 | #else | 271 | #else |
266 | #error No keymap defined! | 272 | #error No keymap defined! |
267 | #endif | 273 | #endif |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 8b5c64d8d7..1153689fed 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -123,6 +123,10 @@ PLUGIN_HEADER | |||
123 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT | 123 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT |
124 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT | 124 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT |
125 | #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT | 125 | #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT |
126 | |||
127 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
128 | #define STARFIELD_QUIT BUTTON_POWER | ||
129 | |||
126 | #endif | 130 | #endif |
127 | 131 | ||
128 | #ifdef HAVE_TOUCHSCREEN | 132 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 346d4206c2..5675458f24 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -93,6 +93,9 @@ static bool abort; | |||
93 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | 93 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD |
94 | #define STATS_STOP BUTTON_POWER | 94 | #define STATS_STOP BUTTON_POWER |
95 | 95 | ||
96 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
97 | #define STATS_STOP BUTTON_POWER | ||
98 | |||
96 | #else | 99 | #else |
97 | #error No keymap defined! | 100 | #error No keymap defined! |
98 | #endif | 101 | #endif |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 4cba167738..1b6a148caa 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -199,6 +199,9 @@ PLUGIN_HEADER | |||
199 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 199 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
200 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 200 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
201 | 201 | ||
202 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
203 | #define STOPWATCH_QUIT BUTTON_POWER | ||
204 | |||
202 | #else | 205 | #else |
203 | #error No keymap defined! | 206 | #error No keymap defined! |
204 | #endif | 207 | #endif |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 1191f37db5..1524416342 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -255,6 +255,10 @@ | |||
255 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 255 | #define SUDOKU_BUTTON_MENU BUTTON_MENU |
256 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_VIEW | 256 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_VIEW |
257 | 257 | ||
258 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
259 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | ||
260 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | ||
261 | |||
258 | #else | 262 | #else |
259 | #error No keymap defined! | 263 | #error No keymap defined! |
260 | #endif | 264 | #endif |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 31f04b3b02..87621861d9 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -63,7 +63,7 @@ char buf[255]; | |||
63 | #define ICON_HEIGHT 10 | 63 | #define ICON_HEIGHT 10 |
64 | #define ICON_WIDTH 10 | 64 | #define ICON_WIDTH 10 |
65 | 65 | ||
66 | #elif (LCD_WIDTH == 240 && LCD_HEIGHT == 320) | 66 | #elif (LCD_WIDTH == 240 && (LCD_HEIGHT == 320 || LCD_HEIGHT == 400)) |
67 | #define NUM_BOX_HEIGHT 25 | 67 | #define NUM_BOX_HEIGHT 25 |
68 | #define NUM_BOX_WIDTH 30 | 68 | #define NUM_BOX_WIDTH 30 |
69 | #define STRIDE 18 | 69 | #define STRIDE 18 |
@@ -141,6 +141,9 @@ char buf[255]; | |||
141 | #define SUPERDOM_RIGHT BUTTON_RIGHT | 141 | #define SUPERDOM_RIGHT BUTTON_RIGHT |
142 | #define SUPERDOM_CANCEL BUTTON_BACK | 142 | #define SUPERDOM_CANCEL BUTTON_BACK |
143 | 143 | ||
144 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
145 | #define SUPERDOM_CANCEL BUTTON_POWER | ||
146 | |||
144 | #endif | 147 | #endif |
145 | 148 | ||
146 | #ifdef HAVE_TOUCHSCREEN | 149 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c index b99e57bb87..a708ed7b07 100644 --- a/apps/plugins/test_codec.c +++ b/apps/plugins/test_codec.c | |||
@@ -28,7 +28,7 @@ PLUGIN_HEADER | |||
28 | #define TESTCODEC_EXITBUTTON BUTTON_RIGHT | 28 | #define TESTCODEC_EXITBUTTON BUTTON_RIGHT |
29 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 29 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
30 | #define TESTCODEC_EXITBUTTON BUTTON_RC_PLAY | 30 | #define TESTCODEC_EXITBUTTON BUTTON_RC_PLAY |
31 | #elif CONFIG_KEYPAD == COWOND2_PAD | 31 | #elif CONFIG_KEYPAD == COWOND2_PAD || CONFIG_KEYPAD == ONDAVX747_PAD |
32 | #define TESTCODEC_EXITBUTTON BUTTON_POWER | 32 | #define TESTCODEC_EXITBUTTON BUTTON_POWER |
33 | #else | 33 | #else |
34 | #define TESTCODEC_EXITBUTTON BUTTON_SELECT | 34 | #define TESTCODEC_EXITBUTTON BUTTON_SELECT |
diff --git a/apps/plugins/test_touchscreen.c b/apps/plugins/test_touchscreen.c index 4d0c8a6744..ae7e453fd3 100644 --- a/apps/plugins/test_touchscreen.c +++ b/apps/plugins/test_touchscreen.c | |||
@@ -28,6 +28,9 @@ PLUGIN_HEADER | |||
28 | #elif (CONFIG_KEYPAD == MROBE500_PAD) | 28 | #elif (CONFIG_KEYPAD == MROBE500_PAD) |
29 | #define TOUCHSCREEN_QUIT BUTTON_POWER | 29 | #define TOUCHSCREEN_QUIT BUTTON_POWER |
30 | #define TOUCHSCREEN_TOGGLE BUTTON_RC_MODE | 30 | #define TOUCHSCREEN_TOGGLE BUTTON_RC_MODE |
31 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
32 | #define TOUCHSCREEN_QUIT BUTTON_POWER | ||
33 | #define TOUCHSCREEN_TOGGLE BUTTON_MENU | ||
31 | #endif | 34 | #endif |
32 | 35 | ||
33 | /* plugin entry point */ | 36 | /* plugin entry point */ |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index f01afbba8c..403213ef80 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -324,6 +324,11 @@ PLUGIN_HEADER | |||
324 | #define VIEWER_MENU BUTTON_MENU | 324 | #define VIEWER_MENU BUTTON_MENU |
325 | #define VIEWER_AUTOSCROLL BUTTON_VIEW | 325 | #define VIEWER_AUTOSCROLL BUTTON_VIEW |
326 | 326 | ||
327 | /* Onda VX747 keys */ | ||
328 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
329 | #define VIEWER_QUIT BUTTON_POWER | ||
330 | #define VIEWER_MENU BUTTON_MENU | ||
331 | |||
327 | #else | 332 | #else |
328 | #error No keymap defined! | 333 | #error No keymap defined! |
329 | #endif | 334 | #endif |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 9dfae72dc0..4124b94563 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -274,6 +274,13 @@ PLUGIN_HEADER | |||
274 | #define LABEL_MENU "MENU" | 274 | #define LABEL_MENU "MENU" |
275 | #define LABEL_VOLUME "UP/DOWN" | 275 | #define LABEL_VOLUME "UP/DOWN" |
276 | 276 | ||
277 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
278 | #define VUMETER_QUIT BUTTON_POWER | ||
279 | #define VUMETER_MENU BUTTON_MENU | ||
280 | #define VUMETER_MENU_EXIT BUTTON_POWER | ||
281 | #define LABEL_QUIT "POWER" | ||
282 | #define LABEL_MENU "MENU" | ||
283 | |||
277 | #else | 284 | #else |
278 | #error No keymap defined! | 285 | #error No keymap defined! |
279 | #endif | 286 | #endif |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 2eed1aa357..52b7566e40 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -275,6 +275,10 @@ PLUGIN_HEADER | |||
275 | #define PLAYERS_TEXT "Up/Down" | 275 | #define PLAYERS_TEXT "Up/Down" |
276 | #define WORMS_TEXT "Left/Right" | 276 | #define WORMS_TEXT "Left/Right" |
277 | 277 | ||
278 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
279 | |||
280 | #define BTN_QUIT BUTTON_POWER | ||
281 | |||
278 | #else | 282 | #else |
279 | #error No keymap defined! | 283 | #error No keymap defined! |
280 | #endif | 284 | #endif |
@@ -366,7 +370,7 @@ PLUGIN_HEADER | |||
366 | #define ARGH_SIZE 8 | 370 | #define ARGH_SIZE 8 |
367 | #define SPEED 4 | 371 | #define SPEED 4 |
368 | #define MAX_WORM_SEGMENTS 512 | 372 | #define MAX_WORM_SEGMENTS 512 |
369 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) | 373 | #elif (LCD_WIDTH == 240) && ((LCD_HEIGHT == 320) || (LCD_HEIGHT == 400)) |
370 | #define FOOD_SIZE 7 | 374 | #define FOOD_SIZE 7 |
371 | #define ARGH_SIZE 8 | 375 | #define ARGH_SIZE 8 |
372 | #define SPEED 4 | 376 | #define SPEED 4 |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index c486e1b4c7..704ffb0df0 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -192,6 +192,10 @@ PLUGIN_HEADER | |||
192 | #define DOWN BUTTON_DOWN | 192 | #define DOWN BUTTON_DOWN |
193 | #define PAUSE BUTTON_VIEW | 193 | #define PAUSE BUTTON_VIEW |
194 | 194 | ||
195 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
196 | |||
197 | #define QUIT BUTTON_POWER | ||
198 | |||
195 | #else | 199 | #else |
196 | #error No keymap defined! | 200 | #error No keymap defined! |
197 | #endif | 201 | #endif |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index fee6e35530..ab5073fb7a 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -150,6 +150,9 @@ | |||
150 | #define ZX_SELECT BUTTON_SELECT | 150 | #define ZX_SELECT BUTTON_SELECT |
151 | #define ZX_MENU BUTTON_MENU | 151 | #define ZX_MENU BUTTON_MENU |
152 | 152 | ||
153 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | ||
154 | #define ZX_MENU (BUTTON_MENU|BUTTON_REL) | ||
155 | |||
153 | #else | 156 | #else |
154 | #error Keymap not defined! | 157 | #error Keymap not defined! |
155 | 158 | ||