From 5449b1ed1d241ad4bdbe5dd2cd8c65ecbfa5b6b1 Mon Sep 17 00:00:00 2001 From: Karl Kurbjun Date: Sat, 11 Apr 2009 07:23:56 +0000 Subject: 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 --- apps/plugins/lib/pluginlib_actions.c | 9 +++++++++ apps/plugins/logo.c | 12 ++++++++---- apps/plugins/stats.c | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 773b103..18c6851 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 2ec1b38..e61de01 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 659f3e6..976fd26 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 -- cgit v1.1