Browse Source

Fix TOOLCHANGE_ZRAISE warning (#14156)

Minims 5 years ago
parent
commit
32afe1d102

+ 1
- 1
Marlin/src/gcode/control/M605.cpp View File

132
         DEBUG_ECHOPAIR("\nX2 Home X: ", x_home_pos(1), "\nX2_MIN_POS=", int(X2_MIN_POS), "\nX2_MAX_POS=", int(X2_MAX_POS));
132
         DEBUG_ECHOPAIR("\nX2 Home X: ", x_home_pos(1), "\nX2_MIN_POS=", int(X2_MIN_POS), "\nX2_MAX_POS=", int(X2_MAX_POS));
133
         DEBUG_ECHOPAIR("\nX2_HOME_DIR=", int(X2_HOME_DIR), "\nX2_HOME_POS=", int(X2_HOME_POS));
133
         DEBUG_ECHOPAIR("\nX2_HOME_DIR=", int(X2_HOME_DIR), "\nX2_HOME_POS=", int(X2_HOME_POS));
134
         DEBUG_ECHOPAIR("\nDEFAULT_DUAL_X_CARRIAGE_MODE=", STRINGIFY(DEFAULT_DUAL_X_CARRIAGE_MODE));
134
         DEBUG_ECHOPAIR("\nDEFAULT_DUAL_X_CARRIAGE_MODE=", STRINGIFY(DEFAULT_DUAL_X_CARRIAGE_MODE));
135
-        DEBUG_ECHOPAIR("\nTOOLCHANGE_ZRAISE=", float(TOOLCHANGE_ZRAISE));
135
+        DEBUG_ECHOPAIR("\toolchange_settings.z_raise=", toolchange_settings.z_raise);
136
         DEBUG_ECHOPAIR("\nDEFAULT_DUPLICATION_X_OFFSET=", int(DEFAULT_DUPLICATION_X_OFFSET));
136
         DEBUG_ECHOPAIR("\nDEFAULT_DUPLICATION_X_OFFSET=", int(DEFAULT_DUPLICATION_X_OFFSET));
137
         DEBUG_EOL();
137
         DEBUG_EOL();
138
 
138
 

+ 0
- 3
Marlin/src/inc/Conditionals_LCD.h View File

405
   #define E_MANUAL        EXTRUDERS
405
   #define E_MANUAL        EXTRUDERS
406
 #elif ENABLED(PRUSA_MMU2)
406
 #elif ENABLED(PRUSA_MMU2)
407
   #define E_STEPPERS 1
407
   #define E_STEPPERS 1
408
-  #ifndef TOOLCHANGE_ZRAISE
409
-    #define TOOLCHANGE_ZRAISE 0
410
-  #endif
411
 #endif
408
 #endif
412
 
409
 
413
 // No inactive extruders with MK2_MULTIPLEXER or SWITCHING_NOZZLE
410
 // No inactive extruders with MK2_MULTIPLEXER or SWITCHING_NOZZLE

+ 1
- 1
Marlin/src/inc/SanityCheck.h View File

694
   #endif
694
   #endif
695
 
695
 
696
   #ifndef TOOLCHANGE_ZRAISE
696
   #ifndef TOOLCHANGE_ZRAISE
697
-    #error "TOOLCHANGE_ZRAISE required for EXTRUDERS > 1. Please update your Configuration."
697
+    #error "TOOLCHANGE_ZRAISE required for EXTRUDERS > 1. Please update your Configuration_adv.h."
698
   #endif
698
   #endif
699
 
699
 
700
 #elif ENABLED(MK2_MULTIPLEXER)
700
 #elif ENABLED(MK2_MULTIPLEXER)

Loading…
Cancel
Save