Skip to content

Commit

Permalink
IIO channel type and modifiers for CCT and RGBC data
Browse files Browse the repository at this point in the history
Add iio channel type and modifiers for Correlated Color Temperature (CCT)
and RGBC (red/green/blue/clear) data.
Add CCT and RGBC descriptions to documentation.

Changes:
Revised/condensed RGBC descriptions.

Merge and trivial fix done by Jonathan Cameron.

Signed-off-by: Jon Brenner <jbrenner@taosinc.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  • Loading branch information
Jon Brenner authored and Jonathan Cameron committed Jul 10, 2012
1 parent ee0312a commit 21cd1fa
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/iio/industrialio-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ static const char * const iio_chan_type_name_spec[] = {
[IIO_TIMESTAMP] = "timestamp",
[IIO_CAPACITANCE] = "capacitance",
[IIO_ALTVOLTAGE] = "altvoltage",
[IIO_CCT] = "cct",
};

static const char * const iio_modifier_names[] = {
Expand All @@ -74,6 +75,10 @@ static const char * const iio_modifier_names[] = {
[IIO_MOD_SUM_SQUARED_X_Y_Z] = "x^2+y^2+z^2",
[IIO_MOD_LIGHT_BOTH] = "both",
[IIO_MOD_LIGHT_IR] = "ir",
[IIO_MOD_LIGHT_CLEAR] = "clear",
[IIO_MOD_LIGHT_RED] = "red",
[IIO_MOD_LIGHT_GREEN] = "green",
[IIO_MOD_LIGHT_BLUE] = "blue",
};

/* relies on pairs of these shared then separate */
Expand Down
23 changes: 23 additions & 0 deletions drivers/staging/iio/Documentation/sysfs-bus-iio-light
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,26 @@ Contact: linux-iio@vger.kernel.org
Description:
This property gets/sets the table of coefficients
used in calculating illuminance in lux.

What: /sys/bus/iio/devices/device[n]/in_intensity_clear[_input|_raw]
What: /sys/bus/iio/devices/device[n]/in_intensity_red[_input|_raw]
What: /sys/bus/iio/devices/device[n]/in_intensity_green[_input|_raw]
What: /sys/bus/iio/devices/device[n]/in_intensity_blue[_input|_raw]
KernelVersion: 3.4.0
Contact: linux-iio@vger.kernel.org
Description:
This property is supported by sensors that have a RGBC
sensing mode. This value should be the output from a reading
and if expressed in SI units, should include _input. If this
value is not in SI units (irradiance, uW/mm^2), then it should
include _raw.

What: /sys/bus/iio/devices/device[n]/in_cct0[_input|_raw]
KernelVersion: 3.4.0
Contact: linux-iio@vger.kernel.org
Description:
This should return the correlated color temperature from the
light sensor. If it comes back in SI units, it should also
include _input else it should include _raw to signify it is not
in SI units.

5 changes: 5 additions & 0 deletions include/linux/iio/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ enum iio_chan_type {
IIO_TIMESTAMP,
IIO_CAPACITANCE,
IIO_ALTVOLTAGE,
IIO_CCT,
};

enum iio_modifier {
Expand All @@ -46,6 +47,10 @@ enum iio_modifier {
IIO_MOD_LIGHT_IR,
IIO_MOD_ROOT_SUM_SQUARED_X_Y,
IIO_MOD_SUM_SQUARED_X_Y_Z,
IIO_MOD_LIGHT_CLEAR,
IIO_MOD_LIGHT_RED,
IIO_MOD_LIGHT_GREEN,
IIO_MOD_LIGHT_BLUE,
};

#define IIO_VAL_INT 1
Expand Down

0 comments on commit 21cd1fa

Please sign in to comment.