BLTouch v3 / 3DTouch Interoperability & performance (#13814)

Marlin/src/module/endstops.cpp

@@ -40,6 +40,10 @@
   #include "printcounter.h" // for print_job_timer
 #endif
 
+#if ENABLED(BLTOUCH)
+  #include "../feature/bltouch.h"
+#endif
+
 Endstops endstops;
 
 // private:
@@ -381,6 +385,9 @@ static void print_es_state(const bool is_hit, PGM_P const label=NULL) {
 }
 
 void _O2 Endstops::M119() {
+  #if ENABLED(BLTOUCH)
+    bltouch._set_SW_mode();
+  #endif
   SERIAL_ECHOLNPGM(MSG_M119_REPORT);
   #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(MSG_##S))
   #if HAS_X_MIN
@@ -457,6 +464,10 @@ void _O2 Endstops::M119() {
       }
     #endif
   #endif
+  #if ENABLED(BLTOUCH)
+    bltouch._reset();
+    if (enabled_globally) bltouch._stow();
+  #endif
 } // Endstops::M119
 
 // The following routines are called from an ISR context. It could be the temperature ISR, the

Marlin/src/module/probe.cpp

@@ -283,7 +283,7 @@ float zprobe_zoffset; // Initialized by settings.load()
     #endif
     #if ENABLED(PROBING_STEPPERS_OFF)
       disable_e_steppers();
-      #if DISABLED(DELTA)
+      #if DISABLED(DELTA, HOME_AFTER_DEACTIVATE)
         disable_X(); disable_Y();
       #endif
     #endif