diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index a973242932..e70942d04b 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,2 @@ -github: [thinkyhead] -patreon: thinkyhead -custom: ["https://www.thinkyhead.com/donate-to-marlin"] +github: [thisiskeithb] +ko_fi: thisiskeithb diff --git a/.github/workflows/test-ender-aio-build.yml b/.github/workflows/test-ender-aio-build.yml new file mode 100644 index 0000000000..017580adad --- /dev/null +++ b/.github/workflows/test-ender-aio-build.yml @@ -0,0 +1,46 @@ +# +# test-ender-aio-build.yml +# Do test build to catch compile errors +# + +name: EnderAIO CI + +on: + pull_request: + paths-ignore: + - config/** + - data/** + - docs/** + - '**/*.md' + push: + paths-ignore: + - config/** + - data/** + - docs/** + - '**/*.md' + +jobs: + test_builds: + name: Test Build + if: github.repository == 'thisiskeithb/EnderAIO' + + runs-on: ubuntu-latest + + steps: + - name: Check out the PR + uses: actions/checkout@v4 + + - name: Select Python 3.7 + uses: actions/setup-python@v3 + with: + python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax. + architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified + + - name: Install PlatformIO + run: | + pip install -U platformio + pio upgrade --dev + pio pkg update --global + + - name: Build Marlin + run: pio run diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 9a0cd1addc..60089da6a5 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -36,6 +36,7 @@ * Advanced settings can be found in Configuration_adv.h */ #define CONFIGURATION_H_VERSION 02010300 +#define ENDER_AIO_VERSION 20240202 //=========================================================================== //============================= Getting Started ============================= @@ -61,7 +62,7 @@ // @section info // Author info of this build printed to the host during boot and M115 -#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(thisiskeithb, Ender-3 AIO)" // Who made the changes. //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) // @section machine @@ -79,7 +80,7 @@ * * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] */ -#define SERIAL_PORT 0 +#define SERIAL_PORT -1 /** * Serial Port Baud Rate @@ -92,7 +93,7 @@ * * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ -#define BAUDRATE 250000 +#define BAUDRATE 115200 //#define BAUD_RATE_GCODE // Enable G-code M575 to set the baud rate @@ -116,7 +117,7 @@ //#define BLUETOOTH // Name displayed in the LCD "Ready" message and Info menu -//#define CUSTOM_MACHINE_NAME "3D Printer" +#define CUSTOM_MACHINE_NAME ENDER_AIO_CUSTOM_PRINTER_NAME // Printer's unique ID, used by some programs to differentiate between machines. // Choose your own or use a service like https://www.uuidgenerator.net/version4 @@ -139,9 +140,9 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', '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'] */ -#define X_DRIVER_TYPE A4988 -#define Y_DRIVER_TYPE A4988 -#define Z_DRIVER_TYPE A4988 +#define X_DRIVER_TYPE TMC2209 +#define Y_DRIVER_TYPE TMC2209 +#define Z_DRIVER_TYPE TMC2209 //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 @@ -153,7 +154,7 @@ //#define U_DRIVER_TYPE A4988 //#define V_DRIVER_TYPE A4988 //#define W_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE A4988 +#define E0_DRIVER_TYPE TMC2209 //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -556,8 +557,8 @@ #define TEMP_SENSOR_PROBE 0 #define TEMP_SENSOR_CHAMBER 0 #define TEMP_SENSOR_COOLER 0 -#define TEMP_SENSOR_BOARD 0 -#define TEMP_SENSOR_SOC 0 +#define TEMP_SENSOR_BOARD ENDER_AIO_TEMP_SENSOR_BOARD +#define TEMP_SENSOR_SOC ENDER_AIO_TEMP_SENSOR_SOC #define TEMP_SENSOR_REDUNDANT 0 // Dummy thermistor constant temperature readings, for use with 998 and 999 @@ -628,7 +629,7 @@ // 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 +#define HEATER_0_MAXTEMP ENDER_AIO_HEATER_0_MAXTEMP #define HEATER_1_MAXTEMP 275 #define HEATER_2_MAXTEMP 275 #define HEATER_3_MAXTEMP 275 @@ -636,7 +637,7 @@ #define HEATER_5_MAXTEMP 275 #define HEATER_6_MAXTEMP 275 #define HEATER_7_MAXTEMP 275 -#define BED_MAXTEMP 150 +#define BED_MAXTEMP 115 // 105 + 10 #define CHAMBER_MAXTEMP 60 /** @@ -662,7 +663,7 @@ * PIDTEMP : PID temperature control (~4.1K) * MPCTEMP : Predictive Model temperature control. (~1.8K without auto-tune) */ -#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning +//#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning //#define MPCTEMP // ** EXPERIMENTAL ** See https://marlinfw.org/docs/features/model_predictive_control.html #define PID_MAX 255 // Limit hotend current while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current @@ -680,9 +681,10 @@ #define DEFAULT_Ki_LIST { 1.08, 1.08 } #define DEFAULT_Kd_LIST { 114.00, 114.00 } #else - #define DEFAULT_Kp 22.20 - #define DEFAULT_Ki 1.08 - #define DEFAULT_Kd 114.00 + // Ender-3 + #define DEFAULT_Kp ENDER_AIO_DEFAULT_Kp + #define DEFAULT_Ki ENDER_AIO_DEFAULT_Ki + #define DEFAULT_Kd ENDER_AIO_DEFAULT_Kd #endif #else #define BANG_MAX 255 // Limit hotend current while in bang-bang mode; 255=full current @@ -698,20 +700,20 @@ */ #if ENABLED(MPCTEMP) #define MPC_AUTOTUNE // Include a method to do MPC auto-tuning (~6.3K bytes of flash) - //#define MPC_EDIT_MENU // Add MPC editing to the "Advanced Settings" menu. (~1.3K bytes of flash) - //#define MPC_AUTOTUNE_MENU // Add MPC auto-tuning to the "Advanced Settings" menu. (~350 bytes of flash) + #define MPC_EDIT_MENU // Add MPC editing to the "Advanced Settings" menu. (~1.3K bytes of flash) + #define MPC_AUTOTUNE_MENU // Add MPC auto-tuning to the "Advanced Settings" menu. (~350 bytes of flash) #define MPC_MAX 255 // (0..255) Current to nozzle while MPC is active. - #define MPC_HEATER_POWER { 40.0f } // (W) Heat cartridge powers. + #define MPC_HEATER_POWER ENDER_AIO_CUSTOM_MPC_HEATER_POWER // (W) Heat cartridge powers. #define MPC_INCLUDE_FAN // Model the fan speed? // Measured physical constants from M306 - #define MPC_BLOCK_HEAT_CAPACITY { 16.7f } // (J/K) Heat block heat capacities. - #define MPC_SENSOR_RESPONSIVENESS { 0.22f } // (K/s per ∆K) Rate of change of sensor temperature from heat block. - #define MPC_AMBIENT_XFER_COEFF { 0.068f } // (W/K) Heat transfer coefficients from heat block to room air with fan off. + #define MPC_BLOCK_HEAT_CAPACITY ENDER_AIO_CUSTOM_MPC_BLOCK_HEAT_CAPACITY // (J/K) Heat block heat capacities. + #define MPC_SENSOR_RESPONSIVENESS ENDER_AIO_CUSTOM_MPC_SENSOR_RESPONSIVENESS // (K/s per ∆K) Rate of change of sensor temperature from heat block. + #define MPC_AMBIENT_XFER_COEFF ENDER_AIO_CUSTOM_MPC_AMBIENT_XFER_COEFF // (W/K) Heat transfer coefficients from heat block to room air with fan off. #if ENABLED(MPC_INCLUDE_FAN) - #define MPC_AMBIENT_XFER_COEFF_FAN255 { 0.097f } // (W/K) Heat transfer coefficients from heat block to room air with fan on full. + #define MPC_AMBIENT_XFER_COEFF_FAN255 ENDER_AIO_CUSTOM_MPC_AMBIENT_XFER_COEFF_FAN255 // (W/K) Heat transfer coefficients from heat block to room air with fan on full. #endif // For one fan and multiple hotends MPC needs to know how to apply the fan cooling effect. @@ -722,10 +724,10 @@ // Filament Heat Capacity (joules/kelvin/mm) // Set at runtime with M306 H - #define FILAMENT_HEAT_CAPACITY_PERMM { 5.6e-3f } // 0.0056 J/K/mm for 1.75mm PLA (0.0149 J/K/mm for 2.85mm PLA). - // 0.0036 J/K/mm for 1.75mm PETG (0.0094 J/K/mm for 2.85mm PETG). - // 0.00515 J/K/mm for 1.75mm ABS (0.0137 J/K/mm for 2.85mm ABS). - // 0.00522 J/K/mm for 1.75mm Nylon (0.0138 J/K/mm for 2.85mm Nylon). + #define FILAMENT_HEAT_CAPACITY_PERMM ENDER_AIO_CUSTOM_FILAMENT_HEAT_CAPACITY_PERMM // 0.0056 J/K/mm for 1.75mm PLA (0.0149 J/K/mm for 2.85mm PLA). + // 0.0036 J/K/mm for 1.75mm PETG (0.0094 J/K/mm for 2.85mm PETG). + // 0.00515 J/K/mm for 1.75mm ABS (0.0137 J/K/mm for 2.85mm ABS). + // 0.00522 J/K/mm for 1.75mm Nylon (0.0138 J/K/mm for 2.85mm Nylon). // Advanced options #define MPC_SMOOTHING_FACTOR 0.5f // (0.0...1.0) Noisy temperature sensors may need a lower value for stabilization. @@ -762,17 +764,16 @@ * * With this option disabled, bang-bang will be used. BED_LIMIT_SWITCHING enables hysteresis. */ -//#define PIDTEMPBED +#define PIDTEMPBED #if ENABLED(PIDTEMPBED) //#define MIN_BED_POWER 0 //#define PID_BED_DEBUG // Print Bed PID debug data to the serial port. - // 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) - // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) - #define DEFAULT_bedKp 10.00 - #define DEFAULT_bedKi .023 - #define DEFAULT_bedKd 305.4 + // Ender-3 + #define DEFAULT_bedKp ENDER_AIO_DEFAULT_bedKp + #define DEFAULT_bedKi ENDER_AIO_DEFAULT_bedKi + #define DEFAULT_bedKd ENDER_AIO_DEFAULT_bedKd // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. #else @@ -833,8 +834,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) + #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash) #endif // @section safety @@ -854,7 +855,7 @@ * Note: For Bowden Extruders make this large enough to allow load/unload. */ #define PREVENT_LENGTHY_EXTRUDE -#define EXTRUDE_MAXLENGTH 200 +#define EXTRUDE_MAXLENGTH 600 //=========================================================================== //======================== Thermal Runaway Protection ======================= @@ -1172,7 +1173,7 @@ #define X_MAX_ENDSTOP_HIT_STATE HIGH #define Y_MIN_ENDSTOP_HIT_STATE HIGH #define Y_MAX_ENDSTOP_HIT_STATE HIGH -#define Z_MIN_ENDSTOP_HIT_STATE HIGH +#define Z_MIN_ENDSTOP_HIT_STATE ENDER_AIO_Z_MIN_ENDSTOP_HIT_STATE #define Z_MAX_ENDSTOP_HIT_STATE HIGH #define I_MIN_ENDSTOP_HIT_STATE HIGH #define I_MAX_ENDSTOP_HIT_STATE HIGH @@ -1186,7 +1187,7 @@ #define V_MAX_ENDSTOP_HIT_STATE HIGH #define W_MIN_ENDSTOP_HIT_STATE HIGH #define W_MAX_ENDSTOP_HIT_STATE HIGH -#define Z_MIN_PROBE_ENDSTOP_HIT_STATE HIGH +#define Z_MIN_PROBE_ENDSTOP_HIT_STATE Z_MIN_ENDSTOP_HIT_STATE // Enable this feature if all enabled endstop pins are interrupt-capable. // This will remove the need to poll the interrupt pins, saving many CPU cycles. @@ -1234,7 +1235,7 @@ * Override with M92 (when enabled below) * X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 500 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, ENDER_AIO_E_STEPS_PER_UNIT } /** * Enable support for M92. Disable to save at least ~530 bytes of flash. @@ -1246,7 +1247,7 @@ * Override with M203 * X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } +#define DEFAULT_MAX_FEEDRATE { 200, 200, 25, 25 } //#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 #if ENABLED(LIMITED_MAX_FR_EDITING) @@ -1259,7 +1260,7 @@ * Override with M201 * X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } +#define DEFAULT_MAX_ACCELERATION { 1300, 1300, 200, 5000 } //#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -1274,9 +1275,9 @@ * M204 R Retract Acceleration * M204 T Travel Acceleration */ -#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves -#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts -#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves +#define DEFAULT_ACCELERATION 1250 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_RETRACT_ACCELERATION 1250 // E acceleration for retracts +#define DEFAULT_TRAVEL_ACCELERATION 1250 // X, Y, Z acceleration for travel (non printing) moves /** * Default Jerk limits (mm/s) @@ -1286,12 +1287,12 @@ * 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 + #define DEFAULT_XJERK 8.0 + #define DEFAULT_YJERK 8.0 #define DEFAULT_ZJERK 0.3 - #define DEFAULT_EJERK 5.0 + #define DEFAULT_EJERK 10.0 //#define DEFAULT_IJERK 0.3 //#define DEFAULT_JJERK 0.3 //#define DEFAULT_KJERK 0.3 @@ -1315,7 +1316,7 @@ * https://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html */ #if DISABLED(CLASSIC_JERK) - #define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge + #define JUNCTION_DEVIATION_MM 0.08 // (mm) Distance from real junction edge #define JD_HANDLE_SMALL_SEGMENTS // Use curvature estimation instead of just the junction angle // for small segments (< 1mm) with large junction angles (> 135°). #endif @@ -1328,7 +1329,7 @@ * * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained */ -//#define S_CURVE_ACCELERATION +#define S_CURVE_ACCELERATION //=========================================================================== //============================= Z Probe Options ============================= @@ -1344,7 +1345,7 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Force the use of the probe for Z-axis homing //#define USE_PROBE_FOR_Z_HOMING @@ -1579,7 +1580,7 @@ * | [-] | * O-- FRONT --+ */ -#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } +#define NOZZLE_TO_PROBE_OFFSET ENDER_AIO_NOZZLE_TO_PROBE_OFFSET // Enable and set to use a specific tool for probing. Disable to allow any tool. #define PROBING_TOOL 0 @@ -1592,10 +1593,10 @@ #define PROBING_MARGIN 10 // X and Y axis travel speed (mm/min) between probes -#define XY_PROBE_FEEDRATE (133*60) +#define XY_PROBE_FEEDRATE (166*60) // Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2) -#define Z_PROBE_FEEDRATE_FAST (4*60) +#define Z_PROBE_FEEDRATE_FAST (8*60) // Feedrate (mm/min) for the "accurate" probe of each point #define Z_PROBE_FEEDRATE_SLOW (Z_PROBE_FEEDRATE_FAST / 2) @@ -1645,8 +1646,8 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -//#define MULTIPLE_PROBING 2 -//#define EXTRA_PROBING 1 +#define MULTIPLE_PROBING 2 +#define EXTRA_PROBING 1 /** * Z probes require clearance when deploying, stowing, and moving between @@ -1662,11 +1663,11 @@ * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_CLEARANCE_DEPLOY_PROBE 10 // (mm) Z Clearance for Deploy/Stow +#define Z_CLEARANCE_DEPLOY_PROBE 5 // (mm) Z Clearance for Deploy/Stow #define Z_CLEARANCE_BETWEEN_PROBES 5 // (mm) Z Clearance between probe points #define Z_CLEARANCE_MULTI_PROBE 5 // (mm) Z Clearance between multiple probes -#define Z_PROBE_ERROR_TOLERANCE 3 // (mm) Tolerance for early trigger (<= -probe.offset.z + ZPET) -//#define Z_AFTER_PROBING 5 // (mm) Z position after probing is done +//#define Z_PROBE_ERROR_TOLERANCE 3 // (mm) Tolerance for early trigger (<= -probe.offset.z + ZPET) +#define Z_AFTER_PROBING 5 // (mm) Z position after probing is done #define Z_PROBE_LOW_POINT -2 // (mm) Farthest distance below the trigger-point to go before stopping @@ -1675,11 +1676,11 @@ //#define PROBE_OFFSET_XMAX 50 // (mm) //#define PROBE_OFFSET_YMIN -50 // (mm) //#define PROBE_OFFSET_YMAX 50 // (mm) -//#define PROBE_OFFSET_ZMIN -20 // (mm) -//#define PROBE_OFFSET_ZMAX 20 // (mm) +#define PROBE_OFFSET_ZMIN -5 // (mm) +#define PROBE_OFFSET_ZMAX 1 // (mm) // Enable the M48 repeatability test to test probe accuracy -//#define Z_MIN_PROBE_REPEATABILITY_TEST +#define Z_MIN_PROBE_REPEATABILITY_TEST // Before deploy/stow pause for user confirmation //#define PAUSE_BEFORE_DEPLOY_STOW @@ -1747,9 +1748,9 @@ // @section motion // 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 true -#define INVERT_Z_DIR false +#define INVERT_X_DIR ENDER_AIO_INVERT_X_DIR +#define INVERT_Y_DIR ENDER_AIO_INVERT_Y_DIR +#define INVERT_Z_DIR ENDER_AIO_INVERT_Z_DIR //#define INVERT_I_DIR false //#define INVERT_J_DIR false //#define INVERT_K_DIR false @@ -1760,7 +1761,7 @@ // @section extruder // For direct drive extruder v9 set to true, for geared extruder set to false. -#define INVERT_E0_DIR false +#define INVERT_E0_DIR ENDER_AIO_INVERT_E0_DIR #define INVERT_E1_DIR false #define INVERT_E2_DIR false #define INVERT_E3_DIR false @@ -1819,16 +1820,16 @@ // @section geometry // The size of the printable area -#define X_BED_SIZE 200 -#define Y_BED_SIZE 200 +#define X_BED_SIZE 235 +#define Y_BED_SIZE 235 // Travel limits (linear=mm, rotational=°) after homing, corresponding to endstop positions. -#define X_MIN_POS 0 -#define Y_MIN_POS 0 +#define X_MIN_POS -1 +#define Y_MIN_POS -2 #define Z_MIN_POS 0 -#define X_MAX_POS X_BED_SIZE +#define X_MAX_POS (X_BED_SIZE + 10) #define Y_MAX_POS Y_BED_SIZE -#define Z_MAX_POS 200 +#define Z_MAX_POS 250 //#define I_MIN_POS 0 //#define I_MAX_POS 50 //#define J_MIN_POS 0 @@ -1880,7 +1881,7 @@ #endif #if ANY(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS) - //#define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD + #define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD #endif /** @@ -1896,9 +1897,9 @@ * RAMPS-based boards use SERVO3_PIN for the first runout sensor. * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc. */ -//#define FILAMENT_RUNOUT_SENSOR +#define FILAMENT_RUNOUT_SENSOR #if ENABLED(FILAMENT_RUNOUT_SENSOR) - #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. + #define FIL_RUNOUT_ENABLED_DEFAULT false // Enable the sensor on startup. Override with M412 followed by M500. #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. #define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present. @@ -2055,7 +2056,7 @@ * leveling immediately after G28. */ //#define RESTORE_LEVELING_AFTER_G28 -//#define ENABLE_LEVELING_AFTER_G28 +#define ENABLE_LEVELING_AFTER_G28 /** * Auto-leveling needs preheating @@ -2084,7 +2085,7 @@ * at which point movement will be level to the machine's XY plane. * The height can be set with M420 Z */ - #define ENABLE_LEVELING_FADE_HEIGHT + //#define ENABLE_LEVELING_FADE_HEIGHT #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) #define DEFAULT_LEVELING_FADE_HEIGHT 10.0 // (mm) Default fade height. #endif @@ -2100,11 +2101,11 @@ /** * Enable the G26 Mesh Validation Pattern tool. */ - //#define G26_MESH_VALIDATION + #define G26_MESH_VALIDATION #if ENABLED(G26_MESH_VALIDATION) #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. #define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for G26. - #define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for G26. + #define MESH_TEST_HOTEND_TEMP 210 // (°C) Default nozzle temperature for G26. #define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for G26. #define G26_XY_FEEDRATE 20 // (mm/s) Feedrate for G26 XY moves. #define G26_XY_FEEDRATE_TRAVEL 100 // (mm/s) Feedrate for G26 XY travel moves. @@ -2116,7 +2117,7 @@ #if ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR) // Set the number of grid points per dimension. - #define GRID_MAX_POINTS_X 3 + #define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X // Probe along the Y axis, advancing X after each column @@ -2126,13 +2127,13 @@ // Beyond the probed grid, continue the implied tilt? // Default is to maintain the height of the nearest edge. - //#define EXTRAPOLATE_BEYOND_GRID + #define EXTRAPOLATE_BEYOND_GRID // // Subdivision of the grid by Catmull-Rom method. // Synthesizes intermediate points to produce a more detailed mesh. // - //#define ABL_BILINEAR_SUBDIVISION + #define ABL_BILINEAR_SUBDIVISION #if ENABLED(ABL_BILINEAR_SUBDIVISION) // Number of subdivisions between probe points #define BILINEAR_SUBDIVISIONS 3 @@ -2202,19 +2203,19 @@ * Add a bed leveling sub-menu for ABL or MBL. * Include a guided procedure if manual probing is enabled. */ -//#define LCD_BED_LEVELING +#define LCD_BED_LEVELING #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. #define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment - //#define MESH_EDIT_MENU // Add a menu to edit mesh points + #define MESH_EDIT_MENU // Add a menu to edit mesh points #endif // Add a menu item to move between bed corners for manual bed adjustment //#define LCD_BED_TRAMMING #if ENABLED(LCD_BED_TRAMMING) - #define BED_TRAMMING_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets + #define BED_TRAMMING_INSET_LFRB { 32, 32, 32, 32 } // (mm) Left, Front, Right, Back insets #define BED_TRAMMING_HEIGHT 0.0 // (mm) Z height of nozzle at tramming points #define BED_TRAMMING_Z_HOP 4.0 // (mm) Z height of nozzle between tramming points //#define BED_TRAMMING_INCLUDE_CENTER // Move to the center after the last corner @@ -2278,7 +2279,7 @@ #endif // Homing speeds (linear=mm/min, rotational=°/min) -#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (4*60) } +#define HOMING_FEEDRATE_MM_M ENDER_AIO_HOMING_FEEDRATE_MM_M // Validate that endstops are triggered on homing moves #define VALIDATE_HOMING_ENDSTOPS @@ -2356,13 +2357,13 @@ * M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) */ -//#define EEPROM_SETTINGS // Persistent storage with M500 and M501 +#define EEPROM_SETTINGS // Persistent storage with M500 and M501 //#define DISABLE_M503 // Saves ~2700 bytes of flash. Disable for release! #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save flash. #define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load #if ENABLED(EEPROM_SETTINGS) - //#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. - //#define EEPROM_INIT_NOW // Init EEPROM on first boot after a new build. + #define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. + #define EEPROM_INIT_NOW // Init EEPROM on first boot after a new build. #endif // @section host @@ -2395,17 +2396,29 @@ // Preheat Constants - Up to 10 are supported without changes // #define PREHEAT_1_LABEL "PLA" -#define PREHEAT_1_TEMP_HOTEND 180 +#define PREHEAT_1_TEMP_HOTEND 210 #define PREHEAT_1_TEMP_BED 70 #define PREHEAT_1_TEMP_CHAMBER 35 #define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 -#define PREHEAT_2_LABEL "ABS" -#define PREHEAT_2_TEMP_HOTEND 240 -#define PREHEAT_2_TEMP_BED 110 +#define PREHEAT_2_LABEL "HTPLA" +#define PREHEAT_2_TEMP_HOTEND 225 +#define PREHEAT_2_TEMP_BED 70 #define PREHEAT_2_TEMP_CHAMBER 35 #define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 +#define PREHEAT_3_LABEL "PETG" +#define PREHEAT_3_TEMP_HOTEND 235 +#define PREHEAT_3_TEMP_BED 80 +#define PREHEAT_3_TEMP_CHAMBER 35 +#define PREHEAT_3_FAN_SPEED 0 // Value from 0 to 255 + +#define PREHEAT_4_LABEL "ABS" +#define PREHEAT_4_TEMP_HOTEND 255 +#define PREHEAT_4_TEMP_BED 105 +#define PREHEAT_4_TEMP_CHAMBER 35 +#define PREHEAT_4_FAN_SPEED 0 // Value from 0 to 255 + // @section motion /** @@ -2419,11 +2432,11 @@ * P1 Raise the nozzle always to Z-park height. * P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS. */ -//#define NOZZLE_PARK_FEATURE +#define NOZZLE_PARK_FEATURE #if ENABLED(NOZZLE_PARK_FEATURE) // Specify a park position as { X, Y, Z_raise } - #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 } + #define NOZZLE_PARK_POINT { (X_MAX_POS - 10), (Y_MIN_POS + 10), 20 } #define NOZZLE_PARK_MOVE 0 // Park motion: 0 = XY Move, 1 = X Only, 2 = Y Only, 3 = X before Y, 4 = Y before X #define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance #define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z axis) @@ -2553,9 +2566,9 @@ * * View the current statistics with M78. */ -//#define PRINTCOUNTER +#define PRINTCOUNTER #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. + #define PRINTCOUNTER_SAVE_INTERVAL ENDER_AIO_PRINTCOUNTER_SAVE_INTERVAL // (minutes) EEPROM save interval during print. A value of 0 will save stats at end of print. #endif // @section security @@ -2607,7 +2620,7 @@ * * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek (Greece)', 'el_CY':'Greek (Cyprus)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'sv':'Swedish', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)' } */ -#define LCD_LANGUAGE en +#define LCD_LANGUAGE ENDER_AIO_LCD_LANGUAGE /** * LCD Character Set @@ -2646,14 +2659,14 @@ * SD Card support is disabled by default. If your controller has an SD slot, * you must uncomment the following option or it won't work. */ -//#define SDSUPPORT +#define SDSUPPORT /** * SD CARD: ENABLE CRC * * Use CRC checks and retries on the SD communication. */ -//#define SD_CHECK_AND_RETRY +#define SD_CHECK_AND_RETRY /** * LCD Menu Items @@ -2726,8 +2739,8 @@ // // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu. // -//#define INDIVIDUAL_AXIS_HOMING_MENU -//#define INDIVIDUAL_AXIS_HOMING_SUBMENU +#define INDIVIDUAL_AXIS_HOMING_MENU +#define INDIVIDUAL_AXIS_HOMING_SUBMENU // // SPEAKER/BUZZER @@ -2735,7 +2748,7 @@ // If you have a speaker that can produce tones, enable it here. // By default Marlin assumes you have a buzzer with a fixed frequency. // -//#define SPEAKER +#define SPEAKER // // The duration and frequency for the UI feedback sound. @@ -3453,7 +3466,7 @@ // Set number of user-controlled fans. Disable to use all board-defined fans. // :[1,2,3,4,5,6,7,8] -//#define NUM_M106_FANS 1 +#define NUM_M106_FANS 1 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency // which is not as annoying as with the hardware PWM. On the other hand, if this frequency diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 49eea39180..579d47c0d6 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -31,6 +31,7 @@ * Basic settings can be found in Configuration.h */ #define CONFIGURATION_ADV_H_VERSION 02010300 +#define ENDER_AIO_VERSION 20240202 // @section develop @@ -304,8 +305,8 @@ * THERMAL_PROTECTION_HYSTERESIS and/or THERMAL_PROTECTION_PERIOD */ #if ENABLED(THERMAL_PROTECTION_HOTENDS) - #define THERMAL_PROTECTION_PERIOD 40 // (seconds) - #define THERMAL_PROTECTION_HYSTERESIS 4 // (°C) + #define THERMAL_PROTECTION_PERIOD 60 // (seconds) + #define THERMAL_PROTECTION_HYSTERESIS 10 // (°C) //#define ADAPTIVE_FAN_SLOWING // Slow down the part-cooling fan if the temperature drops #if ENABLED(ADAPTIVE_FAN_SLOWING) @@ -335,13 +336,13 @@ * Thermal Protection parameters for the bed are just as above for hotends. */ #if ENABLED(THERMAL_PROTECTION_BED) - #define THERMAL_PROTECTION_BED_PERIOD 20 // (seconds) + #define THERMAL_PROTECTION_BED_PERIOD 180 // (seconds) #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // (°C) /** * As described above, except for the bed (M140/M190/M303). */ - #define WATCH_BED_TEMP_PERIOD 60 // (seconds) + #define WATCH_BED_TEMP_PERIOD 180 // (seconds) #define WATCH_BED_TEMP_INCREASE 2 // (°C) #endif @@ -547,10 +548,10 @@ * Hotend Idle Timeout * Prevent filament in the nozzle from charring and causing a critical jam. */ -//#define HOTEND_IDLE_TIMEOUT +#define HOTEND_IDLE_TIMEOUT #if ENABLED(HOTEND_IDLE_TIMEOUT) #define HOTEND_IDLE_TIMEOUT_SEC (5*60) // (seconds) Time without extruder movement to trigger protection - #define HOTEND_IDLE_MIN_TRIGGER 180 // (°C) Minimum temperature to enable hotend protection + #define HOTEND_IDLE_MIN_TRIGGER 160 // (°C) Minimum temperature to enable hotend protection #define HOTEND_IDLE_NOZZLE_TARGET 0 // (°C) Safe temperature for the nozzle after timeout #define HOTEND_IDLE_BED_TARGET 0 // (°C) Safe temperature for the bed after timeout #endif @@ -575,10 +576,10 @@ */ //#define USE_CONTROLLER_FAN #if ENABLED(USE_CONTROLLER_FAN) - //#define CONTROLLER_FAN_PIN -1 // Set a custom pin for the controller fan + #define CONTROLLER_FAN_PIN ENDER_AIO_CONTROLLER_FAN_PIN // Set a custom pin for the controller fan //#define CONTROLLER_FAN2_PIN -1 // Set a custom pin for second controller fan //#define CONTROLLER_FAN_USE_Z_ONLY // With this option only the Z axis is considered - //#define CONTROLLER_FAN_IGNORE_Z // Ignore Z stepper. Useful when stepper timeout is disabled. + #define CONTROLLER_FAN_IGNORE_Z // Ignore Z stepper. Useful when stepper timeout is disabled. #define CONTROLLERFAN_SPEED_MIN 0 // (0-255) Minimum speed. (If set below this value the fan is turned off.) #define CONTROLLERFAN_SPEED_ACTIVE 255 // (0-255) Active speed, used when any motor is enabled #define CONTROLLERFAN_SPEED_IDLE 0 // (0-255) Idle speed, used when motors are disabled @@ -602,7 +603,7 @@ * gets it spinning reliably for a short time before setting the requested speed. * (Does not work on Sanguinololu with FAN_SOFT_PWM.) */ -//#define FAN_KICKSTART_TIME 100 // (ms) +#define FAN_KICKSTART_TIME 800 // (ms) //#define FAN_KICKSTART_POWER 180 // 64-255 // Some coolers may require a non-zero "off" state. @@ -620,7 +621,7 @@ * * Define one or both of these to override the default 0-255 range. */ -//#define FAN_MIN_PWM 50 +#define FAN_MIN_PWM 65 //#define FAN_MAX_PWM 128 /** @@ -681,7 +682,7 @@ * Multiple extruders can be assigned to the same pin in which case * the fan will turn on when any selected extruder is above the threshold. */ -#define E0_AUTO_FAN_PIN -1 +#define E0_AUTO_FAN_PIN FAN1_PIN #define E1_AUTO_FAN_PIN -1 #define E2_AUTO_FAN_PIN -1 #define E3_AUTO_FAN_PIN -1 @@ -923,7 +924,7 @@ * the position of the toolhead relative to the workspace. */ -//#define SENSORLESS_BACKOFF_MM { 2, 2, 0 } // (linear=mm, rotational=°) Backoff from endstops before sensorless homing +#define SENSORLESS_BACKOFF_MM { 5, 5, 0 } // (linear=mm, rotational=°) Backoff from endstops before sensorless homing #define HOMING_BUMP_MM { 5, 5, 2 } // (linear=mm, rotational=°) Backoff from endstops after first bump #define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate) @@ -931,7 +932,7 @@ //#define HOMING_BACKOFF_POST_MM { 2, 2, 2 } // (linear=mm, rotational=°) Backoff from endstops after homing //#define XY_COUNTERPART_BACKOFF_MM 0 // (mm) Backoff X after homing Y, and vice-versa -//#define QUICK_HOME // If G28 contains XY do a diagonal move first +#define QUICK_HOME // If G28 contains XY do a diagonal move first //#define HOME_Y_BEFORE_X // If G28 contains XY home Y before X //#define HOME_Z_FIRST // Home Z first. Requires a real endstop (not a probe). //#define CODEPENDENT_XY_HOMING // If X/Y can't home without homing Y/X first @@ -956,7 +957,7 @@ // Safety: The probe needs time to recognize the command. // Minimum command delay (ms). Enable and increase if needed. - //#define BLTOUCH_DELAY 500 + #define BLTOUCH_DELAY 200 /** * Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones: @@ -1003,13 +1004,13 @@ * * Set the default state here, change with 'M401 S' or UI, use M500 to save, M502 to reset. */ - //#define BLTOUCH_HS_MODE true + #define BLTOUCH_HS_MODE true #ifdef BLTOUCH_HS_MODE // The probe Z offset (M851 Z) is the height at which the probe triggers. // This must be large enough to keep the probe pin off the bed and prevent // it from snagging on the bed clips. - #define BLTOUCH_HS_EXTRA_CLEARANCE 7 // Extra Z Clearance + #define BLTOUCH_HS_EXTRA_CLEARANCE 0 // Extra Z Clearance #endif #endif // BLTOUCH @@ -1086,18 +1087,19 @@ #if ENABLED(ASSISTED_TRAMMING) // Define from 3 to 9 points to probe. - #define TRAMMING_POINT_XY { { 20, 20 }, { 180, 20 }, { 180, 180 }, { 20, 180 } } + #define TRAMMING_POINT_XY { {X_CENTER, Y_CENTER }, { 32, 32 }, { 203, 32 }, { 203, 203 }, { 32, 203 } } // 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 "Center" + #define TRAMMING_POINT_NAME_2 "Front-Left" + #define TRAMMING_POINT_NAME_3 "Front-Right" + #define TRAMMING_POINT_NAME_4 "Back-Right" + #define TRAMMING_POINT_NAME_5 "Back-Left" #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 ASSISTED_TRAMMING_WIZARD // Add a Tramming Wizard to the LCD menu + #define ASSISTED_TRAMMING_WIZARD // Add a Tramming Wizard to the LCD menu //#define ASSISTED_TRAMMING_WAIT_POSITION { X_CENTER, Y_CENTER, 30 } // Move the nozzle out of the way for adjustment @@ -1107,7 +1109,7 @@ * M4: 40 = Clockwise, 41 = Counter-Clockwise * M5: 50 = Clockwise, 51 = Counter-Clockwise */ - #define TRAMMING_SCREW_THREAD 30 + #define TRAMMING_SCREW_THREAD 40 #endif @@ -1204,12 +1206,12 @@ //#define INPUT_SHAPING_Y #if ANY(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. - #define SHAPING_ZETA_X 0.15f // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping). + #define SHAPING_FREQ_X ENDER_AIO_SHAPING_FREQ_X // (Hz) The default dominant resonant frequency on the X axis. + #define SHAPING_ZETA_X ENDER_AIO_SHAPING_ZETA_X // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping). #endif #if ENABLED(INPUT_SHAPING_Y) - #define SHAPING_FREQ_Y 40 // (Hz) The default dominant resonant frequency on the Y axis. - #define SHAPING_ZETA_Y 0.15f // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping). + #define SHAPING_FREQ_Y ENDER_AIO_SHAPING_FREQ_Y // (Hz) The default dominant resonant frequency on the Y axis. + #define SHAPING_ZETA_Y ENDER_AIO_SHAPING_ZETA_Y // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping). #endif //#define SHAPING_MIN_FREQ 20 // By default the minimum of the shaping frequencies. Override to affect SRAM usage. //#define SHAPING_MAX_STEPRATE 10000 // By default the maximum total step rate of the shaped axes. Override to affect SRAM usage. @@ -1243,7 +1245,7 @@ #define DEFAULT_STEPPER_TIMEOUT_SEC 120 #define DISABLE_IDLE_X #define DISABLE_IDLE_Y -#define DISABLE_IDLE_Z // Disable if the nozzle could fall onto your printed part! +//#define DISABLE_IDLE_Z // Disable if the nozzle could fall onto your printed part! //#define DISABLE_IDLE_I //#define DISABLE_IDLE_J //#define DISABLE_IDLE_K @@ -1263,7 +1265,7 @@ // Increase the slowdown divisor for larger buffer sizes. #define SLOWDOWN #if ENABLED(SLOWDOWN) - #define SLOWDOWN_DIVISOR 2 + #define SLOWDOWN_DIVISOR 4 #endif /** @@ -1500,10 +1502,10 @@ * Use a height slightly above the estimated nozzle-to-probe Z offset. * For example, with an offset of -5, consider a starting height of -4. */ - //#define PROBE_OFFSET_WIZARD_START_Z -4.0 + #define PROBE_OFFSET_WIZARD_START_Z -4.0 // Set a convenient position to do the calibration (probing point and nozzle/bed-distance) - //#define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER } + #define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER } #endif #endif @@ -1529,7 +1531,7 @@ #endif // Include a page of printer information in the LCD Main Menu - //#define LCD_INFO_MENU + #define LCD_INFO_MENU #if ENABLED(LCD_INFO_MENU) //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages #endif @@ -1554,7 +1556,7 @@ #define MANUAL_MOVE_DISTANCE_DEG 90, 45, 22.5, 5, 1 // (°) // BACK menu items keep the highlight at the top - //#define TURBO_BACK_MENU_ITEM + #define TURBO_BACK_MENU_ITEM // Insert a menu for preheating at the top level to allow for quick access //#define PREHEAT_SHORTCUT_MENU_ITEM @@ -1579,10 +1581,10 @@ #if ENABLED(SHOW_BOOTSCREEN) #define BOOTSCREEN_TIMEOUT 3000 // (ms) Total Duration to display the boot screen(s) #if ANY(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI) - #define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving lots of flash) + //#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving lots of flash) #endif #if HAS_MARLINUI_U8GLIB - //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of flash. + #define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of flash. #endif #if ANY(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE) //#define SHOW_CUSTOM_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup. @@ -1593,7 +1595,7 @@ //#define CUSTOM_STATUS_SCREEN_IMAGE // Show the bitmap in Marlin/_Statusscreen.h on the status screen. #endif - //#define SOUND_MENU_ITEM // Add a mute option to the LCD menu + #define SOUND_MENU_ITEM // Add a mute option to the LCD menu #define SOUND_ON_DEFAULT // Buzzer/speaker default enabled state #if HAS_WIRED_LCD @@ -1604,7 +1606,7 @@ //#define LCD_TIMEOUT_TO_STATUS 15000 // (ms) // Scroll a longer status message into view - //#define STATUS_MESSAGE_SCROLLING + #define STATUS_MESSAGE_SCROLLING // Apply a timeout to low-priority status messages //#define STATUS_MESSAGE_TIMEOUT_SEC 30 // (seconds) @@ -1613,7 +1615,7 @@ //#define LCD_DECIMAL_SMALL_XY // Show the E position (filament used) during printing - //#define LCD_SHOW_E_TOTAL + #define LCD_SHOW_E_TOTAL // Display a negative temperature instead of "err" //#define SHOW_TEMPERATURE_BELOW_ZERO @@ -1656,7 +1658,7 @@ #endif // Add 'M73' to set print job progress, overrides Marlin's built-in estimate -//#define SET_PROGRESS_MANUALLY +#define SET_PROGRESS_MANUALLY #if ENABLED(SET_PROGRESS_MANUALLY) #define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time @@ -1671,7 +1673,7 @@ #if HAS_DISPLAY && ANY(HAS_MEDIA, SET_PROGRESS_MANUALLY) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') - //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') + #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #if ENABLED(SET_INTERACTION_TIME) #define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change) #endif @@ -1713,7 +1715,7 @@ #define SD_PROCEDURE_DEPTH 1 // Increase if you need more nested M32 calls #define SD_FINISHED_STEPPERRELEASE true // Disable steppers when SD Print is finished - #define SD_FINISHED_RELEASECOMMAND "M84" // Use "M84XYE" to keep Z enabled so your bed stays in place + //#define SD_FINISHED_RELEASECOMMAND "M84" // Use "M84XYE" to keep Z enabled so your bed stays in place // Reverse SD sort to show "more recent" files first, according to the card's FAT. // Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended. @@ -1725,11 +1727,11 @@ //#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files //#define ONE_CLICK_PRINT // Prompt to print the newest file on inserted media - //#define BROWSE_MEDIA_ON_INSERT // Open the file browser when media is inserted + #define BROWSE_MEDIA_ON_INSERT // Open the file browser when media is inserted //#define MEDIA_MENU_AT_TOP // Force the media menu to be listed on the top of the main menu - #define EVENT_GCODE_SD_ABORT "G28XY" // G-code to run on SD Abort Print (e.g., "G28XY" or "G27") + #define EVENT_GCODE_SD_ABORT "G28XY\n" SD_FINISHED_RELEASECOMMAND // G-code to run on SD Abort Print (e.g., "G28XY" or "G27") #if ENABLED(PRINTER_EVENT_LEDS) #define PE_LEDS_COMPLETED_TIME (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination @@ -1795,7 +1797,7 @@ * - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!) * - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!) */ - //#define SDCARD_SORT_ALPHA + #define SDCARD_SORT_ALPHA // SD Card Sorting options #if ENABLED(SDCARD_SORT_ALPHA) @@ -1815,11 +1817,11 @@ // LCD's font must contain the characters. Check your selected LCD language. //#define UTF_FILENAME_SUPPORT - //#define LONG_FILENAME_HOST_SUPPORT // Get the long filename of a file/folder with 'M33 ' and list long filenames with 'M20 L' - //#define LONG_FILENAME_WRITE_SUPPORT // Create / delete files with long filenames via M28, M30, and Binary Transfer Protocol + #define LONG_FILENAME_HOST_SUPPORT // Get the long filename of a file/folder with 'M33 ' and list long filenames with 'M20 L' + #define LONG_FILENAME_WRITE_SUPPORT // Create / delete files with long filenames via M28, M30, and Binary Transfer Protocol //#define M20_TIMESTAMP_SUPPORT // Include timestamps by adding the 'T' flag to M20 commands - //#define SCROLL_LONG_FILENAMES // Scroll long filenames in the SD card menu + #define SCROLL_LONG_FILENAMES // Scroll long filenames in the SD card menu //#define SD_ABORT_NO_COOLDOWN // Leave the heaters on after Stop Print (not recommended!) @@ -1835,7 +1837,7 @@ //#define SD_REPRINT_LAST_SELECTED_FILE // On print completion open the LCD Menu and select the same file - //#define AUTO_REPORT_SD_STATUS // Auto-report media status with 'M27 S' + #define AUTO_REPORT_SD_STATUS // Auto-report media status with 'M27 S' /** * Support for USB thumb drives using an Arduino USB Host Shield or @@ -1904,7 +1906,7 @@ //#define CONFIGURATION_EMBEDDING // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define BINARY_FILE_TRANSFER + #define BINARY_FILE_TRANSFER #if ENABLED(BINARY_FILE_TRANSFER) // Include extra facilities (e.g., 'M20 F') supporting firmware upload via BINARY_FILE_TRANSFER @@ -1920,7 +1922,7 @@ * * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ] */ - //#define SDCARD_CONNECTION LCD + #define SDCARD_CONNECTION ENDER_AIO_SDCARD_CONNECTION // Enable if SD detect is rendered useless (e.g., by using an SD extender) //#define NO_SD_DETECT @@ -1964,7 +1966,7 @@ // A bigger font is available for edit items. Costs 3120 bytes of flash. // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese. - //#define USE_BIG_EDIT_FONT + #define USE_BIG_EDIT_FONT // A smaller font may be used on the Info Screen. Costs 2434 bytes of flash. // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese. @@ -2019,11 +2021,11 @@ //#define STATUS_COOLER_ANIM // Use a second bitmap to indicate laser cooling //#define STATUS_FLOWMETER_ANIM // Use multiple bitmaps to indicate coolant flow //#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap - //#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap - //#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames + #define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap + #define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames // Only one STATUS_HEAT_* option can be enabled - //#define STATUS_HEAT_PERCENT // Show heating in a progress bar + #define STATUS_HEAT_PERCENT // Show heating in a progress bar //#define STATUS_HEAT_POWER // Show heater output power as a vertical bar // Frivolous Game Options @@ -2270,7 +2272,7 @@ * * Warning: Does not respect endstops! */ -//#define BABYSTEPPING +#define BABYSTEPPING #if ENABLED(BABYSTEPPING) //#define EP_BABYSTEPPING // M293/M294 babystepping with EMERGENCY_PARSER support //#define BABYSTEP_WITHOUT_HOMING @@ -2278,16 +2280,16 @@ //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! //#define BABYSTEP_INVERT_Z // Enable if Z babysteps should go the other way //#define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps - #define BABYSTEP_MULTIPLICATOR_Z 1 // (steps or mm) Steps or millimeter distance for each Z babystep + #define BABYSTEP_MULTIPLICATOR_Z 5 // (steps or mm) Steps or millimeter distance for each Z babystep #define BABYSTEP_MULTIPLICATOR_XY 1 // (steps or mm) Steps or millimeter distance for each XY babystep - //#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. #if ENABLED(DOUBLECLICK_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 MOVE_Z_WHEN_IDLE // Jump to the move Z menu on double-click when printer is idle. + #define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on double-click when printer is idle. #if ENABLED(MOVE_Z_WHEN_IDLE) - #define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size. + #define MOVE_Z_IDLE_MULTIPLICATOR 2 // Multiply 1mm by this factor for the move step size. #endif #endif @@ -2296,7 +2298,7 @@ //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping #if ENABLED(BABYSTEP_ZPROBE_OFFSET) //#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets - //#define BABYSTEP_GFX_OVERLAY // Enable graphical overlay on Z-offset editor + #define BABYSTEP_GFX_OVERLAY // Enable graphical overlay on Z-offset editor #endif #endif @@ -2317,12 +2319,12 @@ * * See https://marlinfw.org/docs/features/lin_advance.html for full instructions. */ -//#define LIN_ADVANCE +#define LIN_ADVANCE #if ENABLED(LIN_ADVANCE) #if ENABLED(DISTINCT_E_FACTORS) #define ADVANCE_K { 0.22 } // (mm) Compression length per 1mm/s extruder speed, per extruder #else - #define ADVANCE_K 0.22 // (mm) Compression length applying to all extruders + #define ADVANCE_K 0.0 // (mm) Compression length applying to all extruders #endif //#define ADVANCE_K_EXTRA // Add a second linear advance constant, configurable with M900 L. //#define LA_DEBUG // Print debug information to serial during operation. Disable for production use. @@ -2385,7 +2387,7 @@ */ #if PROBE_SELECTED && !IS_KINEMATIC //#define PROBING_MARGIN_LEFT PROBING_MARGIN - //#define PROBING_MARGIN_RIGHT PROBING_MARGIN + #define PROBING_MARGIN_RIGHT 0 //#define PROBING_MARGIN_FRONT PROBING_MARGIN //#define PROBING_MARGIN_BACK PROBING_MARGIN #endif @@ -2408,15 +2410,15 @@ */ //#define G29_RETRY_AND_RECOVER #if ENABLED(G29_RETRY_AND_RECOVER) - #define G29_MAX_RETRIES 3 + #define G29_MAX_RETRIES 0 #define G29_HALT_ON_FAILURE /** * Specify the GCODE commands that will be executed when leveling succeeds, * between attempts, and after the maximum number of retries have been tried. */ - #define G29_SUCCESS_COMMANDS "M117 Bed leveling done." - #define G29_RECOVER_COMMANDS "M117 Probe failed. Rewiping.\nG28\nG12 P0 S12 T0" - #define G29_FAILURE_COMMANDS "M117 Bed leveling failed.\nG0 Z10\nM300 P25 S880\nM300 P50 S0\nM300 P25 S880\nM300 P50 S0\nM300 P25 S880\nM300 P50 S0\nG4 S1" + //#define G29_SUCCESS_COMMANDS "M117 Bed leveling done." + //#define G29_RECOVER_COMMANDS "M117 Probe failed. Rewiping.\nG28\nG12 P0 S12 T0" + //#define G29_FAILURE_COMMANDS "M117 Bed leveling failed.\nG0 Z10\nM300 P25 S880\nM300 P50 S0\nM300 P25 S880\nM300 P50 S0\nM300 P25 S880\nM300 P50 S0\nG4 S1" #endif @@ -2505,7 +2507,7 @@ #define MIN_CIRCLE_SEGMENTS 72 // Minimum number of segments in a complete circle //#define ARC_SEGMENTS_PER_SEC 50 // Use the feedrate to choose the segment length #define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections - //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles + #define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles //#define SF_ARC_FIX // Enable only if using SkeinForge with "Arc Point" fillet procedure #endif @@ -2602,7 +2604,7 @@ #if ALL(HAS_MEDIA, DIRECT_STEPPING) #define BLOCK_BUFFER_SIZE 8 #elif HAS_MEDIA - #define BLOCK_BUFFER_SIZE 16 + #define BLOCK_BUFFER_SIZE 32 #else #define BLOCK_BUFFER_SIZE 16 #endif @@ -2611,7 +2613,7 @@ // The ASCII buffer for serial input #define MAX_CMD_SIZE 96 -#define BUFSIZE 4 +#define BUFSIZE 32 // Transmission to Host Buffer Size // To save 386 bytes of flash (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0. @@ -2620,7 +2622,7 @@ // For debug-echo: 128 bytes for the optimal speed. // Other output doesn't need to be that speedy. // :[0, 2, 4, 8, 16, 32, 64, 128, 256] -#define TX_BUFFER_SIZE 0 +#define TX_BUFFER_SIZE 32 // Host Receive Buffer Size // Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough. @@ -2658,7 +2660,7 @@ * Currently handles M108, M112, M410, M876 * NOTE: Not yet implemented for all platforms. */ -//#define EMERGENCY_PARSER +#define EMERGENCY_PARSER /** * Realtime Reporting (requires EMERGENCY_PARSER) @@ -2689,7 +2691,7 @@ //#define NO_TIMEOUTS 1000 // (ms) // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -//#define ADVANCED_OK +#define ADVANCED_OK // Printrun may have trouble receiving long strings all at once. // This option inserts short delays between lines of serial output. @@ -2891,23 +2893,23 @@ * * Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park. */ -//#define ADVANCED_PAUSE_FEATURE +#define ADVANCED_PAUSE_FEATURE #if ENABLED(ADVANCED_PAUSE_FEATURE) #define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate. #define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract. // This short retract is done immediately, before parking the nozzle. - #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast. + #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 30 // (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 100 // (mm) The length of filament for a complete unload. + #define FILAMENT_CHANGE_UNLOAD_LENGTH 470 // (mm) The length of filament for a complete unload. // 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. - #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE 6 // (mm/s) Slow move when starting load. - #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0 // (mm) Slow length, to allow time to insert material. + #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE 10 // (mm/s) Slow move when starting load. + #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 50 // (mm) Slow length, to allow time to insert material. // 0 to disable start loading and skip to fast load only #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (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 0 // (mm) Load length of filament, from extruder gear to nozzle. + #define FILAMENT_CHANGE_FAST_LOAD_LENGTH 400 // (mm) Load length of filament, from extruder gear to nozzle. // 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. @@ -2928,13 +2930,13 @@ #define PAUSE_PARK_NOZZLE_TIMEOUT 45 // (seconds) Time limit before the nozzle is turned off for safety. #define FILAMENT_CHANGE_ALERT_BEEPS 10 // Number of alert beeps to play when a response is needed. #define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change. - //#define FILAMENT_CHANGE_RESUME_ON_INSERT // Automatically continue / load filament when runout sensor is triggered again. + #define FILAMENT_CHANGE_RESUME_ON_INSERT // Automatically continue / load filament when runout sensor is triggered again. //#define PAUSE_REHEAT_FAST_RESUME // Reduce number of waits by not prompting again post-timeout before continuing. //#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change. - //#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change + #define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change - //#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. + #define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. //#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302) #define CONFIGURE_FILAMENT_CHANGE // Add M603 G-code and menu items. Requires ~1.3K bytes of flash. #endif @@ -2976,8 +2978,8 @@ #define INTERPOLATE true #if AXIS_IS_TMC_CONFIG(X) - #define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current. - #define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing + #define X_CURRENT 580 // (mA) RMS current. Multiply by 1.414 for peak current. + #define X_CURRENT_HOME (X_CURRENT/2) // (mA) RMS current for sensorless homing #define X_MICROSTEPS 16 // 0..256 #define X_RSENSE 0.11 // Multiplied x1000 for TMC26X #define X_CHAIN_POS -1 // -1..0: Not chained. 1: MCU MOSI connected. 2: Next in chain, ... @@ -2996,8 +2998,8 @@ #endif #if AXIS_IS_TMC_CONFIG(Y) - #define Y_CURRENT 800 - #define Y_CURRENT_HOME Y_CURRENT + #define Y_CURRENT 580 + #define Y_CURRENT_HOME (Y_CURRENT/2) #define Y_MICROSTEPS 16 #define Y_RSENSE 0.11 #define Y_CHAIN_POS -1 @@ -3016,7 +3018,7 @@ #endif #if AXIS_IS_TMC_CONFIG(Z) - #define Z_CURRENT 800 + #define Z_CURRENT 580 #define Z_CURRENT_HOME Z_CURRENT #define Z_MICROSTEPS 16 #define Z_RSENSE 0.11 @@ -3116,7 +3118,7 @@ #endif #if AXIS_IS_TMC_CONFIG(E0) - #define E0_CURRENT 800 + #define E0_CURRENT ENDER_AIO_E0_CURRENT #define E0_MICROSTEPS 16 #define E0_RSENSE 0.11 #define E0_CHAIN_POS -1 @@ -3307,7 +3309,7 @@ * Define your own with: * { , , hysteresis_start[1..8] } */ - #define CHOPPER_TIMING CHOPPER_DEFAULT_12V // All axes (override below) + #define CHOPPER_TIMING CHOPPER_DEFAULT_24V // All axes (override below) //#define CHOPPER_TIMING_X CHOPPER_TIMING // For X Axes (override below) //#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X //#define CHOPPER_TIMING_Y CHOPPER_TIMING // For Y Axes (override below) @@ -3363,12 +3365,12 @@ */ //#define HYBRID_THRESHOLD - #define X_HYBRID_THRESHOLD 100 // [mm/s] + #define X_HYBRID_THRESHOLD 160 // [mm/s] #define X2_HYBRID_THRESHOLD 100 - #define Y_HYBRID_THRESHOLD 100 + #define Y_HYBRID_THRESHOLD 160 #define Y2_HYBRID_THRESHOLD 100 - #define Z_HYBRID_THRESHOLD 3 - #define Z2_HYBRID_THRESHOLD 3 + #define Z_HYBRID_THRESHOLD 40 + #define Z2_HYBRID_THRESHOLD Z_HYBRID_THRESHOLD #define Z3_HYBRID_THRESHOLD 3 #define Z4_HYBRID_THRESHOLD 3 #define I_HYBRID_THRESHOLD 3 // [linear=mm/s, rotational=°/s] @@ -3416,10 +3418,10 @@ #if ANY(SENSORLESS_HOMING, SENSORLESS_PROBING) // TMC2209: 0...255. TMC2130: -64...63 - #define X_STALL_SENSITIVITY 8 - #define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY - #define Y_STALL_SENSITIVITY 8 - #define Y2_STALL_SENSITIVITY Y_STALL_SENSITIVITY + #define X_STALL_SENSITIVITY 55 + //#define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY + #define Y_STALL_SENSITIVITY 65 + //#define Y2_STALL_SENSITIVITY Y_STALL_SENSITIVITY //#define Z_STALL_SENSITIVITY 8 //#define Z2_STALL_SENSITIVITY Z_STALL_SENSITIVITY //#define Z3_STALL_SENSITIVITY Z_STALL_SENSITIVITY @@ -3431,7 +3433,7 @@ //#define V_STALL_SENSITIVITY 8 //#define W_STALL_SENSITIVITY 8 //#define SPI_ENDSTOPS // TMC2130/TMC5160 only - //#define IMPROVE_HOMING_RELIABILITY + #define IMPROVE_HOMING_RELIABILITY #endif // @section tmc/config @@ -3451,7 +3453,7 @@ /** * Step on both rising and falling edge signals (as with a square wave). */ - //#define EDGE_STEPPING + #define EDGE_STEPPING /** * Enable M122 debugging command for TMC stepper drivers. @@ -3888,7 +3890,7 @@ /** * Extra options for the M114 "Current Position" report */ -//#define M114_DETAIL // Use 'M114` for details to check planner calculations +#define M114_DETAIL // Use 'M114` for details to check planner calculations //#define M114_REALTIME // Real current position based on forward kinematics //#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed. @@ -3898,7 +3900,7 @@ */ //#define AUTO_REPORT_FANS -//#define REPORT_FAN_CHANGE // Report the new fan speed when changed by M106 (and others) +#define REPORT_FAN_CHANGE // Report the new fan speed when changed by M106 (and others) /** * Auto-report temperatures with M155 S @@ -3911,7 +3913,7 @@ /** * Auto-report position with M154 S */ -//#define AUTO_REPORT_POSITION +#define AUTO_REPORT_POSITION #if ENABLED(AUTO_REPORT_POSITION) //#define AUTO_REPORT_REAL_POSITION // Auto-report the real position #endif @@ -3925,7 +3927,7 @@ // Include capabilities in M115 output #define EXTENDED_CAPABILITIES_REPORT #if ENABLED(EXTENDED_CAPABILITIES_REPORT) - //#define M115_GEOMETRY_REPORT + #define M115_GEOMETRY_REPORT #endif #endif @@ -4012,18 +4014,18 @@ // Custom Menu: Main Menu //#define CUSTOM_MENU_MAIN #if ENABLED(CUSTOM_MENU_MAIN) - //#define CUSTOM_MENU_MAIN_TITLE "Custom Commands" - #define CUSTOM_MENU_MAIN_SCRIPT_DONE "M117 User Script Done" - #define CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK - //#define CUSTOM_MENU_MAIN_SCRIPT_RETURN // Return to status screen after a script + #define CUSTOM_MENU_MAIN_TITLE "Calibration" + //#define CUSTOM_MENU_MAIN_SCRIPT_DONE "M117 User Script Done" + //#define CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK + #define CUSTOM_MENU_MAIN_SCRIPT_RETURN // Return to status screen after a script #define CUSTOM_MENU_MAIN_ONLY_IDLE // Only show custom menu when the machine is idle - #define MAIN_MENU_ITEM_1_DESC "Home & UBL Info" - #define MAIN_MENU_ITEM_1_GCODE "G28\nG29 W" + //#define MAIN_MENU_ITEM_1_DESC "Home & UBL Info" + //#define MAIN_MENU_ITEM_1_GCODE "G28\nG29 W" //#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action - #define MAIN_MENU_ITEM_2_DESC "Preheat for " PREHEAT_1_LABEL - #define MAIN_MENU_ITEM_2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) + //#define MAIN_MENU_ITEM_2_DESC "Preheat for " PREHEAT_1_LABEL + //#define MAIN_MENU_ITEM_2_GCODE "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) //#define MAIN_MENU_ITEM_2_CONFIRM //#define MAIN_MENU_ITEM_3_DESC "Preheat for " PREHEAT_2_LABEL @@ -4044,18 +4046,18 @@ // Custom Menu: Configuration Menu //#define CUSTOM_MENU_CONFIG #if ENABLED(CUSTOM_MENU_CONFIG) - //#define CUSTOM_MENU_CONFIG_TITLE "Custom Commands" - #define CUSTOM_MENU_CONFIG_SCRIPT_DONE "M117 Wireless Script Done" - #define CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK - //#define CUSTOM_MENU_CONFIG_SCRIPT_RETURN // Return to status screen after a script + #define CUSTOM_MENU_CONFIG_TITLE "Sheet Profiles" + #define CUSTOM_MENU_CONFIG_SCRIPT_DONE "M500\nM117 Sheet Loaded" + //#define CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK + #define CUSTOM_MENU_CONFIG_SCRIPT_RETURN // Return to status screen after a script #define CUSTOM_MENU_CONFIG_ONLY_IDLE // Only show custom menu when the machine is idle - #define CONFIG_MENU_ITEM_1_DESC "Wifi ON" - #define CONFIG_MENU_ITEM_1_GCODE "M118 [ESP110] WIFI-STA pwd=12345678" + //#define CONFIG_MENU_ITEM_1_DESC "Wifi ON" + //#define CONFIG_MENU_ITEM_1_GCODE "M118 [ESP110] WIFI-STA pwd=12345678" //#define CONFIG_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action - #define CONFIG_MENU_ITEM_2_DESC "Bluetooth ON" - #define CONFIG_MENU_ITEM_2_GCODE "M118 [ESP110] BT pwd=12345678" + //#define CONFIG_MENU_ITEM_2_DESC "Bluetooth ON" + //#define CONFIG_MENU_ITEM_2_GCODE "M118 [ESP110] BT pwd=12345678" //#define CONFIG_MENU_ITEM_2_CONFIRM //#define CONFIG_MENU_ITEM_3_DESC "Radio OFF" @@ -4120,12 +4122,12 @@ * Host Prompt Support enables Marlin to use the host for user prompts so * filament runout and other processes can be managed from the host side. */ -//#define HOST_ACTION_COMMANDS +#define HOST_ACTION_COMMANDS #if ENABLED(HOST_ACTION_COMMANDS) //#define HOST_PAUSE_M76 // Tell the host to pause in response to M76 - //#define HOST_PROMPT_SUPPORT // Initiate host prompts to get user feedback + #define HOST_PROMPT_SUPPORT // Initiate host prompts to get user feedback #if ENABLED(HOST_PROMPT_SUPPORT) - //#define HOST_STATUS_NOTIFICATIONS // Send some status messages to the host as notifications + #define HOST_STATUS_NOTIFICATIONS // Send some status messages to the host as notifications #endif //#define HOST_START_MENU_ITEM // Add a menu item that tells the host to start //#define HOST_SHUTDOWN_MENU_ITEM // Add a menu item that tells the host to shut down diff --git a/Marlin/Ender_AIO_Configuration.h b/Marlin/Ender_AIO_Configuration.h new file mode 100644 index 0000000000..dd6ece6e48 --- /dev/null +++ b/Marlin/Ender_AIO_Configuration.h @@ -0,0 +1,322 @@ +#pragma once + +/** + * Ender_AIO_Configuration.h + * + * This file includes basic settings like: + * + * - Getting Started with Ender AIO Firmware + * - Custom Printer Name + * - Motherboard + * - Dual-Z Upgrade + * - Extruder + * - Filament Runout + * - Probes + * - Bed Leveling + * - Hotend & Thermal / PID Settings + * - LCD / TFT / Controller + * - Input Shaping + * - Sheet Profile Menu + */ +#define CONFIGURATION_H_VERSION 02010300 +#define ENDER_AIO_VERSION 20240202 + +//=========================================================================== +//================= Getting Started with Ender AIO Firmware ================= +//=========================================================================== + +/** + * If you find this project helpful, please consider donating: + * + * Keith Bennett, Marlin tester/config builder: https://github.com/sponsors/thisiskeithb + * https://ko-fi.com/thisiskeithb + * Thank you and Happy Printing! + */ + +//=========================================================================== +//=========================== Custom Printer Name =========================== +//=========================================================================== + +// Uncomment to set a custom printer name. +//#define ENDER_AIO_CUSTOM_PRINTER_NAME "Ender-3" + +//=========================================================================== +//=============================== Motherboard =============================== +//=========================================================================== + +/** + * Motherboard + * + * - SKR Mini E3 V3.0 (STM32G0B0RE/STM32G0B1RE) + * - SKR Mini E3 V3.0.1 (STM32F401RC) + * - SKR Mini E3 V2.0 (STM32F103RC/STM32F103RE) + * - SKR Mini E3 V1.2 (STM32F103RC) + * - SKR E3 Turbo (LPC1769) + * - SKR V3.0 (STM32H743VI/STM32H723VG) + * - SKR V3.0 EZ (STM32H743VI/STM32H723VG) + * + * More board support coming soon! + */ +#define ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V3_0 +//#define ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V3_0_1 +//#define ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V2_0 +//#define ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V1_2 +//#define ENDER_AIO_MOTHERBOARD_BTT_SKR_E3_TURBO +//#define ENDER_AIO_MOTHERBOARD_BTT_SKR_V3_0 +//#define ENDER_AIO_MOTHERBOARD_BTT_SKR_V3_0_EZ + +//=========================================================================== +//============================= Dual-Z Upgrade ============================== +//=========================================================================== + +/** + * Creality Ender-3 Dual Z Kit https://www.amazon.com/dp/B09N8QQDSP + * + * Note: If your motherboard supports five drivers, all five driver slots must be populated. + */ +//#define ENDER_AIO_DUAL_Z_KIT + +//=========================================================================== +//================================ Extruder ================================= +//=========================================================================== + +/** + * Extruder + * + * - Stock Ender-3 Extruder https://www.amazon.com/dp/B07WHYBVJ5 + * - WINSINN Dual Gear Extruder https://www.amazon.com/dp/B08D9CNHVN + * - Genuine Bondtech BMG Extruder https://www.bondtech.se/product/bmg-extruder/ + * - Trianglelab DDB 2.0 Extruder https://www.amazon.com/dp/B08KP189KN + */ +#define ENDER_AIO_EXTRUDER_STOCK +//#define ENDER_AIO_EXTRUDER_WINSINN_DUAL_GEAR +//#define ENDER_AIO_EXTRUDER_BONDTECH_BMG +//#define ENDER_AIO_EXTRUDER_TL_DDB_V2 + +// BMG/DDB with LDO 0.9° Slim Power motor on E +#if ANY(ENDER_AIO_EXTRUDER_BONDTECH_BMG, ENDER_AIO_EXTRUDER_TL_DDB_V2) + //#define ENDER_AIO_EXTRUDER_MOTOR_LDO_0_9_SLIM_POWER +#endif + +// Custom E-Steps +//#define ENDER_AIO_CUSTOM_E_STEPS 93 + +// Invert the E stepper direction. Enable if extruder goes the wrong way. +//#define ENDER_AIO_INVERT_E_DIR + +//=========================================================================== +//============================= Filament Runout ============================= +//=========================================================================== + +/** + * Filament Runout + * + * Basic NC-style filament runout support is available (but disabled) by default. + * + * Uncomment for BigTreeTech Smart Filament Sensor V2: https://github.com/bigtreetech/smart-filament-detection-module/tree/master/V2.0 + */ +//#define ENDER_AIO_BTT_SMART_FILAMENT_SENSOR_V2 + +//=========================================================================== +//================================= Probes ================================== +//=========================================================================== + +/** + * Probe Options + * + * To simplify homing, Z endstop must be removed and the probe will be used for Z homing. + */ + +/** + * BLTouch + * + * If your BLTouch did not come with a metal bracket, dude-in-a-box's "stiffer, with cutouts" BLTouch mount is recommended: https://www.thingiverse.com/thing:4390903 + * + * Note: Offsets can also be customized via LCD under Configuration > Advanced Settings > Probe Offsets. + */ +//#define ENDER_AIO_BLTOUCH +#if ENABLED(ENDER_AIO_BLTOUCH) + #define ENDER_AIO_BLTOUCH_MOUNT_CREALITY_METAL // Uses { -40, -9, 0 } probe offsets + //#define ENDER_AIO_BLTOUCH_MOUNT_DUDE_IN_A_BOX // Uses { -43, -10, 0 } probe offsets + //#define ENDER_AIO_CUSTOM_BLTOUCH_MOUNT { -40, -9, -0.0 } // Custom probe offsets { X, Y, Z }. Z should be a negative value +#endif + +/** + * BIQU MicroProbe + * + * Note: Offsets can also be customized via LCD under Configuration > Advanced Settings > Probe Offsets. + */ +//#define ENDER_AIO_MICROPROBE +#if ENABLED(ENDER_AIO_MICROPROBE) + //#define ENDER_AIO_MICROPROBE_V1 // V2 is assumed by default. Uncomment if using V1 + #define ENDER_AIO_CUSTOM_MICROPROBE_MOUNT { -40, -9, -0.0 } // Custom probe offsets { X, Y, Z }. Z should be a negative value +#endif + +/** + * Probe Connection + * + * Connect probe to ZPROBE (5-pin) or SERVO (3-pin) + ZPROBE (2-pin) by default. + * Uncomment if connecting probe to SERVO + Z MIN/Z STOP instead. + */ +//#define ENDER_AIO_PROBE_CONNECTED_TO_Z_MIN_PORT + +//=========================================================================== +//============================== Bed Leveling =============================== +//=========================================================================== + +/** + * Bed Leveling Type + * + * - Mesh Bed Leveling (default unless a probe option is enabled above) + * - Bilinear + * - Unified Bed Leveling + */ +#if ANY(ENDER_AIO_BLTOUCH, ENDER_AIO_MICROPROBE) + #define ENDER_AIO_AUTO_BED_LEVELING_BILINEAR + //#define ENDER_AIO_AUTO_BED_LEVELING_UBL +#endif + +//=========================================================================== +//===================== Hotend & Thermal / PID Settings ===================== +//=========================================================================== + +/** + * Phaetus Dragonfly Hotend + * + * HT-NTC100K cartridge thermistor is recommended: https://www.amazon.com/gp/product/B09WDR1M5Q + */ +//#define ENDER_AIO_PHAETUS_DRAGONFLY_290C // 290°C maximum temperature (305°C - 15°C overshoot) + +/** + * Custom PID Settings + * + * Stock Ender-3 hotend and bed PID settings are enabled by default. + * + * If needed, uncomment ENDER_AIO_CUSTOM_HOTEND_PID and/or ENDER_AIO_CUSTOM_BED_PID to customize PID settings. + */ +//#define ENDER_AIO_CUSTOM_HOTEND_PID +#if ENABLED(ENDER_AIO_CUSTOM_HOTEND_PID) + #define ENDER_AIO_DEFAULT_Kp 21.73 + #define ENDER_AIO_DEFAULT_Ki 1.54 + #define ENDER_AIO_DEFAULT_Kd 76.55 + // Find your own by running "M303 E0 C8 S210" via serial to PID autotune the hotend at 210°C for 8 cycles. +#endif + +//#define ENDER_AIO_CUSTOM_BED_PID +#if ENABLED(ENDER_AIO_CUSTOM_BED_PID) + #define ENDER_AIO_DEFAULT_bedKp 47.93 + #define ENDER_AIO_DEFAULT_bedKi 7.94 + #define ENDER_AIO_DEFAULT_bedKd 192.91 + // Find your own by running "M303 E-1 C8 S65" via serial to PID autotune the bed at 65°C for 8 cycles. +#endif + +/** + * Model Predictive Control for Hotend + * + * Stock Ender-3 hotend with 40W heater cartridge is configured by default. + * + * Note: Replaces PID for the hotend + */ +//#define ENDER_AIO_HOTEND_MPCTEMP + +// If needed, uncomment ENDER_AIO_CUSTOM_HOTEND_MPCTEMP to customize MPCTEMP settings. +// Use M306 T to autotune the model. See https://marlinfw.org/docs/gcode/M306.html for full details. +//#define ENDER_AIO_CUSTOM_HOTEND_MPCTEMP +#if ALL(ENDER_AIO_HOTEND_MPCTEMP, ENDER_AIO_CUSTOM_HOTEND_MPCTEMP) + #define ENDER_AIO_CUSTOM_MPC_HEATER_POWER { 40.0f } // (W) Heat cartridge power. + #define ENDER_AIO_CUSTOM_MPC_BLOCK_HEAT_CAPACITY { 10.46f } // (J/K) Heat block heat capacity. Use M306 T to autotune the model. + #define ENDER_AIO_CUSTOM_MPC_SENSOR_RESPONSIVENESS { 0.7801f } // (K/s per ∆K) Rate of change of sensor temperature from heat block. + #define ENDER_AIO_CUSTOM_MPC_AMBIENT_XFER_COEFF { 0.0564f } // (W/K) Heat transfer coefficients from heat block to room air with fan off. + #define ENDER_AIO_CUSTOM_MPC_AMBIENT_XFER_COEFF_FAN255 { 0.1264f } // (W/K) Heat transfer coefficients from heat block to room air with fan on full. + + // Filament Heat Capacity (joules/kelvin/mm) + // Set with M306 H in your filament or start G-code. + #define ENDER_AIO_CUSTOM_FILAMENT_HEAT_CAPACITY_PERMM { 5.6e-3f } // PLA = 5.6e-3f (0.0056) J/K/mm + // PETG = 3.6e-3f (0.0036) J/K/mm + // ABS = 5.15e-3f (0.00515) J/K/mm + // Nylon = 5.22e-3f (0.00522) J/K/mm +#endif + +//=========================================================================== +//========================= LCD / TFT / Controller ========================== +//=========================================================================== + +/** + * LCD / TFT / Controller + * + * - Stock Creality Ender-3 Screen + * - BigTreeTech TFT35 E3 Dual Mode TFT + */ +#define ENDER_AIO_DISPLAY_STOCK +//#define ENDER_AIO_DISPLAY_BTT_TFT35_E3_TFT +#if ENABLED(ENDER_AIO_DISPLAY_BTT_TFT35_E3_TFT) + #define ENDER_AIO_USES_BOTH_EXP_CABLES // Disable if only using one 10-pin EXP cable. SD card connection will be set to the motherboard instead of TFT. +#endif + +/** + * LCD LANGUAGE + * + * Select the language to display on the LCD. These languages are available: + * + * en, an, bg, ca, cz, da, de, el, el_CY, es, eu, fi, fr, gl, hr, hu, it, + * jp_kana, ko_KR, nl, pl, pt, pt_br, ro, ru, sk, sv, tr, uk, vi, zh_CN, zh_TW + * + * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek (Greece)', 'el_CY':'Greek (Cyprus)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'sv':'Swedish', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)' } + */ +#define ENDER_AIO_LCD_LANGUAGE en + +/** + * Boot & Status Screens + * + * Disabled by default to save flash space. + */ +//#define ENDER_AIO_SHOW_CUSTOM_BOOTSCREEN // Show the Ender dragon bootscreen on startup. +//#define ENDER_AIO_STATUS_SCREEN_IMAGE // Show the "Ender-3" text in upper-left corner of status screen. + +//=========================================================================== +//============================== Input Shaping ============================== +//=========================================================================== + +/** + * Input Shaping -- EXPERIMENTAL + * + * Zero Vibration (ZV) Input Shaping for X and/or Y movements. + * + * See https://github.com/MarlinFirmware/Marlin/pull/24797 for configuration & full details. + * + * Tune with M593 D F: + * + * D Set the zeta/damping factor. If axes (X, Y, etc.) are not specified, set for all axes. + * F Set the frequency. If axes (X, Y, etc.) are not specified, set for all axes. + * X<1> Set the given parameters only for the X axis. + * Y<1> Set the given parameters only for the Y axis. + */ +//#define ENDER_AIO_INPUT_SHAPING +#if ENABLED(ENDER_AIO_INPUT_SHAPING) + #define ENDER_AIO_SHAPING_FREQ_X 40 // (Hz) The default dominant resonant frequency on the X axis. + #define ENDER_AIO_SHAPING_FREQ_Y 40 // (Hz) The default dominant resonant frequency on the Y axis. + #define ENDER_AIO_SHAPING_ZETA_X 0.15f // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping). + #define ENDER_AIO_SHAPING_ZETA_Y 0.15f // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping). +#endif + +//=========================================================================== +//=========================== Sheet Profile Menu ============================ +//=========================================================================== + +/** + * Sheet Profiles Menu + * + * Automatically adjust Z Probe Offset with M851 based on selected Sheet Profile. + * Up to 10 sheet profiles are supported without changes. + */ +//#define ENDER_AIO_SHEET_PROFILES_MENU +#if ENABLED(ENDER_AIO_SHEET_PROFILES_MENU) + #define ENDER_AIO_SHEET_1_DESC "Smooth" // Short description of Sheet + #define ENDER_AIO_SHEET_1_OFFSET -0.000 // Sheet offset. This should be a negative value. + + #define ENDER_AIO_SHEET_2_DESC "Textured" + #define ENDER_AIO_SHEET_2_OFFSET -0.000 + + //#define ENDER_AIO_SHEET_3_DESC "Satin" + //#define ENDER_AIO_SHEET_3_OFFSET -0.000 +#endif diff --git a/Marlin/_Bootscreen.h b/Marlin/_Bootscreen.h new file mode 100644 index 0000000000..324cb4a616 --- /dev/null +++ b/Marlin/_Bootscreen.h @@ -0,0 +1,97 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ +#pragma once + +/** + * Custom Boot Screen bitmap + * + * Place this file in the root with your configuration files + * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * https://marlinfw.org/tools/u8glib/converter.html + */ + +#define CUSTOM_BOOTSCREEN_TIMEOUT 1000 +#define CUSTOM_BOOTSCREEN_BMPWIDTH 81 +#define CUSTOM_BOOTSCREEN_INVERTED + +const unsigned char custom_start_bmp[] PROGMEM = { + B11111111,B11111111,B11111111,B11111111,B11101111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11101111,B11101111,B11111111,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11100111,B11011111,B11111111,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11100111,B11011111,B11111111,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11100011,B11011111,B11111111,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11110011,B11001111,B11111111,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11100001,B11100001,B11001111,B11111111,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111110,B01111000,B00000000,B00000000,B00000011,B11011101,B11111111,B11111111,B11111111,B11111111, + B11111110,B11111111,B10000000,B01111110,B00000000,B00000001,B11101110,B11111111,B11111111,B11111111,B11111111, + B11111110,B01111101,B11001111,B11111100,B00000000,B00000000,B11110111,B01111111,B11111111,B11111111,B11111111, + B11111111,B10001110,B00000110,B00000000,B00000000,B00000000,B01111011,B10111111,B11111111,B11111111,B11111111, + B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B01111101,B11011111,B11111111,B11111111,B11111111, + B11111111,B11111100,B00000001,B11111110,B00000000,B00000000,B00111110,B11100111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111100,B00000000,B00000011,B00011111,B01110011,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111000,B00000000,B00000001,B10001111,B10000001,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11100000,B00000000,B00000000,B10000011,B11111001,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B00000000,B11111100,B00000000,B00000000,B11110000,B11111111,B11111111,B11111111, + B11111111,B11111111,B11100000,B00001111,B11111111,B11000000,B00000000,B00000000,B11111111,B11111111,B11111111, + B11111111,B11111110,B00000011,B11111111,B11111111,B11000000,B00000000,B00000000,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111001,B00000000,B00000000,B00000000,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111100,B00000000,B00000111,B11000000,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B00000000,B00000111,B11100000,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11100000,B00000111,B11110001,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111100,B00000111,B11111001,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B00000011,B11111001,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000011,B11111001,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11000011,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11100001,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,B10111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111011,B11111000,B00111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111001,B11111000,B00111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B01111110,B11110000,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B10001110,B00000011,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11100000,B00011111,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B01111111,B11111111,B11111111,B11111111, + B11111111,B00000000,B00000000,B01111111,B11111111,B11111111,B11111000,B01111111,B11111111,B11111111,B11111111, + B11111111,B10000000,B00000000,B01111111,B11111111,B11111111,B11100000,B01111111,B11111111,B11111111,B11111111, + B11111111,B11000011,B11111100,B11111111,B11111111,B11111111,B11111000,B11111111,B11111111,B11111111,B11111111, + B11111111,B11000011,B11111100,B11111111,B11111111,B11111111,B11111000,B11111111,B11111111,B11111111,B11111111, + B11111111,B10000111,B11111101,B11111111,B11111111,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111, + B11111111,B10000111,B11111111,B11111111,B11111111,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111, + B11111111,B00001111,B11100111,B11110011,B00001111,B11111100,B00100011,B11111100,B00111111,B11111111,B11111111, + B11111111,B00001111,B11101111,B10000000,B00000111,B11110000,B00000011,B11110000,B00011110,B00000000,B01111111, + B11111110,B00011111,B11001111,B10000001,B10000111,B11000111,B10000111,B11000111,B00001100,B00000000,B01111111, + B11111110,B00000000,B00011111,B11000111,B11000111,B10001111,B11000111,B10011111,B00001111,B00001100,B11111111, + B11111110,B00000000,B00011111,B10000111,B10001111,B00011111,B10001111,B00011111,B00001111,B00011111,B11111111, + B11111100,B00111111,B10011111,B10001111,B10001111,B00011111,B10001110,B00000000,B00011110,B00111111,B11111111, + B11111100,B01111111,B00111111,B00001111,B00011110,B00111111,B00011110,B00111111,B11111110,B00111111,B11111111, + B11111000,B01111111,B11111111,B00011111,B00011100,B00111111,B00011100,B01111111,B11111100,B01111111,B11111111, + B11111000,B11111111,B11111111,B00011110,B00011100,B01111110,B00011100,B01111111,B11111100,B01111111,B11111111, + B11110000,B11111111,B11001110,B00111110,B00111100,B01111110,B00111100,B01111111,B10111000,B11111111,B11111111, + B11110000,B11111111,B10011110,B00111100,B00111000,B01111100,B00111000,B01111110,B01111000,B11111111,B11111111, + B11100001,B11111111,B00111100,B01111100,B01111000,B01111100,B01111000,B00111100,B11110001,B11111111,B11111111, + B11100001,B11111000,B00111000,B01111000,B01111000,B00010000,B00011000,B00000001,B11110001,B11111111,B11111111, + B00000000,B00000000,B01100000,B00100000,B00111100,B00000000,B01111100,B00000111,B10000000,B01111111,B11111111, + B11111111,B11111111,B11111111,B11111111,B11111110,B00011111,B11111110,B00011111,B11111111,B11111111,B11111111 +}; diff --git a/Marlin/_Statusscreen.h b/Marlin/_Statusscreen.h new file mode 100644 index 0000000000..d1e2f4a642 --- /dev/null +++ b/Marlin/_Statusscreen.h @@ -0,0 +1,62 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ +#pragma once + +/** + * Custom Status Screen bitmap + * + * Place this file in the root with your configuration files + * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * https://marlinfw.org/tools/u8glib/converter.html + */ + +// +// Status Screen Logo bitmap +// +#define STATUS_LOGO_Y 8 +#define STATUS_LOGO_WIDTH 39 + +const unsigned char status_logo_bmp[] PROGMEM = { + B11111000,B00000001,B10000000,B00000000,B00001100, + B01001000,B00000000,B10000000,B00000000,B00010010, + B01000011,B11000011,B10001100,B11010000,B00000010, + B01110001,B00100100,B10010010,B01100111,B11001100, + B01000001,B00100100,B10011110,B01000000,B00000010, + B01001001,B00100100,B10010000,B01000000,B00010010, + B11111011,B10110011,B11001110,B11100000,B00001100 +}; + +// +// Use default bitmaps +// +#define STATUS_HOTEND_ANIM +#define STATUS_BED_ANIM +#define STATUS_HEATERS_XSPACE 20 +#if HOTENDS < 2 + #define STATUS_HEATERS_X 48 + #define STATUS_BED_X 72 +#else + #define STATUS_HEATERS_X 40 + #define STATUS_BED_X 80 +#endif diff --git a/Marlin/src/inc/Ender_AIO_Changes.h b/Marlin/src/inc/Ender_AIO_Changes.h new file mode 100644 index 0000000000..fe500b32d1 --- /dev/null +++ b/Marlin/src/inc/Ender_AIO_Changes.h @@ -0,0 +1,17 @@ +#pragma once +//=========================================================================== +//========================== DO NOT EDIT THIS FILE ========================== +//=========================================================================== + +/** + * Ender_AIO_Changes.h + * Alert about Ender_AIO_Configuration.h changes at compile-time. + */ +#define CONFIGURATION_H_VERSION 02010300 +#define ENDER_AIO_VERSION 20240202 + +#ifdef ENDER_AIO_E_STEPS_PER_UNIT_CUSTOM + #error "ENDER_AIO_E_STEPS_PER_UNIT_CUSTOM is now ENDER_AIO_CUSTOM_E_STEPS. Please update your configuration." +#elif defined(ENDER_AIO_BLTOUCH_MOUNT_CUSTOM) + #error "ENDER_AIO_BLTOUCH_MOUNT_CUSTOM is now ENDER_AIO_CUSTOM_BLTOUCH_MOUNT. Please update your configuration." +#endif diff --git a/Marlin/src/inc/Ender_AIO_Conditionals.h b/Marlin/src/inc/Ender_AIO_Conditionals.h new file mode 100644 index 0000000000..29a5721353 --- /dev/null +++ b/Marlin/src/inc/Ender_AIO_Conditionals.h @@ -0,0 +1,475 @@ +#pragma once +//=========================================================================== +//========================== DO NOT EDIT THIS FILE ========================== +//=========================================================================== + +/** + * Ender_AIO_Conditionals.h + * Configuration logic based on Ender_AIO_Configuration.h options at compile time. + */ +#define CONFIGURATION_H_VERSION 02010300 +#define ENDER_AIO_VERSION 20240202 + +//=========================================================================== +//============================ Source Code Info ============================= +//=========================================================================== + +#define SOURCE_CODE_URL "bit.ly/3YYEblW" +#define WEBSITE_URL SOURCE_CODE_URL + +//=========================================================================== +//============================== Printer Name =============================== +//=========================================================================== + +#ifndef ENDER_AIO_CUSTOM_PRINTER_NAME + #define ENDER_AIO_CUSTOM_PRINTER_NAME "Ender-3" +#endif + +//=========================================================================== +//=============================== Motherboard =============================== +//=========================================================================== + +// Define MOTHERBOARD here so preflight-checks.py works +#if ENABLED(ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V3_0) + #define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V3_0 + #define ENDER_AIO_NO_DRIVER_UART_SPI_JUMPERS 1 + #define ENDER_AIO_HAS_REAL_EEPROM 1 + #define ENDER_AIO_HAS_CONTROLLER_FAN 1 + #define ENDER_AIO_CONTROLLER_FAN_PIN FAN2_PIN // PB15 + #define ENDSTOP_INTERRUPTS_FEATURE + #define ENDER_AIO_SERIAL_PORT_2 2 + #define FAN_SOFT_PWM + #define ENDER_AIO_SINGLE_BOARD_EXP_CONNECTION 1 + //#define ENDER_AIO_HAS_TEMP_SENSOR_SOC 1 + #define FIL_MOTION1_PIN PC13 // PS-ON +#elif ENABLED(ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V3_0_1) + #define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V3_0_1 + #define ENDER_AIO_NO_DRIVER_UART_SPI_JUMPERS 1 + #define ENDER_AIO_HAS_REAL_EEPROM 1 + #define ENDER_AIO_HAS_CONTROLLER_FAN 1 + #define ENDER_AIO_CONTROLLER_FAN_PIN FAN2_PIN // PC8 + #define ENDSTOP_INTERRUPTS_FEATURE + #define ENDER_AIO_SERIAL_PORT_2 2 + #define FAN_SOFT_PWM + #define ENDER_AIO_SINGLE_BOARD_EXP_CONNECTION 1 + //#define ENDER_AIO_HAS_TEMP_SENSOR_SOC 1 + #define FIL_MOTION1_PIN PC14 // PS-ON +#elif ENABLED(ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V2_0) + #define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V2_0 + #define ENDER_AIO_NO_DRIVER_UART_SPI_JUMPERS 1 + #define ENDSTOP_INTERRUPTS_FEATURE + #define ENDER_AIO_SERIAL_PORT_2 2 + #define FAN_SOFT_PWM + #define ENDER_AIO_SINGLE_BOARD_EXP_CONNECTION 1 + //#define ENDER_AIO_HAS_TEMP_SENSOR_SOC 1 + #define FIL_MOTION1_PIN PC12 // PT-DET +#elif ENABLED(ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V1_2) + #define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_2 + #define ENDER_AIO_NO_DRIVER_UART_SPI_JUMPERS 1 + #define ENDER_AIO_HAS_REAL_EEPROM 1 + #define ENDSTOP_INTERRUPTS_FEATURE + #define ENDER_AIO_SERIAL_PORT_2 2 + #define FAN_SOFT_PWM + #define ENDER_AIO_SINGLE_BOARD_EXP_CONNECTION 1 + //#define ENDER_AIO_HAS_TEMP_SENSOR_SOC 1 + #define FIL_MOTION1_PIN PC13 // PS-ON +#elif ENABLED(ENDER_AIO_MOTHERBOARD_BTT_SKR_E3_TURBO) + #define MOTHERBOARD BOARD_BTT_SKR_E3_TURBO + #define ENDER_AIO_NO_DRIVER_UART_SPI_JUMPERS 1 + #define ENDER_AIO_HAS_FIVE_DRIVERS 1 + #define ENDER_AIO_SERIAL_PORT_2 0 + #define ENDER_AIO_HAS_TEMP_SENSOR_BOARD 1 + #define ENDER_AIO_SINGLE_BOARD_EXP_CONNECTION 1 + #define FIL_MOTION1_PIN P1_25 // E1-STOP +#elif ENABLED(ENDER_AIO_MOTHERBOARD_BTT_SKR_V3_0) + #define MOTHERBOARD BOARD_BTT_SKR_V3_0 + #define ENDER_AIO_HAS_REAL_EEPROM 1 + #define ENDER_AIO_HAS_FIVE_DRIVERS 1 + #define ENDER_AIO_HAS_CONTROLLER_FAN 1 + #define ENDER_AIO_CONTROLLER_FAN_PIN FAN2_PIN // PB5 + #define ENDSTOP_INTERRUPTS_FEATURE + #define ENDER_AIO_NEEDS_ALT_DISPLAY_MINI_12864_NEOPIXEL_ORDER 1 // Incorrect RGB color workaround on SKR V3 (STM32H7 issue?) + #define ENDER_AIO_SERIAL_PORT_2 1 + #define FAN_SOFT_PWM + //#define ENDER_AIO_HAS_TEMP_SENSOR_SOC 1 + #define FIL_MOTION1_PIN PA0 // E1DET +#elif ENABLED(ENDER_AIO_MOTHERBOARD_BTT_SKR_V3_0_EZ) + #define MOTHERBOARD BOARD_BTT_SKR_V3_0_EZ + #define ENDER_AIO_NO_DRIVER_UART_SPI_JUMPERS 1 + #define ENDER_AIO_HAS_REAL_EEPROM 1 + #define ENDER_AIO_HAS_FIVE_DRIVERS 1 + #define ENDER_AIO_HAS_CONTROLLER_FAN 1 + #define ENDER_AIO_CONTROLLER_FAN_PIN FAN2_PIN // PB5 + #define ENDSTOP_INTERRUPTS_FEATURE + #define ENDER_AIO_NEEDS_ALT_DISPLAY_MINI_12864_NEOPIXEL_ORDER 1 // Incorrect RGB color workaround on SKR V3 (STM32H7 issue?) + #define ENDER_AIO_SERIAL_PORT_2 1 + #define FAN_SOFT_PWM + //#define ENDER_AIO_HAS_TEMP_SENSOR_SOC 1 + #define FIL_MOTION1_PIN PA0 // E1DET +#endif + +// +#if ANY(ENDER_AIO_BLTOUCH, ENDER_AIO_MICROPROBE) + #define ENDER_AIO_HAS_PROBE 1 +#endif + +// PRINTCOUNTER +#define ENDER_AIO_PRINTCOUNTER_SAVE_INTERVAL TERN(ENDER_AIO_HAS_REAL_EEPROM, 60, 0) + +#if ALL(ENDER_AIO_HAS_FIVE_DRIVERS, ENDER_AIO_DUAL_Z_KIT) + #define Z2_DRIVER_TYPE Z_DRIVER_TYPE + #define SD_FINISHED_RELEASECOMMAND "M84XYE" + #define STARTUP_COMMANDS "M17 Z" + + #if ENABLED(ENDER_AIO_HAS_PROBE) + #define Z_STEPPER_AUTO_ALIGN + #endif +#else + #define DISABLE_IDLE_Z + #define SD_FINISHED_RELEASECOMMAND "M84" +#endif + +//=========================================================================== +//============================= Stepper Motors ============================== +//=========================================================================== + +// Extruder Motor Current +#define ENDER_AIO_E0_CURRENT TERN(ENDER_AIO_EXTRUDER_MOTOR_LDO_0_9_SLIM_POWER, 550, 650) + +// Extruder Steps/mm +#if defined(ENDER_AIO_CUSTOM_E_STEPS) + #define ENDER_AIO_E_STEPS_PER_UNIT ENDER_AIO_CUSTOM_E_STEPS +#elif ENABLED(ENDER_AIO_EXTRUDER_STOCK) + #define ENDER_AIO_E_STEPS_PER_UNIT 93 +#elif ENABLED(ENDER_AIO_EXTRUDER_WINSINN_DUAL_GEAR) + #define ENDER_AIO_E_STEPS_PER_UNIT 142 +#elif ANY(ENDER_AIO_EXTRUDER_TL_DDB_V2, ENDER_AIO_EXTRUDER_BONDTECH_BMG) + #define ENDER_AIO_E_STEPS_PER_UNIT TERN(ENDER_AIO_EXTRUDER_MOTOR_LDO_0_9_SLIM_POWER, 830, 415) +#endif + +// Default Extruder Inverting +#define ENDER_AIO_INVERT_E0_DIR TERN(ENDER_AIO_EXTRUDER_BONDTECH_BMG, false, true) + +// User Extruder Inverting +#if ENABLED(ENDER_AIO_INVERT_E_DIR) + #if ENDER_AIO_INVERT_E0_DIR == true + #undef ENDER_AIO_INVERT_E0_DIR // Prevent redefined warnings + #define ENDER_AIO_INVERT_E0_DIR false + #elif ENDER_AIO_INVERT_E0_DIR == false + #undef ENDER_AIO_INVERT_E0_DIR // Prevent redefined warnings + #define ENDER_AIO_INVERT_E0_DIR true + #endif +#endif + +// Default X/Y/Z Inverting +#define ENDER_AIO_INVERT_X_DIR true +#define ENDER_AIO_INVERT_Y_DIR true +#define ENDER_AIO_INVERT_Z_DIR false + +//=========================================================================== +//=========================== Homing / StallGuard =========================== +//=========================================================================== + +// Homing speeds (mm/min) +#ifndef ENDER_AIO_HOMING_FEEDRATE_MM_M + #define ENDER_AIO_HOMING_FEEDRATE_MM_M { (50*60), (50*60), (8*60) } +#endif + +/** + * Sensorless Homing + * + * Sensitivity TMC2209 + * HIGHEST 255 (Too sensitive => False positive) + * LOWEST 0 (Too insensitive => No trigger) + * + * If needed, uncomment ENDER_AIO_*_STALL sensorless (StallGuard) settings below. + * Settings can also be customized via LCD under Configuration -> Advanced Settings -> TMC Drivers -> Sensorless Homing + */ +//#define ENDER_AIO_SENSORLESS_HOMING +#if ENABLED(ENDER_AIO_SENSORLESS_HOMING) +//#define ENDER_AIO_X_STALL_SENSITIVITY 75 +//#define ENDER_AIO_Y_STALL_SENSITIVITY 75 + +// If needed, uncomment ENDER_AIO_HOMING_FEEDRATE_MM_M to customize Homing speeds (mm/min) +//#define ENDER_AIO_HOMING_FEEDRATE_MM_M { (50*60), (50*60), (8*60) } +#endif + +// StallGuard settings +#if ENABLED(ENDER_AIO_SENSORLESS_HOMING) + #ifndef ENDER_AIO_X_STALL_SENSITIVITY + #define ENDER_AIO_X_STALL_SENSITIVITY 75 + #endif + #ifndef ENDER_AIO_Y_STALL_SENSITIVITY + #define ENDER_AIO_Y_STALL_SENSITIVITY 75 + #endif +#endif + +//=========================================================================== +//============================== Input Shaping ============================== +//=========================================================================== + +#if ENABLED(ENDER_AIO_INPUT_SHAPING) + #define INPUT_SHAPING_X + #define INPUT_SHAPING_Y +#else + #define S_CURVE_ACCELERATION // Not needed/recommended with Input Shaping +#endif + +//=========================================================================== +//====================== Hotend & Thermal/PID Settings ====================== +//=========================================================================== + +// Phaetus Dragonfly Upgrade +#define ENDER_AIO_HEATER_0_MAXTEMP TERN(ENDER_AIO_PHAETUS_DRAGONFLY_290C, 305, 270) + +// Motherboard Temperature Sensor +#define ENDER_AIO_TEMP_SENSOR_BOARD TERN(ENDER_AIO_HAS_TEMP_SENSOR_BOARD, 1, 0) + +// SOC Temperature Sensor +#define ENDER_AIO_TEMP_SENSOR_SOC TERN(ENDER_AIO_HAS_TEMP_SENSOR_SOC, 100, 0) + +// MPC/Hotend PID +#if ENABLED(ENDER_AIO_HOTEND_MPCTEMP) + #define MPCTEMP + + #if DISABLED(ENDER_AIO_CUSTOM_HOTEND_MPCTEMP) + #define ENDER_AIO_CUSTOM_MPC_HEATER_POWER { 40.0f } + #define ENDER_AIO_CUSTOM_MPC_BLOCK_HEAT_CAPACITY { 13.33f } + #define ENDER_AIO_CUSTOM_MPC_SENSOR_RESPONSIVENESS { 0.1299f } + #define ENDER_AIO_CUSTOM_MPC_AMBIENT_XFER_COEFF { 0.1163f } + #define ENDER_AIO_CUSTOM_MPC_AMBIENT_XFER_COEFF_FAN255 { 0.1245f } + #define ENDER_AIO_CUSTOM_FILAMENT_HEAT_CAPACITY_PERMM { 5.6e-3f } + #endif +#else // Hotend PID + #define PIDTEMP + + #if DISABLED(ENDER_AIO_CUSTOM_HOTEND_PID) + #define ENDER_AIO_DEFAULT_Kp 21.73 + #define ENDER_AIO_DEFAULT_Ki 1.54 + #define ENDER_AIO_DEFAULT_Kd 76.55 + #endif +#endif + +// Bed PID +#if DISABLED(ENDER_AIO_CUSTOM_BED_PID) + #define ENDER_AIO_DEFAULT_bedKp 47.93 + #define ENDER_AIO_DEFAULT_bedKi 7.94 + #define ENDER_AIO_DEFAULT_bedKd 192.91 +#endif + +//=========================================================================== +//================================== Fans =================================== +//=========================================================================== + +// Motherboard Cooling Fan +#if ENABLED(ENDER_AIO_HAS_CONTROLLER_FAN) + #define USE_CONTROLLER_FAN +#endif + +//=========================================================================== +//============================= Filament Runout ============================= +//=========================================================================== + +#if ENABLED(ENDER_AIO_BTT_SMART_FILAMENT_SENSOR_V2) + #define FILAMENT_RUNOUT_DISTANCE_MM 3 + #define FILAMENT_MOTION_SENSOR + #define FILAMENT_SWITCH_AND_MOTION +#endif + +//=========================================================================== +//========================== Probe / Bed Leveling =========================== +//=========================================================================== + +#if ENABLED(ENDER_AIO_HAS_PROBE) + + #define USE_PROBE_FOR_Z_HOMING + //#define ASSISTED_TRAMMING + #define BABYSTEP_ZPROBE_OFFSET + #define BED_TRAMMING_USE_PROBE + #define Z_SAFE_HOMING + #define PROBE_OFFSET_WIZARD + + #if ENABLED(ENDER_AIO_AUTO_BED_LEVELING_BILINEAR) + #define AUTO_BED_LEVELING_BILINEAR + #define G29_RETRY_AND_RECOVER + #elif ENABLED(ENDER_AIO_AUTO_BED_LEVELING_UBL) + #define AUTO_BED_LEVELING_UBL + #define MESH_EDIT_GFX_OVERLAY + #endif + + // Probe pin + #if ENABLED(ENDER_AIO_PROBE_CONNECTED_TO_Z_MIN_PORT) + #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + + #if ANY(ENDER_AIO_BLTOUCH, ENDER_AIO_MICROPROBE_V1) + #define ENDER_AIO_Z_MIN_ENDSTOP_HIT_STATE HIGH + #else // MicroProbe V2 + #define ENDER_AIO_Z_MIN_ENDSTOP_HIT_STATE LOW + #endif + + #endif + + #if ENABLED(ENDER_AIO_BLTOUCH) + #define BLTOUCH + + #ifndef ENDER_AIO_Z_MIN_ENDSTOP_HIT_STATE + #define ENDER_AIO_Z_MIN_ENDSTOP_HIT_STATE HIGH + #endif + + #if ENABLED(ENDER_AIO_BLTOUCH_MOUNT_CREALITY_METAL) + #define ENDER_AIO_NOZZLE_TO_PROBE_OFFSET { -40, -9, -0.0 } + #elif ENABLED(ENDER_AIO_BLTOUCH_MOUNT_DUDE_IN_A_BOX) + #define ENDER_AIO_NOZZLE_TO_PROBE_OFFSET { -43, -10, -0.0 } + #elif defined(ENDER_AIO_CUSTOM_BLTOUCH_MOUNT) + #define ENDER_AIO_NOZZLE_TO_PROBE_OFFSET ENDER_AIO_CUSTOM_BLTOUCH_MOUNT + #endif + + #elif ENABLED(ENDER_AIO_MICROPROBE) + #define PROBE_ENABLE_DISABLE + + #ifndef ENDER_AIO_Z_MIN_ENDSTOP_HIT_STATE + #define ENDER_AIO_Z_MIN_ENDSTOP_HIT_STATE TERN(ENDER_AIO_MICROPROBE_V1, HIGH, LOW) + #endif + + #if ENABLED(ENDER_AIO_MICROPROBE_V1) + #define BIQU_MICROPROBE_V1 + #else // MicroProbe V2 + #define BIQU_MICROPROBE_V2 + #endif + + #if defined(ENDER_AIO_CUSTOM_MICROPROBE_MOUNT) + #define ENDER_AIO_NOZZLE_TO_PROBE_OFFSET ENDER_AIO_CUSTOM_MICROPROBE_MOUNT + #endif + #endif + +#else // No Probe + #define MESH_BED_LEVELING + #define ENDER_AIO_Z_MIN_ENDSTOP_HIT_STATE HIGH +#endif // ENDER_AIO_HAS_PROBE + +//=========================================================================== +//========================= LCD / TFT / Controller ========================== +//=========================================================================== + +#if ENABLED(ENDER_AIO_DISPLAY_STOCK) + #define ENDER_AIO_SINGLE_LCD_EXP_CONNECTION 1 +#elif ENABLED(ENDER_AIO_DISPLAY_BTT_TFT35_E3_TFT) + #define SERIAL_PORT_2 ENDER_AIO_SERIAL_PORT_2 // Only enable TFT serial port when needed + #define EP_BABYSTEPPING // M293/M294 babystepping with EMERGENCY_PARSER support +#endif + +#if ENABLED(ENDER_AIO_USES_BOTH_EXP_CABLES) + #if ENABLED(ENDER_AIO_SINGLE_LCD_EXP_CONNECTION) + #error "ENDER_AIO_USES_BOTH_EXP_CABLES is incompatible with enabled LCD." + #elif ENABLED(ENDER_AIO_SINGLE_BOARD_EXP_CONNECTION) + #error "ENDER_AIO_USES_BOTH_EXP_CABLES is incompatible with enabled motherboard." + #endif +#endif + +#if ENABLED(ENDER_AIO_SINGLE_LCD_EXP_CONNECTION) && DISABLED(ENDER_AIO_USES_BOTH_EXP_CABLES) + #define CR10_STOCKDISPLAY + #define ENDER_AIO_SDCARD_CONNECTION ONBOARD +#else + #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + #define ENDER_AIO_SDCARD_CONNECTION LCD +#endif + +// Boot & Status Screens +#if ENABLED(ENDER_AIO_SHOW_CUSTOM_BOOTSCREEN) + #define SHOW_CUSTOM_BOOTSCREEN +#endif + +#if ENABLED(ENDER_AIO_STATUS_SCREEN_IMAGE) + #define CUSTOM_STATUS_SCREEN_IMAGE +#endif + +//=========================================================================== +//============================== Custom Menus =============================== +//=========================================================================== + +// Sheet Profiles Menu +#if ALL(ENDER_AIO_SHEET_PROFILES_MENU, ENDER_AIO_HAS_PROBE) + #define CUSTOM_MENU_CONFIG + + #if defined(ENDER_AIO_SHEET_1_DESC) && defined(ENDER_AIO_SHEET_1_OFFSET) + #define CONFIG_MENU_ITEM_1_DESC ENDER_AIO_SHEET_1_DESC ": " STRINGIFY(ENDER_AIO_SHEET_1_OFFSET) + #define CONFIG_MENU_ITEM_1_GCODE "M851 Z" STRINGIFY(ENDER_AIO_SHEET_1_OFFSET) + #define CONFIG_MENU_ITEM_1_CONFIRM + #endif + + #if defined(ENDER_AIO_SHEET_2_DESC) && defined(ENDER_AIO_SHEET_2_OFFSET) + #define CONFIG_MENU_ITEM_2_DESC ENDER_AIO_SHEET_2_DESC ": " STRINGIFY(ENDER_AIO_SHEET_2_OFFSET) + #define CONFIG_MENU_ITEM_2_GCODE "M851 Z" STRINGIFY(ENDER_AIO_SHEET_2_OFFSET) + #define CONFIG_MENU_ITEM_2_CONFIRM + #endif + + #if defined(ENDER_AIO_SHEET_3_DESC) && defined(ENDER_AIO_SHEET_3_OFFSET) + #define CONFIG_MENU_ITEM_3_DESC ENDER_AIO_SHEET_3_DESC ": " STRINGIFY(ENDER_AIO_SHEET_3_OFFSET) + #define CONFIG_MENU_ITEM_3_GCODE "M851 Z" STRINGIFY(ENDER_AIO_SHEET_3_OFFSET) + #define CONFIG_MENU_ITEM_3_CONFIRM + #endif + + #if defined(ENDER_AIO_SHEET_4_DESC) && defined(ENDER_AIO_SHEET_4_OFFSET) + #define CONFIG_MENU_ITEM_4_DESC ENDER_AIO_SHEET_4_DESC ": " STRINGIFY(ENDER_AIO_SHEET_4_OFFSET) + #define CONFIG_MENU_ITEM_4_GCODE "M851 Z" STRINGIFY(ENDER_AIO_SHEET_4_OFFSET) + #define CONFIG_MENU_ITEM_4_CONFIRM + #endif + + #if defined(ENDER_AIO_SHEET_5_DESC) && defined(ENDER_AIO_SHEET_5_OFFSET) + #define CONFIG_MENU_ITEM_5_DESC ENDER_AIO_SHEET_5_DESC ": " STRINGIFY(ENDER_AIO_SHEET_5_OFFSET) + #define CONFIG_MENU_ITEM_5_GCODE "M851 Z" STRINGIFY(ENDER_AIO_SHEET_5_OFFSET) + #define CONFIG_MENU_ITEM_5_CONFIRM + #endif + + #if defined(ENDER_AIO_SHEET_6_DESC) && defined(ENDER_AIO_SHEET_6_OFFSET) + #define CONFIG_MENU_ITEM_6_DESC ENDER_AIO_SHEET_6_DESC ": " STRINGIFY(ENDER_AIO_SHEET_6_OFFSET) + #define CONFIG_MENU_ITEM_6_GCODE "M851 Z" STRINGIFY(ENDER_AIO_SHEET_6_OFFSET) + #define CONFIG_MENU_ITEM_6_CONFIRM + #endif + + #if defined(ENDER_AIO_SHEET_7_DESC) && defined(ENDER_AIO_SHEET_7_OFFSET) + #define CONFIG_MENU_ITEM_7_DESC ENDER_AIO_SHEET_7_DESC ": " STRINGIFY(ENDER_AIO_SHEET_7_OFFSET) + #define CONFIG_MENU_ITEM_7_GCODE "M851 Z" STRINGIFY(ENDER_AIO_SHEET_7_OFFSET) + #define CONFIG_MENU_ITEM_7_CONFIRM + #endif + + #if defined(ENDER_AIO_SHEET_8_DESC) && defined(ENDER_AIO_SHEET_8_OFFSET) + #define CONFIG_MENU_ITEM_8_DESC ENDER_AIO_SHEET_8_DESC ": " STRINGIFY(ENDER_AIO_SHEET_8_OFFSET) + #define CONFIG_MENU_ITEM_8_GCODE "M851 Z" STRINGIFY(ENDER_AIO_SHEET_8_OFFSET) + #define CONFIG_MENU_ITEM_8_CONFIRM + #endif + + #if defined(ENDER_AIO_SHEET_9_DESC) && defined(ENDER_AIO_SHEET_9_OFFSET) + #define CONFIG_MENU_ITEM_9_DESC ENDER_AIO_SHEET_9_DESC ": " STRINGIFY(ENDER_AIO_SHEET_9_OFFSET) + #define CONFIG_MENU_ITEM_9_GCODE "M851 Z" STRINGIFY(ENDER_AIO_SHEET_9_OFFSET) + #define CONFIG_MENU_ITEM_9_CONFIRM + #endif + + #if defined(ENDER_AIO_SHEET_10_DESC) && defined(ENDER_AIO_SHEET_10_OFFSET) + #define CONFIG_MENU_ITEM_10_DESC ENDER_AIO_SHEET_10_DESC ": " STRINGIFY(ENDER_AIO_SHEET_10_OFFSET) + #define CONFIG_MENU_ITEM_10_GCODE "M851 Z" STRINGIFY(ENDER_AIO_SHEET_10_OFFSET) + #define CONFIG_MENU_ITEM_10_CONFIRM + #endif +#endif + +/** + * Calibration Menu + */ +//#define ENDER_AIO_CALIBRATION_MENU +#if ENABLED(ENDER_AIO_CALIBRATION_MENU) + #define CUSTOM_MENU_MAIN + + #if ALL(ENDER_AIO_HAS_PROBE, ENDER_AIO_HAS_FIVE_DRIVERS, ENDER_AIO_DUAL_Z_KIT) + #define MAIN_MENU_ITEM_1_DESC "Tram X Gantry" + #define MAIN_MENU_ITEM_1_GCODE "M117 " MAIN_MENU_ITEM_1_DESC "\nG34\nM0 " MAIN_MENU_ITEM_1_DESC " Complete" + #define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action + + #define MAIN_MENU_ITEM_2_DESC "Update Firmware" + #define MAIN_MENU_ITEM_2_GCODE "M997" + #define MAIN_MENU_ITEM_2_CONFIRM + #else + #define MAIN_MENU_ITEM_1_DESC "Update Firmware" + #define MAIN_MENU_ITEM_1_GCODE "M997" + #define MAIN_MENU_ITEM_1_CONFIRM + #endif +#endif diff --git a/Marlin/src/inc/Ender_AIO_SanityCheck.h b/Marlin/src/inc/Ender_AIO_SanityCheck.h new file mode 100644 index 0000000000..fecd5f72f6 --- /dev/null +++ b/Marlin/src/inc/Ender_AIO_SanityCheck.h @@ -0,0 +1,195 @@ +#pragma once +//=========================================================================== +//========================== DO NOT EDIT THIS FILE ========================== +//=========================================================================== + +/** + * Ender_AIO_SanityCheck.h + * Validate Ender_AIO_Configuration.h options at compile-time. + */ +#define CONFIGURATION_H_VERSION 02010300 +#define ENDER_AIO_VERSION 20240202 + +//=========================================================================== +//=============================== Motherboard =============================== +//=========================================================================== + +#if MANY(ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V3_0, ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V3_0_1, ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V2_0, ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V1_2, ENDER_AIO_MOTHERBOARD_BTT_SKR_E3_TURBO, ENDER_AIO_MOTHERBOARD_BTT_SKR_V3_0, ENDER_AIO_MOTHERBOARD_BTT_SKR_V3_0_EZ) + #error "Only one ENDER_AIO_MOTHERBOARD option can be enabled at a time." +#elif NONE(ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V3_0, ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V3_0_1, ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V2_0, ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V1_2, ENDER_AIO_MOTHERBOARD_BTT_SKR_E3_TURBO, ENDER_AIO_MOTHERBOARD_BTT_SKR_V3_0, ENDER_AIO_MOTHERBOARD_BTT_SKR_V3_0_EZ) + #error "Invalid ENDER_AIO_MOTHERBOARD option." +#endif + +//=========================================================================== +//============================== Input Shaping ============================== +//=========================================================================== + +#if ENABLED(ENDER_AIO_INPUT_SHAPING) + #ifndef ENDER_AIO_SHAPING_FREQ_X + #error "ENDER_AIO_SHAPING_FREQ_X is invalid or not defined." + #elif !defined(ENDER_AIO_SHAPING_FREQ_Y) + #error "ENDER_AIO_SHAPING_FREQ_Y is invalid or not defined." + #elif !defined(ENDER_AIO_SHAPING_ZETA_X) + #error "ENDER_AIO_SHAPING_ZETA_X is invalid or not defined." + #elif !defined(ENDER_AIO_SHAPING_ZETA_Y) + #error "ENDER_AIO_SHAPING_ZETA_Y is invalid or not defined." + #endif +#endif + +//=========================================================================== +//================================ Extruder ================================= +//=========================================================================== + +#if MANY(ENDER_AIO_EXTRUDER_STOCK, ENDER_AIO_EXTRUDER_WINSINN_DUAL_GEAR, ENDER_AIO_EXTRUDER_BONDTECH_BMG, ENDER_AIO_EXTRUDER_TL_DDB_V2S) + #error "Only one ENDER_AIO_EXTRUDER option can be enabled at a time." +#elif NONE(ENDER_AIO_EXTRUDER_STOCK, ENDER_AIO_EXTRUDER_WINSINN_DUAL_GEAR, ENDER_AIO_EXTRUDER_BONDTECH_BMG, ENDER_AIO_EXTRUDER_TL_DDB_V2) + #error "Invalid ENDER_AIO_EXTRUDER option." +#endif + +#if NONE(ENDER_AIO_EXTRUDER_BONDTECH_BMG, ENDER_AIO_EXTRUDER_TL_DDB_V2) && ENABLED(ENDER_AIO_EXTRUDER_MOTOR_LDO_0_9_SLIM_POWER) + #error "ENDER_AIO_EXTRUDER_MOTOR_LDO_0_9_SLIM_POWER is not supported on enabled extruder." +#endif + +//=========================================================================== +//========================= Thermal & PID Settings ========================== +//=========================================================================== + +#if ENABLED(ENDER_AIO_CUSTOM_HOTEND_PID) + #ifndef ENDER_AIO_DEFAULT_Kp + #error "ENDER_AIO_DEFAULT_Kp is invalid or not defined." + #elif !defined(ENDER_AIO_DEFAULT_Ki) + #error "ENDER_AIO_DEFAULT_Ki is invalid or not defined." + #elif !defined(ENDER_AIO_DEFAULT_Kd) + #error "ENDER_AIO_DEFAULT_Kd is invalid or not defined." + #endif +#endif + +#if ENABLED(ENDER_AIO_CUSTOM_BED_PID) + #ifndef ENDER_AIO_DEFAULT_bedKp + #error "ENDER_AIO_DEFAULT_bedKp is invalid or not defined." + #elif !defined(ENDER_AIO_DEFAULT_bedKi) + #error "ENDER_AIO_DEFAULT_bedKi is invalid or not defined." + #elif !defined(ENDER_AIO_DEFAULT_bedKd) + #error "ENDER_AIO_DEFAULT_bedKd is invalid or not defined." + #endif +#endif + +#if ALL(ENDER_AIO_HOTEND_MPCTEMP, ENDER_AIO_CUSTOM_HOTEND_PID) + #error "ENDER_AIO_HOTEND_MPCTEMP and ENDER_AIO_CUSTOM_HOTEND_PID cannot be enabled at the same time." +#endif + +#if ENABLED(ENDER_AIO_CUSTOM_HOTEND_MPCTEMP) + #if DISABLED(ENDER_AIO_HOTEND_MPCTEMP) + #error "ENDER_AIO_CUSTOM_HOTEND_MPCTEMP requires ENDER_AIO_HOTEND_MPCTEMP." + #elif !defined(ENDER_AIO_CUSTOM_MPC_HEATER_POWER) + #error "ENDER_AIO_CUSTOM_MPC_HEATER_POWER is invalid or not defined." + #elif !defined(ENDER_AIO_CUSTOM_MPC_BLOCK_HEAT_CAPACITY) + #error "ENDER_AIO_CUSTOM_MPC_BLOCK_HEAT_CAPACITY is invalid or not defined." + #elif !defined(ENDER_AIO_CUSTOM_MPC_SENSOR_RESPONSIVENESS) + #error "ENDER_AIO_CUSTOM_MPC_SENSOR_RESPONSIVENESS is invalid or not defined." + #elif !defined(ENDER_AIO_CUSTOM_MPC_AMBIENT_XFER_COEFF) + #error "ENDER_AIO_CUSTOM_MPC_AMBIENT_XFER_COEFF is invalid or not defined." + #elif !defined(ENDER_AIO_CUSTOM_MPC_AMBIENT_XFER_COEFF_FAN255) + #error "ENDER_AIO_CUSTOM_MPC_AMBIENT_XFER_COEFF_FAN255 is invalid or not defined." + #elif !defined(ENDER_AIO_CUSTOM_FILAMENT_HEAT_CAPACITY_PERMM) + #error "ENDER_AIO_CUSTOM_FILAMENT_HEAT_CAPACITY_PERMM is invalid or not defined." + #endif +#endif + +//=========================================================================== +//========================== Probes / Bed Leveling ========================== +//=========================================================================== + +#if MANY(ENDER_AIO_BLTOUCH, ENDER_AIO_MICROPROBE) + #error "Only one probe option can be enabled at a time." +#endif + +#if ENABLED(ENDER_AIO_HAS_PROBE) + #if MANY(ENDER_AIO_AUTO_BED_LEVELING_BILINEAR, ENDER_AIO_AUTO_BED_LEVELING_UBL) + #error "Only one ENDER_AIO_AUTO_BED_LEVELING option can be enabled at a time." + #elif NONE(ENDER_AIO_AUTO_BED_LEVELING_BILINEAR, ENDER_AIO_AUTO_BED_LEVELING_UBL) + #error "Invalid ENDER_AIO_AUTO_BED_LEVELING option." + #endif +#elif ENABLED(ENDER_AIO_BLTOUCH) + #if MANY(ENDER_AIO_BLTOUCH_MOUNT_CREALITY_METAL, ENDER_AIO_BLTOUCH_MOUNT_DUDE_IN_A_BOX) || (ANY(ENDER_AIO_BLTOUCH_MOUNT_CREALITY_METAL, ENDER_AIO_BLTOUCH_MOUNT_DUDE_IN_A_BOX) && defined(ENDER_AIO_CUSTOM_BLTOUCH_MOUNT)) + #error "Only one ENDER_AIO_BLTOUCH_MOUNT option can be enabled at a time." + #elif NONE(ENDER_AIO_BLTOUCH_MOUNT_CREALITY_METAL, ENDER_AIO_BLTOUCH_MOUNT_DUDE_IN_A_BOX) && !defined(ENDER_AIO_CUSTOM_BLTOUCH_MOUNT) + #error "Invalid ENDER_AIO_BLTOUCH_MOUNT option." + #endif +#elif ENABLED(ENDER_AIO_MICROPROBE) + #ifndef ENDER_AIO_CUSTOM_MICROPROBE_MOUNT + #error "ENDER_AIO_MICROPROBE requires ENDER_AIO_CUSTOM_MICROPROBE_MOUNT." + #endif +#endif + +#if ENABLED(ENDER_AIO_PROBE_CONNECTED_TO_Z_MIN_PORT) && DISABLED(ENDER_AIO_HAS_PROBE) + #error "ENDER_AIO_PROBE_CONNECTED_TO_Z_MIN_PORT requires a probe." +#endif + +//=========================================================================== +//========================= LCD / TFT / Controller ========================== +//=========================================================================== + +#if MANY(ENDER_AIO_DISPLAY_STOCK, ENDER_AIO_DISPLAY_BTT_TFT35_E3_TFT) + #error "Only one ENDER_AIO_DISPLAY option can be enabled at a time." +#elif NONE(ENDER_AIO_DISPLAY_STOCK, ENDER_AIO_DISPLAY_BTT_TFT35_E3_TFT) + #error "Invalid ENDER_AIO_DISPLAY option." +#endif + +#ifndef ENDER_AIO_LCD_LANGUAGE + #error "Invalid ENDER_AIO_LCD_LANGUAGE option." +#endif + +//=========================================================================== +//=========================== Sheet Profiles Menu =========================== +//=========================================================================== + +#if ENABLED(ENDER_AIO_SHEET_PROFILES_MENU) && DISABLED(ENDER_AIO_HAS_PROBE) + #error "ENDER_AIO_SHEET_PROFILES_MENU requires a probe." +#else + // Description is enabled, but no offset + #if defined(ENDER_AIO_SHEET_1_DESC) && !defined(ENDER_AIO_SHEET_1_OFFSET) + #error "ENDER_AIO_SHEET_1_OFFSET is required when ENDER_AIO_SHEET_1_DESC is enabled." + #elif defined(ENDER_AIO_SHEET_2_DESC) && !defined(ENDER_AIO_SHEET_2_OFFSET) + #error "ENDER_AIO_SHEET_2_OFFSET is required when ENDER_AIO_SHEET_2_DESC is enabled." + #elif defined(ENDER_AIO_SHEET_3_DESC) && !defined(ENDER_AIO_SHEET_3_OFFSET) + #error "ENDER_AIO_SHEET_3_OFFSET is required when ENDER_AIO_SHEET_3_DESC is enabled." + #elif defined(ENDER_AIO_SHEET_4_DESC) && !defined(ENDER_AIO_SHEET_4_OFFSET) + #error "ENDER_AIO_SHEET_4_OFFSET is required when ENDER_AIO_SHEET_4_DESC is enabled." + #elif defined(ENDER_AIO_SHEET_5_DESC) && !defined(ENDER_AIO_SHEET_5_OFFSET) + #error "ENDER_AIO_SHEET_5_OFFSET is required when ENDER_AIO_SHEET_5_DESC is enabled." + #elif defined(ENDER_AIO_SHEET_6_DESC) && !defined(ENDER_AIO_SHEET_6_OFFSET) + #error "ENDER_AIO_SHEET_6_OFFSET is required when ENDER_AIO_SHEET_6_DESC is enabled." + #elif defined(ENDER_AIO_SHEET_7_DESC) && !defined(ENDER_AIO_SHEET_7_OFFSET) + #error "ENDER_AIO_SHEET_7_OFFSET is required when ENDER_AIO_SHEET_7_DESC is enabled." + #elif defined(ENDER_AIO_SHEET_8_DESC) && !defined(ENDER_AIO_SHEET_8_OFFSET) + #error "ENDER_AIO_SHEET_8_OFFSET is required when ENDER_AIO_SHEET_8_DESC is enabled." + #elif defined(ENDER_AIO_SHEET_9_DESC) && !defined(ENDER_AIO_SHEET_9_OFFSET) + #error "ENDER_AIO_SHEET_9_OFFSET is required when ENDER_AIO_SHEET_9_DESC is enabled." + #elif defined(ENDER_AIO_SHEET_10_DESC) && !defined(ENDER_AIO_SHEET_10_OFFSET) + #error "ENDER_AIO_SHEET_10_OFFSET is required when ENDER_AIO_SHEET_10_DESC is enabled." + #endif + + // Offset is enabled, but no description + #if defined(ENDER_AIO_SHEET_1_OFFSET) && !defined(ENDER_AIO_SHEET_1_DESC) + #error "ENDER_AIO_SHEET_1_DESC is required when ENDER_AIO_SHEET_1_OFFSET is enabled." + #elif defined(ENDER_AIO_SHEET_2_OFFSET) && !defined(ENDER_AIO_SHEET_2_DESC) + #error "ENDER_AIO_SHEET_2_DESC is required when ENDER_AIO_SHEET_2_OFFSET is enabled." + #elif defined(ENDER_AIO_SHEET_3_OFFSET) && !defined(ENDER_AIO_SHEET_3_DESC) + #error "ENDER_AIO_SHEET_3_DESC is required when ENDER_AIO_SHEET_3_OFFSET is enabled." + #elif defined(ENDER_AIO_SHEET_4_OFFSET) && !defined(ENDER_AIO_SHEET_4_DESC) + #error "ENDER_AIO_SHEET_4_DESC is required when ENDER_AIO_SHEET_4_OFFSET is enabled." + #elif defined(ENDER_AIO_SHEET_5_OFFSET) && !defined(ENDER_AIO_SHEET_5_DESC) + #error "ENDER_AIO_SHEET_5_DESC is required when ENDER_AIO_SHEET_5_OFFSET is enabled." + #elif defined(ENDER_AIO_SHEET_6_OFFSET) && !defined(ENDER_AIO_SHEET_6_DESC) + #error "ENDER_AIO_SHEET_6_DESC is required when ENDER_AIO_SHEET_6_OFFSET is enabled." + #elif defined(ENDER_AIO_SHEET_7_OFFSET) && !defined(ENDER_AIO_SHEET_7_DESC) + #error "ENDER_AIO_SHEET_7_DESC is required when ENDER_AIO_SHEET_7_OFFSET is enabled." + #elif defined(ENDER_AIO_SHEET_8_OFFSET) && !defined(ENDER_AIO_SHEET_8_DESC) + #error "ENDER_AIO_SHEET_8_DESC is required when ENDER_AIO_SHEET_8_OFFSET is enabled." + #elif defined(ENDER_AIO_SHEET_9_OFFSET) && !defined(ENDER_AIO_SHEET_9_DESC) + #error "ENDER_AIO_SHEET_9_DESC is required when ENDER_AIO_SHEET_9_OFFSET is enabled." + #elif defined(ENDER_AIO_SHEET_10_OFFSET) && !defined(ENDER_AIO_SHEET_10_DESC) + #error "ENDER_AIO_SHEET_10_DESC is required when ENDER_AIO_SHEET_10_OFFSET is enabled." + #endif +#endif diff --git a/Marlin/src/inc/Ender_AIO_Warnings.cpp b/Marlin/src/inc/Ender_AIO_Warnings.cpp new file mode 100644 index 0000000000..b365438a9f --- /dev/null +++ b/Marlin/src/inc/Ender_AIO_Warnings.cpp @@ -0,0 +1,93 @@ +//=========================================================================== +//========================== DO NOT EDIT THIS FILE ========================== +//=========================================================================== + +/** + * Ender_AIO_Warnings.cpp + * Test Ender AIO configuration values and give warnings at compile-time. + */ +#include "MarlinConfig.h" +#define ENDER_AIO_VERSION 20240202 + +// +// Warnings! Located here so they will appear just once in the build output. +// + +/** + * Ender AIO Warnings / Reminders + */ +#ifndef NO_ENDER_AIO_WARNINGS + +//=========================================================================== +//============================= Filament Runout ============================= +//=========================================================================== + +#if ENABLED(ENDER_AIO_BTT_SMART_FILAMENT_SENSOR_V2) + + /** + * BTT SFS V2.0 Wiring Colors + * + * Switch Sensor Cable: Red wire -> VCC, Blue wire -> SENSOR + * Motion Sensor Cable: Black wire -> GND, Green wire -> SENSOR + */ + #if ANY(ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V3_0, ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V2_0) + #warning "Connect BTT SFS V2.0 Switch Sensor cable to E0-STOP: Red wire -> +5V, Blue wire -> PC15." + #warning "Connect BTT SFS V2.0 Motion Sensor cable to PS-ON: Black wire -> GND, Green wire -> PC13." + #elif ENABLED(ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V1_2) + #warning "Connect BTT SFS V2.0 Switch Sensor cable to E0-STOP: Red wire -> +5V, Blue wire -> PC15." + #warning "Connect BTT SFS V2.0 Motion Sensor cable to PT-DET: Black wire -> GND, Green wire -> PC12." + #elif ENABLED(ENDER_AIO_MOTHERBOARD_BTT_SKR_MINI_E3_V3_0_1) + #warning "Connect BTT SFS V2.0 Switch Sensor cable to E0-STOP: Red wire -> +5V, Blue wire -> PC15." + #warning "Connect BTT SFS V2.0 Motion Sensor cable to PS-ON: Black wire -> GND, Green wire -> PC14." + #elif ENABLED(ENDER_AIO_MOTHERBOARD_BTT_SKR_E3_TURBO) + #warning "Connect BTT SFS V2.0 Switch Sensor cable to E0-STOP: Red wire -> +5V, Blue wire -> P1_26." + #warning "Connect BTT SFS V2.0 Motion Sensor cable to E1-STOP: Black wire -> GND, Green wire -> P1_25." + #elif ANY(ENDER_AIO_MOTHERBOARD_BTT_SKR_V3_0, ENDER_AIO_MOTHERBOARD_BTT_SKR_V3_0_EZ) + #warning "Connect BTT SFS V2.0 Switch Sensor cable to E0DET: Red wire -> +5V, Blue wire -> PC2." + #warning "Connect BTT SFS V2.0 Motion Sensor cable to E1DET: Black wire -> GND, Green wire -> PA0." + #endif +#endif + +#if ENABLED(ENDER_AIO_HAS_PROBE) + #warning: "Z endstop must be removed and the probe will be used for Z homing." +#endif + +#if ALL(ENDER_AIO_HAS_FIVE_DRIVERS, ENDER_AIO_DUAL_Z_KIT) + #warning "Five stepper drivers are required for enabled motherboard. E1 stepper driver will be used for Z2." +#endif + +//=========================================================================== +//========================== TMC DIAG Jumpers/Pins ========================== +//=========================================================================== + +#if ENABLED(ENDER_AIO_SENSORLESS_HOMING) + #if ALL(ENDER_AIO_HAS_FIVE_DRIVERS, ENDER_AIO_DUAL_Z_KIT) + #if ENABLED(USES_DIAG_JUMPERS) + #warning "DIAG jumpers must be installed for X & Y and removed for Z, Z2 (E1), and E0 or homing and filament runout will not work correctly." + #elif ENABLED(USES_DIAG_PINS) + #warning "DIAG pins must be cut or desoldered from Z, Z2 (E1), and E0 drivers or homing and filament runout will not work correctly." + #endif + #else // Four drivers + #if ENABLED(USES_DIAG_JUMPERS) + #warning "DIAG jumpers must be installed for X & Y and removed for Z & E or homing and filament runout will not work correctly." + #elif ENABLED(USES_DIAG_PINS) + #warning "DIAG pins must be cut or desoldered from Z and E drivers or homing and filament runout will not work correctly." + #endif + #endif +#else // Endstops + #if ALL(ENDER_AIO_HAS_FIVE_DRIVERS, ENDER_AIO_DUAL_Z_KIT) + #if ENABLED(USES_DIAG_JUMPERS) + #warning "DIAG jumpers must be removed for X, Y, Z, Z2 (E1), & E0 or homing and filament runout will not work correctly." + #elif ENABLED(USES_DIAG_PINS) + #warning "DIAG pins must be cut or desoldered from X, Y, Z, Z2 (E1), and E0 drivers or homing and filament runout will not work correctly." + #endif + #else // Four drivers + #if ENABLED(USES_DIAG_JUMPERS) + #warning "DIAG jumpers must be removed for X, Y, Z, & E0 or homing and filament runout will not work correctly." + #elif ENABLED(USES_DIAG_PINS) + #warning "DIAG pins must be cut or desoldered from X, Y, Z, and E0 drivers or homing and filament runout will not work correctly." + #endif + #endif +#endif + +#endif // NO_ENDER_AIO_WARNINGS diff --git a/Marlin/src/inc/MarlinConfigPre.h b/Marlin/src/inc/MarlinConfigPre.h index c2191ab1b7..be84c867fd 100644 --- a/Marlin/src/inc/MarlinConfigPre.h +++ b/Marlin/src/inc/MarlinConfigPre.h @@ -36,6 +36,13 @@ #include "../core/macros.h" #include "../core/boards.h" + +// Ender_AIO files +#include "../../Ender_AIO_Configuration.h" +#include "Ender_AIO_Changes.h" +#include "Ender_AIO_SanityCheck.h" +#include "Ender_AIO_Conditionals.h" + #include "../../Configuration.h" #ifdef CUSTOM_VERSION_FILE diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 7e3a6d2a73..148e6a9e5f 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -25,7 +25,7 @@ * Release version. Leave the Marlin version or apply a custom scheme. */ #ifndef SHORT_BUILD_VERSION - #define SHORT_BUILD_VERSION "bugfix-2.1.x" + #define SHORT_BUILD_VERSION "Ender AIO 2.1.x" #endif /** diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp index 519bb7651a..9315d3c4b6 100644 --- a/Marlin/src/inc/Warnings.cpp +++ b/Marlin/src/inc/Warnings.cpp @@ -202,7 +202,7 @@ #endif #endif #if AUTO_ASSIGNED_Z2_STEPPER - #warning "Note: Auto-assigned Z2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)" + //#warning "Note: Auto-assigned Z2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)" #endif #if AUTO_ASSIGNED_Z2_MS1 #warning "Note: Auto-assigned Z2_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)" @@ -680,9 +680,9 @@ // #if !USE_SENSORLESS #if ENABLED(USES_DIAG_JUMPERS) && DISABLED(DIAG_JUMPERS_REMOVED) - #warning "Motherboard DIAG jumpers must be removed when SENSORLESS_HOMING is disabled. (Define DIAG_JUMPERS_REMOVED to suppress this warning.)" + //#warning "Motherboard DIAG jumpers must be removed when SENSORLESS_HOMING is disabled. (Define DIAG_JUMPERS_REMOVED to suppress this warning.)" #elif ENABLED(USES_DIAG_PINS) && DISABLED(DIAG_PINS_REMOVED) - #warning "Driver DIAG pins must be physically removed unless SENSORLESS_HOMING is enabled. (See https://bit.ly/2ZPRlt0) (Define DIAG_PINS_REMOVED to suppress this warning.)" + //#warning "Driver DIAG pins must be physically removed unless SENSORLESS_HOMING is enabled. (See https://bit.ly/2ZPRlt0) (Define DIAG_PINS_REMOVED to suppress this warning.)" #endif #endif diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index af32d8c119..cdda675611 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -619,7 +619,7 @@ #elif MB(BTT_SKR_MINI_E3_V1_0) #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple #elif MB(BTT_SKR_MINI_E3_V1_2) - #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple + #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB #elif MB(BTT_SKR_MINI_E3_V2_0) #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple #elif MB(BTT_SKR_MINI_MZ_V1_0) diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h index 4cfd75088f..e193b01fd4 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h @@ -357,7 +357,7 @@ #define FORCE_SOFT_SPI #else - #error "Only CR10_STOCKDISPLAY, LCD_FOR_MELZI, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, TFTGLCD_PANEL_(SPI|I2C), FYSETC_MINI_12864_2_1, MKS_MINI_12864_V3, and BTT_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3." + //#error "Only CR10_STOCKDISPLAY, LCD_FOR_MELZI, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, TFTGLCD_PANEL_(SPI|I2C), FYSETC_MINI_12864_2_1, MKS_MINI_12864_V3, and BTT_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3." #endif #endif // HAS_WIRED_LCD diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h index ba1d06f689..24b0c57598 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h @@ -378,7 +378,7 @@ #define LCD_BACKLIGHT_PIN -1 #else - #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3." + //#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3." #endif #endif // SKR_MINI_SCREEN_ADAPTER diff --git a/README.md b/README.md index ac496aac21..5eab4b12ff 100644 --- a/README.md +++ b/README.md @@ -1,154 +1,42 @@ -

MarlinFirmware's logo

+

Creality Ender-3

-

Marlin 3D Printer Firmware

+

Creality Ender-3 AIO Marlin Firmware

- GPL-V3.0 License - Contributors - Last Release Date - CI Status - GitHub Sponsors + GPL-V3.0 License + Contributors + Last Commit Date + CI Status + GitHub Sponsors
- Follow MarlinFirmware on Mastodon + Follow thisiskeithb on Twitter + Follow thisiskeithb on Mastodon

-Additional documentation can be found at the [Marlin Home Page](https://marlinfw.org/). -Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by! +## Configuring Ender-3 All-in-One Firmware -## Marlin 2.1 Bugfix Branch +To configure this firmware, enable options in [`Ender_AIO_Configuration.h`](Marlin/Ender_AIO_Configuration.h). No other config file editing is required! -__Not for production use. Use with caution!__ +## Building Ender-3 All-in-One Firmware -Marlin 2.1 takes this popular RepRap firmware to the next level by adding support for much faster 32-bit and ARM-based boards while improving support for 8-bit AVR boards. Read about Marlin's decision to use a "Hardware Abstraction Layer" below. +To build this firmware, you'll need [Visual Studio Code](https://code.visualstudio.com/) with [PlatformIO](https://docs.platformio.org/en/latest/integration/ide/vscode.html#platformio-ide-for-vscode). Detailed setup instructions can be found in the [Installing Marlin (PlatformIO with VSCode)](https://marlinfw.org/docs/basics/install_platformio_vscode.html) guide. +## Supported Hardware Upgrades -This branch is for patches to the latest 2.1.x release version. Periodically this branch will form the basis for the next minor 2.1.x release. +- **Motherboards**: BigTreeTech SKR Mini E3 V3.x & V2, E3 Turbo, SKR V3.0 & V3.0 EZ +- **Drivers**: TMC2209s on X, Y, Z, and E +- **Displays**: Stock LCD and BigTreeTech TFT35 E3 +- **Extruders**: [WINSINN Dual Gear Extruder](https://www.amazon.com/dp/B08D9CNHVN), [Bondtech BMG Extruder](https://www.bondtech.se/product/creality-cr-10-kit/), and [Trianglelab DDB V2.0 Extruder](https://www.amazon.com/dp/B08KP189KN) +- **Filament Runout**: Basic runout switch and [BigTreeTech SFS V2.0](https://biqu.equipment/products/btt-sfs-v2-0-smart-filament-sensor) +- **Probes**: [BLTouch V3.1](https://www.amazon.com/dp/B087CQ3RLG) and [BIQU MicroProbe](https://biqu.equipment/products/microprobe-v1-0-for-b1-printers-h2-extruders-ender-3?variant=40223870287970) +- **Dual Z**: [Ender 3 Dual Z-Axis Upgrade Kit](https://www.amazon.com/dp/B09N8QQDSP) -Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). +## Credits -## Example Configurations +If you find this project helpful, please consider donating! -Before you can build Marlin for your machine you'll need a configuration for your specific hardware. Upon request, your vendor will be happy to provide you with the complete source code and configurations for your machine, but you'll need to get updated configuration files if you want to install a newer version of Marlin. Fortunately, Marlin users have contributed dozens of tested configurations to get you started. Visit the [MarlinFirmware/Configurations](https://github.com/MarlinFirmware/Configurations) repository to find the right configuration for your hardware. - -## Building Marlin 2.1 - -To build and upload Marlin you will use one of these tools: - -- The free [Visual Studio Code](https://code.visualstudio.com/download) using the [Auto Build Marlin](https://marlinfw.org/docs/basics/auto_build_marlin.html) extension. -- The free [Arduino IDE](https://www.arduino.cc/en/main/software) : See [Building Marlin with Arduino](https://marlinfw.org/docs/basics/install_arduino.html) -- You can also use VSCode with devcontainer : See [Installing Marlin (VSCode devcontainer)](http://marlinfw.org/docs/basics/install_devcontainer_vscode.html). - -Marlin is optimized to build with the **PlatformIO IDE** extension for **Visual Studio Code**. You can still build Marlin with **Arduino IDE**, and we hope to improve the Arduino build experience, but at this time PlatformIO is the better choice. - -## Hardware Abstraction Layer (HAL) - -Marlin includes an abstraction layer to provide a common API for all the platforms it targets. This allows Marlin code to address the details of motion and user interface tasks at the lowest and highest levels with no system overhead, tying all events directly to the hardware clock. - -Every new HAL opens up a world of hardware. At this time we need HALs for RP2040 and the Duet3D family of boards. A HAL that wraps an RTOS is an interesting concept that could be explored. Did you know that Marlin includes a Simulator that can run on Windows, macOS, and Linux? Join the Discord to help move these sub-projects forward! - -## 8-Bit AVR Boards - -A core tenet of this project is to keep supporting 8-bit AVR boards while also maintaining a single codebase that applies equally to all machines. We want casual hobbyists to benefit from the community's innovations as much as possible just as much as those with fancier machines. Plus, those old AVR-based machines are often the best for your testing and feedback! - -### Supported Platforms - - Platform|MCU|Example Boards - --------|---|------- - [Arduino AVR](https://www.arduino.cc/)|ATmega|RAMPS, Melzi, RAMBo - [Teensy++ 2.0](https://www.microchip.com/en-us/product/AT90USB1286)|AT90USB1286|Printrboard - [Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue)|SAM3X8E|RAMPS-FD, RADDS, RAMPS4DUE - [ESP32](https://github.com/espressif/arduino-esp32)|ESP32|FYSETC E4, E4d@BOX, MRR - [LPC1768](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512-kb-flash-64-kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|ARM® Cortex-M3|MKS SBASE, Re-ARM, Selena Compact - [LPC1769](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512-kb-flash-64-kb-sram-ethernet-usb-lqfp100-package:LPC1769FBD100)|ARM® Cortex-M3|Smoothieboard, Azteeg X5 mini, TH3D EZBoard - [STM32F103](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html)|ARM® Cortex-M3|Malyan M200, GTM32 Pro, MKS Robin, BTT SKR Mini - [STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)|ARM® Cortex-M4|ARMED, Rumba32, SKR Pro, Lerdge, FYSETC S6, Artillery Ruby - [STM32F7x6](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html)|ARM® Cortex-M7|The Borg, RemRam V1 - [STM32G0B1RET6](https://www.st.com/en/microcontrollers-microprocessors/stm32g0x1.html)|ARM® Cortex-M0+|BigTreeTech SKR mini E3 V3.0 - [STM32H743xIT6](https://www.st.com/en/microcontrollers-microprocessors/stm32h743-753.html)|ARM® Cortex-M7|BigTreeTech SKR V3.0, SKR EZ V3.0, SKR SE BX V2.0/V3.0 - [SAMD51P20A](https://www.adafruit.com/product/4064)|ARM® Cortex-M4|Adafruit Grand Central M4 - [Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|ARM® Cortex-M4| - [Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|ARM® Cortex-M4| - [Teensy 4.0](https://www.pjrc.com/store/teensy40.html)|ARM® Cortex-M7| - [Teensy 4.1](https://www.pjrc.com/store/teensy41.html)|ARM® Cortex-M7| - Linux Native|x86/ARM/etc.|Raspberry Pi - -## Submitting Patches - -Proposed patches should be submitted as a Pull Request against the ([bugfix-2.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.1.x)) branch. - -- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.1.x life-cycle. -- Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers. -- Please submit Feature Requests and Bug Reports to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues/new/choose). Support resources are also listed there. -- Whenever you add new features, be sure to add tests to `buildroot/tests` and then run your tests locally, if possible. - - It's optional: Running all the tests on Windows might take a long time, and they will run anyway on GitHub. - - If you're running the tests on Linux (or on WSL with the code on a Linux volume) the speed is much faster. - - You can use `make tests-all-local` or `make tests-single-local TEST_TARGET=...`. - - If you prefer Docker you can use `make tests-all-local-docker` or `make tests-all-local-docker TEST_TARGET=...`. - -## Marlin Support - -The Issue Queue is reserved for Bug Reports and Feature Requests. To get help with configuration and troubleshooting, please use the following resources: - -- [Marlin Documentation](https://marlinfw.org) - Official Marlin documentation -- [Marlin Discord](https://discord.gg/n5NJ59y) - Discuss issues with Marlin users and developers -- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/) -- RepRap.org [Marlin Forum](https://forums.reprap.org/list.php?415) -- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/) -- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube - -## Contributors - -Marlin is constantly improving thanks to a huge number of contributors from all over the world bringing their specialties and talents. Huge thanks are due to [all the contributors](https://github.com/MarlinFirmware/Marlin/graphs/contributors) who regularly patch up bugs, help direct traffic, and basically keep Marlin from falling apart. Marlin's continued existence would not be possible without them. - -## Administration - -Regular users can open and close their own issues, but only the administrators can do project-related things like add labels, merge changes, set milestones, and kick trolls. The current Marlin admin team consists of: - - - - -
Project Maintainer
- - 🇺🇸  **Scott Lahteine** -       [@thinkyhead](https://github.com/thinkyhead) -       [  Donate 💸  ](https://www.thinkyhead.com/donate-to-marlin) - - - - 🇺🇸  **Roxanne Neufeld** -       [@Roxy-3D](https://github.com/Roxy-3D) - - 🇺🇸  **Keith Bennett** -       [@thisiskeithb](https://github.com/thisiskeithb) -       [  Donate 💸  ](https://github.com/sponsors/thisiskeithb) - - 🇺🇸  **Jason Smith** -       [@sjasonsmith](https://github.com/sjasonsmith) - - - - 🇧🇷  **Victor Oliveira** -       [@rhapsodyv](https://github.com/rhapsodyv) - - 🇬🇧  **Chris Pepper** -       [@p3p](https://github.com/p3p) - -🇳🇿  **Peter Ellens** -       [@ellensp](https://github.com/ellensp) -       [  Donate 💸  ](https://ko-fi.com/ellensp) - - - - 🇺🇸  **Bob Kuhn** -       [@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn) - - 🇳🇱  **Erik van der Zalm** -       [@ErikZalm](https://github.com/ErikZalm) -       [  Donate 💸  ](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) - -
+ - Keith Bennett [[thisiskeithb](https://github.com/thisiskeithb)], Ender AIO Creator - [💸 Github Sponsors](https://github.com/sponsors/thisiskeithb) / [☕ Ko-fi](https://ko-fi.com/thisiskeithb) + - Scott Lahteine [[thinkyhead](https://github.com/thinkyhead)], Lead Marlin Developer & Maintainer - [💸 Donate](https://www.thinkyhead.com/donate-to-marlin) ## License -Marlin is published under the [GPL license](/LICENSE) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork. - -While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own. +Marlin and the Ender-3 All-in-One Firmware are published under the [GPL license](/LICENSE) because we believe in open development. diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py index 2e4ab5c92d..84211f185b 100644 --- a/buildroot/share/PlatformIO/scripts/preflight-checks.py +++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py @@ -108,6 +108,11 @@ def rm_ofile(subdir, name): if 'EEPROM_INIT_NOW' in env['MARLIN_FEATURES']: rm_ofile("module", "settings") + # + # Give Ender AIO warnings on every build + # + rm_ofile("inc", "Ender_AIO_Warnings") + # # Check for old files indicating an entangled Marlin (mixing old and new code) # diff --git a/buildroot/share/pixmaps/logo/Ender_AIO_Ender-3.png b/buildroot/share/pixmaps/logo/Ender_AIO_Ender-3.png new file mode 100644 index 0000000000..df1633e682 Binary files /dev/null and b/buildroot/share/pixmaps/logo/Ender_AIO_Ender-3.png differ diff --git a/config/README.md b/config/README.md deleted file mode 100644 index b19527ccc3..0000000000 --- a/config/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Where have all the configurations gone? - -Marlin configurations for specific machines are now maintained in their own repository at: - -## https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x - -Configuration files for use with the nightly `bugfix-2.1.x` branch can be downloaded from: - -## https://github.com/MarlinFirmware/Configurations/archive/bugfix-2.1.x.zip diff --git a/platformio.ini b/platformio.ini index 76200cbbd5..f190c9b140 100644 --- a/platformio.ini +++ b/platformio.ini @@ -10,10 +10,41 @@ # Automatic targets - enable auto-uploading #targets = upload +# E3 AIO Environment Options: + +# SKR Mini E3 V3.0 +# =================== +# STM32G0B1RE_btt +# STM32G0B1RE_btt_xfer + +# SKR Mini E3 V3.0.1 +# =================== +# STM32F401RC_btt + +# SKR Mini E3 V2.0 +# =================== +# STM32F103RC_btt +# STM32F103RE_btt +# STM32F103RE_btt_USB + +# SKR Mini E3 V1.2 +# =================== +# STM32F103RC_btt +# STM32F103RC_btt_USB + +# SKR E3 Turbo +# =================== +# LPC1769 + +# SKR V3.0 / V3.0 EZ +# =================== +# STM32H743VI_btt +# STM32H723VG_btt + [platformio] src_dir = Marlin boards_dir = buildroot/share/PlatformIO/boards -default_envs = mega2560 +default_envs = STM32G0B1RE_btt include_dir = Marlin extra_configs = Marlin/config.ini