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.
Showing the changes to include/uapi (1 of 11 files). Show all
Unified · Split
| @@ -49,6 +49,8 @@ enum iio_chan_type { · 48 unmodified lines | |||
| 49 | IIO_MASSCONCENTRATION, | 49 | IIO_MASSCONCENTRATION, |
| 50 | IIO_DELTA_ANGL, | 50 | IIO_DELTA_ANGL, |
| 51 | IIO_DELTA_VELOCITY, | 51 | IIO_DELTA_VELOCITY, |
| 52 | IIO_COLORTEMP, | ||
| 53 | IIO_CHROMATICITY, | ||
| 52 | }; | 54 | }; |
| 53 | 55 | ||
| 54 | enum iio_modifier { | 56 | enum iio_modifier { |