diff --git a/TH3DUF_R2/Configuration.h b/TH3DUF_R2/Configuration.h index 668fd9b..db7b96e 100644 --- a/TH3DUF_R2/Configuration.h +++ b/TH3DUF_R2/Configuration.h @@ -307,6 +307,24 @@ // If you are using a dual hotend with dual nozzles uncomment the below line //#define DUAL_HOTEND_DUAL_NOZZLES +//=========================================================================== +// Creality Ender 4 Options - Select 'Arduino Mega 2560' from Tools > Board +//=========================================================================== +//#define ENDER4 + +// If you have the filament sensor from Creality uncomment the below line +//#define ENDER4_FIL + +// If you are using our EZOut V2 (connected to X+ connector) filament sensor kit please follow the install guide +// and then uncomment the #define EZOUT_ENABLE line below. +// Do NOT ever connect our filament sensor without the supplied adapter board. +//#define EZOUTV2_ENABLE + +// EZABL Probe Mounts +//#define ENDER4_OEM_LEFT +//#define ENDER4_OEM_RIGHT //need to design +//#define CUSTOM_PROBE + //=========================================================================== // Creality Ender 5 Options - Select 'Sanguino 1284p' from Tools > Board //=========================================================================== @@ -676,6 +694,6 @@ #include "Configuration_backend.h" -#define UNIFIED_VERSION "TH3D U1.R2.8a" +#define UNIFIED_VERSION "TH3D U1.R2.9" #endif // CONFIGURATION_H diff --git a/TH3DUF_R2/Configuration_adv.h b/TH3DUF_R2/Configuration_adv.h index ee540f0..e9ddd1d 100644 --- a/TH3DUF_R2/Configuration_adv.h +++ b/TH3DUF_R2/Configuration_adv.h @@ -272,15 +272,15 @@ #else #define BABYSTEP_MULTIPLICATOR 10 #endif - #if ENABLED(EZABL_ENABLE) + #if ENABLED(EZABL_ENABLE) && DISABLED(LCD2004) #define BABYSTEP_ZPROBE_OFFSET - #define BABYSTEP_ZPROBE_GFX_OVERLAY + #define BABYSTEP_ZPROBE_GFX_OVERLAY #endif #define DOUBLECLICK_FOR_Z_BABYSTEPPING #define DOUBLECLICK_MAX_INTERVAL 2000 #if ENABLED(EZABL_ENABLE) && DISABLED(LCD2004) - + #define BABYSTEP_ZPROBE_OFFSET #endif #endif diff --git a/TH3DUF_R2/Configuration_backend.h b/TH3DUF_R2/Configuration_backend.h index 5b4c969..fb36207 100644 --- a/TH3DUF_R2/Configuration_backend.h +++ b/TH3DUF_R2/Configuration_backend.h @@ -31,6 +31,11 @@ #define DISABLE_BOOT #endif #endif +#if ENABLED(ENDER4_OEM_LEFT) + #define X_PROBE_OFFSET_FROM_EXTRUDER -53 + #define Y_PROBE_OFFSET_FROM_EXTRUDER -19 + #define EZABL_ENABLE +#endif #if ENABLED(ADIM_I3P_OEM) #define X_PROBE_OFFSET_FROM_EXTRUDER 33 #define Y_PROBE_OFFSET_FROM_EXTRUDER -60 @@ -151,6 +156,75 @@ #define DISABLE_BOOT #endif +//Ender 4 Settings +#if ENABLED(ENDER4) + #define BAUDRATE 115200 + + #ifndef MOTHERBOARD + #define MOTHERBOARD BOARD_RAMPS_ENDER_4 + #endif + + #define X_MIN_ENDSTOP_INVERTING true + #define Y_MIN_ENDSTOP_INVERTING false + #define Z_MIN_ENDSTOP_INVERTING false + #define X_MAX_ENDSTOP_INVERTING false + #define Y_MAX_ENDSTOP_INVERTING false + #define Z_MAX_ENDSTOP_INVERTING false + #define Z_MIN_PROBE_ENDSTOP_INVERTING false + + #if ENABLED(TITAN_EXTRUDER) + #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, TITAN_EXTRUDER_STEPS } + #else + #if ENABLED(CUSTOM_ESTEPS) + #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, CUSTOM_ESTEPS_VALUE } + #else + #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 95 } + #endif + #endif + + #define REPRAP_DISCOUNT_SMART_CONTROLLER + #define LCD2004 + + #define DEFAULT_MAX_FEEDRATE { 400, 400, 15, 50 } + + #define DEFAULT_MAX_ACCELERATION { 1000, 1000, 50, 5000 } + + #define DEFAULT_ACCELERATION 1000 + #define DEFAULT_RETRACT_ACCELERATION 1000 + #define DEFAULT_TRAVEL_ACCELERATION 1000 + + #define COREXY + + #define X_BED_SIZE 220 + #define Y_BED_SIZE 220 + #define Z_MAX_POS 310 + + #if ENABLED(HOME_ADJUST) + #define X_MIN_POS X_HOME_LOCATION + #define Y_MIN_POS Y_HOME_LOCATION + #else + #define X_MIN_POS 0 + #define Y_MIN_POS 0 + #endif + + #define DEFAULT_XJERK 10.0 + #define DEFAULT_YJERK 10.0 + #define DEFAULT_ZJERK 0.4 + #define DEFAULT_EJERK 5.0 + + #define INVERT_X_DIR true + #define INVERT_Y_DIR true + #define INVERT_Z_DIR true + + #if ENABLED(TITAN_EXTRUDER) + #define INVERT_E0_DIR false + #else + #define INVERT_E0_DIR true + #endif + + #define PRINTER_ENABLED_CHECK +#endif //end ender 4 settings + //Tronxy X5S Settings #if ENABLED(TRONXY_X5S) #define SLIM_1284P @@ -2019,7 +2093,7 @@ #define MAX_SOFTWARE_ENDSTOP_Z #endif -#if ENABLED(EZOUT_ENABLE) || ENABLED(EZOUTV2_ENABLE) || (ENABLED(CR10S) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_MINI) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_S4) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_S5) && DISABLED(CR10S_NOFILAMENTSENSOR)) || ENABLED(ALFAWISE_U10) || ENABLED(ADIM_GANTRY_I3_PLUS) +#if ENABLED(EZOUT_ENABLE) || ENABLED(EZOUTV2_ENABLE) || (ENABLED(CR10S) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_MINI) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_S4) && DISABLED(CR10S_NOFILAMENTSENSOR)) || (ENABLED(CR10S_S5) && DISABLED(CR10S_NOFILAMENTSENSOR)) || ENABLED(ALFAWISE_U10) || ENABLED(ADIM_GANTRY_I3_PLUS) || ENABLED(ENDER4_FIL) #define FILAMENT_RUNOUT_SENSOR #if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(EZOUT_ENABLE) || ENABLED(EZOUTV2_ENABLE) || ENABLED(ADIM_GANTRY_I3_PLUS) diff --git a/TH3DUF_R2/SanityCheck.h b/TH3DUF_R2/SanityCheck.h index ca22e92..13baa58 100644 --- a/TH3DUF_R2/SanityCheck.h +++ b/TH3DUF_R2/SanityCheck.h @@ -40,6 +40,10 @@ #error "Only use one type of EZOut sensor at a time. Please read the EZOut installation guide for details." #endif +#if ENABLED(EZOUTV2_ENABLE) && ENABLED(ENDER4_FIL) + #error "Only use one type of filament sensor at a time on the Ender 4. Please enable the one you have and disable the other." +#endif + #if ENABLED(TH3D_HOTEND_THERMISTOR) && ENABLED(V6_HOTEND) #error "Only select one type of hotend thermistor setting." #endif diff --git a/TH3DUF_R2/pins_RAMPS.h b/TH3DUF_R2/pins_RAMPS.h index 1f8c81a..d5c95d7 100644 --- a/TH3DUF_R2/pins_RAMPS.h +++ b/TH3DUF_R2/pins_RAMPS.h @@ -77,6 +77,8 @@ #ifndef X_MAX_PIN #if ENABLED(EZOUTV2_ENABLE) #define X_MAX_PIN -1 + #elif ENABLED(ENDER4_FIL) + #define X_MAX_PIN -1 #else #define X_MAX_PIN 2 #endif @@ -286,7 +288,7 @@ #endif // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector -#if ENABLED(EZOUTV2_ENABLE) +#if ENABLED(EZOUTV2_ENABLE) || ENABLED(ENDER4_FIL) #if ENABLED(TIM_SMARTT) #define FIL_RUNOUT_PIN 57 #else