ZHA Measurement

devices/generic/constants.json

@@ -15,6 +15,7 @@
     "device-types": {
         "$TYPE_AIR_PURIFIER": "ZHAAirPurifier",
         "$TYPE_AIR_QUALITY_SENSOR": "ZHAAirQuality",
+        "$TYPE_AIR_MEASUREMENT_SENSOR": "ZHAAirMeasurement",
         "$TYPE_ALARM_SENSOR": "ZHAAlarm",
         "$TYPE_BATTERY_SENSOR": "ZHABattery",
         "$TYPE_COLOR_DIMMABLE_LIGHT": "Color dimmable light",
@@ -48,6 +49,7 @@
         "$TYPE_VIBRATION_SENSOR": "ZHAVibration",
         "$TYPE_WARNING_DEVICE": "Warning device",
         "$TYPE_WATER_LEAK_SENSOR": "ZHAWater",
+         "$TYPE_WATER_MEASUREMENT_SENSOR": "ZHAWaterMeasurement",
         "$TYPE_WINDOW_COVERING_DEVICE": "Window covering device",
         "$TYPE_ZGP_SWITCH": "ZGPSwitch"
     }

devices/generic/items/config_measuredunit.json

@@ -0,0 +1,17 @@
+{
+	"schema": "resourceitem1.schema.json",
+	"id": "state/measuredunit",
+	"datatype": "String",
+	"access": "RW",
+	"public": true,
+	"description": "The unit of the measured value. To be defined by static in DDF",
+	"default": "µg/m³",
+	"values": [
+		["µg/m³", "microgram per cubic meter"],
+		["PPM", "Parts Per Million"],
+		["PPB", "Parts Per Billion"],
+		["L", "Liter"],
+		["m³", "Cubic meter"],
+		["g" , "Gram"]
+	]
+}

devices/generic/items/state_maxmeasuredvalue.json

@@ -0,0 +1,9 @@
+{
+	"schema": "resourceitem1.schema.json",
+	"id": "state/maxmeasuredvalue",
+	"datatype": "Real",
+	"access": "R",
+	"public": true,
+	"description": "Maximum value of MeasuredValue that is capable of being measured.",
+  "default": 0
+}

devices/generic/items/state_measuredvalue.json

@@ -0,0 +1,9 @@
+{
+	"schema": "resourceitem1.schema.json",
+	"id": "state/measuredvalue",
+	"datatype": "Real",
+	"access": "R",
+	"public": true,
+	"description": "Represents the concentration as a fraction of 1",
+  "default": 0
+}

devices/generic/items/state_minmeasuredvalue.json

@@ -0,0 +1,8 @@
+{
+"schema": "resourceitem1.schema.json",
+"id": "state/minmeasuredvalue",
+"datatype": "Real",
+"access": "R",
+"public": true,
+"description": "Minimum value of MeasuredValue that is capable of being measured"
+}

devices/generic/subdevices/airmeasurement_sensor.json

@@ -0,0 +1,14 @@
+{
+     "schema": "subdevice1.schema.json",
+     "type": "$TYPE_AIR_MEASUREMENT_SENSOR",
+     "name": "ZHAAirMeasurement",
+     "restapi": "/sensors",
+     "order": 23,
+     "uuid": ["$address.ext", "0x01", "0x040d"],
+     "items": [
+         "state/measuredvalue",
+         "state/minmeasuredvalue",
+         "state/maxmeasuredvalue",
+         "state/measuredunit"
+     ]
+}

devices/generic/subdevices/watermeasurement_sensor.json

@@ -0,0 +1,14 @@
+{
+     "schema": "subdevice1.schema.json",
+     "type": "$TYPE_WATER_MEASUREMENT_SENSOR",
+     "name": "ZHAWaterMeasurement",
+     "restapi": "/sensors",
+     "order": 23,
+     "uuid": ["$address.ext", "0x01", "0x0429"],
+     "items": [
+         "state/measuredvalue",
+         "state/minmeasuredvalue",
+         "state/maxmeasuredvalue",
+         "state/measuredunit"
+     ]
+}

resource.cpp

@@ -130,6 +130,9 @@ const char *RStateLocaltime = "state/localtime";
 const char *RStateLockState = "state/lockstate";
 const char *RStateLowBattery = "state/lowbattery";
 const char *RStateLux = "state/lux";
+const char *RStateMaxmeasuredvalue = "state/maxmeasuredvalue";
+const char *RStateMeasuredvalue = "state/measuredvalue";
+const char *RStateMinmeasuredvalue = "state/minmeasuredvalue";
 const char *RStateMoisture = "state/moisture";
 const char *RStateMountingModeActive = "state/mountingmodeactive";
 const char *RStateOn = "state/on";
@@ -272,6 +275,7 @@ const char *RConfigLocalTime = "config/localtime";
 const char *RConfigLock = "config/lock";
 const char *RConfigLocked = "config/locked";
 const char *RConfigLong = "config/long";
+const char *RConfigMeasuredunit = "config/measuredunit";
 const char *RConfigMelody = "config/melody";
 const char *RConfigMode = "config/mode";
 const char *RConfigMountingMode = "config/mountingmode";
@@ -420,6 +424,9 @@ void initResourceDescriptors()
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeString, QVariant::String, RStateLockState));
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeBool, QVariant::Bool, RStateLowBattery));
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeUInt32, QVariant::Double, RStateLux));
+    rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeReal, QVariant::Double, RStateMaxmeasuredvalue));
+    rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeReal, QVariant::Double, RStateMeasuredvalue));
+    rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeReal, QVariant::Double, RStateMinmeasuredvalue));
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeInt16, QVariant::Double, RStateMoisture));
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeBool, QVariant::Bool, RStateMountingModeActive));
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeBool, QVariant::Bool, RStateOn));
@@ -549,6 +556,7 @@ void initResourceDescriptors()
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeBool, QVariant::Bool, RConfigLock));
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeBool, QVariant::Bool, RConfigLocked));
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeString, QVariant::String, RConfigLong));
+    rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeString, QVariant::String, RConfigMeasuredunit));
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeUInt8, QVariant::Double, RConfigMelody));
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeString, QVariant::String, RConfigMode));
     rItemDescriptors.emplace_back(ResourceItemDescriptor(DataTypeBool, QVariant::Bool, RConfigMountingMode));

resource.h

@@ -159,6 +159,9 @@ extern const char *RStateLocaltime;
 extern const char *RStateLockState;
 extern const char *RStateLowBattery;
 extern const char *RStateLux;
+extern const char *RStateMaxmeasuredvalue;
+extern const char *RStateMeasuredvalue;
+extern const char *RStateMinmeasuredvalue;
 extern const char *RStateMoisture;
 extern const char *RStateMountingModeActive;
 extern const char *RStateOn;
@@ -286,6 +289,7 @@ extern const char *RConfigLocalTime;
 extern const char *RConfigLock;
 extern const char *RConfigLocked;
 extern const char *RConfigLong;
+extern const char *RConfigMeasuredunit;
 extern const char *RConfigMelody;
 extern const char *RConfigMode;
 extern const char *RConfigMountingMode;