diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-10-17 18:57:38 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-10-17 18:57:38 +0000 |
commit | e347146b6268ece5b90bb6cf6fcb5c4e8f9b6a1e (patch) | |
tree | 4b59a351430c3a5d2c51fc36c76c0b3711bf0d2a /manual | |
parent | e44af440c50e2d87fcb57a91a8036e108a3b7362 (diff) | |
download | rockbox-e347146b6268ece5b90bb6cf6fcb5c4e8f9b6a1e.tar.gz rockbox-e347146b6268ece5b90bb6cf6fcb5c4e8f9b6a1e.zip |
Sleep timer options: persistent duration and start on boot.
This makes the sleep timer persistent, so that the duration is remembered
across reboots. Additionally, it adds a setting to automatically apply
it at boot.
Flyspray: FS#10849
Author: Nick Peskett
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30777 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'manual')
-rw-r--r-- | manual/appendix/config_file_options.tex | 3 | ||||
-rw-r--r-- | manual/main_menu/main.tex | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex index a746198981..bfe314bb6f 100644 --- a/manual/appendix/config_file_options.tex +++ b/manual/appendix/config_file_options.tex | |||
@@ -104,6 +104,9 @@ | |||
104 | 104 | ||
105 | idle poweroff & off, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 30, 45, 60 | 105 | idle poweroff & off, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 30, 45, 60 |
106 | & min\\ | 106 | & min\\ |
107 | sleeptimer duration & 5 to 300 (in steps of 5) | ||
108 | & min\\ | ||
109 | sleeptimer on startup & off, on & N/A\\ | ||
107 | max files in playlist & 1000 - 32000 & N/A\\ | 110 | max files in playlist & 1000 - 32000 & N/A\\ |
108 | max files in dir & 50 - 10000 & N/A\\ | 111 | max files in dir & 50 - 10000 & N/A\\ |
109 | lang & /path/filename.lng & N/A\\ | 112 | lang & /path/filename.lng & N/A\\ |
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex index 76063e8fd6..b43cfb1a8f 100644 --- a/manual/main_menu/main.tex +++ b/manual/main_menu/main.tex | |||
@@ -203,7 +203,9 @@ pages of information.} | |||
203 | \item[Sleep Timer:] | 203 | \item[Sleep Timer:] |
204 | The \setting{Sleep Timer} powers off your \dap{} after playing for a given | 204 | The \setting{Sleep Timer} powers off your \dap{} after playing for a given |
205 | time. It can be set from \setting{Off} to 5 hours in 5 minute steps. | 205 | time. It can be set from \setting{Off} to 5 hours in 5 minute steps. |
206 | The \setting{Sleep Timer} is reset on boot. | 206 | While the \setting{Sleep Timer} is reset on boot, the value selected is |
207 | retained and will be used as the default from then on. | ||
208 | If the sleep timer is currently active, \setting{Off} will be highlighted, | ||
207 | \opt{alarm}{ | 209 | \opt{alarm}{ |
208 | \item[Wake-Up Alarm:] | 210 | \item[Wake-Up Alarm:] |
209 | This option will make the \dap{} start up at the specified time. | 211 | This option will make the \dap{} start up at the specified time. |
@@ -212,12 +214,13 @@ pages of information.} | |||
212 | \ActionAlarmSet{} confirms the alarm, and \ActionAlarmCancel{} cancels setting | 214 | \ActionAlarmSet{} confirms the alarm, and \ActionAlarmCancel{} cancels setting |
213 | an alarm. If the \dap{} is turned on again before the alarm occurs, the alarm | 215 | an alarm. If the \dap{} is turned on again before the alarm occurs, the alarm |
214 | will be cancelled. | 216 | will be cancelled. |
215 | |||
216 | \opt{recording,radio}{ | 217 | \opt{recording,radio}{ |
217 | \item[Alarm Wake Up Screen:] | 218 | \item[Alarm Wake Up Screen:] |
218 | This option controls what the \dap{} does when it is woken up by the alarm. | 219 | This option controls what the \dap{} does when it is woken up by the alarm. |
219 | }%\opt{recording,radio} | 220 | }%\opt{recording,radio} |
220 | }%\opt{alarm} | 221 | }%\opt{alarm} |
222 | \item[Start Sleep Timer On Boot:] | ||
223 | If set, a \setting{Sleep Timer} will be initiated when the device starts. | ||
221 | \item [Time Format:] Choose 12 or 24 hour clock. | 224 | \item [Time Format:] Choose 12 or 24 hour clock. |
222 | \end{description} | 225 | \end{description} |
223 | }%\opt{rtc} | 226 | }%\opt{rtc} |
@@ -241,7 +244,11 @@ pages of information.} | |||
241 | \item[Sleep Timer:] | 244 | \item[Sleep Timer:] |
242 | The \setting{Sleep Timer} powers off your \dap{} after playing for a given | 245 | The \setting{Sleep Timer} powers off your \dap{} after playing for a given |
243 | time. It can be set from \setting{Off} to 5 hours in 5 minute steps. | 246 | time. It can be set from \setting{Off} to 5 hours in 5 minute steps. |
244 | The \setting{Sleep Timer} is reset on boot. | 247 | While the \setting{Sleep Timer} is reset on boot, the value selected is |
248 | retained and will be used as the default from then on. | ||
249 | If the sleep timer is currently active, \setting{Off} will be highlighted, | ||
250 | \item[Start Sleep Timer On Boot:] | ||
251 | If set, a \setting{Sleep Timer} will be initiated when the device starts. | ||
245 | } | 252 | } |
246 | 253 | ||
247 | \item[Running Time:] | 254 | \item[Running Time:] |