1 files changed, 30 insertions, 8 deletions

diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index d576c81d88..eae1a7bc4c 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -183,14 +183,6 @@ PLUGIN_HEADER
 
 #elif CONFIG_KEYPAD == COWOND2_PAD
 #define OSCILLOSCOPE_QUIT         BUTTON_POWER
-#define OSCILLOSCOPE_DRAWMODE_PRE (BUTTON_LEFT | BUTTON_MENU)
-#define OSCILLOSCOPE_DRAWMODE     (BUTTON_RIGHT | BUTTON_MENU)
-#define OSCILLOSCOPE_ADVMODE      (BUTTON_SELECT|BUTTON_MENU)
-#define OSCILLOSCOPE_ORIENTATION_PRE (BUTTON_UP | BUTTON_MENU)
-#define OSCILLOSCOPE_ORIENTATION  (BUTTON_DOWN | BUTTON_MENU)
-#define OSCILLOSCOPE_PAUSE        BUTTON_SELECT
-#define OSCILLOSCOPE_SPEED_UP     BUTTON_UP
-#define OSCILLOSCOPE_SPEED_DOWN   BUTTON_DOWN
 #define OSCILLOSCOPE_VOL_UP       BUTTON_PLUS
 #define OSCILLOSCOPE_VOL_DOWN     BUTTON_MINUS
 
@@ -198,6 +190,36 @@ PLUGIN_HEADER
 #error No keymap defined!
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef OSCILLOSCOPE_QUIT
+#define OSCILLOSCOPE_QUIT         BUTTON_TOPLEFT
+#endif
+#ifndef OSCILLOSCOPE_DRAWMODE
+#define OSCILLOSCOPE_DRAWMODE     BUTTON_TOPMIDDLE
+#endif
+#ifndef OSCILLOSCOPE_ADVMODE
+#define OSCILLOSCOPE_ADVMODE      BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef OSCILLOSCOPE_ORIENTATION
+#define OSCILLOSCOPE_ORIENTATION  BUTTON_BOTTOMLEFT
+#endif
+#ifndef OSCILLOSCOPE_PAUSE
+#define OSCILLOSCOPE_PAUSE        BUTTON_CENTER
+#endif
+#ifndef OSCILLOSCOPE_SPEED_UP
+#define OSCILLOSCOPE_SPEED_UP     BUTTON_MIDRIGHT
+#endif
+#ifndef OSCILLOSCOPE_SPEED_DOWN
+#define OSCILLOSCOPE_SPEED_DOWN   BUTTON_MIDLEFT
+#endif
+#ifndef OSCILLOSCOPE_VOL_UP
+#define OSCILLOSCOPE_VOL_UP       BUTTON_TOPRIGHT
+#endif
+#ifndef OSCILLOSCOPE_VOL_DOWN
+#define OSCILLOSCOPE_VOL_DOWN     BUTTON_BOTTOMRIGHT
+#endif
+#endif
+
 /* colours */
 #if LCD_DEPTH > 1
 #ifdef HAVE_LCD_COLOR