Index: firmware/export/config/sansafuzeplus.h =================================================================== --- firmware/export/config/sansafuzeplus.h (révision 31500) +++ firmware/export/config/sansafuzeplus.h (copie de travail) @@ -9,15 +9,17 @@ #define HW_SAMPR_CAPS SAMPR_CAP_ALL +/*#define CONFIG_TUNER SI470O doesn't work for now */ + /* define this if you have recording possibility */ -#define HAVE_RECORDING +/*#define HAVE_RECORDING not yet implemented #define REC_SAMPR_CAPS SAMPR_CAP_ALL -/* Default recording levels */ + Default recording levels #define DEFAULT_REC_MIC_GAIN 23 #define DEFAULT_REC_LEFT_GAIN 23 -#define DEFAULT_REC_RIGHT_GAIN 23 +#define DEFAULT_REC_RIGHT_GAIN 23 */ /* Define bitmask of input sources - recordable bitmask can be defined explicitly if different */ @@ -80,8 +82,6 @@ /* define this if you have an i.MX23 codec */ #define HAVE_IMX233_CODEC -#define CONFIG_TUNER SI4700 - /* There is no hardware tone control */ #define HAVE_SW_TONE_CONTROLS @@ -111,7 +111,7 @@ /* The number of bytes reserved for loadable plugins */ #define PLUGIN_BUFFER_SIZE 0x80000 -#define AB_REPEAT_ENABLE +/*#define AB_REPEAT_ENABLE no button for this yet*/ /* Define this for LCD backlight available */ #define HAVE_BACKLIGHT Index: manual/plugins/text_viewer.tex =================================================================== --- manual/plugins/text_viewer.tex (révision 31500) +++ manual/plugins/text_viewer.tex (copie de travail) @@ -11,7 +11,7 @@ \begin{btnmap} \opt{PLAYER_PAD}{\ButtonLeft} \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD% - ,SANSA_E200_PAD,SANSA_FUZE_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp} + ,SANSA_E200_PAD,SANSA_FUZE_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonUp} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack} \opt{IRIVER_H10_PAD}{\ButtonScrollUp} \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolUp} @@ -27,7 +27,7 @@ \opt{PLAYER_PAD}{\ButtonRight} \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD% - ,SANSA_E200_PAD,SANSA_FUZE_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonDown} + ,SANSA_E200_PAD,SANSA_FUZE_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonDown} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd} \opt{IRIVER_H10_PAD}{\ButtonScrollDown} \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolDown} @@ -43,6 +43,7 @@ \opt{PLAYER_PAD}{\ButtonMenu+\ButtonLeft} \opt{GIGABEAT_S_PAD}{\ButtonPlay+\ButtonLeft} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonLeft} \opt{MPIO_HD200_PAD}{FIXME} \opt{touchscreen}{\TouchMidLeft} \nopt{PLAYER_PAD,GIGABEAT_S_PAD,touchscreen,IAUDIO_M3_PAD,MPIO_HD200_PAD} @@ -55,6 +56,7 @@ \opt{PLAYER_PAD}{\ButtonMenu+\ButtonRight} \opt{GIGABEAT_S_PAD}{\ButtonPlay+\ButtonRight} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonRight} \opt{MPIO_HD200_PAD}{FIXME} \opt{touchscreen}{\TouchMidRight} \nopt{PLAYER_PAD,GIGABEAT_S_PAD,touchscreen,IAUDIO_M3_PAD,MPIO_HD200_PAD} @@ -67,43 +69,47 @@ \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD% ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_S_PAD% - ,GIGABEAT_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD}{% + ,GIGABEAT_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD,SANSA_FUZEPLUS_PAD}{% \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonUp} \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollBack} \opt{SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonUp} \opt{MPIO_HD200_PAD}{FIXME} \opt{GIGABEAT_PAD}{\ButtonA+\ButtonUp} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonVolUp} \opt{HAVEREMOTEKEYMAP}{& } & One line up\\ } \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD% ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_S_PAD% - ,GIGABEAT_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD}{% + ,GIGABEAT_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD,SANSA_FUZEPLUS_PAD}{% \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonDown} \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd} \opt{SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonDown} \opt{MPIO_HD200_PAD}{FIXME} \opt{GIGABEAT_PAD}{\ButtonA+\ButtonDown} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonVolDown} \opt{HAVEREMOTEKEYMAP}{& } & One line down\\ } \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,% - GIGABEAT_S_PAD,MPIO_HD200_PAD}{ + GIGABEAT_S_PAD,MPIO_HD200_PA,SANSA_FUZEPLUS_PAD}{ \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonLeft} \opt{GIGABEAT_S_PAD}{\ButtonLeft} \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft} \opt{MPIO_HD200_PAD}{FIXME} \opt{HAVEREMOTEKEYMAP}{& } & One column left\\ } \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,% - GIGABEAT_S_PAD,MPIO_HD200_PAD}{ + GIGABEAT_S_PAD,MPIO_HD200_PAD,SANSA_FUZEPLUS_PAD}{ \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRight} \opt{GIGABEAT_S_PAD}{\ButtonRight} \opt{GIGABEAT_PAD}{\ButtonA+\ButtonRight} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight} \opt{MPIO_HD200_PAD}{FIXME} \opt{HAVEREMOTEKEYMAP}{& } & One column right\\ @@ -120,6 +126,7 @@ \opt{MROBE100_PAD}{\ButtonDisplay} \opt{MPIO_HD200_PAD}{FIXME} \opt{touchscreen}{\TouchCenter} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonPlayPause} \opt{HAVEREMOTEKEYMAP}{& \opt{IAUDIO_M3_PAD}{\ButtonRCMode} } @@ -132,6 +139,7 @@ \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect} \opt{IRIVER_H10_PAD}{\ButtonFF} \opt{IAUDIO_X5_PAD}{\ButtonRec} + \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonSelect} \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonDown+\ButtonSelect} \opt{COWON_D2_PAD}{\ButtonMenu+\ButtonPlus} \opt{SANSA_FUZE_PAD}{\ButtonUp+\ButtonSelect} @@ -149,6 +157,7 @@ \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD}{\ButtonSelect} \opt{SANSA_FUZE_PAD}{Long \ButtonSelect} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack} \opt{IRIVER_H10_PAD}{\ButtonRew} \opt{COWON_D2_PAD}{\ButtonMenu{} / }% \opt{MPIO_HD200_PAD}{FIXME} @@ -162,7 +171,7 @@ \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu} \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% - ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower} + ,GIGABEAT_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower} \opt{SANSA_FUZE_PAD}{Long \ButtonHome} \opt{GIGABEAT_S_PAD}{\ButtonBack} \opt{COWON_D2_PAD}{\ButtonPower{} / }% Index: manual/platform/sansafuzeplus.tex =================================================================== --- manual/platform/sansafuzeplus.tex (révision 0) +++ manual/platform/sansafuzeplus.tex (révision 0) @@ -0,0 +1,27 @@ +% $Id: sansafuzeplus.tex 2011-31-12 18:25 jlbiasini $ % +\def\UseOption{fuzeplus} +\edef\UseOption{\UseOption,SANSA_FUZEPLUS_PAD} +\edef\UseOption{\UseOption,HAVE_BACKLIGHT} +\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} +\edef\UseOption{\UseOption,IMX233} +\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} + + +\newcommand{\playerman}{Sansa} +\newcommand{\playertype}{Fuze+} +\newcommand{\playerlongtype}{\playertype} +\newcommand{\dapdisplaywidth}{240} +\newcommand{\dapdisplayheight}{320} +\newcommand{\dapdisplaydepth}{16} +\newcommand{\specimg}{sansafuzeplus} +%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{bootloader-fuzeplus.sansa}} +\newcommand{\firmwareextension}{\fname{sansa}} +\newcommand{\screenshotsize}{6cm} +\newcommand{\disk}{flash storage} + +% link external keymap file +\input{platform/keymap-sansafuzeplus.tex} Index: manual/platform/keymap-sansafuzeplus.tex =================================================================== --- manual/platform/keymap-sansafuzeplus.tex (révision 0) +++ manual/platform/keymap-sansafuzeplus.tex (révision 0) @@ -0,0 +1,156 @@ +% $Id: keymap-sansafuzeplus.tex 29093 2011-31-12 18:16 jlbiasini $ + +\newcommand{\ButtonLeft}{\btnfnt{Left}} +\newcommand{\ButtonRight}{\btnfnt{Right}} +\newcommand{\ButtonUp}{\btnfnt{Up}} +\newcommand{\ButtonDown}{\btnfnt{Down}} + +\newcommand{\ButtonBack}{\btnfnt{Back}} +\newcommand{\ButtonPlayPause}{\btnfnt{Play/Pause}} +\newcommand{\ButtonSelect}{\btnfnt{Select}} +\newcommand{\ButtonBottomLeft}{\btnfnt{Bottom-Left}} +\newcommand{\ButtonBottomRight}{\btnfnt{Bottom-Right}} + +\newcommand{\ButtonVolUp}{\btnfnt{Volume Up}} +\newcommand{\ButtonVolDown}{\btnfnt{Volume Down}} +\newcommand{\ButtonPower}{\btnfnt{Power}} + +%Button actions, standard context +\newcommand{\ActionStdPrev}{\ButtonUp} +\newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} +\newcommand{\ActionStdNext}{\ButtonDown} +\newcommand{\ActionStdNextRepeat}{Long \ButtonDown} + +\newcommand{\ActionStdContext}{Long \ButtonSelect{} or Long \ButtonRight} + +\newcommand{\ActionStdCancel}{\ButtonBack{} or \ButtonLeft} +\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} + +\newcommand{\ActionStdRec}{} +\newcommand{\ActionStdQuickScreen}{} +\newcommand{\ActionStdMenu}{} +\newcommand{\ActionQuickScreenExit}{Any corner keys or \ButtonSelect} + +%Button actions, wps context +\newcommand{\ActionWpsPlay}{\ButtonPlayPause} +\newcommand{\ActionWpsStop}{Long \ButtonPlayPause} + +\newcommand{\ActionWpsContext}{Long \ButtonSelect} + +\newcommand{\ActionWpsSkipNext}{\ButtonRight} +\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} +\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} +\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} + +\newcommand{\ActionWpsVolDown}{\ButtonVolDown{} or \ButtonDown} +\newcommand{\ActionWpsVolUp}{\ButtonVolUp{} or \ButtonUp} + +\newcommand{\ActionWpsMenu}{\ButtonBack} +\newcommand{\ActionWpsBrowse}{\ButtonSelect} +\newcommand{\ActionWpsPitchScreen}{Long \ButtonBottomLeft} +\newcommand{\ActionWpsQuickScreen}{\ButtonBottomLeft} +\newcommand{\ActionWpsIdThreeScreen}{Long \ButtonBottomRight} + +\newcommand{\ActionWpsHotkey}{\ButtonBottomRight} + +\newcommand{\ActionWpsPlaylist}{} +%\newcommand{\ActionWpsAbSetBNextDir}{} +%\newcommand{\ActionWpsAbSetAPrevDir}{} +%\newcommand{\ActionWpsAbReset}{} + +%Button actions, tree context +\newcommand{\ActionTreeWps}{\ButtonPlayPause} +\newcommand{\ActionTreeStop}{Long \ButtonPlayPause} + +\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} +\newcommand{\ActionTreeParentDirectory}{\ButtonBack} + +\newcommand{\ActionTreeHotkey}{} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonSelect} + +%Button actions, Setting context +\newcommand{\ActionSettingInc}{\ButtonUp} +\newcommand{\ActionSettingDec}{\ButtonDown} + +%Button actions, Alarm screen +\newcommand{\ActionAlarmSet}{\ButtonSelect} +\newcommand{\ActionAlarmCancel}{\ButtonPower} +\newcommand{\ActionAlarmHoursInc}{\ButtonUp} +\newcommand{\ActionAlarmHoursDec}{\ButtonDown} + +%Button actions, Virtual Keyboard Context +\newcommand{\ActionKbdUp}{\ButtonUp} +\newcommand{\ActionKbdDown}{\ButtonDown} +\newcommand{\ActionKbdLeft}{\ButtonLeft} +\newcommand{\ActionKbdRight}{\ButtonRight} + +\newcommand{\ActionKbdCursorLeft}{\ButtonBottomLeft} +\newcommand{\ActionKbdCursorRight}{\ButtonBottomRight} + +\newcommand{\ActionKbdBackSpace}{\ButtonBack} + +\newcommand{\ActionKbdSelect}{\ButtonPlayPause} +\newcommand{\ActionKbdDone}{Long \ButtonSelect} +\newcommand{\ActionKbdAbort}{\ButtonPower} + +\newcommand{\ActionKbdMorseInput}{\ButtonVolUp} +\newcommand{\ActionKbdMorseSelect}{\ButtonVolDown} + +%Button actions, Pitch Screen context + +\newcommand{\ActionPsIncSmall}{\ButtonUp} +\newcommand{\ActionPsIncBig}{Long \ButtonUp} +\newcommand{\ActionPsDecSmall}{\ButtonDown} +\newcommand{\ActionPsDecBig}{Long \ButtonDown} +\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} +\newcommand{\ActionPsNudgeRight}{\ButtonRight} + +\newcommand{\ActionPsToggleMode}{\ButtonBottomRight} + +\newcommand{\ActionPsReset}{\ButtonSelect} +\newcommand{\ActionPsExit}{\ButtonBack{} or \ButtonPlayPause} + +%Button actions, Recording screen context +\newcommand{\ActionRecPause}{\ButtonPlayPause} +\newcommand{\ActionRecExit}{\ButtonBack} +\newcommand{\ActionRecNewfile}{\ButtonBottomRight} +%\newcommand{\ActionRecMenu}{} +\newcommand{\ActionRecSettingsInc}{\ButtonRight} +\newcommand{\ActionRecSettingsDec}{\ButtonLeft} +\newcommand{\ActionRecPrev}{\ButtonUp} +\newcommand{\ActionRecNext}{\ButtonDown} + +%Button actions, FM radio context +%\newcommand{\ActionFMMenu}{} + +\newcommand{\ActionFMPreset}{\ButtonBottomRight} +\newcommand{\ActionFMPlay}{\ButtonPlayPause} +\newcommand{\ActionFMStop}{Long \ButtonPlayPause} +\newcommand{\ActionFMMode}{\ButtonBottomLeft} +\newcommand{\ActionFMExit}{\ButtonBack} + +\newcommand{\ActionFMSettingsInc}{\ActionSettingInc} +\newcommand{\ActionFMSettingsDec}{\ActionSettingDec} +\newcommand{\ActionFMPrev}{\ButtonLeft} +\newcommand{\ActionFMNext}{\ButtonRight} + +%Button actions, Bookmark screen context +\newcommand{\ActionBmDelete}{Long \ButtonSelect} + +%Plugin lib actions +\newcommand{\PluginUp}{\ButtonUp} +\newcommand{\PluginDown}{\ButtonDown} +\newcommand{\PluginLeft}{\ButtonLeft} +\newcommand{\PluginRight}{\ButtonRight} +\newcommand{\PluginUpRepeat}{Long \ButtonUp} +\newcommand{\PluginDownRepeat}{Long \ButtonDown} +\newcommand{\PluginLeftRepeat}{Long \ButtonLeft} +\newcommand{\PluginRightRepeat}{Long \ButtonRight} + +\newcommand{\PluginCancel}{\ButtonPower} +\newcommand{\PluginExit}{Long \ButtonPower} +\newcommand{\PluginSelect}{\ButtonSelect} +\newcommand{\PluginSelectRepeat}{Long \ButtonSelect} + Index: manual/advanced_topics/main.tex =================================================================== --- manual/advanced_topics/main.tex (révision 31500) +++ manual/advanced_topics/main.tex (copie de travail) @@ -648,7 +648,7 @@ \opt{ipod}{\fname{.ipod}.} % \opt{iaudio}{\fname{.iaudio}.} % \opt{sansa,iriverh10,iriverh10_5gb,vibe500}{\fname{.mi4}.} % -\opt{sansaAMS}{\fname{.sansa}.} % +\opt{sansaAMS,fuzeplus}{\fname{.sansa}.} % \opt{gigabeatf,gigabeats}{\fname{.gigabeat}.} % This can be used to test new firmware versions without deleting your current version. Index: manual/rockbox_interface/main.tex =================================================================== --- manual/rockbox_interface/main.tex (révision 31500) +++ manual/rockbox_interface/main.tex (copie de travail) @@ -42,6 +42,13 @@ \wikilink{BlindFAQ}. % + \opt{fuzeplus}{ + The \playerman \playertype's touchpad provide no reliable way to distinguish + the different buttons on it. Furthermore, there is no separation between the + LCD and the touchpad itself. Therefore, we don't recommend ours blind users + to use this player.} %Someone, with better english knowledge than I have, could + % try a more precise traduction of the position of the buttons grid. I really + % doubt that a blind person could use this player. \opt{iriverh100}{ Hold or lay the \dap{} so that the side with the joystick and LCD is facing towards you, and the curved side is at the top. The joystick functions as @@ -525,7 +532,7 @@ \opt{ONDIO_PAD}{\ButtonOff}\opt{RECORDER_PAD,PLAYER_PAD}% {Long \ButtonOn}% \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,ONDA_VX777_PAD% - ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS,PBELL_VIBE500_PAD% + ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD% }{\ButtonPower}% \opt{COWON_D2_PAD} {\ButtonPower{}, then \ButtonHold}% \opt{ONDA_VX777_PAD} {\ButtonPower{}}% @@ -545,7 +552,7 @@ \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}% \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD% ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS,COWON_D2_PAD% - ,PBELL_VIBE500_PAD,ONDA_VX777_PAD}{Long \ButtonPower}% + ,PBELL_VIBE500_PAD,ONDA_VX777_PAD,SANSA_FUZEPLUS_PAD}{Long \ButtonPower}% & \opt{HAVEREMOTEKEYMAP}{ \opt{IRIVER_RC_H100_PAD}{Long \ButtonRCStop}% @@ -694,7 +701,16 @@ the file \fname{/SD/ccpmp.bin}. To boot into the original firmware press and release \ButtonPower{} immediately after the Rockbox Logo appear on the screen. } - +\opt{fuzeplus} + { + Rockbox has a dual-boot feature. To boot into the original firmware, + when the \dap{} is turned off, press and hold the \ButtonVolDown{} button, + and then press and hold the \ButtonPower{} button for about 5 to 10 seconds. + As the \playerman{} logo display you can release the buttons. + You can also use your \daps{} original firmware while connecting it to your + computer: press and hold the \ButtonVolDown{} button, and then plug the USB + cable into your computer. + } } \subsection{Putting music on your \dap{}} @@ -808,7 +824,7 @@ \nopt{ondio}{ \opt{usb_power}{ \section{USB Charging} - \nopt{clipv2,fuzev2,clipplus}{ + \nopt{clipv2,fuzev2,clipplus,fuzeplus}{ To charge your \dap{} over USB, hold any button while plugging it in. This will prevent it from connecting to your computer and let you continue to use it normally. Your \dap{} must already be in Rockbox for this @@ -818,7 +834,7 @@ \ActionStdUsbCharge{}.} } - \opt{clipv2,fuzev2,clipplus}{ + \opt{clipv2,fuzev2,clipplus,fuzeplus}{ Your \dap{} will automatically charge over USB if the cable is plugged in while Rockbox is running. } Index: manual/rockbox_interface/wps.tex =================================================================== --- manual/rockbox_interface/wps.tex (révision 31500) +++ manual/rockbox_interface/wps.tex (copie de travail) @@ -111,6 +111,7 @@ \opt{PLAYER_PAD}{\ButtonMenu+\ButtonStop} \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown} \opt{SANSA_CLIP_PAD}{\ButtonHome+\ButtonSelect} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonPower} & Key lock (software hold switch) on/off.\\ }% %These actions need definitions for the other targets @@ -125,7 +126,7 @@ % on the 'pitchscreen' feature since some players have the feature but do % not have the button to go from the WPS to the pitch screen. \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD% - ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{% + ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD}{% \ActionWpsPitchScreen \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsPitchScreen} & Show \setting{Pitch Screen} (see \reference{sec:pitchscreen}).\\% @@ -136,7 +137,7 @@ & Show current \setting{Playlist}.\\% }% \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD% - ,SANSA_E200_PAD,SANSA_C200_PAD}{% + ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD}{% \ActionWpsIdThreeScreen \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsIdThreeScreen} & Enter \setting{ID3 Viewer}.\\% @@ -271,7 +272,7 @@ meta data and is stored in audio file formats to keep information on artist, album etc. To access this screen, % \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,% - SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{ + SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}{ press \ActionWpsIdThreeScreen. }% \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD,% GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD,PBELL_VIBE500_PAD,% Index: manual/rockbox_interface/browsing_and_playing.tex =================================================================== --- manual/rockbox_interface/browsing_and_playing.tex (révision 31500) +++ manual/rockbox_interface/browsing_and_playing.tex (copie de travail) @@ -62,6 +62,11 @@ \ButtonRew{}/ \ButtonFF & Move one page up/down in the list.\\ } + \opt{SANSA_FUZEPLUS_PAD} + { + \ButtonBottomLeft{}/ \ButtonBottomRight + & Move one page up/down in the list.\\ + } % \ActionTreeParentDirectory \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeParentDirectory} @@ -220,7 +225,7 @@ \begin{btnmap} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD% - ,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{ + ,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD}{ \ActionKbdCursorLeft{} / \ActionKbdCursorRight & \opt{HAVEREMOTEKEYMAP}{\ActionRCKbdCursorLeft{} / \ActionRCKbdCursorRight @@ -252,7 +257,7 @@ If you move out of the picker area you get to the line edit mode. \\ % - \nopt{IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,ONDIO_PAD,PBELL_VIBE500_PAD}{ + \nopt{IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,ONDIO_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{ \ActionKbdPageFlip & \opt{HAVEREMOTEKEYMAP}{\ActionRCKbdPageFlip Index: manual/getting_started/installation.tex =================================================================== --- manual/getting_started/installation.tex (révision 31500) +++ manual/getting_started/installation.tex (copie de travail) @@ -100,7 +100,7 @@ \end{description} } -\opt{sansaAMS}{ +\opt{sansaAMS,fuzeplus}{ \begin{description} \item[DRM capability.] It is possible that installation of the bootloader may lead to you \emph{permanently} losing the ability to playback files @@ -147,12 +147,12 @@ is intended to be used for USB OTG connections only (digital cameras, memory sticks, etc.). } - \opt{sansa,e200v2,clipv1,clipv2}{ + \opt{sansa,e200v2,clipv1,clipv2,fuzeplus}{ \note{The following steps require you to change the setting in \setting{Settings $\rightarrow$ USB Mode} to \setting{MSC} from within the original firmware.} - \nopt{sansaAMS}{\warn{Never extract files to your \dap{} while it is in recovery mode.}} + \nopt{sansaAMS,fuzeplus}{\warn{Never extract files to your \dap{} while it is in recovery mode.}} } \opt{fuze,fuzev2,clipplus}{ @@ -382,6 +382,26 @@ files using \fname{unzip}. } +\opt{fuzeplus}{ + Rockbox Utility will ask you for a compatible copy of the original + firmware. This is because for legal reasons we cannot distribute + the bootloader directly. Instead, we have to patch the \playerman{} + firmware with the Rockbox bootloader. + + Download a supported version of the \playerman{} firmware for your + \playername{} from the \playerman{} website, links can be found on + \wikilink{SansaFuzePlusPort}. + \note{ + \begin{itemize} + \item Although the only tested version of the original firmware is 02.38.6, + Rockbox Utility should be able to patch any newer version. + \item + If the file that you downloaded is a \fname{.zip} file, use an unzip + utility like mentioned in the prerequisites section to extract the + \fname{firmware.sb} from the \fname{.zip} file to your desktop. + \end{itemize} + } +} \subsubsection{Choosing a Rockbox version}\label{sec:choosing_version} There are three different versions of Rockbox available from the @@ -448,14 +468,14 @@ correct version for your \dap{}.}} \item Connect your \dap{} to the computer via USB - \opt{sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500}{ in MSC mode } + \opt{sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500,fuzeplus}{ in MSC mode } \opt{ipod3g,ipod4g,ipodmini,ipodcolor}{ or Firewire }as described in the manual that came with your \dap{}. \item Take the \fname{.zip} file that you downloaded and use the ``Extract all'' command of your unzip program to extract - the files onto% - \opt{gigabeats}{the main data partition of } + the files onto + \opt{gigabeats,fuzeplus}{the main data partition of } \opt{cowond2}{either an SD card or the internal memory of } \opt{ondavx777}{the MicroSD of } your \dap{}. @@ -499,6 +519,7 @@ \opt{cowond2}{\input{getting_started/cowond2_install.tex}} \opt{vibe500}{\input{getting_started/vibe500_install.tex}} \opt{ondavx777}{\input{getting_started/ondavx777_install.tex}} + \opt{IMX233}{\input{getting_started/IMX233_install.tex}} } } @@ -555,24 +576,22 @@ firmware process usually takes a minute or so.). You are now ready to go. \end{itemize} } -\opt{mpiohd200}{ +\opt{e200}{Your e200 will automatically reboot and Rockbox should load.} + +\opt{fuzeplus}{ \begin{itemize} - \item Safely eject /unmount your \dap{}. - - \item \warn{Before proceeding further, make sure that your player has a full charge - or that it is connected to the power adapter. Interrupting the next step - due to a power failure most likely will brick your \dap{}.} - Update your \daps{} firmware with the patched bootloader. To do this, turn - the jukebox on. The update process should start automatically. The \playerman{} will - display animation indicating that the firmware update is in progress. Do \emph{not} - interrupt this process. When the firmware update is complete the player will restart. - (The update firmware process usually takes a minute or so.). You are now ready to go. + \item \warn{Before proceeding further, make sure that your player is over + 70\% charged. Interrupting the next step due to a power failure most likely + will brick your \dap{}.} + \item Update your \daps{} firmware with the patched bootloader. To do this, + safely eject /unmount your \dap{}. The update process should start + automatically. The \playerman{} will display animation indicating that the + firmware update is in progress. Do \emph{not} interrupt this process. When + the firmware update is complete the player will restart. (The update firmware + process usually takes several minutes.). You are now ready to go. \end{itemize} } -\opt{e200}{Your e200 will automatically reboot and Rockbox should load.} - - \subsection{Enabling Speech Support (optional)}\label{sec:enabling_speech_support} \index{Speech}\index{Installation!Optional Steps} If you wish to use speech support you will also need a voice file. Voice files @@ -588,7 +607,7 @@ to speak file and folder names. \section{Running Rockbox} -\nopt{ipod,gigabeats,cowond2}{When +\nopt{ipod,gigabeats,cowond2,fuzeplus}{When you turn the unit on, Rockbox should load.} \opt{ipod}{Hard reset the Ipod by holding \opt{IPOD_4G_PAD}{\ButtonMenu{} and \ButtonSelect{} simultaneously}% @@ -657,7 +676,7 @@ \section{Uninstalling Rockbox}\index{Installation!uninstall} -\nopt{gigabeatf,iaudiom3,iaudiom5,iaudiox5,archos,mrobe100,gigabeats}{ +\nopt{gigabeatf,iaudiom3,iaudiom5,iaudiox5,archos,mrobe100,gigabeats,fuzeplus}{ \note{The Rockbox bootloader allows you to choose between Rockbox and the original firmware. (See \reference{ref:Dualboot} for more information.)} } @@ -669,7 +688,7 @@ installed Rockbox manually you can still use Rockbox Utility for uninstallation but will not be able to do this selectively. -\opt{iriverh100,iriverh300}{\note{Rockbox Utility cannot uninstall the bootloader due to +\opt{iriverh100,iriverh300,fuzeplus}{\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.}} @@ -748,10 +767,14 @@ } } - \opt{sansaAMS}{ + \opt{sansaAMS,fuzeplus}{ Copy an unmodified original firmware to your player and update it. } + \opt{fuzeplus}{ + \note{You will need to boot into the original firmware to do so. See + \reference{ref:Dualboot} for more information.} +} \opt{mpiohd200}{ If you want to remove the Rockbox bootloader, simply flash an unpatched \playerman{} firmware. @@ -797,6 +820,15 @@ please ensure that you are either logged in as an administrator (Windows), or you have root rights (Linux)} +\opt{fuzeplus}{ + \item[Immediately loading original firmware.] + If the original firmware is immediately loaded without the Rockbox bootloader + appearing first, then the Rockbox bootloader has not been correctly installed. + The original firmware update will only perform the update if the filename is + correct, including case. Make sure that the patched Sansa firmware is called + \fname{firmware.sb} +} + \opt{iriverh100,iriverh300}{ \item[Immediately loading original firmware.] If the original firmware is immediately Index: manual/getting_started/IMX233_install.tex =================================================================== --- manual/getting_started/IMX233_install.tex (révision 0) +++ manual/getting_started/IMX233_install.tex (révision 0) @@ -0,0 +1,76 @@ +% $Id: % + +In order to install the bootloader, you will need to download the following +files: + +\begin{itemize} + \item An original firmware (OF) from + \opt{fuzeplus}{ + \url{http://mp3support.sandisk.com/firmware/fuzeplus/fuzeplus02.38.06.zip}} + + \item The bootloader: + \opt{fuzeplus}{\download{bootloader/sandisk-sansa/fuzeplus/bootloader-fuzeplus.sansa}} + + \item The version of mkimxboot for your operating system from + \download{bootloader/sandisk-sansa/mkimxboot/} +\end{itemize} + +\subsection{Bootloader installation from Windows} + +\begin{enumerate} + +\item Create a folder called ``rbinstall'' on your desktop, and then extract + the OF, the bootloader and mkimxboot into it. + +\item Open a new command prompt, and navigate to the ``rbinstall'' folder. + +\item Run mkimxboot.exe, passing according to the following syntax the name + of the OF and bootloader files that you downloaded, in addition to a name for + the output file and the option argument for dualboot. + + % The following arguments to the code environment select the correct line out + % of the code block. This is necessary as using \opt{} in the code block would + % create unwanted empty lines. + \begin{code}[firstline=\opt{fuzeplus}{1},% + lastline=\opt{fuzeplus}{1}] + mkimxboot.exe -i firmware.sb -b bootloader-fuzeplus.sansa -o patched.sb -t dualboot + \end{code} + + If mkimxboot.exe does not report success, then retry or abort. + + \item Copy the output file (``patched.sb'' in the example given above) to the + root of the device and rename it to the same name as the OF file you downloaded earlier + \opt{fuzeplus}{(``firmware.sb''} above). + +\end{enumerate} + +Please now go to \reference{ref:finish_install} to complete the installation procedure. + +\subsection{Bootloader installation from Mac OS X and Linux} + +\begin{enumerate} + +\item Create a folder called ``rbinstall'' in your home directory, and then + extract the OF, the bootloader and mkimxboot into it. + +\item Open a new terminal, and navigate to the ``rbinstall'' folder. + +\item Run mkimxboot, passing the name of the OF and bootloader files that + you downloaded, in addition to a name for the output file. + +% See above for the code environment arguments explanation. + \begin{code}[firstline=\opt{fuze}{1},% + lastline=\opt{fuze}{1}] + ./mkimxboot -i firmware.sb -b bootloader-fuzeplus.sansa -o patched.sb + + \end{code} + + If mkimxboot does not report success, then retry or abort. + +\item Copy the output file (``patched.sb'' in the example given above) to the + root of the device and rename it to the same name as the OF file you downloaded earlier + \opt{fuzeplus}{(``firmware.sb''} above). +\end{enumerate} + +Please now go to \reference{ref:finish_install} to complete the installation procedure. + Index: manual/appendix/config_file_options.tex =================================================================== --- manual/appendix/config_file_options.tex (révision 31500) +++ manual/appendix/config_file_options.tex (copie de travail) @@ -16,21 +16,22 @@ \opt{iriverh100,iriverh300}{-84 to 0}% \opt{ipodnano}{-72 to +6}% \opt{ipodvideo,cowond2}{-89 to +6}% - \opt{iaudiom3,iaudiom5,iaudiox5}{-73 to +6} + \opt{iaudiom3,iaudiom5,iaudiox5}{-73 to +6}% + \opt{fuzeplus}{-99 to +6}% \opt{e200,e200v2,ipodcolor,vibe500,ipodnano2g}{-74 to +6}% & dB\\ bass & \opt{masd}{-15 to +15}% \opt{masf}{-12 to +12}% \opt{iriverh100,iriverh300}{0 to +24}% \opt{ipod}{-6 to +9}% - \opt{iaudiom3,iaudiom5,iaudiox5,e200,e200v2,vibe500}{% + \opt{iaudiom3,iaudiom5,iaudiox5,e200,e200v2,vibe500,fuzeplus}{% -24 to +24}% & dB\\ treble & \opt{masd}{-15 to +15}% \opt{masf}{-12 to +12}% \opt{iriverh100,iriverh300}{0 to +6}% \opt{ipod}{-6 to +9}% - \opt{iaudiom3,iaudiom5,iaudiox5,e200,e200v2,vibe500}{% + \opt{iaudiom3,iaudiom5,iaudiox5,e200,e200v2,vibe500,fuzeplus}{% -24 to +24}% & dB\\ balance & -100 to +100 & \%\\ Index: manual/configure_rockbox/theme_settings.tex =================================================================== --- manual/configure_rockbox/theme_settings.tex (révision 31500) +++ manual/configure_rockbox/theme_settings.tex (copie de travail) @@ -41,7 +41,7 @@ \opt{gigabeats}{\url{http://themes.rockbox.org/index.php?target=gigabeats}}% \opt{mrobe100}{\url{http://themes.rockbox.org/index.php?target=mrobe100}}% \opt{vibe500}{\url{http://themes.rockbox.org/index.php?target=vibe500}}% - . + .\opt{fuzeplus}{\url{http://themes.rockbox.org/index.php?target=sansafuzeplus}}% \note{Themes do not have to be purely visual. It is quite possible to create a theme that switches between audio configurations for use in the car, with Index: manual/configure_rockbox/system_options.tex =================================================================== --- manual/configure_rockbox/system_options.tex (révision 31500) +++ manual/configure_rockbox/system_options.tex (copie de travail) @@ -1,7 +1,7 @@ % $Id$ % \section{\label{ref:SystemOptions}System} -\nopt{sansa}%will probably be there on Sansas one day - exclude it the simple way without specific option +\nopt{sansa,fuzeplus}%will probably be there on Sansas one day - exclude it the simple way without specific option {\nopt{sansaAMS}{ \subsection{Battery} Options relating to the \opt{archos}{batteries}\nopt{archos}{battery} @@ -216,20 +216,20 @@ This setting control the keypad mode when the \dap{} is attached to a computer through USB. Pressing a key on the \dap{} sends a keystroke the computer the \dap{} is attached to, according to the mapping set by the - keypad mode. There are different modes which provide different + keypad mode. There are different modes which provide different functionality. \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% ,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD% - ,PBELL_VIBE500_PAD}{% + ,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{% Switching modes back and forth is done by pressing the \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}% - \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,IRIVER_H10_PAD}% + \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,IRIVER_H10_PAD,SANSA_FUZEPLUS_PAD}% {\ButtonPower}% \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonRight} \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonLeft} and \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonRec}% - \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,IRIVER_H10_PAD}% + \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,IRIVER_H10_PAD,SANSA_FUZEPLUS_PAD} {Long \ButtonPower}% \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonLeft} \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonRight} @@ -252,15 +252,16 @@ \begin{btnmap} % Volume up / down \opt{SANSA_E200_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD} - {\ButtonScrollFwd / \ButtonScrollBack} - \opt{GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD} - {\ButtonVolUp / \ButtonVolDown} - \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown} - \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp / \ButtonDown} + {\ButtonScrollFwd{} / \ButtonScrollBack} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonUp{} / \ButtonDown} + \opt{GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD} + {\ButtonVolUp{} / \ButtonVolDown} + \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown} + \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp{} / \ButtonDown} & \opt{HAVEREMOTEKEYMAP}{ \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD} - {\ButtonRCVolUp / \ButtonRCVolDown}% + {\ButtonRCVolUp{} / \ButtonRCVolDown}% &} Volume up / down, respectively \\ @@ -268,7 +269,7 @@ % Volume mute \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD% ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{\ButtonSelect} - \opt{GIGABEAT_S_PAD}{\ButtonSelect; \ButtonBack} + \opt{GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{\ButtonSelect; \ButtonBack} \opt{IRIVER_H10_PAD}{\ButtonFF} \opt{IRIVER_VIBE500_PAD}{\ButtonMenu} & @@ -283,6 +284,7 @@ \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonUp} \opt{IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD% ,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonPlay} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonPlayPause} \opt{GIGABEAT_S_PAD}{\ButtonPlay; \ButtonUp} & \opt{HAVEREMOTEKEYMAP}{ @@ -299,6 +301,7 @@ \opt{IRIVER_H10_PAD}{\ButtonRew; Long \ButtonPlay} \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD} {\ButtonMenu; Long \ButtonPlay} + \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonPlayPause} \opt{PBELL_VIBE500_PAD}{\ButtonCancel; Long \ButtonPlay} \opt{MROBE100_PAD}{\ButtonDisplay; Long {\ButtonPlay}} & @@ -312,7 +315,7 @@ % Scan previous track \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,% IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD% - ,MROBE100_PAD,PBELL_VIBE500_PAD} + ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} {\ButtonLeft} \opt{GIGABEAT_RC_PAD}{\ButtonPrev; \ButtonLeft}% & @@ -325,7 +328,7 @@ % Scan next track \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% ,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD% - ,MROBE100_PAD,PBELL_VIBE500_PAD} + ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} {\ButtonRight} \opt{GIGABEAT_RC_PAD}{\ButtonNext; \ButtonRight}% & @@ -344,6 +347,7 @@ \begin{btnmap} % Slideshow start + \opt{SANSA_FUZEPLUS_PAD}{\ButtonPlayPause} \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonUp} \opt{GIGABEAT_S_PAD}{\ButtonPlay; \ButtonUp} \opt{IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD% @@ -356,6 +360,7 @@ \\ % Slideshow leave + \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonPlayPause} \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower} \opt{GIGABEAT_S_PAD}{Long \ButtonPlay; Long \ButtonUp} \opt{SANSA_CLIP_PAD}{\ButtonHome} @@ -371,7 +376,7 @@ % Slide previous \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD% - ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD} + ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} {\ButtonLeft} \opt{GIGABEAT_S_PAD}{\ButtonPrev; \ButtonLeft} \opt{IRIVER_H10_PAD}{\ButtonRew} @@ -384,7 +389,7 @@ % Slide next \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD% - ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD} + ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} {\ButtonRight} \opt{GIGABEAT_S_PAD}{\ButtonNext; \ButtonRight} \opt{IRIVER_H10_PAD}{\ButtonFF} @@ -397,7 +402,7 @@ % Slide first \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD% - ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD} + ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} {Long \ButtonLeft} \opt{GIGABEAT_S_PAD}{Long \ButtonPrev; Long \ButtonLeft} \opt{IRIVER_H10_PAD}{Long \ButtonRew} @@ -410,7 +415,7 @@ % Slide last \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD% - ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD} + ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} {Long \ButtonRight} \opt{GIGABEAT_S_PAD}{Long \ButtonNext; Long \ButtonRight} \opt{IRIVER_H10_PAD}{Long \ButtonFF} @@ -422,6 +427,7 @@ \\ % Screen black + \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight} \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD% ,SANSA_CLIP_PAD}{\ButtonDown} \opt{IRIVER_H10_PAD}{\ButtonLeft} @@ -436,6 +442,7 @@ \\ % Screen white + \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonBottomRight} \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD% ,SANSA_CLIP_PAD}{Long \ButtonDown} \opt{IRIVER_H10_PAD}{Long \ButtonLeft} @@ -455,7 +462,8 @@ \opt{GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD} {\ButtonVolUp / \ButtonVolDown} \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown} - \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp / \ButtonDown} + \opt{MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} + {\ButtonUp / \ButtonDown} & \opt{HAVEREMOTEKEYMAP}{ \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD} @@ -466,7 +474,7 @@ % Mouse click \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD% - ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD} + ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD} {\ButtonSelect} \opt{GIGABEAT_S_PAD}{\ButtonSelect; \ButtonBack} \opt{IRIVER_H10_PAD}{\ButtonRight} @@ -481,7 +489,7 @@ % Mouse over \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD% - ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{Long \ButtonSelect} + ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{Long \ButtonSelect} \opt{GIGABEAT_S_PAD}{Long \ButtonSelect; Long \ButtonBack} \opt{IRIVER_H10_PAD}{Long \ButtonRight} \opt{PBELL_VIBE500_PAD}{Long \ButtonOK} @@ -507,7 +515,7 @@ \opt{GIGABEAT_S_PAD} {\ButtonPrev; \ButtonVolUp / \ButtonNext; \ButtonVolDown} \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown} - \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp / \ButtonDown} + \opt{MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{\ButtonUp / \ButtonDown} & \opt{HAVEREMOTEKEYMAP}{ \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD} @@ -517,21 +525,24 @@ \\ % Scroll page up / page down - \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD} - {\ButtonUp / \ButtonDown} - \opt{GIGABEAT_S_PAD}{\ButtonUp / \ButtonDown} - \opt{IRIVER_H10_PAD}{\ButtonRew / \ButtonFF} - \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD} - {\ButtonPlay / \ButtonMenu} - \opt{PBELL_VIBE500_PAD}{\ButtonOK / \ButtonCancel} - & - \opt{HAVEREMOTEKEYMAP}{ - \opt{MROBE100_RC_PAD}{\ButtonRCPlay / \ButtonRCDisplay}% - &} - Scroll page up / page down, respectively - \\ + \nopt{SANSA_FUZEPLUS_PAD}{ + \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD} + {\ButtonUp / \ButtonDown} + \opt{GIGABEAT_S_PAD}{\ButtonUp / \ButtonDown} + \opt{IRIVER_H10_PAD}{\ButtonRew / \ButtonFF} + \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD} + {\ButtonPlay / \ButtonMenu} + \opt{PBELL_VIBE500_PAD}{\ButtonOK / \ButtonCancel} + & + \opt{HAVEREMOTEKEYMAP}{ + \opt{MROBE100_RC_PAD}{\ButtonRCPlay / \ButtonRCDisplay}% + &} + Scroll page up / page down, respectively + \\ + } - % Zoom in / out + % Zoom in / out + \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonBottomRight} \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD} {Long \ButtonUp / Long \ButtonDown} \opt{GIGABEAT_S_PAD}{Long \ButtonUp / Long \ButtonDown} @@ -549,6 +560,7 @@ \\ % Zoom reset + \opt{SANSA_FUZEPLUS_PAD}{\ButtonPlayPause} \opt{SANSA_E200_PAD} {Long \ButtonSelect; Long \ButtonUp+\ButtonDown} \opt{MROBE100_PAD} @@ -572,7 +584,7 @@ % Tab previous / next \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD% ,SANSA_CLIP_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD% - ,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD} + ,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} {\ButtonLeft / \ButtonRight} & \opt{HAVEREMOTEKEYMAP}{ @@ -583,6 +595,7 @@ \\ % Tab close + \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack} \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonPower} \opt{GIGABEAT_S_PAD}{Long \ButtonPlay; Long \ButtonBack} \opt{SANSA_CLIP_PAD}{Long \ButtonHome} @@ -601,7 +614,7 @@ % History back / forward \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD% ,SANSA_CLIP_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD% - ,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD} + ,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} {Long \ButtonLeft / Long \ButtonRight} & \opt{HAVEREMOTEKEYMAP}{ @@ -611,6 +624,7 @@ \\ % View full-screen + \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonSelect} \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% ,GIGABEAT_S_PAD,MROBE100_PAD} {\ButtonSelect} @@ -634,7 +648,7 @@ \begin{btnmap} % Cursor move up / down / left / right \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD% - ,SANSA_CLIP_PAD,MROBE100_PAD,PBELL_VIBE500_PAD} + ,SANSA_CLIP_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} {\ButtonUp / \ButtonDown / \ButtonLeft / \ButtonRight} \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown / \ButtonLeft / \ButtonRight} @@ -650,7 +664,7 @@ % Mouse button left-click \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD% - ,IPOD_3G_PAD,IPOD_1G2G_PAD} + ,IPOD_3G_PAD,IPOD_1G2G_PAD,SANSA_FUZEPLUS_PAD} {\ButtonSelect} \opt{GIGABEAT_S_PAD}{\ButtonSelect; \ButtonBack} \opt{IRIVER_H10_PAD}{\ButtonPlay} @@ -664,6 +678,7 @@ \\ % Mouse button right-click + \opt{SANSA_FUZEPLUS_PAD}{\ButtonPlayPause} \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower} \opt{GIGABEAT_S_PAD}{\ButtonMenu} \opt{SANSA_CLIP_PAD}{\ButtonHome} @@ -676,6 +691,8 @@ \\ % Mouse wheel scroll up / down + \opt{SANSA_FUZEPLUS_PAD} + {\ButtonBack / \ButtonBottomLeft} \opt{SANSA_E200_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD} {\ButtonScrollBack / \ButtonScrollFwd} \opt{IRIVER_H10_PAD}{\ButtonRew / \ButtonFF} @@ -691,6 +708,7 @@ &} Mouse wheel scroll up / down, respectively \\ + \end{btnmap} }} \end{description} Index: manual/configure_rockbox/sound_settings.tex =================================================================== --- manual/configure_rockbox/sound_settings.tex (révision 31500) +++ manual/configure_rockbox/sound_settings.tex (copie de travail) @@ -28,6 +28,7 @@ -74~dB to a maximum of +6~dB.}% \opt{gigabeats}{minimum of -90~dB to a maximum of +6~dB.}% \opt{gigabeatf,vibe500}{minimum of -74~dB to a maximum of +6~dB.}% + \opt{fuzeplus}{minimum of -100~dB to a maximum of +6~dB.} \opt{ipodvideo}{\\Remark: Lowering the volume below -57~dB will also affect the line-out and the recording gain.} \opt{cowond2}{\\Remark: Lowering the volume below -57~dB will also affect the line-out.} @@ -44,7 +45,7 @@ \opt{ipodnano,ipodnano2g,ipodcolor,mpiohd200}{% 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{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500}{% + \opt{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500,fuzeplus}{% The minimum setting is -24~dB and the maximum is 24~dB.} \opt{ipodvideo}{ @@ -66,7 +67,7 @@ \opt{ipodnano,ipodnano2g,ipodcolor,mpiohd200}{% 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{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500}{% + \opt{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500,fuzeplus}{% The minimum setting is -24~dB and the maximum is 24~dB.} \opt{ipodvideo}{ @@ -387,7 +388,7 @@ \begin{btnmap} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD% ,GIGABEAT_S_PAD,SANSA_C200_PAD,IAUDIO_M3_PAD,MROBE100_PAD% - ,SANSA_CLIP_PAD}{\ButtonRight} + ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}{\ButtonRight} \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd} \opt{IRIVER_H10_PAD}{\ButtonScrollUp} \opt{PBELL_VIBE500_PAD}{\ButtonUp} @@ -403,7 +404,7 @@ % \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD% ,GIGABEAT_S_PAD,SANSA_C200_PAD,IAUDIO_M3_PAD,MROBE100_PAD% - ,SANSA_CLIP_PAD}{\ButtonLeft} + ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}{\ButtonLeft} \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack} \opt{IRIVER_H10_PAD}{\ButtonScrollDown} \opt{PBELL_VIBE500_PAD}{\ButtonDown} @@ -420,7 +421,7 @@ \opt{IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonLeft} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD% ,SANSA_FUZE_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_M3_PAD,MROBE100_PAD% - ,SANSA_CLIP_PAD}{\ButtonUp} + ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}{\ButtonUp} \opt{IRIVER_H10_PAD,MPIO_HD200_PAD}{\ButtonRew} \opt{touchscreen}{\ActionStdPrev} & @@ -435,7 +436,7 @@ \opt{IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonRight} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD% ,SANSA_FUZE_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_M3_PAD,MROBE100_PAD% - ,SANSA_CLIP_PAD}{\ButtonDown} + ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}{\ButtonDown} \opt{IRIVER_H10_PAD,MPIO_HD200_PAD}{\ButtonFF} \opt{touchscreen}{\ActionStdNext} & @@ -449,7 +450,7 @@ % \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD% ,SANSA_C200_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,SANSA_E200_PAD% - ,SANSA_FUZE_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonSelect} + ,SANSA_FUZE_PAD,MROBE100_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}{\ButtonSelect} \opt{MPIO_HD200_PAD}{\ButtonFunc} \opt{PBELL_VIBE500_PAD}{\ButtonOK} \opt{IRIVER_H10_PAD}{\ButtonRight} @@ -472,6 +473,7 @@ \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD}{\ButtonLeft} \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower} \opt{PBELL_VIBE500_PAD}{\ButtonCancel} + \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack} \opt{touchscreen}{\TouchTopLeft \opt{COWON_D2_PAD}{/ \ButtonPower}} &