magenetometeradaptor for ncdk

sailfishos · Feb 9, 2011 · e4244d8 · e4244d8
1 parent 5b91d2d
commit e4244d8
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 22 deletions.
diff --git a/adaptors/adaptors.pro b/adaptors/adaptors.pro
@@ -9,6 +9,7 @@ SUBDIRS = alsadaptor \
           accelerometeradaptor \
           magnetometeradaptor \
           magnetometeradaptor-ascii \
+          magnetometeradaptor-ncdk \
           touchadaptor \
           kbslideradaptor \
           proximityadaptor \

diff --git a/adaptors/magnetometeradaptor/magnetometeradaptor.pro b/adaptors/magnetometeradaptor/magnetometeradaptor.pro
@@ -1,9 +1,11 @@
 TARGET       = magnetometeradaptor
 
 HEADERS += magnetometeradaptor.h \
-           magnetometeradaptorplugin.h
+           magnetometeradaptorplugin.h \
+
 
 SOURCES += magnetometeradaptor.cpp \
-           magnetometeradaptorplugin.cpp
+           magnetometeradaptorplugin.cpp \
+
 
 include( ../adaptor-config.pri )
diff --git a/config/sensord-ncdk.conf b/config/sensord-ncdk.conf
@@ -24,6 +24,8 @@ dataranges = "0=>4096"
 
 [magnetometer]
 path = /dev/ak89750
+path_power_state = /sys/devices/power_state
+path_sens_adjust = /sys/devices/sens_adjust
 dataranges = "-4096=>4096"
 intervals = "25=>1000"
 default_interval = 1000

diff --git a/core/inputdevadaptor.cpp b/core/inputdevadaptor.cpp
@@ -159,31 +159,16 @@ bool InputDevAdaptor::checkInputDevice(const QString& path, const QString& match
     return check;
 }
 
-bool InputDevAdaptor::openPollFile(QFile& pollFile, QIODevice::OpenMode mode) const
-{
-    pollFile.setFileName(usedDevicePollFilePath_);
-    if (!(pollFile.exists() && pollFile.open(mode))) {
-        sensordLogW() << "Unable to locate poll interval setting for " << deviceString_;
-        return false;
-    }
-    return true;
-}
 
 unsigned int InputDevAdaptor::interval() const
 {
     if (deviceNumber_ < 0) {
         return -1;
     }
 
-    QFile pollFile;
-    if(!openPollFile(pollFile, QIODevice::ReadOnly))
-        return 0;
-
     char buf[16];
-    if (pollFile.readLine(buf, sizeof(buf)) > 0) {
-        return QString(buf).toUInt();
-    }
-    return 0;
+    QString str = readFromFile(usedDevicePollFilePath_, buf);
+    return str.isEmpty() ? 0 : str.toUInt();
 }
 
 bool InputDevAdaptor::setInterval(const unsigned int value, const int sessionId)
@@ -203,6 +188,7 @@ bool InputDevAdaptor::setInterval(const unsigned int value, const int sessionId)
         return false;
     }
     return true;
+
 }
 
 void InputDevAdaptor::init()

diff --git a/core/inputdevadaptor.h b/core/inputdevadaptor.h
@@ -32,7 +32,6 @@
 #include "sysfsadaptor.h"
 #include <QString>
 #include <QStringList>
-#include <QFile>
 #include <linux/input.h>
 #include "filterproperty.h"
 
@@ -111,8 +110,6 @@ class InputDevAdaptor : public SysfsAdaptor {
      */
     int getEvents(int fd);
 
-    bool openPollFile(QFile& pollFile, QIODevice::OpenMode mode) const;
-
     QString deviceSysPathString_;
     QString devicePollFilePath_;
     QString usedDevicePollFilePath_;

diff --git a/core/sysfsadaptor.cpp b/core/sysfsadaptor.cpp
@@ -349,6 +349,28 @@ bool SysfsAdaptor::writeToFile(QString path, QString content)
     return true;
 }
 
+bool SysfsAdaptor::openPollFile(QFile& pollFile, QIODevice::OpenMode mode) const
+{
+    if (!(pollFile.exists() && pollFile.open(mode)))
+    {
+        sensordLogW() << "Unable to locate poll interval setting for " << deviceString_;
+        return false;
+    }
+    return true;
+}
+
+QString SysfsAdaptor::readFromFile(QString path, char* buf)
+{
+    QFile pollFile;
+    pollFile.setFileName(path);
+    if(!openPollFile(pollFile, QIODevice::ReadOnly) && pollFile.readLine(buf, sizeof(buf)) > 0)
+    {
+        return QString(buf);
+    }
+
+    return QString();
+}
+
 void SysfsAdaptor::dataAvailable(int pathId, int fd)
 {
     processSample(pathId, fd);

diff --git a/core/sysfsadaptor.h b/core/sysfsadaptor.h
@@ -35,6 +35,7 @@
 #include <QThread>
 #include "filterproperty.h"
 #include <QMutex>
+#include <QFile>
 
 class SysfsAdaptor;
 
@@ -165,6 +166,18 @@ protected slots:
      */
     virtual unsigned int interval() const;
 
+    /**
+         * Utility function for reading data from files.
+         * parameters
+         *
+         * @param path    Path of the file to read from
+         * @param buf     Buffer for data read
+         * @return        resultant read data string.
+         */
+     QString readFromFile(QString path, char* buf);
+
+     QString openPollFile(QFile& pollFile, QIODevice::OpenMode mode) const;
+
     /**
      * Sets the interval for the adaptor. This function is valid for
      * adaptors using PollMode. It just sets the number of milliseconds