Xiaomi special attribute in DDF

devices/generic/constants.json

@@ -32,8 +32,10 @@
         "$TYPE_LIGHT_LEVEL_SENSOR": "ZHALightLevel",
         "$TYPE_MOISTURE_SENSOR": "ZHAMoisture",
         "$TYPE_ON_OFF_LIGHT": "On/Off light",
+        "$TYPE_ON_OFF_LIGHT_SWITCH": "On/Off light switch",
         "$TYPE_ON_OFF_OUTPUT": "On/Off output",
         "$TYPE_ON_OFF_PLUGIN_UNIT": "On/Off plug-in unit",
+        "$TYPE_ON_OFF_SWITCH": "On/Off switch",
         "$TYPE_OPEN_CLOSE_SENSOR": "ZHAOpenClose",
         "$TYPE_POWER_SENSOR": "ZHAPower",
         "$TYPE_PRESENCE_SENSOR": "ZHAPresence",

devices/generic/items/config_battery_bis_item.json

@@ -0,0 +1,12 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "config/battery_bis",
+  "datatype": "UInt8",
+  "access": "R",
+  "public": false,
+  "range": [
+    0,
+    100
+  ],
+  "description": "The current device battery level in 0–100 %."
+}

devices/generic/items/config_devicemode_bis_item.json

@@ -0,0 +1,8 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "config/devicemode_bis",
+  "datatype": "String",
+  "access": "R",
+  "public": false,
+  "description": "Mode of the Hue wall switch module with possible values 'singlerocker', 'singlepushbutton', 'dualrocker', 'dualpushbutton'. Xiaomi devices have possible values of 'compatibility' and 'zigbee', but DO NOT CHANGE UNLESS YOU KNOW EXACTLY, WHAT YOU'RE DOING"
+}

devices/generic/items/config_reportgrid_item.json

@@ -0,0 +1,9 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "config/reportgrid",
+  "datatype": "Bool",
+  "access": "RW",
+  "public": true,
+  "description": "Report detailed presence detection grid data (e.g. Aqara FP1).",
+  "default": true
+}

devices/generic/items/config_sensitivity_bis_item.json

@@ -0,0 +1,8 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "config/sensitivity_bis",
+  "datatype": "UInt8",
+  "access": "R",
+  "public": false,
+  "description": "The sensor sensitivity."
+}

devices/generic/items/config_triggerdistance_bis_item.json

@@ -0,0 +1,8 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "config/triggerdistance_bis",
+  "datatype": "String",
+  "access": "R",
+  "public": false,
+  "description": "A device specific distance setting when it triggers the associated function (e.g. detect presence or motion)."
+}

devices/generic/items/state_airquality_bis_item.json

@@ -0,0 +1,8 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "state/airquality_bis",
+  "datatype": "String",
+  "access": "R",
+  "public": false,
+  "description": "Text representation of the air quality based on tVOC level."
+}

devices/generic/items/state_airqualityppb_bis_item.json

@@ -0,0 +1,8 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "state/airqualityppb_bis",
+  "datatype": "UInt16",
+  "access": "R",
+  "public": false,
+  "description": "Measured tVOC level in ppb."
+}

devices/generic/items/state_humidity_bis_item.json

@@ -0,0 +1,8 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "state/humidity_bis",
+  "datatype": "UInt16",
+  "access": "R",
+  "public": false,
+  "description": "The current relative humidity in percent."
+}

devices/generic/items/state_open_bis_item.json

@@ -0,0 +1,8 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "state/open_bis",
+  "datatype": "Bool",
+  "access": "R",
+  "public": false,
+  "description": "True when open is detected."
+}

devices/generic/items/state_orientation_x_item.json

@@ -3,7 +3,6 @@
 	"id": "state/orientation_x",
 	"datatype": "Int16",
 	"access": "R",
-	"public": false,
-	"range": [-65535, 65535],
+	"public": true,
 	"description": "The X orientation of a gyro."
-}
+}

devices/generic/items/state_orientation_y_item.json

@@ -3,7 +3,6 @@
 	"id": "state/orientation_y",
 	"datatype": "Int16",
 	"access": "R",
-	"public": false,
-	"range": [-65535, 65535],
+	"public": true,
 	"description": "The Y orientation of a gyro."
-}
+}

devices/generic/items/state_orientation_z_item.json

@@ -3,7 +3,6 @@
 	"id": "state/orientation_z",
 	"datatype": "Int16",
 	"access": "R",
-	"public": false,
-	"range": [-65535, 65535],
+	"public": true,
 	"description": "The Z orientation of a gyro."
-}
+}

devices/generic/items/state_pressure_bis_item.json

@@ -0,0 +1,8 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "state/pressure_bis",
+  "datatype": "Int16",
+  "access": "R",
+  "public": false,
+  "description": "The current air pressure (mBar)."
+}

devices/generic/items/state_temperature_bis_item.json

@@ -0,0 +1,8 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "state/temperature_bis",
+  "datatype": "Int16",
+  "access": "R",
+  "public": false,
+  "description": "The current temperature in °C × 100."
+}

devices/generic/items/state_water_bis_item.json

@@ -0,0 +1,8 @@
+{
+  "schema": "resourceitem1.schema.json",
+  "id": "state/water_bis",
+  "datatype": "Bool",
+  "access": "R",
+  "public": false,
+  "description": "True when water is detected."
+}

devices/xiaomi/0001_battery.js

@@ -1,7 +1,7 @@
-/* global Attr, Item */
+/* global Attr, R */
 
 const vmin = 27
 const vmax = 30
 const v = Math.max(vmin, Math.min(Attr.val, vmax))
-const bat = ((v - vmin) / (vmax - vmin)) * 100
-Item.val = Math.max(0, Math.min(bat, 100))
+const bat = Math.round(((v - vmin) / (vmax - vmin)) * 100)
+R.Item('config/battery').val = Math.max(0, Math.min(bat, 100))

devices/xiaomi/0101_orientation.js

@@ -0,0 +1,8 @@
+/* global Attr, R */
+
+const x = Attr.val << 16 >> 16
+const y = Attr.val >> 16
+const z = (Attr.val / 0x10000) >> 16
+R.item('state/orientation_x').val = Math.round(Math.atan(x / Math.sqrt(z * z + y * y)) * 180 / Math.PI)
+R.item('state/orientation_y').val = Math.round(Math.atan(y / Math.sqrt(x * x + z * z)) * 180 / Math.PI)
+R.item('state/orientation_z').val = Math.round(Math.atan(z / Math.sqrt(x * x + y * y)) * 180 / Math.PI)