diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 752fc5c829..90e541ee0c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1,6 +1,6 @@ #define ABL_BLTOUCH // Replaces RGB LED -//#define GraphicalLCD // Will work next to MKS TFT -//#define TMC_2208 // Defaults to TMC2100 +#define GraphicalLCD // Will work next to MKS TFT +#define TMC_2209 // Defaults to TMC2100 #define ABL_UBL // Defaults to Bilinear //#define RunoutSensor // Tinymachines Lerdge Sensor #define RELOCATE_LED // Since the bltouch by default removed the LED, set this if you simply moved them off the hotend @@ -675,12 +675,12 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -#if ENABLED(TMC_2208) - #define X_DRIVER_TYPE TMC2208_STANDALONE - #define Y_DRIVER_TYPE TMC2208_STANDALONE - #define Z_DRIVER_TYPE TMC2208_STANDALONE - #define Z2_DRIVER_TYPE TMC2208_STANDALONE - #define E0_DRIVER_TYPE TMC2208_STANDALONE +#if ENABLED(TMC_2209) + #define X_DRIVER_TYPE TMC2209 + #define Y_DRIVER_TYPE TMC2209 + #define Z_DRIVER_TYPE TMC2209 + #define Z2_DRIVER_TYPE TMC2209 + #define E0_DRIVER_TYPE TMC2209 #else #define X_DRIVER_TYPE TMC2100 #define Y_DRIVER_TYPE TMC2100 @@ -1036,20 +1036,36 @@ // @section machine // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. -#define INVERT_X_DIR false -#define INVERT_Y_DIR false -#define INVERT_Z_DIR true +#if ENABLED(TMC_2209) + #define INVERT_X_DIR true + #define INVERT_Y_DIR true + #define INVERT_Z_DIR false -// @section extruder + // @section extruder -// For direct drive extruder v9 set to true, for geared extruder set to false. -#define INVERT_E0_DIR false -#define INVERT_E1_DIR false -#define INVERT_E2_DIR false -#define INVERT_E3_DIR false -#define INVERT_E4_DIR false -#define INVERT_E5_DIR false + // For direct drive extruder v9 set to true, for geared extruder set to false. + #define INVERT_E0_DIR true + #define INVERT_E1_DIR true + #define INVERT_E2_DIR true + #define INVERT_E3_DIR true + #define INVERT_E4_DIR true + #define INVERT_E5_DIR true +#else + #define INVERT_X_DIR false + #define INVERT_Y_DIR false + #define INVERT_Z_DIR true + // @section extruder + + // For direct drive extruder v9 set to true, for geared extruder set to false. + #define INVERT_E0_DIR false + #define INVERT_E1_DIR false + #define INVERT_E2_DIR false + #define INVERT_E3_DIR false + #define INVERT_E4_DIR false + #define INVERT_E5_DIR false + +#endif // @section homing //#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed @@ -2170,7 +2186,7 @@ * LED Type. Enable only one of the following two options. * */ -#if DISABLED(ABL_BLTOUCH, RELOCATE_LED) +#if DISABLED(ABL_BLTOUCH) || ENABLED(RELOCATE_LED) #define RGB_LED #endif //#define RGBW_LED diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index caa2cf41db..711380111f 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1214,7 +1214,7 @@ * See http://marlinfw.org/docs/features/lin_advance.html for full instructions. * Mention @Sebastianv650 on GitHub to alert the author of any issues. */ -#if DISABLED(TMC_2208) +#if DISABLED(TMC_2209) #define LIN_ADVANCE #endif #if ENABLED(LIN_ADVANCE) @@ -1789,7 +1789,7 @@ */ #define STEALTHCHOP_XY #define STEALTHCHOP_Z - #define STEALTHCHOP_E + //#define STEALTHCHOP_E /** * Optimize spreadCycle chopper parameters by using predefined parameter sets @@ -1805,7 +1805,7 @@ * Define you own with * { , , hysteresis_start[1..8] } */ - #define CHOPPER_TIMING CHOPPER_DEFAULT_12V + #define CHOPPER_TIMING CHOPPER_DEFAULT_24V /** * Monitor Trinamic drivers for error conditions, @@ -1833,7 +1833,7 @@ * STEALTHCHOP_(XY|Z|E) must be enabled to use HYBRID_THRESHOLD. * M913 X/Y/Z/E to live tune the setting */ - //#define HYBRID_THRESHOLD + #define HYBRID_THRESHOLD #define X_HYBRID_THRESHOLD 100 // [mm/s] #define X2_HYBRID_THRESHOLD 100 diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h index 9853dc7010..510ac9f1b0 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS.h +++ b/Marlin/src/pins/ramps/pins_RAMPS.h @@ -333,8 +333,8 @@ #define Z_SERIAL_TX_PIN 42 #define Z_SERIAL_RX_PIN 65 - #define Z2_SERIAL_TX_PIN -1 - #define Z2_SERIAL_RX_PIN -1 + #define Z2_SERIAL_TX_PIN 2 + #define Z2_SERIAL_RX_PIN 15 #define E0_SERIAL_TX_PIN 44 #define E0_SERIAL_RX_PIN 66