diff options
| author | Yilun Lin <yllin@google.com> | 2018-09-06 18:23:36 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-10-04 12:55:53 -0700 |
| commit | b53485334a80ddf0b9bcae0da9e9f31365436e3f (patch) | |
| tree | d2687973658c31cdc83ff1b32d16635295e4f803 | |
| parent | 315aaca9467f49bc432ef5f2de9c0e3bb56f0251 (diff) | |
| download | chrome-ec-b53485334a80ddf0b9bcae0da9e9f31365436e3f.tar.gz | |
kukui: Enable magnetometer.
TEST=make BOARD=kukui
BUG=b:113364863
BRANCH=None
Change-Id: If56821b9018ae23f086f2d04f9bd15f54de77966
Signed-off-by: Yilun Lin <yllin@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1235483
Commit-Ready: Yilun Lin <yllin@chromium.org>
Tested-by: Yilun Lin <yllin@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
| -rw-r--r-- | board/kukui/board.c | 24 | ||||
| -rw-r--r-- | board/kukui/board.h | 4 |
2 files changed, 28 insertions, 0 deletions
diff --git a/board/kukui/board.c b/board/kukui/board.c index d86beb1e46..a14b4a6a76 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -358,6 +358,13 @@ const mat33_fp_t base_standard_ref = { { 0, 0, FLOAT_TO_FP(1)} }; +/* Matrix to rotate accelrator into standard reference frame */ +const mat33_fp_t mag_standard_ref = { + { FLOAT_TO_FP(-1), 0, 0}, + { 0, FLOAT_TO_FP(1), 0}, + { 0, 0, FLOAT_TO_FP(-1)} +}; + struct motion_sensor_t motion_sensors[] = { /* * Note: bmi160: supports accelerometer and gyro sensor @@ -403,6 +410,23 @@ struct motion_sensor_t motion_sensors[] = { .min_frequency = BMI160_GYRO_MIN_FREQ, .max_frequency = BMI160_GYRO_MAX_FREQ, }, + [LID_MAG] = { + .name = "Lid Mag", + .active_mask = SENSOR_ACTIVE_S0, + .chip = MOTIONSENSE_CHIP_BMI160, + .type = MOTIONSENSE_TYPE_MAG, + .location = MOTIONSENSE_LOC_LID, + .drv = &bmi160_drv, + .mutex = &g_base_mutex, + .drv_data = &g_bmi160_data, + .port = I2C_PORT_ACCEL, + .addr = BMI160_ADDR0, + .default_range = 1 << 11, /* 16LSB / uT, fixed */ + .rot_standard_ref = &mag_standard_ref, + .rot_standard_ref = NULL, + .min_frequency = BMM150_MAG_MIN_FREQ, + .max_frequency = BMM150_MAG_MAX_FREQ(SPECIAL), + }, [VSYNC] = { .name = "Camera vsync", .active_mask = SENSOR_ACTIVE_S0, diff --git a/board/kukui/board.h b/board/kukui/board.h index ac87efee30..352e4ea1a8 100644 --- a/board/kukui/board.h +++ b/board/kukui/board.h @@ -90,6 +90,9 @@ /* Motion Sensors */ #ifdef SECTION_IS_RW +#define CONFIG_MAG_BMI160_BMM150 +#define BMI160_SEC_ADDR BMM150_ADDR0 /* 8-bit address */ +#define CONFIG_MAG_CALIBRATE #define CONFIG_ACCELGYRO_BMI160 #define CONFIG_ACCEL_INTERRUPTS #define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4) @@ -211,6 +214,7 @@ enum power_signal { enum sensor_id { LID_ACCEL = 0, LID_GYRO, + LID_MAG, VSYNC, }; |