瀏覽代碼

Patch for BLTOUCH_HEATERS_OFF

Scott Lahteine 8 年之前
父節點
當前提交
4f74c416a4
共有 1 個文件被更改,包括 6 次插入4 次删除
  1. 6
    4
      Marlin/Marlin_main.cpp

+ 6
- 4
Marlin/Marlin_main.cpp 查看文件

@@ -2080,7 +2080,7 @@ static void clean_up_after_endstop_or_probe_move() {
2080 2080
     #if ENABLED(BLTOUCH_HEATERS_OFF)
2081 2081
 
2082 2082
       void set_heaters_for_bltouch(const bool deploy) {
2083
-        static int8_t heaters_were_disabled = 0;
2083
+        static bool heaters_were_disabled = false;
2084 2084
         static millis_t next_emi_protection;
2085 2085
         static float temps_at_entry[HOTENDS];
2086 2086
 
@@ -2111,6 +2111,7 @@ static void clean_up_after_endstop_or_probe_move() {
2111 2111
             thermalManager.setTargetBed(bed_temp_at_entry);
2112 2112
           #endif
2113 2113
         }
2114
+        heaters_were_disabled = deploy;
2114 2115
       }
2115 2116
 
2116 2117
     #endif // BLTOUCH_HEATERS_OFF
@@ -12263,9 +12264,10 @@ void setup() {
12263 12264
   #endif
12264 12265
 
12265 12266
   #if ENABLED(BLTOUCH)
12266
-    bltouch_command(BLTOUCH_RESET);    // Just in case the BLTouch is in the error state, try to
12267
-    set_bltouch_deployed(true);        // reset it. Also needs to deploy and stow to clear the
12268
-    set_bltouch_deployed(false);       // error condition.
12267
+    // Make sure any BLTouch error condition is cleared
12268
+    bltouch_command(BLTOUCH_RESET);
12269
+    set_bltouch_deployed(true);
12270
+    set_bltouch_deployed(false);
12269 12271
   #endif
12270 12272
 
12271 12273
   #if ENABLED(EXPERIMENTAL_I2CBUS) && I2C_SLAVE_ADDRESS > 0

Loading…
取消
儲存