Fix G28 with non-BLTouch probes (#14381)
This commit is contained in:
		
				
					committed by
					
						
						Scott Lahteine
					
				
			
			
				
	
			
			
			
						parent
						
							aa0383a83b
						
					
				
				
					commit
					5986194c36
				
			@@ -43,10 +43,6 @@
 | 
			
		||||
  #include "../../module/probe.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if ENABLED(BLTOUCH)
 | 
			
		||||
  #include "../../feature/bltouch.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#include "../../lcd/ultralcd.h"
 | 
			
		||||
 | 
			
		||||
#if HAS_DRIVER(L6470)                         // set L6470 absolute position registers to counts
 | 
			
		||||
@@ -266,6 +262,10 @@ void GcodeSuite::G28(const bool always_home_all) {
 | 
			
		||||
 | 
			
		||||
    set_destination_from_current();
 | 
			
		||||
 | 
			
		||||
    #if HAS_BED_PROBE
 | 
			
		||||
      STOW_PROBE();
 | 
			
		||||
    #endif
 | 
			
		||||
 | 
			
		||||
    #if Z_HOME_DIR > 0  // If homing away from BED do Z first
 | 
			
		||||
 | 
			
		||||
      if (doZ) homeaxis(Z_AXIS);
 | 
			
		||||
@@ -345,9 +345,6 @@ void GcodeSuite::G28(const bool always_home_all) {
 | 
			
		||||
    // Home Z last if homing towards the bed
 | 
			
		||||
    #if Z_HOME_DIR < 0
 | 
			
		||||
      if (doZ) {
 | 
			
		||||
        #if ENABLED(BLTOUCH)
 | 
			
		||||
          bltouch.init();
 | 
			
		||||
        #endif
 | 
			
		||||
        #if ENABLED(Z_SAFE_HOMING)
 | 
			
		||||
          home_z_safely();
 | 
			
		||||
        #else
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user