浏览代码

Fix Print Stats appearance (#19348)

Haxk20 4 年前
父节点
当前提交
6f8282f01e
没有帐户链接到提交者的电子邮件
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5
    2
      Marlin/src/lcd/menu/menu_info.cpp

+ 5
- 2
Marlin/src/lcd/menu/menu_info.cpp 查看文件

34
   #include "game/game.h"
34
   #include "game/game.h"
35
 #endif
35
 #endif
36
 
36
 
37
+#define VALUE_ITEM(MSG, VALUE, STYL)    do{ char msg[21]; strcpy_P(msg, PSTR(": ")); strcpy(msg + 2, VALUE); STATIC_ITEM(MSG, STYL, msg); }while(0)
38
+#define VALUE_ITEM_P(MSG, PVALUE, STYL) do{ char msg[21]; strcpy_P(msg, PSTR(": ")); strcpy_P(msg + 2, PSTR(PVALUE)); STATIC_ITEM(MSG, STYL, msg); }while(0)
39
+
37
 #if ENABLED(PRINTCOUNTER)
40
 #if ENABLED(PRINTCOUNTER)
38
 
41
 
39
   #include "../../module/printcounter.h"
42
   #include "../../module/printcounter.h"
49
     char buffer[21];
52
     char buffer[21];
50
 
53
 
51
     START_SCREEN();                                                                         // 12345678901234567890
54
     START_SCREEN();                                                                         // 12345678901234567890
52
-    STATIC_ITEM(MSG_INFO_PRINT_COUNT,      SS_LEFT, i16tostr3left(stats.totalPrints));      // Print Count: 999
53
-    STATIC_ITEM(MSG_INFO_COMPLETED_PRINTS, SS_LEFT, i16tostr3left(stats.finishedPrints));   // Completed  : 666
55
+    VALUE_ITEM(MSG_INFO_PRINT_COUNT, i16tostr3left(stats.totalPrints), SS_LEFT);            // Print Count: 999
56
+    VALUE_ITEM(MSG_INFO_COMPLETED_PRINTS, i16tostr3left(stats.finishedPrints), SS_LEFT);    // Completed  : 666
54
 
57
 
55
     STATIC_ITEM(MSG_INFO_PRINT_TIME, SS_LEFT);                                              // Total print Time:
58
     STATIC_ITEM(MSG_INFO_PRINT_TIME, SS_LEFT);                                              // Total print Time:
56
     STATIC_ITEM_P(PSTR("> "), SS_LEFT, duration_t(stats.printTime).toString(buffer));       // > 99y 364d 23h 59m 59s
59
     STATIC_ITEM_P(PSTR("> "), SS_LEFT, duration_t(stats.printTime).toString(buffer));       // > 99y 364d 23h 59m 59s

正在加载...
取消
保存