From 539cdbfeeaaf2036507179678de557e4fb6d083e Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Sat, 17 Sep 2022 08:48:56 +0200 Subject: [PATCH] Lower MSG_ rows --- Firmware/Marlin_main.cpp | 2 +- Firmware/cmdqueue.cpp | 2 +- Firmware/messages.cpp | 2 +- Firmware/temp_model.h | 2 +- lang/po/Firmware.pot | 2 +- lang/po/Firmware_cs.po | 2 +- lang/po/Firmware_da.po | 2 +- lang/po/Firmware_de.po | 2 +- lang/po/Firmware_es.po | 2 +- lang/po/Firmware_fr.po | 2 +- lang/po/Firmware_hr.po | 2 +- lang/po/Firmware_hu.po | 2 +- lang/po/Firmware_it.po | 2 +- lang/po/Firmware_lb.po | 2 +- lang/po/Firmware_lt.po | 2 +- lang/po/Firmware_nl.po | 2 +- lang/po/Firmware_no.po | 2 +- lang/po/Firmware_pl.po | 2 +- lang/po/Firmware_ro.po | 2 +- lang/po/Firmware_sk.po | 2 +- lang/po/Firmware_sl.po | 2 +- lang/po/Firmware_sv.po | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d7dfcb280..7fba2c336 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1791,7 +1791,7 @@ void loop() // The first character in the block is the block type. char *ptr = cmdbuffer + bufindr; if (*ptr == CMDBUFFER_CURRENT_TYPE_SDCARD) { - // To support power panic, move the lenght of the command on the SD card to a planner buffer. + // To support power panic, move the length of the command on the SD card to a planner buffer. union { struct { char lo; diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 687f9cabc..d21327001 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -573,7 +573,7 @@ void get_command() // This is either an empty line, or a line with just a comment. // Continue to the following line, and continue accumulating the number of bytes // read from the sdcard into sd_count, - // so that the lenght of the already read empty lines and comments will be added + // so that the length of the already read empty lines and comments will be added // to the following non-empty line. return; // prevent cycling indefinitely - let manage_heaters do their job } diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 59dfb5d7d..17f18eac4 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -120,7 +120,7 @@ const char MSG_WIZARD_DONE[] PROGMEM_I1 = ISTR("All is done. Happy printing!"); const char MSG_WIZARD_HEATING[] PROGMEM_I1 = ISTR("Preheating nozzle. Please wait."); ////MSG_WIZARD_HEATING c=20 r=3 const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard from Calibration -> Wizard."); ////MSG_WIZARD_QUIT c=20 r=8 const char MSG_WIZARD_WELCOME[] PROGMEM_I1 = ISTR("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"); ////MSG_WIZARD_WELCOME c=20 r=7 -const char MSG_WIZARD_WELCOME_SHIPPING[] PROGMEM_I1 = ISTR("Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."); ////MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +const char MSG_WIZARD_WELCOME_SHIPPING[] PROGMEM_I1 = ISTR("Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."); ////MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////MSG_YES c=4 const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////MSG_V2_CALIBRATION c=18 const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); ////MSG_OFF c=3 diff --git a/Firmware/temp_model.h b/Firmware/temp_model.h index d2afcf973..d0e38da1b 100644 --- a/Firmware/temp_model.h +++ b/Firmware/temp_model.h @@ -5,7 +5,7 @@ #include "planner.h" -constexpr uint8_t TEMP_MODEL_CAL_S = 60; // Maximum recording lenght during calibration (s) +constexpr uint8_t TEMP_MODEL_CAL_S = 60; // Maximum recording length during calibration (s) constexpr uint8_t TEMP_MODEL_CAL_R_STEP = 4; // Fan interpolation steps during calibration constexpr float TEMP_MODEL_fS = 0.065; // simulation filter (1st-order IIR factor) constexpr float TEMP_MODEL_fE = 0.05; // error filter (1st-order IIR factor) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 41067b429..0364d66b0 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -832,7 +832,7 @@ msgstr "" msgid "Heating done." msgstr "" -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:4008 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 89121bb26..0be9e6104 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -719,7 +719,7 @@ msgstr "Zahrivani preruseno bezpecnostnim casovacem." msgid "Heating done." msgstr "Zahrivani OK." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_da.po b/lang/po/Firmware_da.po index 27e48f756..6a0888715 100644 --- a/lang/po/Firmware_da.po +++ b/lang/po/Firmware_da.po @@ -696,7 +696,7 @@ msgstr "" msgid "Heating done." msgstr "" -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 3a171667a..9e02a3284 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -862,7 +862,7 @@ msgstr "Heizung durch Sicherheitstimer deaktiviert." msgid "Heating done." msgstr "Aufwärmen OK." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:4008 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 1218825b0..75493c536 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -719,7 +719,7 @@ msgstr "Calentadores desactivados por el temporizador de seguridad." msgid "Heating done." msgstr "Calentando acabado." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 76deb83ad..e909fbc17 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -723,7 +723,7 @@ msgstr "Chauffage desactivee par le compteur de securite." msgid "Heating done." msgstr "Chauffe terminee." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 5635517fa..ac8cccf87 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -717,7 +717,7 @@ msgstr "Grijanje je onemoguceno sigurnosnim mjeracem vremena." msgid "Heating done." msgstr "Grijanje obavljeno." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 643ef8e51..74c304aa8 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -718,7 +718,7 @@ msgstr "A bizonsagi idozito leallitotta a futest" msgid "Heating done." msgstr "Futes kesz." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index f766cefe8..af2f5cd34 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -719,7 +719,7 @@ msgstr "Riscaldamento fermato dal timer di sicurezza." msgid "Heating done." msgstr "Riscald. completo" -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_lb.po b/lang/po/Firmware_lb.po index 800b627cf..6d25e2b56 100644 --- a/lang/po/Firmware_lb.po +++ b/lang/po/Firmware_lb.po @@ -696,7 +696,7 @@ msgstr "" msgid "Heating done." msgstr "" -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_lt.po b/lang/po/Firmware_lt.po index afce09b57..009357cab 100644 --- a/lang/po/Firmware_lt.po +++ b/lang/po/Firmware_lt.po @@ -696,7 +696,7 @@ msgstr "" msgid "Heating done." msgstr "" -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 6f2b3511f..1cc0b1ba9 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -721,7 +721,7 @@ msgstr "Verwarming uitgeschakeld door veiligheidstimer." msgid "Heating done." msgstr "Opwarmen klaar." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 142e47750..6d701550e 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -715,7 +715,7 @@ msgstr "Varme skrudd av pga. sikkerhet." msgid "Heating done." msgstr "Oppvarming ferdig." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index dbcc27cbb..536783e28 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -717,7 +717,7 @@ msgstr "Grzanie wylaczone przez wyl. czasowy" msgid "Heating done." msgstr "Grzanie zakonczone" -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 6ff603ccd..a07f11bdf 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -720,7 +720,7 @@ msgstr "Incalzirea dezactivata de timer-ul de siguranta" msgid "Heating done." msgstr "Incalzirea gata." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index bcb644d4c..2d0aa0c0d 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -717,7 +717,7 @@ msgstr "Zohrievanie prerusene bezpecnostnym casovacom." msgid "Heating done." msgstr "Zahrievanie OK." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_sl.po b/lang/po/Firmware_sl.po index ee19cef0b..79b794aff 100644 --- a/lang/po/Firmware_sl.po +++ b/lang/po/Firmware_sl.po @@ -696,7 +696,7 @@ msgstr "" msgid "Heating done." msgstr "" -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index da3bf6dca..28234e4c5 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -718,7 +718,7 @@ msgstr "Uppvärmning avaktiverad av säkerhetstimer." msgid "Heating done." msgstr "Uppvärmning klar." -#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=16 +#. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4050 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short "