diff options
author | Robert Kukla <roolku@rockbox.org> | 2008-03-04 23:24:28 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2008-03-04 23:24:28 +0000 |
commit | 4e8904830d8d0119ddc089397396c2a37bda6ead (patch) | |
tree | ccbd193a17517ea7ce7efee17eed8826e270730a | |
parent | 0fd6a04eee7984b21fa3fa5f759f84ccccdf68db (diff) | |
download | rockbox-4e8904830d8d0119ddc089397396c2a37bda6ead.tar.gz rockbox-4e8904830d8d0119ddc089397396c2a37bda6ead.zip |
m:robe 100 - small keymap changes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16521 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/keymaps/keymap-mr100.c | 5 | ||||
-rw-r--r-- | manual/platform/mrobe100.tex | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c index 2d6b616d5d..84b4bc6177 100644 --- a/apps/keymaps/keymap-mr100.c +++ b/apps/keymaps/keymap-mr100.c | |||
@@ -68,6 +68,7 @@ static const struct button_mapping button_context_standard[] = { | |||
68 | 68 | ||
69 | static const struct button_mapping button_context_wps[] = { | 69 | static const struct button_mapping button_context_wps[] = { |
70 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 70 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
71 | { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
71 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 72 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
72 | 73 | ||
73 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 74 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
@@ -231,9 +232,9 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
231 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 232 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
232 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 233 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
233 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 234 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
234 | { ACTION_PS_TOGGLE_MODE, BUTTON_SELECT, BUTTON_NONE }, | 235 | { ACTION_PS_TOGGLE_MODE, BUTTON_MENU, BUTTON_NONE }, |
235 | { ACTION_PS_RESET, BUTTON_DISPLAY, BUTTON_NONE }, | 236 | { ACTION_PS_RESET, BUTTON_DISPLAY, BUTTON_NONE }, |
236 | { ACTION_PS_EXIT, BUTTON_MENU, BUTTON_NONE }, | 237 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, |
237 | 238 | ||
238 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 239 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
239 | }; /* button_context_pitchcreen */ | 240 | }; /* button_context_pitchcreen */ |
diff --git a/manual/platform/mrobe100.tex b/manual/platform/mrobe100.tex index ea324e8128..a7b6be23d8 100644 --- a/manual/platform/mrobe100.tex +++ b/manual/platform/mrobe100.tex | |||
@@ -25,6 +25,7 @@ | |||
25 | \newcommand{\disk}{hard disk} | 25 | \newcommand{\disk}{hard disk} |
26 | 26 | ||
27 | \newcommand{\ButtonPower}{\btnfnt{Power}} | 27 | \newcommand{\ButtonPower}{\btnfnt{Power}} |
28 | \newcommand{\ButtonPlay}{\btnfnt{Play}} | ||
28 | \newcommand{\ButtonMenu}{\btnfnt{Menu}} | 29 | \newcommand{\ButtonMenu}{\btnfnt{Menu}} |
29 | \newcommand{\ButtonLeft}{\btnfnt{Left}} | 30 | \newcommand{\ButtonLeft}{\btnfnt{Left}} |
30 | \newcommand{\ButtonRight}{\btnfnt{Right}} | 31 | \newcommand{\ButtonRight}{\btnfnt{Right}} |
@@ -41,21 +42,21 @@ | |||
41 | \newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} | 42 | \newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} |
42 | \newcommand{\ActionStdNext}{\ButtonDown} | 43 | \newcommand{\ActionStdNext}{\ButtonDown} |
43 | \newcommand{\ActionStdNextRepeat}{Long \ButtonDown} | 44 | \newcommand{\ActionStdNextRepeat}{Long \ButtonDown} |
44 | \newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower} | 45 | \newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonDisplay{} or \ButtonPower} |
45 | \newcommand{\ActionStdContext}{Long \ButtonSelect} | 46 | \newcommand{\ActionStdContext}{Long \ButtonSelect} |
46 | \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu} | 47 | \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu} |
47 | \newcommand{\ActionStdMenu}{\ButtonMenu} | 48 | \newcommand{\ActionStdMenu}{\ButtonMenu} |
48 | \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} | 49 | \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} |
49 | 50 | ||
50 | %Button actions, wps context | 51 | %Button actions, wps context |
51 | \newcommand{\ActionWpsPlay}{\ButtonDisplay} | 52 | \newcommand{\ActionWpsPlay}{\ButtonPlay} |
52 | \newcommand{\ActionWpsSkipNext}{\ButtonRight} | 53 | \newcommand{\ActionWpsSkipNext}{\ButtonRight} |
53 | \newcommand{\ActionWpsSkipPrev}{\ButtonLeft} | 54 | \newcommand{\ActionWpsSkipPrev}{\ButtonLeft} |
54 | \newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} | 55 | \newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} |
55 | \newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} | 56 | \newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} |
56 | \newcommand{\ActionWpsAbSetBNextDir}{\ButtonDisplay{} + \ButtonRight} | 57 | \newcommand{\ActionWpsAbSetBNextDir}{\ButtonDisplay{} + \ButtonRight} |
57 | \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonDisplay{} + \ButtonLeft} | 58 | \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonDisplay{} + \ButtonLeft} |
58 | \newcommand{\ActionWpsStop}{\ButtonPower} | 59 | \newcommand{\ActionWpsStop}{\ButtonPower{} or Long \ButtonPlay} |
59 | \newcommand{\ActionWpsVolDown}{\ButtonDown} | 60 | \newcommand{\ActionWpsVolDown}{\ButtonDown} |
60 | \newcommand{\ActionWpsVolUp}{\ButtonUp} | 61 | \newcommand{\ActionWpsVolUp}{\ButtonUp} |
61 | \newcommand{\ActionWpsPitchScreen}{\ButtonDisplay{} + \ButtonUp/\ButtonDown} | 62 | \newcommand{\ActionWpsPitchScreen}{\ButtonDisplay{} + \ButtonUp/\ButtonDown} |
@@ -68,7 +69,7 @@ | |||
68 | 69 | ||
69 | %Button actions, tree context | 70 | %Button actions, tree context |
70 | \newcommand{\ActionTreeWps}{\ButtonDisplay} | 71 | \newcommand{\ActionTreeWps}{\ButtonDisplay} |
71 | \newcommand{\ActionTreeStop}{\ButtonPower} | 72 | \newcommand{\ActionTreeStop}{\ButtonPower{} or Long \ButtonPlay} |
72 | \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} | 73 | \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} |
73 | \newcommand{\ActionTreeParentDirectory}{\ButtonLeft} | 74 | \newcommand{\ActionTreeParentDirectory}{\ButtonLeft} |
74 | 75 | ||
@@ -103,4 +104,4 @@ | |||
103 | \newcommand{\ActionPsNudgeLeft}{\ButtonLeft} | 104 | \newcommand{\ActionPsNudgeLeft}{\ButtonLeft} |
104 | \newcommand{\ActionPsNudgeRight}{\ButtonRight} | 105 | \newcommand{\ActionPsNudgeRight}{\ButtonRight} |
105 | \newcommand{\ActionPsReset}{\ButtonDisplay} | 106 | \newcommand{\ActionPsReset}{\ButtonDisplay} |
106 | \newcommand{\ActionPsExit}{\ButtonPower} | 107 | \newcommand{\ActionPsExit}{\ButtonPlay} |