Mirrors
/
RNode_Firmware
mirror of https://github.com/markqvist/RNode_Firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved battery calculations for devices without dedicated PMU

This commit is contained in:
Mark Qvist 2024-10-01 15:33:03 +02:00
parent 96e74246bb
commit 0b9f19916e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Display.h
View File

@ -266,14 +266,22 @@ void draw_battery_bars(int px, int py) {
if (battery_ready) { if (battery_ready) {
if (battery_installed) { if (battery_installed) {
float battery_value = battery_percent; float battery_value = battery_percent;
// Disable charging state display for now, since
// boards without dedicated PMU are completely
// unreliable for determining actual charging state.
bool disable_charge_status = false;
if (battery_indeterminate && battery_state == BATTERY_STATE_CHARGING) {
disable_charge_status = true;
}
if (battery_state == BATTERY_STATE_CHARGING) { if (battery_state == BATTERY_STATE_CHARGING && !disable_charge_status) {
battery_value = charge_tick; battery_value = charge_tick;
charge_tick += 3; charge_tick += 3;
if (charge_tick > 100) charge_tick = 0; if (charge_tick > 100) charge_tick = 0;
} }
if (battery_indeterminate && battery_state == BATTERY_STATE_CHARGING) { if (battery_indeterminate && battery_state == BATTERY_STATE_CHARGING && !disable_charge_status) {
stat_area.fillRect(px-2, py-2, 18, 7, SSD1306_BLACK); stat_area.fillRect(px-2, py-2, 18, 7, SSD1306_BLACK);
stat_area.drawBitmap(px-2, py-2, bm_plug, 17, 7, SSD1306_WHITE, SSD1306_BLACK); stat_area.drawBitmap(px-2, py-2, bm_plug, 17, 7, SSD1306_WHITE, SSD1306_BLACK);
} else { } else {

2
Power.h
View File

@ -121,7 +121,7 @@ void measure_battery() {
} }
} else { } else {
if (bat_voltage_dropping == true) { if (bat_voltage_dropping == true) {
if (bat_delay_diff > 0.008) { if (bat_delay_diff > 0.01) {
bat_voltage_dropping = false; bat_voltage_dropping = false;
bat_state_change_v = battery_voltage; bat_state_change_v = battery_voltage;
// SerialBT.printf("STATE CHANGE to CHARGE at delta=%.3fv. State change v is now %.3fv.\n", bat_delay_diff, bat_state_change_v); // SerialBT.printf("STATE CHANGE to CHARGE at delta=%.3fv. State change v is now %.3fv.\n", bat_delay_diff, bat_state_change_v);