Skip to content

Commit ea6f5a7

Browse files
houseofbugshouseofbugs
authored
Merge pull request #157 from th3dstudio/2.0.x
2.0.x
2 parents cc48f0f + 815bd19 commit ea6f5a7

File tree

14 files changed

+461
-67
lines changed

14 files changed

+461
-67
lines changed

‎Board_Configs/CrealityE3FreeRuns.lnk

1.49 KB
Binary file not shown.

‎Firmware/CoreFilesChangeList.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@ This does not include machine `configuration.h` or `PlatformIO.ini` files.
2323
- `boards.h`
2424
- `language.h`
2525
- **inc**
26-
- `Warnings.cpp`
27-
- **gcode**
28-
- **calibrate**
29-
- `M48.cpp`
30-
- **inc**
31-
- `Warnings.cpp`
26+
- `Warnings.cpp``
3227
- **lcd**
3328
- **language**
3429
- `language_en.h`

‎Firmware/Marlin/Configuration_adv.h

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@
12271227
#endif
12281228
//#define SHAPING_MIN_FREQ 20 // By default the minimum of the shaping frequencies. Override to affect SRAM usage.
12291229
//#define SHAPING_MAX_STEPRATE 10000 // By default the maximum total step rate of the shaped axes. Override to affect SRAM usage.
1230-
#if NONE(SPACE_SAVER, KINGROON_KP3, SPACE_SAVER_2560)
1230+
#if DISABLED(SPACE_SAVER_2560)
12311231
#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12321232
#endif
12331233
#endif
@@ -1546,16 +1546,14 @@
15461546
#endif
15471547

15481548
// Include a page of printer information in the LCD Main Menu
1549-
#if DISABLED(SPACE_SAVER)
1550-
#define LCD_INFO_MENU
1551-
#endif
1549+
#define LCD_INFO_MENU
15521550

15531551
#if ENABLED(LCD_INFO_MENU)
15541552
//#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
15551553
#endif
15561554

15571555
// BACK menu items keep the highlight at the top
1558-
#if DISABLED(SPACE_SAVER) && DISABLED(KINGROON_KP3) && DISABLED(SPACE_SAVER_2560)
1556+
#if DISABLED(SPACE_SAVER_2560)
15591557
#define TURBO_BACK_MENU_ITEM
15601558
#endif
15611559

@@ -1581,15 +1579,15 @@
15811579
#endif
15821580

15831581
// Scroll a longer status message into view
1584-
#if NONE(DWIN_CREALITY_LCD, SPACE_SAVER)
1582+
#if DISABLED(DWIN_CREALITY_LCD)
15851583
#define STATUS_MESSAGE_SCROLLING
15861584
#endif
15871585

15881586
// Apply a timeout to low-priority status messages
15891587
//#define STATUS_MESSAGE_TIMEOUT_SEC 30 // (seconds)
15901588

15911589
// On the Info Screen, display XY with one decimal place when possible
1592-
#if NONE(SPACE_SAVER, SPACE_SAVER_2560)
1590+
#if DISABLED(SPACE_SAVER_2560)
15931591
#define LCD_DECIMAL_SMALL_XY
15941592
#endif
15951593

@@ -1604,9 +1602,7 @@
16041602
#define LED_CONTROL_MENU
16051603
#endif
16061604
#if ENABLED(LED_CONTROL_MENU)
1607-
#if DISABLED(SPACE_SAVER)
1608-
#define LED_COLOR_PRESETS // Enable the Preset Color menu option
1609-
#endif
1605+
#define LED_COLOR_PRESETS // Enable the Preset Color menu option
16101606
//#define NEO2_COLOR_PRESETS // Enable a second NeoPixel Preset Color menu option
16111607
#if ENABLED(LED_COLOR_PRESETS)
16121608
#define LED_USER_PRESET_RED 130 // User defined RED value
@@ -1701,7 +1697,7 @@
17011697
// Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended.
17021698
#define SDCARD_RATHERRECENTFIRST
17031699

1704-
#if DISABLED(SPACE_SAVER) && DISABLED(SPACE_SAVER_2560)
1700+
#if DISABLED(SPACE_SAVER_2560)
17051701
#define SD_MENU_CONFIRM_START // Confirm the selected SD file before printing
17061702
#endif
17071703

@@ -1797,7 +1793,7 @@
17971793
//#define M20_TIMESTAMP_SUPPORT // Include timestamps by adding the 'T' flag to M20 commands
17981794
#endif
17991795

1800-
#if NONE(SPACE_SAVER, DWIN_CREALITY_LCD, SPACE_SAVER_2560)
1796+
#if NONE(DWIN_CREALITY_LCD, SPACE_SAVER_2560)
18011797
#define SCROLL_LONG_FILENAMES // Scroll long filenames in the SD card menu
18021798
#endif
18031799

@@ -2006,7 +2002,7 @@
20062002
//#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
20072003
//#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
20082004
//#define STATUS_HEAT_PERCENT // Show heating in a progress bar
2009-
#if DISABLED(SPACE_SAVER) && DISABLED(KINGROON_KP3) && DISABLED(SPACE_SAVER_2560)
2005+
#if DISABLED(SPACE_SAVER_2560)
20102006
#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of flash.
20112007
#endif
20122008

@@ -2264,7 +2260,7 @@
22642260
#if ENABLED(ABL_ENABLE)
22652261
#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
22662262
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
2267-
#if NONE(SPACE_SAVER, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE)
2263+
#if NONE(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE)
22682264
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
22692265
#if DISABLED(LCD2004)
22702266
#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
@@ -2585,7 +2581,7 @@
25852581
// The ASCII buffer for serial input
25862582
#define MAX_CMD_SIZE 96
25872583

2588-
#if ENABLED(SPACE_SAVER) || ENABLED(SPACE_SAVER_2560) || ENABLED(SKR_E3_MINI_BOARD) || ENABLED(KINGROON_KP3)
2584+
#if ENABLED(SPACE_SAVER_2560)
25892585
#define BUFSIZE 16
25902586
#else
25912587
#define BUFSIZE 32
@@ -2882,7 +2878,7 @@
28822878
#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
28832879
//#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change
28842880

2885-
#if NONE(SPACE_SAVER, SPACE_SAVER_2560)
2881+
#if DISABLED(SPACE_SAVER_2560)
28862882
#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
28872883
#endif
28882884
//#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
@@ -2924,7 +2920,7 @@
29242920
*/
29252921
#define INTERPOLATE true
29262922

2927-
#if ANY(EZBOARD, EZBOARD_V2, SKR_E3_MINI_BOARD, DIY_TMCBOARD, SKR_E3_MINI_V3_0, SOVOL_SV06, SOVOL_SV06_PLUS)
2923+
#if ANY(EZBOARD, EZBOARD_V2, SKR_E3_MINI_BOARD, DIY_TMCBOARD, SKR_E3_MINI_V3_0, SOVOL_SV06, SOVOL_SV06_PLUS, E3FREERUNS)
29282924
#if AXIS_IS_TMC_CONFIG(X)
29292925
#if X_MOTOR_CURRENT > 0
29302926
#define X_CURRENT X_MOTOR_CURRENT
@@ -2965,7 +2961,7 @@
29652961
//#define X2_HOLD_MULTIPLIER 0.5
29662962
#endif
29672963

2968-
#if ANY(EZBOARD, EZBOARD_V2, SKR_E3_MINI_BOARD, DIY_TMCBOARD, SKR_E3_MINI_V3_0, SOVOL_SV06, SOVOL_SV06_PLUS)
2964+
#if ANY(EZBOARD, EZBOARD_V2, SKR_E3_MINI_BOARD, DIY_TMCBOARD, SKR_E3_MINI_V3_0, SOVOL_SV06, SOVOL_SV06_PLUS, E3FREERUNS)
29692965
#if AXIS_IS_TMC_CONFIG(Y)
29702966
#if ENABLED(CR10_S5) || ENABLED(CR10S_S5)
29712967
#define Y_CURRENT 800
@@ -3010,7 +3006,7 @@
30103006
//#define Y2_HOLD_MULTIPLIER 0.5
30113007
#endif
30123008

3013-
#if ANY(EZBOARD, EZBOARD_V2, SKR_E3_MINI_BOARD, DIY_TMCBOARD, SKR_E3_MINI_V3_0, SOVOL_SV06, SOVOL_SV06_PLUS)
3009+
#if ANY(EZBOARD, EZBOARD_V2, SKR_E3_MINI_BOARD, DIY_TMCBOARD, SKR_E3_MINI_V3_0, SOVOL_SV06, SOVOL_SV06_PLUS, E3FREERUNS)
30143010
#if AXIS_IS_TMC_CONFIG(Z)
30153011
#if ENABLED(DUAL_Z_MOTORS)
30163012
#define Z_CURRENT 1000
@@ -3160,7 +3156,7 @@
31603156
//#define W_HOLD_MULTIPLIER 0.5
31613157
#endif
31623158

3163-
#if ANY(EZBOARD, EZBOARD_V2, SKR_E3_MINI_BOARD, DIY_TMCBOARD, SKR_E3_MINI_V3_0, SOVOL_SV06, SOVOL_SV06_PLUS)
3159+
#if ANY(EZBOARD, EZBOARD_V2, SKR_E3_MINI_BOARD, DIY_TMCBOARD, SKR_E3_MINI_V3_0, SOVOL_SV06, SOVOL_SV06_PLUS, E3FREERUNS)
31643160
#if ENABLED(PANCAKE_STEPPER)
31653161
#define E0_CURRENT 550
31663162
#elif E0_MOTOR_CURRENT > 0
@@ -3325,7 +3321,7 @@
33253321
#define E5_SLAVE_ADDRESS 0
33263322
#define E6_SLAVE_ADDRESS 0
33273323
#define E7_SLAVE_ADDRESS 0
3328-
#elif ENABLED(EZBOARD_V2)
3324+
#elif ANY(EZBOARD_V2, E3FREERUNS)
33293325
#if ENABLED(ENDER6)
33303326
#define X_SLAVE_ADDRESS 1
33313327
#define Y_SLAVE_ADDRESS 0
@@ -3495,10 +3491,8 @@
34953491
* M912 - Clear stepper driver overtemperature pre-warn condition flag.
34963492
* M122 - Report driver parameters (Requires TMC_DEBUG)
34973493
*/
3498-
#if DISABLED(SPACE_SAVER)
3499-
#define MONITOR_DRIVER_STATUS
3500-
#endif
3501-
3494+
#define MONITOR_DRIVER_STATUS
3495+
35023496
#if ENABLED(MONITOR_DRIVER_STATUS)
35033497
#define CURRENT_STEP_DOWN 50 // [mA]
35043498
#define REPORT_CURRENT_CHANGE
@@ -3611,16 +3605,14 @@
36113605
* Beta feature!
36123606
* Create a 50/50 square wave step pulse optimal for stepper drivers.
36133607
*/
3614-
#define SQUARE_WAVE_STEPPING
3608+
//#define SQUARE_WAVE_STEPPING
36153609

36163610
/**
36173611
* Enable M122 debugging command for TMC stepper drivers.
36183612
* M122 S0/1 will enable continuous reporting.
36193613
*/
3620-
#if DISABLED(SPACE_SAVER)
3621-
#define TMC_DEBUG
3622-
#endif
3623-
3614+
#define TMC_DEBUG
3615+
36243616
/**
36253617
* You can set your own advanced settings by filling in predefined functions.
36263618
* A list of available functions can be found on the library github page
@@ -4032,11 +4024,9 @@
40324024
/**
40334025
* Include capabilities in M115 output
40344026
*/
4035-
#if DISABLED(SPACE_SAVER)
4036-
#define EXTENDED_CAPABILITIES_REPORT
4037-
#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
4038-
//#define M115_GEOMETRY_REPORT
4039-
#endif
4027+
#define EXTENDED_CAPABILITIES_REPORT
4028+
#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
4029+
//#define M115_GEOMETRY_REPORT
40404030
#endif
40414031

40424032
#if ENABLED(BTT_TOUCH_SCREEN)

‎Firmware/Marlin/Configuration_backend.h

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//======================= DO NOT MODIFY THIS FILE ===========================
77
//===========================================================================
88

9-
#define UNIFIED_VERSION "TH3D UFW 2.71"
9+
#define UNIFIED_VERSION "TH3D UFW 2.72"
1010

1111
/**
1212
* ABL Probe Settings
@@ -459,7 +459,7 @@
459459
#define PID_AUTOTUNE_MENU
460460
#endif
461461

462-
#if NONE(SPACE_SAVER, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
462+
#if NONE(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
463463
#define PID_EDIT_MENU
464464
#endif
465465

@@ -583,10 +583,7 @@
583583

584584
#define HOST_KEEPALIVE_FEATURE
585585
#define DEFAULT_KEEPALIVE_INTERVAL 2
586-
587-
#if DISABLED(SPACE_SAVER)
588-
#define BUSY_WHILE_HEATING
589-
#endif
586+
#define BUSY_WHILE_HEATING
590587

591588
#define EEPROM_SETTINGS
592589
#define EEPROM_CHITCHAT
@@ -654,7 +651,7 @@
654651
#define SHOW_CUSTOM_BOOTSCREEN
655652
#endif
656653

657-
#if NONE(DWIN_CREALITY_LCD, SPACE_SAVER)
654+
#if DISABLED(DWIN_CREALITY_LCD)
658655
#define INDIVIDUAL_AXIS_HOMING_MENU
659656
#endif
660657

@@ -708,11 +705,9 @@
708705
#ifndef EZABL_POINTS
709706
#define EZABL_POINTS 3
710707
#endif
708+
711709
#define GRID_MAX_POINTS_X EZABL_POINTS
712710
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
713711
#define XY_PROBE_FEEDRATE (50*60)
714-
715-
#if DISABLED(SPACE_SAVER)
716-
#define MESH_EDIT_MENU
717-
#endif
712+
#define MESH_EDIT_MENU
718713
#endif

‎Firmware/Marlin/src/core/boards.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@
430430
#define BOARD_FYSETC_SPIDER_KING407 4242 // FYSETC Spider King407 (STM32F407ZG)
431431
#define BOARD_MKS_SKIPR_V1 4243 // MKS SKIPR v1.0 all-in-one board (STM32F407VE)
432432
#define BOARD_TRONXY_V10 4244 // TRONXY V10 (STM32F446ZE)
433+
#define BOARD_CREALITY_E3FREERUNS 4245 // Creality E3FreeRuns (STM32F401RE)
433434

434435
//
435436
// ARM Cortex M7

‎Firmware/Marlin/src/gcode/calibrate/M48.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ void GcodeSuite::M48() {
8989
return;
9090
}
9191

92-
#if NONE(SPACE_SAVER, DISABLE_TH3D_MODS) //Save space for lower end boards. Disabled/added by TH3D.
9392
// Get the number of leg moves per test-point
9493
bool seen_L = parser.seen('L');
9594
uint8_t n_legs = seen_L ? parser.value_byte() : 0;
@@ -107,7 +106,6 @@ void GcodeSuite::M48() {
107106
SERIAL_ECHOLNPGM("Positioning the probe...");
108107

109108
// Always disable Bed Level correction before probing...
110-
#endif
111109

112110
#if HAS_LEVELING
113111
const bool was_enabled = planner.leveling_active;
@@ -126,7 +124,6 @@ void GcodeSuite::M48() {
126124
max = -99999.9, // Largest value sampled so far
127125
sample_set[n_samples]; // Storage for sampled values
128126

129-
#if NONE(SPACE_SAVER, DISABLE_TH3D_MODS) //Save space for lower end boards. Disabled/added by TH3D.
130127
auto dev_report = [](const bool verbose, const_float_t mean, const_float_t sigma, const_float_t min, const_float_t max, const bool final=false) {
131128
if (verbose) {
132129
SERIAL_ECHOPAIR_F("Mean: ", mean, 6);
@@ -141,14 +138,6 @@ void GcodeSuite::M48() {
141138
SERIAL_EOL();
142139
}
143140
};
144-
#else
145-
auto dev_report = [](const bool verbose, const_float_t mean, const_float_t sigma, const_float_t min, const_float_t max, const bool final=false) {
146-
if (final) {
147-
SERIAL_ECHOLNPAIR_F("Standard Deviation: ", sigma, 6);
148-
SERIAL_EOL();
149-
}
150-
};
151-
#endif
152141

153142
// Move to the first point, deploy, and probe
154143
const float t = probe.probe_at_point(test_position, raise_after, verbose_level);
@@ -165,7 +154,6 @@ void GcodeSuite::M48() {
165154
ui.status_printf(0, F(S_FMT ": %d/%d"), GET_TEXT(MSG_M48_POINT), int(n + 1), int(n_samples));
166155
#endif
167156

168-
#if NONE(SPACE_SAVER, DISABLE_TH3D_MODS) //Not needed for non-delta machines. Disabled by TH3D for some boards to save space.
169157
// When there are "legs" of movement move around the point before probing
170158
if (n_legs) {
171159

@@ -233,7 +221,6 @@ void GcodeSuite::M48() {
233221
do_blocking_move_to_xy(next_pos);
234222
} // n_legs loop
235223
} // n_legs
236-
#endif
237224

238225
// Probe a single point
239226
const float pz = probe.probe_at_point(test_position, raise_after, 0);

‎Firmware/Marlin/src/pins/pins.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,8 @@
719719
#include "stm32f4/pins_MKS_SKIPR_V1_0.h" // STM32F4 env:mks_skipr_v1 env:mks_skipr_v1_nobootloader
720720
#elif MB(TRONXY_V10)
721721
#include "stm32f4/pins_TRONXY_V10.h" // STM32F4 env:STM32F446_tronxy
722-
722+
#elif MB(CREALITY_E3FREERUNS)
723+
#include "stm32f4/pins_CREALITY_E3FREERUNS.h" // STM32F4 env:STM32F401RE_creality env:STM32F401RC_creality env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink
723724
//
724725
// ARM Cortex M7
725726
//

0 commit comments

Comments
 (0)