Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/core/controller.py
This commit is contained in:
Manuel83
2017-06-12 22:55:17 +02:00
2 changed files with 8 additions and 2 deletions
+1 -1
View File
@@ -118,7 +118,7 @@ class FermenterController(ControllerBase, ActorController, SensorController):
def heater_on(self, power=100):
f = self.api.cache.get("fermenter").get(self.fermenter_id)
if f.heater is not None:
self.actor_on(power, int(f.heater))
self.actor_on(int(f.heater))
@cbpi.try_catch(None)
def heater_off(self):