Merge branch 'harmattan'

Conflicts: adaptors/accelerometeradaptor/accelerometeradaptor.cpp adaptors/alsadaptor/alsadaptor.cpp adaptors/alsadaptor/alsadaptor.h adaptors/kbslideradaptor/kbslideradaptor.cpp adaptors/magnetometeradaptor-ascii/magnetometeradaptor-ascii.cpp adaptors/magnetometeradaptor/magnetometeradaptor.cpp adaptors/magnetometeradaptor/magnetometeradaptor.h adaptors/mrstaccelerometer/mrstaccelerometeradaptor.cpp adaptors/mrstaccelerometer/mrstaccelerometeradaptor.h adaptors/proximityadaptor-ascii/proximityadaptor-ascii.cpp adaptors/proximityadaptor-ascii/proximityadaptor-ascii.h adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp adaptors/proximityadaptor-evdev/proximityadaptor-evdev.h adaptors/proximityadaptor/proximityadaptor.cpp adaptors/tapadaptor/tapadaptor.cpp adaptors/touchadaptor/touchadaptor.cpp chains/accelerometerchain/accelerometerchain.cpp config/90-sensord-default.conf core/deviceadaptor.h core/inputdevadaptor.cpp core/inputdevadaptor.h core/loader.cpp core/logging.h core/nodebase.h core/sensormanager.h core/sysfsadaptor.cpp core/sysfsadaptor.h datatypes/orientationdata.h debian/changelog filters/orientationinterpreter/orientationinterpreter.cpp sensord.pc sensord/calibrationhandler.cpp sensors/gyroscopesensor/gyroscopesensor.cpp sensors/proximitysensor/proximitysensor.cpp tests/adaptors/adaptortest.cpp tests/client/clientapitest.cpp
sailfishos · Apr 20, 2011 · 580ac94 · 580ac94
2 parents e126f2a + b104f1e
commit 580ac94
Show file tree

Hide file tree

Showing 220 changed files with 7,352 additions and 2,474 deletions.
diff --git a/adaptors/accelerometeradaptor/accelerometeradaptor.cpp b/adaptors/accelerometeradaptor/accelerometeradaptor.cpp
@@ -8,6 +8,7 @@
    @author Timo Rongas <ext-timo.2.rongas@nokia.com>
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
    @author Antti Virtanen <antti.i.virtanen@nokia.com>
+   @author Shenghua <ext-shenghua.1.liu@nokia.com>
 
    This file is part of Sensord.
 
@@ -40,7 +41,6 @@
 AccelerometerAdaptor::AccelerometerAdaptor(const QString& id) :
     InputDevAdaptor(id, 1)
 {
-
     accelerometerBuffer_ = new DeviceAdaptorRingBuffer<OrientationData>(1);
     setAdaptedSensor("accelerometer", "Internal accelerometer coordinates", accelerometerBuffer_);
     setDescription("Input device accelerometer adaptor (lis302d)");
@@ -69,7 +69,6 @@ void AccelerometerAdaptor::interpretEvent(int src, struct input_event *ev)
                     break;
             }
             break;
-
     }
 }
 
@@ -81,32 +80,31 @@ void AccelerometerAdaptor::interpretSync(int src, struct input_event *ev)
 
 void AccelerometerAdaptor::commitOutput(struct input_event *ev)
 {
-    OrientationData* d = accelerometerBuffer_->nextSlot();
+    AccelerationData* d = accelerometerBuffer_->nextSlot();
 
     d->timestamp_ = Utils::getTimeStamp(&(ev->time));
     d->x_ = orientationValue_.x_;
     d->y_ = orientationValue_.y_;
     d->z_ = orientationValue_.z_;
 
+    sensordLogT() << "Accelerometer reading: " << d->x_ << ", " << d->y_ << ", " << d->z_;
+
     accelerometerBuffer_->commit();
     accelerometerBuffer_->wakeUpReaders();
 }
 
 unsigned int AccelerometerAdaptor::evaluateIntervalRequests(int& sessionId) const
 {
-    unsigned int highestValue = 0;
-    int winningSessionId = -1;
-
     if (m_intervalMap.size() == 0)
     {
-        sessionId = winningSessionId;
+        sessionId = -1;
         return defaultInterval();
     }
 
     // Get the smallest positive request, 0 is reserved for HW wakeup
     QMap<int, unsigned int>::const_iterator it = m_intervalMap.constBegin();
-    highestValue = it.value();
-    winningSessionId = it.key();
+    unsigned int highestValue = it.value();
+    int winningSessionId = it.key();
 
     for (++it; it != m_intervalMap.constEnd(); ++it)
     {

diff --git a/adaptors/accelerometeradaptor/accelerometeradaptor.h b/adaptors/accelerometeradaptor/accelerometeradaptor.h
@@ -70,8 +70,8 @@ class AccelerometerAdaptor : public InputDevAdaptor
     virtual unsigned int evaluateIntervalRequests(int& sessionId) const;
 
 private:
-    DeviceAdaptorRingBuffer<OrientationData>* accelerometerBuffer_;
-    OrientationData orientationValue_;
+    DeviceAdaptorRingBuffer<AccelerationData>* accelerometerBuffer_;
+    AccelerationData orientationValue_;
 
     void interpretEvent(int src, struct input_event *ev);
     void commitOutput(struct input_event *ev);

diff --git a/adaptors/alsadaptor-sysfs/alsadaptor-sysfs.cpp b/adaptors/alsadaptor-sysfs/alsadaptor-sysfs.cpp
@@ -37,7 +37,7 @@
 #include <linux/types.h>
 
 ALSAdaptorSysfs::ALSAdaptorSysfs(const QString& id) :
-    SysfsAdaptor(id, SysfsAdaptor::IntervalMode, true, Config::configuration()->value("als-sysfs_path").toString())
+    SysfsAdaptor(id, SysfsAdaptor::IntervalMode, true)
 {
     alsBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
     setAdaptedSensor("als", "Internal ambient light sensor lux values", alsBuffer_);
@@ -61,7 +61,7 @@ void ALSAdaptorSysfs::processSample(int pathId, int fd)
     idata = atoi(asciidata);
 
     if (bytesRead <= 0) {
-        sensordLogW() << "read():" << strerror(errno);
+        sensordLogW() << "read(): " << strerror(errno);
         return;
     }
 

diff --git a/adaptors/alsadaptor/alsadaptor.cpp b/adaptors/alsadaptor/alsadaptor.cpp
@@ -11,6 +11,7 @@
    @author Tapio Rantala <ext-tapio.rantala@nokia.com>
    @author Lihan Guo <lihan.guo@digia.com>
    @author Antti Virtanen <antti.i.virtanen@nokia.com>
+   @author Shenghua <ext-shenghua.1.liu@nokia.com>
 
    This file is part of Sensord.
 
@@ -49,15 +50,16 @@ struct bh1770glc_als {
     __u16 lux;
 } __attribute__((packed));
 
-
 ALSAdaptor::ALSAdaptor(const QString& id):
-        SysfsAdaptor(id, SysfsAdaptor::SelectMode, false)
+    SysfsAdaptor(id, SysfsAdaptor::SelectMode, false),
+    deviceType_(DeviceUnknown)
 {
     alsBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
     setAdaptedSensor("als", "Internal ambient light sensor lux values", alsBuffer_);
     setDescription("Ambient light");
-    deviceType_ = (DeviceType)Config::configuration()->value("als/driver_type", "0").toInt();
+    deviceType_ = (DeviceType)Config::configuration()->value<int>("als/driver_type", DeviceUnknown);
     powerStatePath_ = Config::configuration()->value("als/powerstate_path").toByteArray();
+
 #ifdef SENSORFW_MCE_WATCHER
     dbusIfc = new QDBusInterface(MCE_SERVICE, MCE_REQUEST_PATH, MCE_REQUEST_IF,
                                  QDBusConnection::systemBus(), this);
@@ -93,16 +95,14 @@ void ALSAdaptor::stopSensor()
     SysfsAdaptor::stopSensor();
 }
 
-
 bool ALSAdaptor::startAdaptor()
 {
     if (deviceType_ == RM696 || deviceType_ == RM680)
     {
 #ifdef SENSORFW_MCE_WATCHER
-        dbusIfc -> call(QDBus::NoBlock, "req_als_enable");
+        dbusIfc->call(QDBus::NoBlock, "req_als_enable");
 #endif
     }
-
     return SysfsAdaptor::startAdaptor();
 }
 
@@ -111,14 +111,12 @@ void ALSAdaptor::stopAdaptor()
     if (deviceType_ == RM696 || deviceType_ == RM680)
     {
 #ifdef SENSORFW_MCE_WATCHER
-        dbusIfc -> call(QDBus::NoBlock, "req_als_disable");
+        dbusIfc->call(QDBus::NoBlock, "req_als_disable");
 #endif
     }
     SysfsAdaptor::stopAdaptor();
 }
 
-
-
 void ALSAdaptor::processSample(int pathId, int fd)
 {
     Q_UNUSED(pathId);

diff --git a/adaptors/alsadaptor/alsadaptor.h b/adaptors/alsadaptor/alsadaptor.h
@@ -9,6 +9,7 @@
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
    @author Lihan Guo <lihan.guo@digia.com>
    @author Antti Virtanen <antti.i.virtanen@nokia.com>
+   @author Shenghua <ext-shenghua.1.liu@nokia.com>
 
    This file is part of Sensord.
 
@@ -40,7 +41,6 @@
     #include <mce/dbus-names.h>
 #endif
 
-
 /**
  * @brief Adaptor for internal ambient light sensor.
  *
@@ -72,15 +72,16 @@ class ALSAdaptor : public SysfsAdaptor
     {
         return new ALSAdaptor(id);
     }
+
     /**
      * Start measuring loop. Opens file descriptors and set streaming mode
      */
-    bool startAdaptor();
+    virtual bool startAdaptor();
 
     /**
      * Stop measuring loop. Closes file descriptors and removes streaming mode
      */
-    void stopAdaptor();
+    virtual void stopAdaptor();
 
     virtual bool startSensor();
 
@@ -94,8 +95,6 @@ class ALSAdaptor : public SysfsAdaptor
     ALSAdaptor(const QString& id);
     ~ALSAdaptor();
 
-
-
 private:
 
     /**
@@ -114,7 +113,6 @@ class ALSAdaptor : public SysfsAdaptor
 #ifdef SENSORFW_MCE_WATCHER
     QDBusInterface *dbusIfc;
 #endif
-
 };
 
 #endif
diff --git a/adaptors/kbslideradaptor/kbslideradaptor.cpp b/adaptors/kbslideradaptor/kbslideradaptor.cpp
@@ -7,6 +7,7 @@
 
    @author Timo Rongas <ext-timo.2.rongas@nokia.com>
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
+   @author Shenghua <ext-shenghua.1.liu@nokia.com>
 
    This file is part of Sensord.
 
@@ -24,7 +25,6 @@
    </p>
 */
 
-#include <QtDebug>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
@@ -88,7 +88,6 @@ void KeyboardSliderAdaptor::interpretSync(int src, struct input_event *ev)
 
 void KeyboardSliderAdaptor::commitOutput()
 {
-
     sensordLogD() << "KB Slider state change detected: " << currentState_;
 
     KeyboardSliderState *state = kbstateBuffer_->nextSlot();

diff --git a/adaptors/kbslideradaptor/kbslideradaptor.h b/adaptors/kbslideradaptor/kbslideradaptor.h
@@ -36,8 +36,6 @@
  * Events are received through @e gpio-keys input layer.
  *
  * Listening clients are notified whenever the state has changed.
- *
- * @todo Move definition of \e KeyboardSliderState to filters/kbsliderstate.
  */
 class KeyboardSliderAdaptor : public InputDevAdaptor
 {

diff --git a/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-ascii.cpp b/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-ascii.cpp
@@ -51,7 +51,7 @@ MagnetometerAdaptorAscii::~MagnetometerAdaptorAscii()
     delete magnetBuffer_;
 }
 
-void MagnetometerAdaptorAscii::processSample(int pathId, int fd)
+void MagnetometerAdaptorAscii::processSample(int, int fd)
 {
     unsigned short x, y, z;
 

diff --git a/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.cpp b/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.cpp
@@ -33,9 +33,9 @@ MagnetometerAdaptorNCDK::MagnetometerAdaptorNCDK(const QString& id) :
     SysfsAdaptor(id, SysfsAdaptor::IntervalMode),
     powerState_(false)
 {
-    intervalCompensation_ = Config::configuration()->value("magnetometer/interval_compensation", "0").toInt();
-    powerStateFilePath_ = Config::configuration()->value("magnetometer/path_power_state", "").toByteArray();
-    sensAdjFilePath_ = Config::configuration()->value("magnetometer/path_sens_adjust", "").toByteArray();
+    intervalCompensation_ = Config::configuration()->value<int>("magnetometer/interval_compensation", 0);
+    powerStateFilePath_ = Config::configuration()->value<QByteArray>("magnetometer/path_power_state", "");
+    sensAdjFilePath_ = Config::configuration()->value<QByteArray>("magnetometer/path_sens_adjust", "");
     magnetometerBuffer_ = new DeviceAdaptorRingBuffer<TimedXyzData>(128);
     setAdaptedSensor("magnetometer", "Internal magnetometer coordinates", magnetometerBuffer_);
     setDescription("Magnetometer adaptor (ak8975) for NCDK");

diff --git a/adaptors/magnetometeradaptor/magnetometeradaptor.cpp b/adaptors/magnetometeradaptor/magnetometeradaptor.cpp
@@ -44,7 +44,7 @@ struct ak8974_data {
 MagnetometerAdaptor::MagnetometerAdaptor(const QString& id) :
     SysfsAdaptor(id, SysfsAdaptor::IntervalMode, false)
 {
-    intervalCompensation_ = Config::configuration()->value("magnetometer/interval_compensation", "0").toInt();
+    intervalCompensation_ = Config::configuration()->value<int>("magnetometer/interval_compensation", 0);
     magnetometerBuffer_ = new DeviceAdaptorRingBuffer<TimedXyzData>(1);
     setAdaptedSensor("magnetometer", "Internal magnetometer coordinates", magnetometerBuffer_);
     setDescription("Input device Magnetometer adaptor (ak897x)");
@@ -73,7 +73,7 @@ void MagnetometerAdaptor::processSample(int pathId, int fd)
         sensordLogD() << "Invalid sample received from magnetometer";
     }
 
-    sensordLogT() << "Magnetometer Reading: " << mag_data.x << ", " << mag_data.y << ", " << mag_data.z;
+    sensordLogT() << "Magnetometer reading: " << mag_data.x << ", " << mag_data.y << ", " << mag_data.z;
 
     TimedXyzData* sample = magnetometerBuffer_->nextSlot();
 

diff --git a/adaptors/mrstaccelerometer/mrstaccelerometeradaptor.cpp b/adaptors/mrstaccelerometer/mrstaccelerometeradaptor.cpp
@@ -26,7 +26,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
-
 #include "config.h"
 #include "mrstaccelerometeradaptor.h"
 #include "logging.h"
@@ -44,7 +43,7 @@ MRSTAccelAdaptor::~MRSTAccelAdaptor () {
     delete buffer;
 }
 
-void MRSTAccelAdaptor::processSample (int pathId, int fd) {
+void MRSTAccelAdaptor::processSample (int, int fd) {
     char buf[32];
     int x, y, z;
 

diff --git a/adaptors/mrstaccelerometer/mrstaccelerometeradaptor.h b/adaptors/mrstaccelerometer/mrstaccelerometeradaptor.h
@@ -26,9 +26,6 @@
 #define MRSTACCELEROMETERADPTOR_H
 
 #include "sysfsadaptor.h"
-#include <QString>
-#include <QStringList>
-#include <linux/input.h>
 #include "deviceadaptorringbuffer.h"
 
 #include "datatypes/orientationdata.h"

diff --git a/adaptors/proximityadaptor-ascii/proximityadaptor-ascii.cpp b/adaptors/proximityadaptor-ascii/proximityadaptor-ascii.cpp
@@ -13,6 +13,7 @@
    @author Tapio Rantala <ext-tapio.rantala@nokia.com>
    @author Antti Virtanen <antti.i.virtanen@nokia.com>
    @author Lihan Guo <ext-lihan.4.guo@nokia.com>
+   @author Antti Virtanen <antti.i.virtanen@nokia.com>
 
    This file is part of Sensord.
 
@@ -40,8 +41,7 @@
 ProximityAdaptorAscii::ProximityAdaptorAscii(const QString& id) :
     SysfsAdaptor(id, SysfsAdaptor::IntervalMode)
 {
-    memset(buf, 0x0, 16);
-    proximityBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
+    proximityBuffer_ = new DeviceAdaptorRingBuffer<ProximityData>(1);
     setAdaptedSensor("proximity", "apds9802ps ascii", proximityBuffer_);
 }
 
@@ -50,18 +50,19 @@ ProximityAdaptorAscii::~ProximityAdaptorAscii()
     delete proximityBuffer_;
 }
 
-void ProximityAdaptorAscii::processSample(int pathId, int fd)
+void ProximityAdaptorAscii::processSample(int, int fd)
 {
+    char buf[16];
     lseek(fd, 0, SEEK_SET);
     if (read(fd, buf, sizeof(buf)) <= 0) {
         sensordLogW() << "read(): " << strerror(errno);
         return;
     }
     sensordLogT() << "Proximity output value: " << buf;
 
-    TimedUnsigned* proximity = proximityBuffer_->nextSlot();
+    ProximityData* proximity = proximityBuffer_->nextSlot();
     sscanf(buf, "%d", &proximity->value_);
-
+    proximity->withinProximity_ = proximity->value_;
     proximity->timestamp_ = Utils::getTimeStamp();
     proximityBuffer_->commit();
     proximityBuffer_->wakeUpReaders();

diff --git a/adaptors/proximityadaptor-ascii/proximityadaptor-ascii.h b/adaptors/proximityadaptor-ascii/proximityadaptor-ascii.h
@@ -34,7 +34,7 @@
 
 #include "sysfsadaptor.h"
 #include "deviceadaptorringbuffer.h"
-#include "datatypes/timedunsigned.h"
+#include "datatypes/orientationdata.h"
 
 class ProximityAdaptorAscii : public SysfsAdaptor
 {
@@ -51,9 +51,8 @@ class ProximityAdaptorAscii : public SysfsAdaptor
 
 private:
     void processSample(int pathId, int fd);
-    char buf[16];
 
-    DeviceAdaptorRingBuffer<TimedUnsigned>* proximityBuffer_;
+    DeviceAdaptorRingBuffer<ProximityData>* proximityBuffer_;
 };
 
 #endif
diff --git a/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp b/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp
@@ -43,7 +43,7 @@ ProximityAdaptorEvdev::ProximityAdaptorEvdev(const QString& id) :
     InputDevAdaptor(id, 1),
     currentState_(ProximityStateUnknown)
 {
-    proximityBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
+    proximityBuffer_ = new DeviceAdaptorRingBuffer<ProximityData>(1);
     setAdaptedSensor("proximity", "Proximity state", proximityBuffer_);
 }
 
@@ -94,10 +94,10 @@ void ProximityAdaptorEvdev::commitOutput(struct input_event *ev)
     if (currentState_ != oldState) {
         sensordLogD() << "Proximity state change detected: " << currentState_;
 
-        TimedUnsigned *proximityData = proximityBuffer_->nextSlot();
+        ProximityData *proximityData = proximityBuffer_->nextSlot();
 
         proximityData->timestamp_ = Utils::getTimeStamp(&(ev->time));
-        proximityData->value_ = currentState_;
+        proximityData->withinProximity_ = currentState_;
 
         oldState = currentState_;