3 files changed, 17 insertions, 1 deletions

diff --git a/firmware/export/config-creativezv.h b/firmware/export/config-creativezv.h
index af9bedf307..7304dda728 100644
--- a/firmware/export/config-creativezv.h
+++ b/firmware/export/config-creativezv.h
@@ -68,7 +68,7 @@
 /* Define this if your LCD can be enabled/disabled */
 #define HAVE_LCD_ENABLE
 
-#define CONFIG_KEYPAD CREATIVEZVM_PAD
+#define CONFIG_KEYPAD CREATIVEZV_PAD
 #define HAS_BUTTON_HOLD
 #define HAVE_HEADPHONE_DETECTION
 //#define HAVE_TOUCHPAD
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 595b731e0f..51c79abccf 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -81,6 +81,7 @@
 #define IAUDIO_M3_PAD      23
 #define CREATIVEZVM_PAD    24
 #define SANSA_M200_PAD     25
+#define CREATIVEZV_PAD     26
 
 /* CONFIG_REMOTE_KEYPAD */
 #define H100_REMOTE 1
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/button-target.h b/firmware/target/arm/tms320dm320/creative-zvm/button-target.h
index 1b63895374..6530a1c9e0 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/button-target.h
+++ b/firmware/target/arm/tms320dm320/creative-zvm/button-target.h
@@ -37,11 +37,26 @@
 
 #define BUTTON_HOLD         (1 << 10)
 
+#ifdef CREATIVE_ZV
+#define BUTTON_PREV         (1 << 11)
+#define BUTTON_NEXT         (1 << 12)
+
+#define BUTTON_VOL_UP       (1 << 13)
+#define BUTTON_VOL_DOWN     (1 << 14)
+#endif
+
 #define BUTTON_REMOTE       0
 
+#ifndef CREATIVE_ZV
 #define BUTTON_MAIN         ( BUTTON_BACK | BUTTON_MENU | BUTTON_LEFT   | BUTTON_RIGHT \
                             | BUTTON_UP   | BUTTON_DOWN | BUTTON_SELECT | BUTTON_POWER \
                             | BUTTON_PLAY | BUTTON_HOLD | BUTTON_CUSTOM                )
+#else
+#define BUTTON_MAIN         ( BUTTON_BACK   | BUTTON_MENU     | BUTTON_LEFT   | BUTTON_RIGHT \
+                            | BUTTON_UP     | BUTTON_DOWN     | BUTTON_SELECT | BUTTON_POWER \
+                            | BUTTON_PLAY   | BUTTON_HOLD     | BUTTON_NEXT   | BUTTON_PREV  \
+                            | BUTTON_VOL_UP | BUTTON_VOL_DOWN                                )
+#endif
 
 #define POWEROFF_BUTTON     BUTTON_POWER
 #define POWEROFF_COUNT      10