diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2021-01-28 13:46:25 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-27 05:29:23 +0000 |
| commit | c5481deaaec93eee79de7ac7af2e2f2353cacdbf (patch) | |
| tree | 5eab0245ba88392c4de9dcc3c0a2a04ebd2117f7 | |
| parent | 3f4deea779f36b50037cc650c5f204f73aba998b (diff) | |
| download | chrome-ec-c5481deaaec93eee79de7ac7af2e2f2353cacdbf.tar.gz | |
driver: icm426xx: Use calibration unit to set/get offset
EC interface use constant (not range dependent) units to get/set
offsets. Use them in icm426xx driver.
Conflicts:
driver/accelgyro_icm426xx.c: default range is not in rammus
branch, change original driver.
BUG=b:177292639
BRANCH=hatch,nami,kukui,dedede,grunt,zork,octopus,volteer,rammus
TEST=compile
Change-Id: I6e6b1551464ea389db34646ba5b2bb553d683d7a
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2657955
Reviewed-by: Ching-Kang Yen <chingkang@chromium.org>
Reviewed-by: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
(cherry picked from commit 0438e061c30640f4d72213fd09f2f8ba334c22ae)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3128753
Reviewed-by: Zhuohao Lee <zhuohao@chromium.org>
Commit-Queue: Zhuohao Lee <zhuohao@chromium.org>
| -rw-r--r-- | driver/accelgyro_icm426xx.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/driver/accelgyro_icm426xx.c b/driver/accelgyro_icm426xx.c index fccd03a46d..68e2be5811 100644 --- a/driver/accelgyro_icm426xx.c +++ b/driver/accelgyro_icm426xx.c @@ -661,23 +661,23 @@ static int icm426xx_set_offset(const struct motion_sensor_t *s, const int16_t *offset, int16_t temp) { intv3_t v = { offset[X], offset[Y], offset[Z] }; - int range, div1, div2; + int div1, div2; int i; + /* rotate back to chip frame */ rotate_inv(v, *s->rot_standard_ref, v); /* convert raw data to hardware offset units */ - range = icm_get_range(s); switch (s->type) { case MOTIONSENSE_TYPE_ACCEL: - /* hardware offset is 1/2048g by LSB */ - div1 = range * 2048; - div2 = 32768; + /* hardware offset is 1/2048g /LSB, EC offset 1/1024g /LSB. */ + div1 = 2; + div2 = 1; break; case MOTIONSENSE_TYPE_GYRO: - /* hardware offset is 1/32dps by LSB */ - div1 = range * 32; - div2 = 32768; + /* hardware offset is 1/32dps /LSB, EC offset 1/1024dps /LSB. */ + div1 = 1; + div2 = 32; break; default: return EC_ERROR_INVAL; @@ -692,7 +692,7 @@ static int icm426xx_get_offset(const struct motion_sensor_t *s, int16_t *offset, int16_t *temp) { intv3_t v; - int range, div1, div2; + int div1, div2; int i, ret; ret = icm426xx_get_hw_offset(s, v); @@ -700,17 +700,16 @@ static int icm426xx_get_offset(const struct motion_sensor_t *s, int16_t *offset, return ret; /* transform offset to raw data */ - range = icm_get_range(s); switch (s->type) { case MOTIONSENSE_TYPE_ACCEL: - /* hardware offset is 1/2048g by LSB */ - div1 = 32768; - div2 = 2048 * range; + /* hardware offset is 1/2048g /LSB, EC offset 1/1024g /LSB. */ + div1 = 1; + div2 = 2; break; case MOTIONSENSE_TYPE_GYRO: - /* hardware offset is 1/32dps by LSB */ - div1 = 32768; - div2 = 32 * range; + /* hardware offset is 1/32dps /LSB, EC offset 1/1024dps /LSB. */ + div1 = 32; + div2 = 1; break; default: return EC_ERROR_INVAL; @@ -719,7 +718,6 @@ static int icm426xx_get_offset(const struct motion_sensor_t *s, int16_t *offset, v[i] = round_divide(v[i] * div1, div2); rotate(v, *s->rot_standard_ref, v); - offset[X] = v[X]; offset[Y] = v[Y]; offset[Z] = v[Z]; |