On Thu, 2016-11-03 at 18:07 +0800, Ooi, Joyce wrote:
> There are 2 usage types (Magnetic Flux and Heading data field) for
> HID
> compass sensor, thus the values of offset, scale, and sensitivity
> should
> be separated according to their respective usage type. The changes
> made
> are as below:
> 1. Hysteresis: A struct hid_sensor_common rot_attributes is created
> in
> struct magn_3d_state to contain the sensitivity for IIO_ROT.
> 2. Scale: scale_pre_decml and scale_post_decml are separated into
> scale_pre_decml_magn, scale_post_decml_magn, scale_pre_decml_rot, and
> scale_post_decml_rot.
> 3. Offset: Same as scale, value_offset is separated into
> value_offset_magn
> and value_offset_rot.
>
> For sensitivity, HID_USAGE_SENSOR_ORIENT_MAGN_FLUX and
> HID_USAGE_SENSOR_ORIENT_MAGN_HEADING are used for sensivitity fields
> based
> on the HID Sensor Usages specifications. Hence, these changes are
> added on
> the sensitivity field.
>
> Signed-off-by: Ooi, Joyce <joyce.ooi@xxxxxxxxx>
> ---
> .../iio/common/hid-sensors/hid-sensor-attributes.c | 5 +
> drivers/iio/magnetometer/hid-sensor-magn-3d.c | 102
> ++++++++++++++++++---
> 2 files changed, 93 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
> b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
> index c1f8c22..9641a15 100644
> --- a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
> +++ b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
> @@ -46,6 +46,11 @@
>
> {HID_USAGE_SENSOR_COMPASS_3D, 0, 0, 1000000},
> {HID_USAGE_SENSOR_COMPASS_3D, HID_USAGE_SENSOR_UNITS_GAUSS,
> 1, 0},
> + {HID_USAGE_SENSOR_ORIENT_COMP_MAGN_NORTH, 0, 0, 17453293},
> + {HID_USAGE_SENSOR_ORIENT_COMP_MAGN_NORTH,
> + HID_USAGE_SENSOR_UNITS_DEGREES, 0, 17453293},
> + {HID_USAGE_SENSOR_ORIENT_COMP_MAGN_NORTH,
> + HID_USAGE_SENSOR_UNITS_RADIANS, 1, 0},
>
> {HID_USAGE_SENSOR_INCLINOMETER_3D, 0, 0, 17453293},
> {HID_USAGE_SENSOR_INCLINOMETER_3D,
> diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
> b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
> index d8a0c8d..84a59d3 100644
> --- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
> +++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
> @@ -45,6 +45,7 @@ enum magn_3d_channel {
> struct magn_3d_state {
> struct hid_sensor_hub_callbacks callbacks;
> struct hid_sensor_common common_attributes;
To avoid confusion can we rename the above to something like
magn_flux_attributes?
> + struct hid_sensor_common rot_attributes;
> struct hid_sensor_hub_attribute_info
> magn[MAGN_3D_CHANNEL_MAX];
>
> /* dynamically sized array to hold sensor values */
> @@ -52,10 +53,14 @@ struct magn_3d_state {
> /* array of pointers to sensor value */
> u32 *magn_val_addr[MAGN_3D_CHANNEL_MAX];
>
> - int scale_pre_decml;
> - int scale_post_decml;
> - int scale_precision;
> - int value_offset;
> + int scale_pre_decml_magn;
> + int scale_post_decml_magn;
> + int scale_precision_magn;
> + int value_offset_magn;
> + int scale_pre_decml_rot;
> + int scale_post_decml_rot;
> + int scale_precision_rot;
> + int value_offset_rot;
Since the above is common can we have a struct with
{
int scale_pre_decml;
int scale_post_decml;
int scale_precision;>
int value_offset;>
};
Then we can have both flux and heading attributes can use instead of
repeating the field names.
Thanks,
Srinivas
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
