From 5e44a56b65da8fc02174a8397ba395a989dc063e Mon Sep 17 00:00:00 2001 From: Uwe Freese Date: Wed, 12 Feb 2003 22:21:07 +0000 Subject: disable charge control for FM git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3239 a1c6a512-1295-4272-9138-f99709370657 --- apps/debug_menu.c | 4 +++- apps/recorder/icons.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 12f5e059e0..aa232f9331 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -801,6 +801,7 @@ bool view_battery(void) case 3: /* remeining time estimation: */ lcd_clear_display(); +#ifdef HAVE_CHARGE_CTRL snprintf(buf, 30, "charge_state: %d", charge_state); lcd_puts(0, 0, buf); @@ -809,6 +810,7 @@ bool view_battery(void) snprintf(buf, 30, "Lev.at cycle start: %d%%", powermgmt_last_cycle_level); lcd_puts(0, 2, buf); +#endif snprintf(buf, 30, "Last PwrHist val: %d.%02d V", power_history[POWER_HISTORY_LEN-1] / 100, @@ -821,9 +823,9 @@ bool view_battery(void) snprintf(buf, 30, "Est. remaining: %d m", battery_time()); lcd_puts(0, 6, buf); +#ifdef HAVE_CHARGE_CTRL snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec); lcd_puts(0, 7, buf); -#ifdef HAVE_CHARGE_CTRL #endif break; } diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index 2a9c00647b..acd6d6de4b 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c @@ -166,8 +166,12 @@ void statusbar_icon_battery(int percent, bool charging) #ifdef SIMULATOR if (global_settings.battery_type) { #else +#ifdef HAVE_CHARGE_CTRL /* Recorder */ /* show graphical animation when charging instead of numbers */ if ((global_settings.battery_type) && (charge_state != 1)) { +#else /* FM */ + if (global_settings.battery_type) { +#endif /* HAVE_CHARGE_CTRL */ #endif /* Numeric display */ snprintf(buffer, sizeof(buffer), "%3d", percent); -- cgit v1.2.3