M:Robe 500: Start of proper remote support, touchscreen works without remote now.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20684 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 30 insertions, 6 deletions

diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 60ed71cbd0..e5baf8ac1e 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -182,9 +182,11 @@ MENUITEM_SETTING(remote_contrast,
                     &global_settings.remote_contrast, NULL);
 MENUITEM_SETTING(remote_invert, 
                     &global_settings.remote_invert, NULL);
-                    
+   
+#ifdef HAVE_LCD_FLIP                    
 MENUITEM_SETTING(remote_flip_display, 
                     &global_settings.remote_flip_display, flipdisplay_callback);
+#endif
 
 #ifdef HAVE_REMOTE_LCD_TICKING
 static int ticking_callback(int action,const struct menu_item_ex *this_item)
@@ -212,7 +214,11 @@ MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU),
             &remote_backlight_on_button_hold,
 #endif
             &remote_caption_backlight, &remote_bl_filter_first_keypress,
-            &remote_contrast, &remote_invert, &remote_flip_display
+            &remote_contrast, &remote_invert
+            
+#ifdef HAVE_LCD_FLIP
+            ,&remote_flip_display
+#endif
 #ifdef HAVE_REMOTE_LCD_TICKING
             ,&remote_reduce_ticking
 #endif
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 773b1032bd..18c6851827 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -59,6 +59,15 @@ const struct button_mapping remote_directions[] =
     { PLA_DOWN_REPEAT,       BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE},
     { PLA_LEFT_REPEAT,       BUTTON_RC_LEFT|BUTTON_REPEAT,     BUTTON_NONE},
     { PLA_RIGHT_REPEAT,      BUTTON_RC_RIGHT|BUTTON_REPEAT,    BUTTON_NONE},
+#elif (CONFIG_REMOTE_KEYPAD == MROBE_REMOTE)
+    { PLA_UP,                BUTTON_RC_PLAY,                   BUTTON_NONE},
+    { PLA_DOWN,              BUTTON_RC_DOWN,                   BUTTON_NONE},
+    { PLA_LEFT,              BUTTON_RC_REW,                    BUTTON_NONE},
+    { PLA_RIGHT,             BUTTON_RC_FF,                     BUTTON_NONE},
+    { PLA_UP_REPEAT,         BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_NONE},
+    { PLA_DOWN_REPEAT,       BUTTON_RC_DOWN|BUTTON_REPEAT,     BUTTON_NONE},
+    { PLA_LEFT_REPEAT,       BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE},
+    { PLA_RIGHT_REPEAT,      BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_NONE},
 #else
     #error pluginlib_actions: Unsupported remote keypad
 #endif
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c
index 2ec1b38271..e61de014cc 100644
--- a/apps/plugins/logo.c
+++ b/apps/plugins/logo.c
@@ -122,10 +122,6 @@ const unsigned char rockbox16x7[] = {
 
 #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
 
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 #define LP_QUIT BUTTON_BACK
@@ -191,7 +187,15 @@ const unsigned char rockbox16x7[] = {
 #define LP_R_INC_X BUTTON_RC_FF
 #define LP_R_DEC_Y BUTTON_RC_SOURCE
 #define LP_R_INC_Y BUTTON_RC_BITRATE
+
+#elif (CONFIG_REMOTE_KEYPAD==MROBE_REMOTE)
+#define LP_R_QUIT BUTTON_RC_HEART
+#define LP_R_DEC_X BUTTON_RC_REW
+#define LP_R_INC_X BUTTON_RC_FF
+#define LP_R_DEC_Y BUTTON_RC_DOWN
+#define LP_R_INC_Y BUTTON_RC_PLAY
 #endif
+
 #endif /* CONFIG_REMOTE_KEYPAD */
 
 #ifdef HAVE_TOUCHSCREEN
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index 659f3e6763..976fd262f8 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -68,6 +68,7 @@ static bool abort;
 
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define STATS_STOP BUTTON_POWER
+#define STATS_STOP_REMOTE BUTTON_RC_DOWN
 
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 #define STATS_STOP BUTTON_BACK
diff --git a/apps/settings.c b/apps/settings.c
index 4db4f4405c..598e39e7ab 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -742,7 +742,11 @@ void settings_apply(bool read_disk)
 #ifdef HAVE_REMOTE_LCD
     lcd_remote_set_contrast(global_settings.remote_contrast);
     lcd_remote_set_invert_display(global_settings.remote_invert);
+
+#ifdef HAVE_LCD_FLIP
     lcd_remote_set_flip(global_settings.remote_flip_display);
+#endif
+
     lcd_remote_scroll_speed(global_settings.remote_scroll_speed);
     lcd_remote_scroll_step(global_settings.remote_scroll_step);
     lcd_remote_scroll_delay(global_settings.remote_scroll_delay);