diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2021-07-23 07:37:06 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-08-09 22:01:36 +0000 |
commit | 8bbea20178969365302f364527e7949a0cb04197 (patch) | |
tree | d31bf4b2196e27a711fd593179a458c51048544a /test | |
parent | 677220270d3c9973817e5507bdacadc35a24dcae (diff) | |
download | chrome-ec-8bbea20178969365302f364527e7949a0cb04197.tar.gz |
chgstv2/sustainer: Stop AC current when discharging
Currently, the battery sustainer discharges the battery using
CHARGE_CONTROL_IDLE, which uses the AC current and stops the
current from the battery.
With this change, when lower < upper, the sustainer discharges using
DISCHARGE. When lower == upper, the sustainer discharges using IDLE.
BUG=b:188457962
BRANCH=None
TEST=run-sbs_charging_v2
Change-Id: I4af31eff488bc9cfa627f84994b685488c3c9061
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3049290
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Derek Basehore <dbasehore@chromium.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/sbs_charging_v2.c | 68 |
1 files changed, 67 insertions, 1 deletions
diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c index 714cf89124..520db7bb20 100644 --- a/test/sbs_charging_v2.c +++ b/test/sbs_charging_v2.c @@ -799,7 +799,7 @@ static int test_battery_sustainer(void) ccprintf("Test lower < SoC < upper.\n"); display_soc = 799; wait_charging_state(); - TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_IDLE); + TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_DISCHARGE); ccprintf("Pass.\n"); ccprintf("Test SoC < lower < upper.\n"); @@ -856,6 +856,71 @@ static int test_battery_sustainer(void) return EC_SUCCESS; } +static int test_battery_sustainer_discharge_idle(void) +{ + struct ec_params_charge_control p; + int rv; + + test_setup(1); + + /* Enable sustainer */ + p.cmd = EC_CHARGE_CONTROL_CMD_SET; + p.mode = CHARGE_CONTROL_NORMAL; + p.sustain_soc.lower = 80; + p.sustain_soc.upper = 80; + rv = test_send_host_command(EC_CMD_CHARGE_CONTROL, 2, + &p, sizeof(p), NULL, 0); + TEST_ASSERT(rv == EC_RES_SUCCESS); + + /* Check mode transition as the SoC changes. */ + + /* SoC < lower (= upper) */ + display_soc = 780; + wait_charging_state(); + TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_NORMAL); + + /* (lower =) upper < SoC */ + display_soc = 810; + wait_charging_state(); + TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_IDLE); + + /* Unplug AC. Sustainer gets deactivated. */ + gpio_set_level(GPIO_AC_PRESENT, 0); + wait_charging_state(); + TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_NORMAL); + + /* Replug AC. Sustainer gets re-activated. */ + gpio_set_level(GPIO_AC_PRESENT, 1); + wait_charging_state(); + TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_IDLE); + + /* lower = SoC = upper */ + display_soc = 800; + wait_charging_state(); + TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_IDLE); + + /* SoC < lower (= upper) */ + display_soc = 789; + wait_charging_state(); + TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_NORMAL); + + /* Disable sustainer */ + p.cmd = EC_CHARGE_CONTROL_CMD_SET; + p.mode = CHARGE_CONTROL_NORMAL; + p.sustain_soc.lower = -1; + p.sustain_soc.upper = -1; + rv = test_send_host_command(EC_CMD_CHARGE_CONTROL, 2, + &p, sizeof(p), NULL, 0); + TEST_ASSERT(rv == EC_RES_SUCCESS); + + /* This time, mode will stay in NORMAL even when upper < SoC. */ + display_soc = 810; + wait_charging_state(); + TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_NORMAL); + + return EC_SUCCESS; +} + void run_test(int argc, char **argv) { RUN_TEST(test_charge_state); @@ -868,6 +933,7 @@ void run_test(int argc, char **argv) RUN_TEST(test_hc_current_limit); RUN_TEST(test_low_battery_hostevents); RUN_TEST(test_battery_sustainer); + RUN_TEST(test_battery_sustainer_discharge_idle); test_print_result(); } |