diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2014-10-21 10:42:22 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-10-22 21:50:39 +0000 |
| commit | 0907881a3a87b4056c5debf56f64bf59cc3f7175 (patch) | |
| tree | 4f8b813ccb052fe4f0f053c1965de3dc37bed43b | |
| parent | e3d01f8870d8bff15a40bae1173cff81c275a99c (diff) | |
| download | chrome-ec-0907881a3a87b4056c5debf56f64bf59cc3f7175.tar.gz | |
Calibrated lightbar values for Samus & Ryu
This updates the lightbar params with the values determined in
the optic lab. The full-on primary colors are of uniform
intensity at the brightness level used by Link. The Google colors
provide the closest match to the official color palette (at full
brightness) described at
https://sites.google.com/a/google.com/brandsite/the-colours
BUG=chrome-os-partner:33017
BRANCH=ToT,samus,ryu
TEST=manual
The calibration and testing was done in the optic lab.
You can see the result just by looking at the lightbar. For best
results, set the brightness to the max with
ectool lightbar brightness ff
Change-Id: I1cb64e3c547844adf733cd46bff1256319b4f612
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/224992
| -rw-r--r-- | common/lb_common.c | 11 | ||||
| -rw-r--r-- | common/lightbar.c | 15 |
2 files changed, 18 insertions, 8 deletions
diff --git a/common/lb_common.c b/common/lb_common.c index 6db3d9d445..533ebbfa71 100644 --- a/common/lb_common.c +++ b/common/lb_common.c @@ -63,10 +63,13 @@ static inline uint8_t controller_read(int ctrl_num, uint8_t reg) #define MAX_BLUE 0x67 #endif #if defined(BOARD_SAMUS) || defined(BOARD_RYU_P2) -/* Samus uses completely different LEDs, so the numbers are different */ -#define MAX_RED 0x4f -#define MAX_GREEN 0x55 -#define MAX_BLUE 0x67 +/* Samus uses completely different LEDs, so the numbers are different. The + * Samus LEDs can handle much higher currents, but these constants were + * calibrated to provide uniform intensity at the level used by Link. + * See crosbug.com/p/33017 before making any changes. */ +#define MAX_RED 0x28 +#define MAX_GREEN 0x24 +#define MAX_BLUE 0x34 #endif #ifdef BOARD_HOST /* For testing only */ diff --git a/common/lightbar.c b/common/lightbar.c index b6360c18f2..da8121ce70 100644 --- a/common/lightbar.c +++ b/common/lightbar.c @@ -104,10 +104,17 @@ static const struct lightbar_params_v1 default_params = { { 0xff, 0xff, 0xff, 0xff } /* AC: do nothing */ }, .color = { - {0x33, 0x69, 0xe8}, /* 0: Google blue */ - {0xd5, 0x0f, 0x25}, /* 1: Google red */ - {0xee, 0xb2, 0x11}, /* 2: Google yellow */ - {0x00, 0x99, 0x25}, /* 3: Google green */ + /* + * These values have been optically calibrated for the + * Samus LEDs to best match the official colors, described at + * https://sites.google.com/a/google.com/brandsite/the-colours + * See crosbug.com/p/33017 before making any changes. + */ + {0x50, 0x98, 0xe8}, /* 0: Google blue */ + {0xdb, 0x44, 0x37}, /* 1: Google red */ + {0xf4, 0xb4, 0x00}, /* 2: Google yellow */ + {0x00, 0x88, 0x30}, /* 3: Google green */ + /* These are primary colors */ {0x00, 0x00, 0xff}, /* 4: full blue */ {0xff, 0x00, 0x00}, /* 5: full red */ {0xff, 0xff, 0x00}, /* 6: full yellow */ |