andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix SKR Pro pins, STM32F1/4 sanity-check 

Co-Authored-By: Msq001 <msq001@users.noreply.github.com>
pull/1/head
Scott Lahteine 6 years ago
committed by Scott Lahteine
parent
96d52649b8
commit
9821ec2afd
2 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Marlin/src/inc/SanityCheck.h
  2. 28
      Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h

6
Marlin/src/inc/SanityCheck.h
View File

@ -2033,9 +2033,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif #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(X_HARDWARE_SERIAL ) \
|| defined(X2_HARDWARE_SERIAL) \ || defined(X2_HARDWARE_SERIAL) \
|| defined(Y_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(E3_HARDWARE_SERIAL) \
|| defined(E4_HARDWARE_SERIAL) \ || defined(E4_HARDWARE_SERIAL) \
|| defined(E5_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 #endif
#if ENABLED(SENSORLESS_HOMING) #if ENABLED(SENSORLESS_HOMING)

28
Marlin/src/pins/pins_BIGTREE_SKR_PRO_V1.1.h
View File

@ -109,7 +109,7 @@
#define TMC_SW_SCK PC10 #define TMC_SW_SCK PC10
#endif #endif
#if HAS_DRIVER(TMC2208) #if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
/** /**
* TMC2208 stepper drivers * TMC2208 stepper drivers
* *
@ -130,33 +130,33 @@
// //
// Software serial // Software serial
// //
#define X_SERIAL_TX_PIN PC13 #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_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 Z_SERIAL_RX_PIN PE1
#define E0_SERIAL_TX_PIN PD4 #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 E1_SERIAL_RX_PIN PD1
#define Z2_SERIAL_TX_PIN PD6 #define E2_SERIAL_TX_PIN PD6
#define Z2_SERIAL_RX_PIN PD5 #define E2_SERIAL_RX_PIN PD6
#endif #endif
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN PF3 // T0 #define TEMP_0_PIN PF4 // T1 <-> E0
#define TEMP_1_PIN PF4 // T1 #define TEMP_1_PIN PF5 // T2 <-> E1
#define TEMP_2_PIN PF5 // T2 #define TEMP_2_PIN PF6 // T3 <-> E2
#define TEMP_BED_PIN PF6 // TB #define TEMP_BED_PIN PF3 // T0 <-> Bed
// //
// Heaters / Fans // Heaters / Fans
@ -219,7 +219,7 @@
#endif #endif
// Alter timing for graphical display // Alter timing for graphical display
#if HAS_GRAPHICAL_DISPLAY #if HAS_GRAPHICAL_LCD
#ifndef ST7920_DELAY_1 #ifndef ST7920_DELAY_1
#define ST7920_DELAY_1 DELAY_NS(96) #define ST7920_DELAY_1 DELAY_NS(96)
#endif #endif

Write Preview
Loading…
Cancel
Save