Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Alistair Galbraith
2015-07-01 15:11:50 -07:00
3 changed files with 137 additions and 1 deletions

View File

@@ -103,6 +103,15 @@
"off_url": "https://192.168.1.22:3030/devices/23222/off",
"brightness_url": "https://192.168.1.22:3030/devices/23222/brightness/%b",
"http_method": "POST"
},{
"accessory": "ELKM1",
"name": "Security System",
"description": "Allows basic control of Elk M1 security system. You can use 1 of 3 arm modes: Away, Stay, Night. If you need to access all 3, create 3 accessories with different names.",
"zone": "1",
"host": "192.168.1.10",
"port": "2101",
"pin": "1234",
"arm": "Away"
}
]
}