*WIP*

sailfishos · Aug 16, 2022 · ae89907 · ae89907
1 parent 9bd6235
commit ae89907
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/modules/battery-udev.c b/modules/battery-udev.c
@@ -1720,6 +1720,15 @@ udevdevice_evaluate_battery(udevdevice_t *self, mcebat_t *mcebat)
         mcebat->battery_status = BATTERY_STATUS_OK;
         if( self->udd_full && capacity >= BATTERY_CAPACITY_FULL )
             mcebat->battery_status = BATTERY_STATUS_FULL;
+        /* Some devices never report Full state */
+        else if ( capacity >= 100 ) {
+            mcebat->battery_status = BATTERY_STATUS_FULL;
+
+            if( !self->udd_full ) {
+                mce_log(LL_WARN, "assuming end of charging due to battery capacity 100%%");
+                self->udd_full = true;
+            }
+        }
         else
             self->udd_full = false;
     }

diff --git a/modules/charging.c b/modules/charging.c
@@ -480,6 +480,9 @@ static void mch_policy_set_charging_mode(charging_mode_t charging_mode)
     mch_charging_mode = charging_mode;
     mch_charging_mode_evaluated_with_cable_connected = FALSE;
 
+    /* Clear battery full seen */
+    mch_policy_set_battery_full(false);
+
     mch_dbus_send_charging_mode(0);
     mch_policy_evaluate_charging_state();