Skip to content
Snippets Groups Projects
Commit 4a6e3b0f authored by jkerdreu's avatar jkerdreu
Browse files

Added device.html & bind(*)

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/fork@1661 b32b6428-25c9-4566-ad07-03861ab6144f
parent 07608b1c
No related branches found
No related tags found
No related merge requests found
......@@ -22,7 +22,7 @@ setup(
platforms='any',
packages=find_packages(),
include_package_data=True,
namespace_packages=['xaal'],
install_requires=[
'xaal.lib',
]
......
try:
__import__('pkg_resources').declare_namespace(__name__)
except ImportError:
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
......@@ -97,7 +97,7 @@ def run():
setup_xaal()
app = default_app()
debug(True)
server = WSGIServer(("::1", 8080), app, handler_class=WebSocketHandler)
server = WSGIServer(("", 8080), app, handler_class=WebSocketHandler)
server.serve_forever()
def main():
......
<html>
<head>
<title>xAAL JSON / List of devices</title>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
<body>
<h1>Device</h1>
<div id="attributes"></div>
<script>
function getUrlVars()
{
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
for(var i = 0; i < hashes.length; i++)
{
hash = hashes[i].split('=');
vars.push(hash[0]);
vars[hash[0]] = hash[1];
}
return vars;
}
addr=getUrlVars()['addr'];
url="/devices/"+addr;
$.getJSON(url, function(result){
$("#attributes").html(result["attributes"]["temperature"]);
});
</script>
</script>
</body>
</html>
......@@ -5,12 +5,20 @@
<body>
<h1>Devices</h1>
<div></div>
<table id="devices">
</table>
<div id="url">
</div>
<script>
$.getJSON("/devices", function(result){
$.each(result, function(i, field){
$("div").append(field['devtype'] + " ");
devtype = field['devtype'];
addr = field['address'];
url= "./device.html?addr="+addr;
link= "<a href="+url+">"+addr+"</a>";
$("#devices").append("<tr><td>"+devtype+"</td><td>" +link+ "</td></tr>");
});
});
</script>
......
......@@ -21,6 +21,7 @@ setup(
],
keywords=['xaal', 'tools'],
platforms='any',
namespace_packages=['xaal'],
packages=find_packages(),
include_package_data=True,
......
try:
__import__('pkg_resources').declare_namespace(__name__)
except ImportError:
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
......@@ -22,6 +22,7 @@ setup(
keywords=['xaal', 'home-automation'],
platforms='any',
packages=find_packages(),
namespace_packages=['xaal'],
include_package_data=True,
install_requires=["ujson>=1.33","pysodium","configobj"],
)
try:
__import__('pkg_resources').declare_namespace(__name__)
except ImportError:
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
......@@ -363,4 +363,4 @@ def build_timestamp():
"""Return array [seconds since epoch, microseconds since last seconds] Time = UTC+0000 """
epoch = datetime.datetime.utcfromtimestamp(0)
timestamp = datetime.datetime.utcnow() - epoch
return [long(timestamp.total_seconds()), int(timestamp.microseconds)]
return [int(timestamp.total_seconds()), int(timestamp.microseconds)]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment