1 files changed, 19 insertions, 6 deletions

diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index a0b976f466..344a40f9bf 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -349,18 +349,31 @@
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define OSCILLOSCOPE_QUIT            BUTTON_POWER
 
-#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
-#define OSCILLOSCOPE_QUIT            BUTTON_REC
-#define OSCILLOSCOPE_DRAWMODE        (BUTTON_PLAY|BUTTON_LEFT)
+#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#define OSCILLOSCOPE_QUIT            BUTTON_REW
+#define OSCILLOSCOPE_DRAWMODE        BUTTON_FFWD
 #define OSCILLOSCOPE_ADVMODE         (BUTTON_PLAY|BUTTON_RIGHT)
 #define OSCILLOSCOPE_ORIENTATION     (BUTTON_PLAY|BUTTON_UP)
-#define OSCILLOSCOPE_PAUSE           (BUTTON_PLAY|BUTTON_DOWN)
+#define OSCILLOSCOPE_GRAPHMODE       (BUTTON_PLAY|BUTTON_LEFT)
+#define OSCILLOSCOPE_PAUSE_PRE       BUTTON_PLAY
+#define OSCILLOSCOPE_PAUSE           (BUTTON_PLAY|BUTTON_REL)
+#define OSCILLOSCOPE_SPEED_UP        BUTTON_RIGHT
+#define OSCILLOSCOPE_SPEED_DOWN      BUTTON_LEFT
+#define OSCILLOSCOPE_VOL_UP          BUTTON_UP
+#define OSCILLOSCOPE_VOL_DOWN        BUTTON_DOWN
+#define NEED_LASTBUTTON
+
+#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
+#define OSCILLOSCOPE_QUIT            BUTTON_REW
+#define OSCILLOSCOPE_DRAWMODE        BUTTON_FFWD
+#define OSCILLOSCOPE_ADVMODE         (BUTTON_REC|BUTTON_RIGHT)
+#define OSCILLOSCOPE_ORIENTATION     (BUTTON_REC|BUTTON_UP)
+#define OSCILLOSCOPE_GRAPHMODE       (BUTTON_REC|BUTTON_LEFT)
+#define OSCILLOSCOPE_PAUSE           BUTTON_PLAY
 #define OSCILLOSCOPE_SPEED_UP        BUTTON_RIGHT
 #define OSCILLOSCOPE_SPEED_DOWN      BUTTON_LEFT
 #define OSCILLOSCOPE_VOL_UP          BUTTON_UP
 #define OSCILLOSCOPE_VOL_DOWN        BUTTON_DOWN
-/* Need GRAPHMODE */
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 #define OSCILLOSCOPE_QUIT            BUTTON_REC