m:robe 100 - small keymap changes

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

2 files changed, 9 insertions, 7 deletions

diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c
index 2d6b616..84b4bc6 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[]  = {
 
 static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
     { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
 
     { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
@@ -231,9 +232,9 @@ static const struct button_mapping button_context_pitchscreen[]  = {
     { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,         BUTTON_NONE },
     { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,                   BUTTON_NONE },
     { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,        BUTTON_NONE },
-    { ACTION_PS_TOGGLE_MODE,    BUTTON_SELECT,                  BUTTON_NONE },
+    { ACTION_PS_TOGGLE_MODE,    BUTTON_MENU,                    BUTTON_NONE },
     { ACTION_PS_RESET,          BUTTON_DISPLAY,                 BUTTON_NONE },
-    { ACTION_PS_EXIT,           BUTTON_MENU,                    BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_PLAY,                    BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_pitchcreen */
diff --git a/manual/platform/mrobe100.tex b/manual/platform/mrobe100.tex
index ea324e8..a7b6be2 100644
--- a/manual/platform/mrobe100.tex
+++ b/manual/platform/mrobe100.tex
@@ -25,6 +25,7 @@
 \newcommand{\disk}{hard disk}

 

 \newcommand{\ButtonPower}{\btnfnt{Power}}

+\newcommand{\ButtonPlay}{\btnfnt{Play}}

 \newcommand{\ButtonMenu}{\btnfnt{Menu}}

 \newcommand{\ButtonLeft}{\btnfnt{Left}}

 \newcommand{\ButtonRight}{\btnfnt{Right}}

@@ -41,21 +42,21 @@
 \newcommand{\ActionStdPrevRepeat}{Long \ButtonUp}

 \newcommand{\ActionStdNext}{\ButtonDown}

 \newcommand{\ActionStdNextRepeat}{Long \ButtonDown}

-\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower}

+\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonDisplay{} or \ButtonPower}

 \newcommand{\ActionStdContext}{Long \ButtonSelect}

 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}

 \newcommand{\ActionStdMenu}{\ButtonMenu}

 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}

 

 %Button actions, wps context

-\newcommand{\ActionWpsPlay}{\ButtonDisplay}

+\newcommand{\ActionWpsPlay}{\ButtonPlay}

 \newcommand{\ActionWpsSkipNext}{\ButtonRight}

 \newcommand{\ActionWpsSkipPrev}{\ButtonLeft}

 \newcommand{\ActionWpsSeekBack}{Long \ButtonLeft}

 \newcommand{\ActionWpsSeekFwd}{Long \ButtonRight}

 \newcommand{\ActionWpsAbSetBNextDir}{\ButtonDisplay{} + \ButtonRight}

 \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonDisplay{} + \ButtonLeft}

-\newcommand{\ActionWpsStop}{\ButtonPower}

+\newcommand{\ActionWpsStop}{\ButtonPower{} or Long \ButtonPlay}

 \newcommand{\ActionWpsVolDown}{\ButtonDown}

 \newcommand{\ActionWpsVolUp}{\ButtonUp}

 \newcommand{\ActionWpsPitchScreen}{\ButtonDisplay{} + \ButtonUp/\ButtonDown}

@@ -68,7 +69,7 @@
 

 %Button actions, tree context

 \newcommand{\ActionTreeWps}{\ButtonDisplay}

-\newcommand{\ActionTreeStop}{\ButtonPower}

+\newcommand{\ActionTreeStop}{\ButtonPower{} or Long \ButtonPlay}

 \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}

 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}

 

@@ -103,4 +104,4 @@
 \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}

 \newcommand{\ActionPsNudgeRight}{\ButtonRight}

 \newcommand{\ActionPsReset}{\ButtonDisplay}

-\newcommand{\ActionPsExit}{\ButtonPower}

+\newcommand{\ActionPsExit}{\ButtonPlay}