Browse Source

Match tweaks to G33 from 1.1

Scott Lahteine 7 years ago
parent
commit
a22434508f
1 changed files with 14 additions and 10 deletions
  1. 14
    10
      Marlin/src/gcode/calibrate/G33.cpp

+ 14
- 10
Marlin/src/gcode/calibrate/G33.cpp View File

@@ -163,11 +163,13 @@ static float probe_G33_points(float z_at_pt[NPP + 1], const int8_t probe_points,
163 163
   if (!_0p_calibration) {
164 164
 
165 165
     if (!_7p_no_intermediates && !_7p_4_intermediates && !_7p_11_intermediates) { // probe the center
166
-      #if ENABLED(PROBE_MANUALLY)
167
-        z_at_pt[CEN] += lcd_probe_pt(0, 0);
168
-      #else
169
-        z_at_pt[CEN] += probe_pt(dx, dy, stow_after_each, 1, false);
170
-      #endif
166
+      z_at_pt[CEN] +=
167
+        #if ENABLED(PROBE_MANUALLY)
168
+          lcd_probe_pt(0, 0)
169
+        #else
170
+          probe_pt(dx, dy, stow_after_each, 1, false)
171
+        #endif
172
+      ;
171 173
     }
172 174
 
173 175
     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,
176 178
       I_LOOP_CAL_PT(axis, start, steps) {
177 179
         const float a = RADIANS(210 + (360 / NPP) *  (axis - 1)),
178 180
                     r = delta_calibration_radius * 0.1;
179
-        #if ENABLED(PROBE_MANUALLY)
180
-          z_at_pt[CEN] += lcd_probe_pt(cos(a) * r, sin(a) * r);
181
-        #else
182
-          z_at_pt[CEN] += probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1);
183
-        #endif
181
+        z_at_pt[CEN] +=
182
+          #if ENABLED(PROBE_MANUALLY)
183
+            lcd_probe_pt(cos(a) * r, sin(a) * r)
184
+          #else
185
+            probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1)
186
+          #endif
187
+        ;
184 188
       }
185 189
       z_at_pt[CEN] /= float(_7p_2_intermediates ? 7 : probe_points);
186 190
     }

Loading…
Cancel
Save