From 8405cbe461ad133aecbb9418b2d12e62f5e10277 Mon Sep 17 00:00:00 2001 From: "amber.chen" Date: Tue, 1 Dec 2020 10:53:39 +0800 Subject: lindar: modify LED function to match LED SPEC modify LED function to match LED SPEC BUG=b:174443628 BRANCH=firmware-vloteer-13521.B TEST=make -j BOARD=lindar Signed-off-by: amber.chen Change-Id: Ie51eaa92aed3c22c5452a132048f95287ea94367 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2566857 Reviewed-by: Keith Short Reviewed-by: Zhuohao Lee Commit-Queue: Keith Short --- board/lindar/gpio.inc | 4 ++-- board/lindar/led.c | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/board/lindar/gpio.inc b/board/lindar/gpio.inc index b60fb75717..50d4eb1b4a 100644 --- a/board/lindar/gpio.inc +++ b/board/lindar/gpio.inc @@ -128,8 +128,8 @@ GPIO(EC_I2C7_EEPROM_SDA, PIN(B, 2), GPIO_INPUT) GPIO(EC_BATT_PRES_ODL, PIN(E, 1), GPIO_INPUT) /* LED */ -GPIO(LED_1_L, PIN(C, 4), GPIO_OUT_HIGH) /* Battery - Green LED */ -GPIO(LED_2_L, PIN(C, 3), GPIO_OUT_HIGH) /* Battery - Red LED */ +GPIO(LED_1_L, PIN(C, 4), GPIO_OUT_HIGH) /* Battery - White LED */ +GPIO(LED_2_L, PIN(C, 3), GPIO_OUT_HIGH) /* Battery - Amber LED */ GPIO(LED_3_L, PIN(C, 2), GPIO_OUT_HIGH) /* Power - White LED */ /* Alternate functions GPIO definitions */ diff --git a/board/lindar/led.c b/board/lindar/led.c index 6f4e781404..e33db004a4 100644 --- a/board/lindar/led.c +++ b/board/lindar/led.c @@ -18,9 +18,9 @@ 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_RED, LED_INDEFINITE} }, + [STATE_CHARGING_LVL_1] = {{EC_LED_COLOR_AMBER, LED_INDEFINITE} }, [STATE_CHARGING_LVL_2] = {{EC_LED_COLOR_AMBER, LED_INDEFINITE} }, - [STATE_CHARGING_FULL_CHARGE] = {{EC_LED_COLOR_GREEN, LED_INDEFINITE} }, + [STATE_CHARGING_FULL_CHARGE] = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} }, [STATE_DISCHARGE_S0] = {{LED_OFF, LED_INDEFINITE} }, [STATE_DISCHARGE_S3] = {{LED_OFF, LED_INDEFINITE} }, [STATE_DISCHARGE_S5] = {{LED_OFF, LED_INDEFINITE} }, @@ -33,9 +33,10 @@ struct led_descriptor led_bat_state_table[LED_NUM_STATES][LED_NUM_PHASES] = { const struct led_descriptor led_pwr_state_table[PWR_LED_NUM_STATES][LED_NUM_PHASES] = { [PWR_LED_STATE_ON] = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} }, - [PWR_LED_STATE_SUSPEND_AC] = {{EC_LED_COLOR_WHITE, 3 * LED_ONE_SEC}, - {LED_OFF, 0.5 * LED_ONE_SEC} }, - [PWR_LED_STATE_SUSPEND_NO_AC] = {{LED_OFF, LED_INDEFINITE} }, + [PWR_LED_STATE_SUSPEND_AC] = {{EC_LED_COLOR_WHITE, 1 * LED_ONE_SEC}, + {LED_OFF, 3 * LED_ONE_SEC} }, + [PWR_LED_STATE_SUSPEND_NO_AC] = {{EC_LED_COLOR_WHITE, 1 * LED_ONE_SEC}, + {LED_OFF, 3 * LED_ONE_SEC} }, [PWR_LED_STATE_OFF] = {{LED_OFF, LED_INDEFINITE} }, }; @@ -58,15 +59,15 @@ void led_set_color_power(enum ec_led_colors color) void led_set_color_battery(enum ec_led_colors color) { switch (color) { - case EC_LED_COLOR_RED: + case EC_LED_COLOR_AMBER: gpio_set_level(GPIO_LED_1_L, LED_OFF_LVL); gpio_set_level(GPIO_LED_2_L, LED_ON_LVL); break; - case EC_LED_COLOR_AMBER: + case EC_LED_COLOR_RED: gpio_set_level(GPIO_LED_1_L, LED_ON_LVL); gpio_set_level(GPIO_LED_2_L, LED_ON_LVL); break; - case EC_LED_COLOR_GREEN: + case EC_LED_COLOR_WHITE: gpio_set_level(GPIO_LED_1_L, LED_ON_LVL); gpio_set_level(GPIO_LED_2_L, LED_OFF_LVL); break; -- cgit v1.2.1