From 228bc49708e02683a072abf2d5dbdc3d9d091323 Mon Sep 17 00:00:00 2001 From: p2niemel Date: Fri, 8 Apr 2011 20:05:23 +0300 Subject: polishing --- plugins/sensors/meego/meegosensorbase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/sensors/meego/meegosensorbase.cpp') diff --git a/plugins/sensors/meego/meegosensorbase.cpp b/plugins/sensors/meego/meegosensorbase.cpp index 71efc4e283..079320d29d 100644 --- a/plugins/sensors/meego/meegosensorbase.cpp +++ b/plugins/sensors/meego/meegosensorbase.cpp @@ -44,9 +44,9 @@ SensorManagerInterface* meegosensorbase::m_remoteSensorManager = 0; - -const float meegosensorbase::GRAVITY_EARTH = 9.80665; -const float meegosensorbase::GRAVITY_EARTH_THOUSANDTH = 0.00980665; +//According to wikipedia link http://en.wikipedia.org/wiki/Standard_gravity +//const float meegosensorbase::GRAVITY_EARTH = 9.812865328; +const float meegosensorbase::GRAVITY_EARTH_THOUSANDTH = 0.009812865328; const int meegosensorbase::KErrNotFound=-1; const int meegosensorbase::KErrInUse=-14; const char* const meegosensorbase::ALWAYS_ON = "alwaysOn"; -- cgit v1.2.3 From 65b7e18a08ca2dde4e46e39b1e980cc5dfd5d4c8 Mon Sep 17 00:00:00 2001 From: p2niemel Date: Tue, 12 Apr 2011 13:47:33 +0300 Subject: flag for maemo6 features + warnings removed --- plugins/sensors/meego/meegosensorbase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/sensors/meego/meegosensorbase.cpp') diff --git a/plugins/sensors/meego/meegosensorbase.cpp b/plugins/sensors/meego/meegosensorbase.cpp index 079320d29d..31cc6cb0c3 100644 --- a/plugins/sensors/meego/meegosensorbase.cpp +++ b/plugins/sensors/meego/meegosensorbase.cpp @@ -91,7 +91,7 @@ void meegosensorbase::start() int l = sensor()->outputRanges().size(); if (l>1){ if (currentRange != m_prevOutputRange){ -#ifdef Q_WS_MAEMO6 +#ifdef Q_WS_MAEMO_6 bool isOk = m_sensorInterface->setDataRangeIndex(currentRange); //NOTE THAT THE CHANGE MIGHT NOT SUCCEED, FIRST COME FIRST SERVED if (!isOk) sensorError(KErrInUse); else m_prevOutputRange = currentRange; @@ -166,7 +166,7 @@ bool meegosensorbase::doConnectAfterCheck(){ } -const int meegosensorbase::bufferSize(){ +int meegosensorbase::bufferSize() const{ QVariant bufferVariant = sensor()->property(BUFFER_SIZE); int bufferSize = bufferVariant.isValid()?bufferVariant.toInt():1; if (bufferSize==1) return 1; @@ -183,5 +183,5 @@ const int meegosensorbase::bufferSize(){ return bufferSize; } -const qreal meegosensorbase::correctionFactor(){return 1;} +qreal meegosensorbase::correctionFactor() const{return 1;} -- cgit v1.2.3 From adf5b4b10969a502a134c03b85c2f3ca90da92a2 Mon Sep 17 00:00:00 2001 From: p2niemel Date: Tue, 12 Apr 2011 14:20:56 +0300 Subject: only streaming sensors are buffering --- plugins/sensors/meego/meegosensorbase.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'plugins/sensors/meego/meegosensorbase.cpp') diff --git a/plugins/sensors/meego/meegosensorbase.cpp b/plugins/sensors/meego/meegosensorbase.cpp index 31cc6cb0c3..663501e8a4 100644 --- a/plugins/sensors/meego/meegosensorbase.cpp +++ b/plugins/sensors/meego/meegosensorbase.cpp @@ -53,6 +53,7 @@ const char* const meegosensorbase::ALWAYS_ON = "alwaysOn"; const char* const meegosensorbase::BUFFER_SIZE = "bufferSize"; const char* const meegosensorbase::MAX_BUFFER_SIZE = "maxBufferSize"; const char* const meegosensorbase::EFFICIENT_BUFFER_SIZE = "efficientBufferSize"; +QStringList meegosensorbase::m_bufferingSensors = QStringList()<<"meego.accelerometer"<<"meego.magnetometer"<<"meego.gyroscope"<<"meego.rotationsensor"; meegosensorbase::meegosensorbase(QSensor *sensor) : QSensorBackend(sensor), m_sensorInterface(0), m_bufferSize(-1), m_prevOutputRange(0), m_efficientBufferSize(1), m_maxBufferSize(1) @@ -149,8 +150,14 @@ bool meegosensorbase::doConnectAfterCheck(){ int size = bufferSize(); if (size == m_bufferSize) return true; - m_sensorInterface->setBufferSize(size); + if (m_bufferingSensors.contains(sensor()->identifier())) + m_sensorInterface->setBufferSize(size); + else{ + m_bufferSize = 1; + size = 1; + } + // if multiple->single or single->multiple or if uninitialized if ((m_bufferSize>1 && size==1) || (m_bufferSize==1 && size>1) || m_bufferSize==-1){ m_bufferSize = size; -- cgit v1.2.3 From e499400d1090f9d75581c49dddf4d54cd6b5a0b3 Mon Sep 17 00:00:00 2001 From: p2niemel Date: Mon, 18 Apr 2011 14:17:04 +0300 Subject: fix: non-streaming sensors not functioning --- plugins/sensors/meego/meegosensorbase.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'plugins/sensors/meego/meegosensorbase.cpp') diff --git a/plugins/sensors/meego/meegosensorbase.cpp b/plugins/sensors/meego/meegosensorbase.cpp index 663501e8a4..26ffbe6d10 100644 --- a/plugins/sensors/meego/meegosensorbase.cpp +++ b/plugins/sensors/meego/meegosensorbase.cpp @@ -153,10 +153,7 @@ bool meegosensorbase::doConnectAfterCheck(){ if (m_bufferingSensors.contains(sensor()->identifier())) m_sensorInterface->setBufferSize(size); - else{ - m_bufferSize = 1; - size = 1; - } + else size = 1; // if multiple->single or single->multiple or if uninitialized if ((m_bufferSize>1 && size==1) || (m_bufferSize==1 && size>1) || m_bufferSize==-1){ -- cgit v1.2.3