mirror of
https://github.com/PiBrewing/craftbeerpi4.git
synced 2024-11-09 17:07:43 +01:00
Added pressure to steps
This commit is contained in:
parent
1f25b3ae03
commit
d1f656f509
3 changed files with 14 additions and 9 deletions
|
@ -1,3 +1,3 @@
|
|||
__version__ = "4.0.5.a5"
|
||||
__version__ = "4.0.5.a6"
|
||||
__codename__ = "Spring Break"
|
||||
|
||||
|
|
|
@ -94,6 +94,7 @@ class FermenterTargetTempStep(CBPiFermentationStep):
|
|||
self.AutoMode = True if self.props.get("AutoMode","No") == "Yes" else False
|
||||
if self.fermenter is not None:
|
||||
self.fermenter.target_temp = float(self.props.get("Temp", 0))
|
||||
self.fermenter.target_pressure = 0
|
||||
if self.AutoMode == True:
|
||||
await self.setAutoMode(True)
|
||||
self.summary = "Waiting for Target Temp"
|
||||
|
@ -150,8 +151,9 @@ class FermenterTargetTempStep(CBPiFermentationStep):
|
|||
@parameters([Property.Number(label="TimerD", description="Timer Days", configurable=True),
|
||||
Property.Number(label="TimerH", description="Timer Hours", configurable=True),
|
||||
Property.Number(label="TimerM", description="Timer Minutes", configurable=True),
|
||||
Property.Number(label="Temp", configurable=True),
|
||||
Property.Sensor(label="Sensor"),
|
||||
Property.Number(label="Temp", configurable=True, description="Step Temperature"),
|
||||
Property.Number(label="Pressure", configurable=True, description="Step Pressure"),
|
||||
Property.Sensor(label="Sensor", description="Temperature Sensor"),
|
||||
Property.Select(label="AutoMode",options=["Yes","No"], description="Switch Fermenterlogic automatically on and off -> Yes")])
|
||||
class FermenterStep(CBPiFermentationStep):
|
||||
|
||||
|
@ -206,6 +208,7 @@ class FermenterStep(CBPiFermentationStep):
|
|||
self.AutoMode = True if self.props.get("AutoMode", "No") == "Yes" else False
|
||||
if self.fermenter is not None:
|
||||
self.fermenter.target_temp = float(self.props.get("Temp", 0))
|
||||
self.fermenter.target_pressure = float(self.props.get("Pressure", 0))
|
||||
if self.AutoMode == True:
|
||||
await self.setAutoMode(True)
|
||||
await self.push_update()
|
||||
|
@ -293,8 +296,9 @@ class FermenterStep(CBPiFermentationStep):
|
|||
logging.error("Failed to switch on FermenterLogic {} {}".format(self.fermenter.id, e))
|
||||
|
||||
@parameters([Property.Number(label="Temp", configurable=True, description = "Ramp to this temp"),
|
||||
Property.Number(label="Pressure", configurable=True, description="Step Pressure"),
|
||||
Property.Number(label="RampRate", configurable=True, description = "Ramp x °C/F per day. Default: 1"),
|
||||
Property.Sensor(label="Sensor"),
|
||||
Property.Sensor(label="Sensor", description="Temperature Sensor"),
|
||||
Property.Text(label="Notification",configurable = True, description = "Text for notification when Temp is reached"),
|
||||
Property.Select(label="AutoMode",options=["Yes","No"], description="Switch Fermenterlogic automatically on and off -> Yes")])
|
||||
class FermenterRampTempStep(CBPiFermentationStep):
|
||||
|
@ -324,6 +328,7 @@ class FermenterRampTempStep(CBPiFermentationStep):
|
|||
logging.info(self.rate)
|
||||
self.target_temp = round(float(self.props.get("Temp", 0))*10)/10
|
||||
logging.info(self.target_temp)
|
||||
self.fermenter.target_pressure = float(self.props.get("Pressure", 0))
|
||||
while self.get_sensor_value(self.props.get("Sensor", None)).get("value") > 900:
|
||||
await asyncio.sleep(1)
|
||||
self.starttemp = self.get_sensor_value(self.props.get("Sensor", None)).get("value")
|
||||
|
|
|
@ -128,23 +128,23 @@ class FermenterSpundingHysteresis(CBPiFermenterLogic):
|
|||
self.valverelease=int(self.props.get("ValveRelease",1))
|
||||
self.pause=int(self.props.get("Pause",2))
|
||||
if self.valve and self.fermenter.pressure_sensor:
|
||||
valve = self.cbpi.actor.find_by_id(self.valve)
|
||||
#valve = self.cbpi.actor.find_by_id(self.valve)
|
||||
|
||||
await self.actor_off(self.valve)
|
||||
logging.info("Closing Spunding Valve")
|
||||
#logging.info("Closing Spunding Valve")
|
||||
|
||||
while self.running:
|
||||
target_pressure=float(self.fermenter.target_pressure)
|
||||
current_pressure = float(self.get_sensor_value(self.fermenter.pressure_sensor).get("value"))
|
||||
logging.info(f'Target: {target_pressure} | Current: {current_pressure}')
|
||||
if current_pressure >= (target_pressure + self.spunding_offset):
|
||||
#logging.info(f'Target: {target_pressure} | Current: {current_pressure}')
|
||||
if current_pressure >= (target_pressure + self.spunding_offset) and target_pressure !=0:
|
||||
while current_pressure >= target_pressure:
|
||||
await self.actor_on(self.valve)
|
||||
await asyncio.sleep(self.valverelease)
|
||||
await self.actor_off(self.valve)
|
||||
await asyncio.sleep(self.pause)
|
||||
current_pressure = float(self.get_sensor_value(self.fermenter.pressure_sensor).get("value"))
|
||||
logging.info("Value higher than target: Spunding loop is running")
|
||||
#logging.info("Value higher than target: Spunding loop is running")
|
||||
|
||||
await asyncio.sleep(1)
|
||||
else:
|
||||
|
|
Loading…
Reference in a new issue