diff options
| author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-10-08 17:45:52 +0000 |
|---|---|---|
| committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-10-08 17:45:52 +0000 |
| commit | 43079ea07f13a7631cd3c0e5993638235427a476 (patch) | |
| tree | 13ff7f3370f2793797fe9bd51e4e459a5dda695f /apps | |
| parent | 5cf1c97aea10864ecb6c3836a5c17845a5906d79 (diff) | |
| download | rockbox-43079ea07f13a7631cd3c0e5993638235427a476.zip rockbox-43079ea07f13a7631cd3c0e5993638235427a476.tar.gz rockbox-43079ea07f13a7631cd3c0e5993638235427a476.tar.bz2 rockbox-43079ea07f13a7631cd3c0e5993638235427a476.tar.xz | |
multiple battery types prepared (CONFIG_BATTERY)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5227 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings.c | 6 | ||||
| -rw-r--r-- | apps/status.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c index 10333b1..bd7ce43 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -213,10 +213,12 @@ 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 -#ifdef HAVE_LIION +#if CONFIG_BATTERY == BATT_LIION2200 {12, S_O(battery_capacity), 2200, "battery capacity", NULL }, /* 1500...3200 */ -#else +#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 {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, diff --git a/apps/status.c b/apps/status.c index 84a3f8d..248f9b9 100644 --- a/apps/status.c +++ b/apps/status.c @@ -172,7 +172,7 @@ void status_draw(bool force_redraw) if (info.inserted) { battery_state = true; plug_state = true; -#if defined(HAVE_CHARGE_CTRL) || defined(HAVE_LIION) +#if defined(HAVE_CHARGE_CTRL) || CONFIG_BATTERY == BATT_LIION2200 /* zero battery run time if charging */ if (charge_state > 0) { global_settings.runtime = 0; |