From f9ee568647f29adcd62baad1bf3bd2410da4348c Mon Sep 17 00:00:00 2001
From: NizarBouchedakh <mohamednizar.bouchedakh@master.hes-so.ch>
Date: Wed, 17 Feb 2016 18:47:30 +0100
Subject: [PATCH] start : new version2
---
backend.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/backend.py b/backend.py
index 98c8c0c..af024e2 100644
--- a/backend.py
+++ b/backend.py
@@ -305,7 +305,7 @@ class Backend():
self.network.start()
print "Z-Wave Network Starting..."
for i in range(0, 300):
- if self.network.state == self.network.STATE_READY:
+ if self.network.is_ready:
break
else:
time.sleep(1.0)
@@ -320,7 +320,7 @@ class Backend():
# this method stops the software representation
global started
- started = False
+ started = False
print "Stopping Z-Wave Network... "
self.network.stop()
@@ -401,7 +401,7 @@ class Backend():
def allMeasures(self, n):
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)
if len(node.location) < 3:
node.location = configpi.sensors[str(node.node_id)][:4]
@@ -426,7 +426,7 @@ class Backend():
def temperature(self, n):
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)
for value in values.itervalues():
if value.label == "Temperature":
@@ -438,7 +438,7 @@ class Backend():
def humidity(self, n):
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)
for value in values.itervalues():
if value.label == "Relative Humidity":
@@ -450,7 +450,7 @@ class Backend():
def luminance(self, n):
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)
for value in values.itervalues():
if value.label == "Luminance":
@@ -462,7 +462,7 @@ class Backend():
def motion(self, n):
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)
for value in values.itervalues():
if value.label == "Sensor":
@@ -474,7 +474,7 @@ class Backend():
def battery(self, n):
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()
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 !"
--
GitLab