Merge branch 'nfarina/master' into z-way-server-2

Conflicts:
	config-sample.json
This commit is contained in:
S'pht'Kr
2015-09-12 14:26:27 +02:00
6 changed files with 428 additions and 39 deletions

View File

@@ -79,7 +79,17 @@
"password": "zwayuserpassword",
"poll_interval": 2,
"split_services": false
}
},
{
"platform": "MiLight",
"name": "MiLight",
"ip_address": "255.255.255.255",
"port": 8899,
"type": "rgbw",
"delay": 30,
"repeat": 3,
"zones":["Kitchen Lamp","Bedroom Lamp","Living Room Lamp","Hallway Lamp"]
}
],
"accessories": [
@@ -160,16 +170,6 @@
"port" : 4999, // Port the SER2SOCK process is running on
"pin": "1234" // PIN used for arming / disarming
},
{
"accessory":"MiLight",
"name": "Lamp",
"ip_address": "255.255.255.255",
"port": 8899,
"zone": 1,
"type": "rgbw",
"delay": 35,
"repeat": 3
},
{
"accessory": "Tesla",
"name": "Tesla",
@@ -180,7 +180,7 @@
{
"accessory": "Hyperion",
"name": "TV Backlight",
"description": "Control the Hyperion TV backlight server. https://github.com/tvdzwan/hyperion"
"description": "Control the Hyperion TV backlight server. https://github.com/tvdzwan/hyperion",
"host": "localhost",
"port": "19444"
}