summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorJörg Hohensohn <hohensoh@rockbox.org>2005-03-03 08:32:55 +0000
committerJörg Hohensohn <hohensoh@rockbox.org>2005-03-03 08:32:55 +0000
commitd061b371d6f53e0c2f310f4eb5776430772a8ac5 (patch)
tree611417c1cf40f66fe4d7c48e976ab3a26fbb1a22 /apps/settings.c
parentac79a0c42b19c4c3139afee467672d6e6c5b1c06 (diff)
downloadrockbox-d061b371d6f53e0c2f310f4eb5776430772a8ac5.zip
rockbox-d061b371d6f53e0c2f310f4eb5776430772a8ac5.tar.gz
rockbox-d061b371d6f53e0c2f310f4eb5776430772a8ac5.tar.bz2
rockbox-d061b371d6f53e0c2f310f4eb5776430772a8ac5.tar.xz
removed the practically useless "trickle charge" and "deep discharge" options, now trickle is always on and deep always off
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6107 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 866f878..8ff9c7b 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -72,7 +72,7 @@ const char rec_base_directory[] = REC_BASE_DIR;
-#define CONFIG_BLOCK_VERSION 19
+#define CONFIG_BLOCK_VERSION 20
#define CONFIG_BLOCK_SIZE 512
#define RTC_BLOCK_SIZE 44
@@ -217,10 +217,6 @@ static const struct bit_entry rtc_bits[] =
{14, S_O(max_files_in_dir), 400,
"max files in dir", NULL }, /* 50...10000 */
/* battery */
-#ifdef HAVE_CHARGE_CTRL
- {1, S_O(discharge), 0, "deep discharge", off_on },
- {1, S_O(trickle_charge), true, "trickle charge", off_on },
-#endif
{12, S_O(battery_capacity), BATTERY_CAPACITY_MIN, "battery capacity",
NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon,
500...1500 for Alkaline */
@@ -762,10 +758,6 @@ void settings_apply(void)
#endif
set_poweroff_timeout(global_settings.poweroff);
-#ifdef HAVE_CHARGE_CTRL
- enable_deep_discharge(global_settings.discharge);
- enable_trickle_charge(global_settings.trickle_charge);
-#endif
set_battery_capacity(global_settings.battery_capacity);
#if BATTERY_TYPES_COUNT > 1