|
@@ -386,7 +386,7 @@
|
386
|
386
|
#endif
|
387
|
387
|
|
388
|
388
|
#if !defined(PSU_POWERUP_DELAY) && ENABLED(PSU_CONTROL)
|
389
|
|
- #define PSU_POWERUP_DELAY 100
|
|
389
|
+ #define PSU_POWERUP_DELAY 250
|
390
|
390
|
#endif
|
391
|
391
|
|
392
|
392
|
/**
|
|
@@ -1255,94 +1255,238 @@
|
1255
|
1255
|
*/
|
1256
|
1256
|
|
1257
|
1257
|
// Steppers
|
1258
|
|
-#define HAS_X_ENABLE (PIN_EXISTS(X_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(X)))
|
1259
|
|
-#define HAS_X_DIR (PIN_EXISTS(X_DIR))
|
1260
|
|
-#define HAS_X_STEP (PIN_EXISTS(X_STEP))
|
1261
|
|
-#define HAS_X_MICROSTEPS (PIN_EXISTS(X_MS1))
|
1262
|
|
-
|
1263
|
|
-#define HAS_X2_ENABLE (PIN_EXISTS(X2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(X2)))
|
1264
|
|
-#define HAS_X2_DIR (PIN_EXISTS(X2_DIR))
|
1265
|
|
-#define HAS_X2_STEP (PIN_EXISTS(X2_STEP))
|
1266
|
|
-#define HAS_X2_MICROSTEPS (PIN_EXISTS(X2_MS1))
|
1267
|
|
-
|
1268
|
|
-#define HAS_Y_ENABLE (PIN_EXISTS(Y_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y)))
|
1269
|
|
-#define HAS_Y_DIR (PIN_EXISTS(Y_DIR))
|
1270
|
|
-#define HAS_Y_STEP (PIN_EXISTS(Y_STEP))
|
1271
|
|
-#define HAS_Y_MICROSTEPS (PIN_EXISTS(Y_MS1))
|
1272
|
|
-
|
1273
|
|
-#define HAS_Y2_ENABLE (PIN_EXISTS(Y2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y2)))
|
1274
|
|
-#define HAS_Y2_DIR (PIN_EXISTS(Y2_DIR))
|
1275
|
|
-#define HAS_Y2_STEP (PIN_EXISTS(Y2_STEP))
|
1276
|
|
-#define HAS_Y2_MICROSTEPS (PIN_EXISTS(Y2_MS1))
|
1277
|
|
-
|
1278
|
|
-#define HAS_Z_ENABLE (PIN_EXISTS(Z_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z)))
|
1279
|
|
-#define HAS_Z_DIR (PIN_EXISTS(Z_DIR))
|
1280
|
|
-#define HAS_Z_STEP (PIN_EXISTS(Z_STEP))
|
1281
|
|
-#define HAS_Z_MICROSTEPS (PIN_EXISTS(Z_MS1))
|
1282
|
|
-
|
1283
|
|
-#define HAS_Z2_ENABLE (PIN_EXISTS(Z2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z2)))
|
1284
|
|
-#define HAS_Z2_DIR (PIN_EXISTS(Z2_DIR))
|
1285
|
|
-#define HAS_Z2_STEP (PIN_EXISTS(Z2_STEP))
|
1286
|
|
-#define HAS_Z2_MICROSTEPS (PIN_EXISTS(Z2_MS1))
|
1287
|
|
-
|
1288
|
|
-#define HAS_Z3_ENABLE (PIN_EXISTS(Z3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z3)))
|
1289
|
|
-#define HAS_Z3_DIR (PIN_EXISTS(Z3_DIR))
|
1290
|
|
-#define HAS_Z3_STEP (PIN_EXISTS(Z3_STEP))
|
1291
|
|
-#define HAS_Z3_MICROSTEPS (PIN_EXISTS(Z3_MS1))
|
1292
|
|
-
|
1293
|
|
-#define HAS_Z4_ENABLE (PIN_EXISTS(Z4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z4)))
|
1294
|
|
-#define HAS_Z4_DIR (PIN_EXISTS(Z4_DIR))
|
1295
|
|
-#define HAS_Z4_STEP (PIN_EXISTS(Z4_STEP))
|
1296
|
|
-#define HAS_Z4_MICROSTEPS (PIN_EXISTS(Z4_MS1))
|
|
1258
|
+#if PIN_EXISTS(X_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(X))
|
|
1259
|
+ #define HAS_X_ENABLE 1
|
|
1260
|
+#endif
|
|
1261
|
+#if PIN_EXISTS(X_DIR)
|
|
1262
|
+ #define HAS_X_DIR 1
|
|
1263
|
+#endif
|
|
1264
|
+#if PIN_EXISTS(X_STEP)
|
|
1265
|
+ #define HAS_X_STEP 1
|
|
1266
|
+#endif
|
|
1267
|
+#if PIN_EXISTS(X_MS1)
|
|
1268
|
+ #define HAS_X_MICROSTEPS 1
|
|
1269
|
+#endif
|
|
1270
|
+
|
|
1271
|
+#if PIN_EXISTS(X2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(X2))
|
|
1272
|
+ #define HAS_X2_ENABLE 1
|
|
1273
|
+#endif
|
|
1274
|
+#if PIN_EXISTS(X2_DIR)
|
|
1275
|
+ #define HAS_X2_DIR 1
|
|
1276
|
+#endif
|
|
1277
|
+#if PIN_EXISTS(X2_STEP)
|
|
1278
|
+ #define HAS_X2_STEP 1
|
|
1279
|
+#endif
|
|
1280
|
+#if PIN_EXISTS(X2_MS1)
|
|
1281
|
+ #define HAS_X2_MICROSTEPS 1
|
|
1282
|
+#endif
|
|
1283
|
+
|
|
1284
|
+#if PIN_EXISTS(Y_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y))
|
|
1285
|
+ #define HAS_Y_ENABLE 1
|
|
1286
|
+#endif
|
|
1287
|
+#if PIN_EXISTS(Y_DIR)
|
|
1288
|
+ #define HAS_Y_DIR 1
|
|
1289
|
+#endif
|
|
1290
|
+#if PIN_EXISTS(Y_STEP)
|
|
1291
|
+ #define HAS_Y_STEP 1
|
|
1292
|
+#endif
|
|
1293
|
+#if PIN_EXISTS(Y_MS1)
|
|
1294
|
+ #define HAS_Y_MICROSTEPS 1
|
|
1295
|
+#endif
|
|
1296
|
+
|
|
1297
|
+#if PIN_EXISTS(Y2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y2))
|
|
1298
|
+ #define HAS_Y2_ENABLE 1
|
|
1299
|
+#endif
|
|
1300
|
+#if PIN_EXISTS(Y2_DIR)
|
|
1301
|
+ #define HAS_Y2_DIR 1
|
|
1302
|
+#endif
|
|
1303
|
+#if PIN_EXISTS(Y2_STEP)
|
|
1304
|
+ #define HAS_Y2_STEP 1
|
|
1305
|
+#endif
|
|
1306
|
+#if PIN_EXISTS(Y2_MS1)
|
|
1307
|
+ #define HAS_Y2_MICROSTEPS 1
|
|
1308
|
+#endif
|
|
1309
|
+
|
|
1310
|
+#if PIN_EXISTS(Z_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z))
|
|
1311
|
+ #define HAS_Z_ENABLE 1
|
|
1312
|
+#endif
|
|
1313
|
+#if PIN_EXISTS(Z_DIR)
|
|
1314
|
+ #define HAS_Z_DIR 1
|
|
1315
|
+#endif
|
|
1316
|
+#if PIN_EXISTS(Z_STEP)
|
|
1317
|
+ #define HAS_Z_STEP 1
|
|
1318
|
+#endif
|
|
1319
|
+#if PIN_EXISTS(Z_MS1)
|
|
1320
|
+ #define HAS_Z_MICROSTEPS 1
|
|
1321
|
+#endif
|
|
1322
|
+
|
|
1323
|
+#if PIN_EXISTS(Z2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z2))
|
|
1324
|
+ #define HAS_Z2_ENABLE 1
|
|
1325
|
+#endif
|
|
1326
|
+#if PIN_EXISTS(Z2_DIR)
|
|
1327
|
+ #define HAS_Z2_DIR 1
|
|
1328
|
+#endif
|
|
1329
|
+#if PIN_EXISTS(Z2_STEP)
|
|
1330
|
+ #define HAS_Z2_STEP 1
|
|
1331
|
+#endif
|
|
1332
|
+#if PIN_EXISTS(Z2_MS1)
|
|
1333
|
+ #define HAS_Z2_MICROSTEPS 1
|
|
1334
|
+#endif
|
|
1335
|
+
|
|
1336
|
+#if PIN_EXISTS(Z3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z3))
|
|
1337
|
+ #define HAS_Z3_ENABLE 1
|
|
1338
|
+#endif
|
|
1339
|
+#if PIN_EXISTS(Z3_DIR)
|
|
1340
|
+ #define HAS_Z3_DIR 1
|
|
1341
|
+#endif
|
|
1342
|
+#if PIN_EXISTS(Z3_STEP)
|
|
1343
|
+ #define HAS_Z3_STEP 1
|
|
1344
|
+#endif
|
|
1345
|
+#if PIN_EXISTS(Z3_MS1)
|
|
1346
|
+ #define HAS_Z3_MICROSTEPS 1
|
|
1347
|
+#endif
|
|
1348
|
+
|
|
1349
|
+#if PIN_EXISTS(Z4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z4))
|
|
1350
|
+ #define HAS_Z4_ENABLE 1
|
|
1351
|
+#endif
|
|
1352
|
+#if PIN_EXISTS(Z4_DIR)
|
|
1353
|
+ #define HAS_Z4_DIR 1
|
|
1354
|
+#endif
|
|
1355
|
+#if PIN_EXISTS(Z4_STEP)
|
|
1356
|
+ #define HAS_Z4_STEP 1
|
|
1357
|
+#endif
|
|
1358
|
+#if PIN_EXISTS(Z4_MS1)
|
|
1359
|
+ #define HAS_Z4_MICROSTEPS 1
|
|
1360
|
+#endif
|
1297
|
1361
|
|
1298
|
1362
|
// Extruder steppers and solenoids
|
1299
|
|
-#define HAS_E0_ENABLE (PIN_EXISTS(E0_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E0)))
|
1300
|
|
-#define HAS_E0_DIR (PIN_EXISTS(E0_DIR))
|
1301
|
|
-#define HAS_E0_STEP (PIN_EXISTS(E0_STEP))
|
1302
|
|
-#define HAS_E0_MICROSTEPS (PIN_EXISTS(E0_MS1))
|
1303
|
|
-#define HAS_SOLENOID_0 (PIN_EXISTS(SOL0))
|
1304
|
|
-
|
1305
|
|
-#define HAS_E1_ENABLE (PIN_EXISTS(E1_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1)))
|
1306
|
|
-#define HAS_E1_DIR (PIN_EXISTS(E1_DIR))
|
1307
|
|
-#define HAS_E1_STEP (PIN_EXISTS(E1_STEP))
|
1308
|
|
-#define HAS_E1_MICROSTEPS (PIN_EXISTS(E1_MS1))
|
1309
|
|
-#define HAS_SOLENOID_1 (PIN_EXISTS(SOL1))
|
1310
|
|
-
|
1311
|
|
-#define HAS_E2_ENABLE (PIN_EXISTS(E2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E2)))
|
1312
|
|
-#define HAS_E2_DIR (PIN_EXISTS(E2_DIR))
|
1313
|
|
-#define HAS_E2_STEP (PIN_EXISTS(E2_STEP))
|
1314
|
|
-#define HAS_E2_MICROSTEPS (PIN_EXISTS(E2_MS1))
|
1315
|
|
-#define HAS_SOLENOID_2 (PIN_EXISTS(SOL2))
|
1316
|
|
-
|
1317
|
|
-#define HAS_E3_ENABLE (PIN_EXISTS(E3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E3)))
|
1318
|
|
-#define HAS_E3_DIR (PIN_EXISTS(E3_DIR))
|
1319
|
|
-#define HAS_E3_STEP (PIN_EXISTS(E3_STEP))
|
1320
|
|
-#define HAS_E3_MICROSTEPS (PIN_EXISTS(E3_MS1))
|
1321
|
|
-#define HAS_SOLENOID_3 (PIN_EXISTS(SOL3))
|
1322
|
|
-
|
1323
|
|
-#define HAS_E4_ENABLE (PIN_EXISTS(E4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E4)))
|
1324
|
|
-#define HAS_E4_DIR (PIN_EXISTS(E4_DIR))
|
1325
|
|
-#define HAS_E4_STEP (PIN_EXISTS(E4_STEP))
|
1326
|
|
-#define HAS_E4_MICROSTEPS (PIN_EXISTS(E4_MS1))
|
1327
|
|
-#define HAS_SOLENOID_4 (PIN_EXISTS(SOL4))
|
1328
|
|
-
|
1329
|
|
-#define HAS_E5_ENABLE (PIN_EXISTS(E5_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E5)))
|
1330
|
|
-#define HAS_E5_DIR (PIN_EXISTS(E5_DIR))
|
1331
|
|
-#define HAS_E5_STEP (PIN_EXISTS(E5_STEP))
|
1332
|
|
-#define HAS_E5_MICROSTEPS (PIN_EXISTS(E5_MS1))
|
1333
|
|
-#define HAS_SOLENOID_5 (PIN_EXISTS(SOL5))
|
1334
|
|
-
|
1335
|
|
-#define HAS_E6_ENABLE (PIN_EXISTS(E6_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E6)))
|
1336
|
|
-#define HAS_E6_DIR (PIN_EXISTS(E6_DIR))
|
1337
|
|
-#define HAS_E6_STEP (PIN_EXISTS(E6_STEP))
|
1338
|
|
-#define HAS_E6_MICROSTEPS (PIN_EXISTS(E6_MS1))
|
1339
|
|
-#define HAS_SOLENOID_6 (PIN_EXISTS(SOL6))
|
1340
|
|
-
|
1341
|
|
-#define HAS_E7_ENABLE (PIN_EXISTS(E7_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E7)))
|
1342
|
|
-#define HAS_E7_DIR (PIN_EXISTS(E7_DIR))
|
1343
|
|
-#define HAS_E7_STEP (PIN_EXISTS(E7_STEP))
|
1344
|
|
-#define HAS_E7_MICROSTEPS (PIN_EXISTS(E7_MS1))
|
1345
|
|
-#define HAS_SOLENOID_7 (PIN_EXISTS(SOL7))
|
|
1363
|
+#if PIN_EXISTS(E0_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E0))
|
|
1364
|
+ #define HAS_E0_ENABLE 1
|
|
1365
|
+#endif
|
|
1366
|
+#if PIN_EXISTS(E0_DIR)
|
|
1367
|
+ #define HAS_E0_DIR 1
|
|
1368
|
+#endif
|
|
1369
|
+#if PIN_EXISTS(E0_STEP)
|
|
1370
|
+ #define HAS_E0_STEP 1
|
|
1371
|
+#endif
|
|
1372
|
+#if PIN_EXISTS(E0_MS1)
|
|
1373
|
+ #define HAS_E0_MICROSTEPS 1
|
|
1374
|
+#endif
|
|
1375
|
+#if PIN_EXISTS(SOL0)
|
|
1376
|
+ #define HAS_SOLENOID_0 1
|
|
1377
|
+#endif
|
|
1378
|
+
|
|
1379
|
+#if PIN_EXISTS(E1_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1))
|
|
1380
|
+ #define HAS_E1_ENABLE 1
|
|
1381
|
+#endif
|
|
1382
|
+#if PIN_EXISTS(E1_DIR)
|
|
1383
|
+ #define HAS_E1_DIR 1
|
|
1384
|
+#endif
|
|
1385
|
+#if PIN_EXISTS(E1_STEP)
|
|
1386
|
+ #define HAS_E1_STEP 1
|
|
1387
|
+#endif
|
|
1388
|
+#if PIN_EXISTS(E1_MS1)
|
|
1389
|
+ #define HAS_E1_MICROSTEPS 1
|
|
1390
|
+#endif
|
|
1391
|
+#if PIN_EXISTS(SOL1)
|
|
1392
|
+ #define HAS_SOLENOID_1 1
|
|
1393
|
+#endif
|
|
1394
|
+
|
|
1395
|
+#if PIN_EXISTS(E2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E2))
|
|
1396
|
+ #define HAS_E2_ENABLE 1
|
|
1397
|
+#endif
|
|
1398
|
+#if PIN_EXISTS(E2_DIR)
|
|
1399
|
+ #define HAS_E2_DIR 1
|
|
1400
|
+#endif
|
|
1401
|
+#if PIN_EXISTS(E2_STEP)
|
|
1402
|
+ #define HAS_E2_STEP 1
|
|
1403
|
+#endif
|
|
1404
|
+#if PIN_EXISTS(E2_MS1)
|
|
1405
|
+ #define HAS_E2_MICROSTEPS 1
|
|
1406
|
+#endif
|
|
1407
|
+#if PIN_EXISTS(SOL2)
|
|
1408
|
+ #define HAS_SOLENOID_2 1
|
|
1409
|
+#endif
|
|
1410
|
+
|
|
1411
|
+#if PIN_EXISTS(E3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E3))
|
|
1412
|
+ #define HAS_E3_ENABLE 1
|
|
1413
|
+#endif
|
|
1414
|
+#if PIN_EXISTS(E3_DIR)
|
|
1415
|
+ #define HAS_E3_DIR 1
|
|
1416
|
+#endif
|
|
1417
|
+#if PIN_EXISTS(E3_STEP)
|
|
1418
|
+ #define HAS_E3_STEP 1
|
|
1419
|
+#endif
|
|
1420
|
+#if PIN_EXISTS(E3_MS1)
|
|
1421
|
+ #define HAS_E3_MICROSTEPS 1
|
|
1422
|
+#endif
|
|
1423
|
+#if PIN_EXISTS(SOL3)
|
|
1424
|
+ #define HAS_SOLENOID_3 1
|
|
1425
|
+#endif
|
|
1426
|
+
|
|
1427
|
+#if PIN_EXISTS(E4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E4))
|
|
1428
|
+ #define HAS_E4_ENABLE 1
|
|
1429
|
+#endif
|
|
1430
|
+#if PIN_EXISTS(E4_DIR)
|
|
1431
|
+ #define HAS_E4_DIR 1
|
|
1432
|
+#endif
|
|
1433
|
+#if PIN_EXISTS(E4_STEP)
|
|
1434
|
+ #define HAS_E4_STEP 1
|
|
1435
|
+#endif
|
|
1436
|
+#if PIN_EXISTS(E4_MS1)
|
|
1437
|
+ #define HAS_E4_MICROSTEPS 1
|
|
1438
|
+#endif
|
|
1439
|
+#if PIN_EXISTS(SOL4)
|
|
1440
|
+ #define HAS_SOLENOID_4 1
|
|
1441
|
+#endif
|
|
1442
|
+
|
|
1443
|
+#if PIN_EXISTS(E5_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E5))
|
|
1444
|
+ #define HAS_E5_ENABLE 1
|
|
1445
|
+#endif
|
|
1446
|
+#if PIN_EXISTS(E5_DIR)
|
|
1447
|
+ #define HAS_E5_DIR 1
|
|
1448
|
+#endif
|
|
1449
|
+#if PIN_EXISTS(E5_STEP)
|
|
1450
|
+ #define HAS_E5_STEP 1
|
|
1451
|
+#endif
|
|
1452
|
+#if PIN_EXISTS(E5_MS1)
|
|
1453
|
+ #define HAS_E5_MICROSTEPS 1
|
|
1454
|
+#endif
|
|
1455
|
+#if PIN_EXISTS(SOL5)
|
|
1456
|
+ #define HAS_SOLENOID_5 1
|
|
1457
|
+#endif
|
|
1458
|
+
|
|
1459
|
+#if PIN_EXISTS(E6_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E6))
|
|
1460
|
+ #define HAS_E6_ENABLE 1
|
|
1461
|
+#endif
|
|
1462
|
+#if PIN_EXISTS(E6_DIR)
|
|
1463
|
+ #define HAS_E6_DIR 1
|
|
1464
|
+#endif
|
|
1465
|
+#if PIN_EXISTS(E6_STEP)
|
|
1466
|
+ #define HAS_E6_STEP 1
|
|
1467
|
+#endif
|
|
1468
|
+#if PIN_EXISTS(E6_MS1)
|
|
1469
|
+ #define HAS_E6_MICROSTEPS 1
|
|
1470
|
+#endif
|
|
1471
|
+#if PIN_EXISTS(SOL6)
|
|
1472
|
+ #define HAS_SOLENOID_6 1
|
|
1473
|
+#endif
|
|
1474
|
+
|
|
1475
|
+#if PIN_EXISTS(E7_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E7))
|
|
1476
|
+ #define HAS_E7_ENABLE 1
|
|
1477
|
+#endif
|
|
1478
|
+#if PIN_EXISTS(E7_DIR)
|
|
1479
|
+ #define HAS_E7_DIR 1
|
|
1480
|
+#endif
|
|
1481
|
+#if PIN_EXISTS(E7_STEP)
|
|
1482
|
+ #define HAS_E7_STEP 1
|
|
1483
|
+#endif
|
|
1484
|
+#if PIN_EXISTS(E7_MS1)
|
|
1485
|
+ #define HAS_E7_MICROSTEPS 1
|
|
1486
|
+#endif
|
|
1487
|
+#if PIN_EXISTS(SOL7)
|
|
1488
|
+ #define HAS_SOLENOID_7 1
|
|
1489
|
+#endif
|
1346
|
1490
|
|
1347
|
1491
|
// Trinamic Stepper Drivers
|
1348
|
1492
|
#if HAS_TRINAMIC_CONFIG
|
|
@@ -1405,62 +1549,146 @@
|
1405
|
1549
|
#define IS_Z4_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && Z4_USE_ENDSTOP == _##A##M##_)
|
1406
|
1550
|
|
1407
|
1551
|
#define _HAS_STOP(A,M) (PIN_EXISTS(A##_##M) && !IS_PROBE_PIN(A,M) && !IS_X2_ENDSTOP(A,M) && !IS_Y2_ENDSTOP(A,M) && !IS_Z2_ENDSTOP(A,M) && !IS_Z3_ENDSTOP(A,M) && !IS_Z4_ENDSTOP(A,M))
|
1408
|
|
-#define HAS_X_MIN _HAS_STOP(X,MIN)
|
1409
|
|
-#define HAS_X_MAX _HAS_STOP(X,MAX)
|
1410
|
|
-#define HAS_Y_MIN _HAS_STOP(Y,MIN)
|
1411
|
|
-#define HAS_Y_MAX _HAS_STOP(Y,MAX)
|
1412
|
|
-#define HAS_Z_MIN _HAS_STOP(Z,MIN)
|
1413
|
|
-#define HAS_Z_MAX _HAS_STOP(Z,MAX)
|
1414
|
|
-#define HAS_X2_MIN (PIN_EXISTS(X2_MIN))
|
1415
|
|
-#define HAS_X2_MAX (PIN_EXISTS(X2_MAX))
|
1416
|
|
-#define HAS_Y2_MIN (PIN_EXISTS(Y2_MIN))
|
1417
|
|
-#define HAS_Y2_MAX (PIN_EXISTS(Y2_MAX))
|
1418
|
|
-#define HAS_Z2_MIN (PIN_EXISTS(Z2_MIN))
|
1419
|
|
-#define HAS_Z2_MAX (PIN_EXISTS(Z2_MAX))
|
1420
|
|
-#define HAS_Z3_MIN (PIN_EXISTS(Z3_MIN))
|
1421
|
|
-#define HAS_Z3_MAX (PIN_EXISTS(Z3_MAX))
|
1422
|
|
-#define HAS_Z4_MIN (PIN_EXISTS(Z4_MIN))
|
1423
|
|
-#define HAS_Z4_MAX (PIN_EXISTS(Z4_MAX))
|
1424
|
|
-#define HAS_Z_MIN_PROBE_PIN (HAS_CUSTOM_PROBE_PIN && PIN_EXISTS(Z_MIN_PROBE))
|
|
1552
|
+#if _HAS_STOP(X,MIN)
|
|
1553
|
+ #define HAS_X_MIN 1
|
|
1554
|
+#endif
|
|
1555
|
+#if _HAS_STOP(X,MAX)
|
|
1556
|
+ #define HAS_X_MAX 1
|
|
1557
|
+#endif
|
|
1558
|
+#if _HAS_STOP(Y,MIN)
|
|
1559
|
+ #define HAS_Y_MIN 1
|
|
1560
|
+#endif
|
|
1561
|
+#if _HAS_STOP(Y,MAX)
|
|
1562
|
+ #define HAS_Y_MAX 1
|
|
1563
|
+#endif
|
|
1564
|
+#if _HAS_STOP(Z,MIN)
|
|
1565
|
+ #define HAS_Z_MIN 1
|
|
1566
|
+#endif
|
|
1567
|
+#if _HAS_STOP(Z,MAX)
|
|
1568
|
+ #define HAS_Z_MAX 1
|
|
1569
|
+#endif
|
|
1570
|
+#if PIN_EXISTS(X2_MIN)
|
|
1571
|
+ #define HAS_X2_MIN 1
|
|
1572
|
+#endif
|
|
1573
|
+#if PIN_EXISTS(X2_MAX)
|
|
1574
|
+ #define HAS_X2_MAX 1
|
|
1575
|
+#endif
|
|
1576
|
+#if PIN_EXISTS(Y2_MIN)
|
|
1577
|
+ #define HAS_Y2_MIN 1
|
|
1578
|
+#endif
|
|
1579
|
+#if PIN_EXISTS(Y2_MAX)
|
|
1580
|
+ #define HAS_Y2_MAX 1
|
|
1581
|
+#endif
|
|
1582
|
+#if PIN_EXISTS(Z2_MIN)
|
|
1583
|
+ #define HAS_Z2_MIN 1
|
|
1584
|
+#endif
|
|
1585
|
+#if PIN_EXISTS(Z2_MAX)
|
|
1586
|
+ #define HAS_Z2_MAX 1
|
|
1587
|
+#endif
|
|
1588
|
+#if PIN_EXISTS(Z3_MIN)
|
|
1589
|
+ #define HAS_Z3_MIN 1
|
|
1590
|
+#endif
|
|
1591
|
+#if PIN_EXISTS(Z3_MAX)
|
|
1592
|
+ #define HAS_Z3_MAX 1
|
|
1593
|
+#endif
|
|
1594
|
+#if PIN_EXISTS(Z4_MIN)
|
|
1595
|
+ #define HAS_Z4_MIN 1
|
|
1596
|
+#endif
|
|
1597
|
+#if PIN_EXISTS(Z4_MAX)
|
|
1598
|
+ #define HAS_Z4_MAX 1
|
|
1599
|
+#endif
|
|
1600
|
+#if HAS_CUSTOM_PROBE_PIN && PIN_EXISTS(Z_MIN_PROBE)
|
|
1601
|
+ #define HAS_Z_MIN_PROBE_PIN 1
|
|
1602
|
+#endif
|
1425
|
1603
|
|
1426
|
1604
|
//
|
1427
|
1605
|
// ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
|
1428
|
1606
|
//
|
1429
|
1607
|
#define HAS_ADC_TEST(P) (PIN_EXISTS(TEMP_##P) && TEMP_SENSOR_##P != 0 && DISABLED(HEATER_##P##_USES_MAX6675))
|
1430
|
|
-#define HAS_TEMP_ADC_0 HAS_ADC_TEST(0)
|
1431
|
|
-#define HAS_TEMP_ADC_1 HAS_ADC_TEST(1)
|
1432
|
|
-#define HAS_TEMP_ADC_2 HAS_ADC_TEST(2)
|
1433
|
|
-#define HAS_TEMP_ADC_3 HAS_ADC_TEST(3)
|
1434
|
|
-#define HAS_TEMP_ADC_4 HAS_ADC_TEST(4)
|
1435
|
|
-#define HAS_TEMP_ADC_5 HAS_ADC_TEST(5)
|
1436
|
|
-#define HAS_TEMP_ADC_6 HAS_ADC_TEST(6)
|
1437
|
|
-#define HAS_TEMP_ADC_7 HAS_ADC_TEST(7)
|
1438
|
|
-#define HAS_TEMP_ADC_BED HAS_ADC_TEST(BED)
|
1439
|
|
-#define HAS_TEMP_ADC_PROBE HAS_ADC_TEST(PROBE)
|
1440
|
|
-#define HAS_TEMP_ADC_CHAMBER HAS_ADC_TEST(CHAMBER)
|
1441
|
|
-
|
1442
|
|
-#define HAS_TEMP_HOTEND ((HAS_TEMP_ADC_0 || ENABLED(HEATER_0_USES_MAX6675)) && HOTENDS)
|
|
1608
|
+#if HAS_ADC_TEST(0)
|
|
1609
|
+ #define HAS_TEMP_ADC_0 1
|
|
1610
|
+#endif
|
|
1611
|
+#if HAS_ADC_TEST(1)
|
|
1612
|
+ #define HAS_TEMP_ADC_1 1
|
|
1613
|
+#endif
|
|
1614
|
+#if HAS_ADC_TEST(2)
|
|
1615
|
+ #define HAS_TEMP_ADC_2 1
|
|
1616
|
+#endif
|
|
1617
|
+#if HAS_ADC_TEST(3)
|
|
1618
|
+ #define HAS_TEMP_ADC_3 1
|
|
1619
|
+#endif
|
|
1620
|
+#if HAS_ADC_TEST(4)
|
|
1621
|
+ #define HAS_TEMP_ADC_4 1
|
|
1622
|
+#endif
|
|
1623
|
+#if HAS_ADC_TEST(5)
|
|
1624
|
+ #define HAS_TEMP_ADC_5 1
|
|
1625
|
+#endif
|
|
1626
|
+#if HAS_ADC_TEST(6)
|
|
1627
|
+ #define HAS_TEMP_ADC_6 1
|
|
1628
|
+#endif
|
|
1629
|
+#if HAS_ADC_TEST(7)
|
|
1630
|
+ #define HAS_TEMP_ADC_7 1
|
|
1631
|
+#endif
|
|
1632
|
+#if HAS_ADC_TEST(BED)
|
|
1633
|
+ #define HAS_TEMP_ADC_BED 1
|
|
1634
|
+#endif
|
|
1635
|
+#if HAS_ADC_TEST(PROBE)
|
|
1636
|
+ #define HAS_TEMP_ADC_PROBE 1
|
|
1637
|
+#endif
|
|
1638
|
+#if HAS_ADC_TEST(CHAMBER)
|
|
1639
|
+ #define HAS_TEMP_ADC_CHAMBER 1
|
|
1640
|
+#endif
|
|
1641
|
+
|
|
1642
|
+#if HOTENDS && (HAS_TEMP_ADC_0 || ENABLED(HEATER_0_USES_MAX6675))
|
|
1643
|
+ #define HAS_TEMP_HOTEND 1
|
|
1644
|
+#endif
|
1443
|
1645
|
#define HAS_TEMP_BED HAS_TEMP_ADC_BED
|
1444
|
1646
|
#define HAS_TEMP_PROBE HAS_TEMP_ADC_PROBE
|
1445
|
1647
|
#define HAS_TEMP_CHAMBER HAS_TEMP_ADC_CHAMBER
|
1446
|
1648
|
|
1447
|
1649
|
#if ENABLED(JOYSTICK)
|
1448
|
|
- #define HAS_JOY_ADC_X PIN_EXISTS(JOY_X)
|
1449
|
|
- #define HAS_JOY_ADC_Y PIN_EXISTS(JOY_Y)
|
1450
|
|
- #define HAS_JOY_ADC_Z PIN_EXISTS(JOY_Z)
|
1451
|
|
- #define HAS_JOY_ADC_EN PIN_EXISTS(JOY_EN)
|
|
1650
|
+ #if PIN_EXISTS(JOY_X)
|
|
1651
|
+ #define HAS_JOY_ADC_X 1
|
|
1652
|
+#endif
|
|
1653
|
+ #if PIN_EXISTS(JOY_Y)
|
|
1654
|
+ #define HAS_JOY_ADC_Y 1
|
|
1655
|
+#endif
|
|
1656
|
+ #if PIN_EXISTS(JOY_Z)
|
|
1657
|
+ #define HAS_JOY_ADC_Z 1
|
|
1658
|
+#endif
|
|
1659
|
+ #if PIN_EXISTS(JOY_EN)
|
|
1660
|
+ #define HAS_JOY_ADC_EN 1
|
|
1661
|
+#endif
|
1452
|
1662
|
#endif
|
1453
|
1663
|
|
1454
|
1664
|
// Heaters
|
1455
|
|
-#define HAS_HEATER_0 (PIN_EXISTS(HEATER_0))
|
1456
|
|
-#define HAS_HEATER_1 (PIN_EXISTS(HEATER_1))
|
1457
|
|
-#define HAS_HEATER_2 (PIN_EXISTS(HEATER_2))
|
1458
|
|
-#define HAS_HEATER_3 (PIN_EXISTS(HEATER_3))
|
1459
|
|
-#define HAS_HEATER_4 (PIN_EXISTS(HEATER_4))
|
1460
|
|
-#define HAS_HEATER_5 (PIN_EXISTS(HEATER_5))
|
1461
|
|
-#define HAS_HEATER_6 (PIN_EXISTS(HEATER_6))
|
1462
|
|
-#define HAS_HEATER_7 (PIN_EXISTS(HEATER_7))
|
1463
|
|
-#define HAS_HEATER_BED (PIN_EXISTS(HEATER_BED))
|
|
1665
|
+#if PIN_EXISTS(HEATER_0)
|
|
1666
|
+ #define HAS_HEATER_0 1
|
|
1667
|
+#endif
|
|
1668
|
+#if PIN_EXISTS(HEATER_1)
|
|
1669
|
+ #define HAS_HEATER_1 1
|
|
1670
|
+#endif
|
|
1671
|
+#if PIN_EXISTS(HEATER_2)
|
|
1672
|
+ #define HAS_HEATER_2 1
|
|
1673
|
+#endif
|
|
1674
|
+#if PIN_EXISTS(HEATER_3)
|
|
1675
|
+ #define HAS_HEATER_3 1
|
|
1676
|
+#endif
|
|
1677
|
+#if PIN_EXISTS(HEATER_4)
|
|
1678
|
+ #define HAS_HEATER_4 1
|
|
1679
|
+#endif
|
|
1680
|
+#if PIN_EXISTS(HEATER_5)
|
|
1681
|
+ #define HAS_HEATER_5 1
|
|
1682
|
+#endif
|
|
1683
|
+#if PIN_EXISTS(HEATER_6)
|
|
1684
|
+ #define HAS_HEATER_6 1
|
|
1685
|
+#endif
|
|
1686
|
+#if PIN_EXISTS(HEATER_7)
|
|
1687
|
+ #define HAS_HEATER_7 1
|
|
1688
|
+#endif
|
|
1689
|
+#if PIN_EXISTS(HEATER_BED)
|
|
1690
|
+ #define HAS_HEATER_BED 1
|
|
1691
|
+#endif
|
1464
|
1692
|
|
1465
|
1693
|
// Shorthand for common combinations
|
1466
|
1694
|
#if HAS_TEMP_BED && HAS_HEATER_BED
|
|
@@ -1507,15 +1735,33 @@
|
1507
|
1735
|
#endif
|
1508
|
1736
|
|
1509
|
1737
|
// Auto fans
|
1510
|
|
-#define HAS_AUTO_FAN_0 (HOTENDS > 0 && PIN_EXISTS(E0_AUTO_FAN))
|
1511
|
|
-#define HAS_AUTO_FAN_1 (HOTENDS > 1 && PIN_EXISTS(E1_AUTO_FAN))
|
1512
|
|
-#define HAS_AUTO_FAN_2 (HOTENDS > 2 && PIN_EXISTS(E2_AUTO_FAN))
|
1513
|
|
-#define HAS_AUTO_FAN_3 (HOTENDS > 3 && PIN_EXISTS(E3_AUTO_FAN))
|
1514
|
|
-#define HAS_AUTO_FAN_4 (HOTENDS > 4 && PIN_EXISTS(E4_AUTO_FAN))
|
1515
|
|
-#define HAS_AUTO_FAN_5 (HOTENDS > 5 && PIN_EXISTS(E5_AUTO_FAN))
|
1516
|
|
-#define HAS_AUTO_FAN_6 (HOTENDS > 6 && PIN_EXISTS(E6_AUTO_FAN))
|
1517
|
|
-#define HAS_AUTO_FAN_7 (HOTENDS > 7 && PIN_EXISTS(E7_AUTO_FAN))
|
1518
|
|
-#define HAS_AUTO_CHAMBER_FAN (HAS_TEMP_CHAMBER && PIN_EXISTS(CHAMBER_AUTO_FAN))
|
|
1738
|
+#if HAS_HOTEND && PIN_EXISTS(E0_AUTO_FAN)
|
|
1739
|
+ #define HAS_AUTO_FAN_0 1
|
|
1740
|
+#endif
|
|
1741
|
+#if HOTENDS > 1 && PIN_EXISTS(E1_AUTO_FAN)
|
|
1742
|
+ #define HAS_AUTO_FAN_1 1
|
|
1743
|
+#endif
|
|
1744
|
+#if HOTENDS > 2 && PIN_EXISTS(E2_AUTO_FAN)
|
|
1745
|
+ #define HAS_AUTO_FAN_2 1
|
|
1746
|
+#endif
|
|
1747
|
+#if HOTENDS > 3 && PIN_EXISTS(E3_AUTO_FAN)
|
|
1748
|
+ #define HAS_AUTO_FAN_3 1
|
|
1749
|
+#endif
|
|
1750
|
+#if HOTENDS > 4 && PIN_EXISTS(E4_AUTO_FAN)
|
|
1751
|
+ #define HAS_AUTO_FAN_4 1
|
|
1752
|
+#endif
|
|
1753
|
+#if HOTENDS > 5 && PIN_EXISTS(E5_AUTO_FAN)
|
|
1754
|
+ #define HAS_AUTO_FAN_5 1
|
|
1755
|
+#endif
|
|
1756
|
+#if HOTENDS > 6 && PIN_EXISTS(E6_AUTO_FAN)
|
|
1757
|
+ #define HAS_AUTO_FAN_6 1
|
|
1758
|
+#endif
|
|
1759
|
+#if HOTENDS > 7 && PIN_EXISTS(E7_AUTO_FAN)
|
|
1760
|
+ #define HAS_AUTO_FAN_7 1
|
|
1761
|
+#endif
|
|
1762
|
+#if HAS_TEMP_CHAMBER && PIN_EXISTS(CHAMBER_AUTO_FAN)
|
|
1763
|
+ #define HAS_AUTO_CHAMBER_FAN 1
|
|
1764
|
+#endif
|
1519
|
1765
|
|
1520
|
1766
|
#define HAS_AUTO_FAN (HAS_AUTO_FAN_0 || HAS_AUTO_FAN_1 || HAS_AUTO_FAN_2 || HAS_AUTO_FAN_3 || HAS_AUTO_FAN_4 || HAS_AUTO_FAN_5 || HAS_AUTO_FAN_6 || HAS_AUTO_FAN_7 || HAS_AUTO_CHAMBER_FAN)
|
1521
|
1767
|
#define _FANOVERLAP(A,B) (A##_AUTO_FAN_PIN == E##B##_AUTO_FAN_PIN)
|
|
@@ -1535,24 +1781,52 @@
|
1535
|
1781
|
// Other fans
|
1536
|
1782
|
#define HAS_FAN0 (PIN_EXISTS(FAN))
|
1537
|
1783
|
#define _HAS_FAN(P) (PIN_EXISTS(FAN##P) && CONTROLLER_FAN_PIN != FAN##P##_PIN && E0_AUTO_FAN_PIN != FAN##P##_PIN && E1_AUTO_FAN_PIN != FAN##P##_PIN && E2_AUTO_FAN_PIN != FAN##P##_PIN && E3_AUTO_FAN_PIN != FAN##P##_PIN && E4_AUTO_FAN_PIN != FAN##P##_PIN && E5_AUTO_FAN_PIN != FAN##P##_PIN && E6_AUTO_FAN_PIN != FAN##P##_PIN && E7_AUTO_FAN_PIN != FAN##P##_PIN)
|
1538
|
|
-#define HAS_FAN1 _HAS_FAN(1)
|
1539
|
|
-#define HAS_FAN2 _HAS_FAN(2)
|
1540
|
|
-#define HAS_FAN3 _HAS_FAN(3)
|
1541
|
|
-#define HAS_FAN4 _HAS_FAN(4)
|
1542
|
|
-#define HAS_FAN5 _HAS_FAN(5)
|
1543
|
|
-#define HAS_FAN6 _HAS_FAN(6)
|
1544
|
|
-#define HAS_FAN7 _HAS_FAN(7)
|
1545
|
|
-#define HAS_CONTROLLER_FAN (PIN_EXISTS(CONTROLLER_FAN))
|
|
1784
|
+#if _HAS_FAN(1)
|
|
1785
|
+ #define HAS_FAN1 1
|
|
1786
|
+#endif
|
|
1787
|
+#if _HAS_FAN(2)
|
|
1788
|
+ #define HAS_FAN2 1
|
|
1789
|
+#endif
|
|
1790
|
+#if _HAS_FAN(3)
|
|
1791
|
+ #define HAS_FAN3 1
|
|
1792
|
+#endif
|
|
1793
|
+#if _HAS_FAN(4)
|
|
1794
|
+ #define HAS_FAN4 1
|
|
1795
|
+#endif
|
|
1796
|
+#if _HAS_FAN(5)
|
|
1797
|
+ #define HAS_FAN5 1
|
|
1798
|
+#endif
|
|
1799
|
+#if _HAS_FAN(6)
|
|
1800
|
+ #define HAS_FAN6 1
|
|
1801
|
+#endif
|
|
1802
|
+#if _HAS_FAN(7)
|
|
1803
|
+ #define HAS_FAN7 1
|
|
1804
|
+#endif
|
|
1805
|
+#if PIN_EXISTS(CONTROLLER_FAN)
|
|
1806
|
+ #define HAS_CONTROLLER_FAN 1
|
|
1807
|
+#endif
|
1546
|
1808
|
|
1547
|
1809
|
// Servos
|
1548
|
|
-#define HAS_SERVO_0 (PIN_EXISTS(SERVO0) && NUM_SERVOS > 0)
|
1549
|
|
-#define HAS_SERVO_1 (PIN_EXISTS(SERVO1) && NUM_SERVOS > 1)
|
1550
|
|
-#define HAS_SERVO_2 (PIN_EXISTS(SERVO2) && NUM_SERVOS > 2)
|
1551
|
|
-#define HAS_SERVO_3 (PIN_EXISTS(SERVO3) && NUM_SERVOS > 3)
|
1552
|
|
-#define HAS_SERVOS (NUM_SERVOS > 0)
|
|
1810
|
+#if PIN_EXISTS(SERVO0) && NUM_SERVOS > 0
|
|
1811
|
+ #define HAS_SERVO_0 1
|
|
1812
|
+#endif
|
|
1813
|
+#if PIN_EXISTS(SERVO1) && NUM_SERVOS > 1
|
|
1814
|
+ #define HAS_SERVO_1 1
|
|
1815
|
+#endif
|
|
1816
|
+#if PIN_EXISTS(SERVO2) && NUM_SERVOS > 2
|
|
1817
|
+ #define HAS_SERVO_2 1
|
|
1818
|
+#endif
|
|
1819
|
+#if PIN_EXISTS(SERVO3) && NUM_SERVOS > 3
|
|
1820
|
+ #define HAS_SERVO_3 1
|
|
1821
|
+#endif
|
|
1822
|
+#if NUM_SERVOS > 0
|
|
1823
|
+ #define HAS_SERVOS 1
|
|
1824
|
+#endif
|
1553
|
1825
|
|
1554
|
1826
|
// Sensors
|
1555
|
|
-#define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
|
|
1827
|
+#if PIN_EXISTS(FILWIDTH)
|
|
1828
|
+ #define HAS_FILAMENT_WIDTH_SENSOR 1
|
|
1829
|
+#endif
|
1556
|
1830
|
|
1557
|
1831
|
// User Interface
|
1558
|
1832
|
#if PIN_EXISTS(HOME)
|
|
@@ -1638,14 +1912,30 @@
|
1638
|
1912
|
#endif
|
1639
|
1913
|
#endif
|
1640
|
1914
|
|
1641
|
|
- #define HAS_MICROSTEP1 defined(MICROSTEP1)
|
1642
|
|
- #define HAS_MICROSTEP2 defined(MICROSTEP2)
|
1643
|
|
- #define HAS_MICROSTEP4 defined(MICROSTEP4)
|
1644
|
|
- #define HAS_MICROSTEP8 defined(MICROSTEP8)
|
1645
|
|
- #define HAS_MICROSTEP16 defined(MICROSTEP16)
|
1646
|
|
- #define HAS_MICROSTEP32 defined(MICROSTEP32)
|
1647
|
|
- #define HAS_MICROSTEP64 defined(MICROSTEP64)
|
1648
|
|
- #define HAS_MICROSTEP128 defined(MICROSTEP128)
|
|
1915
|
+ #ifdef MICROSTEP1
|
|
1916
|
+ #define HAS_MICROSTEP1 1
|
|
1917
|
+ #endif
|
|
1918
|
+ #ifdef MICROSTEP2
|
|
1919
|
+ #define HAS_MICROSTEP2 1
|
|
1920
|
+ #endif
|
|
1921
|
+ #ifdef MICROSTEP4
|
|
1922
|
+ #define HAS_MICROSTEP4 1
|
|
1923
|
+ #endif
|
|
1924
|
+ #ifdef MICROSTEP8
|
|
1925
|
+ #define HAS_MICROSTEP8 1
|
|
1926
|
+ #endif
|
|
1927
|
+ #ifdef MICROSTEP16
|
|
1928
|
+ #define HAS_MICROSTEP16 1
|
|
1929
|
+ #endif
|
|
1930
|
+ #ifdef MICROSTEP32
|
|
1931
|
+ #define HAS_MICROSTEP32 1
|
|
1932
|
+ #endif
|
|
1933
|
+ #ifdef MICROSTEP64
|
|
1934
|
+ #define HAS_MICROSTEP64 1
|
|
1935
|
+ #endif
|
|
1936
|
+ #ifdef MICROSTEP128
|
|
1937
|
+ #define HAS_MICROSTEP128 1
|
|
1938
|
+ #endif
|
1649
|
1939
|
|
1650
|
1940
|
#endif // HAS_MICROSTEPS
|
1651
|
1941
|
|
|
@@ -1896,8 +2186,12 @@
|
1896
|
2186
|
#undef NO_FAN_SLOWING_IN_PID_TUNING
|
1897
|
2187
|
#endif
|
1898
|
2188
|
|
1899
|
|
-#define QUIET_PROBING (HAS_BED_PROBE && (EITHER(PROBING_HEATERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0))
|
1900
|
|
-#define HEATER_IDLE_HANDLER EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
|
|
2189
|
+#if HAS_BED_PROBE && (EITHER(PROBING_HEATERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)
|
|
2190
|
+ #define QUIET_PROBING 1
|
|
2191
|
+#endif
|
|
2192
|
+#if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
|
|
2193
|
+ #define HEATER_IDLE_HANDLER 1
|
|
2194
|
+#endif
|
1901
|
2195
|
|
1902
|
2196
|
#if ENABLED(ADVANCED_PAUSE_FEATURE) && !defined(FILAMENT_CHANGE_SLOW_LOAD_LENGTH)
|
1903
|
2197
|
#define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0
|