michal/craftbeerpi3
1
0
Fork 0
mirror of https://github.com/Manuel83/craftbeerpi3 synced 2026-08-09 18:52:40 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	modules/core/controller.py
This commit is contained in:
Manuel83
2017-06-12 22:55:17 +02:00
parent 4f95309a28 73153c7461
commit fe002cfb25
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+7 -1
View File
@@ -14,10 +14,16 @@ Open a terminal window on Raspberry Pi and type:
This will download (clone) the software to your local Raspberry Pi. This will download (clone) the software to your local Raspberry Pi.
Type <code>cd craftbeerpi</code> to navigate into the craftbeerpi folder. Type <code>cd craftbeerpi3</code> to navigate into the craftbeerpi folder.
Type <code>sudo ./install.sh</code> Type <code>sudo ./install.sh</code>
## ATTENTION ## ATTENTION
CraftBeerPi 3.0 is a complete rewrite. Server as well as user interface. I recommend to use a second SD card for testing. CraftBeerPi 3.0 is a complete rewrite. Server as well as user interface. I recommend to use a second SD card for testing.
## Donation
CraftBeerPi is a free & open source project. If you like to support the project I happy about a donation:
[![Donate](https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2X9KR98KJ8YZQ)
modules/core/controller.py
+1 -1
View File
@@ -118,7 +118,7 @@ class FermenterController(ControllerBase, ActorController, SensorController):
def heater_on(self, power=100): def heater_on(self, power=100):
f = self.api.cache.get("fermenter").get(self.fermenter_id) f = self.api.cache.get("fermenter").get(self.fermenter_id)
if f.heater is not None: if f.heater is not None:
self.actor_on(power, int(f.heater)) self.actor_on(int(f.heater))
@cbpi.try_catch(None) @cbpi.try_catch(None)
def heater_off(self): def heater_off(self):