MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #1163 from thinkyhead/lcd_abort_message

Browse Source 
LCD "Abort" Message
This commit is contained in:
Bo Herrmannsen 2014-12-17 21:30:19 +01:00
commit e83cfc0a62
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/language.h
View File

@ -243,6 +243,7 @@
#define MSG_DWELL "Sleep..." #define MSG_DWELL "Sleep..."
#define MSG_USERWAIT "Wait for user..." #define MSG_USERWAIT "Wait for user..."
#define MSG_RESUMING "Resuming print" #define MSG_RESUMING "Resuming print"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "No move." #define MSG_NO_MOVE "No move."
#define MSG_KILLED "KILLED. " #define MSG_KILLED "KILLED. "
#define MSG_STOPPED "STOPPED. " #define MSG_STOPPED "STOPPED. "
@ -369,6 +370,7 @@
#define MSG_DWELL "Uspij..." #define MSG_DWELL "Uspij..."
#define MSG_USERWAIT "Oczekiwanie..." #define MSG_USERWAIT "Oczekiwanie..."
#define MSG_RESUMING "Wznawianie druku" #define MSG_RESUMING "Wznawianie druku"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Brak ruchu" #define MSG_NO_MOVE "Brak ruchu"
#define MSG_KILLED "Ubity. " #define MSG_KILLED "Ubity. "
#define MSG_STOPPED "Zatrzymany. " #define MSG_STOPPED "Zatrzymany. "
@ -497,6 +499,7 @@
#define MSG_DWELL "Repos..." #define MSG_DWELL "Repos..."
#define MSG_USERWAIT "Atten. de l'util." #define MSG_USERWAIT "Atten. de l'util."
#define MSG_RESUMING "Repri. de l'impr." #define MSG_RESUMING "Repri. de l'impr."
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Aucun mouvement." #define MSG_NO_MOVE "Aucun mouvement."
#define MSG_KILLED "MORT." #define MSG_KILLED "MORT."
#define MSG_STOPPED "STOPPE." #define MSG_STOPPED "STOPPE."
@ -626,6 +629,7 @@
#define MSG_DWELL "Warten..." #define MSG_DWELL "Warten..."
#define MSG_USERWAIT "Warte auf Nutzer" #define MSG_USERWAIT "Warte auf Nutzer"
#define MSG_RESUMING "Druck fortsetzung" #define MSG_RESUMING "Druck fortsetzung"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Kein Zug." #define MSG_NO_MOVE "Kein Zug."
#define MSG_KILLED "KILLED" #define MSG_KILLED "KILLED"
#define MSG_STOPPED "GESTOPPT" #define MSG_STOPPED "GESTOPPT"
@ -752,6 +756,7 @@
#define MSG_DWELL "Reposo..." #define MSG_DWELL "Reposo..."
#define MSG_USERWAIT "Esperando ordenes" #define MSG_USERWAIT "Esperando ordenes"
#define MSG_RESUMING "Resumiendo impre." #define MSG_RESUMING "Resumiendo impre."
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Sin movimiento" #define MSG_NO_MOVE "Sin movimiento"
#define MSG_KILLED "PARADA DE EMERG." #define MSG_KILLED "PARADA DE EMERG."
#define MSG_STOPPED "PARADA" #define MSG_STOPPED "PARADA"
@ -887,6 +892,7 @@
#define MSG_DWELL "Сон..." #define MSG_DWELL "Сон..."
#define MSG_USERWAIT "Ожиданиие" #define MSG_USERWAIT "Ожиданиие"
#define MSG_RESUMING "Resuming print" #define MSG_RESUMING "Resuming print"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Нет движения." #define MSG_NO_MOVE "Нет движения."
#define MSG_KILLED "УБИТО." #define MSG_KILLED "УБИТО."
#define MSG_STOPPED "ОСТАНОВЛЕНО." #define MSG_STOPPED "ОСТАНОВЛЕНО."
@ -1013,6 +1019,7 @@
#define MSG_DWELL "Sospensione..." #define MSG_DWELL "Sospensione..."
#define MSG_USERWAIT "Attendi Utente..." #define MSG_USERWAIT "Attendi Utente..."
#define MSG_RESUMING "Riprendi Stampa" #define MSG_RESUMING "Riprendi Stampa"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Nessun Movimento." #define MSG_NO_MOVE "Nessun Movimento."
#define MSG_KILLED "UCCISO. " #define MSG_KILLED "UCCISO. "
#define MSG_STOPPED "ARRESTATO. " #define MSG_STOPPED "ARRESTATO. "
@ -1144,6 +1151,7 @@
#define MSG_DWELL "Repouso..." #define MSG_DWELL "Repouso..."
#define MSG_USERWAIT "Esperando ordem" #define MSG_USERWAIT "Esperando ordem"
#define MSG_RESUMING "Resuming print" #define MSG_RESUMING "Resuming print"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Sem movimento" #define MSG_NO_MOVE "Sem movimento"
#define MSG_KILLED "PARADA DE EMERG." #define MSG_KILLED "PARADA DE EMERG."
#define MSG_STOPPED "PARADA. " #define MSG_STOPPED "PARADA. "
@ -1272,6 +1280,7 @@
#define MSG_DWELL "Nukkumassa..." #define MSG_DWELL "Nukkumassa..."
#define MSG_USERWAIT "Odotet. valintaa" #define MSG_USERWAIT "Odotet. valintaa"
#define MSG_RESUMING "Jatke. tulostusta" #define MSG_RESUMING "Jatke. tulostusta"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Ei liiketta." #define MSG_NO_MOVE "Ei liiketta."
#define MSG_KILLED "KILLED. " #define MSG_KILLED "KILLED. "
#define MSG_STOPPED "STOPPED. " #define MSG_STOPPED "STOPPED. "
@ -1395,6 +1404,7 @@
#define MSG_DWELL "Reposo..." #define MSG_DWELL "Reposo..."
#define MSG_USERWAIT "Asperan. ordines" #define MSG_USERWAIT "Asperan. ordines"
#define MSG_RESUMING "Contin. impresion" #define MSG_RESUMING "Contin. impresion"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Sin movimiento" #define MSG_NO_MOVE "Sin movimiento"
#define MSG_KILLED "ATURADA D'EMERCH." #define MSG_KILLED "ATURADA D'EMERCH."
#define MSG_STOPPED "ATURADA." #define MSG_STOPPED "ATURADA."
@ -1529,6 +1539,7 @@
#define MSG_DWELL "Slapen..." #define MSG_DWELL "Slapen..."
#define MSG_USERWAIT "Wachten..." #define MSG_USERWAIT "Wachten..."
#define MSG_RESUMING "Print hervatten" #define MSG_RESUMING "Print hervatten"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Geen beweging." #define MSG_NO_MOVE "Geen beweging."
#define MSG_KILLED "AFGEBROKEN. " #define MSG_KILLED "AFGEBROKEN. "
#define MSG_STOPPED "GESTOPT. " #define MSG_STOPPED "GESTOPT. "
@ -1654,6 +1665,7 @@
#define MSG_DWELL "Repos..." #define MSG_DWELL "Repos..."
#define MSG_USERWAIT "Esperant usuari.." #define MSG_USERWAIT "Esperant usuari.."
#define MSG_RESUMING "Reprenent imp." #define MSG_RESUMING "Reprenent imp."
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Sense moviment." #define MSG_NO_MOVE "Sense moviment."
#define MSG_KILLED "PARADA DE EMERG. " #define MSG_KILLED "PARADA DE EMERG. "
#define MSG_STOPPED "ATURAT. " #define MSG_STOPPED "ATURAT. "
@ -1778,6 +1790,7 @@
#define MSG_DWELL "Lo egin..." #define MSG_DWELL "Lo egin..."
#define MSG_USERWAIT "Aginduak zain..." #define MSG_USERWAIT "Aginduak zain..."
#define MSG_RESUMING "Jarraitzen inpri." #define MSG_RESUMING "Jarraitzen inpri."
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Mugimendu gabe" #define MSG_NO_MOVE "Mugimendu gabe"
#define MSG_KILLED "LARRIALDI GELDIA" #define MSG_KILLED "LARRIALDI GELDIA"
#define MSG_STOPPED "GELDITUTA. " #define MSG_STOPPED "GELDITUTA. "

2
Marlin/ultralcd.cpp
View File

@ -288,6 +288,8 @@ static void lcd_sdcard_stop()
autotempShutdown(); autotempShutdown();
cancel_heatup = true; cancel_heatup = true;
lcd_setstatus(MSG_PRINT_ABORTED);
} }
/* Menu implementation */ /* Menu implementation */