Skip to content

Commit 3cd1545

Browse files
mriscocApie56
authored andcommitted
Fix CREALITY_CR4NTxxC10 E3 Free-runs
1 parent e5f04e2 commit 3cd1545

File tree

7 files changed

+254
-176
lines changed

7 files changed

+254
-176
lines changed

Marlin/Configuration.h

+91-73
Large diffs are not rendered by default.

Marlin/Configuration_adv.h

+151-92
Large diffs are not rendered by default.

Marlin/Version.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,18 @@
3434
* Verbose version identifier which should contain a reference to the location
3535
* from where the binary was downloaded or the source code was compiled.
3636
*/
37-
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION "Ender 3 V2 - 422 - ABL - Sprite, based on bugfix-2.1.x"
37+
#if ENABLED(IS_DEMO)
38+
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " DEMO, NOT FOR PRODUCTION"
39+
#else
40+
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " Ender3V2-422-MM, based on bugfix-2.1.x"
41+
#endif
3842

3943
/**
4044
* The STRING_DISTRIBUTION_DATE represents when the binary file was built,
4145
* here we define this default string as the date where the latest release
4246
* version was tagged.
4347
*/
44-
//#define STRING_DISTRIBUTION_DATE "2023-11-24"
48+
//#define STRING_DISTRIBUTION_DATE "2024-01-06"
4549

4650
#define STRING_DISTRIBUTION_DATE __DATE__
4751
#define STRING_DISTRIBUTION_TIME __TIME__

Marlin/src/core/boards.h

-2
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,6 @@
467467
#define BOARD_FYSETC_CHEETAH_V30 5250 // FYSETC Cheetah V3.0 (STM32F446RC)
468468
#define BOARD_BLACKBEEZMINI_V1 5251 // BlackBeezMini V1 (STM32F401CCU6)
469469

470-
#define BOARD_CREALITY_CR4NTxxC10 5301 // Creality STM32F401RE
471-
472470
//
473471
// ARM Cortex-M7
474472
//

Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTxxC10.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
#define BEEPER_PIN EXP1_01_PIN
227227
#endif
228228

229-
#elif ENABLED(DWIN_CREALITY_LCD)
229+
#elif ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
230230

231231
// DWIN ENCODER LCD
232232
#define BTN_ENC EXP1_05_PIN

ini/stm32f4.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ extra_scripts = ${common_stm32.extra_scripts}
686686
extends = stm32_variant
687687
board = genericSTM32F401RC
688688
board_build.variant = MARLIN_CREALITY_STM32F401
689-
build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4
689+
build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC
690690
-DSS_TIMER=4 -DTIMER_SERVO=TIM5
691691
-DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
692692
build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC
@@ -725,7 +725,7 @@ board_build.variant = MARLIN_CREALITY_STM32F401
725725
board_build.offset = 0x10000
726726
board_upload.offset_address = 0x08010000
727727
board_build.rename = firmware-{date}-{time}.bin
728-
build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RE -DSTM32F401xE -DSTM32F4
728+
build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RE -DSTM32F401xE
729729
build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC
730730
monitor_speed = 115200
731731

@@ -748,7 +748,7 @@ board = marlin_STM32F401RE_freeruns
748748
board_build.offset = 0x10000
749749
board_upload.offset_address = 0x08010000
750750
board_build.rename = firmware-{date}-{time}.bin
751-
build_flags = ${stm32_variant.build_flags} -DSTM32F401xE
751+
build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RE -DSTM32F401xE
752752
-DSS_TIMER=4 -DTIMER_SERVO=TIM5
753753
-DTRANSFER_CLOCK_DIV=8
754754
build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC

platformio.ini

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
[platformio]
1414
src_dir = Marlin
1515
boards_dir = buildroot/share/PlatformIO/boards
16-
default_envs = STM32F401RC_creality
16+
default_envs = STM32F103RC_creality
1717
include_dir = Marlin
1818
extra_configs =
1919
Marlin/config.ini
2020
ini/avr.ini
2121
ini/due.ini
2222
ini/esp32.ini
2323
ini/features.ini
24+
ini/hc32.ini
2425
ini/lpc176x.ini
2526
ini/native.ini
2627
ini/samd21.ini
@@ -106,11 +107,9 @@ default_src_filter = +<src/*> -<src/config> -<src/tests>
106107
+<src/gcode/control/M111.cpp>
107108
+<src/gcode/control/M120_M121.cpp>
108109
+<src/gcode/control/M999.cpp>
109-
+<src/gcode/control/T.cpp>
110110
+<src/gcode/geometry/G92.cpp>
111111
+<src/gcode/host/M110.cpp>
112112
+<src/gcode/host/M114.cpp>
113-
+<src/gcode/host/M115.cpp>
114113
+<src/gcode/host/M118.cpp>
115114
+<src/gcode/host/M119.cpp>
116115
+<src/gcode/motion/G0_G1.cpp>

0 commit comments

Comments
 (0)