diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-01-09 17:12:35 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-01-13 18:48:18 +0000 |
| commit | ed4d13fde2d19bffa6cb58e199179a6a710b218e (patch) | |
| tree | f1bb0892839c4fdad52d50f08ca1257202ab3701 /include | |
| parent | 4cbb3941b188beaf04ffaa2473e65e352aee6254 (diff) | |
| download | chrome-ec-ed4d13fde2d19bffa6cb58e199179a6a710b218e.tar.gz | |
charger v2: Combine prevent_*_discharge functions
prevent_hot_discharge and prevent_deep_discharge are near-identical
copies of one another, and can be combined without the loss of any
useful functionality.
BUG=chrome-os-partner:35188
TEST=Manual on Samus. Charge to 2% and boot system with 5V power supply.
Verify that warnings print to console and AP powers down after 30s. Also
pass unit tests.
BRANCH=Samus
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I0f1da5248825a3884f7910babc742dfa7eadf5a3
Reviewed-on: https://chromium-review.googlesource.com/240033
Diffstat (limited to 'include')
| -rw-r--r-- | include/charge_state.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/charge_state.h b/include/charge_state.h index fea4231def..ab9c1043b5 100644 --- a/include/charge_state.h +++ b/include/charge_state.h @@ -11,8 +11,7 @@ /* Stuff that's common to all charger implementations can go here. */ /* Seconds after AP battery shutdown warning before we kill the AP */ -#define LOW_BATTERY_SHUTDOWN_TIMEOUT 30 -#define HIGH_TEMP_SHUTDOWN_TIMEOUT 30 +#define CRITICAL_BATTERY_SHUTDOWN_TIMEOUT 30 /* Seconds to spend trying to wake a non-responsive battery */ #define PRECHARGE_TIMEOUT 30 |