tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 95e5456c: am 1a2bf61d: fix the nusensor test

Browse source 
Merge commit '95e5456cf87adbc99a20bdc358ff63bc7e501f04'

* commit '95e5456cf87adbc99a20bdc358ff63bc7e501f04':
  fix the nusensor test
This commit is contained in:
Mathias Agopian 2010-07-21 18:04:58 -07:00 committed by Android Git Automerger
commit e939539555
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tests/nusensors/nusensors.cpp
View file

@ -81,6 +81,15 @@ int main(int argc, char** argv)
return 0;
}
for (int i=0 ; i<count ; i++) {
err = device->activate(device, list[i].handle, 0);
if (err != 0) {
printf("deactivate() for '%s'failed (%s)\n",
list[i].name, strerror(-err));
return 0;
}
}
for (int i=0 ; i<count ; i++) {
err = device->activate(device, list[i].handle, 1);
if (err != 0) {
@ -108,10 +117,10 @@ int main(int argc, char** argv)
break;
}
switch(data.sensor) {
switch(data.type) {
case SENSOR_TYPE_ACCELEROMETER:
printf("sensor=%s, time=%lld, value=<%5.1f,%5.1f,%5.1f>\n",
getSensorName(data.sensor),
getSensorName(data.type),
data.timestamp,
data.acceleration.x,
data.acceleration.y,
@ -119,7 +128,7 @@ int main(int argc, char** argv)
break;
case SENSOR_TYPE_MAGNETIC_FIELD:
printf("sensor=%s, time=%lld, value=<%5.1f,%5.1f,%5.1f>\n",
getSensorName(data.sensor),
getSensorName(data.type),
data.timestamp,
data.magnetic.x,
data.magnetic.y,
@ -127,7 +136,7 @@ int main(int argc, char** argv)
break;
case SENSOR_TYPE_ORIENTATION:
printf("sensor=%s, time=%lld, value=<%5.1f,%5.1f,%5.1f>\n",
getSensorName(data.sensor),
getSensorName(data.type),
data.timestamp,
data.orientation.azimuth,
data.orientation.pitch,
@ -135,25 +144,25 @@ int main(int argc, char** argv)
break;
case SENSOR_TYPE_PROXIMITY:
printf("sensor=%s, time=%lld, value=%f\n",
getSensorName(data.sensor),
getSensorName(data.type),
data.timestamp,
data.distance);
break;
case SENSOR_TYPE_TEMPERATURE:
printf("sensor=%s, time=%lld, value=%f\n",
getSensorName(data.sensor),
getSensorName(data.type),
data.timestamp,
data.temperature);
break;
case SENSOR_TYPE_LIGHT:
printf("sensor=%s, time=%lld, value=%f\n",
getSensorName(data.sensor),
getSensorName(data.type),
data.timestamp,
data.light);
break;
default:
printf("sensor=%s, time=%lld, value=<%f,%f,%f>\n",
getSensorName(data.sensor),
printf("sensor=%d, time=%lld, value=<%f,%f,%f>\n",
data.type,
data.timestamp,
data.acceleration.x,
data.acceleration.y,