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

Update MSG_SEVER_SKEW and MSG_SLIGHT_SKEW message to c=14 

Changed and tested Support-> "XYZ cal. details" LCD output
This commit is contained in:
3d-gussner 2021-04-26 12:39:13 +02:00
parent 79f6095bcc
commit b522ef4812
9 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Firmware/ultralcd.cpp
View File

@ -2745,8 +2745,8 @@ void lcd_move_e()
//! |01234567890123456789| //! |01234567890123456789|
//! |Y distance from min | MSG_Y_DIST_FROM_MIN //! |Y distance from min | MSG_Y_DIST_FROM_MIN
//! | -------------- | STR_SEPARATOR //! | -------------- | STR_SEPARATOR
//! |Left: 00.00mm | MSG_LEFT c=10, c=8 //! |Left: 00.00mm| MSG_LEFT c=10, c=8
//! |Right: 00.00mm | MSG_RIGHT c=10, c=8 //! |Right: 00.00mm| MSG_RIGHT c=10, c=8
//! ---------------------- //! ----------------------
//! @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.
@ -2786,10 +2786,10 @@ float _deg(float rad)
//! //!
//! @code{.unparsed} //! @code{.unparsed}
//! |01234567890123456789| //! |01234567890123456789|
//! |Measured skew: 0.00D| MSG_MEASURED_SKEW, c=4 //! |Measured skew :0.00D| MSG_MEASURED_SKEW c=14, c=4
//! | -------------- | STR_SEPARATOR //! | -------------- | STR_SEPARATOR
//! |Slight skew: 0.12D| MSG_SLIGHT_SKEW, c=4 //! |Slight skew :0.12D| MSG_SLIGHT_SKEW c=14, c=4
//! |Severe skew: 0.25D| MSG_SEVERE_SKEW, c=4 //! |Severe skew :0.25D| MSG_SEVERE_SKEW c=14, c=4
//! ---------------------- //! ----------------------
//! D - Degree sysmbol LCD_STR_DEGREE //! D - Degree sysmbol LCD_STR_DEGREE
//! @endcode //! @endcode
@ -2799,15 +2799,15 @@ static void lcd_menu_xyz_skew()
float angleDiff = eeprom_read_float((float*)(EEPROM_XYZ_CAL_SKEW)); float angleDiff = eeprom_read_float((float*)(EEPROM_XYZ_CAL_SKEW));
lcd_home(); lcd_home();
lcd_printf_P(_N( lcd_printf_P(_N(
"%S:\n" "%-14.14S:\n"
"%S\n" "%S\n"
"%-15.15S%3.2f\x01\n" "%-14.14S:%3.2f\x01\n"
"%-15.15S%3.2f\x01" "%-14.14S:%3.2f\x01"
), ),
_i("Measured skew"), ////MSG_MEASURED_SKEW c=13 _i("Measured skew"), ////MSG_MEASURED_SKEW c=14
separator, separator,
_i("Slight skew:"), _deg(bed_skew_angle_mild), ////MSG_SLIGHT_SKEW c=13, c=4 _i("Slight skew"), _deg(bed_skew_angle_mild), ////MSG_SLIGHT_SKEW c=14, c=4
_i("Severe skew:"), _deg(bed_skew_angle_extreme) ////MSG_SEVERE_SKEW c=13, c=4 _i("Severe skew"), _deg(bed_skew_angle_extreme) ////MSG_SEVERE_SKEW c=14, c=4
); );
if (angleDiff < 100){ if (angleDiff < 100){
lcd_set_cursor(15,0); lcd_set_cursor(15,0);
@ -2825,8 +2825,8 @@ static void lcd_menu_xyz_skew()
//! |01234567890123456789| //! |01234567890123456789|
//! |[0;0] point offset | MSG_MEASURED_OFFSET c=20 //! |[0;0] point offset | MSG_MEASURED_OFFSET c=20
//! | -------------- | STR_SEPARATOR //! | -------------- | STR_SEPARATOR
//! |X: 000.00mm| c=10 //! |X 00.00mm| c=10
//! |Y: 000.00mm| c=10 //! |Y 00.00mm| c=10
//! ---------------------- //! ----------------------
//! @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.
@ -2844,9 +2844,9 @@ static void lcd_menu_xyz_offset()
for (uint_least8_t i = 0; i < 2; i++) for (uint_least8_t i = 0; i < 2; i++)
{ {
lcd_set_cursor((cntr[i] < 0) ? 10 : 11, i+2); lcd_set_cursor((cntr[i] < 0) ? 13 : 14, i+2);
lcd_print(cntr[i]); lcd_print(cntr[i]);
lcd_puts_at_P(16, i + 2, PSTR("mm")); lcd_puts_at_P(18, i + 2, PSTR("mm"));
} }
menu_back_if_clicked(); menu_back_if_clicked();
} }

10
lang/lang_en.txt
View File

@ -448,7 +448,7 @@
#MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 #MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4
"MMU OK. Resuming temperature..." "MMU OK. Resuming temperature..."
#MSG_MEASURED_SKEW c=13 #MSG_MEASURED_SKEW c=14
"Measured skew" "Measured skew"
#MSG_MMU_FAILS c=15 #MSG_MMU_FAILS c=15
@ -778,8 +778,8 @@
#MSG_SORT_TIME c=8 #MSG_SORT_TIME c=8
"Time" "Time"
#MSG_SEVERE_SKEW c=13 #MSG_SEVERE_SKEW c=14
"Severe skew:" "Severe skew"
#MSG_SORT_ALPHA c=8 #MSG_SORT_ALPHA c=8
"Alphabet" "Alphabet"
@ -790,8 +790,8 @@
#MSG_SOUND_LOUD c=7 #MSG_SOUND_LOUD c=7
"Loud" "Loud"
#MSG_SLIGHT_SKEW c=13 #MSG_SLIGHT_SKEW c=14
"Slight skew:" "Slight skew"
#MSG_SOUND c=7 #MSG_SOUND c=7
"Sound" "Sound"

10
lang/lang_en_cz.txt
View File

@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..." "MMU OK. Resuming temperature..."
"MMU OK. Pokracuji v nahrivani..." "MMU OK. Pokracuji v nahrivani..."
#MSG_MEASURED_SKEW c=13 #MSG_MEASURED_SKEW c=14
"Measured skew" "Measured skew"
"Merene zkos." "Merene zkos."
@ -1038,9 +1038,9 @@
"Time" "Time"
"Cas" "Cas"
#MSG_SEVERE_SKEW c=13 #MSG_SEVERE_SKEW c=14
"Severe skew:" "Severe skew"
"Tezke zkos.:" "Tezke zkos."
#MSG_SORT_ALPHA c=8 #MSG_SORT_ALPHA c=8
"Alphabet" "Alphabet"
@ -1054,7 +1054,7 @@
"Loud" "Loud"
"Hlasity" "Hlasity"
#MSG_SLIGHT_SKEW c=13 #MSG_SLIGHT_SKEW c=14
"Slight skew:" "Slight skew:"
"Lehke zkos.:" "Lehke zkos.:"

14
lang/lang_en_de.txt
View File

@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..." "MMU OK. Resuming temperature..."
"MMU OK. Temperatur wiederherstellen..." "MMU OK. Temperatur wiederherstellen..."
#MSG_MEASURED_SKEW c=13 #MSG_MEASURED_SKEW c=14
"Measured skew" "Measured skew"
"Schraeglauf" "Schraeglauf"
@ -1038,9 +1038,9 @@
"Time" "Time"
"Zeit" "Zeit"
#MSG_SEVERE_SKEW c=13 #MSG_SEVERE_SKEW c=14
"Severe skew:" "Severe skew"
"Schwer.Schr:" "Sehr Schraeg"
#MSG_SORT_ALPHA c=8 #MSG_SORT_ALPHA c=8
"Alphabet" "Alphabet"
@ -1054,9 +1054,9 @@
"Loud" "Loud"
"Laut" "Laut"
#MSG_SLIGHT_SKEW c=13 #MSG_SLIGHT_SKEW c=14
"Slight skew:" "Slight skew"
"Leicht.Schr:" "Leicht Schraeg"
#MSG_SOUND c=7 #MSG_SOUND c=7
"Sound" "Sound"

16
lang/lang_en_es.txt
View File

@ -598,9 +598,9 @@
"MMU OK. Resuming temperature..." "MMU OK. Resuming temperature..."
"MMU OK. Restaurando temperatura..." "MMU OK. Restaurando temperatura..."
#MSG_MEASURED_SKEW c=13 #MSG_MEASURED_SKEW c=14
"Measured skew" "Measured skew"
"Desviacion med:" "Desviacion med"
#MSG_MMU_FAILS c=15 #MSG_MMU_FAILS c=15
"MMU fails" "MMU fails"
@ -1038,9 +1038,9 @@
"Time" "Time"
"Fecha" "Fecha"
#MSG_SEVERE_SKEW c=13 #MSG_SEVERE_SKEW c=14
"Severe skew:" "Severe skew"
"Incl.severa:" "Severo sesgar"
#MSG_SORT_ALPHA c=8 #MSG_SORT_ALPHA c=8
"Alphabet" "Alphabet"
@ -1054,9 +1054,9 @@
"Loud" "Loud"
"Alto" "Alto"
#MSG_SLIGHT_SKEW c=13 #MSG_SLIGHT_SKEW c=14
"Slight skew:" "Slight skew"
"Liger.incl.:" "Ligera sesgar"
#MSG_SOUND c=7 #MSG_SOUND c=7
"Sound" "Sound"

14
lang/lang_en_fr.txt
View File

@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..." "MMU OK. Resuming temperature..."
"MMU OK. Rechauffage de la buse..." "MMU OK. Rechauffage de la buse..."
#MSG_MEASURED_SKEW c=13 #MSG_MEASURED_SKEW c=14
"Measured skew" "Measured skew"
"Var. mesuree" "Var. mesuree"
@ -1038,9 +1038,9 @@
"Time" "Time"
"Heure" "Heure"
#MSG_SEVERE_SKEW c=13 #MSG_SEVERE_SKEW c=14
"Severe skew:" "Severe skew"
"Deviat.sev.:" "Deviat.sev."
#MSG_SORT_ALPHA c=8 #MSG_SORT_ALPHA c=8
"Alphabet" "Alphabet"
@ -1054,9 +1054,9 @@
"Loud" "Loud"
"Fort" "Fort"
#MSG_SLIGHT_SKEW c=13 #MSG_SLIGHT_SKEW c=14
"Slight skew:" "Slight skew"
"Deviat.leg.:" "Deviat.leg."
#MSG_SOUND c=7 #MSG_SOUND c=7
"Sound" "Sound"

14
lang/lang_en_it.txt
View File

@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..." "MMU OK. Resuming temperature..."
"MMU OK. Ripristino temperatura..." "MMU OK. Ripristino temperatura..."
#MSG_MEASURED_SKEW c=13 #MSG_MEASURED_SKEW c=14
"Measured skew" "Measured skew"
"Dev. misurata" "Dev. misurata"
@ -1038,9 +1038,9 @@
"Time" "Time"
"Cron." "Cron."
#MSG_SEVERE_SKEW c=13 #MSG_SEVERE_SKEW c=14
"Severe skew:" "Severe skew"
"Devia.grave:" "Devia.grave"
#MSG_SORT_ALPHA c=8 #MSG_SORT_ALPHA c=8
"Alphabet" "Alphabet"
@ -1054,9 +1054,9 @@
"Loud" "Loud"
"Forte" "Forte"
#MSG_SLIGHT_SKEW c=13 #MSG_SLIGHT_SKEW c=14
"Slight skew:" "Slight skew"
"Devia.lieve:" "Devia.lieve"
#MSG_SOUND c=7 #MSG_SOUND c=7
"Sound" "Sound"

14
lang/lang_en_nl.txt
View File

@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..." "MMU OK. Resuming temperature..."
"MMU OK. Temperatuur hervatten..." "MMU OK. Temperatuur hervatten..."
#MSG_MEASURED_SKEW c=13 #MSG_MEASURED_SKEW c=14
"Measured skew" "Measured skew"
"Scheefheid" "Scheefheid"
@ -1038,9 +1038,9 @@
"Time" "Time"
"Tijd" "Tijd"
#MSG_SEVERE_SKEW c=13 #MSG_SEVERE_SKEW c=14
"Severe skew:" "Severe skew"
"Erg scheef:" "Erg scheef"
#MSG_SORT_ALPHA c=8 #MSG_SORT_ALPHA c=8
"Alphabet" "Alphabet"
@ -1054,9 +1054,9 @@
"Loud" "Loud"
"Hard" "Hard"
#MSG_SLIGHT_SKEW c=13 #MSG_SLIGHT_SKEW c=14
"Slight skew:" "Slight skew"
"Iets scheef:" "Beetje scheef"
#MSG_SOUND c=7 #MSG_SOUND c=7
"Sound" "Sound"

14
lang/lang_en_pl.txt
View File

@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..." "MMU OK. Resuming temperature..."
"MMU OK. Wznawiam nagrzewanie..." "MMU OK. Wznawiam nagrzewanie..."
#MSG_MEASURED_SKEW c=13 #MSG_MEASURED_SKEW c=14
"Measured skew" "Measured skew"
"Zmierzony skos" "Zmierzony skos"
@ -1038,9 +1038,9 @@
"Time" "Time"
"Czas" "Czas"
#MSG_SEVERE_SKEW c=13 #MSG_SEVERE_SKEW c=14
"Severe skew:" "Severe skew"
"Znaczny skos:" "Znaczny skos"
#MSG_SORT_ALPHA c=8 #MSG_SORT_ALPHA c=8
"Alphabet" "Alphabet"
@ -1054,9 +1054,9 @@
"Loud" "Loud"
"Glosny" "Glosny"
#MSG_SLIGHT_SKEW c=13 #MSG_SLIGHT_SKEW c=14
"Slight skew:" "Slight skew"
"Lekki skos:" "Lekki skos"
#MSG_SOUND c=7 #MSG_SOUND c=7
"Sound" "Sound"