1
0
Fork 0
forked from len0rd/rockbox

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
This commit is contained in:
Jörg Hohensohn 2005-03-03 08:32:55 +00:00
parent ac79a0c42b
commit d061b371d6
29 changed files with 155 additions and 211 deletions

View file

@ -231,9 +231,9 @@ eng: "Scroll Speed Setting Example"
new: "Rol Spoed Opsie Voorbeeld 12345"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Diepontlaai"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu

View file

@ -228,9 +228,9 @@ eng: "Scroll Speed Setting Example"
new: "Ñêðîëèðàíå Ñêîðîñò Íàñòðîéêè Ïðèìåð"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Iieiay ?ac?yaea"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1188,9 +1188,9 @@ eng: "Scroll Step Size Setting Example Text"
new: "Ïðèìåð"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
new: "Ðåãóëèðàíî çàðåæäàíå"
desc: LANG_TRICKLE_CHARGE
eng: ""
new: ""
id: LANG_STATUS_BAR
desc: display menu, F3 substitute

View file

@ -183,10 +183,10 @@ voice: ""
new: "Ukázka rychlosti rolování"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
voice: "Deep Discharge"
new: "Úplné vybití"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1059,10 +1059,10 @@ voice: "Scroll Speed"
new: "Rychlost rolování"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
voice: "Trickle Charge"
new: "Pøeru¹ované nabíjení"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_BATTERY_TOPOFF_CHARGE
desc: in info display, shows that top off charge is running

View file

@ -187,10 +187,10 @@ voice: ""
new: "Eksempel på rulle-hastighed"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
voice: "Deep Discharge"
new: "Dyb afladning"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1075,10 +1075,10 @@ voice: "Scroll Speed"
new: "Rulle hastighed"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
voice: "Trickle Charge"
new: "Dryp-ladning"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_BATTERY_TOPOFF_CHARGE
desc: in info display, shows that top off charge is running

View file

@ -181,10 +181,10 @@ voice: ""
new: "Beispieltext für die Scrollgeschwindigkeit"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
voice: "Vollständiges Entladen"
new: "Vollständiges Entladen"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1057,10 +1057,10 @@ voice: "Geschwindigkeit"
new: "Geschwindigkeit"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
voice: "Erhaltladen"
new: "Erhaltladen"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_BATTERY_TOPOFF_CHARGE
desc: in info display, shows that top off charge is running

View file

@ -194,9 +194,9 @@ voice: ""
new:
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
voice: "Deep Discharge"
desc: DEPRECATED
eng: ""
voice: ""
new:
id: LANG_TIME
@ -1070,9 +1070,9 @@ voice: "Scroll Speed"
new:
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
voice: "Trickle Charge"
desc: DEPRECATED
eng: ""
voice: ""
new:
id: LANG_BATTERY_TOPOFF_CHARGE

View file

@ -180,10 +180,10 @@ voice: ""
new: "Ejemplo de la velocidad de desplazamiento"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
voice: "Descarga Completa"
new: "Descarga Completa"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1170,10 +1170,10 @@ voice: "Formato del reloj"
new: "Formato del reloj"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
voice: "Carga de mantenimiento"
new: "Carga de mantenimiento"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_VOLUME_DISPLAY
desc: Volume type title

View file

@ -192,10 +192,10 @@ voice: ""
new: "Exemple de vitesse de défilement"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
voice: "Décharge complète"
new: "Décharge complète"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1068,10 +1068,10 @@ voice: "Vitesse de d
new: "Vitesse de défilement"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
voice: "Charge max persistante"
new: "Charge max persistante"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_BATTERY_TOPOFF_CHARGE
desc: in info display, shows that top off charge is running

View file

@ -230,9 +230,9 @@ eng: "Scroll Speed Setting Example"
new: "Exemplo da velocidade de desprazamento"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Descarga profunda"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1308,9 +1308,9 @@ eng: "Time Format"
new: "Formato do reloxo"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
new: "Carga Trickle"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_VOLUME_DISPLAY
desc: Volume type title

View file

@ -232,9 +232,9 @@ eng: "Scroll Speed Setting Example"
new: "ÐáñÜäåéãìá Ôá÷ýôçôáò Êýëéóçò"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "ÔÝëåéá Áðïöüñôçóç"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1202,8 +1202,8 @@ eng: "Scroll Step Size Setting Example Text"
new:
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
desc: DEPRECATED
eng: ""
### Not previously translated
new:

View file

@ -245,9 +245,9 @@ eng: "Scroll Speed Setting Example"
new: "ãåâîä ìîäéøåú äçì÷ä"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "ôéøå÷ äñåììä"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu

View file

@ -234,9 +234,9 @@ eng: "Scroll Speed Setting Example"
new: "Skrunuhraði stillingar dæmi"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Full afhlöðun"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1196,9 +1196,9 @@ eng: "Scroll Speed"
new: "Skrunahraði"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
new: "Stöðug hlöðun"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_BATTERY_TOPOFF_CHARGE
desc: in info display, shows that top off charge is running

View file

@ -232,9 +232,9 @@ eng: "Scroll Speed Setting Example"
new: "Esempio Impostazione Velocità Scorrimento"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Scarica Completa"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1196,9 +1196,9 @@ eng: "Scroll Speed"
new: "Velocità Scorrimento"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
new: "Carica Passo-Passo"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_BATTERY_TOPOFF_CHARGE
desc: in info display, shows that top off charge is running

View file

@ -151,9 +151,9 @@ eng: "Scroll Speed Setting Example"
new: "Scrollsnelheid voorbeeld"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Diepe Ontlading"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -896,9 +896,9 @@ eng: "Battery: Trickle Chg"
new: "Batterij: Druppel Laden"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
new: "Druppel Laden"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_DELETE
desc: The verb/action Delete

View file

@ -181,10 +181,10 @@ voice: ""
new: "Eksempel for rullehastighetsinnstilling"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
voice: "Deep Discharge"
new: "Total utlading"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1075,10 +1075,10 @@ voice: ""
new: "Eksempel for å sette rullesteglengde"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
voice: "Trickle Charge"
new: "Topplading"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_MENU_SETTING_CANCEL
desc: Visual confirmation of canceling a changed setting

View file

@ -235,9 +235,9 @@ eng: "Scroll Speed Setting Example"
new: "Przykladowa predkosc przesuwu"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Rozladowanie"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1201,9 +1201,9 @@ eng: "Scroll Speed"
new: "Predkosc przesuwania"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
new: "Wolne ladowanie"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_BATTERY_TOPOFF_CHARGE
desc: in info display, shows that top off charge is running

View file

@ -236,9 +236,9 @@ eng: "Scroll Speed Setting Example"
new: "Przyk³adowa prêdko¶æ przesuwu"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Roz³adowanie"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1202,9 +1202,9 @@ eng: "Scroll Speed"
new: "Prêdko¶æ przesuwania"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
new: "Wolne ³adowanie"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_BATTERY_TOPOFF_CHARGE
desc: in info display, shows that top off charge is running

View file

@ -236,9 +236,9 @@ eng: "Scroll Speed Setting Example"
new: "Exemplo de conf. da Veloc. de desloc. do ecran"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Descarga completa"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu

View file

@ -224,9 +224,9 @@ eng: "Scroll Speed Setting Example"
new: "Exemplu de viteza de defilare"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Descarcare completa"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1189,9 +1189,9 @@ eng: "Scroll Step Size Setting Example Text"
new: "Exemplu de defilare pentru testarea pasilor"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
new: "Incarcare max persistenta"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_QUEUE_FULL
desc: queue buffer full

View file

@ -175,10 +175,10 @@ voice: ""
new: "Ïðèìåð ñêîðîñòè ïðîêðóòêè"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
voice: "Deep Discharge"
new: "Ãëóáîêàÿ ðàçðÿäêà"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1069,10 +1069,10 @@ voice: ""
new: "Îáðàçåö òåêñòà äëÿ øàãà ïðîêðóòêè"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
voice: "Trickle Charge"
new: "Ïåðåçàðÿäêà èìïóëüñàìè"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_STATUS_BAR
desc: display menu, F3 substitute

View file

@ -244,9 +244,9 @@ eng: "Scroll Speed Setting Example"
new: "Preizkus hitrosti premikanja"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
new: "Izprazni"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1210,9 +1210,9 @@ eng: "Scroll Speed"
new: "Hitrost premikanja"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
new: "Trajno polnenje"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_BATTERY_TOPOFF_CHARGE
desc: in info display, shows that top off charge is running

View file

@ -180,10 +180,10 @@ voice: ""
new: "Exempel på rullningshastighet"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep Discharge"
voice: "Deep Discharge"
new: "Total urladdning"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -1074,10 +1074,10 @@ voice: ""
new: "Exempel för att sätta rullningsstegning"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
voice: "Trickle Charge"
new: "Underhållsladdning"
desc: DEPRECATED
eng: ""
voice: ""
new: ""
id: LANG_MENU_SETTING_CANCEL
desc: Visual confirmation of canceling a changed setting

View file

@ -229,9 +229,9 @@ eng: "Scroll Speed Setting Example"
new: "Kayma Hizi Ayari Ornegi"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep discharge"
new: "Tam desarj"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu

View file

@ -151,9 +151,9 @@ eng: "Scroll Speed Setting Example"
new: "Biispiltext fer dScrollgschwindigkeit"
id: LANG_DISCHARGE
desc: in settings_menu
eng: "Deep discharge"
new: "Vollständigs Entladu"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_TIME
desc: in settings_menu
@ -881,9 +881,9 @@ eng: "Scroll Speed"
new: "Scroll-Gschwindigkeit"
id: LANG_TRICKLE_CHARGE
desc: in settings_menu
eng: "Trickle Charge"
new: "Erhaltladu"
desc: DEPRECATED
eng: ""
new: ""
id: LANG_BATTERY_TOPOFF_CHARGE
desc: in info display, shows that top off charge is running

View file

@ -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

View file

@ -183,8 +183,6 @@ struct user_settings
1=always,
then according to timeout_values[] */
bool backlight_on_when_charging;
bool discharge; /* maintain charge of at least: false = 85%, true = 10% */
bool trickle_charge; /* do trickle charging: 0=off, 1=on */
int battery_capacity; /* in mAh */
int battery_type; /* for units which can take multiple types (Ondio). */

View file

@ -722,23 +722,6 @@ static bool battery_type(void)
#endif
#endif
#ifdef HAVE_CHARGE_CTRL
static bool deep_discharge(void)
{
bool result;
result = set_bool( str(LANG_DISCHARGE), &global_settings.discharge );
enable_deep_discharge(global_settings.discharge);
return result;
}
static bool trickle_charge(void)
{
bool result;
result = set_bool( str(LANG_TRICKLE_CHARGE), &global_settings.trickle_charge );
enable_trickle_charge(global_settings.trickle_charge);
return result;
}
#endif
#ifdef HAVE_RTC
static bool timedate_set(void)
{
@ -1256,10 +1239,6 @@ static bool battery_settings_menu(void)
bool result;
static const struct menu_item items[] = {
#ifdef HAVE_CHARGE_CTRL
{ ID2P(LANG_DISCHARGE), deep_discharge },
{ ID2P(LANG_TRICKLE_CHARGE), trickle_charge },
#endif
#ifndef SIMULATOR
{ ID2P(LANG_BATTERY_CAPACITY), battery_capacity },
#if BATTERY_TYPES_COUNT > 1

View file

@ -61,9 +61,8 @@
#define CHARGE_MAX_TIME_1500 450 /* minutes: maximum charging time for 1500 mAh batteries */
/* actual max time depends also on BATTERY_CAPACITY! */
#define CHARGE_MIN_TIME 10 /* minutes: minimum charging time */
#define CHARGE_RESTART_HI 85 /* %: when to restart charging in 'charge' mode */
#define CHARGE_RESTART 85 /* %: when to restart charging in 'charge' mode */
/* attention: if set too high, normal charging is started in trickle mode */
#define CHARGE_RESTART_LO 10 /* %: when to restart charging in 'discharge' mode */
#define TOPOFF_MAX_TIME 90 /* After charging, go to top off charge. How long should top off charge be? */
#define TOPOFF_VOLTAGE 565 /* which voltage is best? (centivolts) */
#define TRICKLE_MAX_TIME 12*60 /* After top off charge, go to trickle charge. How long should trickle charge be? */
@ -80,9 +79,6 @@ extern int short_delta; /* short term delta battery voltage */
extern int powermgmt_last_cycle_startstop_min; /* how many minutes ago was the charging started or stopped? */
extern int powermgmt_last_cycle_level; /* which level had the batteries at this time? */
void enable_deep_discharge(bool on); /* deep discharge the battery */
void enable_trickle_charge(bool on);
extern int trickle_sec; /* trickle charge: How many seconds per minute are we charging actually? */
#endif /* HAVE_CHARGE_CTRL */

View file

@ -145,7 +145,6 @@ int short_delta; /* short term delta battery voltage */
char power_message[POWER_MESSAGE_LEN] = ""; /* message that's shown in
debug menu */
static char charge_restart_level = CHARGE_RESTART_HI;
/* percentage at which charging
starts */
int powermgmt_last_cycle_startstop_min = 0; /* how many minutes ago was the
@ -153,7 +152,6 @@ int powermgmt_last_cycle_startstop_min = 0; /* how many minutes ago was the
stopped? */
int powermgmt_last_cycle_level = 0; /* which level had the
batteries at this time? */
bool trickle_charge_enabled = true;
int trickle_sec = 0; /* how many seconds should the
charger be enabled per
minute for trickle
@ -194,19 +192,6 @@ int powermgmt_est_runningtime_min = -1;
static bool sleeptimer_active = false;
static unsigned long sleeptimer_endtick;
#ifdef HAVE_CHARGE_CTRL
void enable_deep_discharge(bool on)
{
charge_restart_level = on ? CHARGE_RESTART_LO : CHARGE_RESTART_HI;
}
void enable_trickle_charge(bool on)
{
trickle_charge_enabled = on;
}
#endif /* HAVE_CHARGE_CTRL */
#if BATTERY_TYPES_COUNT > 1
void set_battery_type(int type)
{
@ -522,7 +507,6 @@ static void power_thread_sleep(int ticks)
{
int small_ticks;
#ifdef HAVE_CHARGING
unsigned int tmp;
bool charger_plugged;
#endif
@ -659,14 +643,14 @@ static void power_thread(void)
* the charger must have just been plugged in.
* 2) If our battery level falls below the restart level, charge!
*/
if (((charge_state == DISCHARGING) && trickle_charge_enabled) ||
(battery_level() < charge_restart_level)) {
if ((charge_state == DISCHARGING) ||
(battery_level() < CHARGE_RESTART)) {
/*
* If the battery level is nearly charged, just trickle.
* If the battery is in between, top-off and then trickle.
*/
if(battery_percent > charge_restart_level) {
if(battery_percent > CHARGE_RESTART) {
powermgmt_last_cycle_level = battery_percent;
powermgmt_last_cycle_startstop_min = 0;
if(battery_percent >= 95) {
@ -772,14 +756,9 @@ static void power_thread(void)
charge time. For trickle charging, we use 0.05C */
powermgmt_last_cycle_level = battery_percent;
powermgmt_last_cycle_startstop_min = 0;
if (trickle_charge_enabled) {
trickle_sec = START_TRICKLE_SEC;
charge_state = TRICKLE;
} else {
/* If we don't trickle charge, we discharge */
trickle_sec = 0; /* off */
charge_state = DISCHARGING;
}
}
}
else if (charge_state > CHARGING) /* top off or trickle */