From 955971486b5c53b93b7ac9447dee3379bb6d6aef Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Mon, 15 Jun 2020 17:26:09 -0400 Subject: [PATCH] Fix toolchange compile error (#18312) --- Marlin/src/module/tool_change.cpp | 10 ++++++---- buildroot/share/tests/STM32F103RC_fysetc-tests | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index 36830f2c6e..8aa367555d 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -967,10 +967,12 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) { if (ENABLED(SINGLENOZZLE)) { active_extruder = new_tool; return; } } else { - // If first new tool, toolchange without unloading the old not initialized 'Just prime/init the new' - if (first_tool_is_primed) - unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed)); - first_tool_is_primed = true; // The first new tool will be primed by toolchanging + #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED) + // For first new tool, change without unloading the old. 'Just prime/init the new' + if (first_tool_is_primed) + unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed)); + first_tool_is_primed = true; // The first new tool will be primed by toolchanging + #endif } } #endif diff --git a/buildroot/share/tests/STM32F103RC_fysetc-tests b/buildroot/share/tests/STM32F103RC_fysetc-tests index 7d08fb7c58..dfa85d9bb6 100644 --- a/buildroot/share/tests/STM32F103RC_fysetc-tests +++ b/buildroot/share/tests/STM32F103RC_fysetc-tests @@ -9,7 +9,7 @@ set -e # # Build with the default configurations # -use_example_configs "FYSETC/Cheetah 1.2/base" +use_example_configs "Creality/Ender-3/FYSETC Cheetah 1.2/base" exec_test $1 $2 "Cheetah 1.2 Configuration" # clean up