Allow BL-Touch users to control heaters during probe event (#6485)
The Configuration.h file entries for BL-Touch have been updated to: ```cpp //#define BLTOUCH //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed //#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event ```
This commit is contained in:
parent
6e8ecb908a
commit
4075b95519
|
@ -577,6 +577,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -2067,10 +2067,11 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
|
|
||||||
//
|
//
|
||||||
// The BL-Touch probes have a HAL effect sensor. The high currents switching
|
// The BL-Touch probes have a HAL effect sensor. The high currents switching
|
||||||
// on and off cause big magnetic fields that can affect the reliability of the
|
// on and off cause big magnetic fields that can affect the repeatability of the
|
||||||
// sensor. So, for BL-Touch probes, we turn off the heaters during the actual probe.
|
// sensor. So, for BL-Touch probes, we turn off the heaters during the actual probe.
|
||||||
// And then we quickly turn them back on after we have sampled the point
|
// And then we quickly turn them back on after we have sampled the point
|
||||||
//
|
//
|
||||||
|
#if ENABLED(BLTOUCH_HEATERS_OFF)
|
||||||
void turn_heaters_on_or_off_for_bltouch(const bool deploy) {
|
void turn_heaters_on_or_off_for_bltouch(const bool deploy) {
|
||||||
static int8_t bltouch_recursion_cnt=0;
|
static int8_t bltouch_recursion_cnt=0;
|
||||||
static millis_t last_emi_protection=0;
|
static millis_t last_emi_protection=0;
|
||||||
|
@ -2105,9 +2106,12 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void set_bltouch_deployed(const bool deploy) {
|
void set_bltouch_deployed(const bool deploy) {
|
||||||
|
#if ENABLED(BLTOUCH_HEATERS_OFF)
|
||||||
turn_heaters_on_or_off_for_bltouch(deploy);
|
turn_heaters_on_or_off_for_bltouch(deploy);
|
||||||
|
#endif
|
||||||
if (deploy && TEST_BLTOUCH()) { // If BL-Touch says it's triggered
|
if (deploy && TEST_BLTOUCH()) { // If BL-Touch says it's triggered
|
||||||
bltouch_command(BLTOUCH_RESET); // try to reset it.
|
bltouch_command(BLTOUCH_RESET); // try to reset it.
|
||||||
bltouch_command(BLTOUCH_DEPLOY); // Also needs to deploy and stow to
|
bltouch_command(BLTOUCH_DEPLOY); // Also needs to deploy and stow to
|
||||||
|
@ -2143,8 +2147,10 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(BLTOUCH)
|
#if ENABLED(BLTOUCH)
|
||||||
|
#if ENABLED(BLTOUCH_HEATERS_OFF)
|
||||||
turn_heaters_on_or_off_for_bltouch(deploy);
|
turn_heaters_on_or_off_for_bltouch(deploy);
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
if (endstops.z_probe_enabled == deploy) return false;
|
if (endstops.z_probe_enabled == deploy) return false;
|
||||||
|
|
||||||
|
|
|
@ -576,6 +576,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -560,6 +560,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -560,6 +560,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -580,6 +580,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -568,6 +568,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -571,6 +571,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -606,6 +606,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -577,6 +577,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -577,6 +577,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -577,6 +577,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -576,6 +576,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -592,6 +592,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -597,6 +597,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -628,6 +628,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -568,6 +568,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -577,6 +577,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -651,6 +651,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -652,6 +652,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -641,6 +641,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -634,6 +634,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -635,6 +635,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -654,6 +654,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -591,6 +591,7 @@
|
||||||
*/
|
*/
|
||||||
#define BLTOUCH
|
#define BLTOUCH
|
||||||
#define BLTOUCH_DELAY 500 // (ms) Enable and increase if needed
|
#define BLTOUCH_DELAY 500 // (ms) Enable and increase if needed
|
||||||
|
#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -580,6 +580,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -573,6 +573,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
|
@ -582,6 +582,7 @@
|
||||||
*/
|
*/
|
||||||
//#define BLTOUCH
|
//#define BLTOUCH
|
||||||
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
|
||||||
|
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are turned off during probe event
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
* BLTouch WARNING - ONLY APPLIES TO VERSIONS OF MARLIN BEFORE 15 FEB 2017
|
||||||
|
|
Loading…
Reference in a new issue