diff options
| author | Nick Vaccaro <nvaccaro@google.com> | 2019-07-20 23:48:47 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-20 16:31:48 +0000 |
| commit | 8b07b326496025530911f63b220fa987f1950f06 (patch) | |
| tree | 017dd17eed94595345f6881e7b7a644c4236e829 /board/kohaku/board.c | |
| parent | 72c142d8a751089baac1f042d6a199e49daa32d0 (diff) | |
| download | chrome-ec-8b07b326496025530911f63b220fa987f1950f06.tar.gz | |
tcs3400: update fields for als and rgb sensor
Update board files for akemi, flapjack, hatch, kohaku,
and kukui to use new field names in als_calibration_t and
als_channel_scale_t.
BUG=b:124512628
BRANCH=master
TEST='make buildall' of the EC, verified builds succeed.
Cq-Depend: chromium:1633269
Change-Id: I7ee324ce3de3377cd1538b631f4ec6294d2e9078
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1711958
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Diffstat (limited to 'board/kohaku/board.c')
| -rw-r--r-- | board/kohaku/board.c | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/board/kohaku/board.c b/board/kohaku/board.c index e7ef0933c4..e7f44dbc0a 100644 --- a/board/kohaku/board.c +++ b/board/kohaku/board.c @@ -176,23 +176,48 @@ static struct als_drv_data_t g_tcs3400_data = { .als_cal.scale = 1, .als_cal.uscale = 0, .als_cal.offset = 0, + .als_cal.channel_scale = { + .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kc from VPD */ + .cover_scale = ALS_CHANNEL_SCALE(1.0), /* CT */ + }, }; static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { - .device_scale = 1, - .device_uscale = 0, .rgb_cal[X] = { - .scale = ALS_CHANNEL_SCALE(1), - .offset = 0, + .offset = 30, /* 30.38576102 */ + .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(0.31818327), + .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0.28786817), + .coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0.14603897), + .coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(-0.12542082), + .scale = { + .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kr */ + .cover_scale = ALS_CHANNEL_SCALE(0.3507) + } }, .rgb_cal[Y] = { - .scale = ALS_CHANNEL_SCALE(1), - .offset = 0, + .offset = 45, /* 45.0467605 */ + .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(0.26764916), + .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0.26510278), + .coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0.19007195), + .coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(-0.12512564), + .scale = { + .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kg */ + .cover_scale = ALS_CHANNEL_SCALE(1.0) + }, }, .rgb_cal[Z] = { - .scale = ALS_CHANNEL_SCALE(1), - .offset = 0, + .offset = 22, /* 22.5644134 */ + .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(-0.0682575), + .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0.15594184), + .coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0.53616239), + .coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(-0.13502391), + .scale = { + .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kb */ + .cover_scale = ALS_CHANNEL_SCALE(0.5759) + } }, + .saturation.again = TCS_DEFAULT_AGAIN, + .saturation.atime = TCS_DEFAULT_ATIME, }; /* Matrix to rotate accelrator into standard reference frame */ |