Skip to content

Commit

Permalink
Fix of Shottimer Scale, Update Shottimer-Types, Renaming BREWCONTROL_…
Browse files Browse the repository at this point in the history 
…TYPE to FEATURE_BREWCONTROL, Combined brews (time/weight)

- Renaming of BREWCONTROL_TYPE to FEATURE_BREWCONTROL in project.

data/app.js
- Added section "Brew Control" for website

src/display/displayCommon.h:
- Unified the shottimer with/without scale from two separate shottimers to just one with showing the weight if a scale is available (FEATURE_SCALE).
- Changed to do no compilation of Scale-Code if not needed
- Removed SHOTTIMER_TYPE

src/display/displayRotateUpright.h
- SHOTTIMER_TYPE removed
- Syntax error fixed

src/display/displayTemplateScale.h
- Modification of template to show the last brewtime (same as weight)
- Changed to not show target-values of time/weight if deactivated via parameter

src/display/displayTemplateUpright.h
- Old variable sensorError replaced with new function of Tempsensor.

src/brewHandler.h:
- Removed the brew by weight as a separate type and included its functionality in brew by time for easier maintenance.
- scaleDelayValue removed, as this value varies with different coffees, ratio,... and therefore it makes no sense to use it as a constant. --> Makes more sense to adjust it with the target-weight.
- Removal of timeBrewed set to 0 and set of lastBrewTime in step kBrewFinished as this is also performed in kWatBrewOff and will make problems with showing the time in the shottimer.
- stop brew by BREWCONtROL_TYPE instead of FEATURE_BREWCONTROL
- Removal of scale-calculations --> Now done in shottimerscale of scalehandler
- Added no stop of brew via time/weight if target-param is 0

src/defaults.h
- Changed min-value of brew-taraget-min

src/main.cpp
- removed zeroing the variable lastBrewTime to show it in template-scale. --> Reset is not needed as the variable will set with every brew again.
- All check of FEATURE_BREWCONTROL > 0 replaced with == 1
- removed variable brewControlType as it is not used
- Moved brew-target-parameters of website to new section
- Use shottimerscale for calculations of brew-weight with/without brew-feature activated

src/scaleHandler.h
- Set weightBrew to 0 until the preinfusion is finished and normal brew starts

src/userConfig_sample.h
- Renaming of BREWCONTROL_TYPE to FEATURE_BREWCONTROL with explanation
- Added explanation of FEATURE_SHOTTIMER, if FEATURE_SCALE is activated that the weight will be shown.
- Removed SHOTTIMER_TYPE as it is no longer needed
- Modifierd explanation of BREWDETECTION_TYPE to FEATURE_BREWCONTROL
- Changed description of FEATURE_BREWCONTROL
- Removed BREWCONTROL_TYPE --> Configuration via Parameters in Brew-Target-Section

Fix of Shottimer Scale, Update Shottimer-Types, Renaming BREWCONTROL_TYPE to FEATURE_BREWCONTROL, Combined brews (time/weight)

- Renaming of BREWCONTROL_TYPE to FEATURE_BREWCONTROL in project.

data/app.js
- Added section "Brew Control" for website

src/display/displayCommon.h:
- Unified the shottimer with/without scale from two separate shottimers to just one with showing the weight if a scale is available (FEATURE_SCALE).
- Changed to do no compilation of Scale-Code if not needed
- Removed SHOTTIMER_TYPE

src/display/displayRotateUpright.h
- SHOTTIMER_TYPE removed
- Syntax error fixed

src/display/displayTemplateScale.h
- Modification of template to show the last brewtime (same as weight)
- Changed to not show target-values of time/weight if deactivated via parameter

src/display/displayTemplateUpright.h
- Old variable sensorError replaced with new function of Tempsensor.

src/brewHandler.h:
- Removed the brew by weight as a separate type and included its functionality in brew by time for easier maintenance.
- scaleDelayValue removed, as this value varies with different coffees, ratio,... and therefore it makes no sense to use it as a constant. --> Makes more sense to adjust it with the target-weight.
- Removal of timeBrewed set to 0 and set of lastBrewTime in step kBrewFinished as this is also performed in kWatBrewOff and will make problems with showing the time in the shottimer.
- stop brew by BREWCONtROL_TYPE instead of FEATURE_BREWCONTROL
- Removal of scale-calculations --> Now done in shottimerscale of scalehandler
- Added no stop of brew via time/weight if target-param is 0

src/defaults.h
- Changed min-value of brew-taraget-min

src/main.cpp
- removed zeroing the variable lastBrewTime to show it in template-scale. --> Reset is not needed as the variable will set with every brew again.
- All check of FEATURE_BREWCONTROL > 0 replaced with == 1
- removed variable brewControlType as it is not used
- Moved brew-target-parameters of website to new section
- Use shottimerscale for calculations of brew-weight with/without brew-feature activated

src/scaleHandler.h
- Set weightBrew to 0 until the preinfusion is finished and normal brew starts

src/userConfig_sample.h
- Renaming of BREWCONTROL_TYPE to FEATURE_BREWCONTROL with explanation
- Added explanation of FEATURE_SHOTTIMER, if FEATURE_SCALE is activated that the weight will be shown.
- Removed SHOTTIMER_TYPE as it is no longer needed
- Modifierd explanation of BREWDETECTION_TYPE to FEATURE_BREWCONTROL
- Changed description of FEATURE_BREWCONTROL
- Removed BREWCONTROL_TYPE --> Configuration via Parameters in Brew-Target-Section

Renaming of BREWCONTROL_TYPE to FEATURE_BREWCONTROL

src/display/displayTemplateMinimal.h
- Renaming of BREWCONTROL_TYP to FEATURE_BREWCONTROL

src/display/displayTemplateStandard.h
- Renaming of BREWCONTROL_TYP to FEATURE_BREWCONTROL

Fix of Shottimer Scale, Update Shottimer-Types, Renaming BREWCONTROL_TYPE to FEATURE_BREWCONTROL, Combined brews (time/weight)

- Renaming of BREWCONTROL_TYPE to FEATURE_BREWCONTROL in project.

data/app.js
- Added section "Brew Control" for website

src/display/displayCommon.h:
- Unified the shottimer with/without scale from two separate shottimers to just one with showing the weight if a scale is available (FEATURE_SCALE).
- Changed to do no compilation of Scale-Code if not needed
- Removed SHOTTIMER_TYPE

src/display/displayRotateUpright.h
- SHOTTIMER_TYPE removed
- Syntax error fixed

src/display/displayTemplateScale.h
- Modification of template to show the last brewtime (same as weight)
- Changed to not show target-values of time/weight if deactivated via parameter

src/display/displayTemplateUpright.h
- Old variable sensorError replaced with new function of Tempsensor.

src/brewHandler.h:
- Removed the brew by weight as a separate type and included its functionality in brew by time for easier maintenance.
- scaleDelayValue removed, as this value varies with different coffees, ratio,... and therefore it makes no sense to use it as a constant. --> Makes more sense to adjust it with the target-weight.
- Removal of timeBrewed set to 0 and set of lastBrewTime in step kBrewFinished as this is also performed in kWatBrewOff and will make problems with showing the time in the shottimer.
- stop brew by BREWCONtROL_TYPE instead of FEATURE_BREWCONTROL
- Removal of scale-calculations --> Now done in shottimerscale of scalehandler
- Added no stop of brew via time/weight if target-param is 0

src/defaults.h
- Changed min-value of brew-taraget-min

src/main.cpp
- removed zeroing the variable lastBrewTime to show it in template-scale. --> Reset is not needed as the variable will set with every brew again.
- All check of FEATURE_BREWCONTROL > 0 replaced with == 1
- removed variable brewControlType as it is not used
- Moved brew-target-parameters of website to new section
- Use shottimerscale for calculations of brew-weight with/without brew-feature activated

src/scaleHandler.h
- Set weightBrew to 0 until the preinfusion is finished and normal brew starts

src/userConfig_sample.h
- Renaming of BREWCONTROL_TYPE to FEATURE_BREWCONTROL with explanation
- Added explanation of FEATURE_SHOTTIMER, if FEATURE_SCALE is activated that the weight will be shown.
- Removed SHOTTIMER_TYPE as it is no longer needed
- Modifierd explanation of BREWDETECTION_TYPE to FEATURE_BREWCONTROL
- Changed description of FEATURE_BREWCONTROL
- Removed BREWCONTROL_TYPE --> Configuration via Parameters in Brew-Target-Section

Fix of Shottimer Scale, Update Shottimer-Types, Renaming BREWCONTROL_TYPE to FEATURE_BREWCONTROL, Combined brews (time/weight)

- Renaming of BREWCONTROL_TYPE to FEATURE_BREWCONTROL in project.

data/app.js
- Added section "Brew Control" for website

src/display/displayCommon.h:
- Unified the shottimer with/without scale from two separate shottimers to just one with showing the weight if a scale is available (FEATURE_SCALE).
- Changed to do no compilation of Scale-Code if not needed
- Removed SHOTTIMER_TYPE

src/display/displayRotateUpright.h
- SHOTTIMER_TYPE removed
- Syntax error fixed

src/display/displayTemplateScale.h
- Modification of template to show the last brewtime (same as weight)
- Changed to not show target-values of time/weight if deactivated via parameter

src/display/displayTemplateUpright.h
- Old variable sensorError replaced with new function of Tempsensor.

src/brewHandler.h:
- Removed the brew by weight as a separate type and included its functionality in brew by time for easier maintenance.
- scaleDelayValue removed, as this value varies with different coffees, ratio,... and therefore it makes no sense to use it as a constant. --> Makes more sense to adjust it with the target-weight.
- Removal of timeBrewed set to 0 and set of lastBrewTime in step kBrewFinished as this is also performed in kWatBrewOff and will make problems with showing the time in the shottimer.
- stop brew by BREWCONtROL_TYPE instead of FEATURE_BREWCONTROL
- Removal of scale-calculations --> Now done in shottimerscale of scalehandler
- Added no stop of brew via time/weight if target-param is 0

src/defaults.h
- Changed min-value of brew-taraget-min

src/main.cpp
- removed zeroing the variable lastBrewTime to show it in template-scale. --> Reset is not needed as the variable will set with every brew again.
- All check of FEATURE_BREWCONTROL > 0 replaced with == 1
- removed variable brewControlType as it is not used
- Moved brew-target-parameters of website to new section
- Use shottimerscale for calculations of brew-weight with/without brew-feature activated

src/scaleHandler.h
- Set weightBrew to 0 until the preinfusion is finished and normal brew starts

src/userConfig_sample.h
- Renaming of BREWCONTROL_TYPE to FEATURE_BREWCONTROL with explanation
- Added explanation of FEATURE_SHOTTIMER, if FEATURE_SCALE is activated that the weight will be shown.
- Removed SHOTTIMER_TYPE as it is no longer needed
- Modifierd explanation of BREWDETECTION_TYPE to FEATURE_BREWCONTROL
- Changed description of FEATURE_BREWCONTROL
- Removed BREWCONTROL_TYPE --> Configuration via Parameters in Brew-Target-Section

Renaming of BREWCONTROL_TYPE to FEATURE_BREWCONTROL

src/display/displayTemplateMinimal.h
- Renaming of BREWCONTROL_TYP to FEATURE_BREWCONTROL

src/display/displayTemplateStandard.h
- Renaming of BREWCONTROL_TYP to FEATURE_BREWCONTROL
  • Loading branch information
@TobiEdelberg @LoQue90
TobiEdelberg authored and LoQue90 committed Jul 14, 2024
1 parent 1bebd2b commit f6ce867
Show file tree
Hide file tree
Showing 12 changed files with 90 additions and 199 deletions.
5 changes: 3 additions & 2 deletions data/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,9 @@ const vueApp = Vue.createApp({
0: 'PID Parameters',
1: 'Temperature and Preinfusion',
2: 'Brew Detection and Brew PID Parameters',
3: 'Scale Parameters',
4: 'Power Settings'
3: 'Brew Control',
4: 'Scale Parameters',
5: 'Power Settings'
}

return sectionNames[sectionId]
Expand Down
140 changes: 19 additions & 121 deletions src/brewHandler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ void backflush() {
}
}

#if (BREWCONTROL_TYPE == 1)
#if (FEATURE_BREWCONTROL == 1)
/**
* @brief Time base brew mode
*/
Expand All @@ -252,7 +252,13 @@ void brew() {
brewSwitchWasOff = true;
}

totalBrewTime = (preinfusion * 1000) + (preinfusionPause * 1000) + (brewTime * 1000); // running every cycle, in case changes are done during brew
if (brewTime > 0) {
totalBrewTime = (preinfusion * 1000) + (preinfusionPause * 1000) + (brewTime * 1000); // running every cycle, in case changes are done during brew
}
else {
// Stop by time deactivated --> brewTime = 0
totalBrewTime = 0;
}

// state machine for brew
switch (currBrewState) {
Expand Down Expand Up @@ -311,12 +317,19 @@ void brew() {

break;

case kWaitBrew: // waiting time brew
case kWaitBrew: // waiting time or weight brew
lastBrewTime = timeBrewed;

if (timeBrewed > totalBrewTime) {
// stop brew if target-time is reached --> No stop if stop by time is deactivated via Parameter (0)
if ((timeBrewed > totalBrewTime) && ((brewTime > 0))) {
currBrewState = kBrewFinished;
}
#if (FEATURE_SCALE == 1)
// stop brew if target-weight is reached --> No stop if stop by weight is deactivated via Parameter (0)
else if (((FEATURE_SCALE == 1) && (weightBrew > weightSetpoint)) && (weightSetpoint > 0)) {
currBrewState = kBrewFinished;
}
#endif

break;

Expand All @@ -325,7 +338,6 @@ void brew() {
valveRelay.off();
pumpRelay.off();
currBrewState = kWaitBrewOff;
timeBrewed = 0;

break;

Expand All @@ -336,127 +348,13 @@ void brew() {

// disarmed button
currentMillisTemp = 0;
brewDetected = 0; // rearm brewDetection
brewDetected = 0; // rearm brewDetection
currBrewState = kBrewIdle;
lastBrewTime = timeBrewed; // store brewtime to show in Shottimer after brew is finished
timeBrewed = 0;
}

break;
}
}
#endif

#if (BREWCONTROL_TYPE == 2)
/**
* @brief Weight based brew mode
*/
void brew() {
checkbrewswitch();
unsigned long currentMillisTemp = millis();

if (currStateBrewSwitch == LOW && currBrewState > kBrewIdle) {
// abort function for state machine from every state
currBrewState = kWaitBrewOff;
}

if (currBrewState > kBrewIdle && currBrewState < kWaitBrewOff) {
timeBrewed = currentMillisTemp - startingTime;
weightBrew = weight - weightPreBrew;
}

if (currStateBrewSwitch == LOW && movingAverageInitialized) {
// check if brewswitch was turned off at least once, last time,
brewSwitchWasOff = true;
}

totalBrewTime = ((preinfusion * 1000) + (preinfusionPause * 1000) + (brewTime * 1000)); // running every cycle, in case changes are done during brew

// state machine for brew
switch (currBrewState) {
case 10: // waiting step for brew switch turning on
if (currStateBrewSwitch == HIGH && backflushState == 10 && backflushOn == 0 && brewSwitchWasOff) {
startingTime = millis();
currBrewState = kPreinfusion;

if (preinfusionPause == 0 || preinfusion == 0) {
currBrewState = kBrewRunning;
}
weightPreBrew = weight;
}
else {
backflush();
}

break;

case 20: // preinfusioon
LOG(INFO, "Preinfusion");
valveRelay.on();
pumpRelay.on();
currBrewState = kWaitPreinfusion;

break;

case 21: // waiting time preinfusion
if (timeBrewed > (preinfusion * 1000)) {
currBrewState = kPreinfusionPause;
}

break;

case 30: // preinfusion pause
LOG(INFO, "preinfusion pause");
valveRelay.on();
pumpRelay.off();
currBrewState = kWaitPreinfusionPause;

break;

case 31: // waiting time preinfusion pause
if (timeBrewed > ((preinfusion * 1000) + (preinfusionPause * 1000))) {
currBrewState = kBrewRunning;
}

break;

case 40: // brew running
LOG(INFO, "Brew started");
valveRelay.on();
pumpRelay.on();
currBrewState = kWaitBrew;

break;

case 41: // waiting time brew
if (weightBrew > (weightSetpoint - scaleDelayValue)) {
currBrewState = kBrewFinished;
}

break;

case 42: // brew finished
LOG(INFO, "Brew stopped");
valveRelay.off();
pumpRelay.off();
currBrewState = kWaitBrewOff;

break;

case 43: // waiting for brewswitch off position
if (brewSwitch == LOW) {
valveRelay.off();
pumpRelay.off();

// disarmed button
currentMillisTemp = 0;
timeBrewed = 0;
brewDetected = 0; // rearm brewDetection
currBrewState = kBrewIdle;
}

weightBrew = weight - weightPreBrew; // always calculate weight to show on display

break;
}
}
#endif
2 changes: 1 addition & 1 deletion src/defaults.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ int writeSysParamsToStorage(void);
#define BREW_TEMP_OFFSET_MAX 20
#define BREW_TEMP_TIME_MIN 1
#define BREW_TEMP_TIME_MAX 180
#define BREW_TIME_MIN 1
#define BREW_TIME_MIN 0
#define BREW_TIME_MAX 180
#define BREW_PID_DELAY_MIN 0
#define BREW_PID_DELAY_MAX 60
Expand Down
48 changes: 17 additions & 31 deletions src/display/displayCommon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ bool displayShottimer() {
return false;
}

if ((machineState == kBrew || brewSwitchState == kBrewSwitchFlushOff) && SHOTTIMER_TYPE == 1) {
if (machineState == kBrew || brewSwitchState == kBrewSwitchFlushOff) {
u8g2.clearBuffer();

if (brewSwitchState != kBrewSwitchFlushOff) {
Expand All @@ -251,34 +251,7 @@ bool displayShottimer() {
u8g2.drawXBMP(0, 12, Manual_Flush_Logo_width, Manual_Flush_Logo_height, Manual_Flush_Logo);
}

displayBrewtime(48, 25, timeBrewed);

displayWaterIcon(119, 1);
u8g2.sendBuffer();
return true;
}

/* if the totalBrewTime is reached automatically,
* nothing should be done, otherwise wrong time is displayed
* because the switch is pressed later than totalBrewTime
*/
else if ((machineState == kShotTimerAfterBrew && brewSwitchState != kBrewSwitchFlushOff) && SHOTTIMER_TYPE == 1) {
u8g2.clearBuffer();
u8g2.drawXBMP(-1, 11, Brew_Cup_Logo_width, Brew_Cup_Logo_height, Brew_Cup_Logo);

displayBrewtime(48, 25, lastBrewTime);

displayWaterIcon(119, 1);
u8g2.sendBuffer();
return true;
}

#if FEATURE_SCALE == 1
else if ((machineState == kBrew) && SHOTTIMER_TYPE == 2) {
u8g2.clearBuffer();

// temp icon
u8g2.drawXBMP(-1, 11, Brew_Cup_Logo_width, Brew_Cup_Logo_height, Brew_Cup_Logo);
#if (FEATURE_SCALE == 1)
u8g2.setFont(u8g2_font_profont22_tf);
u8g2.setCursor(64, 15);
u8g2.print(timeBrewed / 1000, 1);
Expand All @@ -287,14 +260,24 @@ bool displayShottimer() {
u8g2.print(weightBrew, 1);
u8g2.print("g");
u8g2.setFont(u8g2_font_profont11_tf);
#else
displayBrewtime(48, 25, timeBrewed);
#endif

displayWaterIcon(119, 1);
u8g2.sendBuffer();
return true;
}

else if (((machineState == kShotTimerAfterBrew) && SHOTTIMER_TYPE == 2)) {
/* if the totalBrewTime is reached automatically,
* nothing should be done, otherwise wrong time is displayed
* because the switch is pressed later than totalBrewTime
*/
else if (machineState == kShotTimerAfterBrew && brewSwitchState != kBrewSwitchFlushOff) {
u8g2.clearBuffer();
u8g2.drawXBMP(-1, 11, Brew_Cup_Logo_width, Brew_Cup_Logo_height, Brew_Cup_Logo);

#if (FEATURE_SCALE == 1)
u8g2.setFont(u8g2_font_profont22_tf);
u8g2.setCursor(64, 15);
u8g2.print(lastBrewTime / 1000, 1);
Expand All @@ -303,11 +286,14 @@ bool displayShottimer() {
u8g2.print(weightBrew, 1);
u8g2.print("g");
u8g2.setFont(u8g2_font_profont11_tf);
#else
displayBrewtime(48, 25, lastBrewTime);
#endif

displayWaterIcon(119, 1);
u8g2.sendBuffer();
return true;
}
#endif
return false;
}

Expand Down
8 changes: 4 additions & 4 deletions src/display/displayRotateUpright.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void displayEmergencyStop(void) {
* @brief display shot timer
*/
bool displayShottimer() {
if (((timeBrewed > 0 && BREWCONTROL_TYPE == 0) || (BREWCONTROL_TYPE > 0 && currBrewState > kBrewIdle && currBrewState <= kBrewFinished)) && FEATURE_SHOTTIMER == 1 && SHOTTIMER_TYPE == 1) {
if (((timeBrewed > 0 && FEATURE_BREWCONTROL == 0) || (FEATURE_BREWCONTROL > 0 && currBrewState > kBrewIdle && currBrewState <= kBrewFinished)) && FEATURE_SHOTTIMER == 1) {
u8g2.clearBuffer();

// draw temp icon
Expand All @@ -100,8 +100,8 @@ bool displayShottimer() {
u8g2.sendBuffer();
return true;
}
else if (FEATURE_SHOTTIMER == 1 && SHOTTIMER_TYPE == 1 && millis() >= lastBrewTimeMillis && // directly after creating lastbrewTimeMillis (happens when turning off the brew switch, case 43 in the code) should be started
lastBrewTimeMillis + SHOTTIMERDISPLAYDELAY >= millis() && // should run until millis() has caught up with SHOTTIMERDISPLAYDELAY, this can be used to control the display duration
else if (FEATURE_SHOTTIMER == 1 && millis() >= lastBrewTimeMillis && // directly after creating lastbrewTimeMillis (happens when turning off the brew switch, case 43 in the code) should be started
lastBrewTimeMillis + SHOTTIMERDISPLAYDELAY >= millis() && // should run until millis() has caught up with SHOTTIMERDISPLAYDELAY, this can be used to control the display duration
lastBrewTimeMillis < totalBrewTime) // if the totalBrewTime is reached automatically, nothing should be done, otherwise wrong time will be displayed because switch is pressed later than totalBrewTime
{
u8g2.clearBuffer();
Expand All @@ -114,5 +114,5 @@ bool displayShottimer() {
return true;
}

return false
return false;
}
2 changes: 1 addition & 1 deletion src/display/displayTemplateMinimal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void printScreen() {
u8g2.print(timeBrewed / 1000, 0);
u8g2.print("/");

if (BREWCONTROL_TYPE == 0) {
if (FEATURE_BREWCONTROL == 0) {
u8g2.print(brewtimesoftware, 0);
}
else {
Expand Down
20 changes: 15 additions & 5 deletions src/display/displayTemplateScale.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,11 @@ void printScreen() {
u8g2.print(weight, 0);
}

u8g2.print("/");
u8g2.print(weightSetpoint, 0);
if (weightSetpoint > 0) {
u8g2.print("/");
u8g2.print(weightSetpoint, 0);
}

u8g2.print(" (");
u8g2.print(weightBrew, 1);
u8g2.print(")");
Expand All @@ -76,13 +79,20 @@ void printScreen() {
u8g2.setCursor(32, 36);
u8g2.print("t: ");
u8g2.print(timeBrewed / 1000, 0);
u8g2.print("/");

if (BREWCONTROL_TYPE == 0) {
if (FEATURE_BREWCONTROL == 0) {
u8g2.print("/");
u8g2.print(brewtimesoftware, 0);
}
else {
u8g2.print(totalBrewTime / 1000, 1);
if (brewTime > 0) {
u8g2.print("/");
u8g2.print(totalBrewTime / 1000, 0);
}

u8g2.print(" (");
u8g2.print(lastBrewTime / 1000, 1);
u8g2.print(")");
}

#if (FEATURE_PRESSURESENSOR == 1)
Expand Down
2 changes: 1 addition & 1 deletion src/display/displayTemplateStandard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void printScreen() {
u8g2.print(timeBrewed / 1000, 0);
u8g2.print("/");

if (BREWCONTROL_TYPE == 0) {
if (FEATURE_BREWCONTROL == 0) {
u8g2.print(brewtimesoftware, 0);
}
else {
Expand Down
4 changes: 2 additions & 2 deletions src/display/displayTemplateUpright.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void printScreen() {
if (((machineState == kPidNormal || machineState == kBrewDetectionTrailing) || ((machineState == kBrew || machineState == kShotTimerAfterBrew) && FEATURE_SHOTTIMER == 0) || // shottimer == 0, auch Bezug anzeigen
(machineState == kPidNormal && (setpoint - temperature) > 5. && FEATURE_HEATINGLOGO == 0) || ((machineState == kPidDisabled) && FEATURE_PIDOFF_LOGO == 0)) &&
(brewSwitchState != kBrewSwitchFlushOff)) {
if (!sensorError) {
if (!tempSensor->hasError()) {
u8g2.clearBuffer();
u8g2.setCursor(1, 14);
u8g2.print(langstring_current_temp_rot_ur);
Expand Down Expand Up @@ -103,7 +103,7 @@ void printScreen() {
u8g2.print(timeBrewed / 1000, 0);
u8g2.print("/");

if (BREWCONTROL_TYPE == 0) {
if (FEATURE_BREWCONTROL == 0) {
u8g2.print(brewtimesoftware, 0); // deaktivieren wenn Preinfusion ( // voransetzen )
}
else {
Expand Down
Loading

0 comments on commit f6ce867

Please sign in to comment.