|
@@ -59,40 +59,29 @@
|
59
|
59
|
STATIC_PAIR(MSG_INFO_PRINT_COUNT, i16tostr3left(stats.totalPrints), false); // Print Count: 999
|
60
|
60
|
STATIC_PAIR(MSG_INFO_COMPLETED_PRINTS, i16tostr3left(stats.finishedPrints), false); // Completed : 666
|
61
|
61
|
|
62
|
|
- duration_t elapsed = stats.printTime;
|
63
|
|
- elapsed.toString(buffer);
|
64
|
|
-
|
65
|
62
|
STATIC_PAIR_P(MSG_INFO_PRINT_TIME, "", false); // Total print Time:
|
66
|
|
- STATIC_ITEM("> ", false, false, buffer); // > 99y 364d 23h 59m 59s
|
|
63
|
+ STATIC_ITEM("> ", false, false, duration_t(stats.printTime).toString(buffer)); // > 99y 364d 23h 59m 59s
|
67
|
64
|
|
68
|
65
|
STATIC_PAIR_P(MSG_INFO_PRINT_LONGEST, "", false); // Longest job time:
|
69
|
|
- elapsed = stats.longestPrint;
|
70
|
|
- elapsed.toString(buffer);
|
71
|
|
- STATIC_ITEM("> ", false, false, buffer); // > 99y 364d 23h 59m 59s
|
|
66
|
+ STATIC_ITEM("> ", false, false, duration_t(stats.longestPrint).toString(buffer)); // > 99y 364d 23h 59m 59s
|
72
|
67
|
|
73
|
68
|
STATIC_PAIR_P(MSG_INFO_PRINT_FILAMENT, "", false); // Extruded total:
|
74
|
69
|
sprintf_P(buffer, PSTR("%ld.%im"), long(stats.filamentUsed / 1000), int16_t(stats.filamentUsed / 100) % 10);
|
75
|
70
|
STATIC_ITEM("> ", false, false, buffer); // > 125m
|
76
|
71
|
|
77
|
72
|
#if SERVICE_INTERVAL_1 > 0
|
78
|
|
- elapsed = stats.nextService1;
|
79
|
|
- elapsed.toString(buffer);
|
80
|
73
|
STATIC_ITEM(SERVICE_NAME_1 MSG_SERVICE_IN, false, false); // Service X in:
|
81
|
|
- STATIC_ITEM("> ", false, false, buffer); // > 7d 12h 11m 10s
|
|
74
|
+ STATIC_ITEM("> ", false, false, duration_t(stats.nextService1).toString(buffer)); // > 7d 12h 11m 10s
|
82
|
75
|
#endif
|
83
|
76
|
|
84
|
77
|
#if SERVICE_INTERVAL_2 > 0
|
85
|
|
- elapsed = stats.nextService2;
|
86
|
|
- elapsed.toString(buffer);
|
87
|
78
|
STATIC_ITEM(SERVICE_NAME_2 MSG_SERVICE_IN, false, false);
|
88
|
|
- STATIC_ITEM("> ", false, false, buffer);
|
|
79
|
+ STATIC_ITEM("> ", false, false, duration_t(stats.nextService2).toString(buffer));
|
89
|
80
|
#endif
|
90
|
81
|
|
91
|
82
|
#if SERVICE_INTERVAL_3 > 0
|
92
|
|
- elapsed = stats.nextService3;
|
93
|
|
- elapsed.toString(buffer);
|
94
|
83
|
STATIC_ITEM(SERVICE_NAME_3 MSG_SERVICE_IN, false, false);
|
95
|
|
- STATIC_ITEM("> ", false, false, buffer);
|
|
84
|
+ STATIC_ITEM("> ", false, false, duration_t(stats.nextService3).toString(buffer));
|
96
|
85
|
#endif
|
97
|
86
|
|
98
|
87
|
END_SCREEN();
|