diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-24 13:39:25 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-24 13:39:25 +0100 |
| commit | 431dffc1df07b93ce9be26d264b7946cd65cb949 (patch) | |
| tree | f8aaf7d46c8d90f5b2ebe0d6af6f8991b658ea0b /tools/iio | |
| parent | 57d3909596f9941c7d0777004994438df1b5ba0a (diff) | |
| parent | c6c97210e27237438689611980f8a7b87bcc79bf (diff) | |
Merge branch 'ib-iio-hid-sensors-v6.6-rc1' into togreg
The deta angle and deta velocity channels were added in parallel with
color temperature and chromacity so this merge had to assign a
consistent order. I put the color related ones second.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'tools/iio')
| -rw-r--r-- | tools/iio/iio_event_monitor.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c index 7e6761612246..2eaaa7123b04 100644 --- a/tools/iio/iio_event_monitor.c +++ b/tools/iio/iio_event_monitor.c @@ -61,6 +61,8 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_MASSCONCENTRATION] = "massconcentration", [IIO_DELTA_ANGL] = "deltaangl", [IIO_DELTA_VELOCITY] = "deltavelocity", + [IIO_COLORTEMP] = "colortemp", + [IIO_CHROMATICITY] = "chromaticity", }; static const char * const iio_ev_type_text[] = { @@ -177,6 +179,8 @@ static bool event_is_known(struct iio_event_data *event) case IIO_MASSCONCENTRATION: case IIO_DELTA_ANGL: case IIO_DELTA_VELOCITY: + case IIO_COLORTEMP: + case IIO_CHROMATICITY: break; default: return false; |