diff options
| author | Devin Lu <devin.lu@quantatw.com> | 2019-04-08 10:57:54 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-20 03:58:23 -0700 |
| commit | d8fb8d23c9ae774bce3f345c882c880e25d1790c (patch) | |
| tree | 3c19ef81d5ee18ed934e17acea0bad35052a0d58 /common | |
| parent | 6be7489b25a9cdaa4253fdf604514097b7105352 (diff) | |
| download | chrome-ec-d8fb8d23c9ae774bce3f345c882c880e25d1790c.tar.gz | |
common: led_onoff_states: add new LED state for fully charged in S5
Synchronize with CL:1419477 to common/led_onoff_states.
BUG=none
BRANCH=none
TEST=make buildall -j
Change-Id: Ibb5d9150f03cb7a584d7439bc47d5b59de856502
Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Reviewed-on: https://chromium-review.googlesource.com/1556859
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Karthikeyan Ramasubramanian <kramasub@chromium.org>
Reviewed-by: Marco Chen <marcochen@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/led_onoff_states.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/common/led_onoff_states.c b/common/led_onoff_states.c index 823fa67e26..c82cc2d17c 100644 --- a/common/led_onoff_states.c +++ b/common/led_onoff_states.c @@ -32,11 +32,17 @@ static enum led_states led_get_state(void) else if (charge_lvl < led_charge_lvl_2) new_state = STATE_CHARGING_LVL_2; else - new_state = STATE_CHARGING_FULL_CHARGE; + if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) + new_state = STATE_CHARGING_FULL_S5; + else + new_state = STATE_CHARGING_FULL_CHARGE; break; case PWR_STATE_DISCHARGE_FULL: if (extpower_is_present()) { - new_state = STATE_CHARGING_FULL_CHARGE; + if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) + new_state = STATE_CHARGING_FULL_S5; + else + new_state = STATE_CHARGING_FULL_CHARGE; break; } /* Intentional fall-through */ @@ -58,7 +64,10 @@ static enum led_states led_get_state(void) new_state = STATE_BATTERY_ERROR; break; case PWR_STATE_CHARGE_NEAR_FULL: - new_state = STATE_CHARGING_FULL_CHARGE; + if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) + new_state = STATE_CHARGING_FULL_S5; + else + new_state = STATE_CHARGING_FULL_CHARGE; break; case PWR_STATE_IDLE: /* External power connected in IDLE */ if (charge_get_flags() & CHARGE_FLAG_FORCE_IDLE) @@ -88,6 +97,14 @@ static void led_update_battery(void) * continue using the previous one. */ if (desired_state != led_state && desired_state < LED_NUM_STATES) { + /* + * Allow optional CHARGING_FULL_S5 state to fall back to + * FULL_CHARGE if not defined. + */ + if (desired_state == STATE_CHARGING_FULL_S5 && + led_bat_state_table[desired_state][LED_PHASE_0].time == 0) + desired_state = STATE_CHARGING_FULL_CHARGE; + /* State is changing */ led_state = desired_state; /* Reset ticks and period when state changes */ |