summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/plugins/battery_bench.c4
-rw-r--r--apps/plugins/blackjack.c4
-rw-r--r--apps/plugins/bounce.c3
-rw-r--r--apps/plugins/brickmania.c2
-rw-r--r--apps/plugins/calculator.c3
-rw-r--r--apps/plugins/calendar.c3
-rw-r--r--apps/plugins/chessbox/chessbox_pgn.h3
-rw-r--r--apps/plugins/chessclock.c4
-rw-r--r--apps/plugins/chip8.c4
-rw-r--r--apps/plugins/chopper.c4
-rw-r--r--apps/plugins/clix.c2
-rw-r--r--apps/plugins/cube.c2
-rw-r--r--apps/plugins/dict.c2
-rw-r--r--apps/plugins/doom/i_video.c2
-rw-r--r--apps/plugins/flipit.c4
-rw-r--r--apps/plugins/invadrox.c4
-rw-r--r--apps/plugins/jewels.c1
-rw-r--r--apps/plugins/jpeg/jpeg.h1
-rw-r--r--apps/plugins/lamp.c2
-rw-r--r--apps/plugins/lib/pluginlib_actions.c13
-rw-r--r--apps/plugins/logo.c2
-rw-r--r--apps/plugins/mandelbrot.c3
-rw-r--r--apps/plugins/matrix.c4
-rw-r--r--apps/plugins/midi/midiplay.c2
-rw-r--r--apps/plugins/minesweeper.c4
-rw-r--r--apps/plugins/mosaique.c2
-rw-r--r--apps/plugins/mp3_encoder.c4
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c3
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c3
-rw-r--r--apps/plugins/oscilloscope.c3
-rw-r--r--apps/plugins/pacbox/pacbox.h3
-rw-r--r--apps/plugins/pegbox.c4
-rw-r--r--apps/plugins/png/png.h2
-rw-r--r--apps/plugins/pong.c4
-rw-r--r--apps/plugins/reversi/reversi-gui.h3
-rw-r--r--apps/plugins/rockblox.c2
-rw-r--r--apps/plugins/rockboy/rockboy.c3
-rw-r--r--apps/plugins/rockpaint.c3
-rw-r--r--apps/plugins/sliding_puzzle.c4
-rw-r--r--apps/plugins/snake.c3
-rw-r--r--apps/plugins/snake2.c4
-rw-r--r--apps/plugins/snow.c1
-rw-r--r--apps/plugins/sokoban.c4
-rw-r--r--apps/plugins/solitaire.c4
-rw-r--r--apps/plugins/spacerocks.c4
-rw-r--r--apps/plugins/star.c4
-rw-r--r--apps/plugins/stats.c2
-rw-r--r--apps/plugins/stopwatch.c2
-rw-r--r--apps/plugins/sudoku/sudoku.h3
-rw-r--r--apps/plugins/viewer.c4
-rw-r--r--apps/plugins/vu_meter.c4
-rw-r--r--apps/plugins/wormlet.c4
-rw-r--r--apps/plugins/xobox.c4
-rw-r--r--apps/plugins/zxbox/keymaps.h3
-rw-r--r--docs/CREDITS1
-rwxr-xr-xtools/configure2
-rw-r--r--uisimulator/sdl/button.c4
-rw-r--r--uisimulator/sdl/uisdl.h6
58 files changed, 171 insertions, 17 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 683286c1a0..909de03512 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -184,6 +184,10 @@ PLUGIN_HEADER
184 184
185#define BATTERY_OFF BUTTON_POWER 185#define BATTERY_OFF BUTTON_POWER
186#define BATTERY_OFF_TXT "POWER" 186#define BATTERY_OFF_TXT "POWER"
187#elif CONFIG_KEYPAD == ONDAVX777_PAD
188
189#define BATTERY_OFF BUTTON_POWER
190#define BATTERY_OFF_TXT "POWER"
187 191
188#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 192#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
189 193
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index a2acfeeccd..ec1bd46ce9 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -399,6 +399,10 @@ enum {
399#define BJACK_QUIT BUTTON_POWER 399#define BJACK_QUIT BUTTON_POWER
400#define BJACK_DOUBLEDOWN BUTTON_VOL_DOWN 400#define BJACK_DOUBLEDOWN BUTTON_VOL_DOWN
401 401
402#elif CONFIG_KEYPAD == ONDAVX777_PAD
403#define BJACK_QUIT_NAME "POWER"
404#define BJACK_QUIT BUTTON_POWER
405
402#elif CONFIG_KEYPAD == MROBE500_PAD 406#elif CONFIG_KEYPAD == MROBE500_PAD
403#define BJACK_QUIT_NAME "POWER" 407#define BJACK_QUIT_NAME "POWER"
404#define BJACK_QUIT BUTTON_POWER 408#define BJACK_QUIT BUTTON_POWER
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c
index 8baec546ce..0768c5963d 100644
--- a/apps/plugins/bounce.c
+++ b/apps/plugins/bounce.c
@@ -174,6 +174,9 @@ PLUGIN_HEADER
174#define BOUNCE_QUIT BUTTON_POWER 174#define BOUNCE_QUIT BUTTON_POWER
175#define BOUNCE_MODE BUTTON_MENU 175#define BOUNCE_MODE BUTTON_MENU
176 176
177#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
178#define BOUNCE_QUIT BUTTON_POWER
179
177#elif CONFIG_KEYPAD == MROBE500_PAD 180#elif CONFIG_KEYPAD == MROBE500_PAD
178#define BOUNCE_QUIT BUTTON_POWER 181#define BOUNCE_QUIT BUTTON_POWER
179 182
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 08d76a0de9..c8b9f2ac1c 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -182,6 +182,8 @@ CONFIG_KEYPAD == SANSA_M200_PAD
182#define LEFT BUTTON_VOL_DOWN 182#define LEFT BUTTON_VOL_DOWN
183#define RIGHT BUTTON_VOL_UP 183#define RIGHT BUTTON_VOL_UP
184#define SELECT BUTTON_MENU 184#define SELECT BUTTON_MENU
185#elif CONFIG_KEYPAD == ONDAVX777_PAD
186#define QUIT BUTTON_POWER
185 187
186#elif CONFIG_KEYPAD == MROBE500_PAD 188#elif CONFIG_KEYPAD == MROBE500_PAD
187#define QUIT BUTTON_POWER 189#define QUIT BUTTON_POWER
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 33235fccb5..74ee482b5d 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -334,6 +334,9 @@ PLUGIN_HEADER
334#define CALCULATOR_QUIT BUTTON_POWER 334#define CALCULATOR_QUIT BUTTON_POWER
335#define CALCULATOR_CLEAR BUTTON_MENU 335#define CALCULATOR_CLEAR BUTTON_MENU
336 336
337#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
338#define CALCULATOR_QUIT BUTTON_POWER
339
337#elif CONFIG_KEYPAD == MROBE500_PAD 340#elif CONFIG_KEYPAD == MROBE500_PAD
338#define CALCULATOR_QUIT BUTTON_POWER 341#define CALCULATOR_QUIT BUTTON_POWER
339 342
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 43a71e908c..bde5b1285d 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -193,6 +193,9 @@ CONFIG_KEYPAD == SANSA_M200_PAD
193#define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT 193#define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT
194#define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT 194#define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT
195 195
196#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
197#define CALENDAR_QUIT BUTTON_POWER
198
196#elif CONFIG_KEYPAD == MROBE500_PAD 199#elif CONFIG_KEYPAD == MROBE500_PAD
197#define CALENDAR_QUIT BUTTON_POWER 200#define CALENDAR_QUIT BUTTON_POWER
198 201
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index d292e6b40a..5a58581f2b 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -333,6 +333,9 @@
333#define CB_RESTART BUTTON_VOL_DOWN 333#define CB_RESTART BUTTON_VOL_DOWN
334#define CB_MENU (BUTTON_MENU|BUTTON_REL) 334#define CB_MENU (BUTTON_MENU|BUTTON_REL)
335 335
336#elif CONFIG_KEYPAD == ONDAVX777_PAD
337#define CB_MENU BUTTON_POWER
338
336#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 339#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
337#define CB_SELECT (BUTTON_FFWD|BUTTON_RIGHT) 340#define CB_SELECT (BUTTON_FFWD|BUTTON_RIGHT)
338#define CB_UP BUTTON_UP 341#define CB_UP BUTTON_UP
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 337e2cc5b0..8eaaf05adf 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -242,6 +242,10 @@ PLUGIN_HEADER
242#define CHC_SETTINGS_DEC BUTTON_VOL_DOWN 242#define CHC_SETTINGS_DEC BUTTON_VOL_DOWN
243#define CHC_SETTINGS_CANCEL BUTTON_POWER 243#define CHC_SETTINGS_CANCEL BUTTON_POWER
244 244
245#elif CONFIG_KEYPAD == ONDAVX777_PAD
246#define CHC_QUIT BUTTON_POWER
247#define CHC_SETTINGS_CANCEL BUTTON_POWER
248
245#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 249#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
246#define CHC_QUIT BUTTON_REC 250#define CHC_QUIT BUTTON_REC
247#define CHC_STARTSTOP BUTTON_PLAY 251#define CHC_STARTSTOP BUTTON_PLAY
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index 2be281a3a2..3bdf95093a 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1102,7 +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) || CONFIG_KEYPAD == MROBE500_PAD 1105#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
1106CONFIG_KEYPAD == ONDAVX777_PAD || \
1107CONFIG_KEYPAD == MROBE500_PAD
1106#define CHIP8_OFF BUTTON_POWER 1108#define CHIP8_OFF BUTTON_POWER
1107 1109
1108#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 1110#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index 4a39d2da54..4dfef9d8ae 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -134,7 +134,9 @@ Still To do:
134#define ACTION2 BUTTON_SELECT 134#define ACTION2 BUTTON_SELECT
135#define ACTIONTEXT "MENU" 135#define ACTIONTEXT "MENU"
136 136
137#elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD 137#elif CONFIG_KEYPAD == ONDAVX747_PAD || \
138CONFIG_KEYPAD == ONDAVX777_PAD || \
139CONFIG_KEYPAD == MROBE500_PAD
138#define QUIT BUTTON_POWER 140#define QUIT BUTTON_POWER
139 141
140#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 142#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index 07158c49c1..9c53bdab70 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -144,6 +144,8 @@ PLUGIN_HEADER
144#elif (CONFIG_KEYPAD == ONDAVX747_PAD) 144#elif (CONFIG_KEYPAD == ONDAVX747_PAD)
145#define CLIX_BUTTON_QUIT BUTTON_POWER 145#define CLIX_BUTTON_QUIT BUTTON_POWER
146#define CLIX_BUTTON_CLICK BUTTON_MENU 146#define CLIX_BUTTON_CLICK BUTTON_MENU
147#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
148#define CLIX_BUTTON_QUIT BUTTON_POWER
147 149
148#elif (CONFIG_KEYPAD == MROBE500_PAD) 150#elif (CONFIG_KEYPAD == MROBE500_PAD)
149#define CLIX_BUTTON_QUIT BUTTON_POWER 151#define CLIX_BUTTON_QUIT BUTTON_POWER
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index b90bbee481..1c072a2edd 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -241,6 +241,8 @@ PLUGIN_HEADER
241 241
242#elif CONFIG_KEYPAD == ONDAVX747_PAD 242#elif CONFIG_KEYPAD == ONDAVX747_PAD
243#define CUBE_QUIT BUTTON_POWER 243#define CUBE_QUIT BUTTON_POWER
244#elif CONFIG_KEYPAD == ONDAVX777_PAD
245#define CUBE_QUIT BUTTON_POWER
244 246
245#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 247#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
246#define CUBE_QUIT BUTTON_REC 248#define CUBE_QUIT BUTTON_REC
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c
index 0eada8b83c..fda915ba6c 100644
--- a/apps/plugins/dict.c
+++ b/apps/plugins/dict.c
@@ -142,6 +142,8 @@ long reverse (long N) {
142#define LP_QUIT BUTTON_POWER 142#define LP_QUIT BUTTON_POWER
143#elif CONFIG_KEYPAD == ONDAVX747_PAD 143#elif CONFIG_KEYPAD == ONDAVX747_PAD
144#define LP_QUIT BUTTON_POWER 144#define LP_QUIT BUTTON_POWER
145#elif CONFIG_KEYPAD == ONDAVX777_PAD
146#define LP_QUIT BUTTON_POWER
145#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 147#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
146#define LP_QUIT BUTTON_LEFT 148#define LP_QUIT BUTTON_LEFT
147#else 149#else
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index e463ea5186..84b003be51 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -326,6 +326,8 @@ void I_ShutdownGraphics(void)
326#define DOOMBUTTON_SHOOT BUTTON_VOL_UP 326#define DOOMBUTTON_SHOOT BUTTON_VOL_UP
327#define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN 327#define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN
328#define DOOMBUTTON_MAP BUTTON_MENU 328#define DOOMBUTTON_MAP BUTTON_MENU
329#elif CONFIG_KEYPAD == ONDAVX777_PAD
330#define DOOMBUTTON_ESC BUTTON_POWER
329#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 331#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
330#define DOOMBUTTON_UP BUTTON_UP 332#define DOOMBUTTON_UP BUTTON_UP
331#define DOOMBUTTON_DOWN BUTTON_DOWN 333#define DOOMBUTTON_DOWN BUTTON_DOWN
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index 9a79be6acb..49fb5344ec 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -280,6 +280,10 @@ PLUGIN_HEADER
280 280
281#define FLIPIT_QUIT BUTTON_POWER 281#define FLIPIT_QUIT BUTTON_POWER
282 282
283#elif CONFIG_KEYPAD == ONDAVX777_PAD
284
285#define FLIPIT_QUIT BUTTON_POWER
286
283#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 287#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
284 288
285#define FLIPIT_LEFT BUTTON_LEFT 289#define FLIPIT_LEFT BUTTON_LEFT
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index 19b2b670a4..6a8a37af47 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -172,7 +172,9 @@ PLUGIN_HEADER
172#define RIGHT BUTTON_RIGHT 172#define RIGHT BUTTON_RIGHT
173#define FIRE BUTTON_SELECT 173#define FIRE BUTTON_SELECT
174 174
175#elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD 175#elif CONFIG_KEYPAD == ONDAVX747_PAD || \
176CONFIG_KEYPAD == ONDAVX777_PAD || \
177CONFIG_KEYPAD == MROBE500_PAD
176 178
177#define QUIT BUTTON_POWER 179#define QUIT BUTTON_POWER
178 180
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index b133aa1e45..01c5e1ea0b 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -242,6 +242,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
242#define HK_CANCEL "POWER" 242#define HK_CANCEL "POWER"
243 243
244#elif CONFIG_KEYPAD == ONDAVX747_PAD || \ 244#elif CONFIG_KEYPAD == ONDAVX747_PAD || \
245CONFIG_KEYPAD == ONDAVX777_PAD || \
245CONFIG_KEYPAD == MROBE500_PAD 246CONFIG_KEYPAD == MROBE500_PAD
246#define JEWELS_CANCEL BUTTON_POWER 247#define JEWELS_CANCEL BUTTON_POWER
247#define HK_CANCEL "POWER" 248#define HK_CANCEL "POWER"
diff --git a/apps/plugins/jpeg/jpeg.h b/apps/plugins/jpeg/jpeg.h
index bfe09fa4fd..b6123211d7 100644
--- a/apps/plugins/jpeg/jpeg.h
+++ b/apps/plugins/jpeg/jpeg.h
@@ -277,6 +277,7 @@
277#define JPEG_PREVIOUS BUTTON_PLAYLIST 277#define JPEG_PREVIOUS BUTTON_PLAYLIST
278 278
279#elif CONFIG_KEYPAD == ONDAVX747_PAD 279#elif CONFIG_KEYPAD == ONDAVX747_PAD
280#elif CONFIG_KEYPAD == ONDAVX777_PAD
280 281
281#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 282#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
282#define JPEG_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) 283#define JPEG_ZOOM_IN (BUTTON_PLAY|BUTTON_UP)
diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c
index 7f7204c30a..0775ef84e6 100644
--- a/apps/plugins/lamp.c
+++ b/apps/plugins/lamp.c
@@ -86,6 +86,8 @@ PLUGIN_HEADER
86# define LAMP_LEFT BUTTON_VOL_DOWN 86# define LAMP_LEFT BUTTON_VOL_DOWN
87# define LAMP_RIGHT BUTTON_VOL_UP 87# define LAMP_RIGHT BUTTON_VOL_UP
88 88
89#elif CONFIG_KEYPAD == ONDAVX777_PAD
90
89#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 91#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
90# define LAMP_LEFT BUTTON_LEFT 92# define LAMP_LEFT BUTTON_LEFT
91# define LAMP_RIGHT BUTTON_RIGHT 93# define LAMP_RIGHT BUTTON_RIGHT
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 55c2f46902..957870c0a5 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -172,6 +172,7 @@ const struct button_mapping generic_directions[] =
172 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, 172 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
173 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, 173 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
174#elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ 174#elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */
175#elif (CONFIG_KEYPAD == ONDAVX777_PAD) /* Touchscreen target */
175#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) 176#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
176 { PLA_UP, BUTTON_UP, BUTTON_NONE}, 177 { PLA_UP, BUTTON_UP, BUTTON_NONE},
177 { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, 178 { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE},
@@ -303,6 +304,7 @@ const struct button_mapping generic_left_right_fire[] =
303 { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, 304 { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
304 { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, 305 { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
305#elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ 306#elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */
307#elif (CONFIG_KEYPAD == ONDAVX777_PAD) /* Touchscreen target */
306#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) 308#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
307 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, 309 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
308 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, 310 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
@@ -471,6 +473,12 @@ const struct button_mapping generic_actions[] =
471 {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, 473 {PLA_MENU, BUTTON_MENU, BUTTON_NONE},
472 {PLA_FIRE, BUTTON_VOL_UP, BUTTON_NONE}, 474 {PLA_FIRE, BUTTON_VOL_UP, BUTTON_NONE},
473 {PLA_FIRE_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, 475 {PLA_FIRE_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE},
476#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
477 {PLA_QUIT, BUTTON_POWER, BUTTON_NONE},
478 {PLA_START, BUTTON_VOL_DOWN, BUTTON_NONE},
479 {PLA_MENU, BUTTON_MENU, BUTTON_NONE},
480 {PLA_FIRE, BUTTON_VOL_UP, BUTTON_NONE},
481 {PLA_FIRE_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE},
474#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) 482#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
475 {PLA_QUIT, BUTTON_REW, BUTTON_NONE}, 483 {PLA_QUIT, BUTTON_REW, BUTTON_NONE},
476 {PLA_START, BUTTON_FFWD, BUTTON_NONE}, 484 {PLA_START, BUTTON_FFWD, BUTTON_NONE},
@@ -557,6 +565,11 @@ const struct button_mapping generic_increase_decrease[] =
557 {PLA_DEC, BUTTON_VOL_DOWN, BUTTON_NONE}, 565 {PLA_DEC, BUTTON_VOL_DOWN, BUTTON_NONE},
558 {PLA_INC_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, 566 {PLA_INC_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE},
559 {PLA_DEC_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, 567 {PLA_DEC_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE},
568#elif CONFIG_KEYPAD == ONDAVX777_PAD
569 {PLA_INC, BUTTON_VOL_UP, BUTTON_NONE},
570 {PLA_DEC, BUTTON_VOL_DOWN, BUTTON_NONE},
571 {PLA_INC_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE},
572 {PLA_DEC_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE},
560#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 573#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
561 {PLA_INC, BUTTON_UP, BUTTON_NONE}, 574 {PLA_INC, BUTTON_UP, BUTTON_NONE},
562 {PLA_DEC, BUTTON_DOWN, BUTTON_NONE}, 575 {PLA_DEC, BUTTON_DOWN, BUTTON_NONE},
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c
index 2456704bd1..2f84dc621e 100644
--- a/apps/plugins/logo.c
+++ b/apps/plugins/logo.c
@@ -169,6 +169,8 @@ const unsigned char rockbox16x7[] = {
169 169
170#elif CONFIG_KEYPAD == ONDAVX747_PAD 170#elif CONFIG_KEYPAD == ONDAVX747_PAD
171#define LP_QUIT BUTTON_POWER 171#define LP_QUIT BUTTON_POWER
172#elif CONFIG_KEYPAD == ONDAVX777_PAD
173#define LP_QUIT BUTTON_POWER
172 174
173#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 175#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
174#define LP_QUIT BUTTON_PLAY 176#define LP_QUIT BUTTON_PLAY
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c
index 058b468465..00542cbb14 100644
--- a/apps/plugins/mandelbrot.c
+++ b/apps/plugins/mandelbrot.c
@@ -286,6 +286,9 @@ PLUGIN_HEADER
286#elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD 286#elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD
287#define MANDELBROT_QUIT BUTTON_POWER 287#define MANDELBROT_QUIT BUTTON_POWER
288 288
289#elif CONFIG_KEYPAD == ONDAVX777_PAD
290#define MANDELBROT_QUIT BUTTON_POWER
291
289#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 292#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
290#define MANDELBROT_QUIT BUTTON_REC 293#define MANDELBROT_QUIT BUTTON_REC
291#define MANDELBROT_UP BUTTON_UP 294#define MANDELBROT_UP BUTTON_UP
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c
index 12ec4e9093..5b0a371fe8 100644
--- a/apps/plugins/matrix.c
+++ b/apps/plugins/matrix.c
@@ -133,7 +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) || CONFIG_KEYPAD == MROBE500_PAD 136#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
137CONFIG_KEYPAD == ONDAVX777_PAD || \
138CONFIG_KEYPAD == MROBE500_PAD
137#define MATRIX_EXIT BUTTON_POWER 139#define MATRIX_EXIT BUTTON_POWER
138 140
139#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 141#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index c24da7f309..ab06dd15f4 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -168,6 +168,8 @@ PLUGIN_IRAM_DECLARE
168 168
169#elif CONFIG_KEYPAD == ONDAVX747_PAD 169#elif CONFIG_KEYPAD == ONDAVX747_PAD
170#define BTN_QUIT BUTTON_POWER 170#define BTN_QUIT BUTTON_POWER
171#elif CONFIG_KEYPAD == ONDAVX777_PAD
172#define BTN_QUIT BUTTON_POWER
171 173
172#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 174#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
173#define BTN_QUIT BUTTON_REW 175#define BTN_QUIT BUTTON_REW
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index a1190d5a51..7d946b1c5d 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -224,7 +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) || CONFIG_KEYPAD == MROBE500_PAD 227#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
228CONFIG_KEYPAD == ONDAVX777_PAD || \
229CONFIG_KEYPAD == MROBE500_PAD
228# define MINESWP_QUIT BUTTON_POWER 230# define MINESWP_QUIT BUTTON_POWER
229 231
230#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) 232#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c
index b54e71f3f8..0613800421 100644
--- a/apps/plugins/mosaique.c
+++ b/apps/plugins/mosaique.c
@@ -149,6 +149,8 @@ PLUGIN_HEADER
149 149
150#elif CONFIG_KEYPAD == ONDAVX747_PAD 150#elif CONFIG_KEYPAD == ONDAVX747_PAD
151#define MOSAIQUE_QUIT BUTTON_POWER 151#define MOSAIQUE_QUIT BUTTON_POWER
152#elif CONFIG_KEYPAD == ONDAVX777_PAD
153#define MOSAIQUE_QUIT BUTTON_POWER
152 154
153#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 155#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
154#define MOSAIQUE_QUIT BUTTON_PLAY 156#define MOSAIQUE_QUIT BUTTON_PLAY
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index 6ef1c762a6..e001ab8cdf 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2488,7 +2488,9 @@ void get_mp3_filename(const char *wav_name)
2488#define MP3ENC_DONE BUTTON_POWER 2488#define MP3ENC_DONE BUTTON_POWER
2489#define MP3ENC_SELECT BUTTON_SELECT 2489#define MP3ENC_SELECT BUTTON_SELECT
2490 2490
2491#elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD 2491#elif CONFIG_KEYPAD == ONDAVX747_PAD || \
2492CONFIG_KEYPAD == ONDAVX777_PAD || \
2493CONFIG_KEYPAD == MROBE500_PAD
2492#define MP3ENC_DONE BUTTON_POWER 2494#define MP3ENC_DONE BUTTON_POWER
2493 2495
2494#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 2496#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 7ca000553f..df926f4c17 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -173,6 +173,9 @@ struct mpeg_settings settings;
173#elif CONFIG_KEYPAD == ONDAVX747_PAD 173#elif CONFIG_KEYPAD == ONDAVX747_PAD
174#define MPEG_START_TIME_EXIT BUTTON_POWER 174#define MPEG_START_TIME_EXIT BUTTON_POWER
175 175
176#elif CONFIG_KEYPAD == ONDAVX777_PAD
177#define MPEG_START_TIME_EXIT BUTTON_POWER
178
176#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 179#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
177#define MPEG_START_TIME_SELECT BUTTON_PLAY 180#define MPEG_START_TIME_SELECT BUTTON_PLAY
178#define MPEG_START_TIME_LEFT BUTTON_LEFT 181#define MPEG_START_TIME_LEFT BUTTON_LEFT
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index a66a588ace..0cb5f94d19 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -285,6 +285,9 @@ CONFIG_KEYPAD == SANSA_M200_PAD
285#define MPEG_VOLDOWN BUTTON_VOL_DOWN 285#define MPEG_VOLDOWN BUTTON_VOL_DOWN
286#define MPEG_VOLUP BUTTON_VOL_UP 286#define MPEG_VOLUP BUTTON_VOL_UP
287 287
288#elif CONFIG_KEYPAD == ONDAVX777_PAD
289#define MPEG_MENU BUTTON_POWER
290
288#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 291#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
289#define MPEG_MENU BUTTON_LEFT 292#define MPEG_MENU BUTTON_LEFT
290#define MPEG_STOP BUTTON_RIGHT 293#define MPEG_STOP BUTTON_RIGHT
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 15943ef53e..43b0bb4423 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -248,6 +248,9 @@ PLUGIN_HEADER
248#define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP 248#define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP
249#define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN 249#define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN
250 250
251#elif CONFIG_KEYPAD == ONDAVX777_PAD
252#define OSCILLOSCOPE_QUIT BUTTON_POWER
253
251#elif CONFIG_KEYPAD == MROBE500_PAD 254#elif CONFIG_KEYPAD == MROBE500_PAD
252#define OSCILLOSCOPE_QUIT BUTTON_POWER 255#define OSCILLOSCOPE_QUIT BUTTON_POWER
253 256
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index a4e1f8879d..ac13e24d2c 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -196,6 +196,9 @@
196 196
197#define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) 197#define PACMAN_MENU (BUTTON_MENU|BUTTON_REL)
198 198
199#elif CONFIG_KEYPAD == ONDAVX777_PAD
200#define PACMAN_MENU BUTTON_POWER
201
199#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 202#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
200 203
201#define PACMAN_UP BUTTON_UP 204#define PACMAN_UP BUTTON_UP
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 981d2d4fc6..f0fe0cdb6f 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -356,7 +356,9 @@ PLUGIN_HEADER
356#define LVL_UP_TEXT "VOL+" 356#define LVL_UP_TEXT "VOL+"
357#define LVL_DOWN_TEXT "VOL-" 357#define LVL_DOWN_TEXT "VOL-"
358 358
359#elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD 359#elif CONFIG_KEYPAD == ONDAVX747_PAD || \
360CONFIG_KEYPAD == ONDAVX777_PAD || \
361CONFIG_KEYPAD == MROBE500_PAD
360#define PEGBOX_QUIT BUTTON_POWER 362#define PEGBOX_QUIT BUTTON_POWER
361 363
362#define QUIT_TEXT "POWER" 364#define QUIT_TEXT "POWER"
diff --git a/apps/plugins/png/png.h b/apps/plugins/png/png.h
index 090eaa959d..ddf1ac2d26 100644
--- a/apps/plugins/png/png.h
+++ b/apps/plugins/png/png.h
@@ -300,6 +300,8 @@ You are free to name this file lodepng.cpp or lodepng.c depending on your usage.
300 300
301#elif CONFIG_KEYPAD == ONDAVX747_PAD 301#elif CONFIG_KEYPAD == ONDAVX747_PAD
302#define PNG_MENU BUTTON_POWER 302#define PNG_MENU BUTTON_POWER
303#elif CONFIG_KEYPAD == ONDAVX777_PAD
304#define PNG_MENU BUTTON_POWER
303 305
304#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 306#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
305#define PNG_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) 307#define PNG_ZOOM_IN (BUTTON_PLAY|BUTTON_UP)
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index c49b863717..a6144d9664 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -184,7 +184,9 @@ PLUGIN_HEADER
184#define PONG_RIGHT_UP BUTTON_VOL_UP 184#define PONG_RIGHT_UP BUTTON_VOL_UP
185#define PONG_RIGHT_DOWN BUTTON_VOL_DOWN 185#define PONG_RIGHT_DOWN BUTTON_VOL_DOWN
186 186
187#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD 187#elif CONFIG_KEYPAD == ONDAVX747_PAD || \
188CONFIG_KEYPAD == ONDAVX777_PAD || \
189CONFIG_KEYPAD == MROBE500_PAD
188#define PONG_QUIT BUTTON_POWER 190#define PONG_QUIT BUTTON_POWER
189 191
190#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 192#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index ffb6b53af3..97b85b48b6 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -186,6 +186,9 @@
186#define REVERSI_BUTTON_QUIT BUTTON_POWER 186#define REVERSI_BUTTON_QUIT BUTTON_POWER
187#define REVERSI_BUTTON_MENU BUTTON_MENU 187#define REVERSI_BUTTON_MENU BUTTON_MENU
188 188
189#elif CONFIG_KEYPAD == ONDAVX777_PAD
190#define REVERSI_BUTTON_QUIT BUTTON_POWER
191
189#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 192#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
190#define REVERSI_BUTTON_QUIT BUTTON_REC 193#define REVERSI_BUTTON_QUIT BUTTON_REC
191#define REVERSI_BUTTON_UP BUTTON_UP 194#define REVERSI_BUTTON_UP BUTTON_UP
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 3692526073..0314a7c516 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -286,6 +286,8 @@ PLUGIN_HEADER
286#elif CONFIG_KEYPAD == ONDAVX747_PAD 286#elif CONFIG_KEYPAD == ONDAVX747_PAD
287#define ROCKBLOX_OFF BUTTON_POWER 287#define ROCKBLOX_OFF BUTTON_POWER
288#define ROCKBLOX_RESTART BUTTON_MENU 288#define ROCKBLOX_RESTART BUTTON_MENU
289#elif CONFIG_KEYPAD == ONDAVX777_PAD
290#define ROCKBLOX_OFF BUTTON_POWER
289 291
290#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 292#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
291 293
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index d073f9306f..bf56c6a148 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -237,6 +237,9 @@ static void setoptions (void)
237 options.B=BUTTON_VOL_DOWN; 237 options.B=BUTTON_VOL_DOWN;
238 options.MENU=BUTTON_MENU; 238 options.MENU=BUTTON_MENU;
239 239
240#elif CONFIG_KEYPAD == ONDAVX777_PAD
241 options.MENU=BUTTON_POWER;
242
240#elif CONFIG_KEYPAD == IRIVER_H10_PAD 243#elif CONFIG_KEYPAD == IRIVER_H10_PAD
241 options.UP=BUTTON_UP; 244 options.UP=BUTTON_UP;
242 options.DOWN=BUTTON_DOWN; 245 options.DOWN=BUTTON_DOWN;
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index 12b30d484d..78fe7b46fe 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -159,6 +159,9 @@ PLUGIN_HEADER
159#define ROCKPAINT_QUIT BUTTON_POWER 159#define ROCKPAINT_QUIT BUTTON_POWER
160#define ROCKPAINT_MENU BUTTON_MENU 160#define ROCKPAINT_MENU BUTTON_MENU
161 161
162#elif ( CONFIG_KEYPAD == ONDAVX777_PAD )
163#define ROCKPAINT_QUIT BUTTON_POWER
164
162#elif CONFIG_KEYPAD == MROBE500_PAD 165#elif CONFIG_KEYPAD == MROBE500_PAD
163#define ROCKPAINT_QUIT BUTTON_POWER 166#define ROCKPAINT_QUIT BUTTON_POWER
164 167
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index af7fe83299..2f1d366960 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -188,7 +188,9 @@ PLUGIN_HEADER
188#define PUZZLE_SHUFFLE BUTTON_VIEW 188#define PUZZLE_SHUFFLE BUTTON_VIEW
189#define PUZZLE_PICTURE BUTTON_MENU 189#define PUZZLE_PICTURE BUTTON_MENU
190 190
191#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD 191#elif CONFIG_KEYPAD == ONDAVX747_PAD || \
192CONFIG_KEYPAD == ONDAVX777_PAD || \
193CONFIG_KEYPAD == MROBE500_PAD
192#define PUZZLE_QUIT BUTTON_POWER 194#define PUZZLE_QUIT BUTTON_POWER
193#define PUZZLE_QUIT_TEXT "[POWER]" 195#define PUZZLE_QUIT_TEXT "[POWER]"
194 196
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index e2e34e3f06..54d1d5dce3 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -180,6 +180,9 @@ PLUGIN_HEADER
180#elif (CONFIG_KEYPAD == ONDAVX747_PAD) 180#elif (CONFIG_KEYPAD == ONDAVX747_PAD)
181#define SNAKE_QUIT BUTTON_POWER 181#define SNAKE_QUIT BUTTON_POWER
182 182
183#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
184#define SNAKE_QUIT BUTTON_POWER
185
183#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 186#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
184#define SNAKE_QUIT BUTTON_REC 187#define SNAKE_QUIT BUTTON_REC
185#define SNAKE_LEFT BUTTON_LEFT 188#define SNAKE_LEFT BUTTON_LEFT
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index d858976a31..c611521752 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -285,7 +285,9 @@ PLUGIN_HEADER
285#define SNAKE2_PLAYPAUSE BUTTON_VIEW 285#define SNAKE2_PLAYPAUSE BUTTON_VIEW
286#define SNAKE2_PLAYPAUSE_TEXT "View" 286#define SNAKE2_PLAYPAUSE_TEXT "View"
287 287
288#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD 288#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
289(CONFIG_KEYPAD == ONDAVX777_PAD) || \
290CONFIG_KEYPAD == MROBE500_PAD
289#define SNAKE2_QUIT BUTTON_POWER 291#define SNAKE2_QUIT BUTTON_POWER
290 292
291#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) 293#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c
index 01930b7363..99b6811df6 100644
--- a/apps/plugins/snow.c
+++ b/apps/plugins/snow.c
@@ -59,6 +59,7 @@ PLUGIN_HEADER
59(CONFIG_KEYPAD == IAUDIO67_PAD) || \ 59(CONFIG_KEYPAD == IAUDIO67_PAD) || \
60(CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ 60(CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
61(CONFIG_KEYPAD == ONDAVX747_PAD) || \ 61(CONFIG_KEYPAD == ONDAVX747_PAD) || \
62(CONFIG_KEYPAD == ONDAVX777_PAD) || \
62(CONFIG_KEYPAD == GIGABEAT_PAD) || \ 63(CONFIG_KEYPAD == GIGABEAT_PAD) || \
63(CONFIG_KEYPAD == IAUDIO_X5M5_PAD) 64(CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
64#define SNOW_QUIT BUTTON_POWER 65#define SNOW_QUIT BUTTON_POWER
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 2b90b93094..0d8a0821e5 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -380,6 +380,10 @@ PLUGIN_HEADER
380#define SOKOBAN_MENU BUTTON_MENU 380#define SOKOBAN_MENU BUTTON_MENU
381#define SOKOBAN_MENU_NAME "[MENU]" 381#define SOKOBAN_MENU_NAME "[MENU]"
382 382
383#elif CONFIG_KEYPAD == ONDAVX777_PAD
384#define SOKOBAN_MENU BUTTON_POWER
385#define SOKOBAN_MENU_NAME "[POWER]"
386
383#elif CONFIG_KEYPAD == MROBE500_PAD 387#elif CONFIG_KEYPAD == MROBE500_PAD
384 388
385#define SOKOBAN_MENU BUTTON_POWER 389#define SOKOBAN_MENU BUTTON_POWER
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 0b7d8ac3c7..2296a6ef5a 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -395,7 +395,9 @@ PLUGIN_HEADER
395# define HK_CUR2STACK "SELECT.." 395# define HK_CUR2STACK "SELECT.."
396# define HK_REM2STACK "VIEW+RIGHT" 396# define HK_REM2STACK "VIEW+RIGHT"
397 397
398#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD 398#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
399(CONFIG_KEYPAD == ONDAVX777_PAD) || \
400CONFIG_KEYPAD == MROBE500_PAD
399# define SOL_QUIT BUTTON_POWER 401# define SOL_QUIT BUTTON_POWER
400 402
401#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) 403#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index b0c9a4d604..ded3900b05 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -197,7 +197,9 @@ PLUGIN_HEADER
197#define AST_RIGHT BUTTON_RIGHT 197#define AST_RIGHT BUTTON_RIGHT
198#define AST_FIRE BUTTON_PLAYLIST 198#define AST_FIRE BUTTON_PLAYLIST
199 199
200#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD 200#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
201(CONFIG_KEYPAD == ONDAVX777_PAD) || \
202CONFIG_KEYPAD == MROBE500_PAD
201#define AST_QUIT BUTTON_POWER 203#define AST_QUIT BUTTON_POWER
202 204
203#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) 205#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 118a18227c..663c9dfca3 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -332,6 +332,10 @@ PLUGIN_HEADER
332#define STAR_QUIT BUTTON_POWER 332#define STAR_QUIT BUTTON_POWER
333#define STAR_QUIT_NAME "POWER" 333#define STAR_QUIT_NAME "POWER"
334 334
335#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
336#define STAR_QUIT BUTTON_POWER
337#define STAR_QUIT_NAME "POWER"
338
335#elif CONFIG_KEYPAD == MROBE500_PAD 339#elif CONFIG_KEYPAD == MROBE500_PAD
336#define STAR_QUIT BUTTON_POWER 340#define STAR_QUIT BUTTON_POWER
337#define STAR_QUIT_NAME "POWER" 341#define STAR_QUIT_NAME "POWER"
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index 495523738c..16eac4769c 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -96,6 +96,8 @@ static bool abort;
96 96
97#elif CONFIG_KEYPAD == ONDAVX747_PAD 97#elif CONFIG_KEYPAD == ONDAVX747_PAD
98#define STATS_STOP BUTTON_POWER 98#define STATS_STOP BUTTON_POWER
99#elif CONFIG_KEYPAD == ONDAVX777_PAD
100#define STATS_STOP BUTTON_POWER
99 101
100#else 102#else
101#error No keymap defined! 103#error No keymap defined!
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index f0d8f16540..8c06ee0a5a 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -196,6 +196,8 @@ PLUGIN_HEADER
196 196
197#elif CONFIG_KEYPAD == ONDAVX747_PAD 197#elif CONFIG_KEYPAD == ONDAVX747_PAD
198#define STOPWATCH_QUIT BUTTON_POWER 198#define STOPWATCH_QUIT BUTTON_POWER
199#elif CONFIG_KEYPAD == ONDAVX777_PAD
200#define STOPWATCH_QUIT BUTTON_POWER
199 201
200#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 202#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
201#define STOPWATCH_QUIT BUTTON_REC 203#define STOPWATCH_QUIT BUTTON_REC
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index d4dd19232f..4669774f06 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -248,6 +248,9 @@
248#define SUDOKU_BUTTON_QUIT BUTTON_POWER 248#define SUDOKU_BUTTON_QUIT BUTTON_POWER
249#define SUDOKU_BUTTON_MENU BUTTON_MENU 249#define SUDOKU_BUTTON_MENU BUTTON_MENU
250 250
251#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
252#define SUDOKU_BUTTON_QUIT BUTTON_POWER
253
251#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 254#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
252#define SUDOKU_BUTTON_QUIT BUTTON_REC 255#define SUDOKU_BUTTON_QUIT BUTTON_REC
253#define SUDOKU_BUTTON_UP BUTTON_UP 256#define SUDOKU_BUTTON_UP BUTTON_UP
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c
index f2a3f9f029..4d83dd0cc0 100644
--- a/apps/plugins/viewer.c
+++ b/apps/plugins/viewer.c
@@ -329,6 +329,10 @@ PLUGIN_HEADER
329#define VIEWER_QUIT BUTTON_POWER 329#define VIEWER_QUIT BUTTON_POWER
330#define VIEWER_MENU BUTTON_MENU 330#define VIEWER_MENU BUTTON_MENU
331 331
332/* Onda VX777 keys */
333#elif CONFIG_KEYPAD == ONDAVX777_PAD
334#define VIEWER_QUIT BUTTON_POWER
335
332/* SAMSUNG YH-820 / YH-920 / YH-925 keys */ 336/* SAMSUNG YH-820 / YH-920 / YH-925 keys */
333#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 337#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
334#define VIEWER_QUIT BUTTON_REC 338#define VIEWER_QUIT BUTTON_REC
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 80e9ccbb20..0b331b7581 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -279,6 +279,10 @@ PLUGIN_HEADER
279#define LABEL_QUIT "POWER" 279#define LABEL_QUIT "POWER"
280#define LABEL_MENU "MENU" 280#define LABEL_MENU "MENU"
281 281
282#elif CONFIG_KEYPAD == ONDAVX777_PAD
283#define VUMETER_QUIT BUTTON_POWER
284#define LABEL_QUIT "POWER"
285
282#elif CONFIG_KEYPAD == MROBE500_PAD 286#elif CONFIG_KEYPAD == MROBE500_PAD
283#define VUMETER_QUIT BUTTON_POWER 287#define VUMETER_QUIT BUTTON_POWER
284#define LABEL_QUIT "POWER" 288#define LABEL_QUIT "POWER"
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index eb76e922d9..4d86453178 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -232,7 +232,9 @@ PLUGIN_HEADER
232#define BTN_QUIT BUTTON_POWER 232#define BTN_QUIT BUTTON_POWER
233#define BTN_STOPRESET BUTTON_VIEW 233#define BTN_STOPRESET BUTTON_VIEW
234 234
235#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD 235#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
236(CONFIG_KEYPAD == ONDAVX777_PAD) || \
237CONFIG_KEYPAD == MROBE500_PAD
236 238
237#define BTN_QUIT BUTTON_POWER 239#define BTN_QUIT BUTTON_POWER
238 240
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index daf627d590..3b7ada31f4 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -199,7 +199,9 @@ PLUGIN_HEADER
199#define DOWN BUTTON_DOWN 199#define DOWN BUTTON_DOWN
200#define PAUSE BUTTON_VIEW 200#define PAUSE BUTTON_VIEW
201 201
202#elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD 202#elif CONFIG_KEYPAD == ONDAVX747_PAD || \
203CONFIG_KEYPAD == ONDAVX777_PAD || \
204CONFIG_KEYPAD == MROBE500_PAD
203 205
204#define QUIT BUTTON_POWER 206#define QUIT BUTTON_POWER
205 207
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index eb25adcbe4..29a27de6a8 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -160,6 +160,9 @@
160#elif CONFIG_KEYPAD == ONDAVX747_PAD 160#elif CONFIG_KEYPAD == ONDAVX747_PAD
161#define ZX_MENU (BUTTON_MENU|BUTTON_REL) 161#define ZX_MENU (BUTTON_MENU|BUTTON_REL)
162 162
163#elif CONFIG_KEYPAD == ONDAVX777_PAD
164#define ZX_MENU BUTTON_POWER
165
163#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 166#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
164 167
165#define ZX_UP BUTTON_UP 168#define ZX_UP BUTTON_UP
diff --git a/docs/CREDITS b/docs/CREDITS
index bd92cae474..a4bb7e17b0 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -490,6 +490,7 @@ Amaury Pouly
490Laurent Papier 490Laurent Papier
491Johannes Boy 491Johannes Boy
492Jason Yu 492Jason Yu
493Aaron DeMille
493 494
494The libmad team 495The libmad team
495The wavpack team 496The wavpack team
diff --git a/tools/configure b/tools/configure
index 2f96f377e5..3cbb77fedf 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2224,7 +2224,7 @@ fi
2224 bmp2rb_native="$rootdir/tools/bmp2rb -f 4" 2224 bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
2225 output="rockbox.vx777" 2225 output="rockbox.vx777"
2226 appextra="recorder:gui" 2226 appextra="recorder:gui"
2227 plugins="" #TODO 2227 plugins="yes"
2228 swcodec="yes" 2228 swcodec="yes"
2229 toolset=$genericbitmaptools 2229 toolset=$genericbitmaptools
2230 boottool="$rootdir/tools/scramble -ccpmp" 2230 boottool="$rootdir/tools/scramble -ccpmp"
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 5987584420..45dfc3fe2c 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -1166,6 +1166,10 @@ void button_event(int key, bool pressed)
1166 case SDLK_RETURN: 1166 case SDLK_RETURN:
1167 new_btn = BUTTON_MENU; 1167 new_btn = BUTTON_MENU;
1168 break; 1168 break;
1169#elif CONFIG_KEYPAD == ONDAVX777_PAD
1170 case SDLK_ESCAPE:
1171 new_btn = BUTTON_POWER;
1172 break;
1169#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 1173#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
1170 case SDLK_KP4: 1174 case SDLK_KP4:
1171 case SDLK_LEFT: 1175 case SDLK_LEFT:
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index 962e49d8f1..7b0bbf0f24 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -315,11 +315,13 @@
315#define UI_LCD_POSX 42 /* x position of lcd */ 315#define UI_LCD_POSX 42 /* x position of lcd */
316#define UI_LCD_POSY 55 /* y position of lcd */ 316#define UI_LCD_POSY 55 /* y position of lcd */
317 317
318#elif defined(ONDA_VX747) || defined(ONDA_VX747P) 318#elif defined(ONDA_VX747) || defined(ONDA_VX747P) || defined(ONDA_VX777)
319#ifdef ONDA_VX747 319#ifdef ONDA_VX747
320#define UI_TITLE "Onda VX747" 320#define UI_TITLE "Onda VX747"
321#else 321#elif defined(ONDA_VX747P)
322#define UI_TITLE "Onda VX747+" 322#define UI_TITLE "Onda VX747+"
323#else
324#define UI_TITLE "Onda VX777"
323#endif 325#endif
324#define UI_WIDTH 340 /* width of GUI window */ 326#define UI_WIDTH 340 /* width of GUI window */
325#define UI_HEIGHT 601 /* height of GUI window */ 327#define UI_HEIGHT 601 /* height of GUI window */