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.tar.gz
rockbox-35dbbdee168d39aa5558084b8fd60687bc379532.zip
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 6377b7e300..c092eab423 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -328,6 +328,7 @@ Adilson Vicente Xavier
328Jesse Lockwood 328Jesse Lockwood
329Jonathan Backer 329Jonathan Backer
330Sofian Babai 330Sofian Babai
331Costas Calamvokis
331The libmad team 332The libmad team
332The wavpack team 333The wavpack team
333The ffmpeg team 334The ffmpeg team
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index 56ba520db2..b030bb6893 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -22,18 +22,21 @@
22 Long \ButtonLeft, \ButtonRight & Seek to next station or preset in 22 Long \ButtonLeft, \ButtonRight & Seek to next station or preset in
23 \setting{SCAN} mode.\\ 23 \setting{SCAN} mode.\\
24 % 24 %
25 \ButtonUp, \ButtonDown 25 \opt{SANSA_E200_PAD}{\ButtonScrollUp, \ButtonScrollDown}
26 & Change volume.\\ 26 \nopt{SANSA_E200_PAD}{\ButtonUp, \ButtonDown}
27 & Change volume.\\
27 \opt{RECORDER_PAD}{ 28 \opt{RECORDER_PAD}{
28 \ButtonPlay 29 \ButtonPlay
29 & freezes all screen updates. May enhance radio reception in some 30 & freezes all screen updates. May enhance radio reception in some
30 cases.\\ 31 cases.\\
31 } 32 }
33
32 % 34 %
33 \opt{RECORDER_PAD}{\ButtonOn} 35 \opt{RECORDER_PAD}{\ButtonOn}
34 \opt{ONDIO_PAD}{Long \ButtonOff} 36 \opt{ONDIO_PAD}{Long \ButtonOff}
35 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} 37 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
36 \opt{IAUDIO_X5_PAD}{\ButtonRec} 38 \opt{IAUDIO_X5_PAD}{\ButtonRec}
39 \opt{SANSA_E200_PAD}{\ButtonPower}
37 & Leave the radio screen with the radio playing.\\ 40 & Leave the radio screen with the radio playing.\\
38 % 41 %
39 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD} 42 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
@@ -43,16 +46,19 @@
43 % 46 %
44 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn & Mutes radio playback.\\} 47 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn & Mutes radio playback.\\}
45 \opt{IAUDIO_X5_PAD}{\ButtonPlay & Mutes radio playback.\\} 48 \opt{IAUDIO_X5_PAD}{\ButtonPlay & Mutes radio playback.\\}
49 \opt{SANSA_E200_PAD}{\ButtonUp & Mutes radio playback.\\}
46 % 50 %
47 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{ 51 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{
48 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOn} 52 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOn}
49 \opt{IAUDIO_X5_PAD}{Long \ButtonPlay} 53 \opt{IAUDIO_X5_PAD}{Long \ButtonPlay}
54 \opt{SANSA_E200_PAD}{\ButtonRec}
50 & Switches between \setting{SCAN} and \setting{PRESET} mode.\\ 55 & Switches between \setting{SCAN} and \setting{PRESET} mode.\\
51 } 56 }
52 % 57 %
53 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{ 58 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{
54 \opt{RECORDER_PAD}{\ButtonFTwo} 59 \opt{RECORDER_PAD}{\ButtonFTwo}
55 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect} 60 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
61 \opt{SANSA_E200_PAD}{\ButtonSelect}
56 & Opens a list of radio presets. You can view all the presets that 62 & Opens a list of radio presets. You can view all the presets that
57 you have, and switch to the station.\\ 63 you have, and switch to the station.\\
58 } 64 }
@@ -60,6 +66,7 @@
60 \opt{RECORDER_PAD}{\ButtonFOne} 66 \opt{RECORDER_PAD}{\ButtonFOne}
61 \opt{ONDIO_PAD}{Long \ButtonMenu} 67 \opt{ONDIO_PAD}{Long \ButtonMenu}
62 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{Long \ButtonSelect} 68 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{Long \ButtonSelect}
69 \opt{SANSA_E200_PAD}{\ButtonDown}
63 & Displays the FM radio settings menu.\\ 70 & Displays the FM radio settings menu.\\
64 \end{btnmap} 71 \end{btnmap}
65 \end{table} 72 \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 0000000000..deaca3ebe0
--- /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 0000000000..314acab936
--- /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 3cf7fc29ef..256b7a34b4 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/e200.tex
@@ -2,6 +2,8 @@
2\def\UseOption{e200} 2\def\UseOption{e200}
3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} 3\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
4\edef\UseOption{\UseOption,HAVE_LCD_BITMAP} 4\edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
5\edef\UseOption{\UseOption,HAVE_RECORDING}
6\edef\UseOption{\UseOption,CONFIG_TUNER}
5\edef\UseOption{\UseOption,CONFIG_RTC} 7\edef\UseOption{\UseOption,CONFIG_RTC}
6\edef\UseOption{\UseOption,SWCODEC} 8\edef\UseOption{\UseOption,SWCODEC}
7\edef\UseOption{\UseOption,SANSA_E200_PAD} 9\edef\UseOption{\UseOption,SANSA_E200_PAD}
@@ -99,3 +101,11 @@
99\newcommand{\ActionPsNudgeRight}{\ButtonRight} 101\newcommand{\ActionPsNudgeRight}{\ButtonRight}
100\newcommand{\ActionPsReset}{\ButtonSelect} 102\newcommand{\ActionPsReset}{\ButtonSelect}
101\newcommand{\ActionPsExit}{\ButtonPower} 103\newcommand{\ActionPsExit}{\ButtonPower}
104
105%Button actions, Recording screen context
106\newcommand{\ActionRecPause}{\ButtonUp}
107\newcommand{\ActionRecExit}{\ButtonPower}
108\newcommand{\ActionRecNewfile}{\ButtonRec}
109\newcommand{\ActionRecMenu}{Long \ButtonDown}
110\newcommand{\ActionSettingsInc}{\ButtonRight}
111\newcommand{\ActionSettingsDec}{\ButtonLeft}