diff options
author | Michael Giacomelli <giac2000@hotmail.com> | 2009-08-04 03:08:32 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2009-08-04 03:08:32 +0000 |
commit | 594b6e2b496e69ca843b21bf04810bdb919099a7 (patch) | |
tree | 046af11c0c199fae3e41006f5aff39b4f6539f4f | |
parent | 11ac0b3f2a7d2abc0ae6127752559b1ffafbebff (diff) | |
download | rockbox-594b6e2b496e69ca843b21bf04810bdb919099a7.tar.gz rockbox-594b6e2b496e69ca843b21bf04810bdb919099a7.zip |
Commit FS#10251. Plugins for the YH-820, YH-920, and YH-925 by Jens Erdmann with improvements and bitmap graphics by me.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22149 a1c6a512-1295-4272-9138-f99709370657
76 files changed, 683 insertions, 8 deletions
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c index 4f9a010991..2cb7b4b67a 100755 --- a/apps/keymaps/keymap-yh8xx_yh9xx.c +++ b/apps/keymaps/keymap-yh8xx_yh9xx.c | |||
@@ -19,7 +19,7 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | /* Button Code Definitions for iriver h100/h300 target */ | 22 | /* Button Code Definitions for samsung yh-820 / yh-920 / yh-925 target */ |
23 | #include <stdio.h> | 23 | #include <stdio.h> |
24 | #include <string.h> | 24 | #include <string.h> |
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index 91ce3c2425..76934579a9 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS | |||
@@ -33,7 +33,7 @@ zxbox | |||
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | /* For all big enough colour screens, iriver H1x0 and iAudio M5 */ | 35 | /* For all big enough colour screens, iriver H1x0 and iAudio M5 */ |
36 | #if defined(HAVE_LCD_COLOR) && LCD_HEIGHT > 80\ | 36 | #if defined(HAVE_LCD_COLOR) && LCD_HEIGHT > 96\ |
37 | || defined(IRIVER_H100_SERIES) || defined(IAUDIO_M5) | 37 | || defined(IRIVER_H100_SERIES) || defined(IAUDIO_M5) |
38 | pacbox | 38 | pacbox |
39 | #endif | 39 | #endif |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index aed9c77317..683286c1a0 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -185,6 +185,13 @@ PLUGIN_HEADER | |||
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 | 187 | ||
188 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
189 | |||
190 | #define BATTERY_ON BUTTON_LEFT | ||
191 | #define BATTERY_OFF BUTTON_RIGHT | ||
192 | #define BATTERY_ON_TXT "LEFT" | ||
193 | #define BATTERY_OFF_TXT "RIGHT" | ||
194 | |||
188 | #else | 195 | #else |
189 | #error No keymap defined! | 196 | #error No keymap defined! |
190 | #endif | 197 | #endif |
diff --git a/apps/plugins/beatbox/beatbox.c b/apps/plugins/beatbox/beatbox.c index 3dbaa827b9..0974dc3d05 100644 --- a/apps/plugins/beatbox/beatbox.c +++ b/apps/plugins/beatbox/beatbox.c | |||
@@ -83,6 +83,12 @@ PLUGIN_IRAM_DECLARE | |||
83 | #define BTN_UP BUTTON_SCROLL_UP | 83 | #define BTN_UP BUTTON_SCROLL_UP |
84 | #define BTN_DOWN BUTTON_SCROLL_DOWN | 84 | #define BTN_DOWN BUTTON_SCROLL_DOWN |
85 | 85 | ||
86 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
87 | #define BTN_QUIT BUTTON_PLAY | ||
88 | #define BTN_RIGHT BUTTON_RIGHT | ||
89 | #define BTN_UP BUTTON_UP | ||
90 | #define BTN_DOWN BUTTON_DOWN | ||
91 | |||
86 | #endif | 92 | #endif |
87 | 93 | ||
88 | 94 | ||
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index df93395ee1..4d98b7e4e6 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -136,6 +136,9 @@ bubbles_background.128x128x16.bmp | |||
136 | #elif (LCD_WIDTH >= 132) && (LCD_HEIGHT >= 80) | 136 | #elif (LCD_WIDTH >= 132) && (LCD_HEIGHT >= 80) |
137 | bubbles_emblem.132x80x16.bmp | 137 | bubbles_emblem.132x80x16.bmp |
138 | bubbles_background.132x80x16.bmp | 138 | bubbles_background.132x80x16.bmp |
139 | #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) | ||
140 | bubbles_emblem.132x80x16.bmp | ||
141 | bubbles_background.128x96x16.bmp | ||
139 | #endif | 142 | #endif |
140 | #elif LCD_DEPTH <= 2 /* greyscale, mono */ | 143 | #elif LCD_DEPTH <= 2 /* greyscale, mono */ |
141 | #if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) | 144 | #if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) |
@@ -469,6 +472,8 @@ rockblox_background.160x128x16.bmp | |||
469 | rockblox_background.128x128x16.bmp | 472 | rockblox_background.128x128x16.bmp |
470 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) | 473 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) |
471 | rockblox_background.132x80x16.bmp | 474 | rockblox_background.132x80x16.bmp |
475 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) | ||
476 | rockblox_background.128x96x2.bmp | ||
472 | #endif | 477 | #endif |
473 | #elif LCD_DEPTH == 2 /* greyscale versions */ | 478 | #elif LCD_DEPTH == 2 /* greyscale versions */ |
474 | #if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) | 479 | #if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) |
diff --git a/apps/plugins/bitmaps/native/bubbles_background.128x96x16.bmp b/apps/plugins/bitmaps/native/bubbles_background.128x96x16.bmp new file mode 100755 index 0000000000..e285a8171e --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_background.128x96x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/rockblox_background.128x96x16.bmp b/apps/plugins/bitmaps/native/rockblox_background.128x96x16.bmp new file mode 100755 index 0000000000..0d576928d3 --- /dev/null +++ b/apps/plugins/bitmaps/native/rockblox_background.128x96x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 97b44b3d3c..317b164aeb 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -401,6 +401,21 @@ struct highscore highest[NUM_SCORES]; | |||
401 | #define BJACK_QUIT_NAME "POWER" | 401 | #define BJACK_QUIT_NAME "POWER" |
402 | #define BJACK_QUIT BUTTON_POWER | 402 | #define BJACK_QUIT BUTTON_POWER |
403 | 403 | ||
404 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
405 | #define BJACK_START (BUTTON_PLAY|BUTTON_RIGHT) | ||
406 | #define BJACK_QUIT (BUTTON_PLAY|BUTTON_LEFT) | ||
407 | #define BJACK_MAX (BUTTON_PLAY|BUTTON_UP) | ||
408 | #define BJACK_MIN (BUTTON_PLAY|BUTTON_DOWN) | ||
409 | #define BJACK_HIT BUTTON_PLAY | ||
410 | #define BJACK_STAY BUTTON_REC | ||
411 | #define BJACK_DOUBLEDOWN BUTTON_FFWD | ||
412 | #define BJACK_SCORES (BUTTON_PLAY|BUTTON_REW) | ||
413 | #define BJACK_RESUME BUTTON_REW | ||
414 | #define BJACK_UP BUTTON_UP | ||
415 | #define BJACK_DOWN BUTTON_DOWN | ||
416 | #define BJACK_RIGHT BUTTON_RIGHT | ||
417 | #define BJACK_LEFT BUTTON_LEFT | ||
418 | |||
404 | #else | 419 | #else |
405 | #error No keymap defined! | 420 | #error No keymap defined! |
406 | #endif | 421 | #endif |
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 14bc7dea98..8baec546ce 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -177,6 +177,14 @@ PLUGIN_HEADER | |||
177 | #elif CONFIG_KEYPAD == MROBE500_PAD | 177 | #elif CONFIG_KEYPAD == MROBE500_PAD |
178 | #define BOUNCE_QUIT BUTTON_POWER | 178 | #define BOUNCE_QUIT BUTTON_POWER |
179 | 179 | ||
180 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
181 | #define BOUNCE_LEFT BUTTON_LEFT | ||
182 | #define BOUNCE_RIGHT BUTTON_RIGHT | ||
183 | #define BOUNCE_UP BUTTON_UP | ||
184 | #define BOUNCE_DOWN BUTTON_DOWN | ||
185 | #define BOUNCE_QUIT BUTTON_FFWD | ||
186 | #define BOUNCE_MODE BUTTON_PLAY | ||
187 | |||
180 | #else | 188 | #else |
181 | #error No keymap defined! | 189 | #error No keymap defined! |
182 | #endif | 190 | #endif |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index e2273c7c87..b5c31372f3 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -186,6 +186,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
186 | #elif CONFIG_KEYPAD == MROBE500_PAD | 186 | #elif CONFIG_KEYPAD == MROBE500_PAD |
187 | #define QUIT BUTTON_POWER | 187 | #define QUIT BUTTON_POWER |
188 | 188 | ||
189 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
190 | #define QUIT BUTTON_FFWD | ||
191 | #define SELECT BUTTON_PLAY | ||
192 | #define LEFT BUTTON_LEFT | ||
193 | #define RIGHT BUTTON_RIGHT | ||
194 | #define UP BUTTON_UP | ||
195 | #define DOWN BUTTON_DOWN | ||
196 | |||
197 | |||
189 | #else | 198 | #else |
190 | #error No keymap defined! | 199 | #error No keymap defined! |
191 | #endif | 200 | #endif |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 135335a7fc..33235fccb5 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -337,6 +337,17 @@ PLUGIN_HEADER | |||
337 | #elif CONFIG_KEYPAD == MROBE500_PAD | 337 | #elif CONFIG_KEYPAD == MROBE500_PAD |
338 | #define CALCULATOR_QUIT BUTTON_POWER | 338 | #define CALCULATOR_QUIT BUTTON_POWER |
339 | 339 | ||
340 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
341 | |||
342 | #define CALCULATOR_LEFT BUTTON_LEFT | ||
343 | #define CALCULATOR_RIGHT BUTTON_RIGHT | ||
344 | #define CALCULATOR_UP BUTTON_UP | ||
345 | #define CALCULATOR_DOWN BUTTON_DOWN | ||
346 | #define CALCULATOR_QUIT BUTTON_REC | ||
347 | #define CALCULATOR_INPUT BUTTON_PLAY | ||
348 | #define CALCULATOR_CALC BUTTON_FFWD | ||
349 | #define CALCULATOR_CLEAR BUTTON_REW | ||
350 | |||
340 | #else | 351 | #else |
341 | #error No keymap defined! | 352 | #error No keymap defined! |
342 | #endif | 353 | #endif |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 17116fe3e9..b9f9e8cf67 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -195,6 +195,16 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
195 | #elif CONFIG_KEYPAD == MROBE500_PAD | 195 | #elif CONFIG_KEYPAD == MROBE500_PAD |
196 | #define CALENDAR_QUIT BUTTON_POWER | 196 | #define CALENDAR_QUIT BUTTON_POWER |
197 | 197 | ||
198 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
199 | #define CALENDAR_QUIT BUTTON_REC | ||
200 | #define CALENDAR_SELECT BUTTON_PLAY | ||
201 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN | ||
202 | #define CALENDAR_PREV_WEEK BUTTON_UP | ||
203 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | ||
204 | #define CALENDAR_PREV_DAY BUTTON_LEFT | ||
205 | #define CALENDAR_NEXT_MONTH BUTTON_FFWD | ||
206 | #define CALENDAR_PREV_MONTH BUTTON_REW | ||
207 | |||
198 | #else | 208 | #else |
199 | #error "No keypad setting." | 209 | #error "No keypad setting." |
200 | #endif | 210 | #endif |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index abb0f8399b..d292e6b40a 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -333,6 +333,16 @@ | |||
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 == SAMSUNG_YH_PAD | ||
337 | #define CB_SELECT (BUTTON_FFWD|BUTTON_RIGHT) | ||
338 | #define CB_UP BUTTON_UP | ||
339 | #define CB_DOWN BUTTON_DOWN | ||
340 | #define CB_LEFT BUTTON_LEFT | ||
341 | #define CB_RIGHT BUTTON_RIGHT | ||
342 | #define CB_PLAY BUTTON_PLAY | ||
343 | #define CB_LEVEL (BUTTON_FFWD|BUTTON_UP) | ||
344 | #define CB_MENU (BUTTON_FFWD|BUTTON_LEFT) | ||
345 | |||
336 | #else | 346 | #else |
337 | #error No keymap defined! | 347 | #error No keymap defined! |
338 | #endif | 348 | #endif |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 8954e9ab13..28b1d95df3 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -241,6 +241,16 @@ PLUGIN_HEADER | |||
241 | #define CHC_SETTINGS_DEC BUTTON_VOL_DOWN | 241 | #define CHC_SETTINGS_DEC BUTTON_VOL_DOWN |
242 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | 242 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
243 | 243 | ||
244 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
245 | #define CHC_QUIT BUTTON_REC | ||
246 | #define CHC_STARTSTOP BUTTON_PLAY | ||
247 | #define CHC_RESET BUTTON_FFWD | ||
248 | #define CHC_MENU BUTTON_LEFT | ||
249 | #define CHC_SETTINGS_INC BUTTON_UP | ||
250 | #define CHC_SETTINGS_DEC BUTTON_DOWN | ||
251 | #define CHC_SETTINGS_OK BUTTON_PLAY | ||
252 | #define CHC_SETTINGS_CANCEL BUTTON_REW | ||
253 | |||
244 | #else | 254 | #else |
245 | #error No keymap defined! | 255 | #error No keymap defined! |
246 | #endif | 256 | #endif |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 0fc2c61e65..2be281a3a2 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1105,6 +1105,13 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
1105 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD | 1105 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD |
1106 | #define CHIP8_OFF BUTTON_POWER | 1106 | #define CHIP8_OFF BUTTON_POWER |
1107 | 1107 | ||
1108 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
1109 | #define CHIP8_OFF BUTTON_REC | ||
1110 | #define CHIP8_KEY2 BUTTON_UP | ||
1111 | #define CHIP8_KEY4 BUTTON_LEFT | ||
1112 | #define CHIP8_KEY5 BUTTON_PLAY | ||
1113 | #define CHIP8_KEY6 BUTTON_RIGHT | ||
1114 | #define CHIP8_KEY8 BUTTON_DOWN | ||
1108 | #else | 1115 | #else |
1109 | #error No keymap defined! | 1116 | #error No keymap defined! |
1110 | #endif | 1117 | #endif |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index a75a8d42cc..4a39d2da54 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -137,6 +137,11 @@ Still To do: | |||
137 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD | 137 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD |
138 | #define QUIT BUTTON_POWER | 138 | #define QUIT BUTTON_POWER |
139 | 139 | ||
140 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
141 | #define QUIT BUTTON_LEFT | ||
142 | #define ACTION BUTTON_RIGHT | ||
143 | #define ACTIONTEXT "RIGHT" | ||
144 | |||
140 | #else | 145 | #else |
141 | #error No keymap defined! | 146 | #error No keymap defined! |
142 | #endif | 147 | #endif |
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index 2b5b7febeb..07158c49c1 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -148,6 +148,14 @@ PLUGIN_HEADER | |||
148 | #elif (CONFIG_KEYPAD == MROBE500_PAD) | 148 | #elif (CONFIG_KEYPAD == MROBE500_PAD) |
149 | #define CLIX_BUTTON_QUIT BUTTON_POWER | 149 | #define CLIX_BUTTON_QUIT BUTTON_POWER |
150 | 150 | ||
151 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
152 | #define CLIX_BUTTON_QUIT BUTTON_REC | ||
153 | #define CLIX_BUTTON_LEFT BUTTON_LEFT | ||
154 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT | ||
155 | #define CLIX_BUTTON_CLICK BUTTON_PLAY | ||
156 | #define CLIX_BUTTON_UP BUTTON_UP | ||
157 | #define CLIX_BUTTON_DOWN BUTTON_DOWN | ||
158 | |||
151 | #else | 159 | #else |
152 | #error "no keymap" | 160 | #error "no keymap" |
153 | #endif | 161 | #endif |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index c770214700..b90bbee481 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -242,6 +242,17 @@ PLUGIN_HEADER | |||
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 | 244 | ||
245 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
246 | #define CUBE_QUIT BUTTON_REC | ||
247 | #define CUBE_NEXT BUTTON_RIGHT | ||
248 | #define CUBE_PREV BUTTON_LEFT | ||
249 | #define CUBE_INC BUTTON_UP | ||
250 | #define CUBE_DEC BUTTON_DOWN | ||
251 | #define CUBE_MODE BUTTON_REW | ||
252 | #define CUBE_PAUSE BUTTON_PLAY | ||
253 | #define CUBE_HIGHSPEED BUTTON_FFWD | ||
254 | |||
255 | |||
245 | #else | 256 | #else |
246 | #error No keymap defined! | 257 | #error No keymap defined! |
247 | #endif | 258 | #endif |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index fcc55faef1..0eada8b83c 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 == SAMSUNG_YH_PAD | ||
146 | #define LP_QUIT BUTTON_LEFT | ||
145 | #else | 147 | #else |
146 | #define LP_QUIT BUTTON_OFF | 148 | #define LP_QUIT BUTTON_OFF |
147 | #endif | 149 | #endif |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 759e2179aa..e463ea5186 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -326,6 +326,17 @@ 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 == SAMSUNG_YH_PAD | ||
330 | #define DOOMBUTTON_UP BUTTON_UP | ||
331 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
332 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
333 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
334 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | ||
335 | #define DOOMBUTTON_OPEN (BUTTON_PLAY|BUTTON_LEFT) | ||
336 | #define DOOMBUTTON_ESC BUTTON_REC | ||
337 | #define DOOMBUTTON_ENTER (BUTTON_PLAY|BUTTON_RIGHT) | ||
338 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_UP) | ||
339 | #define DOOMBUTTON_MAP (BUTTON_PLAY|BUTTON_DOWN) | ||
329 | #else | 340 | #else |
330 | #error Keymap not defined! | 341 | #error Keymap not defined! |
331 | #endif | 342 | #endif |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index d237007460..4b3e2fd117 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -102,6 +102,10 @@ PLUGIN_HEADER | |||
102 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | 102 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) |
103 | #define BTN_MENU (BUTTON_MENU|BUTTON_REL) | 103 | #define BTN_MENU (BUTTON_MENU|BUTTON_REL) |
104 | 104 | ||
105 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
106 | #define BTN_MENU BUTTON_LEFT | ||
107 | #define BTN_FIRE BUTTON_PLAY | ||
108 | |||
105 | #elif defined(HAVE_TOUCHSCREEN) | 109 | #elif defined(HAVE_TOUCHSCREEN) |
106 | /* This is a touchscreen target */ | 110 | /* This is a touchscreen target */ |
107 | #else | 111 | #else |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index fe383c1394..1023d3ac54 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -280,6 +280,19 @@ PLUGIN_HEADER | |||
280 | 280 | ||
281 | #define FLIPIT_QUIT BUTTON_POWER | 281 | #define FLIPIT_QUIT BUTTON_POWER |
282 | 282 | ||
283 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
284 | |||
285 | #define FLIPIT_LEFT BUTTON_LEFT | ||
286 | #define FLIPIT_RIGHT BUTTON_RIGHT | ||
287 | #define FLIPIT_UP BUTTON_UP | ||
288 | #define FLIPIT_DOWN BUTTON_DOWN | ||
289 | #define FLIPIT_QUIT BUTTON_REC | ||
290 | #define FLIPIT_SHUFFLE BUTTON_PLAY | ||
291 | #define FLIPIT_SOLVE BUTTON_FFWD | ||
292 | #define FLIPIT_STEP_BY_STEP (BUTTON_PLAY|BUTTON_UP) | ||
293 | #define FLIPIT_TOGGLE (BUTTON_PLAY|BUTTON_DOWN) | ||
294 | |||
295 | |||
283 | #else | 296 | #else |
284 | #error No keymap defined! | 297 | #error No keymap defined! |
285 | #endif | 298 | #endif |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index 9a77221586..54ec968f0b 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -269,6 +269,18 @@ | |||
269 | #define GBN_BUTTON_MENU BUTTON_MENU | BUTTON_REPEAT | 269 | #define GBN_BUTTON_MENU BUTTON_MENU | BUTTON_REPEAT |
270 | #define GBN_BUTTON_PLAY BUTTON_MENU | BUTTON_REL | 270 | #define GBN_BUTTON_PLAY BUTTON_MENU | BUTTON_REL |
271 | #define GBN_BUTTON_NAV_MODE BUTTON_OFF | 271 | #define GBN_BUTTON_NAV_MODE BUTTON_OFF |
272 | |||
273 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
274 | #define GBN_BUTTON_UP BUTTON_UP | ||
275 | #define GBN_BUTTON_DOWN BUTTON_DOWN | ||
276 | #define GBN_BUTTON_LEFT BUTTON_LEFT | ||
277 | #define GBN_BUTTON_RIGHT BUTTON_RIGHT | ||
278 | #define GBN_BUTTON_RETREAT BUTTON_REW | ||
279 | #define GBN_BUTTON_ADVANCE BUTTON_FFWD | ||
280 | #define GBN_BUTTON_MENU BUTTON_PLAY | BUTTON_LEFT | ||
281 | #define GBN_BUTTON_PLAY BUTTON_PLAY | BUTTON_RIGHT | ||
282 | #define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_DOWN | ||
283 | #define GBN_BUTTON_NEXT_VAR BUTTON_PLAY | BUTTON_UP | ||
272 | /* No context */ | 284 | /* No context */ |
273 | /* No advance/retreat */ | 285 | /* No advance/retreat */ |
274 | /* no next var */ | 286 | /* no next var */ |
diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c index 4ff704e93a..73dd98b216 100644 --- a/apps/plugins/greyscale.c +++ b/apps/plugins/greyscale.c | |||
@@ -99,6 +99,14 @@ PLUGIN_HEADER | |||
99 | #define GREYSCALE_RIGHT BUTTON_RIGHT | 99 | #define GREYSCALE_RIGHT BUTTON_RIGHT |
100 | #define GREYSCALE_OFF BUTTON_POWER | 100 | #define GREYSCALE_OFF BUTTON_POWER |
101 | 101 | ||
102 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
103 | #define GREYSCALE_SHIFT BUTTON_FFWD | ||
104 | #define GREYSCALE_UP BUTTON_UP | ||
105 | #define GREYSCALE_DOWN BUTTON_DOWN | ||
106 | #define GREYSCALE_LEFT BUTTON_LEFT | ||
107 | #define GREYSCALE_RIGHT BUTTON_RIGHT | ||
108 | #define GREYSCALE_OFF BUTTON_PLAY | ||
109 | |||
102 | #endif | 110 | #endif |
103 | 111 | ||
104 | #define GFX_HEIGHT (LCD_HEIGHT-8) | 112 | #define GFX_HEIGHT (LCD_HEIGHT-8) |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index d424f1f4cb..3fa983b12e 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -144,6 +144,13 @@ PLUGIN_HEADER | |||
144 | 144 | ||
145 | #define QUIT BUTTON_POWER | 145 | #define QUIT BUTTON_POWER |
146 | 146 | ||
147 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
148 | |||
149 | #define QUIT BUTTON_REC | ||
150 | #define LEFT BUTTON_LEFT | ||
151 | #define RIGHT BUTTON_RIGHT | ||
152 | #define FIRE BUTTON_PLAY | ||
153 | |||
147 | #else | 154 | #else |
148 | #error INVADROX: Unsupported keypad | 155 | #error INVADROX: Unsupported keypad |
149 | #endif | 156 | #endif |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 71cd093963..8f799e973f 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -246,6 +246,16 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
246 | #define JEWELS_CANCEL BUTTON_POWER | 246 | #define JEWELS_CANCEL BUTTON_POWER |
247 | #define HK_CANCEL "POWER" | 247 | #define HK_CANCEL "POWER" |
248 | 248 | ||
249 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
250 | #define JEWELS_UP BUTTON_UP | ||
251 | #define JEWELS_DOWN BUTTON_DOWN | ||
252 | #define JEWELS_LEFT BUTTON_LEFT | ||
253 | #define JEWELS_RIGHT BUTTON_RIGHT | ||
254 | #define JEWELS_SELECT BUTTON_PLAY | ||
255 | #define JEWELS_CANCEL BUTTON_REW | ||
256 | #define HK_SELECT "PLAY" | ||
257 | #define HK_CANCEL "REWIND" | ||
258 | |||
249 | #else | 259 | #else |
250 | #error No keymap defined! | 260 | #error No keymap defined! |
251 | #endif | 261 | #endif |
diff --git a/apps/plugins/jpeg/jpeg.h b/apps/plugins/jpeg/jpeg.h index cb6b4f9123..bfe09fa4fd 100644 --- a/apps/plugins/jpeg/jpeg.h +++ b/apps/plugins/jpeg/jpeg.h | |||
@@ -278,6 +278,17 @@ | |||
278 | 278 | ||
279 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 279 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
280 | 280 | ||
281 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
282 | #define JPEG_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) | ||
283 | #define JPEG_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) | ||
284 | #define JPEG_UP BUTTON_UP | ||
285 | #define JPEG_DOWN BUTTON_DOWN | ||
286 | #define JPEG_LEFT BUTTON_LEFT | ||
287 | #define JPEG_RIGHT BUTTON_RIGHT | ||
288 | #define JPEG_MENU BUTTON_PLAY | ||
289 | #define JPEG_NEXT BUTTON_FFWD | ||
290 | #define JPEG_PREVIOUS BUTTON_REW | ||
291 | |||
281 | #else | 292 | #else |
282 | #error No keymap defined! | 293 | #error No keymap defined! |
283 | #endif | 294 | #endif |
diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c index c35973bd85..7f7204c30a 100644 --- a/apps/plugins/lamp.c +++ b/apps/plugins/lamp.c | |||
@@ -86,6 +86,10 @@ 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 == SAMSUNG_YH_PAD | ||
90 | # define LAMP_LEFT BUTTON_LEFT | ||
91 | # define LAMP_RIGHT BUTTON_RIGHT | ||
92 | |||
89 | #else | 93 | #else |
90 | # error Missing key definitions for this keypad | 94 | # error Missing key definitions for this keypad |
91 | #endif | 95 | #endif |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 776dd2e738..55c2f46902 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -68,6 +68,15 @@ const struct button_mapping remote_directions[] = | |||
68 | { PLA_DOWN_REPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 68 | { PLA_DOWN_REPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
69 | { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, | 69 | { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, |
70 | { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, | 70 | { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, |
71 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
72 | { PLA_UP, BUTTON_UP, BUTTON_NONE}, | ||
73 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, | ||
74 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | ||
75 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | ||
76 | { PLA_UP_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE}, | ||
77 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REW, BUTTON_NONE}, | ||
78 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REW, BUTTON_NONE}, | ||
79 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REW, BUTTON_NONE}, | ||
71 | #else | 80 | #else |
72 | #error pluginlib_actions: Unsupported remote keypad | 81 | #error pluginlib_actions: Unsupported remote keypad |
73 | #endif | 82 | #endif |
@@ -163,6 +172,15 @@ const struct button_mapping generic_directions[] = | |||
163 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 172 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
164 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 173 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
165 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ | 174 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ |
175 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
176 | { PLA_UP, BUTTON_UP, BUTTON_NONE}, | ||
177 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, | ||
178 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | ||
179 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | ||
180 | { PLA_UP_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE}, | ||
181 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REW, BUTTON_NONE}, | ||
182 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REW, BUTTON_NONE}, | ||
183 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REW, BUTTON_NONE}, | ||
166 | #else | 184 | #else |
167 | #error pluginlib_actions: Unsupported keypad | 185 | #error pluginlib_actions: Unsupported keypad |
168 | #endif | 186 | #endif |
@@ -285,6 +303,13 @@ const struct button_mapping generic_left_right_fire[] = | |||
285 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 303 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
286 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 304 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
287 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ | 305 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ |
306 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
307 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | ||
308 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | ||
309 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REW, BUTTON_NONE}, | ||
310 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REW, BUTTON_NONE}, | ||
311 | { PLA_FIRE, BUTTON_UP, BUTTON_NONE}, | ||
312 | { PLA_FIRE_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE}, | ||
288 | #else | 313 | #else |
289 | #error pluginlib_actions: Unsupported keypad | 314 | #error pluginlib_actions: Unsupported keypad |
290 | #endif | 315 | #endif |
@@ -446,6 +471,12 @@ const struct button_mapping generic_actions[] = | |||
446 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | 471 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, |
447 | {PLA_FIRE, BUTTON_VOL_UP, BUTTON_NONE}, | 472 | {PLA_FIRE, BUTTON_VOL_UP, BUTTON_NONE}, |
448 | {PLA_FIRE_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | 473 | {PLA_FIRE_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, |
474 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
475 | {PLA_QUIT, BUTTON_REW, BUTTON_NONE}, | ||
476 | {PLA_START, BUTTON_FFWD, BUTTON_NONE}, | ||
477 | {PLA_MENU, BUTTON_PLAY, BUTTON_NONE}, | ||
478 | {PLA_FIRE, BUTTON_UP, BUTTON_NONE}, | ||
479 | {PLA_FIRE_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE}, | ||
449 | #else | 480 | #else |
450 | #error pluginlib_actions: Unsupported keypad | 481 | #error pluginlib_actions: Unsupported keypad |
451 | #endif | 482 | #endif |
@@ -526,6 +557,11 @@ const struct button_mapping generic_increase_decrease[] = | |||
526 | {PLA_DEC, BUTTON_VOL_DOWN, BUTTON_NONE}, | 557 | {PLA_DEC, BUTTON_VOL_DOWN, BUTTON_NONE}, |
527 | {PLA_INC_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | 558 | {PLA_INC_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, |
528 | {PLA_DEC_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 559 | {PLA_DEC_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
560 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
561 | {PLA_INC, BUTTON_UP, BUTTON_NONE}, | ||
562 | {PLA_DEC, BUTTON_DOWN, BUTTON_NONE}, | ||
563 | {PLA_INC_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE}, | ||
564 | {PLA_DEC_REPEAT, BUTTON_DOWN|BUTTON_REW, BUTTON_NONE}, | ||
529 | #else | 565 | #else |
530 | #error pluginlib_actions: Unsupported keypad | 566 | #error pluginlib_actions: Unsupported keypad |
531 | #endif | 567 | #endif |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index f3a875ff14..2456704bd1 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -170,6 +170,13 @@ const unsigned char rockbox16x7[] = { | |||
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 | 172 | ||
173 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
174 | #define LP_QUIT BUTTON_PLAY | ||
175 | #define LP_DEC_X BUTTON_LEFT | ||
176 | #define LP_INC_X BUTTON_RIGHT | ||
177 | #define LP_DEC_Y BUTTON_DOWN | ||
178 | #define LP_INC_Y BUTTON_UP | ||
179 | |||
173 | #else | 180 | #else |
174 | #define LP_QUIT BUTTON_OFF | 181 | #define LP_QUIT BUTTON_OFF |
175 | #define LP_DEC_X BUTTON_LEFT | 182 | #define LP_DEC_X BUTTON_LEFT |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index 61469d7597..058b468465 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -286,6 +286,20 @@ 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 == SAMSUNG_YH_PAD | ||
290 | #define MANDELBROT_QUIT BUTTON_REC | ||
291 | #define MANDELBROT_UP BUTTON_UP | ||
292 | #define MANDELBROT_DOWN BUTTON_DOWN | ||
293 | #define MANDELBROT_LEFT BUTTON_LEFT | ||
294 | #define MANDELBROT_RIGHT BUTTON_RIGHT | ||
295 | #define MANDELBROT_ZOOM_IN_PRE (BUTTON_FFWD | BUTTON_UP) | ||
296 | #define MANDELBROT_ZOOM_IN (BUTTON_REW | BUTTON_UP) | ||
297 | #define MANDELBROT_ZOOM_OUT_PRE (BUTTON_FFWD | BUTTON_DOWN) | ||
298 | #define MANDELBROT_ZOOM_OUT (BUTTON_REW | BUTTON_DOWN) | ||
299 | #define MANDELBROT_MAXITER_INC (BUTTON_PLAY | BUTTON_UP) | ||
300 | #define MANDELBROT_MAXITER_DEC (BUTTON_FFWD | BUTTON_DOWN) | ||
301 | #define MANDELBROT_RESET (BUTTON_PLAY | BUTTON_RIGHT) | ||
302 | |||
289 | #else | 303 | #else |
290 | #error No keymap defined! | 304 | #error No keymap defined! |
291 | #endif | 305 | #endif |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index 154a2e5378..84a333e1fb 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -136,6 +136,12 @@ extern const fb_data matrix_normal[]; | |||
136 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD | 136 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD |
137 | #define MATRIX_EXIT BUTTON_POWER | 137 | #define MATRIX_EXIT BUTTON_POWER |
138 | 138 | ||
139 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
140 | #define MATRIX_EXIT BUTTON_REC | ||
141 | #define MATRIX_SLEEP_MORE BUTTON_UP | ||
142 | #define MATRIX_SLEEP_LESS BUTTON_DOWN | ||
143 | #define MATRIX_PAUSE BUTTON_PLAY | ||
144 | |||
139 | #else | 145 | #else |
140 | #error Unsupported keypad | 146 | #error Unsupported keypad |
141 | #endif | 147 | #endif |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index fe9bc230c9..c24da7f309 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -169,6 +169,14 @@ PLUGIN_IRAM_DECLARE | |||
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 | 171 | ||
172 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
173 | #define BTN_QUIT BUTTON_REW | ||
174 | #define BTN_RIGHT BUTTON_RIGHT | ||
175 | #define BTN_LEFT BUTTON_LEFT | ||
176 | #define BTN_UP BUTTON_UP | ||
177 | #define BTN_DOWN BUTTON_DOWN | ||
178 | #define BTN_PLAY BUTTON_PLAY | ||
179 | |||
172 | #else | 180 | #else |
173 | #error No keymap defined! | 181 | #error No keymap defined! |
174 | #endif | 182 | #endif |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 47be0ea309..a1190d5a51 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -227,6 +227,16 @@ enum minesweeper_status { | |||
227 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD | 227 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD |
228 | # define MINESWP_QUIT BUTTON_POWER | 228 | # define MINESWP_QUIT BUTTON_POWER |
229 | 229 | ||
230 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
231 | # define MINESWP_LEFT BUTTON_LEFT | ||
232 | # define MINESWP_RIGHT BUTTON_RIGHT | ||
233 | # define MINESWP_UP BUTTON_UP | ||
234 | # define MINESWP_DOWN BUTTON_DOWN | ||
235 | # define MINESWP_QUIT BUTTON_REC | ||
236 | # define MINESWP_TOGGLE BUTTON_PLAY | ||
237 | # define MINESWP_DISCOVER BUTTON_REW | ||
238 | # define MINESWP_INFO BUTTON_FFWD | ||
239 | |||
230 | #else | 240 | #else |
231 | #error No keymap defined! | 241 | #error No keymap defined! |
232 | #endif | 242 | #endif |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 3a649486c0..b54e71f3f8 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -150,6 +150,11 @@ PLUGIN_HEADER | |||
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 | 152 | ||
153 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
154 | #define MOSAIQUE_QUIT BUTTON_PLAY | ||
155 | #define MOSAIQUE_SPEED BUTTON_UP | ||
156 | #define MOSAIQUE_RESTART BUTTON_DOWN | ||
157 | |||
153 | #else | 158 | #else |
154 | #error No keymap defined! | 159 | #error No keymap defined! |
155 | #endif | 160 | #endif |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 9da0d6925f..6ef1c762a6 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2491,6 +2491,12 @@ void get_mp3_filename(const char *wav_name) | |||
2491 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD | 2491 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD |
2492 | #define MP3ENC_DONE BUTTON_POWER | 2492 | #define MP3ENC_DONE BUTTON_POWER |
2493 | 2493 | ||
2494 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
2495 | #define MP3ENC_PREV BUTTON_UP | ||
2496 | #define MP3ENC_NEXT BUTTON_DOWN | ||
2497 | #define MP3ENC_DONE BUTTON_PLAY | ||
2498 | #define MP3ENC_SELECT BUTTON_RIGHT | ||
2499 | |||
2494 | #else | 2500 | #else |
2495 | #error No keymap defined! | 2501 | #error No keymap defined! |
2496 | #endif | 2502 | #endif |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index a9b66fc22f..62293d101f 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -173,6 +173,16 @@ 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 == SAMSUNG_YH_PAD | ||
177 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | ||
178 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | ||
179 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | ||
180 | #define MPEG_START_TIME_UP BUTTON_UP | ||
181 | #define MPEG_START_TIME_DOWN BUTTON_DOWN | ||
182 | #define MPEG_START_TIME_SCROLL_DOWN BUTTON_FFWD | ||
183 | #define MPEG_START_TIME_SCROLL_UP BUTTON_REW | ||
184 | #define MPEG_START_TIME_EXIT BUTTON_REC | ||
185 | |||
176 | #else | 186 | #else |
177 | #error No keymap defined! | 187 | #error No keymap defined! |
178 | #endif | 188 | #endif |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 6412c43af3..47407cca8e 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -285,6 +285,15 @@ 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 == SAMSUNG_YH_PAD | ||
289 | #define MPEG_MENU BUTTON_LEFT | ||
290 | #define MPEG_STOP BUTTON_RIGHT | ||
291 | #define MPEG_PAUSE BUTTON_PLAY | ||
292 | #define MPEG_VOLDOWN BUTTON_DOWN | ||
293 | #define MPEG_VOLUP BUTTON_UP | ||
294 | #define MPEG_RW BUTTON_REW | ||
295 | #define MPEG_FF BUTTON_FFWD | ||
296 | |||
288 | #else | 297 | #else |
289 | #error No keymap defined! | 298 | #error No keymap defined! |
290 | #endif | 299 | #endif |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 1e9e873ae7..15943ef53e 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -251,6 +251,17 @@ PLUGIN_HEADER | |||
251 | #elif CONFIG_KEYPAD == MROBE500_PAD | 251 | #elif CONFIG_KEYPAD == MROBE500_PAD |
252 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 252 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
253 | 253 | ||
254 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
255 | #define OSCILLOSCOPE_QUIT BUTTON_REC | ||
256 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY|BUTTON_LEFT) | ||
257 | #define OSCILLOSCOPE_ADVMODE (BUTTON_PLAY|BUTTON_RIGHT) | ||
258 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_PLAY|BUTTON_UP) | ||
259 | #define OSCILLOSCOPE_PAUSE (BUTTON_PLAY|BUTTON_DOWN) | ||
260 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | ||
261 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | ||
262 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP | ||
263 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN | ||
264 | |||
254 | #else | 265 | #else |
255 | #error No keymap defined! | 266 | #error No keymap defined! |
256 | #endif | 267 | #endif |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 0b0ed5fd52..a4e1f8879d 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -196,6 +196,17 @@ | |||
196 | 196 | ||
197 | #define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) | 197 | #define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) |
198 | 198 | ||
199 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
200 | |||
201 | #define PACMAN_UP BUTTON_UP | ||
202 | #define PACMAN_DOWN BUTTON_DOWN | ||
203 | #define PACMAN_LEFT BUTTON_LEFT | ||
204 | #define PACMAN_RIGHT BUTTON_RIGHT | ||
205 | #define PACMAN_1UP BUTTON_REC | ||
206 | #define PACMAN_2UP BUTTON_REW | ||
207 | #define PACMAN_COIN BUTTON_FFWD | ||
208 | #define PACMAN_MENU BUTTON_PLAY | ||
209 | |||
199 | #else | 210 | #else |
200 | 211 | ||
201 | #error Keymap not defined! | 212 | #error Keymap not defined! |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index cd90de49c6..761a58ae87 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -361,6 +361,23 @@ PLUGIN_HEADER | |||
361 | 361 | ||
362 | #define QUIT_TEXT "POWER" | 362 | #define QUIT_TEXT "POWER" |
363 | 363 | ||
364 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
365 | #define PEGBOX_SAVE (BUTTON_REC|BUTTON_FFWD) | ||
366 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) | ||
367 | #define PEGBOX_RESTART (BUTTON_REC|BUTTON_REW) | ||
368 | #define PEGBOX_LVL_UP BUTTON_FFWD | ||
369 | #define PEGBOX_LVL_DOWN BUTTON_REW | ||
370 | #define PEGBOX_UP BUTTON_UP | ||
371 | #define PEGBOX_DOWN BUTTON_DOWN | ||
372 | #define PEGBOX_RIGHT BUTTON_RIGHT | ||
373 | #define PEGBOX_LEFT BUTTON_LEFT | ||
374 | |||
375 | #define SAVE_TEXT "REC + FFWD" | ||
376 | #define QUIT_TEXT "REC + PLAY" | ||
377 | #define RESTART_TEXT "REC + REW" | ||
378 | #define LVL_UP_TEXT "FFWD" | ||
379 | #define LVL_DOWN_TEXT "REW" | ||
380 | |||
364 | #else | 381 | #else |
365 | #error Unsupported keymap! | 382 | #error Unsupported keymap! |
366 | #endif | 383 | #endif |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 00287eb0b8..294747ffe4 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -130,6 +130,12 @@ static int plasma_frequency; | |||
130 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | 130 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) |
131 | #define PLASMA_QUIT BUTTON_POWER | 131 | #define PLASMA_QUIT BUTTON_POWER |
132 | 132 | ||
133 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
134 | #define PLASMA_QUIT BUTTON_PLAY | ||
135 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | ||
136 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | ||
137 | #define PLASMA_REGEN_COLORS BUTTON_LEFT | ||
138 | |||
133 | #endif | 139 | #endif |
134 | 140 | ||
135 | #ifdef HAVE_TOUCHSCREEN | 141 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/apps/plugins/png/png.h b/apps/plugins/png/png.h index f52976eeb9..090eaa959d 100644 --- a/apps/plugins/png/png.h +++ b/apps/plugins/png/png.h | |||
@@ -301,6 +301,17 @@ You are free to name this file lodepng.cpp or lodepng.c depending on your usage. | |||
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 | 303 | ||
304 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
305 | #define PNG_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) | ||
306 | #define PNG_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) | ||
307 | #define PNG_UP BUTTON_UP | ||
308 | #define PNG_DOWN BUTTON_DOWN | ||
309 | #define PNG_LEFT BUTTON_LEFT | ||
310 | #define PNG_RIGHT BUTTON_RIGHT | ||
311 | #define PNG_MENU BUTTON_PLAY | ||
312 | #define PNG_NEXT BUTTON_FFWD | ||
313 | #define PNG_PREVIOUS BUTTON_REW | ||
314 | |||
304 | #else | 315 | #else |
305 | #error No keymap defined! | 316 | #error No keymap defined! |
306 | #endif | 317 | #endif |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index cb47d664cc..c49b863717 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -187,6 +187,14 @@ PLUGIN_HEADER | |||
187 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD | 187 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD |
188 | #define PONG_QUIT BUTTON_POWER | 188 | #define PONG_QUIT BUTTON_POWER |
189 | 189 | ||
190 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
191 | #define PONG_QUIT BUTTON_REC | ||
192 | #define PONG_PAUSE BUTTON_PLAY | ||
193 | #define PONG_LEFT_UP BUTTON_UP | ||
194 | #define PONG_LEFT_DOWN BUTTON_DOWN | ||
195 | #define PONG_RIGHT_UP BUTTON_FFWD | ||
196 | #define PONG_RIGHT_DOWN BUTTON_REW | ||
197 | |||
190 | #else | 198 | #else |
191 | #error No keymap defined! | 199 | #error No keymap defined! |
192 | #endif | 200 | #endif |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 1ad2d52ed3..ffb6b53af3 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -186,6 +186,15 @@ | |||
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 == SAMSUNG_YH_PAD | ||
190 | #define REVERSI_BUTTON_QUIT BUTTON_REC | ||
191 | #define REVERSI_BUTTON_UP BUTTON_UP | ||
192 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | ||
193 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | ||
194 | #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT | ||
195 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_FFWD | ||
196 | #define REVERSI_BUTTON_MENU BUTTON_PLAY | ||
197 | |||
189 | #else | 198 | #else |
190 | #error No keymap defined! | 199 | #error No keymap defined! |
191 | #endif | 200 | #endif |
diff --git a/apps/plugins/robotfindskitten.c b/apps/plugins/robotfindskitten.c index ed3cda2fc7..a2bff3bfbe 100644 --- a/apps/plugins/robotfindskitten.c +++ b/apps/plugins/robotfindskitten.c | |||
@@ -496,6 +496,18 @@ static char* messages[] = | |||
496 | # define RFK_RUP (BUTTON_UP | BUTTON_REPEAT) | 496 | # define RFK_RUP (BUTTON_UP | BUTTON_REPEAT) |
497 | # define RFK_RDOWN (BUTTON_DOWN | BUTTON_REPEAT) | 497 | # define RFK_RDOWN (BUTTON_DOWN | BUTTON_REPEAT) |
498 | 498 | ||
499 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
500 | # undef __PLUGINLIB_ACTIONS_H__ | ||
501 | # define RFK_QUIT (BUTTON_REC|BUTTON_REPEAT) | ||
502 | # define RFK_RIGHT BUTTON_RIGHT | ||
503 | # define RFK_LEFT BUTTON_LEFT | ||
504 | # define RFK_UP BUTTON_UP | ||
505 | # define RFK_DOWN BUTTON_DOWN | ||
506 | # define RFK_RRIGHT (BUTTON_PLAY | BUTTON_RIGHT) | ||
507 | # define RFK_RLEFT (BUTTON_PLAY | BUTTON_LEFT) | ||
508 | # define RFK_RUP (BUTTON_PLAY | BUTTON_UP) | ||
509 | # define RFK_RDOWN (BUTTON_PLAY | BUTTON_DOWN) | ||
510 | |||
499 | #else | 511 | #else |
500 | # define RFK_QUIT PLA_QUIT | 512 | # define RFK_QUIT PLA_QUIT |
501 | # define RFK_RIGHT PLA_RIGHT | 513 | # define RFK_RIGHT PLA_RIGHT |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index f3857c35fc..3692526073 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -287,6 +287,17 @@ PLUGIN_HEADER | |||
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 | 289 | ||
290 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
291 | |||
292 | #define ROCKBLOX_OFF (BUTTON_REC|BUTTON_PLAY) | ||
293 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_UP | ||
294 | #define ROCKBLOX_ROTATE_LEFT BUTTON_DOWN | ||
295 | #define ROCKBLOX_DOWN BUTTON_REW | ||
296 | #define ROCKBLOX_LEFT BUTTON_LEFT | ||
297 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | ||
298 | #define ROCKBLOX_DROP BUTTON_FFWD | ||
299 | #define ROCKBLOX_RESTART (BUTTON_REC|BUTTON_REW) | ||
300 | |||
290 | #else | 301 | #else |
291 | #error No keymap defined! | 302 | #error No keymap defined! |
292 | #endif | 303 | #endif |
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index 2db83d6537..12f05bb639 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -105,6 +105,10 @@ PLUGIN_HEADER | |||
105 | #define ONEDROCKBLOX_DOWN BUTTON_MENU | 105 | #define ONEDROCKBLOX_DOWN BUTTON_MENU |
106 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | 106 | #define ONEDROCKBLOX_QUIT BUTTON_POWER |
107 | 107 | ||
108 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
109 | #define ONEDROCKBLOX_DOWN BUTTON_DOWN | ||
110 | #define ONEDROCKBLOX_QUIT BUTTON_PLAY | ||
111 | |||
108 | #elif defined(HAVE_TOUCHSCREEN) | 112 | #elif defined(HAVE_TOUCHSCREEN) |
109 | 113 | ||
110 | #define ONEDROCKBLOX_DOWN BUTTON_BOTTOMMIDDLE | 114 | #define ONEDROCKBLOX_DOWN BUTTON_BOTTOMMIDDLE |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 31ad42ebdf..85040b2cd6 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -244,7 +244,28 @@ static void setoptions (void) | |||
244 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 244 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
245 | options.A=BUTTON_VOL_UP; | 245 | options.A=BUTTON_VOL_UP; |
246 | options.B=BUTTON_VOL_DOWN; | 246 | options.B=BUTTON_VOL_DOWN; |
247 | options.MENU=BUTTON_MENU; | 247 | options.MENU=BUTTON_MENU; |
248 | |||
249 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | ||
250 | options.UP=BUTTON_UP; | ||
251 | options.DOWN=BUTTON_DOWN; | ||
252 | |||
253 | options.A=BUTTON_PLAY; | ||
254 | options.B=BUTTON_FFWD; | ||
255 | options.START=BUTTON_REW; | ||
256 | options.SELECT=BUTTON_RIGHT; | ||
257 | options.MENU=BUTTON_LEFT; | ||
258 | |||
259 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
260 | options.UP=BUTTON_UP; | ||
261 | options.DOWN=BUTTON_DOWN; | ||
262 | |||
263 | options.A=BUTTON_PLAY; | ||
264 | options.B=BUTTON_REW; | ||
265 | options.START=BUTTON_REC; | ||
266 | options.SELECT=BUTTON_FFWD; | ||
267 | options.MENU=BUTTON_NONE; | ||
268 | |||
248 | #else | 269 | #else |
249 | #error No Keymap Defined! | 270 | #error No Keymap Defined! |
250 | #endif | 271 | #endif |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 5de6c14a6b..5388aceed5 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -161,6 +161,17 @@ PLUGIN_HEADER | |||
161 | #elif CONFIG_KEYPAD == MROBE500_PAD | 161 | #elif CONFIG_KEYPAD == MROBE500_PAD |
162 | #define ROCKPAINT_QUIT BUTTON_POWER | 162 | #define ROCKPAINT_QUIT BUTTON_POWER |
163 | 163 | ||
164 | #elif ( CONFIG_KEYPAD == SAMSUNG_YH_PAD ) | ||
165 | #define ROCKPAINT_QUIT BUTTON_REC | ||
166 | #define ROCKPAINT_DRAW BUTTON_PLAY | ||
167 | #define ROCKPAINT_MENU BUTTON_FFWD | ||
168 | #define ROCKPAINT_TOOLBAR BUTTON_REW | ||
169 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_REW | BUTTON_LEFT ) | ||
170 | #define ROCKPAINT_UP BUTTON_UP | ||
171 | #define ROCKPAINT_DOWN BUTTON_DOWN | ||
172 | #define ROCKPAINT_LEFT BUTTON_LEFT | ||
173 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | ||
174 | |||
164 | #else | 175 | #else |
165 | #error "Please define keys for this keypad" | 176 | #error "Please define keys for this keypad" |
166 | #endif | 177 | #endif |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 7087fd64a5..78ec5aa5e5 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -192,6 +192,15 @@ PLUGIN_HEADER | |||
192 | #define PUZZLE_QUIT BUTTON_POWER | 192 | #define PUZZLE_QUIT BUTTON_POWER |
193 | #define PUZZLE_QUIT_TEXT "[POWER]" | 193 | #define PUZZLE_QUIT_TEXT "[POWER]" |
194 | 194 | ||
195 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
196 | #define PUZZLE_QUIT BUTTON_REC | ||
197 | #define PUZZLE_LEFT BUTTON_LEFT | ||
198 | #define PUZZLE_RIGHT BUTTON_RIGHT | ||
199 | #define PUZZLE_UP BUTTON_UP | ||
200 | #define PUZZLE_DOWN BUTTON_DOWN | ||
201 | #define PUZZLE_SHUFFLE BUTTON_REW | ||
202 | #define PUZZLE_PICTURE BUTTON_PLAY | ||
203 | |||
195 | #else | 204 | #else |
196 | #error No keymap defined! | 205 | #error No keymap defined! |
197 | #endif | 206 | #endif |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index a5d34e7106..739fce9a3e 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -178,6 +178,14 @@ PLUGIN_HEADER | |||
178 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | 178 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) |
179 | #define SNAKE_QUIT BUTTON_POWER | 179 | #define SNAKE_QUIT BUTTON_POWER |
180 | 180 | ||
181 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
182 | #define SNAKE_QUIT BUTTON_REC | ||
183 | #define SNAKE_LEFT BUTTON_LEFT | ||
184 | #define SNAKE_RIGHT BUTTON_RIGHT | ||
185 | #define SNAKE_UP BUTTON_UP | ||
186 | #define SNAKE_DOWN BUTTON_DOWN | ||
187 | #define SNAKE_PLAYPAUSE BUTTON_PLAY | ||
188 | |||
181 | #else | 189 | #else |
182 | #error No keymap defined! | 190 | #error No keymap defined! |
183 | #endif | 191 | #endif |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 771e385099..5ca5e95912 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -364,6 +364,20 @@ PLUGIN_HEADER | |||
364 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD | 364 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD |
365 | #define SNAKE2_QUIT BUTTON_POWER | 365 | #define SNAKE2_QUIT BUTTON_POWER |
366 | 366 | ||
367 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
368 | #define SNAKE2_LEFT BUTTON_LEFT | ||
369 | #define SNAKE2_RIGHT BUTTON_RIGHT | ||
370 | #define SNAKE2_UP BUTTON_UP | ||
371 | #define SNAKE2_DOWN BUTTON_DOWN | ||
372 | #define SNAKE2_QUIT BUTTON_REC | ||
373 | #define SNAKE2_LEVEL_UP (BUTTON_FFWD|BUTTON_UP) | ||
374 | #define SNAKE2_LEVEL_DOWN (BUTTON_FFWD|BUTTON_DOWN) | ||
375 | #define SNAKE2_MAZE_NEXT (BUTTON_REW|BUTTON_RIGHT) | ||
376 | #define SNAKE2_MAZE_LAST (BUTTON_REW|BUTTON_LEFT) | ||
377 | #define SNAKE2_SELECT_TYPE (BUTTON_PLAY|BUTTON_LEFT) | ||
378 | #define SNAKE2_PLAYPAUSE (BUTTON_PLAY|BUTTON_RIGHT) | ||
379 | #define SNAKE2_PLAYPAUSE_TEXT "Play + Right" | ||
380 | |||
367 | #else | 381 | #else |
368 | #error No keymap defined! | 382 | #error No keymap defined! |
369 | #endif | 383 | #endif |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index fe10e3995b..01930b7363 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -44,7 +44,8 @@ PLUGIN_HEADER | |||
44 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 44 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
45 | #define SNOW_QUIT BUTTON_MENU | 45 | #define SNOW_QUIT BUTTON_MENU |
46 | 46 | ||
47 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 47 | #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) || \ |
48 | (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
48 | #define SNOW_QUIT BUTTON_PLAY | 49 | #define SNOW_QUIT BUTTON_PLAY |
49 | 50 | ||
50 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 51 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index bfd400b408..50410d29f6 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -385,6 +385,22 @@ PLUGIN_HEADER | |||
385 | #define SOKOBAN_MENU BUTTON_POWER | 385 | #define SOKOBAN_MENU BUTTON_POWER |
386 | #define SOKOBAN_MENU_NAME "[POWER]" | 386 | #define SOKOBAN_MENU_NAME "[POWER]" |
387 | 387 | ||
388 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
389 | #define SOKOBAN_LEFT BUTTON_LEFT | ||
390 | #define SOKOBAN_RIGHT BUTTON_RIGHT | ||
391 | #define SOKOBAN_UP BUTTON_UP | ||
392 | #define SOKOBAN_DOWN BUTTON_DOWN | ||
393 | #define SOKOBAN_MENU BUTTON_REC | ||
394 | #define SOKOBAN_UNDO_PRE BUTTON_REW | ||
395 | #define SOKOBAN_UNDO (BUTTON_REW | BUTTON_LEFT) | ||
396 | #define SOKOBAN_REDO BUTTON_FFWD | ||
397 | #define SOKOBAN_LEVEL_DOWN (BUTTON_PLAY | BUTTON_DOWN) | ||
398 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_RIGHT) | ||
399 | #define SOKOBAN_LEVEL_UP (BUTTON_PLAY | BUTTON_UP) | ||
400 | #define SOKOBAN_PAUSE BUTTON_PLAY | ||
401 | #define BUTTON_SAVE BUTTON_PLAY | ||
402 | #define BUTTON_SAVE_NAME "PLAY" | ||
403 | |||
388 | #else | 404 | #else |
389 | #error No keymap defined! | 405 | #error No keymap defined! |
390 | #endif | 406 | #endif |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 2291eaceb9..993ba47ec6 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -398,6 +398,27 @@ PLUGIN_HEADER | |||
398 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD | 398 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD |
399 | # define SOL_QUIT BUTTON_POWER | 399 | # define SOL_QUIT BUTTON_POWER |
400 | 400 | ||
401 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
402 | # define SOL_QUIT BUTTON_REC | ||
403 | # define SOL_UP BUTTON_UP | ||
404 | # define SOL_DOWN BUTTON_DOWN | ||
405 | # define SOL_LEFT_PRE BUTTON_LEFT | ||
406 | # define SOL_LEFT (BUTTON_LEFT | BUTTON_REW) | ||
407 | # define SOL_RIGHT_PRE BUTTON_RIGHT | ||
408 | # define SOL_RIGHT (BUTTON_RIGHT | BUTTON_REW) | ||
409 | # define SOL_MOVE BUTTON_PLAY | ||
410 | # define SOL_DRAW_PRE (BUTTON_PLAY | BUTTON_RIGHT) | ||
411 | # define SOL_DRAW (BUTTON_PLAY | BUTTON_LEFT) | ||
412 | # define SOL_REM2CUR BUTTON_FFWD | ||
413 | # define SOL_CUR2STACK BUTTON_REW | ||
414 | # define SOL_REM2STACK_PRE (BUTTON_FFWD | BUTTON_RIGHT) | ||
415 | # define SOL_REM2STACK (BUTTON_FFWD | BUTTON_LEFT) | ||
416 | # define HK_MOVE "PLAY" | ||
417 | # define HK_DRAW "REW.." | ||
418 | # define HK_REM2CUR "FFWD" | ||
419 | # define HK_CUR2STACK "REW" | ||
420 | # define HK_REM2STACK "FFWD.." | ||
421 | |||
401 | #else | 422 | #else |
402 | #error No keymap defined! | 423 | #error No keymap defined! |
403 | #endif | 424 | #endif |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 2e383c0d0d..b0c9a4d604 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -200,6 +200,19 @@ PLUGIN_HEADER | |||
200 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD | 200 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD |
201 | #define AST_QUIT BUTTON_POWER | 201 | #define AST_QUIT BUTTON_POWER |
202 | 202 | ||
203 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
204 | #define AST_PAUSE BUTTON_FFWD | ||
205 | #define AST_QUIT BUTTON_REC | ||
206 | #define AST_THRUST_REP (BUTTON_UP | BUTTON_REW) | ||
207 | #define AST_THRUST BUTTON_UP | ||
208 | #define AST_HYPERSPACE BUTTON_DOWN | ||
209 | #define AST_LEFT BUTTON_LEFT | ||
210 | #define AST_LEFT_REP (BUTTON_LEFT | BUTTON_REW) | ||
211 | #define AST_RIGHT BUTTON_RIGHT | ||
212 | #define AST_RIGHT_REP (BUTTON_RIGHT | BUTTON_REW) | ||
213 | #define AST_FIRE BUTTON_PLAY | ||
214 | #define AST_FIRE_REP (BUTTON_PLAY | BUTTON_REW) | ||
215 | |||
203 | #else | 216 | #else |
204 | #error No keymap defined! | 217 | #error No keymap defined! |
205 | #endif | 218 | #endif |
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index a169a61a47..a07769c390 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c | |||
@@ -55,6 +55,17 @@ PLUGIN_HEADER | |||
55 | #define SPLITEDIT_SPEED150 (BUTTON_REC | BUTTON_RIGHT) | 55 | #define SPLITEDIT_SPEED150 (BUTTON_REC | BUTTON_RIGHT) |
56 | #define SPLITEDIT_MENU_RUN BUTTON_RIGHT | 56 | #define SPLITEDIT_MENU_RUN BUTTON_RIGHT |
57 | 57 | ||
58 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
59 | #define SPLITEDIT_QUIT (BUTTON_REC | BUTTON_REW) | ||
60 | #define SPLITEDIT_PLAY (BUTTON_REC | BUTTON_FFWD) | ||
61 | #define SPLITEDIT_SAVE BUTTON_FFWD | ||
62 | #define SPLITEDIT_LOOP_MODE BUTTON_REW | ||
63 | #define SPLITEDIT_SCALE BUTTON_UP | ||
64 | #define SPLITEDIT_SPEED50 BUTTON_LEFT | ||
65 | #define SPLITEDIT_SPEED100 BUTTON_DOWN | ||
66 | #define SPLITEDIT_SPEED150 BUTTON_RIGHT | ||
67 | #define SPLITEDIT_MENU_RUN BUTTON_PLAY | ||
68 | |||
58 | #define SPLITEDIT_RC_QUIT BUTTON_RC_STOP | 69 | #define SPLITEDIT_RC_QUIT BUTTON_RC_STOP |
59 | #endif | 70 | #endif |
60 | 71 | ||
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 3b128d06ef..1a27f51f54 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -335,6 +335,25 @@ PLUGIN_HEADER | |||
335 | #define STAR_QUIT BUTTON_POWER | 335 | #define STAR_QUIT BUTTON_POWER |
336 | #define STAR_QUIT_NAME "POWER" | 336 | #define STAR_QUIT_NAME "POWER" |
337 | 337 | ||
338 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
339 | |||
340 | #define STAR_QUIT BUTTON_REC | ||
341 | #define STAR_LEFT BUTTON_LEFT | ||
342 | #define STAR_RIGHT BUTTON_RIGHT | ||
343 | #define STAR_UP BUTTON_UP | ||
344 | #define STAR_DOWN BUTTON_DOWN | ||
345 | #define STAR_LEVEL_UP_PRE (BUTTON_FFWD|BUTTON_UP) | ||
346 | #define STAR_LEVEL_UP (BUTTON_REW|BUTTON_UP) | ||
347 | #define STAR_LEVEL_DOWN_PRE (BUTTON_FFWD|BUTTON_DOWN) | ||
348 | #define STAR_LEVEL_DOWN (BUTTON_REW|BUTTON_DOWN) | ||
349 | #define STAR_TOGGLE_CONTROL (BUTTON_PLAY|BUTTON_UP) | ||
350 | #define STAR_LEVEL_REPEAT (BUTTON_PLAY|BUTTON_DOWN) | ||
351 | #define STAR_TOGGLE_CONTROL_NAME "PLAY" | ||
352 | #define STAR_QUIT_NAME "REC" | ||
353 | #define STAR_LEVEL_UP_NAME "UP" | ||
354 | #define STAR_LEVEL_DOWN_NAME "DOWN" | ||
355 | #define STAR_LEVEL_REPEAT_NAME "PLAY" | ||
356 | |||
338 | #else | 357 | #else |
339 | #error No keymap defined! | 358 | #error No keymap defined! |
340 | #endif | 359 | #endif |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 768ab5a20c..71af7574ae 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -134,6 +134,14 @@ PLUGIN_HEADER | |||
134 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD | 134 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD |
135 | #define STARFIELD_QUIT BUTTON_POWER | 135 | #define STARFIELD_QUIT BUTTON_POWER |
136 | 136 | ||
137 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
138 | #define STARFIELD_QUIT BUTTON_FFWD | ||
139 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP | ||
140 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN | ||
141 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT | ||
142 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT | ||
143 | #define STARFIELD_TOGGLE_COLOR BUTTON_PLAY | ||
144 | |||
137 | #endif | 145 | #endif |
138 | 146 | ||
139 | #ifdef HAVE_TOUCHSCREEN | 147 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index accb286369..495523738c 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -44,7 +44,8 @@ static bool abort; | |||
44 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 44 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
45 | #define STATS_STOP BUTTON_MENU | 45 | #define STATS_STOP BUTTON_MENU |
46 | 46 | ||
47 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 47 | #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) || \ |
48 | (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
48 | #define STATS_STOP BUTTON_PLAY | 49 | #define STATS_STOP BUTTON_PLAY |
49 | 50 | ||
50 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 51 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 4bacf413fa..f0d8f16540 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -197,6 +197,14 @@ PLUGIN_HEADER | |||
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 | 199 | ||
200 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
201 | #define STOPWATCH_QUIT BUTTON_REC | ||
202 | #define STOPWATCH_START_STOP BUTTON_PLAY | ||
203 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT | ||
204 | #define STOPWATCH_LAP_TIMER BUTTON_RIGHT | ||
205 | #define STOPWATCH_SCROLL_UP BUTTON_UP | ||
206 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | ||
207 | |||
200 | #else | 208 | #else |
201 | #error No keymap defined! | 209 | #error No keymap defined! |
202 | #endif | 210 | #endif |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 75ceb1d3f2..d4dd19232f 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -248,6 +248,16 @@ | |||
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 == SAMSUNG_YH_PAD | ||
252 | #define SUDOKU_BUTTON_QUIT BUTTON_REC | ||
253 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
254 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
255 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | ||
256 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | ||
257 | #define SUDOKU_BUTTON_TOGGLE BUTTON_FFWD | ||
258 | #define SUDOKU_BUTTON_MENU BUTTON_PLAY | ||
259 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REW | ||
260 | |||
251 | #else | 261 | #else |
252 | #error No keymap defined! | 262 | #error No keymap defined! |
253 | #endif | 263 | #endif |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 6673810e29..d6b9621343 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -142,6 +142,14 @@ char buf[255]; | |||
142 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD) | 142 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD) |
143 | #define SUPERDOM_CANCEL BUTTON_POWER | 143 | #define SUPERDOM_CANCEL BUTTON_POWER |
144 | 144 | ||
145 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
146 | #define SUPERDOM_OK BUTTON_PLAY | ||
147 | #define SUPERDOM_UP BUTTON_UP | ||
148 | #define SUPERDOM_DOWN BUTTON_DOWN | ||
149 | #define SUPERDOM_LEFT BUTTON_LEFT | ||
150 | #define SUPERDOM_RIGHT BUTTON_RIGHT | ||
151 | #define SUPERDOM_CANCEL BUTTON_REW | ||
152 | |||
145 | #endif | 153 | #endif |
146 | 154 | ||
147 | #ifdef HAVE_TOUCHSCREEN | 155 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c index c51fc4006f..8c44c92409 100644 --- a/apps/plugins/test_codec.c +++ b/apps/plugins/test_codec.c | |||
@@ -28,6 +28,8 @@ 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 == SAMSUNG_YH_PAD | ||
32 | #define TESTCODEC_EXITBUTTON BUTTON_PLAY | ||
31 | #elif CONFIG_KEYPAD == COWOND2_PAD || CONFIG_KEYPAD == ONDAVX747_PAD | 33 | #elif CONFIG_KEYPAD == COWOND2_PAD || CONFIG_KEYPAD == ONDAVX747_PAD |
32 | #define TESTCODEC_EXITBUTTON BUTTON_POWER | 34 | #define TESTCODEC_EXITBUTTON BUTTON_POWER |
33 | #else | 35 | #else |
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c index ddbd51c00b..f7706f64bd 100644 --- a/apps/plugins/test_fps.c +++ b/apps/plugins/test_fps.c | |||
@@ -31,6 +31,8 @@ PLUGIN_IRAM_DECLARE | |||
31 | #define FPS_QUIT BUTTON_MENU | 31 | #define FPS_QUIT BUTTON_MENU |
32 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 32 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
33 | #define FPS_QUIT BUTTON_RC_REC | 33 | #define FPS_QUIT BUTTON_RC_REC |
34 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
35 | #define FPS_QUIT BUTTON_PLAY | ||
34 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 36 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
35 | #define FPS_QUIT (BUTTON_HOME|BUTTON_REPEAT) | 37 | #define FPS_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
36 | #elif defined(BUTTON_OFF) | 38 | #elif defined(BUTTON_OFF) |
diff --git a/apps/plugins/test_grey.c b/apps/plugins/test_grey.c index 84dcdae3e2..5ec24ec58c 100644 --- a/apps/plugins/test_grey.c +++ b/apps/plugins/test_grey.c | |||
@@ -75,6 +75,14 @@ PLUGIN_HEADER | |||
75 | #define GREY_UP BUTTON_RC_VOL_UP | 75 | #define GREY_UP BUTTON_RC_VOL_UP |
76 | #define GREY_DOWN BUTTON_RC_VOL_DOWN | 76 | #define GREY_DOWN BUTTON_RC_VOL_DOWN |
77 | 77 | ||
78 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
79 | #define GREY_QUIT BUTTON_REC | ||
80 | #define GREY_OK BUTTON_PLAY | ||
81 | #define GREY_PREV BUTTON_REW | ||
82 | #define GREY_NEXT BUTTON_FFWD | ||
83 | #define GREY_UP BUTTON_UP | ||
84 | #define GREY_DOWN BUTTON_DOWN | ||
85 | |||
78 | #else | 86 | #else |
79 | #error unsupported keypad | 87 | #error unsupported keypad |
80 | #endif | 88 | #endif |
diff --git a/apps/plugins/test_greylib_bitmap_scale.c b/apps/plugins/test_greylib_bitmap_scale.c index 3e82c23175..7b226d4f96 100644 --- a/apps/plugins/test_greylib_bitmap_scale.c +++ b/apps/plugins/test_greylib_bitmap_scale.c | |||
@@ -28,6 +28,8 @@ | |||
28 | #define GBS_QUIT BUTTON_MENU | 28 | #define GBS_QUIT BUTTON_MENU |
29 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 29 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
30 | #define GBS_QUIT BUTTON_RC_REC | 30 | #define GBS_QUIT BUTTON_RC_REC |
31 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
32 | #define GBS_QUIT BUTTON_PLAY | ||
31 | #elif defined(BUTTON_OFF) | 33 | #elif defined(BUTTON_OFF) |
32 | #define GBS_QUIT BUTTON_OFF | 34 | #define GBS_QUIT BUTTON_OFF |
33 | #else | 35 | #else |
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c index 7746916386..2164bdadf9 100644 --- a/apps/plugins/test_scanrate.c +++ b/apps/plugins/test_scanrate.c | |||
@@ -64,6 +64,13 @@ PLUGIN_HEADER | |||
64 | #define SCANRATE_INC BUTTON_RIGHT | 64 | #define SCANRATE_INC BUTTON_RIGHT |
65 | #define SCANRATE_DEC BUTTON_LEFT | 65 | #define SCANRATE_DEC BUTTON_LEFT |
66 | 66 | ||
67 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
68 | #define SCANRATE_DONE BUTTON_DONE | ||
69 | #define SCANRATE_FASTINC BUTTON_FFWD | ||
70 | #define SCANRATE_FASTDEC BUTTON_REW | ||
71 | #define SCANRATE_INC BUTTON_UP | ||
72 | #define SCANRATE_DEC BUTTON_DOWN | ||
73 | |||
67 | #endif | 74 | #endif |
68 | 75 | ||
69 | /* Default refresh rates in 1/10 Hz */ | 76 | /* Default refresh rates in 1/10 Hz */ |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 9db19d4158..c41996b0f0 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -328,6 +328,16 @@ PLUGIN_HEADER | |||
328 | #define VIEWER_QUIT BUTTON_POWER | 328 | #define VIEWER_QUIT BUTTON_POWER |
329 | #define VIEWER_MENU BUTTON_MENU | 329 | #define VIEWER_MENU BUTTON_MENU |
330 | 330 | ||
331 | /* SAMSUNG YH-820 / YH-920 / YH-925 keys */ | ||
332 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
333 | #define VIEWER_QUIT BUTTON_REC | ||
334 | #define VIEWER_PAGE_UP BUTTON_UP | ||
335 | #define VIEWER_PAGE_DOWN BUTTON_DOWN | ||
336 | #define VIEWER_SCREEN_LEFT BUTTON_LEFT | ||
337 | #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT | ||
338 | #define VIEWER_MENU BUTTON_PLAY | ||
339 | #define VIEWER_AUTOSCROLL BUTTON_REW | ||
340 | |||
331 | #else | 341 | #else |
332 | #error No keymap defined! | 342 | #error No keymap defined! |
333 | #endif | 343 | #endif |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 74c3b1cf97..80e9ccbb20 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -283,6 +283,19 @@ PLUGIN_HEADER | |||
283 | #define VUMETER_QUIT BUTTON_POWER | 283 | #define VUMETER_QUIT BUTTON_POWER |
284 | #define LABEL_QUIT "POWER" | 284 | #define LABEL_QUIT "POWER" |
285 | 285 | ||
286 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
287 | #define VUMETER_QUIT BUTTON_REC | ||
288 | #define VUMETER_HELP BUTTON_PLAY | ||
289 | #define VUMETER_MENU BUTTON_LEFT | ||
290 | #define VUMETER_MENU_EXIT BUTTON_LEFT | ||
291 | #define VUMETER_MENU_EXIT2 BUTTON_RIGHT | ||
292 | #define VUMETER_UP BUTTON_UP | ||
293 | #define VUMETER_DOWN BUTTON_DOWN | ||
294 | #define LABEL_HELP "PLAY" | ||
295 | #define LABEL_QUIT "REC" | ||
296 | #define LABEL_MENU "LEFT" | ||
297 | #define LABEL_VOLUME "UP/DOWN" | ||
298 | |||
286 | #else | 299 | #else |
287 | #error No keymap defined! | 300 | #error No keymap defined! |
288 | #endif | 301 | #endif |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 97b2fded4f..eb76e922d9 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -236,6 +236,16 @@ PLUGIN_HEADER | |||
236 | 236 | ||
237 | #define BTN_QUIT BUTTON_POWER | 237 | #define BTN_QUIT BUTTON_POWER |
238 | 238 | ||
239 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
240 | |||
241 | #define BTN_DIR_UP BUTTON_UP | ||
242 | #define BTN_DIR_DOWN BUTTON_DOWN | ||
243 | #define BTN_DIR_LEFT BUTTON_LEFT | ||
244 | #define BTN_DIR_RIGHT BUTTON_RIGHT | ||
245 | #define BTN_STARTPAUSE BUTTON_PLAY | ||
246 | #define BTN_QUIT BUTTON_FFWD | ||
247 | #define BTN_STOPRESET BUTTON_REW | ||
248 | |||
239 | #else | 249 | #else |
240 | #error No keymap defined! | 250 | #error No keymap defined! |
241 | #endif | 251 | #endif |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index b26c16eabf..daf627d590 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -203,6 +203,15 @@ PLUGIN_HEADER | |||
203 | 203 | ||
204 | #define QUIT BUTTON_POWER | 204 | #define QUIT BUTTON_POWER |
205 | 205 | ||
206 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
207 | |||
208 | #define QUIT BUTTON_PLAY | ||
209 | #define LEFT BUTTON_LEFT | ||
210 | #define RIGHT BUTTON_RIGHT | ||
211 | #define UP BUTTON_UP | ||
212 | #define DOWN BUTTON_DOWN | ||
213 | #define PAUSE BUTTON_FFWD | ||
214 | |||
206 | #else | 215 | #else |
207 | #error No keymap defined! | 216 | #error No keymap defined! |
208 | #endif | 217 | #endif |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 965cfea048..eb25adcbe4 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -160,6 +160,15 @@ | |||
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 == SAMSUNG_YH_PAD | ||
164 | |||
165 | #define ZX_UP BUTTON_UP | ||
166 | #define ZX_DOWN BUTTON_DOWN | ||
167 | #define ZX_LEFT BUTTON_LEFT | ||
168 | #define ZX_RIGHT BUTTON_RIGHT | ||
169 | #define ZX_SELECT BUTTON_PLAY | ||
170 | #define ZX_MENU BUTTON_FFWD | ||
171 | |||
163 | #else | 172 | #else |
164 | #error Keymap not defined! | 173 | #error Keymap not defined! |
165 | 174 | ||
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 7464f2eaa3..4e41087e25 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -166,6 +166,15 @@ | |||
166 | #define KBD_UP BUTTON_UP | 166 | #define KBD_UP BUTTON_UP |
167 | #define KBD_DOWN BUTTON_DOWN | 167 | #define KBD_DOWN BUTTON_DOWN |
168 | 168 | ||
169 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
170 | |||
171 | #define KBD_SELECT BUTTON_PLAY | ||
172 | #define KBD_ABORT BUTTON_REW | ||
173 | #define KBD_LEFT BUTTON_LEFT | ||
174 | #define KBD_RIGHT BUTTON_RIGHT | ||
175 | #define KBD_UP BUTTON_UP | ||
176 | #define KBD_DOWN BUTTON_DOWN | ||
177 | |||
169 | #endif | 178 | #endif |
170 | 179 | ||
171 | #ifdef HAVE_TOUCHSCREEN | 180 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/tools/configure b/tools/configure index 36c74105a3..5b535e70c8 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -2215,7 +2215,7 @@ fi | |||
2215 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 2215 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
2216 | output="rockbox.mi4" | 2216 | output="rockbox.mi4" |
2217 | appextra="recorder:gui" | 2217 | appextra="recorder:gui" |
2218 | plugins="" | 2218 | plugins="yes" |
2219 | swcodec="yes" | 2219 | swcodec="yes" |
2220 | boottool="$rootdir/tools/scramble -mi4v2 -model=y820 -type=RBBL" | 2220 | boottool="$rootdir/tools/scramble -mi4v2 -model=y820 -type=RBBL" |
2221 | bootoutput="FW_YH820.mi4" | 2221 | bootoutput="FW_YH820.mi4" |
@@ -2239,7 +2239,7 @@ fi | |||
2239 | bmp2rb_native="$rootdir/tools/bmp2rb -f 2" | 2239 | bmp2rb_native="$rootdir/tools/bmp2rb -f 2" |
2240 | output="rockbox.mi4" | 2240 | output="rockbox.mi4" |
2241 | appextra="recorder:gui" | 2241 | appextra="recorder:gui" |
2242 | plugins="" | 2242 | plugins="yes" |
2243 | swcodec="yes" | 2243 | swcodec="yes" |
2244 | boottool="$rootdir/tools/scramble -mi4v2 -model=y920 -type=RBBL" | 2244 | boottool="$rootdir/tools/scramble -mi4v2 -model=y920 -type=RBBL" |
2245 | bootoutput="PP5020.mi4" | 2245 | bootoutput="PP5020.mi4" |
@@ -2263,7 +2263,7 @@ fi | |||
2263 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 2263 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" |
2264 | output="rockbox.mi4" | 2264 | output="rockbox.mi4" |
2265 | appextra="recorder:gui" | 2265 | appextra="recorder:gui" |
2266 | plugins="" | 2266 | plugins="yes" |
2267 | swcodec="yes" | 2267 | swcodec="yes" |
2268 | boottool="$rootdir/tools/scramble -mi4v2 -model=y925 -type=RBBL" | 2268 | boottool="$rootdir/tools/scramble -mi4v2 -model=y925 -type=RBBL" |
2269 | bootoutput="FW_YH925.mi4" | 2269 | bootoutput="FW_YH925.mi4" |