From fe32456fe0e8e8db0d747172de6af179f570545f Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sun, 10 Oct 2004 10:28:21 +0000 Subject: Consistent battery capacity handling for settings and menu, adapted allowed range for Ondio git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5243 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.c | 10 +++------- apps/settings_menu.c | 3 ++- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'apps') diff --git a/apps/settings.c b/apps/settings.c index 2765ae8e52..bbb37db3f1 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -217,13 +217,9 @@ static const struct bit_entry rtc_bits[] = {1, S_O(discharge), 0, "deep discharge", off_on }, {1, S_O(trickle_charge), true, "trickle charge", off_on }, #endif -#if CONFIG_BATTERY == BATT_LIION2200 - {12, S_O(battery_capacity), 2200, "battery capacity", NULL }, /* 1500...3200 */ -#elif CONFIG_BATTERY == BATT_4AA_NIMH - {12, S_O(battery_capacity), 1500, "battery capacity", NULL }, /* 1500...3200 */ -#elif CONFIG_BATTERY == BATT_3AAA_ALKALINE - {12, S_O(battery_capacity), 1000, "battery capacity", NULL }, -#endif + {12, S_O(battery_capacity), BATTERY_CAPACITY_MIN, "battery capacity", + NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon, + 1000...2000 for Alkaline */ #ifdef HAVE_CHARGING {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, #endif diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 2579d7b4dc..8877818d43 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -703,7 +703,8 @@ static bool battery_capacity(void) { return set_int(str(LANG_BATTERY_CAPACITY), "mAh", UNIT_MAH, &global_settings.battery_capacity, - &set_battery_capacity, 50, 1500, BATTERY_CAPACITY_MAX ); + &set_battery_capacity, 50, BATTERY_CAPACITY_MIN, + BATTERY_CAPACITY_MAX ); } #endif -- cgit v1.2.3