diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ed11ab7a5..a1ac07105 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5855,7 +5855,7 @@ Sigma_Exit: extruder = code_value(); if(extruder >= EXTRUDERS) { SERIAL_ECHO_START; - SERIAL_ECHO(_i("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER c=0 r=0 break; } } @@ -7677,19 +7677,19 @@ bool setTargetedHotend(int code, uint8_t &extruder) SERIAL_ECHO_START; switch(code){ case 104: - SERIAL_ECHORPGM(_i("M104 Invalid extruder "));////MSG_M104_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHORPGM(_n("M104 Invalid extruder "));////MSG_M104_INVALID_EXTRUDER c=0 r=0 break; case 105: - SERIAL_ECHO(_i("M105 Invalid extruder "));////MSG_M105_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M105 Invalid extruder "));////MSG_M105_INVALID_EXTRUDER c=0 r=0 break; case 109: - SERIAL_ECHO(_i("M109 Invalid extruder "));////MSG_M109_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M109 Invalid extruder "));////MSG_M109_INVALID_EXTRUDER c=0 r=0 break; case 218: - SERIAL_ECHO(_i("M218 Invalid extruder "));////MSG_M218_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M218 Invalid extruder "));////MSG_M218_INVALID_EXTRUDER c=0 r=0 break; case 221: - SERIAL_ECHO(_i("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER c=0 r=0 break; } SERIAL_PROTOCOLLN((int)extruder); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 6ca5842f2..d2da35d1e 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -460,30 +460,12 @@ #MSG_LOOSE_PULLEY c=20 r=1 "Loose pulley" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " - # "Load to nozzle" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " - #MSG_MAIN c=0 r=0 "Main" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index f3e396b89..9b10080da 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -614,38 +614,14 @@ "Loose pulley" "Uvolnena remenicka" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 Neplatny extruder " - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 Neplatny extruder " - # "Load to nozzle" "Zavest do trysky" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 Neplatny extruder " - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Kal. prvni vrstvy" -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 Neplatny extruder " - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 Neplatny extruder " - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 Neplatny extruder " - #MSG_MAIN c=0 r=0 "Main" "Hlavni nabidka" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index b95c65bec..061f3aa2d 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -614,38 +614,14 @@ "Loose pulley" "Lose Riemenscheibe" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 Falscher Extruder " - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 Falscher Extruder " - # "Load to nozzle" "In Druckduese laden" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 Falscher Extruder " - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Erste-Schicht Kal." -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 Falscher Extruder " - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 Falscher Extruder " - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 Falscher Extruder " - #MSG_MAIN c=0 r=0 "Main" "Hauptmenue" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 1fb914fdd..68135b934 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -614,38 +614,14 @@ "Loose pulley" "Polea suelta" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 Extrusor invalido" - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 Extrusor invalido" - # "Load to nozzle" "Cargar a la boquilla" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 Extrusor invalido" - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Cal. primera cap." -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 Extrusor invalido" - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 Extrusor invalido" - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 Extrusor invalido" - #MSG_MAIN c=0 r=0 "Main" "Menu principal" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 6a68b718e..bb822e78e 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -614,38 +614,14 @@ "Loose pulley" "Poulie lache" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 extrudeur invalide" - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 extrudeur invalide" - # "Load to nozzle" "Charger le fil" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 extrudeur invalide" - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Cal. 1ere couche" -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 extrudeur invalide" - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 extrudeur invalide" - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 extrudeur invalide" - #MSG_MAIN c=0 r=0 "Main" "Principal" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 13af94d9b..60ccdf1f6 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -614,38 +614,14 @@ "Loose pulley" "Puleggia lenta" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 Estrusore non valido" - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 Estrusore non valido" - # "Load to nozzle" "Carica ugello" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 Estrusore non valido" - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Calibrazione primo layer." -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 Estrusore non valido" - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 Estrusore non valido" - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 Estrusore non valido" - #MSG_MAIN c=0 r=0 "Main" "Menu principale" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index c859c4b42..393370bbf 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -614,38 +614,14 @@ "Loose pulley" "Luzne kolo pasowe" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 Nieprawidlowy ekstruder" - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 Nieprawidlowy ekstruder" - # "Load to nozzle" "Zaladuj do dyszy" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 Nieprawidlowy ekstruder" - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Kal. 1. warstwy" -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 Nieprawidlowy ekstruder" - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 Nieprawidlowy ekstruder" - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 Nieprawidlowy ekstruder" - #MSG_MAIN c=0 r=0 "Main" "Menu glowne"