USB HID: Fix ipod4g got stuck in mouse mode

- Now mode switch is done by Select+Right and Select+Left
- Add missing manual description on how to switch modes in ipods
- Now it is possible to have 'white screen' in presentation mode (Long Play button)
- Thanks for shai (day 1 in RB) for reporting!


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22991 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2009-10-06 21:40:46 +00:00
parent dcc49194ac
commit 2cf6f85201
2 changed files with 24 additions and 18 deletions

View file

@ -208,7 +208,11 @@ static const struct button_mapping button_context_usb_hid[] = {
{ ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
{ ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
{ ACTION_USB_HID_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_USB_HID_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
{ ACTION_USB_HID_MODE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_USB_HID_MENU_LONG, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
{ ACTION_USB_HID_MODE, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REL, BUTTON_SELECT|BUTTON_RIGHT },
{ ACTION_USB_HID_MODE, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_SELECT|BUTTON_RIGHT },
{ ACTION_USB_HID_MODE_LONG, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REL, BUTTON_SELECT|BUTTON_LEFT },
{ ACTION_USB_HID_MODE_LONG, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_SELECT|BUTTON_LEFT },
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
}; /* button_context_usb_hid */ }; /* button_context_usb_hid */

View file

@ -190,18 +190,19 @@ this option \setting{On}. If it is not required, then turning this setting
keypad mode. There are different modes which provide different keypad mode. There are different modes which provide different
functionality. functionality.
\opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
,MROBE100_PAD}{% ,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{%
Switching modes back and forth is done by pressing the Switching modes back and forth is done by pressing the
\opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec} % \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec} %
\opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD}{\ButtonPower} % \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD}{\ButtonPower} %
\opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonRight} %
and % and %
\opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonRec} % \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonRec} %
\opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD}{Long \ButtonPower} % \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD}{Long \ButtonPower} %
\opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonLeft} %
keys, respectively.% keys, respectively.%
}% }%
\opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IRIVER_H10_PAD}{% \opt{IRIVER_H10_PAD}{%
Switching modes is done by pressing the Switching modes is done by pressing the
\opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonMenu} %
\opt{IRIVER_H10_PAD}{Long \ButtonPower} % \opt{IRIVER_H10_PAD}{Long \ButtonPower} %
key.% key.%
}% }%
@ -334,7 +335,8 @@ this option \setting{On}. If it is not required, then turning this setting
% Screen white % Screen white
\opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD} \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}
{Long \ButtonDown} {Long \ButtonDown}
\opt{MROBE100_PAD}{Long \ButtonMenu} \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}
{Long \ButtonMenu}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& White screen \\ & White screen \\
% %