Skip to content

Commit

Permalink
Merge pull request #32 from rafale77/rafale77-patch-1
Browse files Browse the repository at this point in the history 
Rafale77 patch 1
  • Loading branch information
@watou
watou authored Mar 16, 2017
2 parents 5322ea5 + a9c58e8 commit 12032a7
Show file tree
Hide file tree
Showing 4 changed files with 1,048 additions and 889 deletions.
34 changes: 28 additions & 6 deletions src/D_Ecobee1.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,37 @@
{
"flashicon": "http://watou.github.io/vera-ecobee/icons/ecobee.png",
"default_icon": "http://watou.github.io/vera-ecobee/icons/ecobee.png",
"imgIconBody": "",
"imgIconDimmable": "",
"imgIconTurnable": "",
"imgIconMin": "",
"imgIconMax": "",
"halloIconsDir": "pics/hallo",
"state_icons": [
"ecobee_0.png",
"ecobee_100.png"
],

{
"img": "http://watou.github.io/vera-ecobee/icons/ecobee_0.png",
"conditions": [
{
"service": "urn:ecobee-com:serviceId:Ecobee1",
"variable": "status",
"operator": "==",
"value": "0"
}
]
},
{
"img": "http://watou.github.io/vera-ecobee/icons/ecobee_100.png",
"conditions": [
{
"service": "urn:ecobee-com:serviceId:Ecobee1",
"variable": "status",
"operator": "==",
"value": "1"
}
]
}
],
"x": "2",
"y": "4",
"inScene": "0",
Expand Down Expand Up @@ -111,8 +133,7 @@
"Parameters": []
},
"ControlCode": "get_pin"
},

}
]
},
{
Expand All @@ -127,4 +148,5 @@
}
],
"DeviceType": "urn:schemas-ecobee-com:device:Ecobee:1",
}
"device_type": "urn:schemas-ecobee-com:device:Ecobee:1"
}
127 changes: 106 additions & 21 deletions src/D_EcobeeHouse1.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
{
"flashicon": "http://watou.github.io/vera-ecobee/icons/house.png",
"default_icon": "http://watou.github.io/vera-ecobee/icons/house.png",
"imgIconBody": "",
"imgIconDimmable": "",
"imgIconTurnable": "",
"imgIconMin": "",
"imgIconMax": "",
"halloIconsDir": "pics/hallo",
"state_icons": [
"house_0.png",
"house_100.png"
],
"x": "2",
"y": "4",
"state_icons": [
{
"img": "http://watou.github.io/vera-ecobee/icons/house_0.png",
"conditions": [
{
"service": "urn:upnp-org:serviceId:SwitchPower1",
"variable": "Status",
"operator": "==",
"value": "0"
}
]
},
{
"img": "http://watou.github.io/vera-ecobee/icons/house_100.png",
"conditions": [
{
"service": "urn:upnp-org:serviceId:SwitchPower1",
"variable": "Status",
"operator": "==",
"value": "1"
}
]
}
],
"inScene": "1",
"DisplayStatus": {
"Service": "urn:upnp-org:serviceId:SwitchPower1",
Expand Down Expand Up @@ -128,6 +149,66 @@
},
"ControlCode": "im_away"
},
{
"ControlGroup": "1",
"ControlType": "button",
"top": "0",
"left": "1",
"Label": {
"lang_tag": "cmd_sleep",
"text": "Sleep"
},
"Display": {
"Service": "urn:ecobee-com:serviceId:Ecobee1",
"Variable": "currentClimateRef",
"Value": "sleep",
"Top": 60,
"Left": 50,
"Width": 75,
"Height": 20
},
"Command": {
"Service": "urn:ecobee-com:serviceId:Ecobee1",
"Action": "SetClimateHold",
"Parameters": [
{
"Name": "HoldClimateRef",
"Value": "sleep"
}
]
},
"ControlCode": "im_home"
},
{
"ControlGroup": "2",
"ControlType": "button",
"top": "0",
"left": "1",
"Label": {
"lang_tag": "cmd_smart1",
"text": "Vacation"
},
"Display": {
"Service": "urn:ecobee-com:serviceId:Ecobee1",
"Variable": "currentClimateRef",
"Value": "smart1",
"Top": 60,
"Left": 145,
"Width": 75,
"Height": 20
},
"Command": {
"Service": "urn:ecobee-com:serviceId:Ecobee1",
"Action": "SetClimateHold",
"Parameters": [
{
"Name": "HoldClimateRef",
"Value": "smart1"
}
]
},
"ControlCode": "im_away"
},
{
"ControlGroup": "3",
"ControlType": "label",
Expand All @@ -142,7 +223,8 @@
"Left": 50,
"Width": 75,
"Height": 20
}
},
"ControlCode": "event"
},
{
"ControlGroup": "3",
Expand All @@ -156,7 +238,8 @@
"Height": 20,
"Service": "urn:ecobee-com:serviceId:Ecobee1",
"Variable": "currentEventType"
}
},
"ControlCode": "event"
},
{
"ControlGroup": "3",
Expand All @@ -172,7 +255,8 @@
"Left": 145,
"Width": 75,
"Height": 20
}
},
"ControlCode": "climate"
},
{
"ControlGroup": "3",
Expand All @@ -186,7 +270,8 @@
"Height": 20,
"Service": "urn:ecobee-com:serviceId:Ecobee1",
"Variable": "currentClimateRef"
}
},
"ControlCode": "climate"
}
]
},
Expand Down Expand Up @@ -250,29 +335,29 @@
}
},
"cmd_3": {
"label": "WAKEUP",
"label": "SLEEP",
"serviceId": "urn:ecobee-com:serviceId:Ecobee1",
"action": "SetClimateHold",
"arguments": {
"HoldClimateRef": "wakeup"
"HoldClimateRef": "sleep"
},
"display": {
"service": "urn:ecobee-com:serviceId:Ecobee1",
"variable": "currentClimateRef",
"value": "wakeup"
"value": "sleep"
}
},
"cmd_4": {
"label": "SLEEP",
"label": "VACATION",
"serviceId": "urn:ecobee-com:serviceId:Ecobee1",
"action": "SetClimateHold",
"arguments": {
"HoldClimateRef": "sleep"
"HoldClimateRef": "smart1"
},
"display": {
"service": "urn:ecobee-com:serviceId:Ecobee1",
"variable": "currentClimateRef",
"value": "sleep"
"value": "smart1"
}
}
}
Expand Down Expand Up @@ -306,17 +391,17 @@
}
},
{
"Wakeup": "wakeup",
"Sleep": "sleep",
"HumanFriendlyText": {
"lang_tag": "hft_device_set_to_wakeup",
"text": "_DEVICE_NAME_ is set to wakeup"
"lang_tag": "hft_device_set_to_sleep",
"text": "_DEVICE_NAME_ is set to sleep"
}
},
{
"Sleep": "sleep",
"Vacation": "vacation",
"HumanFriendlyText": {
"lang_tag": "hft_device_set_to_sleep",
"text": "_DEVICE_NAME_ is set to sleep"
"lang_tag": "hft_device_set_to_vacation",
"text": "_DEVICE_NAME_ is set to vacation"
}
}
],
Expand All @@ -333,4 +418,4 @@
],
"DeviceType": "urn:schemas-ecobee-com:device:EcobeeHouse:1",
"device_type": "urn:schemas-ecobee-com:device:EcobeeHouse:1"
}
}
1 change: 1 addition & 0 deletions src/D_EcobeeHumidistat1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"flashicon": "icons/Humidity_Sensor.swf",
"default_icon": "humidity_sensor_default.png",
"iconText": "1",
"imgIconBody": "",
"imgIconDimmable": "",
Expand Down
Loading

0 comments on commit 12032a7

Please sign in to comment.