bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x

Browse Source
This commit is contained in:
Bob-the-Kuhn
2019-04-17 15:34:29 -05:00
parent 57aaa9110b e1acc09c6e
commit 520585c5ed
208 changed files with 1900 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
View File

@ -517,7 +517,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
else {
#if DISABLED(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING)
if (!TEST(axis_known_position, axis))
lcd_put_u8str_P(axis == Z_AXIS ? PSTR(" ") : PSTR(" "));
lcd_put_u8str_P(axis == Z_AXIS ? PSTR(" ") : PSTR(" "));
else
#endif
lcd_put_u8str(value);

2
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@ -245,7 +245,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
else {
#if DISABLED(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING)
if (!TEST(axis_known_position, axis))
lcd_put_u8str_P(axis == Z_AXIS ? PSTR(" ") : PSTR(" "));
lcd_put_u8str_P(axis == Z_AXIS ? PSTR(" ") : PSTR(" "));
else
#endif
lcd_put_u8str(value);

6
Marlin/src/lcd/dogm/ultralcd_DOGM.h
View File

@ -112,7 +112,11 @@
//#define U8G_CLASS U8GLIB_MINI12864
//#define U8G_PARAM DOGLCD_CS, DOGLCD_A0 // 8 stripes
#define U8G_CLASS U8GLIB_MINI12864_2X
#define U8G_PARAM DOGLCD_CS, DOGLCD_A0 // 4 stripes
#if EITHER(FYSETC_MINI_12864, TARGET_LPC1768)
#define U8G_PARAM DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0 // 4 stripes SW-SPI
#else
#define U8G_PARAM DOGLCD_CS, DOGLCD_A0 // 4 stripes HW-SPI
#endif
#elif ENABLED(U8GLIB_SH1106_EINSTART)
// Connected via motherboard header
#define U8G_CLASS U8GLIB_SH1106_128X64

152
Marlin/src/lcd/language/language_cz.h
View File

@ -35,15 +35,20 @@
*/
#define DISPLAY_CHARSET_ISO10646_CZ
#define THIS_LANGUAGES_SPECIAL_SYMBOLS _UxGT("áÁčČďĎéÉěĚíÍňŇóÓřŘšŠťŤúÚůŮýÝžŽ³")
#define CHARSIZE 2
#define WELCOME_MSG MACHINE_NAME _UxGT(" připraven.")
#define MSG_YES _UxGT("ANO")
#define MSG_NO _UxGT("NE")
#define MSG_BACK _UxGT("Zpět")
#define MSG_SD_INSERTED _UxGT("Karta vložena")
#define MSG_SD_REMOVED _UxGT("Karta vyjmuta")
#define MSG_LCD_ENDSTOPS _UxGT("Endstopy") // max 8 znaku
#define MSG_LCD_SOFT_ENDSTOPS _UxGT("Soft Endstopy")
#define MSG_MAIN _UxGT("Hlavní nabídka")
#define MSG_ADVANCED_SETTINGS _UxGT("Další nastavení")
#define MSG_CONFIGURATION _UxGT("Konfigurace")
#define MSG_AUTOSTART _UxGT("Autostart")
#define MSG_DISABLE_STEPPERS _UxGT("Uvolnit motory")
#define MSG_DEBUG_MENU _UxGT("Nabídka ladění")
@ -56,6 +61,7 @@
#define MSG_AUTO_HOME_X _UxGT("Domů osa X")
#define MSG_AUTO_HOME_Y _UxGT("Domů osa Y")
#define MSG_AUTO_HOME_Z _UxGT("Domů osa Z")
#define MSG_AUTO_Z_ALIGN _UxGT("Auto srovnání Z")
#define MSG_LEVEL_BED_HOMING _UxGT("Měření podložky")
#define MSG_LEVEL_BED_WAITING _UxGT("Kliknutím spusťte")
#define MSG_LEVEL_BED_NEXT_POINT _UxGT("Další bod")
@ -76,7 +82,13 @@
#define MSG_PREHEAT_2_END MSG_PREHEAT_2 _UxGT(" hotend")
#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 _UxGT(" podlož")
#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 _UxGT(" nast")
#define MSG_PREHEAT_CUSTOM _UxGT("Zahřát vlastní")
#define MSG_COOLDOWN _UxGT("Zchladit")
#define MSG_LASER_MENU _UxGT("Ovládání laseru")
#define MSG_LASER_OFF _UxGT("Vypnout laser")
#define MSG_LASER_ON _UxGT("Zapnout laser")
#define MSG_LASER_POWER _UxGT("Výkon laseru")
#define MSG_SPINDLE_REVERSE _UxGT("Vřeteno opačně")
#define MSG_SWITCH_PS_ON _UxGT("Zapnout napájení")
#define MSG_SWITCH_PS_OFF _UxGT("Vypnout napájení")
#define MSG_EXTRUDE _UxGT("Vytlačit (extr.)")
@ -88,10 +100,23 @@
#define MSG_NEXT_CORNER _UxGT("Další roh")
#define MSG_EDITING_STOPPED _UxGT("Konec úprav sítě")
#define MSG_MESH_X _UxGT("Index X")
#define MSG_MESH_Y _UxGT("Index Y")
#define MSG_MESH_EDIT_Z _UxGT("Hodnota Z")
#define MSG_USER_MENU _UxGT("Vlastní příkazy")
#define MSG_UBL_DOING_G29 _UxGT("Provádím G29")
#define MSG_UBL_UNHOMED _UxGT("Přejeďte domů")
#define MSG_UBL_TOOLS _UxGT("UBL nástroje")
#define MSG_UBL_LEVEL_BED _UxGT("Unified Bed Leveling")
#define MSG_IDEX_MENU _UxGT("Režim IDEX")
#define MSG_OFFSETS_MENU _UxGT("Ofsety nástrojů")
#define MSG_IDEX_MODE_AUTOPARK _UxGT("Auto-Park")
#define MSG_IDEX_MODE_DUPLICATE _UxGT("Duplikace")
#define MSG_IDEX_MODE_MIRRORED_COPY _UxGT("Zrcadlení")
#define MSG_IDEX_MODE_FULL_CTRL _UxGT("Plná kontrola")
#define MSG_X_OFFSET _UxGT("2. tryska X")
#define MSG_Y_OFFSET _UxGT("2. tryska Y")
#define MSG_Z_OFFSET _UxGT("2. tryska Z")
#define MSG_UBL_MANUAL_MESH _UxGT("Manuální síť bodů")
#define MSG_UBL_BC_INSERT _UxGT("Vložte kartu, změřte")
#define MSG_UBL_BC_INSERT2 _UxGT("Změřte")
@ -169,7 +194,6 @@
#define MSG_INTENSITY_B _UxGT("Modrá intenzita")
#define MSG_INTENSITY_W _UxGT("Bílá intenzita")
#define MSG_LED_BRIGHTNESS _UxGT("Jas")
#define MSG_USER_MENU _UxGT("Vlastní příkazy")
#define MSG_MOVING _UxGT("Posouvání...")
#define MSG_FREE_XY _UxGT("Uvolnit XY")
@ -177,6 +201,7 @@
#define MSG_MOVE_Y _UxGT("Posunout Y")
#define MSG_MOVE_Z _UxGT("Posunout Z")
#define MSG_MOVE_E _UxGT("Extrudér")
#define MSG_HOTEND_TOO_COLD _UxGT("Hotend je studený")
#define MSG_MOVE_01MM _UxGT("Posunout o 0,1mm")
#define MSG_MOVE_1MM _UxGT("Posunout o 1mm")
#define MSG_MOVE_10MM _UxGT("Posunout o 10mm")
@ -184,6 +209,7 @@
#define MSG_BED_Z _UxGT("Výška podl.")
#define MSG_NOZZLE _UxGT("Tryska")
#define MSG_BED _UxGT("Podložka")
#define MSG_CHAMBER _UxGT("Komora")
#define MSG_FAN_SPEED _UxGT("Rychlost vent.")
#define MSG_EXTRA_FAN_SPEED _UxGT("Rychlost ex. vent.")
#define MSG_FLOW _UxGT("Průtok")
@ -250,10 +276,15 @@
#define MSG_LOAD_EEPROM _UxGT("Načíst nastavení")
#define MSG_RESTORE_FAILSAFE _UxGT("Obnovit výchozí")
#define MSG_INIT_EEPROM _UxGT("Inic. EEPROM")
#define MSG_SD_UPDATE _UxGT("Aktualizace z SD")
#define MSG_RESET_PRINTER _UxGT("Reset tiskárny")
#define MSG_REFRESH _UxGT("Obnovit")
#define MSG_WATCH _UxGT("Info obrazovka")
#define MSG_PREPARE _UxGT("Připrava tisku")
#define MSG_TUNE _UxGT("Doladění tisku")
#define MSG_START_PRINT _UxGT("Spustit tisk")
#define MSG_BUTTON_PRINT _UxGT("Tisk")
#define MSG_BUTTON_CANCEL _UxGT("Zrušit")
#define MSG_PAUSE_PRINT _UxGT("Pozastavit tisk")
#define MSG_RESUME_PRINT _UxGT("Obnovit tisk")
#define MSG_STOP_PRINT _UxGT("Zastavit tisk")
@ -277,6 +308,12 @@
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_CONTROL_RETRACT_RECOVER_SWAPF _UxGT("S UnRet V")
#define MSG_AUTORETRACT _UxGT("AutoRetr.")
#define MSG_FILAMENT_SWAP_LENGTH _UxGT("Délka retrakce")
#define MSG_TOOL_CHANGE _UxGT("Výměna nástroje")
#define MSG_TOOL_CHANGE_ZLIFT _UxGT("Zdvih Z")
#define MSG_SINGLENOZZLE_PRIME_SPD _UxGT("Rychlost primár.")
#define MSG_SINGLENOZZLE_RETRACT_SPD _UxGT("Rychlost retrak.")
#define MSG_NOZZLE_STANDBY _UxGT("Tryska standby")
#define MSG_FILAMENTCHANGE _UxGT("Vyměnit filament")
#define MSG_FILAMENTLOAD _UxGT("Zavést filament")
#define MSG_FILAMENTUNLOAD _UxGT("Vysunout filament")
@ -287,16 +324,22 @@
#define MSG_ZPROBE_OUT _UxGT("Sonda Z mimo podl")
#define MSG_SKEW_FACTOR _UxGT("Faktor zkosení")
#define MSG_BLTOUCH _UxGT("BLTouch")
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Self-Test")
#define MSG_BLTOUCH_RESET _UxGT("BLTouch Reset")
#define MSG_BLTOUCH_DEPLOY _UxGT("BLTouch Vysunout")
#define MSG_BLTOUCH_STOW _UxGT("BLTouch Zasunout")
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch self-test")
#define MSG_BLTOUCH_RESET _UxGT("BLTouch reset")
#define MSG_BLTOUCH_DEPLOY _UxGT("BLTouch vysunout")
#define MSG_BLTOUCH_SW_MODE _UxGT("SW výsun BLTouch")
#define MSG_BLTOUCH_5V_MODE _UxGT("BLTouch 5V režim")
#define MSG_BLTOUCH_OD_MODE _UxGT("BLTouch OD režim")
#define MSG_BLTOUCH_STOW _UxGT("BLTouch zasunout")
#define MSG_MANUAL_DEPLOY _UxGT("Vysunout Z-sondu")
#define MSG_MANUAL_STOW _UxGT("Zasunout Z-sondu")
#define MSG_HOME _UxGT("Domů") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("první")
#define MSG_ZPROBE_ZOFFSET _UxGT("Z ofset")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
#define MSG_BABYSTEP_Z _UxGT("Babystep Z")
#define MSG_BABYSTEP_TOTAL _UxGT("Celkem")
#define MSG_ENDSTOP_ABORT _UxGT("Endstop abort")
#define MSG_HEATING_FAILED_LCD _UxGT("Chyba zahřívání")
#define MSG_HEATING_FAILED_LCD_BED _UxGT("Chyba zahř.podl.")
@ -307,6 +350,8 @@
#define MSG_ERR_MINTEMP _UxGT("NÍZKA TEPLOTA")
#define MSG_ERR_MAXTEMP_BED _UxGT("VYS. TEPL. PODL.")
#define MSG_ERR_MINTEMP_BED _UxGT("NÍZ. TEPL. PODL.")
#define MSG_ERR_MAXTEMP_CHAMBER _UxGT("Err: MAXTEMP KOMORA")
#define MSG_ERR_MINTEMP_CHAMBER _UxGT("Err: MINTEMP KOMORA")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_HALTED _UxGT("TISK. ZASTAVENA")
#define MSG_PLEASE_RESET _UxGT("Proveďte reset")
@ -380,18 +425,82 @@
#define MSG_FILAMENT_CHANGE_OPTION_PURGE _UxGT("Vytlačit víc")
#define MSG_FILAMENT_CHANGE_OPTION_RESUME _UxGT("Obnovit tisk")
#define MSG_FILAMENT_CHANGE_NOZZLE _UxGT(" Tryska: ")
#define MSG_RUNOUT_SENSOR _UxGT("Senzor filamentu")
#define MSG_ERR_HOMING_FAILED _UxGT("Parkování selhalo")
#define MSG_ERR_PROBING_FAILED _UxGT("Kalibrace selhala")
#define MSG_M600_TOO_COLD _UxGT("M600: Moc studený")
#define MSG_MMU2_FILAMENT_CHANGE_HEADER _UxGT("VÝMĚNA FILAMENTU")
#define MSG_MMU2_CHOOSE_FILAMENT_HEADER _UxGT("VYBERTE FILAMENT")
#define MSG_MMU2_MENU _UxGT("MMU")
#define MSG_MMU2_WRONG_FIRMWARE _UxGT("Aktual. MMU firmware!")
#define MSG_MMU2_NOT_RESPONDING _UxGT("MMU potř. pozornost.")
#define MSG_MMU2_RESUME _UxGT("Obnovit tisk")
#define MSG_MMU2_RESUMING _UxGT("Obnovování...")
#define MSG_MMU2_LOAD_FILAMENT _UxGT("Zavést filament")
#define MSG_MMU2_LOAD_ALL _UxGT("Zavést všechny")
#define MSG_MMU2_LOAD_TO_NOZZLE _UxGT("Zavést do trysky")
#define MSG_MMU2_EJECT_FILAMENT _UxGT("Vysunout filament")
#define MSG_MMU2_EJECT_FILAMENT0 _UxGT("Vysun. filament 1")
#define MSG_MMU2_EJECT_FILAMENT1 _UxGT("Vysun. filament 2")
#define MSG_MMU2_EJECT_FILAMENT2 _UxGT("Vysun. filament 3")
#define MSG_MMU2_EJECT_FILAMENT3 _UxGT("Vysun. filament 4")
#define MSG_MMU2_EJECT_FILAMENT4 _UxGT("Vysun. filament 5")
#define MSG_MMU2_UNLOAD_FILAMENT _UxGT("Vytáhnout filament")
#define MSG_MMU2_LOADING_FILAMENT _UxGT("Zavádění fil. %i...")
#define MSG_MMU2_EJECTING_FILAMENT _UxGT("Vytahování fil. ...")
#define MSG_MMU2_UNLOADING_FILAMENT _UxGT("Vysouvání fil....")
#define MSG_MMU2_ALL _UxGT("Všechny")
#define MSG_MMU2_FILAMENT0 _UxGT("Filament 1")
#define MSG_MMU2_FILAMENT1 _UxGT("Filament 2")
#define MSG_MMU2_FILAMENT2 _UxGT("Filament 3")
#define MSG_MMU2_FILAMENT3 _UxGT("Filament 4")
#define MSG_MMU2_FILAMENT4 _UxGT("Filament 5")
#define MSG_MMU2_RESET _UxGT("Resetovat MMU")
#define MSG_MMU2_RESETTING _UxGT("Resetování MMU...")
#define MSG_MMU2_EJECT_RECOVER _UxGT("Vytáhněte, klikněte")
#define MSG_MIX _UxGT("Mix")
#define MSG_MIX_COMPONENT _UxGT("Komponenta")
#define MSG_MIXER _UxGT("Mixér")
#define MSG_GRADIENT _UxGT("Přechod")
#define MSG_FULL_GRADIENT _UxGT("Celý přechod")
#define MSG_TOGGLE_MIX _UxGT("Přepnout mix")
#define MSG_CYCLE_MIX _UxGT("Střídat mix")
#define MSG_GRADIENT_MIX _UxGT("Přechod mix")
#define MSG_REVERSE_GRADIENT _UxGT("Opačný přechod")
#if LCD_WIDTH >= 20
#define MSG_ACTIVE_VTOOL _UxGT("Aktivní V-nástroj")
#define MSG_START_VTOOL _UxGT("Spustit V-nástroj")
#define MSG_END_VTOOL _UxGT("Ukončit V-nástroj")
#define MSG_GRADIENT_ALIAS _UxGT("Alias V-nástroje")
#define MSG_RESET_VTOOLS _UxGT("Resetovat V-nástroj")
#define MSG_COMMIT_VTOOL _UxGT("Uložit V-nástroj mix")
#define MSG_VTOOLS_RESET _UxGT("V-nástroj resetovat")
#else
#define MSG_ACTIVE_VTOOL _UxGT("Aktivní V-nástr.")
#define MSG_START_VTOOL _UxGT("Spustit V-nástr.")
#define MSG_END_VTOOL _UxGT("Ukončit V-nástr.")
#define MSG_GRADIENT_ALIAS _UxGT("Alias V-nástr.")
#define MSG_RESET_VTOOLS _UxGT("Reset. V-nástr.")
#define MSG_COMMIT_VTOOL _UxGT("Uložit V-nás. mix")
#define MSG_VTOOLS_RESET _UxGT("V-nástr. reset.")
#endif
#define MSG_START_Z _UxGT("Počáteční Z")
#define MSG_END_Z _UxGT(" Koncové Z")
#define MSG_BRICKOUT _UxGT("Brickout")
#define MSG_INVADERS _UxGT("Invaders")
#define MSG_SNAKE _UxGT("Sn4k3")
#define MSG_MAZE _UxGT("Bludiště")
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_ADVANCED_PAUSE_WAITING_1 _UxGT("Stikněte tlačítko")
#define MSG_ADVANCED_PAUSE_WAITING_2 _UxGT("pro obnovení tisku")
#define MSG_PAUSE_PRINT_INIT_1 _UxGT("Parkování...")
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Čekejte prosím")
#define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("na zahájení")
#define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("výměny filamentu")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Čekejte prosím")
#define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("na vysunuti")
#define MSG_FILAMENT_CHANGE_UNLOAD_3 _UxGT("filamentu")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Vložte filament")
#define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("a stiskněte")
#define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("tlačítko...")
@ -399,21 +508,46 @@
#define MSG_FILAMENT_CHANGE_HEAT_2 _UxGT("nahřátí trysky")
#define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("Čekejte prosím")
#define MSG_FILAMENT_CHANGE_HEATING_2 _UxGT("na nahřátí tr.")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Čekejte prosím")
#define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("na vysunuti")
#define MSG_FILAMENT_CHANGE_UNLOAD_3 _UxGT("filamentu")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Čekejte prosím")
#define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("na zavedení")
#define MSG_FILAMENT_CHANGE_LOAD_3 _UxGT("filamentu")
#define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("Vyčkejte na")
#define MSG_FILAMENT_CHANGE_PURGE_2 _UxGT("vytlačení")
#define MSG_FILAMENT_CHANGE_CONT_PURGE_1 _UxGT("Klikněte pro")
#define MSG_FILAMENT_CHANGE_CONT_PURGE_2 _UxGT("ukončení")
#define MSG_FILAMENT_CHANGE_CONT_PURGE_3 _UxGT("vytlačování")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Čekejte prosím")
#define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("na pokračování")
#define MSG_FILAMENT_CHANGE_RESUME_3 _UxGT("tisku")
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_ADVANCED_PAUSE_WAITING_1 _UxGT("Stikněte tlač.")
#define MSG_ADVANCED_PAUSE_WAITING_2 _UxGT("pro obnovení")
#define MSG_PAUSE_PRINT_INIT_1 _UxGT("Parkování...")
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Čekejte...")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Vysouvání...")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Vložte, klikněte")
#define MSG_FILAMENT_CHANGE_HEAT_1 _UxGT("Klikněte pro")
#define MSG_FILAMENT_CHANGE_HEAT_2 _UxGT("nahřátí")
#define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("Nahřívání...")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Vysouvání...")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Zavádění...")
#define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("Vytlačování...")
#define MSG_FILAMENT_CHANGE_CONT_PURGE_1 _UxGT("Klikněte pro")
#define MSG_FILAMENT_CHANGE_CONT_PURGE_2 _UxGT("ukončení")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Pokračování...")
#endif // LCD_HEIGHT < 4
#define MSG_TMC_DRIVERS _UxGT("TMC budiče")
#define MSG_TMC_CURRENT _UxGT("Proud budičů")
#define MSG_TMC_HYBRID_THRS _UxGT("Hybridní práh")
#define MSG_TMC_HOMING_THRS _UxGT("Domů bez senzorů")
#define MSG_TMC_STEPPING_MODE _UxGT("Režim kroků")
#define MSG_TMC_STEALTH_ENABLED _UxGT("StealthChop povolen")
#define MSG_SERVICE_RESET _UxGT("Reset")
#define MSG_SERVICE_IN _UxGT(" za:")
#define MSG_BACKLASH _UxGT("Vůle")
#define MSG_BACKLASH_CORRECTION _UxGT("Korekce")
#define MSG_BACKLASH_SMOOTHING _UxGT("Vyhlazení")

3
Marlin/src/lcd/language/language_en.h
View File

@ -1362,6 +1362,9 @@
#ifndef MSG_ADVANCED_PAUSE_WAITING_1
#define MSG_ADVANCED_PAUSE_WAITING_1 _UxGT("Click to continue")
#endif
#ifndef MSG_PAUSE_PRINT_INIT_1
#define MSG_PAUSE_PRINT_INIT_1 _UxGT("Parking...")
#endif
#ifndef MSG_FILAMENT_CHANGE_INIT_1
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Please wait...")
#endif

14
Marlin/src/lcd/language/language_sk.h
View File

@ -40,6 +40,8 @@
#define THIS_LANGUAGES_SPECIAL_SYMBOLS _UxGT("äÄáÁčČďĎéÉíÍĺĹľĽňŇóÓôÔŕŔšŠťŤúÚýÝžŽ³")
#define WELCOME_MSG MACHINE_NAME _UxGT(" pripravená.")
#define MSG_YES _UxGT("ÁNO")
#define MSG_NO _UxGT("NIE")
#define MSG_BACK _UxGT("Naspäť")
#define MSG_SD_INSERTED _UxGT("Karta vložená")
#define MSG_SD_REMOVED _UxGT("Karta vybraná")
@ -104,6 +106,7 @@
#define MSG_UBL_TOOLS _UxGT("Nástroje UBL")
#define MSG_UBL_LEVEL_BED _UxGT("UBL rovnanie")
#define MSG_IDEX_MENU _UxGT("IDEX režim")
#define MSG_OFFSETS_MENU _UxGT("Offset nástrojov")
#define MSG_IDEX_MODE_AUTOPARK _UxGT("Auto-parkovanie")
#define MSG_IDEX_MODE_DUPLICATE _UxGT("Duplikácia")
#define MSG_IDEX_MODE_MIRRORED_COPY _UxGT("Zrkadlená kópia")
@ -276,6 +279,9 @@
#define MSG_WATCH _UxGT("Info. obrazovka")
#define MSG_PREPARE _UxGT("Príprava tlače")
#define MSG_TUNE _UxGT("Doladenie tlače")
#define MSG_START_PRINT _UxGT("Spustiť tlač")
#define MSG_BUTTON_PRINT _UxGT("Tlačiť")
#define MSG_BUTTON_CANCEL _UxGT("Zrušiť")
#define MSG_PAUSE_PRINT _UxGT("Pozastaviť tlač")
#define MSG_RESUME_PRINT _UxGT("Obnoviť tlač")
#define MSG_STOP_PRINT _UxGT("Zastaviť tlač")
@ -330,6 +336,7 @@
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
#define MSG_BABYSTEP_Z _UxGT("Babystep Z")
#define MSG_BABYSTEP_TOTAL _UxGT("Celkom")
#define MSG_ENDSTOP_ABORT _UxGT("Zastavenie Endstop")
#define MSG_HEATING_FAILED_LCD _UxGT("Chyba ohrevu")
#define MSG_HEATING_FAILED_LCD_BED _UxGT("Chyba ohrevu podl.")
@ -461,6 +468,10 @@
#define MSG_VTOOLS_RESET _UxGT("V-tools resetované")
#define MSG_START_Z _UxGT("Počiat.Z")
#define MSG_END_Z _UxGT("Konečn.Z")
#define MSG_BRICKOUT _UxGT("Brickout")
#define MSG_INVADERS _UxGT("Nájazdníci")
#define MSG_SNAKE _UxGT("Had")
#define MSG_MAZE _UxGT("Bludisko")
//
// Filament Change screens show up to 3 lines on a 4-line display
@ -515,3 +526,6 @@
#define MSG_SERVICE_RESET _UxGT("Vynulovať")
#define MSG_SERVICE_IN _UxGT(" za:")
#define MSG_BACKLASH _UxGT("Kompenz. vôle")
#define MSG_BACKLASH_CORRECTION _UxGT("Korekcia")
#define MSG_BACKLASH_SMOOTHING _UxGT("Vyhladzovanie")

4
Marlin/src/lcd/menu/menu.cpp
View File

@ -167,9 +167,9 @@ DEFINE_MENU_EDIT_ITEM(float3); // 123 right-justified
DEFINE_MENU_EDIT_ITEM(float52); // 123.45
DEFINE_MENU_EDIT_ITEM(float43); // 1.234
DEFINE_MENU_EDIT_ITEM(float5); // 12345 right-justified
DEFINE_MENU_EDIT_ITEM(float51); // +1234.5
DEFINE_MENU_EDIT_ITEM(float51); // 1234.5 right-justified
DEFINE_MENU_EDIT_ITEM(float51sign); // +1234.5
DEFINE_MENU_EDIT_ITEM(float52sign); // +123.45
DEFINE_MENU_EDIT_ITEM(float62); // 1234.56 right-justified
DEFINE_MENU_EDIT_ITEM(long5); // 12345 right-justified
void MenuItem_bool::action_edit(PGM_P pstr, bool *ptr, screenFunc_t callback) {

18
Marlin/src/lcd/menu/menu.h
View File

@ -24,6 +24,8 @@
#include "../ultralcd.h"
#include "../../inc/MarlinConfig.h"
#include "limits.h"
extern int8_t encoderLine, encoderTopLine, screen_items;
extern bool screen_changed;
@ -54,9 +56,9 @@ DECLARE_MENU_EDIT_TYPE(float, float3, ftostr3, 1 ); // 123
DECLARE_MENU_EDIT_TYPE(float, float52, ftostr52, 100 ); // 123.45
DECLARE_MENU_EDIT_TYPE(float, float43, ftostr43sign, 1000 ); // 1.234
DECLARE_MENU_EDIT_TYPE(float, float5, ftostr5rj, 0.01f ); // 12345 right-justified
DECLARE_MENU_EDIT_TYPE(float, float51, ftostr51sign, 10 ); // +1234.5
DECLARE_MENU_EDIT_TYPE(float, float51, ftostr51rj, 10 ); // 1234.5 right-justified
DECLARE_MENU_EDIT_TYPE(float, float51sign, ftostr51sign, 10 ); // +1234.5
DECLARE_MENU_EDIT_TYPE(float, float52sign, ftostr52sign, 100 ); // +123.45
DECLARE_MENU_EDIT_TYPE(float, float62, ftostr62rj, 100 ); // 1234.56 right-justified
DECLARE_MENU_EDIT_TYPE(uint32_t, long5, ftostr5rj, 0.01f ); // 12345 right-justified
////////////////////////////////////////////
@ -119,9 +121,9 @@ DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float3); // 123 right-justif
DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52); // 123.45
DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float43); // 1.234
DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float5); // 12345 right-justified
DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51); // +1234.5
DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51); // 1234.5 right-justified
DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float51sign); // +1234.5
DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float52sign); // +123.45
DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(float62); // 1234.56 right-justified
DEFINE_DRAW_MENU_ITEM_SETTING_EDIT(long5); // 12345 right-justified
#define draw_menu_item_edit_bool(sel, row, pstr, pstr2, data, ...) DRAW_BOOL_SETTING(sel, row, pstr, data)
@ -179,8 +181,10 @@ class TMenuItem : MenuItemBase {
static char* to_string(const int16_t value) { return NAME::strfunc(unscale(value)); }
public:
static void action_edit(PGM_P const pstr, type_t * const ptr, const type_t minValue, const type_t maxValue, const screenFunc_t callback=NULL, const bool live=false) {
const int16_t minv = scale(minValue);
init(pstr, ptr, minv, int16_t(scale(maxValue)) - minv, int16_t(scale(*ptr)) - minv, edit, callback, live);
// Make sure minv and maxv fit within int16_t
const int16_t minv = MAX(scale(minValue), INT16_MIN),
maxv = MIN(scale(maxValue), INT16_MAX);
init(pstr, ptr, minv, maxv - minv, scale(*ptr) - minv, edit, callback, live);
}
static void edit() { MenuItemBase::edit(to_string, load); }
};
@ -199,8 +203,8 @@ DECLARE_MENU_EDIT_ITEM(float52);
DECLARE_MENU_EDIT_ITEM(float43);
DECLARE_MENU_EDIT_ITEM(float5);
DECLARE_MENU_EDIT_ITEM(float51);
DECLARE_MENU_EDIT_ITEM(float51sign);
DECLARE_MENU_EDIT_ITEM(float52sign);
DECLARE_MENU_EDIT_ITEM(float62);
DECLARE_MENU_EDIT_ITEM(long5);
class MenuItem_bool {

8
Marlin/src/lcd/menu/menu_advanced.cpp
View File

@ -571,14 +571,14 @@ void menu_backlash();
START_MENU();
MENU_BACK(MSG_ADVANCED_SETTINGS);
#define EDIT_QSTEPS(Q) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_##Q##STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, _planner_refresh_positioning)
#define EDIT_QSTEPS(Q) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_##Q##STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, _planner_refresh_positioning)
EDIT_QSTEPS(A);
EDIT_QSTEPS(B);
EDIT_QSTEPS(C);
#if ENABLED(DISTINCT_E_FACTORS)
#define EDIT_ESTEPS(N,E) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_E##N##STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(E)], 5, 9999, _planner_refresh_e##E##_positioning)
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, _planner_refresh_positioning);
#define EDIT_ESTEPS(N,E) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_E##N##STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(E)], 5, 9999, _planner_refresh_e##E##_positioning)
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_ESTEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, _planner_refresh_positioning);
EDIT_ESTEPS(1,0);
EDIT_ESTEPS(2,1);
#if E_STEPPERS > 2
@ -594,7 +594,7 @@ void menu_backlash();
#endif // E_STEPPERS > 3
#endif // E_STEPPERS > 2
#elif E_STEPPERS
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_positioning);
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_ESTEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_positioning);
#endif
END_MENU();