summaryrefslogtreecommitdiffstats
path: root/apps/plugins/rockblox.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins/rockblox.c')
-rw-r--r--apps/plugins/rockblox.c42
1 files changed, 8 insertions, 34 deletions
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index ec6d892a0b..6a8b50a68d 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -431,31 +431,7 @@
#define ROCKBLOX_ROTATE_CCW BUTTON_VOLDOWN
#define ROCKBLOX_DOWN BUTTON_DOWN
-#elif CONFIG_KEYPAD == XDUOO_X3_PAD
-
-#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_CCW BUTTON_HOME
-#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN
-#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP
-#define ROCKBLOX_DOWN BUTTON_OPTION
-#define ROCKBLOX_LEFT BUTTON_PREV
-#define ROCKBLOX_RIGHT BUTTON_NEXT
-#define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL)
-#define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT)
-
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-
-#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_CCW BUTTON_HOME
-#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN
-#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP
-#define ROCKBLOX_DOWN BUTTON_OPTION
-#define ROCKBLOX_LEFT BUTTON_PREV
-#define ROCKBLOX_RIGHT BUTTON_NEXT
-#define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL)
-#define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT)
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif (CONFIG_KEYPAD == XDUOO_X3_PAD) || (CONFIG_KEYPAD == XDUOO_X3II_PAD) || (CONFIG_KEYPAD == XDUOO_X20_PAD)
#define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_ROTATE_CCW BUTTON_HOME
@@ -479,7 +455,7 @@
#define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL)
#define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT)
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD)
#define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_ROTATE_CCW BUTTON_HOME
@@ -491,17 +467,15 @@
#define ROCKBLOX_DROP (BUTTON_POWER|BUTTON_PLAY)
#define ROCKBLOX_RESTART (BUTTON_POWER|BUTTON_REPEAT)
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
-
+#elif CONFIG_KEYPAD == EROSQ_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_CCW BUTTON_HOME
-#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN
-#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP
-#define ROCKBLOX_DOWN BUTTON_PLAY
+#define ROCKBLOX_ROTATE_CCW BUTTON_SCROLL_BACK
+#define ROCKBLOX_ROTATE_CW BUTTON_SCROLL_FWD
+#define ROCKBLOX_DOWN BUTTON_MENU
#define ROCKBLOX_LEFT BUTTON_PREV
#define ROCKBLOX_RIGHT BUTTON_NEXT
-#define ROCKBLOX_DROP (BUTTON_POWER|BUTTON_PLAY)
-#define ROCKBLOX_RESTART (BUTTON_POWER|BUTTON_REPEAT)
+#define ROCKBLOX_DROP BUTTON_PLAY
+#define ROCKBLOX_RESTART BUTTON_BACK
#else
#error No keymap defined!