summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/plugins/SOURCES3
-rw-r--r--apps/plugins/battery_bench.c7
-rw-r--r--apps/plugins/chessclock.c10
-rw-r--r--apps/plugins/cube.c13
-rw-r--r--apps/plugins/dict.c2
-rw-r--r--apps/plugins/logo.c8
-rw-r--r--apps/plugins/mosaique.c5
-rw-r--r--apps/plugins/rockblox.c28
-rw-r--r--apps/plugins/snow.c2
-rw-r--r--apps/plugins/stats.c2
-rw-r--r--apps/plugins/stopwatch.c7
-rw-r--r--apps/plugins/viewer.c9
12 files changed, 94 insertions, 2 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index c7f55ee..33ebec3 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,4 +1,3 @@
-#ifndef OLYMPUS_MROBE_500
/* plugins common to all models */
battery_bench.c
chessclock.c
@@ -21,6 +20,8 @@ stopwatch.c
vbrfix.c
viewer.c
+#ifndef OLYMPUS_MROBE_500
+
#if CONFIG_CODEC == SWCODEC
metronome.c
#endif
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index f03a4e2..2b99595 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -114,6 +114,13 @@ PLUGIN_HEADER
#define BATTERY_ON_TXT "SELECT - start"
#define BATTERY_OFF_TXT "POWER - quit"
+#elif CONFIG_KEYPAD == MROBE500_PAD
+
+#define BATTERY_ON BUTTON_RC_PLAY
+#define BATTERY_OFF BUTTON_POWER
+#define BATTERY_ON_TXT "PLAY - start"
+#define BATTERY_OFF_TXT "POWER - quit"
+
#endif
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 56d2709..439ebb1 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -140,6 +140,16 @@ PLUGIN_HEADER
#define CHC_SETTINGS_OK BUTTON_PLAY
#define CHC_SETTINGS_CANCEL BUTTON_POWER
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define CHC_QUIT BUTTON_POWER
+#define CHC_STARTSTOP BUTTON_RC_PLAY
+#define CHC_RESET BUTTON_RC_HEART
+#define CHC_MENU BUTTON_RC_MODE
+#define CHC_SETTINGS_INC BUTTON_RC_VOL_UP
+#define CHC_SETTINGS_DEC BUTTON_RC_VOL_DOWN
+#define CHC_SETTINGS_OK BUTTON_RC_PLAY
+#define CHC_SETTINGS_CANCEL BUTTON_POWER
+
#endif
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 3294b37..31faf32 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -191,6 +191,19 @@ PLUGIN_HEADER
#define CUBE_PAUSE (BUTTON_PLAY | BUTTON_REL)
#define CUBE_HIGHSPEED (BUTTON_FF | BUTTON_REL)
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define CUBE_QUIT BUTTON_POWER
+#define CUBE_X_INC BUTTON_LEFT
+#define CUBE_X_DEC BUTTON_RIGHT
+#define CUBE_Y_INC BUTTON_RC_PLAY
+#define CUBE_Y_DEC BUTTON_RC_DOWN
+#define CUBE_Z_INC BUTTON_RC_VOL_UP
+#define CUBE_Z_DEC BUTTON_RC_VOL_DOWN
+#define CUBE_MODE BUTTON_RC_MODE
+#define CUBE_PAUSE_PRE BUTTON_RC_HEART
+#define CUBE_PAUSE (BUTTON_RC_HEART | BUTTON_REL)
+#define CUBE_HIGHSPEED BUTTON_RC_HEART
+
#endif
#ifdef HAVE_LCD_BITMAP
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c
index 257a0c6..38e86fb 100644
--- a/apps/plugins/dict.c
+++ b/apps/plugins/dict.c
@@ -119,6 +119,8 @@ long reverse (long N) {
#define LP_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define LP_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define LP_QUIT BUTTON_POWER
#else
#define LP_QUIT BUTTON_OFF
#endif
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c
index 88821c8..dc1fc6e 100644
--- a/apps/plugins/logo.c
+++ b/apps/plugins/logo.c
@@ -224,6 +224,14 @@ const unsigned char rockbox16x7[] = {
#define LP_INC_X BUTTON_RIGHT
#define LP_DEC_Y BUTTON_SCROLL_DOWN
#define LP_INC_Y BUTTON_SCROLL_UP
+
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define LP_QUIT BUTTON_POWER
+#define LP_DEC_X BUTTON_LEFT
+#define LP_INC_X BUTTON_RIGHT
+#define LP_DEC_Y BUTTON_RC_DOWN
+#define LP_INC_Y BUTTON_RC_PLAY
+
#else
#define LP_QUIT BUTTON_OFF
#define LP_DEC_X BUTTON_LEFT
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c
index 45d2319..8ce5c1b 100644
--- a/apps/plugins/mosaique.c
+++ b/apps/plugins/mosaique.c
@@ -102,6 +102,11 @@ PLUGIN_HEADER
#define MOSAIQUE_SPEED BUTTON_FF
#define MOSAIQUE_RESTART BUTTON_PLAY
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define MOSAIQUE_QUIT BUTTON_POWER
+#define MOSAIQUE_SPEED BUTTON_RC_FF
+#define MOSAIQUE_RESTART BUTTON_RC_PLAY
+
#endif
enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 0b3382f..45f3c4f 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -167,6 +167,16 @@ PLUGIN_HEADER
#define ROCKBLOX_DROP BUTTON_MODE
#define ROCKBLOX_RESTART BUTTON_EQ
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define ROCKBLOX_OFF BUTTON_POWER
+#define ROCKBLOX_ROTATE_RIGHT BUTTON_RC_VOL_UP
+#define ROCKBLOX_ROTATE_LEFT BUTTON_RC_VOL_DOWN
+#define ROCKBLOX_DOWN BUTTON_RC_DOWN
+#define ROCKBLOX_LEFT BUTTON_LEFT
+#define ROCKBLOX_RIGHT BUTTON_RIGHT
+#define ROCKBLOX_DROP BUTTON_RC_HEART
+#define ROCKBLOX_RESTART BUTTON_RC_MODE
+
#endif
#define BLOCKS_NUM 7
@@ -178,7 +188,23 @@ PLUGIN_HEADER
#define BOARD_HEIGHT 20
-#if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240)
+#if (LCD_WIDTH == 480) && (LCD_HEIGHT == 640)
+
+#define BLOCK_WIDTH 30
+#define BLOCK_HEIGHT 30
+#define BOARD_X 14
+#define BOARD_Y 2
+#define PREVIEW_X 342
+#define PREVIEW_Y 482
+#define LABEL_X 344
+#define SCORE_Y 58
+#define LEVEL_Y 142
+#define LINES_Y 218
+#define HIGH_LABEL_X 344
+#define HIGH_SCORE_Y 326
+#define HIGH_LEVEL_Y 344
+
+#elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240)
#define BLOCK_WIDTH 12
#define BLOCK_HEIGHT 12
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c
index 6078f87..47b1822 100644
--- a/apps/plugins/snow.c
+++ b/apps/plugins/snow.c
@@ -51,6 +51,8 @@ PLUGIN_HEADER
#define SNOW_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define SNOW_QUIT BUTTON_POWER
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define SNOW_QUIT BUTTON_POWER
#else
#define SNOW_QUIT BUTTON_OFF
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index 03dc9fa..32d15cc 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -60,6 +60,8 @@ static bool abort;
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define STATS_STOP BUTTON_POWER
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define STATS_STOP BUTTON_POWER
#endif
/* 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 d36a774..3a863e8 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -115,6 +115,13 @@ PLUGIN_HEADER
#define STOPWATCH_LAP_TIMER BUTTON_FF
#define STOPWATCH_SCROLL_UP BUTTON_SCROLL_UP
#define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_DOWN
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define STOPWATCH_QUIT BUTTON_POWER
+#define STOPWATCH_START_STOP BUTTON_RC_HEART
+#define STOPWATCH_RESET_TIMER BUTTON_RC_MODE
+#define STOPWATCH_LAP_TIMER BUTTON_RC_PLAY
+#define STOPWATCH_SCROLL_UP BUTTON_RIGHT
+#define STOPWATCH_SCROLL_DOWN BUTTON_LEFT
#endif
static struct plugin_api* rb;
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c
index 30d3d37..f0b8e3f 100644
--- a/apps/plugins/viewer.c
+++ b/apps/plugins/viewer.c
@@ -206,6 +206,15 @@ PLUGIN_HEADER
#define VIEWER_MENU BUTTON_REW
#define VIEWER_AUTOSCROLL BUTTON_PLAY
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define VIEWER_QUIT BUTTON_POWER
+#define VIEWER_PAGE_UP BUTTON_RC_PLAY
+#define VIEWER_PAGE_DOWN BUTTON_RC_DOWN
+#define VIEWER_SCREEN_LEFT BUTTON_LEFT
+#define VIEWER_SCREEN_RIGHT BUTTON_RIGHT
+#define VIEWER_MENU BUTTON_RC_HEART
+#define VIEWER_AUTOSCROLL BUTTON_RC_MODE
+
#endif
/* stuff for the bookmarking */