commit 09b5ed4d92066c20bf11440fca3b04ff1fc4698a
author Enxun Wei <enxun@google.com> Thu Apr 27 18:03:55 2017 -0700
committer Enxun Wei <enxun@google.com> Mon May 22 11:23:45 2017 -0700
tree d612d8845dd3b87ce21547f4c115d147b1a5f4ef
parent 10700d72e1028af720f2bfcab0bf15ab4c13740a

[sensorhal] marlin/sailfish: Change accel range 8g->16g

BUG: 37222541
Test: tested with local build
Change-Id: I54ab5e9a0dda9ed7c23a02d3f30f0ad0a7ded637

sensorhal/sensorlist.cpp

diff --git a/sensorhal/sensorlist.cpp b/sensorhal/sensorlist.cpp
index 3c03741..e9053c5 100644
--- a/sensorhal/sensorlist.cpp
+++ b/sensorhal/sensorlist.cpp
@@ -26,7 +26,8 @@
 
 const float kMinSampleRateHzAccel = 6.250f;
 const float kMaxSampleRateHzAccel = 400.0f;
-extern const float kScaleAccel = (8.0f * 9.81f / 32768.0f);
+const float kAccelRangeG = 16.0f;
+extern const float kScaleAccel = (kAccelRangeG * 9.81f / 32768.0f);
 
 const float kMinSampleRateHzGyro = 6.250f;
 const float kMaxSampleRateHzGyro = 400.0f;
@@ -146,8 +147,8 @@
         kVersion,
         COMMS_SENSOR_ACCEL,
         SENSOR_TYPE_ACCELEROMETER,
-        GRAVITY_EARTH * 8.0f,                      // maxRange
-        GRAVITY_EARTH * 8.0f / 32768.0f,           // resolution
+        GRAVITY_EARTH * kAccelRangeG,              // maxRange
+        GRAVITY_EARTH * kAccelRangeG / 32768.0f,   // resolution
         0.0f,                                      // XXX power
         (int32_t)(1.0E6f / kMaxSampleRateHzAccel), // minDelay
         3000,                                      // XXX fifoReservedEventCount
@@ -560,8 +561,8 @@
         kVersion,
         COMMS_SENSOR_ACCEL_UNCALIBRATED,
         SENSOR_TYPE_ACCELEROMETER_UNCALIBRATED,
-        GRAVITY_EARTH * 8.0f,                      // maxRange
-        GRAVITY_EARTH * 8.0f / 32768.0f,           // resolution
+        GRAVITY_EARTH * kAccelRangeG,              // maxRange
+        GRAVITY_EARTH * kAccelRangeG / 32768.0f,   // resolution
         0.0f,                                      // XXX power
         (int32_t)(1.0E6f / kMaxSampleRateHzAccel), // minDelay
         3000,                                      // XXX fifoReservedEventCount