fwk: set charger control mode after disable battery sustainer

when we disable battery sustainer need manual set the charger control mode
because the sustain_battery_soc wouldn't set chg mode(return by !battery_sustainer_enabled)

BRANCH=marigold
BUG=https://app.clickup.com/t/86eq06zen
TEST=when batt extender trigger to stage 2,
disable battery extender and make sure the battery starting charge
TEST=disable battery extender and enable again check the extender timer is starting count.

Signed-off-by: LeoCX_Tsai <[email protected]>

Author: LeoCX-Tsai

common/charge_state.c

@@ -244,7 +244,7 @@ static void battery_sustainer_disable(void)
 
 static const char *const state_list[] = { "idle", "discharge", "charge",
 					  "precharge" };
-BUILD_ASSERT(ARRAY_SIZE(state_list) == CHARGE_STATE_COUNT);
+BUILD_ASSERT(ARRAY_SIZE(state_list) == NUM_STATES_V2);
 static const char *const batt_pres[] = {
 	"NO",
 	"YES",

include/charge_state.h

@@ -434,7 +434,7 @@ int board_want_charger_change_mode(void);
  *
  * @param lower: lower battery soc charge limit [1-100%] or -1 to disable
  * @param upper: upper battery soc charge limit [1-100%] or -1 to disable
- * 
+ *
  * @return EC_SUCCESS or EC_ERROR_INVAL
  */
 int battery_sustainer_set(int8_t lower, int8_t upper);

zephyr/program/framework/src/battery_extender.c

@@ -46,6 +46,7 @@ static timestamp_t reset_deadline;
 static void extender_init(void)
 {
 	timestamp_t now = get_time();
+
 	batt_extender_deadline.val =
 			now.val + battery_extender_trigger;
 	batt_extender_deadline_stage2.val =
@@ -82,6 +83,7 @@ void battery_extender(void)
 		batt_extender_deadline_stage2.val =
 				now.val + battery_extender_trigger + 2*DAY;
 		battery_sustainer_set(-1, -1);
+		set_chg_ctrl_mode(CHARGE_CONTROL_NORMAL);
 	}
 
 	if (batt_extender_deadline_stage2.val &&
@@ -139,6 +141,7 @@ static enum ec_status battery_extender_hc(struct host_cmd_handler_args *args)
 			batt_extender_disable = p->disable;
 			if (batt_extender_disable) {
 				battery_sustainer_set(-1, -1);
+				set_chg_ctrl_mode(CHARGE_CONTROL_NORMAL);
 				stage = BATT_EXTENDER_STAGE_0;
 			}
 		}
@@ -186,23 +189,25 @@ static uint64_t cmd_parse_timestamp(int argc, const char **argv)
 		} else if (!strncmp(argv[3], "d", 1)) {
 			time_val *= DAY;
 		} else {
-			CPRINTF("invalid option for time scale: %s. Valid options: [s,h,d]\n", argv[3]);
+			CPRINTF("invalid option for time scale: %s. Valid options: [s,h,d]\n",
+				argv[3]);
 			return EC_ERROR_PARAM3;
 		}
 		return time_val;
-	} else {
-		CPRINTF("invalid parameters:\n");
-		return 0;
 	}
+
+	CPRINTF("invalid parameters:\n");
+	return 0;
 }
 
 static void print_time_offset(uint64_t t_end, uint64_t t_start)
 {
 	uint64_t t = t_end - t_start;
 	uint64_t d = TIMES2DAYS(t);
-	uint64_t h = (t % DAY)/ HOUR;
-	uint64_t m = (t % HOUR)/ MINUTE;
-	uint64_t s = (t % MINUTE)/ SECOND;
+	uint64_t h = (t % DAY) / HOUR;
+	uint64_t m = (t % HOUR) / MINUTE;
+	uint64_t s = (t % MINUTE) / SECOND;
+
 	if (t_end < t_start) {
 		CPRINTF("Expired\n");
 	} else {
@@ -226,11 +231,12 @@ static int cmd_batt_extender(int argc, const char **argv)
 				disable ? "enabled" : "disabled");
 			if (batt_extender_disable) {
 				battery_sustainer_set(-1, -1);
+				set_chg_ctrl_mode(CHARGE_CONTROL_NORMAL);
 				stage = BATT_EXTENDER_STAGE_0;
 			} else {
 				if (battery_extender_reset) {
-				reset_deadline.val =
-					now.val + battery_extender_reset;
+					reset_deadline.val =
+						now.val + battery_extender_reset;
 				}
 				if (battery_extender_trigger != 0) {
 					batt_extender_deadline.val =
@@ -240,7 +246,8 @@ static int cmd_batt_extender(int argc, const char **argv)
 				}
 			}
 		} else if (!strncmp(argv[1], "timeext2", 8)) {
-			batt_extender_deadline_stage2.val = now.val + cmd_parse_timestamp(argc, argv);
+			batt_extender_deadline_stage2.val =
+				now.val + cmd_parse_timestamp(argc, argv);
 		} else if (!strncmp(argv[1], "timeext", 7)) {
 			batt_extender_deadline.val = now.val + cmd_parse_timestamp(argc, argv);
 		} else if (!strncmp(argv[1], "timerst", 7)) {