diff --git a/creality-ender3/Marlin-2.1.2.4/Marlin/Configuration.h b/creality-ender3/Marlin-2.1.2.4/Marlin/Configuration.h index 2a83f22..eb93ea9 100644 --- a/creality-ender3/Marlin-2.1.2.4/Marlin/Configuration.h +++ b/creality-ender3/Marlin-2.1.2.4/Marlin/Configuration.h @@ -634,7 +634,8 @@ // Above this temperature the heater will be switched off. // This can protect components from overheating, but NOT from shorts and failures. // (Use MINTEMP for thermistor short/failure protection.) -#define HEATER_0_MAXTEMP 275 +// TODO: Change HEATER_0_MAXTEMP to 300 after Sprite Pro extruder upgrade +#define HEATER_0_MAXTEMP 275 // MBO #define HEATER_1_MAXTEMP 275 #define HEATER_2_MAXTEMP 275 #define HEATER_3_MAXTEMP 275 @@ -834,8 +835,8 @@ #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. - //#define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of flash) -#define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash) + #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of flash) // MBO + #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash) // MBO #endif // @section safety @@ -855,7 +856,8 @@ * Note: For Bowden Extruders make this large enough to allow load/unload. */ #define PREVENT_LENGTHY_EXTRUDE -#define EXTRUDE_MAXLENGTH 600 +// TODO: To be decrease with Sprite Pro? +#define EXTRUDE_MAXLENGTH 600 // MBO //=========================================================================== //======================== Thermal Runaway Protection ======================= @@ -1170,7 +1172,7 @@ //#define ENDSTOP_NOISE_THRESHOLD 2 // Check for stuck or disconnected endstops during homing moves. -//#define DETECT_BROKEN_ENDSTOP +#define DETECT_BROKEN_ENDSTOP // MBO: enable //============================================================================= //============================== Movement Settings ============================ @@ -1197,6 +1199,7 @@ * Override with M92 * X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]] */ +// TODO: change e-step (93) to fit Sprite Pro extruder => https://www.youtube.com/watch?v=lH-RrjtiC8M #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 93 } /** @@ -1244,7 +1247,7 @@ * When changing speed and direction, if the difference is less than the * value set here, it may happen instantaneously. */ -#define CLASSIC_JERK +//#define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) #define DEFAULT_XJERK 10.0 #define DEFAULT_YJERK 10.0 @@ -1515,12 +1518,14 @@ // PROBE_OFFSET with original extruder fans //#define NOZZLE_TO_PROBE_OFFSET { -44, -14, -2.725 } + // PROBE_OFFSET with SATSANA fangs extruder fans -#define NOZZLE_TO_PROBE_OFFSET { -51, -12, 0 } +// TODO: To be change after Sprite Pro upgrade +#define NOZZLE_TO_PROBE_OFFSET { -51, -12, 0 } // MBO // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. -#define PROBING_MARGIN 15 +#define PROBING_MARGIN 10 // MBO: change from 15 to 10 // X and Y axis travel speed (mm/min) between probes #define XY_PROBE_FEEDRATE (133*60) @@ -1633,8 +1638,8 @@ // Require minimum nozzle and/or bed temperature for probing //#define PREHEAT_BEFORE_PROBING #if ENABLED(PREHEAT_BEFORE_PROBING) - #define PROBING_NOZZLE_TEMP 120 // (°C) Only applies to E0 at this time - #define PROBING_BED_TEMP 50 + #define PROBING_NOZZLE_TEMP 150 // (°C) Only applies to E0 at this time // MBO: change from 120 to 150 + #define PROBING_BED_TEMP 60 // MBO: change from 50 to 60 #endif // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 @@ -1872,7 +1877,8 @@ // After a runout is detected, continue printing this length of filament // before executing the runout script. Useful for a sensor at the end of // a feed tube. Requires 4 bytes SRAM per sensor, plus 4 bytes overhead. - #define FILAMENT_RUNOUT_DISTANCE_MM 8 + // TODO: to be changed after Sprite Pro and new filament sensor installation + #define FILAMENT_RUNOUT_DISTANCE_MM 8 // MBO #ifdef FILAMENT_RUNOUT_DISTANCE_MM // Enable this option to use an encoder disc that toggles the runout pin @@ -1943,10 +1949,10 @@ /** * Auto-leveling needs preheating */ -#define PREHEAT_BEFORE_LEVELING +#define PREHEAT_BEFORE_LEVELING // MBO #if ENABLED(PREHEAT_BEFORE_LEVELING) #define LEVELING_NOZZLE_TEMP 120 // (°C) Only applies to E0 at this time - #define LEVELING_BED_TEMP 50 + #define LEVELING_BED_TEMP 60 // #endif /** @@ -2150,7 +2156,7 @@ #define HOMING_FEEDRATE_MM_M { (20*60), (20*60), (4*60) } // Validate that endstops are triggered on homing moves -#define VALIDATE_HOMING_ENDSTOPS +#define VALIDATE_HOMING_ENDSTOPS // MBO: enable // @section calibrate @@ -2416,7 +2422,7 @@ * * View the current statistics with M78. */ -//#define PRINTCOUNTER +#define PRINTCOUNTER // MBO: enable #if ENABLED(PRINTCOUNTER) #define PRINTCOUNTER_SAVE_INTERVAL 60 // (minutes) EEPROM save interval during print. A value of 0 will save stats at end of print. #endif @@ -3354,17 +3360,17 @@ #endif // Support for Adafruit NeoPixel LED driver -#define NEOPIXEL_LED +#define NEOPIXEL_LED // MBO: enable #if ENABLED(NEOPIXEL_LED) #define NEOPIXEL_TYPE NEO_GRB // NEO_GRBW, NEO_RGBW, NEO_GRB, NEO_RBG, etc. // See https://github.com/adafruit/Adafruit_NeoPixel/blob/master/Adafruit_NeoPixel.h - #define NEOPIXEL_PIN PA8 // LED driving pin + #define NEOPIXEL_PIN PA8 // MBO: LED driving pin for BBT SKR E3 Mini v2.0 //#define NEOPIXEL2_TYPE NEOPIXEL_TYPE //#define NEOPIXEL2_PIN 5 - #define NEOPIXEL_PIXELS 17 // Number of LEDs in the strip. (Longest strip when NEOPIXEL2_SEPARATE is disabled.) - #define NEOPIXEL_IS_SEQUENTIAL // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once. - #define NEOPIXEL_BRIGHTNESS 127 // Initial brightness (0-255) - #define NEOPIXEL_STARTUP_TEST // Cycle through colors at startup + #define NEOPIXEL_PIXELS 17 // Number of LEDs in the strip. (Longest strip when NEOPIXEL2_SEPARATE is disabled.) // MBO: 17 + //#define NEOPIXEL_IS_SEQUENTIAL // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once. + #define NEOPIXEL_BRIGHTNESS 127 // Initial brightness (0-255) // MBO: 127 + #define NEOPIXEL_STARTUP_TEST // Cycle through colors at startup // MBO: enable // Support for second Adafruit NeoPixel LED driver controlled with M150 S1 ... //#define NEOPIXEL2_SEPARATE diff --git a/creality-ender3/Marlin-2.1.2.4/Marlin/Configuration_adv.h b/creality-ender3/Marlin-2.1.2.4/Marlin/Configuration_adv.h index bddf765..3d1a0f0 100644 --- a/creality-ender3/Marlin-2.1.2.4/Marlin/Configuration_adv.h +++ b/creality-ender3/Marlin-2.1.2.4/Marlin/Configuration_adv.h @@ -1032,23 +1032,25 @@ // // Add the G35 command to read bed corners to help adjust screws. Requires a bed probe. // -#define ASSISTED_TRAMMING +#define ASSISTED_TRAMMING // MBO: enable #if ENABLED(ASSISTED_TRAMMING) // Define from 3 to 9 points to probe. //#define TRAMMING_POINT_XY { { 35, 30 }, { 205, 30 }, { 205, 205 }, { 35, 205 } } - #define TRAMMING_POINT_XY { { 35, 30 }, { 180, 30 }, { 180, 200 }, { 35, 200 } } + //#define TRAMMING_POINT_XY { { 35, 200 }, { 35, 30 }, { 180, 30 }, { 180, 200 } } + // TODO: Change after Sprite Pro upgrade + #define TRAMMING_POINT_XY { { 27, 205 }, { 25, 35 }, { 184, 30 }, { 184, 205 } } // MBO // Define position names for probe points. - #define TRAMMING_POINT_NAME_1 "Front-Left" - #define TRAMMING_POINT_NAME_2 "Front-Right" - #define TRAMMING_POINT_NAME_3 "Back-Right" - #define TRAMMING_POINT_NAME_4 "Back-Left" + #define TRAMMING_POINT_NAME_1 "Back-Left" + #define TRAMMING_POINT_NAME_2 "Front-Left" + #define TRAMMING_POINT_NAME_3 "Front-Right" + #define TRAMMING_POINT_NAME_4 "Back-Right" #define RESTORE_LEVELING_AFTER_G35 // Enable to restore leveling setup after operation - //#define REPORT_TRAMMING_MM // Report Z deviation (mm) for each point relative to the first + #define REPORT_TRAMMING_MM // Report Z deviation (mm) for each point relative to the first // MBO: enable - #define ASSISTED_TRAMMING_WIZARD // Add a Tramming Wizard to the LCD menu + #define ASSISTED_TRAMMING_WIZARD // Add a Tramming Wizard to the LCD menu // MBO: enable //#define ASSISTED_TRAMMING_WAIT_POSITION { X_CENTER, Y_CENTER, 30 } // Move the nozzle out of the way for adjustment @@ -1085,8 +1087,8 @@ * X<1> Set the given parameters only for the X axis. * Y<1> Set the given parameters only for the Y axis. */ -#define INPUT_SHAPING_X -#define INPUT_SHAPING_Y +//#define INPUT_SHAPING_X +//#define INPUT_SHAPING_Y #if EITHER(INPUT_SHAPING_X, INPUT_SHAPING_Y) #if ENABLED(INPUT_SHAPING_X) #define SHAPING_FREQ_X 40 // (Hz) The default dominant resonant frequency on the X axis. @@ -2657,7 +2659,8 @@ // This short retract is done immediately, before parking the nozzle. #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 50 // (mm/s) Unload filament feedrate. This can be pretty fast. #define FILAMENT_CHANGE_UNLOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. - #define FILAMENT_CHANGE_UNLOAD_LENGTH 400 // (mm) The length of filament for a complete unload. + // TODO: Change FILAMENT_CHANGE_UNLOAD_LENGTH after Sprite Pro upgrade + #define FILAMENT_CHANGE_UNLOAD_LENGTH 400 // (mm) The length of filament for a complete unload. // MBO // For Bowden, the full length of the tube and nozzle. // For direct drive, the full length of the nozzle. // Set to 0 for manual unloading. @@ -2666,7 +2669,8 @@ // 0 to disable start loading and skip to fast load only #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 60 // (mm/s) Load filament feedrate. This can be pretty fast. #define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. - #define FILAMENT_CHANGE_FAST_LOAD_LENGTH 400 // (mm) Load length of filament, from extruder gear to nozzle. + // TODO: Change FILAMENT_CHANGE_FAST_LOAD_LENGTH after Sprite Pro upgrade + #define FILAMENT_CHANGE_FAST_LOAD_LENGTH 400 // (mm) Load length of filament, from extruder gear to nozzle. // MBO // For Bowden, the full length of the tube and nozzle. // For direct drive, the full length of the nozzle. //#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted.