Skip to content

Commit

Permalink
Implemented v1.2, closing issues #11, #12, #13, #14 and #16.
Browse files Browse the repository at this point in the history
  • Loading branch information
@watou
watou committed Jun 9, 2015
1 parent 68cb208 commit b78fcc4
Show file tree
Hide file tree
Showing 7 changed files with 298 additions and 225 deletions.
2 changes: 1 addition & 1 deletion src/D_Ecobee1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"flashicon": "http://cocu.la/vera/ecobee/icons/ecobee.png",
"flashicon": "http://watou.github.io/vera-ecobee/icons/ecobee.png",
"imgIconBody": "",
"imgIconDimmable": "",
"imgIconTurnable": "",
Expand Down
112 changes: 76 additions & 36 deletions src/D_EcobeeHouse1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"flashicon": "http://cocu.la/vera/ecobee/icons/house.png",
"flashicon": "http://watou.github.io/vera-ecobee/icons/house.png",
"imgIconBody": "",
"imgIconDimmable": "",
"imgIconTurnable": "",
Expand Down Expand Up @@ -78,21 +78,21 @@
"text": "Home"
},
"Display": {
"Service": "urn:upnp-org:serviceId:HouseStatus1",
"Variable": "OccupancyState",
"Value": "Occupied",
"Service": "urn:ecobee-com:serviceId:Ecobee1",
"Variable": "currentClimateRef",
"Value": "home",
"Top": 60,
"Left": 145,
"Width": 75,
"Height": 20
},
"Command": {
"Service": "urn:upnp-org:serviceId:HouseStatus1",
"Action": "SetOccupancyState",
"Service": "urn:ecobee-com:serviceId:Ecobee1",
"Action": "SetClimateHold",
"Parameters": [
{
"Name": "NewOccupancyState",
"Value": "Occupied"
"Name": "HoldClimateRef",
"Value": "home"
}
]
},
Expand All @@ -108,21 +108,21 @@
"text": "Away"
},
"Display": {
"Service": "urn:upnp-org:serviceId:HouseStatus1",
"Variable": "OccupancyState",
"Value": "Unoccupied",
"Service": "urn:ecobee-com:serviceId:Ecobee1",
"Variable": "currentClimateRef",
"Value": "away",
"Top": 60,
"Left": 50,
"Width": 75,
"Height": 20
},
"Command": {
"Service": "urn:upnp-org:serviceId:HouseStatus1",
"Action": "SetOccupancyState",
"Service": "urn:ecobee-com:serviceId:Ecobee1",
"Action": "SetClimateHold",
"Parameters": [
{
"Name": "NewOccupancyState",
"Value": "Unoccupied"
"Name": "HoldClimateRef",
"Value": "away"
}
]
},
Expand All @@ -135,7 +135,7 @@
"left": "0",
"Label": {
"lang_tag": "event",
"text": "Event"
"text": "Event:"
},
"Display": {
"Top": 20,
Expand Down Expand Up @@ -165,7 +165,7 @@
"left": "1",
"Label": {
"lang_tag": "climate",
"text": "Climate"
"text": "Climate:"
},
"Display": {
"Top": 20,
Expand Down Expand Up @@ -225,28 +225,54 @@
"group_1": {
"cmd_1": {
"label": "HOME",
"serviceId": "urn:upnp-org:serviceId:HouseStatus1",
"action": "SetOccupancyState",
"serviceId": "urn:ecobee-com:serviceId:Ecobee1",
"action": "SetClimateHold",
"arguments": {
"NewOccupancyState": "Occupied"
"HoldClimateRef": "home"
},
"display": {
"service": "urn:upnp-org:serviceId:HouseStatus1",
"variable": "OccupancyState",
"value": "Occupied"
"service": "urn:ecobee-com:serviceId:Ecobee1",
"variable": "currentClimateRef",
"value": "home"
}
},
"cmd_2": {
"label": "AWAY",
"serviceId": "urn:upnp-org:serviceId:HouseStatus1",
"action": "SetOccupancyState",
"serviceId": "urn:ecobee-com:serviceId:Ecobee1",
"action": "SetClimateHold",
"arguments": {
"HoldClimateRef": "away"
},
"display": {
"service": "urn:ecobee-com:serviceId:Ecobee1",
"variable": "currentClimateRef",
"value": "away"
}
},
"cmd_3": {
"label": "WAKEUP",
"serviceId": "urn:ecobee-com:serviceId:Ecobee1",
"action": "SetClimateHold",
"arguments": {
"HoldClimateRef": "wakeup"
},
"display": {
"service": "urn:ecobee-com:serviceId:Ecobee1",
"variable": "currentClimateRef",
"value": "wakeup"
}
},
"cmd_4": {
"label": "SLEEP",
"serviceId": "urn:ecobee-com:serviceId:Ecobee1",
"action": "SetClimateHold",
"arguments": {
"NewOccupancyState": "Unoccupied"
"HoldClimateRef": "sleep"
},
"display": {
"service": "urn:upnp-org:serviceId:HouseStatus1",
"variable": "OccupancyState",
"value": "Unoccupied"
"service": "urn:ecobee-com:serviceId:Ecobee1",
"variable": "currentClimateRef",
"value": "sleep"
}
}
}
Expand All @@ -256,35 +282,49 @@
"id": 1,
"label": {
"lang_tag": "a_device_is_set_to_home_or_away",
"text": "A device is set to home or away"
"text": "A device is set to home, away, wakeup or sleep"
},
"serviceId": "urn:upnp-org:serviceId:HouseStatus1",
"serviceId": "urn:ecobee-com:serviceId:Ecobee1",
"argumentList": [
{
"id": 1,
"dataType": "string",
"defaultValue": "Occupied",
"defaultValue": "home",
"allowedValueList": [
{
"Away": "Unoccupied",
"Away": "away",
"HumanFriendlyText": {
"lang_tag": "hft_device_set_to_away",
"text": "_DEVICE_NAME_ is set to away"
}
},
{
"Home": "Occupied",
"Home": "home",
"HumanFriendlyText": {
"lang_tag": "hft_device_set_to_home",
"text": "_DEVICE_NAME_ is set to home"
}
},
{
"Wakeup": "wakeup",
"HumanFriendlyText": {
"lang_tag": "hft_device_set_to_wakeup",
"text": "_DEVICE_NAME_ is set to wakeup"
}
},
{
"Sleep": "sleep",
"HumanFriendlyText": {
"lang_tag": "hft_device_set_to_sleep",
"text": "_DEVICE_NAME_ is set to sleep"
}
}
],
"name": "OccupancyState",
"name": "currentClimateRef",
"comparisson": "=",
"prefix": {
"lang_tag": "which_mode",
"text": "Which mode"
"text": "Which comfort setting"
},
"suffix": {}
}
Expand Down
5 changes: 0 additions & 5 deletions src/D_EcobeeHouse1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@
<handleChildren>0</handleChildren>
<staticJson>D_EcobeeHouse1.json</staticJson>
<serviceList>
<service>
<serviceType>urn:schemas-upnp-org:service:HouseStatus:1</serviceType>
<serviceId>urn:upnp-org:serviceId:HouseStatus1</serviceId>
<SCPDURL>S_HouseStatusEcobee1.xml</SCPDURL>
</service>
<service>
<serviceType>urn:schemas-upnp-org:service:SwitchPower:1</serviceType>
<serviceId>urn:upnp-org:serviceId:SwitchPower1</serviceId>
Expand Down
2 changes: 1 addition & 1 deletion src/D_EcobeeThermostat1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"flashicon": "http://cocu.la/vera/ecobee/icons/thermostat.png",
"flashicon": "http://watou.github.io/vera-ecobee/icons/thermostat.png",
"iconText": "1",
"imgIconBody": "",
"imgIconDimmable": "",
Expand Down
Loading

0 comments on commit b78fcc4

Please sign in to comment.