SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Match tweaks to G33 from 1.1

Browse source
This commit is contained in:
Scott Lahteine 2017-11-04 18:19:14 -05:00
parent c07bbd4154
commit a22434508f
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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,
if (!_0p_calibration) { if (!_0p_calibration) {
if (!_7p_no_intermediates && !_7p_4_intermediates && !_7p_11_intermediates) { // probe the center if (!_7p_no_intermediates && !_7p_4_intermediates && !_7p_11_intermediates) { // probe the center
z_at_pt[CEN] +=
#if ENABLED(PROBE_MANUALLY) #if ENABLED(PROBE_MANUALLY)
z_at_pt[CEN] += lcd_probe_pt(0, 0); lcd_probe_pt(0, 0)
#else #else
z_at_pt[CEN] += probe_pt(dx, dy, stow_after_each, 1, false); probe_pt(dx, dy, stow_after_each, 1, false)
#endif #endif
;
} }
if (_7p_calibration) { // probe extra center points 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) { I_LOOP_CAL_PT(axis, start, steps) {
const float a = RADIANS(210 + (360 / NPP) * (axis - 1)), const float a = RADIANS(210 + (360 / NPP) * (axis - 1)),
r = delta_calibration_radius * 0.1; r = delta_calibration_radius * 0.1;
z_at_pt[CEN] +=
#if ENABLED(PROBE_MANUALLY) #if ENABLED(PROBE_MANUALLY)
z_at_pt[CEN] += lcd_probe_pt(cos(a) * r, sin(a) * r); lcd_probe_pt(cos(a) * r, sin(a) * r)
#else #else
z_at_pt[CEN] += probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1); probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1)
#endif #endif
;
} }
z_at_pt[CEN] /= float(_7p_2_intermediates ? 7 : probe_points); z_at_pt[CEN] /= float(_7p_2_intermediates ? 7 : probe_points);
} }