Browse Source

Undo driver type auto-assignment for now

Good general concept but needs more time to develop and group with a stepper suite.
Scott Lahteine 4 years ago
parent
commit
71539bcbeb
2 changed files with 5 additions and 22 deletions
  1. 5
    0
      Marlin/Configuration.h
  2. 0
    22
      Marlin/src/pins/pins.h

+ 5
- 0
Marlin/Configuration.h View File

674
 //#define X_DRIVER_TYPE  A4988
674
 //#define X_DRIVER_TYPE  A4988
675
 //#define Y_DRIVER_TYPE  A4988
675
 //#define Y_DRIVER_TYPE  A4988
676
 //#define Z_DRIVER_TYPE  A4988
676
 //#define Z_DRIVER_TYPE  A4988
677
+//#define X2_DRIVER_TYPE A4988
678
+//#define Y2_DRIVER_TYPE A4988
679
+//#define Z2_DRIVER_TYPE A4988
680
+//#define Z3_DRIVER_TYPE A4988
681
+//#define Z4_DRIVER_TYPE A4988
677
 //#define E0_DRIVER_TYPE A4988
682
 //#define E0_DRIVER_TYPE A4988
678
 //#define E1_DRIVER_TYPE A4988
683
 //#define E1_DRIVER_TYPE A4988
679
 //#define E2_DRIVER_TYPE A4988
684
 //#define E2_DRIVER_TYPE A4988

+ 0
- 22
Marlin/src/pins/pins.h View File

1189
 #define _PEXI(p,q) __PEXI(p,q)
1189
 #define _PEXI(p,q) __PEXI(p,q)
1190
 #define __EPIN(p,q) E##p##_##q##_PIN
1190
 #define __EPIN(p,q) E##p##_##q##_PIN
1191
 #define _EPIN(p,q) __EPIN(p,q)
1191
 #define _EPIN(p,q) __EPIN(p,q)
1192
-#define __EDRV(p) E##p##_DRIVER_TYPE
1193
-#define _EDRV(p) __EDRV(p)
1194
 #define DIAG_REMAPPED(p,q) (PIN_EXISTS(q) && _EPIN(p##_E_INDEX, DIAG) == q##_PIN)
1192
 #define DIAG_REMAPPED(p,q) (PIN_EXISTS(q) && _EPIN(p##_E_INDEX, DIAG) == q##_PIN)
1195
 
1193
 
1196
 // The X2 axis, if any, should be the next open extruder port
1194
 // The X2 axis, if any, should be the next open extruder port
1197
 #define X2_E_INDEX E_STEPPERS
1195
 #define X2_E_INDEX E_STEPPERS
1198
 
1196
 
1199
 #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
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
   #ifndef X2_STEP_PIN
1198
   #ifndef X2_STEP_PIN
1205
     #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
1199
     #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
1206
     #define X2_DIR_PIN    _EPIN(X2_E_INDEX, DIR)
1200
     #define X2_DIR_PIN    _EPIN(X2_E_INDEX, DIR)
1274
 
1268
 
1275
 // The Y2 axis, if any, should be the next open extruder port
1269
 // The Y2 axis, if any, should be the next open extruder port
1276
 #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
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
   #ifndef Y2_STEP_PIN
1271
   #ifndef Y2_STEP_PIN
1282
     #define Y2_STEP_PIN   _EPIN(Y2_E_INDEX, STEP)
1272
     #define Y2_STEP_PIN   _EPIN(Y2_E_INDEX, STEP)
1283
     #define Y2_DIR_PIN    _EPIN(Y2_E_INDEX, DIR)
1273
     #define Y2_DIR_PIN    _EPIN(Y2_E_INDEX, DIR)
1346
 
1336
 
1347
 // The Z2 axis, if any, should be the next open extruder port
1337
 // The Z2 axis, if any, should be the next open extruder port
1348
 #if NUM_Z_STEPPER_DRIVERS >= 2
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
   #ifndef Z2_STEP_PIN
1339
   #ifndef Z2_STEP_PIN
1354
     #define Z2_STEP_PIN   _EPIN(Z2_E_INDEX, STEP)
1340
     #define Z2_STEP_PIN   _EPIN(Z2_E_INDEX, STEP)
1355
     #define Z2_DIR_PIN    _EPIN(Z2_E_INDEX, DIR)
1341
     #define Z2_DIR_PIN    _EPIN(Z2_E_INDEX, DIR)
1417
 #endif
1403
 #endif
1418
 
1404
 
1419
 #if NUM_Z_STEPPER_DRIVERS >= 3
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
   #ifndef Z3_STEP_PIN
1406
   #ifndef Z3_STEP_PIN
1425
     #define Z3_STEP_PIN   _EPIN(Z3_E_INDEX, STEP)
1407
     #define Z3_STEP_PIN   _EPIN(Z3_E_INDEX, STEP)
1426
     #define Z3_DIR_PIN    _EPIN(Z3_E_INDEX, DIR)
1408
     #define Z3_DIR_PIN    _EPIN(Z3_E_INDEX, DIR)
1488
 #endif
1470
 #endif
1489
 
1471
 
1490
 #if NUM_Z_STEPPER_DRIVERS >= 4
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
   #ifndef Z4_STEP_PIN
1473
   #ifndef Z4_STEP_PIN
1496
     #define Z4_STEP_PIN   _EPIN(Z4_E_INDEX, STEP)
1474
     #define Z4_STEP_PIN   _EPIN(Z4_E_INDEX, STEP)
1497
     #define Z4_DIR_PIN    _EPIN(Z4_E_INDEX, DIR)
1475
     #define Z4_DIR_PIN    _EPIN(Z4_E_INDEX, DIR)

Loading…
Cancel
Save