bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Various fixups for single-nozzle filament swap (#12036)

Browse Source
This commit is contained in:
InsanityAutomation
2018-10-08 16:39:55 -04:00
committed by Scott Lahteine
parent 8dbb305e8e
commit ee253991d4
81 changed files with 417 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Marlin/src/inc/Conditionals_post.h
View File

@ -1513,28 +1513,6 @@
// Add commands that need sub-codes to this list
#define USE_GCODE_SUBCODES ENABLED(G38_PROBE_TARGET) || ENABLED(CNC_COORDINATE_SYSTEMS) || ENABLED(POWER_LOSS_RECOVERY)
// Single Nozzle swap on toolchange defaults
#if ENABLED(SINGLENOZZLE)
#ifndef SINGLENOZZLE_SWAP_LENGTH
#define SINGLENOZZLE_SWAP_LENGTH 0
#endif
#ifndef SINGLENOZZLE_SWAP_RETRACT_SPEED
#define SINGLENOZZLE_SWAP_RETRACT_SPEED 60.0
#endif
#ifndef SINGLENOZZLE_SWAP_PRIME_SPEED
#define SINGLENOZZLE_SWAP_PRIME_SPEED 60.0
#endif
#if ENABLED(SINGLENOZZLE_SWAP_PARK)
#ifndef SINGLENOZZLE_TOOLCHANGE_POSITION
#define SINGLENOZZLE_TOOLCHANGE_POSITION { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 }
#endif
#else
#ifndef SINGLENOZZLE_TOOLCHANGE_ZRAISE
#define SINGLENOZZLE_TOOLCHANGE_ZRAISE 2.0
#endif
#endif
#endif
// Parking Extruder
#if ENABLED(PARKING_EXTRUDER)
#ifndef PARKING_EXTRUDER_GRAB_DISTANCE

21
Marlin/src/inc/SanityCheck.h
View File

@ -602,8 +602,25 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
#error "EXTRUDERS must be 1 with HEATERS_PARALLEL."
#endif
#if ENABLED(SINGLENOZZLE) && !defined(SINGLENOZZLE_SWAP_LENGTH)
#define SINGLENOZZLE_SWAP_LENGTH 0
#if ENABLED(SINGLENOZZLE)
#ifndef SINGLENOZZLE_SWAP_LENGTH
#error "SINGLENOZZLE requires SINGLENOZZLE_SWAP_LENGTH. Please update your Configuration."
#elif !defined(SINGLENOZZLE_SWAP_RETRACT_SPEED)
#error "SINGLENOZZLE requires SINGLENOZZLE_SWAP_RETRACT_SPEED. Please update your Configuration."
#elif !defined(SINGLENOZZLE_SWAP_PRIME_SPEED)
#error "SINGLENOZZLE requires SINGLENOZZLE_SWAP_PRIME_SPEED. Please update your Configuration."
#endif
#if ENABLED(SINGLENOZZLE_SWAP_PARK)
#ifndef SINGLENOZZLE_TOOLCHANGE_POSITION
#error "SINGLENOZZLE_SWAP_PARK requires SINGLENOZZLE_TOOLCHANGE_POSITION. Please update your Configuration."
#elif !defined(SINGLENOZZLE_PARK_XY_FEEDRATE)
#error "SINGLENOZZLE_SWAP_PARK requires SINGLENOZZLE_PARK_XY_FEEDRATE. Please update your Configuration."
#endif
#else
#ifndef SINGLENOZZLE_TOOLCHANGE_ZRAISE
#error "SINGLENOZZLE requires SINGLENOZZLE_TOOLCHANGE_ZRAISE. Please update your Configuration."
#endif
#endif
#endif
#elif ENABLED(MK2_MULTIPLEXER)