1 files changed, 27 insertions, 6 deletions

diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 82fb758dee..42efa6f308 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -213,18 +213,39 @@ PLUGIN_HEADER
 
 #elif CONFIG_KEYPAD == COWOND2_PAD
 #define ROCKBLOX_OFF           BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT  BUTTON_PLUS
-#define ROCKBLOX_ROTATE_LEFT   BUTTON_MINUS
-#define ROCKBLOX_DOWN          BUTTON_DOWN
-#define ROCKBLOX_LEFT          BUTTON_LEFT
-#define ROCKBLOX_RIGHT         BUTTON_RIGHT
-#define ROCKBLOX_DROP          BUTTON_SELECT
 #define ROCKBLOX_RESTART       BUTTON_MENU
 
 #else
 #error No keymap defined!
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef ROCKBLOX_OFF
+#define ROCKBLOX_OFF           BUTTON_TOPLEFT
+#endif
+#ifndef ROCKBLOX_ROTATE_RIGHT
+#define ROCKBLOX_ROTATE_RIGHT  BUTTON_BOTTOMRIGHT
+#endif
+#ifndef ROCKBLOX_ROTATE_LEFT
+#define ROCKBLOX_ROTATE_LEFT   BUTTON_BOTTOMLEFT
+#endif
+#ifndef ROCKBLOX_DOWN
+#define ROCKBLOX_DOWN          BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef ROCKBLOX_LEFT
+#define ROCKBLOX_LEFT          BUTTON_MIDLEFT
+#endif
+#ifndef ROCKBLOX_RIGHT
+#define ROCKBLOX_RIGHT         BUTTON_MIDRIGHT
+#endif
+#ifndef ROCKBLOX_DROP
+#define ROCKBLOX_DROP          BUTTON_CENTER
+#endif
+#ifndef ROCKBLOX_RESTART
+#define ROCKBLOX_RESTART       BUTTON_TOPRIGHT
+#endif
+#endif
+
 #define BLOCKS_NUM  7
 #define EMPTY_BLOCK 7