|
@@ -1425,8 +1425,14 @@
|
1425
|
1425
|
#ifndef STATUS_HOTEND6_WIDTH
|
1426
|
1426
|
#define STATUS_HOTEND6_WIDTH STATUS_HOTEND5_WIDTH
|
1427
|
1427
|
#endif
|
|
1428
|
+ #ifndef STATUS_HOTEND7_WIDTH
|
|
1429
|
+ #define STATUS_HOTEND7_WIDTH STATUS_HOTEND6_WIDTH
|
|
1430
|
+ #endif
|
|
1431
|
+ #ifndef STATUS_HOTEND8_WIDTH
|
|
1432
|
+ #define STATUS_HOTEND8_WIDTH STATUS_HOTEND7_WIDTH
|
|
1433
|
+ #endif
|
1428
|
1434
|
|
1429
|
|
- constexpr uint8_t status_hotend_width[HOTENDS] = ARRAY_N(HOTENDS, STATUS_HOTEND1_WIDTH, STATUS_HOTEND2_WIDTH, STATUS_HOTEND3_WIDTH, STATUS_HOTEND4_WIDTH, STATUS_HOTEND5_WIDTH, STATUS_HOTEND6_WIDTH);
|
|
1435
|
+ constexpr uint8_t status_hotend_width[HOTENDS] = ARRAY_N(HOTENDS, STATUS_HOTEND1_WIDTH, STATUS_HOTEND2_WIDTH, STATUS_HOTEND3_WIDTH, STATUS_HOTEND4_WIDTH, STATUS_HOTEND5_WIDTH, STATUS_HOTEND6_WIDTH, STATUS_HOTEND7_WIDTH, STATUS_HOTEND8_WIDTH);
|
1430
|
1436
|
#define STATUS_HOTEND_WIDTH(N) status_hotend_width[N]
|
1431
|
1437
|
|
1432
|
1438
|
#ifndef STATUS_HOTEND1_BYTEWIDTH
|
|
@@ -1447,8 +1453,14 @@
|
1447
|
1453
|
#ifndef STATUS_HOTEND6_BYTEWIDTH
|
1448
|
1454
|
#define STATUS_HOTEND6_BYTEWIDTH BW(STATUS_HOTEND6_WIDTH)
|
1449
|
1455
|
#endif
|
|
1456
|
+ #ifndef STATUS_HOTEND7_BYTEWIDTH
|
|
1457
|
+ #define STATUS_HOTEND7_BYTEWIDTH BW(STATUS_HOTEND7_WIDTH)
|
|
1458
|
+ #endif
|
|
1459
|
+ #ifndef STATUS_HOTEND8_BYTEWIDTH
|
|
1460
|
+ #define STATUS_HOTEND8_BYTEWIDTH BW(STATUS_HOTEND8_WIDTH)
|
|
1461
|
+ #endif
|
1450
|
1462
|
|
1451
|
|
- constexpr uint8_t status_hotend_bytewidth[HOTENDS] = ARRAY_N(HOTENDS, STATUS_HOTEND1_BYTEWIDTH, STATUS_HOTEND2_BYTEWIDTH, STATUS_HOTEND3_BYTEWIDTH, STATUS_HOTEND4_BYTEWIDTH, STATUS_HOTEND5_BYTEWIDTH, STATUS_HOTEND6_BYTEWIDTH);
|
|
1463
|
+ constexpr uint8_t status_hotend_bytewidth[HOTENDS] = ARRAY_N(HOTENDS, STATUS_HOTEND1_BYTEWIDTH, STATUS_HOTEND2_BYTEWIDTH, STATUS_HOTEND3_BYTEWIDTH, STATUS_HOTEND4_BYTEWIDTH, STATUS_HOTEND5_BYTEWIDTH, STATUS_HOTEND6_BYTEWIDTH, STATUS_HOTEND7_BYTEWIDTH, STATUS_HOTEND8_BYTEWIDTH);
|
1452
|
1464
|
#define STATUS_HOTEND_BYTEWIDTH(N) status_hotend_bytewidth[N]
|
1453
|
1465
|
|
1454
|
1466
|
#ifndef STATUS_HOTEND1_X
|
|
@@ -1471,8 +1483,14 @@
|
1471
|
1483
|
#ifndef STATUS_HOTEND6_X
|
1472
|
1484
|
#define STATUS_HOTEND6_X STATUS_HOTEND5_X + STATUS_HEATERS_XSPACE
|
1473
|
1485
|
#endif
|
|
1486
|
+ #ifndef STATUS_HOTEND7_X
|
|
1487
|
+ #define STATUS_HOTEND7_X STATUS_HOTEND6_X + STATUS_HEATERS_XSPACE
|
|
1488
|
+ #endif
|
|
1489
|
+ #ifndef STATUS_HOTEND8_X
|
|
1490
|
+ #define STATUS_HOTEND8_X STATUS_HOTEND7_X + STATUS_HEATERS_XSPACE
|
|
1491
|
+ #endif
|
1474
|
1492
|
|
1475
|
|
- constexpr uint8_t status_hotend_x[HOTENDS] = ARRAY_N(HOTENDS, STATUS_HOTEND1_X, STATUS_HOTEND2_X, STATUS_HOTEND3_X, STATUS_HOTEND4_X, STATUS_HOTEND5_X, STATUS_HOTEND6_X);
|
|
1493
|
+ constexpr uint8_t status_hotend_x[HOTENDS] = ARRAY_N(HOTENDS, STATUS_HOTEND1_X, STATUS_HOTEND2_X, STATUS_HOTEND3_X, STATUS_HOTEND4_X, STATUS_HOTEND5_X, STATUS_HOTEND6_X, STATUS_HOTEND7_X, STATUS_HOTEND8_X);
|
1476
|
1494
|
#define STATUS_HOTEND_X(N) status_hotend_x[N]
|
1477
|
1495
|
#elif HAS_MULTI_HOTEND
|
1478
|
1496
|
#define STATUS_HOTEND_X(N) ((N) ? STATUS_HOTEND2_X : STATUS_HOTEND1_X)
|
|
@@ -1497,7 +1515,13 @@
|
1497
|
1515
|
#ifndef STATUS_HOTEND6_TEXT_X
|
1498
|
1516
|
#define STATUS_HOTEND6_TEXT_X STATUS_HOTEND5_TEXT_X + STATUS_HEATERS_XSPACE
|
1499
|
1517
|
#endif
|
1500
|
|
- constexpr uint8_t status_hotend_text_x[] = ARRAY_N(HOTENDS, STATUS_HOTEND1_TEXT_X, STATUS_HOTEND2_TEXT_X, STATUS_HOTEND3_TEXT_X, STATUS_HOTEND4_TEXT_X, STATUS_HOTEND5_TEXT_X, STATUS_HOTEND6_TEXT_X);
|
|
1518
|
+ #ifndef STATUS_HOTEND7_TEXT_X
|
|
1519
|
+ #define STATUS_HOTEND7_TEXT_X STATUS_HOTEND6_TEXT_X + STATUS_HEATERS_XSPACE
|
|
1520
|
+ #endif
|
|
1521
|
+ #ifndef STATUS_HOTEND8_TEXT_X
|
|
1522
|
+ #define STATUS_HOTEND8_TEXT_X STATUS_HOTEND7_TEXT_X + STATUS_HEATERS_XSPACE
|
|
1523
|
+ #endif
|
|
1524
|
+ constexpr uint8_t status_hotend_text_x[] = ARRAY_N(HOTENDS, STATUS_HOTEND1_TEXT_X, STATUS_HOTEND2_TEXT_X, STATUS_HOTEND3_TEXT_X, STATUS_HOTEND4_TEXT_X, STATUS_HOTEND5_TEXT_X, STATUS_HOTEND6_TEXT_X, STATUS_HOTEND7_TEXT_X, STATUS_HOTEND8_TEXT_X);
|
1501
|
1525
|
#define STATUS_HOTEND_TEXT_X(N) status_hotend_text_x[N]
|
1502
|
1526
|
#else
|
1503
|
1527
|
#define STATUS_HOTEND_TEXT_X(N) (STATUS_HOTEND1_X + 6 + (N) * (STATUS_HEATERS_XSPACE))
|