浏览代码

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/core/controller.py
tags/3.0
Manuel83 8 年前
父节点
当前提交
fe002cfb25
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. +7
    -1
      README.md
  2. +1
    -1
      modules/core/controller.py

+ 7
- 1
README.md 查看文件

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

+ 1
- 1
modules/core/controller.py 查看文件

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


正在加载...
取消
保存