Merge upstream changes from Marlin 2.1.2.1

2023-05-26 18:48:34 +02:00
parent 22dedaeb81
commit f92a587638
620 changed files with 41015 additions and 28889 deletions
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -843,11 +843,13 @@ namespace ExtUI {
  #endif // BABYSTEPPING

  float getZOffset_mm() {
-    return (0.0f
+    return (
      #if HAS_BED_PROBE
-        + probe.offset.z
+        probe.offset.z
      #elif ENABLED(BABYSTEP_DISPLAY_TOTAL)
-        + planner.mm_per_step[Z_AXIS] * babystep.axis_total[BS_AXIS_IND(Z_AXIS)]
+        planner.mm_per_step[Z_AXIS] * babystep.axis_total[BS_AXIS_IND(Z_AXIS)]
+      #else
+        0.0f
      #endif
    );
  }