Add support for ZCOMBO-G.

manifest.json

@@ -35,5 +35,5 @@
     }
   },
   "short_name": "Z-Wave",
-  "version": "0.10.3"
+  "version": "0.10.4"
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zwave-adapter",
   "display_name": "Z-Wave",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Z-Wave adapter plugin for Mozilla WebThings Gateway",
   "author": "Mozilla IoT",
   "main": "index.js",

test/classifier/FirstAlert-ZCOMBOG-Smoke-CO-Detector.json

@@ -0,0 +1,359 @@
+{
+  "baseHref": null,
+  "pin": {
+    "required": false,
+    "pattern": null
+  },
+  "credentialsRequired": false,
+  "lastStatus": "sleeping",
+  "zwInfo": {
+    "location": "",
+    "nodeId": 48,
+    "manufacturer": "First Alert (BRK Brands Inc)",
+    "manufacturerId": "0x0138",
+    "product": "ZCombo Smoke and Carbon Monoxide Detector",
+    "productId": "0x0002",
+    "productType": "0x0001",
+    "type": "Alarm Sensor",
+    "genericType": 161,
+    "basicType": 4,
+    "specificType": 0
+  },
+  "zwClasses": [
+    112,
+    113,
+    114,
+    128,
+    132,
+    134
+  ],
+  "zwValues": {
+    "48-112-1-1": {
+      "value_id": "48-112-1-1",
+      "node_id": 48,
+      "class_id": 112,
+      "type": "list",
+      "genre": "config",
+      "instance": 1,
+      "index": 1,
+      "label": "Send double alarm messages",
+      "units": "",
+      "help": "Causes the device to send double alarm messages.",
+      "read_only": false,
+      "write_only": false,
+      "min": 0,
+      "max": 0,
+      "is_polled": false,
+      "values": [
+        "Disable",
+        "Enable"
+      ],
+      "value": "Disable"
+    },
+    "48-113-1-512": {
+      "value_id": "48-113-1-512",
+      "node_id": 48,
+      "class_id": 113,
+      "type": "byte",
+      "genre": "user",
+      "instance": 1,
+      "index": 512,
+      "label": "Alarm Type",
+      "units": "",
+      "help": "Alarm Type Received",
+      "read_only": true,
+      "write_only": false,
+      "min": 0,
+      "max": 255,
+      "is_polled": false,
+      "value": 13
+    },
+    "48-113-1-513": {
+      "value_id": "48-113-1-513",
+      "node_id": 48,
+      "class_id": 113,
+      "type": "byte",
+      "genre": "user",
+      "instance": 1,
+      "index": 513,
+      "label": "Alarm Level",
+      "units": "",
+      "help": "Alarm Level Received",
+      "read_only": true,
+      "write_only": false,
+      "min": 0,
+      "max": 255,
+      "is_polled": false,
+      "value": 255
+    },
+    "48-113-1-514": {
+      "value_id": "48-113-1-514",
+      "node_id": 48,
+      "class_id": 113,
+      "type": "int",
+      "genre": "config",
+      "instance": 1,
+      "index": 514,
+      "label": "Automatically Clear Events",
+      "units": "ms",
+      "help": "Automatically Clear Events sent by a device after a number of Milliseconds",
+      "read_only": false,
+      "write_only": false,
+      "min": -2147483648,
+      "max": 2147483647,
+      "is_polled": false,
+      "value": 5000
+    },
+    "48-114-1-0": {
+      "value_id": "48-114-1-0",
+      "node_id": 48,
+      "class_id": 114,
+      "type": "int",
+      "genre": "system",
+      "instance": 1,
+      "index": 0,
+      "label": "Loaded Config Revision",
+      "units": "",
+      "help": "Revision of the Config file currently loaded",
+      "read_only": true,
+      "write_only": false,
+      "min": -2147483648,
+      "max": 2147483647,
+      "is_polled": false,
+      "value": 2
+    },
+    "48-114-1-1": {
+      "value_id": "48-114-1-1",
+      "node_id": 48,
+      "class_id": 114,
+      "type": "int",
+      "genre": "system",
+      "instance": 1,
+      "index": 1,
+      "label": "Config File Revision",
+      "units": "",
+      "help": "Revision of the Config file on the File System",
+      "read_only": true,
+      "write_only": false,
+      "min": -2147483648,
+      "max": 2147483647,
+      "is_polled": false,
+      "value": 2
+    },
+    "48-114-1-2": {
+      "value_id": "48-114-1-2",
+      "node_id": 48,
+      "class_id": 114,
+      "type": "int",
+      "genre": "system",
+      "instance": 1,
+      "index": 2,
+      "label": "Latest Available Config File Revision",
+      "units": "",
+      "help": "Latest Revision of the Config file available for download",
+      "read_only": true,
+      "write_only": false,
+      "min": -2147483648,
+      "max": 2147483647,
+      "is_polled": false,
+      "value": 2
+    },
+    "48-114-1-3": {
+      "value_id": "48-114-1-3",
+      "node_id": 48,
+      "class_id": 114,
+      "type": "string",
+      "genre": "system",
+      "instance": 1,
+      "index": 3,
+      "label": "Device ID",
+      "units": "",
+      "help": "Manufacturer Specific Device ID/Model",
+      "read_only": true,
+      "write_only": false,
+      "min": 0,
+      "max": 0,
+      "is_polled": false,
+      "value": ""
+    },
+    "48-114-1-4": {
+      "value_id": "48-114-1-4",
+      "node_id": 48,
+      "class_id": 114,
+      "type": "string",
+      "genre": "system",
+      "instance": 1,
+      "index": 4,
+      "label": "Serial Number",
+      "units": "",
+      "help": "Device Serial Number",
+      "read_only": true,
+      "write_only": false,
+      "min": 0,
+      "max": 0,
+      "is_polled": false,
+      "value": ""
+    },
+    "48-128-1-0": {
+      "value_id": "48-128-1-0",
+      "node_id": 48,
+      "class_id": 128,
+      "type": "byte",
+      "genre": "user",
+      "instance": 1,
+      "index": 0,
+      "label": "Battery Level",
+      "units": "%",
+      "help": "Current Battery Level",
+      "read_only": true,
+      "write_only": false,
+      "min": 0,
+      "max": 255,
+      "is_polled": false,
+      "value": 100
+    },
+    "48-132-1-0": {
+      "value_id": "48-132-1-0",
+      "node_id": 48,
+      "class_id": 132,
+      "type": "int",
+      "genre": "system",
+      "instance": 1,
+      "index": 0,
+      "label": "Wake-up Interval",
+      "units": "Seconds",
+      "help": "How often the Device will Wake up to check for pending commands",
+      "read_only": false,
+      "write_only": false,
+      "min": -2147483648,
+      "max": 2147483647,
+      "is_polled": false,
+      "value": 3600
+    },
+    "48-134-1-0": {
+      "value_id": "48-134-1-0",
+      "node_id": 48,
+      "class_id": 134,
+      "type": "string",
+      "genre": "system",
+      "instance": 1,
+      "index": 0,
+      "label": "Library Version",
+      "units": "",
+      "help": "Z-Wave Library Version",
+      "read_only": true,
+      "write_only": false,
+      "min": 0,
+      "max": 0,
+      "is_polled": false,
+      "value": "6"
+    },
+    "48-134-1-1": {
+      "value_id": "48-134-1-1",
+      "node_id": 48,
+      "class_id": 134,
+      "type": "string",
+      "genre": "system",
+      "instance": 1,
+      "index": 1,
+      "label": "Protocol Version",
+      "units": "",
+      "help": "Z-Wave Protocol Version",
+      "read_only": true,
+      "write_only": false,
+      "min": 0,
+      "max": 0,
+      "is_polled": false,
+      "value": "3.52"
+    },
+    "48-134-1-2": {
+      "value_id": "48-134-1-2",
+      "node_id": 48,
+      "class_id": 134,
+      "type": "string",
+      "genre": "system",
+      "instance": 1,
+      "index": 2,
+      "label": "Application Version",
+      "units": "",
+      "help": "Application Version",
+      "read_only": true,
+      "write_only": false,
+      "min": 0,
+      "max": 0,
+      "is_polled": false,
+      "value": "0.05"
+    }
+  },
+  "id": "zwave-defe3c65-48",
+  "title": "zwave-defe3c65-48-Alarm Type",
+  "type": "thing",
+  "@context": "https://iot.mozilla.org/schemas",
+  "@type": [
+    "Alarm"
+  ],
+  "description": "",
+  "properties": {
+    "_alarmType": {
+      "name": "_alarmType",
+      "value": 13,
+      "visible": false,
+      "valueId": "48-113-1-512",
+      "readOnly": true,
+      "type": "number"
+    },
+    "_alarmLevel": {
+      "name": "_alarmLevel",
+      "value": 255,
+      "visible": false,
+      "valueId": "48-113-1-513",
+      "readOnly": true,
+      "type": "number"
+    },
+    "smoke": {
+      "name": "smoke",
+      "value": false,
+      "visible": true,
+      "title": "Smoke",
+      "description": "Smoke Detector",
+      "readOnly": true,
+      "type": "boolean",
+      "@type": "AlarmProperty"
+    },
+    "co": {
+      "name": "co",
+      "value": false,
+      "visible": true,
+      "title": "CO",
+      "description": "Carbon Monoxide Detector",
+      "readOnly": true,
+      "type": "boolean",
+      "@type": "AlarmProperty"
+    },
+    "wakeUpInterval": {
+      "name": "wakeUpInterval",
+      "value": 3600,
+      "visible": true,
+      "title": "WakeUp Interval",
+      "type": "number",
+      "unit": "seconds",
+      "valueId": "48-132-1-0"
+    },
+    "batteryLevel": {
+      "name": "batteryLevel",
+      "value": 100,
+      "visible": true,
+      "title": "Battery",
+      "type": "number",
+      "@type": "LevelProperty",
+      "unit": "percent",
+      "minimum": 0,
+      "maximum": 100,
+      "readOnly": true,
+      "valueId": "48-128-1-0"
+    }
+  },
+  "actions": {},
+  "events": {},
+  "links": []
+}