summaryrefslogtreecommitdiff
path: root/6515/libsensors_iio/sensors.h
diff options
context:
space:
mode:
authorNick Vaccaro <nvaccaro@google.com>2015-03-19 17:33:25 -0700
committerNick Vaccaro <nvaccaro@google.com>2015-05-14 14:47:56 -0700
commit9b7ebb5143dd692c20fc9348ae999450133dad57 (patch)
tree4829f3f786d6510844abffafec779b34eacffc7a /6515/libsensors_iio/sensors.h
parent6452c4ee74f245f0814e0cf44f2b6c1ad7a18fdf (diff)
downloadinvensense-9b7ebb5143dd692c20fc9348ae999450133dad57.tar.gz
Invensense: 6515: Update HAL to v5_2_0_L_RC26-2015-02-27
Merged in the latest upgrade from Invensense, that purports to fix some cts sensor test failures and includes a better pedometer algorithm. Bug: 19575833 Bug: 16778026 Bug: 16702488 Change-Id: Iaf8eba248bb9aa97f7b6a5394e939370a4812776
Diffstat (limited to '6515/libsensors_iio/sensors.h')
-rw-r--r--6515/libsensors_iio/sensors.h58
1 files changed, 57 insertions, 1 deletions
diff --git a/6515/libsensors_iio/sensors.h b/6515/libsensors_iio/sensors.h
index 84263f7..e299228 100644
--- a/6515/libsensors_iio/sensors.h
+++ b/6515/libsensors_iio/sensors.h
@@ -111,7 +111,63 @@ enum {
{ name, vendor, version, handle, type, maxRange, resolution, power, minDelay,
fifoReservedEventCount, fifoMaxEventCount, reserved[] }
*/
-#if defined ANDROID_KITKAT
+#if defined ANDROID_LOLLIPOP
+static struct sensor_t sBaseSensorList[] =
+{
+ {(const char *)("MPL Gyroscope"), (const char *)("Invensense"), 1,
+ SENSORS_GYROSCOPE_HANDLE,
+ SENSOR_TYPE_GYROSCOPE, 2000.0f, 1.0f, 0.5f, 10000, 0, 124, 0,0,0,0,0,0},
+ {"MPL Raw Gyroscope", "Invensense", 1,
+ SENSORS_RAW_GYROSCOPE_HANDLE,
+ SENSOR_TYPE_GYROSCOPE_UNCALIBRATED, 2000.0f, 1.0f, 0.5f, 10000, 0, 124, 0,0,0,0,0,0},
+ {"MPL Accelerometer", "Invensense", 1,
+ SENSORS_ACCELERATION_HANDLE,
+ SENSOR_TYPE_ACCELEROMETER, 10240.0f, 1.0f, 0.5f, 10000, 0, 124, 0,0,0,0,0,0},
+ {"MPL Magnetic Field", "Invensense", 1,
+ SENSORS_MAGNETIC_FIELD_HANDLE,
+ SENSOR_TYPE_MAGNETIC_FIELD, 10240.0f, 1.0f, 0.5f, 10000, 0, 124, 0,0,0,0,0,0},
+ {"MPL Raw Magnetic Field", "Invensense", 1,
+ SENSORS_RAW_MAGNETIC_FIELD_HANDLE,
+ SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED, 10240.0f, 1.0f, 0.5f, 10000, 0, 124, 0,0,0,0,0,0},
+#ifdef ENABLE_PRESSURE
+ {"MPL Pressure", "Invensense", 1,
+ SENSORS_PRESSURE_HANDLE,
+ SENSOR_TYPE_PRESSURE, 10240.0f, 1.0f, 0.5f, 10000, 0, 165, 0,0,0,0,0,0},
+#endif
+ {"MPL Orientation", "Invensense", 1,
+ SENSORS_ORIENTATION_HANDLE,
+ SENSOR_TYPE_ORIENTATION, 360.0f, 1.0f, 9.7f, 10000, 0, 0, 0,0,0,0,0,0},
+ {"MPL Rotation Vector", "Invensense", 1,
+ SENSORS_ROTATION_VECTOR_HANDLE,
+ SENSOR_TYPE_ROTATION_VECTOR, 10240.0f, 1.0f, 0.5f, 10000, 0, 0, 0,0,0,0,0,0},
+ {"MPL Game Rotation Vector", "Invensense", 1,
+ SENSORS_GAME_ROTATION_VECTOR_HANDLE,
+ SENSOR_TYPE_GAME_ROTATION_VECTOR, 10240.0f, 1.0f, 0.5f, 10000, 0, 62, 0,0,0,0,0,0},
+ {"MPL Linear Acceleration", "Invensense", 1,
+ SENSORS_LINEAR_ACCEL_HANDLE,
+ SENSOR_TYPE_LINEAR_ACCELERATION, 10240.0f, 1.0f, 0.5f, 10000, 0, 0, 0,0,0,0,0,0},
+ {"MPL Gravity", "Invensense", 1,
+ SENSORS_GRAVITY_HANDLE,
+ SENSOR_TYPE_GRAVITY, 10240.0f, 1.0f, 0.5f, 10000, 0, 0, 0,0,0,0,0,0},
+ {"MPL Significant Motion", "Invensense", 1,
+ SENSORS_SIGNIFICANT_MOTION_HANDLE,
+ SENSOR_TYPE_SIGNIFICANT_MOTION, 100.0f, 1.0f, 1.1f, 0, 0, 0, 0,0,0,0,0,0},
+ {"MPL Step Detector", "Invensense", 1,
+ SENSORS_PEDOMETER_HANDLE,
+ SENSOR_TYPE_STEP_DETECTOR, 100.0f, 1.0f, 1.1f, 0, 0, 124, 0,0,0,0,0,0},
+ {"MPL Step Counter", "Invensense", 1,
+ SENSORS_STEP_COUNTER_HANDLE,
+ SENSOR_TYPE_STEP_COUNTER, 100.0f, 1.0f, 1.1f, 0, 0, 0, 0,0,0,0,0,0},
+ {"MPL Geomagnetic Rotation Vector", "Invensense", 1,
+ SENSORS_GEOMAGNETIC_ROTATION_VECTOR_HANDLE,
+ SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR, 10240.0f, 1.0f, 0.5f, 5000, 0, 0, 0,0,0,0,0,0},
+#ifdef ENABLE_DMP_SCREEN_AUTO_ROTATION
+ {"MPL Screen Orientation", "Invensense ", 1,
+ SENSORS_SCREEN_ORIENTATION_HANDLE,
+ SENSOR_TYPE_SCREEN_ORIENTATION, 100.0f, 1.0f, 1.1f, 0, 0, 0, 0,0,0,0,0,0},
+#endif
+};
+#elif defined ANDROID_KITKAT
static struct sensor_t sBaseSensorList[] =
{
{"MPL Gyroscope", "Invensense", 1, SENSORS_GYROSCOPE_HANDLE,