|
30 | 30 | * |
31 | 31 | * Basic settings can be found in Configuration.h |
32 | 32 | */ |
33 | | -#define CONFIGURATION_ADV_H_VERSION 02010200 |
| 33 | +#define CONFIGURATION_ADV_H_VERSION 02010300 |
34 | 34 |
|
35 | 35 | // @section develop |
36 | 36 |
|
|
304 | 304 | #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius |
305 | 305 |
|
306 | 306 | //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops |
307 | | - #if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP) |
308 | | - //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 |
| 307 | + #if ENABLED(ADAPTIVE_FAN_SLOWING) && EITHER(MPCTEMP, PIDTEMP) |
| 308 | + //#define TEMP_TUNING_MAINTAIN_FAN // Don't slow fan speed during M303 or M306 T |
309 | 309 | #endif |
310 | 310 |
|
311 | 311 | /** |
|
375 | 375 | #endif |
376 | 376 |
|
377 | 377 | #if ENABLED(PIDTEMP) |
378 | | - // Add an experimental additional term to the heater power, proportional to the extrusion speed. |
| 378 | + // Add an additional term to the heater power, proportional to the extrusion speed. |
379 | 379 | // A well-chosen Kc value should add just enough power to melt the increased material volume. |
380 | 380 | //#define PID_EXTRUSION_SCALING |
381 | 381 | #if ENABLED(PID_EXTRUSION_SCALING) |
|
384 | 384 | #endif |
385 | 385 |
|
386 | 386 | /** |
387 | | - * Add an experimental additional term to the heater power, proportional to the fan speed. |
| 387 | + * Add an additional term to the heater power, proportional to the fan speed. |
388 | 388 | * A well-chosen Kf value should add just enough power to compensate for power-loss from the cooling fan. |
389 | 389 | * You can either just add a constant compensation with the DEFAULT_Kf value |
390 | 390 | * or follow the instruction below to get speed-dependent compensation. |
|
843 | 843 | //#define Z_MULTI_ENDSTOPS // Other Z axes have their own endstops |
844 | 844 | #if ENABLED(Z_MULTI_ENDSTOPS) |
845 | 845 | #define Z2_USE_ENDSTOP _XMAX_ // Z2 endstop board plug. Don't forget to enable USE_*_PLUG. |
846 | | - #define Z2_ENDSTOP_ADJUSTMENT 0 // Z2 offset relative to Y endstop |
| 846 | + #define Z2_ENDSTOP_ADJUSTMENT 0 // Z2 offset relative to Z endstop |
847 | 847 | #endif |
848 | 848 | #ifdef Z3_DRIVER_TYPE |
849 | 849 | //#define INVERT_Z3_VS_Z_DIR // Z3 direction signal is the opposite of Z |
850 | 850 | #if ENABLED(Z_MULTI_ENDSTOPS) |
851 | 851 | #define Z3_USE_ENDSTOP _YMAX_ // Z3 endstop board plug. Don't forget to enable USE_*_PLUG. |
852 | | - #define Z3_ENDSTOP_ADJUSTMENT 0 // Z3 offset relative to Y endstop |
| 852 | + #define Z3_ENDSTOP_ADJUSTMENT 0 // Z3 offset relative to Z endstop |
853 | 853 | #endif |
854 | 854 | #endif |
855 | 855 | #ifdef Z4_DRIVER_TYPE |
856 | 856 | //#define INVERT_Z4_VS_Z_DIR // Z4 direction signal is the opposite of Z |
857 | 857 | #if ENABLED(Z_MULTI_ENDSTOPS) |
858 | 858 | #define Z4_USE_ENDSTOP _ZMAX_ // Z4 endstop board plug. Don't forget to enable USE_*_PLUG. |
859 | | - #define Z4_ENDSTOP_ADJUSTMENT 0 // Z4 offset relative to Y endstop |
| 859 | + #define Z4_ENDSTOP_ADJUSTMENT 0 // Z4 offset relative to Z endstop |
860 | 860 | #endif |
861 | 861 | #endif |
862 | 862 | #endif |
|
1034 | 1034 | //#define ASSISTED_TRAMMING |
1035 | 1035 | #if ENABLED(ASSISTED_TRAMMING) |
1036 | 1036 |
|
1037 | | - // Define positions for probe points. |
| 1037 | + // Define from 3 to 9 points to probe. |
1038 | 1038 | #define TRAMMING_POINT_XY { { 20, 20 }, { 180, 20 }, { 180, 180 }, { 20, 180 } } |
1039 | 1039 |
|
1040 | 1040 | // Define position names for probe points. |
|
1104 | 1104 | // Add a Duplicate option for well-separated conjoined nozzles |
1105 | 1105 | //#define MULTI_NOZZLE_DUPLICATION |
1106 | 1106 |
|
1107 | | -// By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step. |
1108 | | -#define INVERT_X_STEP_PIN false |
1109 | | -#define INVERT_Y_STEP_PIN false |
1110 | | -#define INVERT_Z_STEP_PIN false |
1111 | | -#define INVERT_I_STEP_PIN false |
1112 | | -#define INVERT_J_STEP_PIN false |
1113 | | -#define INVERT_K_STEP_PIN false |
1114 | | -#define INVERT_U_STEP_PIN false |
1115 | | -#define INVERT_V_STEP_PIN false |
1116 | | -#define INVERT_W_STEP_PIN false |
1117 | | -#define INVERT_E_STEP_PIN false |
| 1107 | +// By default stepper drivers require an active-HIGH signal but some high-power drivers require an active-LOW signal to step. |
| 1108 | +#define STEP_STATE_X HIGH |
| 1109 | +#define STEP_STATE_Y HIGH |
| 1110 | +#define STEP_STATE_Z HIGH |
| 1111 | +#define STEP_STATE_I HIGH |
| 1112 | +#define STEP_STATE_J HIGH |
| 1113 | +#define STEP_STATE_K HIGH |
| 1114 | +#define STEP_STATE_U HIGH |
| 1115 | +#define STEP_STATE_V HIGH |
| 1116 | +#define STEP_STATE_W HIGH |
| 1117 | +#define STEP_STATE_E HIGH |
1118 | 1118 |
|
1119 | 1119 | /** |
1120 | 1120 | * Idle Stepper Shutdown |
1121 | | - * Set DISABLE_INACTIVE_? 'true' to shut down axis steppers after an idle period. |
| 1121 | + * Enable DISABLE_INACTIVE_* to shut down axis steppers after an idle period. |
1122 | 1122 | * The Deactive Time can be overridden with M18 and M84. Set to 0 for No Timeout. |
1123 | 1123 | */ |
1124 | 1124 | #define DEFAULT_STEPPER_DEACTIVE_TIME 120 |
1125 | | -#define DISABLE_INACTIVE_X true |
1126 | | -#define DISABLE_INACTIVE_Y true |
1127 | | -#define DISABLE_INACTIVE_Z true // Set 'false' if the nozzle could fall onto your printed part! |
1128 | | -#define DISABLE_INACTIVE_I true |
1129 | | -#define DISABLE_INACTIVE_J true |
1130 | | -#define DISABLE_INACTIVE_K true |
1131 | | -#define DISABLE_INACTIVE_U true |
1132 | | -#define DISABLE_INACTIVE_V true |
1133 | | -#define DISABLE_INACTIVE_W true |
1134 | | -#define DISABLE_INACTIVE_E true |
| 1125 | +#define DISABLE_INACTIVE_X |
| 1126 | +#define DISABLE_INACTIVE_Y |
| 1127 | +#define DISABLE_INACTIVE_Z // Disable if the nozzle could fall onto your printed part! |
| 1128 | +//#define DISABLE_INACTIVE_I |
| 1129 | +//#define DISABLE_INACTIVE_J |
| 1130 | +//#define DISABLE_INACTIVE_K |
| 1131 | +//#define DISABLE_INACTIVE_U |
| 1132 | +//#define DISABLE_INACTIVE_V |
| 1133 | +//#define DISABLE_INACTIVE_W |
1135 | 1134 |
|
1136 | 1135 | // Default Minimum Feedrates for printing and travel moves |
1137 | 1136 | #define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s. °/s for rotational-only moves) Minimum feedrate. Set with M205 S. |
|
1429 | 1428 |
|
1430 | 1429 | #endif // HAS_MARLINUI_MENU |
1431 | 1430 |
|
1432 | | -#if ANY(HAS_DISPLAY, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) |
| 1431 | +#if HAS_DISPLAY |
1433 | 1432 | //#define SOUND_MENU_ITEM // Add a mute option to the LCD menu |
1434 | 1433 | #define SOUND_ON_DEFAULT // Buzzer/speaker default enabled state |
1435 | | -#endif |
1436 | 1434 |
|
1437 | | -#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI) |
1438 | 1435 | // The timeout to return to the status screen from sub-menus |
1439 | 1436 | //#define LCD_TIMEOUT_TO_STATUS 15000 // (ms) |
1440 | 1437 |
|
|
1457 | 1454 | // Show the E position (filament used) during printing |
1458 | 1455 | #define LCD_SHOW_E_TOTAL |
1459 | 1456 |
|
| 1457 | + // Display a negative temperature instead of "err" |
| 1458 | + //#define SHOW_TEMPERATURE_BELOW_ZERO |
| 1459 | + |
1460 | 1460 | /** |
1461 | 1461 | * LED Control Menu |
1462 | 1462 | * Add LED Control to the LCD menu |
|
1483 | 1483 | #endif |
1484 | 1484 | #endif |
1485 | 1485 |
|
1486 | | -#endif // HAS_DISPLAY || DWIN_LCD_PROUI |
| 1486 | +#endif // HAS_DISPLAY |
1487 | 1487 |
|
1488 | 1488 | // Add 'M73' to set print job progress, overrides Marlin's built-in estimate |
1489 | 1489 | //#define SET_PROGRESS_MANUALLY |
|
2091 | 2091 | #define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping |
2092 | 2092 | #if ENABLED(BABYSTEP_ZPROBE_OFFSET) |
2093 | 2093 | //#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets |
2094 | | - #define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor |
| 2094 | + #define BABYSTEP_GFX_OVERLAY // Enable graphical overlay on Z-offset editor |
2095 | 2095 | #endif |
2096 | 2096 | #endif |
2097 | 2097 |
|
|
2124 | 2124 | #endif |
2125 | 2125 | //#define ADVANCE_K_EXTRA // Add a second linear advance constant, configurable with M900 L. |
2126 | 2126 | //#define LA_DEBUG // Print debug information to serial during operation. Disable for production use. |
2127 | | - //#define EXPERIMENTAL_SCURVE // Allow S-Curve Acceleration to be used with LA. |
2128 | 2127 | //#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends. |
2129 | 2128 | //#define EXPERIMENTAL_I2S_LA // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz. |
2130 | 2129 | #endif |
|
2559 | 2558 | * Extra G-code to run while executing tool-change commands. Can be used to use an additional |
2560 | 2559 | * stepper motor (e.g., I axis in Configuration.h) to drive the tool-changer. |
2561 | 2560 | */ |
2562 | | - //#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 A0" // Extra G-code to run while executing tool-change command T0 |
2563 | | - //#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10" // Extra G-code to run while executing tool-change command T1 |
2564 | | - //#define EVENT_GCODE_TOOLCHANGE_ALWAYS_RUN // Always execute above G-code sequences. Use with caution! |
| 2561 | + //#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 A0" // Extra G-code to run while executing tool-change command T0 |
| 2562 | + //#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10" // Extra G-code to run while executing tool-change command T1 |
| 2563 | + //#define EVENT_GCODE_TOOLCHANGE_ALWAYS_RUN // Always execute above G-code sequences. Use with caution! |
| 2564 | + |
| 2565 | + /** |
| 2566 | + * Consider coordinates for EVENT_GCODE_TOOLCHANGE_Tx as relative to T0 |
| 2567 | + * so that moves in the specified axes are the same for all tools. |
| 2568 | + */ |
| 2569 | + //#define TC_GCODE_USE_GLOBAL_X // Use X position relative to Tool 0 |
| 2570 | + //#define TC_GCODE_USE_GLOBAL_Y // Use Y position relative to Tool 0 |
| 2571 | + //#define TC_GCODE_USE_GLOBAL_Z // Use Z position relative to Tool 0 |
2565 | 2572 |
|
2566 | 2573 | /** |
2567 | 2574 | * Tool Sensors detect when tools have been picked up or dropped. |
|
0 commit comments