From 7cf0b1514bcea41dd11c4fd0ad9865ef824b2c3d Mon Sep 17 00:00:00 2001 From: li feng Date: Wed, 13 Jan 2016 12:13:12 -0800 Subject: glados / kunimitsu: led: battery LED blinking on low battery If no charger connected, battery LED blinks when battery is low/critical; and it should stop blinking once system is in S5/G3. BUG=chrome-os-partner:48718 BRANCH=none TEST=Verified on Kunimitsu when OS shutdown system due to critical battery and enter S5/G3, battery LED stops blinking. Change-Id: I9349a9938a548ce675999579f749bd5dae3c399f Signed-off-by: li feng Reviewed-on: https://chromium-review.googlesource.com/321794 Commit-Ready: Li1 Feng Tested-by: Li1 Feng Reviewed-by: Shawn N --- board/glados/led.c | 6 ++++-- board/kunimitsu/led.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/board/glados/led.c b/board/glados/led.c index 259a08f2c6..ef6c5d9b76 100644 --- a/board/glados/led.c +++ b/board/glados/led.c @@ -122,12 +122,14 @@ static void glados_led_set_battery(void) break; case PWR_STATE_DISCHARGE: /* Less than 3%, blink one second every two second */ - if (charge_get_percent() < CRITICAL_LOW_BATTERY_PERCENTAGE) + if (!chipset_in_state(CHIPSET_STATE_ANY_OFF) && + charge_get_percent() < CRITICAL_LOW_BATTERY_PERCENTAGE) glados_led_set_color_battery( (battery_ticks % LED_TOTAL_2SECS_TICKS < LED_ON_1SEC_TICKS) ? LED_AMBER : LED_OFF); /* Less than 10%, blink one second every four seconds */ - else if (charge_get_percent() < LOW_BATTERY_PERCENTAGE) + else if (!chipset_in_state(CHIPSET_STATE_ANY_OFF) && + charge_get_percent() < LOW_BATTERY_PERCENTAGE) glados_led_set_color_battery( (battery_ticks % LED_TOTAL_4SECS_TICKS < LED_ON_1SEC_TICKS) ? LED_AMBER : LED_OFF); diff --git a/board/kunimitsu/led.c b/board/kunimitsu/led.c index 058d7e7594..70f6f863d0 100644 --- a/board/kunimitsu/led.c +++ b/board/kunimitsu/led.c @@ -114,12 +114,14 @@ static void kunimitsu_led_set_battery(void) break; case PWR_STATE_DISCHARGE: /* Less than 3%, blink one second every two second */ - if (charge_get_percent() < CRITICAL_LOW_BATTERY_PERCENTAGE) + if (!chipset_in_state(CHIPSET_STATE_ANY_OFF) && + charge_get_percent() < CRITICAL_LOW_BATTERY_PERCENTAGE) kunimitsu_led_set_color_battery( (battery_ticks % LED_TOTAL_2SECS_TICKS < LED_ON_1SEC_TICKS) ? LED_AMBER : LED_OFF); /* Less than 10%, blink one second every four seconds */ - else if (charge_get_percent() < LOW_BATTERY_PERCENTAGE) + else if (!chipset_in_state(CHIPSET_STATE_ANY_OFF) && + charge_get_percent() < LOW_BATTERY_PERCENTAGE) kunimitsu_led_set_color_battery( (battery_ticks % LED_TOTAL_4SECS_TICKS < LED_ON_1SEC_TICKS) ? LED_AMBER : LED_OFF); -- cgit v1.2.1