Browse Source

Merge pull request #4043 from AnHardt/save_delay

Introduce save_delay()
Scott Lahteine 9 years ago
parent
commit
948c467e16
1 changed files with 18 additions and 5 deletions
  1. 18
    5
      Marlin/ultralcd_implementation_hitachi_HD44780.h

+ 18
- 5
Marlin/ultralcd_implementation_hitachi_HD44780.h View File

443
     lcd.setCursor(indent, 2); lcd.print('\x02'); lcd_printPGM(PSTR( "------" ));  lcd.print('\x03');
443
     lcd.setCursor(indent, 2); lcd.print('\x02'); lcd_printPGM(PSTR( "------" ));  lcd.print('\x03');
444
   }
444
   }
445
 
445
 
446
+  void safe_delay(uint16_t del){
447
+    while (del > 50) {
448
+      del -= 50;
449
+      delay(50);
450
+      thermalManager.manage_heater();
451
+    }
452
+    delay(del);
453
+  }
454
+
446
   void bootscreen() {
455
   void bootscreen() {
447
     byte top_left[8] = {
456
     byte top_left[8] = {
448
       B00000,
457
       B00000,
498
       if (strlen(STRING) <= LCD_WIDTH) { \
507
       if (strlen(STRING) <= LCD_WIDTH) { \
499
         lcd.setCursor((LCD_WIDTH - lcd_strlen_P(PSTR(STRING))) / 2, 3); \
508
         lcd.setCursor((LCD_WIDTH - lcd_strlen_P(PSTR(STRING))) / 2, 3); \
500
         lcd_printPGM(PSTR(STRING)); \
509
         lcd_printPGM(PSTR(STRING)); \
501
-        delay(DELAY); \
510
+        safe_delay(DELAY); \
502
       } \
511
       } \
503
       else { \
512
       else { \
504
         lcd_scroll(0, 3, PSTR(STRING), LCD_WIDTH, DELAY); \
513
         lcd_scroll(0, 3, PSTR(STRING), LCD_WIDTH, DELAY); \
516
         #ifdef STRING_SPLASH_LINE2
525
         #ifdef STRING_SPLASH_LINE2
517
           CENTER_OR_SCROLL(STRING_SPLASH_LINE2, 2000);
526
           CENTER_OR_SCROLL(STRING_SPLASH_LINE2, 2000);
518
         #else
527
         #else
519
-          delay(2000);
528
+          safe_delay(2000);
520
         #endif
529
         #endif
521
       }
530
       }
522
       else {
531
       else {
541
       //
550
       //
542
       if (LCD_EXTRA_SPACE >= strlen(STRING_SPLASH_LINE2) + 1) {
551
       if (LCD_EXTRA_SPACE >= strlen(STRING_SPLASH_LINE2) + 1) {
543
         logo_lines(PSTR(" " STRING_SPLASH_LINE2));
552
         logo_lines(PSTR(" " STRING_SPLASH_LINE2));
544
-        delay(2000);
553
+        safe_delay(2000);
545
       }
554
       }
546
       else {
555
       else {
547
         logo_lines(PSTR(""));
556
         logo_lines(PSTR(""));
552
       // Show only the Marlin logo
561
       // Show only the Marlin logo
553
       //
562
       //
554
       logo_lines(PSTR(""));
563
       logo_lines(PSTR(""));
555
-      delay(2000);
564
+      safe_delay(2000);
556
     #endif
565
     #endif
557
-
566
+    lcd_set_custom_characters(
567
+    #if ENABLED(LCD_PROGRESS_BAR)
568
+      false
569
+    #endif
570
+    );
558
   }
571
   }
559
 
572
 
560
 #endif // SHOW_BOOTSCREEN
573
 #endif // SHOW_BOOTSCREEN

Loading…
Cancel
Save