Manual: Add mrobe100's remote control support to the manual

- Also mijnor changes to USB HID keymapping for this remote
- Node that the remote control buttons are not used in many action contexts


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23224 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 41 insertions, 42 deletions

diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c
index cdf37366d7..ede3d5ef1b 100644
--- a/apps/keymaps/keymap-mr100.c
+++ b/apps/keymaps/keymap-mr100.c
@@ -419,8 +419,8 @@ static const struct button_mapping button_context_usb_hid_mode_mouse[] = {
 #endif
 
 static const struct button_mapping remote_button_context_usb_hid[] = {
-    { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_RC_HEART|BUTTON_REL,    BUTTON_RC_HEART },
-    { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_RC_HEART },
+    { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_RC_MODE|BUTTON_REL,    BUTTON_RC_MODE },
+    { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE },
 
     LAST_ITEM_IN_LIST
 }; /* remote_button_context_usb_hid */
@@ -430,7 +430,7 @@ static const struct button_mapping remote_button_context_usb_hid_mode_multimedia
     { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN,         BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP,           BUTTON_RC_VOL_UP,                 BUTTON_NONE },
     { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP,           BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE,         BUTTON_RC_MODE|BUTTON_REL,        BUTTON_RC_MODE },
+    { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE,         BUTTON_RC_HEART|BUTTON_REL,       BUTTON_RC_HEART },
     { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
     { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP,       BUTTON_RC_DOWN|BUTTON_REL,        BUTTON_RC_DOWN },
     { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP,       BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_RC_PLAY },
@@ -442,7 +442,6 @@ static const struct button_mapping remote_button_context_usb_hid_mode_multimedia
 
 static const struct button_mapping remote_button_context_usb_hid_mode_presentation[] = {
     { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
-    { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_RC_DOWN|BUTTON_REL,        BUTTON_RC_DOWN },
     { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_RC_PLAY },
     { ACTION_USB_HID_PRESENTATION_SLIDE_PREV,      BUTTON_RC_REW|BUTTON_REL,         BUTTON_RC_REW },
     { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT,      BUTTON_RC_FF|BUTTON_REL,          BUTTON_RC_FF },
@@ -454,55 +453,55 @@ static const struct button_mapping remote_button_context_usb_hid_mode_presentati
     { ACTION_USB_HID_PRESENTATION_LINK_PREV,       BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_USB_HID_PRESENTATION_LINK_NEXT,       BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
     { ACTION_USB_HID_PRESENTATION_LINK_NEXT,       BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_USB_HID_PRESENTATION_MOUSE_CLICK,     BUTTON_RC_MODE|BUTTON_REL,        BUTTON_RC_MODE },
-    { ACTION_USB_HID_PRESENTATION_MOUSE_OVER,      BUTTON_RC_MODE|BUTTON_REPEAT,     BUTTON_RC_MODE },
+    { ACTION_USB_HID_PRESENTATION_MOUSE_CLICK,     BUTTON_RC_HEART|BUTTON_REL,       BUTTON_RC_HEART },
+    { ACTION_USB_HID_PRESENTATION_MOUSE_OVER,      BUTTON_RC_HEART|BUTTON_REPEAT,    BUTTON_RC_HEART },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
 }; /* remote_button_context_usb_hid_mode_presentation */
 
 static const struct button_mapping remote_button_context_usb_hid_mode_browser[] = {
-    { ACTION_USB_HID_BROWSER_SCROLL_UP,        BUTTON_RC_VOL_UP,                            BUTTON_NONE },
-    { ACTION_USB_HID_BROWSER_SCROLL_UP,        BUTTON_RC_VOL_UP|BUTTON_REPEAT,              BUTTON_NONE },
-    { ACTION_USB_HID_BROWSER_SCROLL_DOWN,      BUTTON_RC_VOL_DOWN,                          BUTTON_NONE },
-    { ACTION_USB_HID_BROWSER_SCROLL_DOWN,      BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,            BUTTON_NONE },
-    { ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP,   BUTTON_RC_PLAY|BUTTON_REL,                   BUTTON_RC_PLAY },
-    { ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN, BUTTON_RC_DOWN|BUTTON_REL,                   BUTTON_RC_DOWN },
-    { ACTION_USB_HID_BROWSER_ZOOM_IN,          BUTTON_RC_PLAY|BUTTON_REPEAT,                BUTTON_RC_PLAY },
-    { ACTION_USB_HID_BROWSER_ZOOM_OUT,         BUTTON_RC_DOWN|BUTTON_REPEAT,                BUTTON_RC_DOWN },
-    { ACTION_USB_HID_BROWSER_ZOOM_RESET,       BUTTON_RC_MODE|BUTTON_REPEAT,                BUTTON_RC_MODE },
-    { ACTION_USB_HID_BROWSER_TAB_PREV,         BUTTON_RC_REW|BUTTON_REL,                    BUTTON_RC_REW },
-    { ACTION_USB_HID_BROWSER_TAB_NEXT,         BUTTON_RC_FF|BUTTON_REL,                     BUTTON_RC_FF },
-    { ACTION_USB_HID_BROWSER_HISTORY_BACK,     BUTTON_RC_REW|BUTTON_REPEAT,                 BUTTON_RC_REW },
-    { ACTION_USB_HID_BROWSER_HISTORY_FORWARD,  BUTTON_RC_FF|BUTTON_REPEAT,                  BUTTON_RC_FF },
-    { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_RC_MODE|BUTTON_REL,                   BUTTON_RC_MODE },
+    { ACTION_USB_HID_BROWSER_SCROLL_UP,        BUTTON_RC_VOL_UP,                 BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_UP,        BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_DOWN,      BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_DOWN,      BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP,   BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
+    { ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN, BUTTON_RC_DOWN|BUTTON_REL,        BUTTON_RC_DOWN },
+    { ACTION_USB_HID_BROWSER_ZOOM_IN,          BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_RC_PLAY },
+    { ACTION_USB_HID_BROWSER_ZOOM_OUT,         BUTTON_RC_DOWN|BUTTON_REPEAT,     BUTTON_RC_DOWN },
+    { ACTION_USB_HID_BROWSER_ZOOM_RESET,       BUTTON_RC_HEART|BUTTON_REPEAT,    BUTTON_RC_HEART },
+    { ACTION_USB_HID_BROWSER_TAB_PREV,         BUTTON_RC_REW|BUTTON_REL,         BUTTON_RC_REW },
+    { ACTION_USB_HID_BROWSER_TAB_NEXT,         BUTTON_RC_FF|BUTTON_REL,          BUTTON_RC_FF },
+    { ACTION_USB_HID_BROWSER_HISTORY_BACK,     BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_RC_REW },
+    { ACTION_USB_HID_BROWSER_HISTORY_FORWARD,  BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_RC_FF },
+    { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_RC_HEART|BUTTON_REL,       BUTTON_RC_HEART },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
 }; /* remote_button_context_usb_hid_mode_browser */
 
 #ifdef HAVE_USB_HID_MOUSE
 static const struct button_mapping remote_button_context_usb_hid_mode_mouse[] = {
-    { ACTION_USB_HID_MOUSE_UP,                BUTTON_RC_PLAY,                              BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_UP_REP,            BUTTON_RC_PLAY|BUTTON_REPEAT,                BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_DOWN,              BUTTON_RC_DOWN,                              BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_DOWN_REP,          BUTTON_RC_DOWN|BUTTON_REPEAT,                BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LEFT,              BUTTON_RC_REW,                               BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LEFT_REP,          BUTTON_RC_REW|BUTTON_REPEAT,                 BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RIGHT,             BUTTON_RC_FF,                                BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_RIGHT_REP,         BUTTON_RC_FF|BUTTON_REPEAT,                  BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_BUTTON_LEFT,       BUTTON_RC_MODE,                              BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL,   BUTTON_RC_MODE|BUTTON_REL,                   BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_UP,          BUTTON_RC_MODE|BUTTON_RC_PLAY,               BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_UP_REP,      BUTTON_RC_MODE|BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_DOWN,        BUTTON_RC_MODE|BUTTON_RC_DOWN,               BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP,    BUTTON_RC_MODE|BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_LEFT,        BUTTON_RC_MODE|BUTTON_RC_REW,                BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP,    BUTTON_RC_MODE|BUTTON_RC_REW|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_RIGHT,       BUTTON_RC_MODE|BUTTON_RC_FF,                 BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP,   BUTTON_RC_MODE|BUTTON_RC_FF|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_RC_VOL_UP,                            BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_RC_VOL_UP|BUTTON_REPEAT,              BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_RC_VOL_DOWN,                          BUTTON_NONE },
-    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,            BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_UP,                BUTTON_RC_PLAY,                               BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_UP_REP,            BUTTON_RC_PLAY|BUTTON_REPEAT,                 BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_DOWN,              BUTTON_RC_DOWN,                               BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_DOWN_REP,          BUTTON_RC_DOWN|BUTTON_REPEAT,                 BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LEFT,              BUTTON_RC_REW,                                BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LEFT_REP,          BUTTON_RC_REW|BUTTON_REPEAT,                  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RIGHT,             BUTTON_RC_FF,                                 BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_RIGHT_REP,         BUTTON_RC_FF|BUTTON_REPEAT,                   BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_LEFT,       BUTTON_RC_HEART,                              BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL,   BUTTON_RC_HEART|BUTTON_REL,                   BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_UP,          BUTTON_RC_HEART|BUTTON_RC_PLAY,               BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_UP_REP,      BUTTON_RC_HEART|BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_DOWN,        BUTTON_RC_HEART|BUTTON_RC_DOWN,               BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP,    BUTTON_RC_HEART|BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_LEFT,        BUTTON_RC_HEART|BUTTON_RC_REW,                BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP,    BUTTON_RC_HEART|BUTTON_RC_REW|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_RIGHT,       BUTTON_RC_HEART|BUTTON_RC_FF,                 BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP,   BUTTON_RC_HEART|BUTTON_RC_FF|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_RC_VOL_UP,                             BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP,   BUTTON_RC_VOL_UP|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_RC_VOL_DOWN,                           BUTTON_NONE },
+    { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,             BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
 }; /* remote_button_context_usb_hid_mode_mouse */