1 files changed, 63 insertions, 20 deletions

diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c
index 499eb2b562..74673ccb20 100644
--- a/apps/keymaps/keymap-touchscreen.c
+++ b/apps/keymaps/keymap-touchscreen.c
@@ -253,27 +253,63 @@ static const struct button_mapping button_context_radio[]  = {
 
 #ifdef USB_ENABLE_HID
 static const struct button_mapping button_context_usb_hid[] = {
-    { ACTION_USB_HID_INC,         BUTTON_BOTTOMRIGHT|BUTTON_REL,     BUTTON_BOTTOMRIGHT },
-    { ACTION_USB_HID_INC,         BUTTON_BOTTOMRIGHT|BUTTON_REPEAT,  BUTTON_BOTTOMRIGHT },
-    { ACTION_USB_HID_DEC,         BUTTON_BOTTOMMIDDLE|BUTTON_REL,    BUTTON_BOTTOMMIDDLE },
-    { ACTION_USB_HID_DEC,         BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_BOTTOMMIDDLE },
-    { ACTION_USB_HID_START,       BUTTON_TOPMIDDLE|BUTTON_REL,       BUTTON_TOPMIDDLE },
-    { ACTION_USB_HID_START_LONG,  BUTTON_TOPMIDDLE|BUTTON_REPEAT,    BUTTON_TOPMIDDLE },
-    { ACTION_USB_HID_QUIT,        BUTTON_BOTTOMLEFT|BUTTON_REL,      BUTTON_BOTTOMLEFT },
-    { ACTION_USB_HID_QUIT_LONG,   BUTTON_BOTTOMLEFT|BUTTON_REPEAT,   BUTTON_BOTTOMLEFT },
-    { ACTION_USB_HID_LEFT,        BUTTON_MIDLEFT|BUTTON_REL,         BUTTON_MIDLEFT },
-    { ACTION_USB_HID_LEFT_LONG,   BUTTON_MIDLEFT|BUTTON_REPEAT,      BUTTON_MIDLEFT },
-    { ACTION_USB_HID_RIGHT,       BUTTON_MIDRIGHT|BUTTON_REL,        BUTTON_MIDRIGHT },
-    { ACTION_USB_HID_RIGHT_LONG,  BUTTON_MIDRIGHT|BUTTON_REPEAT,     BUTTON_MIDRIGHT },
-    { ACTION_USB_HID_SELECT,      BUTTON_CENTER|BUTTON_REL,          BUTTON_CENTER },
-    { ACTION_USB_HID_SELECT_LONG, BUTTON_CENTER|BUTTON_REPEAT,       BUTTON_CENTER },
-    { ACTION_USB_HID_MENU,        BUTTON_TOPRIGHT|BUTTON_REL,        BUTTON_TOPRIGHT },
-    { ACTION_USB_HID_MENU_LONG,   BUTTON_TOPRIGHT|BUTTON_REPEAT,     BUTTON_TOPRIGHT },
-    { ACTION_USB_HID_MODE,        BUTTON_TOPLEFT|BUTTON_REL,         BUTTON_TOPLEFT },
-    { ACTION_USB_HID_MODE_LONG,   BUTTON_TOPLEFT|BUTTON_REPEAT,      BUTTON_TOPLEFT },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_USB_HID)
+    { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_TOPLEFT|BUTTON_REL,    BUTTON_TOPLEFT },
+    { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT },
+
+    LAST_ITEM_IN_LIST
 }; /* button_context_usb_hid */
+
+static const struct button_mapping button_context_usb_hid_mode_multimedia[] = {
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN,         BUTTON_BOTTOMMIDDLE,               BUTTON_NONE },
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN,         BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP,           BUTTON_TOPMIDDLE,                  BUTTON_NONE },
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP,           BUTTON_TOPMIDDLE|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE,         BUTTON_CENTER|BUTTON_REL,          BUTTON_CENTER },
+    { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_TOPRIGHT|BUTTON_REL,        BUTTON_TOPRIGHT },
+    { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP,       BUTTON_TOPRIGHT|BUTTON_REPEAT,     BUTTON_TOPRIGHT },
+    { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_PREV, BUTTON_BOTTOMLEFT|BUTTON_REL,      BUTTON_BOTTOMLEFT },
+    { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_NEXT, BUTTON_BOTTOMRIGHT|BUTTON_REL,     BUTTON_BOTTOMRIGHT },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
+}; /* button_context_usb_hid_mode_multimedia */
+
+static const struct button_mapping button_context_usb_hid_mode_presentation[] = {
+    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_TOPRIGHT|BUTTON_REL,        BUTTON_TOPRIGHT },
+    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_TOPRIGHT|BUTTON_REPEAT,     BUTTON_TOPRIGHT },
+    { ACTION_USB_HID_PRESENTATION_SLIDE_PREV,      BUTTON_MIDLEFT|BUTTON_REL,         BUTTON_MIDLEFT },
+    { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT,      BUTTON_MIDRIGHT|BUTTON_REL,        BUTTON_MIDRIGHT },
+    { ACTION_USB_HID_PRESENTATION_SLIDE_FIRST,     BUTTON_MIDLEFT|BUTTON_REPEAT,      BUTTON_MIDLEFT },
+    { ACTION_USB_HID_PRESENTATION_SLIDE_LAST,      BUTTON_MIDRIGHT|BUTTON_REPEAT,     BUTTON_MIDRIGHT },
+    { ACTION_USB_HID_PRESENTATION_SCREEN_BLACK,    BUTTON_BOTTOMRIGHT|BUTTON_REL,     BUTTON_BOTTOMRIGHT },
+    { ACTION_USB_HID_PRESENTATION_SCREEN_WHITE,    BUTTON_BOTTOMRIGHT|BUTTON_REPEAT,  BUTTON_BOTTOMRIGHT },
+    { ACTION_USB_HID_PRESENTATION_LINK_PREV,       BUTTON_TOPMIDDLE|BUTTON_REL,       BUTTON_TOPMIDDLE },
+    { ACTION_USB_HID_PRESENTATION_LINK_PREV,       BUTTON_TOPMIDDLE|BUTTON_REPEAT,    BUTTON_TOPMIDDLE },
+    { ACTION_USB_HID_PRESENTATION_LINK_NEXT,       BUTTON_BOTTOMMIDDLE|BUTTON_REL,    BUTTON_BOTTOMMIDDLE },
+    { ACTION_USB_HID_PRESENTATION_LINK_NEXT,       BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_BOTTOMMIDDLE },
+    { ACTION_USB_HID_PRESENTATION_MOUSE_CLICK,     BUTTON_CENTER|BUTTON_REL,          BUTTON_CENTER },
+    { ACTION_USB_HID_PRESENTATION_MOUSE_OVER,      BUTTON_CENTER|BUTTON_REPEAT,       BUTTON_CENTER },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
+}; /* button_context_usb_hid_mode_presentation */
+
+static const struct button_mapping button_context_usb_hid_mode_browser[] = {
+    { ACTION_USB_HID_BROWSER_SCROLL_UP,        BUTTON_TOPMIDDLE,                                 BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_UP,        BUTTON_TOPMIDDLE|BUTTON_REPEAT,                   BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_DOWN,      BUTTON_BOTTOMMIDDLE,                              BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_DOWN,      BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT,                BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_ZOOM_IN,          BUTTON_TOPRIGHT|BUTTON_REPEAT,                    BUTTON_TOPRIGHT },
+    { ACTION_USB_HID_BROWSER_ZOOM_OUT,         BUTTON_BOTTOMRIGHT|BUTTON_REPEAT,                 BUTTON_BOTTOMRIGHT },
+    { ACTION_USB_HID_BROWSER_ZOOM_RESET,       BUTTON_CENTER|BUTTON_REPEAT,                      BUTTON_CENTER },
+    { ACTION_USB_HID_BROWSER_ZOOM_RESET,       BUTTON_TOPRIGHT|BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_TOPRIGHT|BUTTON_BOTTOMRIGHT },
+    { ACTION_USB_HID_BROWSER_TAB_PREV,         BUTTON_MIDLEFT|BUTTON_REL,                        BUTTON_MIDLEFT },
+    { ACTION_USB_HID_BROWSER_TAB_NEXT,         BUTTON_MIDRIGHT|BUTTON_REL,                       BUTTON_MIDRIGHT },
+    { ACTION_USB_HID_BROWSER_TAB_CLOSE,        BUTTON_BOTTOMLEFT|BUTTON_REPEAT,                  BUTTON_BOTTOMLEFT },
+    { ACTION_USB_HID_BROWSER_HISTORY_BACK,     BUTTON_MIDLEFT|BUTTON_REPEAT,                     BUTTON_MIDLEFT },
+    { ACTION_USB_HID_BROWSER_HISTORY_FORWARD,  BUTTON_MIDRIGHT|BUTTON_REPEAT,                    BUTTON_MIDRIGHT },
+    { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_CENTER|BUTTON_REL,                         BUTTON_CENTER },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
+}; /* button_context_usb_hid_mode_browser */
 #endif
 
 const struct button_mapping* get_context_mapping(int context)
@@ -331,7 +367,14 @@ const struct button_mapping* get_context_mapping(int context)
 #ifdef USB_ENABLE_HID
         case CONTEXT_USB_HID:
             return button_context_usb_hid;
+        case CONTEXT_USB_HID_MODE_MULTIMEDIA:
+            return button_context_usb_hid_mode_multimedia;
+        case CONTEXT_USB_HID_MODE_PRESENTATION:
+            return button_context_usb_hid_mode_presentation;
+        case CONTEXT_USB_HID_MODE_BROWSER:
+            return button_context_usb_hid_mode_browser;
 #endif
+
     }
     return button_context_standard;
 }