diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/apps/settings.c b/apps/settings.c index 866f87879e..8ff9c7b0b0 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -72,7 +72,7 @@ const char rec_base_directory[] = REC_BASE_DIR; | |||
72 | 72 | ||
73 | 73 | ||
74 | 74 | ||
75 | #define CONFIG_BLOCK_VERSION 19 | 75 | #define CONFIG_BLOCK_VERSION 20 |
76 | #define CONFIG_BLOCK_SIZE 512 | 76 | #define CONFIG_BLOCK_SIZE 512 |
77 | #define RTC_BLOCK_SIZE 44 | 77 | #define RTC_BLOCK_SIZE 44 |
78 | 78 | ||
@@ -217,10 +217,6 @@ static const struct bit_entry rtc_bits[] = | |||
217 | {14, S_O(max_files_in_dir), 400, | 217 | {14, S_O(max_files_in_dir), 400, |
218 | "max files in dir", NULL }, /* 50...10000 */ | 218 | "max files in dir", NULL }, /* 50...10000 */ |
219 | /* battery */ | 219 | /* battery */ |
220 | #ifdef HAVE_CHARGE_CTRL | ||
221 | {1, S_O(discharge), 0, "deep discharge", off_on }, | ||
222 | {1, S_O(trickle_charge), true, "trickle charge", off_on }, | ||
223 | #endif | ||
224 | {12, S_O(battery_capacity), BATTERY_CAPACITY_MIN, "battery capacity", | 220 | {12, S_O(battery_capacity), BATTERY_CAPACITY_MIN, "battery capacity", |
225 | NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon, | 221 | NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon, |
226 | 500...1500 for Alkaline */ | 222 | 500...1500 for Alkaline */ |
@@ -762,10 +758,6 @@ void settings_apply(void) | |||
762 | #endif | 758 | #endif |
763 | 759 | ||
764 | set_poweroff_timeout(global_settings.poweroff); | 760 | set_poweroff_timeout(global_settings.poweroff); |
765 | #ifdef HAVE_CHARGE_CTRL | ||
766 | enable_deep_discharge(global_settings.discharge); | ||
767 | enable_trickle_charge(global_settings.trickle_charge); | ||
768 | #endif | ||
769 | 761 | ||
770 | set_battery_capacity(global_settings.battery_capacity); | 762 | set_battery_capacity(global_settings.battery_capacity); |
771 | #if BATTERY_TYPES_COUNT > 1 | 763 | #if BATTERY_TYPES_COUNT > 1 |