summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-11-22 10:35:26 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2013-11-22 10:35:26 -0800
commitcbcd12852be7e8cffe58baf3cb1bb6fb35d3564d (patch)
tree5440d4e51da14b64e4a56b03e9d7ed1058a85668
parent1bb66b9ec3dfe71e18e3fe86addc96ddfe4e035f (diff)
parent6d3be412647b0eab0adff8a2768736cf4eb68039 (diff)
downloadakm-cbcd12852be7e8cffe58baf3cb1bb6fb35d3564d.tar.gz
Merge commit '6d3be412647b0eab0adff8a2768736cf4eb68039' into HEAD
-rw-r--r--AK8975_FS/libsensors/sensors.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/AK8975_FS/libsensors/sensors.cpp b/AK8975_FS/libsensors/sensors.cpp
index e37adc8..af0daea 100644
--- a/AK8975_FS/libsensors/sensors.cpp
+++ b/AK8975_FS/libsensors/sensors.cpp
@@ -66,30 +66,30 @@ static const struct sensor_t sSensorList[] = {
1,
SENSORS_MAGNETIC_FIELD_HANDLE,
SENSOR_TYPE_MAGNETIC_FIELD, 1228.8f,
- CONVERT_M, 0.35f, 10000, { } },
+ CONVERT_M, 0.35f, 10000, 0, 0, { } },
#ifdef SENSORHAL_ACC_ADXL346
{ "Analog Devices ADXL345/6 3-axis Accelerometer",
"ADI",
1, SENSORS_ACCELERATION_HANDLE,
SENSOR_TYPE_ACCELEROMETER, (GRAVITY_EARTH * 16.0f),
- (GRAVITY_EARTH * 16.0f) / 4096.0f, 0.145f, 10000, { } },
+ (GRAVITY_EARTH * 16.0f) / 4096.0f, 0.145f, 10000, 0, 0, { } },
{ "AK8975 Orientation sensor",
"Asahi Kasei Microdevices",
1, SENSORS_ORIENTATION_HANDLE,
SENSOR_TYPE_ORIENTATION, 360.0f,
- CONVERT_O, 0.495f, 10000, { } }
+ CONVERT_O, 0.495f, 10000, 0, 0, { } }
#endif
#ifdef SENSORHAL_ACC_KXTF9
{ "Kionix KXTF9 3-axis Accelerometer",
"Kionix",
1, SENSORS_ACCELERATION_HANDLE,
SENSOR_TYPE_ACCELEROMETER, (GRAVITY_EARTH * 2.0f),
- (GRAVITY_EARTH) / 1024.0f, 0.7f, 10000, { } },
+ (GRAVITY_EARTH) / 1024.0f, 0.7f, 10000, 0,0, { } },
{ "AK8975 Orientation sensor",
"Asahi Kasei Microdevices",
1, SENSORS_ORIENTATION_HANDLE,
SENSOR_TYPE_ORIENTATION, 360.0f,
- CONVERT_O, 1.05f, 10000, { } }
+ CONVERT_O, 1.05f, 10000, 0, 0, { } }
#endif
};