diff options
| author | Louis Yung-Chieh Lo <yjlou@chromium.org> | 2014-04-23 16:39:32 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-04-24 23:59:44 +0000 |
| commit | aa87df83efbd966fa485e6ee85798f418cde7919 (patch) | |
| tree | 2ca5d4a84a5ce3a599dfa9c931ac29461f5e29cd | |
| parent | c22002b82bea61c0afadb35509a323f934bb41c0 (diff) | |
| download | chrome-ec-aa87df83efbd966fa485e6ee85798f418cde7919.tar.gz | |
charger v2: only configure charger when AC is on.
The CL fcf26a4 enabled periodically charge_request(). However, that
could fail and generates lots of error message in the EC console if
the AC is not on and charger refuses the request (even it is 0v/0mA).
BUG=none
BRANCH=tot,nyan
TEST=make runtests. Tested on big. Expect NO below annoying error message
[1.353104 charge_request(0mV, 0mA)]
[1.453170 charge_request(0mV, 0mA)]
[1.553281 charge_request(0mV, 0mA)]
[1.653317 charge_request(0mV, 0mA)]
in the follwing cases:
AC on, battery attached, power on, then remove/plug in AC.
AC on, battery attached, power on, then remove/plug in battery.
AC on, battery removed, power on, then plug in and remove battery.
AC off, battery attached, power on, then plug in and remove AC.
'chgstate' also shows good state. At final, charge for 10 mins.
Signed-off-by: Louis Yung-Chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/196678
Reviewed-by: Lin Cloud <cloud_lin@compal.com>
Tested-by: Lin Cloud <cloud_lin@compal.com>
Reviewed-by: Devin Lu <Devin.Lu@quantatw.com>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
(cherry picked from commit b0409436adcf68cda3bf70a2964b9fdee599189a)
Change-Id: Icab972bac073f7ecde55583e2b11451e095dc156
Original-Change-Id: I3ab4294efbd009ecc0f53f2b78228213d2404964
Reviewed-on: https://chromium-review.googlesource.com/196945
Reviewed-by: Yung-chieh Lo <yjlou@chromium.org>
Commit-Queue: Yung-chieh Lo <yjlou@chromium.org>
Tested-by: Yung-chieh Lo <yjlou@chromium.org>
| -rw-r--r-- | common/charge_state_v2.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index 2527d7f92a..36addbe332 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -617,16 +617,21 @@ wait_for_it: curr.requested_current = charger_closest_current(curr.requested_current); - /* - * As a safety feature, some chargers will stop charging if - * we don't communicate with it frequently enough. In manual - * mode, we'll just tell it what it already knows - */ - if (manual_mode) { - charge_request(curr.chg.voltage, curr.chg.current); - } else { - charge_request(curr.requested_voltage, - curr.requested_current); + /* Charger only accpets request when AC is on. */ + if (curr.ac) { + /* + * As a safety feature, some chargers will stop + * charging if we don't communicate with it frequently + * enough. In manual mode, we'll just tell it what it + * knows. + */ + if (manual_mode) { + charge_request(curr.chg.voltage, + curr.chg.current); + } else { + charge_request(curr.requested_voltage, + curr.requested_current); + } } /* How long to sleep? */ |