2018-12-13 14:45:37

by Andreas Brauchli

Subject: [PATCH v3 1/3] iio: Add modifiers for ethanol and H2 gases

Add ethanol and H2 gas modifiers:
* IIO_MOD_ETHANOL
* IIO_MOD_H2

Signed-off-by: Andreas Brauchli <[email protected]>
---
Documentation/ABI/testing/sysfs-bus-iio | 4 ++++
include/uapi/linux/iio/types.h | 2 ++
tools/iio/iio_event_monitor.c | 4 ++++
3 files changed, 10 insertions(+)

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 8127a08e366d..6d64521bf565 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -1554,6 +1554,10 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentration_raw
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_raw
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_co2_raw
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_co2_raw
+What: /sys/bus/iio/devices/iio:deviceX/in_concentration_ethanol_raw
+What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw
+What: /sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw
+What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
KernelVersion: 4.3
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
index 92baabc103ac..04a6649fa442 100644
--- a/include/uapi/linux/iio/types.h
+++ b/include/uapi/linux/iio/types.h
@@ -87,6 +87,8 @@ enum iio_modifier {
IIO_MOD_VOC,
IIO_MOD_LIGHT_UV,
IIO_MOD_LIGHT_DUV,
+ IIO_MOD_ETHANOL,
+ IIO_MOD_H2,
};

enum iio_event_type {
diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
index ac2de6b7e89f..f29c885f4b28 100644
--- a/tools/iio/iio_event_monitor.c
+++ b/tools/iio/iio_event_monitor.c
@@ -114,6 +114,8 @@ static const char * const iio_modifier_names[] = {
[IIO_MOD_I] = "i",
[IIO_MOD_Q] = "q",
[IIO_MOD_CO2] = "co2",
+ [IIO_MOD_ETHANOL] = "ethanol",
+ [IIO_MOD_H2] = "h2",
[IIO_MOD_VOC] = "voc",
};

@@ -199,6 +201,8 @@ static bool event_is_known(struct iio_event_data *event)
case IIO_MOD_I:
case IIO_MOD_Q:
case IIO_MOD_CO2:
+ case IIO_MOD_ETHANOL:
+ case IIO_MOD_H2:
case IIO_MOD_VOC:
break;
default:
--
2.17.1

2018-12-14 18:09:28

by Matt Ranostay

Subject: Re: [PATCH v3 1/3] iio: Add modifiers for ethanol and H2 gases

On Thu, Dec 13, 2018 at 6:44 AM Andreas Brauchli
<[email protected]> wrote:
>
> Add ethanol and H2 gas modifiers:
> * IIO_MOD_ETHANOL

Was going to ask why this wasn't a chemical formula like the rest of
the modifiers, but C2H6O would be a bit wordy/unclear :).

> * IIO_MOD_H2
>

Acked-by: Matt Ranostay <[email protected]>

> Signed-off-by: Andreas Brauchli <[email protected]>
> ---
> Documentation/ABI/testing/sysfs-bus-iio | 4 ++++
> include/uapi/linux/iio/types.h | 2 ++
> tools/iio/iio_event_monitor.c | 4 ++++
> 3 files changed, 10 insertions(+)
>
> diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
> index 8127a08e366d..6d64521bf565 100644
> --- a/Documentation/ABI/testing/sysfs-bus-iio
> +++ b/Documentation/ABI/testing/sysfs-bus-iio
> @@ -1554,6 +1554,10 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentration_raw
> What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_raw
> What: /sys/bus/iio/devices/iio:deviceX/in_concentration_co2_raw
> What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_co2_raw
> +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_ethanol_raw
> +What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw
> +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw
> +What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw
> What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw
> What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
> KernelVersion: 4.3
> diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
> index 92baabc103ac..04a6649fa442 100644
> --- a/include/uapi/linux/iio/types.h
> +++ b/include/uapi/linux/iio/types.h
> @@ -87,6 +87,8 @@ enum iio_modifier {
> IIO_MOD_VOC,
> IIO_MOD_LIGHT_UV,
> IIO_MOD_LIGHT_DUV,
> + IIO_MOD_ETHANOL,
> + IIO_MOD_H2,
> };
>
> enum iio_event_type {
> diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
> index ac2de6b7e89f..f29c885f4b28 100644
> --- a/tools/iio/iio_event_monitor.c
> +++ b/tools/iio/iio_event_monitor.c
> @@ -114,6 +114,8 @@ static const char * const iio_modifier_names[] = {
> [IIO_MOD_I] = "i",
> [IIO_MOD_Q] = "q",
> [IIO_MOD_CO2] = "co2",
> + [IIO_MOD_ETHANOL] = "ethanol",
> + [IIO_MOD_H2] = "h2",
> [IIO_MOD_VOC] = "voc",
> };
>
> @@ -199,6 +201,8 @@ static bool event_is_known(struct iio_event_data *event)
> case IIO_MOD_I:
> case IIO_MOD_Q:
> case IIO_MOD_CO2:
> + case IIO_MOD_ETHANOL:
> + case IIO_MOD_H2:
> case IIO_MOD_VOC:
> break;
> default:
> --
> 2.17.1
>

2018-12-16 13:21:26

by Jonathan Cameron

Subject: Re: [PATCH v3 1/3] iio: Add modifiers for ethanol and H2 gases

On Fri, 14 Dec 2018 10:06:39 -0800
Matt Ranostay <[email protected]> wrote:

> On Thu, Dec 13, 2018 at 6:44 AM Andreas Brauchli
> <[email protected]> wrote:
> >
> > Add ethanol and H2 gas modifiers:
> > * IIO_MOD_ETHANOL
>
> Was going to ask why this wasn't a chemical formula like the rest of
> the modifiers, but C2H6O would be a bit wordy/unclear :).
>
> > * IIO_MOD_H2
> >
>
> Acked-by: Matt Ranostay <[email protected]>

There was a bit of fuzz due to crossing with the particle sensor.
Note that it changed the enum numbers so you'll need to rebuild
your own tools against the new version of the header.

Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.

Thanks,

Jonathan

>
> > Signed-off-by: Andreas Brauchli <[email protected]>
> > ---
> > Documentation/ABI/testing/sysfs-bus-iio | 4 ++++
> > include/uapi/linux/iio/types.h | 2 ++
> > tools/iio/iio_event_monitor.c | 4 ++++
> > 3 files changed, 10 insertions(+)
> >
> > diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
> > index 8127a08e366d..6d64521bf565 100644
> > --- a/Documentation/ABI/testing/sysfs-bus-iio
> > +++ b/Documentation/ABI/testing/sysfs-bus-iio
> > @@ -1554,6 +1554,10 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentration_raw
> > What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_raw
> > What: /sys/bus/iio/devices/iio:deviceX/in_concentration_co2_raw
> > What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_co2_raw
> > +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_ethanol_raw
> > +What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw
> > +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw
> > +What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw
> > What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw
> > What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
> > KernelVersion: 4.3
> > diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
> > index 92baabc103ac..04a6649fa442 100644
> > --- a/include/uapi/linux/iio/types.h
> > +++ b/include/uapi/linux/iio/types.h
> > @@ -87,6 +87,8 @@ enum iio_modifier {
> > IIO_MOD_VOC,
> > IIO_MOD_LIGHT_UV,
> > IIO_MOD_LIGHT_DUV,
> > + IIO_MOD_ETHANOL,
> > + IIO_MOD_H2,
> > };
> >
> > enum iio_event_type {
> > diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
> > index ac2de6b7e89f..f29c885f4b28 100644
> > --- a/tools/iio/iio_event_monitor.c
> > +++ b/tools/iio/iio_event_monitor.c
> > @@ -114,6 +114,8 @@ static const char * const iio_modifier_names[] = {
> > [IIO_MOD_I] = "i",
> > [IIO_MOD_Q] = "q",
> > [IIO_MOD_CO2] = "co2",
> > + [IIO_MOD_ETHANOL] = "ethanol",
> > + [IIO_MOD_H2] = "h2",
> > [IIO_MOD_VOC] = "voc",
> > };
> >
> > @@ -199,6 +201,8 @@ static bool event_is_known(struct iio_event_data *event)
> > case IIO_MOD_I:
> > case IIO_MOD_Q:
> > case IIO_MOD_CO2:
> > + case IIO_MOD_ETHANOL:
> > + case IIO_MOD_H2:
> > case IIO_MOD_VOC:
> > break;
> > default:
> > --
> > 2.17.1
> >