1 files changed, 9 insertions, 7 deletions

diff --git a/apps/keymaps/keymap-ondavx747.c b/apps/keymaps/keymap-ondavx747.c
index 6eb2230d49..ee590599b6 100644
--- a/apps/keymaps/keymap-ondavx747.c
+++ b/apps/keymaps/keymap-ondavx747.c
@@ -167,14 +167,16 @@ static const struct button_mapping button_context_keyboard[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_keyboard */
 
-#ifdef HAVE_USBSTACK
+#ifdef USB_ENABLE_HID
 static const struct button_mapping button_context_usb_hid[] = {
-    { ACTION_USB_HID_VOLUP,    BUTTON_VOL_UP,                    BUTTON_NONE },
-    { ACTION_USB_HID_VOLUP,    BUTTON_VOL_UP|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_USB_HID_VOLDOWN,  BUTTON_VOL_DOWN,                  BUTTON_NONE },
-    { ACTION_USB_HID_VOLDOWN,  BUTTON_VOL_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_USB_HID_MUTE,     BUTTON_POWER,                     BUTTON_NONE },
-    { ACTION_USB_HID_MENU,     BUTTON_MENU,                      BUTTON_NONE },
+    { ACTION_USB_HID_INC,    BUTTON_VOL_UP,                 BUTTON_NONE },
+    { ACTION_USB_HID_INC,    BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_USB_HID_DEC,    BUTTON_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_USB_HID_DEC,    BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_USB_HID_QUIT,   BUTTON_POWER|BUTTON_REPEAT,    BUTTON_SELECT },
+    { ACTION_USB_HID_SELECT, BUTTON_POWER|BUTTON_REL,       BUTTON_SELECT },
+    { ACTION_USB_HID_MENU,   BUTTON_MENU|BUTTON_REPEAT,     BUTTON_MENU },
+    { ACTION_USB_HID_MODE,   BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_usb_hid */