 Manuel83andGitHub
|
5b47b94833
|
Merge pull request #213 from cgspeck/fix-typo
Fix typo in README
|
2018-09-04 06:32:32 +02:00 |
|
 Manuel83andGitHub
|
98409d9895
|
Merge pull request #206 from swimIan/swimIan-patch-1
Remove "Steps started on xml imported" bug
|
2018-09-04 06:32:15 +02:00 |
|
 Manuel83andGitHub
|
a477cb83a8
|
Merge pull request #211 from cgspeck/docker-dev-env
Docker files for ease of development on PCs/macs
|
2018-08-15 07:00:19 +02:00 |
|
 Manuel83andGitHub
|
1414b1ed3b
|
Merge pull request #166 from DrRataplan/master
Import hop alerts from BeerXML
|
2018-08-02 12:54:14 +02:00 |
|
 Manuel83andGitHub
|
acd404622b
|
Merge pull request #182 from archonic/patch-1
Remove duplicate line
|
2018-05-23 10:19:17 +02:00 |
|
 Manuel83andGitHub
|
d657077570
|
Merge pull request #181 from clearwaterbrewer/patch-1
Fix hysteresis turning off heater
|
2018-05-23 10:18:41 +02:00 |
|
 Manuel83andGitHub
|
5efa1df350
|
Merge pull request #133 from JamFfm/JamFfm-install
Added a combinaton of stop-del logfiles-start
|
2017-11-08 19:45:08 +01:00 |
|
 Manuel83andGitHub
|
dd5b5f456a
|
Merge pull request #151 from mb-tec/master
Buzzer Beep Level
|
2017-11-08 19:44:32 +01:00 |
|
 Manuel83andGitHub
|
2a02979e37
|
Merge pull request #142 from Manuel83/revert-105-patch2
Revert "Updates the boilstep and beerxml recipe import"
|
2017-10-15 14:48:45 +02:00 |
|
 Manuel83andGitHub
|
a1740074ac
|
Revert "Updates the boilstep and beerxml recipe import"
|
2017-10-15 14:48:24 +02:00 |
|
 Manuel83andGitHub
|
b279dcf347
|
Merge pull request #105 from swimIan/patch2
Updates the boilstep and beerxml recipe import
|
2017-10-13 21:56:17 +02:00 |
|
 Manuel83andGitHub
|
03395647ed
|
Merge pull request #130 from bertah/master
GPIOPWM: Fixed misleading label and support decimal frequencies
|
2017-09-25 13:22:46 +02:00 |
|
 Manuel83andGitHub
|
25ace8024c
|
Merge pull request #127 from mrillies/patch-1
Add reset to post put call (Fermenter update)
|
2017-09-22 13:55:10 +02:00 |
|
 Manuel83andGitHub
|
837b906af1
|
Merge pull request #126 from mrillies/patch-1
Fix Fermentor Heater power
|
2017-09-20 23:41:43 +02:00 |
|
 Manuel83andGitHub
|
bf3fbddbe2
|
Merge pull request #119 from carlallen/text_property_default_value_fix
Set default value for TextProperty to fix bug
|
2017-09-05 08:03:24 +02:00 |
|
 Manuel83andGitHub
|
d3bc54001f
|
Merge pull request #101 from carlallen/default_value_for_numbers
Default value for Property.Number
|
2017-09-04 16:34:53 +02:00 |
|
 Manuel83andGitHub
|
25dead2e4d
|
Merge pull request #115 from cow77/patch-3
Update __init__.py
|
2017-09-04 16:34:25 +02:00 |
|
 Manuel83andGitHub
|
2fe3d1d68e
|
Merge pull request #94 from carlallen/modify_charts_in_plugins
Allow modifying chart data in plugins
|
2017-07-22 09:13:10 +02:00 |
|
 Manuel83andGitHub
|
1f1f84018d
|
Merge pull request #98 from swimIan/patch2
Add notification(s) at the end of mashstep and boilstep
|
2017-07-22 09:11:33 +02:00 |
|
 Manuel83andGitHub
|
805b3fae1b
|
Merge pull request #90 from swimIan/master
Add 2 more beeps to the Buzzer
|
2017-07-19 06:31:08 +02:00 |
|
 Manuel83andGitHub
|
f8d4015b6e
|
Merge pull request #89 from carlallen/port_param
Allow setting port by param
|
2017-07-19 06:29:54 +02:00 |
|
 Manuel83andGitHub
|
ca9575ac29
|
Merge pull request #70 from MikonosII/patch-3
fixed typos
|
2017-07-15 13:13:16 +02:00 |
|
 Manuel83andGitHub
|
9a1981fa46
|
Merge pull request #81 from swimIan/master
Update all brew steps to allow decimal values
|
2017-07-15 13:12:59 +02:00 |
|
 Manuel83andGitHub
|
46fc39c185
|
Merge pull request #80 from IndyJoeA/master
Use Integer for Buzzer GPIO
|
2017-07-15 13:12:44 +02:00 |
|
 Manuel83andGitHub
|
fd5ac5ce77
|
Merge pull request #77 from carlallen/patch-2
Improved descriptions for fermenter hysteresis
|
2017-07-11 22:11:25 +02:00 |
|
 Manuel83andGitHub
|
785e5c984c
|
Merge pull request #71 from carlallen/patch-1
Add back in sensor_name and improve description for offset
|
2017-07-10 21:57:36 +02:00 |
|
 Manuel83andGitHub
|
ca7270b5ee
|
Merge pull request #67 from carlallen/buzzer_gpio_options
allow buzzer on all gpio pins
|
2017-07-07 08:47:37 +02:00 |
|
 Manuel83andGitHub
|
2c941e01d5
|
Merge pull request #66 from MikonosII/patch-2
Update __init__.py
|
2017-07-07 08:46:14 +02:00 |
|
 Manuel83andGitHub
|
62f31e2dd4
|
Merge pull request #55 from jalim/hotfix/buzzer_fix
Move buzzer init order to fall after config init.
|
2017-07-05 20:34:29 +02:00 |
|
 Manuel83andGitHub
|
88a9989c13
|
Merge pull request #62 from carlallen/patch-6
Select properties configurable for steps
|
2017-07-05 20:33:32 +02:00 |
|
 Manuel83andGitHub
|
c2aa5d8141
|
Update README.md
|
2017-06-29 15:13:57 +02:00 |
|
 Manuel83andGitHub
|
dc046e92c4
|
Merge pull request #50 from carlallen/patch-5
Allow blank value for offset on onewire sensor
|
2017-06-28 21:59:08 +02:00 |
|
 Manuel83andGitHub
|
e67baeabb0
|
Merge pull request #47 from jalim/hotfix/message-event-bus-patch
Change to notification to use message event bus
|
2017-06-28 09:32:44 +02:00 |
|
 Manuel83andGitHub
|
3396e1b379
|
Merge pull request #38 from carlallen/patch-3
Allow specifying an offset on onewire sensor
|
2017-06-28 08:42:07 +02:00 |
|
 Manuel83andGitHub
|
0749c55478
|
Merge pull request #39 from IndyJoeA/patch-1
Replace int with float in get_sensor_value()
|
2017-06-28 08:41:43 +02:00 |
|
 Manuel83andGitHub
|
3b60c8cfd1
|
Merge pull request #44 from carlallen/patch-4
Allow SQL file to be re-run
|
2017-06-28 08:41:05 +02:00 |
|
 Manuel83andGitHub
|
ef0f719c58
|
Merge pull request #41 from MikonosII/patch-1
Update controller.py
|
2017-06-28 08:38:02 +02:00 |
|
 Manuel83andGitHub
|
1ec6b9acf1
|
Merge pull request #36 from carlallen/patch-2
Allow floats for offeset min/max
|
2017-06-28 08:37:39 +02:00 |
|
 Manuel83andGitHub
|
f0b7c6e640
|
Merge pull request #24 from alexpalmer/patch-1
Update __init__.py
|
2017-06-18 21:22:34 +02:00 |
|
Manuel83
|
37d8c7be83
|
Merge branch 'master' of https://github.com/Manuel83/craftbeerpi3
|
2017-06-13 20:40:21 +02:00 |
|
Manuel83
|
c0e3ef4c4c
|
ip addr for startup
|
2017-06-13 20:39:50 +02:00 |
|
 Manuel83andGitHub
|
3727c1494e
|
Merge pull request #9 from carlallen/patch-1
Add GPIO Pin 27
|
2017-06-12 23:05:41 +02:00 |
|
 Manuel83andGitHub
|
73153c7461
|
Update README.md
|
2017-06-11 22:11:45 +02:00 |
|
 Manuel83andGitHub
|
1838575d2d
|
Merge pull request #1 from carlallen/patch-1
Fix exception in FermenterController
|
2017-06-11 20:34:05 +02:00 |
|
 Manuel83andGitHub
|
b7664e31fd
|
Create README.md
|
2017-06-11 19:00:23 +02:00 |
|
 Manuel83andGitHub
|
b03966562c
|
Create README.md
|
2017-06-11 17:09:05 +02:00 |
|