Merge pull request android#292 from jiawen/master-cmake

Set event rate after enabling sensor so it takes effect.
simonzhexu · Sep 15, 2016 · 2b00aa2 · 2b00aa2
2 parents 7056c38 + ca59693
commit 2b00aa2
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/sensor-graph/accelerometer/src/main/cpp/sensorgraph.cpp b/sensor-graph/accelerometer/src/main/cpp/sensorgraph.cpp
@@ -32,7 +32,8 @@
 
 const int LOOPER_ID_USER = 3;
 const int SENSOR_HISTORY_LENGTH = 100;
-const int SENSOR_REFRESH_RATE = 100;
+const int SENSOR_REFRESH_RATE_HZ = 100;
+constexpr int32_t SENSOR_REFRESH_PERIOD_US = int32_t(1000000 / SENSOR_REFRESH_RATE_HZ);
 const float SENSOR_FILTER_ALPHA = 0.1f;
 
 
@@ -92,12 +93,13 @@ class sensorgraph {
         accelerometerEventQueue = ASensorManager_createEventQueue(sensorManager, looper,
                                                                   LOOPER_ID_USER, NULL, NULL);
         assert(accelerometerEventQueue != NULL);
-        ASensorEventQueue_setEventRate(accelerometerEventQueue,
-                                       accelerometer,
-                                       int32_t(1000000 / SENSOR_REFRESH_RATE));
         auto status = ASensorEventQueue_enableSensor(accelerometerEventQueue,
                                                      accelerometer);
         assert(status >= 0);
+        status = ASensorEventQueue_setEventRate(accelerometerEventQueue,
+                                                accelerometer,
+                                                SENSOR_REFRESH_PERIOD_US);
+        assert(status >= 0);
         (void)status;   //to silent unused compiler warning
 
         generateXPos();
@@ -208,6 +210,10 @@ class sensorgraph {
 
     void resume() {
         ASensorEventQueue_enableSensor(accelerometerEventQueue, accelerometer);
+        auto status = ASensorEventQueue_setEventRate(accelerometerEventQueue,
+                                                     accelerometer,
+                                                     SENSOR_REFRESH_PERIOD_US);
+        assert(status >= 0);
     }
 };