1 files changed, 9 insertions, 29 deletions

diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 89dcc61714..59aba941ae 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -381,27 +381,7 @@
 #define CALENDAR_NEXT_MONTH  (BUTTON_VOLDOWN)
 #define CALENDAR_PREV_MONTH  (BUTTON_VOLUP)
 
-#elif CONFIG_KEYPAD == XDUOO_X3_PAD
-#define CALENDAR_QUIT       BUTTON_POWER
-#define CALENDAR_SELECT     BUTTON_PLAY
-#define CALENDAR_NEXT_WEEK  BUTTON_OPTION
-#define CALENDAR_PREV_WEEK  BUTTON_HOME
-#define CALENDAR_NEXT_DAY   BUTTON_NEXT
-#define CALENDAR_PREV_DAY   BUTTON_PREV
-#define CALENDAR_NEXT_MONTH BUTTON_VOL_UP
-#define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN
-
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define CALENDAR_QUIT       BUTTON_POWER
-#define CALENDAR_SELECT     BUTTON_PLAY
-#define CALENDAR_NEXT_WEEK  BUTTON_OPTION
-#define CALENDAR_PREV_WEEK  BUTTON_HOME
-#define CALENDAR_NEXT_DAY   BUTTON_NEXT
-#define CALENDAR_PREV_DAY   BUTTON_PREV
-#define CALENDAR_NEXT_MONTH BUTTON_VOL_UP
-#define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3_PAD || CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
 #define CALENDAR_SELECT     BUTTON_PLAY
 #define CALENDAR_NEXT_WEEK  BUTTON_OPTION
@@ -421,7 +401,7 @@
 #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP
 #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
 #define CALENDAR_SELECT     BUTTON_PLAY
 #define CALENDAR_NEXT_WEEK  (BUTTON_POWER | BUTTON_VOL_DOWN)
@@ -431,15 +411,15 @@
 #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN
 #define CALENDAR_PREV_MONTH BUTTON_VOL_UP
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
 #define CALENDAR_SELECT     BUTTON_PLAY
-#define CALENDAR_NEXT_WEEK  (BUTTON_POWER | BUTTON_VOL_DOWN)
-#define CALENDAR_PREV_WEEK  (BUTTON_POWER | BUTTON_VOL_UP)
-#define CALENDAR_NEXT_DAY   BUTTON_NEXT
-#define CALENDAR_PREV_DAY   BUTTON_PREV
-#define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN
-#define CALENDAR_PREV_MONTH BUTTON_VOL_UP
+#define CALENDAR_NEXT_WEEK  BUTTON_NEXT
+#define CALENDAR_PREV_WEEK  BUTTON_PREV
+#define CALENDAR_NEXT_DAY   BUTTON_SCROLL_FWD
+#define CALENDAR_PREV_DAY   BUTTON_SCROLL_BACK
+#define CALENDAR_NEXT_MONTH BUTTON_VOL_UP
+#define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN
 
 #else
 #error "No keypad setting."