浏览代码

8 Extruders + Graphical LCD fix (#18079)

Jason Smith 5 年前
父节点
当前提交
8c0c8e4046
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 29 次插入4 次删除
  1. 28
    4
      Marlin/src/lcd/dogm/dogm_Statusscreen.h
  2. 1
    0
      buildroot/share/tests/BIGTREE_GTR_V1_0-tests

+ 28
- 4
Marlin/src/lcd/dogm/dogm_Statusscreen.h 查看文件

1425
   #ifndef STATUS_HOTEND6_WIDTH
1425
   #ifndef STATUS_HOTEND6_WIDTH
1426
     #define STATUS_HOTEND6_WIDTH STATUS_HOTEND5_WIDTH
1426
     #define STATUS_HOTEND6_WIDTH STATUS_HOTEND5_WIDTH
1427
   #endif
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
   #define STATUS_HOTEND_WIDTH(N) status_hotend_width[N]
1436
   #define STATUS_HOTEND_WIDTH(N) status_hotend_width[N]
1431
 
1437
 
1432
   #ifndef STATUS_HOTEND1_BYTEWIDTH
1438
   #ifndef STATUS_HOTEND1_BYTEWIDTH
1447
   #ifndef STATUS_HOTEND6_BYTEWIDTH
1453
   #ifndef STATUS_HOTEND6_BYTEWIDTH
1448
     #define STATUS_HOTEND6_BYTEWIDTH BW(STATUS_HOTEND6_WIDTH)
1454
     #define STATUS_HOTEND6_BYTEWIDTH BW(STATUS_HOTEND6_WIDTH)
1449
   #endif
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
   #define STATUS_HOTEND_BYTEWIDTH(N) status_hotend_bytewidth[N]
1464
   #define STATUS_HOTEND_BYTEWIDTH(N) status_hotend_bytewidth[N]
1453
 
1465
 
1454
   #ifndef STATUS_HOTEND1_X
1466
   #ifndef STATUS_HOTEND1_X
1471
     #ifndef STATUS_HOTEND6_X
1483
     #ifndef STATUS_HOTEND6_X
1472
       #define STATUS_HOTEND6_X STATUS_HOTEND5_X + STATUS_HEATERS_XSPACE
1484
       #define STATUS_HOTEND6_X STATUS_HOTEND5_X + STATUS_HEATERS_XSPACE
1473
     #endif
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
     #define STATUS_HOTEND_X(N) status_hotend_x[N]
1494
     #define STATUS_HOTEND_X(N) status_hotend_x[N]
1477
   #elif HAS_MULTI_HOTEND
1495
   #elif HAS_MULTI_HOTEND
1478
     #define STATUS_HOTEND_X(N) ((N) ? STATUS_HOTEND2_X : STATUS_HOTEND1_X)
1496
     #define STATUS_HOTEND_X(N) ((N) ? STATUS_HOTEND2_X : STATUS_HOTEND1_X)
1497
       #ifndef STATUS_HOTEND6_TEXT_X
1515
       #ifndef STATUS_HOTEND6_TEXT_X
1498
         #define STATUS_HOTEND6_TEXT_X STATUS_HOTEND5_TEXT_X + STATUS_HEATERS_XSPACE
1516
         #define STATUS_HOTEND6_TEXT_X STATUS_HOTEND5_TEXT_X + STATUS_HEATERS_XSPACE
1499
       #endif
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
       #define STATUS_HOTEND_TEXT_X(N) status_hotend_text_x[N]
1525
       #define STATUS_HOTEND_TEXT_X(N) status_hotend_text_x[N]
1502
     #else
1526
     #else
1503
       #define STATUS_HOTEND_TEXT_X(N) (STATUS_HOTEND1_X + 6 + (N) * (STATUS_HEATERS_XSPACE))
1527
       #define STATUS_HOTEND_TEXT_X(N) (STATUS_HOTEND1_X + 6 + (N) * (STATUS_HEATERS_XSPACE))

+ 1
- 0
buildroot/share/tests/BIGTREE_GTR_V1_0-tests 查看文件

23
 opt_set E2_AUTO_FAN_PIN PC12
23
 opt_set E2_AUTO_FAN_PIN PC12
24
 opt_set X_DRIVER_TYPE TMC2208
24
 opt_set X_DRIVER_TYPE TMC2208
25
 opt_set Y_DRIVER_TYPE TMC2130
25
 opt_set Y_DRIVER_TYPE TMC2130
26
+opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
26
 exec_test $1 $2 "BigTreeTech GTR 8 Extruders with Auto-Fan and Mixed TMC Drivers"
27
 exec_test $1 $2 "BigTreeTech GTR 8 Extruders with Auto-Fan and Mixed TMC Drivers"
27
 
28
 
28
 restore_configs
29
 restore_configs

正在加载...
取消
保存