summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/battery_bench.c7
-rw-r--r--apps/plugins/chessclock.c10
-rw-r--r--apps/plugins/cube.c9
-rw-r--r--apps/plugins/dict.c2
-rw-r--r--apps/plugins/flipit.c11
-rw-r--r--apps/plugins/lamp.c4
-rw-r--r--apps/plugins/lib/pluginlib_actions.c29
-rw-r--r--apps/plugins/logo.c7
-rw-r--r--apps/plugins/mosaique.c5
-rw-r--r--apps/plugins/rockblox.c11
-rw-r--r--apps/plugins/snow.c3
-rw-r--r--apps/plugins/stats.c3
-rw-r--r--apps/plugins/stopwatch.c8
-rw-r--r--apps/plugins/viewer.c12
14 files changed, 120 insertions, 1 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 57545c2106..e4e399ff7b 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -203,6 +203,13 @@ PLUGIN_HEADER
203#define BATTERY_ON_TXT "LEFT" 203#define BATTERY_ON_TXT "LEFT"
204#define BATTERY_OFF_TXT "RIGHT" 204#define BATTERY_OFF_TXT "RIGHT"
205 205
206#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
207
208#define BATTERY_ON BUTTON_PLAY
209#define BATTERY_OFF BUTTON_REC
210#define BATTERY_ON_TXT "PLAY - start"
211#define BATTERY_OFF_TXT "REC"
212
206#else 213#else
207#error No keymap defined! 214#error No keymap defined!
208#endif 215#endif
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index ff33bda470..f0a63f63dc 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -266,6 +266,16 @@ PLUGIN_HEADER
266#define CHC_SETTINGS_OK BUTTON_PLAY 266#define CHC_SETTINGS_OK BUTTON_PLAY
267#define CHC_SETTINGS_CANCEL BUTTON_REW 267#define CHC_SETTINGS_CANCEL BUTTON_REW
268 268
269#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
270#define CHC_QUIT BUTTON_REC
271#define CHC_STARTSTOP BUTTON_PLAY
272#define CHC_RESET BUTTON_PREV
273#define CHC_MENU BUTTON_MENU
274#define CHC_SETTINGS_INC BUTTON_UP
275#define CHC_SETTINGS_DEC BUTTON_DOWN
276#define CHC_SETTINGS_OK BUTTON_OK
277#define CHC_SETTINGS_CANCEL BUTTON_CANCEL
278
269#else 279#else
270#error No keymap defined! 280#error No keymap defined!
271#endif 281#endif
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 13db09d5e6..014bcfcb79 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -264,6 +264,15 @@ PLUGIN_HEADER
264#define CUBE_PAUSE BUTTON_PLAY 264#define CUBE_PAUSE BUTTON_PLAY
265#define CUBE_HIGHSPEED BUTTON_FFWD 265#define CUBE_HIGHSPEED BUTTON_FFWD
266 266
267#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
268#define CUBE_QUIT BUTTON_REC
269#define CUBE_NEXT BUTTON_NEXT
270#define CUBE_PREV BUTTON_PREV
271#define CUBE_INC BUTTON_UP
272#define CUBE_DEC BUTTON_DOWN
273#define CUBE_MODE BUTTON_MENU
274#define CUBE_PAUSE BUTTON_PLAY
275#define CUBE_HIGHSPEED BUTTON_OK
267 276
268#else 277#else
269#error No keymap defined! 278#error No keymap defined!
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c
index 2127186e72..bb98df7501 100644
--- a/apps/plugins/dict.c
+++ b/apps/plugins/dict.c
@@ -148,6 +148,8 @@ long reverse (long N) {
148#define LP_QUIT BUTTON_POWER 148#define LP_QUIT BUTTON_POWER
149#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 149#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
150#define LP_QUIT BUTTON_LEFT 150#define LP_QUIT BUTTON_LEFT
151#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
152#define LP_QUIT BUTTON_CANCEL
151#else 153#else
152#define LP_QUIT BUTTON_OFF 154#define LP_QUIT BUTTON_OFF
153#endif 155#endif
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index da4acd70b6..b706b63f94 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -308,6 +308,17 @@ PLUGIN_HEADER
308#define FLIPIT_STEP_BY_STEP (BUTTON_PLAY|BUTTON_UP) 308#define FLIPIT_STEP_BY_STEP (BUTTON_PLAY|BUTTON_UP)
309#define FLIPIT_TOGGLE (BUTTON_PLAY|BUTTON_DOWN) 309#define FLIPIT_TOGGLE (BUTTON_PLAY|BUTTON_DOWN)
310 310
311#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
312
313#define FLIPIT_LEFT BUTTON_PREV
314#define FLIPIT_RIGHT BUTTON_NEXT
315#define FLIPIT_UP BUTTON_UP
316#define FLIPIT_DOWN BUTTON_DOWN
317#define FLIPIT_QUIT BUTTON_REC
318#define FLIPIT_SHUFFLE BUTTON_PLAY
319#define FLIPIT_SOLVE BUTTON_MENU
320#define FLIPIT_STEP_BY_STEP BUTTON_CANCEL
321#define FLIPIT_TOGGLE BUTTON_OK
311 322
312#else 323#else
313#error No keymap defined! 324#error No keymap defined!
diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c
index 690676e054..53815b3abd 100644
--- a/apps/plugins/lamp.c
+++ b/apps/plugins/lamp.c
@@ -96,6 +96,10 @@ PLUGIN_HEADER
96# define LAMP_LEFT BUTTON_LEFT 96# define LAMP_LEFT BUTTON_LEFT
97# define LAMP_RIGHT BUTTON_RIGHT 97# define LAMP_RIGHT BUTTON_RIGHT
98 98
99#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
100# define LAMP_LEFT BUTTON_PREV
101# define LAMP_RIGHT BUTTON_NEXT
102
99#else 103#else
100# error Missing key definitions for this keypad 104# error Missing key definitions for this keypad
101#endif 105#endif
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index d587f80ba4..20e7bd7ea3 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -190,6 +190,15 @@ const struct button_mapping generic_directions[] =
190 { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REW, BUTTON_NONE}, 190 { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REW, BUTTON_NONE},
191 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REW, BUTTON_NONE}, 191 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REW, BUTTON_NONE},
192 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REW, BUTTON_NONE}, 192 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REW, BUTTON_NONE},
193#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
194 { PLA_UP, BUTTON_UP, BUTTON_NONE},
195 { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE},
196 { PLA_LEFT, BUTTON_PREV, BUTTON_NONE},
197 { PLA_RIGHT, BUTTON_NEXT, BUTTON_NONE},
198 { PLA_UP_REPEAT, BUTTON_UP, BUTTON_NONE},
199 { PLA_DOWN_REPEAT, BUTTON_DOWN, BUTTON_NONE},
200 { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE},
201 { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE},
193#else 202#else
194 #error pluginlib_actions: Unsupported keypad 203 #error pluginlib_actions: Unsupported keypad
195#endif 204#endif
@@ -326,6 +335,13 @@ const struct button_mapping generic_left_right_fire[] =
326 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REW, BUTTON_NONE}, 335 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REW, BUTTON_NONE},
327 { PLA_FIRE, BUTTON_UP, BUTTON_NONE}, 336 { PLA_FIRE, BUTTON_UP, BUTTON_NONE},
328 { PLA_FIRE_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE}, 337 { PLA_FIRE_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE},
338#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
339 { PLA_LEFT, BUTTON_PREV, BUTTON_NONE},
340 { PLA_RIGHT, BUTTON_NEXT, BUTTON_NONE},
341 { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE},
342 { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE},
343 { PLA_FIRE, BUTTON_OK, BUTTON_NONE},
344 { PLA_FIRE_REPEAT, BUTTON_OK|BUTTON_REPEAT, BUTTON_NONE},
329#else 345#else
330 #error pluginlib_actions: Unsupported keypad 346 #error pluginlib_actions: Unsupported keypad
331#endif 347#endif
@@ -499,6 +515,12 @@ const struct button_mapping generic_actions[] =
499 {PLA_MENU, BUTTON_PLAY, BUTTON_NONE}, 515 {PLA_MENU, BUTTON_PLAY, BUTTON_NONE},
500 {PLA_FIRE, BUTTON_UP, BUTTON_NONE}, 516 {PLA_FIRE, BUTTON_UP, BUTTON_NONE},
501 {PLA_FIRE_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE}, 517 {PLA_FIRE_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE},
518#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
519 {PLA_QUIT, BUTTON_REC, BUTTON_NONE},
520 {PLA_START, BUTTON_PLAY, BUTTON_NONE},
521 {PLA_MENU, BUTTON_MENU, BUTTON_NONE},
522 {PLA_FIRE, BUTTON_OK, BUTTON_NONE},
523 {PLA_FIRE_REPEAT, BUTTON_OK|BUTTON_REPEAT, BUTTON_NONE},
502#else 524#else
503 #error pluginlib_actions: Unsupported keypad 525 #error pluginlib_actions: Unsupported keypad
504#endif 526#endif
@@ -589,8 +611,13 @@ const struct button_mapping generic_increase_decrease[] =
589 {PLA_DEC, BUTTON_DOWN, BUTTON_NONE}, 611 {PLA_DEC, BUTTON_DOWN, BUTTON_NONE},
590 {PLA_INC_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE}, 612 {PLA_INC_REPEAT, BUTTON_UP|BUTTON_REW, BUTTON_NONE},
591 {PLA_DEC_REPEAT, BUTTON_DOWN|BUTTON_REW, BUTTON_NONE}, 613 {PLA_DEC_REPEAT, BUTTON_DOWN|BUTTON_REW, BUTTON_NONE},
614#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
615 {PLA_INC, BUTTON_UP, BUTTON_NONE},
616 {PLA_DEC, BUTTON_DOWN, BUTTON_NONE},
617 {PLA_INC_REPEAT, BUTTON_UP, BUTTON_NONE},
618 {PLA_DEC_REPEAT, BUTTON_DOWN, BUTTON_NONE},
592#else 619#else
593#error pluginlib_actions: Unsupported keypad 620 #error pluginlib_actions: Unsupported keypad
594#endif 621#endif
595 {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE} 622 {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
596}; 623};
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c
index 04c8aa015b..b2320237f9 100644
--- a/apps/plugins/logo.c
+++ b/apps/plugins/logo.c
@@ -186,6 +186,13 @@ const unsigned char rockbox16x7[] = {
186#define LP_DEC_Y BUTTON_DOWN 186#define LP_DEC_Y BUTTON_DOWN
187#define LP_INC_Y BUTTON_UP 187#define LP_INC_Y BUTTON_UP
188 188
189#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
190#define LP_QUIT BUTTON_REC
191#define LP_DEC_X BUTTON_PREV
192#define LP_INC_X BUTTON_NEXT
193#define LP_DEC_Y BUTTON_DOWN
194#define LP_INC_Y BUTTON_UP
195
189#else 196#else
190#define LP_QUIT BUTTON_OFF 197#define LP_QUIT BUTTON_OFF
191#define LP_DEC_X BUTTON_LEFT 198#define LP_DEC_X BUTTON_LEFT
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c
index 0f3e9ffc08..d6fc11d131 100644
--- a/apps/plugins/mosaique.c
+++ b/apps/plugins/mosaique.c
@@ -164,6 +164,11 @@ PLUGIN_HEADER
164#define MOSAIQUE_SPEED BUTTON_UP 164#define MOSAIQUE_SPEED BUTTON_UP
165#define MOSAIQUE_RESTART BUTTON_DOWN 165#define MOSAIQUE_RESTART BUTTON_DOWN
166 166
167#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
168#define MOSAIQUE_QUIT BUTTON_REC
169#define MOSAIQUE_SPEED BUTTON_PLAY
170#define MOSAIQUE_RESTART BUTTON_MENU
171
167#else 172#else
168#error No keymap defined! 173#error No keymap defined!
169#endif 174#endif
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 95a793fb8c..a3d644e583 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -314,6 +314,17 @@ PLUGIN_HEADER
314#define ROCKBLOX_DROP BUTTON_FFWD 314#define ROCKBLOX_DROP BUTTON_FFWD
315#define ROCKBLOX_RESTART (BUTTON_REC|BUTTON_REW) 315#define ROCKBLOX_RESTART (BUTTON_REC|BUTTON_REW)
316 316
317#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
318
319#define ROCKBLOX_OFF BUTTON_REC
320#define ROCKBLOX_ROTATE_RIGHT BUTTON_PLAY
321#define ROCKBLOX_ROTATE_LEFT BUTTON_MENU
322#define ROCKBLOX_DOWN BUTTON_DOWN
323#define ROCKBLOX_LEFT BUTTON_PREV
324#define ROCKBLOX_RIGHT BUTTON_NEXT
325#define ROCKBLOX_DROP BUTTON_OK
326#define ROCKBLOX_RESTART BUTTON_CANCEL
327
317#else 328#else
318#error No keymap defined! 329#error No keymap defined!
319#endif 330#endif
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c
index c64dfd0a5c..a81e12be96 100644
--- a/apps/plugins/snow.c
+++ b/apps/plugins/snow.c
@@ -79,6 +79,9 @@ PLUGIN_HEADER
79#define SNOW_QUIT BUTTON_REC 79#define SNOW_QUIT BUTTON_REC
80#define SNOW_RC_QUIT BUTTON_RC_REC 80#define SNOW_RC_QUIT BUTTON_RC_REC
81 81
82#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
83#define SNOW_QUIT BUTTON_REC
84
82#else 85#else
83#define SNOW_QUIT BUTTON_OFF 86#define SNOW_QUIT BUTTON_OFF
84#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) 87#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index b928c0c4db..22ad5c13e3 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -102,6 +102,9 @@ static bool abort;
102#elif CONFIG_KEYPAD == ONDAVX777_PAD 102#elif CONFIG_KEYPAD == ONDAVX777_PAD
103#define STATS_STOP BUTTON_POWER 103#define STATS_STOP BUTTON_POWER
104 104
105#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
106#define STATS_STOP BUTTON_REC
107
105#else 108#else
106#error No keymap defined! 109#error No keymap defined!
107#endif 110#endif
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index b7ed592fdf..ad3b285d2f 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -215,6 +215,14 @@ PLUGIN_HEADER
215#define STOPWATCH_SCROLL_UP BUTTON_UP 215#define STOPWATCH_SCROLL_UP BUTTON_UP
216#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN 216#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
217 217
218#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
219#define STOPWATCH_QUIT BUTTON_REC
220#define STOPWATCH_START_STOP BUTTON_PLAY
221#define STOPWATCH_RESET_TIMER BUTTON_OK
222#define STOPWATCH_LAP_TIMER BUTTON_MENU
223#define STOPWATCH_SCROLL_UP BUTTON_UP
224#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
225
218#else 226#else
219#error No keymap defined! 227#error No keymap defined!
220#endif 228#endif
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c
index 88b43c30b3..299c392177 100644
--- a/apps/plugins/viewer.c
+++ b/apps/plugins/viewer.c
@@ -352,6 +352,18 @@ PLUGIN_HEADER
352#define VIEWER_MENU BUTTON_PLAY 352#define VIEWER_MENU BUTTON_PLAY
353#define VIEWER_AUTOSCROLL BUTTON_REW 353#define VIEWER_AUTOSCROLL BUTTON_REW
354 354
355/* Packard Bell Vibe 500 keys */
356#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
357#define VIEWER_QUIT BUTTON_REC
358#define VIEWER_PAGE_UP BUTTON_OK
359#define VIEWER_PAGE_DOWN BUTTON_CANCEL
360#define VIEWER_LINE_UP BUTTON_UP
361#define VIEWER_LINE_DOWN BUTTON_DOWN
362#define VIEWER_SCREEN_LEFT BUTTON_PREV
363#define VIEWER_SCREEN_RIGHT BUTTON_NEXT
364#define VIEWER_MENU BUTTON_MENU
365#define VIEWER_AUTOSCROLL BUTTON_PLAY
366
355#else 367#else
356#error No keymap defined! 368#error No keymap defined!
357#endif 369#endif