michal/craftbeerpi3
1
0
Fork 0
mirror of https://github.com/Manuel83/craftbeerpi3 synced 2026-11-03 20:53:54 +01:00
Code Issues Releases Wiki Activity
146 Commits 10 Branches 2 Tags
83699f1933c854110a35600b0291f68d82c11aaa
Commit Graph
146 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin 83699f1933 Import boil time alerts from BeerXML 
By reading the HOP and MISC elements, the 'please add your hop' alerts may be imported.
 2018-01-07 11:45:15 +00: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
Matthias e0e3aff929 Buzzer Beep Level 2017-10-28 22:08:30 +02: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
JamFfmandGitHub 211edc1bbc Added a combinaton of stop-del logfiles-start 
This one makes it easier to test plugins.
 2017-10-01 14:11:52 +02:00
swimIanandGitHub b56c10a8a5 Merge branch 'master' into patch2 2017-09-29 13:43:51 -07:00
swimIan 8d2c5c916a Updated again 2017-09-29 13:40:55 -07:00
swimIan d637c08eba update to reflect changes in the master branch 2017-09-29 13:12:03 -07: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
bertah 65833b1249 GPIOPWM: Fixed misleading label "duty cycle" to "frequency", and handle decimal frequency values. Tested working with Rpi.GPIO 2017-09-23 10:03:48 -04: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
Manuel83 820061cf09 - Two new hop steps added. Now you can set 5 hop alerts 2017-09-22 13:52:00 +02:00
mrilliesandGitHub c1c5faa1f3 Add reset to post put call (Fermenter update) 
Added a call to reset the fermenter after an update.

Reset builds step parameter with FerementerStep objects from database.
Reset all clears current ferment steps - this may be positive or negative
 2017-09-22 21:41:19 +10:00
Manuel83andGitHub 837b906af1 Merge pull request #126 from mrillies/patch-1 
Fix Fermentor Heater power
 2017-09-20 23:41:43 +02:00
mrilliesandGitHub 0f42153591 Update controller.py 
Fix for issue #125: Missing 'power' in call to actor_on had heater id number set as power
 2017-09-21 02:14:56 +10:00
swimIan 5fc5684e56 update boilstep and reorder steps in beerxml recipe import 2017-09-09 10:51:37 -07:00
swimIanandGitHub dc908268dd Merge pull request #9 from swimIan/master 
update 9/6/17
 2017-09-06 06:10:43 -07:00
swimIanandGitHub 14e4e6d61a Merge pull request #8 from Manuel83/master 
Update 9/6/17
 2017-09-06 06:08:22 -07: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
Carl Allen 590ef4ca92 set default_value for Text Property 2017-09-04 21:16:23 -05: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
Manuel83 f771289224 Loading all plugins before calling initializer methods. Now also 
initializer which are defined in the plugin will be called. Before
these initializer where ignored.
 2017-08-31 18:42:02 +02:00
Co de WaalandGitHub bf02c08677 Update __init__.py 2017-08-29 11:11:20 +02:00
Manuel83 c765589984 Chart boost added 2017-08-15 22:10:59 +02:00
swimIan ae7e3a2e7b Adjust check_hop_timer function to alert the user to add the hops at the expected values in the boil process (ex. 60= bittering, 20=aroma, etc), instead of the reverse (ex. 0=bittering, 40=aroma, etc). 2017-08-08 23:36:18 -07:00
swimIan 3eee952a04 Add mashinstep, import mashin temp(infuse_temp) from beerxml, and put boil step ahead of whirlpool and chill steps. 2017-08-08 22:48:23 -07:00
swimIanandGitHub 88b360a8d7 Merge pull request #7 from Manuel83/master 
- Add On - Link to Plugin Website
 2017-07-29 07:13:20 -07:00
Carl AllenandGitHub f62f9ba7ce Add default to text property for @IndyJoeA 2017-07-28 09:32:15 -05:00
Carl Allen 909a6aa0ea Add default values for Property.Number 2017-07-26 18:15:31 -05:00
Manuel83 40b7253a6d - Add On - Link to Plugin Website 
- CSS Fix for Safari
 2017-07-24 21:27:42 +02:00
swimIanandGitHub 3761713219 Merge pull request #6 from swimIan/patch2 
Merge pull request #5 from swimIan/master
 2017-07-22 07:55:19 -07:00
swimIanandGitHub a96c678dd9 Merge pull request #5 from swimIan/master 
Update
 2017-07-22 07:53:16 -07:00
swimIanandGitHub e7765a2c4c Merge pull request #4 from Manuel83/master 
Update
 2017-07-22 07:51:27 -07: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
swimIan f68e0f46ee Merge branch 'patch2' of https://github.com/swimIan/craftbeerpi3 into patch2 2017-07-21 15:49:33 -07:00
swimIan b75926d23e Removes boiltemp notifications for earlier commit 2017-07-21 15:49:11 -07:00
swimIan aa3420efc8 Merge branch 'patch2' of https://github.com/swimIan/craftbeerpi3 into patch2 2017-07-21 14:58:52 -07:00
swimIan 124a03bd0f Add notification(s) at the end of a mashstep, boilstep, and upon reaching boil temperature. 2017-07-21 14:57:49 -07:00
swimIan 1c4e16e358 Add notification at the end of a mashstep. 2017-07-20 16:44:57 -07:00
swimIanandGitHub 74b56937e7 Merge pull request #3 from Manuel83/master 
Update
 2017-07-18 21:43:34 -07: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
Carl Allen 01997f741c Allow modifying chart data in plugins 2017-07-18 15:06:55 -05:00
swimIan 1184107e50 Merge branch 'master' of https://github.com/swimIan/craftbeerpi3 2017-07-16 16:59:15 -07:00
swimIan ea793996ab Merge branch 'master' into patch-1 2017-07-16 16:58:51 -07:00