diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8827ccdf1..eb90d63ed 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4170,7 +4170,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 diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index e8689d3b5..b973f3a97 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -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 xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ 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(); diff --git a/Firmware/xyzcal.h b/Firmware/xyzcal.h index 8f908bbe4..77dc77619 100644 --- a/Firmware/xyzcal.h +++ b/Firmware/xyzcal.h @@ -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); diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 36dbe371b..2899e953c 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -722,8 +722,8 @@ msgid "Hotend fan:" msgstr "" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." +#: ../../Firmware/ultralcd.cpp:4030 +msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" #. MSG_WIZARD_Z_CAL c=20 r=8 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 56bba57e8..0f9e21e93 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -760,9 +760,9 @@ msgid "Hotend fan:" msgstr "Vent. hotendu:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." -msgstr "Nyni provedu xyz kalibraci. Zabere to priblizne 12 min." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index d68fe9241..22eb183d2 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -762,10 +762,10 @@ msgid "Hotend fan:" msgstr "Hotend-Lüfter:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." +#: ../../Firmware/ultralcd.cpp:4030 +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 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 43da735bf..79ab24f4c 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -761,9 +761,9 @@ msgid "Hotend fan:" msgstr "Vent. d. fusor:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." -msgstr "Hare la calibracion XYZ. Tardara 12 min. aproximadamente." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index ce22b7b50..600b21030 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -764,10 +764,10 @@ msgid "Hotend fan:" msgstr "Vent. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 37caa8a51..103868938 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -759,9 +759,9 @@ msgid "Hotend fan:" msgstr "Hotend vent:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." -msgstr "Sada cu pokrenuti xyz kalibraciju. Trebat ce cca. 12 min." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index ba44da976..658811a72 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -760,9 +760,9 @@ msgid "Hotend fan:" msgstr "Hotend vent.:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." -msgstr "Lefuttatom az XYZ kalibraciot. Ez kb. 12 percet vesz igenybe." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 5f22e4dc6..ffa628eee 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -761,9 +761,9 @@ msgid "Hotend fan:" msgstr "Ventola hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." -msgstr "Adesso avviero una Calibrazione XYZ. Puo durare circa 12 min." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index ea53f6437..62c9ce337 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -763,9 +763,9 @@ msgid "Hotend fan:" msgstr "Hotend fan:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." -msgstr "Begin nu met xyz-kalibratie. Het duurt ongeveer 12 min." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 2cebcb2a0..708006258 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -755,9 +755,9 @@ msgid "Hotend fan:" msgstr "Hotend-vifte:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -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." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 2f0ace98a..ea0521aea 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -758,9 +758,9 @@ msgid "Hotend fan:" msgstr "Went. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." -msgstr "Przeprowadze teraz kalibracje XYZ. Zajmie ok. 12 min." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 9a9999cca..11bd2246a 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -761,9 +761,9 @@ msgid "Hotend fan:" msgstr "Vent. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." -msgstr "Voi rula calibrarea XYZ acum. Va dura aprox. 12 minute." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index baad09c58..f6ba9dc2a 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -758,9 +758,9 @@ msgid "Hotend fan:" msgstr "Hotend vent.:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." -msgstr "Teraz urobim XYZ kalibraciu. Zaberie to priblizne 12 min." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index ab5293a4d..89df12da3 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -760,10 +760,10 @@ msgid "Hotend fan:" msgstr "Hotend-fläkt:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4094 -msgid "I will run xyz calibration now. It will take approx. 12 mins." +#: ../../Firmware/ultralcd.cpp:4030 +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:4102