|
|
|
@ -2116,9 +2116,9 @@ static void clean_up_after_endstop_or_probe_move() {
|
|
|
|
|
bltouch_command(BLTOUCH_RESET); // try to reset it.
|
|
|
|
|
bltouch_command(BLTOUCH_DEPLOY); // Also needs to deploy and stow to
|
|
|
|
|
bltouch_command(BLTOUCH_STOW); // clear the triggered condition.
|
|
|
|
|
safe_delay(1500); // wait for internal self test to complete
|
|
|
|
|
// measured completion time was 0.65 seconds
|
|
|
|
|
// after reset, deploy & stow sequence
|
|
|
|
|
safe_delay(1500); // Wait for internal self-test to complete.
|
|
|
|
|
// (Measured completion time was 0.65 seconds
|
|
|
|
|
// after reset, deploy, and stow sequence)
|
|
|
|
|
if (TEST_BLTOUCH()) { // If it still claims to be triggered...
|
|
|
|
|
SERIAL_ERROR_START;
|
|
|
|
|
SERIAL_ERRORLNPGM(MSG_STOP_BLTOUCH);
|
|
|
|
@ -2328,15 +2328,15 @@ static void clean_up_after_endstop_or_probe_move() {
|
|
|
|
|
return current_position[Z_AXIS] + zprobe_zoffset;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// - Move to the given XY
|
|
|
|
|
// - Deploy the probe, if not already deployed
|
|
|
|
|
// - Probe the bed, get the Z position
|
|
|
|
|
// - Depending on the 'stow' flag
|
|
|
|
|
// - Stow the probe, or
|
|
|
|
|
// - Raise to the BETWEEN height
|
|
|
|
|
// - Return the probed Z position
|
|
|
|
|
//
|
|
|
|
|
/**
|
|
|
|
|
* - Move to the given XY
|
|
|
|
|
* - Deploy the probe, if not already deployed
|
|
|
|
|
* - Probe the bed, get the Z position
|
|
|
|
|
* - Depending on the 'stow' flag
|
|
|
|
|
* - Stow the probe, or
|
|
|
|
|
* - Raise to the BETWEEN height
|
|
|
|
|
* - Return the probed Z position
|
|
|
|
|
*/
|
|
|
|
|
float probe_pt(const float x, const float y, const bool stow/*=true*/, const int verbose_level/*=1*/) {
|
|
|
|
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
|
|
|
|
if (DEBUGGING(LEVELING)) {
|
|
|
|
@ -2505,14 +2505,14 @@ static void clean_up_after_endstop_or_probe_move() {
|
|
|
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(MESH_BED_LEVELING)
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// Enable if you prefer your output in JSON format
|
|
|
|
|
// suitable for SCAD or JavaScript mesh visualizers.
|
|
|
|
|
//
|
|
|
|
|
// Visualize meshes in OpenSCAD using the included script.
|
|
|
|
|
//
|
|
|
|
|
// buildroot/shared/scripts/MarlinMesh.scad
|
|
|
|
|
//
|
|
|
|
|
/**
|
|
|
|
|
* Enable to produce output in JSON format suitable
|
|
|
|
|
* for SCAD or JavaScript mesh visualizers.
|
|
|
|
|
*
|
|
|
|
|
* Visualize meshes in OpenSCAD using the included script.
|
|
|
|
|
*
|
|
|
|
|
* buildroot/shared/scripts/MarlinMesh.scad
|
|
|
|
|
*/
|
|
|
|
|
//#define SCAD_MESH_OUTPUT
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|