summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongBeum Ha <ybha@samsung.com>2019-07-25 03:05:37 +0900
committerCommit Bot <commit-bot@chromium.org>2019-08-01 20:11:57 +0000
commit6a7688400904eb18708573e6af0fb20352afe825 (patch)
treeb4ab515a3194e386a9954400e58d40053d1330f8
parent9bddd38eff5464d157bcba755e92aff9b0d7218b (diff)
downloadchrome-ec-6a7688400904eb18708573e6af0fb20352afe825.tar.gz
casta & bluebird : make charge state to ST_DISCHARGE
charge_profile_override() changes charge state from ST_DISCHARGE to ST_IDLE on overtemperature condition. This makes led color to green when there is no adapter. This CL skip changing charge state when charge state is ST_DISCHARGE. BUG=b:138268383 BRANCH=None TEST=None Change-Id: I581a42641cf6632657b8e19ab41b532805024d9e Signed-off-by: YongBeum Ha <ybha@samsung.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1715952 Reviewed-by: Furquan Shaikh <furquan@chromium.org> (cherry picked from commit f911ddd9d425c2159d21758ba9eb05051180969a) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1730369 Reviewed-by: Karthikeyan Ramasubramanian <kramasub@chromium.org> Commit-Queue: Karthikeyan Ramasubramanian <kramasub@chromium.org> Tested-by: Karthikeyan Ramasubramanian <kramasub@chromium.org>
-rw-r--r--board/casta/battery.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/casta/battery.c b/board/casta/battery.c
index abed3481ef..965db28395 100644
--- a/board/casta/battery.c
+++ b/board/casta/battery.c
@@ -138,7 +138,8 @@ int charger_profile_override(struct charge_state_data *curr)
current = 0;
voltage = 0;
curr->batt.flags &= ~BATT_FLAG_WANT_CHARGE;
- curr->state = ST_IDLE;
+ if (curr->state != ST_DISCHARGE)
+ curr->state = ST_IDLE;
break;
}