Bugfix: wrong time changed (brewswitchdelay). Added variable brewSwit…

…chLongPress to brewscale.ini. Rename BREWSWITCHDELAY to SHOTTIMEDISPLAY, adapt comment in ini file
rancilio-pid · Dec 15, 2023 · 58e699f · 58e699f
1 parent 80db731
commit 58e699f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/brewscaleini.h b/src/brewscaleini.h
@@ -39,6 +39,7 @@ unsigned long startingTime = 0;                     // start time of brew
 boolean brewPIDdisabled = false;                    // is PID disabled for delay after brew has started?
 const unsigned long analogreadingtimeinterval = 10; // ms
 unsigned long previousMillistempanalogreading;      // ms for analogreading
+const unsigned long brewSwitchLongPress = 500;      // time in ms until brew trigger will be interpreted as manual brewing
 
 // Shot timer with or without scale
 #if (ONLYPIDSCALE == 1 || BREWMODE == 2)

diff --git a/src/brewvoid.h b/src/brewvoid.h
@@ -68,7 +68,7 @@ void checkbrewswitch() {
                 }
 
                 // Button more than one 1sec pushed
-                if (brewswitchTrigger == HIGH && (brewswitchTriggermillis + 1000 <= millis())) {
+                if (brewswitchTrigger == HIGH && (brewswitchTriggermillis + brewSwitchLongPress <= millis())) {
                     debugPrintln("brewswitchTriggerCase 20: Manual Trigger - brewing");
                     brewswitchTriggerCase = 31;
                     digitalWrite(PIN_VALVE, relayON);

diff --git a/src/main.cpp b/src/main.cpp
@@ -1127,7 +1127,7 @@ void handleMachineState() {
         case kShotTimerAfterBrew:
             brewDetection();
 
-            if (millis() - lastbrewTimeMillis > BREWSWITCHDELAY) {
+            if (millis() - lastbrewTimeMillis > SHOTTIMEDISPLAY) {
                 debugPrintf("Shot time: %4.1f s\n", lastbrewTime / 1000);
                 machineState = kBrewDetectionTrailing;
                 lastbrewTime = 0;

diff --git a/src/userConfig_sample.h b/src/userConfig_sample.h
@@ -38,7 +38,7 @@ enum MACHINE {
 #define SHOTTIMER 1                // 0 = deactivated, 1 = activated 2 = with scale
 #define HEATINGLOGO 0              // 0 = deactivated, 1 = Rancilio, 2 = Gaggia
 #define OFFLINEGLOGO 1             // 0 = deactivated, 1 = activated
-#define BREWSWITCHDELAY 500       // time in ms that the brew switch will be delayed (shot timer will show that much longer after switching off)
+#define SHOTTIMEDISPLAY 3000       // time in ms that shot timer will be shown after brew finished
 #define VERBOSE 0                  // 1 = Show verbose output (serial connection), 0 = show less
 
 #define LANGUAGE 0                 // LANGUAGE = 0 (DE), LANGUAGE = 1 (EN), LANGUAGE = 2 (ES)