Merge pull request #4691 from 3d-gussner/MK3_3.14.0_Pre_release

Pre-release update bump up verion and build number
prusa3d · May 22, 2024 · b97131b · b97131b
2 parents 9da23d8 + 2a4c012
commit b97131b
Show file tree

Hide file tree

Showing 15 changed files with 129 additions and 129 deletions.
diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
@@ -21,9 +21,9 @@ extern const char _sPrinterMmuName[] PROGMEM;
 #define FW_MAJOR 3
 #define FW_MINOR 14
 #define FW_REVISION 0
-#define FW_COMMITNR 7945
-#define FW_FLAVOR BETA      //uncomment if DEV, ALPHA, BETA or RC
-#define FW_FLAVERSION 1     //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8.
+#define FW_COMMITNR 8066
+//#define FW_FLAVOR BETA      //uncomment if DEV, ALPHA, BETA or RC
+//#define FW_FLAVERSION 1     //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8.
 #endif
 
 #ifndef FW_FLAVOR

diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot
@@ -839,7 +839,7 @@ msgid "Heating"
 msgstr ""
 
 #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:9647 ../../Firmware/messages.cpp:211
+#: ../../Firmware/Marlin_main.cpp:9648 ../../Firmware/messages.cpp:211
 msgid "Heating disabled by safety timer."
 msgstr ""
 
@@ -1216,7 +1216,7 @@ msgid "Mesh bed leveling failed. Please run Z calibration."
 msgstr ""
 
 #. MSG_MODE c=6
-#: ../../Firmware/Marlin_main.cpp:8495 ../../Firmware/messages.cpp:117
+#: ../../Firmware/Marlin_main.cpp:8496 ../../Firmware/messages.cpp:117
 #: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:4132
 #: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4144
 #: ../../Firmware/ultralcd.cpp:4152 ../../Firmware/ultralcd.cpp:4155
@@ -1325,7 +1325,7 @@ msgid "None"
 msgstr ""
 
 #. MSG_NORMAL c=7
-#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:121
+#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:121
 #: ../../Firmware/ultralcd.cpp:4096 ../../Firmware/ultralcd.cpp:4132
 #: ../../Firmware/ultralcd.cpp:4511
 msgid "Normal"
@@ -1433,7 +1433,7 @@ msgid "Once"
 msgstr ""
 
 #. MSG_PAUSED_THERMAL_ERROR c=20
-#: ../../Firmware/Marlin_main.cpp:9861 ../../Firmware/messages.cpp:186
+#: ../../Firmware/Marlin_main.cpp:9862 ../../Firmware/messages.cpp:186
 msgid "PAUSED THERMAL ERROR"
 msgstr ""
 
@@ -1569,7 +1569,7 @@ msgid "Please place steel sheet on heatbed."
 msgstr ""
 
 #. MSG_PRESS_TO_UNLOAD c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:11215 ../../Firmware/Marlin_main.cpp:11245
+#: ../../Firmware/Marlin_main.cpp:11216 ../../Firmware/Marlin_main.cpp:11246
 #: ../../Firmware/messages.cpp:84
 msgid "Please press the knob to unload filament"
 msgstr ""
@@ -1606,7 +1606,7 @@ msgid "Please upgrade."
 msgstr ""
 
 #. MSG_PLEASE_WAIT c=20
-#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8090
+#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8091
 #: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:2179
 #: ../../Firmware/ultralcd.cpp:2190
 msgid "Please wait"
@@ -1671,7 +1671,7 @@ msgid "Press the knob"
 msgstr ""
 
 #. MSG_PRESS_TO_PREHEAT c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:11227 ../../Firmware/messages.cpp:212
+#: ../../Firmware/Marlin_main.cpp:11228 ../../Firmware/messages.cpp:212
 msgid "Press the knob to preheat nozzle and continue."
 msgstr ""
 
@@ -1846,7 +1846,7 @@ msgid "SELECTOR CANNOT MOVE"
 msgstr ""
 
 #. MSG_STOPPED c=20
-#: ../../Firmware/Marlin_main.cpp:9887 ../../Firmware/messages.cpp:125
+#: ../../Firmware/Marlin_main.cpp:9888 ../../Firmware/messages.cpp:125
 msgid "STOPPED."
 msgstr ""
 
@@ -2004,7 +2004,7 @@ msgid "Shutdown host"
 msgstr ""
 
 #. MSG_SILENT c=7
-#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:120
+#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:120
 #: ../../Firmware/ultralcd.cpp:4155 ../../Firmware/ultralcd.cpp:4194
 msgid "Silent"
 msgstr ""

diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po
@@ -851,7 +851,7 @@ msgid "Heating"
 msgstr "Zahřívání"
 
 #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:9647 ../../Firmware/messages.cpp:211
+#: ../../Firmware/Marlin_main.cpp:9648 ../../Firmware/messages.cpp:211
 msgid "Heating disabled by safety timer."
 msgstr "Zahřívání přerušeno bezpečnostním časovačem."
 
@@ -1185,7 +1185,7 @@ msgid "Mesh Bed Leveling"
 msgstr "Mesh Bed Leveling"
 
 #. MSG_MODE c=6
-#: ../../Firmware/Marlin_main.cpp:8495 ../../Firmware/messages.cpp:117
+#: ../../Firmware/Marlin_main.cpp:8496 ../../Firmware/messages.cpp:117
 #: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:4132
 #: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4144
 #: ../../Firmware/ultralcd.cpp:4152 ../../Firmware/ultralcd.cpp:4155
@@ -1294,7 +1294,7 @@ msgid "None"
 msgstr "Žádné"
 
 #. MSG_NORMAL c=7
-#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:121
+#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:121
 #: ../../Firmware/ultralcd.cpp:4096 ../../Firmware/ultralcd.cpp:4132
 #: ../../Firmware/ultralcd.cpp:4511
 msgid "Normal"
@@ -1390,7 +1390,7 @@ msgid "Once"
 msgstr "Jednou"
 
 #. MSG_PAUSED_THERMAL_ERROR c=20
-#: ../../Firmware/Marlin_main.cpp:9861 ../../Firmware/messages.cpp:186
+#: ../../Firmware/Marlin_main.cpp:9862 ../../Firmware/messages.cpp:186
 msgid "PAUSED THERMAL ERROR"
 msgstr "STOP: CHYBA TEPLOTY"
 
@@ -1533,7 +1533,7 @@ msgid "Please place steel sheet on heatbed."
 msgstr "Umistěte tiskový plát na podložku"
 
 #. MSG_PRESS_TO_UNLOAD c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:11215 ../../Firmware/Marlin_main.cpp:11245
+#: ../../Firmware/Marlin_main.cpp:11216 ../../Firmware/Marlin_main.cpp:11246
 #: ../../Firmware/messages.cpp:84
 msgid "Please press the knob to unload filament"
 msgstr "Pro vysunutí filamentu stiskněte tlačítko"
@@ -1570,7 +1570,7 @@ msgid "Please upgrade."
 msgstr "Prosím aktualizujte."
 
 #. MSG_PLEASE_WAIT c=20
-#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8090
+#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8091
 #: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:2179
 #: ../../Firmware/ultralcd.cpp:2190
 msgid "Please wait"
@@ -1630,7 +1630,7 @@ msgid "Press the knob"
 msgstr "Stiskněte tlačítko"
 
 #. MSG_PRESS_TO_PREHEAT c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:11227 ../../Firmware/messages.cpp:212
+#: ../../Firmware/Marlin_main.cpp:11228 ../../Firmware/messages.cpp:212
 msgid "Press the knob to preheat nozzle and continue."
 msgstr "Pro nahřátí trysky a pokračování stiskněte tlačítko."
 
@@ -1811,7 +1811,7 @@ msgid "SELECTOR CANNOT MOVE"
 msgstr "SELEKTOR SE NEHÝBE"
 
 #. MSG_STOPPED c=20
-#: ../../Firmware/Marlin_main.cpp:9887 ../../Firmware/messages.cpp:125
+#: ../../Firmware/Marlin_main.cpp:9888 ../../Firmware/messages.cpp:125
 msgid "STOPPED."
 msgstr "ZASTAVENO."
 
@@ -1946,7 +1946,7 @@ msgid "Show end stops"
 msgstr "Stav konc. spín."
 
 #. MSG_SILENT c=7
-#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:120
+#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:120
 #: ../../Firmware/ultralcd.cpp:4155 ../../Firmware/ultralcd.cpp:4194
 msgid "Silent"
 msgstr "Tichý"

diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po
@@ -857,7 +857,7 @@ msgid "Heating"
 msgstr "Aufwärmen"
 
 #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:9647 ../../Firmware/messages.cpp:211
+#: ../../Firmware/Marlin_main.cpp:9648 ../../Firmware/messages.cpp:211
 msgid "Heating disabled by safety timer."
 msgstr "Heizung durch Sicherheitstimer deaktiviert."
 
@@ -1200,7 +1200,7 @@ msgid "Mesh Bed Leveling"
 msgstr "MeshBett Ausgleich"
 
 #. MSG_MODE c=6
-#: ../../Firmware/Marlin_main.cpp:8495 ../../Firmware/messages.cpp:117
+#: ../../Firmware/Marlin_main.cpp:8496 ../../Firmware/messages.cpp:117
 #: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:4132
 #: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4144
 #: ../../Firmware/ultralcd.cpp:4152 ../../Firmware/ultralcd.cpp:4155
@@ -1309,7 +1309,7 @@ msgid "None"
 msgstr "Ohne"
 
 #. MSG_NORMAL c=7
-#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:121
+#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:121
 #: ../../Firmware/ultralcd.cpp:4096 ../../Firmware/ultralcd.cpp:4132
 #: ../../Firmware/ultralcd.cpp:4511
 msgid "Normal"
@@ -1406,7 +1406,7 @@ msgid "Once"
 msgstr "Einmal"
 
 #. MSG_PAUSED_THERMAL_ERROR c=20
-#: ../../Firmware/Marlin_main.cpp:9861 ../../Firmware/messages.cpp:186
+#: ../../Firmware/Marlin_main.cpp:9862 ../../Firmware/messages.cpp:186
 msgid "PAUSED THERMAL ERROR"
 msgstr "PAUSE THERM. FEHLER"
 
@@ -1553,7 +1553,7 @@ msgid "Please place steel sheet on heatbed."
 msgstr "Legen Sie das Stahlblech auf das Heizbett."
 
 #. MSG_PRESS_TO_UNLOAD c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:11215 ../../Firmware/Marlin_main.cpp:11245
+#: ../../Firmware/Marlin_main.cpp:11216 ../../Firmware/Marlin_main.cpp:11246
 #: ../../Firmware/messages.cpp:84
 msgid "Please press the knob to unload filament"
 msgstr "Drücken Sie den Knopf um das Filament zu entladen."
@@ -1590,7 +1590,7 @@ msgid "Please upgrade."
 msgstr "Bitte aktualisieren."
 
 #. MSG_PLEASE_WAIT c=20
-#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8090
+#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8091
 #: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:2179
 #: ../../Firmware/ultralcd.cpp:2190
 msgid "Please wait"
@@ -1650,7 +1650,7 @@ msgid "Press the knob"
 msgstr "Knopf drücken zum"
 
 #. MSG_PRESS_TO_PREHEAT c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:11227 ../../Firmware/messages.cpp:212
+#: ../../Firmware/Marlin_main.cpp:11228 ../../Firmware/messages.cpp:212
 msgid "Press the knob to preheat nozzle and continue."
 msgstr "Drücken Sie den Knopf um die Düse vorzuheizen und fortzufahren."
 
@@ -1831,7 +1831,7 @@ msgid "SELECTOR CANNOT MOVE"
 msgstr "SELEKTOR SITZT FEST"
 
 #. MSG_STOPPED c=20
-#: ../../Firmware/Marlin_main.cpp:9887 ../../Firmware/messages.cpp:125
+#: ../../Firmware/Marlin_main.cpp:9888 ../../Firmware/messages.cpp:125
 msgid "STOPPED."
 msgstr "GESTOPPT."
 
@@ -1968,7 +1968,7 @@ msgid "Show end stops"
 msgstr "Endschalter Status"
 
 #. MSG_SILENT c=7
-#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:120
+#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:120
 #: ../../Firmware/ultralcd.cpp:4155 ../../Firmware/ultralcd.cpp:4194
 msgid "Silent"
 msgstr "Leise"

diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po
@@ -861,7 +861,7 @@ msgid "Heating"
 msgstr "Calentando..."
 
 #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:9647 ../../Firmware/messages.cpp:211
+#: ../../Firmware/Marlin_main.cpp:9648 ../../Firmware/messages.cpp:211
 msgid "Heating disabled by safety timer."
 msgstr "Calentadores desactivados por el temporizador de seguridad."
 
@@ -1197,7 +1197,7 @@ msgid "Mesh Bed Leveling"
 msgstr "Nivela. Malla Base"
 
 #. MSG_MODE c=6
-#: ../../Firmware/Marlin_main.cpp:8495 ../../Firmware/messages.cpp:117
+#: ../../Firmware/Marlin_main.cpp:8496 ../../Firmware/messages.cpp:117
 #: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:4132
 #: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4144
 #: ../../Firmware/ultralcd.cpp:4152 ../../Firmware/ultralcd.cpp:4155
@@ -1306,7 +1306,7 @@ msgid "None"
 msgstr "Ninguno"
 
 #. MSG_NORMAL c=7
-#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:121
+#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:121
 #: ../../Firmware/ultralcd.cpp:4096 ../../Firmware/ultralcd.cpp:4132
 #: ../../Firmware/ultralcd.cpp:4511
 msgid "Normal"
@@ -1406,7 +1406,7 @@ msgid "Once"
 msgstr "Una vez"
 
 #. MSG_PAUSED_THERMAL_ERROR c=20
-#: ../../Firmware/Marlin_main.cpp:9861 ../../Firmware/messages.cpp:186
+#: ../../Firmware/Marlin_main.cpp:9862 ../../Firmware/messages.cpp:186
 msgid "PAUSED THERMAL ERROR"
 msgstr "PAUSA ERROR TÉRMICO"
 
@@ -1551,7 +1551,7 @@ msgid "Please place steel sheet on heatbed."
 msgstr "Coloca la lam. de acero en la base."
 
 #. MSG_PRESS_TO_UNLOAD c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:11215 ../../Firmware/Marlin_main.cpp:11245
+#: ../../Firmware/Marlin_main.cpp:11216 ../../Firmware/Marlin_main.cpp:11246
 #: ../../Firmware/messages.cpp:84
 msgid "Please press the knob to unload filament"
 msgstr "Pulsa el dial para descargar el filamento"
@@ -1588,7 +1588,7 @@ msgid "Please upgrade."
 msgstr "Actualiza por favor."
 
 #. MSG_PLEASE_WAIT c=20
-#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8090
+#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8091
 #: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:2179
 #: ../../Firmware/ultralcd.cpp:2190
 msgid "Please wait"
@@ -1648,7 +1648,7 @@ msgid "Press the knob"
 msgstr "Pulsa el dial"
 
 #. MSG_PRESS_TO_PREHEAT c=20 r=4
-#: ../../Firmware/Marlin_main.cpp:11227 ../../Firmware/messages.cpp:212
+#: ../../Firmware/Marlin_main.cpp:11228 ../../Firmware/messages.cpp:212
 msgid "Press the knob to preheat nozzle and continue."
 msgstr "Pulsa el dial para precalentar la boquilla y continue."
 
@@ -1829,7 +1829,7 @@ msgid "SELECTOR CANNOT MOVE"
 msgstr "SELECT. SIN MOVERSE"
 
 #. MSG_STOPPED c=20
-#: ../../Firmware/Marlin_main.cpp:9887 ../../Firmware/messages.cpp:125
+#: ../../Firmware/Marlin_main.cpp:9888 ../../Firmware/messages.cpp:125
 msgid "STOPPED."
 msgstr "PARADA"
 
@@ -1970,7 +1970,7 @@ msgid "Show end stops"
 msgstr "Mostrar endstops"
 
 #. MSG_SILENT c=7
-#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:120
+#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:120
 #: ../../Firmware/ultralcd.cpp:4155 ../../Firmware/ultralcd.cpp:4194
 msgid "Silent"
 msgstr "Acallar"