1 files changed, 27 insertions, 20 deletions

diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index ad1ed64c5a..81673397c3 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -337,30 +337,37 @@ static const struct button_mapping button_context_radio[]  = {
     
 };
 
-#ifdef HAVE_USBSTACK
+#ifdef USB_ENABLE_HID
 static const struct button_mapping button_context_usb_hid[] = {
-    { ACTION_USB_HID_PLAY,     BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
-    { ACTION_USB_HID_STOP,     BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_PLAY },
-    { ACTION_USB_HID_SKIPPREV, BUTTON_REW,                       BUTTON_NONE },
-    { ACTION_USB_HID_SKIPNEXT, BUTTON_FF,                        BUTTON_NONE },
-    { ACTION_USB_HID_VOLUP,    BUTTON_SCROLL_UP,                 BUTTON_NONE },
-    { ACTION_USB_HID_VOLUP,    BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_USB_HID_VOLDOWN,  BUTTON_SCROLL_DOWN,               BUTTON_NONE },
-    { ACTION_USB_HID_VOLDOWN,  BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_USB_HID_MENU,     BUTTON_POWER,                     BUTTON_NONE },
+    { ACTION_USB_HID_INC,         BUTTON_SCROLL_UP,                 BUTTON_NONE },
+    { ACTION_USB_HID_INC,         BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_USB_HID_DEC,         BUTTON_SCROLL_DOWN,               BUTTON_NONE },
+    { ACTION_USB_HID_DEC,         BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_USB_HID_START,       BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
+    { ACTION_USB_HID_START_LONG,  BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_PLAY },
+    { ACTION_USB_HID_QUIT,        BUTTON_REW|BUTTON_REL,            BUTTON_REW },
+    { ACTION_USB_HID_LEFT,        BUTTON_LEFT|BUTTON_REL,           BUTTON_LEFT },
+    { ACTION_USB_HID_LEFT_LONG,   BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_LEFT },
+    { ACTION_USB_HID_RIGHT,       BUTTON_RIGHT|BUTTON_REL,          BUTTON_RIGHT },
+    { ACTION_USB_HID_RIGHT_LONG,  BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_RIGHT },
+    { ACTION_USB_HID_SELECT,      BUTTON_FF|BUTTON_REL,             BUTTON_FF },
+    { ACTION_USB_HID_MENU,        BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
+    { ACTION_USB_HID_MODE,        BUTTON_POWER|BUTTON_REPEAT,       BUTTON_POWER },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_usb_hid */
 
 static const struct button_mapping remote_button_context_usb_hid[] = {
-    { ACTION_USB_HID_PLAY,     BUTTON_RC_PLAY,                   BUTTON_NONE },
-    { ACTION_USB_HID_STOP,     BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_USB_HID_SKIPPREV, BUTTON_RC_REW,                    BUTTON_NONE },
-    { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_FF,                     BUTTON_NONE },
-    { ACTION_USB_HID_VOLUP,    BUTTON_RC_VOL_UP,                 BUTTON_NONE },
-    { ACTION_USB_HID_VOLUP,    BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_USB_HID_VOLDOWN,  BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
-    { ACTION_USB_HID_VOLDOWN,  BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_USB_HID_INC,        BUTTON_RC_VOL_UP,                 BUTTON_NONE },
+    { ACTION_USB_HID_INC,        BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_USB_HID_DEC,        BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_USB_HID_DEC,        BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_USB_HID_START,      BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
+    { ACTION_USB_HID_QUIT,       BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_RC_PLAY },
+    { ACTION_USB_HID_LEFT,       BUTTON_RC_REW|BUTTON_REL,         BUTTON_RC_REW },
+    { ACTION_USB_HID_LEFT_LONG,  BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_RC_REW },
+    { ACTION_USB_HID_RIGHT,      BUTTON_RC_FF|BUTTON_REL,          BUTTON_RC_FF },
+    { ACTION_USB_HID_RIGHT_LONG, BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_RC_FF },
 
     LAST_ITEM_IN_LIST
 }; /* remote_button_context_usb_hid */
@@ -395,7 +402,7 @@ static const struct button_mapping* get_context_mapping_remote( int context )
             return remote_button_context_pitchscreen;
         case CONTEXT_RECSCREEN:
             return button_context_recscreen;
-#ifdef HAVE_USBSTACK
+#ifdef USB_ENABLE_HID
         case CONTEXT_USB_HID:
             return remote_button_context_usb_hid;
 #endif
@@ -453,7 +460,7 @@ const struct button_mapping* get_context_mapping(int context)
             return button_context_recscreen;
         case CONTEXT_FM:
             return button_context_radio;
-#ifdef HAVE_USBSTACK
+#ifdef USB_ENABLE_HID
         case CONTEXT_USB_HID:
             return button_context_usb_hid;
 #endif