1 files changed, 11 insertions, 34 deletions

diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index f02f99ee0d..77f79f9057 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -493,29 +493,7 @@ F3: equal to "="
 #define CALCULATOR_CALC    BUTTON_VOLUP
 #define CALCULATOR_CLEAR   (BUTTON_SELECT|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == XDUOO_X3_PAD
-#define CALCULATOR_LEFT      BUTTON_PREV
-#define CALCULATOR_RIGHT     BUTTON_NEXT
-#define CALCULATOR_UP        BUTTON_HOME
-#define CALCULATOR_DOWN      BUTTON_OPTION
-#define CALCULATOR_QUIT      BUTTON_POWER
-#define CALCULATOR_INPUT_CALC_PRE (BUTTON_OPTION|BUTTON_REPEAT)
-#define CALCULATOR_INPUT     (BUTTON_PLAY|BUTTON_REL)
-#define CALCULATOR_CALC      (BUTTON_PLAY|BUTTON_REPEAT)
-#define CALCULATOR_CLEAR     (BUTTON_POWER|BUTTON_REPEAT)
-
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define CALCULATOR_LEFT      BUTTON_PREV
-#define CALCULATOR_RIGHT     BUTTON_NEXT
-#define CALCULATOR_UP        BUTTON_HOME
-#define CALCULATOR_DOWN      BUTTON_OPTION
-#define CALCULATOR_QUIT      BUTTON_POWER
-#define CALCULATOR_INPUT_CALC_PRE (BUTTON_OPTION|BUTTON_REPEAT)
-#define CALCULATOR_INPUT     (BUTTON_PLAY|BUTTON_REL)
-#define CALCULATOR_CALC      (BUTTON_PLAY|BUTTON_REPEAT)
-#define CALCULATOR_CLEAR     (BUTTON_POWER|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 CALCULATOR_LEFT      BUTTON_PREV
 #define CALCULATOR_RIGHT     BUTTON_NEXT
 #define CALCULATOR_UP        BUTTON_HOME
@@ -537,7 +515,7 @@ F3: equal to "="
 #define CALCULATOR_CALC      (BUTTON_PLAY|BUTTON_REPEAT)
 #define CALCULATOR_CLEAR     (BUTTON_POWER|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 #define CALCULATOR_LEFT      BUTTON_HOME
 #define CALCULATOR_RIGHT     BUTTON_VOL_DOWN
 #define CALCULATOR_UP        BUTTON_PREV
@@ -548,16 +526,15 @@ F3: equal to "="
 #define CALCULATOR_CALC      (BUTTON_PLAY|BUTTON_REPEAT)
 #define CALCULATOR_CLEAR     (BUTTON_POWER|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
-#define CALCULATOR_LEFT      BUTTON_HOME
-#define CALCULATOR_RIGHT     BUTTON_VOL_DOWN
-#define CALCULATOR_UP        BUTTON_PREV
-#define CALCULATOR_DOWN      BUTTON_NEXT
-#define CALCULATOR_QUIT      BUTTON_POWER
-#define CALCULATOR_INPUT_CALC_PRE (BUTTON_HOME|BUTTON_REPEAT)
-#define CALCULATOR_INPUT     (BUTTON_PLAY|BUTTON_REL)
-#define CALCULATOR_CALC      (BUTTON_PLAY|BUTTON_REPEAT)
-#define CALCULATOR_CLEAR     (BUTTON_POWER|BUTTON_REPEAT)
+#elif CONFIG_KEYPAD == EROSQ_PAD
+#define CALCULATOR_LEFT    BUTTON_SCROLL_BACK
+#define CALCULATOR_RIGHT   BUTTON_SCROLL_FWD
+#define CALCULATOR_UP      BUTTON_PREV
+#define CALCULATOR_DOWN    BUTTON_NEXT
+#define CALCULATOR_QUIT    BUTTON_POWER
+#define CALCULATOR_INPUT   BUTTON_PLAY
+#define CALCULATOR_CALC    BUTTON_MENU
+#define CALCULATOR_CLEAR   BUTTON_BACK
 
 #else
 #error No keymap defined!