1 files changed, 26 insertions, 9 deletions

diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 979705fbe1..38a97f0b46 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -251,20 +251,37 @@ PLUGIN_HEADER
 
 #elif (CONFIG_KEYPAD == COWOND2_PAD)
 
-#define CALCULATOR_LEFT BUTTON_LEFT
-#define CALCULATOR_RIGHT BUTTON_RIGHT
-#define CALCULATOR_UP   BUTTON_UP
-#define CALCULATOR_DOWN BUTTON_DOWN
-#define CALCULATOR_QUIT BUTTON_POWER
-#define CALCULATOR_INPUT_CALC_PRE BUTTON_MINUS
-#define CALCULATOR_INPUT BUTTON_PLUS
-#define CALCULATOR_CALC BUTTON_SELECT
-#define CALCULATOR_CLEAR BUTTON_MENU
+#define CALCULATOR_QUIT           BUTTON_POWER
+#define CALCULATOR_CLEAR          BUTTON_MENU
 
 #else
 #error No keymap defined!
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef CALCULATOR_LEFT
+#define CALCULATOR_LEFT           BUTTON_MIDLEFT
+#endif
+#ifndef CALCULATOR_RIGHT
+#define CALCULATOR_RIGHT          BUTTON_MIDRIGHT
+#endif
+#ifndef CALCULATOR_UP
+#define CALCULATOR_UP             BUTTON_TOPMIDDLE
+#endif
+#ifndef CALCULATOR_DOWN
+#define CALCULATOR_DOWN           BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef CALCULATOR_CALC
+#define CALCULATOR_CALC           BUTTON_BOTTOMRIGHT
+#endif
+#ifndef CALCULATOR_INPUT
+#define CALCULATOR_INPUT          BUTTON_CENTER
+#endif
+#ifndef CALCULATOR_CLEAR
+#define CALCULATOR_CLEAR          BUTTON_TOPRIGHT
+#endif
+#endif
+
 static struct plugin_api* rb;
 
 enum {