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

Merge pull request #3830 from 3d-gussner/MK3_XYZ_cal_fix 

MK3: XYZ cal change message and add LCD ouput
This commit is contained in:
3d-gussner 2022-12-20 14:16:49 +01:00 committed by GitHub
parent 0bcb4ab59d 7fef570d1b
commit 9ca7760c2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/ultralcd.cpp
View File

@ -4025,7 +4025,7 @@ void lcd_wizard(WizState state)
else end = true;
break;
case S::Xyz:
lcd_show_fullscreen_message_and_wait_P(_i("I will run xyz calibration now. It will take approx. 12 mins."));////MSG_WIZARD_XYZ_CAL c=20 r=8
lcd_show_fullscreen_message_and_wait_P(_i("I will run xyz calibration now. It will take up to 24 mins."));////MSG_WIZARD_XYZ_CAL c=20 r=8
wizard_event = gcode_M45(false, 0);
if (wizard_event) {
#ifdef TEMP_MODEL

12
Firmware/xyzcal.cpp
View File

@ -135,10 +135,10 @@ pos_mm_t pos_2_mm(float pos){
return pos * 0.01f;
}
void xyzcal_meassure_enter(void)
void xyzcal_meassure_center(void)
{
DBG(_n("xyzcal_meassure_enter\n"));
DBG(_n("xyzcal_meassure_center\n"));
lcd_puts_at_P(4,3,PSTR("Measure center ")); ////MSG_MEASURE_CENTER c=16
// disable heaters and stop motion before we initialize sm4
disable_heater();
st_synchronize();
@ -158,6 +158,8 @@ void xyzcal_meassure_enter(void)
void xyzcal_meassure_leave(void)
{
DBG(_n("xyzcal_meassure_leave\n"));
lcd_set_cursor(4,3);
lcd_space(16);
// resync planner position from counters (changed by xyzcal_update_pos)
planner_reset_position();
@ -569,6 +571,8 @@ void __attribute__((noinline)) xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t
sm4_set_dir(X_AXIS, d);
//@size=242
DBG(_n("%d\n"), 64 - (r * 2 + d)); ///< to keep OctoPrint connection alive
lcd_set_cursor(4,3);
lcd_printf_P(PSTR("Countdown: %d "),64 - (r * 2 + d)); ////MSG_COUNTDOWN c=12
for (uint8_t c = 0; c < 32; c++){ ///< X axis
/// move to the next point and move Z up diagonally (if needed)
@ -1002,7 +1006,7 @@ BedSkewOffsetDetectionResultType xyzcal_scan_and_process(){
BedSkewOffsetDetectionResultType xyzcal_find_bed_induction_sensor_point_xy(void) {
// DBG(_n("xyzcal_find_bed_induction_sensor_point_xy x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]);
BedSkewOffsetDetectionResultType ret = BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND;
xyzcal_meassure_enter();
xyzcal_meassure_center();
if (xyzcal_searchZ())
ret = xyzcal_scan_and_process();
xyzcal_meassure_leave();

2
Firmware/xyzcal.h
View File

@ -5,7 +5,7 @@
#include "mesh_bed_calibration.h"
extern void xyzcal_meassure_enter(void);
extern void xyzcal_meassure_center(void);
extern void xyzcal_meassure_leave(void);

2
lang/po/Firmware.pot
View File

@ -873,7 +873,7 @@ msgstr ""
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr ""
#. MSG_WIZARD_Z_CAL c=20 r=8

4
lang/po/Firmware_cs.po
View File

@ -917,8 +917,8 @@ msgstr "Vent. hotendu:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgstr "Nyni provedu xyz kalibraci. Zabere to priblizne 12 min."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr "Nyni provedu xyz kalibraci. Zabere to až 24 min."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_de.po
View File

@ -924,9 +924,9 @@ msgstr "Hotend-Lüfter:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr ""
"Ich werde jetzt die XYZ-Kalibrierung durchführen. Es wird ca. 12 Minuten "
"Ich werde jetzt die XYZ-Kalibrierung durchführen. Es kan bis zu 24 Min."
"dauern."
#. MSG_WIZARD_Z_CAL c=20 r=8

4
lang/po/Firmware_es.po
View File

@ -920,8 +920,8 @@ msgstr "Vent. d. fusor:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgstr "Hare la calibracion XYZ. Tardara 12 min. aproximadamente."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr "Hare la calibracion XYZ. Puede tardar hasta 24 min."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_fr.po
View File

@ -925,9 +925,9 @@ msgstr "Vent. hotend:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr ""
"Je vais maintenant lancer la calibration XYZ. Cela prendra 12 min environ."
"Je vais maintenant lancer la calibration XYZ. Cela peut prendre jusqu'à 24 min."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_hr.po
View File

@ -917,8 +917,8 @@ msgstr "Hotend vent:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgstr "Sada cu pokrenuti xyz kalibraciju. Trebat ce cca. 12 min."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr "Sada cu pokrenuti xyz kalibraciju. Trebat ce do 24 min."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_hu.po
View File

@ -920,8 +920,8 @@ msgstr "Hotend vent.:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgstr "Lefuttatom az XYZ kalibraciot. Ez kb. 12 percet vesz igenybe."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr "Lefuttatom az XYZ kalibraciot. Ez akár 24 percig is eltarthat."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_it.po
View File

@ -921,8 +921,8 @@ msgstr "Ventola hotend:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgstr "Adesso avviero una Calibrazione XYZ. Puo durare circa 12 min."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr "Adesso avviero una Calibrazione XYZ. Puo durare fino a 24 min."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_nl.po
View File

@ -922,8 +922,8 @@ msgstr "Hotend fan:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgstr "Begin nu met xyz-kalibratie. Het duurt ongeveer 12 min."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr "Begin nu met xyz-kalibratie. Het kan tot 24 min. duren."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_no.po
View File

@ -914,8 +914,8 @@ msgstr "Hotend-vifte:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgstr "Nå skal jeg kjøre kalibreringen. Det tar ca. 12 min."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr "Nå skal jeg kjøre kalibreringen. Det kan ta opptil 24 min."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_pl.po
View File

@ -918,8 +918,8 @@ msgstr "Went. hotend:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgstr "Przeprowadze teraz kalibracje XYZ. Zajmie ok. 12 min."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr "Przeprowadze teraz kalibracje XYZ. Zajmie to do 24 min."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_ro.po
View File

@ -921,8 +921,8 @@ msgstr "Vent. hotend:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgstr "Voi rula calibrarea XYZ acum. Va dura aprox. 12 minute."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr "Voi rula calibrarea XYZ acum. Va dura până la 24 de min."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_sk.po
View File

@ -917,8 +917,8 @@ msgstr "Hotend vent.:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgstr "Teraz urobim XYZ kalibraciu. Zaberie to priblizne 12 min."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr "Teraz urobim XYZ kalibraciu. Zaberie to až 24 min."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038

4
lang/po/Firmware_sv.po
View File

@ -919,9 +919,9 @@ msgstr "Hotend-fläkt:"
#. MSG_WIZARD_XYZ_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4030
msgid "I will run xyz calibration now. It will take approx. 12 mins."
msgid "I will run xyz calibration now. It will take up to 24 mins."
msgstr ""
"Jag kommer att utföra en xyz-kalibrering nu. Det kommer att ta ca. 12 min."
"Jag kommer att utföra en xyz-kalibrering nu. Det tar upp till 24 min."
#. MSG_WIZARD_Z_CAL c=20 r=8
#: ../../Firmware/ultralcd.cpp:4038