diff options
| author | Ryan Zhang <Ryan.Zhang@quanta.corp-partner.google.com> | 2017-07-12 10:07:44 +0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2017-07-18 16:15:18 +0000 |
| commit | c9bf4c8ff95554bbed2c799cefcdb58134248b0a (patch) | |
| tree | cc95e671c92626b2ee5ce46cdadd85aae405b447 | |
| parent | 76f0ed5101064ea52a26069bb8f195173db0eb13 (diff) | |
| download | chrome-ec-c9bf4c8ff95554bbed2c799cefcdb58134248b0a.tar.gz | |
Common: charge timeout function should exclude manual mode in factory.
Clear deadline & battery_seems_to_be_dead(use for LED indicator) when
system is in manual mode.
BUG=chrome-os-partner:53590
BRANCH=glados-7820.B
TEST=system won't be timeout after switching between
ectool chargecontrol normal/idle/discharge
Change-Id: Iadb2963aedb9d8414f5ca3f9ae105f8be772c340
Signed-off-by: Ryan Zhang <ryan.zhang@quanta.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/567611
Reviewed-by: Shawn N <shawnn@chromium.org>
(cherry picked from commit a5d1b7169f7ca04cbac7c5bab33602b9eb6f49b4)
Reviewed-on: https://chromium-review.googlesource.com/569422
| -rw-r--r-- | common/charge_state_v2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index 7c94f8495d..d9a5e4fcb6 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -787,7 +787,8 @@ wait_for_it: * without getting full (CONFIG_CHARGER_TIMEOUT_HOURS). */ #ifdef CONFIG_CHARGER_TIMEOUT_HOURS - if (curr.state == ST_DISCHARGE || calc_is_full()) { + if (curr.state == ST_DISCHARGE || calc_is_full() || + manual_mode) { deadline.val = 0; } else if ((curr.state == ST_CHARGE || curr.state == ST_PRECHARGE) && |