Browse Source

Fixed advanced pause messages (#12353)

Roman Moravčík 6 years ago
parent
commit
34ea458667
1 changed files with 24 additions and 24 deletions
  1. 24
    24
      Marlin/src/lcd/menu/menu_filament.cpp

+ 24
- 24
Marlin/src/lcd/menu/menu_filament.cpp View File

370
 }
370
 }
371
 
371
 
372
 void lcd_advanced_pause_init_message() {
372
 void lcd_advanced_pause_init_message() {
373
-  _lcd_advanced_pause_message(MSG_FILAMENT_CHANGE_INIT_1
373
+  _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_INIT_1)
374
     #ifdef MSG_FILAMENT_CHANGE_INIT_2
374
     #ifdef MSG_FILAMENT_CHANGE_INIT_2
375
-      , MSG_FILAMENT_CHANGE_INIT_2
375
+      , PSTR(MSG_FILAMENT_CHANGE_INIT_2)
376
       #ifdef MSG_FILAMENT_CHANGE_INIT_3
376
       #ifdef MSG_FILAMENT_CHANGE_INIT_3
377
-        , MSG_FILAMENT_CHANGE_INIT_3
377
+        , PSTR(MSG_FILAMENT_CHANGE_INIT_3)
378
       #endif
378
       #endif
379
     #endif
379
     #endif
380
   );
380
   );
381
 }
381
 }
382
 
382
 
383
 void lcd_advanced_pause_unload_message() {
383
 void lcd_advanced_pause_unload_message() {
384
-  _lcd_advanced_pause_message(MSG_FILAMENT_CHANGE_UNLOAD_1
384
+  _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_UNLOAD_1)
385
     #ifdef MSG_FILAMENT_CHANGE_UNLOAD_2
385
     #ifdef MSG_FILAMENT_CHANGE_UNLOAD_2
386
-      , MSG_FILAMENT_CHANGE_UNLOAD_2
386
+      , PSTR(MSG_FILAMENT_CHANGE_UNLOAD_2)
387
       #ifdef MSG_FILAMENT_CHANGE_UNLOAD_3
387
       #ifdef MSG_FILAMENT_CHANGE_UNLOAD_3
388
-        , MSG_FILAMENT_CHANGE_UNLOAD_3
388
+        , PSTR(MSG_FILAMENT_CHANGE_UNLOAD_3)
389
       #endif
389
       #endif
390
     #endif
390
     #endif
391
   );
391
   );
392
 }
392
 }
393
 
393
 
394
 void lcd_advanced_pause_heating_message() {
394
 void lcd_advanced_pause_heating_message() {
395
-  _lcd_advanced_pause_message(MSG_FILAMENT_CHANGE_HEATING_1
395
+  _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_HEATING_1)
396
     #ifdef MSG_FILAMENT_CHANGE_HEATING_2
396
     #ifdef MSG_FILAMENT_CHANGE_HEATING_2
397
-      , MSG_FILAMENT_CHANGE_HEATING_2
397
+      , PSTR(MSG_FILAMENT_CHANGE_HEATING_2)
398
       #ifdef MSG_FILAMENT_CHANGE_HEATING_3
398
       #ifdef MSG_FILAMENT_CHANGE_HEATING_3
399
-        , MSG_FILAMENT_CHANGE_HEATING_3
399
+        , PSTR(MSG_FILAMENT_CHANGE_HEATING_3)
400
       #endif
400
       #endif
401
     #endif
401
     #endif
402
   );
402
   );
403
 }
403
 }
404
 
404
 
405
 void lcd_advanced_pause_heat_message() {
405
 void lcd_advanced_pause_heat_message() {
406
-  _lcd_advanced_pause_message(MSG_FILAMENT_CHANGE_HEAT_1
406
+  _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_HEAT_1)
407
     #ifdef MSG_FILAMENT_CHANGE_HEAT_2
407
     #ifdef MSG_FILAMENT_CHANGE_HEAT_2
408
-      , MSG_FILAMENT_CHANGE_HEAT_2
408
+      , PSTR(MSG_FILAMENT_CHANGE_HEAT_2)
409
       #ifdef MSG_FILAMENT_CHANGE_HEAT_3
409
       #ifdef MSG_FILAMENT_CHANGE_HEAT_3
410
-        , MSG_FILAMENT_CHANGE_HEAT_3
410
+        , PSTR(MSG_FILAMENT_CHANGE_HEAT_3)
411
       #endif
411
       #endif
412
     #endif
412
     #endif
413
   );
413
   );
414
 }
414
 }
415
 
415
 
416
 void lcd_advanced_pause_insert_message() {
416
 void lcd_advanced_pause_insert_message() {
417
-  _lcd_advanced_pause_message(MSG_FILAMENT_CHANGE_INSERT_1
417
+  _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_INSERT_1)
418
     #ifdef MSG_FILAMENT_CHANGE_INSERT_2
418
     #ifdef MSG_FILAMENT_CHANGE_INSERT_2
419
-      , MSG_FILAMENT_CHANGE_INSERT_2
419
+      , PSTR(MSG_FILAMENT_CHANGE_INSERT_2)
420
       #ifdef MSG_FILAMENT_CHANGE_INSERT_3
420
       #ifdef MSG_FILAMENT_CHANGE_INSERT_3
421
-        , MSG_FILAMENT_CHANGE_INSERT_3
421
+        , PSTR(MSG_FILAMENT_CHANGE_INSERT_3)
422
       #endif
422
       #endif
423
     #endif
423
     #endif
424
   );
424
   );
425
 }
425
 }
426
 
426
 
427
 void lcd_advanced_pause_load_message() {
427
 void lcd_advanced_pause_load_message() {
428
-  _lcd_advanced_pause_message(MSG_FILAMENT_CHANGE_LOAD_1
428
+  _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_LOAD_1)
429
     #ifdef MSG_FILAMENT_CHANGE_LOAD_2
429
     #ifdef MSG_FILAMENT_CHANGE_LOAD_2
430
-      , MSG_FILAMENT_CHANGE_LOAD_2
430
+      , PSTR(MSG_FILAMENT_CHANGE_LOAD_2)
431
       #ifdef MSG_FILAMENT_CHANGE_LOAD_3
431
       #ifdef MSG_FILAMENT_CHANGE_LOAD_3
432
-        , MSG_FILAMENT_CHANGE_LOAD_3
432
+        , PSTR(MSG_FILAMENT_CHANGE_LOAD_3)
433
       #endif
433
       #endif
434
     #endif
434
     #endif
435
   );
435
   );
436
 }
436
 }
437
 
437
 
438
 void lcd_advanced_pause_waiting_message() {
438
 void lcd_advanced_pause_waiting_message() {
439
-  _lcd_advanced_pause_message(MSG_ADVANCED_PAUSE_WAITING_1
439
+  _lcd_advanced_pause_message(PSTR(MSG_ADVANCED_PAUSE_WAITING_1)
440
     #ifdef MSG_ADVANCED_PAUSE_WAITING_2
440
     #ifdef MSG_ADVANCED_PAUSE_WAITING_2
441
-      , MSG_ADVANCED_PAUSE_WAITING_2
441
+      , PSTR(MSG_ADVANCED_PAUSE_WAITING_2)
442
       #ifdef MSG_ADVANCED_PAUSE_WAITING_3
442
       #ifdef MSG_ADVANCED_PAUSE_WAITING_3
443
-        , MSG_ADVANCED_PAUSE_WAITING_3
443
+        , PSTR(MSG_ADVANCED_PAUSE_WAITING_3)
444
       #endif
444
       #endif
445
     #endif
445
     #endif
446
   );
446
   );
447
 }
447
 }
448
 
448
 
449
 void lcd_advanced_pause_resume_message() {
449
 void lcd_advanced_pause_resume_message() {
450
-  _lcd_advanced_pause_message(MSG_FILAMENT_CHANGE_RESUME_1
450
+  _lcd_advanced_pause_message(PSTR(MSG_FILAMENT_CHANGE_RESUME_1)
451
     #ifdef MSG_FILAMENT_CHANGE_RESUME_2
451
     #ifdef MSG_FILAMENT_CHANGE_RESUME_2
452
-      , MSG_FILAMENT_CHANGE_RESUME_2
452
+      , PSTR(MSG_FILAMENT_CHANGE_RESUME_2)
453
       #ifdef MSG_FILAMENT_CHANGE_RESUME_3
453
       #ifdef MSG_FILAMENT_CHANGE_RESUME_3
454
-        , MSG_FILAMENT_CHANGE_RESUME_3
454
+        , PSTR(MSG_FILAMENT_CHANGE_RESUME_3)
455
       #endif
455
       #endif
456
     #endif
456
     #endif
457
   );
457
   );

Loading…
Cancel
Save