Browse Source

Fix toolchange compile error (#18312)

InsanityAutomation 4 years ago
parent
commit
955971486b
No account linked to committer's email address

+ 6
- 4
Marlin/src/module/tool_change.cpp View File

967
             if (ENABLED(SINGLENOZZLE)) { active_extruder = new_tool; return; }
967
             if (ENABLED(SINGLENOZZLE)) { active_extruder = new_tool; return; }
968
           }
968
           }
969
           else {
969
           else {
970
-            // If first new tool, toolchange without unloading the old not initialized 'Just prime/init the new'
971
-            if (first_tool_is_primed)
972
-              unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed));
973
-            first_tool_is_primed = true; // The first new tool will be primed by toolchanging
970
+            #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
971
+              // For first new tool, change without unloading the old. 'Just prime/init the new'
972
+              if (first_tool_is_primed)
973
+                unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed));
974
+              first_tool_is_primed = true; // The first new tool will be primed by toolchanging
975
+            #endif
974
           }
976
           }
975
         }
977
         }
976
       #endif
978
       #endif

+ 1
- 1
buildroot/share/tests/STM32F103RC_fysetc-tests View File

9
 #
9
 #
10
 # Build with the default configurations
10
 # Build with the default configurations
11
 #
11
 #
12
-use_example_configs "FYSETC/Cheetah 1.2/base"
12
+use_example_configs "Creality/Ender-3/FYSETC Cheetah 1.2/base"
13
 exec_test $1 $2 "Cheetah 1.2 Configuration"
13
 exec_test $1 $2 "Cheetah 1.2 Configuration"
14
 
14
 
15
 # clean up
15
 # clean up

Loading…
Cancel
Save