Restore SMOOTH_ENCODER_MENUITEMS functionality for release version

Fix DEF_PROBEZFIX conditional compile
mriscoc · Oct 23, 2024 · 78c615a · 78c615a
1 parent 404e13a
commit 78c615a
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 1 deletion.
diff --git a/Marlin/lib/proui/stm32f1/libproui_abl_dwin.a b/Marlin/lib/proui/stm32f1/libproui_abl_dwin.a
diff --git a/Marlin/lib/proui/stm32f1/libproui_abl_ultipanel.a b/Marlin/lib/proui/stm32f1/libproui_abl_ultipanel.a
diff --git a/Marlin/lib/proui/stm32f1/libproui_mbl_dwin.a b/Marlin/lib/proui/stm32f1/libproui_mbl_dwin.a
diff --git a/Marlin/lib/proui/stm32f1/libproui_mbl_ultipanel.a b/Marlin/lib/proui/stm32f1/libproui_mbl_ultipanel.a
diff --git a/Marlin/lib/proui/stm32f1/libproui_ubl_dwin.a b/Marlin/lib/proui/stm32f1/libproui_ubl_dwin.a
diff --git a/Marlin/lib/proui/stm32f1/libproui_ubl_ultipanel.a b/Marlin/lib/proui/stm32f1/libproui_ubl_ultipanel.a
diff --git a/Marlin/lib/proui/stm32f4/libproui_abl_dwin.a b/Marlin/lib/proui/stm32f4/libproui_abl_dwin.a
diff --git a/Marlin/lib/proui/stm32f4/libproui_mbl_dwin.a b/Marlin/lib/proui/stm32f4/libproui_mbl_dwin.a
diff --git a/Marlin/lib/proui/stm32f4/libproui_ubl_dwin.a b/Marlin/lib/proui/stm32f4/libproui_ubl_dwin.a
diff --git a/Marlin/lib/proui/stm32g0/libproui_abl_dwin.a b/Marlin/lib/proui/stm32g0/libproui_abl_dwin.a
diff --git a/Marlin/lib/proui/stm32g0/libproui_mbl_dwin.a b/Marlin/lib/proui/stm32g0/libproui_mbl_dwin.a
diff --git a/Marlin/lib/proui/stm32g0/libproui_ubl_dwin.a b/Marlin/lib/proui/stm32g0/libproui_ubl_dwin.a
diff --git a/Marlin/src/lcd/e3v2/common/encoder.cpp b/Marlin/src/lcd/e3v2/common/encoder.cpp
@@ -175,6 +175,8 @@ EncoderState encoderReceiveAnalyze() {
   return temp_diffState;
 }
 
+EncoderState get_encoder_menuitems() { return TERN(SMOOTH_ENCODER_MENUITEMS, get_encoder_state(), encoderReceiveAnalyze()); }
+
 #if PIN_EXISTS(LCD_LED)
 
   // Take the low 24 valid bits  24Bit: G7 G6 G5 G4 G3 G2 G1 G0 R7 R6 R5 R4 R3 R2 R1 R0 B7 B6 B5 B4 B3 B2 B1 B0

diff --git a/Marlin/src/lcd/e3v2/common/encoder.h b/Marlin/src/lcd/e3v2/common/encoder.h
@@ -53,6 +53,9 @@ void encoderConfiguration();
 // Analyze encoder value and return state
 EncoderState encoderReceiveAnalyze();
 
+// Smooth encoder state for menu items
+EncoderState get_encoder_menuitems();
+
 inline EncoderState get_encoder_state() {
   static millis_t Encoder_ms = 0;
   const millis_t ms = millis();

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
@@ -3307,7 +3307,11 @@ void MarlinSettings::reset() {
       #endif
     #endif
     #if HAS_BED_PROBE
-      PRO_data.probezfix = TERN0(DEF_PROBEZFIX, DEF_PROBEZFIX);
+      #ifdef DEF_PROBEZFIX
+        PRO_data.probezfix = DEF_PROBEZFIX;
+      #else 
+        PRO_data.probezfix = 0;
+      #endif
       PRO_data.zprobefeedslow = DEF_Z_PROBE_FEEDRATE_SLOW;
       PRO_data.multiple_probing = MULTIPLE_PROBING;
     #endif