fixes after rebase

rancilio-pid · Oct 11, 2024 · e21b747 · e21b747
1 parent 810df00
commit e21b747
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 44 deletions.
diff --git a/src/defaults.h b/src/defaults.h
@@ -72,8 +72,6 @@ int writeSysParamsToStorage(void);
 #define STEAM_SETPOINT_MAX       140
 #define BREW_TEMP_OFFSET_MIN     0
 #define BREW_TEMP_OFFSET_MAX     20
-#define BREW_TEMP_TIME_MIN       1
-#define BREW_TEMP_TIME_MAX       180
 #define BREW_TIME_MIN            0
 #define BREW_TIME_MAX            180
 #define BREW_PID_DELAY_MIN       0
@@ -96,43 +94,3 @@ int writeSysParamsToStorage(void);
 #define BACKFLUSH_FILL_TIME_MAX  20
 #define BACKFLUSH_FLUSH_TIME_MIN 5
 #define BACKFLUSH_FLUSH_TIME_MAX 20
-#define PID_KP_START_MIN       0
-#define PID_KP_START_MAX       999
-#define PID_TN_START_MIN       0
-#define PID_TN_START_MAX       999
-#define PID_KP_REGULAR_MIN     0
-#define PID_KP_REGULAR_MAX     999
-#define PID_TN_REGULAR_MIN     0
-#define PID_TN_REGULAR_MAX     999
-#define PID_TV_REGULAR_MIN     0
-#define PID_TV_REGULAR_MAX     999
-#define PID_I_MAX_REGULAR_MIN  0
-#define PID_I_MAX_REGULAR_MAX  999
-#define PID_KP_BD_MIN          0
-#define PID_KP_BD_MAX          999
-#define PID_TN_BD_MIN          0
-#define PID_TN_BD_MAX          999
-#define PID_TV_BD_MIN          0
-#define PID_TV_BD_MAX          999
-#define BREW_SETPOINT_MIN      20
-#define BREW_SETPOINT_MAX      110
-#define STEAM_SETPOINT_MIN     100
-#define STEAM_SETPOINT_MAX     140
-#define BREW_TEMP_OFFSET_MIN   0
-#define BREW_TEMP_OFFSET_MAX   20
-#define BREW_TEMP_TIME_MIN     1
-#define BREW_TEMP_TIME_MAX     180
-#define BREW_TIME_MIN          0
-#define BREW_TIME_MAX          180
-#define BREW_PID_DELAY_MIN     0
-#define BREW_PID_DELAY_MAX     60
-#define PRE_INFUSION_TIME_MIN  0
-#define PRE_INFUSION_TIME_MAX  60
-#define PRE_INFUSION_PAUSE_MIN 0
-#define PRE_INFUSION_PAUSE_MAX 60
-#define WEIGHTSETPOINT_MIN     0
-#define WEIGHTSETPOINT_MAX     500
-#define PID_KP_STEAM_MIN       0
-#define PID_KP_STEAM_MAX       500
-#define STANDBY_MODE_TIME_MIN  30
-#define STANDBY_MODE_TIME_MAX  120
diff --git a/src/embeddedWebserver.h b/src/embeddedWebserver.h
@@ -58,7 +58,7 @@ void serverSetup();
 void setEepromWriteFcn(int (*fcnPtr)(void));
 
 // editable vars are specified in main.cpp
-#define EDITABLE_VARS_LEN 33
+#define EDITABLE_VARS_LEN 34
 extern std::map<String, editable_t> editableVars;
 
 // EEPROM

diff --git a/src/main.cpp b/src/main.cpp
@@ -1292,7 +1292,7 @@ void setup() {
 #endif
 
     editableVars["VERSION"] = {
-        .displayName = F("Version"), .hasHelpText = false, .helpText = "", .type = kCString, .section = sOtherSection, .position = 35, .show = [] { return false; }, .minValue = 0, .maxValue = 1, .ptr = (void*)sysVersion};
+        .displayName = F("Version"), .hasHelpText = false, .helpText = "", .type = kCString, .section = sOtherSection, .position = 34, .show = [] { return false; }, .minValue = 0, .maxValue = 1, .ptr = (void*)sysVersion};
     // when adding parameters, set EDITABLE_VARS_LEN to max of .position
 
 #if (FEATURE_PRESSURESENSOR == 1)