dave
/
printerfw
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "swap X onto E1 for dead axis workaround" 

This reverts commit b0f26ea457.
This commit is contained in:
dave 2020-01-04 12:44:10 -08:00 committed by dave
parent 2c3e80586a
commit 7a8dec728c
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View File

@ -112,11 +112,11 @@
//
// Steppers
//
#define X_STEP_PIN P0_01
#define X_DIR_PIN P0_00
#define X_ENABLE_PIN P0_10
#define X_STEP_PIN P2_02
#define X_DIR_PIN P2_06
#define X_ENABLE_PIN P2_01
#ifndef X_CS_PIN
#define X_CS_PIN P1_01
#define X_CS_PIN P1_17
#endif
#define Y_STEP_PIN P0_19
@ -140,17 +140,11 @@
#define E0_CS_PIN P1_04
#endif
<<<<<<< HEAD:Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
#define E1_STEP_PIN P1_15
#define E1_DIR_PIN P1_14
#define E1_ENABLE_PIN P1_16
=======
#define E1_STEP_PIN P2_02
#define E1_DIR_PIN P2_06
#define E1_ENABLE_PIN P2_01
>>>>>>> swap X onto E1 for dead axis workaround:Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
#ifndef E1_CS_PIN
#define E1_CS_PIN P1_17
#define E1_CS_PIN P1_01
#endif
#define TEMP_1_PIN P0_23_A0 // A2 (T2) - (69) - TEMP_1_PIN
@ -198,6 +192,7 @@
//
// Software serial
//
<<<<<<< HEAD:Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
<<<<<<< HEAD:Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
#define X_SERIAL_TX_PIN P1_10
#define X_SERIAL_RX_PIN P1_10
@ -205,6 +200,10 @@
#define X_SERIAL_TX_PIN P1_04
#define X_SERIAL_RX_PIN P1_01
>>>>>>> swap X onto E1 for dead axis workaround:Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
=======
#define X_SERIAL_TX_PIN P4_29
#define X_SERIAL_RX_PIN P1_17
>>>>>>> Revert "swap X onto E1 for dead axis workaround":Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
#define Y_SERIAL_TX_PIN P1_09
#define Y_SERIAL_RX_PIN P1_09
@ -215,6 +214,7 @@
#define E0_SERIAL_TX_PIN P1_04
#define E0_SERIAL_RX_PIN P1_04
<<<<<<< HEAD:Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
<<<<<<< HEAD:Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
#define E1_SERIAL_TX_PIN P1_01
#define E1_SERIAL_RX_PIN P1_01
@ -222,6 +222,10 @@
#define E1_SERIAL_TX_PIN P4_29
#define E1_SERIAL_RX_PIN P1_17
>>>>>>> swap X onto E1 for dead axis workaround:Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
=======
#define E1_SERIAL_TX_PIN P1_04
#define E1_SERIAL_RX_PIN P1_01
>>>>>>> Revert "swap X onto E1 for dead axis workaround":Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
#define Z2_SERIAL_TX_PIN P1_01
#define Z2_SERIAL_RX_PIN P1_01