summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2007-09-10 17:55:02 +0000
committerNils Wallménius <nils@rockbox.org>2007-09-10 17:55:02 +0000
commit35dbbdee168d39aa5558084b8fd60687bc379532 (patch)
tree379babe7125b751d97a068d68cb115006088782b
parent04b3435afd032766a8ac93b2904166499e62c7a4 (diff)
downloadrockbox-35dbbdee168d39aa5558084b8fd60687bc379532.zip
rockbox-35dbbdee168d39aa5558084b8fd60687bc379532.tar.gz
rockbox-35dbbdee168d39aa5558084b8fd60687bc379532.tar.bz2
rockbox-35dbbdee168d39aa5558084b8fd60687bc379532.tar.xz
Accept patch in FS#7726 by Costas Calamvokis, enables FM radio and recording stuff for sansa in the manual
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14663 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--docs/CREDITS1
-rw-r--r--manual/main_menu/fmradio.tex11
-rw-r--r--manual/main_menu/images/ss-fm-radio-screen-176x220x16.pngbin0 -> 1034 bytes
-rw-r--r--manual/main_menu/images/ss-while-recording-screen-176x220x16.pngbin0 -> 1294 bytes
-rw-r--r--manual/platform/e200.tex10
5 files changed, 20 insertions, 2 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index 6377b7e..c092eab 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -328,6 +328,7 @@ Adilson Vicente Xavier
Jesse Lockwood
Jonathan Backer
Sofian Babai
+Costas Calamvokis
The libmad team
The wavpack team
The ffmpeg team
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index 56ba520..b030bb6 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -22,18 +22,21 @@
Long \ButtonLeft, \ButtonRight & Seek to next station or preset in
\setting{SCAN} mode.\\
%
- \ButtonUp, \ButtonDown
- & Change volume.\\
+ \opt{SANSA_E200_PAD}{\ButtonScrollUp, \ButtonScrollDown}
+ \nopt{SANSA_E200_PAD}{\ButtonUp, \ButtonDown}
+ & Change volume.\\
\opt{RECORDER_PAD}{
\ButtonPlay
& freezes all screen updates. May enhance radio reception in some
cases.\\
}
+
%
\opt{RECORDER_PAD}{\ButtonOn}
\opt{ONDIO_PAD}{Long \ButtonOff}
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
\opt{IAUDIO_X5_PAD}{\ButtonRec}
+ \opt{SANSA_E200_PAD}{\ButtonPower}
& Leave the radio screen with the radio playing.\\
%
\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
@@ -43,16 +46,19 @@
%
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn & Mutes radio playback.\\}
\opt{IAUDIO_X5_PAD}{\ButtonPlay & Mutes radio playback.\\}
+ \opt{SANSA_E200_PAD}{\ButtonUp & Mutes radio playback.\\}
%
\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{
\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOn}
\opt{IAUDIO_X5_PAD}{Long \ButtonPlay}
+ \opt{SANSA_E200_PAD}{\ButtonRec}
& Switches between \setting{SCAN} and \setting{PRESET} mode.\\
}
%
\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{
\opt{RECORDER_PAD}{\ButtonFTwo}
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+ \opt{SANSA_E200_PAD}{\ButtonSelect}
& Opens a list of radio presets. You can view all the presets that
you have, and switch to the station.\\
}
@@ -60,6 +66,7 @@
\opt{RECORDER_PAD}{\ButtonFOne}
\opt{ONDIO_PAD}{Long \ButtonMenu}
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{Long \ButtonSelect}
+ \opt{SANSA_E200_PAD}{\ButtonDown}
& Displays the FM radio settings menu.\\
\end{btnmap}
\end{table}
diff --git a/manual/main_menu/images/ss-fm-radio-screen-176x220x16.png b/manual/main_menu/images/ss-fm-radio-screen-176x220x16.png
new file mode 100644
index 0000000..deaca3e
--- /dev/null
+++ b/manual/main_menu/images/ss-fm-radio-screen-176x220x16.png
Binary files differ
diff --git a/manual/main_menu/images/ss-while-recording-screen-176x220x16.png b/manual/main_menu/images/ss-while-recording-screen-176x220x16.png
new file mode 100644
index 0000000..314acab
--- /dev/null
+++ b/manual/main_menu/images/ss-while-recording-screen-176x220x16.png
Binary files differ
diff --git a/manual/platform/e200.tex b/manual/platform/e200.tex
index 3cf7fc2..256b7a3 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/e200.tex
@@ -2,6 +2,8 @@
\def\UseOption{e200}
\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
+\edef\UseOption{\UseOption,HAVE_RECORDING}
+\edef\UseOption{\UseOption,CONFIG_TUNER}
\edef\UseOption{\UseOption,CONFIG_RTC}
\edef\UseOption{\UseOption,SWCODEC}
\edef\UseOption{\UseOption,SANSA_E200_PAD}
@@ -99,3 +101,11 @@
\newcommand{\ActionPsNudgeRight}{\ButtonRight}
\newcommand{\ActionPsReset}{\ButtonSelect}
\newcommand{\ActionPsExit}{\ButtonPower}
+
+%Button actions, Recording screen context
+\newcommand{\ActionRecPause}{\ButtonUp}
+\newcommand{\ActionRecExit}{\ButtonPower}
+\newcommand{\ActionRecNewfile}{\ButtonRec}
+\newcommand{\ActionRecMenu}{Long \ButtonDown}
+\newcommand{\ActionSettingsInc}{\ButtonRight}
+\newcommand{\ActionSettingsDec}{\ButtonLeft}