diff options
author | Matt_Wang <Matt_Wang@compal.corp-partner.google.com> | 2021-08-18 10:58:20 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-08-18 07:17:04 +0000 |
commit | f16346d44ec065d1fbddaeaf3b1fdcfa8f1bc780 (patch) | |
tree | 6f8b577520e197b58116ace6843177a6c43e460d | |
parent | ab6945cb0d35e619cb2e3afd6eb588d964d11459 (diff) | |
download | chrome-ec-f16346d44ec065d1fbddaeaf3b1fdcfa8f1bc780.tar.gz |
driblee: modify LED behavior
modify LED behavior for driblee
Power LED:
System S0: White
System S0ix: Blinking white (1 sec on, 1 sec off)
System S5/G3: Off.
Battery LED:
DC mode:
System S0: off.
System S5/G3: Off.
System battery low: Blinking Amber (1 sec on, 1 sec off).
AC mode:
Charging: Amber.
Full charged: White.
Battery low or AC only: Blinking Amber (1 sec on, 1 sec off).
BUG=b:196910961
BRANCH=keeby
TEST=make BOARD=driblee
Signed-off-by: Matt_Wang <Matt_Wang@compal.corp-partner.google.com>
Change-Id: Iddd6d74a8073d8b409340a2585c45776e10388aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3102331
Tested-by: Matt Wang <matt_wang@compal.corp-partner.google.com>
Reviewed-by: Elthan Huang <elthan_huang@compal.corp-partner.google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
-rw-r--r-- | board/driblee/board.h | 2 | ||||
-rw-r--r-- | board/driblee/gpio.inc | 5 | ||||
-rw-r--r-- | board/driblee/led.c | 68 |
3 files changed, 38 insertions, 37 deletions
diff --git a/board/driblee/board.h b/board/driblee/board.h index 866c96d71b..65e4a32ea7 100644 --- a/board/driblee/board.h +++ b/board/driblee/board.h @@ -42,6 +42,8 @@ /* LED defines */ #define CONFIG_LED_ONOFF_STATES +#define CONFIG_LED_COMMON +#define CONFIG_LED_ONOFF_STATES_BAT_LOW 10 /* PWM */ #define CONFIG_PWM diff --git a/board/driblee/gpio.inc b/board/driblee/gpio.inc index 854c2c5b9c..25ab4f7ffa 100644 --- a/board/driblee/gpio.inc +++ b/board/driblee/gpio.inc @@ -64,9 +64,8 @@ GPIO(EN_BL_OD, PIN(D, 3), GPIO_ODR_LOW) GPIO(EC_CBI_WP, PIN(E, 5), GPIO_OUT_LOW) /* LED */ -GPIO(LED_B_ODL, PIN(C, 2), GPIO_OUT_HIGH) /* PWM_CH_LED2_BLUE */ -GPIO(LED_G_ODL, PIN(C, 3), GPIO_OUT_HIGH) /* PWM_CH_LED1_GREEN */ -GPIO(LED_R_ODL, PIN(C, 4), GPIO_OUT_HIGH) /* PWM_CH_LED2_ORANGE */ +GPIO(LED_1_PWR_WHITE_L, PIN(C, 3), GPIO_OUT_HIGH) +GPIO(LED_2_CHG_AMBER_L, PIN(C, 4), GPIO_OUT_HIGH) /* Power Sequencing */ GPIO(EC_AP_PSYS, PIN(B, 7), GPIO_OUT_LOW) diff --git a/board/driblee/led.c b/board/driblee/led.c index cfe6f9eb6a..cd34613a7c 100644 --- a/board/driblee/led.c +++ b/board/driblee/led.c @@ -14,66 +14,66 @@ #define LED_ON_LVL 0 #define LED_OFF_LVL 1 -__override const int led_charge_lvl_1 = 5; +__override const int led_charge_lvl_1 = 10; -__override const int led_charge_lvl_2 = 95; +__override const int led_charge_lvl_2 = 100; __override struct led_descriptor led_bat_state_table[LED_NUM_STATES][LED_NUM_PHASES] = { - [STATE_CHARGING_LVL_1] = {{EC_LED_COLOR_AMBER, LED_INDEFINITE} }, + [STATE_CHARGING_LVL_1] = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC}, + {LED_OFF, 1 * LED_ONE_SEC} }, [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_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}, + [STATE_CHARGING_FULL_CHARGE] = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} }, + [STATE_CHARGING_FULL_S5] = {{LED_OFF, LED_INDEFINITE} }, + [STATE_DISCHARGE_S0] = {{EC_LED_COLOR_WHITE, LED_INDEFINITE} }, + [STATE_DISCHARGE_S0_BAT_LOW] = {{EC_LED_COLOR_AMBER, 1 * LED_ONE_SEC}, + {LED_OFF, 1 * LED_ONE_SEC} }, + [STATE_DISCHARGE_S3] = {{EC_LED_COLOR_WHITE, 1 * LED_ONE_SEC}, + {LED_OFF, 1 * 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_WHITE, 2 * LED_ONE_SEC}, {EC_LED_COLOR_AMBER, 2 * LED_ONE_SEC} }, }; +BUILD_ASSERT(ARRAY_SIZE(led_bat_state_table) == LED_NUM_STATES); -const enum ec_led_id supported_led_ids[] = { - EC_LED_ID_BATTERY_LED -}; +const enum ec_led_id supported_led_ids[] = { EC_LED_ID_BATTERY_LED }; const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); __override void led_set_color_battery(enum ec_led_colors color) { switch (color) { - case EC_LED_COLOR_AMBER: - gpio_set_level(GPIO_LED_R_ODL, LED_ON_LVL); - gpio_set_level(GPIO_LED_B_ODL, LED_OFF_LVL); + case EC_LED_COLOR_WHITE: + gpio_set_level(GPIO_LED_1_PWR_WHITE_L, LED_ON_LVL); + gpio_set_level(GPIO_LED_2_CHG_AMBER_L, LED_OFF_LVL); break; - case EC_LED_COLOR_BLUE: - gpio_set_level(GPIO_LED_R_ODL, LED_OFF_LVL); - gpio_set_level(GPIO_LED_B_ODL, LED_ON_LVL); + case EC_LED_COLOR_AMBER: + gpio_set_level(GPIO_LED_1_PWR_WHITE_L, LED_OFF_LVL); + gpio_set_level(GPIO_LED_2_CHG_AMBER_L, LED_ON_LVL); break; default: /* LED_OFF and other unsupported colors */ - gpio_set_level(GPIO_LED_R_ODL, LED_OFF_LVL); - gpio_set_level(GPIO_LED_B_ODL, LED_OFF_LVL); + gpio_set_level(GPIO_LED_1_PWR_WHITE_L, LED_OFF_LVL); + gpio_set_level(GPIO_LED_2_CHG_AMBER_L, LED_OFF_LVL); break; } } 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_AMBER] = 1; - 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 (led_id == EC_LED_ID_BATTERY_LED) { - if (brightness[EC_LED_COLOR_BLUE] != 0) - led_set_color_battery(EC_LED_COLOR_BLUE); - else if (brightness[EC_LED_COLOR_AMBER] != 0) - led_set_color_battery(EC_LED_COLOR_AMBER); - else - led_set_color_battery(LED_OFF); - } + 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 + led_set_color_battery(LED_OFF); + return EC_SUCCESS; } |