diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/SOURCES | 3 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 7 | ||||
-rw-r--r-- | apps/plugins/chessclock.c | 10 | ||||
-rw-r--r-- | apps/plugins/cube.c | 13 | ||||
-rw-r--r-- | apps/plugins/dict.c | 2 | ||||
-rw-r--r-- | apps/plugins/logo.c | 8 | ||||
-rw-r--r-- | apps/plugins/mosaique.c | 5 | ||||
-rw-r--r-- | apps/plugins/rockblox.c | 28 | ||||
-rw-r--r-- | apps/plugins/snow.c | 2 | ||||
-rw-r--r-- | apps/plugins/stats.c | 2 | ||||
-rw-r--r-- | apps/plugins/stopwatch.c | 7 | ||||
-rw-r--r-- | apps/plugins/viewer.c | 9 |
12 files changed, 94 insertions, 2 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index c7f55ee062..33ebec31bd 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -1,4 +1,3 @@ | |||
1 | #ifndef OLYMPUS_MROBE_500 | ||
2 | /* plugins common to all models */ | 1 | /* plugins common to all models */ |
3 | battery_bench.c | 2 | battery_bench.c |
4 | chessclock.c | 3 | chessclock.c |
@@ -21,6 +20,8 @@ stopwatch.c | |||
21 | vbrfix.c | 20 | vbrfix.c |
22 | viewer.c | 21 | viewer.c |
23 | 22 | ||
23 | #ifndef OLYMPUS_MROBE_500 | ||
24 | |||
24 | #if CONFIG_CODEC == SWCODEC | 25 | #if CONFIG_CODEC == SWCODEC |
25 | metronome.c | 26 | metronome.c |
26 | #endif | 27 | #endif |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index f03a4e2fb7..2b995952ea 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -114,6 +114,13 @@ PLUGIN_HEADER | |||
114 | #define BATTERY_ON_TXT "SELECT - start" | 114 | #define BATTERY_ON_TXT "SELECT - start" |
115 | #define BATTERY_OFF_TXT "POWER - quit" | 115 | #define BATTERY_OFF_TXT "POWER - quit" |
116 | 116 | ||
117 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
118 | |||
119 | #define BATTERY_ON BUTTON_RC_PLAY | ||
120 | #define BATTERY_OFF BUTTON_POWER | ||
121 | #define BATTERY_ON_TXT "PLAY - start" | ||
122 | #define BATTERY_OFF_TXT "POWER - quit" | ||
123 | |||
117 | #endif | 124 | #endif |
118 | 125 | ||
119 | 126 | ||
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 56d2709bb7..439ebb1c1d 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -140,6 +140,16 @@ PLUGIN_HEADER | |||
140 | #define CHC_SETTINGS_OK BUTTON_PLAY | 140 | #define CHC_SETTINGS_OK BUTTON_PLAY |
141 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | 141 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
142 | 142 | ||
143 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
144 | #define CHC_QUIT BUTTON_POWER | ||
145 | #define CHC_STARTSTOP BUTTON_RC_PLAY | ||
146 | #define CHC_RESET BUTTON_RC_HEART | ||
147 | #define CHC_MENU BUTTON_RC_MODE | ||
148 | #define CHC_SETTINGS_INC BUTTON_RC_VOL_UP | ||
149 | #define CHC_SETTINGS_DEC BUTTON_RC_VOL_DOWN | ||
150 | #define CHC_SETTINGS_OK BUTTON_RC_PLAY | ||
151 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | ||
152 | |||
143 | #endif | 153 | #endif |
144 | 154 | ||
145 | 155 | ||
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 3294b37fab..31faf323f9 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -191,6 +191,19 @@ PLUGIN_HEADER | |||
191 | #define CUBE_PAUSE (BUTTON_PLAY | BUTTON_REL) | 191 | #define CUBE_PAUSE (BUTTON_PLAY | BUTTON_REL) |
192 | #define CUBE_HIGHSPEED (BUTTON_FF | BUTTON_REL) | 192 | #define CUBE_HIGHSPEED (BUTTON_FF | BUTTON_REL) |
193 | 193 | ||
194 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
195 | #define CUBE_QUIT BUTTON_POWER | ||
196 | #define CUBE_X_INC BUTTON_LEFT | ||
197 | #define CUBE_X_DEC BUTTON_RIGHT | ||
198 | #define CUBE_Y_INC BUTTON_RC_PLAY | ||
199 | #define CUBE_Y_DEC BUTTON_RC_DOWN | ||
200 | #define CUBE_Z_INC BUTTON_RC_VOL_UP | ||
201 | #define CUBE_Z_DEC BUTTON_RC_VOL_DOWN | ||
202 | #define CUBE_MODE BUTTON_RC_MODE | ||
203 | #define CUBE_PAUSE_PRE BUTTON_RC_HEART | ||
204 | #define CUBE_PAUSE (BUTTON_RC_HEART | BUTTON_REL) | ||
205 | #define CUBE_HIGHSPEED BUTTON_RC_HEART | ||
206 | |||
194 | #endif | 207 | #endif |
195 | 208 | ||
196 | #ifdef HAVE_LCD_BITMAP | 209 | #ifdef HAVE_LCD_BITMAP |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 257a0c6147..38e86fbed7 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -119,6 +119,8 @@ long reverse (long N) { | |||
119 | #define LP_QUIT BUTTON_POWER | 119 | #define LP_QUIT BUTTON_POWER |
120 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 120 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
121 | #define LP_QUIT BUTTON_POWER | 121 | #define LP_QUIT BUTTON_POWER |
122 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
123 | #define LP_QUIT BUTTON_POWER | ||
122 | #else | 124 | #else |
123 | #define LP_QUIT BUTTON_OFF | 125 | #define LP_QUIT BUTTON_OFF |
124 | #endif | 126 | #endif |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 88821c8a78..dc1fc6e7cb 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -224,6 +224,14 @@ const unsigned char rockbox16x7[] = { | |||
224 | #define LP_INC_X BUTTON_RIGHT | 224 | #define LP_INC_X BUTTON_RIGHT |
225 | #define LP_DEC_Y BUTTON_SCROLL_DOWN | 225 | #define LP_DEC_Y BUTTON_SCROLL_DOWN |
226 | #define LP_INC_Y BUTTON_SCROLL_UP | 226 | #define LP_INC_Y BUTTON_SCROLL_UP |
227 | |||
228 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
229 | #define LP_QUIT BUTTON_POWER | ||
230 | #define LP_DEC_X BUTTON_LEFT | ||
231 | #define LP_INC_X BUTTON_RIGHT | ||
232 | #define LP_DEC_Y BUTTON_RC_DOWN | ||
233 | #define LP_INC_Y BUTTON_RC_PLAY | ||
234 | |||
227 | #else | 235 | #else |
228 | #define LP_QUIT BUTTON_OFF | 236 | #define LP_QUIT BUTTON_OFF |
229 | #define LP_DEC_X BUTTON_LEFT | 237 | #define LP_DEC_X BUTTON_LEFT |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 45d2319101..8ce5c1b435 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -102,6 +102,11 @@ PLUGIN_HEADER | |||
102 | #define MOSAIQUE_SPEED BUTTON_FF | 102 | #define MOSAIQUE_SPEED BUTTON_FF |
103 | #define MOSAIQUE_RESTART BUTTON_PLAY | 103 | #define MOSAIQUE_RESTART BUTTON_PLAY |
104 | 104 | ||
105 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
106 | #define MOSAIQUE_QUIT BUTTON_POWER | ||
107 | #define MOSAIQUE_SPEED BUTTON_RC_FF | ||
108 | #define MOSAIQUE_RESTART BUTTON_RC_PLAY | ||
109 | |||
105 | #endif | 110 | #endif |
106 | 111 | ||
107 | enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | 112 | enum plugin_status plugin_start(struct plugin_api* api, void* parameter) |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 0b3382ff19..45f3c4f14e 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -167,6 +167,16 @@ PLUGIN_HEADER | |||
167 | #define ROCKBLOX_DROP BUTTON_MODE | 167 | #define ROCKBLOX_DROP BUTTON_MODE |
168 | #define ROCKBLOX_RESTART BUTTON_EQ | 168 | #define ROCKBLOX_RESTART BUTTON_EQ |
169 | 169 | ||
170 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
171 | #define ROCKBLOX_OFF BUTTON_POWER | ||
172 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_RC_VOL_UP | ||
173 | #define ROCKBLOX_ROTATE_LEFT BUTTON_RC_VOL_DOWN | ||
174 | #define ROCKBLOX_DOWN BUTTON_RC_DOWN | ||
175 | #define ROCKBLOX_LEFT BUTTON_LEFT | ||
176 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | ||
177 | #define ROCKBLOX_DROP BUTTON_RC_HEART | ||
178 | #define ROCKBLOX_RESTART BUTTON_RC_MODE | ||
179 | |||
170 | #endif | 180 | #endif |
171 | 181 | ||
172 | #define BLOCKS_NUM 7 | 182 | #define BLOCKS_NUM 7 |
@@ -178,7 +188,23 @@ PLUGIN_HEADER | |||
178 | 188 | ||
179 | #define BOARD_HEIGHT 20 | 189 | #define BOARD_HEIGHT 20 |
180 | 190 | ||
181 | #if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) | 191 | #if (LCD_WIDTH == 480) && (LCD_HEIGHT == 640) |
192 | |||
193 | #define BLOCK_WIDTH 30 | ||
194 | #define BLOCK_HEIGHT 30 | ||
195 | #define BOARD_X 14 | ||
196 | #define BOARD_Y 2 | ||
197 | #define PREVIEW_X 342 | ||
198 | #define PREVIEW_Y 482 | ||
199 | #define LABEL_X 344 | ||
200 | #define SCORE_Y 58 | ||
201 | #define LEVEL_Y 142 | ||
202 | #define LINES_Y 218 | ||
203 | #define HIGH_LABEL_X 344 | ||
204 | #define HIGH_SCORE_Y 326 | ||
205 | #define HIGH_LEVEL_Y 344 | ||
206 | |||
207 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) | ||
182 | 208 | ||
183 | #define BLOCK_WIDTH 12 | 209 | #define BLOCK_WIDTH 12 |
184 | #define BLOCK_HEIGHT 12 | 210 | #define BLOCK_HEIGHT 12 |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 6078f87708..47b182299c 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -51,6 +51,8 @@ PLUGIN_HEADER | |||
51 | #define SNOW_QUIT BUTTON_POWER | 51 | #define SNOW_QUIT BUTTON_POWER |
52 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 52 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
53 | #define SNOW_QUIT BUTTON_POWER | 53 | #define SNOW_QUIT BUTTON_POWER |
54 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
55 | #define SNOW_QUIT BUTTON_POWER | ||
54 | #else | 56 | #else |
55 | #define SNOW_QUIT BUTTON_OFF | 57 | #define SNOW_QUIT BUTTON_OFF |
56 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | 58 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 03dc9fa038..32d15cc1d3 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -60,6 +60,8 @@ static bool abort; | |||
60 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 60 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
61 | #define STATS_STOP BUTTON_POWER | 61 | #define STATS_STOP BUTTON_POWER |
62 | 62 | ||
63 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
64 | #define STATS_STOP BUTTON_POWER | ||
63 | #endif | 65 | #endif |
64 | 66 | ||
65 | /* TODO: Better get the exts from the filetypes var in tree.c */ | 67 | /* TODO: Better get the exts from the filetypes var in tree.c */ |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index d36a774447..3a863e8fd9 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -115,6 +115,13 @@ PLUGIN_HEADER | |||
115 | #define STOPWATCH_LAP_TIMER BUTTON_FF | 115 | #define STOPWATCH_LAP_TIMER BUTTON_FF |
116 | #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_UP | 116 | #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_UP |
117 | #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_DOWN | 117 | #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_DOWN |
118 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
119 | #define STOPWATCH_QUIT BUTTON_POWER | ||
120 | #define STOPWATCH_START_STOP BUTTON_RC_HEART | ||
121 | #define STOPWATCH_RESET_TIMER BUTTON_RC_MODE | ||
122 | #define STOPWATCH_LAP_TIMER BUTTON_RC_PLAY | ||
123 | #define STOPWATCH_SCROLL_UP BUTTON_RIGHT | ||
124 | #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT | ||
118 | #endif | 125 | #endif |
119 | 126 | ||
120 | static struct plugin_api* rb; | 127 | static struct plugin_api* rb; |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 30d3d37837..f0b8e3ff36 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -206,6 +206,15 @@ PLUGIN_HEADER | |||
206 | #define VIEWER_MENU BUTTON_REW | 206 | #define VIEWER_MENU BUTTON_REW |
207 | #define VIEWER_AUTOSCROLL BUTTON_PLAY | 207 | #define VIEWER_AUTOSCROLL BUTTON_PLAY |
208 | 208 | ||
209 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
210 | #define VIEWER_QUIT BUTTON_POWER | ||
211 | #define VIEWER_PAGE_UP BUTTON_RC_PLAY | ||
212 | #define VIEWER_PAGE_DOWN BUTTON_RC_DOWN | ||
213 | #define VIEWER_SCREEN_LEFT BUTTON_LEFT | ||
214 | #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT | ||
215 | #define VIEWER_MENU BUTTON_RC_HEART | ||
216 | #define VIEWER_AUTOSCROLL BUTTON_RC_MODE | ||
217 | |||
209 | #endif | 218 | #endif |
210 | 219 | ||
211 | /* stuff for the bookmarking */ | 220 | /* stuff for the bookmarking */ |