Merge PR #442: Add O2, PH, ORP, CO and flammable gas sensor interfaces

libnymea/interfaces/co2sensor.json

@@ -1,6 +1,6 @@
 {
     "extends": "sensor",
-    "description": "CO2 sensors. Measures co2 in parts per million.",
+    "description": "CO2 (carbon dioxide) sensors. Measures co2 in parts per million.",
     "states": [
         {
             "name": "co2",

libnymea/interfaces/cosensor.json

@@ -0,0 +1,12 @@
+{
+    "extends": "sensor",
+    "description": "CO (carbon monoxide) sensors. Measures co in parts per million.",
+    "states": [
+        {
+            "name": "co",
+            "type": "double",
+            "unit": "PartsPerMillion",
+            "logged": true
+        }
+    ]
+}

libnymea/interfaces/gassensor.json

@@ -0,0 +1,12 @@
+{
+    "extends": "sensor",
+    "description": "Flammable gas (LPG, Propane, Methane etc) sensors. Measures co2 in parts per million.",
+    "states": [
+        {
+            "name": "gas",
+            "type": "double",
+            "unit": "PartsPerMillion",
+            "logged": true
+        }
+    ]
+}

libnymea/interfaces/interfaces.qrc

@@ -5,7 +5,6 @@
         <file>light.json</file>
         <file>dimmablelight.json</file>
         <file>account.json</file>
-        <file>daylightsensor.json</file>
         <file>colortemperaturelight.json</file>
         <file>doorbell.json</file>
         <file>colorlight.json</file>
@@ -31,12 +30,24 @@
         <file>simplemultibutton.json</file>
         <file>longpressmultibutton.json</file>
         <file>sensor.json</file>
+        <file>daylightsensor.json</file>
+        <file>closablesensor.json</file>
+        <file>presencesensor.json</file>
+        <file>watersensor.json</file>
         <file>temperaturesensor.json</file>
         <file>humiditysensor.json</file>
         <file>pressuresensor.json</file>
         <file>moisturesensor.json</file>
-        <file>conductivitysensor.json</file>
         <file>lightsensor.json</file>
+        <file>noisesensor.json</file>
+        <file>windspeedsensor.json</file>
+        <file>cosensor.json</file>
+        <file>co2sensor.json</file>
+        <file>o2sensor.json</file>
+        <file>gassensor.json</file>
+        <file>orpsensor.json</file>
+        <file>conductivitysensor.json</file>
+        <file>phsensor.json</file>
         <file>thermostat.json</file>
         <file>connectable.json</file>
         <file>wirelessconnectable.json</file>
@@ -65,19 +76,13 @@
         <file>useraccesscontrol.json</file>
         <file>heating.json</file>
         <file>evcharger.json</file>
-        <file>noisesensor.json</file>
-        <file>windspeedsensor.json</file>
-        <file>co2sensor.json</file>
-        <file>presencesensor.json</file>
         <file>navigationpad.json</file>
         <file>extendednavigationpad.json</file>
-        <file>closablesensor.json</file>
         <file>powerswitch.json</file>
         <file>barcodescanner.json</file>
         <file>irrigation.json</file>
         <file>venetianblind.json</file>
         <file>update.json</file>
-        <file>watersensor.json</file>
         <file>cleaningrobot.json</file>
         <file>airquality.json</file>
         <file>indoorairquality.json</file>

libnymea/interfaces/o2sensor.json

@@ -0,0 +1,19 @@
+{
+    "description": "Interface for oxygen sensors. O2 saturation in percentage is mandatory, optionally more advanced sensors may offer O2 values in milligrams per liter (mg/L).",
+    "extends": "sensor",
+    "states": [
+        {
+            "name": "o2saturation",
+            "type": "double",
+            "unit": "Percentage",
+            "logged": true
+        },
+        {
+            "name": "o2",
+            "type": "double",
+            "unit": "MilligramPerLiter",
+            "logged": true,
+            "optional": true
+        }
+    ]
+}

libnymea/interfaces/orpsensor.json

@@ -0,0 +1,12 @@
+{
+    "description": "Interface for ORP (Oxidation Reduction Potential) sensors.",
+    "extends": "sensor",
+    "states": [
+        {
+            "name": "orp",
+            "type": "double",
+            "unit": "MilliVolt",
+            "logged": true
+        }
+    ]
+}

libnymea/interfaces/phsensor.json

@@ -0,0 +1,13 @@
+{
+    "description": "Interface for PH sensors.",
+    "extends": "sensor",
+    "states": [
+        {
+            "name": "ph",
+            "type": "double",
+            "minValue": 0,
+            "maxValue": 14,
+            "logged": true
+        }
+    ]
+}

libnymea/typeutils.h

@@ -140,7 +140,8 @@ public:
         UnitDuration,
         UnitNewton,
         UnitNewtonMeter,
-        UnitRpm
+        UnitRpm,
+        UnitMilligramPerLiter,
     };
     Q_ENUM(Unit)
 

nymea.pro

@@ -5,10 +5,10 @@ NYMEA_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"
 
 # define protocol versions
 JSON_PROTOCOL_VERSION_MAJOR=5
-JSON_PROTOCOL_VERSION_MINOR=6
+JSON_PROTOCOL_VERSION_MINOR=7
 JSON_PROTOCOL_VERSION="$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}"
 LIBNYMEA_API_VERSION_MAJOR=7
-LIBNYMEA_API_VERSION_MINOR=1
+LIBNYMEA_API_VERSION_MINOR=2
 LIBNYMEA_API_VERSION_PATCH=0
 LIBNYMEA_API_VERSION="$${LIBNYMEA_API_VERSION_MAJOR}.$${LIBNYMEA_API_VERSION_MINOR}.$${LIBNYMEA_API_VERSION_PATCH}"
 

plugins/mock/integrationpluginmock.h

@@ -32,7 +32,7 @@
 #define INTEGRATIONPLUGINMOCK_H
 
 #include "integrations/integrationplugin.h"
-
+#include "extern-plugininfo.h"
 #include <QProcess>
 
 class HttpDaemon;

plugins/mock/integrationpluginmock.json

@@ -37,7 +37,7 @@
                         {
                             "id": "d222adb4-2f9c-4c3f-8655-76400d0fb6ce",
                             "name": "resultCount",
-                            "displayName": "resultCount",
+                            "displayName": "Result count",
                             "type": "int",
                             "defaultValue": 2,
                             "allowedValues": [1, 2]

tests/auto/api.json

@@ -1,4 +1,4 @@
-5.6
+5.7
 {
     "enums": {
         "BasicType": [
@@ -376,7 +376,8 @@
             "UnitDuration",
             "UnitNewton",
             "UnitNewtonMeter",
-            "UnitRpm"
+            "UnitRpm",
+            "UnitMilligramPerLiter"
         ],
         "UserError": [
             "UserErrorNoError",