Browse Source

Only assign CS/RX/TX on extra axes with SPI/UART (#15886)

Robby Candra 5 years ago
parent
commit
fcfde7c2f5
1 changed files with 17 additions and 15 deletions
  1. 17
    15
      Marlin/src/pins/pins.h

+ 17
- 15
Marlin/src/pins/pins.h View File

987
       #error "No E stepper plug left for X2!"
987
       #error "No E stepper plug left for X2!"
988
     #endif
988
     #endif
989
   #endif
989
   #endif
990
-  #ifndef X2_CS_PIN
991
-    #define X2_CS_PIN     _EPIN(E_STEPPERS, CS)
992
-  #endif
993
   #ifndef X2_MS1_PIN
990
   #ifndef X2_MS1_PIN
994
     #define X2_MS1_PIN    _EPIN(E_STEPPERS, MS1)
991
     #define X2_MS1_PIN    _EPIN(E_STEPPERS, MS1)
995
   #endif
992
   #endif
999
   #ifndef X2_MS3_PIN
996
   #ifndef X2_MS3_PIN
1000
     #define X2_MS3_PIN    _EPIN(E_STEPPERS, MS3)
997
     #define X2_MS3_PIN    _EPIN(E_STEPPERS, MS3)
1001
   #endif
998
   #endif
1002
-  #if AXIS_DRIVER_TYPE_X2(TMC2208) || AXIS_DRIVER_TYPE_X2(TMC2209)
999
+  #if AXIS_HAS_SPI(X2) && !defined(X2_CS_PIN)
1000
+    #define X2_CS_PIN     _EPIN(E_STEPPERS, CS)
1001
+  #endif
1002
+  #if AXIS_HAS_UART(X2)
1003
     #ifndef X2_SERIAL_TX_PIN
1003
     #ifndef X2_SERIAL_TX_PIN
1004
       #define X2_SERIAL_TX_PIN _EPIN(E_STEPPERS, SERIAL_TX)
1004
       #define X2_SERIAL_TX_PIN _EPIN(E_STEPPERS, SERIAL_TX)
1005
     #endif
1005
     #endif
1035
       #error "No E stepper plug left for Y2!"
1035
       #error "No E stepper plug left for Y2!"
1036
     #endif
1036
     #endif
1037
   #endif
1037
   #endif
1038
-  #ifndef Y2_CS_PIN
1039
-    #define Y2_CS_PIN     _EPIN(Y2_E_INDEX, CS)
1040
-  #endif
1041
   #ifndef Y2_MS1_PIN
1038
   #ifndef Y2_MS1_PIN
1042
     #define Y2_MS1_PIN    _EPIN(Y2_E_INDEX, MS1)
1039
     #define Y2_MS1_PIN    _EPIN(Y2_E_INDEX, MS1)
1043
   #endif
1040
   #endif
1047
   #ifndef Y2_MS3_PIN
1044
   #ifndef Y2_MS3_PIN
1048
     #define Y2_MS3_PIN    _EPIN(Y2_E_INDEX, MS3)
1045
     #define Y2_MS3_PIN    _EPIN(Y2_E_INDEX, MS3)
1049
   #endif
1046
   #endif
1050
-  #if AXIS_DRIVER_TYPE_Y2(TMC2208) || AXIS_DRIVER_TYPE_Y2(TMC2209)
1047
+  #if AXIS_HAS_SPI(Y2) && !defined(Y2_CS_PIN)
1048
+    #define Y2_CS_PIN     _EPIN(Y2_E_INDEX, CS)
1049
+  #endif
1050
+  #if AXIS_HAS_UART(Y2)
1051
     #ifndef Y2_SERIAL_TX_PIN
1051
     #ifndef Y2_SERIAL_TX_PIN
1052
       #define Y2_SERIAL_TX_PIN _EPIN(Y2_E_INDEX, SERIAL_TX)
1052
       #define Y2_SERIAL_TX_PIN _EPIN(Y2_E_INDEX, SERIAL_TX)
1053
     #endif
1053
     #endif
1083
       #error "No E stepper plug left for Z2!"
1083
       #error "No E stepper plug left for Z2!"
1084
     #endif
1084
     #endif
1085
   #endif
1085
   #endif
1086
-  #ifndef Z2_CS_PIN
1087
-    #define Z2_CS_PIN     _EPIN(Z2_E_INDEX, CS)
1088
-  #endif
1089
   #ifndef Z2_MS1_PIN
1086
   #ifndef Z2_MS1_PIN
1090
     #define Z2_MS1_PIN    _EPIN(Z2_E_INDEX, MS1)
1087
     #define Z2_MS1_PIN    _EPIN(Z2_E_INDEX, MS1)
1091
   #endif
1088
   #endif
1095
   #ifndef Z2_MS3_PIN
1092
   #ifndef Z2_MS3_PIN
1096
     #define Z2_MS3_PIN    _EPIN(Z2_E_INDEX, MS3)
1093
     #define Z2_MS3_PIN    _EPIN(Z2_E_INDEX, MS3)
1097
   #endif
1094
   #endif
1098
-  #if AXIS_DRIVER_TYPE_Z2(TMC2208) || AXIS_DRIVER_TYPE_Z2(TMC2209)
1095
+  #if AXIS_HAS_SPI(Z2) && !defined(Z2_CS_PIN)
1096
+    #define Z2_CS_PIN     _EPIN(Z2_E_INDEX, CS)
1097
+  #endif
1098
+  #if AXIS_HAS_UART(Z2)
1099
     #ifndef Z2_SERIAL_TX_PIN
1099
     #ifndef Z2_SERIAL_TX_PIN
1100
       #define Z2_SERIAL_TX_PIN _EPIN(Z2_E_INDEX, SERIAL_TX)
1100
       #define Z2_SERIAL_TX_PIN _EPIN(Z2_E_INDEX, SERIAL_TX)
1101
     #endif
1101
     #endif
1130
       #error "No E stepper plug left for Z3!"
1130
       #error "No E stepper plug left for Z3!"
1131
     #endif
1131
     #endif
1132
   #endif
1132
   #endif
1133
-  #ifndef Z3_CS_PIN
1134
-    #define Z3_CS_PIN     _EPIN(Z3_E_INDEX, CS)
1133
+  #if AXIS_HAS_SPI(Z3)
1134
+    #ifndef Z3_CS_PIN
1135
+      #define Z3_CS_PIN     _EPIN(Z3_E_INDEX, CS)
1136
+    #endif
1135
   #endif
1137
   #endif
1136
   #ifndef Z3_MS1_PIN
1138
   #ifndef Z3_MS1_PIN
1137
     #define Z3_MS1_PIN    _EPIN(Z3_E_INDEX, MS1)
1139
     #define Z3_MS1_PIN    _EPIN(Z3_E_INDEX, MS1)
1142
   #ifndef Z3_MS3_PIN
1144
   #ifndef Z3_MS3_PIN
1143
     #define Z3_MS3_PIN    _EPIN(Z3_E_INDEX, MS3)
1145
     #define Z3_MS3_PIN    _EPIN(Z3_E_INDEX, MS3)
1144
   #endif
1146
   #endif
1145
-  #if AXIS_DRIVER_TYPE_Z3(TMC2208) || AXIS_DRIVER_TYPE_Z3(TMC2209)
1147
+  #if AXIS_HAS_UART(Z3)
1146
     #ifndef Z3_SERIAL_TX_PIN
1148
     #ifndef Z3_SERIAL_TX_PIN
1147
       #define Z3_SERIAL_TX_PIN _EPIN(Z3_E_INDEX, SERIAL_TX)
1149
       #define Z3_SERIAL_TX_PIN _EPIN(Z3_E_INDEX, SERIAL_TX)
1148
     #endif
1150
     #endif

Loading…
Cancel
Save