summaryrefslogtreecommitdiff
path: root/driver/accelgyro_lsm6ds0.c
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2015-08-19 14:52:49 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-08-24 19:08:24 +0000
commitf7fa6248bf170d2fffbf3fb067b6ed40f0a4d55f (patch)
tree90ff771d673fb587bab572181769fa1a529efbb6 /driver/accelgyro_lsm6ds0.c
parent0e01759cedcd25868196508177791388b89450e5 (diff)
downloadchrome-ec-f7fa6248bf170d2fffbf3fb067b6ed40f0a4d55f.tar.gz
driver: accel: Apply offsets after rotation
Offsets are in the axis of the device, not the sensor. Apply the offsets after rotiation BRANCH=cyan TEST=compile, test on cyan BUG=chromium:517675 Change-Id: Iae9282efcbb5889bb0f1f556b7e5ca9fabe31b22 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/294595 Reviewed-by: Sheng-liang Song <ssl@chromium.org>
Diffstat (limited to 'driver/accelgyro_lsm6ds0.c')
-rw-r--r--driver/accelgyro_lsm6ds0.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/driver/accelgyro_lsm6ds0.c b/driver/accelgyro_lsm6ds0.c
index 357710d56e..9aa6644670 100644
--- a/driver/accelgyro_lsm6ds0.c
+++ b/driver/accelgyro_lsm6ds0.c
@@ -375,13 +375,15 @@ static int read(const struct motion_sensor_t *s, vector_3_t v)
return ret;
}
- get_range(s, &range);
- for (i = X; i <= Z; i++) {
+ for (i = X; i <= Z; i++)
v[i] = ((int16_t)((raw[i * 2 + 1] << 8) | raw[i * 2]));
+
+ rotate(v, *s->rot_standard_ref, v);
+
+ /* apply offset in the device coordinates */
+ get_range(s, &range);
+ for (i = X; i <= Z; i++)
v[i] += (data->offset[i] << 5) / range;
- }
- if (*s->rot_standard_ref != NULL)
- rotate(v, *s->rot_standard_ref, v);
return EC_SUCCESS;
}