Quellcode durchsuchen

Fix: Sensors are now stopping after update of config

tags/3.1_alpha
Manuel83 Manuel83 vor 8 Jahren
Ursprung
Commit
10a989cee9
3 geänderte Dateien mit 4 neuen und 8 gelöschten Zeilen
  1. +2
    -6
      modules/base_plugins/dummy_temp/__init__.py
  2. +0
    -1
      modules/core/core.py
  3. +2
    -1
      modules/core/hardware.py

+ 2
- 6
modules/base_plugins/dummy_temp/__init__.py Datei anzeigen

@@ -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)



+ 0
- 1
modules/core/core.py Datei anzeigen

@@ -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):


+ 2
- 1
modules/core/hardware.py Datei anzeigen

@@ -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



Laden…
Abbrechen
Speichern