3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-18 23:49:49 +00:00
Code Issues Releases Wiki Activity

Fix Creality E3 "Free-runs" (#26533)

Browse source 
Followup to #25636
This commit is contained in:
geijt 2023-12-17 23:33:46 +01:00 committed by GitHub
parent 145ab7b1ec
commit 4a89ef6273
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_adv.h
View file

@ -1277,7 +1277,7 @@
#if LCD_IS_SERIAL_HOST && !defined(LCD_SERIAL_PORT) #if LCD_IS_SERIAL_HOST && !defined(LCD_SERIAL_PORT)
#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_MINI_E3_V3_0_1, BTT_SKR_E3_TURBO, BTT_OCTOPUS_V1_1, AQUILA_V101) #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_MINI_E3_V3_0_1, BTT_SKR_E3_TURBO, BTT_OCTOPUS_V1_1, AQUILA_V101)
#define LCD_SERIAL_PORT 1 #define LCD_SERIAL_PORT 1
#elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_F401RE, CREALITY_V423, MKS_ROBIN, PANOWIN_CUTLASS, KODAMA_BARDO) #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_F401RE, CREALITY_V423, CREALITY_CR4NTXXC10, MKS_ROBIN, PANOWIN_CUTLASS, KODAMA_BARDO)
#define LCD_SERIAL_PORT 2 #define LCD_SERIAL_PORT 2
#else #else
#define LCD_SERIAL_PORT 3 #define LCD_SERIAL_PORT 3

20
Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTXXC10.h
View file

@ -100,15 +100,15 @@
#define X_STEP_PIN PC2 #define X_STEP_PIN PC2
#define X_DIR_PIN PB9 #define X_DIR_PIN PB9
#define Y_ENABLE_PIN PC3 #define Y_ENABLE_PIN X_ENABLE_PIN
#define Y_STEP_PIN PB8 #define Y_STEP_PIN PB8
#define Y_DIR_PIN PB7 #define Y_DIR_PIN PB7
#define Z_ENABLE_PIN PC3 #define Z_ENABLE_PIN X_ENABLE_PIN
#define Z_STEP_PIN PB6 #define Z_STEP_PIN PB6
#define Z_DIR_PIN PB5 #define Z_DIR_PIN PB5
#define E0_ENABLE_PIN PC3 #define E0_ENABLE_PIN X_ENABLE_PIN
#define E0_STEP_PIN PB4 #define E0_STEP_PIN PB4
#define E0_DIR_PIN PB3 #define E0_DIR_PIN PB3
@ -142,21 +142,21 @@
* If undefined software serial is used according to the pins below * If undefined software serial is used according to the pins below
*/ */
#define X_HARDWARE_SERIAL Serial6 #define X_HARDWARE_SERIAL Serial6
#define Y_HARDWARE_SERIAL Serial6 #define Y_HARDWARE_SERIAL X_HARDWARE_SERIAL
#define Z_HARDWARE_SERIAL Serial6 #define Z_HARDWARE_SERIAL X_HARDWARE_SERIAL
#define E0_HARDWARE_SERIAL Serial6 #define E0_HARDWARE_SERIAL X_HARDWARE_SERIAL
#ifndef X_SLAVE_ADDRESS #ifndef X_SLAVE_ADDRESS
#define X_SLAVE_ADDRESS 0 #define X_SLAVE_ADDRESS 0
#endif #endif
#ifndef Y_SLAVE_ADDRESS #ifndef Y_SLAVE_ADDRESS
#define Y_SLAVE_ADDRESS 1 #define Y_SLAVE_ADDRESS 1
#endif #endif
#ifndef Z_SLAVE_ADDRESS #ifndef Z_SLAVE_ADDRESS
#define Z_SLAVE_ADDRESS 2 #define Z_SLAVE_ADDRESS 2
#endif #endif
#ifndef E0_SLAVE_ADDRESS #ifndef E0_SLAVE_ADDRESS
#define E0_SLAVE_ADDRESS 3 #define E0_SLAVE_ADDRESS 3
#endif #endif
// Software serial // Software serial

10
buildroot/share/PlatformIO/variants/MARLIN_STM32F401RE_FREERUNS/ldscript.ld
View file

@ -51,17 +51,17 @@
ENTRY(Reset_Handler) ENTRY(Reset_Handler)
/* Highest address of the user mode stack */ /* Highest address of the user mode stack */
_estack = 0x20017FFB; /* end of RAM */ _estack = 0x20000000 + LD_MAX_DATA_SIZE; /* end of RAM */
/* Generate a link error if heap and stack don't fit into RAM */ /* Generate a link error if heap and stack don't fit into RAM */
_Min_Heap_Size = 0x200; /* required amount of heap */ _Min_Heap_Size = 0x200; /* required amount of heap */
_Min_Stack_Size = 0x400; /* required amount of stack */ _Min_Stack_Size = 0x400; /* required amount of stack */
/* Specify the memory areas */ /* Specify the memory areas */
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 96K RAM (xrw) : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
} }
/* Define output sections */ /* Define output sections */

3
ini/stm32f4.ini
View file

@ -746,9 +746,10 @@ board = genericSTM32F401RE
board_build.variant = marlin_STM32F401RE_freeruns board_build.variant = marlin_STM32F401RE_freeruns
board_build.offset = 0x10000 board_build.offset = 0x10000
board_upload.offset_address = 0x08010000 board_upload.offset_address = 0x08010000
board_build.rename = firmware-{date}-{time}.bin
build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RE -DSTM32F4 build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RE -DSTM32F4
-DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DSS_TIMER=4 -DTIMER_SERVO=TIM5
-DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DTRANSFER_CLOCK_DIV=8
build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC
extra_scripts = ${stm32_variant.extra_scripts} extra_scripts = ${stm32_variant.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/random-bin.py pre:buildroot/share/PlatformIO/scripts/random-bin.py