On 10/15/2012 10:35 AM, Lars-Peter Clausen wrote:
> Most of the channel offsets and scales in the adis16201 are incorrect:
> * Temperature scale is off by a factor of 1000
> * Voltage scale is off by a factor of 1000
> * Acceleration scale is in g instead of m/(s**2)
> * Temperature offset is completely wrong
>
> This patch fixes these issues.
>
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Applied to fixes-togreg branch (changed plan on the previous patch as these
fixes are dependent on it and that will now go in the fixes branch as well).
> ---
> drivers/staging/iio/accel/adis16201_core.c | 24 +++++++++++++-----------
> 1 file changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
> index 8e37d6e..b12ca68 100644
> --- a/drivers/staging/iio/accel/adis16201_core.c
> +++ b/drivers/staging/iio/accel/adis16201_core.c
> @@ -310,30 +310,32 @@ static int adis16201_read_raw(struct iio_dev *indio_dev,
> case IIO_CHAN_INFO_SCALE:
> switch (chan->type) {
> case IIO_VOLTAGE:
> - *val = 0;
> - if (chan->channel == 0)
> - *val2 = 1220;
> - else
> - *val2 = 610;
> + if (chan->channel == 0) {
> + *val = 1;
> + *val2 = 220000; /* 1.22 mV */
> + } else {
> + *val = 0;
> + *val2 = 610000; /* 0.610 mV */
> + }
> return IIO_VAL_INT_PLUS_MICRO;
> case IIO_TEMP:
> - *val = 0;
> - *val2 = -470000;
> + *val = -470; /* 0.47 C */
> + *val2 = 0;
> return IIO_VAL_INT_PLUS_MICRO;
> case IIO_ACCEL:
> *val = 0;
> - *val2 = 462500;
> - return IIO_VAL_INT_PLUS_MICRO;
> + *val2 = IIO_G_TO_M_S_2(462400); /* 0.4624 mg */
> + return IIO_VAL_INT_PLUS_NANO;
> case IIO_INCLI:
> *val = 0;
> - *val2 = 100000;
> + *val2 = 100000; /* 0.1 degree */
> return IIO_VAL_INT_PLUS_MICRO;
> default:
> return -EINVAL;
> }
> break;
> case IIO_CHAN_INFO_OFFSET:
> - *val = 25;
> + *val = 25000 / -470 - 1278; /* 25 C = 1278 */
> return IIO_VAL_INT;
> case IIO_CHAN_INFO_CALIBBIAS:
> switch (chan->type) {
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
