diff options
| -rw-r--r-- | board/flapjack/board.c | 7 | ||||
| -rw-r--r-- | board/hatch/board.c | 7 | ||||
| -rw-r--r-- | board/kohaku/board.c | 7 | ||||
| -rw-r--r-- | board/kukui/board.c | 7 | ||||
| -rw-r--r-- | board/stryke/board.c | 7 |
5 files changed, 20 insertions, 15 deletions
diff --git a/board/flapjack/board.c b/board/flapjack/board.c index 84d8e5016b..4b8e7d2816 100644 --- a/board/flapjack/board.c +++ b/board/flapjack/board.c @@ -465,7 +465,7 @@ static struct als_drv_data_t g_tcs3400_data = { }; static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { - .rgb_cal[X] = { + .calibration.rgb_cal[X] = { .offset = 15, /* 15.65956688 */ .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(-0.04592318), .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0.06756278), @@ -476,7 +476,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { .cover_scale = ALS_CHANNEL_SCALE(0.6) } }, - .rgb_cal[Y] = { + .calibration.rgb_cal[Y] = { .offset = 8, /* 8.75943638 */ .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(-0.07786953), .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0.18940035), @@ -487,7 +487,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { .cover_scale = ALS_CHANNEL_SCALE(1.0) } }, - .rgb_cal[Z] = { + .calibration.rgb_cal[Z] = { .offset = -21, /* -21.92665481 */ .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(-0.18981975), .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0.5351057), @@ -498,6 +498,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { .cover_scale = ALS_CHANNEL_SCALE(1.5) } }, + .calibration.irt = INT_TO_FP(1), .saturation.again = TCS_DEFAULT_AGAIN, .saturation.atime = TCS_DEFAULT_ATIME, }; diff --git a/board/hatch/board.c b/board/hatch/board.c index bf243c4ee8..978a0feef1 100644 --- a/board/hatch/board.c +++ b/board/hatch/board.c @@ -192,27 +192,28 @@ static struct als_drv_data_t g_tcs3400_data = { }; static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { - .rgb_cal[X] = { + .calibration.rgb_cal[X] = { .offset = 0, .scale = { .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kr */ .cover_scale = ALS_CHANNEL_SCALE(1.0) }, }, - .rgb_cal[Y] = { + .calibration.rgb_cal[Y] = { .offset = 0, .scale = { .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kg */ .cover_scale = ALS_CHANNEL_SCALE(1.0) }, }, - .rgb_cal[Z] = { + .calibration.rgb_cal[Z] = { .offset = 0, .scale = { .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kb */ .cover_scale = ALS_CHANNEL_SCALE(1.0) }, }, + .calibration.irt = INT_TO_FP(1), .saturation.again = TCS_DEFAULT_AGAIN, .saturation.atime = TCS_DEFAULT_ATIME, }; diff --git a/board/kohaku/board.c b/board/kohaku/board.c index 791d2dd8a1..89888135fc 100644 --- a/board/kohaku/board.c +++ b/board/kohaku/board.c @@ -183,7 +183,7 @@ static struct als_drv_data_t g_tcs3400_data = { }; static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { - .rgb_cal[X] = { + .calibration.rgb_cal[X] = { .offset = 30, /* 30.38576102 */ .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(0.31818327), .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0.28786817), @@ -194,7 +194,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { .cover_scale = ALS_CHANNEL_SCALE(0.3507) } }, - .rgb_cal[Y] = { + .calibration.rgb_cal[Y] = { .offset = 45, /* 45.0467605 */ .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(0.26764916), .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0.26510278), @@ -205,7 +205,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { .cover_scale = ALS_CHANNEL_SCALE(1.0) }, }, - .rgb_cal[Z] = { + .calibration.rgb_cal[Z] = { .offset = 22, /* 22.5644134 */ .coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(-0.0682575), .coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0.15594184), @@ -216,6 +216,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { .cover_scale = ALS_CHANNEL_SCALE(0.5759) } }, + .calibration.irt = INT_TO_FP(1), .saturation.again = TCS_DEFAULT_AGAIN, .saturation.atime = TCS_DEFAULT_ATIME, }; diff --git a/board/kukui/board.c b/board/kukui/board.c index 21d77589fe..c3fc1fc9ce 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -368,7 +368,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { * TODO(b:139366662): calculates the actual coefficients and scaling * factors */ - .rgb_cal[X] = { + .calibration.rgb_cal[X] = { .offset = 0, .scale = { .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kr */ @@ -379,7 +379,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { .coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0), .coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(0), }, - .rgb_cal[Y] = { + .calibration.rgb_cal[Y] = { .offset = 0, .scale = { .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kg */ @@ -390,7 +390,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { .coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0), .coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(0.1), }, - .rgb_cal[Z] = { + .calibration.rgb_cal[Z] = { .offset = 0, .scale = { .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kb */ @@ -401,6 +401,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { .coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0), .coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(0), }, + .calibration.irt = INT_TO_FP(1), .saturation.again = TCS_DEFAULT_AGAIN, .saturation.atime = TCS_DEFAULT_ATIME, }; diff --git a/board/stryke/board.c b/board/stryke/board.c index 9169772044..929401250d 100644 --- a/board/stryke/board.c +++ b/board/stryke/board.c @@ -192,27 +192,28 @@ static struct als_drv_data_t g_tcs3400_data = { }; static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { - .rgb_cal[X] = { + .calibration.rgb_cal[X] = { .offset = 0, .scale = { .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kr */ .cover_scale = ALS_CHANNEL_SCALE(1.0) }, }, - .rgb_cal[Y] = { + .calibration.rgb_cal[Y] = { .offset = 0, .scale = { .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kg */ .cover_scale = ALS_CHANNEL_SCALE(1.0) }, }, - .rgb_cal[Z] = { + .calibration.rgb_cal[Z] = { .offset = 0, .scale = { .k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kb */ .cover_scale = ALS_CHANNEL_SCALE(1.0) }, }, + .calibration.irt = INT_TO_FP(1), .saturation.again = TCS_DEFAULT_AGAIN, .saturation.atime = TCS_DEFAULT_ATIME, }; |