Pārlūkot izejas kodu

Merge pull request #1163 from thinkyhead/lcd_abort_message

LCD "Abort" Message
Bo Herrmannsen 10 gadus atpakaļ
vecāks
revīzija
e83cfc0a62
2 mainītis faili ar 15 papildinājumiem un 0 dzēšanām
  1. 13
    0
      Marlin/language.h
  2. 2
    0
      Marlin/ultralcd.cpp

+ 13
- 0
Marlin/language.h Parādīt failu

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

+ 2
- 0
Marlin/ultralcd.cpp Parādīt failu

@@ -288,6 +288,8 @@ static void lcd_sdcard_stop()
288 288
     autotempShutdown();
289 289
 
290 290
 	cancel_heatup = true;
291
+
292
+	lcd_setstatus(MSG_PRINT_ABORTED);
291 293
 }
292 294
 
293 295
 /* Menu implementation */

Notiek ielāde…
Atcelt
Saglabāt