diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 374258dbd..be2e34732 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5841,7 +5841,7 @@ void process_commands() } #ifdef STEEL_SHEET_TYPES if (eeprom_read_byte((uint8_t*)EEPROM_CHECK_SHEET_TYPE) == (uint8_t)ClCheckMode::_Always) { - uint8_t result = lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_SHEET_TYPE_CONTINUE), false, LCD_MIDDLE_BUTTON_CHOICE); + uint8_t result = lcd_show_multiscreen_message_cont_cancel_and_wait_P(_T(MSG_CHECK_SHEET_TYPE), false, LCD_MIDDLE_BUTTON_CHOICE); if (result == LCD_MIDDLE_BUTTON_CHOICE) { print_stop(false, true); } diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index a0d87f3ce..c40fb5de4 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -160,8 +160,7 @@ const char MSG_NOZZLE_DIFFERS_CONTINUE[] PROGMEM_I1 = ISTR("Nozzle diameter diff const char MSG_NOZZLE_DIFFERS_CANCELLED[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Please check the value in settings."); ////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////MSG_NOZZLE_DIAMETER c=10 #ifdef STEEL_SHEET_TYPES -const char MSG_SHEET_TYPE_CONTINUE[] PROGMEM_I1 = ISTR("Check selected sheet. Continue?"); ////MSG_SHEET_TYPE_CONTINUE c=20 r=3 -const char MSG_SHEET_TYPE_CANCELLED[] PROGMEM_I1 = ISTR("Check selected sheet. Print cancelled."); ////MSG_SHEET_TYPE_CANCELLED c=20 r=4 +const char MSG_CHECK_SHEET_TYPE[] PROGMEM_I1 = ISTR("Check selected steel sheet."); ////MSG_CHECK_SHEET_TYPE c=20 r=3 #endif //STEEL_SHEET_TYPES const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////MSG_MMU_MODE c=8 const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////MSG_SD_CARD c=8 diff --git a/Firmware/messages.h b/Firmware/messages.h index 0251c21a2..80d70ae18 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -162,8 +162,7 @@ extern const char MSG_NOZZLE_DIFFERS_CONTINUE[]; extern const char MSG_NOZZLE_DIFFERS_CANCELLED[]; extern const char MSG_NOZZLE_DIAMETER[]; #ifdef STEEL_SHEET_TYPES -extern const char MSG_SHEET_TYPE_CONTINUE[]; -extern const char MSG_SHEET_TYPE_CANCELLED[]; +extern const char MSG_CHECK_SHEET_TYPE[]; #endif //STEEL_SHEET_TYPES extern const char MSG_MMU_MODE[]; extern const char MSG_SD_CARD[]; diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 2bf0bbc52..31f09d776 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -275,19 +275,17 @@ void fCheckModeInit() { static void render_M862_warnings(const char* warning, const char* strict, uint8_t check) { +#ifdef STEEL_SHEET_TYPES + if (check == 1 || check == 3) { // Warning, stop print if user selects 'No' +#else if (check == 1) { // Warning, stop print if user selects 'No' +#endif //STEEL_SHEET_TYPES if (lcd_show_multiscreen_message_cont_cancel_and_wait_P(warning, true, LCD_LEFT_BUTTON_CHOICE) == LCD_MIDDLE_BUTTON_CHOICE) { lcd_print_stop(); } } else if (check == 2) { // Strict, always stop print lcd_show_fullscreen_message_and_wait_P(strict); lcd_print_stop(); -#ifdef STEEL_SHEET_TYPES - } else if (check == 3 ) { // Always warn, stop print if user selects 'No' This doesn't time out - if (lcd_show_multiscreen_message_yes_no_and_wait_P(warning, false, LCD_LEFT_BUTTON_CHOICE) == LCD_MIDDLE_BUTTON_CHOICE) { - lcd_print_stop(); - } -#endif //STEEL_SHEET_TYPES } } @@ -453,8 +451,8 @@ void sheet_type_check(uint16_t nSheetType) { SERIAL_PROTOCOLLN((int)oCheckSheets); */ render_M862_warnings( - _T(MSG_SHEET_TYPE_CONTINUE) - ,_T(MSG_SHEET_TYPE_CANCELLED) + _T(MSG_CHECK_SHEET_TYPE) + ,_T(MSG_CHECK_SHEET_TYPE) //Identical messages ,(uint8_t)oCheckSheets ); } diff --git a/Firmware/variants/MK3S.h b/Firmware/variants/MK3S.h index 32d672d85..dd7ab91e3 100644 --- a/Firmware/variants/MK3S.h +++ b/Firmware/variants/MK3S.h @@ -186,7 +186,7 @@ //#define DEBUG_PULLUP_CRASH //Test Pullup crash //#define DEBUG_PRINTER_STATES -#define DEBUG_EEPROM_CHANGES //Uses +1188 bytes Flash +6 bytes SRAM +//#define DEBUG_EEPROM_CHANGES //Uses +1188 bytes Flash +6 bytes SRAM //#define DEBUG_BUILD //#define DEBUG_SEC_LANG //secondary language debug output at startup //#define DEBUG_XFLASH //debug external spi flash diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index b34318b7e..69c8c50d1 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -272,6 +272,12 @@ msgstr "" msgid "Changed correctly" msgstr "" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "" + #. MSG_CHECKING_X c=20 #: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:5930 #: ../../Firmware/ultralcd.cpp:6955 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index ae6ed0964..d0f81fcaa 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2582,6 +2582,12 @@ msgstr "Není vložen filament." msgid "Z calibration recommended. Run it now?" msgstr "Doporučujeme kalibraci osy Z. Spustit nyní?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Zkontrolujte tiskový plát." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 74be2eaea..bd1794e5b 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2609,6 +2609,12 @@ msgstr "Kein Filament geladen." msgid "Z calibration recommended. Run it now?" msgstr "Z-Kalibrierung empfohlen. Jetzt ausführen?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Überprüfe ausgewähltes Stahlblech." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "Entferne das alte Fil. und drücke den Knopf, um das neue zu laden." diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index cbf04c9bb..89ea230fc 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2608,6 +2608,12 @@ msgstr "No hay ningún filamento cargado." msgid "Z calibration recommended. Run it now?" msgstr "Se recomienda calibrar Z. ¿Ejecutarlo ahora?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Verifique la lámina de acero seleccionada." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "" #~ "Retira el fil. viejo y presiona el dial para comenzar a cargar el nuevo." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 599526a3d..38a922d72 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2616,6 +2616,12 @@ msgstr "Il n'y a pas de filament chargé." msgid "Z calibration recommended. Run it now?" msgstr "Calibrage Z recommandé. Exécuter maintenant?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Vérifiez la plaque en acier sélectionnée." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "" #~ "Retirez l'ancien fil. puis appuyez sur le bouton pour charger le nouveau." diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 02b27a9fa..5ba7c4d9f 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2598,6 +2598,12 @@ msgstr "Nema umetnute niti." msgid "Z calibration recommended. Run it now?" msgstr "Preporuča se Z kalibracija. Pokrenuti ga sada?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Provjerite odabrani čelični ploca." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "Uklonite stari fil. i pritisnite gumb za pocetak stavljanja novog." diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 04294cc5e..d82fbda6f 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2606,6 +2606,12 @@ msgstr "Nincs befűzve filament." msgid "Z calibration recommended. Run it now?" msgstr "Z kalibráció javasolt. Futtassam most?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Nezd meg a kiválasztott az acellapot." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "Vedd ki a regi fil., majd nyomd meg a gombot az uj fil. betoltesehez." diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 68f368afd..ee0ecd579 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2604,6 +2604,12 @@ msgstr "Nessun filamento caricato." msgid "Z calibration recommended. Run it now?" msgstr "Si consiglia la calibrazione Z. Eseguirla ora?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Controllare la piastra d'acciaio selezionata." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "Rimuovi il fil. precedente e premi la manopola per caricare il nuovo." diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 53f13d97e..a4267d17c 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2607,6 +2607,12 @@ msgstr "Geen filament geladen." msgid "Z calibration recommended. Run it now?" msgstr "Z-kalibratie aanbevolen. Nu uitvoeren?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Controleer de geselecteerde staalplaat." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "" #~ "Verwijder de oude filament en druk op de knop om nieuwe filament te laden." diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 49e21ab2e..61c05164d 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2581,6 +2581,12 @@ msgstr "Det er ingen filament lastet." msgid "Z calibration recommended. Run it now?" msgstr "Z-kalibrering anbefales. Kjøre det nå?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Sjekk valgt stålplaten." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "Ta bort det gamle filamentet og trykk valghjulet for å laste et nytt." diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 1383110b2..ba16d8d9a 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2595,6 +2595,12 @@ msgstr "Nie ma załadowanego filamentu." msgid "Z calibration recommended. Run it now?" msgstr "Zalecana kalibracja Z. Uruchomić teraz?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Sprawdź wybraną płyta stalowa." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "Wyciągnij poprzedni filament i naciśnij pokrętło aby załadować nowy." diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 2d498aa02..95617cf5a 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2605,6 +2605,12 @@ msgstr "Filamentul nu este detectat." msgid "Z calibration recommended. Run it now?" msgstr "Calibrarea Z este recomandată. Calibrează acum?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Verificați suprafața selectată." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "Scoateți fil. vechi și apăsați butonul pentru a încărca unul nou." diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index d03fcaa2a..79b7334cb 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2585,6 +2585,12 @@ msgstr "Nie je zavedený žiaden filament." msgid "Z calibration recommended. Run it now?" msgstr "Odporúča sa kalibrácia Z. Spustiť ju teraz?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Skontrolujte vybraný platňa." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "Vyberte starý filament a stlačte tlačidlo pre zavedenie nového." diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index c2e626c88..89c7d45c0 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2593,6 +2593,12 @@ msgstr "Det finns ingen filament laddad." msgid "Z calibration recommended. Run it now?" msgstr "Z-kalibrering rekommenderas. Kör den nu?" +#. MSG_CHECK_SHEET_TYPE c=20 r=3 +#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163 +#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455 +msgid "Check selected steel sheet." +msgstr "Kontrollera vald metallskivan." + #~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgstr "Ta bort det gamla fil. och tryck på knappen för att börja ladda nytt."