Sfoglia il codice sorgente

M73 remaining time for MKS UI (#18326)

Anton Skorochod 5 anni fa
parent
commit
0b30de1b8e
Nessun account collegato all'indirizzo email del committer
1 ha cambiato i file con 9 aggiunte e 1 eliminazioni
  1. 9
    1
      Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp

+ 9
- 1
Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp Vedi File

39
 #if ENABLED(POWER_LOSS_RECOVERY)
39
 #if ENABLED(POWER_LOSS_RECOVERY)
40
   #include "../../../../feature/powerloss.h"
40
   #include "../../../../feature/powerloss.h"
41
 #endif
41
 #endif
42
+#if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
43
+  #include "../../../ultralcd.h"
44
+#endif
42
 
45
 
43
 static lv_obj_t * scr;
46
 static lv_obj_t * scr;
44
 static lv_obj_t * labelExt1, * labelExt2, * labelFan, * labelZpos, * labelTime;
47
 static lv_obj_t * labelExt1, * labelExt2, * labelFan, * labelZpos, * labelTime;
364
 
367
 
365
 void disp_print_time() {
368
 void disp_print_time() {
366
   memset(public_buf_l, 0, sizeof(public_buf_l));
369
   memset(public_buf_l, 0, sizeof(public_buf_l));
367
-  sprintf(public_buf_l, "%d%d:%d%d:%d%d", print_time.hours / 10, print_time.hours % 10, print_time.minutes / 10, print_time.minutes % 10, print_time.seconds / 10, print_time.seconds % 10);
370
+  #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
371
+    const uint32_t r = ui.get_remaining_time();
372
+    sprintf(public_buf_l, "%02d:%02d R", r / 3600, (r % 3600) / 60);
373
+  #else
374
+    sprintf(public_buf_l, "%d%d:%d%d:%d%d", print_time.hours / 10, print_time.hours % 10, print_time.minutes / 10, print_time.minutes % 10, print_time.seconds / 10, print_time.seconds % 10);
375
+  #endif
368
   lv_label_set_text(labelTime, public_buf_l);
376
   lv_label_set_text(labelTime, public_buf_l);
369
 }
377
 }
370
 
378
 

Loading…
Annulla
Salva