summaryrefslogtreecommitdiffstats
path: root/manual/platform
diff options
context:
space:
mode:
authorSebastian Leonhardt <sebastian.leonhardt@web.de>2015-07-20 01:50:26 +0200
committerGerrit Rockbox <gerrit@rockbox.org>2015-11-15 23:46:39 +0100
commita507bb283782ee3adb1fc9ba0c6f094108ef558c (patch)
treeacae6cf04f8e34172375061b6fbdc11b6ffb84cb /manual/platform
parenta8758c953d50fb020b245d5739c41de113638b49 (diff)
downloadrockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.tar.gz
rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.zip
YH8xx,YH9xx: Keymap improvement
The main "innovation" in this patch are two "virtual buttons" for the record switch on YH92x targets. When the switch state changes, a single BUTTON_REC_SW_ON or .._OFF button event will be generated. Thus keymap code can react on switching, but not on the actual state of the switch. Wherever sensible, the following user scheme is applied: - use PLAY as confirm button - use REW button or Long REW to exit - use REC (YH820) or FFWD (YH92X) as modifier key for button combos Change-Id: Ic8d1db9cc6869daed8dda98990dfdf7f6fd5d5a1
Diffstat (limited to 'manual/platform')
-rw-r--r--manual/platform/keymap-yh820.tex26
-rw-r--r--manual/platform/keymap-yh92x.tex35
2 files changed, 31 insertions, 30 deletions
diff --git a/manual/platform/keymap-yh820.tex b/manual/platform/keymap-yh820.tex
index 47f5acad04..9e775d7e2f 100644
--- a/manual/platform/keymap-yh820.tex
+++ b/manual/platform/keymap-yh820.tex
@@ -20,7 +20,7 @@
\newcommand{\ActionStdMenu}{Long \ButtonLeft{}+Long \ButtonUp}
\newcommand{\ActionStdContext}{Long \ButtonRight}
\newcommand{\ActionStdQuickScreen}{Long \ButtonLeft{}+Long \ButtonDown}
-\newcommand{\ActionQuickScreenExit}{\ButtonPlay{} or \ButtonFF}
+\newcommand{\ActionQuickScreenExit}{\ButtonPlay{} or \ButtonRew}
\newcommand{\ActionStdRec}{Long \ButtonRec}
%a button without harmful side effects for USB charging
\newcommand{\ActionStdUsbCharge}{\ButtonRew}
@@ -40,9 +40,9 @@
\newcommand{\ActionWpsPlaylist}{Long \ButtonLeft}
\newcommand{\ActionWpsMenu}{\ButtonLeft}
\newcommand{\ActionWpsQuickScreen}{Long \ButtonLeft{}+Long \ButtonDown}
-\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPlay{} + \ButtonRight}
-\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPlay{} + \ButtonLeft}
-\newcommand{\ActionWpsAbReset}{\ButtonPlay{} + \ButtonUp}
+\newcommand{\ActionWpsAbSetBNextDir}{\ButtonRec{}+\ButtonFF}
+\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonRec{}+\ButtonRew}
+\newcommand{\ActionWpsAbReset}{\ButtonRec{}+\ButtonPlay}
%Button actions, tree context
\newcommand{\ActionTreeWps}{\ButtonPlay}
@@ -52,7 +52,7 @@
\newcommand{\ActionTreeHotkey}{\ButtonRec}
%Button actions, YesNo context
-\newcommand{\ActionYesNoAccept}{\ButtonRight}
+\newcommand{\ActionYesNoAccept}{\ButtonPlay}
%Button actions, Setting context
\newcommand{\ActionSettingInc}{\ButtonUp}
@@ -68,14 +68,14 @@
\newcommand{\ActionKbdLeft}{\ButtonLeft}
\newcommand{\ActionKbdRight}{\ButtonRight}
\newcommand{\ActionKbdSelect}{\ButtonPlay}
-\newcommand{\ActionKbdDone}{\ButtonFF}
-\newcommand{\ActionKbdAbort}{\ButtonFF{}+\ButtonRew{} or \ButtonRec}
+\newcommand{\ActionKbdDone}{Long \ButtonFF}
+\newcommand{\ActionKbdAbort}{Long \ButtonRew}
\newcommand{\ActionKbdUp}{\ButtonUp}
\newcommand{\ActionKbdDown}{\ButtonDown}
-\newcommand{\ActionKbdCursorLeft}{\ButtonFF{}+\ButtonLeft}
-\newcommand{\ActionKbdCursorRight}{\ButtonFF{}+\ButtonRight}
-\newcommand{\ActionKbdBackSpace}{\ButtonRew}
-\newcommand{\ActionKbdMorseInput}{Long \ButtonFF}
+\newcommand{\ActionKbdCursorLeft}{\ButtonRec{}+\ButtonLeft}
+\newcommand{\ActionKbdCursorRight}{\ButtonRec{}+\ButtonRight}
+\newcommand{\ActionKbdBackSpace}{\ButtonRew{} or \ButtonRec{}+\ButtonRew}
+\newcommand{\ActionKbdMorseInput}{\ButtonRec{}+\ButtonFF}
\newcommand{\ActionKbdMorseSelect}{\ButtonPlay}
%Button actions, Pitch Screen context
@@ -91,9 +91,9 @@
%Button actions, Recording screen context
\newcommand{\ActionRecNewfile}{\ButtonFF}
-\newcommand{\ActionRecMenu}{\ButtonRew}
+\newcommand{\ActionRecMenu}{Long \ButtonRew}
\newcommand{\ActionRecPause}{\ButtonPlay}
-\newcommand{\ActionRecExit}{Long \ButtonRew{} or \ButtonRec}
+\newcommand{\ActionRecExit}{\ButtonRew{} or \ButtonRec}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
\newcommand{\ActionRecPrev}{\ButtonUp}
diff --git a/manual/platform/keymap-yh92x.tex b/manual/platform/keymap-yh92x.tex
index 47f5acad04..f8a9aa310e 100644
--- a/manual/platform/keymap-yh92x.tex
+++ b/manual/platform/keymap-yh92x.tex
@@ -7,7 +7,10 @@
\newcommand{\ButtonDown}{\btnfnt{Down}}
\newcommand{\ButtonRew}{\btnfnt{Rewind}}
\newcommand{\ButtonFF}{\btnfnt{Forward}}
+% this is still needed for the QuickStart/Player's Controls section
\newcommand{\ButtonRec}{\btnfnt{Rec}}
+\newcommand{\ButtonRecOn}{\btnfnt{\btnfnt{Rec}$\rightarrow$on}}
+\newcommand{\ButtonRecOff}{\btnfnt{\btnfnt{Rec}$\rightarrow$off}}
\newcommand{\ButtonHold}{\btnfnt{Hold}}
%Button actions, standard context
@@ -20,8 +23,8 @@
\newcommand{\ActionStdMenu}{Long \ButtonLeft{}+Long \ButtonUp}
\newcommand{\ActionStdContext}{Long \ButtonRight}
\newcommand{\ActionStdQuickScreen}{Long \ButtonLeft{}+Long \ButtonDown}
-\newcommand{\ActionQuickScreenExit}{\ButtonPlay{} or \ButtonFF}
-\newcommand{\ActionStdRec}{Long \ButtonRec}
+\newcommand{\ActionQuickScreenExit}{\ButtonPlay{} or \ButtonRew}
+\newcommand{\ActionStdRec}{\ButtonRecOn}
%a button without harmful side effects for USB charging
\newcommand{\ActionStdUsbCharge}{\ButtonRew}
@@ -36,23 +39,23 @@
\newcommand{\ActionWpsVolUp}{\ButtonUp}
\newcommand{\ActionWpsBrowse}{\ButtonRight}
\newcommand{\ActionWpsContext}{Long \ButtonRight}
-\newcommand{\ActionWpsHotkey}{\ButtonRec}
+\newcommand{\ActionWpsHotkey}{Long \ButtonRight{}+Long \ButtonDown}
\newcommand{\ActionWpsPlaylist}{Long \ButtonLeft}
\newcommand{\ActionWpsMenu}{\ButtonLeft}
\newcommand{\ActionWpsQuickScreen}{Long \ButtonLeft{}+Long \ButtonDown}
-\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPlay{} + \ButtonRight}
-\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPlay{} + \ButtonLeft}
-\newcommand{\ActionWpsAbReset}{\ButtonPlay{} + \ButtonUp}
+\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPlay{}+\ButtonRight}
+\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPlay{}+\ButtonLeft}
+\newcommand{\ActionWpsAbReset}{\ButtonPlay{}+\ButtonUp{} or \ButtonPlay{}+\ButtonDown}
%Button actions, tree context
\newcommand{\ActionTreeWps}{\ButtonPlay}
\newcommand{\ActionTreeStop}{Long \ButtonPlay}
\newcommand{\ActionTreeEnter}{\ButtonRight}
\newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
-\newcommand{\ActionTreeHotkey}{\ButtonRec}
+\newcommand{\ActionTreeHotkey}{Long \ButtonRight{}+Long \ButtonDown}
%Button actions, YesNo context
-\newcommand{\ActionYesNoAccept}{\ButtonRight}
+\newcommand{\ActionYesNoAccept}{\ButtonPlay}
%Button actions, Setting context
\newcommand{\ActionSettingInc}{\ButtonUp}
@@ -60,7 +63,7 @@
%Button actions, Alarm screen
\newcommand{\ActionAlarmSet}{\ButtonPlay}
-\newcommand{\ActionAlarmCancel}{Long \Buttonplay}
+\newcommand{\ActionAlarmCancel}{\ButtonRew}
\newcommand{\ActionAlarmHoursDec}{\ButtonDown}
\newcommand{\ActionAlarmHoursInc}{\ButtonUp}
@@ -68,14 +71,12 @@
\newcommand{\ActionKbdLeft}{\ButtonLeft}
\newcommand{\ActionKbdRight}{\ButtonRight}
\newcommand{\ActionKbdSelect}{\ButtonPlay}
-\newcommand{\ActionKbdDone}{\ButtonFF}
-\newcommand{\ActionKbdAbort}{\ButtonFF{}+\ButtonRew{} or \ButtonRec}
+\newcommand{\ActionKbdDone}{Long \ButtonFF}
+\newcommand{\ActionKbdAbort}{Long \ButtonRew}
\newcommand{\ActionKbdUp}{\ButtonUp}
\newcommand{\ActionKbdDown}{\ButtonDown}
-\newcommand{\ActionKbdCursorLeft}{\ButtonFF{}+\ButtonLeft}
-\newcommand{\ActionKbdCursorRight}{\ButtonFF{}+\ButtonRight}
\newcommand{\ActionKbdBackSpace}{\ButtonRew}
-\newcommand{\ActionKbdMorseInput}{Long \ButtonFF}
+\newcommand{\ActionKbdMorseInput}{\ButtonRecOn{} or \ButtonRecOff}
\newcommand{\ActionKbdMorseSelect}{\ButtonPlay}
%Button actions, Pitch Screen context
@@ -91,9 +92,9 @@
%Button actions, Recording screen context
\newcommand{\ActionRecNewfile}{\ButtonFF}
-\newcommand{\ActionRecMenu}{\ButtonRew}
+\newcommand{\ActionRecMenu}{Long \ButtonRew}
\newcommand{\ActionRecPause}{\ButtonPlay}
-\newcommand{\ActionRecExit}{Long \ButtonRew{} or \ButtonRec}
+\newcommand{\ActionRecExit}{\ButtonRew{} or \ButtonRecOff}
\newcommand{\ActionRecSettingsInc}{\ButtonRight}
\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
\newcommand{\ActionRecPrev}{\ButtonUp}
@@ -124,6 +125,6 @@
\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
\newcommand{\PluginRightRepeat}{Long \ButtonRight}
\newcommand{\PluginCancel}{\ButtonRew}
-\newcommand{\PluginExit}{\ButtonFF}
+\newcommand{\PluginExit}{Long \ButtonRew}
\newcommand{\PluginSelect}{\ButtonPlay}
\newcommand{\PluginSelectRepeat}{Long \ButtonPlay}