3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3999 from 3d-gussner/MK3_312_Thermal_model

Browse Source 
PFW-1479: MK3_3.12 Change Temp model to Thermal model
This commit is contained in:
3d-gussner 2023-02-09 07:10:47 +01:00 committed by GitHub
commit c740bf923c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.cpp
View File

@ -164,7 +164,7 @@ const char MSG_IR_UNKNOWN[] PROGMEM_I1 = ISTR("unknown state");////MSG_IR_UNKNOW
extern const char MSG_PAUSED_THERMAL_ERROR[] PROGMEM_I1 = ISTR("PAUSED THERMAL ERROR");////MSG_PAUSED_THERMAL_ERROR c=20 extern const char MSG_PAUSED_THERMAL_ERROR[] PROGMEM_I1 = ISTR("PAUSED THERMAL ERROR");////MSG_PAUSED_THERMAL_ERROR c=20
#ifdef TEMP_MODEL #ifdef TEMP_MODEL
extern const char MSG_THERMAL_ANOMALY[] PROGMEM_I1 = ISTR("THERMAL ANOMALY");////MSG_THERMAL_ANOMALY c=20 extern const char MSG_THERMAL_ANOMALY[] PROGMEM_I1 = ISTR("THERMAL ANOMALY");////MSG_THERMAL_ANOMALY c=20
extern const char MSG_TM_NOT_CAL[] PROGMEM_I1 = ISTR("Temp model not calibrated yet.");////MSG_TM_NOT_CAL c=20 r=4 extern const char MSG_TM_NOT_CAL[] PROGMEM_I1 = ISTR("Thermal model not calibrated yet.");////MSG_TM_NOT_CAL c=20 r=4
extern const char MSG_TM_ACK_ERROR[] PROGMEM_I1 = ISTR("Clear TM error");////MSG_TM_ACK_ERROR c=18 extern const char MSG_TM_ACK_ERROR[] PROGMEM_I1 = ISTR("Clear TM error");////MSG_TM_ACK_ERROR c=18
#endif #endif
extern const char MSG_NOZZLE_CNG_MENU [] PROGMEM_I1 = ISTR("Nozzle change");////MSG_NOZZLE_CNG_MENU c=18 extern const char MSG_NOZZLE_CNG_MENU [] PROGMEM_I1 = ISTR("Nozzle change");////MSG_NOZZLE_CNG_MENU c=18

6
Firmware/ultralcd.cpp
View File

@ -4207,9 +4207,9 @@ void lcd_wizard(WizState state)
break; break;
#ifdef TEMP_MODEL #ifdef TEMP_MODEL
case S::TempModel: case S::TempModel:
lcd_show_fullscreen_message_and_wait_P(_i("Temp model cal. takes approx. 12 mins."));////MSG_TM_CAL c=20 r=4 lcd_show_fullscreen_message_and_wait_P(_i("Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"));////MSG_TM_CAL c=20 r=4
lcd_commands_type = LcdCommands::TempModel; lcd_commands_type = LcdCommands::TempModel;
end = true; // Leave wizard temporarily for Temp model cal. end = true; // Leave wizard temporarily for TM cal.
break; break;
#endif //TEMP_MODEL #endif //TEMP_MODEL
case S::IsFil: case S::IsFil:
@ -5040,7 +5040,7 @@ static void lcd_calibration_menu()
#endif #endif
} }
#ifdef TEMP_MODEL #ifdef TEMP_MODEL
MENU_ITEM_SUBMENU_P(_n("Temp Model cal."), lcd_temp_model_cal); MENU_ITEM_SUBMENU_P(_n("Thermal Model cal."), lcd_temp_model_cal);
#endif //TEMP_MODEL #endif //TEMP_MODEL
MENU_END(); MENU_END();

4
lang/po/Firmware.pot
View File

@ -1744,13 +1744,13 @@ msgstr ""
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "" msgstr ""
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "" msgstr ""
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18

8
lang/po/Firmware_cs.po
View File

@ -1806,14 +1806,14 @@ msgstr "TEPLOTNI VYJIMKA"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Kalibrace teplotního modelu trvá asi 12 minut." msgstr "Kalibrace termálního modelu trvá asi 12 minut. Viz\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Teplotní model zatím nebyl kalibrován." msgstr "Termálního model zatím nebyl kalibrován."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_de.po
View File

@ -1820,14 +1820,14 @@ msgstr "THERMISCHE ANOMALIE"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Tempmodell Kal. benötigt ca. 12 Min." msgstr "Thermomodell Kal. benötigt ca. 12 Min. Siehe\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Tempmodell noch unkalibriert." msgstr "Thermomodell noch unkalibriert."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_es.po
View File

@ -1823,14 +1823,14 @@ msgstr "ANOMALIA TERMICA"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Cal. modelo temp. tarda 12 mins. aprox." msgstr "Cal. modelo térmico tarda 12 mins. aprox. Mira\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Modelo temp. todavia sin cal." msgstr "Modelo térmico todavia sin cal."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_fr.po
View File

@ -1823,14 +1823,14 @@ msgstr "ANOMALIE THERMIQUE"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Cal. du modele temp. dure env. 12 min." msgstr "Cal. du modele thermique dure env. 12 min. Vois\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Modele de temp. non calibre." msgstr "Modele de thermique non calibre."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_hr.po
View File

@ -1813,14 +1813,14 @@ msgstr "TERMALNA ANOMALIJA"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Temp model kal. traje cca. 12 min." msgstr "Toplinski model kal. traje cca. 12 min. Pogledajte\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Temp model još nije kalibriran." msgstr "Toplinski model još nije kalibriran."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_hu.po
View File

@ -1815,14 +1815,14 @@ msgstr "Homersekl. anomalia"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Hőmérsékleti modell kal. kb. 12 percet." msgstr "Termikus modell kal. kb. 12 percet. Lásd\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "A hőmérsékleti modell még nincs kalibrálva." msgstr "A termikus modell még nincs kalibrálva."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_it.po
View File

@ -1816,14 +1816,14 @@ msgstr "ANOMALIA TERMICA"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Calib mod temp richiede circa 12 min." msgstr "Calib mod termico richiede circa 12 min. Vedere\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Modello temp non calibrato." msgstr "Modello termico non calibrato."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_nl.po
View File

@ -1822,14 +1822,14 @@ msgstr "THERMISCHE ANOMALIE"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Temp model kal. duurt ongeveer 12 min." msgstr "Thermo model kal. duurt ongeveer 12 min. Zie\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Temp model nog ongekalibreerd." msgstr "Thermo model nog ongekalibreerd."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_no.po
View File

@ -1797,14 +1797,14 @@ msgstr "THERMISK ANOMALI"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Temp modell kal. tar omtrent 12 min." msgstr "Termisk modell kal. tar omtrent 12 min. Se\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Temp modell ikke kalibrert enda." msgstr "Termisk modell ikke kalibrert enda."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_pl.po
View File

@ -1811,14 +1811,14 @@ msgstr "THERMAL ANOMALY"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Kal. modelu temp. moze zajac ok. 12min." msgstr "Kal. modelu termicznego trwa ok. 12min. Spójrz\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Model temp. nie zostal skalib." msgstr "Model termicznego nie zostal skalib."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_ro.po
View File

@ -1813,14 +1813,14 @@ msgstr "ANOMALIE TERMICA"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Cal. Model de temp dureaza aprox. 12 min." msgstr "Cal. Model termic dureaza aprox. 12 min. Vezi\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Modelul de temp. nu este inca calibrat." msgstr "Modelul termic nu este inca calibrat."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_sk.po
View File

@ -1805,14 +1805,14 @@ msgstr "THERMAL ANOMALY"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Výpočet teplotného modelu trvá približne 12 minút." msgstr "Výpočet termálny modelu trvá asi 12 min. Pozri\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Teplotný model zatiaľ nebol kalibrovaný" msgstr "Termálny model zatiaľ nebol kalibrovaný"
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816

8
lang/po/Firmware_sv.po
View File

@ -1814,14 +1814,14 @@ msgstr "TERMISK ANOMALI"
#. MSG_TM_CAL c=20 r=4 #. MSG_TM_CAL c=20 r=4
#: ../../Firmware/ultralcd.cpp:4054 #: ../../Firmware/ultralcd.cpp:4054
msgid "Temp model cal. takes approx. 12 mins." msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
msgstr "Temp modell kal. tar ca. 12 min." msgstr "Termisk modell kal. tar ca. 12 min. Kolla\nprusa.io/tm-cal"
#. MSG_TM_NOT_CAL c=20 r=4 #. MSG_TM_NOT_CAL c=20 r=4
#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
#: ../../Firmware/messages.cpp:170 #: ../../Firmware/messages.cpp:170
msgid "Temp model not calibrated yet." msgid "Thermal model not calibrated yet."
msgstr "Temp-modellen är inte kalibrerad ännu." msgstr "Termisk-modellen är inte kalibrerad ännu."
#. MSG_TEMPERATURE c=18 #. MSG_TEMPERATURE c=18
#: ../../Firmware/ultralcd.cpp:4816 #: ../../Firmware/ultralcd.cpp:4816