This is the bug/patch tracker for Rockbox. Click here for more information.
Quick links: Bugs · Patches · Rockbox frontpage
FS#10849 - Sleep timer options: persistent duration and start on boot.
Attached to Project:
Rockbox
Opened by Nick Peskett (nickp) - Sunday, 13 December 2009, 10:18 GMT+2
Last edited by Thomas Martitz (kugel.) - Tuesday, 18 October 2011, 21:08 GMT+2
Opened by Nick Peskett (nickp) - Sunday, 13 December 2009, 10:18 GMT+2
Last edited by Thomas Martitz (kugel.) - Tuesday, 18 October 2011, 21:08 GMT+2
|
Details[EDIT: More accurate description of latest patch posted in comments section, requested by nickp]
This patch adds two sleep timer options and a sub-menu to hold them (Settings > General Settings > System > Sleep Timer). The two options are; Sleep Timer Duration: Allows the value to be set permanently (as 'sleeptimer duration' in the config file). The value will be used until reset to a new value. Start Sleep Timer On Boot: Whether you would like a sleep timer to automatically be started when the device boots up (stored in the config file as 'sleeptimer on startup'). These options are particularly useful for users who have a dedicated DAP by their bedside, or a specific config file used when sleeping. When the later is set, powering the device up will play for the users specified duration, then switch the device off. The existing (System > (Date & Time) > Sleep Timer) option has been modified to be a switch showing "Start Sleep Timer (duration)" when inactive, or "Stop Sleep Timer (remaining)" when active. Duration and remaining being the current setting and remaining minutes left on the timer, respectively. 
sleeptimer_submenu_23963.patch
(16.5 KiB)
apps/lang/english.lang | 58 +++++++++++++++++++ apps/settings.h | 3 + apps/menus/exported_menus.h | 23 ++++--- apps/menus/main_menu.c | 43 -------------- apps/menus/time_menu.c | 5 - apps/menus/sleeptimer_menu.c | 94 ++++++++++++++++++++++++++++++++ apps/settings_list.c | 11 +++ apps/SOURCES | 1 apps/root_menu.c | 3 + manual/appendix/config_file_options.tex | 3 + manual/main_menu/main.tex | 34 +++++++---- uisimulator/common/stubs.c | 23 ++++++- 12 files changed, 228 insertions(+), 73 deletions(-) |
This task depends upon
Closed by Thomas Martitz (kugel.)
Tuesday, 18 October 2011, 21:08 GMT+2
Reason for closing: Accepted
Additional comments about closing: r30777. Thank you for this.
Tuesday, 18 October 2011, 21:08 GMT+2
Reason for closing: Accepted
Additional comments about closing: r30777. Thank you for this.
I made this patch by "svn diff >sleep_timer_menu.patch".
Which option brings svn diff to include the a new file?
http://www.rockbox.org/tracker/task/11042
FS#11042has more features, at this point I'm not convinced it is more sophisticated.This is mainly due to to the unsolved issue (which you have also commented on) regarding cancelling of timers when pause is pressed in wps, and the timer not being reinstated unless sleeptimer_on_startup is set.
Depending on this getting resolved, I'll either request this is closed or import the uisimulator improvements into this patch.
Updated manual removal of wake-up alarm warning from r28263.
Got rid of redundant uisimulator/common/stubs.c code, it seems something very similar is now in trunk.
It's working for me after an svn up to r29788.
Could you try the following in your rockbox checked out root and attach /tmp/reject.txt?
wget http://www.rockbox.org/tracker/task/10849?getfile=23392 -O /tmp/sleeptimer_submenu_29474.patch
patch -p0 -i /tmp/sleeptimer_submenu_29474.patch --global-reject-file=/tmp/reject.txt
svn info >> /tmp/reject.txt
Maybe another patch is conflicting with it?
Cheers
I just tried a compile for the Clip+ and it seems to run fine on the device - what errors are you getting?
Thanks for your fast reply. I tried the patch on a clean source, no other patches applied. Applying the patch normally (patch -p0 < sleeptimer_submenu_29474.patch) gives no error. Trying your trouble shooting above gives no reject.txt. However, when actually compiling a clean source with the patch, it spits out hundreds of errors.
Here's the last few lines of the terminal buffer, after trying make: http://pastie.org/1839139 - there's hundreds more errors like these.
Applying any other patches to the same clean source gives no issues.
I'm trying to build it for a Clip+, on Ubuntu 10, by the way.
Cheers,
Martin
Are you sure it isn't
FS#11042you're applying? I only ask because menu_sleeptimer_pause_mode only exists there, not in this patch (which just powers off the device when the timer completes). That patch is pretty neglected nowadays.If not I'll have a go downloading and installing a Ubuntu 10 over the weekend, I'm still on an ancient 8.04 server here...
MAKE_MENU(sleeptimer_menu, ID2P(LANG_SLEEP_TIMER), NULL, Icon_NOICON,
&menu_toggle_sleeptimer, &menu_sleeptimer_duration, &menu_sleeptimer_on_startup);
/home/dfkt/rockbox-clean/apps/menus/sleeptimer_menu.c:649: error: redefinition of ‘menu_toggle_sleeptimer’
apps/menus/sleeptimer_menu.c should only have 94 lines - I think there's something odd going on there...
Try "wc -l apps/menus/sleeptimer_menu.c"
I re-downloaded the patch from the site, to make sure it's not
FS#11042I wrongly renamed or similar. It was the correct patch I used.The "sed" command indeed does return the lines you specified. The "wc" command returns "848 apps/menus/sleeptimer_menu.c". I checked that file and it indeed contains 848 lines, several slightly different copies one after each other.
I did a "svn revert -R ." after that, and applied the patch again, normally. This is what sleeptimer_menu.c looks like after applying the patch: http://pastie.org/1839628 - one too many copies.
--- apps/menus/sleeptimer_menu.c (revision 0)
+++ apps/menus/sleeptimer_menu.c (revision 0)
@@ -0,0 +1,94 @@
I think the root of the problem is the revert doesn't seem to be getting rid of the file/ maybe other stuff before reapplying it.
A quick hack might be to just "rm apps/menus/sleeptimer_menu.c" before you start.
I personally always keep a pristine checkout in one directory (rockbox_orig), then if I want to apply any patches do a "svn up rockbox_orig/ && cp -a rockbox_orig rockbox && cd rockbox" before I start, then "cd .. && rm -rf rockbox" after I've finished.
Could you face a fresh checkout of rockbox? I know it's quite a hit to take but I think your current one might have become a bit corrupted.
After successfully compiling a build with the sleep timer patch, I did a "svn revert -R ." on the new source. Lo and behold, sleeptimer_menu.c didn't get removed by that, and reapplying the patch to the presumably "clean" source led to sleeptimer_menu.c becoming filled with duplicates. I didn't have that behavior with any other patch yet, but at least now I know that "svn revert -R ." doesn't fully clean up the source with this one patch. I wonder if anyone else ever had those issues, or why I'm having them...
Thanks for your help, Nick - highly appreciated. I'm happy I can use your sleep timer again in my builds.
It all makes sense now, even though you wrote "svn revert -R .", for some reason I was thinking you were doing a patch -R.
Due to sleeptimer_menu.c not being in the repository the code was checked out from (the patch creates it from scratch), it's necessary for me to do a "svn add apps/menus/sleeptimer_menu.c" before svn diff to create the patch. Otherwise (as you found) svn diff doesn't even mention the file.
This means when you checkout from trunk, svn knows nothing about sleeptimer_menu.c, so doesn't bother reverting it. The next time you apply the patch, it would apply the change to line 0 of the sleeptimer_menu.c, leaving the previous change at the end.
I think even patch -R would leave an empty file rather than deleting it, not ideal.
I just checked svn help revert, there doesn't even seem to be an option to delete unknown files... Oh well.
any chance to get this updated to 3.9 or current cvs rev.?
I just tried it here, apart from a few offsets, the current patch seems to work with v3_9;
svn switch svn://svn.rockbox.org/rockbox/tags/v3_9
wget http://www.rockbox.org/tracker/task/10849?getfile=23392 -O /tmp/sleeptimer_submenu_29474.patch
patch -p0 -i /tmp/sleeptimer_submenu_29474.patch
I tend to only update the patch when changes to the code base break the patch. Are you getting any failures? If so, could you post them?
Thanks,
Nick
switched to v3_9, patched, recompiled and installed it on my Sansa Clip+:
works like a charm.
Thanks!
Miguel
http://www.rockbox.org/irc/log-20110808#14:03:21
I'll test this for a few days and then report back. Unless something surprising surfaces, it's time to brings this up on the developer's mailing list.
Regarding the one nifty feature
FS#11042has over this one (which obviously caused some issues) - may I ask if it would be possible/easier to add an option for "reset timer on *any* key press" instead of having it only linked with the pause function? Creative players stock firmwares have this feature, and it seems rather comfortable to me.I think the most elegant implementation might be to tap into the code which wakes the display on key press, refreshing the sleep timer if it's active. This might also be good to be optional as a setting too.
At this stage though, sideral and I think that the best chance to get this accepted is to introduce as few changes as possible initially, presenting new features as further patches.
* Lang additions have to be at the end of english.lang
* Removed sleeptimer_menu.c to minimize diff; options live in settings_menu.c for the time being
* Moved sleep-timer settings next to idle-poweroff settings
* Some whitespace and formatting changes
* The formats using LANG_SLEEP_TIMER_START and LANG_SLEEP_TIMER_STOP needed to be made a part of the corresponding translation strings to cater for right-to-left languages.
Still missing:
[EDIT: nothing right now.]
Re LANG_SLEEP_TIMER_(START|STOP), do you think we could get away with (stripped for brevity)?
if lang_is_rtl()
"%s (%d:%02d)"
else
"(%02d:%d) %s"
I think it turned out well, the patch is even smaller now and I think this actually adds functionality.
All Sleep Timer entries are now all in System (> Time & Date)[if real time clock].
Existing sleep timer entry now also sets the persistent sleep timer value.
"Start sleep timer on boot" option added after "Alarm Wake up Screen" in same menu.
http://www.rockbox.org/irc/log-20110825#14:17:04
The third patch is based on sleeptimer_submenu_30355.patch, however I added that the sleep timer menu item transforms into "cancel running timer (XX min)" and cancels the current timer on selection (took me longer than I anticipated :\ )
Perhaps I split the last one for commit, but that's a minor topic.
dfkt: I just added another patch which adds a "restart running sleep timer on keypress" option:
FS#12338. Sorry it took a while, I was holding off until the persistent sleep timer duration value was available.