Brewery/Brewery-Controller
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Encoder interrupt handles auto mode.

Browse Source 
Add logic for changing the setpoint temperature
as well as duty cycle.
This commit is contained in:
Chris Giacofei 2022-01-24 11:11:10 -05:00
parent c5b19e9103
commit 484db54d89
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
boil_kettle/src/functions.h
View File

@ -8,19 +8,31 @@ void doEncoder()
{ {
uint8_t result = rotary.read(); uint8_t result = rotary.read();
uint8_t inc; uint8_t inc;
uint8_t KettleDuty = (uint8_t)KettleController.Power();
if (result) { if (result) {
uint8_t speed = rotary.speed(); uint8_t speed = rotary.speed();
speed >= 10 ? inc = 5 : inc = 1; speed >= 10 ? inc = 5 : inc = 1;
} }
if (KettleController.Mode() == MANUAL) {
uint8_t KettleDuty = (uint8_t)KettleController.Power();
if (result == DIR_CW && KettleDuty < 100) {
KettleDuty = (KettleDuty / inc) * inc + inc;
} else if (result == DIR_CCW && KettleDuty > 0) {
KettleDuty = (KettleDuty / inc) * inc - inc;
}
KettleController.Power((double)KettleDuty);
if (result == DIR_CW && KettleDuty < 100) { } else {
KettleDuty = (KettleDuty / inc) * inc + inc;
} else if (result == DIR_CCW && KettleDuty > 0) { uint8_t KettleTemp = (uint8_t)KettleController.Setpoint();
KettleDuty = (KettleDuty / inc) * inc - inc; if (result == DIR_CW && KettleTemp < 220) {
KettleTemp = (KettleTemp / inc) * inc + inc;
} else if (result == DIR_CCW && KettleTemp > 0) {
KettleTemp = (KettleTemp / inc) * inc - inc;
}
KettleController.Setpoint((double)KettleTemp);
} }
KettleController.Power((double)KettleDuty);
SettingChanged = true; SettingChanged = true;
} }
@ -64,7 +76,7 @@ void UpdateBoilKettle(){
KettleController.CycleMode(); KettleController.CycleMode();
SettingChanged = true; SettingChanged = true;
} }
if (SettingChanged) { if (SettingChanged) {
menu.update(); menu.update();
SettingChanged = false; SettingChanged = false;

2
boil_kettle/src/thermoControl.cpp
View File

@ -98,7 +98,7 @@ void thermoControl::Hysteresis(double hys) {
void thermoControl::ThreshPWR(double thresh) { void thermoControl::ThreshPWR(double thresh) {
max_pwr_threshold = thresh; max_pwr_threshold = thresh;
} }
void thermoControl::Mode(modes newMode) { void thermoControl::Mode(modes newMode) {
OpMode = newMode; OpMode = newMode;
} }