Single Z raise value for all tool-changing / parking (#12090)
* Universal tool-change Z lift * Add TOOLCHANGE_ZRAISE to example configs * Park/unpark changes to example configs * Implement DEBUG_DXC_MODE
This commit is contained in:
		
				
					committed by
					
						
						Scott Lahteine
					
				
			
			
				
	
			
			
			
						parent
						
							6bdbe3299e
						
					
				
				
					commit
					3ec3872730
				
			@@ -202,7 +202,6 @@
 | 
			
		||||
  #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600  // (mm/m)
 | 
			
		||||
  #define SINGLENOZZLE_SWAP_PRIME_SPEED   3600  // (mm/m)
 | 
			
		||||
  //#define SINGLENOZZLE_SWAP_PARK
 | 
			
		||||
  #define SINGLENOZZLE_TOOLCHANGE_ZRAISE     2  // (mm)
 | 
			
		||||
  #if ENABLED(SINGLENOZZLE_SWAP_PARK)
 | 
			
		||||
    #define SINGLENOZZLE_TOOLCHANGE_XY    { X_MIN_POS + 10, Y_MIN_POS + 10 }
 | 
			
		||||
    #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000  // (mm/m)
 | 
			
		||||
@@ -256,7 +255,6 @@
 | 
			
		||||
  #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250        // Delay (ms) for magnetic field. No delay if 0 or not defined.
 | 
			
		||||
  #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
 | 
			
		||||
  #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
 | 
			
		||||
  #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
 | 
			
		||||
  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
@@ -274,7 +272,6 @@
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_Y_SECURITY    10         // (mm) Security distance Y axis
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_Y_CLEAR       60         // (mm) Minimum distance from dock for unobstructed X axis
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_X_POS        { 215, 0 }  // (mm) X positions for parking the extruders
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5         // (mm) Z-raise before parking
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
@@ -1038,6 +1035,9 @@
 | 
			
		||||
#define Y_MAX_POS Y_BED_SIZE
 | 
			
		||||
#define Z_MAX_POS 500
 | 
			
		||||
 | 
			
		||||
// Z raise distance for tool-change, as needed for some extruders
 | 
			
		||||
#define TOOLCHANGE_ZRAISE     2  // (mm)
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Software Endstops
 | 
			
		||||
 *
 | 
			
		||||
 
 | 
			
		||||
@@ -385,10 +385,6 @@
 | 
			
		||||
  // This is the default power-up mode which can be later using M605.
 | 
			
		||||
  #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE
 | 
			
		||||
 | 
			
		||||
  // Default settings in "Auto-park Mode"
 | 
			
		||||
  #define TOOLCHANGE_PARK_ZLIFT   0.2      // the distance to raise Z axis when parking an extruder
 | 
			
		||||
  #define TOOLCHANGE_UNPARK_ZLIFT 1        // the distance to raise Z axis when unparking an extruder
 | 
			
		||||
 | 
			
		||||
  // Default x offset in duplication mode (typically set to half print bed width)
 | 
			
		||||
  #define DEFAULT_DUPLICATION_X_OFFSET 100
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -164,7 +164,6 @@
 | 
			
		||||
  #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600  // (mm/m)
 | 
			
		||||
  #define SINGLENOZZLE_SWAP_PRIME_SPEED   3600  // (mm/m)
 | 
			
		||||
  //#define SINGLENOZZLE_SWAP_PARK
 | 
			
		||||
  #define SINGLENOZZLE_TOOLCHANGE_ZRAISE     2  // (mm)
 | 
			
		||||
  #if ENABLED(SINGLENOZZLE_SWAP_PARK)
 | 
			
		||||
    #define SINGLENOZZLE_TOOLCHANGE_XY    { X_MIN_POS + 10, Y_MIN_POS + 10 }
 | 
			
		||||
    #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000  // (mm/m)
 | 
			
		||||
@@ -218,7 +217,6 @@
 | 
			
		||||
  #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250        // Delay (ms) for magnetic field. No delay if 0 or not defined.
 | 
			
		||||
  #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
 | 
			
		||||
  #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
 | 
			
		||||
  #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
 | 
			
		||||
  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
@@ -236,7 +234,6 @@
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_Y_SECURITY    10         // (mm) Security distance Y axis
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_Y_CLEAR       60         // (mm) Minimum distance from dock for unobstructed X axis
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_X_POS        { 215, 0 }  // (mm) X positions for parking the extruders
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5         // (mm) Z-raise before parking
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
@@ -984,6 +981,9 @@
 | 
			
		||||
  #define Z_MAX_POS 500
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// Z raise distance for tool-change, as needed for some extruders
 | 
			
		||||
#define TOOLCHANGE_ZRAISE     2  // (mm)
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Software Endstops
 | 
			
		||||
 *
 | 
			
		||||
 
 | 
			
		||||
@@ -389,10 +389,6 @@
 | 
			
		||||
  // This is the default power-up mode which can be later using M605.
 | 
			
		||||
  #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_AUTO_PARK_MODE
 | 
			
		||||
 | 
			
		||||
  // Default settings in "Auto-park Mode"
 | 
			
		||||
  #define TOOLCHANGE_PARK_ZLIFT   0.2      // the distance to raise Z axis when parking an extruder
 | 
			
		||||
  #define TOOLCHANGE_UNPARK_ZLIFT 1        // the distance to raise Z axis when unparking an extruder
 | 
			
		||||
 | 
			
		||||
  // Default x offset in duplication mode (typically set to half print bed width)
 | 
			
		||||
  #define DEFAULT_DUPLICATION_X_OFFSET 200
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -165,7 +165,6 @@
 | 
			
		||||
  #define SINGLENOZZLE_SWAP_RETRACT_SPEED 3600  // (mm/m)
 | 
			
		||||
  #define SINGLENOZZLE_SWAP_PRIME_SPEED   3600  // (mm/m)
 | 
			
		||||
  //#define SINGLENOZZLE_SWAP_PARK
 | 
			
		||||
  #define SINGLENOZZLE_TOOLCHANGE_ZRAISE     2  // (mm)
 | 
			
		||||
  #if ENABLED(SINGLENOZZLE_SWAP_PARK)
 | 
			
		||||
    #define SINGLENOZZLE_TOOLCHANGE_XY    { X_MIN_POS + 10, Y_MIN_POS + 10 }
 | 
			
		||||
    #define SINGLENOZZLE_PARK_XY_FEEDRATE 6000  // (mm/m)
 | 
			
		||||
@@ -219,7 +218,6 @@
 | 
			
		||||
  #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250        // Delay (ms) for magnetic field. No delay if 0 or not defined.
 | 
			
		||||
  #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
 | 
			
		||||
  #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
 | 
			
		||||
  #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
 | 
			
		||||
  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
@@ -237,7 +235,6 @@
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_Y_SECURITY    10         // (mm) Security distance Y axis
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_Y_CLEAR       60         // (mm) Minimum distance from dock for unobstructed X axis
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_X_POS        { 215, 0 }  // (mm) X positions for parking the extruders
 | 
			
		||||
  #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5         // (mm) Z-raise before parking
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
@@ -967,6 +964,9 @@
 | 
			
		||||
  #define Z_MAX_POS 500
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// Z raise distance for tool-change, as needed for some extruders
 | 
			
		||||
#define TOOLCHANGE_ZRAISE     2  // (mm)
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Software Endstops
 | 
			
		||||
 *
 | 
			
		||||
 
 | 
			
		||||
@@ -390,10 +390,6 @@
 | 
			
		||||
  // This is the default power-up mode which can be later using M605.
 | 
			
		||||
  #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_AUTO_PARK_MODE
 | 
			
		||||
 | 
			
		||||
  // Default settings in "Auto-park Mode"
 | 
			
		||||
  #define TOOLCHANGE_PARK_ZLIFT   0.2      // the distance to raise Z axis when parking an extruder
 | 
			
		||||
  #define TOOLCHANGE_UNPARK_ZLIFT 1        // the distance to raise Z axis when unparking an extruder
 | 
			
		||||
 | 
			
		||||
  // Default x offset in duplication mode (typically set to half print bed width)
 | 
			
		||||
  #define DEFAULT_DUPLICATION_X_OFFSET 200
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user