Browse Source

Merge branch 'MK3' into MK3_Dutch

3d-gussner 4 years ago
parent
commit
a4211da8f0

+ 4 - 1
Firmware/Marlin_main.cpp

@@ -1242,8 +1242,8 @@ void setup()
         // Once a firmware boots up, it forces at least a language selection, which changes
         // Once a firmware boots up, it forces at least a language selection, which changes
         // EEPROM_LANG to number lower than 0x0ff.
         // EEPROM_LANG to number lower than 0x0ff.
         // 1) Set a high power mode.
         // 1) Set a high power mode.
+	    eeprom_update_byte((uint8_t*)EEPROM_SILENT, SILENT_MODE_OFF);
 #ifdef TMC2130
 #ifdef TMC2130
-        eeprom_write_byte((uint8_t*)EEPROM_SILENT, 0);
         tmc2130_mode = TMC2130_MODE_NORMAL;
         tmc2130_mode = TMC2130_MODE_NORMAL;
 #endif //TMC2130
 #endif //TMC2130
         eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard
         eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard
@@ -2433,6 +2433,9 @@ void ramming() {
 
 
 #ifdef TMC2130
 #ifdef TMC2130
 void force_high_power_mode(bool start_high_power_section) {
 void force_high_power_mode(bool start_high_power_section) {
+#ifdef PSU_Delta
+	if (start_high_power_section == true) enable_force_z();
+#endif //PSU_Delta
 	uint8_t silent;
 	uint8_t silent;
 	silent = eeprom_read_byte((uint8_t*)EEPROM_SILENT);
 	silent = eeprom_read_byte((uint8_t*)EEPROM_SILENT);
 	if (silent == 1) {
 	if (silent == 1) {

+ 0 - 4
Firmware/stepper.cpp

@@ -1564,10 +1564,6 @@ void st_current_init() //Initialize Digipot Motor Current
 {
 {
 #ifdef MOTOR_CURRENT_PWM_XY_PIN
 #ifdef MOTOR_CURRENT_PWM_XY_PIN
   uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT);
   uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT);
-  if (SilentMode == 0xff){ //set power to High Power (MK2.5) or Normal Power (MK3, unused)
-    SilentMode = SILENT_MODE_POWER;
-    eeprom_update_byte((uint8_t*)EEPROM_SILENT, SilentMode);
-  }
   SilentModeMenu = SilentMode;
   SilentModeMenu = SilentMode;
     pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT);
     pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT);
     pinMode(MOTOR_CURRENT_PWM_Z_PIN, OUTPUT);
     pinMode(MOTOR_CURRENT_PWM_Z_PIN, OUTPUT);

+ 4 - 1
Firmware/temperature.cpp

@@ -505,7 +505,10 @@ void checkFanSpeed()
 		// we may even send some info to the LCD from here
 		// we may even send some info to the LCD from here
 		fan_check_error = EFCE_FIXED;
 		fan_check_error = EFCE_FIXED;
 	}
 	}
-
+	if ((fan_check_error == EFCE_FIXED) && !PRINTER_ACTIVE){
+		fan_check_error = EFCE_OK; //if the issue is fixed while the printer is doing nothing, reenable processing immediately.
+		lcd_reset_alert_level(); //for another fan speed error
+	}
 	if ((fan_speed_errors[0] > max_extruder_fan_errors) && fans_check_enabled && (fan_check_error == EFCE_OK)) {
 	if ((fan_speed_errors[0] > max_extruder_fan_errors) && fans_check_enabled && (fan_check_error == EFCE_OK)) {
 		fan_speed_errors[0] = 0;
 		fan_speed_errors[0] = 0;
 		fanSpeedError(0); //extruder fan
 		fanSpeedError(0); //extruder fan

+ 18 - 15
Firmware/ultralcd.cpp

@@ -1843,8 +1843,8 @@ static void lcd_menu_fails_stats_total()
 //! @code{.unparsed}
 //! @code{.unparsed}
 //! |01234567890123456789|
 //! |01234567890123456789|
 //! |Last print failures |	c=20 r=1
 //! |Last print failures |	c=20 r=1
-//! | Power failures: 000|	c=14 r=1
-//! | Filam. runouts: 000|	c=14 r=1
+//! | Power failures  000|	c=14 r=1
+//! | Filam. runouts  000|	c=14 r=1
 //! | Crash   X:000 Y:000|	c=7 r=1
 //! | Crash   X:000 Y:000|	c=7 r=1
 //! ----------------------
 //! ----------------------
 //! @endcode
 //! @endcode
@@ -1890,6 +1890,7 @@ static void lcd_menu_fails_stats()
 }
 }
 
 
 #elif defined(FILAMENT_SENSOR)
 #elif defined(FILAMENT_SENSOR)
+static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" "%S\n" " %-16.16S%-3d\n";
 //! 
 //! 
 //! @brief Print last print and total filament run outs
 //! @brief Print last print and total filament run outs
 //! 
 //! 
@@ -1900,9 +1901,9 @@ static void lcd_menu_fails_stats()
 //! @code{.unparsed}
 //! @code{.unparsed}
 //! |01234567890123456789|
 //! |01234567890123456789|
 //! |Last print failures |	c=20 r=1
 //! |Last print failures |	c=20 r=1
-//! | Filam. runouts: 000|	c=14 r=1
+//! | Filam. runouts  000|	c=14 r=1
 //! |Total failures      |	c=20 r=1
 //! |Total failures      |	c=20 r=1
-//! | Filam. runouts: 000|	c=14 r=1
+//! | Filam. runouts  000|	c=14 r=1
 //! ----------------------
 //! ----------------------
 //! @endcode
 //! @endcode
 //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
 //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
@@ -1912,11 +1913,13 @@ static void lcd_menu_fails_stats()
     uint8_t filamentLast = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT);
     uint8_t filamentLast = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT);
     uint16_t filamentTotal = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT);
     uint16_t filamentTotal = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT);
 	lcd_home();
 	lcd_home();
-    lcd_printf_P(PSTR("Last print failures\n"  ////c=20 r=1 
-        " Filam. runouts  %-3d\n"   ////c=14 r=1
-        "Total failures\n"  ////c=20 r=1
-        " Filam. runouts  %-3d"), filamentLast, filamentTotal);  ////c=14 r=1
-    menu_back_if_clicked();
+	lcd_printf_P(failStatsFmt, 
+        _i("Last print failures"),   ////c=20 r=1
+        _i("Filam. runouts"), filamentLast,   ////c=14 r=1
+        _i("Total failures"),  ////c=20 r=1
+        _i("Filam. runouts"), filamentTotal);   ////c=14 r=1
+
+	menu_back_if_clicked();
 }
 }
 #else
 #else
 static void lcd_menu_fails_stats()
 static void lcd_menu_fails_stats()
@@ -4929,12 +4932,12 @@ static void lcd_wizard_load()
 {
 {
 	if (mmu_enabled)
 	if (mmu_enabled)
 	{
 	{
-		lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament to the first tube of MMU, then press the knob to load it."));////c=20 r=8
+		lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the first tube of the MMU, then press the knob to load it."));////c=20 r=8
 		tmp_extruder = 0;
 		tmp_extruder = 0;
 	} 
 	} 
 	else
 	else
 	{
 	{
-		lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament to the extruder, then press knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=8
+		lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the extruder, then press the knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=8
 	}	
 	}	
 	lcd_update_enable(false);
 	lcd_update_enable(false);
 	lcd_clear();
 	lcd_clear();
@@ -4958,7 +4961,7 @@ static void wizard_lay1cal_message(bool cold)
     if (mmu_enabled)
     if (mmu_enabled)
     {
     {
         lcd_show_fullscreen_message_and_wait_P(
         lcd_show_fullscreen_message_and_wait_P(
-                _i("First you will select filament you wish to use for calibration. Then select temperature which matches your material."));
+                _i("Choose a filament for the First Layer Calibration and select it in the on-screen menu."));
     }
     }
     else if (cold)
     else if (cold)
     {
     {
@@ -4966,7 +4969,7 @@ static void wizard_lay1cal_message(bool cold)
                 _i("Select temperature which matches your material."));
                 _i("Select temperature which matches your material."));
     }
     }
     lcd_show_fullscreen_message_and_wait_P(
     lcd_show_fullscreen_message_and_wait_P(
-            _i("I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration.")); ////MSG_WIZARD_V2_CAL_2 c=20 r=12
+            _i("The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter).")); ////MSG_WIZARD_V2_CAL_2 c=20 r=12
 }
 }
 
 
 //! @brief Printer first run wizard (Selftest and calibration)
 //! @brief Printer first run wizard (Selftest and calibration)
@@ -5094,7 +5097,7 @@ void lcd_wizard(WizState state)
 			setTargetBed(PLA_PREHEAT_HPB_TEMP);
 			setTargetBed(PLA_PREHEAT_HPB_TEMP);
 			if (mmu_enabled)
 			if (mmu_enabled)
 			{
 			{
-			    wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is any filament loaded?"), true);////c=20 r=2
+			    wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////c=20 r=2
 			} else
 			} else
 			{
 			{
 			    wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2
 			    wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2
@@ -5139,7 +5142,7 @@ void lcd_wizard(WizState state)
 			}
 			}
 			else
 			else
 			{
 			{
-			    lcd_show_fullscreen_message_and_wait_P(_i("If you have more steel sheets you can calibrate additional presets in Settings / HW Setup / Steel sheets."));
+			    lcd_show_fullscreen_message_and_wait_P(_i("If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."));
 				state = S::Finish;
 				state = S::Finish;
 			}
 			}
 			break;
 			break;

+ 1 - 1
lang/lang-add.sh

@@ -51,7 +51,7 @@ if ! [ -e lang_add.txt ]; then
 fi
 fi
 
 
 cat lang_add.txt | sed 's/^/"/;s/$/"/' | while read new_s; do
 cat lang_add.txt | sed 's/^/"/;s/$/"/' | while read new_s; do
-	if grep "$new_s" lang_en.txt >/dev/nul; then
+	if grep "$new_s" lang_en.txt >/dev/null; then
 		echo "text already exist:"
 		echo "text already exist:"
 		echo "$new_s"
 		echo "$new_s"
 		echo
 		echo

+ 24 - 3
lang/lang_en.txt

@@ -133,6 +133,9 @@
 #MSG_CRASHDETECT_ON
 #MSG_CRASHDETECT_ON
 "Crash det.   [on]"
 "Crash det.   [on]"
 
 
+#
+"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
+
 #MSG_CRASHDETECT_NA
 #MSG_CRASHDETECT_NA
 "Crash det.  [N/A]"
 "Crash det.  [N/A]"
 
 
@@ -361,6 +364,9 @@
 #
 #
 "Last print failures"
 "Last print failures"
 
 
+#
+"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
+
 #
 #
 "Last print"
 "Last print"
 
 
@@ -613,6 +619,15 @@
 #
 #
 "Print FAN"
 "Print FAN"
 
 
+#
+"Please insert filament into the extruder, then press the knob to load it."
+
+#
+"Please insert filament into the first tube of the MMU, then press the knob to load it."
+
+#
+"Please load filament first."
+
 #MSG_PRUSA3D
 #MSG_PRUSA3D
 "prusa3d.com"
 "prusa3d.com"
 
 
@@ -688,9 +703,6 @@
 #
 #
 "Select nozzle preheat temperature which matches your material."
 "Select nozzle preheat temperature which matches your material."
 
 
-#
-"Select PLA filament:"
-
 #MSG_SET_TEMPERATURE c=19 r=1
 #MSG_SET_TEMPERATURE c=19 r=1
 "Set temperature:"
 "Set temperature:"
 
 
@@ -763,12 +775,18 @@
 #MSG_SELFTEST_SWAPPED
 #MSG_SELFTEST_SWAPPED
 "Swapped"
 "Swapped"
 
 
+#
+"Select filament:"
+
 #MSG_TEMP_CALIBRATION c=20 r=1
 #MSG_TEMP_CALIBRATION c=20 r=1
 "Temp. cal.          "
 "Temp. cal.          "
 
 
 #MSG_TEMP_CALIBRATION_ON c=20 r=1
 #MSG_TEMP_CALIBRATION_ON c=20 r=1
 "Temp. cal.   [on]"
 "Temp. cal.   [on]"
 
 
+#
+"Select temperature which matches your material."
+
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 "Temp. cal.  [off]"
 "Temp. cal.  [off]"
 
 
@@ -904,6 +922,9 @@
 #
 #
 "Y distance from min"
 "Y distance from min"
 
 
+#
+"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
+
 #
 #
 "Y-correct:"
 "Y-correct:"
 
 

+ 33 - 5
lang/lang_en_cz.txt

@@ -72,7 +72,7 @@
 
 
 #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
 #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
 "Autoloading filament available only when filament sensor is turned on..."
 "Autoloading filament available only when filament sensor is turned on..."
-"Automaticke zavadeni filamentu je dostupne pouze pri zapnutem filament senzoru..."
+"Automaticke zavadeni filamentu je mozne pouze pri zapnutem filament senzoru..."
 
 
 #MSG_AUTOLOADING_ENABLED c=20 r=4
 #MSG_AUTOLOADING_ENABLED c=20 r=4
 "Autoloading filament is active, just press the knob and insert filament..."
 "Autoloading filament is active, just press the knob and insert filament..."
@@ -178,6 +178,10 @@
 "Crash det.   [on]"
 "Crash det.   [on]"
 "Crash det.  [zap]"
 "Crash det.  [zap]"
 
 
+#
+"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
+"Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu"
+
 #MSG_CRASHDETECT_NA
 #MSG_CRASHDETECT_NA
 "Crash det.  [N/A]"
 "Crash det.  [N/A]"
 "\x00"
 "\x00"
@@ -482,6 +486,10 @@
 "Last print failures"
 "Last print failures"
 "Selhani posl. tisku"
 "Selhani posl. tisku"
 
 
+#
+"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
+"Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy"
+
 #
 #
 "Last print"
 "Last print"
 "Posledni tisk"
 "Posledni tisk"
@@ -818,6 +826,18 @@
 "Print FAN"
 "Print FAN"
 "Tiskovy vent."
 "Tiskovy vent."
 
 
+#
+"Please insert filament into the extruder, then press the knob to load it."
+"Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni"
+
+#
+"Please insert filament into the first tube of the MMU, then press the knob to load it."
+"Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni"
+
+#
+"Please load filament first."
+"Prosim nejdriv zavedte filament"
+
 #MSG_PRUSA3D
 #MSG_PRUSA3D
 "prusa3d.com"
 "prusa3d.com"
 "\x00"
 "\x00"
@@ -918,10 +938,6 @@
 "Select nozzle preheat temperature which matches your material."
 "Select nozzle preheat temperature which matches your material."
 "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu."
 "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu."
 
 
-#
-"Select PLA filament:"
-"Vyberte PLA filament:"
-
 #MSG_SET_TEMPERATURE c=19 r=1
 #MSG_SET_TEMPERATURE c=19 r=1
 "Set temperature:"
 "Set temperature:"
 "Nastavte teplotu:"
 "Nastavte teplotu:"
@@ -1018,6 +1034,10 @@
 "Swapped"
 "Swapped"
 "Prohozene"
 "Prohozene"
 
 
+#
+"Select filament:"
+"Zvolte filament:"
+
 #MSG_TEMP_CALIBRATION c=20 r=1
 #MSG_TEMP_CALIBRATION c=20 r=1
 "Temp. cal.          "
 "Temp. cal.          "
 "Tepl. kal. "
 "Tepl. kal. "
@@ -1026,6 +1046,10 @@
 "Temp. cal.   [on]"
 "Temp. cal.   [on]"
 "Tepl. kal.  [zap]"
 "Tepl. kal.  [zap]"
 
 
+#
+"Select temperature which matches your material."
+"Zvolte teplotu, ktera odpovida vasemu materialu."
+
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 "Temp. cal.  [off]"
 "Temp. cal.  [off]"
 "Tepl. kal.  [vyp]"
 "Tepl. kal.  [vyp]"
@@ -1206,6 +1230,10 @@
 "Y distance from min"
 "Y distance from min"
 "Y vzdalenost od min"
 "Y vzdalenost od min"
 
 
+#
+"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
+"\x00"
+
 #
 #
 "Y-correct:"
 "Y-correct:"
 "Korekce Y:"
 "Korekce Y:"

+ 32 - 5
lang/lang_en_de.txt

@@ -178,6 +178,10 @@
 "Crash det.   [on]"
 "Crash det.   [on]"
 "Crash Erk.   [an]"
 "Crash Erk.   [an]"
 
 
+#
+"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
+"Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus."
+
 #MSG_CRASHDETECT_NA
 #MSG_CRASHDETECT_NA
 "Crash det.  [N/A]"
 "Crash det.  [N/A]"
 "Crash Erk.   [nv]"
 "Crash Erk.   [nv]"
@@ -482,6 +486,10 @@
 "Last print failures"
 "Last print failures"
 "Letzte Druckfehler"
 "Letzte Druckfehler"
 
 
+#
+"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
+"Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche."
+
 #
 #
 "Last print"
 "Last print"
 "Letzter Druck"
 "Letzter Druck"
@@ -818,6 +826,18 @@
 "Print FAN"
 "Print FAN"
 "Druckvent."
 "Druckvent."
 
 
+#
+"Please insert filament into the extruder, then press the knob to load it."
+"Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden."
+
+#
+"Please insert filament into the first tube of the MMU, then press the knob to load it."
+"Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden."
+
+#
+"Please load filament first."
+"Bitte laden Sie zuerst das Filament."
+
 #MSG_PRUSA3D
 #MSG_PRUSA3D
 "prusa3d.com"
 "prusa3d.com"
 "\x00"
 "\x00"
@@ -918,10 +938,6 @@
 "Select nozzle preheat temperature which matches your material."
 "Select nozzle preheat temperature which matches your material."
 "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht."
 "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht."
 
 
-#
-"Select PLA filament:"
-"PLA Filament auswaehlen:"
-
 #MSG_SET_TEMPERATURE c=19 r=1
 #MSG_SET_TEMPERATURE c=19 r=1
 "Set temperature:"
 "Set temperature:"
 "Temp. einstellen:"
 "Temp. einstellen:"
@@ -1018,6 +1034,10 @@
 "Swapped"
 "Swapped"
 "Ausgetauscht"
 "Ausgetauscht"
 
 
+#
+"Select filament:"
+"Filament auswaehlen:"
+
 #MSG_TEMP_CALIBRATION c=20 r=1
 #MSG_TEMP_CALIBRATION c=20 r=1
 "Temp. cal.          "
 "Temp. cal.          "
 "Temp Kalib.         "
 "Temp Kalib.         "
@@ -1026,6 +1046,10 @@
 "Temp. cal.   [on]"
 "Temp. cal.   [on]"
 "Temp. Kal.   [an]"
 "Temp. Kal.   [an]"
 
 
+#
+"Select temperature which matches your material."
+"Waehlen Sie die Temperatur, die zu Ihrem Material passt."
+
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 "Temp. cal.  [off]"
 "Temp. cal.  [off]"
 "Temp. Kal.  [aus]"
 "Temp. Kal.  [aus]"
@@ -1202,11 +1226,14 @@
 "XYZ calibration failed. Right front calibration point not reachable."
 "XYZ calibration failed. Right front calibration point not reachable."
 "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar."
 "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar."
 
 
-
 #
 #
 "Y distance from min"
 "Y distance from min"
 "Y Entfernung vom Min"
 "Y Entfernung vom Min"
 
 
+#
+"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
+"\x00"
+
 #
 #
 "Y-correct:"
 "Y-correct:"
 "Y-Korrektur:"
 "Y-Korrektur:"

+ 34 - 6
lang/lang_en_es.txt

@@ -72,11 +72,11 @@
 
 
 #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
 #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
 "Autoloading filament available only when filament sensor is turned on..."
 "Autoloading filament available only when filament sensor is turned on..."
-"La carga automatica de filamento solo funciona si el sensor de filamento esta activado..."
+"La carga automatica solo funciona si el sensor de filamento esta activado..."
 
 
 #MSG_AUTOLOADING_ENABLED c=20 r=4
 #MSG_AUTOLOADING_ENABLED c=20 r=4
 "Autoloading filament is active, just press the knob and insert filament..."
 "Autoloading filament is active, just press the knob and insert filament..."
-"La carga automatica de filamento esta activada, pulse el dial e inserte el filamento..."
+"La carga automatica esta activada, pulse el dial e inserte el filamento..."
 
 
 #MSG_SELFTEST_AXIS_LENGTH
 #MSG_SELFTEST_AXIS_LENGTH
 "Axis length"
 "Axis length"
@@ -178,6 +178,10 @@
 "Crash det.   [on]"
 "Crash det.   [on]"
 "Det. choque [act]"
 "Det. choque [act]"
 
 
+#
+"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
+"Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla."
+
 #MSG_CRASHDETECT_NA
 #MSG_CRASHDETECT_NA
 "Crash det.  [N/A]"
 "Crash det.  [N/A]"
 "Dec. choque [N/D]"
 "Dec. choque [N/D]"
@@ -482,6 +486,10 @@
 "Last print failures"
 "Last print failures"
 "Ultimas impresiones fallidas"
 "Ultimas impresiones fallidas"
 
 
+#
+"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
+"Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero."
+
 #
 #
 "Last print"
 "Last print"
 "Ultima impresion"
 "Ultima impresion"
@@ -818,6 +826,18 @@
 "Print FAN"
 "Print FAN"
 "Vent. extr"
 "Vent. extr"
 
 
+#
+"Please insert filament into the extruder, then press the knob to load it."
+"Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo."
+
+#
+"Please insert filament into the first tube of the MMU, then press the knob to load it."
+"Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo."
+
+#
+"Please load filament first."
+"Por favor, cargar primero el filamento. "
+
 #MSG_PRUSA3D
 #MSG_PRUSA3D
 "prusa3d.com"
 "prusa3d.com"
 "prusa3d.es"
 "prusa3d.es"
@@ -918,10 +938,6 @@
 "Select nozzle preheat temperature which matches your material."
 "Select nozzle preheat temperature which matches your material."
 "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. "
 "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. "
 
 
-#
-"Select PLA filament:"
-"Seleccionar filamento PLA:"
-
 #MSG_SET_TEMPERATURE c=19 r=1
 #MSG_SET_TEMPERATURE c=19 r=1
 "Set temperature:"
 "Set temperature:"
 "Establecer temp.:"
 "Establecer temp.:"
@@ -1018,6 +1034,10 @@
 "Swapped"
 "Swapped"
 "Intercambiado"
 "Intercambiado"
 
 
+#
+"Select filament:"
+"Selecciona filamento:"
+
 #MSG_TEMP_CALIBRATION c=20 r=1
 #MSG_TEMP_CALIBRATION c=20 r=1
 "Temp. cal.          "
 "Temp. cal.          "
 "Cal. temp. "
 "Cal. temp. "
@@ -1026,6 +1046,10 @@
 "Temp. cal.   [on]"
 "Temp. cal.   [on]"
 "Cal. temp.   [on]"
 "Cal. temp.   [on]"
 
 
+#
+"Select temperature which matches your material."
+"Selecciona la temperatura adecuada a tu material."
+
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 "Temp. cal.  [off]"
 "Temp. cal.  [off]"
 "Cal. temp.  [off]"
 "Cal. temp.  [off]"
@@ -1206,6 +1230,10 @@
 "Y distance from min"
 "Y distance from min"
 "Distancia en Y desde el min"
 "Distancia en Y desde el min"
 
 
+#
+"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
+"\x00"
+
 #
 #
 "Y-correct:"
 "Y-correct:"
 "Corregir-Y:"
 "Corregir-Y:"

+ 32 - 4
lang/lang_en_fr.txt

@@ -178,6 +178,10 @@
 "Crash det.   [on]"
 "Crash det.   [on]"
 "Detect.crash [on]"
 "Detect.crash [on]"
 
 
+#
+"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
+"Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran."
+
 #MSG_CRASHDETECT_NA
 #MSG_CRASHDETECT_NA
 "Crash det.  [N/A]"
 "Crash det.  [N/A]"
 "Detect.crash[N/A]"
 "Detect.crash[N/A]"
@@ -482,6 +486,10 @@
 "Last print failures"
 "Last print failures"
 "Echecs derniere imp."
 "Echecs derniere imp."
 
 
+#
+"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
+"Si vous avez d'autres feuilles d'acier,  calibrez leurs pre-reglages dans Reglages - Config HW - Feuilles d'acier."
+
 #
 #
 "Last print"
 "Last print"
 "Derniere impres."
 "Derniere impres."
@@ -818,6 +826,18 @@
 "Print FAN"
 "Print FAN"
 "Vent. impr"
 "Vent. impr"
 
 
+#
+"Please insert filament into the extruder, then press the knob to load it."
+"Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger."
+
+#
+"Please insert filament into the first tube of the MMU, then press the knob to load it."
+"Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger."
+
+#
+"Please load filament first."
+"Veuillez d'abord charger un filament."
+
 #MSG_PRUSA3D
 #MSG_PRUSA3D
 "prusa3d.com"
 "prusa3d.com"
 "\x00"
 "\x00"
@@ -918,10 +938,6 @@
 "Select nozzle preheat temperature which matches your material."
 "Select nozzle preheat temperature which matches your material."
 "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau."
 "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau."
 
 
-#
-"Select PLA filament:"
-"Selectionnez le fil. PLA:"
-
 #MSG_SET_TEMPERATURE c=19 r=1
 #MSG_SET_TEMPERATURE c=19 r=1
 "Set temperature:"
 "Set temperature:"
 "Regler temp.:"
 "Regler temp.:"
@@ -1018,6 +1034,10 @@
 "Swapped"
 "Swapped"
 "Echange"
 "Echange"
 
 
+#
+"Select filament:"
+"Selectionnez le filament:"
+
 #MSG_TEMP_CALIBRATION c=20 r=1
 #MSG_TEMP_CALIBRATION c=20 r=1
 "Temp. cal.          "
 "Temp. cal.          "
 "Calib. Temp."
 "Calib. Temp."
@@ -1026,6 +1046,10 @@
 "Temp. cal.   [on]"
 "Temp. cal.   [on]"
 "Calib. Temp. [on]"
 "Calib. Temp. [on]"
 
 
+#
+"Select temperature which matches your material."
+"Selectionnez la temperature qui correspond a votre materiau."
+
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 "Temp. cal.  [off]"
 "Temp. cal.  [off]"
 "Calib. Temp.[off]"
 "Calib. Temp.[off]"
@@ -1206,6 +1230,10 @@
 "Y distance from min"
 "Y distance from min"
 "Distance Y du min"
 "Distance Y du min"
 
 
+#
+"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
+"\x00"
+
 #
 #
 "Y-correct:"
 "Y-correct:"
 "Correct-Y:"
 "Correct-Y:"

+ 32 - 4
lang/lang_en_it.txt

@@ -178,6 +178,10 @@
 "Crash det.   [on]"
 "Crash det.   [on]"
 "Rileva.crash [on]"
 "Rileva.crash [on]"
 
 
+#
+"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
+"Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo."
+
 #MSG_CRASHDETECT_NA
 #MSG_CRASHDETECT_NA
 "Crash det.  [N/A]"
 "Crash det.  [N/A]"
 "Rileva.crash[N/A]"
 "Rileva.crash[N/A]"
@@ -482,6 +486,10 @@
 "Last print failures"
 "Last print failures"
 "Fallimenti ultima stampa"
 "Fallimenti ultima stampa"
 
 
+#
+"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
+"Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio."
+
 #
 #
 "Last print"
 "Last print"
 "Ultima stampa"
 "Ultima stampa"
@@ -818,6 +826,18 @@
 "Print FAN"
 "Print FAN"
 "Ventola di stampa"
 "Ventola di stampa"
 
 
+#
+"Please insert filament into the extruder, then press the knob to load it."
+"Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo."
+
+#
+"Please insert filament into the first tube of the MMU, then press the knob to load it."
+"Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo."
+
+#
+"Please load filament first."
+"Per favore prima carica il filamento."
+
 #MSG_PRUSA3D
 #MSG_PRUSA3D
 "prusa3d.com"
 "prusa3d.com"
 "\x00"
 "\x00"
@@ -918,10 +938,6 @@
 "Select nozzle preheat temperature which matches your material."
 "Select nozzle preheat temperature which matches your material."
 "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale."
 "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale."
 
 
-#
-"Select PLA filament:"
-"Selezionate filamento PLA:"
-
 #MSG_SET_TEMPERATURE c=19 r=1
 #MSG_SET_TEMPERATURE c=19 r=1
 "Set temperature:"
 "Set temperature:"
 "Imposta temperatura:"
 "Imposta temperatura:"
@@ -1018,6 +1034,10 @@
 "Swapped"
 "Swapped"
 "Scambiato"
 "Scambiato"
 
 
+#
+"Select filament:"
+"Seleziona il filamento:"
+
 #MSG_TEMP_CALIBRATION c=20 r=1
 #MSG_TEMP_CALIBRATION c=20 r=1
 "Temp. cal.          "
 "Temp. cal.          "
 "Calib. temp. "
 "Calib. temp. "
@@ -1026,6 +1046,10 @@
 "Temp. cal.   [on]"
 "Temp. cal.   [on]"
 "Calib. temp. [on]"
 "Calib. temp. [on]"
 
 
+#
+"Select temperature which matches your material."
+"Seleziona la temperatura appropriata per il tuo materiale."
+
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 "Temp. cal.  [off]"
 "Temp. cal.  [off]"
 "Calib. temp.[off]"
 "Calib. temp.[off]"
@@ -1206,6 +1230,10 @@
 "Y distance from min"
 "Y distance from min"
 "Distanza Y dal min"
 "Distanza Y dal min"
 
 
+#
+"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
+"\x00"
+
 #
 #
 "Y-correct:"
 "Y-correct:"
 "Correzione-Y:"
 "Correzione-Y:"

+ 33 - 5
lang/lang_en_pl.txt

@@ -72,7 +72,7 @@
 
 
 #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
 #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
 "Autoloading filament available only when filament sensor is turned on..."
 "Autoloading filament available only when filament sensor is turned on..."
-"Autoladowanie filamentu dostepne tylko gdy czujnik filamentu jest wlaczony..."
+"Autoladowanie fil. dostepne tylko gdy czujnik filamentu jest wlaczony..."
 
 
 #MSG_AUTOLOADING_ENABLED c=20 r=4
 #MSG_AUTOLOADING_ENABLED c=20 r=4
 "Autoloading filament is active, just press the knob and insert filament..."
 "Autoloading filament is active, just press the knob and insert filament..."
@@ -178,6 +178,10 @@
 "Crash det.   [on]"
 "Crash det.   [on]"
 "Wykr.zderzen [wl]"
 "Wykr.zderzen [wl]"
 
 
+#
+"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
+"Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym."
+
 #MSG_CRASHDETECT_NA
 #MSG_CRASHDETECT_NA
 "Crash det.  [N/A]"
 "Crash det.  [N/A]"
 "Wykr.zderzen[N/D]"
 "Wykr.zderzen[N/D]"
@@ -482,6 +486,10 @@
 "Last print failures"
 "Last print failures"
 "Ostatnie bledy druku"
 "Ostatnie bledy druku"
 
 
+#
+"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
+"Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe."
+
 #
 #
 "Last print"
 "Last print"
 "Ost. wydruk"
 "Ost. wydruk"
@@ -818,6 +826,18 @@
 "Print FAN"
 "Print FAN"
 "WentWydruk"
 "WentWydruk"
 
 
+#
+"Please insert filament into the extruder, then press the knob to load it."
+"Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac."
+
+#
+"Please insert filament into the first tube of the MMU, then press the knob to load it."
+"Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac."
+
+#
+"Please load filament first."
+"Najpierw zaladuj filament."
+
 #MSG_PRUSA3D
 #MSG_PRUSA3D
 "prusa3d.com"
 "prusa3d.com"
 "\x00"
 "\x00"
@@ -918,10 +938,6 @@
 "Select nozzle preheat temperature which matches your material."
 "Select nozzle preheat temperature which matches your material."
 "Wybierz temperature grzania dyszy odpowiednia dla materialu."
 "Wybierz temperature grzania dyszy odpowiednia dla materialu."
 
 
-#
-"Select PLA filament:"
-"Wybierz filament PLA:"
-
 #MSG_SET_TEMPERATURE c=19 r=1
 #MSG_SET_TEMPERATURE c=19 r=1
 "Set temperature:"
 "Set temperature:"
 "Ustaw temperature:"
 "Ustaw temperature:"
@@ -1018,6 +1034,10 @@
 "Swapped"
 "Swapped"
 "Zamieniono"
 "Zamieniono"
 
 
+#
+"Select filament:"
+"Wybierz filament:"
+
 #MSG_TEMP_CALIBRATION c=20 r=1
 #MSG_TEMP_CALIBRATION c=20 r=1
 "Temp. cal.          "
 "Temp. cal.          "
 "Kalibracja temp."
 "Kalibracja temp."
@@ -1026,6 +1046,10 @@
 "Temp. cal.   [on]"
 "Temp. cal.   [on]"
 "Kalibr.temp. [wl]"
 "Kalibr.temp. [wl]"
 
 
+#
+"Select temperature which matches your material."
+"Wybierz temperature, ktora odpowiada Twojemu filamentowi."
+
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 #MSG_TEMP_CALIBRATION_OFF c=20 r=1
 "Temp. cal.  [off]"
 "Temp. cal.  [off]"
 "Kalibr.temp.[wyl]"
 "Kalibr.temp.[wyl]"
@@ -1206,6 +1230,10 @@
 "Y distance from min"
 "Y distance from min"
 "Dystans od 0 w osi Y"
 "Dystans od 0 w osi Y"
 
 
+#
+"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
+"\x00"
+
 #
 #
 "Y-correct:"
 "Y-correct:"
 "Korekcja-Y:"
 "Korekcja-Y:"