resolved conflicts for merge of 72c113ee
to master
Change-Id: Icef7703423fdb153477bfd3dc49980e979bbd8e7
This commit is contained in:
commit
8cd4162a14
1 changed files with 10 additions and 8 deletions
|
@ -193,12 +193,14 @@ __BEGIN_DECLS
|
|||
* ---------
|
||||
* All values are in radians/second and measure the rate of rotation
|
||||
* around the X, Y and Z axis. The coordinate system is the same as is
|
||||
* used for the acceleration sensor. Rotation is positive in the counter-clockwise
|
||||
* direction. That is, an observer looking from some positive location on the x, y.
|
||||
* or z axis at a device positioned on the origin would report positive rotation
|
||||
* if the device appeared to be rotating counter clockwise. Note that this is the
|
||||
* standard mathematical definition of positive rotation and does not agree with the
|
||||
* definition of roll given earlier.
|
||||
* used for the acceleration sensor. Rotation is positive in the
|
||||
* counter-clockwise direction (right-hand rule). That is, an observer
|
||||
* looking from some positive location on the x, y or z axis at a device
|
||||
* positioned on the origin would report positive rotation if the device
|
||||
* appeared to be rotating counter clockwise. Note that this is the
|
||||
* standard mathematical definition of positive rotation and does not agree
|
||||
* with the definition of roll given earlier.
|
||||
* The range should at least be 17.45 rad/s (ie: ~1000 deg/s).
|
||||
*
|
||||
* Proximity
|
||||
* ---------
|
||||
|
@ -309,8 +311,8 @@ typedef struct sensors_event_t {
|
|||
/* orientation values are in degrees */
|
||||
sensors_vec_t orientation;
|
||||
|
||||
/* angular velocity in degrees per second (dps) */
|
||||
sensors_vec_t gyro;
|
||||
/* gyroscope values are in rad/s */
|
||||
sensors_vec_t gyro;
|
||||
|
||||
/* temperature is in degrees centigrade (Celsius) */
|
||||
float temperature;
|
||||
|
|
Loading…
Reference in a new issue