fwk: modified the charging LED to meet the ERS

Signed-off-by: Josh-Tsai <josh_tsai@compal.com>

Author: Josh-Tsai

zephyr/program/lotus/azalea/led_policy.dtsi

@@ -6,17 +6,17 @@
 
 		power-state-charge {
 			charge-state = "LED_PWRS_CHARGE";
-			/* Battery percent range (>= 0, <= 96) */
-			batt-lvl = <BATTERY_LEVEL_EMPTY 96>;
+			/* Battery percent range (>= 0, < 96) */
+			batt-lvl = <BATTERY_LEVEL_EMPTY 95>;
 			color-0 {
 				led-color = <&color_amber>;
 			};
 		};
 
 		power-state-charge-lvl-2 {
 			charge-state = "LED_PWRS_CHARGE";
-			/* Battery percent range (>= 97%, <= 100%) */
-			batt-lvl = <97 100>;
+			/* Battery percent range (>= 96%, <= 100%) */
+			batt-lvl = <96 100>;
 
 			color-0 {
 				led-color = <&color_white>;
@@ -25,8 +25,6 @@
 
 		power-state-discharge {
 			charge-state = "LED_PWRS_DISCHARGE";
-			/* Battery percent range (>= 11, <= 97) */
-			batt-lvl = <(BATTERY_LEVEL_LOW + 1) BATTERY_LEVEL_FULL>;
 
 			color-0 {
 				led-color = <&color_off>;

zephyr/program/lotus/include/board_function.h

@@ -24,4 +24,6 @@ int chassis_cmd_clear(int type);
 
 __override_proto void project_chassis_function(enum gpio_signal signal);
 
+uint32_t get_system_percentage(void);
+
 #endif	/* __CROS_EC_BOARD_FUNCTION_H */

zephyr/program/lotus/lotus/led_policy.dtsi

@@ -6,17 +6,17 @@
 
 		power-state-charge {
 			charge-state = "LED_PWRS_CHARGE";
-			/* Battery percent range (>= 0, <= 96) */
-			batt-lvl = <BATTERY_LEVEL_EMPTY 96>;
+			/* Battery percent range (>= 0, < 96) */
+			batt-lvl = <BATTERY_LEVEL_EMPTY 95>;
 			color-0 {
 				led-color = <&color_amber>;
 			};
 		};
 
 		power-state-charge-lvl-2 {
 			charge-state = "LED_PWRS_CHARGE";
-			/* Battery percent range (>= 97%, <= 100%) */
-			batt-lvl = <97 100>;
+			/* Battery percent range (>= 96%, <= 100%) */
+			batt-lvl = <96 100>;
 
 			color-0 {
 				led-color = <&color_white>;
@@ -25,8 +25,6 @@
 
 		power-state-discharge {
 			charge-state = "LED_PWRS_DISCHARGE";
-			/* Battery percent range (>= 11, <= 97) */
-			batt-lvl = <(BATTERY_LEVEL_LOW + 1) BATTERY_LEVEL_FULL>;
 
 			color-0 {
 				led-color = <&color_off>;
@@ -47,11 +45,11 @@
 
 			color-0 {
 				led-color = <&color_red>;
-				period-ms = <500>;
+				period-ms = <1000>;
 			};
 			color-1 {
 				led-color = <&color_blue>;
-				period-ms = <500>;
+				period-ms = <1000>;
 			};
 		};
 

zephyr/program/lotus/lotus/src/battery.c

@@ -9,6 +9,7 @@
 #include "battery_smart.h"
 #include "battery_fuel_gauge.h"
 #include "board_adc.h"
+#include "board_function.h"
 #include "board_host_command.h"
 #include "charger.h"
 #include "charge_state.h"
@@ -77,16 +78,22 @@ static void enable_check_battery_timer(void)
 }
 DECLARE_HOOK(HOOK_INIT, enable_check_battery_timer, HOOK_PRIO_DEFAULT);
 
+uint32_t get_system_percentage(void)
+{
+	uint32_t memmap_cap = *(uint32_t *)host_get_memmap(EC_MEMMAP_BATT_CAP);
+	uint32_t memmap_lfcc = *(uint32_t *)host_get_memmap(EC_MEMMAP_BATT_LFCC);
+
+	return 1000 * memmap_cap / (memmap_lfcc + 1);
+
+}
+
 static void battery_percentage_control(void)
 {
 	enum ec_charge_control_mode new_mode;
 	static int in_percentage_control;
-	uint32_t memmap_cap = *(uint32_t *)host_get_memmap(EC_MEMMAP_BATT_CAP);
-	uint32_t memmap_lfcc = *(uint32_t *)host_get_memmap(EC_MEMMAP_BATT_LFCC);
-	uint32_t batt_os_percentage;
+	uint32_t batt_os_percentage = get_system_percentage();
 	int rv;
 
-	batt_os_percentage = 1000 * memmap_cap / (memmap_lfcc + 1);
 	/**
 	 * If the host command EC_CMD_CHARGE_CONTROL set control mode to CHARGE_CONTROL_DISCHARGE
 	 * or CHARGE_CONTROL_IDLE, ignore the battery_percentage_control();

zephyr/program/lotus/src/led.c

@@ -24,6 +24,7 @@
 #include "system.h"
 #include "util.h"
 
+#include "board_function.h"
 #include "cypress_pd_common.h"
 #include "diagnostics.h"
 #include "lid_switch.h"
@@ -274,7 +275,7 @@ static int match_node(int node_idx)
 	/* Check if this node depends on battery level */
 	if (node_array[node_idx].batt_lvl[0] != -1) {
 		int curr_batt_lvl =
-			DIV_ROUND_NEAREST(charge_get_display_charge(), 10);
+			DIV_ROUND_NEAREST(get_system_percentage(), 10);
 
 		if ((curr_batt_lvl < node_array[node_idx].batt_lvl[0]) ||
 		    (curr_batt_lvl > node_array[node_idx].batt_lvl[1]))