melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix toolchange compile error (#18312)

Browse Source
This commit is contained in:
InsanityAutomation 2020-06-15 17:26:09 -04:00 committed by GitHub
parent fc99665c01
commit 955971486b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/module/tool_change.cpp
View File

@ -967,10 +967,12 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
if (ENABLED(SINGLENOZZLE)) { active_extruder = new_tool; return; } if (ENABLED(SINGLENOZZLE)) { active_extruder = new_tool; return; }
} }
else { else {
// If first new tool, toolchange without unloading the old not initialized 'Just prime/init the new' #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
if (first_tool_is_primed) // For first new tool, change without unloading the old. 'Just prime/init the new'
unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed)); if (first_tool_is_primed)
first_tool_is_primed = true; // The first new tool will be primed by toolchanging 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 #endif

2
buildroot/share/tests/STM32F103RC_fysetc-tests
View File

@ -9,7 +9,7 @@ set -e
# #
# Build with the default configurations # 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" exec_test $1 $2 "Cheetah 1.2 Configuration"
# clean up # clean up