zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Unify BTT Motor Expansion Options (#21823)

Browse source
This commit is contained in:
Keith Bennett 2021-05-09 01:52:53 -07:00 committed by Scott Lahteine
parent 6a1e78e614
commit a7fd6b68be
4 changed files with 114 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View file

@ -279,7 +279,7 @@
#undef SPEAKER #undef SPEAKER
#endif #endif
#elif HAS_WIRED_LCD && !HAS_BTT_EXP_MOT #elif HAS_WIRED_LCD && !BTT_MOTOR_EXPANSION
#if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING) #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
#error "CAUTION! ANET_FULL_GRAPHICS_LCD_ALT_WIRING requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue." #error "CAUTION! ANET_FULL_GRAPHICS_LCD_ALT_WIRING requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."

21
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
View file

@ -23,11 +23,11 @@
#include "env_validate.h" #include "env_validate.h"
// If you have the Big tree tech driver expansion module, enable HAS_BTT_EXP_MOT // If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
// https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT // https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
//#define HAS_BTT_EXP_MOT 1 //#define BTT_MOTOR_EXPANSION
#if BOTH(HAS_WIRED_LCD, HAS_BTT_EXP_MOT) #if BOTH(HAS_WIRED_LCD, BTT_MOTOR_EXPANSION)
#if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY) #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
#define EXP_MOT_USE_EXP2_ONLY 1 #define EXP_MOT_USE_EXP2_ONLY 1
#else #else
@ -138,14 +138,13 @@
#error "No custom SD drive cable defined for this board." #error "No custom SD drive cable defined for this board."
#endif #endif
#if HAS_BTT_EXP_MOT #if ENABLED(BTT_MOTOR_EXPANSION)
/** _____ _____ /** _____ _____
* NC | · · | GND NC | · · | GND * NC | . . | GND NC | . . | GND
* NC | · · | 1.31 (M1EN) (M2EN) 1.23 | · · | 1.22 (M3EN) * NC | . . | M1EN M2EN | . . | M3EN
* (M1STP) 0.18 | · · 3.25 (M1DIR) (M1RX) 1.21 | · · 1.20 (M1DIAG) * M1STP | . . M1DIR M1RX | . . M1DIAG
* (M2DIR) 0.16 | · · | 3.26 (M2STP) (M2RX) 1.19 | · · | 1.18 (M2DIAG) * M2DIR | . . | M2STP M2RX | . . | M2DIAG
* (M3DIR) 0.15 | · · | 0.17 (M3STP) (M3RX) 0.28 | · · | 1.30 (M3DIAG) * M3DIR | . . | M3STP M3RX | . . | M3DIAG
* ----- ----- * ----- -----
* EXP2 EXP1 * EXP2 EXP1
* *
@ -195,4 +194,4 @@
#define E4_ENABLE_PIN EXP2_04_PIN #define E4_ENABLE_PIN EXP2_04_PIN
#endif #endif
#endif // HAS_BTT_EXP_MOT #endif // BTT_MOTOR_EXPANSION

34
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
View file

@ -23,11 +23,16 @@
#include "env_validate.h" #include "env_validate.h"
// BigTreeTech driver expansion module https://bit.ly/3ptRRoj // If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
// https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
//#define BTT_MOTOR_EXPANSION //#define BTT_MOTOR_EXPANSION
#if BOTH(HAS_WIRED_LCD, BTT_MOTOR_EXPANSION) #if BOTH(HAS_WIRED_LCD, BTT_MOTOR_EXPANSION)
#error "It's not possible to have both LCD and motor expansion module on EXP1/EXP2." #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
#define EXP_MOT_USE_EXP2_ONLY 1
#else
#error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time."
#endif
#endif #endif
// Use one of these or SDCard-based Emulation will be used // Use one of these or SDCard-based Emulation will be used
@ -311,31 +316,35 @@
#endif #endif
#if ENABLED(BTT_MOTOR_EXPANSION) #if ENABLED(BTT_MOTOR_EXPANSION)
/** /** _____ _____
* _____ _____ * NC | . . | GND NC | . . | GND
* NC | · · | GND NC | · · | GND * NC | . . | M1EN M2EN | . . | M3EN
* NC | · · | PF12 (M1EN) (M2EN) PG7 | · · | PG6 (M3EN) * M1STP | . . M1DIR M1RX | . . M1DIAG
* (M1STP) PB15 | · · PF11 (M1DIR) (M1RX) PG3 | · · PG2 (M1DIAG) * M2DIR | . . | M2STP M2RX | . . | M2DIAG
* (M2DIR) PB12 | · · | PG10 (M2STP) (M2RX) PD10 | · · | PD11 (M2DIAG) * M3DIR | . . | M3STP M3RX | . . | M3DIAG
* (M3DIR) PB13 | · · | PB14 (M3STP) (M3RX) PA8 | · · | PG4 (M3DIAG)
* ----- ----- * ----- -----
* EXP2 EXP1 * EXP2 EXP1
*
* NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
*/ */
// M1 on Driver Expansion Module // M1 on Driver Expansion Module
#define E3_STEP_PIN EXP2_05_PIN #define E3_STEP_PIN EXP2_05_PIN
#define E3_DIR_PIN EXP2_06_PIN #define E3_DIR_PIN EXP2_06_PIN
#define E3_ENABLE_PIN EXP2_04_PIN #define E3_ENABLE_PIN EXP2_04_PIN
#if !EXP_MOT_USE_EXP2_ONLY
#define E3_DIAG_PIN EXP1_06_PIN #define E3_DIAG_PIN EXP1_06_PIN
#define E3_CS_PIN EXP1_05_PIN #define E3_CS_PIN EXP1_05_PIN
#if HAS_TMC_UART #if HAS_TMC_UART
#define E3_SERIAL_TX_PIN EXP1_05_PIN #define E3_SERIAL_TX_PIN EXP1_05_PIN
#define E3_SERIAL_RX_PIN EXP1_05_PIN #define E3_SERIAL_RX_PIN EXP1_05_PIN
#endif #endif
#endif
// M2 on Driver Expansion Module // M2 on Driver Expansion Module
#define E4_STEP_PIN EXP2_08_PIN #define E4_STEP_PIN EXP2_08_PIN
#define E4_DIR_PIN EXP2_07_PIN #define E4_DIR_PIN EXP2_07_PIN
#if !EXP_MOT_USE_EXP2_ONLY
#define E4_ENABLE_PIN EXP1_03_PIN #define E4_ENABLE_PIN EXP1_03_PIN
#define E4_DIAG_PIN EXP1_08_PIN #define E4_DIAG_PIN EXP1_08_PIN
#define E4_CS_PIN EXP1_07_PIN #define E4_CS_PIN EXP1_07_PIN
@ -343,10 +352,14 @@
#define E4_SERIAL_TX_PIN EXP1_07_PIN #define E4_SERIAL_TX_PIN EXP1_07_PIN
#define E4_SERIAL_RX_PIN EXP1_07_PIN #define E4_SERIAL_RX_PIN EXP1_07_PIN
#endif #endif
#else
#define E4_ENABLE_PIN EXP2_04_PIN
#endif
// M3 on Driver Expansion Module // M3 on Driver Expansion Module
#define E5_STEP_PIN EXP2_10_PIN #define E5_STEP_PIN EXP2_10_PIN
#define E5_DIR_PIN EXP2_09_PIN #define E5_DIR_PIN EXP2_09_PIN
#if !EXP_MOT_USE_EXP2_ONLY
#define E5_ENABLE_PIN EXP1_04_PIN #define E5_ENABLE_PIN EXP1_04_PIN
#define E5_DIAG_PIN EXP1_10_PIN #define E5_DIAG_PIN EXP1_10_PIN
#define E5_CS_PIN EXP1_09_PIN #define E5_CS_PIN EXP1_09_PIN
@ -354,6 +367,9 @@
#define E5_SERIAL_TX_PIN EXP1_09_PIN #define E5_SERIAL_TX_PIN EXP1_09_PIN
#define E5_SERIAL_RX_PIN EXP1_09_PIN #define E5_SERIAL_RX_PIN EXP1_09_PIN
#endif #endif
#else
#define E5_ENABLE_PIN EXP2_04_PIN
#endif
#endif // BTT_MOTOR_EXPANSION #endif // BTT_MOTOR_EXPANSION

79
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
View file

@ -23,6 +23,18 @@
#include "env_validate.h" #include "env_validate.h"
// If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
// https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
//#define BTT_MOTOR_EXPANSION
#if BOTH(HAS_WIRED_LCD, BTT_MOTOR_EXPANSION)
#if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
#define EXP_MOT_USE_EXP2_ONLY 1
#else
#error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time."
#endif
#endif
// Use one of these or SDCard-based Emulation will be used // Use one of these or SDCard-based Emulation will be used
#if NO_EEPROM_SELECTED #if NO_EEPROM_SELECTED
//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation //#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
@ -349,48 +361,59 @@
#endif #endif
#if ENABLED(BTT_MOTOR_EXPANSION) #if ENABLED(BTT_MOTOR_EXPANSION)
/** /** _____ _____
* _____ _____ * NC | . . | GND NC | . . | GND
* NC | · · | GND NC | · · | GND * NC | . . | M1EN M2EN | . . | M3EN
* NC | · · | PF12 (M1EN) (M2EN) PG7 | · · | PG6 (M3EN) * M1STP | . . M1DIR M1RX | . . M1DIAG
* (M1STP) PB15 | · · PF11 (M1DIR) (M1RX) PG3 | · · PG2 (M1DIAG) * M2DIR | . . | M2STP M2RX | . . | M2DIAG
* (M2DIR) PB12 | · · | PG10 (M2STP) (M2RX) PD10 | · · | PD11 (M2DIAG) * M3DIR | . . | M3STP M3RX | . . | M3DIAG
* (M3DIR) PB13 | · · | PB14 (M3STP) (M3RX) PA8 | · · | PG4 (M3DIAG)
* ----- ----- * ----- -----
* EXP2 EXP1 * EXP2 EXP1
*
* NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
*/ */
// M1 on Driver Expansion Module // M1 on Driver Expansion Module
#define E3_STEP_PIN EXP2_05_PIN #define E2_STEP_PIN EXP2_05_PIN
#define E3_DIR_PIN EXP2_06_PIN #define E2_DIR_PIN EXP2_06_PIN
#define E3_ENABLE_PIN EXP2_04_PIN #define E2_ENABLE_PIN EXP2_04_PIN
#define E3_DIAG_PIN EXP1_06_PIN #if !EXP_MOT_USE_EXP2_ONLY
#define E3_CS_PIN EXP1_05_PIN #define E2_DIAG_PIN EXP1_06_PIN
#define E2_CS_PIN EXP1_05_PIN
#if HAS_TMC_UART #if HAS_TMC_UART
#define E3_SERIAL_TX_PIN EXP1_05_PIN #define E2_SERIAL_TX_PIN EXP1_05_PIN
#define E3_SERIAL_RX_PIN EXP1_05_PIN #define E2_SERIAL_RX_PIN EXP1_05_PIN
#endif
#endif #endif
// M2 on Driver Expansion Module // M2 on Driver Expansion Module
#define E4_STEP_PIN EXP2_08_PIN #define E3_STEP_PIN EXP2_08_PIN
#define E4_DIR_PIN EXP2_07_PIN #define E3_DIR_PIN EXP2_07_PIN
#define E4_ENABLE_PIN EXP1_03_PIN #if !EXP_MOT_USE_EXP2_ONLY
#define E4_DIAG_PIN EXP1_08_PIN #define E3_ENABLE_PIN EXP1_03_PIN
#define E4_CS_PIN EXP1_07_PIN #define E3_DIAG_PIN EXP1_08_PIN
#define E3_CS_PIN EXP1_07_PIN
#if HAS_TMC_UART #if HAS_TMC_UART
#define E4_SERIAL_TX_PIN EXP1_07_PIN #define E3_SERIAL_TX_PIN EXP1_07_PIN
#define E4_SERIAL_RX_PIN EXP1_07_PIN #define E3_SERIAL_RX_PIN EXP1_07_PIN
#endif
#else
#define E3_ENABLE_PIN EXP2_04_PIN
#endif #endif
// M3 on Driver Expansion Module // M3 on Driver Expansion Module
#define E5_STEP_PIN EXP2_10_PIN #define E4_STEP_PIN EXP2_10_PIN
#define E5_DIR_PIN EXP2_09_PIN #define E4_DIR_PIN EXP2_09_PIN
#define E5_ENABLE_PIN EXP1_04_PIN #if !EXP_MOT_USE_EXP2_ONLY
#define E5_DIAG_PIN EXP1_10_PIN #define E4_ENABLE_PIN EXP1_04_PIN
#define E5_CS_PIN EXP1_09_PIN #define E4_DIAG_PIN EXP1_10_PIN
#define E4_CS_PIN EXP1_09_PIN
#if HAS_TMC_UART #if HAS_TMC_UART
#define E5_SERIAL_TX_PIN EXP1_09_PIN #define E4_SERIAL_TX_PIN EXP1_09_PIN
#define E5_SERIAL_RX_PIN EXP1_09_PIN #define E4_SERIAL_RX_PIN EXP1_09_PIN
#endif
#else
#define E4_ENABLE_PIN EXP2_04_PIN
#endif #endif
#endif // BTT_MOTOR_EXPANSION #endif // BTT_MOTOR_EXPANSION