Fuze+ demo plugin's keymaps upgrade

1)  keymaps reviewed
2)  manual updated/created accordingly

Change-Id: I38dd178466a390e9badeda4f44ac275041b313f1
Reviewed-on: http://gerrit.rockbox.org/132
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>

4 files changed, 23 insertions, 14 deletions

diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 7575b41700..1e323ec7bd 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -243,9 +243,10 @@ GREY_INFO_STRUCT
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
 #   define FFT_PREV_GRAPH   BUTTON_LEFT
 #   define FFT_NEXT_GRAPH   BUTTON_RIGHT
-#   define FFT_ORIENTATION  BUTTON_BACK
+#   define FFT_ORIENTATION  BUTTON_PLAYPAUSE
 #   define FFT_WINDOW       BUTTON_SELECT
-#   define FFT_AMP_SCALE    BUTTON_PLAYPAUSE
+#   define FFT_AMP_SCALE    BUTTON_BOTTOMLEFT
+#   define FFT_FREQ_SCALE   BUTTON_BOTTOMRIGHT
 #   define FFT_QUIT         BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD)
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 0bf951f069..af2c821037 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -324,7 +324,7 @@
 #define OSCILLOSCOPE_QUIT         BUTTON_POWER
 #define OSCILLOSCOPE_DRAWMODE     BUTTON_SELECT
 #define OSCILLOSCOPE_ADVMODE      BUTTON_BACK
-#define OSCILLOSCOPE_ORIENTATION  (BUTTON_BACK|BUTTON_REPEAT)
+#define OSCILLOSCOPE_ORIENTATION  BUTTON_UP
 #define OSCILLOSCOPE_PAUSE        BUTTON_PLAYPAUSE
 #define OSCILLOSCOPE_SPEED_UP     BUTTON_LEFT
 #define OSCILLOSCOPE_SPEED_DOWN   BUTTON_RIGHT
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index 560544d79d..b2d43cf5e8 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -14,11 +14,12 @@ This is a rotating cube screen saver in 3D.
     \opt{PBELL_VIBE500_PAD}{\ButtonOK}
     \opt{MPIO_HD200_PAD}{\ButtonFunc}
     \opt{MPIO_HD300_PAD}{\ButtonEnter}
+    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
        \opt{HAVEREMOTEKEYMAP}{& }
         & Display at maximum frame rate\\
     \opt{PLAYER_PAD,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}{\ButtonPlay}
+        ,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{GIGABEAT_PAD}{\ButtonSelect}
@@ -31,7 +32,7 @@ This is a rotating cube screen saver in 3D.
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
-    \opt{IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IAUDIO_X5_PAD,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{\ButtonDown}
     \opt{COWON_D2_PAD}{\TouchTopRight}
@@ -41,7 +42,8 @@ This is a rotating cube screen saver in 3D.
         & Cycle draw mode\\
     \opt{ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,RECORDER_PAD%
         ,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
-        ,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,PBELL_VIBE500_PAD}
+        ,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,PBELL_VIBE500_PAD%
+        ,SANSA_FUZEPLUS_PAD}
         {\ButtonRight{} / \ButtonLeft}
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight{} / \ButtonOn+\ButtonLeft}
     \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
@@ -50,7 +52,8 @@ This is a rotating cube screen saver in 3D.
         & Select axis to adjust\\
     \opt{PLAYER_PAD}{\ButtonRight{} / \ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp{} / \ButtonDown}
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
+        ,SANSA_FUZEPLUS_PAD}{\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolDown{} / \ButtonVolUp}
@@ -63,7 +66,7 @@ This is a rotating cube screen saver in 3D.
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-        ,MROBE100_PAD,COWON_D2_PAD}{\ButtonPower}
+        ,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
     \opt{PBELL_VIBE500_PAD}{\ButtonRec}
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index dfa096d0a4..a79331aa30 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -15,7 +15,8 @@ being played.
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
-      ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+      ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD%
+      ,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
@@ -34,7 +35,7 @@ being played.
     \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonRight}
     \opt{GIGABEAT_S_PAD}{\ButtonNext}
     \opt{COWON_D2_PAD}{\TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
+    \opt{PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{\ButtonCancel}
     \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Toggle whether to scroll or not \\
@@ -51,10 +52,12 @@ being played.
     \opt{PBELL_VIBE500_PAD}{\ButtonOK}
     \opt{MPIO_HD200_PAD}{Long \ButtonFunc}
     \opt{MPIO_HD300_PAD}{\ButtonMenu}
+    \opt{SANSA_FUZEPLUS_PAD}{\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}%
+        ,GIGABEAT_S_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD%
+        ,SANSA_FUZEPLUS_PAD}%
         {\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
@@ -69,14 +72,16 @@ being played.
         {\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD,MPIO_HD300_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,MPIO_HD200_PAD}
+    \opt{SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,MPIO_HD200_PAD%
+        ,SANSA_FUZEPLUS_PAD}
         {\ButtonVolUp{} / \ButtonVolDown}
     \opt{COWON_D2_PAD}{\ButtonPlus{} / \ButtonMinus}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease volume\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD%
-        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
+        ,SANSA_FUZEPLUS_PAD}
         {\ButtonRight{} / \ButtonLeft}
     \opt{COWON_D2_PAD}{\TouchMidRight\ /\ \TouchMidLeft}
     \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonFF / \ButtonRew}
@@ -85,7 +90,7 @@ being played.
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD}
+        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}
         {\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}