Merge branch 'master' into fix-led-status-confusion

Fix LED state handling in StatusLEDModule to clarify power state conditions
2026-06-06 18:38:52 +00:00 · 2026-04-23 18:21:33 -05:00 · 2026-04-19 08:15:46 -05:00
1 changed files with 2 additions and 4 deletions
@@ -78,8 +78,6 @@ int32_t StatusLEDModule::runOnce()
 #ifndef POWER_LED_HARDWARE_BLINKS_WHILE_CHARGING
        CHARGE_LED_state = !CHARGE_LED_state;
 #endif
-    } else if (power_state == charged) {
-        CHARGE_LED_state = LED_STATE_ON;
    } else if (power_state == critical) {
        if (POWER_LED_starttime + 30000 < millis() && !doing_fast_blink) {
            doing_fast_blink = true;
@@ -96,7 +94,7 @@ int32_t StatusLEDModule::runOnce()
        }
    }

-    if (power_state != charging && power_state != charged && !doing_fast_blink) {
+    if (power_state != charging && !doing_fast_blink) {
        if (CHARGE_LED_state == LED_STATE_ON) {
            CHARGE_LED_state = LED_STATE_OFF;
            my_interval = 999;
@@ -145,7 +143,7 @@ int32_t StatusLEDModule::runOnce()
 #if defined(HAS_PMU)
    if (pmu_found && PMU) {
        // blink the axp led
-        PMU->setChargingLedMode(CHARGE_LED_state ? XPOWERS_CHG_LED_ON : XPOWERS_CHG_LED_OFF);
+        PMU->setChargingLedMode((CHARGE_LED_state == LED_STATE_ON) ? XPOWERS_CHG_LED_ON : XPOWERS_CHG_LED_OFF);
    }
 #endif
Author	SHA1	Message	Date
Jonathan Bennett	f65f3e5645	Merge branch 'master' into fix-led-status-confusion	2026-04-23 18:21:33 -05:00
Ben Meadors	c78abc2073	Fix LED state handling in StatusLEDModule to clarify power state conditions	2026-04-19 08:15:46 -05:00