move backflush vars into storage

src/brewHandler.h

@@ -153,7 +153,7 @@ void backflush() {
         backflushState = kBackflushWaitBrewswitchOff; // Force reset in case backflushOn is reset during backflush!
         LOG(INFO, "Backflush: Disabled via Webinterface");
     }
-    else if (offlineMode == 1 || currBrewState > kBrewIdle || maxflushCycles <= 0 || backflushOn == 0) {
+    else if (offlineMode == 1 || currBrewState > kBrewIdle || maxBackflushCycles <= 0 || backflushOn == 0) {
         return;
     }
 
@@ -189,7 +189,7 @@ void backflush() {
             break;
 
         case kBackflushFilling:
-            if (millis() - startingTime > FILLTIME) {
+            if (millis() - startingTime > (backflushFillTime * 1000)) {
                 startingTime = millis();
                 backflushState = kBackflushFlushingStart;
             }
@@ -200,17 +200,17 @@ void backflush() {
             LOG(INFO, "Backflush: Flushing to drip tray...");
             valveRelay.off();
             pumpRelay.off();
-            flushCycles++;
+            currBackflushCycles++;
             backflushState = kBackflushFlushing;
 
             break;
 
         case kBackflushFlushing:
-            if (millis() - startingTime > flushTime && flushCycles < maxflushCycles) {
+            if (millis() - startingTime > (backflushFlushTime * 10000) && currBackflushCycles < maxBackflushCycles) {
                 startingTime = millis();
                 backflushState = kBackflushFillingStart;
             }
-            else if (flushCycles >= maxflushCycles) {
+            else if (currBackflushCycles >= maxBackflushCycles) {
                 backflushState = kBackflushWaitBrewswitchOff;
             }
 
@@ -221,7 +221,7 @@ void backflush() {
                 LOG(INFO, "Backflush: Finished!");
                 valveRelay.off();
                 pumpRelay.off();
-                flushCycles = 0;
+                currBackflushCycles = 0;
                 backflushState = kBackflushWaitBrewswitchOn;
             }
 

src/defaults.h

@@ -42,6 +42,9 @@ int writeSysParamsToStorage(void);
 #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 BACKFLUSH_CYCLES          5      // number of cycles the backflush should run
+#define BACKFLUSH_FILL_TIME       5      // time in seconds the pump is running during backflush
+#define BACKFLUSH_FLUSH_TIME      10     // time in seconds the 3-way valve is open during backflush
 #define SCALE_WEIGHTSETPOINT      30     // Target weight in grams
 #define WIFI_CREDENTIALS_SAVED    0      // Flag if wifi setup is done. 0: not set up, 1: credentials set up via wifi manager
 #define STANDBY_MODE_ON           0      // Standby mode off by default
@@ -85,6 +88,12 @@ int writeSysParamsToStorage(void);
 #define PRE_INFUSION_TIME_MAX  60
 #define PRE_INFUSION_PAUSE_MIN 0
 #define PRE_INFUSION_PAUSE_MAX 60
+#define BACKFLUSH_CYCLES_MIN   5
+#define BACKFLUSH_CYCLES_MAX   20
+#define BACKFLUSH_FILL_TIME_MIN 5
+#define BACKFLUSH_FILL_TIME_MAX 20
+#define BACKFLUSH_FLUSH_TIME_MIN 5
+#define BACKFLUSH_FLUSH_TIME_MAX 20
 #define WEIGHTSETPOINT_MIN     0
 #define WEIGHTSETPOINT_MAX     500
 #define PID_KP_STEAM_MIN       0

src/display/displayCommon.h

@@ -384,9 +384,9 @@ bool displayMachineState() {
             default:
                 u8g2.setFont(u8g2_font_fub17_tf);
                 u8g2.setCursor(42, 42);
-                u8g2.print(flushCycles + 1, 0);
+                u8g2.print(currBackflushCycles+ 1, 0);
                 u8g2.print("/");
-                u8g2.print(maxflushCycles, 0);
+                u8g2.print(maxBackflushCycles, 0);
                 break;
         }
 

src/main.cpp

@@ -122,9 +122,12 @@ unsigned int wifiReconnects = 0; // actual number of reconnects
 const char* OTApass = OTAPASS;
 
 // Backflush values
-const unsigned long fillTime = FILLTIME;
-const unsigned long flushTime = FLUSHTIME;
-int maxflushCycles = MAXFLUSHCYCLES;
+uint8_t maxBackflushCycles = BACKFLUSH_CYCLES;
+double backflushFillTime = BACKFLUSH_FILL_TIME;
+double backflushFlushTime = BACKFLUSH_FLUSH_TIME;
+int backflushOn = 0;
+int backflushState = 10;
+int currBackflushCycles = 0;                 // number of active flush cycles
 
 // Optocoupler
 unsigned long previousMillisOptocouplerReading = millis();
@@ -264,6 +267,9 @@ SysPara<double> sysParaBrewThresh(&brewSensitivity, BD_THRESHOLD_MIN, BD_THRESHO
 SysPara<uint8_t> sysParaWifiCredentialsSaved(&wifiCredentialsSaved, 0, 1, STO_ITEM_WIFI_CREDENTIALS_SAVED);
 SysPara<double> sysParaPreInfTime(&preinfusion, PRE_INFUSION_TIME_MIN, PRE_INFUSION_TIME_MAX, STO_ITEM_PRE_INFUSION_TIME);
 SysPara<double> sysParaPreInfPause(&preinfusionPause, PRE_INFUSION_PAUSE_MIN, PRE_INFUSION_PAUSE_MAX, STO_ITEM_PRE_INFUSION_PAUSE);
+SysPara<uint8_t> sysParaBackflushCycles(&maxBackflushCycles, BACKFLUSH_CYCLES_MIN, BACKFLUSH_CYCLES_MAX, STO_ITEM_BACKFLUSH_CYCLES);
+SysPara<double> sysParaBackflushFillTime(&backflushFillTime, BACKFLUSH_FILL_TIME_MIN, BACKFLUSH_FILL_TIME_MAX, STO_ITEM_BACKFLUSH_FILL_TIME);
+SysPara<double> sysParaBackflushFlushTime(&backflushFlushTime, BACKFLUSH_FLUSH_TIME_MIN, BACKFLUSH_FLUSH_TIME_MAX, STO_ITEM_BACKFLUSH_FLUSH_TIME);
 SysPara<double> sysParaPidKpSteam(&steamKp, PID_KP_STEAM_MIN, PID_KP_STEAM_MAX, STO_ITEM_PID_KP_STEAM);
 SysPara<double> sysParaSteamSetpoint(&steamSetpoint, STEAM_SETPOINT_MIN, STEAM_SETPOINT_MAX, STO_ITEM_STEAM_SETPOINT);
 SysPara<double> sysParaWeightSetpoint(&weightSetpoint, WEIGHTSETPOINT_MIN, WEIGHTSETPOINT_MAX, STO_ITEM_WEIGHTSETPOINT);
@@ -279,10 +285,6 @@ const double EmergencyStopTemp = 145;         // Temp EmergencyStopTemp
 float inX = 0, inY = 0, inOld = 0, inSum = 0; // used for filterPressureValue()
 boolean brewDetected = 0;
 boolean setupDone = false;
-int backflushOn = 0;                          // 1 = backflush mode active
-int flushCycles = 0;                          // number of active flush cycles
-
-int backflushState = 10;
 
 // Water sensor
 boolean waterFull = true;
@@ -2071,6 +2073,9 @@ int readSysParamsFromStorage(void) {
     if (sysParaBrewThresh.getStorage() != 0) return -1;
     if (sysParaPreInfTime.getStorage() != 0) return -1;
     if (sysParaPreInfPause.getStorage() != 0) return -1;
+    if (sysParaBackflushCycles.getStorage() != 0) return -1;
+    if (sysParaBackflushFillTime.getStorage() != 0) return -1;
+    if (sysParaBackflushFlushTime.getStorage() != 0) return -1;
     if (sysParaPidKpSteam.getStorage() != 0) return -1;
     if (sysParaSteamSetpoint.getStorage() != 0) return -1;
     if (sysParaWeightSetpoint.getStorage() != 0) return -1;
@@ -2110,6 +2115,9 @@ int writeSysParamsToStorage(void) {
     if (sysParaBrewThresh.setStorage() != 0) return -1;
     if (sysParaPreInfTime.setStorage() != 0) return -1;
     if (sysParaPreInfPause.setStorage() != 0) return -1;
+    if (sysParaBackflushCycles.setStorage() != 0) return -1;
+    if (sysParaBackflushFillTime.setStorage() != 0) return -1;
+    if (sysParaBackflushFlushTime.setStorage() != 0) return -1;
     if (sysParaPidKpSteam.setStorage() != 0) return -1;
     if (sysParaSteamSetpoint.setStorage() != 0) return -1;
     if (sysParaWeightSetpoint.setStorage() != 0) return -1;

src/storage.h

@@ -30,6 +30,9 @@ typedef enum {
     STO_ITEM_WIFI_CREDENTIALS_SAVED,    // flag for wifisetup
     STO_ITEM_PRE_INFUSION_TIME,         // pre-infusion time
     STO_ITEM_PRE_INFUSION_PAUSE,        // pre-infusion pause
+    STO_ITEM_BACKFLUSH_CYCLES,          // number of cycles the backflush should run
+    STO_ITEM_BACKFLUSH_FILL_TIME,        // time in ms the pump is running during backflush
+    STO_ITEM_BACKFLUSH_FLUSH_TIME,       // time in ms the 3-way valve is open during backflush
     STO_ITEM_PID_KP_STEAM,              // PID P part at steam phase
     STO_ITEM_STEAM_SETPOINT,            // Setpoint for Steam mode
     STO_ITEM_SOFT_AP_ENABLED_CHECK,     // soft AP enable state
@@ -81,6 +84,9 @@ typedef struct __attribute__((packed)) {
         double brewTimeMs;
         float scaleCalibration;
         double preInfusionTimeMs;
+        uint8_t backflushCycles;
+        double backflushFillTimeMs;
+        double backflushFlushTimeMs;
         float scaleKnownWeight;
         double preInfusionPauseMs;
         uint8_t freeToUse6[21];
@@ -130,6 +136,9 @@ static const sto_data_t itemDefaults PROGMEM = {
     PRE_INFUSION_TIME,                                                                                                              // STO_ITEM_PRE_INFUSION_TIME
     SCALE_KNOWN_WEIGHT,                                                                                                             // STO_ITEM_SCALE_KNOWN_WEIGHT
     PRE_INFUSION_PAUSE_TIME,                                                                                                        // STO_ITEM_PRE_INFUSION_PAUSE
+    BACKFLUSH_CYCLES,                                                                                                               // STO_ITEM_BACKFLUSH_CYCLES
+    BACKFLUSH_FILL_TIME,                                                                                                            // STO_ITEM_BACKFLUSH_FILLTIME
+    BACKFLUSH_FLUSH_TIME,                                                                                                           // STO_ITEM_BACKFLUSH_FLUSHTIME
     {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, // free to use
     0,                                                                                                                              // STO_ITEM_USE_PID_BD
     AGGBKP,                                                                                                                         // STO_ITEM_PID_KP_BD
@@ -219,6 +228,21 @@ static inline int32_t getItemAddr(sto_item_id_t itemId, uint16_t* maxItemSize =
             size = STRUCT_MEMBER_SIZE(sto_data_t, preInfusionPauseMs);
             break;
 
+        case STO_ITEM_BACKFLUSH_CYCLES:
+            addr = offsetof(sto_data_t, backflushCycles);
+            size = STRUCT_MEMBER_SIZE(sto_data_t, backflushCycles);
+            break;
+
+        case STO_ITEM_BACKFLUSH_FILL_TIME:
+            addr = offsetof(sto_data_t, backflushFillTimeMs);
+            size = STRUCT_MEMBER_SIZE(sto_data_t, backflushFillTimeMs);
+            break;
+
+        case STO_ITEM_BACKFLUSH_FLUSH_TIME:
+            addr = offsetof(sto_data_t, backflushFlushTimeMs);
+            size = STRUCT_MEMBER_SIZE(sto_data_t, backflushFlushTimeMs);
+            break;
+
         case STO_ITEM_BREW_PID_DELAY:
             addr = offsetof(sto_data_t, brewPIDDelaySec);
             size = STRUCT_MEMBER_SIZE(sto_data_t, brewPIDDelaySec);

src/userConfig_sample.h

@@ -78,11 +78,6 @@ enum MACHINE {
 #define SCALE_TYPE    0 // 0 = one HX711 per load cell, 1 = Only a single HX711 with two channels
 #define SCALE_SAMPLES 2 // Load cell sample rate
 
-// Backflush values
-#define FILLTIME       5000  // time in ms the pump is running
-#define FLUSHTIME      10000 // time in ms the 3-way valve is open -> backflush
-#define MAXFLUSHCYCLES 5     // number of cycles the backflush should run, 0 = disabled
-
 // PlatformIO OTA
 #define OTA     true      // true = OTA activated, false = OTA deactivated
 #define OTAPASS "otapass" // Password for OTA updates