From 8a148d2c236f646d0c68d63a61084d97fd400f89 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Tue, 13 Oct 2009 20:27:57 +0000 Subject: Changes to build a Nano2G manual. It is now just missing the ipodnano2g-front.* images git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23160 a1c6a512-1295-4272-9138-f99709370657 --- manual/appendix/config_file_options.tex | 1 + manual/configure_rockbox/display_options.tex | 2 +- manual/configure_rockbox/sound_settings.tex | 10 +++++----- manual/configure_rockbox/theme_settings.tex | 1 + manual/getting_started/installation.tex | 12 ++++++------ manual/platform/ipodnano2g.tex | 23 +++++++++++++++++++++++ manual/rockbox_interface/main.tex | 4 ++-- 7 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 manual/platform/ipodnano2g.tex diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex index fb296e6fd8..38f3a4ab8f 100644 --- a/manual/appendix/config_file_options.tex +++ b/manual/appendix/config_file_options.tex @@ -15,6 +15,7 @@ \opt{masf}{-100 -to +12}% \opt{h100,h300}{-84 to 0}% \opt{ipodnano}{-72 to +6}% + \opt{ipodnano2g}{-74 to +6}% \opt{ipodvideo}{-57 to +6}% \opt{x5}{-73 to +6} \opt{e200,e200v2}{-74 to +6} diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex index 95455df7ba..01fb66c63a 100644 --- a/manual/configure_rockbox/display_options.tex +++ b/manual/configure_rockbox/display_options.tex @@ -166,7 +166,7 @@ \opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft} \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft} \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano, - ipodvideo,x5,mrobe100,gigabeatf,gigabeats,e200v2} + ipodnano2g,ipodvideo,x5,mrobe100,gigabeatf,gigabeats,e200v2} {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}. Setting this option to \setting{Yes} will keep the list entries at their fixed positions and allow them to be diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex index fc93070b95..3e78dd65f5 100644 --- a/manual/configure_rockbox/sound_settings.tex +++ b/manual/configure_rockbox/sound_settings.tex @@ -10,7 +10,7 @@ change to customise your listening experience. where 0 dB is a reference that indicates the maximum volume that the \dap{} can produce without possible distortion (clipping). All values lower than this reference will be negative and yield a progressively softer volume. - \opt{player,recorder,recorderv2fm,ondio,x5,m5,ipodnano,ipodvideo, + \opt{player,recorder,recorderv2fm,ondio,x5,m5,ipodnano,ipodnano2g,ipodvideo, ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS,gigabeats,gigabeatf}{ Values higher than 0 dB are available and can be used to raise the volume more than would otherwise be possible. These volume levels will @@ -23,8 +23,8 @@ change to customise your listening experience. \opt{x5,m5,ipod3g,ipod4g,gigabeatf,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}% \opt{ipodnano}{minimum of -72 dB to a maximum of +6 dB.}% \opt{ipodvideo}{minimum of -57 dB to a maximum of +6 dB.}% - \opt{ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS}{minimum of -74 dB to a maximum - of +6 db.}% + \opt{ipodnano2g,ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS}{minimum of + -74 dB to a maximum of +6 db.}% \opt{gigabeats}{minimum of -90 dB to a maximum of +6 dB.}% \opt{gigabeatf}{minimum of -74 dB to a maximum of +6 dB.}% @@ -36,7 +36,7 @@ change to customise your listening experience. \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}% \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}% \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 24 dB.}% - \opt{ipodnano,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}% + \opt{ipodnano,ipodnano2g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}% \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}% \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.} @@ -56,7 +56,7 @@ change to customise your listening experience. \opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}% \opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}% \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 6 dB.}% - \opt{ipodnano,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}% + \opt{ipodnano,ipodnano2g,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}% \opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}% \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.} diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex index feab3b37c4..725bc50a40 100644 --- a/manual/configure_rockbox/theme_settings.tex +++ b/manual/configure_rockbox/theme_settings.tex @@ -33,6 +33,7 @@ customize the visual apperance of Rockbox. \opt{ipodvideo}{\url{http://themes.rockbox.org/index.php?target=ipodvideo}}% \opt{ipodmini}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}% \opt{ipodnano}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}% + \opt{ipodnano2g}{\url{http://themes.rockbox.org/index.php?target=ipodnano2g}}% \opt{e200}{\url{http://themes.rockbox.org/index.php?target=e200}}% \opt{e200v2}{\url{http://themes.rockbox.org/index.php?target=e200v2}}% \opt{c200}{\url{http://themes.rockbox.org/index.php?target=c200}}% diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex index 2fee2594c0..26f387a28b 100644 --- a/manual/getting_started/installation.tex +++ b/manual/getting_started/installation.tex @@ -11,14 +11,14 @@ before beginning there are a few things it is important to know. follow the instructions at \url{http://www.rockbox.org/twiki/bin/view/Main/SansaE200RInstallation}.}} -\opt{ipodnano,ipodvideo,e200,c200,e200v2}{ +\opt{ipodnano,ipodnano2g,ipodvideo,e200,c200,e200v2}{ \begin{description} \item[Supported hardware versions.] - \opt{ipodnano}{ + \opt{ipodnano,ipodnano2g}{ The \playertype{} is available in multiple versions, not all of which run Rockbox. Rockbox presently runs only on - the original Ipod Nano. Rockbox does - \emph{not} run on the second, third, or fourth generation Ipod Nano. + the first and second generation Ipod Nano. Rockbox does + \emph{not} run on the third, fourth or fifth generation Ipod Nano. For information on identifying which Ipod you own, see this page on Apple's website: \url{http://www.info.apple.com/kbnum/n61688}. } @@ -156,8 +156,8 @@ people. Rockbox Utility is a graphical application that does almost everything for you. However, should you encounter a problem, then the manual way is still available to you.\\ -\opt{gigabeats}{\note{The automated install is not yet available for the - \playertype{}. For now you can use the manual method to install Rockbox. +\opt{gigabeats,ipodnano2g}{\note{The automated install is not yet available for the + \playerlongtype{}. For now you can use the manual method to install Rockbox. Please still read the section on the automatic install as it explains various important aspects of Rockbox, such as the different versions available.\\}} diff --git a/manual/platform/ipodnano2g.tex b/manual/platform/ipodnano2g.tex new file mode 100644 index 0000000000..88b02f8e3e --- /dev/null +++ b/manual/platform/ipodnano2g.tex @@ -0,0 +1,23 @@ +% $Id$ % +\def\UseOption{ipodnano2g} +\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} +\edef\UseOption{\UseOption,IPOD_4G_PAD} +\edef\UseOption{\UseOption,HAVE_BACKLIGHT} +\edef\UseOption{\UseOption,ipod} + +\newcommand{\playerman}{Ipod} +\newcommand{\playertype}{Nano} +\newcommand{\playerlongtype}{\playertype{} 2nd generation} +\newcommand{\genericimg}{176x132x16} +\newcommand{\specimg}{ipodnano2g} +%Used to name the player, e.g. ...to the \dap +\newcommand{\dap}{player} +%For use when referring to the player. E.g. the \daps\ capacity ... +\newcommand{\daps}{player's} +\newcommand{\firmwarefilename}{\fname{rockbox.ipod}} +\newcommand{\firmwareextension}{\fname{ipod}} +\newcommand{\screenshotsize}{4cm} +\newcommand{\disk}{flash storage} + +% link external keymap file +\input{platform/keymap-ipod4g.tex} diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex index 102e138d42..c58f3e68c7 100644 --- a/manual/rockbox_interface/main.tex +++ b/manual/rockbox_interface/main.tex @@ -156,7 +156,7 @@ described in detail in the following paragraph. \ButtonHold{} is off before trying to use your player. } % - \opt{ipodnano}{ + \opt{ipodnano,ipodnano2g}{ The main controls on the \dap{} are a slightly indented wheel with a flat round button in the center. Hold the \dap{} with these controls on the top surface. There is a \ButtonHold{} switch at one end, and @@ -480,7 +480,7 @@ To turn on and off your Rockbox enabled \dap{} use the following keys: { \subsection{Starting the original firmware} \label{ref:Dualboot} - \opt{ipod4g,ipodcolor,ipodvideo,ipodnano,ipodmini} + \opt{ipod4g,ipodcolor,ipodvideo,ipodnano,ipodnano2g,ipodmini} { Rockbox has a dual-boot feature. To boot into the original firmware, shut down the device as described above. Turn on the \ButtonHold{} switch -- cgit v1.2.3