From ab8546a7b774cf94e13ed39cb445b70440b87e22 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 30 Jun 2020 08:05:49 -0600
Subject: [PATCH] Alternative detection of battery charged

---
 src/board/system76/common/acpi.c  | 2 +-
 src/board/system76/common/power.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/board/system76/common/acpi.c b/src/board/system76/common/acpi.c
index f7ff78a..c8fe68e 100644
--- a/src/board/system76/common/acpi.c
+++ b/src/board/system76/common/acpi.c
@@ -94,7 +94,7 @@ uint8_t acpi_read(uint8_t addr) {
             // If AC adapter connected
             if (!gpio_get(&ACIN_N)) {
                 // And battery is not fully charged
-                if (!(battery_status & 0x0020)) {
+                if (battery_current != 0) {
                     // Battery is charging
                     data |= 1 << 1;
                 }
diff --git a/src/board/system76/common/power.c b/src/board/system76/common/power.c
index 6eb40fa..e9f947d 100644
--- a/src/board/system76/common/power.c
+++ b/src/board/system76/common/power.c
@@ -531,7 +531,7 @@ void power_event(void) {
         // Discharging (no AC adapter)
         gpio_set(&LED_BAT_CHG, false);
         gpio_set(&LED_BAT_FULL, false);
-    } else if (battery_status & 0x0020) {
+    } else if (battery_current == 0) {
         // Fully charged
         // TODO: turn off charger
         gpio_set(&LED_BAT_CHG, false);