From a704b99d81a2ef3fa3f5659f59a5217d4b4ed448 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 16 Dec 2024 11:16:59 +0100 Subject: [PATCH 01/20] Fix multiple choice Fixes #4819 --- Firmware/ultralcd.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0faec8a90..baf9a8d4a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2266,11 +2266,25 @@ void show_preheat_nozzle_warning() void lcd_load_filament_color_check() { - uint8_t clean = lcd_show_multiscreen_message_with_choices_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, LCD_LEFT_BUTTON_CHOICE, _T(MSG_YES), _T(MSG_NO), _T(MSG_EJECT), 8); + // The total length of the individual messages MSG_YES c=4, MSG_NO c=4 and MSG_EJECT c=8 with the selectors and spaces between + // exceeds the LCD width. + // 01234567890123456789 + // >yyyy >nnnn >eeeeeeee + // As long the translations of MSG_YES, MSG_NO and MSG_EJECT combined length do not exceed 15 chars, we don't have to shorten + // the MSG_EJECT message/translation. We can set the second_col value to the length of the first choice + the selector and space. + // Examples: + // German + // 01234567890123456789 + // >Ja >Nein >Auswerf. + // Hungarian + // 01234567890123456789 + // >Igen >Nem >Kiadás + + uint8_t clean = lcd_show_multiscreen_message_with_choices_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, LCD_LEFT_BUTTON_CHOICE, _T(MSG_YES), _T(MSG_NO), _T(MSG_EJECT), strlen_P(_T(MSG_YES))+2); while (clean == LCD_MIDDLE_BUTTON_CHOICE) { load_filament_final_feed(); st_synchronize(); - clean = lcd_show_multiscreen_message_with_choices_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, LCD_LEFT_BUTTON_CHOICE, _T(MSG_YES), _T(MSG_NO), _T(MSG_EJECT), 8); + clean = lcd_show_multiscreen_message_with_choices_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, LCD_LEFT_BUTTON_CHOICE, _T(MSG_YES), _T(MSG_NO), _T(MSG_EJECT), strlen_P(_T(MSG_YES))+2); } if (clean == LCD_RIGHT_BUTTON_CHOICE) { unload_filament(FILAMENTCHANGE_FINALRETRACT); From 3ea620c27ae4ec61afda920ef65179eadd223552 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 16 Dec 2024 11:47:56 +0100 Subject: [PATCH 02/20] Eject translations in German and Dutch not shorten as it fits now the multiple choice. --- Firmware/messages.cpp | 2 +- Firmware/mmu2/errors_list.h | 2 +- Firmware/ultralcd.cpp | 4 ++-- lang/po/Firmware.pot | 2 +- lang/po/Firmware_cs.po | 2 +- lang/po/Firmware_de.po | 4 ++-- lang/po/Firmware_es.po | 2 +- lang/po/Firmware_fr.po | 2 +- lang/po/Firmware_hr.po | 2 +- lang/po/Firmware_hu.po | 2 +- lang/po/Firmware_it.po | 2 +- lang/po/Firmware_nl.po | 4 ++-- lang/po/Firmware_no.po | 2 +- lang/po/Firmware_pl.po | 2 +- lang/po/Firmware_ro.po | 2 +- lang/po/Firmware_sk.po | 2 +- lang/po/Firmware_sv.po | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 1c5a31c30..9fe3bc897 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -18,7 +18,7 @@ const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////MSG_BED_HEATI const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////MSG_BELT_STATUS c=18 -const char MSG_EJECT[] PROGMEM_I1 = ISTR("Eject"); ////MSG_EJECT c=8 +const char MSG_EJECT[] PROGMEM_I1 = ISTR("Eject"); ////MSG_EJECT c=9 const char MSG_CANCEL[] PROGMEM_I1 = ISTR(">Cancel");////MSG_CANCEL c=10 const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////MSG_CALIBRATE_Z_AUTO c=20 r=2 const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////MSG_CARD_MENU c=18 diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 8d64a00d2..9a88da1f3 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -355,7 +355,7 @@ static const char MSG_BTN_RETRY[] PROGMEM_I1 = ISTR("Retry"); ////MSG_BTN_RETRY static const char MSG_BTN_RESET_MMU[] PROGMEM_I1 = ISTR("ResetMMU"); ////MSG_BTN_RESET_MMU c=8 static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8 static const char MSG_BTN_LOAD[] PROGMEM_I1 = ISTR("Load"); ////MSG_BTN_LOAD c=8 -//static const char MSG_BTN_EJECT[] PROGMEM_I1 = ISTR("Eject"); //Reuse MSG_EJECT c=8 +//static const char MSG_BTN_EJECT[] PROGMEM_I1 = ISTR("Eject"); //Reuse MSG_EJECT c=9 //static const char MSG_BTN_TUNE_MMU[] PROGMEM_I1 = ISTR("Tune"); //Reuse MSG_TUNE c=8 static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=8 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=8 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index baf9a8d4a..7bf6133db 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2266,7 +2266,7 @@ void show_preheat_nozzle_warning() void lcd_load_filament_color_check() { - // The total length of the individual messages MSG_YES c=4, MSG_NO c=4 and MSG_EJECT c=8 with the selectors and spaces between + // The total length of the individual messages MSG_YES c=4, MSG_NO c=4 and MSG_EJECT c=9 with the selectors and spaces between // exceeds the LCD width. // 01234567890123456789 // >yyyy >nnnn >eeeeeeee @@ -2275,7 +2275,7 @@ void lcd_load_filament_color_check() // Examples: // German // 01234567890123456789 - // >Ja >Nein >Auswerf. + // >Ja >Nein >Auswerfen // Hungarian // 01234567890123456789 // >Igen >Nem >Kiadás diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 7ef7dc553..36458f974 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -470,7 +470,7 @@ msgstr "" msgid "ERROR:" msgstr "" -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 99c7b4478..d5df331dd 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2518,7 +2518,7 @@ msgstr "NEZNÁMÁ CHYBA" msgid "Unexpected error occurred." msgstr "Došlo k neočekávané chybě." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 52b3a6f20..a705b02b8 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2544,11 +2544,11 @@ msgstr "UNBEKANNTER FEHLER" msgid "Unexpected error occurred." msgstr "Ein unerwarteter Fehler ist aufgetreten." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" -msgstr "Auswerf." +msgstr "Auswerfen" #. MSG_TITLE_FILAMENT_CHANGE c=20 #: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:236 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 6eec2af07..7c77deb96 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2540,7 +2540,7 @@ msgstr "ERROR DESCONOCIDO" msgid "Unexpected error occurred." msgstr "Ocurrió un error inesperado." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index b05ee5932..108c0ce0d 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2553,7 +2553,7 @@ msgstr "ERREUR INCONNUE" msgid "Unexpected error occurred." msgstr "Une erreur inattendue s'est produite." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index dea20725d..849680974 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2535,7 +2535,7 @@ msgstr "NEPOZNATA POGREŠKA" msgid "Unexpected error occurred." msgstr "Došlo je do neočekivane pogreške." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 6a43dbb6f..34e5934bf 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2541,7 +2541,7 @@ msgstr "ISMERETLEN HIBA" msgid "Unexpected error occurred." msgstr "Váratlan hiba történt." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 093c82b9d..02d11664c 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2540,7 +2540,7 @@ msgstr "ERRORE SCONOSCIUTO" msgid "Unexpected error occurred." msgstr "Si è verificato un errore imprevisto." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index e587951fa..dfd41b1b8 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2543,11 +2543,11 @@ msgstr "ONBEKENDE FOUT" msgid "Unexpected error occurred." msgstr "Er is een onverwachte fout opgetreden." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" -msgstr "Uitwerp." +msgstr "Uitwerpen" #. MSG_TITLE_FILAMENT_CHANGE c=20 #: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:236 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index a3aceb78c..0c47128b7 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2517,7 +2517,7 @@ msgstr "UKJENT FEIL" msgid "Unexpected error occurred." msgstr "Det oppstod en uventet feil." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 251e686d0..7819e10a2 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2533,7 +2533,7 @@ msgstr "NIEZNANY BŁĄD" msgid "Unexpected error occurred." msgstr "Pojawił się nieoczekiwany błąd." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 03eaf9002..5e8666830 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2541,7 +2541,7 @@ msgstr "EROARE NECUNOSCUTĂ" msgid "Unexpected error occurred." msgstr "A apărut o eroare neașteptată." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index be54da826..e8c484ac4 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2523,7 +2523,7 @@ msgstr "NEZNÁMA CHYBA" msgid "Unexpected error occurred." msgstr "Vyskytla sa neočakávaná chyba." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 40d9a6cd4..8b05e343f 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2530,7 +2530,7 @@ msgstr "OKÄNT FEL" msgid "Unexpected error occurred." msgstr "Ett oväntat fel inträffade." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" From 901f63e90fee7f932fd5eeed9c36fd22911f19bc Mon Sep 17 00:00:00 2001 From: gudnimg Date: Sat, 21 Dec 2024 13:59:51 +0000 Subject: [PATCH 03/20] remove incomplete dual stepper configuration If either Y_DUAL_STEPPER_DRIVERS or Z_DUAL_STEPPER_DRIVERS is defined the compilation will fail with an error message. This configuration will likely never be fully implemented unless someone from the community steps up. --- Firmware/Configuration_adv.h | 28 ------------------- Firmware/Marlin.h | 19 ++----------- Firmware/stepper.cpp | 52 +++--------------------------------- 3 files changed, 5 insertions(+), 94 deletions(-) diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index d4d8c2118..be529ce72 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -125,34 +125,6 @@ #endif //End auto min/max positions //END AUTOSET LOCATIONS OF LIMIT SWITCHES -ZP - -// A single Z stepper driver is usually used to drive 2 stepper motors. -// Uncomment this define to utilize a separate stepper driver for each Z axis motor. -// Only a few motherboards support this, like RAMPS, which have dual extruder support (the 2nd, often unused, extruder driver is used -// to control the 2nd Z axis stepper motor). The pins are currently only defined for a RAMPS motherboards. -// On a RAMPS (or other 5 driver) motherboard, using this feature will limit you to using 1 extruder. -//#define Z_DUAL_STEPPER_DRIVERS - -#ifdef Z_DUAL_STEPPER_DRIVERS - #undef EXTRUDERS - #define EXTRUDERS 1 -#endif - -// Same again but for Y Axis. -//#define Y_DUAL_STEPPER_DRIVERS - -// Define if the two Y drives need to rotate in opposite directions -#define INVERT_Y2_VS_Y_DIR 1 - -#ifdef Y_DUAL_STEPPER_DRIVERS - #undef EXTRUDERS - #define EXTRUDERS 1 -#endif - -#if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS) - #error "You cannot have dual drivers for both Y and Z" -#endif - //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again: #define X_HOME_RETRACT_MM 5 #define Y_HOME_RETRACT_MM 5 diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 68494a0e5..5f1978adf 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -121,13 +121,8 @@ void manage_inactivity(bool ignore_stepper_queue=false); #endif #if defined(Y_ENABLE_PIN) && Y_ENABLE_PIN > -1 - #ifdef Y_DUAL_STEPPER_DRIVERS - #define enable_y() { WRITE(Y_ENABLE_PIN, Y_ENABLE_ON); WRITE(Y2_ENABLE_PIN, Y_ENABLE_ON); } - #define disable_y() { WRITE(Y_ENABLE_PIN,!Y_ENABLE_ON); WRITE(Y2_ENABLE_PIN, !Y_ENABLE_ON); axis_known_position[Y_AXIS] = false; } - #else - #define enable_y() WRITE(Y_ENABLE_PIN, Y_ENABLE_ON) - #define disable_y() { WRITE(Y_ENABLE_PIN,!Y_ENABLE_ON); axis_known_position[Y_AXIS] = false; } - #endif + #define enable_y() WRITE(Y_ENABLE_PIN, Y_ENABLE_ON) + #define disable_y() { WRITE(Y_ENABLE_PIN,!Y_ENABLE_ON); axis_known_position[Y_AXIS] = false; } #else #define enable_y() ; #define disable_y() ; @@ -135,21 +130,11 @@ void manage_inactivity(bool ignore_stepper_queue=false); #if defined(Z_ENABLE_PIN) && Z_ENABLE_PIN > -1 #if defined(Z_AXIS_ALWAYS_ON) - #ifdef Z_DUAL_STEPPER_DRIVERS - #define poweron_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); } - #define poweroff_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; } - #else #define poweron_z() WRITE(Z_ENABLE_PIN, Z_ENABLE_ON) #define poweroff_z() {} - #endif #else - #ifdef Z_DUAL_STEPPER_DRIVERS - #define poweron_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); } - #define poweroff_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; } - #else #define poweron_z() WRITE(Z_ENABLE_PIN, Z_ENABLE_ON) #define poweroff_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; } - #endif #endif #else #define poweron_z() {} diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 16fad21fc..7cc41be62 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -59,14 +59,6 @@ uint16_t SP_min = 0x21FF; #ifdef DEBUG_YSTEP_DUP_PIN #define _STEP_PIN_Y_DUP_AXIS DEBUG_YSTEP_DUP_PIN #endif -#ifdef Y_DUAL_STEPPER_DRIVERS -#error Y_DUAL_STEPPER_DRIVERS not fully implemented -#define _STEP_PIN_Y2_AXIS Y2_STEP_PIN -#endif -#ifdef Z_DUAL_STEPPER_DRIVERS -#error Z_DUAL_STEPPER_DRIVERS not fully implemented -#define _STEP_PIN_Z2_AXIS Z2_STEP_PIN -#endif #ifdef TMC2130 #define STEPPER_MINIMUM_PULSE TMC2130_MINIMUM_PULSE @@ -1079,17 +1071,9 @@ void st_init() #endif #if defined(Y_DIR_PIN) && Y_DIR_PIN > -1 SET_OUTPUT(Y_DIR_PIN); - - #if defined(Y_DUAL_STEPPER_DRIVERS) && defined(Y2_DIR_PIN) && (Y2_DIR_PIN > -1) - SET_OUTPUT(Y2_DIR_PIN); - #endif #endif #if defined(Z_DIR_PIN) && Z_DIR_PIN > -1 SET_OUTPUT(Z_DIR_PIN); - - #if defined(Z_DUAL_STEPPER_DRIVERS) && defined(Z2_DIR_PIN) && (Z2_DIR_PIN > -1) - SET_OUTPUT(Z2_DIR_PIN); - #endif #endif #if defined(E0_DIR_PIN) && E0_DIR_PIN > -1 SET_OUTPUT(E0_DIR_PIN); @@ -1108,20 +1092,10 @@ void st_init() #if defined(Y_ENABLE_PIN) && Y_ENABLE_PIN > -1 SET_OUTPUT(Y_ENABLE_PIN); if(!Y_ENABLE_ON) WRITE(Y_ENABLE_PIN,HIGH); - - #if defined(Y_DUAL_STEPPER_DRIVERS) && defined(Y2_ENABLE_PIN) && (Y2_ENABLE_PIN > -1) - SET_OUTPUT(Y2_ENABLE_PIN); - if(!Y_ENABLE_ON) WRITE(Y2_ENABLE_PIN,HIGH); - #endif #endif #if defined(Z_ENABLE_PIN) && Z_ENABLE_PIN > -1 SET_OUTPUT(Z_ENABLE_PIN); if(!Z_ENABLE_ON) WRITE(Z_ENABLE_PIN,HIGH); - - #if defined(Z_DUAL_STEPPER_DRIVERS) && defined(Z2_ENABLE_PIN) && (Z2_ENABLE_PIN > -1) - SET_OUTPUT(Z2_ENABLE_PIN); - if(!Z_ENABLE_ON) WRITE(Z2_ENABLE_PIN,HIGH); - #endif #endif #if defined(E0_ENABLE_PIN) && (E0_ENABLE_PIN > -1) SET_OUTPUT(E0_ENABLE_PIN); @@ -1201,19 +1175,11 @@ void st_init() SET_OUTPUT(DEBUG_YSTEP_DUP_PIN); WRITE(DEBUG_YSTEP_DUP_PIN,INVERT_Y_STEP_PIN); #endif //DEBUG_YSTEP_DUP_PIN - #if defined(Y_DUAL_STEPPER_DRIVERS) && defined(Y2_STEP_PIN) && (Y2_STEP_PIN > -1) - SET_OUTPUT(Y2_STEP_PIN); - WRITE(Y2_STEP_PIN,INVERT_Y_STEP_PIN); - #endif disable_y(); #endif #if defined(Z_STEP_PIN) && (Z_STEP_PIN > -1) SET_OUTPUT(Z_STEP_PIN); WRITE(Z_STEP_PIN,INVERT_Z_STEP_PIN); - #if defined(Z_DUAL_STEPPER_DRIVERS) && defined(Z2_STEP_PIN) && (Z2_STEP_PIN > -1) - SET_OUTPUT(Z2_STEP_PIN); - WRITE(Z2_STEP_PIN,INVERT_Z_STEP_PIN); - #endif #ifdef PSU_Delta init_force_z(); #endif // PSU_Delta @@ -1373,7 +1339,7 @@ void babystep(const uint8_t axis,const bool direction) case X_AXIS: { enable_x(); - uint8_t old_x_dir_pin = READ(X_DIR_PIN); //if dualzstepper, both point to same direction. + uint8_t old_x_dir_pin = READ(X_DIR_PIN); uint8_t new_x_dir_pin = (INVERT_X_DIR)^direction; //setup new step @@ -1401,7 +1367,7 @@ void babystep(const uint8_t axis,const bool direction) case Y_AXIS: { enable_y(); - uint8_t old_y_dir_pin = READ(Y_DIR_PIN); //if dualzstepper, both point to same direction. + uint8_t old_y_dir_pin = READ(Y_DIR_PIN); uint8_t new_y_dir_pin = (INVERT_Y_DIR)^direction; //setup new step @@ -1429,35 +1395,23 @@ void babystep(const uint8_t axis,const bool direction) case Z_AXIS: { enable_z(); - uint8_t old_z_dir_pin = READ(Z_DIR_PIN); //if dualzstepper, both point to same direction. + uint8_t old_z_dir_pin = READ(Z_DIR_PIN); uint8_t new_z_dir_pin = (INVERT_Z_DIR)^direction^BABYSTEP_INVERT_Z; //setup new step if (new_z_dir_pin != old_z_dir_pin) { WRITE_NC(Z_DIR_PIN, new_z_dir_pin); -#ifdef Z_DUAL_STEPPER_DRIVERS - WRITE_NC(Z2_DIR_PIN, new_z_dir_pin); -#endif delayMicroseconds(STEPPER_SET_DIR_DELAY); } //perform step STEP_NC_HI(Z_AXIS); -#ifdef Z_DUAL_STEPPER_DRIVERS - STEP_NC_HI(Z2_AXIS); -#endif STEPPER_MINIMUM_DELAY; STEP_NC_LO(Z_AXIS); -#ifdef Z_DUAL_STEPPER_DRIVERS - STEP_NC_LO(Z2_AXIS); -#endif //get old pin state back. if (new_z_dir_pin != old_z_dir_pin) { WRITE_NC(Z_DIR_PIN, old_z_dir_pin); -#ifdef Z_DUAL_STEPPER_DRIVERS - WRITE_NC(Z2_DIR_PIN, old_z_dir_pin); -#endif } } break; From 80cb13003ea0400b800c3c06498fa2223ee6fdf8 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 5 Dec 2024 09:13:26 +0100 Subject: [PATCH 04/20] Show filename after SD print finished --- Firmware/cmdqueue.cpp | 2 ++ Firmware/ultralcd.cpp | 6 +++++- Firmware/variants/MK25-RAMBo10a.h | 7 +++++++ Firmware/variants/MK25-RAMBo13a.h | 7 +++++++ Firmware/variants/MK25S-RAMBo10a.h | 7 +++++++ Firmware/variants/MK25S-RAMBo13a.h | 7 +++++++ Firmware/variants/MK3-E3DREVO.h | 7 +++++++ Firmware/variants/MK3-E3DREVO_HF_60W.h | 7 +++++++ Firmware/variants/MK3.h | 7 +++++++ Firmware/variants/MK3S-E3DREVO.h | 7 +++++++ Firmware/variants/MK3S-E3DREVO_HF_60W.h | 7 +++++++ Firmware/variants/MK3S.h | 7 +++++++ Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 7 +++++++ Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 7 +++++++ 14 files changed, 91 insertions(+), 1 deletion(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 6121eca40..b3800b8c2 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -670,7 +670,9 @@ void get_command() sprintf_P(time, PSTR("%i hours %i minutes"),hours, minutes); SERIAL_ECHO_START; SERIAL_ECHOLN(time); +#ifndef SHOW_FILENAME_AFTER_FINISH lcd_setstatus(time); +#endif //SHOW_FILENAME_AFTER_FINISH card.printingHasFinished(); card.checkautostart(true); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7bf6133db..463163196 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -542,10 +542,14 @@ void lcdui_print_status_line(void) { break; } } - else if ((IS_SD_PRINTING) && + else if (((IS_SD_PRINTING) && (custom_message_type == CustomMsg::Status) && (lcd_status_message_level <= LCD_STATUS_INFO) && lcd_status_message_timeout.expired_cont(LCD_STATUS_INFO_TIMEOUT)) +#ifdef SHOW_FILENAME_AFTER_FINISH + || (GetPrinterState() == PrinterState::SDPrintingFinished) +#endif //SHOW_FILENAME_AFTER_FINISH + ) { // If printing from SD, show what we are printing const char* longFilenameOLD = (card.longFilename[0] ? card.longFilename : card.filename); diff --git a/Firmware/variants/MK25-RAMBo10a.h b/Firmware/variants/MK25-RAMBo10a.h index 77cced0be..891d88385 100644 --- a/Firmware/variants/MK25-RAMBo10a.h +++ b/Firmware/variants/MK25-RAMBo10a.h @@ -520,4 +520,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK25-RAMBo13a.h b/Firmware/variants/MK25-RAMBo13a.h index 9f081885f..a94097c41 100644 --- a/Firmware/variants/MK25-RAMBo13a.h +++ b/Firmware/variants/MK25-RAMBo13a.h @@ -524,4 +524,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK25S-RAMBo10a.h b/Firmware/variants/MK25S-RAMBo10a.h index b047cb00d..6e0484468 100644 --- a/Firmware/variants/MK25S-RAMBo10a.h +++ b/Firmware/variants/MK25S-RAMBo10a.h @@ -528,4 +528,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK25S-RAMBo13a.h b/Firmware/variants/MK25S-RAMBo13a.h index 9ef7f3bd7..1ae556fdb 100644 --- a/Firmware/variants/MK25S-RAMBo13a.h +++ b/Firmware/variants/MK25S-RAMBo13a.h @@ -529,4 +529,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3-E3DREVO.h b/Firmware/variants/MK3-E3DREVO.h index 9232f8462..4d81d5bb7 100644 --- a/Firmware/variants/MK3-E3DREVO.h +++ b/Firmware/variants/MK3-E3DREVO.h @@ -687,4 +687,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3-E3DREVO_HF_60W.h b/Firmware/variants/MK3-E3DREVO_HF_60W.h index ace4553d5..9c10541b6 100644 --- a/Firmware/variants/MK3-E3DREVO_HF_60W.h +++ b/Firmware/variants/MK3-E3DREVO_HF_60W.h @@ -688,4 +688,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3.h b/Firmware/variants/MK3.h index 8b0651f25..6b759993e 100644 --- a/Firmware/variants/MK3.h +++ b/Firmware/variants/MK3.h @@ -690,4 +690,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3S-E3DREVO.h b/Firmware/variants/MK3S-E3DREVO.h index 70aef3d4d..b6e98348f 100644 --- a/Firmware/variants/MK3S-E3DREVO.h +++ b/Firmware/variants/MK3S-E3DREVO.h @@ -699,4 +699,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3S-E3DREVO_HF_60W.h b/Firmware/variants/MK3S-E3DREVO_HF_60W.h index cf576d82d..048c94faa 100644 --- a/Firmware/variants/MK3S-E3DREVO_HF_60W.h +++ b/Firmware/variants/MK3S-E3DREVO_HF_60W.h @@ -700,4 +700,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3S.h b/Firmware/variants/MK3S.h index 6d2027671..962e74eff 100644 --- a/Firmware/variants/MK3S.h +++ b/Firmware/variants/MK3S.h @@ -702,4 +702,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index b9c970b37..3f4d12a87 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -430,4 +430,11 @@ THERMISTORS SETTINGS #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index b89d95f9b..19183943a 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -429,4 +429,11 @@ THERMISTORS SETTINGS #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H From ee4d8bb5e5af822b1de5d7457e37e0801a670128 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 24 Dec 2024 07:12:12 +0100 Subject: [PATCH 05/20] Fix lcd_status_message_level --- Firmware/ultralcd.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 463163196..954a6848c 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -542,14 +542,14 @@ void lcdui_print_status_line(void) { break; } } - else if (((IS_SD_PRINTING) && - (custom_message_type == CustomMsg::Status) && - (lcd_status_message_level <= LCD_STATUS_INFO) && - lcd_status_message_timeout.expired_cont(LCD_STATUS_INFO_TIMEOUT)) + else if (((IS_SD_PRINTING) #ifdef SHOW_FILENAME_AFTER_FINISH || (GetPrinterState() == PrinterState::SDPrintingFinished) #endif //SHOW_FILENAME_AFTER_FINISH - ) + ) && + (custom_message_type == CustomMsg::Status) && + (lcd_status_message_level <= LCD_STATUS_INFO) && + lcd_status_message_timeout.expired_cont(LCD_STATUS_INFO_TIMEOUT)) { // If printing from SD, show what we are printing const char* longFilenameOLD = (card.longFilename[0] ? card.longFilename : card.filename); From 477d7ae5ef49307cf1eeb36a0502877247d3dbac Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 24 Dec 2024 07:56:43 +0100 Subject: [PATCH 06/20] Add multiscreen message with `Cont.|Cancel` Remove `Continue?` from some mesages to save "translation space" and replace multiscreen from `Yes|No` to `Cont.|Cancel` Remove `Print canceled.` from check messages to save again "translation sapce" and after confirming the message the Status Line shows that it has been stopped. fix rebase issue --- Firmware/messages.cpp | 25 +++++++------- Firmware/messages.h | 3 +- Firmware/ultralcd.cpp | 20 +++++++++--- Firmware/ultralcd.h | 1 + Firmware/util.cpp | 6 ++-- lang/po/Firmware.pot | 41 ++++++++--------------- lang/po/Firmware_cs.po | 68 ++++++++++++++------------------------ lang/po/Firmware_de.po | 69 ++++++++++++++------------------------- lang/po/Firmware_es.po | 63 ++++++++++++++--------------------- lang/po/Firmware_fr.po | 69 ++++++++++++++------------------------- lang/po/Firmware_hr.po | 69 ++++++++++++++------------------------- lang/po/Firmware_hu.po | 66 ++++++++++++++----------------------- lang/po/Firmware_it.po | 69 ++++++++++++++------------------------- lang/po/Firmware_nl.po | 74 ++++++++++++++++-------------------------- lang/po/Firmware_no.po | 70 +++++++++++++++------------------------ lang/po/Firmware_pl.po | 70 ++++++++++++++------------------------- lang/po/Firmware_ro.po | 73 +++++++++++++++-------------------------- lang/po/Firmware_sk.po | 70 ++++++++++++++------------------------- lang/po/Firmware_sv.po | 73 +++++++++++++++-------------------------- 19 files changed, 377 insertions(+), 622 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 9fe3bc897..6fe7955ed 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -19,7 +19,7 @@ const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling f const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////MSG_BELT_STATUS c=18 const char MSG_EJECT[] PROGMEM_I1 = ISTR("Eject"); ////MSG_EJECT c=9 -const char MSG_CANCEL[] PROGMEM_I1 = ISTR(">Cancel");////MSG_CANCEL c=10 +const char MSG_CANCEL[] PROGMEM_I1 = ISTR(">Cancel");////MSG_CANCEL c=9 const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////MSG_CALIBRATE_Z_AUTO c=20 r=2 const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////MSG_CARD_MENU c=18 const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////MSG_CHECKING_X c=20 @@ -149,16 +149,15 @@ const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////MSG_NONE c=8 const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////MSG_WARN c=8 const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////MSG_STRICT c=8 const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////MSG_MODEL c=8 -const char MSG_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different printer type. Continue?"); ////MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -const char MSG_GCODE_DIFF_PRINTER_CANCELLED[] PROGMEM_I1 =ISTR("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."); ////MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -const char MSG_GCODE_NEWER_FIRMWARE_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a newer firmware. Continue?"); ////MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -const char MSG_GCODE_NEWER_FIRMWARE_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."); ////MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -const char MSG_GCODE_DIFF_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different level. Continue?"); ////MSG_GCODE_DIFF_CONTINUE c=20 r=3 -const char MSG_GCODE_DIFF_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a different level. Please re-slice the model again. Print cancelled."); ////MSG_GCODE_DIFF_CANCELLED c=20 r=8 -const char MSG_MISSING_FILAMENT_CONTINUE[] PROGMEM_I1 = ISTR("There is no filament loaded. Continue?"); ////MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 -const char MSG_MISSING_FILAMENT_CANCELLED[] PROGMEM_I1 = ISTR("There is no filament loaded. Print cancelled."); ////MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -const char MSG_NOZZLE_DIFFERS_CONTINUE[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Continue?"); ////MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -const char MSG_NOZZLE_DIFFERS_CANCELLED[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."); ////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 +const char MSG_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different printer type."); ////MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 +const char MSG_GCODE_DIFF_PRINTER_CANCELLED[] PROGMEM_I1 =ISTR("G-code sliced for a different printer type. Please re-slice the model again."); ////MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 +const char MSG_GCODE_NEWER_FIRMWARE_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a newer firmware."); ////MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 +const char MSG_GCODE_NEWER_FIRMWARE_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a newer firmware. Please update the firmware."); ////MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 +const char MSG_GCODE_DIFF_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different level."); ////MSG_GCODE_DIFF_CONTINUE c=20 r=3 +const char MSG_GCODE_DIFF_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a different level. Please re-slice the model again."); ////MSG_GCODE_DIFF_CANCELLED c=20 r=8 +const char MSG_MISSING_FILAMENT[] PROGMEM_I1 = ISTR("There is no filament loaded."); ////MSG_MISSING_FILAMENT c=20 r=3 +const char MSG_NOZZLE_DIFFERS_CONTINUE[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code."); ////MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 +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_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 @@ -295,7 +294,7 @@ extern const char MSG_MODE_CHANGE_IN_PROGRESS [] PROGMEM_I1 = ISTR("Mode change extern const char MSG_COPY_SEL_LANG [] PROGMEM_I1 = ISTR("Copy selected language?"); ////MSG_COPY_SEL_LANG c=20 r=3 extern const char MSG_SHEET_OFFSET [] PROGMEM_I1 = ISTR("Sheet %.7s\nZ offset: %+1.3fmm\n%cContinue\n%cReset"); ////MSG_SHEET_OFFSET c=20 r=4 extern const char MSG_PLEASE_LOAD_PLA [] PROGMEM_I1 = ISTR("Please load filament first."); ////MSG_PLEASE_LOAD_PLA c=20 r=4 -extern const char MSG_WIZARD_RERUN [] PROGMEM_I1 = ISTR("Running Wizard will delete current calibration results and start from the beginning. Continue?"); ////MSG_WIZARD_RERUN c=20 r=7 +extern const char MSG_WIZARD_RERUN [] PROGMEM_I1 = ISTR("Running Wizard will delete current calibration results and start from the beginning."); ////MSG_WIZARD_RERUN c=20 r=7 extern const char MSG_MMU_INSERT_FILAMENT_FIRST_TUBE [] PROGMEM_I1 = ISTR("Please insert filament into the first tube of the MMU, then press the knob to load it."); ////MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 extern const char MSG_WIZARD_LOAD_FILAMENT [] PROGMEM_I1 = ISTR("Please insert filament into the extruder, then press the knob to load it."); ////MSG_WIZARD_LOAD_FILAMENT c=20 r=6 extern const char MSG_WIZARD_V2_CAL [] PROGMEM_I1 = ISTR("Now I will calibrate distance between tip of the nozzle and heatbed surface."); ////MSG_WIZARD_V2_CAL c=20 r=8 @@ -372,7 +371,7 @@ extern const char MSG_SELFTEST_CHECK_HOTEND [] PROGMEM_I1 = ISTR("Checking hoten extern const char MSG_SELFTEST_CHECK_ALLCORRECT [] PROGMEM_I1 = ISTR("All correct"); ////MSG_SELFTEST_CHECK_ALLCORRECT c=20 extern const char MSG_CALIBRATING_HOME [] PROGMEM_I1 = ISTR("Calibrating home"); ////MSG_CALIBRATING_HOME c=20 extern const char MSG_CHECKING_FILE [] PROGMEM_I1 = ISTR("Checking file"); ////MSG_CHECKING_FILE c=17 -extern const char MSG_FILE_INCOMPLETE [] PROGMEM_I1 = ISTR("File incomplete. Continue anyway?"); ////MSG_FILE_INCOMPLETE c=20 r=3 +extern const char MSG_FILE_INCOMPLETE [] PROGMEM_I1 = ISTR("File incomplete."); ////MSG_FILE_INCOMPLETE c=20 r=3 extern const char MSG_SD_REMOVED [] PROGMEM_I1 = ISTR("Card removed"); ////MSG_SD_REMOVED c=20 extern const char MSG_NEW_FIRMWARE_AVAILABLE [] PROGMEM_I1 = ISTR("New firmware version available:"); ////MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 extern const char MSG_NEW_FIRMWARE_PLEASE_UPGRADE [] PROGMEM_I1 = ISTR("Please upgrade."); ////MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index 8ce056840..5abd460a5 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -157,8 +157,7 @@ extern const char MSG_GCODE_NEWER_FIRMWARE_CONTINUE[]; extern const char MSG_GCODE_NEWER_FIRMWARE_CANCELLED[]; extern const char MSG_GCODE_DIFF_CONTINUE[]; extern const char MSG_GCODE_DIFF_CANCELLED[]; -extern const char MSG_MISSING_FILAMENT_CONTINUE[]; -extern const char MSG_MISSING_FILAMENT_CANCELLED[]; +extern const char MSG_MISSING_FILAMENT[]; extern const char MSG_NOZZLE_DIFFERS_CONTINUE[]; extern const char MSG_NOZZLE_DIFFERS_CANCELLED[]; extern const char MSG_NOZZLE_DIAMETER[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 954a6848c..a73d072b2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1981,7 +1981,8 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) lcd_draw_update = 1; lcd_clear(); - lcd_puts_at_P(0, 3, _T(MSG_CANCEL)); + lcd_puts_at_P(0,3, PSTR(">")); + lcd_puts_at_P(1, 3, _T(MSG_CANCEL)); lcd_set_cursor(0, 1); switch (eFilamentAction) @@ -3057,6 +3058,17 @@ uint8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, bool all { return lcd_show_multiscreen_message_with_choices_and_wait_P(msg, allow_timeouting, default_selection, _T(MSG_YES), _T(MSG_NO), nullptr, 10); } +//! @brief Show multiple screen message with yes and no possible choices and wait with possible timeout +//! @param msg Message to show. If NULL, do not clear the screen and handle choice selection only. +//! @param allow_timeouting if true, allows time outing of the screen +//! @param default_selection if 0, 'Yes' choice is selected by default, otherwise 'No' choice is preselected +//! @retval 0 cont choice selected by user +//! @retval 1 cancel choice selected by user +//! @retval 0xFF button timeout (only possible if allow_timeouting is true) +uint8_t lcd_show_multiscreen_message_cont_cancel_and_wait_P(const char *msg, bool allow_timeouting, uint8_t default_selection) //currently just max. n*4 + 3 lines supported (set in language header files) +{ + return lcd_show_multiscreen_message_with_choices_and_wait_P(msg, allow_timeouting, default_selection, _T(MSG_CONTINUE_SHORT), _T(MSG_CANCEL), nullptr, 10); +} //! @brief Show a two-choice prompt on the last line of the LCD //! @param selected Show first choice as selected if true, the second otherwise //! @param first_choice text caption of first possible choice @@ -3632,7 +3644,7 @@ void lcd_v2_calibration() { if (MMU2::mmu2.Enabled()) { const uint8_t filament = choose_menu_P( _T(MSG_SELECT_FILAMENT), - MSG_FILAMENT,(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off + MSG_FILAMENT,_T(MSG_CANCEL)); if (filament < MMU_FILAMENT_COUNT) { lay1cal_filament = filament; } else { @@ -3675,7 +3687,7 @@ void lcd_wizard() { bool result = true; if (calibration_status_get(CALIBRATION_WIZARD_STEPS)) { // calibration already performed: ask before clearing the previous status - result = !lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_WIZARD_RERUN), false); + result = !lcd_show_multiscreen_message_cont_cancel_and_wait_P(_T(MSG_WIZARD_RERUN), false); } if (result) { calibration_status_clear(CALIBRATION_WIZARD_STEPS); @@ -7128,7 +7140,7 @@ static void menu_action_sdfile(const char* filename) } if (!check_file(selected_filename)) { - result = !lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_FILE_INCOMPLETE), false); + result = !lcd_show_multiscreen_message_cont_cancel_and_wait_P(_T(MSG_FILE_INCOMPLETE), false); lcd_update_enable(true); } if (result) { diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index f2446110c..ace96a75f 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -98,6 +98,7 @@ extern uint8_t lcd_show_multiscreen_message_with_choices_and_wait_P( const char * const first_choice, const char * const second_choice, const char * const third_choice = nullptr, uint8_t second_col = 7); extern uint8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, bool allow_timeouting = true, uint8_t default_selection = LCD_MIDDLE_BUTTON_CHOICE); +extern uint8_t lcd_show_multiscreen_message_cont_cancel_and_wait_P(const char *msg, bool allow_timeouting = true, uint8_t default_selection = LCD_MIDDLE_BUTTON_CHOICE); // Ask the user to move the Z axis up to the end stoppers and let // the user confirm that it has been done. diff --git a/Firmware/util.cpp b/Firmware/util.cpp index ae9da486e..e9bd9017b 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -268,7 +268,7 @@ void fCheckModeInit() { static void render_M862_warnings(const char* warning, const char* strict, uint8_t check) { if (check == 1) { // Warning, stop print if user selects 'No' - if (lcd_show_multiscreen_message_yes_no_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(); } } else if (check == 2) { // Strict, always stop print @@ -385,8 +385,8 @@ bool filament_presence_check() { } render_M862_warnings( - _T(MSG_MISSING_FILAMENT_CONTINUE) - ,_T(MSG_MISSING_FILAMENT_CANCELLED) + _T(MSG_MISSING_FILAMENT) + ,_T(MSG_MISSING_FILAMENT) //Identical messages ,(uint8_t)oCheckFilament ); diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 36458f974..b34318b7e 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -23,10 +23,10 @@ msgstr "" msgid "%s level expected" msgstr "" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" +msgid "Cancel" msgstr "" #. MSG_BABYSTEPPING_Z c=13 @@ -727,7 +727,7 @@ msgstr "" #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "" #. MSG_FINISHING_MOVEMENTS c=20 @@ -778,40 +778,34 @@ msgstr "" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" +msgid "G-code sliced for a different level." msgstr "" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." +msgid "G-code sliced for a different level. Please re-slice the model again." msgstr "" #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" +msgid "G-code sliced for a different printer type." msgstr "" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." +msgid "G-code sliced for a different printer type. Please re-slice the model again." msgstr "" #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" +msgid "G-code sliced for a newer firmware." msgstr "" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." +msgid "G-code sliced for a newer firmware. Please update the firmware." msgstr "" #. MSG_HW_SETUP c=18 @@ -1373,14 +1367,12 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" +msgid "Nozzle diameter differs from the G-code." msgstr "" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." msgstr "" #. MSG_NOZZLE_CNG_COOLDOWN c=20 r=3 @@ -1828,7 +1820,7 @@ msgstr "" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" #. MSG_SD_CARD c=8 @@ -2175,14 +2167,9 @@ msgid "" "chapter)." msgstr "" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." +msgid "There is no filament loaded." msgstr "" #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index d5df331dd..ae6ed0964 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -32,11 +32,11 @@ msgstr " 0.4 nebo novější" msgid "%s level expected" msgstr "%s očekávaná verze" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Zrušit" +msgid "Cancel" +msgstr "Zrušit" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -731,8 +731,8 @@ msgstr "Spotřebováno filam." #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" -msgstr "Soubor nekompletní. Pokračovat?" +msgid "File incomplete." +msgstr "Soubor nekompletní." #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:45 @@ -786,44 +786,35 @@ msgstr "Přední/levý vent." #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-code je připraven pro jinou verzi. Pokračovat?" +msgid "G-code sliced for a different level." +msgstr "G-code je připraven pro jinou verzi." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code je připraven pro jinou verzi. Vyslicujte model znovu. Tisk zrušen." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code je připraven pro jinou verzi. Vyslicujte model znovu." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" +msgid "G-code sliced for a different printer type." msgstr "G-code je připraven pro jiný typ tiskárny.Pokračovat?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code je připraven pro jiný typ tiskarny. Vyslicujte model znovu. Tisk " -"zrušen." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-code je připraven pro jiný typ tiskarny. Vyslicujte model znovu." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code je pripraven pro novější FW. Pokračovat?" +msgid "G-code sliced for a newer firmware." +msgstr "G-code je pripraven pro novější FW." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "G-code je připraven pro novější FW. Aktualizujte FW. Tisk zrušen." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code je připraven pro novější FW. Aktualizujte FW." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1663,17 +1654,13 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Průměr trysky tiskárny se liší od G-code. Pokračovat?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Průměr trysky tiskárny se liší od G-code." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Průměr trysky tiskárny se liší od G-code. Zkontrolujte nastavení. Tisk " -"zrušen." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." +msgstr "Průměr trysky tiskárny se liší od G-code. Zkontrolujte nastavení." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1775,10 +1762,10 @@ msgstr "Vpravo [µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Spuštění Průvodce vymaže uložene výsledky všech kalibrací a spustí " -"kalibrační proces od začátku. Pokračovat?" +"kalibrační proces od začátku." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2585,15 +2572,10 @@ msgstr "Tryska je horká! Počkejte na vychladnutí." msgid "Nozzle changed?" msgstr "Vyměnili jste trysku?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Není vložen filament. Pokračovat?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Není vložen filament. Tisk zrušen." +msgid "There is no filament loaded." +msgstr "Není vložen filament." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index a705b02b8..74be2eaea 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -32,11 +32,11 @@ msgstr " 0.4 oder neuer" msgid "%s level expected" msgstr "%s Level erwartet" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Abbruch" +msgid "Cancel" +msgstr "Abbruch" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -734,7 +734,7 @@ msgstr "Filament benutzt" #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "Datei unvollständig. Trotzdem fortfahren?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -789,47 +789,35 @@ msgstr "Druck/Hotend Lüfter" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-Code ist für einen anderen Level geslict. Fortfahren?" +msgid "G-code sliced for a different level." +msgstr "G-Code ist für einen anderen Level geslict." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-Code ist für einen anderen Level geslict. Slicen Sie das Modell erneut. " -"Druck abgebrochen." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-Code ist für einen anderen Level geslict. Slicen Sie das Modell erneut." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-Code ist für einen anderen Drucker geslict. Fortfahren?" +msgid "G-code sliced for a different printer type." +msgstr "G-Code ist für einen anderen Drucker geslict." #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-Code ist für einen anderen Drucker geslict. Slicen Sie das Modell erneut. " -"Druck abgebrochen." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-Code ist für einen anderen Drucker geslict. Slicen Sie das Modell erneut." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-Code ist für eine neuere Firmware geslict. Fortfahren?" +msgid "G-code sliced for a newer firmware." +msgstr "G-Code ist für eine neuere Firmware geslict." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-Code ist für eine neuere Firmware geslict. Aktualisieren die Firmware. " -"Druck abgebrochen." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-Code ist für eine neuere Firmware geslict. Aktualisieren die Firmware." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1683,17 +1671,15 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Düsendurchmesser weicht vom G-Code ab. Fortfahren?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Düsendurchmesser weicht vom G-Code ab." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." msgstr "" "Der Durchmesser der Druckerdüse weicht vom G-Code ab. Bitte überprüfen Sie " -"den Wert in den Einstellungen. Druck abgebrochen." +"den Wert in den Einstellungen." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1795,10 +1781,10 @@ msgstr "Rechts [µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Der Assistent wird die aktuellen Kalibrierungsdaten löschen und von vorne " -"beginnen. Fortfahren?" +"beginnen." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2613,15 +2599,10 @@ msgstr "Die Düse ist heiß! Auf Abkühlung warten." msgid "Nozzle changed?" msgstr "Düse gewechselt?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Kein Filament geladen. Fortfahren?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Kein Filament geladen. Druck abgebrochen." +msgid "There is no filament loaded." +msgstr "Kein Filament geladen." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 7c77deb96..cbf04c9bb 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -32,11 +32,11 @@ msgstr " 0.4 o más nueva" msgid "%s level expected" msgstr "%s nivel esperado" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Cancelar" +msgid "Cancel" +msgstr "Cancelar" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -738,7 +738,7 @@ msgstr "Filamento usado" #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "¿Archivo incompleto. Continuar de todos modos?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -793,47 +793,39 @@ msgstr "Vents. front/izqui." #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "Código G laminado para un nivel dif. ¿Continuar?" +msgid "G-code sliced for a different level." +msgstr "Código G laminado para un nivel dif." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." +msgid "G-code sliced for a different level. Please re-slice the model again." msgstr "" "Código G laminado para un nivel diferente. Vuelve a laminar el modelo de " -"nuevo. Impresión cancelada." +"nuevo." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" +msgid "G-code sliced for a different printer type." msgstr "Código G laminado para un tipo de impresora dif.Cont.?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." +msgid "G-code sliced for a different printer type. Please re-slice the model again." msgstr "" "Código G laminado para una impresora diferente. Vuelve a laminar el modelo " -"de nuevo. Impresión cancelada." +"de nuevo." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "Código G laminado para nuevo firmware. ¿Continuar?" +msgid "G-code sliced for a newer firmware." +msgstr "Código G laminado para nuevo firmware." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"Código G laminado para nuevo firmware. Actualiza el firmware. Impresión " -"cancelada." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "Código G laminado para nuevo firmware. Actualiza el firmware." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1681,17 +1673,15 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Diámetro boquilla impresora difiere de cod.G. ¿Continuar?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Diámetro boquilla impresora difiere de cod.G." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." msgstr "" "Diámetro boquilla Impresora difiere de cod.G. Comprueba los valores en " -"ajustes. Impresión cancelada." +"ajustes." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1793,10 +1783,10 @@ msgstr "Derecha [µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Ejecutar el Asistente borrara los valores de calibración actuales y " -"comenzará de nuevo. ¿Continuar?" +"comenzará de nuevo." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2608,15 +2598,10 @@ msgstr "La boquilla está caliente! Espere a que se enfríe." msgid "Nozzle changed?" msgstr "Cambió la boquilla?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "No hay ningún filamento cargado. ¿Continuar?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "No hay ningún filamento cargado. Impresión cancelada." +msgid "There is no filament loaded." +msgstr "No hay ningún filamento cargado." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 108c0ce0d..599526a3d 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -32,11 +32,11 @@ msgstr " 0.4 ou +recent" msgid "%s level expected" msgstr "niveau %s attendu" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Annuler" +msgid "Cancel" +msgstr "Annuler" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -741,7 +741,7 @@ msgstr "Filament utilise" #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "Fichier incomplet. Continuer qd meme?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -796,47 +796,35 @@ msgstr "Ventilos avt/gauche" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-code a été préparé pour un niveau diff. Continuer?" +msgid "G-code sliced for a different level." +msgstr "G-code a été préparé pour un niveau diff." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code a été préparé pour un niveau différent. Découpez le modèle à nouveau." -" Impression annulée." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code a été préparé pour un niveau différent. Découpez le modèle à nouveau." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-code pour un type d'imprimante différent. Continue?" +msgid "G-code sliced for a different printer type." +msgstr "G-code pour un type d'imprimante différent" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code pour un type d'imprimante différent. Découpez le modèle à nouveau. " -"Impression annulée." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-code pour un type d'imprimante différent. Découpez le modèle à nouveau." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" +msgid "G-code sliced for a newer firmware." msgstr "G-code a été préparé pour un FW plus récent. Cont.?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code a été préparé pour un nouveau FW. Mettre à jour le FW. Impression " -"annulée." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code a été préparé pour un nouveau FW. Mettre à jour le FW." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1688,17 +1676,13 @@ msgstr "L'imprimante n'a pas encore été calibrée. Suivez le manuel." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Diamètre de la buse diffère du G-Code. Continuer?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Diamètre de la buse diffère du G-Code." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Diamètre de la buse diffère du G-Code. Vérifiez la valeur. Impression " -"annulée." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." +msgstr "Diamètre de la buse diffère du G-Code. Vérifiez la valeur." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1800,10 +1784,10 @@ msgstr "Droite [µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Le lancement de l'Assistant supprimera les résultats actuels de calibration " -"et commencera du début. Continuer?" +"et commencera du début." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2622,15 +2606,10 @@ msgstr "La buse est chaude! Attendre le refroidissement." msgid "Nozzle changed?" msgstr "La buse a été changée?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Il n'y a pas de filament chargé. Continuer?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Il n'y a pas de filament chargé. Impression annulée." +msgid "There is no filament loaded." +msgstr "Il n'y a pas de filament chargé." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 849680974..02b27a9fa 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -32,11 +32,11 @@ msgstr " 0.4 ili noviji" msgid "%s level expected" msgstr "%s level ocekivan" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Otkazati" +msgid "Cancel" +msgstr "Otkazati" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -735,7 +735,7 @@ msgstr "Iskoristeni fil." #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "Datoteka je nepotpuna. Svejedno nastaviti?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -790,47 +790,35 @@ msgstr "Prednji/lijevi vent" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-kod izrezan za drugu razinu. Nastavite?" +msgid "G-code sliced for a different level." +msgstr "G-kod izrezan za drugu razinu." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-kod izrezan za drugu razinu. Molimo ponovo izrezite model. Print je " -"otkazan." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-kod izrezan za drugu razinu. Molimo ponovo izrezite model." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-kod izrezan za drugu vrstu printera. Nastavite?" +msgid "G-code sliced for a different printer type." +msgstr "G-kod izrezan za drugu vrstu printera." #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-kod izrezan za drugu vrstu printera. Molimo ponovo izrezite model. Print " -"je otkazan." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-kod izrezan za drugu vrstu printera. Molimo ponovo izrezite model." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-kod izrezan za noviji firmware. Nastavite?" +msgid "G-code sliced for a newer firmware." +msgstr "G-kod izrezan za noviji firmware." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-kod izrezan za noviji firmware. Molimo azurirajte firmware. Prime je " -"otkazan." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-kod izrezan za noviji firmware. Molimo azurirajte firmware." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1677,17 +1665,15 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Promjer mlaznice razlikuje se od G-koda. Nastavite?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Promjer mlaznice razlikuje se od G-koda." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." msgstr "" "Promjer mlaznice printera razlikuje se od G-koda. Molimo provjerite " -"vrijednost u postavkama. Print je otkazan." +"vrijednost u postavkama." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1789,10 +1775,10 @@ msgstr "Desna str.[µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Pokrenuti carobnjak ce izbrisati trenutne rezultate kalibracije i poceti " -"ispocetka. Nastavite?" +"ispocetka." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2602,15 +2588,10 @@ msgstr "Mlaznica je vruća! Pričekajte hlađenje." msgid "Nozzle changed?" msgstr "Mlaznica se promijenila?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Nema umetnute niti. Nastavite?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Nema umetnute niti. Print je otkazan." +msgid "There is no filament loaded." +msgstr "Nema umetnute niti." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 34e5934bf..04294cc5e 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -32,11 +32,11 @@ msgstr " 0.4 v. ujabb" msgid "%s level expected" msgstr "Vart szint: %s" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Megsem" +msgid "Cancel" +msgstr "Megsem" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -738,7 +738,7 @@ msgstr "Felhasznalt filam." #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "A fajl vege hianyzik. Folytatod igy is?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -793,47 +793,35 @@ msgstr "Elso/bal ventillator" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "A G-kod mas szintre lett elokesztve. Folytassam?" +msgid "G-code sliced for a different level." +msgstr "A G-kod mas szintre lett elokesztve." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"A G-kod mas szintre lett elokesztve. Szeleteld ujra a modellt. Nyomtatas " -"megallitva." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "A G-kod mas szintre lett elokesztve. Szeleteld ujra a modellt." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "A G-kod mas nyomtato tipusra lett elokesztve.Folytassam?" +msgid "G-code sliced for a different printer type." +msgstr "A G-kod mas nyomtato tipusra lett elokesztve." #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"A G-kod mas nyomtato tipusra lett elokesztve. Szeleteld ujra a modellt. " -"Nyomtatas megallitva." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "A G-kod mas nyomtato tipusra lett elokesztve. Szeleteld ujra a modellt." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "A G-kod ujabb firmverre lett elokesztve.Folytassam?" +msgid "G-code sliced for a newer firmware." +msgstr "A G-kod ujabb firmverre lett elokesztve." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"A G-kod ujabb firmverre lett elokesztve. Frissitsd a nyomtato firmveret. " -"Nyomtatas megallitva." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "A G-kod ujabb firmverre lett elokesztve. Frissitsd a nyomtato firmveret." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1683,17 +1671,16 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "A fuvoka atmeroje elter a G-kodtol. Folytasasm?" +msgid "Nozzle diameter differs from the G-code." +msgstr "A fuvoka atmeroje elter a G-kodtol." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." msgstr "" "A nyomtato fuvoka atmeroje elter a G-kodtol. Ellenorizd az erteket a " -"beallitasokban. Nyomtatas megallitva." +"beallitasokban." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1793,10 +1780,10 @@ msgstr "Jobb old.[µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "A Varazslo futtatasa nullazza a jelenlegi kalibracios ertekeket es elolrol " -"fog mindent kezdeni. Folytatod?" +"fog mindent kezdeni." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2609,15 +2596,10 @@ msgstr "A fúvóka forró! Várja meg a lehűlést." msgid "Nozzle changed?" msgstr "Fúvóka cserélve?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Nincs befűzve filament. Folytassam?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Nincs befűzve filament. Nyomtatás megállítva." +msgid "There is no filament loaded." +msgstr "Nincs befűzve filament." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 02d11664c..68f368afd 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -32,11 +32,11 @@ msgstr " 0.4 o superiore" msgid "%s level expected" msgstr "atteso livello %s" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Annulla" +msgid "Cancel" +msgstr "Annulla" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -740,7 +740,7 @@ msgstr "Fil. utilizzato" #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "File incompleto. Continuare comunque?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -795,47 +795,37 @@ msgstr "Ventola frontale/sin" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-code processato per un livello diverso. Continuare?" +msgid "G-code sliced for a different level." +msgstr "G-code processato per un livello diverso." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." +msgid "G-code sliced for a different level. Please re-slice the model again." msgstr "" "G-code processato per un livello diverso. Per favore esegui nuovamente lo " -"slice del modello. Stampa annullata." +"slice del modello." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-code processato per una stampante diversa. Continuare?" +msgid "G-code sliced for a different printer type." +msgstr "G-code processato per una stampante diversa." #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code processato per un'altra stampante. Per favore rislice il modello. " -"Annullamento stampa." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-code processato per un'altra stampante. Per favore rislice il modello." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code processato per un FW piu recente. Continuare?" +msgid "G-code sliced for a newer firmware." +msgstr "G-code processato per un FW piu recente." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code processato per un FW piu recente. Per favore aggiorna il FW. Stampa " -"annullata." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code processato per un FW piu recente. Per favore aggiorna il FW." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1682,17 +1672,13 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Diametro ugello diverso da G-Code. Continuare?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Diametro ugello diverso da G-Code." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. " -"Stampa annullata." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." +msgstr "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1794,10 +1780,10 @@ msgstr "Destra [µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Se avvi il Wizard perderai la calibrazione preesistente e dovrai " -"ricominciare dall'inizio. Continuare?" +"ricominciare dall'inizio." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2608,15 +2594,10 @@ msgstr "L'ugello è caldo! Attendere il raffreddamento." msgid "Nozzle changed?" msgstr "L'ugello è cambiato?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Nessun filamento caricato. Continuare?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Nessun filamento caricato. Stampa annullata." +msgid "There is no filament loaded." +msgstr "Nessun filamento caricato." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index dfd41b1b8..53f13d97e 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -32,11 +32,11 @@ msgstr " 0.4 of nieuwer" msgid "%s level expected" msgstr "%s niveau verwacht" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Annuleren" +msgid "Cancel" +msgstr "Annuleren" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -740,7 +740,7 @@ msgstr "Gebruikte filament" #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "Bestand onvolledig. Toch doorgaan?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -795,47 +795,37 @@ msgstr "Fans voor/links" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-Code is voor een ander niveau geslict. Doorgaan?" +msgid "G-code sliced for a different level." +msgstr "G-Code is voor een ander niveau geslict." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft." -" Druk geannuleerd." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-Code is voor een ander printertype geslict. Doorgaan?" +msgid "G-code sliced for a different printer type." +msgstr "G-Code is voor een ander printertype geslict." #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-Code is voor een ander printertype geslict. Slice het model opniew " -"alsjeblieft. Druk geannuleerd." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-Code is voor een ander printertype geslict. Slice het model opniew " +"alsjeblieft." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-Code is voor een nieuwere firmware geslict. Doorgaan?" +msgid "G-code sliced for a newer firmware." +msgstr "G-Code is voor een nieuwere firmware geslict." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-Code is voor een nieuwere firmware geslict. Update de firmware " -"alsjeblieft. Druk geannuleerd." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-Code is voor een nieuwere firmware geslict. Update de firmware " +"alsjeblieft." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1685,17 +1675,14 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Tuitdiameter wijkt af van de G-code. Doorgaan?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Tuitdiameter wijkt af van de G-code." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"De diameter van de tuit van de printer verschilt van de G-code. Controleer " -"de waarde in de instellingen. Printen geannuleerd." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." +msgstr "De diameter van de tuit van de printer verschilt van de G-code. Controleer " +"de waarde in de instellingen." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1797,10 +1784,10 @@ msgstr "Recht.kant[µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Starten van de Wizard verwijdert de huidige kalibreringsresultaten en begint" -" vanaf het begin. Doorgaan?" +" vanaf het begin." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2610,15 +2597,10 @@ msgstr "Mondstuk is heet! Wacht op afkoeling." msgid "Nozzle changed?" msgstr "Mondstuk veranderd?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Geen filament geladen. Doorgaan?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Geen filament geladen. Printen geannuleerd." +msgid "There is no filament loaded." +msgstr "Geen filament geladen." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 0c47128b7..49e21ab2e 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -32,11 +32,11 @@ msgstr " 0.4 eller nyere" msgid "%s level expected" msgstr "%s nivå ventet" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Avbryt" +msgid "Cancel" +msgstr "Avbryt" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -738,7 +738,7 @@ msgstr "Brukt filament" #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "Fil er ukomplett. Fortsette allikevel?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -791,45 +791,35 @@ msgstr "Fremre/venstre vifte" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-code sliced for en annen høyde. Fortsette?" +msgid "G-code sliced for a different level." +msgstr "G-code sliced for en annen høyde." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code sliced for en annen høyde. Vennligst slice igjen. Print avbrutt." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code sliced for en annen høyde. Vennligst slice igjen." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-code sliced for en annen printer. Fortsette?" +msgid "G-code sliced for a different printer type." +msgstr "G-code sliced for en annen printer." #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code sliced for en annen printer. Vennligst slice igjen. Print avbrutt." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-code sliced for en annen printer. Vennligst slice igjen." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code sliced for nyere fastvare. Fortsette?" +msgid "G-code sliced for a newer firmware." +msgstr "G-code sliced for nyere fastvare." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code sliced for nyere fastvare. Vennligst oppdater systemet. Print " -"avbrutt." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code sliced for nyere fastvare. Vennligst oppdater systemet." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1672,17 +1662,14 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Dysediameteren er forskjellig fra G-Code. Fortsette?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Dysediameteren er forskjellig fra G-Code." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Printerens dysediameter er forskjellig fra G-Code. Sjekk Innstillinger for " -"hva som er satt. Print avbrutt." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." +msgstr "Printerens dysediameter er forskjellig fra G-Code. Sjekk Innstillinger for " +"hva som er satt." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1782,10 +1769,10 @@ msgstr "Høyre side[µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Ved å kjøre Veilederen slettes all nåværende kalibreringsdata og du må " -"begynne på nytt. Fortsette?" +"begynne på nytt." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2584,15 +2571,10 @@ msgstr "Dysen er varm! Vent på nedkjøling." msgid "Nozzle changed?" msgstr "Har du byttet dyse?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Det er ingen filament lastet. Fortsette?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Det er ingen filament lastet. Print avbrutt." +msgid "There is no filament loaded." +msgstr "Det er ingen filament lastet." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 7819e10a2..1383110b2 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -32,11 +32,11 @@ msgstr " 0.4 lub nowszy" msgid "%s level expected" msgstr "Oczekiwano wersji %s" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Anuluj" +msgid "Cancel" +msgstr "Anuluj" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -740,7 +740,7 @@ msgstr "Użyty filament" #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "Plik niekompletny. Kontynuowac?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -795,45 +795,35 @@ msgstr "Przedni/lewy wentyl." #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-code pocięty dla innej wersji. Kontynuować?" +msgid "G-code sliced for a different level." +msgstr "G-code pocięty dla innej wersji." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code pocięty na innym poziomie. Potnij model ponownie. Druk anulowany." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code pocięty na innym poziomie. Potnij model ponownie." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-code pocięty dla innej drukarki. Kontynuować?" +msgid "G-code sliced for a different printer type." +msgstr "G-code pocięty dla innej drukarki." #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code pocięty dla drukarki innego typu. Potnij model ponownie. Druk " -"anulowany." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-code pocięty dla drukarki innego typu. Potnij model ponownie." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code pocięty dla nowszego firmware. Kontynuować?" +msgid "G-code sliced for a newer firmware." +msgstr "G-code pocięty dla nowszego firmware." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code pocięty dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code pocięty dla nowszego firmware. Zaktualizuj firmware." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1679,17 +1669,13 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Średnica dyszy różni się od tej w G-code. Kontynuować?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Średnica dyszy różni się od tej w G-code." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Średnica dyszy różni się od tej w G-code. Sprawdź ustawienia. Druk " -"anulowany." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." +msgstr "Średnica dyszy różni się od tej w G-code. Sprawdź ustawienia." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1791,10 +1777,9 @@ msgstr "Prawo [µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" -"Włączenie Asystenta usunie obecne dane kalibracyjne i zacznie od początku. " -"Kontynuować?" +"Włączenie Asystenta usunie obecne dane kalibracyjne i zacznie od początku." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2600,15 +2585,10 @@ msgstr "Dysza jest gorąca! Poczekaj na schłodzenie." msgid "Nozzle changed?" msgstr "Dysza została zmieniona?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Nie ma załadowanego filamentu. Kontynuować?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Nie ma załadowanego filamentu. Druk anulowany." +msgid "There is no filament loaded." +msgstr "Nie ma załadowanego filamentu." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 5e8666830..2d498aa02 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -32,11 +32,11 @@ msgstr " 0.4 / mai nou" msgid "%s level expected" msgstr "nivel %s așteptat" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Anulează" +msgid "Cancel" +msgstr "Anulează" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -740,7 +740,7 @@ msgstr "Filament folosit" #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "Fișier incomplet. Continuă oricum?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -795,47 +795,36 @@ msgstr "Ventilatoarele sunt" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "Versiune de G-code e incorectă. Continuați?" +msgid "G-code sliced for a different level." +msgstr "Versiune de G-code e incorectă." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"Versiune de G-code e incorectă. Vă rugăm pregătiți modelul din nou. Print " -"anulat." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "Versiune de G-code e incorectă. Vă rugăm pregătiți modelul din nou." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-code pregătit pentru un alt tip de printer. Continuați?" +msgid "G-code sliced for a different printer type." +msgstr "G-code pregătit pentru un alt tip de printer." #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code pregătit pentru un alt tip de printer. Vă rugăm să pregătiți modelul " -"din nou. Print anulat." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-code pregătit pentru un alt tip de printer. Vă rugăm să pregătiți modelul " +"din nou." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code pregătit pentru firmware mai nou. Continuați?" +msgid "G-code sliced for a newer firmware." +msgstr "G-code pregătit pentru firmware mai nou." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code pregătit pentru firmware mai nou. Vă rugăm actualizați firmware-ul. " -"Print anulat." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code pregătit pentru firmware mai nou. Vă rugăm actualizați firmware-ul." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1681,17 +1670,14 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Diametrul vârfului diferă de cel din G-code. Continuați?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Diametrul vârfului diferă de cel din G-code." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Diametrul vârfului diferă de cel din G-code. Vă rugăm verificați valoarea în" -" setări. Print anulat." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." +msgstr "Diametrul vârfului diferă de cel din G-code. Vă rugăm verificați valoarea în" +" setări." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1793,10 +1779,10 @@ msgstr "Dreapta [µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Rularea Wizard-ului va șterge rezultatele curente ale calibrării și va porni" -" de la început. Continuați?" +" de la început." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2609,15 +2595,10 @@ msgstr "Duza este fierbinte! Așteptați să se răcească." msgid "Nozzle changed?" msgstr "S-a schimbat duza?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Filamentul nu este detectat. Continuați?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Filamentul nu este detectat. Print anulat." +msgid "There is no filament loaded." +msgstr "Filamentul nu este detectat." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index e8c484ac4..d03fcaa2a 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -32,11 +32,11 @@ msgstr " 0.4 a novšie" msgid "%s level expected" msgstr "Očakávaná verzia %s" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Zrušiť" +msgid "Cancel" +msgstr "Zrušiť" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -737,8 +737,8 @@ msgstr "Spotrebovaný filam." #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" -msgstr "Súbor nekompletný. Pokračovať?" +msgid "File incomplete." +msgstr "Súbor nekompletný." #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:45 @@ -792,46 +792,35 @@ msgstr "Predný/ľavý vent." #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-code pripravený pre inú úroveň. Pokračovať?" +msgid "G-code sliced for a different level." +msgstr "G-code pripravený pre inú úroveň." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code pripravený pre inú verziu. Vygenerujte G-code znova. Tlač zrušená." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code pripravený pre inú verziu. Vygenerujte G-code znova." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" +msgid "G-code sliced for a different printer type." msgstr "G-code je pripravený pre iný typ tlačiarne.Pokračovať?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code je pripravený pre iný typ tlačiarne. Vygenerujte G-code znova. Tlač " -"zrušená." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-code je pripravený pre iný typ tlačiarne. Vygenerujte G-code znova." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code je pripravený pre novší firmware. Pokračovať?" +msgid "G-code sliced for a newer firmware." +msgstr "G-code je pripravený pre novší firmware." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code je pripravený pre novší firmware. Prosím aktualizujte firmware. Tlač " -"zrušená." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code je pripravený pre novší firmware. Prosím aktualizujte firmware." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1675,17 +1664,13 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Priemer trysky tlačiarne sa líši od G-code. Pokračovať?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Priemer trysky tlačiarne sa líši od G-code." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Priemer trysky tlačiarne sa líši od G-code. Prosím skontrolujte nastavenie. " -"Tlač zrušená." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." +msgstr "Priemer trysky tlačiarne sa líši od G-code. Prosím skontrolujte nastavenie." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1787,10 +1772,10 @@ msgstr "Pravá str.[µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Spustenie Sprievodcu vymaže uložené výsledky všetkých kalibrácií a spustí " -"kalibračný proces od začiatku. Pokračovať?" +"kalibračný proces od začiatku." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2590,15 +2575,10 @@ msgstr "Tryska je horúca! Počkajte na vychladnutie." msgid "Nozzle changed?" msgstr "Vymenili ste trysku?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Nie je zavedený žiaden filament. Pokračovať?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Nie je zavedený žiaden filament. Tlač zrušená." +msgid "There is no filament loaded." +msgstr "Nie je zavedený žiaden filament." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 8b05e343f..c2e626c88 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -32,11 +32,11 @@ msgstr " 0.4 el nyare" msgid "%s level expected" msgstr "%s nivå förväntad" -#. MSG_CANCEL c=10 +#. MSG_CANCEL c=9 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986 #: ../../Firmware/ultralcd.cpp:3623 -msgid ">Cancel" -msgstr ">Avbryt" +msgid "Cancel" +msgstr "Avbryt" #. MSG_BABYSTEPPING_Z c=13 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652 @@ -738,7 +738,7 @@ msgstr "Använt filament" #. MSG_FILE_INCOMPLETE c=20 r=3 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119 -msgid "File incomplete. Continue anyway?" +msgid "File incomplete." msgstr "Filen är ofullständig. Fortsätta ändå?" #. MSG_FINISHING_MOVEMENTS c=20 @@ -793,47 +793,36 @@ msgstr "Front/vänster fläkt" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-code genererad för en annan nivå. Fortsätta?" +msgid "G-code sliced for a different level." +msgstr "G-code genererad för en annan nivå." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code genererad för en annan nivå. Vänligen re-generera modellen igen. " -"Utskriften avbröts." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code genererad för en annan nivå. Vänligen re-generera modellen igen." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319 #: ../../Firmware/util.cpp:436 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-code genererad för en annan skrivartyp. Fortsätta?" +msgid "G-code sliced for a different printer type." +msgstr "G-code genererad för en annan skrivartyp." #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320 #: ../../Firmware/util.cpp:437 -msgid "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code genererad för en annan skrivartyp. Vänligen re-generera modellen " -"igen. Utskriften avbröts." +msgid "G-code sliced for a different printer type. Please re-slice the model again." +msgstr "G-code genererad för en annan skrivartyp. Vänligen re-generera modellen " +"igen." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code genererad för en nyare firmware. Fortsätta?" +msgid "G-code sliced for a newer firmware." +msgstr "G-code genererad för en nyare firmware." #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370 -msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code genererad för en nyare firmware. Vänligen uppdatera firmware. " -"Utskriften avbröts." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code genererad för en nyare firmware. Vänligen uppdatera firmware." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325 @@ -1681,17 +1670,14 @@ msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "Munstycksdiametern skiljer sig från G-codeen. Fortsätta?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Munstycksdiametern skiljer sig från G-codeen." #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Skrivarmunstyckets diameter skiljer sig från G-codeen. Kontrollera värdet i " -"inställningarna. Utskriften avbröts." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." +msgstr "Skrivarmunstyckets diameter skiljer sig från G-codeen. Kontrollera värdet i " +"inställningarna." #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302 @@ -1793,10 +1779,10 @@ msgstr "Höger sida[µm]" #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666 msgid "" "Running Wizard will delete current calibration results and start from the " -"beginning. Continue?" +"beginning." msgstr "" "Att utföra guiden kommer att radera aktuella kalibreringsinställningar och " -"börja om från början. Fortsätta?" +"börja om från början." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -2597,15 +2583,10 @@ msgstr "Munstycket är varmt! Vänta på nedkylning." msgid "Nozzle changed?" msgstr "Har munstycket ändrats?" -#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3 +#. MSG_MISSING_FILAMENT c=20 r=3 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388 -msgid "There is no filament loaded. Continue?" -msgstr "Det finns ingen filament laddad. Fortsätta?" - -#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389 -msgid "There is no filament loaded. Print cancelled." -msgstr "Det finns ingen filament laddad. Utskriften avbröts." +msgid "There is no filament loaded." +msgstr "Det finns ingen filament laddad." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 From e10c8d9c5a99291d838c008b220ce5433778b5b7 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 24 Dec 2024 08:00:24 +0100 Subject: [PATCH 07/20] Fix rebase issue fix --- Firmware/messages.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 6fe7955ed..95d2ded1e 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -19,7 +19,7 @@ const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling f const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////MSG_BELT_STATUS c=18 const char MSG_EJECT[] PROGMEM_I1 = ISTR("Eject"); ////MSG_EJECT c=9 -const char MSG_CANCEL[] PROGMEM_I1 = ISTR(">Cancel");////MSG_CANCEL c=9 +const char MSG_CANCEL[] PROGMEM_I1 = ISTR("Cancel");////MSG_CANCEL c=9 const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////MSG_CALIBRATE_Z_AUTO c=20 r=2 const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////MSG_CARD_MENU c=18 const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////MSG_CHECKING_X c=20 From c21dc365076cbd4685292cc1d3089a178893b164 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 11 Feb 2025 05:55:58 +0100 Subject: [PATCH 08/20] Update upload-atrifacts to version 4 as 3 is deprecated --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 135794416..61ba3c6a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,7 @@ jobs: - name: Upload artifacts if: ${{ !github.event.pull_request }} - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v4 with: name: Firmware path: build/*.hex From 1a0e0a804fe3ba8ad27234ca260210bdfdd5a816 Mon Sep 17 00:00:00 2001 From: Anna Snoeijs Date: Thu, 6 Feb 2025 23:12:18 +0100 Subject: [PATCH 09/20] Added description on how to install dependencies on Fedora based distributions --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index fe922469f..2b8d47330 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,12 @@ Assuming a recent Debian/Ubuntu distribution, install the dependencies globally sudo apt-get install cmake ninja python3-pyelftools python3-polib python3-regex gettext +When using a recent Fedora(non-atomic)/RHEL distribution, install the dependencies globally with: + + sudo dnf install cmake ninja-build python3-pyelftools python3-polib python3-regex gettext + +When using a Fedora Atomic/UBlue distribution use `rpm-ostree install --allow-inactive` instead of `sudo dnf install` + Prusa-Firmware depends on a pinned version of `avr-gcc` and the external `prusa3dboards` package. These can be setup using `./utils/bootstrap.py`: # automatically setup dependencies From e80c9fa315d1e77e2cbc4278959f715a9f5e2b66 Mon Sep 17 00:00:00 2001 From: sarusani Date: Fri, 24 Jan 2025 15:43:29 +0100 Subject: [PATCH 10/20] Align MIN_Z raise for unload & load Align values for load and unload to prevent movement between unload & load operations. --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index ce1f3c329..1db9dee48 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -358,8 +358,8 @@ your extruder heater takes 2 minutes to hit the target on heating. // Try to maintain a minimum distance from the bed even when Z is // unknown when doing the following operations -#define MIN_Z_FOR_LOAD 50 // lcd filament loading or autoload -#define MIN_Z_FOR_UNLOAD 20 // lcd filament unloading +#define MIN_Z_FOR_LOAD 35 // lcd filament loading or autoload (values for load and unload have been unified to prevent movement between unload & load operations!) +#define MIN_Z_FOR_UNLOAD 35 // lcd filament unloading #define MIN_Z_FOR_SWAP 27 // filament change (including M600) #define MIN_Z_FOR_PREHEAT 10 // lcd preheat From 1965743ba28a5e7395cef11bdd4d0510fa55a239 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 11 Feb 2025 17:31:28 +0100 Subject: [PATCH 11/20] Change actions/cache to v4 --- .github/workflows/build.yml | 6 +++--- .github/workflows/pr-size.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 61ba3c6a8..3687c5042 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: fetch-depth: 0 - name: Cache Dependencies - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 id: cache-pkgs with: path: ".dependencies" @@ -106,7 +106,7 @@ jobs: fetch-depth: 0 - name: Cache Dependencies - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 id: cache-pkgs with: path: ".dependencies" @@ -154,7 +154,7 @@ jobs: fetch-depth: 0 - name: Cache Dependencies - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 id: cache-pkgs with: path: ".dependencies" diff --git a/.github/workflows/pr-size.yml b/.github/workflows/pr-size.yml index 8cf9f83b0..01756f11d 100644 --- a/.github/workflows/pr-size.yml +++ b/.github/workflows/pr-size.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 - name: Cache Dependencies - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 id: cache-pkgs with: path: ".dependencies" From c40af0c896ad9f1e82d9047f1c0066f10c53e8d5 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 11 Feb 2025 17:59:50 +0100 Subject: [PATCH 12/20] M300 set 3.5s duration limit --- Firmware/Marlin_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ad9860012..75b24d296 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6515,11 +6515,11 @@ void process_commands() #### Parameters - `S` - frequency in Hz. Not all firmware versions support this parameter - - `P` - duration in milliseconds + - `P` - duration in milliseconds max 3500ms */ case 300: // M300 { - uint16_t beepP = code_seen('P') ? code_value() : 1000; + uint16_t beepP = code_seen('P') ? min(code_value(), 3500) : 1000; uint16_t beepS; if (!code_seen('S')) beepS = 0; From 29907639aef09ca3adc0887b621cb7b83ecaf7a0 Mon Sep 17 00:00:00 2001 From: sarusani Date: Tue, 20 Aug 2024 10:40:35 +0200 Subject: [PATCH 13/20] Remove lcd_menu_AutoLoadFilament --- Firmware/messages.cpp | 2 ++ Firmware/messages.h | 2 ++ Firmware/ultralcd.cpp | 17 ++++++++++------- Firmware/variants/MK25-RAMBo10a.h | 3 +++ Firmware/variants/MK25-RAMBo13a.h | 3 +++ Firmware/variants/MK25S-RAMBo10a.h | 3 +++ Firmware/variants/MK25S-RAMBo13a.h | 3 +++ Firmware/variants/MK3-E3DREVO.h | 3 +++ Firmware/variants/MK3-E3DREVO_HF_60W.h | 3 +++ Firmware/variants/MK3.h | 3 +++ Firmware/variants/MK3S-E3DREVO.h | 3 +++ Firmware/variants/MK3S-E3DREVO_HF_60W.h | 3 +++ Firmware/variants/MK3S.h | 3 +++ .../obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 3 +++ .../obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 3 +++ 15 files changed, 50 insertions(+), 7 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 95d2ded1e..d68aca79f 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -253,7 +253,9 @@ extern const char MSG_LOADING_COLOR [] PROGMEM_I1 = ISTR("Loading color"); ////M extern const char MSG_CORRECTLY [] PROGMEM_I1 = ISTR("Changed correctly"); ////MSG_CORRECTLY c=19 extern const char MSG_NOT_LOADED [] PROGMEM_I1 = ISTR("Filament not loaded"); ////MSG_NOT_LOADED c=19 extern const char MSG_NOT_COLOR [] PROGMEM_I1 = ISTR("Color not correct"); ////MSG_NOT_COLOR c=19 +#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY extern const char MSG_AUTOLOADING_ENABLED [] PROGMEM_I1 = ISTR("Autoloading filament is active, just press the knob and insert filament..."); ////MSG_AUTOLOADING_ENABLED c=20 r=4 +#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY extern const char MSG_FILAMENT_USED [] PROGMEM_I1 = ISTR("Filament used"); ////MSG_FILAMENT_USED c=19 extern const char MSG_PRINT_TIME [] PROGMEM_I1 = ISTR("Print time"); ////MSG_PRINT_TIME c=19 extern const char MSG_TOTAL_FILAMENT [] PROGMEM_I1 = ISTR("Total filament"); ////MSG_TOTAL_FILAMENT c=19 diff --git a/Firmware/messages.h b/Firmware/messages.h index 5abd460a5..52adb82c4 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -252,7 +252,9 @@ extern const char MSG_LOADING_COLOR []; extern const char MSG_CORRECTLY []; extern const char MSG_NOT_LOADED []; extern const char MSG_NOT_COLOR []; +#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY extern const char MSG_AUTOLOADING_ENABLED []; +#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY extern const char MSG_FILAMENT_USED []; extern const char MSG_PRINT_TIME []; extern const char MSG_TOTAL_FILAMENT []; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a73d072b2..21e47de89 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2296,13 +2296,13 @@ void lcd_load_filament_color_check() } } -#ifdef FILAMENT_SENSOR +#if defined(FILAMENT_SENSOR) && !defined(REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY) static void lcd_menu_AutoLoadFilament() { lcd_display_message_fullscreen_nonBlocking_P(_T(MSG_AUTOLOADING_ENABLED)); menu_back_if_clicked(); } -#endif //FILAMENT_SENSOR +#endif //FILAMENT_SENSOR && REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY static void preheat_or_continue(FilamentAction action) { @@ -5351,13 +5351,16 @@ static void lcd_main_menu() if (!fsensor.getAutoLoadEnabled()) { MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament); } - if (!fsensor.getFilamentPresent()) { - if (fsensor.getAutoLoadEnabled()) { - MENU_ITEM_SUBMENU_P(_T(MSG_AUTOLOAD_FILAMENT), lcd_menu_AutoLoadFilament); - } - } else { + if (fsensor.getFilamentPresent()) { MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament); } +#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + else { + if (fsensor.getAutoLoadEnabled()) { + MENU_ITEM_SUBMENU_P(_T(MSG_AUTOLOAD_FILAMENT), lcd_menu_AutoLoadFilament); + } + } +#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY } else { #endif //FILAMENT_SENSOR MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament); diff --git a/Firmware/variants/MK25-RAMBo10a.h b/Firmware/variants/MK25-RAMBo10a.h index 891d88385..8bc1f786e 100644 --- a/Firmware/variants/MK25-RAMBo10a.h +++ b/Firmware/variants/MK25-RAMBo10a.h @@ -527,4 +527,7 @@ //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK25-RAMBo13a.h b/Firmware/variants/MK25-RAMBo13a.h index a94097c41..1b23dccfa 100644 --- a/Firmware/variants/MK25-RAMBo13a.h +++ b/Firmware/variants/MK25-RAMBo13a.h @@ -531,4 +531,7 @@ //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK25S-RAMBo10a.h b/Firmware/variants/MK25S-RAMBo10a.h index 6e0484468..e4c56a8a3 100644 --- a/Firmware/variants/MK25S-RAMBo10a.h +++ b/Firmware/variants/MK25S-RAMBo10a.h @@ -535,4 +535,7 @@ //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK25S-RAMBo13a.h b/Firmware/variants/MK25S-RAMBo13a.h index 1ae556fdb..163b18ca0 100644 --- a/Firmware/variants/MK25S-RAMBo13a.h +++ b/Firmware/variants/MK25S-RAMBo13a.h @@ -536,4 +536,7 @@ //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3-E3DREVO.h b/Firmware/variants/MK3-E3DREVO.h index 4d81d5bb7..2275266bb 100644 --- a/Firmware/variants/MK3-E3DREVO.h +++ b/Firmware/variants/MK3-E3DREVO.h @@ -694,4 +694,7 @@ //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3-E3DREVO_HF_60W.h b/Firmware/variants/MK3-E3DREVO_HF_60W.h index 9c10541b6..537340921 100644 --- a/Firmware/variants/MK3-E3DREVO_HF_60W.h +++ b/Firmware/variants/MK3-E3DREVO_HF_60W.h @@ -695,4 +695,7 @@ //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3.h b/Firmware/variants/MK3.h index 6b759993e..a988139aa 100644 --- a/Firmware/variants/MK3.h +++ b/Firmware/variants/MK3.h @@ -697,4 +697,7 @@ //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3S-E3DREVO.h b/Firmware/variants/MK3S-E3DREVO.h index b6e98348f..953b775b3 100644 --- a/Firmware/variants/MK3S-E3DREVO.h +++ b/Firmware/variants/MK3S-E3DREVO.h @@ -706,4 +706,7 @@ //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3S-E3DREVO_HF_60W.h b/Firmware/variants/MK3S-E3DREVO_HF_60W.h index 048c94faa..eb173da03 100644 --- a/Firmware/variants/MK3S-E3DREVO_HF_60W.h +++ b/Firmware/variants/MK3S-E3DREVO_HF_60W.h @@ -707,4 +707,7 @@ //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3S.h b/Firmware/variants/MK3S.h index 962e74eff..c6f682554 100644 --- a/Firmware/variants/MK3S.h +++ b/Firmware/variants/MK3S.h @@ -709,4 +709,7 @@ //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 3f4d12a87..fa816c066 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -437,4 +437,7 @@ THERMISTORS SETTINGS //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 19183943a..0db3b785e 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -436,4 +436,7 @@ THERMISTORS SETTINGS //Show filename instead of print time after SD card print finished //#define SHOW_FILENAME_AFTER_FINISH +//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled. +//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY + #endif //__CONFIGURATION_PRUSA_H From 34450f52a896f049f14cd944800015be8facaba4 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 26 Feb 2025 13:35:29 +0100 Subject: [PATCH 14/20] Add M256 - Removed hardcoded values and added - LCD_BACKLIGHT_LEVEL_HIGH 130 - LCD_BACKLIGHT_LEVEL_LOW 50 - LCD_BACKLIGHT_FORCE_ON 30 - LCD_BACKLIGHT_TIMEOUT 15 --- Firmware/Configuration.h | 4 ++++ Firmware/Marlin_main.cpp | 40 +++++++++++++++++++++++++++++++++++++++- Firmware/backlight.cpp | 10 +++++----- Firmware/menu.cpp | 2 -- Firmware/ultralcd.cpp | 2 +- 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 1db9dee48..b2a9f6a65 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -324,6 +324,10 @@ your extruder heater takes 2 minutes to hit the target on heating. #define SDSUPPORT #define LCD_WIDTH 20 #define LCD_HEIGHT 4 +#define LCD_BACKLIGHT_LEVEL_HIGH 130 +#define LCD_BACKLIGHT_LEVEL_LOW 50 +#define LCD_BACKLIGHT_FORCE_ON 30 +#define LCD_BACKLIGHT_TIMEOUT 15 // Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ad9860012..2ac7fca9e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3710,7 +3710,7 @@ extern uint8_t st_backlash_y; //!@n M221 - Set extrude factor override percentage //!@n M226 - Wait for Pin state //!@n M240 - Trigger camera -//!@n M250 - Set LCD contrast C (value 0..63) +//!@n M256 - Set LCD brightness //!@n M300 - Play tone //!@n M301 - Set hotend PID //!@n M302 - Allow cold extrude, or set minimum extrude temperature @@ -6641,6 +6641,44 @@ void process_commands() break; #ifdef PREVENT_DANGEROUS_EXTRUDE + /*! + ### M256 - Set LCD brightness M256: Set LCD brightness + Set and/or get the LCD brightness. The value is constrained based on the LCD, but typically a value of 0 is the dimmest and 255 is the brightest. + #### Usage + + M256 [ B | D | S | T ] + + #### Parameters + - `B` - Normal Brightness value (0 - 255), default 130 + - `D` - Dimmed Brightness value (0 - 255), default 50 + - `S` - Brightness mode, default Auto + - `0` - Dim + - `1` - Bright + - `2` - Auto + - `T` - Brightness timeout (15 - 900), default 15 seconds + */ + #ifdef LCD_BL_PIN + case 256: + { + if (backlightSupport) { + if (code_seen('B') ) backlightLevel_HIGH=code_value_uint8(); + if (code_seen('D')) backlightLevel_LOW=code_value_uint8(); + if (code_seen('S')) { + backlightMode=code_value_uint8(); + if (backlightMode >2 ) backlightMode = 2; + } + if (code_seen('T')) { + backlightTimer_period=code_value_short(); + if (backlightTimer_period < LCD_BACKLIGHT_TIMEOUT) backlightTimer_period = LCD_BACKLIGHT_TIMEOUT; + if (backlightTimer_period > LCD_BACKLIGHT_TIMEOUT*60) backlightTimer_period = LCD_BACKLIGHT_TIMEOUT*60; + } + printf_P(PSTR("M256 B%d D%d S%d T%u\n"), backlightLevel_HIGH, backlightLevel_LOW, backlightMode, backlightTimer_period); + backlight_save(); + } + } + break; + #endif //LCD_BL_PIN + /*! ### M302 - Allow cold extrude, or set minimum extrude temperature M302: Allow cold extrudes This tells the printer to allow movement of the extruder motor above a certain temperature, or if disabled, to allow extruder movement when the hotend is below a safe printing temperature. diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index daab6e2ab..2654d885c 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -17,7 +17,7 @@ bool backlightSupport = 0; //only if it's true will any of the settings be visib uint8_t backlightLevel_HIGH = 0; uint8_t backlightLevel_LOW = 0; uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT; -int16_t backlightTimer_period = 10; +int16_t backlightTimer_period = LCD_BACKLIGHT_TIMEOUT; LongTimer backlightTimer; static void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on user interactions. @@ -32,7 +32,7 @@ void force_bl_on(bool section_start) if (section_start) { backlightMode = BACKLIGHT_MODE_BRIGHT; - if (backlightLevel_HIGH < 30) backlightLevel_HIGH = 30; + if (backlightLevel_HIGH < LCD_BACKLIGHT_FORCE_ON) backlightLevel_HIGH = LCD_BACKLIGHT_FORCE_ON; } else { @@ -93,9 +93,9 @@ void backlight_init() //initialize backlight backlightMode = eeprom_init_default_byte((uint8_t *)EEPROM_BACKLIGHT_MODE, BACKLIGHT_MODE_AUTO); - backlightLevel_HIGH = eeprom_init_default_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, 130); - backlightLevel_LOW = eeprom_init_default_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW, 50); - backlightTimer_period = eeprom_init_default_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, 10); // in seconds + backlightLevel_HIGH = eeprom_init_default_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, LCD_BACKLIGHT_LEVEL_HIGH); + backlightLevel_LOW = eeprom_init_default_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW, LCD_BACKLIGHT_LEVEL_LOW); + backlightTimer_period = eeprom_init_default_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, LCD_BACKLIGHT_TIMEOUT); // in seconds SET_OUTPUT(LCD_BL_PIN); backlightTimer_reset(); diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 9ceb0c1f4..d222bcec2 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -475,10 +475,8 @@ static void _menu_edit_P() // disable after first use and/or if the initial value is not minEditValue _md->minJumpValue = 0; } - _md->currentValue += lcd_encoder; lcd_encoder = 0; // Consume knob rotation event - // Constrain the value in case it's outside the allowed limits _md->currentValue = constrain(_md->currentValue, _md->minEditValue, _md->maxEditValue); lcd_set_cursor(0, 1); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a73d072b2..b90c5ff17 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5620,7 +5620,7 @@ static void lcd_backlight_menu() MENU_ITEM_EDIT_int3_P(_T(MSG_BL_HIGH), &backlightLevel_HIGH, backlightLevel_LOW, 255); MENU_ITEM_EDIT_int3_P(_T(MSG_BL_LOW), &backlightLevel_LOW, 0, backlightLevel_HIGH); MENU_ITEM_TOGGLE_P(_T(MSG_MODE), ((backlightMode==BACKLIGHT_MODE_BRIGHT) ? _T(MSG_BRIGHT) : ((backlightMode==BACKLIGHT_MODE_DIM) ? _T(MSG_DIM) : _T(MSG_AUTO))), backlight_mode_toggle); - MENU_ITEM_EDIT_int3_P(_T(MSG_TIMEOUT), &backlightTimer_period, 1, 999); + MENU_ITEM_EDIT_int3_P(_T(MSG_TIMEOUT), &backlightTimer_period, LCD_BACKLIGHT_TIMEOUT, LCD_BACKLIGHT_TIMEOUT*60); MENU_END(); } From a7682997f4bbece9e38e9bbe6c3264ec5708607b Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 28 Feb 2025 07:56:51 +0100 Subject: [PATCH 15/20] Optimisation, thanks @gudnimg --- Firmware/Marlin_main.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2ac7fca9e..52db575b0 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6661,17 +6661,10 @@ void process_commands() case 256: { if (backlightSupport) { - if (code_seen('B') ) backlightLevel_HIGH=code_value_uint8(); - if (code_seen('D')) backlightLevel_LOW=code_value_uint8(); - if (code_seen('S')) { - backlightMode=code_value_uint8(); - if (backlightMode >2 ) backlightMode = 2; - } - if (code_seen('T')) { - backlightTimer_period=code_value_short(); - if (backlightTimer_period < LCD_BACKLIGHT_TIMEOUT) backlightTimer_period = LCD_BACKLIGHT_TIMEOUT; - if (backlightTimer_period > LCD_BACKLIGHT_TIMEOUT*60) backlightTimer_period = LCD_BACKLIGHT_TIMEOUT*60; - } + if (code_seen('B') ) backlightLevel_HIGH = code_value_uint8(); + if (code_seen('D')) backlightLevel_LOW = code_value_uint8(); + if (code_seen('S')) backlightMode = max(static_cast(code_value_uint8()), BACKLIGHT_MODE_AUTO); + if (code_seen('T')) backlightTimer_period = constrain(code_value_short(), LCD_BACKLIGHT_TIMEOUT, LCD_BACKLIGHT_TIMEOUT*60); printf_P(PSTR("M256 B%d D%d S%d T%u\n"), backlightLevel_HIGH, backlightLevel_LOW, backlightMode, backlightTimer_period); backlight_save(); } From 66797abf84efcb9a8a7ff5cbd8008edb4f4cd82e Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 16 Apr 2025 06:08:48 +0200 Subject: [PATCH 16/20] Add `c`ommunity tag --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 581939c6a..1614afb7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ message(STATUS "Filename debug suffix ...........: ${FN_VERSION_DEBUG_SUFFIX}") # SET(FW_COMMIT_DSC "v3.13.0-1234") if(NOT "${PROJECT_VERSION_HASH}" STREQUAL "UNKNOWN" AND NOT "${FW_COMMIT_DSC}" MATCHES ".+NOTFOUND.+") # else -> no commit hash is known... likely no git. -string(REGEX MATCH "[v|t]([0-9]+)\.([0-9]+)\.([0-9]+)-?(${DEV_TAG_REGEX})?([0-9]+)?-([0-9]+)" TAG_VERSION "${FW_COMMIT_DSC}") +string(REGEX MATCH "[v|t|c]([0-9]+)\.([0-9]+)\.([0-9]+)-?(${DEV_TAG_REGEX})?([0-9]+)?-([0-9]+)" TAG_VERSION "${FW_COMMIT_DSC}") if (CMAKE_MATCH_4) # Do we have a build type? decode_flavor_code(PROJECT_VER_TAG_FLV "${CMAKE_MATCH_4}" "${CMAKE_MATCH_5}") From 88730dca2a40383caf77adc0af93d392f7371d54 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 16 Apr 2025 06:51:17 +0200 Subject: [PATCH 17/20] Update github action to build `t` test (Alpha, Beta, RC) and `c` community tags --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3687c5042..7af0befec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,8 @@ on: branches: [ MK3, MK3_* ] tags: - 'v*' + - 't*' + - 'c*' env: GH_ANNOTATIONS: 1 From 242bc9d7a8ab6f8d039547d421a46a4d2b63b903 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 16 Apr 2025 07:20:29 +0200 Subject: [PATCH 18/20] Prepare also draft releases when `t` or `c` tags are created --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7af0befec..a16173797 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: path: build/*.hex - name: RELEASE THE KRAKEN - if: startsWith(github.ref, 'refs/tags/v') + if: startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/t') || startsWith(github.ref, 'refs/tags/c') uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" From 295142a01020d99f58863ab1fb8400e7d9f8dbdc Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 16 Apr 2025 07:31:41 +0200 Subject: [PATCH 19/20] Fix semantic versioning --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a16173797..02a0716c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,6 +75,7 @@ jobs: uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: ${{ github.ref_name }} draft: true files: | ${{ github.workspace }}/build/release/*.hex From f915455dae30aa3d031c82109261b3b7cfe8e438 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 22 Apr 2025 18:42:22 +0200 Subject: [PATCH 20/20] Fix M256 S parameter --- Firmware/Marlin_main.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b7bc899b1..65d1799a6 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6663,7 +6663,12 @@ void process_commands() if (backlightSupport) { if (code_seen('B') ) backlightLevel_HIGH = code_value_uint8(); if (code_seen('D')) backlightLevel_LOW = code_value_uint8(); - if (code_seen('S')) backlightMode = max(static_cast(code_value_uint8()), BACKLIGHT_MODE_AUTO); + if (code_seen('S')) { + uint8_t mode = code_value_uint8(); + if (mode <= BACKLIGHT_MODE_AUTO) { + backlightMode = static_cast(mode); + } + } if (code_seen('T')) backlightTimer_period = constrain(code_value_short(), LCD_BACKLIGHT_TIMEOUT, LCD_BACKLIGHT_TIMEOUT*60); printf_P(PSTR("M256 B%d D%d S%d T%u\n"), backlightLevel_HIGH, backlightLevel_LOW, backlightMode, backlightTimer_period); backlight_save();