summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Berg <alecaberg@chromium.org>2015-09-28 10:20:22 -0700
committerChromeOS bot <3su6n15k.default@developer.gserviceaccount.com>2015-12-01 18:29:40 +0000
commit20aff00c2b92665aec1957b1a962a52619a7105a (patch)
treeae47f56f76058fab9ced813caade36cb2c2b0747
parent835de3afde0bf99a1d105667109a21e3a91c73d1 (diff)
downloadchrome-ec-20aff00c2b92665aec1957b1a962a52619a7105a.tar.gz
lightbar: on tap sequence, only get battery percentage once
Change tap sequence so that it only gets the battery percentage once. This means we won't dynamically change color and level if the battery percentage changes mid sequence, but that's ok. BUG=chrome-os-partner:45878 BRANCH=none TEST=run tap sequence Change-Id: I2183343b69d01f4835302e291a2e1a0a2c658b1e Signed-off-by: Alec Berg <alecaberg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/302685 Reviewed-by: Vincent Palatin <vpalatin@chromium.org> (cherry picked from commit 1c2bbee5c7a779cb22519e8710213a641b43eeff) Reviewed-on: https://chromium-review.googlesource.com/315126 Reviewed-by: Gwendal Grignou <gwendal@chromium.org> Commit-Queue: Gwendal Grignou <gwendal@chromium.org> Tested-by: Gwendal Grignou <gwendal@chromium.org>
-rw-r--r--common/lightbar.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/common/lightbar.c b/common/lightbar.c
index 9b48168faa..2355067016 100644
--- a/common/lightbar.c
+++ b/common/lightbar.c
@@ -993,20 +993,20 @@ static uint32_t sequence_TAP_inner(int dir)
#endif
f_osc = st.p.tap_seg_osc * FP_SCALE / 100;
- start = get_time();
- while (1) {
- get_battery_level();
+ get_battery_level();
- if (st.battery_level == 0)
- base_color = RED;
- else if (st.battery_percent > st.p.tap_pct_green)
- base_color = GREEN;
- else
- base_color = YELLOW;
+ if (st.battery_level == 0)
+ base_color = RED;
+ else if (st.battery_percent > st.p.tap_pct_green)
+ base_color = GREEN;
+ else
+ base_color = YELLOW;
- ci = st.p.tap_idx[base_color];
- max_led = st.battery_percent / CUT;
+ ci = st.p.tap_idx[base_color];
+ max_led = st.battery_percent / CUT;
+ start = get_time();
+ while (1) {
/* Enable the segments gradually */
gi = elapsed_time / st.p.tap_gate_delay;
gr = elapsed_time % st.p.tap_gate_delay;