3 files changed, 17 insertions, 2 deletions

diff --git a/apps/plugins/lib/keymaps.h b/apps/plugins/lib/keymaps.h
index c079a9080b..64deccf513 100644
--- a/apps/plugins/lib/keymaps.h
+++ b/apps/plugins/lib/keymaps.h
@@ -60,7 +60,8 @@
     (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD)     || \
     (CONFIG_KEYPAD == IRIVER_H300_PAD)      || \
     (CONFIG_KEYPAD == HM801_PAD)            || \
-    (CONFIG_KEYPAD == HM60X_PAD)
+    (CONFIG_KEYPAD == HM60X_PAD)            || \
+    (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
 #define BTN_UP         BUTTON_UP
 #define BTN_DOWN       BUTTON_DOWN
 #define BTN_LEFT       BUTTON_LEFT
@@ -83,6 +84,10 @@
 #define BTN_UP_RIGHT   BUTTON_TOPRIGHT
 #endif
 
+#if (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
+#define BTN_FIRE       BUTTON_SELECT
+#define BTN_PAUSE      BUTTON_POWER
+#endif
 
 #if (CONFIG_KEYPAD == HM60X_PAD)
 #define BTN_FIRE       BUTTON_POWER
diff --git a/apps/plugins/lib/osd.c b/apps/plugins/lib/osd.c
index e6fc39178a..d2e0fe3e50 100644
--- a/apps/plugins/lib/osd.c
+++ b/apps/plugins/lib/osd.c
@@ -115,6 +115,9 @@ static struct osd grey_osd;
 #elif LCD_DEPTH == 24
 #    define _OSD_WIDTH2BYTES(w)    ((w)*3)
 #    define _OSD_BYTES2WIDTH(b)    ((b)/3)
+#elif LCD_DEPTH == 32
+#    define _OSD_WIDTH2BYTES(w)    ((w)*4)
+#    define _OSD_BYTES2WIDTH(b)    ((b)/4)
 #else /* other LCD depth */
 #  error Unknown LCD depth; please define macros
 #endif /* LCD_DEPTH */
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 2f550f817c..f9addb32f4 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -123,7 +123,8 @@ const struct button_mapping pla_main_ctx[] =
     || (CONFIG_KEYPAD == HM60X_PAD) \
     || (CONFIG_KEYPAD == HM801_PAD) \
     || (CONFIG_KEYPAD == SONY_NWZ_PAD) \
-    || (CONFIG_KEYPAD == CREATIVE_ZEN_PAD))
+    || (CONFIG_KEYPAD == CREATIVE_ZEN_PAD) \
+    || (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD))
     { PLA_UP,               BUTTON_UP,                          BUTTON_NONE },
     { PLA_DOWN,             BUTTON_DOWN,                        BUTTON_NONE },
     { PLA_LEFT,             BUTTON_LEFT,                        BUTTON_NONE },
@@ -422,6 +423,12 @@ const struct button_mapping pla_main_ctx[] =
     {PLA_SELECT,            BUTTON_SELECT,                      BUTTON_NONE},
     {PLA_SELECT_REL,        BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT},
     {PLA_SELECT_REPEAT,     BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_NONE},
+#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)                                      
+    {PLA_CANCEL,            BUTTON_VOLUP,                       BUTTON_NONE},
+    {PLA_EXIT,              BUTTON_POWER,                       BUTTON_NONE},
+    {PLA_SELECT,            BUTTON_SELECT,                      BUTTON_NONE},
+    {PLA_SELECT_REL,        BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT},
+    {PLA_SELECT_REPEAT,     BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_NONE},
 #elif (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD)
     {PLA_CANCEL,            BUTTON_POWER|BUTTON_REL,            BUTTON_NONE},
     {PLA_EXIT,              BUTTON_POWER|BUTTON_REPEAT,         BUTTON_NONE},