1 files changed, 10 insertions, 8 deletions

diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index b9a109084a..554e51cf66 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -23,7 +23,7 @@ being played.
     \opt{COWON_D2_PAD}{\TouchTopMiddle}
     \opt{MPIO_HD200_PAD}{\ButtonFunc}
     \opt{MPIO_HD300_PAD}{\ButtonEnter}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonLeft}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Toggle filled / curve / plot \\
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -39,7 +39,8 @@ being played.
     \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
     \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
     \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonRight}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonRight}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonRight}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Toggle whether to scroll or not \\
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -56,12 +57,13 @@ being played.
     \opt{MPIO_HD200_PAD}{Long \ButtonFunc}
     \opt{MPIO_HD300_PAD}{\ButtonMenu}
     \opt{SANSA_FUZEPLUS_PAD}{\ButtonUp}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonUp}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonUp}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonUp}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Toggle drawing orientation \\
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
         ,GIGABEAT_S_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD%
-        ,SANSA_FUZEPLUS_PAD}%
+        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
         {\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
@@ -70,7 +72,6 @@ being played.
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
     \opt{COWON_D2_PAD}{\TouchCenter}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonDown}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Pause the demo \\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD%
@@ -90,7 +91,7 @@ being played.
         ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
         {\ButtonRight{} / \ButtonLeft}
     \opt{COWON_D2_PAD}{\TouchMidRight\ /\ \TouchMidLeft}
-    \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonFF / \ButtonRew}
+    \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonFF{} / \ButtonRew}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -100,8 +101,9 @@ being played.
         {\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
-    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{MPIO_HD200_PAD}{\ButtonRec+\ButtonPlay}
     \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{&
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}