diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp index a8cc78308dee359137b3b6f7e70ebfa9dddd5d05..57a38963f942fa51c4b398eaa8d30882b5fd7221 100644 --- a/Marlin/src/Marlin.cpp +++ b/Marlin/src/Marlin.cpp @@ -146,7 +146,7 @@ #include "feature/fanmux.h" #endif -#if (ENABLED(SWITCHING_EXTRUDER) && !DONT_SWITCH) || ENABLED(SWITCHING_NOZZLE) || ENABLED(PARKING_EXTRUDER) +#if DO_SWITCH_EXTRUDER || ENABLED(SWITCHING_NOZZLE) || ENABLED(PARKING_EXTRUDER) #include "module/tool_change.h" #endif @@ -864,7 +864,7 @@ void setup() { setup_endstop_interrupts(); #endif - #if ENABLED(SWITCHING_EXTRUDER) && !DONT_SWITCH + #if DO_SWITCH_EXTRUDER move_extruder_servo(0); // Initialize extruder servo #endif diff --git a/Marlin/src/gcode/config/M218.cpp b/Marlin/src/gcode/config/M218.cpp index 69452e347ca7df2cd591dff0ff3b63567d82ce7d..c68c297f52df0427b6ce014cea24b9d61fe30bb7 100644 --- a/Marlin/src/gcode/config/M218.cpp +++ b/Marlin/src/gcode/config/M218.cpp @@ -37,7 +37,7 @@ * T<tool> * X<xoffset> * Y<yoffset> - * Z<zoffset> - Available with DUAL_X_CARRIAGE and SWITCHING_NOZZLE + * Z<zoffset> - Available with DUAL_X_CARRIAGE, SWITCHING_NOZZLE and PARKING_EXTRUDER */ void GcodeSuite::M218() { if (get_target_extruder_from_command() || target_extruder == 0) return; diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index a9e4fd7333ffb39424a0315358964150a51cd363..9d414ee41b9a00d773db695e22deb210342036eb 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -445,6 +445,8 @@ #define E_MANUAL EXTRUDERS #endif +#define DO_SWITCH_EXTRUDER (ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR)) + /** * DISTINCT_E_FACTORS affects how some E factors are accessed */ diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index a6802f386f16de9213430867e58a3f4b3e5dcbaa..f456ad3adefc8a54da5e49d583ca76a7013f3393 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -3270,7 +3270,7 @@ void lcd_quick_feedback(const bool clear_buttons) { else MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28")); - #if ENABLED(SWITCHING_EXTRUDER) + #if ENABLED(SWITCHING_EXTRUDER) || ENABLED(SWITCHING_NOZZLE) #if EXTRUDERS == 4 switch (active_extruder) { diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index 4c7aa664f90b135bb84f69a7ebced2bbc62850ff..483775baaf082da282898f32ff5f8f37e56bb833 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -2126,7 +2126,7 @@ void MarlinSettings::reset(PORTARG_SOLO) { SERIAL_ECHOPAIR_P(port, " M218 T", (int)e); SERIAL_ECHOPAIR_P(port, " X", LINEAR_UNIT(hotend_offset[X_AXIS][e])); SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(hotend_offset[Y_AXIS][e])); - #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(SWITCHING_NOZZLE) ||ENABLED(PARKING_EXTRUDER) + #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(SWITCHING_NOZZLE) || ENABLED(PARKING_EXTRUDER) SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(hotend_offset[Z_AXIS][e])); #endif SERIAL_EOL_P(port); diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index 2701a7707eb598dabdcf6959e7d8f547aa744f2c..ee8659e1284d20e0b6bd41acec1b2aebfeef17ee 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -57,7 +57,7 @@ #include "../feature/fanmux.h" #endif -#if ENABLED(SWITCHING_EXTRUDER) +#if DO_SWITCH_EXTRUDER #if EXTRUDERS > 3 #define REQ_ANGLES 4 @@ -347,8 +347,6 @@ inline void invalid_extruder_error(const uint8_t e) { #endif // DUAL_X_CARRIAGE -#define DO_SWITCH_EXTRUDER (SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR) - /** * Perform a tool-change, which may result in moving the * previous tool out of the way and the new tool into place. diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h index a464085d446eb3489d02511e7feaf25b2dfee3a7..53da00d1785363ac4c7764d684d811598610b565 100644 --- a/Marlin/src/module/tool_change.h +++ b/Marlin/src/module/tool_change.h @@ -25,7 +25,7 @@ #include "../inc/MarlinConfig.h" -#if ENABLED(SWITCHING_EXTRUDER) +#if DO_SWITCH_EXTRUDER void move_extruder_servo(const uint8_t e); #endif