Merge PR #583: Rework air quliaty interfaces

libnymea/interfaces/airquality.json

@@ -1,24 +0,0 @@
-{
-    "description": "Air quality sensors. Describes the current quality of the air. As air quality index the PM2.5 measurment (particles pollution level) will be used.",
-    "extends": "sensor",
-    "states": [
-        {
-            "name": "airQuality",
-            "type": "QString",
-            "logged": true,
-            "possibleValues": [
-                "Good",
-                "Moderate",
-                "Unhealthy for Sensitive Groups",
-                "Unhealthy",
-                "Very unhealthy",
-                "Hazardous"
-            ]
-        },
-        {
-            "name": "airQualityIndex",
-            "type": "uint",
-            "logged": true
-        }
-    ]
-}

libnymea/interfaces/cosensor.json

@@ -6,6 +6,8 @@
             "name": "co",
             "type": "double",
             "unit": "PartsPerMillion",
+            "minValue": 0,
+            "maxValue": 255,
             "logged": true
         }
     ]

libnymea/interfaces/indoorairquality.json

@@ -1,24 +0,0 @@
-{
-    "description": "Indoor air quality sensors. Describes the current quality of the air in a room. As air quality index the Volatile organic compounds (VOC) measurment will be used.",
-    "extends": "sensor",
-    "states": [
-        {
-            "name": "indoorAirQuality",
-            "type": "QString",
-            "logged": true,
-            "possibleValues": [
-                "Excellent",
-                "Good",
-                "Moderate",
-                "Poor",
-                "Unhealthy"
-            ]
-        },
-        {
-            "name": "voc",
-            "type": "uint",
-            "unit": "PartsPerMillion",
-            "logged": true
-        }
-    ]
-}

libnymea/interfaces/interfaces.qrc

@@ -45,6 +45,10 @@
         <file>cosensor.json</file>
         <file>co2sensor.json</file>
         <file>o2sensor.json</file>
+        <file>no2sensor.json</file>
+        <file>o3sensor.json</file>
+        <file>pm25sensor.json</file>
+        <file>pm10sensor.json</file>
         <file>gassensor.json</file>
         <file>orpsensor.json</file>
         <file>conductivitysensor.json</file>
@@ -87,8 +91,7 @@
         <file>venetianblind.json</file>
         <file>update.json</file>
         <file>cleaningrobot.json</file>
-        <file>airquality.json</file>
-        <file>indoorairquality.json</file>
+        <file>vocsensor.json</file>
         <file>energystorage.json</file>
         <file>heatpump.json</file>
         <file>smartgridheatpump.json</file>

libnymea/interfaces/no2sensor.json

@@ -0,0 +1,14 @@
+{
+    "description": "Interface for nitrogen dioxide sensors. NO2 is measured in µg/m3.",
+    "extends": "sensor",
+    "states": [
+        {
+            "name": "no2",
+            "type": "double",
+            "unit": "MicroGrammPerCubicalMeter",
+            "minValue": 0,
+            "maxValue": 800,
+            "logged": true
+        }
+    ]
+}

libnymea/interfaces/o3sensor.json

@@ -0,0 +1,14 @@
+{
+    "extends": "sensor",
+    "description": "O3 (ozone) sensors. Measures o3 in parts per million.",
+    "states": [
+        {
+            "name": "o3",
+            "type": "double",
+            "unit": "MicroGrammPerCubicalMeter",
+            "minValue": 0,
+            "maxValue": 500,
+            "logged": true
+        }
+    ]
+}

libnymea/interfaces/pm10sensor.json

@@ -0,0 +1,14 @@
+{
+    "extends": "sensor",
+    "description": "PM10 (Coarse particles) sensors. Measures PM10 particles in µg/m3.",
+    "states": [
+        {
+            "name": "pm10",
+            "type": "double",
+            "unit": "MicroGrammPerCubicalMeter",
+            "minValue": 0,
+            "maxValue": 500,
+            "logged": true
+        }
+    ]
+}

libnymea/interfaces/pm25sensor.json

@@ -0,0 +1,14 @@
+{
+    "extends": "sensor",
+    "description": "PM2.5 (Fine particles) sensors. Measures PM2.5 particles in µg/m3.",
+    "states": [
+        {
+            "name": "pm25",
+            "type": "double",
+            "unit": "MicroGrammPerCubicalMeter",
+            "minValue": 0,
+            "maxValue": 500,
+            "logged": true
+        }
+    ]
+}

libnymea/interfaces/vocsensor.json

@@ -0,0 +1,14 @@
+{
+    "description": "Sensor for volatile organic compounds (VOC).",
+    "extends": "sensor",
+    "states": [
+        {
+            "name": "voc",
+            "type": "uint",
+            "unit": "PartsPerBillion",
+            "minValue": 0,
+            "maxValue": 65353,
+            "logged": true
+        }
+    ]
+}

libnymea/typeutils.h

@@ -126,6 +126,7 @@ public:
         UnitEuroCentPerKiloWattHour,
         UnitPercentage,
         UnitPartsPerMillion,
+        UnitPartsPerBillion,
         UnitEuro,
         UnitDollar,
         UnitHertz,
@@ -144,6 +145,7 @@ public:
         UnitRpm,
         UnitMilligramPerLiter,
         UnitLiter,
+        UnitMicroGrammPerCubicalMeter,
     };
     Q_ENUM(Unit)
 

tests/auto/api.json

@@ -340,6 +340,7 @@
             "UnitEuroCentPerKiloWattHour",
             "UnitPercentage",
             "UnitPartsPerMillion",
+            "UnitPartsPerBillion",
             "UnitEuro",
             "UnitDollar",
             "UnitHertz",
@@ -357,7 +358,8 @@
             "UnitNewtonMeter",
             "UnitRpm",
             "UnitMilligramPerLiter",
-            "UnitLiter"
+            "UnitLiter",
+            "UnitMicroGrammPerCubicalMeter"
         ],
         "UserError": [
             "UserErrorNoError",