Merge "improve sensorservice_test output"

1 files changed, 12 insertions, 13 deletions

diff --git a/services/sensorservice/tests/sensorservicetest.cpp b/services/sensorservice/tests/sensorservicetest.cpp
index 54bce091f66f..1025fa83f80b 100644
--- a/services/sensorservice/tests/sensorservicetest.cpp
+++ b/services/sensorservice/tests/sensorservicetest.cpp
@@ -35,22 +35,21 @@ int receiver(int fd, int events, void* data)
 
     while ((n = q->read(buffer, 8)) > 0) {
         for (int i=0 ; i<n ; i++) {
-            if (buffer[i].type == Sensor::TYPE_ACCELEROMETER) {
-                printf("time=%lld, value=<%5.1f,%5.1f,%5.1f>\n",
-                        buffer[i].timestamp,
-                        buffer[i].acceleration.x,
-                        buffer[i].acceleration.y,
-                        buffer[i].acceleration.z);
-            }
-
+            float t;
             if (oldTimeStamp) {
-                float t = float(buffer[i].timestamp - oldTimeStamp) / s2ns(1);
-                printf("%f ms (%f Hz)\n", t*1000, 1.0/t);
+                t = float(buffer[i].timestamp - oldTimeStamp) / s2ns(1);
             } else {
-                float t = float(buffer[i].timestamp - sStartTime) / s2ns(1);
-                printf("first event: %f ms\n", t*1000);
+                t = float(buffer[i].timestamp - sStartTime) / s2ns(1);
             }
             oldTimeStamp = buffer[i].timestamp;
+
+            if (buffer[i].type == Sensor::TYPE_ACCELEROMETER) {
+                printf("%lld\t%8f\t%8f\t%8f\t%f\n",
+                        buffer[i].timestamp,
+                        buffer[i].data[0], buffer[i].data[1], buffer[i].data[2],
+                        1.0/t);
+            }
+
         }
     }
     if (n<0 && n != -EAGAIN) {
@@ -79,7 +78,7 @@ int main(int argc, char** argv)
 
     q->enableSensor(accelerometer);
 
-    q->setEventRate(accelerometer, ms2ns(200));
+    q->setEventRate(accelerometer, ms2ns(10));
 
     sp<Looper> loop = new Looper(false);
     loop->addFd(q->getFd(), 0, ALOOPER_EVENT_INPUT, receiver, q.get());