From 0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Tue, 6 Jun 2006 22:23:52 +0000 Subject: Work-in-progress rework of charging status reading & display: * Changed several charging related HAVE_* macros into one multi-value CONFIG_CHARGING. * Always use proper macros for charging states. * Battery symbol charging animation now starts from current level on all targets with charging. Two-colour animation kept for non-b&w targets. Round down fill level while charging as before, but round to nearest pixel value for discharging on all targets. * Charging anim fixed on player. * Some code cleanup. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10080 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings_menu.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'apps/settings_menu.c') diff --git a/apps/settings_menu.c b/apps/settings_menu.c index bcf5a784c0..821ad53dec 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -81,7 +81,7 @@ void dac_line_in(bool enable); #include "backdrop.h" #endif -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING static bool car_adapter_mode(void) { return set_bool( str(LANG_CAR_ADAPTER_MODE), @@ -177,7 +177,7 @@ static bool caption_backlight(void) &global_settings.caption_backlight); } -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING static bool backlight_timer_plugged(void) { return set_option((char *)str(LANG_BACKLIGHT_ON_WHEN_CHARGING), @@ -248,7 +248,7 @@ static bool remote_backlight_timer(void) remote_backlight_set_timeout ); } -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING static bool remote_backlight_timer_plugged(void) { return set_option((char *)str(LANG_BACKLIGHT_ON_WHEN_CHARGING), @@ -1715,7 +1715,7 @@ static bool lcd_settings_menu(void) static const struct menu_item items[] = { #ifdef CONFIG_BACKLIGHT { ID2P(LANG_BACKLIGHT), backlight_timer }, -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING { ID2P(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_timer_plugged }, #endif { ID2P(LANG_CAPTION_BACKLIGHT), caption_backlight }, @@ -1763,7 +1763,7 @@ static bool lcd_remote_settings_menu(void) static const struct menu_item items[] = { { ID2P(LANG_BACKLIGHT), remote_backlight_timer }, -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING { ID2P(LANG_BACKLIGHT_ON_WHEN_CHARGING), remote_backlight_timer_plugged }, #endif @@ -1860,9 +1860,7 @@ static bool battery_settings_menu(void) { ID2P(LANG_BATTERY_TYPE), battery_type }, #endif #else -#ifndef HAVE_CHARGE_CTRL { "Dummy", NULL }, /* to have an entry at all, in the simulator */ -#endif #endif }; @@ -1975,7 +1973,7 @@ static bool system_settings_menu(void) #if CONFIG_CODEC == MAS3507D { ID2P(LANG_LINE_IN), line_in }, #endif -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING { ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode }, #endif }; -- cgit v1.2.3