Commit dd4b17e0 authored by Michael Tross's avatar Michael Tross

Merge branch 'post-hackaton' into 'master'

Post hackaton

@mtross : please adapt your netatmo vdc code and add x-netatmo- prefix to our "user defined" properties (username, password, connectionStatus).

See merge request !1
parents b40765c5 fd7ac1e0
ui/favicon.ico

510 Bytes

ui/icon16.png

472 Bytes | W: | H:

ui/icon16.png

458 Bytes | W: | H:

ui/icon16.png
ui/icon16.png
ui/icon16.png
ui/icon16.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -143,8 +143,9 @@ var vdc_auth_button_clicked = function(dsuid, evt)
var callback = function(username, password)
{
$.getJSON("/json/property/vdcquery?query=setProperty(deviceId=" +
device.dSUID + ")/(username=\"" + username + "\"," +
"password=\"" + password + "\")").fail(vdc_request_failed);
device.dSUID + ")/(x-netatmo-username=\"" + username + "\"," +
"x-netatmo-password=\"" + password + "\")"
).fail(vdc_request_failed);
};
......@@ -237,11 +238,11 @@ var vdc_device_query_callback = function(device, data)
{
modeluid = property.value;
}
else if (property.name === "connectionStatus")
else if (property.name === "x-netatmo-connectionStatus")
{
connected = property.value;
}
else if (property.name === "username")
else if (property.name === "x-netatmo-username")
{
username = property.value;
}
......@@ -299,7 +300,7 @@ var vdc_query_device = function(device, remaining)
$.getJSON("/json/property/vdcquery?query=getProperty(deviceId=" +
device.dSUID +
")/modelUID,connectionStatus,username",
")/modelUID,x-netatmo-connectionStatus,x-netatmo-username",
callback).fail(callback);
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment