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

Change check for out of bounds setpoints.

Browse Source 
Makes more sense this way, and is compatible with more boards.

ESP32 chips don't seem to like min/max with mixed types.
This commit is contained in:
Chris Giacofei 2024-04-29 12:47:49 -04:00
parent ff8129f400
commit 0e74d66125
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
boil_kettle/boil_kettle.ino
View File

@ -45,6 +45,7 @@ char* KettleState() {
case OFF: return (char*)"OFF"; case OFF: return (char*)"OFF";
case AUTOMATIC: return (char*)"AUT"; case AUTOMATIC: return (char*)"AUT";
case MANUAL: return (char*)"MAN"; case MANUAL: return (char*)"MAN";
default: return (char*)"OFF";
} }
} }
@ -88,8 +89,8 @@ void doEncoder() {
KettleSetpoint = (KettleSetpoint / inc) * inc - inc; KettleSetpoint = (KettleSetpoint / inc) * inc - inc;
} }
KettleSetpoint = max(KettleSetpoint,0); if (KettleSetpoint > 212) KettleSetpoint=212;
KettleSetpoint = min(KettleSetpoint,212); if (KettleSetpoint < 0) KettleSetpoint=0;
} else if (Controller.Mode() == MANUAL) { } else if (Controller.Mode() == MANUAL) {
if (result == DIR_CW) { if (result == DIR_CW) {
@ -98,8 +99,8 @@ void doEncoder() {
KettleDuty = (KettleDuty / inc) * inc - inc; KettleDuty = (KettleDuty / inc) * inc - inc;
} }
KettleDuty = max(KettleDuty,0); if (KettleDuty > 100) KettleDuty = 100;
KettleDuty = min(KettleDuty,100); if (KettleDuty < 0) KettleDuty = 0;
} }
//menu.update(); //menu.update();

4
boil_kettle/src/thermoControl/thermoControl.cpp
View File

@ -28,8 +28,8 @@ bool thermoControl::Compute() {
*output_pwm = outMax; *output_pwm = outMax;
} else if (error > hysteresis) { } else if (error > hysteresis) {
*output_pwm = 100 * error / max_pwr_threshold; *output_pwm = 100 * error / max_pwr_threshold;
*output_pwm = max(*output_pwm, outMin); if (*output_pwm > 100) *output_pwm = 100;
*output_pwm = min(*output_pwm, outMax); if (*output_pwm < 0) *output_pwm = 0;
} else { } else {
*output_pwm = 0; *output_pwm = 0;
} }