* [PATCH] iio: chemical: scd4x: Add a scale for the co2 concentration reading
@ 2021-10-21 14:00 Roan van Dijk
2021-10-21 19:53 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Roan van Dijk @ 2021-10-21 14:00 UTC (permalink / raw)
To: Jonathan Cameron
Cc: linux-iio, linux-kernel, david, Lars-Peter Clausen, Roan van Dijk
This patch adds a scale for the co2 concentration reading. The reading is
expressed in percent after applying the scale to the raw value.
Signed-off-by: Roan van Dijk <roan@protonic.nl>
---
drivers/iio/chemical/scd4x.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/chemical/scd4x.c b/drivers/iio/chemical/scd4x.c
index 09b34201c42b..b063b378c7d5 100644
--- a/drivers/iio/chemical/scd4x.c
+++ b/drivers/iio/chemical/scd4x.c
@@ -352,7 +352,11 @@ static int scd4x_read_raw(struct iio_dev *indio_dev,
*val = ret;
return IIO_VAL_INT;
case IIO_CHAN_INFO_SCALE:
- if (chan->type == IIO_TEMP) {
+ if (chan->type == IIO_CONCENTRATION) {
+ *val = 0;
+ *val2 = 100;
+ return IIO_VAL_INT_PLUS_MICRO;
+ } else if (chan->type == IIO_TEMP) {
*val = 175000;
*val2 = 65536;
return IIO_VAL_FRACTIONAL;
@@ -501,7 +505,8 @@ static const struct iio_chan_spec scd4x_channels[] = {
.type = IIO_CONCENTRATION,
.channel2 = IIO_MOD_CO2,
.modified = 1,
- .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+ BIT(IIO_CHAN_INFO_SCALE),
.address = SCD4X_CO2,
.scan_index = SCD4X_CO2,
.scan_type = {
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iio: chemical: scd4x: Add a scale for the co2 concentration reading
2021-10-21 14:00 [PATCH] iio: chemical: scd4x: Add a scale for the co2 concentration reading Roan van Dijk
@ 2021-10-21 19:53 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2021-10-21 19:53 UTC (permalink / raw)
To: Roan van Dijk; +Cc: linux-iio, linux-kernel, david, Lars-Peter Clausen
On Thu, 21 Oct 2021 16:00:18 +0200
Roan van Dijk <roan@protonic.nl> wrote:
> This patch adds a scale for the co2 concentration reading. The reading is
> expressed in percent after applying the scale to the raw value.
>
> Signed-off-by: Roan van Dijk <roan@protonic.nl>
Thanks,
Applied to the togreg branch of iio.git and for once pushed out directly
as I want to get this into linux-next tomorrow and a pull request out if
no problems show up.
Thanks,
Jonathan
> ---
> drivers/iio/chemical/scd4x.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/chemical/scd4x.c b/drivers/iio/chemical/scd4x.c
> index 09b34201c42b..b063b378c7d5 100644
> --- a/drivers/iio/chemical/scd4x.c
> +++ b/drivers/iio/chemical/scd4x.c
> @@ -352,7 +352,11 @@ static int scd4x_read_raw(struct iio_dev *indio_dev,
> *val = ret;
> return IIO_VAL_INT;
> case IIO_CHAN_INFO_SCALE:
> - if (chan->type == IIO_TEMP) {
> + if (chan->type == IIO_CONCENTRATION) {
> + *val = 0;
> + *val2 = 100;
> + return IIO_VAL_INT_PLUS_MICRO;
> + } else if (chan->type == IIO_TEMP) {
> *val = 175000;
> *val2 = 65536;
> return IIO_VAL_FRACTIONAL;
> @@ -501,7 +505,8 @@ static const struct iio_chan_spec scd4x_channels[] = {
> .type = IIO_CONCENTRATION,
> .channel2 = IIO_MOD_CO2,
> .modified = 1,
> - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
> + BIT(IIO_CHAN_INFO_SCALE),
> .address = SCD4X_CO2,
> .scan_index = SCD4X_CO2,
> .scan_type = {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-21 19:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-21 14:00 [PATCH] iio: chemical: scd4x: Add a scale for the co2 concentration reading Roan van Dijk
2021-10-21 19:53 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.