diff options
| author | Tommy Chung <tommy.chung@quanta.corp-partner.google.com> | 2021-08-04 18:55:02 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-13 17:33:01 +0000 |
| commit | bcb73a6355d21c87ef63ea0a14f0490229da8a24 (patch) | |
| tree | d2b09f8dddeb09fa88835b4ff09e468bd557b809 | |
| parent | c11c2208865e7c70d7c11afcb3e38f861421dcfd (diff) | |
| download | chrome-ec-bcb73a6355d21c87ef63ea0a14f0490229da8a24.tar.gz | |
chgstv2: call sustain_battery_soc without checking previous states
When we enalbe battery sustain after battery returns that it is full,
we need to add this condition for sustain_battery_soc(). Also, add this
test condition for battery sustainer.
BUG=b:188457962
BRANCH=none
TEST=make sure the battery sustain works when enabling it after battery
returns that it is full. Also, make sure that "make run-sbs_charging_v2"
pass.
Signed-off-by: Tommy Chung <tommy.chung@quanta.corp-partner.google.com>
Change-Id: If10b9fd0264717abfb7cdbb7ddc947b370291895
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3070946
Reviewed-by: Devin Lu <Devin.Lu@quantatw.com>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3869645
Auto-Submit: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | common/charge_state_v2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index 9c8c81229a..5b111e6baa 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -1935,6 +1935,10 @@ wait_for_it: /* And the EC console */ is_full = calc_is_full(); + + /* Run battery sustainer (no-op if not applicable). */ + sustain_battery_soc(); + if ((!(curr.batt.flags & BATT_FLAG_BAD_STATE_OF_CHARGE) && curr.batt.state_of_charge != prev_charge) || #ifdef CONFIG_EC_EC_COMM_BATTERY_MASTER @@ -1943,7 +1947,6 @@ wait_for_it: (is_full != prev_full) || (curr.state != prev_state) || (charge_get_display_charge() != prev_disp_charge)) { - sustain_battery_soc(); show_charging_progress(); prev_charge = curr.batt.state_of_charge; prev_disp_charge = charge_get_display_charge(); |