CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6549 from thinkyhead/rc_bltouch_refix

Browse Source 
Fix BLTOUCH_HEATERS_OFF bug
This commit is contained in:
Scott Lahteine 2017-05-02 21:53:09 -05:00 committed by GitHub
commit fc857c5b78
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View File

@ -2079,7 +2079,7 @@ static void clean_up_after_endstop_or_probe_move() {
void set_heaters_for_bltouch(const bool deploy) { void set_heaters_for_bltouch(const bool deploy) {
static bool heaters_were_disabled = false; static bool heaters_were_disabled = false;
static millis_t next_emi_protection; static millis_t next_emi_protection = 0;
static float temps_at_entry[HOTENDS]; static float temps_at_entry[HOTENDS];
#if HAS_TEMP_BED #if HAS_TEMP_BED
@ -2131,7 +2131,9 @@ static void clean_up_after_endstop_or_probe_move() {
#if ENABLED(BLTOUCH_HEATERS_OFF) #if ENABLED(BLTOUCH_HEATERS_OFF)
set_heaters_for_bltouch(deploy); set_heaters_for_bltouch(deploy);
#endif #endif
bltouch_command(deploy ? BLTOUCH_DEPLOY : BLTOUCH_STOW); bltouch_command(deploy ? BLTOUCH_DEPLOY : BLTOUCH_STOW);
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("set_bltouch_deployed(", deploy); SERIAL_ECHOPAIR("set_bltouch_deployed(", deploy);
@ -2155,10 +2157,6 @@ static void clean_up_after_endstop_or_probe_move() {
if (endstops.z_probe_enabled == deploy) return false; if (endstops.z_probe_enabled == deploy) return false;
#if ENABLED(BLTOUCH) && ENABLED(BLTOUCH_HEATERS_OFF)
set_heaters_for_bltouch(deploy);
#endif
// Make room for probe // Make room for probe
do_probe_raise(_Z_CLEARANCE_DEPLOY_PROBE); do_probe_raise(_Z_CLEARANCE_DEPLOY_PROBE);