summaryrefslogtreecommitdiff
path: root/driver/mag_bmm150.c
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2015-07-31 13:22:40 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-08-22 09:31:38 +0000
commit7b102441425af16ba960100c34a415b45917cda9 (patch)
tree7ca8eea3fc7e5e451be91112add040b48fa43358 /driver/mag_bmm150.c
parented0192a9b1c7f4d45f646df9dd463ce7879459f6 (diff)
downloadchrome-ec-7b102441425af16ba960100c34a415b45917cda9.tar.gz
bmm150: Add support for calibration
Allow sending calibration information to the magnetometer. BRANCH=smaug TEST=Check from user space that calibration is taken into account. BUG=chrome-os-partner:39900 Change-Id: Ic0f595bde1afdc0b6a79e3516a42b55d1f50c17c Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/291333 Reviewed-by: Sheng-liang Song <ssl@chromium.org>
Diffstat (limited to 'driver/mag_bmm150.c')
-rw-r--r--driver/mag_bmm150.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/driver/mag_bmm150.c b/driver/mag_bmm150.c
index 4bc0d7a8e7..fb2d5c7108 100644
--- a/driver/mag_bmm150.c
+++ b/driver/mag_bmm150.c
@@ -199,6 +199,7 @@ void bmm150_normalize(const struct motion_sensor_t *s,
{
uint16_t r;
vector_3_t raw;
+ struct bmm150_comp_registers *regs = BMM150_COMP_REG(s);
/* X and Y are two's complement 13 bits vectors */
raw[X] = ((int16_t)(data[0] | (data[1] << 8))) >> 3;
@@ -211,5 +212,30 @@ void bmm150_normalize(const struct motion_sensor_t *s,
bmm150_temp_compensate_xy(s, raw, v, r);
bmm150_temp_compensate_z(s, raw, v, r);
+ v[X] += regs->offset[X];
+ v[Y] += regs->offset[Y];
+ v[Z] += regs->offset[Z];
+}
+
+int bmm150_set_offset(const struct motion_sensor_t *s,
+ const int16_t *offset,
+ int16_t temp)
+{
+ struct bmm150_comp_registers *regs = BMM150_COMP_REG(s);
+ regs->offset[X] = offset[X];
+ regs->offset[Y] = offset[Y];
+ regs->offset[Z] = offset[Z];
+ return EC_SUCCESS;
}
+int bmm150_get_offset(const struct motion_sensor_t *s,
+ int16_t *offset,
+ int16_t *temp)
+{
+ struct bmm150_comp_registers *regs = BMM150_COMP_REG(s);
+ offset[X] = regs->offset[X];
+ offset[Y] = regs->offset[Y];
+ offset[Z] = regs->offset[Z];
+ *temp = EC_MOTION_SENSE_INVALID_CALIB_TEMP;
+ return EC_SUCCESS;
+}