diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-06-06 22:23:52 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-06-06 22:23:52 +0000 |
commit | 0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f (patch) | |
tree | e3e77d4e6b25b82c82b3570cd8c4a988c7788e66 /apps/settings.c | |
parent | 8c9e22580e220b793130ed3ac67b9c54e85b3d0f (diff) | |
download | rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.gz rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.zip |
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
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/settings.c b/apps/settings.c index 0d6ee1d376..6d7f250436 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -243,7 +243,7 @@ static const struct bit_entry rtc_bits[] = | |||
243 | {6, S_O(contrast), 40, "contrast", NULL }, | 243 | {6, S_O(contrast), 40, "contrast", NULL }, |
244 | #ifdef CONFIG_BACKLIGHT | 244 | #ifdef CONFIG_BACKLIGHT |
245 | {5, S_O(backlight_timeout), 5, "backlight timeout", backlight_times_conf }, | 245 | {5, S_O(backlight_timeout), 5, "backlight timeout", backlight_times_conf }, |
246 | #ifdef HAVE_CHARGING | 246 | #ifdef CONFIG_CHARGING |
247 | {5, S_O(backlight_timeout_plugged), 11, "backlight timeout plugged", | 247 | {5, S_O(backlight_timeout_plugged), 11, "backlight timeout plugged", |
248 | backlight_times_conf }, | 248 | backlight_times_conf }, |
249 | #endif | 249 | #endif |
@@ -276,7 +276,7 @@ static const struct bit_entry rtc_bits[] = | |||
276 | {12, S_O(battery_capacity), BATTERY_CAPACITY_DEFAULT, "battery capacity", | 276 | {12, S_O(battery_capacity), BATTERY_CAPACITY_DEFAULT, "battery capacity", |
277 | NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon, | 277 | NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon, |
278 | 500...1500 for Alkaline */ | 278 | 500...1500 for Alkaline */ |
279 | #ifdef HAVE_CHARGING | 279 | #ifdef CONFIG_CHARGING |
280 | {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, | 280 | {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, |
281 | #endif | 281 | #endif |
282 | /* tuner */ | 282 | /* tuner */ |
@@ -296,7 +296,7 @@ static const struct bit_entry rtc_bits[] = | |||
296 | {1, S_O(remote_flip_display), false, "remote flip display", off_on }, | 296 | {1, S_O(remote_flip_display), false, "remote flip display", off_on }, |
297 | {5, S_O(remote_backlight_timeout), 5, "remote backlight timeout", | 297 | {5, S_O(remote_backlight_timeout), 5, "remote backlight timeout", |
298 | backlight_times_conf }, | 298 | backlight_times_conf }, |
299 | #ifdef HAVE_CHARGING | 299 | #ifdef CONFIG_CHARGING |
300 | {5, S_O(remote_backlight_timeout_plugged), 11, | 300 | {5, S_O(remote_backlight_timeout_plugged), 11, |
301 | "remote backlight timeout plugged", backlight_times_conf }, | 301 | "remote backlight timeout plugged", backlight_times_conf }, |
302 | #endif | 302 | #endif |
@@ -1018,13 +1018,13 @@ void settings_apply(void) | |||
1018 | lcd_remote_emireduce(global_settings.remote_reduce_ticking); | 1018 | lcd_remote_emireduce(global_settings.remote_reduce_ticking); |
1019 | #endif | 1019 | #endif |
1020 | remote_backlight_set_timeout(global_settings.remote_backlight_timeout); | 1020 | remote_backlight_set_timeout(global_settings.remote_backlight_timeout); |
1021 | #ifdef HAVE_CHARGING | 1021 | #ifdef CONFIG_CHARGING |
1022 | remote_backlight_set_timeout_plugged(global_settings.remote_backlight_timeout_plugged); | 1022 | remote_backlight_set_timeout_plugged(global_settings.remote_backlight_timeout_plugged); |
1023 | #endif | 1023 | #endif |
1024 | #endif | 1024 | #endif |
1025 | #ifdef CONFIG_BACKLIGHT | 1025 | #ifdef CONFIG_BACKLIGHT |
1026 | backlight_set_timeout(global_settings.backlight_timeout); | 1026 | backlight_set_timeout(global_settings.backlight_timeout); |
1027 | #ifdef HAVE_CHARGING | 1027 | #ifdef CONFIG_CHARGING |
1028 | backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged); | 1028 | backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged); |
1029 | #endif | 1029 | #endif |
1030 | #if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR) | 1030 | #if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR) |