Release 2.6.2

jghaanstra · Mar 15, 2018 · 5d3f558 · 5d3f558
1 parent 991d654
commit 5d3f558
Show file tree

Hide file tree

Showing 15 changed files with 2,033 additions and 12 deletions.
diff --git a/APPSTORE.md b/APPSTORE.md
@@ -12,6 +12,7 @@ Below is a list of supported devices and devices. Post a comment in the [support
 * Xiamomi Humidifier (tested)
 * Xiaomi Single Power Plug and Power Strip WiFi version (tested)
 * Xiaomi PM2.5 Air Monitor (tested)
+* Xiaomi Gateway Light - alarm not supported yet and subdevices are supported directly with the Xiaomi ZigBee app (tested)
 
 ## Support topic
 For support please use the official support topic on the forum [here](https://forum.athom.com/discussion/3295/).
@@ -46,6 +47,11 @@ For Homey to be able to communicate with devices over the miIO protocol a unique
 * Default flow cards for on/off, measure power and meter power capabilities class
 
 ## Changelog
+### 2018-03-15 -- v2.6.2
+* NEW: add support for the Xiaomi Gateway Light - alarm not supported yet and subdevices are supported directly with the Xiaomi ZigBee app
+* FIX: fix for pairing wizard Philips Light Bulbs
+* FIX: small fix in Yeelights driver
+
 ### 2018-03-04 -- v2.6.1
 * CHANGE: updated device class of Mi Power Plug and Mi Power Strip to "socket" (this require re-pairing of these devices)
 * FIX: solved small device naming issue in pair wizard

diff --git a/app.json b/app.json
@@ -6,10 +6,10 @@
 		"nl": "Xiaomi Mi Home"
     },
     "tags": {
-		"en": [ "Xiaomi", "Mi", "Mi Home", "miio", "vacuumcleaner", "robot", "yeelight", "yeelights", "purifier", "humidifier", "philips", "eyecare", "powerplug" ],
-		"nl": [ "Xiaomi", "Mi", "Mi home", "miio", "stofzuiger", "robot", "yeelight", "yeelights", "luchtreiniger", "luchtbevochtiger", "philips", "eyecare", "powerplug" ]
+		"en": [ "Xiaomi", "Mi", "Mi Home", "miio", "vacuumcleaner", "robot", "yeelight", "yeelights", "purifier", "humidifier", "philips", "eyecare", "powerplug", "gateway" ],
+		"nl": [ "Xiaomi", "Mi", "Mi home", "miio", "stofzuiger", "robot", "yeelight", "yeelights", "luchtreiniger", "luchtbevochtiger", "philips", "eyecare", "powerplug", "gateway" ]
 	},
-	"version": "2.6.1",
+	"version": "2.6.2",
 	"compatibility": "1.x >=1.5.0",
 	"author": {
 		"name": "Jelger Haanstra",
@@ -663,6 +663,92 @@
 		            ]
 		        }
 		    ]
+		},
+        {
+			"id": "gateway",
+			"name": {
+				"en": "Gateway",
+				"nl": "Gateway"
+			},
+			"images": {
+				"large": "drivers/gateway/assets/images/large.jpg",
+				"small": "drivers/gateway/assets/images/small.jpg"
+			},
+			"class": "other",
+			"capabilities": [
+                "onoff",
+                "dim",
+                "light_hue",
+                "light_saturation",
+                "measure_luminance"
+            ],
+            "mobile": {
+                "components": [
+                    {
+                        "id": "icon",
+                        "capabilities": [ "onoff" ]
+                    },
+                    {
+                        "id": "sensor",
+                        "capabilities": [ "measure_luminance" ]
+                    },
+                    {
+                        "id": "slider",
+                        "capabilities": [ "dim" ]
+                    },
+                    {
+                        "id": "color",
+                        "capabilities": [ "light_hue", "light_saturation" ]
+                    }
+                ]
+            },
+			"pair": [
+				{
+					"id": "start"
+				}
+			],
+			"settings": [
+			    {
+                    "type": "group",
+                    "label": {
+                        "en": "Gateway Settings",
+						"nl": "Gateway Instellingen"
+                    },
+					"children": [
+				        {
+				            "id": "address",
+				            "type": "text",
+				            "value": "0.0.0.0",
+				            "label": {
+				                "en": "IP Address",
+				                "nl": "IP Adres"
+				            }
+				        },
+				        {
+					        "id": "token",
+					        "type": "text",
+					        "value": "",
+					        "label": {
+						        "en": "Gateway Token",
+						        "nl": "Gateway Token"
+					        }
+				        },
+                        {
+					        "id": "polling",
+					        "type": "number",
+					        "value": 60,
+                            "attr": {
+                                "min": 5,
+                                "max": 3600
+                            },
+					        "label": {
+						        "en": "Gateway Polling",
+						        "nl": "Gateway Polling"
+					        }
+				        }
+		            ]
+		        }
+		    ]
 		}
 	],
 	"flow": {

diff --git a/drivers/air-monitor/pair/start.html b/drivers/air-monitor/pair/start.html
@@ -11,7 +11,7 @@
 		var inputaddress = $('#address').val();
 		var inputtoken = $('#token').val();
 
-        if( inputaddress != '' && inputtoken != '') {
+        if (inputaddress != '' && inputtoken != '') {
             var device_data = {
                 address: inputaddress,
                 token: inputtoken
@@ -132,7 +132,7 @@
         </div>
         <div class="form-group buttons">
             <button id="test-connection" class="button" data-i18n="pair.test">Test Connection</button>
-            <button id="connect" class="button" data-i18n="pair.connect">Connect</button>
+            <button id="connect" class="button" data-i18n="pair.connect" disabled>Connect</button>
         </div>
     </div>
     <div class="col2">