Skip to content

Commit

Permalink
V1.14.2
Browse files Browse the repository at this point in the history 
* Fixed a typo for the DELICIOUS COMMANDS that would say the wrong temperature finished PID tuning.
* Added HAS_ORBITER_V2 to E Steps in the Customize Printer section for the Orbiter Extruder V2.0
* Added BEDSIZE_300x225x380 for CR 5 Pro
  • Loading branch information
@ADeliciousMan
ADeliciousMan committed Oct 17, 2023
1 parent 73ec3e0 commit 1fcadcb
Show file tree
Hide file tree
Showing 11 changed files with 7,752 additions and 10 deletions.
28 changes: 22 additions & 6 deletions Configuration.h
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#pragma once

/*
________ ___________________ ____________ ______ ____ ____ _____ __________________
/ ____/ / / / ___/_ __/ _/ |/ / _/__ / / ____/ / __ \/ __ \/ _/ | / /_ __/ ____/ __ \
/ / / / / /\__ \ / / / // /|_/ // / / / / __/ / /_/ / /_/ // // |/ / / / / __/ / /_/ /
/ /___/ /_/ /___/ // / _/ // / / // / / /__/ /___ / ____/ _, _// // /| / / / / /___/ _, _/
\____/\____//____//_/ /___/_/ /_/___/ /____/_____/ /_/ /_/ |_/___/_/ |_/ /_/ /_____/_/ |_|
________ _________________ __ ____________ ______ ____ ____ _____ __________________
/ ____/ / / / ___/_ __/ __ \/ |/ / _/__ / / ____/ / __ \/ __ \/ _/ | / /_ __/ ____/ __ \
/ / / / / /\__ \ / / / / / / /|_/ // / / / / __/ / /_/ / /_/ // // |/ / / / / __/ / /_/ /
/ /___/ /_/ /___/ // / / /_/ / / / // / / /__/ /___ / ____/ _, _// // /| / / / / /___/ _, _/
\____/\____//____//_/ \____/_/ /_/___/ /____/_____/ /_/ /_/ |_/___/_/ |_/ /_/ /_____/_/ |_|
*/

//===========================================================================
Expand Down Expand Up @@ -69,6 +69,7 @@
//#define HAS_STANDARD_MOTORS // Default Creality Motors
//#define HAS_SPRITE_EXTRUDER // Creality Sprite Extruder
//#define HAS_H2_V2s // BIQU H2 V2s
//#define HAS_ORBITER_V2 // Orbiter Extruder V2.0

//===========================================================================
//================================= Z-AXIS =================================
Expand All @@ -89,6 +90,7 @@
//#define BEDSIZE_300x300x340 // Ender 3 Max
//#define BEDSIZE_300x300x320 // Ender 3 Max Neo
//#define BEDSIZE_400x400x450 // Anycubic Kobra Max
//#define BEDSIZE_300x225x380 // CR 5 Pro

//===========================================================================
//================================= SCREENS =================================
Expand Down Expand Up @@ -226,6 +228,8 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 430 }
#elif ENABLED(HAS_H2_V2s)
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 930}
#elif ENABLED(HAS_ORBITER_V2)
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 690}
#endif

// Z-Axis
Expand Down Expand Up @@ -293,6 +297,18 @@ DO NOT TOUCH UNLESS IF YOU KNOW WHAT YOU ARE DOING
#define X_MAX_POS X_BED_SIZE +4 // Default values from company
#define Y_MAX_POS Y_BED_SIZE +4 // Default values from company
#define Z_MAX_POS 450
#elif ENABLED(BEDSIZE_300x225x380)
#define X_BED_SIZE 300
#define Y_BED_SIZE 225

// Travel limits after homing, corresponding to endstop positions.
#define X_MIN_POS -6.2 // Default values from company
#define Y_MIN_POS -20.5 // Default values from company
#define Z_MIN_POS 0

#define X_MAX_POS X_BED_SIZE
#define Y_MAX_POS Y_BED_SIZE
#define Z_MAX_POS 380
#endif

/*
Expand Down
6 changes: 3 additions & 3 deletions Configuration_adv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3321,15 +3321,15 @@
#define CUSTOM_MENU_CONFIG_ONLY_IDLE // Only show custom menu when the machine is idle
// M106 Sets fan speed to 100 percent, M106 S0 sets fan to 0 - DELICIOUS
#define CONFIG_MENU_ITEM_1_DESC "PID E C10 TEMP 190"
#define CONFIG_MENU_ITEM_1_GCODE "M106 S255\nM303 E0 C10 S190 U\nM500\nM106 S0\nM117 PID E TEMP 180 DONE"
#define CONFIG_MENU_ITEM_1_GCODE "M106 S255\nM303 E0 C10 S190 U\nM500\nM106 S0\nM117 PID E TEMP 190 DONE"
#define CONFIG_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action

#define CONFIG_MENU_ITEM_2_DESC "PID E C10 TEMP 200"
#define CONFIG_MENU_ITEM_2_GCODE "M106 S255\nM303 E0 C10 S200 U\nM500\nM106 S0\nM117 PID E TEMP 190 DONE"
#define CONFIG_MENU_ITEM_2_GCODE "M106 S255\nM303 E0 C10 S200 U\nM500\nM106 S0\nM117 PID E TEMP 200 DONE"
#define CONFIG_MENU_ITEM_2_CONFIRM // Show a confirmation dialog before this action

#define CONFIG_MENU_ITEM_3_DESC "PID E C10 TEMP 210"
#define CONFIG_MENU_ITEM_3_GCODE "M106 S255\nM303 E0 C10 S210 U\nM500\nM106 S0\nM117 PID E TEMP 200 DONE"
#define CONFIG_MENU_ITEM_3_GCODE "M106 S255\nM303 E0 C10 S210 U\nM500\nM106 S0\nM117 PID E TEMP 210 DONE"
#define CONFIG_MENU_ITEM_3_CONFIRM // Show a confirmation dialog before this action

#define CONFIG_MENU_ITEM_4_DESC "PID E C10 TEMP 260"
Expand Down
7 changes: 6 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![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-10-14 - V1.14.1
#### Date of Latest Build: 2023-10-17 - V1.14.2
#### 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 @@ -127,6 +127,11 @@ This firmware and all other files is provided free of charge with no warranty or

## CHANGELOG:

#### 2023-10-17 - V1.14.2
* Fixed a typo for the DELICIOUS COMMANDS that would say the wrong temperature finished PID tuning.
* Added HAS_ORBITER_V2 to E Steps in the Customize Printer section for the Orbiter Extruder V2.0
* Added BEDSIZE_300x225x380 for CR 5 Pro

#### 2023-10-14 - V1.14.1
* Added BEDSIZE_300x300x320 (Ender 3 Max Neo)

Expand Down
80 changes: 80 additions & 0 deletions _OLDER VERSIONS/V1.12.1/_Bootscreen.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
#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 LEU1_BMPWIDTH 128

const unsigned char custom_start_bmp[] PROGMEM = {
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B10000000,
B00011111,B11000000,B11111111,B00011110,B00000111,B10000001,B11110011,B11100001,B11110000,B01111000,B11110001,B11111000,B00000000,B00000000,B00000111,B10000000,
B00001100,B01110000,B01100001,B10001100,B00000011,B00000110,B00110001,B11000011,B00011000,B00110000,B01100011,B00011000,B00000000,B00000000,B00011110,B00000000,
B00001100,B00110000,B01100000,B00001100,B00000011,B00001100,B00010001,B11000110,B00001100,B00110000,B01100011,B00001000,B00000000,B00000000,B00011110,B00000000,
B00001100,B00011000,B01100000,B00001100,B00000011,B00001100,B00000001,B11000100,B00000110,B00110000,B01100011,B00000000,B00000000,B00000000,B01111000,B00000000,
B00001100,B00011000,B01100010,B00001100,B00000011,B00001100,B00000001,B11001100,B00000110,B00110000,B01100011,B00000000,B00000000,B00000000,B01111000,B00000000,
B00001100,B00011000,B01111110,B00001100,B00000011,B00001000,B00000001,B11001100,B00000110,B00110000,B01100001,B11000000,B00000000,B00000001,B11111000,B00000000,
B00001100,B00011000,B01111110,B00001100,B00000011,B00001000,B00000001,B11001100,B00000110,B00110000,B01100000,B11110000,B00000000,B00000001,B11111100,B00000000,
B00001100,B00011000,B01100010,B00001100,B00000011,B00001000,B00000001,B11001100,B00000110,B00110000,B01100000,B00111000,B00000000,B00011111,B11111110,B00000000,
B00001100,B00011000,B01100000,B00001100,B00000011,B00001100,B00000001,B11001100,B00000110,B00110000,B01100000,B00011000,B00000000,B00111111,B11111111,B10000000,
B00001100,B00011000,B01100000,B00001100,B00110011,B00001100,B00000001,B11000100,B00000100,B00110000,B01100000,B00001000,B00000000,B01111111,B11111111,B10000000,
B00001100,B00110000,B01100001,B10001100,B00110011,B00001100,B00010001,B11000110,B00001100,B00110000,B01100010,B00001000,B00000001,B11100111,B11111111,B11100000,
B00001100,B01100000,B11100001,B10001100,B00110011,B00000110,B00110001,B11000011,B00011000,B00011000,B11000011,B00111000,B00000001,B11011000,B00111111,B11100000,
B00011111,B10000000,B11111111,B00011111,B11100111,B10000011,B11100011,B11100001,B11110000,B00001111,B10000001,B11110000,B00000001,B10011000,B00011111,B11100000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111110,B00011101,B11100011,B11100000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,B11100001,B11100000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11000001,B11111111,B11100001,B11100000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111000,B00000000,B00011111,B11111100,B01110000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00100111,B11111110,B00110000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100011,B11111110,B00010000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100001,B10011111,B10010000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100001,B10011111,B10010000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100001,B10001111,B10010000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100001,B10001111,B10010000,
B00000000,B00000001,B11000000,B01110000,B00010000,B00111111,B10000011,B11000000,B01110001,B11000001,B11000000,B00000000,B00000000,B01100001,B10001111,B10010000,
B00000000,B00000001,B11000000,B11100000,B00111000,B00011000,B11100001,B10000000,B01110000,B11100001,B10000000,B00000000,B00000000,B00000000,B00001111,B10000000,
B00000000,B00000001,B11100000,B11100000,B00111000,B00011000,B01100001,B10000000,B00100000,B11100001,B10000000,B00000000,B00000000,B00000000,B00001111,B10000000,
B00000000,B00000001,B11100001,B11100000,B01111000,B00011000,B01100001,B10000000,B00100000,B10110001,B10000000,B00000000,B00000000,B00000000,B00001111,B11000000,
B00000000,B00000001,B10100001,B01100000,B01001100,B00011000,B01100001,B10000000,B00100000,B10111001,B10000000,B00000000,B00000000,B00000000,B00001111,B11100000,
B00000000,B00000001,B10110001,B01100000,B01001100,B00011000,B01100001,B10000000,B00100000,B10011001,B10000000,B00000000,B00000000,B00000000,B00001111,B11100000,
B00000000,B00000001,B10110010,B01100000,B11001100,B00011111,B11000001,B10000000,B00100000,B10001101,B10000000,B00000000,B00000000,B00000000,B00001111,B11000000,
B00000000,B00000001,B10011010,B01100000,B10000100,B00011111,B10000001,B10000000,B00100000,B10001101,B10000000,B00000000,B00000000,B00000000,B00001111,B10000000,
B00000000,B00000001,B10011110,B01100000,B11111110,B00011000,B11000001,B10000000,B00100000,B10000111,B10000000,B00000000,B00000000,B00000000,B00001111,B10000000,
B00000000,B00000001,B10001100,B01100001,B10000110,B00011000,B01100001,B10000010,B00100000,B10000111,B10000000,B00000000,B00000000,B00000000,B00001110,B00000000,
B00000000,B00000001,B10001100,B01100001,B00000010,B00011000,B01100001,B10000110,B00100000,B10000011,B10000000,B00000000,B00000000,B00000000,B00001110,B00000000,
B00000000,B00000001,B10000000,B01100011,B00000011,B00011000,B00110001,B10000110,B01110000,B10000001,B10000000,B00000000,B00000000,B00000000,B00001110,B00000000,
B00000000,B00000011,B11000000,B11110111,B10000111,B10111100,B00111011,B11111110,B01110001,B11000001,B10000000,B00000000,B00000000,B00000000,B00001110,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001100,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011110,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111110,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111110,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11100111,B10000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11000011,B10000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,B00000000,B01000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011000,B00000000,B01000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011000,B00000000,B01000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011000,B00000000,B01100000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011000,B00000000,B01000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
};
50 changes: 50 additions & 0 deletions _OLDER VERSIONS/V1.12.1/_Statusscreen.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#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,
B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000011,B10000000,B00000000,B00000000,
B00000000,B00000010,B01000000,B00000000,B00000000,
B00000000,B00000010,B01010110,B01100000,B00000000,
B00000000,B00000011,B10011000,B10010000,B00000000,
B00000000,B00000010,B00010000,B10010000,B00000000,
B00000000,B00000010,B00010000,B10010000,B00000000,
B00000000,B00000010,B00010000,B01100000,B00000000
};

//
// 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
Loading

0 comments on commit 1fcadcb

Please sign in to comment.