diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2004-10-10 10:28:21 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2004-10-10 10:28:21 +0000 |
| commit | fe32456fe0e8e8db0d747172de6af179f570545f (patch) | |
| tree | d50b693a28efb8b75d214a1c612afdea1955abda /apps/settings.c | |
| parent | ccfa4cd97af5fd8a4d4868d92cb616a7959b5fa2 (diff) | |
| download | rockbox-fe32456fe0e8e8db0d747172de6af179f570545f.tar.gz rockbox-fe32456fe0e8e8db0d747172de6af179f570545f.zip | |
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
Diffstat (limited to 'apps/settings.c')
| -rw-r--r-- | apps/settings.c | 10 |
1 files changed, 3 insertions, 7 deletions
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[] = | |||
| 217 | {1, S_O(discharge), 0, "deep discharge", off_on }, | 217 | {1, S_O(discharge), 0, "deep discharge", off_on }, |
| 218 | {1, S_O(trickle_charge), true, "trickle charge", off_on }, | 218 | {1, S_O(trickle_charge), true, "trickle charge", off_on }, |
| 219 | #endif | 219 | #endif |
| 220 | #if CONFIG_BATTERY == BATT_LIION2200 | 220 | {12, S_O(battery_capacity), BATTERY_CAPACITY_MIN, "battery capacity", |
| 221 | {12, S_O(battery_capacity), 2200, "battery capacity", NULL }, /* 1500...3200 */ | 221 | NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon, |
| 222 | #elif CONFIG_BATTERY == BATT_4AA_NIMH | 222 | 1000...2000 for Alkaline */ |
| 223 | {12, S_O(battery_capacity), 1500, "battery capacity", NULL }, /* 1500...3200 */ | ||
| 224 | #elif CONFIG_BATTERY == BATT_3AAA_ALKALINE | ||
| 225 | {12, S_O(battery_capacity), 1000, "battery capacity", NULL }, | ||
| 226 | #endif | ||
| 227 | #ifdef HAVE_CHARGING | 223 | #ifdef HAVE_CHARGING |
| 228 | {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, | 224 | {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, |
| 229 | #endif | 225 | #endif |