From 7a648726e34a37dabd1fb4e718a50554ea53f553 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Mon, 2 Dec 2013 21:36:38 +1000 Subject: [PATCH] [sensorfw] correct adapted sensor for orientation is orientation. stop the mag sensor from starting and calibrating at startup. add more debug output. --- .../hybrisorientationadaptor/hybrisorientationadaptor.cpp | 2 +- core/hybrisadaptor.cpp | 4 ++++ rpm/sensord.service | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp b/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp index 9d64ab84..da6a65b7 100644 --- a/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp +++ b/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp @@ -44,7 +44,7 @@ HybrisOrientationAdaptor::HybrisOrientationAdaptor(const QString& id) : HybrisAdaptor(id,SENSOR_TYPE_ORIENTATION) { buffer = new DeviceAdaptorRingBuffer(1); - setAdaptedSensor("accelerometer", "Internal orientation coordinates", buffer); + setAdaptedSensor("orientation", "Internal orientation coordinates", buffer); setDescription("Hybris orientation"); // setDefaultInterval(50); diff --git a/core/hybrisadaptor.cpp b/core/hybrisadaptor.cpp index 0d00908d..ba366597 100644 --- a/core/hybrisadaptor.cpp +++ b/core/hybrisadaptor.cpp @@ -177,6 +177,7 @@ bool HybrisManager::setDelay(int sensorHandle, int interval) void HybrisManager::startReader(HybrisAdaptor *adaptor) { if (registeredAdaptors.values().contains(adaptor)) { + sensordLogD() << "activating " << adaptor->name(); int error = device->activate(device, adaptor->sensorHandle, 1); if (error != 0) { sensordLogW() <name(); int error = device->activate(device, adaptor->sensorHandle, 0); if (error != 0) { sensordLogW() <name(); int error = device->activate(device, adaptor->sensorHandle, 1); if (error != 0) { sensordLogW() <name(); int error = device->activate(device, adaptor->sensorHandle, 0); if (error != 0) { sensordLogW() <