bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Patch G33 misuse of PROBE_MANUALLY

Browse Source
This commit is contained in:
Scott Lahteine
2017-11-07 19:34:34 -06:00
parent 064e6fe60e
commit 82f45c3e6a
8 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Marlin/src/gcode/calibrate/G33.cpp
View File

@ -153,7 +153,7 @@ static float probe_G33_points(float z_at_pt[NPP + 1], const int8_t probe_points,
_7p_6_centre = probe_points >= 5 && probe_points <= 7,
_7p_9_centre = probe_points >= 8;
#if DISABLED(PROBE_MANUALLY)
#if HAS_BED_PROBE
const float dx = (X_PROBE_OFFSET_FROM_EXTRUDER),
dy = (Y_PROBE_OFFSET_FROM_EXTRUDER);
#endif
@ -164,10 +164,10 @@ static float probe_G33_points(float z_at_pt[NPP + 1], const int8_t probe_points,
if (!_7p_no_intermediates && !_7p_4_intermediates && !_7p_11_intermediates) { // probe the center
z_at_pt[CEN] +=
#if ENABLED(PROBE_MANUALLY)
lcd_probe_pt(0, 0)
#else
#if HAS_BED_PROBE
probe_pt(dx, dy, stow_after_each, 1, false)
#else
lcd_probe_pt(0, 0)
#endif
;
}
@ -179,10 +179,10 @@ static float probe_G33_points(float z_at_pt[NPP + 1], const int8_t probe_points,
const float a = RADIANS(210 + (360 / NPP) * (axis - 1)),
r = delta_calibration_radius * 0.1;
z_at_pt[CEN] +=
#if ENABLED(PROBE_MANUALLY)
lcd_probe_pt(cos(a) * r, sin(a) * r)
#else
#if HAS_BED_PROBE
probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1)
#else
lcd_probe_pt(cos(a) * r, sin(a) * r)
#endif
;
}
@ -208,10 +208,10 @@ static float probe_G33_points(float z_at_pt[NPP + 1], const int8_t probe_points,
r = delta_calibration_radius * (1 + 0.1 * (zig_zag ? circle : - circle)),
interpol = FMOD(axis, 1);
const float z_temp =
#if ENABLED(PROBE_MANUALLY)
lcd_probe_pt(cos(a) * r, sin(a) * r)
#else
#if HAS_BED_PROBE
probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1)
#else
lcd_probe_pt(cos(a) * r, sin(a) * r)
#endif
;
// split probe point to neighbouring calibration points
@ -242,7 +242,7 @@ static float probe_G33_points(float z_at_pt[NPP + 1], const int8_t probe_points,
return 0.00001;
}
#if DISABLED(PROBE_MANUALLY)
#if HAS_BED_PROBE
static void G33_auto_tune() {
float z_at_pt[NPP + 1] = { 0.0 },
@ -366,7 +366,7 @@ static float probe_G33_points(float z_at_pt[NPP + 1], const int8_t probe_points,
SERIAL_EOL();
}
#endif // !PROBE_MANUALLY
#endif // HAS_BED_PROBE
/**
* G33 - Delta '1-4-7-point' Auto-Calibration
@ -488,10 +488,10 @@ void GcodeSuite::G33() {
}
if (auto_tune) {
#if ENABLED(PROBE_MANUALLY)
SERIAL_PROTOCOLLNPGM("A probe is needed for auto-tune");
#else
#if HAS_BED_PROBE
G33_auto_tune();
#else
SERIAL_PROTOCOLLNPGM("A probe is needed for auto-tune");
#endif
G33_CLEANUP();
return;
@ -556,7 +556,7 @@ void GcodeSuite::G33() {
#define Z2(I) ZP(2, I)
#define Z1(I) ZP(1, I)
#if ENABLED(PROBE_MANUALLY)
#if !HAS_BED_PROBE
test_precision = 0.00; // forced end
#endif
@ -638,7 +638,7 @@ void GcodeSuite::G33() {
if ((zero_std_dev >= test_precision && iterations > force_iterations) || zero_std_dev <= calibration_precision) { // end iterations
SERIAL_PROTOCOLPGM("Calibration OK");
SERIAL_PROTOCOL_SP(32);
#if DISABLED(PROBE_MANUALLY)
#if HAS_BED_PROBE
if (zero_std_dev >= test_precision && !_1p_calibration)
SERIAL_PROTOCOLPGM("rolling back.");
else

2
Marlin/src/gcode/gcode.h
View File

@ -379,7 +379,7 @@ private:
#endif
#endif
#if PROBE_SELECTED && ENABLED(DELTA_AUTO_CALIBRATION)
#if ENABLED(DELTA_AUTO_CALIBRATION)
static void G33();
#endif