Quellcode durchsuchen

Shorter labels for Print Stats info

Scott Lahteine vor 8 Jahren
Ursprung
Commit
ef8980bfa0
2 geänderte Dateien mit 24 neuen und 11 gelöschten Zeilen
  1. 21
    8
      Marlin/language_en.h
  2. 3
    3
      Marlin/ultralcd.cpp

+ 21
- 8
Marlin/language_en.h Datei anzeigen

@@ -544,14 +544,27 @@
544 544
 #ifndef MSG_INFO_PROTOCOL
545 545
   #define MSG_INFO_PROTOCOL                   "Protocol"
546 546
 #endif
547
-#ifndef MSG_INFO_TOTAL_PRINTS
548
-  #define MSG_INFO_TOTAL_PRINTS               "Total Prints"
549
-#endif
550
-#ifndef MSG_INFO_FINISHED_PRINTS
551
-  #define MSG_INFO_FINISHED_PRINTS            "Finished Prints"
552
-#endif
553
-#ifndef MSG_INFO_PRINT_TIME
554
-  #define MSG_INFO_PRINT_TIME                 "Total Print Time"
547
+
548
+#if LCD_WIDTH > 19
549
+  #ifndef MSG_INFO_PRINT_COUNT
550
+    #define MSG_INFO_PRINT_COUNT              "Print Count "
551
+  #endif
552
+  #ifndef MSG_INFO_FINISHED_PRINTS
553
+    #define MSG_INFO_FINISHED_PRINTS          "Finished    "
554
+  #endif
555
+  #ifndef MSG_INFO_PRINT_TIME
556
+    #define MSG_INFO_PRINT_TIME               "Total Time  "
557
+  #endif
558
+#else
559
+  #ifndef MSG_INFO_PRINT_COUNT
560
+    #define MSG_INFO_PRINT_COUNT              "Prints   "
561
+  #endif
562
+  #ifndef MSG_INFO_FINISHED_PRINTS
563
+    #define MSG_INFO_FINISHED_PRINTS          "Finished "
564
+  #endif
565
+  #ifndef MSG_INFO_PRINT_TIME
566
+    #define MSG_INFO_PRINT_TIME               "Duration "
567
+  #endif
555 568
 #endif
556 569
 #ifndef MSG_INFO_MIN_TEMP
557 570
   #define MSG_INFO_MIN_TEMP                   "Min Temp"

+ 3
- 3
Marlin/ultralcd.cpp Datei anzeigen

@@ -1950,9 +1950,9 @@ static void lcd_status_screen() {
1950 1950
 
1951 1951
         if (LCD_CLICKED) lcd_goto_previous_menu(true);
1952 1952
         START_SCREEN();
1953
-        STATIC_ITEM(MSG_INFO_TOTAL_PRINTS ": ", itostr3left(stats.totalPrints));       // Total Prints: 999
1954
-        STATIC_ITEM(MSG_INFO_FINISHED_PRINTS ": ", itostr3left(stats.finishedPrints)); // Finished Prints: 666
1955
-        STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", printTime);                              // Total Print Time: 123456
1953
+        STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", itostr3left(stats.totalPrints));        // Print Count : 999
1954
+        STATIC_ITEM(MSG_INFO_FINISHED_PRINTS ": ", itostr3left(stats.finishedPrints)); // Finished    : 666
1955
+        STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", printTime);                              // Total Time  : 12:34
1956 1956
         END_SCREEN();
1957 1957
       }
1958 1958
     #endif // PRINTCOUNTER

Laden…
Abbrechen
Speichern