Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pre-release 3.13.3 #4620

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Pre-release 3.13.3 #4620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Firmware/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ extern const char _sPrinterMmuName[] PROGMEM;
#ifndef CMAKE_CONTROL
#define FW_MAJOR 3
#define FW_MINOR 13
#define FW_REVISION 2
#define FW_COMMITNR 7080
#define FW_REVISION 3
#define FW_COMMITNR 7094
//#define FW_FLAVOR RC //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
Expand Down
57 changes: 28 additions & 29 deletions lang/po/Firmware.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,20 +120,20 @@ msgid "Back"
msgstr ""

#. MSG_BED c=13
#: ../../Firmware/Marlin_main.cpp:2023 ../../Firmware/Marlin_main.cpp:4628
#: ../../Firmware/Marlin_main.cpp:4679 ../../Firmware/messages.cpp:12
#: ../../Firmware/Marlin_main.cpp:2023 ../../Firmware/Marlin_main.cpp:4625
#: ../../Firmware/Marlin_main.cpp:4676 ../../Firmware/messages.cpp:12
#: ../../Firmware/ultralcd.cpp:1364 ../../Firmware/ultralcd.cpp:4164
msgid "Bed"
msgstr ""

#. MSG_BED_HEATING c=20
#: ../../Firmware/Marlin_main.cpp:6138 ../../Firmware/messages.cpp:14
#: ../../Firmware/Marlin_main.cpp:6135 ../../Firmware/messages.cpp:14
#: ../../Firmware/ultralcd.cpp:527
msgid "Bed Heating"
msgstr ""

#. MSG_BED_DONE c=20
#: ../../Firmware/Marlin_main.cpp:6175 ../../Firmware/messages.cpp:13
#: ../../Firmware/Marlin_main.cpp:6172 ../../Firmware/messages.cpp:13
#: ../../Firmware/ultralcd.cpp:530
msgid "Bed done"
msgstr ""
Expand All @@ -146,9 +146,8 @@ msgstr ""
#. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
#: ../../Firmware/Marlin_main.cpp:2204 ../../Firmware/Marlin_main.cpp:2974
#: ../../Firmware/Marlin_main.cpp:2984
#: ../../Firmware/mesh_bed_calibration.cpp:2870
#: ../../Firmware/mesh_bed_calibration.cpp:2878
#: ../../Firmware/mesh_bed_calibration.cpp:2904 ../../Firmware/messages.cpp:15
#: ../../Firmware/mesh_bed_calibration.cpp:2903 ../../Firmware/messages.cpp:15
msgid ""
"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for "
"reset."
Expand Down Expand Up @@ -676,7 +675,7 @@ msgid "Fil. sensor"
msgstr ""

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3483 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/Marlin_main.cpp:3480 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:3607
#: ../../Firmware/ultralcd.cpp:6711
msgid "Filament"
Expand Down Expand Up @@ -834,18 +833,18 @@ msgid "Heater/Thermistor"
msgstr ""

#. MSG_HEATING c=20
#: ../../Firmware/Marlin_main.cpp:6081 ../../Firmware/messages.cpp:49
#: ../../Firmware/Marlin_main.cpp:6078 ../../Firmware/messages.cpp:49
#: ../../Firmware/ultralcd.cpp:519
msgid "Heating"
msgstr ""

#. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
#: ../../Firmware/Marlin_main.cpp:9413
#: ../../Firmware/Marlin_main.cpp:9410
msgid "Heating disabled by safety timer."
msgstr ""

#. MSG_HEATING_COMPLETE c=20
#: ../../Firmware/Marlin_main.cpp:6112 ../../Firmware/messages.cpp:50
#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:50
#: ../../Firmware/ultralcd.cpp:522
msgid "Heating done."
msgstr ""
Expand Down Expand Up @@ -965,7 +964,7 @@ msgid "Is filament loaded?"
msgstr ""

#. MSG_STEEL_SHEET_CHECK c=20 r=3
#: ../../Firmware/Marlin_main.cpp:3265 ../../Firmware/Marlin_main.cpp:4746
#: ../../Firmware/Marlin_main.cpp:3265 ../../Firmware/Marlin_main.cpp:4743
#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:3852
msgid "Is steel sheet on heatbed?"
msgstr ""
Expand Down Expand Up @@ -1063,7 +1062,7 @@ msgid "Loading color"
msgstr ""

#. MSG_LOADING_FILAMENT c=20
#: ../../Firmware/Marlin_main.cpp:3610 ../../Firmware/messages.cpp:59
#: ../../Firmware/Marlin_main.cpp:3607 ../../Firmware/messages.cpp:59
#: ../../Firmware/mmu2_progress_converter.cpp:51
#: ../../Firmware/mmu2_reporting.cpp:360 ../../Firmware/ultralcd.cpp:2162
#: ../../Firmware/ultralcd.cpp:3709
Expand Down Expand Up @@ -1195,7 +1194,7 @@ msgstr ""

#. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3
#: ../../Firmware/Marlin_main.cpp:3246
#: ../../Firmware/mesh_bed_calibration.cpp:2848 ../../Firmware/messages.cpp:67
#: ../../Firmware/mesh_bed_calibration.cpp:2852 ../../Firmware/messages.cpp:67
msgid "Measuring reference height of calibration point"
msgstr ""

Expand Down Expand Up @@ -1306,7 +1305,7 @@ msgid "No SD card"
msgstr ""

#. MSG_NO_MOVE c=20
#: ../../Firmware/Marlin_main.cpp:5291
#: ../../Firmware/Marlin_main.cpp:5288
msgid "No move."
msgstr ""

Expand Down Expand Up @@ -1425,7 +1424,7 @@ msgid "Once"
msgstr ""

#. MSG_PAUSED_THERMAL_ERROR c=20
#: ../../Firmware/Marlin_main.cpp:9592 ../../Firmware/messages.cpp:177
#: ../../Firmware/Marlin_main.cpp:9589 ../../Firmware/messages.cpp:177
msgid "PAUSED THERMAL ERROR"
msgstr ""

Expand All @@ -1450,7 +1449,7 @@ msgid "PINDA Heating"
msgstr ""

#. MSG_PINDA_CALIBRATION c=13
#: ../../Firmware/Marlin_main.cpp:4791 ../../Firmware/Marlin_main.cpp:4893
#: ../../Firmware/Marlin_main.cpp:4788 ../../Firmware/Marlin_main.cpp:4890
#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:600
#: ../../Firmware/ultralcd.cpp:4486 ../../Firmware/ultralcd.cpp:4588
msgid "PINDA cal."
Expand All @@ -1462,7 +1461,7 @@ msgid "PINDA calibration failed"
msgstr ""

#. MSG_PINDA_CALIBRATION_DONE c=20 r=8
#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:118
#: ../../Firmware/Marlin_main.cpp:4965 ../../Firmware/messages.cpp:118
#: ../../Firmware/ultralcd.cpp:3212
msgid ""
"PINDA calibration is finished and active. It can be disabled in menu "
Expand Down Expand Up @@ -1550,7 +1549,7 @@ msgid "Please load filament first."
msgstr ""

#. MSG_CHECK_IDLER c=20 r=4
#: ../../Firmware/Marlin_main.cpp:3553
#: ../../Firmware/Marlin_main.cpp:3550
msgid "Please open idler and remove filament manually."
msgstr ""

Expand All @@ -1561,7 +1560,7 @@ msgid "Please place steel sheet on heatbed."
msgstr ""

#. MSG_PRESS_TO_UNLOAD c=20 r=4
#: ../../Firmware/Marlin_main.cpp:10902 ../../Firmware/Marlin_main.cpp:10932
#: ../../Firmware/Marlin_main.cpp:10899 ../../Firmware/Marlin_main.cpp:10929
#: ../../Firmware/messages.cpp:80
msgid "Please press the knob to unload filament"
msgstr ""
Expand All @@ -1577,13 +1576,13 @@ msgid "Please remove shipping helpers first."
msgstr ""

#. MSG_REMOVE_STEEL_SHEET c=20 r=4
#: ../../Firmware/Marlin_main.cpp:3267 ../../Firmware/Marlin_main.cpp:4756
#: ../../Firmware/Marlin_main.cpp:3267 ../../Firmware/Marlin_main.cpp:4753
#: ../../Firmware/messages.cpp:85
msgid "Please remove steel sheet from heatbed."
msgstr ""

#. MSG_RUN_XYZ c=20 r=4
#: ../../Firmware/Marlin_main.cpp:4732
#: ../../Firmware/Marlin_main.cpp:4729
msgid "Please run XYZ calibration first."
msgstr ""

Expand All @@ -1598,7 +1597,7 @@ msgid "Please upgrade."
msgstr ""

#. MSG_PLEASE_WAIT c=20
#: ../../Firmware/Marlin_main.cpp:3549 ../../Firmware/Marlin_main.cpp:7898
#: ../../Firmware/Marlin_main.cpp:3546 ../../Firmware/Marlin_main.cpp:7895
#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2152
#: ../../Firmware/ultralcd.cpp:2163
msgid "Please wait"
Expand Down Expand Up @@ -1663,7 +1662,7 @@ msgid "Press the knob"
msgstr ""

#. MSG_PRESS_TO_PREHEAT c=20 r=4
#: ../../Firmware/Marlin_main.cpp:10914
#: ../../Firmware/Marlin_main.cpp:10911
msgid "Press the knob to preheat nozzle and continue."
msgstr ""

Expand Down Expand Up @@ -1831,7 +1830,7 @@ msgid "SELECTOR CANNOT MOVE"
msgstr ""

#. MSG_STOPPED c=20
#: ../../Firmware/Marlin_main.cpp:9618 ../../Firmware/messages.cpp:116
#: ../../Firmware/Marlin_main.cpp:9615 ../../Firmware/messages.cpp:116
msgid "STOPPED."
msgstr ""

Expand All @@ -1854,7 +1853,7 @@ msgid ""
msgstr ""

#. MSG_SELECT_FILAMENT c=20
#: ../../Firmware/Marlin_main.cpp:3483 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/Marlin_main.cpp:3480 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:3606
#: ../../Firmware/ultralcd.cpp:6711
msgid "Select filament:"
Expand Down Expand Up @@ -2026,7 +2025,7 @@ msgid "Spinning"
msgstr ""

#. MSG_TEMP_CAL_WARNING c=20 r=4
#: ../../Firmware/Marlin_main.cpp:4745
#: ../../Firmware/Marlin_main.cpp:4742
msgid "Stable ambient temperature 21-26C is needed a rigid stand is required."
msgstr ""

Expand Down Expand Up @@ -2228,7 +2227,7 @@ msgid "Unload filament"
msgstr ""

#. MSG_UNLOADING_FILAMENT c=20
#: ../../Firmware/Marlin_main.cpp:3466 ../../Firmware/messages.cpp:120
#: ../../Firmware/Marlin_main.cpp:3463 ../../Firmware/messages.cpp:120
#: ../../Firmware/mmu2_progress_converter.cpp:50
#: ../../Firmware/ultralcd.cpp:4902
msgid "Unloading filament"
Expand Down Expand Up @@ -2272,7 +2271,7 @@ msgid ""
msgstr ""

#. MSG_USERWAIT c=20
#: ../../Firmware/Marlin_main.cpp:5260
#: ../../Firmware/Marlin_main.cpp:5257
msgid "Wait for user..."
msgstr ""

Expand Down Expand Up @@ -2308,7 +2307,7 @@ msgid "Warning: printer type changed."
msgstr ""

#. MSG_UNLOAD_SUCCESSFUL c=20 r=3
#: ../../Firmware/Marlin_main.cpp:3546
#: ../../Firmware/Marlin_main.cpp:3543
msgid "Was filament unload successful?"
msgstr ""

Expand Down
Loading
Loading