diff --git a/modules/base_plugins/dummy_temp/__init__.py b/modules/base_plugins/dummy_temp/__init__.py index 6cfaa88..557a9b9 100644 --- a/modules/base_plugins/dummy_temp/__init__.py +++ b/modules/base_plugins/dummy_temp/__init__.py @@ -20,18 +20,14 @@ class DummyTempSensor(SensorActive): return "°C" if self.get_config_parameter("unit", "C") == "C" else "°F" def stop(self): - ''' - Stop the sensor. Is called when the sensor config is updated or the sensor is deleted - :return: - ''' - pass + SensorActive.stop(self) def execute(self): ''' Active sensor has to handle his own loop :return: ''' - while self.is_running(): + while self.is_running() is True: self.data_received(self.temp) socketio.sleep(5) diff --git a/modules/core/core.py b/modules/core/core.py index a8714c4..88470c2 100644 --- a/modules/core/core.py +++ b/modules/core/core.py @@ -326,7 +326,6 @@ class CraftBeerPi(ActorAPI, SensorAPI): for m in members: if isinstance(tmpObj.__getattribute__(m), StepProperty.Number): t = tmpObj.__getattribute__(m) - print t.__dict__ #self.cache[key][name]["properties"].append(t.__dict__) self.cache[key][name]["properties"].append({"name": m, "label": t.label, "type": "number", "configurable": t.configurable, "default_value": t.default_value}) elif isinstance(tmpObj.__getattribute__(m), StepProperty.Text): diff --git a/modules/core/hardware.py b/modules/core/hardware.py index 7f69c29..ab66e88 100644 --- a/modules/core/hardware.py +++ b/modules/core/hardware.py @@ -70,15 +70,16 @@ class SensorActive(SensorBase): __running = False def is_running(self): + return self.__running def init(self): self.__running = True - print "INIT ACTIVE SENSOR" def stop(self): self.__running = False + def execute(self): pass