nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some battery issues when unplugging/replugging

Browse source
This commit is contained in:
o9000 2015-05-08 23:35:44 +02:00
parent d2ee0a481f
commit 1ff028e99f
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/battery/battery.c
View file

@ -76,6 +76,9 @@ void update_battery_tick(void* arg)
int16_t old_hours = battery_state.time.hours; int16_t old_hours = battery_state.time.hours;
int8_t old_minutes = battery_state.time.minutes; int8_t old_minutes = battery_state.time.minutes;
if (!battery_found) {
init_battery();
}
if (update_battery() != 0) { if (update_battery() != 0) {
// Reconfigure // Reconfigure
init_battery(); init_battery();
@ -103,15 +106,23 @@ void update_battery_tick(void* arg)
int i; int i;
for (i = 0; i < nb_panel; i++) { for (i = 0; i < nb_panel; i++) {
if (!battery_found && panel1[i].battery.area.on_screen == 1) { if (!battery_found) {
hide(&panel1[i].battery.area); if (panel1[i].battery.area.on_screen == 1) {
panel_refresh = 1; hide(&panel1[i].battery.area);
} else if (battery_state.percentage >= percentage_hide && panel1[i].battery.area.on_screen == 1) { panel_refresh = 1;
hide(&panel1[i].battery.area); }
panel_refresh = 1; } else {
} else if (battery_state.percentage < percentage_hide && panel1[i].battery.area.on_screen == 0) { if (battery_state.percentage >= percentage_hide) {
show(&panel1[i].battery.area); if (panel1[i].battery.area.on_screen == 1) {
panel_refresh = 1; hide(&panel1[i].battery.area);
panel_refresh = 1;
}
} else {
if (panel1[i].battery.area.on_screen == 0) {
show(&panel1[i].battery.area);
panel_refresh = 1;
}
}
} }
if (panel1[i].battery.area.on_screen == 1) { if (panel1[i].battery.area.on_screen == 1) {
panel1[i].battery.area.resize = 1; panel1[i].battery.area.resize = 1;
@ -279,7 +290,7 @@ void init_battery()
#endif #endif
if (!battery_timeout) if (!battery_timeout)
battery_timeout = add_timeout(10, 10000, update_battery_tick, 0, &battery_timeout); battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
} }
@ -474,7 +485,7 @@ int update_battery() {
battery_state.time.seconds = seconds; battery_state.time.seconds = seconds;
if (energy_full > 0) if (energy_full > 0)
new_percentage = ((energy_now <= energy_full ? energy_now : energy_full) * 100) / energy_full; new_percentage = 0.5 + ((energy_now <= energy_full ? energy_now : energy_full) * 100.0) / energy_full;
battery_state.percentage = new_percentage; battery_state.percentage = new_percentage;