Skip to content

Commit

Permalink
V14.0.0
Browse files Browse the repository at this point in the history
* Separated XYZ driver selection from the E driver, noticed a few printers that needed that
* Included latest Marlin folders in GitHub so it's easier and faster to find the current version
* Enabled EEPROM_AUTO_INIT, auto initialize the EEPROM on error
  • Loading branch information
ADeliciousMan committed Oct 10, 2023
1 parent 2847097 commit 47481e0
Show file tree
Hide file tree
Showing 27 changed files with 11,477 additions and 26 deletions.
57 changes: 33 additions & 24 deletions Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

//#define MOTHERBOARD BOARD_CREALITY_V427 // Creality 4.2.7 Board
//#define MOTHERBOARD BOARD_CREALITY_V422 // Creality 4.2.2 Board, standard for Ender 3 and Ender 3 Pro
//#define MOTHERBOARD BOARD_CREALITY_V4 // Ender 3 Max, Ender 3V2
//#define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V3_0 // BIQU SKR MINI E3 V3.0
//#define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0 // BIQU SKR MINI E3 V1.0
//#define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_2 // BIQU SKR MINI E3 V1.2
Expand All @@ -23,26 +24,33 @@
//#define MOTHERBOARD BOARD_BTT_OCTOPUS_V1_1 // BIQU OCTOPUS V1.1
//#define MOTHERBOARD BOARD_BTT_OCTOPUS_PRO_V1_0 // BIQU OCTOPUS PRO V1
//#define MOTHERBOARD BOARD_BTT_OCTOPUS_MAX_EZ_V1_0 // BIQU OCTOPUS MAX EZ
//#define MOTHERBOARD BOARD_CREALITY_V4 // Ender 3 Max

//===========================================================================
//================================= DRIVERS =================================
//============================== X Y Z DRIVERS ==============================
//===========================================================================

//#define DRIVERS_TMC2208_STANDALONE // Typical drivers for a Creality 4.2.7 board
//#define DRIVERS_A4988 // Typical drivers for a Creality 4.2.2 board
//#define DRIVERS_TMC2209 // Typical drivers for a BIQU SKR Mini 3 V3 board or Octopus Pro (Same driver as the EZ2209 on the Octopus Max EZ), Anycubic Kobra Max

//===========================================================================
//================================ E DRIVERS ================================
//===========================================================================

//#define DRIVERS_TMC2208_STANDALONE_E // Typical drivers for a Creality 4.2.7 board
//#define DRIVERS_A4988_E // Typical drivers for a Creality 4.2.2 board
//#define DRIVERS_TMC2209_E // Typical drivers for a BIQU SKR Mini 3 V3 board or Octopus Pro (Same driver as the EZ2209 on the Octopus Max EZ), Anycubic Kobra Max

//===========================================================================
//================================= Z PROBE =================================
//===========================================================================

//#define HAS_Z_PROBE // Say if you have a Z Probe, leave blank for Z axis switch

#if ENABLED(HAS_Z_PROBE) // PICK ONLY ONE AND ONLY IF HAS_Z_PROBE IS ON
// #define HAS_BL_CR_TOUCH // BL Touch or CR Touch probe
#define HAS_SPRITE // Creality Sprite Extruder
// #define TH3D_BL_CR_MULTIMOUNT // If you're using a BL_CR_MULTIMOUNT with TH3D Multi-Mount
//#define HAS_BL_CR_TOUCH // BL Touch or CR Touch probe
//#define HAS_SPRITE // Creality Sprite Extruder with BL or CR Touch
//#define TH3D_BL_CR_MULTIMOUNT // If you're using a BL_CR_MULTIMOUNT with TH3D Multi-Mount
#endif

//===========================================================================
Expand All @@ -55,7 +63,7 @@
//#define THERMISTOR_1047 // Thermistor for Pt1000, 4.7kΩ pullup

//===========================================================================
//================================= E STEPS =================================
//================================= E-STEPS =================================
//===========================================================================

//#define HAS_STANDARD_MOTORS // Default Creality Motors
Expand Down Expand Up @@ -95,8 +103,8 @@
//#define FILAMENT_RUNOUT_SENSOR // Enable filament runout sensor

#if ENABLED(FILAMENT_RUNOUT_SENSOR) // PICK ONLY ONE AND ONLY IF FILAMENT_RUNOUT_SENSOR IS ON
//#define FIL_RUNOUT_STATE LOW // State pins are in indicating that filament is NOT present
//#define FIL_RUNOUT_STATE HIGH // State pins are in indicating that filament is NOT present
//#define FIL_RUNOUT_STATE LOW // State pins are in indicating that filament is NOT present
//#define FIL_RUNOUT_STATE HIGH // State pins are in indicating that filament is NOT present
#endif

/* ______________ ______ ____ ____ _ ________
Expand Down Expand Up @@ -144,23 +152,27 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING
#define CUSTOM_MACHINE_NAME "Ender-3 Octopus - Marlin 2.1.2.1"
#endif

// Driver Setting
// X Y Z Driver Setting
#if ENABLED(DRIVERS_TMC2208_STANDALONE)
#define X_DRIVER_TYPE TMC2208_STANDALONE
#define Y_DRIVER_TYPE TMC2208_STANDALONE
#define Z_DRIVER_TYPE TMC2208_STANDALONE
#define E0_DRIVER_TYPE TMC2208_STANDALONE
#endif
#if ENABLED(DRIVERS_A4988)
#elif ENABLED(DRIVERS_A4988)
#define X_DRIVER_TYPE TMC2208_STANDALONE
#define Y_DRIVER_TYPE TMC2208_STANDALONE
#define Z_DRIVER_TYPE TMC2208_STANDALONE
#define E0_DRIVER_TYPE TMC2208_STANDALONE
#endif
#if ENABLED(DRIVERS_TMC2209)
#elif ENABLED(DRIVERS_TMC2209)
#define X_DRIVER_TYPE TMC2209
#define Y_DRIVER_TYPE TMC2209
#define Z_DRIVER_TYPE TMC2209
#endif

// E Driver Settings
#if ENABLED(DRIVERS_TMC2208_STANDALONE_E)
#define E0_DRIVER_TYPE TMC2208_STANDALONE
#elif ENABLED(DRIVERS_A4988_E)
#define E0_DRIVER_TYPE TMC2208_STANDALONE
#elif ENABLED(DRIVERS_TMC2209_E)
#define E0_DRIVER_TYPE TMC2209
#endif

Expand Down Expand Up @@ -220,11 +232,9 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING
#if ENABLED(DUEL_Z_AXIS)
#if ENABLED(DRIVERS_TMC2208_STANDALONE)
#define Z2_DRIVER_TYPE TMC2208_STANDALONE
#endif
#if ENABLED(DRIVERS_A4988)
#elif ENABLED(DRIVERS_A4988)
#define Z2_DRIVER_TYPE TMC2208_STANDALONE
#endif
#if ENABLED(DRIVERS_TMC2209)
#elif ENABLED(DRIVERS_TMC2209)
#define Z2_DRIVER_TYPE TMC2209
#endif
#endif
Expand All @@ -243,8 +253,7 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING
#define X_MAX_POS 235
#define Y_MAX_POS 235
#define Z_MAX_POS 250
#endif
#if ENABLED(BEDSIZE_300x300x340)
#elif ENABLED(BEDSIZE_300x300x340)
// The size of the printable area
#define X_BED_SIZE 300
#define Y_BED_SIZE 300
Expand All @@ -257,8 +266,7 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING
#define X_MAX_POS X_BED_SIZE
#define Y_MAX_POS Y_BED_SIZE
#define Z_MAX_POS 340
#endif
#if ENABLED(BEDSIZE_400x400x450)
#elif ENABLED(BEDSIZE_400x400x450)
// The size of the printable area
#define X_BED_SIZE 400
#define Y_BED_SIZE 400
Expand All @@ -284,6 +292,7 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING

//===========================================================================
//=========== UNCOMMENT ONLY 1 PRINTER AND 1 MOTHERBOARD AT A TIME ==========
//=========== DO NOT USE IN COMBINATION WITH THE CUSTIMIZE PRINTER ==========
//===========================================================================

//#define DELICIOUS_PRINTER // My personal settings as my setup is custom to me - DELICIOUS
Expand Down Expand Up @@ -2549,7 +2558,7 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING
#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
#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_AUTO_INIT // Init EEPROM automatically on any errors.
//#define EEPROM_INIT_NOW // Init EEPROM on first boot after a new build.
#endif

Expand Down
Binary file added Marlin-2.1.2.1.zip
Binary file not shown.
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# A Delicious Marlin Ender 3/Pro Firmware
# A Delicious Marlin Ender 3 Firmware

[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I8PI401)
[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/donate/?business=FQK32ZSLKR8AJ&no_recurring=0&item_name=Creating+Marling+Firmware+and+Open+Source+Games&currency_code=USD)

#### Date of Latest Build: 2023-09-29 - V1.13.00
#### Date of Latest Build: 2023-10-10 - V1.14.00
#### Latest Marlin Version: 2.1.2.1

![LOGO](https://raw.githubusercontent.com/ADeliciousMan/A-Delicious-Marlin-Ender-3-Firmware/master/images/bootscreen.png?raw=true)
Expand Down Expand Up @@ -117,13 +117,22 @@ I **ONLY** own a Ender 3 Pro with a 4.2.7 512k board so it's the only one I can
- [General Calibrations](https://github.com/5axes/Calibration-Shapes/wiki)
- [Ellis 3dp guide](https://ellis3dp.com/Print-Tuning-Guide/)

### DISCLAIMER

This firmware and all other files is provided free of charge with no warranty or guarantee. I am not liable for any damage to your printer, person, or other property due to the use of this firmware.

## TO DO:
* Leveling/Tramming is off to the side a little, still trying to figure it out (I think it's fixed but needs testing)
* Check Multi Mount probe offset, see if it's correct - { -54, -19, 0 } (this might be fixed too, same issues as above)
* Added triple and quad Z Axis motor support

## CHANGELOG:

#### 2023-10-10 - V1.14.00
* Separated XYZ driver selection from the E driver, noticed a few printers that needed that
* Included latest Marlin folders in GitHub so it's easier and faster to find the current version
* Enabled EEPROM_AUTO_INIT, auto initialize the EEPROM on error

#### 2023-09-29 - V1.13.00
* Added drive inversion for BTT Octopus boards, same as SKR boards (on the Customize Printer section)
* Added a more robust Z-Axis duel motor support for Customize Printer section
Expand Down
Loading

0 comments on commit 47481e0

Please sign in to comment.