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

Update messsage and translations

This commit is contained in:
3d-gussner 2025-01-08 15:37:15 +01:00
parent e725e1a646
commit c38d965e94
19 changed files with 94 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -5841,7 +5841,7 @@ void process_commands()
} }
#ifdef STEEL_SHEET_TYPES #ifdef STEEL_SHEET_TYPES
if (eeprom_read_byte((uint8_t*)EEPROM_CHECK_SHEET_TYPE) == (uint8_t)ClCheckMode::_Always) { 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) { if (result == LCD_MIDDLE_BUTTON_CHOICE) {
print_stop(false, true); print_stop(false, true);
} }

3
Firmware/messages.cpp
View File

@ -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_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 const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////MSG_NOZZLE_DIAMETER c=10
#ifdef STEEL_SHEET_TYPES #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_CHECK_SHEET_TYPE[] PROGMEM_I1 = ISTR("Check selected steel sheet."); ////MSG_CHECK_SHEET_TYPE 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
#endif //STEEL_SHEET_TYPES #endif //STEEL_SHEET_TYPES
const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////MSG_MMU_MODE c=8 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 const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////MSG_SD_CARD c=8

3
Firmware/messages.h
View File

@ -162,8 +162,7 @@ extern const char MSG_NOZZLE_DIFFERS_CONTINUE[];
extern const char MSG_NOZZLE_DIFFERS_CANCELLED[]; extern const char MSG_NOZZLE_DIFFERS_CANCELLED[];
extern const char MSG_NOZZLE_DIAMETER[]; extern const char MSG_NOZZLE_DIAMETER[];
#ifdef STEEL_SHEET_TYPES #ifdef STEEL_SHEET_TYPES
extern const char MSG_SHEET_TYPE_CONTINUE[]; extern const char MSG_CHECK_SHEET_TYPE[];
extern const char MSG_SHEET_TYPE_CANCELLED[];
#endif //STEEL_SHEET_TYPES #endif //STEEL_SHEET_TYPES
extern const char MSG_MMU_MODE[]; extern const char MSG_MMU_MODE[];
extern const char MSG_SD_CARD[]; extern const char MSG_SD_CARD[];

14
Firmware/util.cpp
View File

@ -275,19 +275,17 @@ void fCheckModeInit() {
static void render_M862_warnings(const char* warning, const char* strict, uint8_t check) 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' 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) { if (lcd_show_multiscreen_message_cont_cancel_and_wait_P(warning, true, LCD_LEFT_BUTTON_CHOICE) == LCD_MIDDLE_BUTTON_CHOICE) {
lcd_print_stop(); lcd_print_stop();
} }
} else if (check == 2) { // Strict, always stop print } else if (check == 2) { // Strict, always stop print
lcd_show_fullscreen_message_and_wait_P(strict); lcd_show_fullscreen_message_and_wait_P(strict);
lcd_print_stop(); 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); SERIAL_PROTOCOLLN((int)oCheckSheets);
*/ */
render_M862_warnings( render_M862_warnings(
_T(MSG_SHEET_TYPE_CONTINUE) _T(MSG_CHECK_SHEET_TYPE)
,_T(MSG_SHEET_TYPE_CANCELLED) ,_T(MSG_CHECK_SHEET_TYPE) //Identical messages
,(uint8_t)oCheckSheets ,(uint8_t)oCheckSheets
); );
} }

2
Firmware/variants/MK3S.h
View File

@ -186,7 +186,7 @@
//#define DEBUG_PULLUP_CRASH //Test Pullup crash //#define DEBUG_PULLUP_CRASH //Test Pullup crash
//#define DEBUG_PRINTER_STATES //#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_BUILD
//#define DEBUG_SEC_LANG //secondary language debug output at startup //#define DEBUG_SEC_LANG //secondary language debug output at startup
//#define DEBUG_XFLASH //debug external spi flash //#define DEBUG_XFLASH //debug external spi flash

6
lang/po/Firmware.pot
View File

@ -272,6 +272,12 @@ msgstr ""
msgid "Changed correctly" msgid "Changed correctly"
msgstr "" 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 #. MSG_CHECKING_X c=20
#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:5930 #: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:5930
#: ../../Firmware/ultralcd.cpp:6955 #: ../../Firmware/ultralcd.cpp:6955

6
lang/po/Firmware_cs.po
View File

@ -2582,6 +2582,12 @@ msgstr "Není vložen filament."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Doporučujeme kalibraci osy Z. Spustit nyní?" 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." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." #~ msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho."

6
lang/po/Firmware_de.po
View File

@ -2609,6 +2609,12 @@ msgstr "Kein Filament geladen."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Z-Kalibrierung empfohlen. Jetzt ausführen?" 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." #~ 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." #~ msgstr "Entferne das alte Fil. und drücke den Knopf, um das neue zu laden."

6
lang/po/Firmware_es.po
View File

@ -2608,6 +2608,12 @@ msgstr "No hay ningún filamento cargado."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Se recomienda calibrar Z. ¿Ejecutarlo ahora?" 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." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "" #~ msgstr ""
#~ "Retira el fil. viejo y presiona el dial para comenzar a cargar el nuevo." #~ "Retira el fil. viejo y presiona el dial para comenzar a cargar el nuevo."

6
lang/po/Firmware_fr.po
View File

@ -2616,6 +2616,12 @@ msgstr "Il n'y a pas de filament chargé."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Calibrage Z recommandé. Exécuter maintenant?" 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." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "" #~ msgstr ""
#~ "Retirez l'ancien fil. puis appuyez sur le bouton pour charger le nouveau." #~ "Retirez l'ancien fil. puis appuyez sur le bouton pour charger le nouveau."

6
lang/po/Firmware_hr.po
View File

@ -2598,6 +2598,12 @@ msgstr "Nema umetnute niti."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Preporuča se Z kalibracija. Pokrenuti ga sada?" 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." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Uklonite stari fil. i pritisnite gumb za pocetak stavljanja novog." #~ msgstr "Uklonite stari fil. i pritisnite gumb za pocetak stavljanja novog."

6
lang/po/Firmware_hu.po
View File

@ -2606,6 +2606,12 @@ msgstr "Nincs befűzve filament."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Z kalibráció javasolt. Futtassam most?" 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." #~ 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." #~ msgstr "Vedd ki a regi fil., majd nyomd meg a gombot az uj fil. betoltesehez."

6
lang/po/Firmware_it.po
View File

@ -2604,6 +2604,12 @@ msgstr "Nessun filamento caricato."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Si consiglia la calibrazione Z. Eseguirla ora?" 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." #~ 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." #~ msgstr "Rimuovi il fil. precedente e premi la manopola per caricare il nuovo."

6
lang/po/Firmware_nl.po
View File

@ -2607,6 +2607,12 @@ msgstr "Geen filament geladen."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Z-kalibratie aanbevolen. Nu uitvoeren?" 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." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "" #~ msgstr ""
#~ "Verwijder de oude filament en druk op de knop om nieuwe filament te laden." #~ "Verwijder de oude filament en druk op de knop om nieuwe filament te laden."

6
lang/po/Firmware_no.po
View File

@ -2581,6 +2581,12 @@ msgstr "Det er ingen filament lastet."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Z-kalibrering anbefales. Kjøre det nå?" 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." #~ 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." #~ msgstr "Ta bort det gamle filamentet og trykk valghjulet for å laste et nytt."

6
lang/po/Firmware_pl.po
View File

@ -2595,6 +2595,12 @@ msgstr "Nie ma załadowanego filamentu."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Zalecana kalibracja Z. Uruchomić teraz?" 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." #~ 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." #~ msgstr "Wyciągnij poprzedni filament i naciśnij pokrętło aby załadować nowy."

6
lang/po/Firmware_ro.po
View File

@ -2605,6 +2605,12 @@ msgstr "Filamentul nu este detectat."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Calibrarea Z este recomandată. Calibrează acum?" 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." #~ 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." #~ msgstr "Scoateți fil. vechi și apăsați butonul pentru a încărca unul nou."

6
lang/po/Firmware_sk.po
View File

@ -2585,6 +2585,12 @@ msgstr "Nie je zavedený žiaden filament."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Odporúča sa kalibrácia Z. Spustiť ju teraz?" 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." #~ 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." #~ msgstr "Vyberte starý filament a stlačte tlačidlo pre zavedenie nového."

6
lang/po/Firmware_sv.po
View File

@ -2593,6 +2593,12 @@ msgstr "Det finns ingen filament laddad."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Z-kalibrering rekommenderas. Kör den nu?" 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." #~ 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." #~ msgstr "Ta bort det gamla fil. och tryck på knappen för att börja ladda nytt."