From f498d53d72007124049cf72ccccf3435abb097fe Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 7 Dec 2008 23:00:15 +0000 Subject: Rename h100 manual name "h1xx" to "h100" to be in line with other players. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19361 a1c6a512-1295-4272-9138-f99709370657 --- manual/advanced_topics/main.tex | 4 +- manual/appendix/config_file_options.tex | 8 +- manual/appendix/file_formats.tex | 6 +- manual/appendix/wps_tags.tex | 2 +- manual/configure_rockbox/display_options.tex | 8 +- manual/configure_rockbox/recording_settings.tex | 8 +- manual/configure_rockbox/sound_settings.tex | 10 +- manual/configure_rockbox/system_options.tex | 2 +- manual/configure_rockbox/theme_settings.tex | 2 +- manual/getting_started/installation.tex | 8 +- manual/platform/h100.tex | 26 + manual/platform/h1xx.tex | 26 - manual/platform/h300.tex | 2 +- manual/platform/keymap-h100_h300.tex | 107 +++ manual/platform/keymap-h1xx_h300.tex | 107 --- manual/plugins/main.tex | 6 +- manual/plugins/mandelbrot.tex | 2 +- manual/plugins/sliding.tex | 6 +- manual/rockbox_interface/images/h100-front.pdf | Bin 0 -> 51359 bytes manual/rockbox_interface/images/h100-front.png | Bin 0 -> 49802 bytes manual/rockbox_interface/images/h100-front.svg | 1099 +++++++++++++++++++++++ manual/rockbox_interface/images/h1xx-front.pdf | Bin 51359 -> 0 bytes manual/rockbox_interface/images/h1xx-front.png | Bin 49802 -> 0 bytes manual/rockbox_interface/images/h1xx-front.svg | 1099 ----------------------- manual/rockbox_interface/main.tex | 4 +- tools/configure | 2 +- 26 files changed, 1272 insertions(+), 1272 deletions(-) create mode 100644 manual/platform/h100.tex delete mode 100644 manual/platform/h1xx.tex create mode 100644 manual/platform/keymap-h100_h300.tex delete mode 100644 manual/platform/keymap-h1xx_h300.tex create mode 100644 manual/rockbox_interface/images/h100-front.pdf create mode 100644 manual/rockbox_interface/images/h100-front.png create mode 100644 manual/rockbox_interface/images/h100-front.svg delete mode 100644 manual/rockbox_interface/images/h1xx-front.pdf delete mode 100644 manual/rockbox_interface/images/h1xx-front.png delete mode 100644 manual/rockbox_interface/images/h1xx-front.svg diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex index 6247fe3a2f..a567e82926 100644 --- a/manual/advanced_topics/main.tex +++ b/manual/advanced_topics/main.tex @@ -116,7 +116,7 @@ all the tags that are available. the last number giving the colour depth in bits) when designing your own WPS, or if you use a WPS designed for another target. \opt{HAVE_REMOTE_LCD}{The resolution of the remote is - \opt{h1xx,h300}{128x64x1}\opt{x5}{128x96x2} pixels.}} + \opt{h100,h300}{128x64x1}\opt{x5}{128x96x2} pixels.}} \subsubsection{Conditional Tags} @@ -411,7 +411,7 @@ Rockbox is able to load and start another firmware file without rebooting. You just ``play'' a file with the extension % \opt{recorder,recorderv2fm,ondio}{\fname{.ajz}.} % \opt{player}{\fname{.mod}.} % -\opt{h1xx,h300}{\fname{.iriver}.} % +\opt{h100,h300}{\fname{.iriver}.} % \opt{ipod}{\fname{.ipod}.} % \opt{iaudio}{\fname{.iaudio}.} % \opt{sansa,h10,h10_5gb}{\fname{.mi4}.} % diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex index 9ccccee767..81d740152b 100644 --- a/manual/appendix/config_file_options.tex +++ b/manual/appendix/config_file_options.tex @@ -12,7 +12,7 @@ \midrule\localendhead % endhead breaks with htlatex volume & \opt{player}{-78 to +18}% \opt{recorder,recorderv2fm,ondiosp,ondiofm}{-100 -to +12}% - \opt{h1xx,h300}{-84 to 0}% + \opt{h100,h300}{-84 to 0}% \opt{ipodnano}{-72 to +6}% \opt{ipodvideo}{-57 to +6}% \opt{x5}{-73 to +6} @@ -21,12 +21,12 @@ & dB\\ \nopt{x5}{% bass & \opt{MASCODEC}{-15 to +15}% - \opt{h1xx,h300}{0 to +24}% + \opt{h100,h300}{0 to +24}% \opt{ipod}{-6 to +9}% \opt{e200}{-24 to +24}% & dB\\ treble & \opt{MASCODEC}{-15 to +15}% - \opt{h1xx,h300}{0 to +6}% + \opt{h100,h300}{0 to +6}% \opt{ipod}{-6 to +9}% \opt{e200}{-24 to +24}% & dB\\ @@ -286,7 +286,7 @@ & on, off & N/A\\ remote iconset & /path/filename.bmp & N/A\\ remote viewers iconset & /path/filename.bmp & N/A\\ - \opt{h1xx,h300}{ + \opt{h100,h300}{ remote reduce ticking & on, off & N/A\\ }% diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex index c00eaef9af..839a565e7e 100644 --- a/manual/appendix/file_formats.tex +++ b/manual/appendix/file_formats.tex @@ -25,7 +25,7 @@ \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} & Rockbox firmware & \opt{player}{\fname{.mod}}\opt{recorder,recorderv2fm,ondiofm,ondiosp}{\fname{.ajz}}% - \opt{h1xx,h300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}% + \opt{h100,h300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}% \opt{h10,h10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}} & ROLO will load the new firmware \\ \includegraphics[width=0.37cm]{appendix/images/icon-wps.png} @@ -83,13 +83,13 @@ Apple Lossless & \fname{.m4a, .mp4} & \\ Wavpack & \fname{.wv} & \\ Shorten & \fname{.shn} & Seeking not supported.\\ - \opt{h1xx,h300,x5,m5,m3}{ + \opt{h100,h300,x5,m5,m3}{ Monkey's Audio & \fname{.ape, .mac} & -c1000 and -c2000 files decode fast enough to be useful. \\ } \opt{gigabeat}{ Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c3000 files decode fast enough to be useful. \\ } - \nopt{h1xx,h300,x5,m5,m3,gigabeat}{% + \nopt{h100,h300,x5,m5,m3,gigabeat}{% Monkey's Audio & \fname{.ape, .mac} & Only -c1000 files decode fast enough to be useful. \\ } \\ diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex index df43984c6c..2c505f90dc 100644 --- a/manual/appendix/wps_tags.tex +++ b/manual/appendix/wps_tags.tex @@ -133,7 +133,7 @@ Example for the \config{\%dN} commands: If the path is \end{tagmap} \end{table} } -\opt{h1xx,h300}{ +\opt{h100,h300}{ \section{Hold Switches} \begin{table} \begin{tagmap}{}{} diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex index b00dbb4522..048d9b70b6 100644 --- a/manual/configure_rockbox/display_options.tex +++ b/manual/configure_rockbox/display_options.tex @@ -70,12 +70,12 @@ } } % \opt{HAVE_BACKLIGHT} - \opt{archos,h1xx,ipodmini,ipod3g,ipod4g,x5}{ + \opt{archos,h100,ipodmini,ipod3g,ipod4g,x5}{ \item[Contrast:] Changes the contrast of your LCD display. \warn{Setting the contrast too dark or too light can make it hard to find this menu option again!} - } % \opt{archos,h1xx,ipodmini,ipod4g,x5} + } % \opt{archos,h100,ipodmini,ipod4g,x5} \opt{lcd_invert}{ \item[LCD Mode:] @@ -124,7 +124,7 @@ Displays the screen so that the top of the display is nearest the buttons. This is sometimes useful when carrying the \dap\ in a pocket for easy access to the headphone socket. - \opt{h1xx,h300}{ + \opt{h100,h300}{ \item[Reduce Ticking:] Enable this option if you can hear a ticking sound in your headphones when using your remote. @@ -165,7 +165,7 @@ Screens can be manually scrolled horizontally by pressing \opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft} \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft} - \opt{c200,e200,h1xx,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano, + \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano, ipodvideo,x5,mrobe100,gigabeatf,gigabeats} {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}. Setting this option to \setting{Yes} diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex index 15e0b1f4d2..a0a3743c93 100644 --- a/manual/configure_rockbox/recording_settings.tex +++ b/manual/configure_rockbox/recording_settings.tex @@ -47,7 +47,7 @@ \nopt{sansa}{ Choose the recording frequency (sample rate). \opt{MASCODEC}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz} - \opt{h1xx,h300}{44.1kHz, 22.05kHz and 11.025kHz} + \opt{h100,h300}{44.1kHz, 22.05kHz and 11.025kHz} \opt{x5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz} are available. Higher sample rates use up more disk space, but give better sound quality. @@ -60,7 +60,7 @@ MPEG v1 for 48, 44.1 and 32\\ MPEG v2 for 24, 22.05 and 16\\ } - \opt{recorder,recorderv2fm,h1xx} + \opt{recorder,recorderv2fm,h100} {\note{You cannot change the sample rate for digital recordings.} } } % nopt e200 @@ -71,7 +71,7 @@ \section{Source} Choose the source of the recording. The options are: - \opt{recorder,recorderv2fm,h1xx}{\setting{SPDIF (digital)}, }% + \opt{recorder,recorderv2fm,h100}{\setting{SPDIF (digital)}, }% \nopt{ipodnano,ipodvideo}{\setting{Mic}}% \nopt{sansa}{, and {\setting{Line In}}}. % \opt{radio}{For recording from the radio see \reference{ref:FMradio}.} @@ -230,7 +230,7 @@ More information can be found at \wikilink{VolumeTriggeredRecording}. -\opt{h1xx,h300}{% +\opt{h100,h300}{% \section{Automatic Gain Control} The \setting{Automatic Gain Control} has five different presets for automatically controlling the gain while recording. diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex index c0116e40d7..60fc127e99 100644 --- a/manual/configure_rockbox/sound_settings.tex +++ b/manual/configure_rockbox/sound_settings.tex @@ -19,7 +19,7 @@ change to customise your listening experience. The volume can be adjusted from a \opt{player}{minimum of -78 dB to a maximum of +18 dB.}% \opt{recorder,recorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}% - \opt{h1xx,h300}{minimum of -84 dB to a maximum of 0 dB.}% + \opt{h100,h300}{minimum of -84 dB to a maximum of 0 dB.}% \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.}% @@ -28,12 +28,12 @@ change to customise your listening experience. \section{Bass} This setting emphasises - \nopt{h1xx,h300}{or suppresses} + \nopt{h100,h300}{or suppresses} the lower (bass) frequencies in the sound. A value of 0 dB means that bass sounds are unaltered (flat response). \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{h1xx,h300}{The minimum setting is 0 dB and the maximum is 24 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{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}% \opt{x5,sansa,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.} @@ -48,12 +48,12 @@ change to customise your listening experience. \section{Treble} This setting emphasises - \nopt{h1xx,h300}{or suppresses} + \nopt{h100,h300}{or suppresses} the higher (treble) frequencies in the sound. A value of 0 dB means that treble sounds are unaltered (flat response). \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{h1xx,h300}{The minimum setting is 0 dB and the maximum is 6 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{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}% \opt{x5,sansa,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.} diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex index b5183ed5d6..8c7d93ffe2 100644 --- a/manual/configure_rockbox/system_options.tex +++ b/manual/configure_rockbox/system_options.tex @@ -18,7 +18,7 @@ \opt{player,recorder}{1500mAh}% \opt{recorderv2fm}{2200mAh}% \opt{ondiosp,ondiofm}{1000mAh}% - \opt{h1xx,h300}{1300mAh}% + \opt{h100,h300}{1300mAh}% \opt{ipodmini}{400mAh (1G) or 630mAh (2G)}% \opt{ipodcolor}{700mAh}% \opt{ipodnano}{300mAh}% diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex index e36e1ee42d..0273fe02ea 100644 --- a/manual/configure_rockbox/theme_settings.tex +++ b/manual/configure_rockbox/theme_settings.tex @@ -15,7 +15,7 @@ customize the visual apperance of Rockbox. There are a number of themes that ship with Rockbox. If none of these suit your needs, many more can be downloaded from \opt{RECORDER_PAD}{\wikilink{WpsArchos}}% - \opt{h1xx}{\wikilink{WpsIriverH100}}% + \opt{h100}{\wikilink{WpsIriverH100}}% \opt{h300,ipodcolor}{\wikilink{WpsIriverH300}}% \opt{ipodvideo}{\wikilink{WpsIpod5g}}% \opt{ipodnano}{\wikilink{WpsIpodNano}}% diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex index 982201b028..40c4aba884 100644 --- a/manual/getting_started/installation.tex +++ b/manual/getting_started/installation.tex @@ -319,7 +319,7 @@ structure that Rockbox needs.} \opt{swcodec}{ \subsubsection{Installing the bootloader} - \opt{h1xx,h300}{\input{getting_started/iriver_install.tex}} + \opt{h100,h300}{\input{getting_started/iriver_install.tex}} \opt{ipod}{\input{getting_started/ipod_install.tex}} \opt{m5,x5}{\input{getting_started/iaudio_install.tex}} \opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}} @@ -387,7 +387,7 @@ You can uninstall Rockbox automatically by using Rockbox Utility. If you installed Rockbox manually you can still use Rockbox Utility for uninstallation but will not be able to do this selectively. -\opt{h1xx,h300}{\note{Rockbox Utility cannot uninstall the bootloader due to +\opt{h100,h300}{\note{Rockbox Utility cannot uninstall the bootloader due to the fact that it requires a flashing procedure. To uninstall the bootloader completely follow the manual uninstallation instructions below.}} @@ -439,7 +439,7 @@ completely follow the manual uninstallation instructions below.}} and insert the charger. The original firmware will automatically be flashed. } -\opt{h1xx,h300}{ +\opt{h100,h300}{ \note{ If you want to remove the Rockbox bootloader, simply flash an unpatched \playerman{} firmware. Be aware that doing so will also remove the bootloader @@ -447,7 +447,7 @@ completely follow the manual uninstallation instructions below.}} having disk errors) it is recommended to keep the bootloader. It also gives you the possibility of trying Rockbox anytime later by simply installing the distribution files. - \opt{h1xx}{ + \opt{h100}{ The Rockbox bootloader will automatically start the original firmware if the \fname{.rockbox} directory has been deleted. }% diff --git a/manual/platform/h100.tex b/manual/platform/h100.tex new file mode 100644 index 0000000000..bbb659d573 --- /dev/null +++ b/manual/platform/h100.tex @@ -0,0 +1,26 @@ +% $Id$ % +\def\UseOption{h100} +\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} +\edef\UseOption{\UseOption,IRIVER_H100_PAD} +\edef\UseOption{\UseOption,HAVE_REMOTE_LCD} +\edef\UseOption{\UseOption,HAVE_BACKLIGHT} +\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} +\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} +\edef\UseOption{\UseOption,iriver} + +\newcommand{\playerman}{Iriver} +\newcommand{\playertype}{H100} +\newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140} +\newcommand{\genericimg}{160x128x2} +\newcommand{\specimg}{h100} +%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.iriver}} +\newcommand{\screenshotsize}{4cm} +\newcommand{\disk}{hard disk} + +% link external keymap file +\input{platform/keymap-h100_h300.tex} + diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex deleted file mode 100644 index 85d3ba8a26..0000000000 --- a/manual/platform/h1xx.tex +++ /dev/null @@ -1,26 +0,0 @@ -% $Id$ % -\def\UseOption{h1xx} -\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} -\edef\UseOption{\UseOption,IRIVER_H100_PAD} -\edef\UseOption{\UseOption,HAVE_REMOTE_LCD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,iriver} - -\newcommand{\playerman}{Iriver} -\newcommand{\playertype}{H1xx} -\newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140} -\newcommand{\genericimg}{160x128x2} -\newcommand{\specimg}{h1xx} -%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.iriver}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-h1xx_h300.tex} - diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex index fb576de819..fce8823dbf 100644 --- a/manual/platform/h300.tex +++ b/manual/platform/h300.tex @@ -22,5 +22,5 @@ \newcommand{\disk}{hard disk} % link external keymap file -\input{platform/keymap-h1xx_h300.tex} +\input{platform/keymap-h100_h300.tex} diff --git a/manual/platform/keymap-h100_h300.tex b/manual/platform/keymap-h100_h300.tex new file mode 100644 index 0000000000..925d2fb20a --- /dev/null +++ b/manual/platform/keymap-h100_h300.tex @@ -0,0 +1,107 @@ +% $Id$ + +\newcommand{\ButtonLeft}{\btnfnt{Left}} +\newcommand{\ButtonRight}{\btnfnt{Right}} +\newcommand{\ButtonUp}{\btnfnt{Up}} +\newcommand{\ButtonDown}{\btnfnt{Down}} +\newcommand{\ButtonSelect}{\btnfnt{Navi}} +\newcommand{\ButtonMode}{\btnfnt{A-B}} +\newcommand{\ButtonRec}{\btnfnt{Rec}} +\newcommand{\ButtonOn}{\btnfnt{Play}} +\newcommand{\ButtonOff}{\btnfnt{Stop}} +\newcommand{\ButtonHold}{\btnfnt{Hold}} + +%Button actions, standard context +\newcommand{\ActionStdPrev}{\ButtonUp} +\newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} +\newcommand{\ActionStdNext}{\ButtonDown} +\newcommand{\ActionStdNextRepeat}{Long \ButtonDown} +\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonOff} +\newcommand{\ActionStdContext}{Long \ButtonSelect} +\newcommand{\ActionStdQuickScreen}{Long \ButtonMode} +\newcommand{\ActionQuickScreenExit}{\ButtonMode} +\newcommand{\ActionStdMenu}{\ButtonMode} +\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} +\newcommand{\ActionStdUsbCharge}{\ButtonMode} +\newcommand{\ActionStdRec}{Long \ButtonRec} + +%Button actions, wps context +\newcommand{\ActionWpsPlay}{\ButtonOn} +\newcommand{\ActionWpsSkipNext}{\ButtonRight} +\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} +\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} +\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} +\newcommand{\ActionWpsAbSetBNextDir}{\ButtonOn{} + \ButtonRight} +\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonOn{} + \ButtonLeft} +\newcommand{\ActionWpsStop}{\ButtonOff} +\newcommand{\ActionWpsVolDown}{\ButtonDown} +\newcommand{\ActionWpsVolUp}{\ButtonUp} +\newcommand{\ActionWpsPitchScreen}{\ButtonOn{} + \ButtonUp/\ButtonDown} +\newcommand{\ActionWpsQuickScreen}{Long \ButtonMode} +\newcommand{\ActionWpsMenu}{\ButtonMode} +\newcommand{\ActionWpsContext}{Long \ButtonSelect} +\newcommand{\ActionWpsBrowse}{\ButtonSelect} +\newcommand{\ActionWpsAbReset}{\ButtonOn{} + \ButtonSelect} +\newcommand{\ActionWpsIdThreeScreen}{\ButtonOn{} + \ButtonMode} + +%Button actions, tree context +\newcommand{\ActionTreeWps}{\ButtonOn} +\newcommand{\ActionTreeStop}{\ButtonOff} +\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} +\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonSelect} + +%Button actions, Setting context +\newcommand{\ActionSettingInc}{\ButtonUp} +\newcommand{\ActionSettingDec}{\ButtonDown} + +%Button actions, Virtual Keyboard Context +\newcommand{\ActionKbdLeft}{\ButtonLeft} +\newcommand{\ActionKbdRight}{\ButtonRight} +\newcommand{\ActionKbdSelect}{\ButtonSelect} +\newcommand{\ActionKbdCursorLeft}{\ButtonOn{} + \ButtonLeft} +\newcommand{\ActionKbdCursorRight}{\ButtonOn{} + \ButtonRight} +\newcommand{\ActionKbdPageFlip}{\ButtonMode} +\newcommand{\ActionKbdDone}{\ButtonOn} +\newcommand{\ActionKbdAbort}{\ButtonOff} +\newcommand{\ActionKbdBackSpace}{\ButtonRec} +\newcommand{\ActionKbdMorseInput}{\ButtonOn{} + \ButtonMode} +\newcommand{\ActionKbdMorseSelect}{\ButtonSelect} +\newcommand{\ActionKbdUp}{\ButtonUp} +\newcommand{\ActionKbdDown}{\ButtonDown} + +%Button actions, Pitch Screen context +\newcommand{\ActionPsToggleMode}{\ButtonMode} +\newcommand{\ActionPsIncSmall}{\ButtonUp} +\newcommand{\ActionPsIncBig}{Long \ButtonUp} +\newcommand{\ActionPsDecSmall}{\ButtonDown} +\newcommand{\ActionPsDecBig}{Long \ButtonDown} +\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} +\newcommand{\ActionPsNudgeRight}{\ButtonRight} +\newcommand{\ActionPsReset}{\ButtonSelect} +\newcommand{\ActionPsExit}{\ButtonOn{} or \ButtonOff} + +%Button actions, Recording screen context +\newcommand{\ActionRecPause}{\ButtonOn} +\newcommand{\ActionRecNewfile}{\ButtonRec} +\newcommand{\ActionRecSettingsInc}{\ButtonRight} +\newcommand{\ActionRecSettingsDec}{\ButtonLeft} +\newcommand{\ActionRecPrev}{\ButtonUp} +\newcommand{\ActionRecNext}{\ButtonDown} +\newcommand{\ActionRecMenu}{\ButtonMode} +\newcommand{\ActionRecExit}{\ButtonOff} + +%Button actions, FM radio context +\newcommand{\ActionFMPreset}{\ButtonSelect} +\newcommand{\ActionFMMenu}{Long \ButtonSelect} +\newcommand{\ActionFMMode}{Long \ButtonOn} +\newcommand{\ActionFMStop}{\ButtonOff} +\newcommand{\ActionFMExit}{\ButtonMode} +\newcommand{\ActionFMPlay}{\ButtonOn} +\newcommand{\ActionFMSettingsInc}{\ActionSettingInc} +\newcommand{\ActionFMSettingsDec}{\ActionSettingDec} +\newcommand{\ActionFMPrev}{\ButtonLeft} +\newcommand{\ActionFMNext}{\ButtonRight} + diff --git a/manual/platform/keymap-h1xx_h300.tex b/manual/platform/keymap-h1xx_h300.tex deleted file mode 100644 index 925d2fb20a..0000000000 --- a/manual/platform/keymap-h1xx_h300.tex +++ /dev/null @@ -1,107 +0,0 @@ -% $Id$ - -\newcommand{\ButtonLeft}{\btnfnt{Left}} -\newcommand{\ButtonRight}{\btnfnt{Right}} -\newcommand{\ButtonUp}{\btnfnt{Up}} -\newcommand{\ButtonDown}{\btnfnt{Down}} -\newcommand{\ButtonSelect}{\btnfnt{Navi}} -\newcommand{\ButtonMode}{\btnfnt{A-B}} -\newcommand{\ButtonRec}{\btnfnt{Rec}} -\newcommand{\ButtonOn}{\btnfnt{Play}} -\newcommand{\ButtonOff}{\btnfnt{Stop}} -\newcommand{\ButtonHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonUp} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} -\newcommand{\ActionStdNext}{\ButtonDown} -\newcommand{\ActionStdNextRepeat}{Long \ButtonDown} -\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonOff} -\newcommand{\ActionStdContext}{Long \ButtonSelect} -\newcommand{\ActionStdQuickScreen}{Long \ButtonMode} -\newcommand{\ActionQuickScreenExit}{\ButtonMode} -\newcommand{\ActionStdMenu}{\ButtonMode} -\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionStdUsbCharge}{\ButtonMode} -\newcommand{\ActionStdRec}{Long \ButtonRec} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonOn} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} -\newcommand{\ActionWpsAbSetBNextDir}{\ButtonOn{} + \ButtonRight} -\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonOn{} + \ButtonLeft} -\newcommand{\ActionWpsStop}{\ButtonOff} -\newcommand{\ActionWpsVolDown}{\ButtonDown} -\newcommand{\ActionWpsVolUp}{\ButtonUp} -\newcommand{\ActionWpsPitchScreen}{\ButtonOn{} + \ButtonUp/\ButtonDown} -\newcommand{\ActionWpsQuickScreen}{Long \ButtonMode} -\newcommand{\ActionWpsMenu}{\ButtonMode} -\newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} -\newcommand{\ActionWpsAbReset}{\ButtonOn{} + \ButtonSelect} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonOn{} + \ButtonMode} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonOn} -\newcommand{\ActionTreeStop}{\ButtonOff} -\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonSelect} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonUp} -\newcommand{\ActionSettingDec}{\ButtonDown} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdSelect}{\ButtonSelect} -\newcommand{\ActionKbdCursorLeft}{\ButtonOn{} + \ButtonLeft} -\newcommand{\ActionKbdCursorRight}{\ButtonOn{} + \ButtonRight} -\newcommand{\ActionKbdPageFlip}{\ButtonMode} -\newcommand{\ActionKbdDone}{\ButtonOn} -\newcommand{\ActionKbdAbort}{\ButtonOff} -\newcommand{\ActionKbdBackSpace}{\ButtonRec} -\newcommand{\ActionKbdMorseInput}{\ButtonOn{} + \ButtonMode} -\newcommand{\ActionKbdMorseSelect}{\ButtonSelect} -\newcommand{\ActionKbdUp}{\ButtonUp} -\newcommand{\ActionKbdDown}{\ButtonDown} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonMode} -\newcommand{\ActionPsIncSmall}{\ButtonUp} -\newcommand{\ActionPsIncBig}{Long \ButtonUp} -\newcommand{\ActionPsDecSmall}{\ButtonDown} -\newcommand{\ActionPsDecBig}{Long \ButtonDown} -\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} -\newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonSelect} -\newcommand{\ActionPsExit}{\ButtonOn{} or \ButtonOff} - -%Button actions, Recording screen context -\newcommand{\ActionRecPause}{\ButtonOn} -\newcommand{\ActionRecNewfile}{\ButtonRec} -\newcommand{\ActionRecSettingsInc}{\ButtonRight} -\newcommand{\ActionRecSettingsDec}{\ButtonLeft} -\newcommand{\ActionRecPrev}{\ButtonUp} -\newcommand{\ActionRecNext}{\ButtonDown} -\newcommand{\ActionRecMenu}{\ButtonMode} -\newcommand{\ActionRecExit}{\ButtonOff} - -%Button actions, FM radio context -\newcommand{\ActionFMPreset}{\ButtonSelect} -\newcommand{\ActionFMMenu}{Long \ButtonSelect} -\newcommand{\ActionFMMode}{Long \ButtonOn} -\newcommand{\ActionFMStop}{\ButtonOff} -\newcommand{\ActionFMExit}{\ButtonMode} -\newcommand{\ActionFMPlay}{\ButtonOn} -\newcommand{\ActionFMSettingsInc}{\ActionSettingInc} -\newcommand{\ActionFMSettingsDec}{\ActionSettingDec} -\newcommand{\ActionFMPrev}{\ButtonLeft} -\newcommand{\ActionFMNext}{\ButtonRight} - diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex index e03892afba..e8aadb093f 100644 --- a/manual/plugins/main.tex +++ b/manual/plugins/main.tex @@ -16,7 +16,7 @@ text files% \section{Games} \opt{lcd_bitmap} {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator} - \opt{recorder,recorderv2fm,h1xx,m5,lcd_color} + \opt{recorder,recorderv2fm,h100,m5,lcd_color} {and Rockboy in \reference{ref:Rockboy}}.} \opt{lcd_bitmap}{\input{plugins/blackjack.tex}} @@ -45,7 +45,7 @@ text files% \opt{player}{\input{plugins/nim.tex}} -\opt{h1xx,m5,lcd_color}{\nopt{c200}{\input{plugins/pacbox.tex}}} +\opt{h100,m5,lcd_color}{\nopt{c200}{\input{plugins/pacbox.tex}}} \opt{lcd_bitmap}{\input{plugins/pegbox.tex}} @@ -128,7 +128,7 @@ the associated file. Viewers are stored in the \opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}} -\opt{recorder,recorderv2fm,h1xx,m5,lcd_color}{\input{plugins/rockboy.tex}} +\opt{recorder,recorderv2fm,h100,m5,lcd_color}{\input{plugins/rockboy.tex}} {\input{plugins/search.tex}} diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex index f474c37b3a..18daea2ea9 100644 --- a/manual/plugins/mandelbrot.tex +++ b/manual/plugins/mandelbrot.tex @@ -1,7 +1,7 @@ \subsection{Mandelbrot} \screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}{img:mandelbrot} This demonstration draws fractal images from the Mandelbrot set -\opt{archos,h1xx}{using the greyscale engine}. +\opt{archos,h100}{using the greyscale engine}. \begin{table} \begin{btnmap}{}{} Direction keys diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex index d586853893..9e4ecf4358 100644 --- a/manual/plugins/sliding.tex +++ b/manual/plugins/sliding.tex @@ -8,7 +8,7 @@ Key controls: \begin{table} \begin{btnmap}{}{} - \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD} + \opt{RECORDER_PAD,ONDIO_PAD,h100,h300,x5,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD} {\ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft{} / \ButtonRight{} / \ButtonMenu{} / \ButtonPlay} \opt{IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight{} / \ButtonScrollUp{} / \ButtonScrollDown} @@ -16,7 +16,7 @@ Key controls: % \opt{RECORDER_PAD}{\ButtonFOne} \opt{ONDIO_PAD}{Long \ButtonMenu} - \opt{h1xx,h300,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect} + \opt{h100,h300,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect} \opt{x5,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft} \opt{IRIVER_H10_PAD}{\ButtonRew} @@ -24,7 +24,7 @@ Key controls: % \opt{RECORDER_PAD}{\ButtonFTwo} \opt{ONDIO_PAD}{\ButtonMenu} - \opt{h1xx,h300}{\ButtonOn} + \opt{h100,h300}{\ButtonOn} \opt{x5,IRIVER_H10_PAD}{\ButtonPlay} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight} \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect} diff --git a/manual/rockbox_interface/images/h100-front.pdf b/manual/rockbox_interface/images/h100-front.pdf new file mode 100644 index 0000000000..286266619f Binary files /dev/null and b/manual/rockbox_interface/images/h100-front.pdf differ diff --git a/manual/rockbox_interface/images/h100-front.png b/manual/rockbox_interface/images/h100-front.png new file mode 100644 index 0000000000..8318ed49ec Binary files /dev/null and b/manual/rockbox_interface/images/h100-front.png differ diff --git a/manual/rockbox_interface/images/h100-front.svg b/manual/rockbox_interface/images/h100-front.svg new file mode 100644 index 0000000000..285801f427 --- /dev/null +++ b/manual/rockbox_interface/images/h100-front.svg @@ -0,0 +1,1099 @@ + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Up +Left +Rec +Down +Play +Right +Navi +A-B +Stop +Hold + \ No newline at end of file diff --git a/manual/rockbox_interface/images/h1xx-front.pdf b/manual/rockbox_interface/images/h1xx-front.pdf deleted file mode 100644 index 286266619f..0000000000 Binary files a/manual/rockbox_interface/images/h1xx-front.pdf and /dev/null differ diff --git a/manual/rockbox_interface/images/h1xx-front.png b/manual/rockbox_interface/images/h1xx-front.png deleted file mode 100644 index 8318ed49ec..0000000000 Binary files a/manual/rockbox_interface/images/h1xx-front.png and /dev/null differ diff --git a/manual/rockbox_interface/images/h1xx-front.svg b/manual/rockbox_interface/images/h1xx-front.svg deleted file mode 100644 index 285801f427..0000000000 --- a/manual/rockbox_interface/images/h1xx-front.svg +++ /dev/null @@ -1,1099 +0,0 @@ - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Up -Left -Rec -Down -Play -Right -Navi -A-B -Stop -Hold - \ No newline at end of file diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex index 93fea71d1b..a0ad76cf54 100644 --- a/manual/rockbox_interface/main.tex +++ b/manual/rockbox_interface/main.tex @@ -22,7 +22,7 @@ described in detail in the following paragraph. \wikilink{BlindFAQ}. % - \opt{h1xx}{ + \opt{h100}{ If you put the \dap{} on a table with the joystick pointing towards you, and the curved sides at the top, you will find the following if you start from the top-right corner and follow the side of the \dap{} in a @@ -455,7 +455,7 @@ To turn on and off your Rockbox enabled \dap{} use the following keys: simultaneously until the player hard resets. } - \opt{h1xx,h300} + \opt{h100,h300} { Rockbox has a dual-boot feature. To boot into the original firmware, when the \dap{} is turned off, press and hold the \ButtonRec{} button, diff --git a/tools/configure b/tools/configure index 7f02f97314..e382a4272b 100755 --- a/tools/configure +++ b/tools/configure @@ -2116,7 +2116,7 @@ fi manualdev="recorderv2fm" ;; h1??) - manualdev="h1xx" + manualdev="h100" ;; ipodmini2g) manualdev="ipodmini" -- cgit v1.2.3