Ver código fonte

Use LCD_MESSAGEPGM over lcd_setstatuspgm

Scott Lahteine 8 anos atrás
pai
commit
cbc2331187
1 arquivos alterados com 8 adições e 12 exclusões
  1. 8
    12
      Marlin/ubl_G29.cpp

+ 8
- 12
Marlin/ubl_G29.cpp Ver arquivo

@@ -674,7 +674,7 @@
674 674
           if (ELAPSED(millis(), nxt)) {
675 675
             SERIAL_PROTOCOLLNPGM("\nZ-Offset Adjustment Stopped.");
676 676
             do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
677
-            lcd_setstatuspgm(PSTR("Z-Offset Stopped"));
677
+            LCD_MESSAGEPGM("Z-Offset Stopped");
678 678
             restore_ubl_active_state_and_leave();
679 679
             goto LEAVE;
680 680
           }
@@ -693,7 +693,7 @@
693 693
 
694 694
     #if ENABLED(ULTRA_LCD)
695 695
       lcd_reset_alert_level();
696
-      lcd_setstatuspgm(PSTR(""));
696
+      LCD_MESSAGEPGM("");
697 697
       lcd_quick_feedback();
698 698
     #endif
699 699
 
@@ -997,7 +997,7 @@
997 997
 
998 998
   bool g29_parameter_parsing() {
999 999
     #if ENABLED(ULTRA_LCD)
1000
-      lcd_setstatuspgm(PSTR("Doing G29 UBL!"));
1000
+      LCD_MESSAGEPGM("Doing G29 UBL!");
1001 1001
       lcd_quick_feedback();
1002 1002
     #endif
1003 1003
 
@@ -1121,7 +1121,7 @@
1121 1121
     ubl_state_recursion_chk++;
1122 1122
     if (ubl_state_recursion_chk != 1) {
1123 1123
       SERIAL_ECHOLNPGM("save_ubl_active_state_and_disabled() called multiple times in a row.");
1124
-      lcd_setstatuspgm(PSTR("save_UBL_active() error"));
1124
+      LCD_MESSAGEPGM("save_UBL_active() error");
1125 1125
       lcd_quick_feedback();
1126 1126
       return;
1127 1127
     }
@@ -1132,7 +1132,7 @@
1132 1132
   void restore_ubl_active_state_and_leave() {
1133 1133
     if (--ubl_state_recursion_chk) {
1134 1134
       SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");
1135
-      lcd_setstatuspgm(PSTR("restore_UBL_active() error"));
1135
+      LCD_MESSAGEPGM("restore_UBL_active() error");
1136 1136
       lcd_quick_feedback();
1137 1137
       return;
1138 1138
     }
@@ -1371,9 +1371,7 @@
1371 1371
     save_ubl_active_state_and_disable();
1372 1372
     memset(not_done, 0xFF, sizeof(not_done));
1373 1373
 
1374
-    #if ENABLED(ULTRA_LCD)
1375
-      lcd_setstatuspgm(PSTR("Fine Tuning Mesh"));
1376
-    #endif
1374
+    LCD_MESSAGEPGM("Fine Tuning Mesh");
1377 1375
 
1378 1376
     do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
1379 1377
     do_blocking_move_to_xy(lx, ly);
@@ -1431,7 +1429,7 @@
1431 1429
           lcd_return_to_status();
1432 1430
           //SERIAL_PROTOCOLLNPGM("\nFine Tuning of Mesh Stopped.");
1433 1431
           do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
1434
-          lcd_setstatuspgm(PSTR("Mesh Editing Stopped"));
1432
+          LCD_MESSAGEPGM("Mesh Editing Stopped");
1435 1433
 
1436 1434
           while (ubl_lcd_clicked()) idle();
1437 1435
 
@@ -1458,9 +1456,7 @@
1458 1456
 
1459 1457
     do_blocking_move_to_xy(lx, ly);
1460 1458
 
1461
-    #if ENABLED(ULTRA_LCD)
1462
-      lcd_setstatuspgm(PSTR("Done Editing Mesh"));
1463
-    #endif
1459
+    LCD_MESSAGEPGM("Done Editing Mesh");
1464 1460
     SERIAL_ECHOLNPGM("Done Editing Mesh");
1465 1461
   }
1466 1462
 

Carregando…
Cancelar
Salvar