From 4ebc6e313a4ff802dfcd3988357b43555bbb7fff Mon Sep 17 00:00:00 2001 From: Lu Zhang Date: Wed, 8 Jul 2020 17:22:33 +0800 Subject: vilboz: Add power led and battery led support. BRANCH=none BUG=b:160758409 TEST=make buildall -j Signed-off-by: Lu Zhang Change-Id: Iee9219cc05321c7518e9ff374c802c0768ff497c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2287112 Reviewed-by: Edward Hill Reviewed-by: Denis Brockus Commit-Queue: Edward Hill --- board/vilboz/led.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'board/vilboz') diff --git a/board/vilboz/led.c b/board/vilboz/led.c index 751305c184..5b8d650936 100644 --- a/board/vilboz/led.c +++ b/board/vilboz/led.c @@ -11,21 +11,20 @@ #define LED_OFF_LVL 1 #define LED_ON_LVL 0 -const int led_charge_lvl_1; -const int led_charge_lvl_2 = 100; +const int led_charge_lvl_1 = 5; +const int led_charge_lvl_2 = 97; struct led_descriptor led_bat_state_table[LED_NUM_STATES][LED_NUM_PHASES] = { - [STATE_CHARGING_LVL_1] = {{EC_LED_COLOR_GREEN, 2 * LED_ONE_SEC}, - {EC_LED_COLOR_RED, 2 * LED_ONE_SEC} }, - [STATE_CHARGING_LVL_2] = {{EC_LED_COLOR_RED, LED_INDEFINITE} }, + [STATE_CHARGING_LVL_1] = {{EC_LED_COLOR_RED, LED_INDEFINITE} }, + [STATE_CHARGING_LVL_2] = {{EC_LED_COLOR_AMBER, LED_INDEFINITE} }, [STATE_CHARGING_FULL_CHARGE] = {{EC_LED_COLOR_GREEN, LED_INDEFINITE} }, - [STATE_DISCHARGE_S0] = {{EC_LED_COLOR_GREEN, LED_INDEFINITE} }, - [STATE_DISCHARGE_S3] = {{EC_LED_COLOR_RED, 1 * LED_ONE_SEC}, - {LED_OFF, 3 * LED_ONE_SEC} }, + [STATE_DISCHARGE_S0] = {{LED_OFF, LED_INDEFINITE} }, + [STATE_DISCHARGE_S3] = {{LED_OFF, LED_INDEFINITE} }, [STATE_DISCHARGE_S5] = {{LED_OFF, LED_INDEFINITE} }, - [STATE_BATTERY_ERROR] = {{EC_LED_COLOR_GREEN, 2 * LED_ONE_SEC}, - {EC_LED_COLOR_RED, 2 * LED_ONE_SEC} }, - [STATE_FACTORY_TEST] = {{EC_LED_COLOR_GREEN, LED_INDEFINITE} }, + [STATE_BATTERY_ERROR] = {{EC_LED_COLOR_RED, 1 * LED_ONE_SEC}, + {LED_OFF, 1 * LED_ONE_SEC} }, + [STATE_FACTORY_TEST] = {{EC_LED_COLOR_RED, 2 * LED_ONE_SEC}, + {EC_LED_COLOR_GREEN, 2 * LED_ONE_SEC} }, }; BUILD_ASSERT(ARRAY_SIZE(led_bat_state_table) == LED_NUM_STATES); @@ -68,6 +67,10 @@ void led_set_color_battery(enum ec_led_colors color) gpio_set_level(GPIO_LED_FULL_L, LED_OFF_LVL); gpio_set_level(GPIO_LED_CHRG_L, LED_ON_LVL); break; + case EC_LED_COLOR_AMBER: + gpio_set_level(GPIO_LED_FULL_L, LED_ON_LVL); + gpio_set_level(GPIO_LED_CHRG_L, LED_ON_LVL); + break; default: /* LED_OFF and other unsupported colors */ gpio_set_level(GPIO_LED_FULL_L, LED_OFF_LVL); gpio_set_level(GPIO_LED_CHRG_L, LED_OFF_LVL); @@ -80,6 +83,7 @@ void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) if (led_id == EC_LED_ID_BATTERY_LED) { brightness_range[EC_LED_COLOR_GREEN] = 1; brightness_range[EC_LED_COLOR_RED] = 1; + brightness_range[EC_LED_COLOR_AMBER] = 1; } else if (led_id == EC_LED_ID_POWER_LED) { brightness_range[EC_LED_COLOR_WHITE] = 1; } @@ -92,6 +96,8 @@ int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) led_set_color_battery(EC_LED_COLOR_GREEN); else if (brightness[EC_LED_COLOR_RED] != 0) led_set_color_battery(EC_LED_COLOR_RED); + else if (brightness[EC_LED_COLOR_AMBER] != 0) + led_set_color_battery(EC_LED_COLOR_AMBER); else led_set_color_battery(LED_OFF); } else if (led_id == EC_LED_ID_POWER_LED) { -- cgit v1.2.1