From 5ba7e2ca72412a4e58a76f43738f6309b533e03f Mon Sep 17 00:00:00 2001
From: Jean-Louis Biasini <jlbiasini@gmail.com>
Date: Mon, 15 Jul 2013 18:28:54 +0300
Subject: [Fuze+][Keymaps] keymaps for radio and recorder update

1) Now that recording is working a few keymaps update are required.
2) also implement the radio.c file so that fm dedicated keymaps
works.
3) implement some missing fm keymaps
4) manual updated accordingly

Change-Id: I40be3e245853ccb9ed7a5bc5a76fe4ed90772272
Reviewed-on: http://gerrit.rockbox.org/513
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
---
 apps/keymaps/keymap-fuzeplus.c           | 13 ++++++++++---
 apps/radio/radio.c                       | 13 +++++++++++++
 manual/main_menu/fmradio.tex             |  5 +++++
 manual/platform/keymap-sansafuzeplus.tex |  9 +++++----
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/apps/keymaps/keymap-fuzeplus.c b/apps/keymaps/keymap-fuzeplus.c
index 43c50c03b0..042803dd15 100644
--- a/apps/keymaps/keymap-fuzeplus.c
+++ b/apps/keymaps/keymap-fuzeplus.c
@@ -169,11 +169,17 @@ static const struct button_mapping button_context_list[]  = {
 
 #ifdef CONFIG_TUNER
 static const struct button_mapping button_context_radio[]  = {
+
+    { ACTION_FM_MODE,                  BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT },
     { ACTION_FM_MENU,                  BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_FM_PRESET,                BUTTON_BOTTOMRIGHT,                 BUTTON_SELECT },
+
     { ACTION_FM_PLAY,                  BUTTON_PLAYPAUSE|BUTTON_REL,        BUTTON_PLAYPAUSE },
     { ACTION_FM_STOP,                  BUTTON_PLAYPAUSE|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_FM_MODE,                  BUTTON_BOTTOMLEFT,                  BUTTON_BOTTOMLEFT },
+
+    { ACTION_FM_PREV_PRESET,           BUTTON_BOTTOMLEFT|BUTTON_REL,       BUTTON_BOTTOMLEFT },
+    { ACTION_FM_NEXT_PRESET,           BUTTON_BOTTOMRIGHT|BUTTON_REL,      BUTTON_BOTTOMRIGHT },
+    { ACTION_FM_PRESET,                BUTTON_BOTTOMRIGHT|BUTTON_REPEAT,   BUTTON_NONE },
+
     { ACTION_SETTINGS_INC,             BUTTON_VOL_UP,                      BUTTON_NONE },
     { ACTION_SETTINGS_INCREPEAT,       BUTTON_VOL_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_SETTINGS_DEC,             BUTTON_VOL_DOWN,                    BUTTON_NONE },
@@ -187,7 +193,8 @@ static const struct button_mapping button_context_radio[]  = {
 
 #ifdef HAVE_RECORDING
 static const struct button_mapping button_context_recscreen[]  = {
-    { ACTION_REC_PAUSE,                BUTTON_PLAYPAUSE|BUTTON_REL,        BUTTON_PLAYPAUSE },
+
+    { ACTION_REC_PAUSE,                BUTTON_PLAYPAUSE,                   BUTTON_NONE },
     { ACTION_REC_NEWFILE,              BUTTON_BOTTOMRIGHT,                 BUTTON_NONE },
     { ACTION_SETTINGS_INC,             BUTTON_RIGHT,                       BUTTON_NONE },
     { ACTION_SETTINGS_INCREPEAT,       BUTTON_RIGHT|BUTTON_REPEAT,         BUTTON_NONE },
diff --git a/apps/radio/radio.c b/apps/radio/radio.c
index 4502400677..8a26c5f814 100644
--- a/apps/radio/radio.c
+++ b/apps/radio/radio.c
@@ -137,6 +137,19 @@
 #define FM_PREV_PRESET
 #define FM_NEXT_PRESET
 
+#elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD)
+#define FM_PRESET_ADD
+#define FM_PRESET_ACTION
+#define FM_MENU
+#define FM_PRESET
+#define FM_STOP
+#define FM_MODE
+#define FM_EXIT
+#define FM_PLAY
+#define FM_RECORD
+#define FM_PREV_PRESET
+#define FM_NEXT_PRESET
+
 #endif
 
 /* presets.c needs these so keep unstatic or redo the whole thing! */
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index 1ba67de068..b8c76291db 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -49,6 +49,11 @@
           \opt{HAVEREMOTEKEYMAP}{& Long \ActionRCFMPrev, Long \ActionRCFMNext}
           & Seek to next station in \setting{SCAN} mode.\\
           %
+          \opt{SANSA_FUZEPLUS_PAD}{
+              \ActionFMPrevPreset, \ActionFMNextPreset
+              & Jump to next/previous preset station.\\
+          }
+          %
           \ActionFMSettingsInc, \ActionFMSettingsDec
           \opt{HAVEREMOTEKEYMAP}{
               &
diff --git a/manual/platform/keymap-sansafuzeplus.tex b/manual/platform/keymap-sansafuzeplus.tex
index 9f8c538d94..9b915f0f10 100644
--- a/manual/platform/keymap-sansafuzeplus.tex
+++ b/manual/platform/keymap-sansafuzeplus.tex
@@ -121,14 +121,15 @@
 \newcommand{\ActionRecNext}{\ButtonDown}
 
 %Button actions, FM radio context
-\newcommand{\ActionFMMenu}{\fixme{tbd}}
+\newcommand{\ActionFMMenu}{Long \ButtonSelect}
 
-\newcommand{\ActionFMPreset}{\ButtonBottomRight}
+\newcommand{\ActionFMPreset}{Long \ButtonBottomRight}
 \newcommand{\ActionFMPlay}{\ButtonPlay}
 \newcommand{\ActionFMStop}{Long \ButtonPlay}
-\newcommand{\ActionFMMode}{\ButtonBottomLeft}
+\newcommand{\ActionFMMode}{\ButtonSelect}
 \newcommand{\ActionFMExit}{\ButtonBack}
-
+\newcommand{\ActionFMPrevPreset}{\ButtonBottomLeft}
+\newcommand{\ActionFMNextPreset}{\ButtonBottomRight}
 \newcommand{\ActionFMSettingsInc}{\ActionSettingInc}
 \newcommand{\ActionFMSettingsDec}{\ActionSettingDec}
 \newcommand{\ActionFMPrev}{\ButtonLeft}
-- 
cgit v1.2.3