Bug fixing and fine tuning configuration changes.

sailfishos · Feb 7, 2011 · fcaadc5 · fcaadc5
1 parent d38841a
commit fcaadc5
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 50 deletions.
diff --git a/chains/accelerometerchain/accelerometerchain.cpp b/chains/accelerometerchain/accelerometerchain.cpp
@@ -58,8 +58,6 @@ AccelerometerChain::AccelerometerChain(const QString& id) :
         {
             sensordLogW() << "Failed to parse 'transformation_matrix' configuration key. Coordinate alignment may be invalid";
         }
-    } else {
-        sensordLogT() << "Key 'acc_trans_matrix' not found from configuration.";
     }
 
     accCoordinateAlignFilter_ = sm.instantiateFilter("coordinatealignfilter");

diff --git a/config/sensord-n900.conf b/config/sensord-n900.conf
@@ -3,37 +3,37 @@ alsadaptor = alsadaptor-sysfs
 proximityadaptor = proximityadaptor-evdev
 
 [accelerometer]
-dataranges = -2048=>2048
-intervals = 0,10=>1000
+dataranges = "-2048=>2048"
+intervals = "0,10=>1000"
 transformation_matrix = "0,-1,0,1,0,0,0,0,-1"
 
 [als]
 path = /sys/bus/i2c/drivers/apds990x/0-0039/lux_output
-dataranges = 0=>65535
-intervals = 50=>2000
+dataranges = "0=>65535"
+intervals = "50=>2000"
 default_interval = 1000
 
 [keyboardslider]
 input_match = gpio-keys
-dataranges = 0=>2
+dataranges = "0=>2"
 intervals = 0
 
 [proximity]
 path = /sys/bus/i2c/devices/5-0055/apds9802ps/proximity_output
-dataranges = 0=>4096
+dataranges = "0=>4096"
 
 [magnetometer]
 path = /dev/ak89750
-dataranges = -4096=>4096
-intervals = 25=>1000
+dataranges = "-4096=>4096"
+intervals = "25=>1000"
 default_interval = 1000
 scale_coefficient = 300
 calibration_rate = 100
 calibration_timeout = 60000
 
 [tap]
 device = accelerometer
-dataranges = 0=>2
+dataranges = "0=>2"
 intervals = 0
 
 [orientation]

diff --git a/config/sensord-ncdk.conf b/config/sensord-ncdk.conf
@@ -3,37 +3,37 @@ alsadaptor = alsadaptor-ascii
 proximityadaptor = proximityadaptor-ascii
 
 [accelerometer]
-dataranges = -2048=>2048
-intervals = 0,10=>1000
+dataranges = "-2048=>2048"
+intervals = "0,10=>1000"
 transformation_matrix = "-1,0,0,0,-1,0,0,0,-1"
 
 [als]
 path = /sys/bus/i2c/drivers/apds990x/0-0039/lux_output
-dataranges = 0=>65535
-intervals = 50=>2000
+dataranges = "0=>65535"
+intervals = "50=>2000"
 default_interval = 1000
 
 [keyboardslider]
 input_match = gpio-keys
-dataranges = 0=>2
+dataranges = "0=>2"
 intervals = 0
 
 [proximity]
 path = /sys/bus/i2c/devices/5-0055/apds9802ps/proximity_output
-dataranges = 0=>4096
+dataranges = "0=>4096"
 
 [magnetometer]
 path = /dev/ak89750
-dataranges = -4096=>4096
-intervals = 25=>1000
+dataranges = "-4096=>4096"
+intervals = "25=>1000"
 default_interval = 1000
 scale_coefficient = 300
 calibration_rate = 100
 calibration_timeout = 60000
 
 [tap]
 device = accelerometer
-dataranges = 0=>2
+dataranges = "0=>2"
 intervals = 0
 
 [orientation]

diff --git a/config/sensord-rm680.conf b/config/sensord-rm680.conf
@@ -1,37 +1,37 @@
 [accelerometer]
-dataranges = -2048=>2048
-intervals = 0,10=>1000
+dataranges = "-2048=>2048"
+intervals = "0,10=>1000"
 transformation_matrix = "-1,0,0,0,-1,0,0,0,-1"
 
 [als]
 driver_type = 1
 path = /dev/bh1770glc_als
-dataranges = 0=>65535
+dataranges = "0=>65535"
 intervals = 0
 
 [keyboardslider]
 input_match = gpio-keys
-dataranges = 0=>2
+dataranges = "0=>2"
 intervals = 0
 
 [proximity]
 driver_type = 1
 path = /dev/bh1770glc_ps
-dataranges = 0=>1
+dataranges = "0=>1"
 intervals = 0
 
 [magnetometer]
 path = /dev/ak89740
-dataranges = -2048=>2048
-intervals = 25=>1000
+dataranges = "-2048=>2048"
+intervals = "25=>1000"
 default_interval = 1000
 scale_coefficient = 300
 calibration_rate = 100
 calibration_timeout = 60000
 
 [tap]
 device = accelerometer
-dataranges = 0=>2
+dataranges = "0=>2"
 intervals = 0
 
 [orientation]

diff --git a/config/sensord-rm696.conf b/config/sensord-rm696.conf
@@ -1,29 +1,29 @@
 [accelerometer]
-dataranges = -2048=>2048
-intervals = 0,10=>1000
+dataranges = "-2048=>2048"
+intervals = "0,10=>1000"
 transformation_matrix = "-1,0,0,0,-1,0,0,0,-1"
 
 [als]
 driver_type = 2
 path = /dev/apds990x0
-dataranges = 0=>65535
+dataranges = "0=>65535"
 intervals = 0
 
 [keyboardslider]
 input_match = gpio-keys
-dataranges = 0=>2
+dataranges = "0=>2"
 intervals = 0
 
 [proximity]
 driver_type = 2
 path = /dev/apds990x0
-dataranges = 0=>1
+dataranges = "0=>1"
 intervals = 0
 
 [magnetometer]
 path = /dev/ak89750
-dataranges = -4096=>4096
-intervals = 25=>1000
+dataranges = "-4096=>4096"
+intervals = "25=>1000"
 default_interval = 1000
 interval_compensation = 16
 scale_coefficient = 300
@@ -32,7 +32,7 @@ calibration_timeout = 60000
 
 [tap]
 device = accelerometer
-dataranges = 0=>2
+dataranges = "0=>2"
 intervals = 0
 
 [orientation]

diff --git a/core/inputdevadaptor.cpp b/core/inputdevadaptor.cpp
@@ -190,7 +190,7 @@ bool InputDevAdaptor::setInterval(const unsigned int value, const int sessionId)
 {
     Q_UNUSED(sessionId);
 
-    sensordLogD() << "Setting poll interval for" << deviceString_ << " to " << value;
+    sensordLogD() << "Setting poll interval for " << deviceString_ << " to " << value;
 
     QFile pollFile;
     if(!openPollFile(pollFile, QIODevice::WriteOnly))

diff --git a/core/nodebase.cpp b/core/nodebase.cpp
@@ -52,6 +52,7 @@ void NodeBase::introduceAvailableDataRange(const DataRange& range)
 {
     if (!m_dataRangeList.contains(range))
     {
+        sensordLogD() << "Introduced new data range: " << range.min << "-" << range.max << ", " << range.resolution;
         m_dataRangeList.append(range);
     }
 }
@@ -61,7 +62,7 @@ void NodeBase::introduceAvailableDataRanges(const QString& typeName)
     QVariant ranges = Config::configuration()->value(typeName + "/dataranges");
     if(ranges.isValid())
     {
-        DataRangeList list(parseDataRangeList(ranges.toString()));
+        DataRangeList list(parseDataRangeList(ranges.toString(), 1));
         foreach(const DataRange& range, list)
         {
             introduceAvailableDataRange(range);
@@ -199,14 +200,15 @@ bool NodeBase::hasLocalRange() const
     return (m_dataRangeSource == NULL);
 }
 
-DataRangeList NodeBase::parseDataRangeList(const QString& input) const
+DataRangeList NodeBase::parseDataRangeList(const QString& input, int defaultResolution) const
 {
     DataRangeList list;
     foreach(const QString& fragment, input.split(",", QString::SkipEmptyParts))
     {
-        QStringList pair(fragment.split("->"));
+        QStringList pair(fragment.split("=>"));
         QStringList pair2(fragment.split(":"));
         DataRange range;
+        range.resolution = defaultResolution;
         if(pair.size() == 1)
         {
             QVariant value(fragment);
@@ -243,6 +245,7 @@ void NodeBase::introduceAvailableInterval(const DataRange& interval)
 {
     if (!m_intervalList.contains(interval))
     {
+        sensordLogD() << "Introduced new interval: " << interval.min << "-" << interval.max;
         m_intervalList.append(interval);
     }
 }
@@ -252,7 +255,7 @@ void NodeBase::introduceAvailableIntervals(const QString& typeName)
     QVariant ranges = Config::configuration()->value(typeName + "/intervals");
     if(ranges.isValid())
     {
-        DataRangeList list(parseDataRangeList(ranges.toString()));
+        DataRangeList list(parseDataRangeList(ranges.toString(), 0));
         foreach(const DataRange& range, list)
         {
             introduceAvailableInterval(range);
@@ -409,7 +412,7 @@ bool NodeBase::setDefaultInterval(const unsigned int value)
 {
     if (!isValidIntervalRequest(value))
     {
-        sensordLogW() << "Attempting to define invalid default data rate.";
+        sensordLogW() << "Attempting to define invalid default data rate: " << value;
         return false;
     }
     m_defaultInterval = value;

diff --git a/core/nodebase.h b/core/nodebase.h
@@ -351,7 +351,7 @@ public Q_SLOTS:
     bool updateBufferSize();
     bool updateBufferInterval();
 
-    DataRangeList parseDataRangeList(const QString& input) const;
+    DataRangeList parseDataRangeList(const QString& input, int defaultResolution) const;
 
     QString                 m_description;
 

diff --git a/core/sysfsadaptor.cpp b/core/sysfsadaptor.cpp
@@ -461,7 +461,7 @@ void SysfsAdaptor::init()
     }
     else
     {
-        sensordLogW() << "Failed to locate path for " << name();
+        sensordLogW() << "No sysfs path defined for: " << name();
     }
 
     introduceAvailableDataRanges(name());

diff --git a/sensord/main.cpp b/sensord/main.cpp
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
     if(parser.configDirInput())
         defConfigDir = parser.configDirPath();
     if (Config::loadConfig(defConfigFile, defConfigDir))
-        sensordLogT() << "Config file is loading successfully.";
+        sensordLogT() << "Config file is loaded successfully.";
     else
     {
         sensordLogC() << "Config file error! Load using default paths.";
@@ -164,15 +164,15 @@ void printUsage()
 {
     qDebug() << "Usage: sensord [OPTIONS]";
     qDebug() << " -d, --daemon                     Detach from terminal and run as daemon.\n";
-    qDebug() << " -l=N, --log-level=N              Use logging level N. Messages are logged for";
+    qDebug() << " -l=N, --log-level=<level>        Use given logging level. Messages are logged for";
     qDebug() << "                                  the given and higher priority levels. Level";
     qDebug() << "                                  can also be notched up by sending SIGUSR1 to";
     qDebug() << "                                  the process. Valid values for N are: 'test',";
     qDebug() << "                                  'debug', 'warning', 'critical'.\n";
-    qDebug() << " --log-target=N                   logging target mask (1=stdout, 2=stderr, 4=file, 8=syslog and combos e.g. 3=stdout|stderr\n";
-    qDebug() << " --log-file-path=P                Log file path\n";
-    qDebug() << " -c=P, --config-file=P            Load configuration from P. By default";
-    qDebug() << "                                  /etc/sensord.conf is used.\n";
+    qDebug() << " --log-target=<target>            Logging target mask (1=stdout, 2=stderr, 4=file, 8=syslog and combos e.g. 3=stdout|stderr\n";
+    qDebug() << " --log-file-path=<path>           Log file path\n";
+    qDebug() << " -c=P, --config-file=<path>       Load configuration from given path. By default";
+    qDebug() << "                                  /etc/sensorfw/sensord.conf is used.\n";
     qDebug() << " --no-context-info                Do not provide context information for context";
     qDebug() << "                                  framework.\n";
     qDebug() << " --no-magnetometer-bg-calibration Do not start calibration of magnetometer in";

diff --git a/sensord/parser.cpp b/sensord/parser.cpp
@@ -32,6 +32,7 @@ Parser::Parser(QStringList arguments) :
     contextInfo_(true),
     changeLogLevel_(false),
     configFile_(false),
+    configDir_(false),
     daemon_(false),
     magnetometerCalibration_(true),
     configFilePath_(""),