From a22434508f98eead87560536aaec331cd8293a5a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 4 Nov 2017 18:19:14 -0500
Subject: [PATCH] Match tweaks to G33 from 1.1

---
 Marlin/src/gcode/calibrate/G33.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 037e133d99..3cf09fea57 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -163,11 +163,13 @@ static float probe_G33_points(float z_at_pt[NPP + 1], const int8_t probe_points,
   if (!_0p_calibration) {
 
     if (!_7p_no_intermediates && !_7p_4_intermediates && !_7p_11_intermediates) { // probe the center
-      #if ENABLED(PROBE_MANUALLY)
-        z_at_pt[CEN] += lcd_probe_pt(0, 0);
-      #else
-        z_at_pt[CEN] += probe_pt(dx, dy, stow_after_each, 1, false);
-      #endif
+      z_at_pt[CEN] +=
+        #if ENABLED(PROBE_MANUALLY)
+          lcd_probe_pt(0, 0)
+        #else
+          probe_pt(dx, dy, stow_after_each, 1, false)
+        #endif
+      ;
     }
 
     if (_7p_calibration) { // probe extra center points
@@ -176,11 +178,13 @@ static float probe_G33_points(float z_at_pt[NPP + 1], const int8_t probe_points,
       I_LOOP_CAL_PT(axis, start, steps) {
         const float a = RADIANS(210 + (360 / NPP) *  (axis - 1)),
                     r = delta_calibration_radius * 0.1;
-        #if ENABLED(PROBE_MANUALLY)
-          z_at_pt[CEN] += lcd_probe_pt(cos(a) * r, sin(a) * r);
-        #else
-          z_at_pt[CEN] += probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1);
-        #endif
+        z_at_pt[CEN] +=
+          #if ENABLED(PROBE_MANUALLY)
+            lcd_probe_pt(cos(a) * r, sin(a) * r)
+          #else
+            probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1)
+          #endif
+        ;
       }
       z_at_pt[CEN] /= float(_7p_2_intermediates ? 7 : probe_points);
     }