add sensors - humidity, pressure, temperature

qt-api/humiditysensor_i.cpp

@@ -0,0 +1,76 @@
+/**
+   @file humiditysensor_i.cpp
+   @brief Interface for HumiditySensor
+
+   <p>
+   Copyright (C) 2016 Canonical LTD.
+
+   @author Lorn Potter <lorn.potter@canonical.com>
+
+   This file is part of Sensorfw.
+
+   Sensord is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License
+   version 2.1 as published by the Free Software Foundation.
+
+   Sensord is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with Sensord.  If not, see <http://www.gnu.org/licenses/>.
+   </p>
+ */
+
+#include "sensormanagerinterface.h"
+#include "humiditysensor_i.h"
+#include "socketreader.h"
+
+const char* HumiditySensorChannelInterface::staticInterfaceName = "local.HumiditySensor";
+
+AbstractSensorChannelInterface* HumiditySensorChannelInterface::factoryMethod(const QString& id, int sessionId)
+{
+    return new HumiditySensorChannelInterface(OBJECT_PATH + "/" + id, sessionId);
+}
+
+HumiditySensorChannelInterface::HumiditySensorChannelInterface(const QString& path, int sessionId)
+    : AbstractSensorChannelInterface(path, HumiditySensorChannelInterface::staticInterfaceName, sessionId)
+{
+}
+
+const HumiditySensorChannelInterface* HumiditySensorChannelInterface::listenInterface(const QString& id)
+{
+    return dynamic_cast<const HumiditySensorChannelInterface*> (interface(id));
+}
+
+HumiditySensorChannelInterface* HumiditySensorChannelInterface::controlInterface(const QString& id)
+{
+    return interface(id);
+}
+
+
+HumiditySensorChannelInterface* HumiditySensorChannelInterface::interface(const QString& id)
+{
+    SensorManagerInterface& sm = SensorManagerInterface::instance();
+    if ( !sm.registeredAndCorrectClassName( id, HumiditySensorChannelInterface::staticMetaObject.className())) {
+        return 0;
+    }
+
+    return dynamic_cast<HumiditySensorChannelInterface*>(sm.interface(id));
+}
+
+bool HumiditySensorChannelInterface::dataReceivedImpl()
+{
+    QVector<TimedUnsigned> values;
+    if(!read<TimedUnsigned>(values))
+        return false;
+    foreach(const TimedUnsigned& data, values)
+        emit relativeHumidityChanged(data);
+    return true;
+}
+
+Unsigned HumiditySensorChannelInterface::relativeHumidity()
+{
+    return getAccessor<Unsigned>("relativeHumidity");
+}

qt-api/humiditysensor_i.h

@@ -0,0 +1,118 @@
+/**
+   @file humiditysensor_i.h
+   @brief Interface for HumiditySensor
+
+   <p>
+   Copyright (C) 2016 Canonical LTD.
+
+   @author Lorn Potter <lorn.potter@canonical.com>
+
+   This file is part of Sensorfw.
+
+   Sensord is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License
+   version 2.1 as published by the Free Software Foundation.
+
+   Sensord is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with Sensord.  If not, see <http://www.gnu.org/licenses/>.
+   </p>
+ */
+
+#ifndef HUMIDITYSENSOR_I_H
+#define HUMIDITYSENSOR_I_H
+
+#include <QtDBus/QtDBus>
+
+#include "datatypes/unsigned.h"
+#include "abstractsensor_i.h"
+
+/**
+ * Client interface for accessing ambient light sensor.
+ * Provides signal on change of measured ambient light intensity level.
+ * Previous measured intensity level can be queried any time. Provided
+ * values are in \e lux.
+ */
+class HumiditySensorChannelInterface : public AbstractSensorChannelInterface
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(HumiditySensorChannelInterface)
+    Q_PROPERTY(Unsigned relativeHumidity READ relativeHumidity NOTIFY relativeHumidityChanged)
+
+public:
+    /**
+     * Name of the D-Bus interface for this class.
+     */
+    static const char* staticInterfaceName;
+
+    /**
+     * Create new instance of the class.
+     *
+     * @param id Sensor ID.
+     * @param sessionId Session ID.
+     * @return Pointer to new instance of the class.
+     */
+    static AbstractSensorChannelInterface* factoryMethod(const QString& id, int sessionId);
+
+    /**
+     * Get latest relative humidity reading from sensor daemon.
+     *
+     * @return relative humidity reading.
+     */
+    Unsigned relativeHumidity();
+
+    /**
+     * Constructor.
+     *
+     * @param path      path.
+     * @param sessionId session ID.
+     */
+    HumiditySensorChannelInterface(const QString& path, int sessionId);
+
+    /**
+     * Request a listening interface to the sensor.
+     *
+     * @param id sensor ID.
+     * @return Pointer to interface, or NULL on failure.
+     * @deprecated use interface(const QString&) instead.
+     */
+    static const HumiditySensorChannelInterface* listenInterface(const QString& id);
+
+    /**
+     * Request a control interface to the sensor.
+     *
+     * @param id sensor ID.
+     * @return Pointer to interface, or NULL on failure.
+     * @deprecated use interface(const QString&) instead.
+     */
+    static HumiditySensorChannelInterface* controlInterface(const QString& id);
+
+    /**
+     * Request an interface to the sensor.
+     *
+     * @param id sensor ID.
+     * @return Pointer to interface, or NULL on failure.
+     */
+    static HumiditySensorChannelInterface* interface(const QString& id);
+
+protected:
+    virtual bool dataReceivedImpl();
+
+Q_SIGNALS:
+    /**
+     * Sent when measured relative humidity has changed.
+     *
+     * @param value relative humidity reading.
+     */
+    void relativeHumidityChanged(const Unsigned& value);
+};
+
+namespace local {
+  typedef ::HumiditySensorChannelInterface HumiditySensor;
+}
+
+#endif

qt-api/pressuresensor_i.cpp

@@ -0,0 +1,76 @@
+/**
+   @file pressuresensor_i.cpp
+   @brief Interface for PressureSensor
+
+   <p>
+   Copyright (C) 2016 Canonical LTD.
+
+   @author Lorn Potter <lorn.potter@canonical.com>
+
+   This file is part of Sensorfw.
+
+   Sensord is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License
+   version 2.1 as published by the Free Software Foundation.
+
+   Sensord is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with Sensord.  If not, see <http://www.gnu.org/licenses/>.
+   </p>
+ */
+
+#include "sensormanagerinterface.h"
+#include "pressuresensor_i.h"
+#include "socketreader.h"
+
+const char* PressureSensorChannelInterface::staticInterfaceName = "local.PressureSensor";
+
+AbstractSensorChannelInterface* PressureSensorChannelInterface::factoryMethod(const QString& id, int sessionId)
+{
+    return new PressureSensorChannelInterface(OBJECT_PATH + "/" + id, sessionId);
+}
+
+PressureSensorChannelInterface::PressureSensorChannelInterface(const QString& path, int sessionId)
+    : AbstractSensorChannelInterface(path, PressureSensorChannelInterface::staticInterfaceName, sessionId)
+{
+}
+
+const PressureSensorChannelInterface* PressureSensorChannelInterface::listenInterface(const QString& id)
+{
+    return dynamic_cast<const PressureSensorChannelInterface*> (interface(id));
+}
+
+PressureSensorChannelInterface* PressureSensorChannelInterface::controlInterface(const QString& id)
+{
+    return interface(id);
+}
+
+
+PressureSensorChannelInterface* PressureSensorChannelInterface::interface(const QString& id)
+{
+    SensorManagerInterface& sm = SensorManagerInterface::instance();
+    if ( !sm.registeredAndCorrectClassName( id, PressureSensorChannelInterface::staticMetaObject.className())) {
+        return 0;
+    }
+
+    return dynamic_cast<PressureSensorChannelInterface*>(sm.interface(id));
+}
+
+bool PressureSensorChannelInterface::dataReceivedImpl()
+{
+    QVector<TimedUnsigned> values;
+    if(!read<TimedUnsigned>(values))
+        return false;
+    foreach(const TimedUnsigned& data, values)
+        emit pressureChanged(data);
+    return true;
+}
+
+Unsigned PressureSensorChannelInterface::pressure()
+{
+    return getAccessor<Unsigned>("pressure");
+}

qt-api/pressuresensor_i.h

@@ -0,0 +1,118 @@
+/**
+   @file pressuresensor_i.h
+   @brief Interface for PressureSensor
+
+   <p>
+   Copyright (C) 2016 Canonical LTD.
+
+   @author Lorn Potter <lorn.potter@canonical.com>
+
+   This file is part of Sensorfw.
+
+   Sensord is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License
+   version 2.1 as published by the Free Software Foundation.
+
+   Sensord is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with Sensord.  If not, see <http://www.gnu.org/licenses/>.
+   </p>
+ */
+
+#ifndef PRESSURESENSOR_I_H
+#define PRESSURESENSOR_I_H
+
+#include <QtDBus/QtDBus>
+
+#include "datatypes/unsigned.h"
+#include "abstractsensor_i.h"
+
+/**
+ * Client interface for accessing pressure sensor.
+ * Provides signal on change of measured pressure level.
+ * Previous measured pressure level can be queried any time. Provided
+ * values are in \e pascals.
+ */
+class PressureSensorChannelInterface : public AbstractSensorChannelInterface
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(PressureSensorChannelInterface)
+    Q_PROPERTY(Unsigned pressure READ pressure NOTIFY pressureChanged)
+
+public:
+    /**
+     * Name of the D-Bus interface for this class.
+     */
+    static const char* staticInterfaceName;
+
+    /**
+     * Create new instance of the class.
+     *
+     * @param id Sensor ID.
+     * @param sessionId Session ID.
+     * @return Pointer to new instance of the class.
+     */
+    static AbstractSensorChannelInterface* factoryMethod(const QString& id, int sessionId);
+
+    /**
+     * Get latest pressure from sensor daemon.
+     *
+     * @return pressure reading.
+     */
+    Unsigned pressure();
+
+    /**
+     * Constructor.
+     *
+     * @param path      path.
+     * @param sessionId session ID.
+     */
+    PressureSensorChannelInterface(const QString& path, int sessionId);
+
+    /**
+     * Request a listening interface to the sensor.
+     *
+     * @param id sensor ID.
+     * @return Pointer to interface, or NULL on failure.
+     * @deprecated use interface(const QString&) instead.
+     */
+    static const PressureSensorChannelInterface* listenInterface(const QString& id);
+
+    /**
+     * Request a control interface to the sensor.
+     *
+     * @param id sensor ID.
+     * @return Pointer to interface, or NULL on failure.
+     * @deprecated use interface(const QString&) instead.
+     */
+    static PressureSensorChannelInterface* controlInterface(const QString& id);
+
+    /**
+     * Request an interface to the sensor.
+     *
+     * @param id sensor ID.
+     * @return Pointer to interface, or NULL on failure.
+     */
+    static PressureSensorChannelInterface* interface(const QString& id);
+
+protected:
+    virtual bool dataReceivedImpl();
+
+Q_SIGNALS:
+    /**
+     * Sent when measured ambient light intensity has changed.
+     *
+     * @param value ambient light reading.
+     */
+    void pressureChanged(const Unsigned& value);
+};
+
+namespace local {
+  typedef ::PressureSensorChannelInterface PressureSensor;
+}
+
+#endif