|
@@ -433,7 +433,6 @@
|
433
|
433
|
#define Z_STEPPER_ALIGN_ACC 0.02
|
434
|
434
|
#endif
|
435
|
435
|
|
436
|
|
-
|
437
|
436
|
// @section machine
|
438
|
437
|
|
439
|
438
|
#define AXIS_RELATIVE_MODES {false, false, false, false}
|
|
@@ -514,7 +513,6 @@
|
514
|
513
|
//#define MICROSTEP16 LOW,LOW,HIGH
|
515
|
514
|
//#define MICROSTEP32 HIGH,LOW,HIGH
|
516
|
515
|
|
517
|
|
-
|
518
|
516
|
// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
|
519
|
517
|
#define MICROSTEP_MODES { 16, 16, 16, 16, 16, 16 } // [1,2,4,8,16]
|
520
|
518
|
|
|
@@ -851,6 +849,7 @@
|
851
|
849
|
#if ENABLED(MOVE_Z_WHEN_IDLE)
|
852
|
850
|
#define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size.
|
853
|
851
|
#endif
|
|
852
|
+
|
854
|
853
|
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
|
855
|
854
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
856
|
855
|
#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
|
|
@@ -1099,6 +1098,34 @@
|
1099
|
1098
|
//#define RETRACT_SYNC_MIXING // Retract and restore all mixing steppers simultaneously
|
1100
|
1099
|
#endif
|
1101
|
1100
|
#endif
|
|
1101
|
+
|
|
1102
|
+/**
|
|
1103
|
+ * Universal tool change settings.
|
|
1104
|
+ * Applies to all types of extruders except where explicitly noted.
|
|
1105
|
+ */
|
|
1106
|
+#if EXTRUDERS > 1
|
|
1107
|
+ // Z raise distance for tool-change, as needed for some extruders
|
|
1108
|
+ #define TOOLCHANGE_ZRAISE 2 // (mm)
|
|
1109
|
+
|
|
1110
|
+ // Retract and prime filament on tool-change
|
|
1111
|
+ //#define TOOLCHANGE_FILAMENT_SWAP
|
|
1112
|
+ #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
|
|
1113
|
+ #define TOOLCHANGE_FIL_SWAP_LENGTH 12 // (mm)
|
|
1114
|
+ #define TOOLCHANGE_FIL_SWAP_RETRACT_SPEED 3600 // (mm/m)
|
|
1115
|
+ #define TOOLCHANGE_FIL_SWAP_PRIME_SPEED 3600 // (mm/m)
|
|
1116
|
+ #endif
|
|
1117
|
+
|
|
1118
|
+ /**
|
|
1119
|
+ * Position to park head during tool change.
|
|
1120
|
+ * Doesn't apply to SWITCHING_TOOLHEAD, DUAL_X_CARRIAGE, or PARKING_EXTRUDER
|
|
1121
|
+ */
|
|
1122
|
+ //#define TOOLCHANGE_PARK
|
|
1123
|
+ #if ENABLED(TOOLCHANGE_PARK)
|
|
1124
|
+ #define TOOLCHANGE_PARK_XY { X_MIN_POS + 10, Y_MIN_POS + 10 }
|
|
1125
|
+ #define TOOLCHANGE_PARK_XY_FEEDRATE 6000 // (mm/m)
|
|
1126
|
+ #endif
|
|
1127
|
+#endif
|
|
1128
|
+
|
1102
|
1129
|
/**
|
1103
|
1130
|
* Advanced Pause
|
1104
|
1131
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
|
@@ -1669,25 +1696,41 @@
|
1669
|
1696
|
#endif
|
1670
|
1697
|
|
1671
|
1698
|
/**
|
|
1699
|
+ * G-code Macros
|
|
1700
|
+ *
|
|
1701
|
+ * Add G-codes M810-M819 to define and run G-code macros.
|
|
1702
|
+ * Macros are not saved to EEPROM.
|
|
1703
|
+ */
|
|
1704
|
+//#define GCODE_MACROS
|
|
1705
|
+#if ENABLED(GCODE_MACROS)
|
|
1706
|
+ #define GCODE_MACROS_SLOTS 5 // Up to 10 may be used
|
|
1707
|
+ #define GCODE_MACROS_SLOT_SIZE 50 // Maximum length of a single macro
|
|
1708
|
+#endif
|
|
1709
|
+
|
|
1710
|
+/**
|
1672
|
1711
|
* User-defined menu items that execute custom GCode
|
1673
|
1712
|
*/
|
1674
|
1713
|
//#define CUSTOM_USER_MENUS
|
1675
|
1714
|
#if ENABLED(CUSTOM_USER_MENUS)
|
1676
|
1715
|
//#define CUSTOM_USER_MENU_TITLE "Custom Commands"
|
1677
|
|
- //#define USER_SCRIPT_AUDIBLE_FEEDBACK
|
1678
|
|
- #define USER_SCRIPT_RETURN // Return to status screen after a script
|
|
1716
|
+ #define USER_SCRIPT_DONE "M117 User Script Done"
|
|
1717
|
+ #define USER_SCRIPT_AUDIBLE_FEEDBACK
|
|
1718
|
+ //#define USER_SCRIPT_RETURN // Return to status screen after a script
|
|
1719
|
+
|
|
1720
|
+ #define USER_DESC_1 "Home & UBL Info"
|
|
1721
|
+ #define USER_GCODE_1 "G28\nG29 W"
|
1679
|
1722
|
|
1680
|
|
- #define USER_DESC_1 "User cmd 1"
|
1681
|
|
- #define USER_GCODE_1 "G28 X \n"
|
|
1723
|
+ #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
|
|
1724
|
+ #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
|
1682
|
1725
|
|
1683
|
|
- #define USER_DESC_2 "User cmd 2"
|
1684
|
|
- #define USER_GCODE_2 "G28 \nG1 X100 \n"
|
|
1726
|
+ #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
|
|
1727
|
+ #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
|
1685
|
1728
|
|
1686
|
|
- #define USER_DESC_3 "User cmd 3"
|
1687
|
|
- #define USER_GCODE_3 "M48 \n"
|
|
1729
|
+ #define USER_DESC_4 "Heat Bed/Home/Level"
|
|
1730
|
+ #define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
|
1688
|
1731
|
|
1689
|
|
- #define USER_DESC_4 "User cmd 4"
|
1690
|
|
- #define USER_GCODE_4 "M114 \n"
|
|
1732
|
+ #define USER_DESC_5 "Home & Info"
|
|
1733
|
+ #define USER_GCODE_5 "G28\nM503"
|
1691
|
1734
|
#endif
|
1692
|
1735
|
|
1693
|
1736
|
/**
|