diff options
| author | Yu-An Chen <yu-an.chen@quanta.corp-partner.google.com> | 2020-03-03 16:21:51 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-05 09:22:51 +0000 |
| commit | 73477d6694e24b931d55c6f36cbc904f2cb602bc (patch) | |
| tree | 956b5079d24e3a5dfe901c3a061d0a66a4e937ab /board/dood | |
| parent | 1500273ac4f048454bdc1f1846e57ec7292c71d4 (diff) | |
| download | chrome-ec-73477d6694e24b931d55c6f36cbc904f2cb602bc.tar.gz | |
Dood: Modify battery LED behavior and color label
Modify battery LED behavior to 1 sec ON 3 sec OFF when battery error.
Modify the color of the LED from blue to white.
BUG=b:150180166
BRANCH=octopus
TEST=Manual check battery LED behavior under battery error.
LED colors is correct after changes.
Signed-off-by: Yu-An Chen <yu-an.chen@quanta.corp-partner.google.com>
Change-Id: Id165df02500093ce69a9ddacf7eea641c49f1369
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2087432
Reviewed-by: Henry Sun <henrysun@google.com>
Commit-Queue: Henry Sun <henrysun@google.com>
Tested-by: Henry Sun <henrysun@google.com>
Diffstat (limited to 'board/dood')
| -rw-r--r-- | board/dood/board.c | 4 | ||||
| -rw-r--r-- | board/dood/gpio.inc | 4 | ||||
| -rw-r--r-- | board/dood/led.c | 28 |
3 files changed, 18 insertions, 18 deletions
diff --git a/board/dood/board.c b/board/dood/board.c index 3a7b529854..ae2785b786 100644 --- a/board/dood/board.c +++ b/board/dood/board.c @@ -253,8 +253,8 @@ void board_hibernate_late(void) const uint32_t hibernate_pins[][2] = { /* Turn off LEDs before going to hibernate */ - {GPIO_BAT_LED_BLUE_L, GPIO_INPUT | GPIO_PULL_UP}, - {GPIO_BAT_LED_ORANGE_L, GPIO_INPUT | GPIO_PULL_UP}, + {GPIO_BAT_LED_WHITE_L, GPIO_INPUT | GPIO_PULL_UP}, + {GPIO_BAT_LED_AMBER_L, GPIO_INPUT | GPIO_PULL_UP}, }; for (i = 0; i < ARRAY_SIZE(hibernate_pins); ++i) diff --git a/board/dood/gpio.inc b/board/dood/gpio.inc index b6b9ca6535..6b1b7269a6 100644 --- a/board/dood/gpio.inc +++ b/board/dood/gpio.inc @@ -127,8 +127,8 @@ GPIO(USB_C1_HPD_1V8_ODL, PIN(C, 6), GPIO_INPUT | /* C1 DP Hotplug Detect */ GPIO_SEL_1P8V) /* LED */ -GPIO(BAT_LED_ORANGE_L, PIN(C, 3), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN) /* LED_1_L */ -GPIO(BAT_LED_BLUE_L, PIN(C, 4), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN) /* LED_2_L */ +GPIO(BAT_LED_AMBER_L, PIN(C, 3), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN) /* LED_1_L */ +GPIO(BAT_LED_WHITE_L, PIN(C, 4), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN) /* LED_2_L */ GPIO(LED_3_L, PIN(D, 7), GPIO_OUT_HIGH) /* Keyboard Backlight */ diff --git a/board/dood/led.c b/board/dood/led.c index 6ae461b9ff..a120e7c801 100644 --- a/board/dood/led.c +++ b/board/dood/led.c @@ -20,14 +20,14 @@ const int led_charge_lvl_2 = 100; /* Dood: Note there is only LED for charge / power */ struct led_descriptor led_bat_state_table[LED_NUM_STATES][LED_NUM_PHASES] = { [STATE_CHARGING_LVL_2] = {{EC_LED_COLOR_AMBER, LED_INDEFINITE} }, - [STATE_CHARGING_FULL_CHARGE] = {{EC_LED_COLOR_BLUE, LED_INDEFINITE} }, - [STATE_DISCHARGE_S0] = {{EC_LED_COLOR_BLUE, LED_INDEFINITE} }, + [STATE_CHARGING_FULL_CHARGE] = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} }, + [STATE_DISCHARGE_S0] = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} }, [STATE_DISCHARGE_S3] = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC}, {LED_OFF, 3 * LED_ONE_SEC} }, [STATE_DISCHARGE_S5] = {{LED_OFF, LED_INDEFINITE} }, [STATE_BATTERY_ERROR] = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC}, - {LED_OFF, 1 * LED_ONE_SEC} }, - [STATE_FACTORY_TEST] = {{EC_LED_COLOR_BLUE, 2 * LED_ONE_SEC}, + {LED_OFF, 3 * LED_ONE_SEC} }, + [STATE_FACTORY_TEST] = {{EC_LED_COLOR_WHITE, 2 * LED_ONE_SEC}, {EC_LED_COLOR_AMBER, 2 * LED_ONE_SEC} }, }; @@ -38,31 +38,31 @@ const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); void led_set_color_battery(enum ec_led_colors color) { switch (color) { - case EC_LED_COLOR_BLUE: - gpio_set_level(GPIO_BAT_LED_BLUE_L, LED_ON_LVL); - gpio_set_level(GPIO_BAT_LED_ORANGE_L, LED_OFF_LVL); + case EC_LED_COLOR_WHITE: + gpio_set_level(GPIO_BAT_LED_WHITE_L, LED_ON_LVL); + gpio_set_level(GPIO_BAT_LED_AMBER_L, LED_OFF_LVL); break; case EC_LED_COLOR_AMBER: - gpio_set_level(GPIO_BAT_LED_BLUE_L, LED_OFF_LVL); - gpio_set_level(GPIO_BAT_LED_ORANGE_L, LED_ON_LVL); + gpio_set_level(GPIO_BAT_LED_WHITE_L, LED_OFF_LVL); + gpio_set_level(GPIO_BAT_LED_AMBER_L, LED_ON_LVL); break; default: /* LED_OFF and other unsupported colors */ - gpio_set_level(GPIO_BAT_LED_BLUE_L, LED_OFF_LVL); - gpio_set_level(GPIO_BAT_LED_ORANGE_L, LED_OFF_LVL); + gpio_set_level(GPIO_BAT_LED_WHITE_L, LED_OFF_LVL); + gpio_set_level(GPIO_BAT_LED_AMBER_L, LED_OFF_LVL); break; } } void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) { - brightness_range[EC_LED_COLOR_BLUE] = 1; + brightness_range[EC_LED_COLOR_WHITE] = 1; brightness_range[EC_LED_COLOR_AMBER] = 1; } int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) { - if (brightness[EC_LED_COLOR_BLUE] != 0) - led_set_color_battery(EC_LED_COLOR_BLUE); + if (brightness[EC_LED_COLOR_WHITE] != 0) + led_set_color_battery(EC_LED_COLOR_WHITE); else if (brightness[EC_LED_COLOR_AMBER] != 0) led_set_color_battery(EC_LED_COLOR_AMBER); else |