|
@@ -1189,18 +1189,12 @@
|
1189
|
1189
|
#define _PEXI(p,q) __PEXI(p,q)
|
1190
|
1190
|
#define __EPIN(p,q) E##p##_##q##_PIN
|
1191
|
1191
|
#define _EPIN(p,q) __EPIN(p,q)
|
1192
|
|
-#define __EDRV(p) E##p##_DRIVER_TYPE
|
1193
|
|
-#define _EDRV(p) __EDRV(p)
|
1194
|
1192
|
#define DIAG_REMAPPED(p,q) (PIN_EXISTS(q) && _EPIN(p##_E_INDEX, DIAG) == q##_PIN)
|
1195
|
1193
|
|
1196
|
1194
|
// The X2 axis, if any, should be the next open extruder port
|
1197
|
1195
|
#define X2_E_INDEX E_STEPPERS
|
1198
|
1196
|
|
1199
|
1197
|
#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
|
1200
|
|
- #ifndef X2_DRIVER_TYPE
|
1201
|
|
- #define X2_DRIVER_TYPE _EDRV(X2_E_INDEX)
|
1202
|
|
- #endif
|
1203
|
|
-
|
1204
|
1198
|
#ifndef X2_STEP_PIN
|
1205
|
1199
|
#define X2_STEP_PIN _EPIN(X2_E_INDEX, STEP)
|
1206
|
1200
|
#define X2_DIR_PIN _EPIN(X2_E_INDEX, DIR)
|
|
@@ -1274,10 +1268,6 @@
|
1274
|
1268
|
|
1275
|
1269
|
// The Y2 axis, if any, should be the next open extruder port
|
1276
|
1270
|
#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
|
1277
|
|
- #ifndef Y2_DRIVER_TYPE
|
1278
|
|
- #define Y2_DRIVER_TYPE _EDRV(Y2_E_INDEX)
|
1279
|
|
- #endif
|
1280
|
|
-
|
1281
|
1271
|
#ifndef Y2_STEP_PIN
|
1282
|
1272
|
#define Y2_STEP_PIN _EPIN(Y2_E_INDEX, STEP)
|
1283
|
1273
|
#define Y2_DIR_PIN _EPIN(Y2_E_INDEX, DIR)
|
|
@@ -1346,10 +1336,6 @@
|
1346
|
1336
|
|
1347
|
1337
|
// The Z2 axis, if any, should be the next open extruder port
|
1348
|
1338
|
#if NUM_Z_STEPPER_DRIVERS >= 2
|
1349
|
|
- #ifndef Z2_DRIVER_TYPE
|
1350
|
|
- #define Z2_DRIVER_TYPE _EDRV(Z2_E_INDEX)
|
1351
|
|
- #endif
|
1352
|
|
-
|
1353
|
1339
|
#ifndef Z2_STEP_PIN
|
1354
|
1340
|
#define Z2_STEP_PIN _EPIN(Z2_E_INDEX, STEP)
|
1355
|
1341
|
#define Z2_DIR_PIN _EPIN(Z2_E_INDEX, DIR)
|
|
@@ -1417,10 +1403,6 @@
|
1417
|
1403
|
#endif
|
1418
|
1404
|
|
1419
|
1405
|
#if NUM_Z_STEPPER_DRIVERS >= 3
|
1420
|
|
- #ifndef Z3_DRIVER_TYPE
|
1421
|
|
- #define Z3_DRIVER_TYPE _EDRV(Z3_E_INDEX)
|
1422
|
|
- #endif
|
1423
|
|
-
|
1424
|
1406
|
#ifndef Z3_STEP_PIN
|
1425
|
1407
|
#define Z3_STEP_PIN _EPIN(Z3_E_INDEX, STEP)
|
1426
|
1408
|
#define Z3_DIR_PIN _EPIN(Z3_E_INDEX, DIR)
|
|
@@ -1488,10 +1470,6 @@
|
1488
|
1470
|
#endif
|
1489
|
1471
|
|
1490
|
1472
|
#if NUM_Z_STEPPER_DRIVERS >= 4
|
1491
|
|
- #ifndef Z4_DRIVER_TYPE
|
1492
|
|
- #define Z4_DRIVER_TYPE _EDRV(Z4_E_INDEX)
|
1493
|
|
- #endif
|
1494
|
|
-
|
1495
|
1473
|
#ifndef Z4_STEP_PIN
|
1496
|
1474
|
#define Z4_STEP_PIN _EPIN(Z4_E_INDEX, STEP)
|
1497
|
1475
|
#define Z4_DIR_PIN _EPIN(Z4_E_INDEX, DIR)
|