|
|
@@ -386,7 +386,7 @@
|
|
|
#define Y_HOME_BUMP_MM 5
|
|
|
#define Z_HOME_BUMP_MM 2
|
|
|
#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate)
|
|
|
-//#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially
|
|
|
+#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially
|
|
|
|
|
|
// When G28 is called, this option will make Y home before X
|
|
|
//#define HOME_Y_BEFORE_X
|
|
|
@@ -394,65 +394,6 @@
|
|
|
// Enable this if X or Y can't home without homing the other axis first.
|
|
|
//#define CODEPENDENT_XY_HOMING
|
|
|
|
|
|
-#if ENABLED(BLTOUCH)
|
|
|
- /**
|
|
|
- * Either: Use the defaults (recommended) or: For special purposes, use the following DEFINES
|
|
|
- * Do not activate settings that the probe might not understand. Clones might misunderstand
|
|
|
- * advanced commands.
|
|
|
- *
|
|
|
- * Note: If the probe is not deploying, check a "Cmd: Reset" and "Cmd: Self-Test" and then
|
|
|
- * check the wiring of the BROWN, RED and ORANGE wires.
|
|
|
- *
|
|
|
- * Note: If the trigger signal of your probe is not being recognized, it has been very often
|
|
|
- * because the BLACK and WHITE wires needed to be swapped. They are not "interchangeable"
|
|
|
- * like they would be with a real switch. So please check the wiring first.
|
|
|
- *
|
|
|
- * Settings for all BLTouch and clone probes:
|
|
|
- */
|
|
|
-
|
|
|
- // Safety: The probe needs time to recognize the command.
|
|
|
- // Minimum command delay (ms). Enable and increase if needed.
|
|
|
- //#define BLTOUCH_DELAY 500
|
|
|
-
|
|
|
- /**
|
|
|
- * Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones:
|
|
|
- */
|
|
|
-
|
|
|
- // Feature: Switch into SW mode after a deploy. It makes the output pulse longer. Can be useful
|
|
|
- // in special cases, like noisy or filtered input configurations.
|
|
|
- //#define BLTOUCH_FORCE_SW_MODE
|
|
|
-
|
|
|
- /**
|
|
|
- * Settings for BLTouch Smart 3.0 and 3.1
|
|
|
- * Summary:
|
|
|
- * - Voltage modes: 5V and OD (open drain - "logic voltage free") output modes
|
|
|
- * - High-Speed mode
|
|
|
- * - Disable LCD voltage options
|
|
|
- */
|
|
|
-
|
|
|
- /**
|
|
|
- * Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
|
|
|
- * V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
|
|
|
- * If disabled, OD mode is the hard-coded default on 3.0
|
|
|
- * On startup, Marlin will compare its eeprom to this vale. If the selected mode
|
|
|
- * differs, a mode set eeprom write will be completed at initialization.
|
|
|
- * Use the option below to force an eeprom write to a V3.1 probe regardless.
|
|
|
- */
|
|
|
- //#define BLTOUCH_SET_5V_MODE
|
|
|
-
|
|
|
- /**
|
|
|
- * Safety: Activate if connecting a probe with an unknown voltage mode.
|
|
|
- * V3.0: Set a probe into mode selected above at Marlin startup. Required for 5V mode on 3.0
|
|
|
- * V3.1: Force a probe with unknown mode into selected mode at Marlin startup ( = Probe EEPROM write )
|
|
|
- * To preserve the life of the probe, use this once then turn it off and re-flash.
|
|
|
- */
|
|
|
- //#define BLTOUCH_FORCE_MODE_SET
|
|
|
-
|
|
|
- // Safety: Enable voltage mode settings in the LCD menu.
|
|
|
- //#define BLTOUCH_LCD_VOLTAGE_MENU
|
|
|
-
|
|
|
-#endif // BLTOUCH
|
|
|
-
|
|
|
// @section machine
|
|
|
|
|
|
#define AXIS_RELATIVE_MODES {false, false, false, false}
|
|
|
@@ -483,7 +424,7 @@
|
|
|
// @section lcd
|
|
|
|
|
|
#if ENABLED(ULTIPANEL)
|
|
|
- #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
|
|
|
+ #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 0} // Feedrates for manual moves along X, Y, Z, E from panel
|
|
|
#define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
|
|
|
#endif
|
|
|
|
|
|
@@ -583,10 +524,10 @@
|
|
|
// @section lcd
|
|
|
|
|
|
// Include a page of printer information in the LCD Main Menu
|
|
|
-//#define LCD_INFO_MENU
|
|
|
+#define LCD_INFO_MENU
|
|
|
|
|
|
// Scroll a longer status message into view
|
|
|
-//#define STATUS_MESSAGE_SCROLLING
|
|
|
+#define STATUS_MESSAGE_SCROLLING
|
|
|
|
|
|
// On the Info Screen, display XY with one decimal place when possible
|
|
|
//#define LCD_DECIMAL_SMALL_XY
|
|
|
@@ -700,7 +641,7 @@
|
|
|
//#define LONG_FILENAME_HOST_SUPPORT
|
|
|
|
|
|
// Enable this option to scroll long filenames in the SD card menu
|
|
|
- //#define SCROLL_LONG_FILENAMES
|
|
|
+ #define SCROLL_LONG_FILENAMES
|
|
|
|
|
|
/**
|
|
|
* This option allows you to abort SD printing when any endstop is triggered.
|
|
|
@@ -803,13 +744,13 @@
|
|
|
*
|
|
|
* Warning: Does not respect endstops!
|
|
|
*/
|
|
|
-//#define BABYSTEPPING
|
|
|
+#define BABYSTEPPING
|
|
|
#if ENABLED(BABYSTEPPING)
|
|
|
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
|
|
|
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
|
|
|
#define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
|
|
|
//#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping
|
|
|
- //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
|
|
|
+ #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
|
|
|
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
|
|
|
// Note: Extra time may be added to mitigate controller latency.
|
|
|
//#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
|
|
|
@@ -1133,7 +1074,7 @@
|
|
|
#define E4_SENSE_RESISTOR 91
|
|
|
#define E4_MICROSTEPS 16
|
|
|
|
|
|
-#endif // TMC26X
|
|
|
+#endif
|
|
|
|
|
|
// @section tmc_smart
|
|
|
|
|
|
@@ -1361,7 +1302,7 @@
|
|
|
#define E4_OVERCURRENT 2000
|
|
|
#define E4_STALLCURRENT 1500
|
|
|
|
|
|
-#endif // L6470
|
|
|
+#endif
|
|
|
|
|
|
/**
|
|
|
* TWI/I2C BUS
|
