- Fermenter Controller Fix

- Kettle Controller Fix
- Remove SQL Alchemie
This commit is contained in:
Manuel83
2017-06-12 22:53:49 +02:00
parent 83a7628248
commit 4f95309a28
7 changed files with 67 additions and 30 deletions
+17 -4
View File
@@ -106,9 +106,10 @@ class FermenterController(ControllerBase, ActorController, SensorController):
self.fermenter_id = kwds.get("fermenter_id")
self.cooler = kwds.get("cooler")
@cbpi.try_catch(None)
def get_target_temp(self, id=None):
if id is None:
id = self.fermenter_id
return self.api.cache.get("fermenter").get(id).target_temp
@@ -116,15 +117,27 @@ class FermenterController(ControllerBase, ActorController, SensorController):
@cbpi.try_catch(None)
def heater_on(self, power=100):
f = self.api.cache.get("fermenter").get(self.fermenter_id)
if k.heater is not None:
self.actor_on(int(f.heater))
if f.heater is not None:
self.actor_on(power, int(f.heater))
@cbpi.try_catch(None)
def heater_off(self):
f = self.api.cache.get("fermenter").get(self.fermenter_id)
if k.heater is not None:
if f.heater is not None:
self.actor_off(int(f.heater))
@cbpi.try_catch(None)
def cooler_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.cooler))
@cbpi.try_catch(None)
def cooler_off(self):
f = self.api.cache.get("fermenter").get(self.fermenter_id)
if f.heater is not None:
self.actor_off(int(f.cooler))
@cbpi.try_catch(None)
def get_temp(self, id=None):
+1 -1
View File
@@ -6,7 +6,7 @@ import datetime
from datetime import datetime
from flask.views import MethodView
from flask_classy import FlaskView, route
from flask_sqlalchemy import SQLAlchemy
from time import localtime, strftime
from functools import wraps, update_wrapper
from props import *