Rockbox mail archiveSubject: Re: Crash
From: Mike Holden <rockbox_at_mikeholden.uklinux.net>
Date: Sat, 12 Apr 2003 22:11:54 +0100 (BST)
Johan Vromans said:
> "Mike Holden" <rockbox_at_mikeholden.uklinux.net> writes:
>> Mike Holden said:
>> I've looked at merging your patch, but it doesn't apply cleanly to the
>> current CVS version.
> Huh? I just applied it to my CVS tree (last updated earlier today) and
> it went in smoothly.
I'll have another look. Maybe I need another beer!
> I needed an additional change to get it to build correctly:
> --- apps/debug_menu.c~ Thu Apr 10 13:25:02 2003
> +++ apps/debug_menu.c Sat Apr 12 22:25:46 2003
> _at__at_ -802,7 +802,7 _at__at_
> #ifdef HAVE_CHARGE_CTRL
> - snprintf(buf, 30, "charge_state: %d", charge_state); +
> snprintf(buf, 30, "charge_state: %d", charger_status());
> lcd_puts(0, 0, buf);
> snprintf(buf, 30, "Cycle time: %d m",
Well caught! My excuse is that that bit of code isn't used on FM!
I've uploaded another patch, which includes that fix, and I've also had a
quick pass at including the battery time remaining value on the status
line. If usb is inserted, then the status line only includes battery icon,
charger inserted icon, runtime (in the form %2dh%02dm so 8h05m for
example) and clock.
-- Mike HoldenReceived on 2003-04-12