Combine more tool-change variables (#12137)

2018-11-06 22:52:20 -05:00
parent 147e270208
commit 6471a75a22
143 changed files with 1827 additions and 1382 deletions
--- a/Marlin/src/module/tool_change.h
+++ b/Marlin/src/module/tool_change.h
@@ -26,12 +26,12 @@
 #if EXTRUDERS > 1

  typedef struct {
-    #if ENABLED(SINGLENOZZLE)
+    #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
      float swap_length;
      int16_t prime_speed, retract_speed;
-      #if ENABLED(SINGLENOZZLE_SWAP_PARK)
-        struct { float x, y; } change_point;
-      #endif
+    #endif
+    #if ENABLED(TOOLCHANGE_PARK)
+      struct { float x, y; } change_point;
    #endif
    float z_raise;
  } toolchange_settings_t;