Banjo: led control

New led control from Yuna since it is close to CrOS UI.

BUG=none
BRANCH=banjo
TEST="make BOARD=banjo"

Change-Id: If7315c7da67f1d08ca0ed4cb584950f9c14dfeee
Signed-off-by: Henry Hsu <Henry.Hsu@quantatw.com>
Reviewed-on: https://chromium-review.googlesource.com/253330
Reviewed-by: Mohammed Habibulla <moch@chromium.org>

2 files changed, 68 insertions, 46 deletions

diff --git a/board/banjo/board.h b/board/banjo/board.h
index 20f086ee3e..bacb748b35 100644
--- a/board/banjo/board.h
+++ b/board/banjo/board.h
@@ -11,9 +11,6 @@
 /* Optional features */
 #define CONFIG_AP_HANG_DETECT
 #define CONFIG_BACKLIGHT_LID
-#define CONFIG_BATTERY_LEVEL_CRITICAL 7
-#define CONFIG_BATTERY_LEVEL_LOW 13
-#define CONFIG_BATTERY_LEVEL_NEAR_FULL 95
 #define CONFIG_BATTERY_SMART
 #define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
diff --git a/board/banjo/led.c b/board/banjo/led.c
index 51c816906a..0a818aaddd 100644
--- a/board/banjo/led.c
+++ b/board/banjo/led.c
@@ -9,11 +9,21 @@
 #include "chipset.h"
 #include "gpio.h"
 #include "hooks.h"
+#include "host_command.h"
 #include "led_common.h"
 #include "pwm.h"
 #include "util.h"
 #include "extpower.h"
 
+#define CRITICAL_LOW_BATTERY_PERMILLAGE 71
+#define LOW_BATTERY_PERMILLAGE 137
+#define FULL_BATTERY_PERMILLAGE 937
+
+#define LED_TOTAL_4SECS_TICKS 16
+#define LED_TOTAL_2SECS_TICKS 8
+#define LED_ON_1SEC_TICKS 4
+#define LED_ON_2SECS_TICKS 8
+
 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);
@@ -101,7 +111,7 @@ DECLARE_HOOK(HOOK_INIT, led_init, HOOK_PRIO_DEFAULT);
  */
 static void power_led(void)
 {
-	static unsigned power_ticks;
+	static unsigned int power_ticks;
 	static int previous_state_suspend;
 
 	power_ticks++;
@@ -114,13 +124,12 @@ static void power_led(void)
 		if (!previous_state_suspend)
 			power_ticks = 0;
 
-	/* If chipset state in suspend, blink orange, 25% duty cycle,
-	 * 4 sec period.
-	 */
-			set_color_power_led((power_ticks % 16) < 4 ?
-				     LED_ORANGE : LED_OFF);
-			previous_state_suspend = 1;
-			return;
+		/* Blink once every four seconds. */
+		set_color_power_led((power_ticks % LED_TOTAL_4SECS_TICKS <
+				    LED_ON_1SEC_TICKS) ? LED_ORANGE : LED_OFF);
+
+		previous_state_suspend = 1;
+		return;
 	}
 
 	previous_state_suspend = 0;
@@ -134,49 +143,65 @@ static void power_led(void)
 
 static void battery_led(void)
 {
-	struct batt_params batt;
-	static unsigned battery_ticks;
-	int chstate = charge_get_state();
+	static unsigned int battery_ticks;
+	uint32_t chflags = charge_get_flags();
+	int remaining_capacity;
+	int full_charge_capacity;
+	int permillage;
+
 	battery_ticks++;
 
-	battery_get_params(&batt);
 	/* If we don't control the LED, nothing to do */
 	if (!led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
 		return;
 
-	/* If Battery critical Low, blink orange, 50% duty cycle,
-	 * 2 sec period.
-	 */
-	if (!extpower_is_present() && chipset_in_state(CHIPSET_STATE_ON) &&
-	    (batt.state_of_charge <= CONFIG_BATTERY_LEVEL_CRITICAL)) {
-		set_color_battery_led((battery_ticks & 0x4) ?
-				      LED_ORANGE : LED_OFF);
-		return;
-	}
-
-	/* If Battery Low, blink orange, 25% duty cycle, 4 sec period */
-	if (!extpower_is_present() && chipset_in_state(CHIPSET_STATE_ON) &&
-	    (batt.state_of_charge <= CONFIG_BATTERY_LEVEL_LOW)) {
-		set_color_battery_led((battery_ticks % 16) < 4 ?
-				      LED_ORANGE : LED_OFF);
-		return;
-	}
-
-	/* If the system is charging, solid orange */
-	if (chstate == PWR_STATE_CHARGE) {
-		set_color_battery_led(LED_ORANGE);
-		return;
-	}
-
-	/* If AC connected and fully charged (or close to it), solid blue */
-	if (chstate == PWR_STATE_CHARGE_NEAR_FULL ||
-	    chstate == PWR_STATE_IDLE) {
+	remaining_capacity = *(int *)host_get_memmap(EC_MEMMAP_BATT_CAP);
+	full_charge_capacity = *(int *)host_get_memmap(EC_MEMMAP_BATT_LFCC);
+	permillage = !full_charge_capacity ? 0 :
+		(1000 * remaining_capacity) / full_charge_capacity;
+
+	switch (charge_get_state()) {
+	case PWR_STATE_CHARGE:
+		/* Make the percentage approximate to UI shown */
+		set_color_battery_led(permillage <
+			FULL_BATTERY_PERMILLAGE ? LED_ORANGE : LED_BLUE);
+		break;
+	case PWR_STATE_CHARGE_NEAR_FULL:
 		set_color_battery_led(LED_BLUE);
-		return;
+		break;
+	case PWR_STATE_DISCHARGE:
+		/* Less than 3%, blink one second every two seconds */
+		if (!chipset_in_state(CHIPSET_STATE_ANY_OFF) &&
+		    permillage <= CRITICAL_LOW_BATTERY_PERMILLAGE)
+			set_color_battery_led(
+				(battery_ticks % LED_TOTAL_2SECS_TICKS <
+				 LED_ON_1SEC_TICKS) ? LED_ORANGE : LED_OFF);
+		/* Less than 10%, blink one second every four seconds */
+		else if (!chipset_in_state(CHIPSET_STATE_ANY_OFF) &&
+			 permillage <= LOW_BATTERY_PERMILLAGE)
+			set_color_battery_led(
+				(battery_ticks % LED_TOTAL_4SECS_TICKS <
+				 LED_ON_1SEC_TICKS) ? LED_ORANGE : LED_OFF);
+		else
+			set_color_battery_led(LED_OFF);
+		break;
+	case PWR_STATE_ERROR:
+		set_color_battery_led(
+			(battery_ticks % LED_TOTAL_2SECS_TICKS <
+			 LED_ON_1SEC_TICKS) ? LED_ORANGE : LED_OFF);
+		break;
+	case PWR_STATE_IDLE: /* External power connected in IDLE. */
+		if (chflags & CHARGE_FLAG_FORCE_IDLE)
+			set_color_battery_led(
+				(battery_ticks % LED_TOTAL_4SECS_TICKS <
+				 LED_ON_2SECS_TICKS) ? LED_BLUE : LED_ORANGE);
+		else
+			set_color_battery_led(LED_BLUE);
+		break;
+	default:
+		/* Other states don't alter LED behavior */
+		break;
 	}
-
-	/* Otherwise, system is off and AC not connected, LED off */
-	set_color_battery_led(LED_OFF);
 }
 
 static void led_tick(void)