Skip to content
Snippets Groups Projects
Commit f9ee5686 authored by NizarBouchedakh's avatar NizarBouchedakh
Browse files

start : new version2

parent a6124020
No related branches found
No related tags found
No related merge requests found
...@@ -305,7 +305,7 @@ class Backend(): ...@@ -305,7 +305,7 @@ class Backend():
self.network.start() self.network.start()
print "Z-Wave Network Starting..." print "Z-Wave Network Starting..."
for i in range(0, 300): for i in range(0, 300):
if self.network.state == self.network.STATE_READY: if self.network.is_ready:
break break
else: else:
time.sleep(1.0) time.sleep(1.0)
...@@ -401,7 +401,7 @@ class Backend(): ...@@ -401,7 +401,7 @@ class Backend():
def allMeasures(self, n): def allMeasures(self, n):
for node in self.network.nodes.itervalues(): for node in self.network.nodes.itervalues():
if node.node_id == n and node.isReady and n != 1 and "timestamp"+str(node.node_id) in self.timestamps: if node.node_id == n and node.isReady and n != 1 :
values = node.get_values("All", "User", "All", True, False) values = node.get_values("All", "User", "All", True, False)
if len(node.location) < 3: if len(node.location) < 3:
node.location = configpi.sensors[str(node.node_id)][:4] node.location = configpi.sensors[str(node.node_id)][:4]
...@@ -426,7 +426,7 @@ class Backend(): ...@@ -426,7 +426,7 @@ class Backend():
def temperature(self, n): def temperature(self, n):
for node in self.network.nodes.itervalues(): for node in self.network.nodes.itervalues():
if node.node_id == n and node.isReady and n != 1 and "timestamp"+str(node.node_id) in self.timestamps: if node.node_id == n and node.isReady and n != 1 :
values = node.get_values(0x31, "User", "All", True, False) values = node.get_values(0x31, "User", "All", True, False)
for value in values.itervalues(): for value in values.itervalues():
if value.label == "Temperature": if value.label == "Temperature":
...@@ -438,7 +438,7 @@ class Backend(): ...@@ -438,7 +438,7 @@ class Backend():
def humidity(self, n): def humidity(self, n):
for node in self.network.nodes.itervalues(): for node in self.network.nodes.itervalues():
if node.node_id == n and node.isReady and n != 1 and "timestamp"+str(node.node_id) in self.timestamps: if node.node_id == n and node.isReady and n != 1 :
values = node.get_values(0x31, "User", "All", True, False) values = node.get_values(0x31, "User", "All", True, False)
for value in values.itervalues(): for value in values.itervalues():
if value.label == "Relative Humidity": if value.label == "Relative Humidity":
...@@ -450,7 +450,7 @@ class Backend(): ...@@ -450,7 +450,7 @@ class Backend():
def luminance(self, n): def luminance(self, n):
for node in self.network.nodes.itervalues(): for node in self.network.nodes.itervalues():
if node.node_id == n and node.isReady and n != 1 and "timestamp"+str(node.node_id) in self.timestamps: if node.node_id == n and node.isReady and n != 1 :
values = node.get_values(0x31, "User", "All", True, False) values = node.get_values(0x31, "User", "All", True, False)
for value in values.itervalues(): for value in values.itervalues():
if value.label == "Luminance": if value.label == "Luminance":
...@@ -462,7 +462,7 @@ class Backend(): ...@@ -462,7 +462,7 @@ class Backend():
def motion(self, n): def motion(self, n):
for node in self.network.nodes.itervalues(): for node in self.network.nodes.itervalues():
if node.node_id == n and node.isReady and n != 1 and "timestamp"+str(node.node_id) in self.timestamps: if node.node_id == n and node.isReady and n != 1 :
values = node.get_values(0x30, "User", "All", True, False) values = node.get_values(0x30, "User", "All", True, False)
for value in values.itervalues(): for value in values.itervalues():
if value.label == "Sensor": if value.label == "Sensor":
...@@ -474,7 +474,7 @@ class Backend(): ...@@ -474,7 +474,7 @@ class Backend():
def battery(self, n): def battery(self, n):
for node in self.network.nodes.itervalues(): for node in self.network.nodes.itervalues():
if node.node_id == n and node.isReady and n != 1 and "timestamp"+str(node.node_id) in self.timestamps: if node.node_id == n and node.isReady and n != 1 :
val = node.get_battery_level() val = node.get_battery_level()
return jsonify(controller = name, sensor = node.node_id, location = node.location, type = "battery", updateTime = self.timestamps["timestamp"+str(node.node_id)], value = val) return jsonify(controller = name, sensor = node.node_id, location = node.location, type = "battery", updateTime = self.timestamps["timestamp"+str(node.node_id)], value = val)
return "Node not ready or wrong sensor node !" return "Node not ready or wrong sensor node !"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment