From 344c2fb865620f149dc16ed26fafcb882b958653 Mon Sep 17 00:00:00 2001 From: "git-cloud_lin.compal.com" Date: Tue, 4 Mar 2014 15:16:33 +0800 Subject: Big: implement the power and battery LED behavior Remove power_led_task and add the big-specific LED logic BRANCH=big BUG=None TEST=manually >> ectool led power blue: PWR LED blue >> ectool led power yellow: PWR LED orange >> ectool led power off: PWR LED off >> ectool led power auto: PWR LED auto control >> ectool led battery blue: BAT LED blue >> ectool led battery yellow: BAT LED orange >> ectool led battery off: BAT LED off >> ectool led battery auto: BAT LED auto control Signed-off-by: Cloud Lin Change-Id: I5ded361a46c627e4e4e6fcb6bddea9b487a46768 Reviewed-on: https://chromium-review.googlesource.com/188631 Reviewed-by: Yung-chieh Lo Commit-Queue: Lin Cloud Tested-by: Lin Cloud --- board/big/board.c | 6 +- board/big/board.h | 3 +- board/big/build.mk | 4 +- board/big/ec.tasklist | 3 +- board/big/led.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 board/big/led.c diff --git a/board/big/board.c b/board/big/board.c index 4cf2dac7b9..26ae2f9395 100644 --- a/board/big/board.c +++ b/board/big/board.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2014 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -64,8 +64,8 @@ const struct gpio_info gpio_list[] = { {"ENTERING_RW", GPIO_H, (1<<0), GPIO_OUT_LOW, NULL}, {"I2C1_SCL", GPIO_B, (1<<6), GPIO_ODR_HIGH, NULL}, {"I2C1_SDA", GPIO_B, (1<<7), GPIO_ODR_HIGH, NULL}, - {"I2C2_SCL", GPIO_B, (1<<10), GPIO_ODR_HIGH, NULL}, - {"I2C2_SDA", GPIO_B, (1<<11), GPIO_ODR_HIGH, NULL}, + {"I2C2_SCL", GPIO_B, (1<<10), GPIO_OUT_LOW, NULL}, + {"I2C2_SDA", GPIO_B, (1<<11), GPIO_OUT_LOW, NULL}, {"LED_POWER_L", GPIO_A, (1<<2), GPIO_OUT_HIGH, NULL}, /* PWR_LED1 */ {"PMIC_PWRON_L", GPIO_A, (1<<12), GPIO_OUT_HIGH, NULL}, {"PMIC_RESET", GPIO_A, (1<<15), GPIO_OUT_LOW, NULL}, diff --git a/board/big/board.h b/board/big/board.h index cd51279259..feaba4dc36 100644 --- a/board/big/board.h +++ b/board/big/board.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2014 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -23,6 +23,7 @@ #define CONFIG_PWM #define CONFIG_POWER_BUTTON #define CONFIG_VBOOT_HASH +#define CONFIG_LED_COMMON #ifndef __ASSEMBLER__ diff --git a/board/big/build.mk b/board/big/build.mk index c950c382d6..605af9c169 100644 --- a/board/big/build.mk +++ b/board/big/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +# Copyright (c) 2014 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -10,4 +10,4 @@ CHIP:=stm32 CHIP_FAMILY:=stm32l CHIP_VARIANT:=stm32l100 -board-y=board.o battery.o +board-y=board.o battery.o led.o diff --git a/board/big/ec.tasklist b/board/big/ec.tasklist index dcdca4df28..17add5094d 100644 --- a/board/big/ec.tasklist +++ b/board/big/ec.tasklist @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2014 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -16,7 +16,6 @@ */ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_NOTEST(POWERLED, power_led_task, NULL, 256) \ TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \ diff --git a/board/big/led.c b/board/big/led.c new file mode 100644 index 0000000000..0d3b33567d --- /dev/null +++ b/board/big/led.c @@ -0,0 +1,170 @@ +/* Copyright (c) 2014 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + * + * Battery LED and Power LED control for Big + */ + +#include "gpio.h" +#include "hooks.h" +#include "battery.h" +#include "charge_state.h" +#include "chipset.h" +#include "led_common.h" +#include "util.h" + +const enum ec_led_id supported_led_ids[] = { + EC_LED_ID_BATTERY_LED, EC_LED_ID_POWER_LED}; + +const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); + +enum led_color { + LED_OFF = 0, + LED_BLUE, + LED_ORANGE, + LED_COLOR_COUNT /* Number of colors, not a color itself */ +}; + +static int bat_led_set_color(enum led_color color) +{ + switch (color) { + case LED_OFF: + gpio_set_level(GPIO_CHARGING, 0); + gpio_set_level(GPIO_BAT_LED1, 0); + break; + case LED_BLUE: + gpio_set_level(GPIO_CHARGING, 0); + gpio_set_level(GPIO_BAT_LED1, 1); + break; + case LED_ORANGE: + gpio_set_level(GPIO_CHARGING, 1); + gpio_set_level(GPIO_BAT_LED1, 0); + break; + default: + return EC_ERROR_UNKNOWN; + } + return EC_SUCCESS; +} + +static int pwr_led_set_color(enum led_color color) +{ + switch (color) { + case LED_OFF: + gpio_set_level(GPIO_LED_POWER_L, 0); + gpio_set_level(GPIO_PWR_LED0, 0); + break; + case LED_BLUE: + gpio_set_level(GPIO_LED_POWER_L, 1); + gpio_set_level(GPIO_PWR_LED0, 0); + break; + case LED_ORANGE: + gpio_set_level(GPIO_LED_POWER_L, 0); + gpio_set_level(GPIO_PWR_LED0, 1); + break; + default: + return EC_ERROR_UNKNOWN; + } + return EC_SUCCESS; +} + +void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) +{ + /* Ignoring led_id as both leds support the same colors */ + brightness_range[EC_LED_COLOR_BLUE] = 1; + brightness_range[EC_LED_COLOR_YELLOW] = 1; +} + +int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) +{ + switch (led_id) { + case EC_LED_ID_BATTERY_LED: + if (brightness[EC_LED_COLOR_BLUE] != 0) + bat_led_set_color(LED_BLUE); + else if (brightness[EC_LED_COLOR_YELLOW] != 0) + bat_led_set_color(LED_ORANGE); + else + bat_led_set_color(LED_OFF); + break; + case EC_LED_ID_POWER_LED: + if (brightness[EC_LED_COLOR_BLUE] != 0) + pwr_led_set_color(LED_BLUE); + else if (brightness[EC_LED_COLOR_YELLOW] != 0) + pwr_led_set_color(LED_ORANGE); + else + pwr_led_set_color(LED_OFF); + break; + default: + return EC_ERROR_UNKNOWN; + } + return EC_SUCCESS; +} + +static void big_led_set_power(void) +{ + static int power_second; + + power_second++; + + /* PWR LED behavior: + * Power on: Blue + * Suspend: Orange in breeze mode ( 1 sec on/ 3 sec off) + * Power off: OFF + */ + if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) + pwr_led_set_color(LED_OFF); + else if (chipset_in_state(CHIPSET_STATE_ON)) + pwr_led_set_color(LED_BLUE); + else if (chipset_in_state(CHIPSET_STATE_SUSPEND)) + pwr_led_set_color((power_second & 3) ? LED_OFF : LED_ORANGE); +} + +static void big_led_set_battery(void) +{ + static int battery_second; + + battery_second++; + + /* BAT LED behavior: + * Fully charged: Blue + * Under charging: Orange + * Battery low (10%): Orange in breeze mode (1 sec on, 3 sec off) + * Battery critical low (less than 3%) or abnormal battery + * situation: Orange in blinking mode (1 sec on, 1 sec off) + * Using battery or not connected to AC power: OFF + */ + switch (charge_get_state()) { + case PWR_STATE_CHARGE: + bat_led_set_color(LED_ORANGE); + break; + case PWR_STATE_DISCHARGE: + if (charge_get_percent() < 3) + bat_led_set_color((battery_second & 1) + ? LED_OFF : LED_ORANGE); + else if (charge_get_percent() < 10) + bat_led_set_color((battery_second & 3) + ? LED_OFF : LED_ORANGE); + else + bat_led_set_color(LED_OFF); + break; + case PWR_STATE_ERROR: + bat_led_set_color((battery_second & 1) ? LED_OFF : LED_ORANGE); + break; + case PWR_STATE_CHARGE_NEAR_FULL: + bat_led_set_color(LED_BLUE); + break; + default: + /* Other states don't alter LED behavior */ + break; + } +} + +/** * Called by hook task every 1 sec */ +static void led_second(void) +{ + if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED)) + big_led_set_power(); + if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED)) + big_led_set_battery(); +} +DECLARE_HOOK(HOOK_SECOND, led_second, HOOK_PRIO_DEFAULT); + -- cgit v1.2.1