From c9bf4c8ff95554bbed2c799cefcdb58134248b0a Mon Sep 17 00:00:00 2001 From: Ryan Zhang Date: Wed, 12 Jul 2017 10:07:44 +0800 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/567611 Reviewed-by: Shawn N (cherry picked from commit a5d1b7169f7ca04cbac7c5bab33602b9eb6f49b4) Reviewed-on: https://chromium-review.googlesource.com/569422 --- common/charge_state_v2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) && -- cgit v1.2.1