Moved gyro metadata settings to config file.

sailfishos · Feb 11, 2011 · 3a8be1d · 3a8be1d
1 parent 2a7a992
commit 3a8be1d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 27 deletions.
diff --git a/adaptors/gyroscopeadaptor/gyroscopeadaptor.cpp b/adaptors/gyroscopeadaptor/gyroscopeadaptor.cpp
@@ -8,7 +8,7 @@
    @author Timo Rongas <ext-timo.2.rongas@nokia.com>
    @author Samuli Piippo <ext-samuli.1.piippo@nokia.com>
    @author Antti Virtanen <antti.i.virtanen@nokia.com>
-   @author Pia Niemelä <pia.s.niemela@nokia.com>
+   @author Pia Niemelä <pia.s.niemela@nokia.com>
 
    This file is part of Sensord.
 
@@ -36,26 +36,9 @@
 GyroscopeAdaptor::GyroscopeAdaptor(const QString& id) :
     SysfsAdaptor(id, SysfsAdaptor::SelectMode)
 {
-
-    QString path = Config::configuration()->value("gyroscope_sysfs_path").toString();
-    if ( !addPath(path, 0) ) {
-        setValid(false);
-    }
-
     gyroscopeBuffer_ = new DeviceAdaptorRingBuffer<TimedXyzData>(32);
     setAdaptedSensor("gyroscope", "l3g4200dh", gyroscopeBuffer_);
-
-    introduceAvailableDataRange(DataRange(-250000, 250000, 1));
     setDescription("Sysfs Gyroscope adaptor (l3g4200dh)");
-
-    introduceAvailableInterval(DataRange(100, 100, 1));     // 10 Hz
-    introduceAvailableInterval(DataRange(25, 25, 1));       // 40 Hz
-    introduceAvailableInterval(DataRange(10, 10, 1));       // 100 Hz
-    introduceAvailableInterval(DataRange(5, 5, 1));         // 200 Hz
-    introduceAvailableInterval(DataRange(2.5, 2.5, 1));     // 400 Hz
-    introduceAvailableInterval(DataRange(1.25, 1.25, 1));   // 800 Hz
-    setDefaultInterval(10); // 100 Hz
-
 }
 
 GyroscopeAdaptor::~GyroscopeAdaptor()
@@ -87,15 +70,11 @@ void GyroscopeAdaptor::processSample(int pathId, int fd)
     gyroscopeBuffer_->wakeUpReaders();
 }
 
-
 bool GyroscopeAdaptor::setInterval(const unsigned int value, const int sessionId)
 {
-    return SysfsAdaptor::setInterval(value>10?10:value, sessionId);
+    return SysfsAdaptor::setInterval((value > 10 ? 10 : value), sessionId);
 }
 
 unsigned int GyroscopeAdaptor::interval() const{
     return SysfsAdaptor::interval();
 }
-
-
-
diff --git a/config/90-sensord-default.conf b/config/90-sensord-default.conf
@@ -1,7 +1,3 @@
 [global]
 device_sys_path = /dev/input/event%1
 device_poll_file_path = /sys/class/input/input%1/poll
-
-[gyroscope]
-path=/sys/devices/platform/l3g4200dh/angular_rate
-
diff --git a/config/sensord-ncdk.conf b/config/sensord-ncdk.conf
@@ -1,6 +1,12 @@
 [plugins]
 magnetometeradaptor = magnetometeradaptor-ncdk
 
+[gyroscope]
+path = /sys/devices/platform/l3g4200dh/angular_rate
+dataranges = "-250000=>250000"
+intervals = "1.25,2.5,5,10,25,100"
+default_interval = "10"
+
 [accelerometer]
 dataranges = "-32767=>32767"
 intervals = "0,10=>1000"