Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Only propagate the values above/below threshold in case of a sensor threshold crossing, excluding the sensors that haven't crossed the threshold

Browse source
This commit is contained in:
Fabio Manganiello 2018-07-15 17:28:13 +02:00
parent b3e3621c5a
commit 42fa8360f3
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
platypush/backend/sensor/__init__.py
View file

@ -49,6 +49,9 @@ class SensorBackend(Backend):
if self.data is None or self.data != new_data: if self.data is None or self.data != new_data:
self.bus.post(SensorDataChangeEvent(data=new_data)) self.bus.post(SensorDataChangeEvent(data=new_data))
data_below_threshold = {}
data_above_threshold = {}
if self.thresholds: if self.thresholds:
if isinstance(self.thresholds, dict) and isinstance(new_data, dict): if isinstance(self.thresholds, dict) and isinstance(new_data, dict):
for (measure, threshold) in self.thresholds.items(): for (measure, threshold) in self.thresholds.items():
@ -57,15 +60,22 @@ class SensorBackend(Backend):
if new_data[measure] > threshold and (self.data is None or ( if new_data[measure] > threshold and (self.data is None or (
measure in self.data and self.data[measure] <= threshold)): measure in self.data and self.data[measure] <= threshold)):
self.bus.post(SensorDataAboveThresholdEvent(data=new_data)) data_above_threshold[measure] = new_data[measure]
elif new_data[measure] < threshold and (self.data is None or ( elif new_data[measure] < threshold and (self.data is None or (
measure in self.data and self.data[measure] >= threshold)): measure in self.data and self.data[measure] >= threshold)):
self.bus.post(SensorDataBelowThresholdEvent(data=new_data)) data_below_threshold[measure] = new_data[measure]
else: else:
if new_data > threshold and (self.data is None or self.data <= threshold): if new_data > threshold and (self.data is None or self.data <= threshold):
self.bus.post(SensorDataAboveThresholdEvent(data=new_data)) data_above_threshold = new_data
elif new_data < threshold and (self.data is None or self.data >= threshold): elif new_data < threshold and (self.data is None or self.data >= threshold):
self.bus.post(SensorDataBelowThresholdEvent(data=new_data)) data_below_threshold = new_data
if data_below_threshold:
self.bus.post(SensorDataBelowThresholdEvent(data=data_below_threshold))
if data_above_threshold:
self.bus.post(SensorDataAboveThresholdEvent(data=data_above_threshold))
self.data = new_data self.data = new_data