am 83eb0af0: Merge "support humidity sensor type"

* commit '83eb0af000c80bc9d9b2a19eb15ab22bb0dddb1b':
  support humidity sensor type
This commit is contained in:
Jean-Baptiste Queru
2011-05-18 15:15:48 -07:00
committed by Android Git Automerger

View File

@@ -61,6 +61,7 @@ __BEGIN_DECLS
#define SENSOR_TYPE_GRAVITY 9
#define SENSOR_TYPE_LINEAR_ACCELERATION 10
#define SENSOR_TYPE_ROTATION_VECTOR 11
#define SENSOR_TYPE_RELATIVE_HUMIDITY 12
/**
* Values returned by the accelerometer in various locations in the universe.
@@ -274,6 +275,14 @@ __BEGIN_DECLS
* sensors_event_t.data[2] = z*sin(theta/2)
* sensors_event_t.data[3] = cos(theta/2)
*
* Relative Humidity
* -----------------
*
* A relative humidity sensor measures relative ambient air humidity and
* returns a value in percent.
*
* Relative humidity sensors report a value only when it changes and each
* time the sensor is enabled. setDelay() is ignored.
*/
typedef struct {
@@ -340,6 +349,9 @@ typedef struct sensors_event_t {
/* pressure in hectopascal (hPa) */
float pressure;
/* relative humidity in percent */
float relative_humidity;
};
uint32_t reserved1[4];
} sensors_event_t;