From 9821ec2afd8419e353f23791dddb22b5f60c0107 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 8 Jul 2019 22:57:25 -0500 Subject: [PATCH] Fix SKR Pro pins, STM32F1/4 sanity-check Co-Authored-By: Msq001 --- Marlin/src/inc/SanityCheck.h | 6 ++--- Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h | 28 ++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index f65c1e9ad7..0296b72c4e 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -2033,9 +2033,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS #endif /** - * TMC2208/2209 software UART is only supported on AVR and LPC + * TMC2208/2209 software UART is only supported on AVR, LPC, STM32F1 and STM32F4 */ -#if (HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)) && !defined(__AVR__) && !defined(TARGET_LPC1768) && !( \ +#if (HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)) && !defined(__AVR__) && !defined(TARGET_LPC1768) && !defined(TARGET_STM32F1) && !defined(TARGET_STM32F4) && !( \ defined(X_HARDWARE_SERIAL ) \ || defined(X2_HARDWARE_SERIAL) \ || defined(Y_HARDWARE_SERIAL ) \ @@ -2048,7 +2048,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS || defined(E3_HARDWARE_SERIAL) \ || defined(E4_HARDWARE_SERIAL) \ || defined(E5_HARDWARE_SERIAL) ) - #error "TMC2208 Software Serial is supported only on AVR and LPC1768 platforms." + #error "TMC2208 Software Serial is supported only on AVR, LPC1768, STM32F1 and STM32F4 platforms." #endif #if ENABLED(SENSORLESS_HOMING) diff --git a/Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h b/Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h index dc2cfd3365..3b7a89fc84 100644 --- a/Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h +++ b/Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h @@ -109,7 +109,7 @@ #define TMC_SW_SCK PC10 #endif -#if HAS_DRIVER(TMC2208) +#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209) /** * TMC2208 stepper drivers * @@ -130,33 +130,33 @@ // // Software serial - // + // #define X_SERIAL_TX_PIN PC13 - #define X_SERIAL_RX_PIN PE4 + #define X_SERIAL_RX_PIN PC13 #define Y_SERIAL_TX_PIN PE3 - #define Y_SERIAL_RX_PIN PE2 + #define Y_SERIAL_RX_PIN PE3 - #define Z_SERIAL_TX_PIN PE0 + #define Z_SERIAL_TX_PIN PE1 #define Z_SERIAL_RX_PIN PE1 #define E0_SERIAL_TX_PIN PD4 - #define E0_SERIAL_RX_PIN PD2 + #define E0_SERIAL_RX_PIN PD4 - #define E1_SERIAL_TX_PIN PD0 + #define E1_SERIAL_TX_PIN PD1 #define E1_SERIAL_RX_PIN PD1 - #define Z2_SERIAL_TX_PIN PD6 - #define Z2_SERIAL_RX_PIN PD5 + #define E2_SERIAL_TX_PIN PD6 + #define E2_SERIAL_RX_PIN PD6 #endif // // Temperature Sensors // -#define TEMP_0_PIN PF3 // T0 -#define TEMP_1_PIN PF4 // T1 -#define TEMP_2_PIN PF5 // T2 -#define TEMP_BED_PIN PF6 // TB +#define TEMP_0_PIN PF4 // T1 <-> E0 +#define TEMP_1_PIN PF5 // T2 <-> E1 +#define TEMP_2_PIN PF6 // T3 <-> E2 +#define TEMP_BED_PIN PF3 // T0 <-> Bed // // Heaters / Fans @@ -219,7 +219,7 @@ #endif // Alter timing for graphical display - #if HAS_GRAPHICAL_DISPLAY + #if HAS_GRAPHICAL_LCD #ifndef ST7920_DELAY_1 #define ST7920_DELAY_1 DELAY_NS(96) #endif