summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Guay <marcguay@rockbox.org>2008-07-04 18:12:01 +0000
committerMarc Guay <marcguay@rockbox.org>2008-07-04 18:12:01 +0000
commita5f99f2a51d9064fe86a68bfb634d1898f761ee7 (patch)
tree6e98dc39aff6a63a2301b4e8d97090126e793eaa
parent33d8bb15e28b1a2ef0d4ae3a8bf305230c913182 (diff)
downloadrockbox-a5f99f2a51d9064fe86a68bfb634d1898f761ee7.tar.gz
rockbox-a5f99f2a51d9064fe86a68bfb634d1898f761ee7.zip
Bring the H300 charging-only button in line with the other targets. Hold the AB button on connect for this feature. To discuss a greater reworking of the function, see FS#8702.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17940 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/usb.h2
-rw-r--r--manual/platform/h300.tex2
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index 04cb3ea43b..9952a074bb 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -49,7 +49,7 @@ enum {
49#define USBPOWER_BUTTON BUTTON_MENU 49#define USBPOWER_BUTTON BUTTON_MENU
50#define USBPOWER_BTN_IGNORE BUTTON_PLAY 50#define USBPOWER_BTN_IGNORE BUTTON_PLAY
51#elif CONFIG_KEYPAD == IRIVER_H300_PAD 51#elif CONFIG_KEYPAD == IRIVER_H300_PAD
52#define USBPOWER_BUTTON BUTTON_REC 52#define USBPOWER_BUTTON BUTTON_MODE
53#define USBPOWER_BTN_IGNORE BUTTON_ON 53#define USBPOWER_BTN_IGNORE BUTTON_ON
54#elif CONFIG_KEYPAD == GIGABEAT_PAD 54#elif CONFIG_KEYPAD == GIGABEAT_PAD
55#define USBPOWER_BUTTON BUTTON_MENU 55#define USBPOWER_BUTTON BUTTON_MENU
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index 39502b2704..78ab41b008 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -43,7 +43,7 @@
43\newcommand{\ActionQuickScreenExit}{\ButtonMode} 43\newcommand{\ActionQuickScreenExit}{\ButtonMode}
44\newcommand{\ActionStdMenu}{\ButtonMode} 44\newcommand{\ActionStdMenu}{\ButtonMode}
45\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} 45\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
46\newcommand{\ActionStdUsbCharge}{\ButtonRec} 46\newcommand{\ActionStdUsbCharge}{\ButtonMode}
47\newcommand{\ActionStdRec}{Long \ButtonRec} 47\newcommand{\ActionStdRec}{Long \ButtonRec}
48 48
49%Button actions, wps context 49%Button actions, wps context