diff options
-rw-r--r-- | apps/keymaps/keymap-fuzeplus.c | 13 | ||||
-rw-r--r-- | apps/radio/radio.c | 13 | ||||
-rw-r--r-- | manual/main_menu/fmradio.tex | 5 | ||||
-rw-r--r-- | 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[] = { | |||
169 | 169 | ||
170 | #ifdef CONFIG_TUNER | 170 | #ifdef CONFIG_TUNER |
171 | static const struct button_mapping button_context_radio[] = { | 171 | static const struct button_mapping button_context_radio[] = { |
172 | |||
173 | { ACTION_FM_MODE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
172 | { ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, | 174 | { ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, |
173 | { ACTION_FM_PRESET, BUTTON_BOTTOMRIGHT, BUTTON_SELECT }, | 175 | |
174 | { ACTION_FM_PLAY, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_PLAYPAUSE }, | 176 | { ACTION_FM_PLAY, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_PLAYPAUSE }, |
175 | { ACTION_FM_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, | 177 | { ACTION_FM_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, |
176 | { ACTION_FM_MODE, BUTTON_BOTTOMLEFT, BUTTON_BOTTOMLEFT }, | 178 | |
179 | { ACTION_FM_PREV_PRESET, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, | ||
180 | { ACTION_FM_NEXT_PRESET, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, | ||
181 | { ACTION_FM_PRESET, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
182 | |||
177 | { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, | 183 | { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
178 | { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 184 | { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
179 | { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, | 185 | { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, |
@@ -187,7 +193,8 @@ static const struct button_mapping button_context_radio[] = { | |||
187 | 193 | ||
188 | #ifdef HAVE_RECORDING | 194 | #ifdef HAVE_RECORDING |
189 | static const struct button_mapping button_context_recscreen[] = { | 195 | static const struct button_mapping button_context_recscreen[] = { |
190 | { ACTION_REC_PAUSE, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_PLAYPAUSE }, | 196 | |
197 | { ACTION_REC_PAUSE, BUTTON_PLAYPAUSE, BUTTON_NONE }, | ||
191 | { ACTION_REC_NEWFILE, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, | 198 | { ACTION_REC_NEWFILE, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, |
192 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 199 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
193 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 200 | { 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 @@ | |||
137 | #define FM_PREV_PRESET | 137 | #define FM_PREV_PRESET |
138 | #define FM_NEXT_PRESET | 138 | #define FM_NEXT_PRESET |
139 | 139 | ||
140 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) | ||
141 | #define FM_PRESET_ADD | ||
142 | #define FM_PRESET_ACTION | ||
143 | #define FM_MENU | ||
144 | #define FM_PRESET | ||
145 | #define FM_STOP | ||
146 | #define FM_MODE | ||
147 | #define FM_EXIT | ||
148 | #define FM_PLAY | ||
149 | #define FM_RECORD | ||
150 | #define FM_PREV_PRESET | ||
151 | #define FM_NEXT_PRESET | ||
152 | |||
140 | #endif | 153 | #endif |
141 | 154 | ||
142 | /* presets.c needs these so keep unstatic or redo the whole thing! */ | 155 | /* 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 @@ | |||
49 | \opt{HAVEREMOTEKEYMAP}{& Long \ActionRCFMPrev, Long \ActionRCFMNext} | 49 | \opt{HAVEREMOTEKEYMAP}{& Long \ActionRCFMPrev, Long \ActionRCFMNext} |
50 | & Seek to next station in \setting{SCAN} mode.\\ | 50 | & Seek to next station in \setting{SCAN} mode.\\ |
51 | % | 51 | % |
52 | \opt{SANSA_FUZEPLUS_PAD}{ | ||
53 | \ActionFMPrevPreset, \ActionFMNextPreset | ||
54 | & Jump to next/previous preset station.\\ | ||
55 | } | ||
56 | % | ||
52 | \ActionFMSettingsInc, \ActionFMSettingsDec | 57 | \ActionFMSettingsInc, \ActionFMSettingsDec |
53 | \opt{HAVEREMOTEKEYMAP}{ | 58 | \opt{HAVEREMOTEKEYMAP}{ |
54 | & | 59 | & |
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 @@ | |||
121 | \newcommand{\ActionRecNext}{\ButtonDown} | 121 | \newcommand{\ActionRecNext}{\ButtonDown} |
122 | 122 | ||
123 | %Button actions, FM radio context | 123 | %Button actions, FM radio context |
124 | \newcommand{\ActionFMMenu}{\fixme{tbd}} | 124 | \newcommand{\ActionFMMenu}{Long \ButtonSelect} |
125 | 125 | ||
126 | \newcommand{\ActionFMPreset}{\ButtonBottomRight} | 126 | \newcommand{\ActionFMPreset}{Long \ButtonBottomRight} |
127 | \newcommand{\ActionFMPlay}{\ButtonPlay} | 127 | \newcommand{\ActionFMPlay}{\ButtonPlay} |
128 | \newcommand{\ActionFMStop}{Long \ButtonPlay} | 128 | \newcommand{\ActionFMStop}{Long \ButtonPlay} |
129 | \newcommand{\ActionFMMode}{\ButtonBottomLeft} | 129 | \newcommand{\ActionFMMode}{\ButtonSelect} |
130 | \newcommand{\ActionFMExit}{\ButtonBack} | 130 | \newcommand{\ActionFMExit}{\ButtonBack} |
131 | 131 | \newcommand{\ActionFMPrevPreset}{\ButtonBottomLeft} | |
132 | \newcommand{\ActionFMNextPreset}{\ButtonBottomRight} | ||
132 | \newcommand{\ActionFMSettingsInc}{\ActionSettingInc} | 133 | \newcommand{\ActionFMSettingsInc}{\ActionSettingInc} |
133 | \newcommand{\ActionFMSettingsDec}{\ActionSettingDec} | 134 | \newcommand{\ActionFMSettingsDec}{\ActionSettingDec} |
134 | \newcommand{\ActionFMPrev}{\ButtonLeft} | 135 | \newcommand{\ActionFMPrev}{\ButtonLeft} |