remove brewdetection completely

LoQue90 · Mar 14, 2024 · f3bb045 · f3bb045
1 parent ddb0a00
commit f3bb045
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 290 deletions.
diff --git a/src/brewHandler.h b/src/brewHandler.h
@@ -340,7 +340,6 @@ void brew() {
 
                 // disarmed button
                 currentMillisTemp = 0;
-                brewDetected = 0;  // rearm brewDetection
                 currBrewState = kBrewIdle;
                 timeBrewed = 0;
             }

diff --git a/src/defaults.h b/src/defaults.h
@@ -37,9 +37,7 @@ int writeSysParamsToStorage(void);
 #define AGGBTN 0                   // PID Tn (brew detection phase)
 #define AGGBTV 20                  // PID Tv (brew detection phase)
 #define BREW_TIME 25               // brew time in seconds (only used if pump is being controlled)
-#define BREW_SW_TIME 25            // keep brew PID params for this many seconds after detection (only for software BD)
 #define BREW_PID_DELAY 10          // delay until enabling PID controller during brew (no heating during this time)
-#define BD_SENSITIVITY 120         // brew detection sensitivity, be careful: if too low, then there is the risk of wrong brew detection and rising temperature
 #define PRE_INFUSION_TIME 2        // pre-infusion time in seconds
 #define PRE_INFUSION_PAUSE_TIME 5  // pre-infusion pause time in seconds
 #define SCALE_WEIGHTSETPOINT 30    // Target weight in grams

diff --git a/src/display/displayTemplateStandard.h b/src/display/displayTemplateStandard.h
@@ -12,7 +12,7 @@
  */
 void printScreen()
 {
-    if (((machineState == kAtSetpoint || machineState == kPidNormal || machineState == kBrewDetectionTrailing) ||
+    if (((machineState == kAtSetpoint || machineState == kPidNormal) ||
         ((machineState == kBrew || machineState == kShotTimerAfterBrew) && FEATURE_SHOTTIMER == 0) ||  // shottimer == 0, auch Bezug anzeigen
         machineState == kCoolDown || ((machineState == kInit || machineState == kColdStart) && FEATURE_HEATINGLOGO == 0) ||
         ((machineState == kPidOffline) && FEATURE_OFFLINELOGO == 0))
@@ -59,13 +59,8 @@ void printScreen()
             u8g2.setCursor(84, 36);
             u8g2.print(timeBrewed / 1000, 0);
             u8g2.print("/");
-
-            if (BREWCONTROL_TYPE == 0) {
-                u8g2.print(brewtimesoftware, 0);
-            }
-            else {
-                u8g2.print(totalBrewTime / 1000, 1);
-            }
+            u8g2.print(totalBrewTime / 1000, 1);
+
         }
 
         // PID values over heat bar

diff --git a/src/display/displayTemplateTempOnly.h b/src/display/displayTemplateTempOnly.h
@@ -15,7 +15,7 @@ float blinkingtempoffset = 0.3;  // offset for blinking
  * @brief Send data to display
  */
 void printScreen() {
-    if (((machineState == kAtSetpoint || machineState == kPidNormal || machineState == kBrewDetectionTrailing) ||
+    if (((machineState == kAtSetpoint || machineState == kPidNormal ) ||
         ((machineState == kBrew || machineState == kShotTimerAfterBrew) && FEATURE_SHOTTIMER == 0) ||  // shottimer == 0, auch Bezug anzeigen
         machineState == kCoolDown || ((machineState == kInit || machineState == kColdStart) && FEATURE_HEATINGLOGO == 0) ||
         ((machineState == kPidOffline) && FEATURE_OFFLINELOGO == 0))