Browse Source

Print a message when printing is aborted

Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
Scott Lahteine 9 years ago
parent
commit
3ebfd29312
2 changed files with 15 additions and 0 deletions
  1. 13
    0
      Marlin/language.h
  2. 2
    0
      Marlin/ultralcd.cpp

+ 13
- 0
Marlin/language.h View File

243
 	#define MSG_DWELL "Sleep..."
243
 	#define MSG_DWELL "Sleep..."
244
 	#define MSG_USERWAIT "Wait for user..."
244
 	#define MSG_USERWAIT "Wait for user..."
245
 	#define MSG_RESUMING "Resuming print"
245
 	#define MSG_RESUMING "Resuming print"
246
+	#define MSG_PRINT_ABORTED "Print aborted"
246
 	#define MSG_NO_MOVE "No move."
247
 	#define MSG_NO_MOVE "No move."
247
 	#define MSG_KILLED "KILLED. "
248
 	#define MSG_KILLED "KILLED. "
248
 	#define MSG_STOPPED "STOPPED. "
249
 	#define MSG_STOPPED "STOPPED. "
369
 	#define MSG_DWELL "Uspij..."
370
 	#define MSG_DWELL "Uspij..."
370
 	#define MSG_USERWAIT "Oczekiwanie..."
371
 	#define MSG_USERWAIT "Oczekiwanie..."
371
 	#define MSG_RESUMING "Wznawianie druku"
372
 	#define MSG_RESUMING "Wznawianie druku"
373
+	#define MSG_PRINT_ABORTED "Print aborted"
372
 	#define MSG_NO_MOVE "Brak ruchu"
374
 	#define MSG_NO_MOVE "Brak ruchu"
373
 	#define MSG_KILLED "Ubity. "
375
 	#define MSG_KILLED "Ubity. "
374
 	#define MSG_STOPPED "Zatrzymany. "
376
 	#define MSG_STOPPED "Zatrzymany. "
497
 	#define MSG_DWELL "Repos..."
499
 	#define MSG_DWELL "Repos..."
498
 	#define MSG_USERWAIT "Atten. de l'util."
500
 	#define MSG_USERWAIT "Atten. de l'util."
499
 	#define MSG_RESUMING "Repri. de l'impr."
501
 	#define MSG_RESUMING "Repri. de l'impr."
502
+	#define MSG_PRINT_ABORTED "Print aborted"
500
 	#define MSG_NO_MOVE "Aucun mouvement."
503
 	#define MSG_NO_MOVE "Aucun mouvement."
501
 	#define MSG_KILLED "MORT."
504
 	#define MSG_KILLED "MORT."
502
 	#define MSG_STOPPED "STOPPE."
505
 	#define MSG_STOPPED "STOPPE."
626
 	#define MSG_DWELL            "Warten..."
629
 	#define MSG_DWELL            "Warten..."
627
 	#define MSG_USERWAIT         "Warte auf Nutzer"
630
 	#define MSG_USERWAIT         "Warte auf Nutzer"
628
 	#define MSG_RESUMING         "Druck fortsetzung"
631
 	#define MSG_RESUMING         "Druck fortsetzung"
632
+	#define MSG_PRINT_ABORTED    "Print aborted"
629
 	#define MSG_NO_MOVE          "Kein Zug."
633
 	#define MSG_NO_MOVE          "Kein Zug."
630
 	#define MSG_KILLED           "KILLED"
634
 	#define MSG_KILLED           "KILLED"
631
 	#define MSG_STOPPED          "GESTOPPT"
635
 	#define MSG_STOPPED          "GESTOPPT"
752
 	#define MSG_DWELL "Reposo..."
756
 	#define MSG_DWELL "Reposo..."
753
 	#define MSG_USERWAIT "Esperando ordenes"
757
 	#define MSG_USERWAIT "Esperando ordenes"
754
 	#define MSG_RESUMING "Resumiendo impre."
758
 	#define MSG_RESUMING "Resumiendo impre."
759
+	#define MSG_PRINT_ABORTED "Print aborted"
755
 	#define MSG_NO_MOVE "Sin movimiento"
760
 	#define MSG_NO_MOVE "Sin movimiento"
756
 	#define MSG_KILLED "PARADA DE EMERG."
761
 	#define MSG_KILLED "PARADA DE EMERG."
757
 	#define MSG_STOPPED "PARADA"
762
 	#define MSG_STOPPED "PARADA"
887
 	#define MSG_DWELL							"Сон..."
892
 	#define MSG_DWELL							"Сон..."
888
 	#define MSG_USERWAIT  						"Ожиданиие"
893
 	#define MSG_USERWAIT  						"Ожиданиие"
889
 	#define MSG_RESUMING 						"Resuming print"
894
 	#define MSG_RESUMING 						"Resuming print"
895
+	#define MSG_PRINT_ABORTED					"Print aborted"
890
 	#define MSG_NO_MOVE							"Нет движения."
896
 	#define MSG_NO_MOVE							"Нет движения."
891
 	#define MSG_KILLED							"УБИТО."
897
 	#define MSG_KILLED							"УБИТО."
892
 	#define MSG_STOPPED							"ОСТАНОВЛЕНО."
898
 	#define MSG_STOPPED							"ОСТАНОВЛЕНО."
1013
 	#define MSG_DWELL                "Sospensione..."
1019
 	#define MSG_DWELL                "Sospensione..."
1014
 	#define MSG_USERWAIT             "Attendi Utente..."
1020
 	#define MSG_USERWAIT             "Attendi Utente..."
1015
 	#define MSG_RESUMING             "Riprendi Stampa"
1021
 	#define MSG_RESUMING             "Riprendi Stampa"
1022
+	#define MSG_PRINT_ABORTED        "Print aborted"
1016
 	#define MSG_NO_MOVE              "Nessun Movimento."
1023
 	#define MSG_NO_MOVE              "Nessun Movimento."
1017
 	#define MSG_KILLED               "UCCISO. "
1024
 	#define MSG_KILLED               "UCCISO. "
1018
 	#define MSG_STOPPED              "ARRESTATO. "
1025
 	#define MSG_STOPPED              "ARRESTATO. "
1144
 	#define MSG_DWELL "Repouso..."
1151
 	#define MSG_DWELL "Repouso..."
1145
 	#define MSG_USERWAIT "Esperando ordem"
1152
 	#define MSG_USERWAIT "Esperando ordem"
1146
 	#define MSG_RESUMING "Resuming print"
1153
 	#define MSG_RESUMING "Resuming print"
1154
+	#define MSG_PRINT_ABORTED "Print aborted"
1147
 	#define MSG_NO_MOVE "Sem movimento"
1155
 	#define MSG_NO_MOVE "Sem movimento"
1148
 	#define MSG_KILLED "PARADA DE EMERG."
1156
 	#define MSG_KILLED "PARADA DE EMERG."
1149
 	#define MSG_STOPPED "PARADA. "
1157
 	#define MSG_STOPPED "PARADA. "
1272
 	#define MSG_DWELL "Nukkumassa..."
1280
 	#define MSG_DWELL "Nukkumassa..."
1273
 	#define MSG_USERWAIT "Odotet. valintaa"
1281
 	#define MSG_USERWAIT "Odotet. valintaa"
1274
 	#define MSG_RESUMING "Jatke. tulostusta"
1282
 	#define MSG_RESUMING "Jatke. tulostusta"
1283
+	#define MSG_PRINT_ABORTED "Print aborted"
1275
 	#define MSG_NO_MOVE "Ei liiketta."
1284
 	#define MSG_NO_MOVE "Ei liiketta."
1276
 	#define MSG_KILLED "KILLED. "
1285
 	#define MSG_KILLED "KILLED. "
1277
 	#define MSG_STOPPED "STOPPED. "
1286
 	#define MSG_STOPPED "STOPPED. "
1395
 	#define MSG_DWELL "Reposo..."
1404
 	#define MSG_DWELL "Reposo..."
1396
 	#define MSG_USERWAIT "Asperan. ordines"
1405
 	#define MSG_USERWAIT "Asperan. ordines"
1397
 	#define MSG_RESUMING "Contin. impresion"
1406
 	#define MSG_RESUMING "Contin. impresion"
1407
+	#define MSG_PRINT_ABORTED "Print aborted"
1398
 	#define MSG_NO_MOVE "Sin movimiento"
1408
 	#define MSG_NO_MOVE "Sin movimiento"
1399
 	#define MSG_KILLED "ATURADA D'EMERCH."
1409
 	#define MSG_KILLED "ATURADA D'EMERCH."
1400
 	#define MSG_STOPPED "ATURADA."
1410
 	#define MSG_STOPPED "ATURADA."
1529
 	#define MSG_DWELL "Slapen..."
1539
 	#define MSG_DWELL "Slapen..."
1530
 	#define MSG_USERWAIT "Wachten..."
1540
 	#define MSG_USERWAIT "Wachten..."
1531
 	#define MSG_RESUMING "Print hervatten"
1541
 	#define MSG_RESUMING "Print hervatten"
1542
+	#define MSG_PRINT_ABORTED "Print aborted"
1532
 	#define MSG_NO_MOVE "Geen beweging."
1543
 	#define MSG_NO_MOVE "Geen beweging."
1533
 	#define MSG_KILLED "AFGEBROKEN. "
1544
 	#define MSG_KILLED "AFGEBROKEN. "
1534
 	#define MSG_STOPPED "GESTOPT. "
1545
 	#define MSG_STOPPED "GESTOPT. "
1654
 	#define MSG_DWELL "Repos..."
1665
 	#define MSG_DWELL "Repos..."
1655
 	#define MSG_USERWAIT "Esperant usuari.."
1666
 	#define MSG_USERWAIT "Esperant usuari.."
1656
 	#define MSG_RESUMING "Reprenent imp."
1667
 	#define MSG_RESUMING "Reprenent imp."
1668
+	#define MSG_PRINT_ABORTED "Print aborted"
1657
 	#define MSG_NO_MOVE "Sense moviment."
1669
 	#define MSG_NO_MOVE "Sense moviment."
1658
 	#define MSG_KILLED "PARADA DE EMERG. "
1670
 	#define MSG_KILLED "PARADA DE EMERG. "
1659
 	#define MSG_STOPPED "ATURAT. "
1671
 	#define MSG_STOPPED "ATURAT. "
1778
 	#define MSG_DWELL "Lo egin..."
1790
 	#define MSG_DWELL "Lo egin..."
1779
 	#define MSG_USERWAIT "Aginduak zain..."
1791
 	#define MSG_USERWAIT "Aginduak zain..."
1780
 	#define MSG_RESUMING "Jarraitzen inpri."
1792
 	#define MSG_RESUMING "Jarraitzen inpri."
1793
+	#define MSG_PRINT_ABORTED "Print aborted"
1781
 	#define MSG_NO_MOVE "Mugimendu gabe"
1794
 	#define MSG_NO_MOVE "Mugimendu gabe"
1782
 	#define MSG_KILLED "LARRIALDI GELDIA"
1795
 	#define MSG_KILLED "LARRIALDI GELDIA"
1783
 	#define MSG_STOPPED "GELDITUTA. "
1796
 	#define MSG_STOPPED "GELDITUTA. "

+ 2
- 0
Marlin/ultralcd.cpp View File

279
     autotempShutdown();
279
     autotempShutdown();
280
 
280
 
281
 	cancel_heatup = true;
281
 	cancel_heatup = true;
282
+
283
+	lcd_setstatus(MSG_PRINT_ABORTED);
282
 }
284
 }
283
 
285
 
284
 /* Menu implementation */
286
 /* Menu implementation */

Loading…
Cancel
Save