devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

disable charge control for FM

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3239 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Uwe Freese 2003-02-12 22:21:07 +00:00
parent faec49f9a8
commit 5e44a56b65
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/debug_menu.c
View file

@ -801,6 +801,7 @@ bool view_battery(void)
case 3: /* remeining time estimation: */ case 3: /* remeining time estimation: */
lcd_clear_display(); lcd_clear_display();
#ifdef HAVE_CHARGE_CTRL
snprintf(buf, 30, "charge_state: %d", charge_state); snprintf(buf, 30, "charge_state: %d", charge_state);
lcd_puts(0, 0, buf); lcd_puts(0, 0, buf);
@ -809,6 +810,7 @@ bool view_battery(void)
snprintf(buf, 30, "Lev.at cycle start: %d%%", powermgmt_last_cycle_level); snprintf(buf, 30, "Lev.at cycle start: %d%%", powermgmt_last_cycle_level);
lcd_puts(0, 2, buf); lcd_puts(0, 2, buf);
#endif
snprintf(buf, 30, "Last PwrHist val: %d.%02d V", snprintf(buf, 30, "Last PwrHist val: %d.%02d V",
power_history[POWER_HISTORY_LEN-1] / 100, power_history[POWER_HISTORY_LEN-1] / 100,
@ -821,9 +823,9 @@ bool view_battery(void)
snprintf(buf, 30, "Est. remaining: %d m", battery_time()); snprintf(buf, 30, "Est. remaining: %d m", battery_time());
lcd_puts(0, 6, buf); lcd_puts(0, 6, buf);
#ifdef HAVE_CHARGE_CTRL
snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec); snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec);
lcd_puts(0, 7, buf); lcd_puts(0, 7, buf);
#ifdef HAVE_CHARGE_CTRL
#endif #endif
break; break;
} }

4
apps/recorder/icons.c
View file

@ -166,8 +166,12 @@ void statusbar_icon_battery(int percent, bool charging)
#ifdef SIMULATOR #ifdef SIMULATOR
if (global_settings.battery_type) { if (global_settings.battery_type) {
#else #else
#ifdef HAVE_CHARGE_CTRL /* Recorder */
/* show graphical animation when charging instead of numbers */ /* show graphical animation when charging instead of numbers */
if ((global_settings.battery_type) && (charge_state != 1)) { if ((global_settings.battery_type) && (charge_state != 1)) {
#else /* FM */
if (global_settings.battery_type) {
#endif /* HAVE_CHARGE_CTRL */
#endif #endif
/* Numeric display */ /* Numeric display */
snprintf(buffer, sizeof(buffer), "%3d", percent); snprintf(buffer, sizeof(buffer), "%3d", percent);

6
firmware/powermgmt.c
View file

@ -105,13 +105,9 @@ int charge_state = 0; /* at the beginning, the charger
static int percent_to_volt_charge[11] = /* voltages (centivolt) of 0%, 10%, ... 100% when charging enabled */ static int percent_to_volt_charge[11] = /* voltages (centivolt) of 0%, 10%, ... 100% when charging enabled */
{ {
#ifdef HAVE_LIION
/* values guessed, see http://www.seattlerobotics.org/encoder/200210/LiIon2.pdf */ /* values guessed, see http://www.seattlerobotics.org/encoder/200210/LiIon2.pdf */
/* until someone measures voltages over a charging cycle */ /* until someone measures voltages over a charging cycle */
260, 290, 320, 340, 360, 370, 380, 390, 400, 410, 420 476, 544, 551, 556, 561, 564, 566, 576, 582, 584, 585 /* NiMH */
#else /* NiMH */
476, 544, 551, 556, 561, 564, 566, 576, 582, 584, 585
#endif
}; };
void enable_trickle_charge(bool on) void enable_trickle_charge(bool on)