From 173062295f9ead60600c5df24419d911e5c3e994 Mon Sep 17 00:00:00 2001 From: Voinea Date: Sat, 6 Apr 2019 12:50:22 +0300 Subject: [PATCH 001/110] Enable print fan while waiting for cooldown --- Firmware/ultralcd.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e06824f1..c9932ead 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3507,6 +3507,8 @@ void lcd_wait_for_cool_down() { lcd_set_custom_characters_degree(); setAllTargetHotends(0); setTargetBed(0); + int fanSpeedBckp = fanSpeed; + fanSpeed = 255; while ((degHotend(0)>MAX_HOTEND_TEMP_CALIBRATION) || (degBed() > MAX_BED_TEMP_CALIBRATION)) { lcd_display_message_fullscreen_P(_i("Waiting for nozzle and bed cooling"));////MSG_WAITING_TEMP c=20 r=3 @@ -3525,6 +3527,7 @@ void lcd_wait_for_cool_down() { delay_keep_alive(1000); serialecho_temperatures(); } + fanSpeed = fanSpeedBckp; lcd_set_custom_characters_arrows(); lcd_update_enable(true); } From 863c7158b2f97c624acde09aa678ed7e06b5eac4 Mon Sep 17 00:00:00 2001 From: Paul Bransford Date: Tue, 16 Apr 2019 06:15:46 -0400 Subject: [PATCH 002/110] use modification times for sdcard sort --- Firmware/cardreader.cpp | 28 ++++++++++++++-------------- Firmware/cardreader.h | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 7aa8ed7e..38c3f9e6 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -137,8 +137,8 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m SERIAL_ECHOPGM("Access date: "); MYSERIAL.println(p.lastAccessDate); SERIAL_ECHOLNPGM("");*/ - creationDate = p.creationDate; - creationTime = p.creationTime; + modificationDate = p.lastWriteDate; + modificationTime = p.lastWriteTime; //writeDate = p.lastAccessDate; if (match != NULL) { if (strcasecmp(match, filename) == 0) return; @@ -761,8 +761,8 @@ void CardReader::presort() { #endif #elif SDSORT_USES_STACK char sortnames[fileCnt][LONG_FILENAME_LENGTH]; - uint16_t creation_time[fileCnt]; - uint16_t creation_date[fileCnt]; + uint16_t modification_time[fileCnt]; + uint16_t modification_date[fileCnt]; #endif // Folder sorting needs 1 bit per entry for flags. @@ -782,8 +782,8 @@ void CardReader::presort() { // retaining only two filenames at a time. This is very // slow but is safest and uses minimal RAM. char name1[LONG_FILENAME_LENGTH + 1]; - uint16_t creation_time_bckp; - uint16_t creation_date_bckp; + uint16_t modification_time_bckp; + uint16_t modification_date_bckp; #endif position = 0; @@ -809,8 +809,8 @@ void CardReader::presort() { #else // Copy filenames into the static array strcpy(sortnames[i], LONGEST_FILENAME); - creation_time[i] = creationTime; - creation_date[i] = creationDate; + modification_time[i] = modificationTime; + modification_date[i] = modificationDate; #if SDSORT_CACHE_NAMES strcpy(sortshort[i], filename); #endif @@ -835,12 +835,12 @@ void CardReader::presort() { // Compare names from the array or just the two buffered names #if SDSORT_USES_RAM #define _SORT_CMP_NODIR() (strcasecmp(sortnames[o1], sortnames[o2]) > 0) - #define _SORT_CMP_TIME_NODIR() (((creation_date[o1] == creation_date[o2]) && (creation_time[o1] < creation_time[o2])) || \ - (creation_date[o1] < creation_date [o2])) + #define _SORT_CMP_TIME_NODIR() (((modification_date[o1] == modification_date[o2]) && (modification_time[o1] < modification_time[o2])) || \ + (modification_date[o1] < modification_date [o2])) #else #define _SORT_CMP_NODIR() (strcasecmp(name1, name2) > 0) //true if lowercase(name1) > lowercase(name2) - #define _SORT_CMP_TIME_NODIR() (((creation_date_bckp == creationDate) && (creation_time_bckp > creationTime)) || \ - (creation_date_bckp > creationDate)) + #define _SORT_CMP_TIME_NODIR() (((modification_date_bckp == modificationDate) && (modification_time_bckp > modificationTime)) || \ + (modification_date_bckp > modificationDate)) #endif @@ -891,8 +891,8 @@ void CardReader::presort() { counter++; getfilename_simple(positions[o1]); strcpy(name1, LONGEST_FILENAME); // save (or getfilename below will trounce it) - creation_date_bckp = creationDate; - creation_time_bckp = creationTime; + modification_date_bckp = modificationDate; + modification_time_bckp = modificationTime; #if HAS_FOLDER_SORTING bool dir1 = filenameIsDir; #endif diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index f287a44f..9f8385ba 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -77,7 +77,7 @@ public: bool cardOK ; bool paused ; char filename[13]; - uint16_t creationTime, creationDate; + uint16_t modificationTime, modificationDate; uint32_t cluster, position; char longFilename[LONG_FILENAME_LENGTH]; bool filenameIsDir; @@ -114,8 +114,8 @@ private: #endif #elif !SDSORT_USES_STACK char sortnames[SDSORT_LIMIT][FILENAME_LENGTH]; - uint16_t creation_time[SDSORT_LIMIT]; - uint16_t creation_date[SDSORT_LIMIT]; + uint16_t modification_time[SDSORT_LIMIT]; + uint16_t modification_date[SDSORT_LIMIT]; #endif // Folder sorting uses an isDir array when caching items. From ce25bb8532b3f9262fbfd57c3613ecf782caeee9 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 19 Apr 2019 17:24:03 +0200 Subject: [PATCH 003/110] Introduce an editorconfig file --- .editorconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..8acdfc7e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,14 @@ +#-*-mode:conf-*- +# editorconfig file (see EditorConfig.org) + +root = true + +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +trim_trailing_whitespace = true +indent_style = space +indent_size = 4 +tab_width = 4 +max_line_length = 100 From e54497d80266ff818e6c08979cc53fee1a47b8e7 Mon Sep 17 00:00:00 2001 From: Renzo Date: Thu, 20 Jun 2019 00:09:55 +0200 Subject: [PATCH 004/110] added new function belt test under calibration menu --- Firmware/ultralcd.cpp | 60 +++++++++++++++++++++++++++++++++++++++++++ Firmware/ultralcd.h | 1 + 2 files changed, 61 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3b2be088..46ae201c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -152,6 +152,7 @@ static void mmu_cut_filament_menu(); static void lcd_menu_fails_stats(); #endif //TMC2130 or FILAMENT_SENSOR +static void lcd_belttest_v(); static void lcd_selftest_v(); #ifdef TMC2130 @@ -5568,6 +5569,9 @@ static void lcd_calibration_menu() MENU_ITEM_FUNCTION_P(_i("Wizard"), lcd_wizard);////MSG_WIZARD c=17 r=1 MENU_ITEM_SUBMENU_P(_i("First layer cal."), lcd_v2_calibration);////MSG_V2_CALIBRATION c=17 r=1 MENU_ITEM_GCODE_P(_T(MSG_AUTO_HOME), PSTR("G28 W")); +#ifdef TMC2130 + MENU_ITEM_FUNCTION_P(_i("Belt test "), lcd_belttest_v);////MSG_BELTTEST +#endif //TMC2130 MENU_ITEM_FUNCTION_P(_i("Selftest "), lcd_selftest_v);////MSG_SELFTEST #ifdef MK1BP // MK1 @@ -6942,6 +6946,62 @@ void lcd_sdcard_menu() MENU_END(); } +static void lcd_belttest_v() +{ + lcd_belttest(); + menu_back_if_clicked(); +} +void lcd_belttest_print(const char* msg, uint16_t X, uint16_t Y) +{ + lcd_clear(); + lcd_printf_P( + _N( + ESC_H(0,0) + "%S:\n" + "%S\n" + "X:%d\n" + "Y:%d" + ), + _i("Belt status"), + msg, + X,Y + ); +} +void lcd_belttest() +{ + int _progress = 0; + bool _result = true; + uint16_t X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); + uint16_t Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y)); + lcd_belttest_print(_i("Checking X..."), X, Y); + + _delay(2000); + KEEPALIVE_STATE(IN_HANDLER); + + _result = lcd_selfcheck_axis_sg(X_AXIS); + X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); + if (!_result){ + lcd_belttest_print(_i("Error"), X, Y); + return; + } + + lcd_belttest_print(_i("Checking Y..."), X, Y); + _result = lcd_selfcheck_axis_sg(Y_AXIS); + Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y)); + + if (!_result){ + lcd_belttest_print(_i("Error"), X, Y); + lcd_clear(); + return; + } + + + lcd_belttest_print(_i("Done"), X, Y); + + KEEPALIVE_STATE(NOT_BUSY); + _delay(3000); +} + static void lcd_selftest_v() { (void)lcd_selftest(); diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 665c1233..ac3a017d 100644 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -50,6 +50,7 @@ unsigned char lcd_choose_color(); void lcd_load_filament_color_check(); //void lcd_mylang(); +extern void lcd_belttest(); extern bool lcd_selftest(); void lcd_menu_statistics(); From 9a904362e5a0da174786d556b8bc9795e07c7f4e Mon Sep 17 00:00:00 2001 From: Renzo Dani Date: Thu, 20 Jun 2019 10:17:48 +0200 Subject: [PATCH 005/110] code only for TMC2130 --- Firmware/ultralcd.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 46ae201c..7dd8b027 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -152,7 +152,10 @@ static void mmu_cut_filament_menu(); static void lcd_menu_fails_stats(); #endif //TMC2130 or FILAMENT_SENSOR +#ifdef TMC2130 static void lcd_belttest_v(); +#endif //TMC2130 + static void lcd_selftest_v(); #ifdef TMC2130 @@ -6945,7 +6948,7 @@ void lcd_sdcard_menu() } MENU_END(); } - +#ifdef TMC2130 static void lcd_belttest_v() { lcd_belttest(); @@ -7001,6 +7004,7 @@ void lcd_belttest() KEEPALIVE_STATE(NOT_BUSY); _delay(3000); } +#endif //TMC2130 static void lcd_selftest_v() { From 556b87edece80f38bfaa8c3aa05dd97786e0f74f Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 29 Jul 2019 09:41:33 +0300 Subject: [PATCH 006/110] M350 for all axis - MK3 --- Firmware/Marlin_main.cpp | 43 +++++++++++++++++++++++----------------- Firmware/tmc2130.cpp | 4 ++-- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 35722679..d987fad9 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7538,27 +7538,34 @@ Sigma_Exit: case 350: { #ifdef TMC2130 - if(code_seen('E')) + for (int i=0; i res) + uint16_t res_new = code_value(); + bool res_valid = (res_new == 8) || (res_new == 16) || (res_new == 32); // resolutions valid for all axis + res_valid |= (i != E_AXIS) && ((res_new == 1) || (res_new == 2) || (res_new == 4)); // resolutions valid for X Y Z only + res_valid |= (i == E_AXIS) && ((res_new == 64) || (res_new == 128)); // resolutions valid for E only + if (res_valid) { - uint16_t fac = (res_new / res); - cs.axis_steps_per_unit[axis] *= fac; - position[E_AXIS] *= fac; - } - else - { - uint16_t fac = (res / res_new); - cs.axis_steps_per_unit[axis] /= fac; - position[E_AXIS] /= fac; + + st_synchronize(); + uint16_t res = tmc2130_get_res(i); + tmc2130_set_res(i, res_new); + cs.axis_ustep_resolution[i] = res_new; + uint16_t fac; + if (res_new > res) + { + fac = (res_new / res); + cs.axis_steps_per_unit[i] *= fac; + position[i] *= fac; + } + else + { + fac = (res / res_new); + cs.axis_steps_per_unit[i] /= fac; + position[i] /= fac; + } } } } diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 15188fc4..bff7030b 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -425,7 +425,7 @@ void tmc2130_check_overtemp() void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_t current_r) { - uint8_t intpol = 1; + uint8_t intpol = (mres != 0); // intpol to 256 only if microsteps aren't 256 uint8_t toff = tmc2130_chopper_config[axis].toff; // toff = 3 (fchop = 27.778kHz) uint8_t hstrt = tmc2130_chopper_config[axis].hstr; //initial 4, modified to 5 uint8_t hend = tmc2130_chopper_config[axis].hend; //original value = 1 @@ -598,7 +598,7 @@ void tmc2130_wr_THIGH(uint8_t axis, uint32_t val32) uint8_t tmc2130_usteps2mres(uint16_t usteps) { - uint8_t mres = 8; while (mres && (usteps >>= 1)) mres--; + uint8_t mres = 8; while (usteps >>= 1) mres--; return mres; } From 5fdaead6633478946dd2f6eddaaf9636327a486c Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 29 Jul 2019 15:55:42 +0300 Subject: [PATCH 007/110] Fix language related warnings in LANG_MODE 0 --- Firmware/language.c | 6 +++--- Firmware/ultralcd.cpp | 4 ++++ Firmware/ultralcd.h | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Firmware/language.c b/Firmware/language.c index c4b501b9..e4376096 100644 --- a/Firmware/language.c +++ b/Firmware/language.c @@ -17,10 +17,10 @@ uint8_t lang_selected = 0; #if (LANG_MODE == 0) //primary language only -uint8_t lang_select(uint8_t lang) { return 0; } +uint8_t lang_select(__attribute__((unused)) uint8_t lang) { return 0; } uint8_t lang_get_count() { return 1; } -uint16_t lang_get_code(uint8_t lang) { return LANG_CODE_EN; } -const char* lang_get_name_by_code(uint16_t code) { return _n("English"); } +uint16_t lang_get_code(__attribute__((unused)) uint8_t lang) { return LANG_CODE_EN; } +const char* lang_get_name_by_code(__attribute__((unused)) uint16_t code) { return _n("English"); } void lang_reset(void) { } uint8_t lang_is_selected(void) { return 1; } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index acb369d9..cac952db 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -114,7 +114,9 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg, /* Different menus */ static void lcd_status_screen(); +#if (LANG_MODE != 0) static void lcd_language_menu(); +#endif static void lcd_main_menu(); static void lcd_tune_menu(); //static void lcd_move_menu(); @@ -4733,6 +4735,7 @@ void lcd_wizard() { } } +#if (LANG_MODE != 0) void lcd_language() { lcd_update_enable(true); @@ -4752,6 +4755,7 @@ void lcd_language() else lang_select(LANG_ID_PRI); } +#endif static void wait_preheat() { diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 2c57c944..62ba7519 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -6,6 +6,7 @@ #include "conv2str.h" #include "menu.h" #include "mesh_bed_calibration.h" +#include "config.h" extern void menu_lcd_longpress_func(void); extern void menu_lcd_charsetup_func(void); @@ -208,7 +209,9 @@ void lcd_set_degree(); void lcd_set_progress(); #endif +#if (LANG_MODE != 0) void lcd_language(); +#endif void lcd_wizard(); bool lcd_autoDepleteEnabled(); From 4e58a112e8935b5bf685e37a7cf2922b6171c6c9 Mon Sep 17 00:00:00 2001 From: rhounsell <53660397+rhounsell@users.noreply.github.com> Date: Thu, 8 Aug 2019 15:45:59 -0400 Subject: [PATCH 008/110] Fix for Toshiba FlashAir (or other) SD card initialization - add clock cycles between sending CMD0 and CMD8. Redone for MK3 branch) --- Firmware/Sd2Card.cpp | 15 +++++++++++++++ Firmware/Sd2Card.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/Firmware/Sd2Card.cpp b/Firmware/Sd2Card.cpp index c00c7ef9..cb1959be 100644 --- a/Firmware/Sd2Card.cpp +++ b/Firmware/Sd2Card.cpp @@ -319,6 +319,21 @@ bool Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) { goto fail; } } + + // send 0xFF until 0xFF received to give card some clock cycles + SERIAL_ECHOLNRPGM(PSTR("Sending 0xFF")); + spiSend(0XFF); + while ((status_ = spiRec()) != 0xFF) + { + spiSend(0XFF); + if (((uint16_t)_millis() - t0) > SD_CARD_ERROR_FF_TIMEOUT) + { + error(SD_CARD_ERROR_CMD8); + SERIAL_ECHOLNRPGM(PSTR("No 0xFF received")); + goto fail; + } + } + // check SD version if ((cardCommand(CMD8, 0x1AA) & R1_ILLEGAL_COMMAND)) { type(SD_CARD_TYPE_SD1); diff --git a/Firmware/Sd2Card.h b/Firmware/Sd2Card.h index 537d249c..f4cc59d7 100644 --- a/Firmware/Sd2Card.h +++ b/Firmware/Sd2Card.h @@ -105,6 +105,8 @@ uint8_t const SD_CARD_ERROR_SCK_RATE = 0X18; uint8_t const SD_CARD_ERROR_INIT_NOT_CALLED = 0X19; /** crc check error */ uint8_t const SD_CARD_ERROR_CRC = 0X20; +/** no response to sent 0xFF */ +uint8_t const SD_CARD_ERROR_FF_TIMEOUT = 0X21; /** Toshiba FlashAir: iSDIO */ uint8_t const SD_CARD_ERROR_CMD48 = 0x80; From 505deb28fd85f3baf4259d302865b64be181d411 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 10 Aug 2019 08:42:33 +0300 Subject: [PATCH 009/110] Toggle menu item --- Firmware/menu.cpp | 30 ++++++++++++++++++++++++++++++ Firmware/menu.h | 3 +++ 2 files changed, 33 insertions(+) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 7839bbdc..08503111 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -184,6 +184,17 @@ static void menu_draw_item_puts_P(char type_char, const char* str) lcd_printf_P(PSTR("%c%-18.18S%c"), menu_selection_mark(), str, type_char); } +static void menu_draw_toggle_puts_P(const char* str, const char* toggle) +{ + menu_draw_item_puts_P(LCD_STR_REFRESH[0], str); + lcd_set_cursor(LCD_WIDTH - 4 - strlen_P(toggle), menu_row); + lcd_putc('['); + lcd_puts_P(toggle); + lcd_putc(']'); + + // lcd_printf_P(PSTR("[%s]"), toggle); +} + //! @brief Format sheet name //! //! @param[in] sheet_E Sheet in EEPROM @@ -367,6 +378,25 @@ uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t) return 0; } +uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func) +{ + if (menu_item == menu_line) + { + if (lcd_draw_update) menu_draw_toggle_puts_P(str, toggle); + if (menu_clicked && (lcd_encoder == menu_item)) + { + menu_clicked = false; + lcd_consume_click(); + lcd_update_enabled = 0; + if (func) func(); + lcd_update_enabled = 1; + return menu_item_ret(); + } + } + menu_item++; + return 0; +} + uint8_t menu_item_gcode_P(const char* str, const char* str_gcode) { if (menu_item == menu_line) diff --git a/Firmware/menu.h b/Firmware/menu.h index d9bbf876..d7676661 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -118,6 +118,9 @@ extern uint8_t menu_item_function_P(const char* str, menu_func_t func); #define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0) extern uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t), uint8_t fn_par); +#define MENU_ITEM_TOGGLE_P(str, toggle, func) do { if (menu_item_toggle_P(str, toggle, func)) return; } while (0) +extern uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func); + #define MENU_ITEM_GCODE_P(str, str_gcode) do { if (menu_item_gcode_P(str, str_gcode)) return; } while (0) extern uint8_t menu_item_gcode_P(const char* str, const char* str_gcode); From 29dcb1cad356e1b2e43647591d84cd748023bfaa Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 10 Aug 2019 08:43:07 +0300 Subject: [PATCH 010/110] Toggle FANS_CHECK --- Firmware/messages.c | 4 ++-- Firmware/messages.h | 4 ++-- Firmware/ultralcd.cpp | 10 ++-------- lang/lang_en.txt | 12 ++++++------ lang/lang_en_cz.txt | 18 +++++++++--------- lang/lang_en_de.txt | 18 +++++++++--------- lang/lang_en_es.txt | 18 +++++++++--------- lang/lang_en_fr.txt | 16 ++++++++-------- lang/lang_en_it.txt | 16 ++++++++-------- lang/lang_en_pl.txt | 18 +++++++++--------- 10 files changed, 64 insertions(+), 70 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 1c36e43c..4c1dbc27 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -104,13 +104,13 @@ const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); //// const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1 const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 +const char MSG_OFF[] PROGMEM_I1 = "Off"; ////c=3 r=1 +const char MSG_ON[] PROGMEM_I1 = "On"; ////c=2 r=1 //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; //// const char MSG_EXTERNAL_RESET[] PROGMEM_N1 = " External Reset"; //// const char MSG_FILE_SAVED[] PROGMEM_N1 = "Done saving file."; //// -const char MSG_OFF[] PROGMEM_N1 = "Off"; //// -const char MSG_ON[] PROGMEM_N1 = "On "; //// const char MSG_POSITION_UNKNOWN[] PROGMEM_N1 = "Home X/Y before Z"; //// const char MSG_SOFTWARE_RESET[] PROGMEM_N1 = " Software Reset"; //// const char MSG_UNKNOWN_COMMAND[] PROGMEM_N1 = "Unknown command: \""; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index b48337ef..65ddbab3 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -104,12 +104,12 @@ extern const char MSG_WIZARD_QUIT[]; extern const char MSG_YES[]; extern const char MSG_V2_CALIBRATION[]; extern const char WELCOME_MSG[]; +extern const char MSG_OFF[]; +extern const char MSG_ON[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; extern const char MSG_EXTERNAL_RESET[]; extern const char MSG_FILE_SAVED[]; -extern const char MSG_OFF[]; -extern const char MSG_ON[]; extern const char MSG_POSITION_UNKNOWN[]; extern const char MSG_SOFTWARE_RESET[]; extern const char MSG_UNKNOWN_COMMAND[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ac8a302f..cf81908d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5569,10 +5569,7 @@ static void lcd_settings_menu() SETTINGS_CUTTER; - if (fans_check_enabled == true) - MENU_ITEM_FUNCTION_P(_i("Fans check [on]"), lcd_set_fan_check);////MSG_FANS_CHECK_ON c=17 r=1 - else - MENU_ITEM_FUNCTION_P(_i("Fans check [off]"), lcd_set_fan_check);////MSG_FANS_CHECK_OFF c=17 r=1 + MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); SETTINGS_SILENT_MODE; @@ -6881,10 +6878,7 @@ static void lcd_tune_menu() if(farm_mode) { - if (fans_check_enabled == true) - MENU_ITEM_FUNCTION_P(_i("Fans check [on]"), lcd_set_fan_check);////MSG_FANS_CHECK_ON c=17 r=1 - else - MENU_ITEM_FUNCTION_P(_i("Fans check [off]"), lcd_set_fan_check);////MSG_FANS_CHECK_OFF c=17 r=1 + MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); } #ifdef TMC2130 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 2da37fc0..8819d40a 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -220,11 +220,8 @@ #MSG_SELFTEST_FAN c=20 "Fan test" -#MSG_FANS_CHECK_ON c=17 r=1 -"Fans check [on]" - -#MSG_FANS_CHECK_OFF c=17 r=1 -"Fans check [off]" +#MSG_FANS_CHECK +"Fans check" #MSG_FSENSOR_ON "Fil. sensor [on]" @@ -929,4 +926,7 @@ "Y-correct:" #MSG_OFF -" [off]" +"Off" + +#MSG_ON +"On" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index ed682e81..9a4b7579 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -294,13 +294,9 @@ "Fan test" "Test ventilatoru" -#MSG_FANS_CHECK_ON c=17 r=1 -"Fans check [on]" -"Kontr. vent.[zap]" - -#MSG_FANS_CHECK_OFF c=17 r=1 -"Fans check [off]" -"Kontr. vent.[vyp]" +#MSG_FANS_CHECK +"Fans check" +"Kontr. vent." #MSG_FSENSOR_ON "Fil. sensor [on]" @@ -1239,5 +1235,9 @@ "Korekce Y:" #MSG_OFF -" [off]" -"\x00" +"Off" +"Vyp" + +#MSG_ON +"On" +"Zap" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index cb73f8f2..1dc09798 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -294,13 +294,9 @@ "Fan test" "Lueftertest" -#MSG_FANS_CHECK_ON c=17 r=1 -"Fans check [on]" -"Luefter Chk. [an]" - -#MSG_FANS_CHECK_OFF c=17 r=1 -"Fans check [off]" -"Luefter Chk.[aus]" +#MSG_FANS_CHECK +"Fans check" +"Luefter Chk." #MSG_FSENSOR_ON "Fil. sensor [on]" @@ -1240,5 +1236,9 @@ "Y-Korrektur:" #MSG_OFF -" [off]" -"\x00" +"Off" +"Aus" + +#MSG_ON +"On" +"An" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index a48da96f..ba1fea1e 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -294,13 +294,9 @@ "Fan test" "Test ventiladores" -#MSG_FANS_CHECK_ON c=17 r=1 -"Fans check [on]" -"Comprob.vent[act]" - -#MSG_FANS_CHECK_OFF c=17 r=1 -"Fans check [off]" -"Comprob.vent[ina]" +#MSG_FANS_CHECK +"Fans check" +"Comprob.vent" #MSG_FSENSOR_ON "Fil. sensor [on]" @@ -1239,5 +1235,9 @@ "Y-correcion:" #MSG_OFF -" [off]" -"\x00" +"Off" +"Ina" + +#MSG_ON +"On" +"Act" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 320b91d9..f86795d7 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -294,13 +294,9 @@ "Fan test" "Test ventilateur" -#MSG_FANS_CHECK_ON c=17 r=1 -"Fans check [on]" -"Verif ventilo[on]" - -#MSG_FANS_CHECK_OFF c=17 r=1 -"Fans check [off]" -"Verif venti [off]" +#MSG_FANS_CHECK +"Fans check" +"Verif ventilo" #MSG_FSENSOR_ON "Fil. sensor [on]" @@ -1239,5 +1235,9 @@ "Correct-Y:" #MSG_OFF -" [off]" +"Off" +"\x00" + +#MSG_ON +"On" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 0b82c587..4130aedb 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -294,13 +294,9 @@ "Fan test" "Test ventola" -#MSG_FANS_CHECK_ON c=17 r=1 -"Fans check [on]" -"Controllo ventole [on]" - -#MSG_FANS_CHECK_OFF c=17 r=1 -"Fans check [off]" -"Control.vent[off]" +#MSG_FANS_CHECK +"Fans check" +"Control.vent" #MSG_FSENSOR_ON "Fil. sensor [on]" @@ -1239,5 +1235,9 @@ "Correzione-Y:" #MSG_OFF -" [off]" +"Off" +"\x00" + +#MSG_ON +"On" "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 47e0fbb0..45b402fa 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -294,13 +294,9 @@ "Fan test" "Test wentylatora" -#MSG_FANS_CHECK_ON c=17 r=1 -"Fans check [on]" -"Sprawd.went. [wl]" - -#MSG_FANS_CHECK_OFF c=17 r=1 -"Fans check [off]" -"Sprawd.went.[wyl]" +#MSG_FANS_CHECK +"Fans check" +"Sprawd.went." #MSG_FSENSOR_ON "Fil. sensor [on]" @@ -1239,5 +1235,9 @@ "Korekcja Y:" #MSG_OFF -" [off]" -"\x00" +"Off" +"Wyl" + +#MSG_ON +"On" +"Wl" From 7ce2fedac71e8bedd1cc3ad494584cd8f1726b71 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 10 Aug 2019 09:16:23 +0300 Subject: [PATCH 011/110] Fix missing first two characters in multi-lang mode --- Firmware/Marlin_main.cpp | 2 +- Firmware/messages.c | 2 -- Firmware/messages.h | 2 -- Firmware/ultralcd.cpp | 4 ++-- lang/lang_en.txt | 4 ++-- lang/lang_en_cz.txt | 4 ++-- lang/lang_en_de.txt | 4 ++-- lang/lang_en_es.txt | 4 ++-- lang/lang_en_fr.txt | 4 ++-- lang/lang_en_it.txt | 4 ++-- lang/lang_en_pl.txt | 4 ++-- 11 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a9fbf958..c1d46be1 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6131,7 +6131,7 @@ Sigma_Exit: WRITE(PS_ON_PIN, PS_ON_ASLEEP); #endif powersupply = false; - LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),MSG_OFF,PSTR("."))); + LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),_i("Off"),PSTR("."))); lcd_update(0); break; diff --git a/Firmware/messages.c b/Firmware/messages.c index 4c1dbc27..83665d4b 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -104,8 +104,6 @@ const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); //// const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1 const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 -const char MSG_OFF[] PROGMEM_I1 = "Off"; ////c=3 r=1 -const char MSG_ON[] PROGMEM_I1 = "On"; ////c=2 r=1 //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 65ddbab3..f944f52d 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -104,8 +104,6 @@ extern const char MSG_WIZARD_QUIT[]; extern const char MSG_YES[]; extern const char MSG_V2_CALIBRATION[]; extern const char WELCOME_MSG[]; -extern const char MSG_OFF[]; -extern const char MSG_ON[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; extern const char MSG_EXTERNAL_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cf81908d..35afc954 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5569,7 +5569,7 @@ static void lcd_settings_menu() SETTINGS_CUTTER; - MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); + MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _i("On") : _i("Off"), lcd_set_fan_check); SETTINGS_SILENT_MODE; @@ -6878,7 +6878,7 @@ static void lcd_tune_menu() if(farm_mode) { - MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); + MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _i("On") : _i("Off"), lcd_set_fan_check); } #ifdef TMC2130 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 8819d40a..8e00dd80 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -925,8 +925,8 @@ # "Y-correct:" -#MSG_OFF +# "Off" -#MSG_ON +# "On" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 9a4b7579..70169394 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Korekce Y:" -#MSG_OFF +# "Off" "Vyp" -#MSG_ON +# "On" "Zap" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 1dc09798..fbfb27fd 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1235,10 +1235,10 @@ "Y-correct:" "Y-Korrektur:" -#MSG_OFF +# "Off" "Aus" -#MSG_ON +# "On" "An" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index ba1fea1e..b1da127d 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Y-correcion:" -#MSG_OFF +# "Off" "Ina" -#MSG_ON +# "On" "Act" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index f86795d7..57ed8d11 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Correct-Y:" -#MSG_OFF +# "Off" "\x00" -#MSG_ON +# "On" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 4130aedb..b79b678a 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Correzione-Y:" -#MSG_OFF +# "Off" "\x00" -#MSG_ON +# "On" "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 45b402fa..79765625 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Korekcja Y:" -#MSG_OFF +# "Off" "Wyl" -#MSG_ON +# "On" "Wl" From 596ffe1dc2fcd57e4ddbba98b06872823ed31078 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 10 Aug 2019 21:03:45 +0300 Subject: [PATCH 012/110] Actual fix to the missing first two characters --- Firmware/Marlin_main.cpp | 2 +- Firmware/menu.cpp | 6 +----- Firmware/messages.c | 2 ++ Firmware/messages.h | 2 ++ Firmware/ultralcd.cpp | 4 ++-- lang/lang_en.txt | 4 ++-- lang/lang_en_cz.txt | 4 ++-- lang/lang_en_de.txt | 4 ++-- lang/lang_en_es.txt | 4 ++-- lang/lang_en_fr.txt | 4 ++-- lang/lang_en_it.txt | 4 ++-- lang/lang_en_pl.txt | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c1d46be1..a9fbf958 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6131,7 +6131,7 @@ Sigma_Exit: WRITE(PS_ON_PIN, PS_ON_ASLEEP); #endif powersupply = false; - LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),_i("Off"),PSTR("."))); + LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),MSG_OFF,PSTR("."))); lcd_update(0); break; diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 08503111..8d3c8d64 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -188,11 +188,7 @@ static void menu_draw_toggle_puts_P(const char* str, const char* toggle) { menu_draw_item_puts_P(LCD_STR_REFRESH[0], str); lcd_set_cursor(LCD_WIDTH - 4 - strlen_P(toggle), menu_row); - lcd_putc('['); - lcd_puts_P(toggle); - lcd_putc(']'); - - // lcd_printf_P(PSTR("[%s]"), toggle); + lcd_printf_P(PSTR("[%S]"), toggle); } //! @brief Format sheet name diff --git a/Firmware/messages.c b/Firmware/messages.c index 83665d4b..8ba32a4d 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -104,6 +104,8 @@ const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); //// const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1 const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 +const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); //// +const char MSG_ON[] PROGMEM_I1 = ISTR("On"); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index f944f52d..65ddbab3 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -104,6 +104,8 @@ extern const char MSG_WIZARD_QUIT[]; extern const char MSG_YES[]; extern const char MSG_V2_CALIBRATION[]; extern const char WELCOME_MSG[]; +extern const char MSG_OFF[]; +extern const char MSG_ON[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; extern const char MSG_EXTERNAL_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 35afc954..cf81908d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5569,7 +5569,7 @@ static void lcd_settings_menu() SETTINGS_CUTTER; - MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _i("On") : _i("Off"), lcd_set_fan_check); + MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); SETTINGS_SILENT_MODE; @@ -6878,7 +6878,7 @@ static void lcd_tune_menu() if(farm_mode) { - MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _i("On") : _i("Off"), lcd_set_fan_check); + MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); } #ifdef TMC2130 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 8e00dd80..8819d40a 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -925,8 +925,8 @@ # "Y-correct:" -# +#MSG_OFF "Off" -# +#MSG_ON "On" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 70169394..9a4b7579 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Korekce Y:" -# +#MSG_OFF "Off" "Vyp" -# +#MSG_ON "On" "Zap" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index fbfb27fd..1dc09798 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1235,10 +1235,10 @@ "Y-correct:" "Y-Korrektur:" -# +#MSG_OFF "Off" "Aus" -# +#MSG_ON "On" "An" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index b1da127d..ba1fea1e 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Y-correcion:" -# +#MSG_OFF "Off" "Ina" -# +#MSG_ON "On" "Act" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 57ed8d11..f86795d7 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Correct-Y:" -# +#MSG_OFF "Off" "\x00" -# +#MSG_ON "On" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b79b678a..4130aedb 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Correzione-Y:" -# +#MSG_OFF "Off" "\x00" -# +#MSG_ON "On" "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 79765625..45b402fa 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Korekcja Y:" -# +#MSG_OFF "Off" "Wyl" -# +#MSG_ON "On" "Wl" From 32fa8caab873e5b959f9393b825c236a85740347 Mon Sep 17 00:00:00 2001 From: rhounsell <53660397+rhounsell@users.noreply.github.com> Date: Sun, 11 Aug 2019 17:57:41 -0400 Subject: [PATCH 013/110] reinitialize the timestamp to ensure enough time to receive response for 0xFF sent. --- Firmware/Sd2Card.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Sd2Card.cpp b/Firmware/Sd2Card.cpp index cb1959be..449590f1 100644 --- a/Firmware/Sd2Card.cpp +++ b/Firmware/Sd2Card.cpp @@ -321,6 +321,7 @@ bool Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) { } // send 0xFF until 0xFF received to give card some clock cycles + t0 = (uint16_t)_millis(); SERIAL_ECHOLNRPGM(PSTR("Sending 0xFF")); spiSend(0XFF); while ((status_ = spiRec()) != 0xFF) From 5a3f14b752334465e17dbec65d619d8633e9bc93 Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 19 Aug 2019 10:20:17 +0300 Subject: [PATCH 014/110] "N/A" toggle support and format update --- Firmware/menu.cpp | 27 ++++++++++++++++++--------- Firmware/messages.c | 2 ++ Firmware/messages.h | 2 ++ Firmware/ultralcd.cpp | 10 +++++----- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 2 +- lang/lang_en_de.txt | 2 +- lang/lang_en_es.txt | 4 ++-- lang/lang_en_fr.txt | 2 +- lang/lang_en_it.txt | 2 +- lang/lang_en_pl.txt | 2 +- 11 files changed, 35 insertions(+), 22 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 8d3c8d64..971122dc 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -184,10 +184,11 @@ static void menu_draw_item_puts_P(char type_char, const char* str) lcd_printf_P(PSTR("%c%-18.18S%c"), menu_selection_mark(), str, type_char); } -static void menu_draw_toggle_puts_P(const char* str, const char* toggle) +static void menu_draw_toggle_puts_P(const char* str, char* toggle) { - menu_draw_item_puts_P(LCD_STR_REFRESH[0], str); - lcd_set_cursor(LCD_WIDTH - 4 - strlen_P(toggle), menu_row); + menu_draw_item_puts_P((toggle == NULL)?LCD_STR_ARROW_RIGHT[0]:LCD_STR_REFRESH[0], str); + if (toggle == NULL) toggle = _T(MSG_NA); + lcd_set_cursor(LCD_WIDTH - 3 - strlen_P(toggle), menu_row); lcd_printf_P(PSTR("[%S]"), toggle); } @@ -381,12 +382,20 @@ uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func if (lcd_draw_update) menu_draw_toggle_puts_P(str, toggle); if (menu_clicked && (lcd_encoder == menu_item)) { - menu_clicked = false; - lcd_consume_click(); - lcd_update_enabled = 0; - if (func) func(); - lcd_update_enabled = 1; - return menu_item_ret(); + if (toggle == NULL) // print N/A warning message + { + menu_submenu(func); + return menu_item_ret(); + } + else // do the actual toggling + { + menu_clicked = false; + lcd_consume_click(); + lcd_update_enabled = 0; + if (func) func(); + lcd_update_enabled = 1; + return menu_item_ret(); + } } } menu_item++; diff --git a/Firmware/messages.c b/Firmware/messages.c index 8ba32a4d..61082c15 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -106,6 +106,8 @@ const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); //// const char MSG_ON[] PROGMEM_I1 = ISTR("On"); //// +const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); //// + //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 65ddbab3..b2f72a1a 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -106,6 +106,8 @@ extern const char MSG_V2_CALIBRATION[]; extern const char WELCOME_MSG[]; extern const char MSG_OFF[]; extern const char MSG_ON[]; +extern const char MSG_NA[]; + //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; extern const char MSG_EXTERNAL_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cf81908d..9e93c20c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2970,7 +2970,7 @@ static void lcd_menu_xyz_y_min() for (uint8_t i = 0; i < 2; i++) { lcd_set_cursor(11,2+i); - if (distanceMin[i] >= 200) lcd_puts_P(_N("N/A")); + if (distanceMin[i] >= 200) lcd_puts_P(_T(MSG_NA)); else lcd_printf_P(_N("%6.2fmm"), distanceMin[i]); } if (lcd_clicked()) @@ -3010,7 +3010,7 @@ static void lcd_menu_xyz_skew() } else{ lcd_set_cursor(15,0); - lcd_puts_P(_N("N/A")); + lcd_puts_P(_T(MSG_NA)); } if (lcd_clicked()) menu_goto(lcd_menu_xyz_offset, 0, true, true); @@ -3910,13 +3910,13 @@ static void lcd_print_state(uint8_t state) { switch (state) { case STATE_ON: - lcd_puts_P(_i(" 1")); + lcd_puts_P(_N(" 1")); break; case STATE_OFF: - lcd_puts_P(_i(" 0")); + lcd_puts_P(_N(" 0")); break; default: - lcd_puts_P(_i("N/A")); + lcd_puts_P(_T(MSG_NA)); break; } } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 8819d40a..c55ca2b1 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -481,7 +481,7 @@ #MSG_NO_CARD "No SD card" -# +#MSG_NA "N/A" #MSG_NO diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 9a4b7579..177b88f7 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -642,7 +642,7 @@ "No SD card" "Zadna SD karta" -# +#MSG_NA "N/A" "\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 1dc09798..06d5016b 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -642,7 +642,7 @@ "No SD card" "Keine SD Karte" -# +#MSG_NA "N/A" "N.V." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index ba1fea1e..f684dd29 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -642,9 +642,9 @@ "No SD card" "No hay tarjeta SD" -# +#MSG_NA "N/A" -"No disponible" +"N/D" #MSG_NO "No" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index f86795d7..bc9f6062 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -642,7 +642,7 @@ "No SD card" "Pas de carte SD" -# +#MSG_NA "N/A" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 4130aedb..19eed4d8 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -642,7 +642,7 @@ "No SD card" "Nessuna SD" -# +#MSG_NA "N/A" "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 45b402fa..e1feb11f 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -642,7 +642,7 @@ "No SD card" "Brak karty SD" -# +#MSG_NA "N/A" "N/D" From 6e9c44af2dd5f6132f0743ccba4ec6da6174edbb Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 19 Aug 2019 11:07:11 +0300 Subject: [PATCH 015/110] Fix warning --- Firmware/menu.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 971122dc..7dd791b8 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -184,12 +184,11 @@ static void menu_draw_item_puts_P(char type_char, const char* str) lcd_printf_P(PSTR("%c%-18.18S%c"), menu_selection_mark(), str, type_char); } -static void menu_draw_toggle_puts_P(const char* str, char* toggle) +static void menu_draw_toggle_puts_P(const char* str, const char* toggle) { menu_draw_item_puts_P((toggle == NULL)?LCD_STR_ARROW_RIGHT[0]:LCD_STR_REFRESH[0], str); - if (toggle == NULL) toggle = _T(MSG_NA); - lcd_set_cursor(LCD_WIDTH - 3 - strlen_P(toggle), menu_row); - lcd_printf_P(PSTR("[%S]"), toggle); + lcd_set_cursor(LCD_WIDTH - 3 - strlen_P((toggle == NULL)?_T(MSG_NA):toggle), menu_row); + lcd_printf_P(PSTR("[%S]"), (toggle == NULL)?_T(MSG_NA):toggle); } //! @brief Format sheet name From 0d22f8039e1b43a28eed6dd102c7077c230cbec2 Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 19 Aug 2019 11:58:16 +0300 Subject: [PATCH 016/110] Toggle FSENSOR and FSENSOR_AUTOLOAD --- Firmware/messages.c | 5 ++--- Firmware/messages.h | 5 ++--- Firmware/ultralcd.cpp | 18 +++++++++--------- lang/lang_en.txt | 20 ++++---------------- lang/lang_en_cz.txt | 28 ++++++---------------------- lang/lang_en_de.txt | 28 ++++++---------------------- lang/lang_en_es.txt | 28 ++++++---------------------- lang/lang_en_fr.txt | 28 ++++++---------------------- lang/lang_en_it.txt | 28 ++++++---------------------- lang/lang_en_pl.txt | 28 ++++++---------------------- 10 files changed, 53 insertions(+), 163 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 61082c15..4c1508c3 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -40,9 +40,8 @@ const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[] PROGMEM_I1 = ISTR(" of 4"); //// const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20 r=1 const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8 const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8 -const char MSG_FSENS_AUTOLOAD_NA[] PROGMEM_I1 = ISTR("F. autoload [N/A]"); ////c=17 r=1 -const char MSG_FSENSOR_OFF[] PROGMEM_I1 = ISTR("Fil. sensor [off]"); //// -const char MSG_FSENSOR_ON[] PROGMEM_I1 = ISTR("Fil. sensor [on]"); //// +const char MSG_FSENSOR_AUTOLOAD[] PROGMEM_I1 = ISTR("F. autoload"); ////c=17 r=1 +const char MSG_FSENSOR[] PROGMEM_I1 = ISTR("Fil. sensor"); //// const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); //// const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20 const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index b2f72a1a..d584324a 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -41,9 +41,8 @@ extern const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[]; extern const char MSG_FINISHING_MOVEMENTS[]; extern const char MSG_FOLLOW_CALIBRATION_FLOW[]; extern const char MSG_FOLLOW_Z_CALIBRATION_FLOW[]; -extern const char MSG_FSENS_AUTOLOAD_NA[]; -extern const char MSG_FSENSOR_OFF[]; -extern const char MSG_FSENSOR_ON[]; +extern const char MSG_FSENSOR_AUTOLOAD[]; +extern const char MSG_FSENSOR[]; extern const char MSG_HEATING[]; extern const char MSG_HEATING_COMPLETE[]; extern const char MSG_HOMEYZ[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 9e93c20c..67d8391d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5056,29 +5056,29 @@ do\ if (fsensor_not_responding && (mmu_enabled == false))\ {\ /* Filament sensor not working*/\ - MENU_ITEM_FUNCTION_P(_i("Fil. sensor [N/A]"), lcd_fsensor_state_set);/*////MSG_FSENSOR_NA*/\ - MENU_ITEM_SUBMENU_P(_T(MSG_FSENS_AUTOLOAD_NA), lcd_fsensor_fail);\ + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_NA), lcd_fsensor_state_set);/*////MSG_FSENSOR_NA*/\ + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), NULL, lcd_fsensor_fail);\ }\ else\ {\ /* Filament sensor turned off, working, no problems*/\ - MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_OFF), lcd_fsensor_state_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_OFF), lcd_fsensor_state_set);\ if (mmu_enabled == false)\ {\ - MENU_ITEM_SUBMENU_P(_T(MSG_FSENS_AUTOLOAD_NA), lcd_filament_autoload_info);\ + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), NULL, lcd_filament_autoload_info);\ }\ }\ }\ else\ {\ /* Filament sensor turned on, working, no problems*/\ - MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_ON), lcd_fsensor_state_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_ON), lcd_fsensor_state_set);\ if (mmu_enabled == false)\ {\ if (fsensor_autoload_enabled)\ - MENU_ITEM_FUNCTION_P(_i("F. autoload [on]"), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_ON c=17 r=1*/\ + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), _T(MSG_ON), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_ON c=17 r=1*/\ else\ - MENU_ITEM_FUNCTION_P(_i("F. autoload [off]"), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_OFF c=17 r=1*/\ + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), _T(MSG_OFF), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_OFF c=17 r=1*/\ /*if (fsensor_oq_meassure_enabled)*/\ /*MENU_ITEM_FUNCTION_P(_i("F. OQ meass. [on]"), lcd_set_filament_oq_meass);*//*////MSG_FSENS_OQMEASS_ON c=17 r=1*/\ /*else*/\ @@ -6865,10 +6865,10 @@ static void lcd_tune_menu() #ifdef FILAMENT_SENSOR if (FSensorStateMenu == 0) { - MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_OFF), lcd_fsensor_state_set); + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_OFF), lcd_fsensor_state_set); } else { - MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_ON), lcd_fsensor_state_set); + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_ON), lcd_fsensor_state_set); } #endif //FILAMENT_SENSOR diff --git a/lang/lang_en.txt b/lang/lang_en.txt index c55ca2b1..4580e25e 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -202,14 +202,8 @@ # "Fail stats MMU" -#MSG_FSENS_AUTOLOAD_ON c=17 r=1 -"F. autoload [on]" - -#MSG_FSENS_AUTOLOAD_NA c=17 r=1 -"F. autoload [N/A]" - -#MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -"F. autoload [off]" +#MSG_FSENSOR_AUTOLOAD +"F. autoload" # "Fail stats" @@ -223,14 +217,8 @@ #MSG_FANS_CHECK "Fans check" -#MSG_FSENSOR_ON -"Fil. sensor [on]" - -#MSG_FSENSOR_NA -"Fil. sensor [N/A]" - -#MSG_FSENSOR_OFF -"Fil. sensor [off]" +#MSG_FSENSOR +"Fil. sensor" # "Filam. runouts" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 177b88f7..dc4b6101 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -270,17 +270,9 @@ "Fail stats MMU" "Selhani MMU" -#MSG_FSENS_AUTOLOAD_ON c=17 r=1 -"F. autoload [on]" -"F. autozav. [zap]" - -#MSG_FSENS_AUTOLOAD_NA c=17 r=1 -"F. autoload [N/A]" -"F. autozav. [N/A]" - -#MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -"F. autoload [off]" -"F. autozav. [vyp]" +#MSG_FSENSOR_AUTOLOAD +"F. autoload" +"F. autozav." # "Fail stats" @@ -298,17 +290,9 @@ "Fans check" "Kontr. vent." -#MSG_FSENSOR_ON -"Fil. sensor [on]" -"Fil. senzor [zap]" - -#MSG_FSENSOR_NA -"Fil. sensor [N/A]" -"Fil. senzor [N/A]" - -#MSG_FSENSOR_OFF -"Fil. sensor [off]" -"Fil. senzor [vyp]" +#MSG_FSENSOR +"Fil. sensor" +"Fil. senzor" # "Filam. runouts" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 06d5016b..fb168d48 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -270,17 +270,9 @@ "Fail stats MMU" "MMU-Fehler" -#MSG_FSENS_AUTOLOAD_ON c=17 r=1 -"F. autoload [on]" -"F.Autoladen [an]" - -#MSG_FSENS_AUTOLOAD_NA c=17 r=1 -"F. autoload [N/A]" -"F. Autoload [nv]" - -#MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -"F. autoload [off]" -"F. Autoload [aus]" +#MSG_FSENSOR_AUTOLOAD +"F. autoload" +"F. autoladen" # "Fail stats" @@ -298,17 +290,9 @@ "Fans check" "Luefter Chk." -#MSG_FSENSOR_ON -"Fil. sensor [on]" -"Fil. Sensor [an]" - -#MSG_FSENSOR_NA -"Fil. sensor [N/A]" -"Fil. Sensor [nv]" - -#MSG_FSENSOR_OFF -"Fil. sensor [off]" -"Fil. Sensor [aus]" +#MSG_FSENSOR +"Fil. sensor" +"\x00" # "Filam. runouts" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index f684dd29..e68bdf3f 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -270,17 +270,9 @@ "Fail stats MMU" "Estadistica de fallos MMU" -#MSG_FSENS_AUTOLOAD_ON c=17 r=1 -"F. autoload [on]" -"Autocarg.Fil[act]" - -#MSG_FSENS_AUTOLOAD_NA c=17 r=1 -"F. autoload [N/A]" -"Autocarg.Fil[N/D]" - -#MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -"F. autoload [off]" -"Autocarg.Fil[ina]" +#MSG_FSENSOR_AUTOLOAD +"F. autoload" +"Autocarg.fil." # "Fail stats" @@ -298,17 +290,9 @@ "Fans check" "Comprob.vent" -#MSG_FSENSOR_ON -"Fil. sensor [on]" -"Sensor Fil. [act]" - -#MSG_FSENSOR_NA -"Fil. sensor [N/A]" -"Sensor Fil. [N/D]" - -#MSG_FSENSOR_OFF -"Fil. sensor [off]" -"Sensor Fil. [ina]" +#MSG_FSENSOR +"Fil. sensor" +"Sensor Fil." # "Filam. runouts" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index bc9f6062..8c50b060 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -270,17 +270,9 @@ "Fail stats MMU" "Stat. echecs MMU" -#MSG_FSENS_AUTOLOAD_ON c=17 r=1 -"F. autoload [on]" -"ChargAuto f. [on]" - -#MSG_FSENS_AUTOLOAD_NA c=17 r=1 -"F. autoload [N/A]" -"AutoCharg F [N/A]" - -#MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -"F. autoload [off]" -"AutoCharg F [off]" +#MSG_FSENSOR_AUTOLOAD +"F. autoload" +"Charg.auto.F." # "Fail stats" @@ -298,17 +290,9 @@ "Fans check" "Verif ventilo" -#MSG_FSENSOR_ON -"Fil. sensor [on]" -"Capteur Fil. [on]" - -#MSG_FSENSOR_NA -"Fil. sensor [N/A]" -"Capteur Fil. [N/A]" - -#MSG_FSENSOR_OFF -"Fil. sensor [off]" -"Capteur Fil.[off]" +#MSG_FSENSOR +"Fil. sensor" +"Capteur Fil." # "Filam. runouts" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 19eed4d8..2a0a00fb 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -270,17 +270,9 @@ "Fail stats MMU" "Statistiche fallimenti MMU" -#MSG_FSENS_AUTOLOAD_ON c=17 r=1 -"F. autoload [on]" -"Autocar.filam[on]" - -#MSG_FSENS_AUTOLOAD_NA c=17 r=1 -"F. autoload [N/A]" -"Autocar.fil.[N/A]" - -#MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -"F. autoload [off]" -"Autocar.fil.[off]" +#MSG_FSENSOR_AUTOLOAD +"F. autoload" +"Autocar.filam" # "Fail stats" @@ -298,17 +290,9 @@ "Fans check" "Control.vent" -#MSG_FSENSOR_ON -"Fil. sensor [on]" -"Sensor filam.[On]" - -#MSG_FSENSOR_NA -"Fil. sensor [N/A]" -"Sensor filam[N/A]" - -#MSG_FSENSOR_OFF -"Fil. sensor [off]" -"Sensor filam[off]" +#MSG_FSENSOR +"Fil. sensor" +"Sensor filam." # "Filam. runouts" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index e1feb11f..3ddd63ac 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -270,17 +270,9 @@ "Fail stats MMU" "Bledy MMU" -#MSG_FSENS_AUTOLOAD_ON c=17 r=1 -"F. autoload [on]" -"Autolad. fil [wl]" - -#MSG_FSENS_AUTOLOAD_NA c=17 r=1 -"F. autoload [N/A]" -"Autolad.fil.[N/D]" - -#MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -"F. autoload [off]" -"Autolad.fil.[wyl]" +#MSG_FSENSOR_AUTOLOAD +"F. autoload" +"Autolad. fil." # "Fail stats" @@ -298,17 +290,9 @@ "Fans check" "Sprawd.went." -#MSG_FSENSOR_ON -"Fil. sensor [on]" -"Czuj. filam. [wl]" - -#MSG_FSENSOR_NA -"Fil. sensor [N/A]" -"Czuj. filam.[N/D]" - -#MSG_FSENSOR_OFF -"Fil. sensor [off]" -"Czuj. filam.[wyl]" +#MSG_FSENSOR +"Fil. sensor" +"Czuj. filam." # "Filam. runouts" From e0acb23993d7067cc40e8973c4ccb41c6b22a2fe Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 19 Aug 2019 12:46:07 +0300 Subject: [PATCH 017/110] Fix N/A for German --- lang/lang_en_de.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index fb168d48..8c91b2de 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -628,7 +628,7 @@ #MSG_NA "N/A" -"N.V." +"N/V" #MSG_NO "No" From 1937cf20740c398540cd9e1fb1552faae2a9deec Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 29 Aug 2019 15:40:04 +0300 Subject: [PATCH 018/110] Toggle SpoolJoin --- Firmware/ultralcd.cpp | 11 +++++------ lang/lang_en.txt | 10 ++-------- lang/lang_en_cz.txt | 12 ++---------- lang/lang_en_de.txt | 14 +++----------- lang/lang_en_es.txt | 12 ++---------- lang/lang_en_fr.txt | 12 ++---------- lang/lang_en_it.txt | 12 ++---------- lang/lang_en_pl.txt | 14 +++----------- 8 files changed, 21 insertions(+), 76 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c1f40d74..62215266 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5106,30 +5106,29 @@ static void auto_deplete_switch() eeprom_update_byte((unsigned char *)EEPROM_AUTO_DEPLETE, lcd_autoDeplete); } -static bool settingsAutoDeplete() +static void settingsAutoDeplete() { if (mmu_enabled) { if (!fsensor_enabled) { - if (menu_item_text_P(_i("SpoolJoin [N/A]"))) return true; + MENU_ITEM_TOGGLE_P(_i("SpoolJoin"), _T(MSG_NA), NULL); } else if (lcd_autoDeplete) { - if (menu_item_function_P(_i("SpoolJoin [on]"), auto_deplete_switch)) return true; + MENU_ITEM_TOGGLE_P(_i("SpoolJoin"), _T(MSG_ON), auto_deplete_switch); } else { - if (menu_item_function_P(_i("SpoolJoin [off]"), auto_deplete_switch)) return true; + MENU_ITEM_TOGGLE_P(_i("SpoolJoin"), _T(MSG_OFF), auto_deplete_switch); } } - return false; } #define SETTINGS_AUTO_DEPLETE \ do\ {\ - if(settingsAutoDeplete()) return;\ + settingsAutoDeplete();\ }\ while(0)\ diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 4580e25e..41501d06 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -34,14 +34,8 @@ #MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 "Are left and right Z~carriages all up?" -#MSG_AUTO_DEPLETE_ON c=17 r=1 -"SpoolJoin [on]" - -# -"SpoolJoin [N/A]" - -#MSG_AUTO_DEPLETE_OFF c=17 r=1 -"SpoolJoin [off]" +#MSG_AUTO_DEPLETE c=17 r=1 +"SpoolJoin" #MSG_AUTO_HOME "Auto home" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index dc4b6101..88ffa69c 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -46,18 +46,10 @@ "Are left and right Z~carriages all up?" "Dojely oba Z voziky k~hornimu dorazu?" -#MSG_AUTO_DEPLETE_ON c=17 r=1 -"SpoolJoin [on]" -"SpoolJoin [zap]" - -# -"SpoolJoin [N/A]" +#MSG_AUTO_DEPLETE c=17 r=1 +"SpoolJoin" "\x00" -#MSG_AUTO_DEPLETE_OFF c=17 r=1 -"SpoolJoin [off]" -"SpoolJoin [vyp]" - #MSG_AUTO_HOME "Auto home" "\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 8c91b2de..68859bd8 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -46,17 +46,9 @@ "Are left and right Z~carriages all up?" "Sind linke+rechte Z- Schlitten ganz oben?" -#MSG_AUTO_DEPLETE_ON c=17 r=1 -"SpoolJoin [on]" -"SpoolJoin [an]" - -# -"SpoolJoin [N/A]" -"SpoolJoin [N/V]" - -#MSG_AUTO_DEPLETE_OFF c=17 r=1 -"SpoolJoin [off]" -"SpoolJoin [aus]" +#MSG_AUTO_DEPLETE c=17 r=1 +"SpoolJoin" +"\x00" #MSG_AUTO_HOME "Auto home" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index e68bdf3f..b33a5e08 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -46,16 +46,8 @@ "Are left and right Z~carriages all up?" "Carros Z izq./der. estan arriba maximo?" -#MSG_AUTO_DEPLETE_ON c=17 r=1 -"SpoolJoin [on]" -"\x00" - -# -"SpoolJoin [N/A]" -"\x00" - -#MSG_AUTO_DEPLETE_OFF c=17 r=1 -"SpoolJoin [off]" +#MSG_AUTO_DEPLETE c=17 r=1 +"SpoolJoin" "\x00" #MSG_AUTO_HOME diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 8c50b060..512a5255 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -46,16 +46,8 @@ "Are left and right Z~carriages all up?" "Z~carriages gauche + droite tout en haut?" -#MSG_AUTO_DEPLETE_ON c=17 r=1 -"SpoolJoin [on]" -"\x00" - -# -"SpoolJoin [N/A]" -"\x00" - -#MSG_AUTO_DEPLETE_OFF c=17 r=1 -"SpoolJoin [off]" +#MSG_AUTO_DEPLETE c=17 r=1 +"SpoolJoin" "\x00" #MSG_AUTO_HOME diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 2a0a00fb..839cbec7 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -46,16 +46,8 @@ "Are left and right Z~carriages all up?" "I carrelli Z sin/des sono altezza max?" -#MSG_AUTO_DEPLETE_ON c=17 r=1 -"SpoolJoin [on]" -"\x00" - -# -"SpoolJoin [N/A]" -"\x00" - -#MSG_AUTO_DEPLETE_OFF c=17 r=1 -"SpoolJoin [off]" +#MSG_AUTO_DEPLETE c=17 r=1 +"SpoolJoin" "\x00" #MSG_AUTO_HOME diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 3ddd63ac..09d393b7 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -46,17 +46,9 @@ "Are left and right Z~carriages all up?" "Obydwa konce osi dojechaly do gornych ogranicznikow?" -#MSG_AUTO_DEPLETE_ON c=17 r=1 -"SpoolJoin [on]" -"SpoolJoin [wl]" - -# -"SpoolJoin [N/A]" -"SpoolJoin [nd]" - -#MSG_AUTO_DEPLETE_OFF c=17 r=1 -"SpoolJoin [off]" -"SpoolJoin [wyl]" +#MSG_AUTO_DEPLETE c=17 r=1 +"SpoolJoin" +"\x00" #MSG_AUTO_HOME "Auto home" From d0f9f10ed63c5bf1d8b3aabf1393d8b794f07beb Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 29 Aug 2019 15:43:41 +0300 Subject: [PATCH 019/110] Toggle Cutter --- Firmware/ultralcd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 62215266..043e06b6 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5139,17 +5139,17 @@ static bool settingsCutter() { if (EEPROM_MMU_CUTTER_ENABLED_enabled == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) { - if (menu_item_function_P(_i("Cutter [on]"), lcd_cutter_enabled)) return true;//// c=17 r=1 + MENU_ITEM_TOGGLE_P(_i("Cutter"), _T(MSG_ON), lcd_cutter_enabled); } #ifdef MMU_ALWAYS_CUT else if (EEPROM_MMU_CUTTER_ENABLED_always == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) { - if (menu_item_function_P(_i("Cutter [always]"), lcd_cutter_enabled)) return true;//// c=17 r=1 + MENU_ITEM_TOGGLE_P(_i("Cutter"), _i("Always"), lcd_cutter_enabled); } #endif else { - if (menu_item_function_P(_i("Cutter [off]"), lcd_cutter_enabled)) return true;//// c=17 r=1 + MENU_ITEM_TOGGLE_P(_i("Cutter"), _T(MSG_OFF), lcd_cutter_enabled); } } return false; @@ -5158,7 +5158,7 @@ static bool settingsCutter() #define SETTINGS_CUTTER \ do\ {\ - if(settingsCutter()) return;\ + settingsCutter();\ }\ while(0) #else From 0b21acec46d70bcbf847725a3b537a04bb14b772 Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 29 Aug 2019 15:49:26 +0300 Subject: [PATCH 020/110] Minor fix to Toggle Cutter --- Firmware/ultralcd.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 043e06b6..800a7298 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5133,7 +5133,7 @@ do\ while(0)\ #ifdef MMU_HAS_CUTTER -static bool settingsCutter() +static void settingsCutter() { if (mmu_enabled) { @@ -5152,7 +5152,6 @@ static bool settingsCutter() MENU_ITEM_TOGGLE_P(_i("Cutter"), _T(MSG_OFF), lcd_cutter_enabled); } } - return false; } #define SETTINGS_CUTTER \ From 7f51e0bad826b6207f4c6b224df1a5f65d8629a0 Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 29 Aug 2019 17:35:26 +0300 Subject: [PATCH 021/110] Move SpoolJoin and Cutter to MSGs --- Firmware/messages.c | 2 ++ Firmware/messages.h | 2 ++ Firmware/ultralcd.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 4c1508c3..5eac34a0 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -106,6 +106,8 @@ const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); //// const char MSG_ON[] PROGMEM_I1 = ISTR("On"); //// const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); //// +const char MSG_AUTO_DEPLETE[] PROGMEM_I1 = ISTR("SpoolJoin"); //// +const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index d584324a..10d14074 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -106,6 +106,8 @@ extern const char WELCOME_MSG[]; extern const char MSG_OFF[]; extern const char MSG_ON[]; extern const char MSG_NA[]; +extern const char MSG_AUTO_DEPLETE[]; +extern const char MSG_CUTTER[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 800a7298..713f590c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5112,15 +5112,15 @@ static void settingsAutoDeplete() { if (!fsensor_enabled) { - MENU_ITEM_TOGGLE_P(_i("SpoolJoin"), _T(MSG_NA), NULL); + MENU_ITEM_TOGGLE_P(_T(MSG_AUTO_DEPLETE), _T(MSG_NA), NULL); } else if (lcd_autoDeplete) { - MENU_ITEM_TOGGLE_P(_i("SpoolJoin"), _T(MSG_ON), auto_deplete_switch); + MENU_ITEM_TOGGLE_P(_T(MSG_AUTO_DEPLETE), _T(MSG_ON), auto_deplete_switch); } else { - MENU_ITEM_TOGGLE_P(_i("SpoolJoin"), _T(MSG_OFF), auto_deplete_switch); + MENU_ITEM_TOGGLE_P(_T(MSG_AUTO_DEPLETE), _T(MSG_OFF), auto_deplete_switch); } } } @@ -5139,17 +5139,17 @@ static void settingsCutter() { if (EEPROM_MMU_CUTTER_ENABLED_enabled == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) { - MENU_ITEM_TOGGLE_P(_i("Cutter"), _T(MSG_ON), lcd_cutter_enabled); + MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_ON), lcd_cutter_enabled); } #ifdef MMU_ALWAYS_CUT else if (EEPROM_MMU_CUTTER_ENABLED_always == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) { - MENU_ITEM_TOGGLE_P(_i("Cutter"), _i("Always"), lcd_cutter_enabled); + MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _i("Always"), lcd_cutter_enabled); } #endif else { - MENU_ITEM_TOGGLE_P(_i("Cutter"), _T(MSG_OFF), lcd_cutter_enabled); + MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_OFF), lcd_cutter_enabled); } } } From db6e2e0525052685d7a7843e17c5fcc609f60bde Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 29 Aug 2019 22:31:30 +0300 Subject: [PATCH 022/110] Toggle Crash det. --- Firmware/messages.c | 4 +--- Firmware/messages.h | 4 +--- Firmware/ultralcd.cpp | 15 ++++++--------- lang/lang_en.txt | 10 ++-------- lang/lang_en_cz.txt | 12 ++---------- lang/lang_en_de.txt | 14 +++----------- lang/lang_en_es.txt | 14 +++----------- lang/lang_en_fr.txt | 14 +++----------- lang/lang_en_it.txt | 14 +++----------- lang/lang_en_pl.txt | 12 ++---------- 10 files changed, 26 insertions(+), 87 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 5eac34a0..085cf2e9 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -22,9 +22,7 @@ const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); //// const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8 const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); //// const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1 -const char MSG_CRASHDETECT_NA[] PROGMEM_I1 = ISTR("Crash det. [N/A]"); //// -const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det. [off]"); //// -const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det. [on]"); //// +const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); //// const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 diff --git a/Firmware/messages.h b/Firmware/messages.h index 10d14074..334d2116 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -23,9 +23,7 @@ extern const char MSG_CARD_MENU[]; extern const char MSG_CONFIRM_NOZZLE_CLEAN[]; extern const char MSG_COOLDOWN[]; extern const char MSG_CRASH_DETECTED[]; -extern const char MSG_CRASHDETECT_NA[]; -extern const char MSG_CRASHDETECT_OFF[]; -extern const char MSG_CRASHDETECT_ON[]; +extern const char MSG_CRASHDETECT[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; extern const char MSG_FILAMENT[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 713f590c..d0f0da91 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5177,13 +5177,10 @@ do\ else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set);\ if (SilentModeMenu == SILENT_MODE_NORMAL)\ {\ - if (lcd_crash_detect_enabled())\ - {\ - MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), crash_mode_switch);\ - }\ - else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), crash_mode_switch);\ + if (lcd_crash_detect_enabled()) MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_ON), crash_mode_switch);\ + else MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_OFF), crash_mode_switch);\ }\ - else MENU_ITEM_SUBMENU_P(_T(MSG_CRASHDETECT_NA), lcd_crash_mode_info);\ + else MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), NULL, lcd_crash_mode_info);\ }\ }\ while (0) @@ -6895,10 +6892,10 @@ static void lcd_tune_menu() if (SilentModeMenu == SILENT_MODE_NORMAL) { - if (lcd_crash_detect_enabled()) MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), crash_mode_switch); - else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), crash_mode_switch); + if (lcd_crash_detect_enabled()) MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_ON), crash_mode_switch); + else MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_OFF), crash_mode_switch); } - else MENU_ITEM_SUBMENU_P(_T(MSG_CRASHDETECT_NA), lcd_crash_mode_info); + else MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), NULL, lcd_crash_mode_info); } #else //TMC2130 if (!farm_mode) { //dont show in menu if we are in farm mode diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 41501d06..29f7c213 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -121,14 +121,8 @@ # "Copy selected language?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" +#MSG_CRASHDETECT +"Crash det." #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 88ffa69c..91144ece 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -162,18 +162,10 @@ "Copy selected language?" "Kopirovat vybrany jazyk?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" -"Crash det. [zap]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" +#MSG_CRASHDETECT +"Crash det." "\x00" -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Crash det. [vyp]" - #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." "Detekovan naraz." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 68859bd8..43fc9fb9 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -162,17 +162,9 @@ "Copy selected language?" "Gewaehlte Sprache kopieren?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" -"Crash Erk. [an]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" -"Crash Erk. [nv]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Crash Erk. [aus]" +#MSG_CRASHDETECT +"Crash det." +"Crash Erk." #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index b33a5e08..efd92b12 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -162,17 +162,9 @@ "Copy selected language?" "Copiar idioma seleccionado?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" -"Det. choque [act]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" -"Dec. choque [N/D]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Det. choque [ina]" +#MSG_CRASHDETECT +"Crash det." +"Det. choque" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 512a5255..d2d03346 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -162,17 +162,9 @@ "Copy selected language?" "Copier la langue selectionne ?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" -"Detect. crash[on]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" -"Detect. crash [N/A]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Detect. crash[off]" +#MSG_CRASHDETECT +"Crash det." +"Detect. crash" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 839cbec7..b99eb148 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -162,17 +162,9 @@ "Copy selected language?" "Copiare la lingua selezionata?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" -"Rilevam.imp. [on]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" -"Rilevam.imp.[N/A]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Rilevam.imp.[off]" +#MSG_CRASHDETECT +"Crash det." +"Rilevam.imp." #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 09d393b7..cf9a0c71 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -163,16 +163,8 @@ "Skopiowac wybrany jezyk?" #MSG_CRASHDETECT_ON -"Crash det. [on]" -"Wykr.zderzen [wl]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" -"Wykr.zderzen[n/d]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Wykr.zderzen[wyl]" +"Crash det." +"Wykr.zderzen" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." From 8df6691819581dd6e35c42e6810569040d6b3487 Mon Sep 17 00:00:00 2001 From: vintagepc Date: Thu, 29 Aug 2019 18:07:24 -0400 Subject: [PATCH 023/110] Relocate sheet menu, show sheet on info screen -Sheet is shown instead of percentage done either if idle, or during print preheat. -Relocated sheet menu to below SD menu for additional visibility to current sheet. --- Firmware/ultralcd.cpp | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e601fd75..5591586b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -598,11 +598,21 @@ void lcdui_print_feedrate(void) // Print percent done in form "USB---%", " SD---%", " ---%" (7 chars total) void lcdui_print_percent_done(void) { + char sheet[8]; const char* src = is_usb_printing?_N("USB"):(IS_SD_PRINTING?_N(" SD"):_N(" ")); char per[4]; bool num = IS_SD_PRINTING || (PRINTER_ACTIVE && (print_percent_done_normal != PRINT_PERCENT_DONE_INIT)); - sprintf_P(per, num?_N("%3hhd"):_N("---"), calc_percent_done()); - lcd_printf_P(_N("%3S%3s%%"), src, per); + if (!num || heating_status) // either not printing or heating + { + eeprom_read_block(sheet, EEPROM_Sheets_base->s[selected_sheet].name, 7); + sheet[7] = '\0'; + lcd_printf_P(PSTR("%s"),sheet); + } + else + { + sprintf_P(per, num?_N("%3hhd"):_N("---"), calc_percent_done()); + lcd_printf_P(_N("%3S%3s%%"), src, per); + } } // Print extruder status (5 chars total) @@ -6714,6 +6724,14 @@ static void lcd_main_menu() } #endif + if(!isPrintPaused && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal)) + { + if (!farm_mode) + { + MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))], change_sheet_from_menu); + } + } + if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) { @@ -6759,14 +6777,6 @@ static void lcd_main_menu() } - if(!isPrintPaused && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal)) - { - if (!farm_mode) - { - MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))], change_sheet_from_menu); - } - } - if (!is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal)) { MENU_ITEM_SUBMENU_P(_i("Statistics "), lcd_menu_statistics);////MSG_STATISTICS From b86a92a7d6c7ee096d32dca562f0eaf4c46d714d Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 30 Aug 2019 07:59:58 +0300 Subject: [PATCH 024/110] Toggle Mode (stepper power) --- Firmware/messages.c | 11 ++++++----- Firmware/messages.h | 11 ++++++----- Firmware/ultralcd.cpp | 24 ++++++++++++------------ lang/lang_en.txt | 23 +++++++++++++---------- lang/lang_en_cz.txt | 34 +++++++++++++++++++--------------- lang/lang_en_de.txt | 34 +++++++++++++++++++--------------- lang/lang_en_es.txt | 34 +++++++++++++++++++--------------- lang/lang_en_fr.txt | 32 ++++++++++++++++++-------------- lang/lang_en_it.txt | 34 +++++++++++++++++++--------------- lang/lang_en_pl.txt | 34 +++++++++++++++++++--------------- 10 files changed, 150 insertions(+), 121 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 085cf2e9..111ec0b4 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -9,7 +9,6 @@ //internationalized messages const char MSG_AUTO_HOME[] PROGMEM_I1 = ISTR("Auto home"); //// -const char MSG_AUTO_MODE_ON[] PROGMEM_I1 = ISTR("Mode [auto power]"); //// const char MSG_BABYSTEP_Z[] PROGMEM_I1 = ISTR("Live adjust Z"); //// c=18 const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."); ////c=20 r=12 const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); //// @@ -82,10 +81,12 @@ const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); //// const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); //// const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); //// -const char MSG_SILENT_MODE_OFF[] PROGMEM_I1 = ISTR("Mode [high power]"); //// -const char MSG_SILENT_MODE_ON[] PROGMEM_I1 = ISTR("Mode [silent]"); //// -const char MSG_STEALTH_MODE_OFF[] PROGMEM_I1 = ISTR("Mode [Normal]"); //// -const char MSG_STEALTH_MODE_ON[] PROGMEM_I1 = ISTR("Mode [Stealth]"); //// +const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); //// +const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); //// +const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); //// +const char MSG_SILENT[] PROGMEM_I1 = ISTR("Silent"); //// +const char MSG_NORMAL[] PROGMEM_I1 = ISTR("Normal"); //// +const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); //// const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2 const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); //// const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 334d2116..b1151717 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -10,7 +10,6 @@ extern "C" { // LCD Menu Messages //internationalized messages extern const char MSG_AUTO_HOME[]; -extern const char MSG_AUTO_MODE_ON[]; extern const char MSG_BABYSTEP_Z[]; extern const char MSG_BABYSTEP_Z_NOT_SET[]; extern const char MSG_BED[]; @@ -82,10 +81,12 @@ extern const char MSG_SELFTEST_FILAMENT_SENSOR[]; extern const char MSG_SELFTEST_WIRINGERROR[]; extern const char MSG_SETTINGS[]; extern const char MSG_HW_SETUP[]; -extern const char MSG_SILENT_MODE_OFF[]; -extern const char MSG_SILENT_MODE_ON[]; -extern const char MSG_STEALTH_MODE_OFF[]; -extern const char MSG_STEALTH_MODE_ON[]; +extern const char MSG_MODE[]; +extern const char MSG_HIGH_POWER[]; +extern const char MSG_AUTO_POWER[]; +extern const char MSG_SILENT[]; +extern const char MSG_NORMAL[]; +extern const char MSG_STEALTH[]; extern const char MSG_STEEL_SHEET_CHECK[]; extern const char MSG_STOP_PRINT[]; extern const char MSG_STOPPED[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d0f0da91..f690ea28 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5172,9 +5172,9 @@ do\ {\ if (SilentModeMenu == SILENT_MODE_NORMAL)\ {\ - MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_OFF), lcd_silent_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_NORMAL), lcd_silent_mode_set);\ }\ - else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set);\ + else MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_STEALTH), lcd_silent_mode_set);\ if (SilentModeMenu == SILENT_MODE_NORMAL)\ {\ if (lcd_crash_detect_enabled()) MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_ON), crash_mode_switch);\ @@ -5194,16 +5194,16 @@ do\ switch (SilentModeMenu)\ {\ case SILENT_MODE_POWER:\ - MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set);\ break;\ case SILENT_MODE_SILENT:\ - MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_ON), lcd_silent_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_SILENT), lcd_silent_mode_set);\ break;\ case SILENT_MODE_AUTO:\ - MENU_ITEM_FUNCTION_P(_T(MSG_AUTO_MODE_ON), lcd_silent_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_AUTO_POWER), lcd_silent_mode_set);\ break;\ default:\ - MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set);\ break; /* (probably) not needed*/\ }\ }\ @@ -6887,8 +6887,8 @@ static void lcd_tune_menu() #ifdef TMC2130 if(!farm_mode) { - if (SilentModeMenu == SILENT_MODE_NORMAL) MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_OFF), lcd_silent_mode_set); - else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set); + if (SilentModeMenu == SILENT_MODE_NORMAL) MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_NORMAL), lcd_silent_mode_set); + else MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_STEALTH), lcd_silent_mode_set); if (SilentModeMenu == SILENT_MODE_NORMAL) { @@ -6900,10 +6900,10 @@ static void lcd_tune_menu() #else //TMC2130 if (!farm_mode) { //dont show in menu if we are in farm mode switch (SilentModeMenu) { - case SILENT_MODE_POWER: MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set); break; - case SILENT_MODE_SILENT: MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_ON), lcd_silent_mode_set); break; - case SILENT_MODE_AUTO: MENU_ITEM_FUNCTION_P(_T(MSG_AUTO_MODE_ON), lcd_silent_mode_set); break; - default: MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set); break; // (probably) not needed + case SILENT_MODE_POWER: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); break; + case SILENT_MODE_SILENT: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_SILENT), lcd_silent_mode_set); break; + case SILENT_MODE_AUTO: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_AUTO_POWER), lcd_silent_mode_set); break; + default: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); break; // (probably) not needed } } #endif //TMC2130 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 29f7c213..344cccb8 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -412,11 +412,14 @@ #MSG_MMU_OK_RESUMING c=20 r=4 "MMU OK. Resuming..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" +#MSG_MODE +"Mode" -#MSG_SILENT_MODE_ON -"Mode [silent]" +#MSG_NORMAL +"Normal" + +#MSG_SILENT +"Silent" # "MMU needs user attention." @@ -424,14 +427,14 @@ # "MMU power fails" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" +#MSG_STEALTH +"Stealth" -#MSG_AUTO_MODE_ON -"Mode [auto power]" +#MSG_AUTO_POWER +"Auto power" -#MSG_SILENT_MODE_OFF -"Mode [high power]" +#MSG_HIGH_POWER +"High power" # "MMU2 connected" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 91144ece..0f1ce9f6 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Pokracuji..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" -"Mod [Normal]" +#MSG_MODE +"Mode" +"Mod" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Mod [tichy]" +#MSG_NORMAL +"Normal" +"\x00" + +#MSG_SILENT +"Silent" +"Tichy" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "MMU vypadky proudu" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Mod [tichy]" +#MSG_STEALTH +"Stealth" +"Tichy" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Mod [automaticky]" +#MSG_AUTO_POWER +"Auto power" +"Automaticky" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Mod [vys. vykon]" +#MSG_HIGH_POWER +"High power" +"Vys. vykon" # "MMU2 connected" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 43fc9fb9..8e059a3b 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Weiterdrucken..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" -"Modus [Normal]" +#MSG_MODE +"Mode" +"Modus" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Modus [leise]" +#MSG_NORMAL +"Normal" +"\x00" + +#MSG_SILENT +"Silent" +"Leise" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "MMU Netzfehler" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Modus [Stealth]" +#MSG_STEALTH +"Stealth" +"\x00" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Modus[Auto Power]" +#MSG_AUTO_POWER +"Auto power" +"\x00" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Modus[Hohe Leist]" +#MSG_HIGH_POWER +"High power" +"Hohe leist" # "MMU2 connected" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index efd92b12..c74c1557 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Resumiendo..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" -"Modo [Normal]" +#MSG_MODE +"Mode" +"Modo" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Modo [silencio]" +#MSG_NORMAL +"Normal" +"\x00" + +#MSG_SILENT +"Silent" +"Silencio" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "Fallo de energia en MMU" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Modo [Silencio]" +#MSG_STEALTH +"Stealth" +"Silencio" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Modo[fuerza auto]" +#MSG_AUTO_POWER +"Auto power" +"Fuerza auto" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Modo [rend.pleno]" +#MSG_HIGH_POWER +"High power" +"Rend.pleno" # "MMU2 connected" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index d2d03346..b21b638a 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Reprise ..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" +#MSG_MODE +"Mode" "\x00" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Mode [silencieux]" +#MSG_NORMAL +"Normal" +"\x00" + +#MSG_SILENT +"Silent" +"Silencieux" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "Echecs alim. MMU" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Mode [Furtif]" +#MSG_STEALTH +"Stealth" +"Furtif" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Mode [puiss.auto]" +#MSG_AUTO_POWER +"Auto power" +"Puiss.auto" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Mode [haute puiss]" +#MSG_HIGH_POWER +"High power" +"Haute puiss" # "MMU2 connected" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b99eb148..f2873971 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Riprendendo... " -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" -"Modo [normale]" +#MSG_MODE +"Mode" +"Modo" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Modo [silenzioso]" +#MSG_NORMAL +"Normal" +"Normale" + +#MSG_SILENT +"Silent" +"Silenzioso" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "Mancanza corrente MMU" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Modo [Silenziosa]" +#MSG_STEALTH +"Stealth" +"Silenziosa" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Modo [auto]" +#MSG_AUTO_POWER +"Auto power" +"Auto" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Mode [forte]" +#MSG_HIGH_POWER +"High power" +"Forte" # "MMU2 connected" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index cf9a0c71..c523c064 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Wznawianie..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" -"Tryb [normalny]" +#MSG_MODE +"Mode" +"Tryb" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Tryb [cichy]" +#MSG_NORMAL +"Normal" +"Normalny" + +#MSG_SILENT +"Silent" +"Cichy" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "Zaniki zasil. MMU" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Tryb [Stealth]" +#MSG_STEALTH +"Stealth" +"\x00" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Tryb [automatycz]" +#MSG_AUTO_POWER +"Auto power" +"Automatycz" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Tryb[wysoka wyd.]" +#MSG_HIGH_POWER +"High power" +"Wysoka wyd." # "MMU2 connected" From 6a8330a43b364ac9b7410adf4157d5fe788890cb Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 30 Aug 2019 17:36:21 +0300 Subject: [PATCH 025/110] Toggle "HW Setup"* All toggles from "HW Setup" were changed. This includes: -"Nozzle d." -all "Checks" Also added an option to provide a string from sram (not from progmem) as the toggle argument. This can be useful when toggling numbers or even when toggling sheets in the future. --- Firmware/menu.cpp | 10 ++++---- Firmware/menu.h | 5 ++-- Firmware/messages.c | 7 ++++++ Firmware/messages.h | 7 ++++++ Firmware/ultralcd.cpp | 55 ++++++++++++++++++++----------------------- 5 files changed, 48 insertions(+), 36 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 7dd791b8..33f9b748 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -184,11 +184,11 @@ static void menu_draw_item_puts_P(char type_char, const char* str) lcd_printf_P(PSTR("%c%-18.18S%c"), menu_selection_mark(), str, type_char); } -static void menu_draw_toggle_puts_P(const char* str, const char* toggle) +static void menu_draw_toggle_puts_P(const char* str, const char* toggle, const bool fromProgmem) { menu_draw_item_puts_P((toggle == NULL)?LCD_STR_ARROW_RIGHT[0]:LCD_STR_REFRESH[0], str); - lcd_set_cursor(LCD_WIDTH - 3 - strlen_P((toggle == NULL)?_T(MSG_NA):toggle), menu_row); - lcd_printf_P(PSTR("[%S]"), (toggle == NULL)?_T(MSG_NA):toggle); + lcd_set_cursor(LCD_WIDTH - 3 - (fromProgmem?(strlen_P((toggle == NULL)?_T(MSG_NA):toggle)):(strlen(toggle))), menu_row); + lcd_printf_P(fromProgmem?PSTR("[%S]"):PSTR("[%s]"), (toggle == NULL)?_T(MSG_NA):toggle); } //! @brief Format sheet name @@ -374,11 +374,11 @@ uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t) return 0; } -uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func) +uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const bool fromProgmem) { if (menu_item == menu_line) { - if (lcd_draw_update) menu_draw_toggle_puts_P(str, toggle); + if (lcd_draw_update) menu_draw_toggle_puts_P(str, toggle, fromProgmem); if (menu_clicked && (lcd_encoder == menu_item)) { if (toggle == NULL) // print N/A warning message diff --git a/Firmware/menu.h b/Firmware/menu.h index d7676661..d447581f 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -118,8 +118,9 @@ extern uint8_t menu_item_function_P(const char* str, menu_func_t func); #define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0) extern uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t), uint8_t fn_par); -#define MENU_ITEM_TOGGLE_P(str, toggle, func) do { if (menu_item_toggle_P(str, toggle, func)) return; } while (0) -extern uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func); +#define MENU_ITEM_TOGGLE_P(str, toggle, func) do { if (menu_item_toggle_P(str, toggle, func, true)) return; } while (0) +#define MENU_ITEM_TOGGLE(str, toggle, func) do { if (menu_item_toggle_P(str, toggle, func, false)) return; } while (0) +extern uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const bool fromProgmem); #define MENU_ITEM_GCODE_P(str, str_gcode) do { if (menu_item_gcode_P(str, str_gcode)) return; } while (0) extern uint8_t menu_item_gcode_P(const char* str, const char* str_gcode); diff --git a/Firmware/messages.c b/Firmware/messages.c index 111ec0b4..d5c504d7 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -107,6 +107,13 @@ const char MSG_ON[] PROGMEM_I1 = ISTR("On"); //// const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); //// const char MSG_AUTO_DEPLETE[] PROGMEM_I1 = ISTR("SpoolJoin"); //// const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); //// +const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); //// +const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); //// +const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); //// +const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); //// +const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); //// +const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); //// +const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index b1151717..9c9a99ea 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -107,6 +107,13 @@ extern const char MSG_ON[]; extern const char MSG_NA[]; extern const char MSG_AUTO_DEPLETE[]; extern const char MSG_CUTTER[]; +extern const char MSG_NONE[]; +extern const char MSG_WARN[]; +extern const char MSG_STRICT[]; +extern const char MSG_MODEL[]; +extern const char MSG_FIRMWARE[]; +extern const char MSG_GCODE[]; +extern const char MSG_NOZZLE_DIAMETER[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f690ea28..f4f3cceb 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5332,16 +5332,16 @@ do\ switch(oCheckMode)\ {\ case ClCheckMode::_None:\ - MENU_ITEM_FUNCTION_P(_i("Nozzle [none]"),lcd_check_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_NOZZLE), _T(MSG_NONE), lcd_check_mode_set);\ break;\ case ClCheckMode::_Warn:\ - MENU_ITEM_FUNCTION_P(_i("Nozzle [warn]"),lcd_check_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_NOZZLE), _T(MSG_WARN), lcd_check_mode_set);\ break;\ case ClCheckMode::_Strict:\ - MENU_ITEM_FUNCTION_P(_i("Nozzle [strict]"),lcd_check_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_NOZZLE), _T(MSG_STRICT), lcd_check_mode_set);\ break;\ default:\ - MENU_ITEM_FUNCTION_P(_i("Nozzle [none]"),lcd_check_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_NOZZLE), _T(MSG_NONE), lcd_check_mode_set);\ }\ }\ while (0) @@ -5375,20 +5375,17 @@ eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,nDiameter); #define SETTINGS_NOZZLE \ do\ {\ + char sNozzleDiam[5];/*enough for two decimals*/\ + float fNozzleDiam;\ switch(oNozzleDiameter)\ - {\ - case ClNozzleDiameter::_Diameter_250:\ - MENU_ITEM_FUNCTION_P(_i("Nozzle d. [0.25]"),lcd_nozzle_diameter_set);\ - break;\ - case ClNozzleDiameter::_Diameter_400:\ - MENU_ITEM_FUNCTION_P(_i("Nozzle d. [0.40]"),lcd_nozzle_diameter_set);\ - break;\ - case ClNozzleDiameter::_Diameter_600:\ - MENU_ITEM_FUNCTION_P(_i("Nozzle d. [0.60]"),lcd_nozzle_diameter_set);\ - break;\ - default:\ - MENU_ITEM_FUNCTION_P(_i("Nozzle d. [0.40]"),lcd_nozzle_diameter_set);\ - }\ + {\ + case ClNozzleDiameter::_Diameter_250: fNozzleDiam = 0.25f; break;\ + case ClNozzleDiameter::_Diameter_400: fNozzleDiam = 0.4f; break;\ + case ClNozzleDiameter::_Diameter_600: fNozzleDiam = 0.6f; break;\ + default: fNozzleDiam = 0.4f; break;\ + }\ + sprintf_P(sNozzleDiam, PSTR("%.2f"), fNozzleDiam);\ + MENU_ITEM_TOGGLE(_T(MSG_NOZZLE_DIAMETER), sNozzleDiam, lcd_nozzle_diameter_set);\ }\ while (0) @@ -5417,16 +5414,16 @@ do\ switch(oCheckModel)\ {\ case ClCheckModel::_None:\ - MENU_ITEM_FUNCTION_P(_i("Model [none]"),lcd_check_model_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODEL), _T(MSG_NONE), lcd_check_model_set);\ break;\ case ClCheckModel::_Warn:\ - MENU_ITEM_FUNCTION_P(_i("Model [warn]"),lcd_check_model_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODEL), _T(MSG_WARN), lcd_check_model_set);\ break;\ case ClCheckModel::_Strict:\ - MENU_ITEM_FUNCTION_P(_i("Model [strict]"),lcd_check_model_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODEL), _T(MSG_STRICT), lcd_check_model_set);\ break;\ default:\ - MENU_ITEM_FUNCTION_P(_i("Model [none]"),lcd_check_model_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODEL), _T(MSG_NONE), lcd_check_model_set);\ }\ }\ while (0) @@ -5456,16 +5453,16 @@ do\ switch(oCheckVersion)\ {\ case ClCheckVersion::_None:\ - MENU_ITEM_FUNCTION_P(_i("Firmware [none]"),lcd_check_version_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_FIRMWARE), _T(MSG_NONE), lcd_check_version_set);\ break;\ case ClCheckVersion::_Warn:\ - MENU_ITEM_FUNCTION_P(_i("Firmware [warn]"),lcd_check_version_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_FIRMWARE), _T(MSG_WARN), lcd_check_version_set);\ break;\ case ClCheckVersion::_Strict:\ - MENU_ITEM_FUNCTION_P(_i("Firmware [strict]"),lcd_check_version_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_FIRMWARE), _T(MSG_STRICT), lcd_check_version_set);\ break;\ default:\ - MENU_ITEM_FUNCTION_P(_i("Firmware [none]"),lcd_check_version_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_FIRMWARE), _T(MSG_NONE), lcd_check_version_set);\ }\ }\ while (0) @@ -5495,16 +5492,16 @@ do\ switch(oCheckGcode)\ {\ case ClCheckGcode::_None:\ - MENU_ITEM_FUNCTION_P(_i("Gcode [none]"),lcd_check_gcode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_GCODE), _T(MSG_NONE), lcd_check_gcode_set);\ break;\ case ClCheckGcode::_Warn:\ - MENU_ITEM_FUNCTION_P(_i("Gcode [warn]"),lcd_check_gcode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_GCODE), _T(MSG_WARN), lcd_check_gcode_set);\ break;\ case ClCheckGcode::_Strict:\ - MENU_ITEM_FUNCTION_P(_i("Gcode [strict]"),lcd_check_gcode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_GCODE), _T(MSG_STRICT), lcd_check_gcode_set);\ break;\ default:\ - MENU_ITEM_FUNCTION_P(_i("Gcode [none]"),lcd_check_gcode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_GCODE), _T(MSG_NONE), lcd_check_gcode_set);\ }\ }\ while (0) From 871e29621f90e1e05031b45793ac813cb14dfec7 Mon Sep 17 00:00:00 2001 From: vintagepc Date: Fri, 30 Aug 2019 19:14:22 -0400 Subject: [PATCH 026/110] Fix "stuck" rename cursor --- Firmware/ultralcd.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5591586b..4af82c2d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6580,6 +6580,15 @@ static void lcd_rename_sheet_menu() lcd_putc(menuData->name[i]); } lcd_set_cursor(menuData->selected, 1); + if (menuData->selected>0) + { + lcd_set_cursor(menuData->selected-1, 1); + lcd_putc(' '); + } + else + { + lcd_set_cursor(menuData->selected, 1); + } lcd_putc('^'); if (lcd_clicked()) { From a821002f02d727907e10898477fca1bba6ac8546 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 31 Aug 2019 07:38:40 +0300 Subject: [PATCH 027/110] Toggle MMU Mode --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index d5c504d7..7fc598cd 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -114,6 +114,7 @@ const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); //// const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); //// const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); //// const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); //// +const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 9c9a99ea..e7cebf80 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -114,6 +114,7 @@ extern const char MSG_MODEL[]; extern const char MSG_FIRMWARE[]; extern const char MSG_GCODE[]; extern const char MSG_NOZZLE_DIAMETER[]; +extern const char MSG_MMU_MODE[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f4f3cceb..8933f701 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5217,8 +5217,8 @@ do\ {\ if (mmu_enabled)\ {\ - if (SilentModeMenu_MMU == 0) MENU_ITEM_FUNCTION_P(_i("MMU Mode [Normal]"), lcd_silent_mode_mmu_set); \ - else MENU_ITEM_FUNCTION_P(_i("MMU Mode[Stealth]"), lcd_silent_mode_mmu_set); \ + if (SilentModeMenu_MMU == 0) MENU_ITEM_TOGGLE_P(_T(MSG_MMU_MODE), _T(MSG_NORMAL), lcd_silent_mode_mmu_set);\ + else MENU_ITEM_TOGGLE_P(_T(MSG_MMU_MODE), _T(MSG_STEALTH), lcd_silent_mode_mmu_set);\ }\ }\ while (0) From f69035323a78c3d2f7f97fcc830ba3990ddec1e2 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 31 Aug 2019 14:55:51 +0300 Subject: [PATCH 028/110] Toggle SD Settings This includes FlashAir support and SD Sorting type --- Firmware/messages.c | 5 +++++ Firmware/messages.h | 5 +++++ Firmware/ultralcd.cpp | 14 +++++++------- lang/lang_en.txt | 23 +++++++++++++---------- lang/lang_en_cz.txt | 32 ++++++++++++++++++-------------- lang/lang_en_de.txt | 34 +++++++++++++++++++--------------- lang/lang_en_es.txt | 34 +++++++++++++++++++--------------- lang/lang_en_fr.txt | 34 +++++++++++++++++++--------------- lang/lang_en_it.txt | 34 +++++++++++++++++++--------------- lang/lang_en_pl.txt | 34 +++++++++++++++++++--------------- 10 files changed, 143 insertions(+), 106 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 7fc598cd..d55027b3 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -115,6 +115,11 @@ const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); //// const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); //// const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); //// const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); //// +const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); //// +const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir"); //// +const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); //// +const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); //// +const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index e7cebf80..ed8d5d54 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -115,6 +115,11 @@ extern const char MSG_FIRMWARE[]; extern const char MSG_GCODE[]; extern const char MSG_NOZZLE_DIAMETER[]; extern const char MSG_MMU_MODE[]; +extern const char MSG_SD_CARD[]; +extern const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[]; +extern const char MSG_SORT[]; +extern const char MSG_SORT_TIME[]; +extern const char MSG_SORT_ALPHA[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8933f701..95290d8b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5231,9 +5231,9 @@ while (0) do\ {\ if (card.ToshibaFlashAir_isEnabled())\ - MENU_ITEM_FUNCTION_P(_i("SD card [flshAir]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1*/\ + MENU_ITEM_TOGGLE_P(_T(MSG_SD_CARD), _T(MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY), lcd_toshiba_flash_air_compatibility_toggle);\ else\ - MENU_ITEM_FUNCTION_P(_i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1*/\ + MENU_ITEM_TOGGLE_P(_T(MSG_SD_CARD), _T(MSG_NORMAL), lcd_toshiba_flash_air_compatibility_toggle);\ \ if (!farm_mode)\ {\ @@ -5241,9 +5241,9 @@ do\ EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort));\ switch (sdSort)\ {\ - case SD_SORT_TIME: MENU_ITEM_FUNCTION_P(_i("Sort [time]"), lcd_sort_type_set); break;/*////MSG_SORT_TIME c=17 r=1*/\ - case SD_SORT_ALPHA: MENU_ITEM_FUNCTION_P(_i("Sort [alphabet]"), lcd_sort_type_set); break;/*////MSG_SORT_ALPHA c=17 r=1*/\ - default: MENU_ITEM_FUNCTION_P(_i("Sort [none]"), lcd_sort_type_set);/*////MSG_SORT_NONE c=17 r=1*/\ + case SD_SORT_TIME: MENU_ITEM_TOGGLE_P(_T(MSG_SORT), _T(MSG_SORT_TIME), lcd_sort_type_set); break;\ + case SD_SORT_ALPHA: MENU_ITEM_TOGGLE_P(_T(MSG_SORT), _T(MSG_SORT_ALPHA), lcd_sort_type_set); break;\ + default: MENU_ITEM_TOGGLE_P(_T(MSG_SORT), _T(MSG_NONE), lcd_sort_type_set);\ }\ }\ }\ @@ -5253,9 +5253,9 @@ while (0) do\ {\ if (card.ToshibaFlashAir_isEnabled())\ - MENU_ITEM_FUNCTION_P(_i("SD card [flshAir]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1*/\ + MENU_ITEM_TOGGLE_P(_T(MSG_SD_CARD), _T(MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY), lcd_toshiba_flash_air_compatibility_toggle);\ else\ - MENU_ITEM_FUNCTION_P(_i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1*/\ + MENU_ITEM_TOGGLE_P(_T(MSG_SD_CARD), _T(MSG_NORMAL), lcd_toshiba_flash_air_compatibility_toggle);\ }\ while (0) #endif // SDCARD_SORT_ALPHA diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 344cccb8..d11fc47d 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -649,11 +649,11 @@ #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -"SD card [normal]" +#MSG_SD_CARD +"SD card" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -"SD card [flshAir]" +#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +"FlashAir" # "Right" @@ -703,17 +703,20 @@ #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." -#MSG_SORT_NONE c=17 r=1 -"Sort [none]" +#MSG_SORT +"Sort" -#MSG_SORT_TIME c=17 r=1 -"Sort [time]" +#MSG_NONE +"None" + +#MSG_SORT_TIME +"Time" # "Severe skew" -#MSG_SORT_ALPHA c=17 r=1 -"Sort [alphabet]" +#MSG_SORT_ALPHA +"Alphabet" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 0f1ce9f6..e601fe62 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -866,13 +866,13 @@ "Running Wizard will delete current calibration results and start from the beginning. Continue?" "Spusteni Pruvodce vymaze ulozene vysledky vsech kalibraci a spusti kalibracni proces od zacatku. Pokracovat?" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -"SD card [normal]" +#MSG_SD_CARD +"SD card" "\x00" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -"SD card [flshAir]" -"SD card [FlshAir]" +#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +"FlashAir" +"\x00" # "Right" @@ -938,21 +938,25 @@ "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." -#MSG_SORT_NONE c=17 r=1 -"Sort [none]" -"Trideni [Zadne]" +#MSG_SORT +"Sort" +"Trideni" -#MSG_SORT_TIME c=17 r=1 -"Sort [time]" -"Trideni [cas]" +#MSG_NONE +"None" +"Zadne" + +#MSG_SORT_TIME +"Time" +"Cas" # "Severe skew" "Tezke zkoseni" -#MSG_SORT_ALPHA c=17 r=1 -"Sort [alphabet]" -"Trideni [Abeceda]" +#MSG_SORT_ALPHA +"Alphabet" +"Abeceda" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 8e059a3b..5a0ae671 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -866,13 +866,13 @@ "Running Wizard will delete current calibration results and start from the beginning. Continue?" "Der Assistent wird die aktuellen Kalibrierungsdaten loeschen und von vorne beginnen. Weiterfahren?" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -"SD card [normal]" -"SD Karte [normal]" +#MSG_SD_CARD +"SD card" +"SD Karte" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -"SD card [flshAir]" -"SD Karte[flshAir]" +#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +"FlashAir" +"\x00" # "Right" @@ -938,21 +938,25 @@ "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." -#MSG_SORT_NONE c=17 r=1 -"Sort [none]" -"Sort. [Keine]" +#MSG_SORT +"Sort" +"Sort." -#MSG_SORT_TIME c=17 r=1 -"Sort [time]" -"Sort. [Zeit]" +#MSG_NONE +"None" +"Keine" + +#MSG_SORT_TIME +"Time" +"Zeit" # "Severe skew" "Schwerer Schraeglauf" -#MSG_SORT_ALPHA c=17 r=1 -"Sort [alphabet]" -"Sort. [Alphabet]" +#MSG_SORT_ALPHA +"Alphabet" +"\x00" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index c74c1557..cb9bea16 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -866,13 +866,13 @@ "Running Wizard will delete current calibration results and start from the beginning. Continue?" "Ejecutar el Wizard borrara los valores de calibracion actuales y comenzara de nuevo. Continuar?" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -"SD card [normal]" -"Tarj. SD [normal]" +#MSG_SD_CARD +"SD card" +"Tarj. SD" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -"SD card [flshAir]" -"Tarj. SD[FlshAir]" +#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +"FlashAir" +"\x00" # "Right" @@ -938,21 +938,25 @@ "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " -#MSG_SORT_NONE c=17 r=1 -"Sort [none]" -"Ordenar [nada]" +#MSG_SORT +"Sort" +"Ordenar" -#MSG_SORT_TIME c=17 r=1 -"Sort [time]" -"Ordenar [Fecha]" +#MSG_NONE +"None" +"Nada" + +#MSG_SORT_TIME +"Time" +"Fecha" # "Severe skew" "Inclinacion severa" -#MSG_SORT_ALPHA c=17 r=1 -"Sort [alphabet]" -"Ordenar [alfabet]" +#MSG_SORT_ALPHA +"Alphabet" +"Alfabet" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index b21b638a..d4a21e7e 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -866,13 +866,13 @@ "Running Wizard will delete current calibration results and start from the beginning. Continue?" "Lancer l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer ?" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -"SD card [normal]" -"Carte SD [normal]" +#MSG_SD_CARD +"SD card" +"Carte SD" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -"SD card [flshAir]" -"Carte SD [flashAir]" +#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +"FlashAir" +"\x00" # "Right" @@ -938,21 +938,25 @@ "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." -#MSG_SORT_NONE c=17 r=1 -"Sort [none]" -"Tri : [aucun]" +#MSG_SORT +"Sort" +"Tri" -#MSG_SORT_TIME c=17 r=1 -"Sort [time]" -"Tri [heure]" +#MSG_NONE +"None" +"Aucun" + +#MSG_SORT_TIME +"Time" +"Heure" # "Severe skew" "Deviation severe" -#MSG_SORT_ALPHA c=17 r=1 -"Sort [alphabet]" -"Tri [alphabet]" +#MSG_SORT_ALPHA +"Alphabet" +"\x00" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index f2873971..8ee3e2dd 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -866,13 +866,13 @@ "Running Wizard will delete current calibration results and start from the beginning. Continue?" "Se avvi il Wizard perderai la calibrazione preesistente e dovrai ricominciare dall'inizio. Continuare?" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -"SD card [normal]" -"Mem. SD [normale]" +#MSG_SD_CARD +"SD card" +"Mem. SD" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -"SD card [flshAir]" -"Mem. SD [flshAir]" +#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +"FlashAir" +"\x00" # "Right" @@ -938,21 +938,25 @@ "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati." -#MSG_SORT_NONE c=17 r=1 -"Sort [none]" -"Ordina [none]" +#MSG_SORT +"Sort" +"Ordina" -#MSG_SORT_TIME c=17 r=1 -"Sort [time]" -"Ordina [time]" +#MSG_NONE +"None" +"\x00" + +#MSG_SORT_TIME +"Time" +"\x00" # "Severe skew" "Disassamento grave" -#MSG_SORT_ALPHA c=17 r=1 -"Sort [alphabet]" -"Ordine [alfabet]" +#MSG_SORT_ALPHA +"Alphabet" +"Alfabet" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index c523c064..797dbb93 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -866,13 +866,13 @@ "Running Wizard will delete current calibration results and start from the beginning. Continue?" "Wlaczenie Asystenta usunie obecne dane kalibracyjne i zacznie od poczatku. Kontynuowac?" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -"SD card [normal]" -"Karta SD [normal]" +#MSG_SD_CARD +"SD card" +"Karta SD" -#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -"SD card [flshAir]" -"Karta SD[FlshAir]" +#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +"FlashAir" +"\x00" # "Right" @@ -938,21 +938,25 @@ "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." -#MSG_SORT_NONE c=17 r=1 -"Sort [none]" -"Sortuj [brak]" +#MSG_SORT +"Sort" +"Sortuj" -#MSG_SORT_TIME c=17 r=1 -"Sort [time]" -"Sortuj [czas]" +#MSG_NONE +"None" +"Brak" + +#MSG_SORT_TIME +"Time" +"Czas" # "Severe skew" "Znaczny skos" -#MSG_SORT_ALPHA c=17 r=1 -"Sort [alphabet]" -"Sortuj [alfabet]" +#MSG_SORT_ALPHA +"Alphabet" +"Alfabet" #MSG_SORTING c=20 r=1 "Sorting files" From a5a5f5cf0b1cfdf551e6caae4fb85bcf7aaed511 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 31 Aug 2019 15:25:00 +0300 Subject: [PATCH 029/110] Toggle RPi port Probably works, needs to be tested. --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 5 +---- lang/lang_en.txt | 7 ++----- lang/lang_en_cz.txt | 10 +++------- lang/lang_en_de.txt | 10 +++------- lang/lang_en_es.txt | 10 +++------- lang/lang_en_fr.txt | 10 +++------- lang/lang_en_it.txt | 10 +++------- lang/lang_en_pl.txt | 10 +++------- 10 files changed, 23 insertions(+), 51 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index d55027b3..07ca8883 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -120,6 +120,7 @@ const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir"); const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); //// const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); //// const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); //// +const char MSG_RPI_PORT[] PROGMEM_I1 = ISTR("RPi port"); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index ed8d5d54..3bcfc288 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -120,6 +120,7 @@ extern const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[]; extern const char MSG_SORT[]; extern const char MSG_SORT_TIME[]; extern const char MSG_SORT_ALPHA[]; +extern const char MSG_RPI_PORT[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 95290d8b..ad45cf75 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5593,10 +5593,7 @@ static void lcd_settings_menu() MENU_ITEM_FUNCTION_P(_i("Temp. cal. [on]"), lcd_temp_calibration_set);////MSG_TEMP_CALIBRATION_ON c=20 r=1 #ifdef HAS_SECOND_SERIAL_PORT - if (selectedSerialPort == 0) - MENU_ITEM_FUNCTION_P(_i("RPi port [off]"), lcd_second_serial_set);////MSG_SECOND_SERIAL_OFF c=17 r=1 - else - MENU_ITEM_FUNCTION_P(_i("RPi port [on]"), lcd_second_serial_set);////MSG_SECOND_SERIAL_ON c=17 r=1 + MENU_ITEM_TOGGLE_P(_T(MSG_RPI_PORT), (selectedSerialPort == 0) ? _T(MSG_OFF) : _T(MSG_ON), lcd_second_serial_set); #endif //HAS_SECOND_SERIAL if (!isPrintPaused && !homing_flag) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index d11fc47d..1e17b869 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -640,11 +640,8 @@ #MSG_BED_CORRECTION_RIGHT c=14 r=1 "Right side[um]" -#MSG_SECOND_SERIAL_ON c=17 r=1 -"RPi port [on]" - -#MSG_SECOND_SERIAL_OFF c=17 r=1 -"RPi port [off]" +#MSG_RPI_PORT +"RPi port" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index e601fe62..1966166e 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -854,13 +854,9 @@ "Right side[um]" "Vpravo [um]" -#MSG_SECOND_SERIAL_ON c=17 r=1 -"RPi port [on]" -"RPi port [zap]" - -#MSG_SECOND_SERIAL_OFF c=17 r=1 -"RPi port [off]" -"RPi port [vyp]" +#MSG_RPI_PORT +"RPi port" +"\x00" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 5a0ae671..e53195ec 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -854,13 +854,9 @@ "Right side[um]" "Rechts [um]" -#MSG_SECOND_SERIAL_ON c=17 r=1 -"RPi port [on]" -"RPi Port [an]" - -#MSG_SECOND_SERIAL_OFF c=17 r=1 -"RPi port [off]" -"RPi Port [aus]" +#MSG_RPI_PORT +"RPi port" +"\x00" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index cb9bea16..35b7e5df 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -854,13 +854,9 @@ "Right side[um]" "Derecha [um]" -#MSG_SECOND_SERIAL_ON c=17 r=1 -"RPi port [on]" -"Puerto RPi [act]" - -#MSG_SECOND_SERIAL_OFF c=17 r=1 -"RPi port [off]" -"Puerto RPi [ina]" +#MSG_RPI_PORT +"RPi port" +"Puerto RPi" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index d4a21e7e..619456ef 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -854,13 +854,9 @@ "Right side[um]" "Droite [um]" -#MSG_SECOND_SERIAL_ON c=17 r=1 -"RPi port [on]" -"Port RPi [on]" - -#MSG_SECOND_SERIAL_OFF c=17 r=1 -"RPi port [off]" -"Port RPi [off]" +#MSG_RPI_PORT +"RPi port" +"Port RPi" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 8ee3e2dd..20dba996 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -854,13 +854,9 @@ "Right side[um]" "Destra [um]" -#MSG_SECOND_SERIAL_ON c=17 r=1 -"RPi port [on]" -"Porta RPi [on]" - -#MSG_SECOND_SERIAL_OFF c=17 r=1 -"RPi port [off]" -"Porta RPi [off]" +#MSG_RPI_PORT +"RPi port" +"Porta RPi" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 797dbb93..9906f8f9 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -854,13 +854,9 @@ "Right side[um]" "Prawo [um]" -#MSG_SECOND_SERIAL_ON c=17 r=1 -"RPi port [on]" -"Port RPi [wl]" - -#MSG_SECOND_SERIAL_OFF c=17 r=1 -"RPi port [off]" -"Port RPi [wyl]" +#MSG_RPI_PORT +"RPi port" +"Port RPi" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" From 2345288d401d157a75ddc5225a4f2c41f034f5e6 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 31 Aug 2019 15:28:31 +0200 Subject: [PATCH 030/110] Fix the LCD pause function Do not call long_pause recursively! long_pause() is called before resetting the lcd_command_type. As long_pause uses st_synchronize() internally, there could be time to schedule another call to long_pause(). --- Firmware/Marlin_main.cpp | 5 ++--- Firmware/ultralcd.cpp | 10 +++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a034f94e..275326ab 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9492,10 +9492,9 @@ void long_pause() //long pause print current_position[Y_AXIS] = Y_PAUSE_POS; plan_buffer_line_curposXYZE(50, active_extruder); - // Turn off the print fan + // Turn off the hotends and print fan + setAllTargetHotends(0); fanSpeed = 0; - - st_synchronize(); } void serialecho_temperatures() { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2efc1e09..0f4af7ce 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1059,12 +1059,8 @@ void lcd_commands() if (!blocks_queued() && !homing_flag) { lcd_setstatuspgm(_i("Print paused"));////MSG_PRINT_PAUSED c=20 r=1 - long_pause(); - if (lcd_commands_type == LcdCommands::LongPause) // !!! because "lcd_commands_type" can be changed during/inside "long_pause()" - { - lcd_commands_type = LcdCommands::Idle; - lcd_commands_step = 0; - } + lcd_commands_type = LcdCommands::Idle; + lcd_commands_step = 0; } } @@ -1644,7 +1640,7 @@ void lcd_pause_print() { lcd_return_to_status(); stop_and_save_print_to_ram(0.0,0.0); - setAllTargetHotends(0); + long_pause(); isPrintPaused = true; if (LcdCommands::Idle == lcd_commands_type) { From 795b1d1cf79324630ed360f93863363d57f1b007 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 31 Aug 2019 16:56:14 +0300 Subject: [PATCH 031/110] Toggle Sound --- Firmware/messages.c | 4 ++++ Firmware/messages.h | 4 ++++ Firmware/sound.h | 6 ----- Firmware/ultralcd.cpp | 53 +++++++++++++++---------------------------- lang/lang_en.txt | 15 +++++------- lang/lang_en_cz.txt | 22 ++++++++---------- lang/lang_en_de.txt | 22 ++++++++---------- lang/lang_en_es.txt | 22 ++++++++---------- lang/lang_en_fr.txt | 22 ++++++++---------- lang/lang_en_it.txt | 22 ++++++++---------- lang/lang_en_pl.txt | 22 ++++++++---------- 11 files changed, 86 insertions(+), 128 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 07ca8883..46bd750b 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -121,6 +121,10 @@ const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); //// const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); //// const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); //// const char MSG_RPI_PORT[] PROGMEM_I1 = ISTR("RPi port"); //// +const char MSG_SOUND[] PROGMEM_I1 = ISTR("Sound"); //// +const char MSG_SOUND_LOUD[] PROGMEM_I1 = ISTR("Loud"); //// +const char MSG_SOUND_ONCE[] PROGMEM_I1 = ISTR("Once"); //// +const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 3bcfc288..96d13816 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -121,6 +121,10 @@ extern const char MSG_SORT[]; extern const char MSG_SORT_TIME[]; extern const char MSG_SORT_ALPHA[]; extern const char MSG_RPI_PORT[]; +extern const char MSG_SOUND[]; +extern const char MSG_SOUND_LOUD[]; +extern const char MSG_SOUND_ONCE[]; +extern const char MSG_SOUND_BLIND[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; diff --git a/Firmware/sound.h b/Firmware/sound.h index 90f3e723..a80d0155 100644 --- a/Firmware/sound.h +++ b/Firmware/sound.h @@ -3,12 +3,6 @@ #define SOUND_H -#define MSG_SOUND_MODE_LOUD "Sound [loud]" -#define MSG_SOUND_MODE_ONCE "Sound [once]" -#define MSG_SOUND_MODE_SILENT "Sound [silent]" -#define MSG_SOUND_MODE_BLIND "Sound [assist]" - - #define e_SOUND_MODE_NULL 0xFF typedef enum {e_SOUND_MODE_LOUD,e_SOUND_MODE_ONCE,e_SOUND_MODE_SILENT,e_SOUND_MODE_BLIND} eSOUND_MODE; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a6732c4f..6a82f277 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5282,22 +5282,22 @@ while (0) do\ {\ switch(eSoundMode)\ - {\ - case e_SOUND_MODE_LOUD:\ - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set);\ - break;\ - case e_SOUND_MODE_ONCE:\ - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_ONCE),lcd_sound_state_set);\ - break;\ - case e_SOUND_MODE_SILENT:\ - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set);\ - break;\ - case e_SOUND_MODE_BLIND:\ - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_BLIND),lcd_sound_state_set);\ - break;\ - default:\ - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set);\ - }\ + {\ + case e_SOUND_MODE_LOUD:\ + MENU_ITEM_TOGGLE_P(_T(MSG_SOUND), _T(MSG_SOUND_LOUD), lcd_sound_state_set);\ + break;\ + case e_SOUND_MODE_ONCE:\ + MENU_ITEM_TOGGLE_P(_T(MSG_SOUND), _T(MSG_SOUND_ONCE), lcd_sound_state_set);\ + break;\ + case e_SOUND_MODE_SILENT:\ + MENU_ITEM_TOGGLE_P(_T(MSG_SOUND), _T(MSG_SILENT), lcd_sound_state_set);\ + break;\ + case e_SOUND_MODE_BLIND:\ + MENU_ITEM_TOGGLE_P(_T(MSG_SOUND), _T(MSG_SOUND_BLIND), lcd_sound_state_set);\ + break;\ + default:\ + MENU_ITEM_TOGGLE_P(_T(MSG_SOUND), _T(MSG_SOUND_LOUD), lcd_sound_state_set);\ + }\ }\ while (0) @@ -6875,25 +6875,8 @@ static void lcd_tune_menu() } } #endif //TMC2130 - SETTINGS_MMU_MODE; - switch(eSoundMode) - { - case e_SOUND_MODE_LOUD: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set); - break; - case e_SOUND_MODE_ONCE: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_ONCE),lcd_sound_state_set); - break; - case e_SOUND_MODE_SILENT: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set); - break; - case e_SOUND_MODE_BLIND: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_BLIND),lcd_sound_state_set); - break; - default: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set); - } - + SETTINGS_MMU_MODE; + SETTINGS_SOUND; MENU_END(); } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 1e17b869..e2add805 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -718,23 +718,20 @@ #MSG_SORTING c=20 r=1 "Sorting files" -#MSG_SOUND_LOUD c=17 r=1 -"Sound [loud]" +#MSG_SOUND_LOUD +"Loud" # "Slight skew" -#MSG_SOUND_MUTE c=17 r=1 -"Sound [mute]" +#MSG_SOUND +"Sound" # "Some problem encountered, Z-leveling enforced ..." -#MSG_SOUND_ONCE c=17 r=1 -"Sound [once]" - -#MSG_SOUND_SILENT c=17 r=1 -"Sound [silent]" +#MSG_SOUND_ONCE +"Once" #MSG_SPEED "Speed" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 1966166e..6bb5293f 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -958,29 +958,25 @@ "Sorting files" "Trideni souboru" -#MSG_SOUND_LOUD c=17 r=1 -"Sound [loud]" -"Zvuk [hlasity]" +#MSG_SOUND_LOUD +"Loud" +"Hlasity" # "Slight skew" "Lehke zkoseni" -#MSG_SOUND_MUTE c=17 r=1 -"Sound [mute]" -"Zvuk [vypnuto]" +#MSG_SOUND +"Sound" +"Zvuk" # "Some problem encountered, Z-leveling enforced ..." "Vyskytl se problem, srovnavam osu Z ..." -#MSG_SOUND_ONCE c=17 r=1 -"Sound [once]" -"Zvuk [jednou]" - -#MSG_SOUND_SILENT c=17 r=1 -"Sound [silent]" -"Zvuk [tichy]" +#MSG_SOUND_ONCE +"Once" +"Jednou" #MSG_SPEED "Speed" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index e53195ec..044156c1 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -958,29 +958,25 @@ "Sorting files" "Sortiere Dateien" -#MSG_SOUND_LOUD c=17 r=1 -"Sound [loud]" -"Sound [laut]" +#MSG_SOUND_LOUD +"Loud" +"Laut" # "Slight skew" "Leichter Schraeglauf" -#MSG_SOUND_MUTE c=17 r=1 -"Sound [mute]" -"Sound [stumm]" +#MSG_SOUND +"Sound" +"\x00" # "Some problem encountered, Z-leveling enforced ..." "Fehler aufgetreten, Z-Kalibrierung erforderlich..." -#MSG_SOUND_ONCE c=17 r=1 -"Sound [once]" -"Sound [einmal]" - -#MSG_SOUND_SILENT c=17 r=1 -"Sound [silent]" -"Sound [leise]" +#MSG_SOUND_ONCE +"Once" +"Einmal" #MSG_SPEED "Speed" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 35b7e5df..40b7af19 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -958,29 +958,25 @@ "Sorting files" "Ordenando archivos" -#MSG_SOUND_LOUD c=17 r=1 -"Sound [loud]" -"Sonido [alto]" +#MSG_SOUND_LOUD +"Loud" +"Alto" # "Slight skew" "Ligeramente inclinado" -#MSG_SOUND_MUTE c=17 r=1 -"Sound [mute]" -"Sonido[silenciad]" +#MSG_SOUND +"Sound" +"Sonido" # "Some problem encountered, Z-leveling enforced ..." "Problema encontrado, nivelacion Z forzosa ..." -#MSG_SOUND_ONCE c=17 r=1 -"Sound [once]" -"Sonido [una vez]" - -#MSG_SOUND_SILENT c=17 r=1 -"Sound [silent]" -"Sonido[silencios]" +#MSG_SOUND_ONCE +"Once" +"Una vez" #MSG_SPEED "Speed" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 619456ef..973f4c14 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -958,29 +958,25 @@ "Sorting files" "Tri des fichiers" -#MSG_SOUND_LOUD c=17 r=1 -"Sound [loud]" -"Son [fort]" +#MSG_SOUND_LOUD +"Loud" +"Fort" # "Slight skew" "Deviation legere" -#MSG_SOUND_MUTE c=17 r=1 -"Sound [mute]" -"Son [muet]" +#MSG_SOUND +"Sound" +"Son" # "Some problem encountered, Z-leveling enforced ..." "Problemes rencontres, nivellement de l'axe Z applique..." -#MSG_SOUND_ONCE c=17 r=1 -"Sound [once]" -"Son [une fois]" - -#MSG_SOUND_SILENT c=17 r=1 -"Sound [silent]" -"Son [silencieux]" +#MSG_SOUND_ONCE +"Once" +"Une fois" #MSG_SPEED "Speed" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 20dba996..8bf6038d 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -958,29 +958,25 @@ "Sorting files" "Ordinando i file" -#MSG_SOUND_LOUD c=17 r=1 -"Sound [loud]" -"Suono [forte]" +#MSG_SOUND_LOUD +"Loud" +"Forte" # "Slight skew" "Disassamento lieve" -#MSG_SOUND_MUTE c=17 r=1 -"Sound [mute]" -"Suono [mute]" +#MSG_SOUND +"Sound" +"Suono" # "Some problem encountered, Z-leveling enforced ..." "Sono stati rilevati problemi, avviato livellamento Z ..." -#MSG_SOUND_ONCE c=17 r=1 -"Sound [once]" -"Suono [singolo]" - -#MSG_SOUND_SILENT c=17 r=1 -"Sound [silent]" -"Suono[silenzioso]" +#MSG_SOUND_ONCE +"Once" +"Singolo" #MSG_SPEED "Speed" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 9906f8f9..54c48248 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -958,29 +958,25 @@ "Sorting files" "Sortowanie plikow" -#MSG_SOUND_LOUD c=17 r=1 -"Sound [loud]" -"Dzwiek [Glosny]" +#MSG_SOUND_LOUD +"Loud" +"Glosny" # "Slight skew" "Lekki skos" -#MSG_SOUND_MUTE c=17 r=1 -"Sound [mute]" -"Dzwiek[Wylaczony]" +#MSG_SOUND +"Sound" +"Dzwiek" # "Some problem encountered, Z-leveling enforced ..." "Wykryto problem, wymuszono poziomowanie osi Z ..." -#MSG_SOUND_ONCE c=17 r=1 -"Sound [once]" -"Dzwiek [1-raz]" - -#MSG_SOUND_SILENT c=17 r=1 -"Sound [silent]" -"Dzwiek [Cichy]" +#MSG_SOUND_ONCE +"Once" +"1-raz" #MSG_SPEED "Speed" From 10cdcb3ae3dd91d7d7063bd8ba0c488e61eae288 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 31 Aug 2019 17:00:39 +0300 Subject: [PATCH 032/110] SD Scroll workaround --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2efc1e09..e72db256 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -305,7 +305,7 @@ const char STR_SEPARATOR[] PROGMEM = "------------"; static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* longFilename) { char c; - int enc_dif = lcd_encoder_diff; + int enc_dif = lcd_encoder_diff / ENCODER_PULSES_PER_STEP; uint8_t n = LCD_WIDTH - 1; for(uint_least8_t g = 0; g<4;g++){ lcd_set_cursor(0, g); @@ -331,7 +331,7 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* longF n = LCD_WIDTH - 1; for(int g = 0; g<300 ;g++){ manage_heater(); - if(LCD_CLICKED || ( enc_dif != lcd_encoder_diff )){ + if(LCD_CLICKED || ( enc_dif != (lcd_encoder_diff / ENCODER_PULSES_PER_STEP))){ longFilenameTMP = longFilename; *(longFilenameTMP + LCD_WIDTH - 2) = '\0'; i = 1; From 339771a5fb3f13456429234e120d5d2bbdca8edc Mon Sep 17 00:00:00 2001 From: vintagepc Date: Sat, 31 Aug 2019 21:27:08 -0400 Subject: [PATCH 033/110] Fixed info screen when selected_sheet hasn't been initialized. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0460e147..66e08143 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -600,7 +600,7 @@ void lcdui_print_percent_done(void) bool num = IS_SD_PRINTING || (PRINTER_ACTIVE && (print_percent_done_normal != PRINT_PERCENT_DONE_INIT)); if (!num || heating_status) // either not printing or heating { - eeprom_read_block(sheet, EEPROM_Sheets_base->s[selected_sheet].name, 7); + eeprom_read_block(sheet, EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))].name, 7); sheet[7] = '\0'; lcd_printf_P(PSTR("%s"),sheet); } From bb1fb4989489c2b01906e68bc08f408872d84590 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 10 Sep 2019 18:36:14 +0200 Subject: [PATCH 034/110] Use MMU cutter only as last resort. Cut filament only before last load retry. --- Firmware/mmu.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index e7a59e75..f44bad97 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1577,19 +1577,23 @@ void mmu_continue_loading(bool blocking) increment_load_fail(); // no break case Ls::Retry: -#ifdef MMU_HAS_CUTTER - if (1 == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) + ++retry; // overflow not handled, as it is not dangerous. + if (retry >= max_retry) { - mmu_command(MmuCmd::K0 + tmp_extruder); - manage_response(true, true, MMU_UNLOAD_MOVE); - } + state = Ls::Unload; +#ifdef MMU_HAS_CUTTER + if (1 == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) + { + mmu_command(MmuCmd::K0 + tmp_extruder); + manage_response(true, true, MMU_UNLOAD_MOVE); + } #endif //MMU_HAS_CUTTER + } mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(true, true, MMU_TCODE_MOVE); success = load_more(); if (success) success = can_load(); - ++retry; // overflow not handled, as it is not dangerous. - if (retry >= max_retry) state = Ls::Unload; + break; case Ls::Unload: stop_and_save_print_to_ram(0, 0); From bf9f66857436500afb887f55f3581292a34dfddb Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 11 Sep 2019 22:03:56 +0300 Subject: [PATCH 035/110] Fix short filenames scrolling in sdprint menu and status screen --- Firmware/ultralcd.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ee8475d1..33b2b555 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -302,18 +302,24 @@ bool bSettings; // flag (i.e. 'fake parameter' const char STR_SEPARATOR[] PROGMEM = "------------"; -static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* longFilename) +static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* filename, char* longFilename) { char c; int enc_dif = lcd_encoder_diff; uint8_t n = LCD_WIDTH - 1; + for(uint_least8_t g = 0; g<4;g++){ lcd_set_cursor(0, g); lcd_print(' '); } - lcd_set_cursor(0, row); lcd_print('>'); + + if (longFilename[0] == '\0') + { + longFilename = filename; + } + int i = 1; int j = 0; char* longFilenameTMP = longFilename; @@ -529,7 +535,7 @@ static uint8_t menu_item_sdfile(const char* if (lcd_draw_update) { if (lcd_encoder == menu_item) - lcd_implementation_drawmenu_sdfile_selected(menu_row, str_fnl); + lcd_implementation_drawmenu_sdfile_selected(menu_row, str_fn, str_fnl); else lcd_implementation_drawmenu_sdfile(menu_row, str_fn, str_fnl); } @@ -701,10 +707,10 @@ void lcdui_print_status_line(void) { if (IS_SD_PRINTING) { - if (strcmp(longFilenameOLD, card.longFilename) != 0) + if (strcmp(longFilenameOLD, (card.longFilename[0] ? card.longFilename : card.filename)) != 0) { memset(longFilenameOLD, '\0', strlen(longFilenameOLD)); - sprintf_P(longFilenameOLD, PSTR("%s"), card.longFilename); + sprintf_P(longFilenameOLD, PSTR("%s"), (card.longFilename[0] ? card.longFilename : card.filename)); scrollstuff = 0; } } @@ -752,16 +758,16 @@ void lcdui_print_status_line(void) } else if ((IS_SD_PRINTING) && (custom_message_type == CustomMsg::Status)) { // If printing from SD, show what we are printing - if(strlen(card.longFilename) > LCD_WIDTH) + if(strlen(longFilenameOLD) > LCD_WIDTH) { int inters = 0; int gh = scrollstuff; while (((gh - scrollstuff) < LCD_WIDTH) && (inters == 0)) { - if (card.longFilename[gh] == '\0') + if (longFilenameOLD[gh] == '\0') { lcd_set_cursor(gh - scrollstuff, 3); - lcd_print(card.longFilename[gh - 1]); + lcd_print(longFilenameOLD[gh - 1]); scrollstuff = 0; gh = scrollstuff; inters = 1; @@ -769,7 +775,7 @@ void lcdui_print_status_line(void) else { lcd_set_cursor(gh - scrollstuff, 3); - lcd_print(card.longFilename[gh - 1]); + lcd_print(longFilenameOLD[gh - 1]); gh++; } } @@ -777,7 +783,7 @@ void lcdui_print_status_line(void) } else { - lcd_print(longFilenameOLD); + lcd_printf_P(PSTR("%-20s"), longFilenameOLD); } } else From ae839aee311ddcb8432a693e88cda3745bab2b8f Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 12 Sep 2019 16:28:36 +0300 Subject: [PATCH 036/110] Merge branch 'MK3' into MK3_Translations --- Firmware/Configuration.h | 11 +- Firmware/Configuration_adv.h | 12 - Firmware/Marlin_main.cpp | 9 +- Firmware/config.h | 2 +- Firmware/eeprom.cpp | 56 +- Firmware/lcd.cpp | 3 +- Firmware/lcd.h | 1 - Firmware/menu.cpp | 3 +- Firmware/stepper.cpp | 3 +- Firmware/temperature.cpp | 68 +- Firmware/temperature.h | 4 - Firmware/ultralcd.cpp | 537 +++----- Firmware/ultralcd.h | 1 + .../variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 2 +- .../variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 10 +- .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 10 +- .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 10 +- .../1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 10 +- .../1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 10 +- .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 10 +- .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 10 +- lang/lang-export.sh | 2 +- lang/lang-import.sh | 2 +- lang/lang_en.txt | 144 ++ lang/lang_en_cz.txt | 210 ++- lang/lang_en_de.txt | 218 ++- lang/lang_en_es.txt | 230 +++- lang/lang_en_fr.txt | 210 ++- lang/lang_en_it.txt | 236 +++- lang/lang_en_pl.txt | 220 +++- lang/po/Firmware.pot | 978 +++++++------- lang/po/Firmware_cs.po | 1054 ++++++++------- lang/po/Firmware_de.po | 1065 ++++++++------- lang/po/Firmware_es.po | 1058 ++++++++------- lang/po/Firmware_fr.po | 1168 +++++++++-------- lang/po/Firmware_it.po | 1058 ++++++++------- lang/po/Firmware_pl.po | 1056 ++++++++------- lang/po/new/cs.po | 851 ++++++++---- lang/po/new/de.po | 862 ++++++++---- lang/po/new/es.po | 892 +++++++++---- lang/po/new/fr.po | 850 ++++++++---- lang/po/new/it.po | 880 +++++++++---- lang/po/new/pl.po | 864 ++++++++---- 43 files changed, 9185 insertions(+), 5705 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index ebda4960..d3544c93 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -16,8 +16,8 @@ extern uint16_t nPrinterType; extern PGM_P sPrinterName; // Firmware version -#define FW_VERSION "3.8.0-RC2" -#define FW_COMMIT_NR 2639 +#define FW_VERSION "3.8.0" +#define FW_COMMIT_NR 2684 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. #define FW_DEV_VERSION FW_VERSION_UNKNOWN @@ -113,11 +113,6 @@ extern PGM_P sPrinterName; // #define PS_DEFAULT_OFF - -// This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted. -//#define TEMP_SENSOR_1_AS_REDUNDANT -#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 - // Actual temperature must be close to target for this long before M109 returns success #define TEMP_RESIDENCY_TIME 3 // (seconds) #define TEMP_HYSTERESIS 5 // (degC) range of +/- temperatures considered "close" to the target one @@ -291,6 +286,8 @@ your extruder heater takes 2 minutes to hit the target on heating. #define Z_HEIGHT_HIDE_LIVE_ADJUST_MENU 2.0f +#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in calibration + //============================= Bed Auto Leveling =========================== //#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line) diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index 95130287..dd77c91c 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -10,14 +10,6 @@ #endif #define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control -//// Heating sanity check: -// This waits for the watch period in milliseconds whenever an M104 or M109 increases the target temperatureLCD_PROGRESS_BAR -// If the temperature has not increased at the end of that period, the target temperature is set to zero. -// It can be reset with another M104/M109. This check is also only triggered if the target temperature and the current temperature -// differ by at least 2x WATCH_TEMP_INCREASE -//#define WATCH_TEMP_PERIOD 40000 //40 seconds -//#define WATCH_TEMP_INCREASE 10 //Heat up at least 10 degree in 20 seconds - #ifdef PIDTEMP // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -400,10 +392,6 @@ const unsigned int dropsegments=5; //everything with less than this number of st //============================= Define Defines ============================ //=========================================================================== -#if EXTRUDERS > 1 && defined TEMP_SENSOR_1_AS_REDUNDANT - #error "You cannot use TEMP_SENSOR_1_AS_REDUNDANT if EXTRUDERS > 1" -#endif - #if EXTRUDERS > 1 && defined HEATERS_PARALLEL #error "You cannot use HEATERS_PARALLEL if EXTRUDERS > 1" #endif diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a034f94e..2423beaf 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2860,7 +2860,8 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) #endif //TMC2130 enable_endstops(endstops_enabled); - if (st_get_position_mm(Z_AXIS) == MESH_HOME_Z_SEARCH) + if ((st_get_position_mm(Z_AXIS) <= (MESH_HOME_Z_SEARCH + HOME_Z_SEARCH_THRESHOLD)) && + (st_get_position_mm(Z_AXIS) >= (MESH_HOME_Z_SEARCH - HOME_Z_SEARCH_THRESHOLD))) { if (onlyZ) { @@ -3261,7 +3262,7 @@ static void gcode_PRUSA_SN() //! May be that's why the bad RAMBo's still produce some fan RPM reading, but not corresponding to reality static void gcode_PRUSA_BadRAMBoFanTest(){ //printf_P(PSTR("Enter fan pin test\n")); -#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 && defined(IR_SENSOR) +#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 fan_measuring = false; // prevent EXTINT7 breaking into the measurement unsigned long tach1max = 0; uint8_t tach1cntr = 0; @@ -5891,7 +5892,6 @@ Sigma_Exit: { setTargetHotendSafe(code_value(), extruder); } - setWatch(); break; } @@ -6036,7 +6036,6 @@ Sigma_Exit: } #endif - setWatch(); codenum = _millis(); /* See if we are heating up or cooling down */ @@ -10207,7 +10206,7 @@ void restore_print_from_ram_and_continue(float e_move) else { //not sd printing nor usb printing } - printf_P(PSTR("ok\n")); //dummy response because of octoprint is waiting for this + SERIAL_PROTOCOLLNRPGM(MSG_OK); //dummy response because of octoprint is waiting for this lcd_setstatuspgm(_T(WELCOME_MSG)); saved_printing = false; } diff --git a/Firmware/config.h b/Firmware/config.h index a712839b..0473c3ff 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -49,7 +49,7 @@ //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support -#define LANG_SIZE_RESERVED 0x2800 // reserved space for secondary language (10240 bytes) +#define LANG_SIZE_RESERVED 0x3000 // reserved space for secondary language (12288 bytes) #endif //_CONFIG_H diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp index dd1a410b..b33b2c3c 100644 --- a/Firmware/eeprom.cpp +++ b/Firmware/eeprom.cpp @@ -97,14 +97,66 @@ void eeprom_init() //! @brief Get default sheet name for index //! +//! | index | sheetName | +//! | ----- | --------- | +//! | 0 | Smooth1 | +//! | 1 | Smooth2 | +//! | 2 | Textur1 | +//! | 3 | Textur2 | +//! | 4 | Custom1 | +//! | 5 | Custom2 | +//! | 6 | Custom3 | +//! | 7 | Custom4 | +//! //! @param[in] index //! @param[out] sheetName void eeprom_default_sheet_name(uint8_t index, SheetName &sheetName) { static_assert(8 == sizeof(SheetName),"Default sheet name needs to be adjusted."); - sprintf_P(sheetName.c, PSTR("%-6.6S"), _T(MSG_SHEET)); - sheetName.c[6] = '1' + index; + if (index < 2) + { + strcpy_P(sheetName.c, PSTR("Smooth")); + } + else if (index < 4) + { + strcpy_P(sheetName.c, PSTR("Textur")); + } + else + { + strcpy_P(sheetName.c, PSTR("Custom")); + } + + switch (index) + { + case 0: + sheetName.c[6] = '1'; + break; + case 1: + sheetName.c[6] = '2'; + break; + case 2: + sheetName.c[6] = '1'; + break; + case 3: + sheetName.c[6] = '2'; + break; + case 4: + sheetName.c[6] = '1'; + break; + case 5: + sheetName.c[6] = '2'; + break; + case 6: + sheetName.c[6] = '3'; + break; + case 7: + sheetName.c[6] = '4'; + break; + default: + break; + } + sheetName.c[7] = '\0'; } diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index fd3e1328..71948789 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -189,9 +189,10 @@ static void lcd_begin(uint8_t clear) #endif } -static void lcd_putchar(char c, FILE *) +static int lcd_putchar(char c, FILE *) { lcd_write(c); + return 0; } void lcd_init(void) diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 307e9486..790c0a95 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -11,7 +11,6 @@ extern FILE _lcdout; #define lcdout (&_lcdout) -extern void lcd_putchar(char c, FILE *stream); extern void lcd_init(void); diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 17770208..d516be37 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -457,7 +457,8 @@ void menu_draw_P(char chr, const char* str, int16_t val) float factor = 1.0f + static_cast(val) / 1000.0f; if (val <= _md->minEditValue) { - lcd_printf_P(menu_fmt_float13off, chr, str, " [off]"); + // lcd_printf_P(menu_fmt_float13off, chr, str, " [off]"); + menu_draw_toggle_puts_P(str, _T(MSG_OFF), true); } else { diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 860d761c..5b102f42 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1562,7 +1562,8 @@ void EEPROM_read_st(int pos, uint8_t* value, uint8_t size) void st_current_init() //Initialize Digipot Motor Current { -uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); + uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); + if (SilentMode == 0xff) SilentMode = 0; //set power to High Power (MK2.5) or Normal Power (MK3, unused) SilentModeMenu = SilentMode; #ifdef MOTOR_CURRENT_PWM_XY_PIN pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT); diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 391607e8..3c7f5fbc 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -73,10 +73,6 @@ int current_voltage_raw_bed = 0; int current_temperature_bed_raw = 0; float current_temperature_bed = 0.0; -#ifdef TEMP_SENSOR_1_AS_REDUNDANT - int redundant_temperature_raw = 0; - float redundant_temperature = 0.0; -#endif #ifdef PIDTEMP @@ -175,13 +171,8 @@ static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP; static int bed_maxttemp_raw = HEATER_BED_RAW_HI_TEMP; #endif -#ifdef TEMP_SENSOR_1_AS_REDUNDANT - static void *heater_ttbl_map[2] = {(void *)HEATER_0_TEMPTABLE, (void *)HEATER_1_TEMPTABLE }; - static uint8_t heater_ttbllen_map[2] = { HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN }; -#else - static void *heater_ttbl_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( (void *)HEATER_0_TEMPTABLE, (void *)HEATER_1_TEMPTABLE, (void *)HEATER_2_TEMPTABLE ); - static uint8_t heater_ttbllen_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN, HEATER_2_TEMPTABLE_LEN ); -#endif +static void *heater_ttbl_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( (void *)HEATER_0_TEMPTABLE, (void *)HEATER_1_TEMPTABLE, (void *)HEATER_2_TEMPTABLE ); +static uint8_t heater_ttbllen_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN, HEATER_2_TEMPTABLE_LEN ); static float analog2temp(int raw, uint8_t e); static float analog2tempBed(int raw); @@ -195,11 +186,6 @@ enum TempRunawayStates TempRunaway_ACTIVE = 2, }; -#ifdef WATCH_TEMP_PERIOD -int watch_start_temp[EXTRUDERS] = ARRAY_BY_EXTRUDERS(0,0,0); -unsigned long watchmillis[EXTRUDERS] = ARRAY_BY_EXTRUDERS(0,0,0); -#endif //WATCH_TEMP_PERIOD - #ifndef SOFT_PWM_SCALE #define SOFT_PWM_SCALE 0 #endif @@ -728,34 +714,6 @@ void manage_heater() { soft_pwm[e] = 0; } - - #ifdef WATCH_TEMP_PERIOD - if(watchmillis[e] && _millis() - watchmillis[e] > WATCH_TEMP_PERIOD) - { - if(degHotend(e) < watch_start_temp[e] + WATCH_TEMP_INCREASE) - { - setTargetHotend(0, e); - LCD_MESSAGEPGM("Heating failed"); - SERIAL_ECHO_START; - SERIAL_ECHOLN("Heating failed"); - }else{ - watchmillis[e] = 0; - } - } - #endif - #ifdef TEMP_SENSOR_1_AS_REDUNDANT - if(fabs(current_temperature[0] - redundant_temperature) > MAX_REDUNDANT_TEMP_SENSOR_DIFF) { - disable_heater(); - if(IsStopped() == false) { - SERIAL_ERROR_START; - SERIAL_ERRORLNPGM("Extruder switched off. Temperature difference between temp sensors is too high !"); - LCD_ALERTMESSAGEPGM("Err: REDUNDANT TEMP ERROR"); - } - #ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE - Stop(); - #endif - } - #endif } // End extruder for loop #define FAN_CHECK_PERIOD 5000 //5s @@ -907,11 +865,7 @@ void manage_heater() // Derived from RepRap FiveD extruder::getTemperature() // For hot end temperature measurement. static float analog2temp(int raw, uint8_t e) { -#ifdef TEMP_SENSOR_1_AS_REDUNDANT - if(e > EXTRUDERS) -#else if(e >= EXTRUDERS) -#endif { SERIAL_ERROR_START; SERIAL_ERROR((int)e); @@ -1054,10 +1008,6 @@ static void updateTemperaturesFromRawValues() current_temperature_bed = analog2tempBed(current_temperature_bed_raw); #endif //DEBUG_HEATER_BED_SIM - #ifdef TEMP_SENSOR_1_AS_REDUNDANT - redundant_temperature = analog2temp(redundant_temperature_raw, 1); - #endif - CRITICAL_SECTION_START; temp_meas_ready = false; CRITICAL_SECTION_END; @@ -1221,20 +1171,6 @@ void tp_init() #endif //BED_MAXTEMP } -void setWatch() -{ -#ifdef WATCH_TEMP_PERIOD - for (int e = 0; e < EXTRUDERS; e++) - { - if(degHotend(e) < degTargetHotend(e) - (WATCH_TEMP_INCREASE * 2)) - { - watch_start_temp[e] = degHotend(e); - watchmillis[e] = _millis(); - } - } -#endif -} - #if (defined (TEMP_RUNAWAY_BED_HYSTERESIS) && TEMP_RUNAWAY_BED_TIMEOUT > 0) || (defined (TEMP_RUNAWAY_EXTRUDER_HYSTERESIS) && TEMP_RUNAWAY_EXTRUDER_TIMEOUT > 0) void temp_runaway_check(int _heater_id, float _target_temperature, float _current_temperature, float _output, bool _isbed) { diff --git a/Firmware/temperature.h b/Firmware/temperature.h index e9ba11b4..7f4daa2e 100755 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -74,9 +74,6 @@ extern int current_voltage_raw_pwr; extern int current_voltage_raw_bed; #endif -#ifdef TEMP_SENSOR_1_AS_REDUNDANT - extern float redundant_temperature; -#endif #if defined(CONTROLLERFAN_PIN) && CONTROLLERFAN_PIN > -1 extern unsigned char soft_pwm_bed; @@ -220,7 +217,6 @@ FORCE_INLINE bool isCoolingBed() { int getHeaterPower(int heater); void disable_heater(); -void setWatch(); void updatePID(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6a82f277..f29ea5c9 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1661,100 +1661,12 @@ static void lcd_move_menu_axis(); /* Menu implementation */ -static void lcd_preheat_farm() -{ - setTargetHotend0(FARM_PREHEAT_HOTEND_TEMP); - setTargetBed(FARM_PREHEAT_HPB_TEMP); - fanSpeed = 0; - lcd_return_to_status(); - setWatch(); // heater sanity check timer -} - -static void lcd_preheat_farm_nozzle() -{ - setTargetHotend0(FARM_PREHEAT_HOTEND_TEMP); - setTargetBed(0); - fanSpeed = 0; - lcd_return_to_status(); - setWatch(); // heater sanity check timer -} - -static void lcd_preheat_pla() -{ - setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(PLA_PREHEAT_HPB_TEMP); - fanSpeed = PLA_PREHEAT_FAN_SPEED; - lcd_return_to_status(); - setWatch(); // heater sanity check timer - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_asa() -{ - setTargetHotend0(ASA_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(ASA_PREHEAT_HPB_TEMP); - fanSpeed = ASA_PREHEAT_FAN_SPEED; - lcd_return_to_status(); - setWatch(); // heater sanity check timer - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_abs() -{ - setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(ABS_PREHEAT_HPB_TEMP); - fanSpeed = ABS_PREHEAT_FAN_SPEED; - lcd_return_to_status(); - setWatch(); // heater sanity check timer - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_pp() -{ - setTargetHotend0(PP_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(PP_PREHEAT_HPB_TEMP); - fanSpeed = PP_PREHEAT_FAN_SPEED; - lcd_return_to_status(); - setWatch(); // heater sanity check timer - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_pet() -{ - setTargetHotend0(PET_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(PET_PREHEAT_HPB_TEMP); - fanSpeed = PET_PREHEAT_FAN_SPEED; - lcd_return_to_status(); - setWatch(); // heater sanity check timer - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_hips() -{ - setTargetHotend0(HIPS_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(HIPS_PREHEAT_HPB_TEMP); - fanSpeed = HIPS_PREHEAT_FAN_SPEED; - lcd_return_to_status(); - setWatch(); // heater sanity check timer - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_flex() -{ - setTargetHotend0(FLEX_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(FLEX_PREHEAT_HPB_TEMP); - fanSpeed = FLEX_PREHEAT_FAN_SPEED; - lcd_return_to_status(); - setWatch(); // heater sanity check timer - if (wizard_active) lcd_wizard(WizState::Unload); -} - - static void lcd_cooldown() { setAllTargetHotends(0); setTargetBed(0); fanSpeed = 0; + eFilamentAction = FilamentAction::None; lcd_return_to_status(); } @@ -2021,27 +1933,8 @@ static void lcd_menu_test_restore() static void lcd_preheat_menu() { - MENU_BEGIN(); - - if (!wizard_active) MENU_ITEM_BACK_P(_T(MSG_MAIN)); - - if (farm_mode) { - MENU_ITEM_FUNCTION_P(PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), lcd_preheat_farm); - MENU_ITEM_FUNCTION_P(PSTR("nozzle - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/0"), lcd_preheat_farm_nozzle); - MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown); - } else { - MENU_ITEM_FUNCTION_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla); - MENU_ITEM_FUNCTION_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet); - MENU_ITEM_FUNCTION_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)), lcd_preheat_asa); - MENU_ITEM_FUNCTION_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs); - MENU_ITEM_FUNCTION_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)), lcd_preheat_hips); - MENU_ITEM_FUNCTION_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)), lcd_preheat_pp); - MENU_ITEM_FUNCTION_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)), lcd_preheat_flex); - if (!wizard_active) MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown); - } - - - MENU_END(); + eFilamentAction = FilamentAction::Preheat; + mFilamentMenu(); } static void lcd_support_menu() @@ -2194,7 +2087,7 @@ FilamentAction eFilamentAction=FilamentAction::None; // must be initialized as ' bool bFilamentFirstRun; bool bFilamentPreheatState; bool bFilamentAction=false; -bool bFilamentWaitingFlag=false; +static bool bFilamentWaitingFlag=false; static void mFilamentPrompt() { @@ -2219,6 +2112,7 @@ switch(eFilamentAction) case FilamentAction::MmuEject: case FilamentAction::MmuCut: case FilamentAction::None: + case FilamentAction::Preheat: break; } if(lcd_clicked()) @@ -2247,290 +2141,220 @@ if(lcd_clicked()) case FilamentAction::MmuEject: case FilamentAction::MmuCut: case FilamentAction::None: + case FilamentAction::Preheat: break; } } } -/* -void _mFilamentItem(uint16_t nTemp,uint16_t nTempBed) +void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) { -static int nTargetOld,nTargetBedOld; -uint8_t nLevel; -static bool bBeep=false; + static int nTargetOld; + static int nTargetBedOld; + uint8_t nLevel; -//if(bPreheatState) // not necessary - nTargetOld=target_temperature[0]; - nTargetBedOld=target_temperature_bed; -setTargetHotend0((float)nTemp); -setTargetBed((float)nTempBed); -lcd_timeoutToStatus.stop(); -lcd_set_cursor(0,0); -lcdui_print_temp(LCD_STR_THERMOMETER[0],(int)degHotend(0),(int)degTargetHotend(0)); -lcd_set_cursor(0,1); -switch(eFilamentAction) - { - case eFILAMENT_ACTION::load: - case eFILAMENT_ACTION::autoLoad: - case eFILAMENT_ACTION::mmuLoad: - lcd_puts_P(_i("Preheating to load")); ////MSG_ c=20 r=1 - break; - case eFILAMENT_ACTION::unLoad: - case eFILAMENT_ACTION::mmuUnLoad: - lcd_puts_P(_i("Preheating to unload")); ////MSG_ c=20 r=1 - break; - case eFILAMENT_ACTION::mmuEject: - lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20 r=1 - break; - case eFILAMENT_ACTION::mmuCut: - lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 r=1 - break; - } -lcd_set_cursor(0,3); -lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1 -if(lcd_clicked()) - { - if(!bFilamentPreheatState) - { - setTargetHotend0(0.0); - setTargetBed(0.0); - menu_back(); - } - else { - setTargetHotend0((float)nTargetOld); - setTargetBed((float)nTargetBedOld); - } - menu_back(); - if(eFilamentAction==eFILAMENT_ACTION::autoLoad) - eFilamentAction=eFILAMENT_ACTION::none; // i.e. non-autoLoad - } -else { - if(current_temperature[0]>(target_temperature[0]*0.95)) - { - switch(eFilamentAction) - { - case eFILAMENT_ACTION::load: - case eFILAMENT_ACTION::autoLoad: - case eFILAMENT_ACTION::unLoad: - menu_submenu(mFilamentPrompt); - break; - case eFILAMENT_ACTION::mmuLoad: - nLevel=1; - if(!bFilamentPreheatState) - nLevel++; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_load_to_nozzle_menu); - break; - case eFILAMENT_ACTION::mmuUnLoad: - nLevel=1; - if(!bFilamentPreheatState) - nLevel++; - bFilamentAction=true; - menu_back(nLevel); - extr_unload(); - break; - case eFILAMENT_ACTION::mmuEject: - nLevel=1; - if(!bFilamentPreheatState) - nLevel++; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_fil_eject_menu); - break; - case eFILAMENT_ACTION::mmuCut: - nLevel=1; - if(!bFilamentPreheatState) - nLevel++; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_cut_filament_menu); - break; - } - if(bBeep) - Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); - bBeep=false; - } - else bBeep=true; - } -} -*/ + nTargetOld = target_temperature[0]; + nTargetBedOld = target_temperature_bed; + setTargetHotend0((float )nTemp); + if (!wizard_active) setTargetBed((float) nTempBed); -void mFilamentItem(uint16_t nTemp,uint16_t nTempBed) -{ -static int nTargetOld,nTargetBedOld; -uint8_t nLevel; + if (eFilamentAction == FilamentAction::Preheat) + { + eFilamentAction = FilamentAction::None; + lcd_return_to_status(); + if (wizard_active) lcd_wizard(WizState::Unload); + return; + } -//if(bPreheatState) // not necessary - nTargetOld=target_temperature[0]; - nTargetBedOld=target_temperature_bed; -setTargetHotend0((float)nTemp); -setTargetBed((float)nTempBed); -lcd_timeoutToStatus.stop(); -if(current_temperature[0]>(target_temperature[0]*0.95)) - { - switch(eFilamentAction) - { - case FilamentAction::Load: - case FilamentAction::AutoLoad: - case FilamentAction::UnLoad: - if(bFilamentWaitingFlag) - menu_submenu(mFilamentPrompt); - else { - nLevel=bFilamentPreheatState?1:2; - menu_back(nLevel); - if((eFilamentAction==FilamentAction::Load)||(eFilamentAction==FilamentAction::AutoLoad)) - { - loading_flag=true; - enquecommand_P(PSTR("M701")); // load filament - if(eFilamentAction==FilamentAction::AutoLoad) - eFilamentAction=FilamentAction::None; // i.e. non-autoLoad - } - if(eFilamentAction==FilamentAction::UnLoad) - enquecommand_P(PSTR("M702")); // unload filament - } - break; - case FilamentAction::MmuLoad: - nLevel=bFilamentPreheatState?1:2; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_load_to_nozzle_menu); - break; - case FilamentAction::MmuUnLoad: - nLevel=bFilamentPreheatState?1:2; - bFilamentAction=true; - menu_back(nLevel); - extr_unload(); - break; - case FilamentAction::MmuEject: - nLevel=bFilamentPreheatState?1:2; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_fil_eject_menu); - break; - case FilamentAction::MmuCut: + lcd_timeoutToStatus.stop(); + + if (current_temperature[0] > (target_temperature[0] * 0.95)) + { + switch (eFilamentAction) + { + case FilamentAction::Load: + case FilamentAction::AutoLoad: + case FilamentAction::UnLoad: + if (bFilamentWaitingFlag) menu_submenu(mFilamentPrompt); + else + { + nLevel = bFilamentPreheatState ? 1 : 2; + menu_back(nLevel); + if ((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad)) + { + loading_flag = true; + enquecommand_P(PSTR("M701")); // load filament + if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad + } + if (eFilamentAction == FilamentAction::UnLoad) + enquecommand_P(PSTR("M702")); // unload filament + } + break; + case FilamentAction::MmuLoad: + nLevel = bFilamentPreheatState ? 1 : 2; + bFilamentAction = true; + menu_back(nLevel); + menu_submenu(mmu_load_to_nozzle_menu); + break; + case FilamentAction::MmuUnLoad: + nLevel = bFilamentPreheatState ? 1 : 2; + bFilamentAction = true; + menu_back(nLevel); + extr_unload(); + break; + case FilamentAction::MmuEject: + nLevel = bFilamentPreheatState ? 1 : 2; + bFilamentAction = true; + menu_back(nLevel); + menu_submenu(mmu_fil_eject_menu); + break; + case FilamentAction::MmuCut: #ifdef MMU_HAS_CUTTER - nLevel=bFilamentPreheatState?1:2; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_cut_filament_menu); + nLevel=bFilamentPreheatState?1:2; + bFilamentAction=true; + menu_back(nLevel); + menu_submenu(mmu_cut_filament_menu); #endif //MMU_HAS_CUTTER - break; - case FilamentAction::None: - break; - } - if(bFilamentWaitingFlag) - Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); - bFilamentWaitingFlag=false; - } -else { - bFilamentWaitingFlag=true; - lcd_set_cursor(0,0); - lcdui_print_temp(LCD_STR_THERMOMETER[0],(int)degHotend(0),(int)degTargetHotend(0)); - lcd_set_cursor(0,1); - switch(eFilamentAction) - { - case FilamentAction::Load: - case FilamentAction::AutoLoad: - case FilamentAction::MmuLoad: - lcd_puts_P(_i("Preheating to load")); ////MSG_ c=20 r=1 - break; - case FilamentAction::UnLoad: - case FilamentAction::MmuUnLoad: - lcd_puts_P(_i("Preheating to unload")); ////MSG_ c=20 r=1 - break; - case FilamentAction::MmuEject: - lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20 r=1 - break; - case FilamentAction::MmuCut: - lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 r=1 - break; - case FilamentAction::None: - break; - } - lcd_set_cursor(0,3); - lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1 - if(lcd_clicked()) - { - bFilamentWaitingFlag=false; - if(!bFilamentPreheatState) - { - setTargetHotend0(0.0); - setTargetBed(0.0); - menu_back(); - } - else { - setTargetHotend0((float)nTargetOld); - setTargetBed((float)nTargetBedOld); - } - menu_back(); - if(eFilamentAction==FilamentAction::AutoLoad) - eFilamentAction=FilamentAction::None; // i.e. non-autoLoad - } - } + break; + case FilamentAction::None: + case FilamentAction::Preheat: + break; + } + if (bFilamentWaitingFlag) Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); + bFilamentWaitingFlag = false; + } + else + { + bFilamentWaitingFlag = true; + lcd_set_cursor(0, 0); + lcdui_print_temp(LCD_STR_THERMOMETER[0], (int) degHotend(0), (int) degTargetHotend(0)); + lcd_set_cursor(0, 1); + switch (eFilamentAction) + { + case FilamentAction::Load: + case FilamentAction::AutoLoad: + case FilamentAction::MmuLoad: + lcd_puts_P(_i("Preheating to load")); ////MSG_ c=20 r=1 + break; + case FilamentAction::UnLoad: + case FilamentAction::MmuUnLoad: + lcd_puts_P(_i("Preheating to unload")); ////MSG_ c=20 r=1 + break; + case FilamentAction::MmuEject: + lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20 r=1 + break; + case FilamentAction::MmuCut: + lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 r=1 + break; + case FilamentAction::None: + case FilamentAction::Preheat: + break; + } + lcd_set_cursor(0, 3); + lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1 + if (lcd_clicked()) + { + bFilamentWaitingFlag = false; + if (!bFilamentPreheatState) + { + setTargetHotend0(0.0); + setTargetBed(0.0); + menu_back(); + } + else + { + setTargetHotend0((float )nTargetOld); + setTargetBed((float) nTargetBedOld); + } + menu_back(); + if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad + } + } +} + +static void mFilamentItem_farm() +{ + bFilamentPreheatState = false; + mFilamentItem(FARM_PREHEAT_HOTEND_TEMP, FARM_PREHEAT_HPB_TEMP); +} +static void mFilamentItem_farm_nozzle() +{ + bFilamentPreheatState = false; + mFilamentItem(FARM_PREHEAT_HOTEND_TEMP, 0); } static void mFilamentItem_PLA() { -bFilamentPreheatState=false; -mFilamentItem(PLA_PREHEAT_HOTEND_TEMP,PLA_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(PLA_PREHEAT_HOTEND_TEMP, PLA_PREHEAT_HPB_TEMP); } static void mFilamentItem_PET() { -bFilamentPreheatState=false; -mFilamentItem(PET_PREHEAT_HOTEND_TEMP,PET_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(PET_PREHEAT_HOTEND_TEMP, PET_PREHEAT_HPB_TEMP); } static void mFilamentItem_ASA() { - bFilamentPreheatState=false; - mFilamentItem(ASA_PREHEAT_HOTEND_TEMP,ASA_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(ASA_PREHEAT_HOTEND_TEMP, ASA_PREHEAT_HPB_TEMP); } static void mFilamentItem_ABS() { -bFilamentPreheatState=false; -mFilamentItem(ABS_PREHEAT_HOTEND_TEMP,ABS_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(ABS_PREHEAT_HOTEND_TEMP, ABS_PREHEAT_HPB_TEMP); } static void mFilamentItem_HIPS() { -bFilamentPreheatState=false; -mFilamentItem(HIPS_PREHEAT_HOTEND_TEMP,HIPS_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(HIPS_PREHEAT_HOTEND_TEMP, HIPS_PREHEAT_HPB_TEMP); } static void mFilamentItem_PP() { -bFilamentPreheatState=false; -mFilamentItem(PP_PREHEAT_HOTEND_TEMP,PP_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(PP_PREHEAT_HOTEND_TEMP, PP_PREHEAT_HPB_TEMP); } static void mFilamentItem_FLEX() { -bFilamentPreheatState=false; -mFilamentItem(FLEX_PREHEAT_HOTEND_TEMP,FLEX_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(FLEX_PREHEAT_HOTEND_TEMP, FLEX_PREHEAT_HPB_TEMP); } - void mFilamentBack() { -menu_back(); -if(eFilamentAction==FilamentAction::AutoLoad) - eFilamentAction=FilamentAction::None; // i.e. non-autoLoad + menu_back(); + if (eFilamentAction == FilamentAction::AutoLoad || + eFilamentAction == FilamentAction::Preheat) + { + eFilamentAction = FilamentAction::None; // i.e. non-autoLoad + } } void mFilamentMenu() { MENU_BEGIN(); - MENU_ITEM_FUNCTION_P(_T(MSG_MAIN),mFilamentBack); - MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA); - MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET); - MENU_ITEM_SUBMENU_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)),mFilamentItem_ASA); - MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS); - MENU_ITEM_SUBMENU_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)),mFilamentItem_HIPS); - MENU_ITEM_SUBMENU_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)),mFilamentItem_PP); - MENU_ITEM_SUBMENU_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)),mFilamentItem_FLEX); + if (!wizard_active) MENU_ITEM_FUNCTION_P(_T(MSG_MAIN),mFilamentBack); + if (farm_mode) + { + MENU_ITEM_FUNCTION_P(PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), mFilamentItem_farm); + MENU_ITEM_FUNCTION_P(PSTR("nozzle - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/0"), mFilamentItem_farm_nozzle); + } + else + { + MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA); + MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET); + MENU_ITEM_SUBMENU_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)),mFilamentItem_ASA); + MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS); + MENU_ITEM_SUBMENU_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)),mFilamentItem_HIPS); + MENU_ITEM_SUBMENU_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)),mFilamentItem_PP); + MENU_ITEM_SUBMENU_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)),mFilamentItem_FLEX); + } + if (!wizard_active && eFilamentAction == FilamentAction::Preheat) MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown); MENU_END(); } @@ -8489,8 +8313,23 @@ uint8_t get_message_level() void menu_lcd_longpress_func(void) { - move_menu_scale = 1.0; - menu_submenu(lcd_move_z); + if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z) + { + // disable longpress during re-entry, while homing or calibration + lcd_quick_feedback(); + return; + } + + if (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU && (moves_planned() || IS_SD_PRINTING || is_usb_printing )) + { + lcd_clear(); + menu_submenu(lcd_babystep_z); + } + else + { + move_menu_scale = 1.0; + menu_submenu(lcd_move_z); + } } void menu_lcd_charsetup_func(void) diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index f414a1cc..516a3135 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -167,6 +167,7 @@ enum class FilamentAction : uint_least8_t MmuUnLoad, MmuEject, MmuCut, + Preheat, }; extern FilamentAction eFilamentAction; diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 2539e82c..45b88c7b 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -257,7 +257,7 @@ BED SETTINGS #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index fbbc332d..7b3e2445 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -256,7 +256,7 @@ BED SETTINGS #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind @@ -319,35 +319,27 @@ PREHEAT SETTINGS #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 55 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 240 #define PET_PREHEAT_HPB_TEMP 90 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 230 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index d0d0341c..6b918c0c 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -314,7 +314,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind @@ -377,35 +377,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index c931b7db..f37a00db 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -315,7 +315,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind @@ -378,35 +378,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index c5df948c..935066d2 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -314,7 +314,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind @@ -377,35 +377,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index cc2498d6..d5d0b791 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -315,7 +315,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind @@ -378,35 +378,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index b2b26617..54f0c469 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -422,7 +422,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind @@ -487,35 +487,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 5736b632..62dae6ac 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -424,7 +424,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind @@ -489,35 +489,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/lang/lang-export.sh b/lang/lang-export.sh index 4fa6bc59..ab123dbe 100755 --- a/lang/lang-export.sh +++ b/lang/lang-export.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # lang-export.sh - multi-language support script # for generating lang_xx.po diff --git a/lang/lang-import.sh b/lang/lang-import.sh index 6176e053..092afb98 100755 --- a/lang/lang-import.sh +++ b/lang/lang-import.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # lang-import.sh - multi-language support script # for importing translated xx.po diff --git a/lang/lang_en.txt b/lang/lang_en.txt index e2add805..88d538a3 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -906,3 +906,147 @@ #MSG_ON "On" + +# +"Back" + +# +"Checks" + +# +"False triggering" + +# +"FINDA:" + +# +"Firmware [none]" + +# +"Firmware [strict]" + +# +"Firmware [warn]" + +# +"HW Setup" + +# +"IR:" + +# +"Magnets comp.[N/A]" + +# +"Magnets comp.[Off]" + +# +"Magnets comp. [On]" + +# +"Mesh [3x3]" + +# +"Mesh [7x7]" + +# +"Mesh bed leveling" + +# +"MK3S firmware detected on MK3 printer" + +# +"MMU Mode [Normal]" + +# +"MMU Mode[Stealth]" + +# +"Mode change in progress ..." + +# +"Model [none]" + +# +"Model [strict]" + +# +"Model [warn]" + +# +"Nozzle d. [0.25]" + +# +"Nozzle d. [0.40]" + +# +"Nozzle d. [0.60]" + +# +"Nozzle [none]" + +# +"Nozzle [strict]" + +# +"Nozzle [warn]" + +# +"G-code sliced for a different level. Continue?" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." + +# +"G-code sliced for a different printer type. Continue?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." + +# +"G-code sliced for a newer firmware. Continue?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." + +# +"PINDA:" + +# +"Preheating to cut" + +# +"Preheating to eject" + +# +"Printer nozzle diameter differs from the G-code. Continue?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." + +# +"Rename" + +# +"Select" + +# +"Sensor info" + +# +"Sheet" + +# +"Sound [assist]" + +# +"Steel sheets" + +# +"Z-correct:" + +# +"Z-probe nr. [1]" + +# +"Z-probe nr. [3]" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 6bb5293f..341c37b3 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Dostavovani Z:" +"Doladeni Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -280,7 +280,7 @@ # "Filam. runouts" -"Vypadky filamentu" +"Vypadky filam." #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" @@ -656,7 +656,7 @@ # "Nozzle FAN" -"Trysk. vent." +"Tryska V." #MSG_PAUSE_PRINT "Pause print" @@ -760,7 +760,7 @@ #MSG_WIZARD_HEATING c=20 r=3 "Preheating nozzle. Please wait." -"Predehrivam trysku. Prosim cekejte." +"Predehrev trysky. Prosim cekejte." # "Please upgrade." @@ -780,15 +780,15 @@ # "Preheating to load" -"Predehrivam k zavedeni" +"Predehrev k zavedeni" # "Preheating to unload" -"Predehrivam k vyjmuti" +"Predehrev k vyjmuti" #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Tiskovy vent.:" +"Tiskovy v:" #MSG_CARD_MENU "Print from SD" @@ -796,7 +796,7 @@ # "Press the knob" -"Stisknete tlacitko" +"Stisknete hl. tlacitko" #MSG_PRINT_PAUSED c=20 r=1 "Print paused" @@ -812,7 +812,7 @@ # "Print FAN" -"Tiskovy vent." +"Tiskovy v" #MSG_PRUSA3D "prusa3d.com" @@ -1206,6 +1206,198 @@ "Off" "Vyp" +# +"Back" +"Zpet" + +# +"Checks" +"Kontrola" + +# +"False triggering" +"Falesne spusteni" + +# +"FINDA:" +"\x00" + #MSG_ON "On" "Zap" + +# +"Firmware [none]" +"Firmware [Zadne]" + +# +"Firmware [strict]" +"Firmware [Prisne]" + +# +"Firmware [warn]" +"Firmware[Varovat]" + +# +"HW Setup" +"HW nastaveni" + +# +"IR:" +"\x00" + +# +"Magnets comp.[N/A]" +"Komp. magnetu[N/A]" + +# +"Magnets comp.[Off]" +"Komp. magnetu[Vyp]" + +# +"Magnets comp. [On]" +"Komp. magnetu[Zap]" + +# +"Mesh [3x3]" +"Mesh [3x3]" + +# +"Mesh [7x7]" +"Mesh [7x7]" + +# +"Mesh bed leveling" +"Mesh Bed Leveling" + +# +"MK3S firmware detected on MK3 printer" +"MK3S firmware detekovan na tiskarne MK3" + +# +"MMU Mode [Normal]" +"MMU mod [Normal]" + +# +"MMU Mode[Stealth]" +"MMU Mod [Tichy]" + +# +"Mode change in progress ..." +"Probiha zmena modu..." + +# +"Model [none]" +"Model [Zadne]" + +# +"Model [strict]" +"Model [Prisne]" + +# +"Model [warn]" +"Model [Varovat]" + +# +"Nozzle d. [0.25]" +"Tryska [0.25]" + +# +"Nozzle d. [0.40]" +"Tryska [0.40]" + +# +"Nozzle d. [0.60]" +"Tryska [0.60]" + +# +"Nozzle [none]" +"Tryska [Zadne]" + +# +"Nozzle [strict]" +"Tryska [Prisne]" + +# +"Nozzle [warn]" +"Tryska [Varovat]" + +# +"G-code sliced for a different level. Continue?" +"\x00" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"\x00" + +# +"G-code sliced for a different printer type. Continue?" +"G-code je pripraven pro jiny typ tiskarny. Pokracovat?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"G-code je pripraven pro jiny typ tiskarny. Prosim preslicujte model znovu. Tisk zrusen." + +# +"G-code sliced for a newer firmware. Continue?" +"G-code je pripraven pro novejsi firmware. Pokracovat?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen." + +# +"PINDA:" +"\x00" + +# +"Preheating to cut" +"Predehrev k ustrizeni" + +# +"Preheating to eject" +"Predehrev k vysunuti" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Prumer trysky tiskarny se lisi od G-code. Pokracovat?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." + +# +"Rename" +"Prejmenovat" + +# +"Select" +"Vybrat" + +# +"Sensor info" +"Senzor info" + +# +"Sheet" +"Plat" + +# +"Sound [assist]" +"Zvuk [Asist.]" + +# +"Steel sheets" +"Tiskove platy" + +# +"Z-correct:" +"Korekce Z:" + +# +"Z-probe nr. [1]" +"Pocet mereni Z [1]" + +# +"Z-probe nr. [3]" +"Pocet mereni Z [3]" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 044156c1..d9ac2d77 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -24,11 +24,11 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Z Einstellung:" +"Z Anpassen:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " -"Alles richtig " +"Alles richtig " #MSG_WIZARD_DONE c=20 r=8 "All is done. Happy printing!" @@ -656,7 +656,7 @@ # "Nozzle FAN" -"Duesen Luefter" +"Duesevent." #MSG_PAUSE_PRINT "Pause print" @@ -812,7 +812,7 @@ # "Print FAN" -"Druckluefter" +"Druckvent" #MSG_PRUSA3D "prusa3d.com" @@ -852,7 +852,7 @@ #MSG_BED_CORRECTION_RIGHT c=14 r=1 "Right side[um]" -"Rechts [um]" +"Rechts [um]" #MSG_RPI_PORT "RPi port" @@ -892,7 +892,7 @@ #MSG_SELFTEST "Selftest " -"Selbsttest " +"Selbsttest " #MSG_SELFTEST_ERROR "Selftest error !" @@ -940,7 +940,7 @@ #MSG_NONE "None" -"Keine" +"Ohne" #MSG_SORT_TIME "Time" @@ -948,7 +948,7 @@ # "Severe skew" -"Schwerer Schraeglauf" +"Schwer.Schr" #MSG_SORT_ALPHA "Alphabet" @@ -964,7 +964,7 @@ # "Slight skew" -"Leichter Schraeglauf" +"Leicht.Schr" #MSG_SOUND "Sound" @@ -1000,7 +1000,7 @@ #MSG_STOPPED "STOPPED. " -"GESTOPPT. " +"GESTOPPT." #MSG_SUPPORT "Support" @@ -1012,15 +1012,15 @@ #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " -"Temp Kalib. " +"Temp Kalib. " #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Temp. Kal. [AN]" +"Temp. Kal. [an]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" -"Temp. Kal. [AUS]" +"Temp. Kal. [aus]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" @@ -1207,6 +1207,198 @@ "Off" "Aus" +# +"Back" +"Zurueck" + +# +"Checks" +"\x00" + #MSG_ON "On" "An" + +# +"False triggering" +"Falschtriggerung" + +# +"FINDA:" +"\x00" + +# +"Firmware [none]" +"Firmware [ohne]" + +# +"Firmware [strict]" +"Firmware [streng]" + +# +"Firmware [warn]" +"\x00" + +# +"HW Setup" +"HW Einstellungen" + +# +"IR:" +"\x00" + +# +"Magnets comp.[N/A]" +"Magnet Komp. [nv]" + +# +"Magnets comp.[Off]" +"Magnet Komp. [Aus]" + +# +"Magnets comp. [On]" +"Magnet Komp. [An]" + +# +"Mesh [3x3]" +"\x00" + +# +"Mesh [7x7]" +"\x00" + +# +"Mesh bed leveling" +"Mesh Bett Ausgleich" + +# +"MK3S firmware detected on MK3 printer" +"MK3S-Firmware auf MK3-Drucker erkannt" + +# +"MMU Mode [Normal]" +"MMU Modus[Normal]" + +# +"MMU Mode[Stealth]" +"MMU Mod.[Stealth]" + +# +"Mode change in progress ..." +"Moduswechsel erfolgt..." + +# +"Model [none]" +"Modell [ohne]" + +# +"Model [strict]" +"Modell [streng]" + +# +"Model [warn]" +"Modell [warn]" + +# +"Nozzle d. [0.25]" +"Duese D. [0.25]" + +# +"Nozzle d. [0.40]" +"Duese D. [0.40]" + +# +"Nozzle d. [0.60]" +"Duese D. [0.60]" + +# +"Nozzle [none]" +"Duese [ohne]" + +# +"Nozzle [strict]" +"Duese [streng]" + +# +"Nozzle [warn]" +"Duese [warn]" + +# +"G-code sliced for a different level. Continue?" +"G-Code ist fuer einen anderen Level geslict. Fortfahren?" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." + +# +"G-code sliced for a different printer type. Continue?" +"G-Code ist fuer einen anderen Drucker geslict. Fortfahren?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"G-Code ist fuer einen anderen Drucker geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." + +# +"G-code sliced for a newer firmware. Continue?" +"G-Code ist fuer eine neuere Firmware geslict. Fortfahren?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." + +# +"PINDA:" +"\x00" + +# +"Preheating to cut" +"Heizen zum Schnitt" + +# +"Preheating to eject" +"Heizen zum Auswurf" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + +# +"Rename" +"Umbenennen" + +# +"Select" +"Auswahl" + +# +"Sensor info" +"Sensor Info" + +# +"Sheet" +"Blech" + +# +"Sound [assist]" +"Sound [Assist]" + +# +"Steel sheets" +"Stahlbleche" + +# +"Z-correct:" +"Z-Korrektur:" + +# +"Z-probe nr. [1]" +"Z-Probe Nr. [1]" + +# +"Z-probe nr. [3]" +"Z-Probe Nr. [3]" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 40b7af19..d46fef5b 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Ajustar Z:" +"Ajustando Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -96,7 +96,7 @@ #MSG_BED "Bed" -"Base calefactable " +"Base" #MSG_MENU_BELT_STATUS c=15 r=1 "Belt status" @@ -200,7 +200,7 @@ #MSG_EXTRUDER_CORRECTION c=10 "E-correct:" -"E-correcion:" +"Correccion-E:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -240,7 +240,7 @@ #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" -"Ventilador del extrusor:" +"Vent.extrusor:" #MSG_INFO_EXTRUDER c=15 r=1 "Extruder info" @@ -532,7 +532,7 @@ # "Measured skew" -"Desviacion medida:" +"Desviacion med:" # "MMU fails" @@ -616,7 +616,7 @@ #MSG_NA "N/A" -"N/D" +"N/A" #MSG_NO "No" @@ -640,7 +640,7 @@ #MSG_WIZARD_WILL_PREHEAT c=20 r=4 "Now I will preheat nozzle for PLA." -"Voy a precalentar la boquilla para PLA ahora." +"Ahora precalentare la boquilla para PLA." #MSG_NOZZLE "Nozzle" @@ -656,7 +656,7 @@ # "Nozzle FAN" -"Ventilador de capa" +"Vent. capa" #MSG_PAUSE_PRINT "Pause print" @@ -788,7 +788,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Ventilador del fusor:" +"Vent.fusor:" #MSG_CARD_MENU "Print from SD" @@ -812,7 +812,7 @@ # "Print FAN" -"Ventilador del extrusor" +"Vent.extr" #MSG_PRUSA3D "prusa3d.com" @@ -848,7 +848,7 @@ #MSG_RESUMING_PRINT c=20 r=1 "Resuming print" -"Resumiendo impresion" +"Continuando impresion" #MSG_BED_CORRECTION_RIGHT c=14 r=1 "Right side[um]" @@ -940,15 +940,15 @@ #MSG_NONE "None" -"Nada" +"Ninguno" #MSG_SORT_TIME "Time" -"Fecha" +"Tiempo" # "Severe skew" -"Inclinacion severa" +"Incl.severa" #MSG_SORT_ALPHA "Alphabet" @@ -964,7 +964,7 @@ # "Slight skew" -"Ligeramente inclinado" +"Liger.incl." #MSG_SOUND "Sound" @@ -1016,11 +1016,11 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Cal. temp. [ON]" +"Cal. temp. [on]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" -"Cal. temp. [OFF]" +"Cal. temp. [off]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" @@ -1164,7 +1164,7 @@ # "X-correct:" -"X-correcion:" +"Correccion-X:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1200,12 +1200,204 @@ # "Y-correct:" -"Y-correcion:" +"Correccion-Y:" #MSG_OFF "Off" "Ina" +# +"Back" +"atras" + +# +"Checks" +"Comprobaciones" + +# +"False triggering" +"Falsa activacion" + +# +"FINDA:" +"FINDA:" + +# +"Firmware [none]" +"Firmware[ninguno]" + +# +"Firmware [strict]" +"Firmware[estrict]" + +# +"Firmware [warn]" +"Firmware [aviso]" + +# +"HW Setup" +"Configuracion HW" + +# +"IR:" +"\x00" + #MSG_ON "On" "Act" + +# +"Magnets comp.[N/A]" +"Comp. imanes [N/A]" + +# +"Magnets comp.[Off]" +"Comp. imanes [Off]" + +# +"Magnets comp. [On]" +"Comp. imanes [On]" + +# +"Mesh [3x3]" +"Malla [3x3]" + +# +"Mesh [7x7]" +"Malla [7x7]" + +# +"Mesh bed leveling" +"Nivelacion Malla Base" + +# +"MK3S firmware detected on MK3 printer" +"Firmware MK3S detectado en impresora MK3" + +# +"MMU Mode [Normal]" +"Modo MMU [Normal]" + +# +"MMU Mode[Stealth]" +"Modo MMU[Silenci]" + +# +"Mode change in progress ..." +"Cambio de modo progresando ..." + +# +"Model [none]" +"Modelo [ninguno]" + +# +"Model [strict]" +"Modelo [estricto]" + +# +"Model [warn]" +"Modelo [aviso]" + +# +"Nozzle d. [0.25]" +"Diam. nozzl[0.25]" + +# +"Nozzle d. [0.40]" +"Diam. nozzl[0.40]" + +# +"Nozzle d. [0.60]" +"Diam. nozzl[0.60]" + +# +"Nozzle [none]" +"Nozzle [ninguno]" + +# +"Nozzle [strict]" +"Nozzle [estricto]" + +# +"Nozzle [warn]" +"Nozzle [aviso]" + +# +"G-code sliced for a different level. Continue?" +"Codigo G laminado para un nivel diferente. ?Continuar?" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"Codigo G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." + +# +"G-code sliced for a different printer type. Continue?" +"Codigo G laminado para un tipo de impresora diferente. ?Continuar?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." + +# +"G-code sliced for a newer firmware. Continue?" +"Codigo G laminado para nuevo firmware. ?Continuar?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada." + +# +"PINDA:" +"PINDA:" + +# +"Preheating to cut" +"Precalentando para laminar" + +# +"Preheating to eject" +"Precalentar para expulsar" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Diametro nozzle impresora difiere de cod.G. ?Continuar?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada." + +# +"Rename" +"Renombrar" + +# +"Select" +"Seleccionar" + +# +"Sensor info" +"Info sensor" + +# +"Sheet" +"Lamina" + +# +"Sound [assist]" +"Sonido [asistido]" + +# +"Steel sheets" +"Lamina de acero" + +# +"Z-correct:" +"Correccion-Z:" + +# +"Z-probe nr. [1]" +"Z-sensor nr. [1]" + +# +"Z-probe nr. [3]" +"Z-sensor nr. [3]" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 973f4c14..ed58ece5 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Ajust. de Z:" +"Ajuster Z :" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -264,7 +264,7 @@ #MSG_FAN_SPEED c=14 "Fan speed" -"Vitesse ventil" +"Vitesse vent." #MSG_SELFTEST_FAN c=20 "Fan test" @@ -656,7 +656,7 @@ # "Nozzle FAN" -"Ventilateur buse" +"Vent. buse" #MSG_PAUSE_PRINT "Pause print" @@ -772,7 +772,7 @@ # "Power failures" -"Coupures de courant" +"Coup.de courant" #MSG_PRINT_ABORTED c=20 "Print aborted" @@ -788,7 +788,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Ventilo impr. :" +"Vent.impr:" #MSG_CARD_MENU "Print from SD" @@ -812,7 +812,7 @@ # "Print FAN" -"Ventilo impression" +"Vent.impr" #MSG_PRUSA3D "prusa3d.com" @@ -836,7 +836,7 @@ #MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." -"Reinit. calibr. XYZ" +"Reinit.calibr. XYZ" #MSG_BED_CORRECTION_RESET "Reset" @@ -948,7 +948,7 @@ # "Severe skew" -"Deviation severe" +"Deviat.sev." #MSG_SORT_ALPHA "Alphabet" @@ -964,7 +964,7 @@ # "Slight skew" -"Deviation legere" +"Deviat.leg." #MSG_SOUND "Sound" @@ -1206,6 +1206,198 @@ "Off" "\x00" +# +"Back" +"Retour" + +# +"Checks" +"Verifications" + +# +"False triggering" +"Faux declenchement" + +# +"FINDA:" +"FINDA:" + +# +"Firmware [none]" +"Firmware [aucune]" + +# +"Firmware [strict]" +"Firmware[stricte]" + +# +"Firmware [warn]" +"Firmware [avert]" + +# +"HW Setup" +"Config HW" + +# +"IR:" +"IR:" + +# +"Magnets comp.[N/A]" +"Comp. aimants[N/A]" + +# +"Magnets comp.[Off]" +"Comp. aimants[Off]" + +# +"Magnets comp. [On]" +"Comp. aimants [On]" + +# +"Mesh [3x3]" +"\x00" + #MSG_ON "On" "\x00" + +# +"Mesh [7x7]" +"\x00" + +# +"Mesh bed leveling" +"\x00" + +# +"MK3S firmware detected on MK3 printer" +"Firmware MK3S detecte sur imprimante MK3" + +# +"MMU Mode [Normal]" +"Mode MMU [Normal]" + +# +"MMU Mode[Stealth]" +"Mode MMU [Furtif]" + +# +"Mode change in progress ..." +"Changement de mode en cours..." + +# +"Model [none]" +"Modele [aucune]" + +# +"Model [strict]" +"Modele [stricte]" + +# +"Model [warn]" +"Modele [avert]" + +# +"Nozzle d. [0.25]" +"Diam. buse [0.25]" + +# +"Nozzle d. [0.40]" +"Diam. buse [0.40]" + +# +"Nozzle d. [0.60]" +"Diam. buse [0.60]" + +# +"Nozzle [none]" +"Buse [aucune]" + +# +"Nozzle [strict]" +"Buse [stricte]" + +# +"Nozzle [warn]" +"Buse [avert]" + +# +"G-code sliced for a different level. Continue?" +"\x00" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"\x00" + +# +"G-code sliced for a different printer type. Continue?" +"Le G-code a ete prepare pour une autre version de l'imprimante. Continuer?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"Le G-code a ete prepare pour une autre version de l'imprimante. Veuillez decouper le modele a nouveau. L'impression a ete annulee. " + +# +"G-code sliced for a newer firmware. Continue?" +"Le G-code a ete prepare pour une version plus recente du firmware. Continuer?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." + +# +"PINDA:" +"PINDA:" + +# +"Preheating to cut" +"Prechauffage pour couper" + +# +"Preheating to eject" +"Prechauffage pour ejecter" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Diametre de la buse de l'imprimante different du G-Code. Continuer ?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Diametre de la buse de l'imprimante different du G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." + +# +"Rename" +"Renommer" + +# +"Select" +"Selectionner" + +# +"Sensor info" +"Info capteur" + +# +"Sheet" +"Feuille" + +# +"Sound [assist]" +"Son [Assist]" + +# +"Steel sheets" +"Plaques en acier" + +# +"Z-correct:" +"Correct-Z:" + +# +"Z-probe nr. [1]" +"Sonde-Z num. [1]" + +# +"Z-probe nr. [3]" +"Sonde-Z num. [3]" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 8bf6038d..c5479d31 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -15,7 +15,7 @@ "Rilev. impatto\x0aattivabile solo\x0ain Modalita normale" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\x0aCrash detection disabled in Stealth mode" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # @@ -240,7 +240,7 @@ #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" -"Ventola estrusore:" +"Ventola estr:" #MSG_INFO_EXTRUDER c=15 r=1 "Extruder info" @@ -252,7 +252,7 @@ # "Fail stats MMU" -"Statistiche fallimenti MMU" +"Stat.fall. MMU" #MSG_FSENSOR_AUTOLOAD "F. autoload" @@ -260,11 +260,11 @@ # "Fail stats" -"Statistiche fallimenti" +"Stat. fallimenti" #MSG_FAN_SPEED c=14 "Fan speed" -"Velocita ventola" +"Velocita vent." #MSG_SELFTEST_FAN c=20 "Fan test" @@ -476,7 +476,7 @@ #MSG_BED_CORRECTION_LEFT c=14 r=1 "Left side [um]" -"Lato sinistro [um]" +"Sinistra [um]" # "Lin. correction" @@ -532,7 +532,7 @@ # "Measured skew" -"Disassamento misurato" +"Deviazione mis" # "MMU fails" @@ -568,7 +568,7 @@ # "MMU power fails" -"Mancanza corrente MMU" +"Manc. corr. MMU" #MSG_STEALTH "Stealth" @@ -596,15 +596,15 @@ #MSG_MOVE_X "Move X" -"Muovi X" +"Sposta X" #MSG_MOVE_Y "Move Y" -"Muovi Y" +"Sposta Y" #MSG_MOVE_Z "Move Z" -"Muovi Z" +"Sposta Z" #MSG_NO_MOVE "No move." @@ -648,7 +648,7 @@ #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." -"Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati" +"Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." # "Now remove the test print from steel sheet." @@ -788,7 +788,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Ventola di stampa:" +"Vent.stam:" #MSG_CARD_MENU "Print from SD" @@ -940,19 +940,19 @@ #MSG_NONE "None" -"\x00" +"Nessuno" #MSG_SORT_TIME "Time" -"\x00" +"Tempo" # "Severe skew" -"Disassamento grave" +"Devia.grave" #MSG_SORT_ALPHA "Alphabet" -"Alfabet" +"Alfabeti" #MSG_SORTING c=20 r=1 "Sorting files" @@ -964,7 +964,7 @@ # "Slight skew" -"Disassamento lieve" +"Devia.lieve" #MSG_SOUND "Sound" @@ -1016,11 +1016,11 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Calib. temp. [ON]" +"Calib. temp. [on]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" -"Calib. temp.[OFF]" +"Calib. temp.[off]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" @@ -1052,7 +1052,7 @@ # "Total print time" -"Tempo di stampa totale" +"Tempo stampa totale" #MSG_TUNE "Tune" @@ -1076,7 +1076,7 @@ #MSG_UNLOAD_FILAMENT c=17 "Unload filament" -"Scarica filam." +"Scarica filamento" #MSG_UNLOADING_FILAMENT c=20 r=1 "Unloading filament" @@ -1209,3 +1209,195 @@ #MSG_ON "On" "\x00" + +# +"Back" +"Indietro" + +# +"Checks" +"Controlli" + +# +"False triggering" +"Falso innesco" + +# +"FINDA:" +"\x00" + +# +"Firmware [none]" +"Firmware[nessuno]" + +# +"Firmware [strict]" +"Firmware [esatto]" + +# +"Firmware [warn]" +"Firmware [avviso]" + +# +"HW Setup" +"Installazione HW" + +# +"IR:" +"\x00" + +# +"Magnets comp.[N/A]" +"Comp. Magneti[N/A]" + +# +"Magnets comp.[Off]" +"Comp. Magneti[off]" + +# +"Magnets comp. [On]" +"Comp. Magneti [on]" + +# +"Mesh [3x3]" +"Griglia [3x3]" + +# +"Mesh [7x7]" +"Griglia [7x7]" + +# +"Mesh bed leveling" +"Mesh livel. letto" + +# +"MK3S firmware detected on MK3 printer" +"Firmware MK3S rilevato su stampante MK3" + +# +"MMU Mode [Normal]" +"Modalita MMU [Normale]" + +# +"MMU Mode[Stealth]" +"Modalita MMU [Silenziosa]" + +# +"Mode change in progress ..." +"Cambio modalita in corso ..." + +# +"Model [none]" +"Modello [nessuno]" + +# +"Model [strict]" +"Modello [esatto]" + +# +"Model [warn]" +"Modello [avviso]" + +# +"Nozzle d. [0.25]" +"Diam.Ugello[0.25]" + +# +"Nozzle d. [0.40]" +"Diam.Ugello[0.40]" + +# +"Nozzle d. [0.60]" +"Diam.Ugello[0.60]" + +# +"Nozzle [none]" +"Ugello [nessuno]" + +# +"Nozzle [strict]" +"Ugello [esatto]" + +# +"Nozzle [warn]" +"Ugello [avviso]" + +# +"G-code sliced for a different level. Continue?" +"G-code processato per un livello diverso. Continuare?" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata." + +# +"G-code sliced for a different printer type. Continue?" +"G-code processato per una stampante diversa. Continuare?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"G-code processato per una stampante diversa. Per favore esegui nuovamente lo slice del modello. Stampa annullata." + +# +"G-code sliced for a newer firmware. Continue?" +"G-code processato per un firmware piu recente. Continuare?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." + +# +"PINDA:" +"\x00" + +# +"Preheating to cut" +"Preriscaldamento per taglio" + +# +"Preheating to eject" +"Preriscaldamento per espulsione" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Diametro ugello diverso da G-Code. Continuare?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." + +# +"Rename" +"Rinomina" + +# +"Select" +"Seleziona" + +# +"Sensor info" +"Info Sensore" + +# +"Sheet" +"Piano" + +# +"Sound [assist]" +"Suono [assistito]" + +# +"Steel sheets" +"Piani d'acciaio" + +# +"Z-correct:" +"Correzione-Z:" + +# +"Z-probe nr. [1]" +"Z-probe nr. [1]" + +# +"Z-probe nr. [3]" +"Z-probe nr. [3]" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 54c48248..dcc923bb 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -8,7 +8,7 @@ #MSG_MEASURED_OFFSET "[0;0] point offset" -"[0;0] przesuniecie punktu" +"[0;0] przesun.punktu" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 "Crash detection can\x0abe turned on only in\x0aNormal mode" @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Dostrajanie Z:" +"Ustawianie Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -44,7 +44,7 @@ #MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 "Are left and right Z~carriages all up?" -"Obydwa konce osi dojechaly do gornych ogranicznikow?" +"Obydwa konce osi sa na szczycie?" #MSG_AUTO_DEPLETE c=17 r=1 "SpoolJoin" @@ -200,7 +200,7 @@ #MSG_EXTRUDER_CORRECTION c=10 "E-correct:" -"Korekcja E:" +"Korekcja-E:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -240,7 +240,7 @@ #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" -"Went. ekstrudera:" +"Went. ekstr:" #MSG_INFO_EXTRUDER c=15 r=1 "Extruder info" @@ -656,7 +656,7 @@ # "Nozzle FAN" -"Went. hotendu" +"Went. Hotend" #MSG_PAUSE_PRINT "Pause print" @@ -788,7 +788,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Went. wydruku:" +"Went.wydr:" #MSG_CARD_MENU "Print from SD" @@ -812,7 +812,7 @@ # "Print FAN" -"Went. wydruku" +"Went.wydr" #MSG_PRUSA3D "prusa3d.com" @@ -936,7 +936,7 @@ #MSG_SORT "Sort" -"Sortuj" +"Sortowanie" #MSG_NONE "None" @@ -948,7 +948,7 @@ # "Severe skew" -"Znaczny skos" +"ZnacznySkos" #MSG_SORT_ALPHA "Alphabet" @@ -996,7 +996,7 @@ #MSG_STOP_PRINT "Stop print" -"Zatrzymac druk" +"Przerwanie druku" #MSG_STOPPED "STOPPED. " @@ -1016,7 +1016,7 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Kalibr. temp.[wl]" +"Kalibr.temp. [wl]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" @@ -1164,7 +1164,7 @@ # "X-correct:" -"Korekcja X:" +"Korekcja-X:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1200,12 +1200,204 @@ # "Y-correct:" -"Korekcja Y:" +"Korekcja-Y:" #MSG_OFF "Off" "Wyl" +# +"Back" +"Wstecz" + +# +"Checks" +"Testy" + +# +"False triggering" +"Falszywy alarm" + +# +"FINDA:" +"\x00" + #MSG_ON "On" "Wl" + +# +"Firmware [none]" +"Firmware [brak]" + +# +"Firmware [strict]" +"Firmware [restr.]" + +# +"Firmware [warn]" +"Firmware[ostrzez]" + +# +"HW Setup" +"Ustawienia HW" + +# +"IR:" +"\x00" + +# +"Magnets comp.[N/A]" +"Kor. magnesow [nd]" + +# +"Magnets comp.[Off]" +"Kor. magnesow[wyl]" + +# +"Magnets comp. [On]" +"Kor. magnesow [wl]" + +# +"Mesh [3x3]" +"Siatka [3x3]" + +# +"Mesh [7x7]" +"Siatka [7x7]" + +# +"Mesh bed leveling" +"Poziomowanie wg siatki" + +# +"MK3S firmware detected on MK3 printer" +"Wykryto firmware MK3S w drukarce MK3" + +# +"MMU Mode [Normal]" +"Tryb MMU[Normaln]" + +# +"MMU Mode[Stealth]" +"Tryb MMU[Stealth]" + +# +"Mode change in progress ..." +"Trwa zmiana trybu..." + +# +"Model [none]" +"Model [brak]" + +# +"Model [strict]" +"Model [restrykc.]" + +# +"Model [warn]" +"Model [ostrzez.]" + +# +"Nozzle d. [0.25]" +"Sr. dyszy [0,25]" + +# +"Nozzle d. [0.40]" +"Sr. dyszy [0,40]" + +# +"Nozzle d. [0.60]" +"Sr. dyszy [0,60]" + +# +"Nozzle [none]" +"Dysza [brak]" + +# +"Nozzle [strict]" +"Dysza [restrykc.]" + +# +"Nozzle [warn]" +"Dysza [ostrzez.]" + +# +"G-code sliced for a different level. Continue?" +"\x00" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany." + +# +"G-code sliced for a different printer type. Continue?" +"G-code pociety dla innej drukarki. Kontynuowac?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany." + +# +"G-code sliced for a newer firmware. Continue?" +"G-code pociety dla nowszego firmware. Kontynuowac?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." + +# +"PINDA:" +"\x00" + +# +"Preheating to cut" +"Nagrzewanie do obciecia" + +# +"Preheating to eject" +"Nagrzewanie do wysuniecia" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." + +# +"Rename" +"Zmien nazwe" + +# +"Select" +"Wybierz" + +# +"Sensor info" +"Info o sensorach" + +# +"Sheet" +"Plyta" + +# +"Sound [assist]" +"Dzwiek [asyst.]" + +# +"Steel sheets" +"Plyty stalowe" + +# +"Z-correct:" +"Korekcja-Z:" + +# +"Z-probe nr. [1]" +"Pomiar-Z [1]" + +# +"Z-probe nr. [3]" +"Pomiar-Z [3]" diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index d61a746f..d2e5bfd1 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: en\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:41:39\n" -"PO-Revision-Date: Ät 7. úno 2019 14:41:39\n" +"POT-Creation-Date: Wed Sep 4 16:13:32 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:13:32 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,72 +21,72 @@ msgid " of 4" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr "" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" msgstr "" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" msgstr "" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" msgstr "" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" msgstr "" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" msgstr "" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" msgstr "" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" msgstr "" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "" # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "" @@ -145,38 +145,28 @@ msgstr "" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "" -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "" - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "" - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "" @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "" @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "" @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "" # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" msgstr "" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "" -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "" @@ -375,38 +335,13 @@ msgstr "" msgid "ERROR:" msgstr "" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "" - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "" @@ -431,12 +366,12 @@ msgid "F. autoload [N/A]" msgstr "" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "" @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "" @@ -465,13 +400,8 @@ msgstr "" msgid "Fil. sensor [on]" msgstr "" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "" @@ -481,7 +411,7 @@ msgid "Fil. sensor [off]" msgstr "" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" msgstr "" @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "" # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "" @@ -586,67 +511,62 @@ msgid "Heating" msgstr "" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "" @@ -666,112 +586,82 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "" # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "" # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "" -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "" - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "" - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "" - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "" - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "" - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" msgstr "" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "" @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "" # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "" # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "" # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" msgstr "" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " msgstr "" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" msgstr "" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" msgstr "" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" msgstr "" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "" # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "" @@ -955,78 +845,73 @@ msgstr "" msgid "New firmware version available:" msgstr "" -# -#: -msgid "No " -msgstr "" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "" # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" msgstr "" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "" # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "" @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "" # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "" # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "" # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "" # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "" # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "" # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "" # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "" # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "" # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "" # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "" # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "" @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" msgstr "" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" msgstr "" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" msgstr "" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" msgstr "" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "" @@ -1186,37 +1071,27 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" msgstr "" -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "" - # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" @@ -1225,63 +1100,58 @@ msgstr "" msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "" - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" msgstr "" -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "" - # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "" # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" msgstr "" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" msgstr "" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" msgstr "" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "" # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "" # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "" # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" msgstr "" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" msgstr "" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" msgstr "" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" msgstr "" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "" # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 msgid "Warning: both printer type and motherboard type changed." msgstr "" # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "" @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "" # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" # -#: ultralcd.cpp:4885 -msgid "X-correct" +#: ultralcd.cpp:5044 +msgid "X-correct:" msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "" - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "" - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "" - # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "" # -#: ultralcd.cpp:4886 -msgid "Y-correct" +#: ultralcd.cpp:5045 +msgid "Y-correct:" msgstr "" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" +# +#: messages.c:57 +msgid "Back" +msgstr "" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "" + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 3a1ab885..c9130c60 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:43:00\n" -"PO-Revision-Date: Ät 7. úno 2019 14:43:00\n" +"POT-Creation-Date: Wed Sep 4 16:13:39 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:13:39 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,72 +21,72 @@ msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JCrash detekce muze\x1b[1;0Hbyt zapnuta pouze v\x1b[2;0HNormal modu" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Crash detekce muze\x0abyt zapnuta pouze v\x0aNormal modu" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JPOZOR:\x1b[1;0HCrash detekce\x1b[2;0Hdeaktivovana ve\x1b[3;0HStealth modu" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Zrusit" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Dostavovani Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Dostavovani Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Vse OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Vse je hotovo." # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" -msgstr "" +msgstr "Okoli" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "a stisknete tlacitko" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" msgstr "SpoolJoin [zap]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" +msgstr "" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" msgstr "SpoolJoin [vyp]" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automaticke zavadeni filamentu je dostupne pouze pri zapnutem filament senzoru..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte filament..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Delka osy" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Osa" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Podlozka / Topeni" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Zahrivani bed" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "Korekce podlozky" @@ -145,38 +145,28 @@ msgstr "Korekce podlozky" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset." -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Kalibrace Z selhala. Sensor je odpojeny nebo preruseny kabel. Cekam na reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Kalibrace Z selhala. Sensor sepnul prilis vysoko. Cekam na reset." - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Podlozka" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Stav remenu" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu.Obnovit tisk?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Kalibruji vychozi poz." # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Kalibrovat Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Zkalibrovat" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Kalibrace XYZ. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte tlacitkem." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Kalibruji Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Kalibrace Z. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte tlacitkem." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Kalibrace OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibrace" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Zrusit" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Karta vlozena" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Karta vyjmuta" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Barva neni cista" @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "Zchladit" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" @@ -253,7 +238,7 @@ msgstr "Crash det. [zap]" # MSG_CRASHDETECT_NA #: messages.c:25 msgid "Crash det. [N/A]" -msgstr "Crash det. [N/A]" +msgstr "" # MSG_CRASHDETECT_OFF #: messages.c:26 @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "Detekovan naraz." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Detekovan naraz. Obnovit tisk?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" -msgstr "" +msgstr "Naraz" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Pouze aktualni" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Vypnout motory" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Neni zkalibrovana vzdalenost trysky od tiskove podlozky. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Nastaveni prvni vrstvy." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Chcete opakovat posledni krok a pozmenit vzdalenost mezi tryskou a podlozkou?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Korekce E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "Korekce E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Vysunout filament" -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Vysunout filament 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Vysunout filament 2" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Vysunout filament 3" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Vysunout filament 4" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Vysunout filament 5" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Vysunout" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Vysouvam filament" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Koncovy spinac" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Konc. spinace" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Chyba - Doslo k prepisu staticke pameti!" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." @@ -375,38 +335,13 @@ msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." msgid "ERROR:" msgstr "CHYBA:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Externi SPI flash W25X20CL neodpovida." - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Levy vent.:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "Selhani MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "F. autozav. [zap]" @@ -431,14 +366,14 @@ msgid "F. autoload [N/A]" msgstr "F. autozav. [N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "F. autozav. [vyp]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" -msgstr "" +msgstr "Selhani" # MSG_FAN_SPEED c=14 #: messages.c:31 @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Rychlost vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventilatoru" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "Kontr. vent.[zap]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Kontr. vent.[vyp]" @@ -465,13 +400,8 @@ msgstr "Kontr. vent.[vyp]" msgid "Fil. sensor [on]" msgstr "Fil. senzor [zap]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "Senzor nerozpoznal filament, vypnout?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "Fil. senzor [N/A]" @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Fil. senzor [vyp]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "" +msgstr "Vypadky filamentu" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Filament nezaveden" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Senzor filamentu" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Senzor filamentu:" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Spotrebovano filamentu" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Cas tisku" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Dokoncovani pohybu" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Kal. prvni vrstvy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Opravte chybu a pote stisknete tlacitko na jednotce MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Prutok" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Predni tiskovy vent?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Vpredu [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Predni/levy vent." # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Zahrivani" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Dobry den, jsem vase tiskarna Original Prusa i3. Chcete abych Vas provedla kalibracnim procesem?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Zmenit extruder" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Vymenit filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Zmena uspesna!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Vymena ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Kontrola podlozky" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Kontrola endstopu" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Kontrola hotend " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Kontrola senzoru" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Kontrola osy X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Kontrola osy Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Kontrola osy Z" @@ -666,112 +586,82 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Nyni provedu xyz kalibraci. Zabere to priblizne 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Zacnu tisknout linku a Vy budete postupne snizovat trysku otacenim tlacitka dokud nedosahnete optimalni vysky. Prohlednete si obrazky v nasi prirucce v kapitole Kalibrace." -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Zlepsuji presnost kalibracniho bodu" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Informace" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Vlozte filament do extruderu 1. Potvrdte tlacitkem." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Vlozte filament do extruderu 2. Potvrdte tlacitkem." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Vlozte filament do extruderu 3. Potvrdte tlacitkem." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Vlozte filament do extruderu 4. Potvrdte tlacitkem." - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "Je filament 1 zaveden?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Vlozte filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Je filament zaveden?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "Je to PLA filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "Je PLA filament zaveden?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Je tiskovy plat na podlozce?" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "Iterace " - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "" +msgstr "Selhani posl. tisku" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "" +msgstr "Posledni tisk" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Levy vent na trysce?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Vlevo:" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Vlevo [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Korekce lin." @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Zavest filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Cisteni barvy" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "Zavadeni filamentu" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Uvolnena remenicka" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "Zavest do trysky" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Kal. prvni vrstvy" # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Hlavni nabidka" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Pokracuji v tisku..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Pokracuji v nahrivani..." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Merene zkoseni" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "Selhani MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "Zavedeni MMU selhalo" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "MMU selhani zavadeni" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Pokracuji..." # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Mod [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Mod [tichy]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU potrebuje zasah uzivatele." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "MMU vypadky proudu" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Mod [tichy]" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "Mod [automaticky]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Mod [vys. vykon]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "" +msgstr "MMU2 pripojeno" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Posunout osu" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Posunout X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Posunout Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Posunout Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Bez pohybu." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "Zadna SD karta" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Ne" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nezapojeno " @@ -955,78 +845,73 @@ msgstr "Nezapojeno " msgid "New firmware version available:" msgstr "Vysla nova verze firmware:" -# -#: -msgid "No " -msgstr "Ne" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Netoci se" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Nyni zkalibruji vzdalenost mezi koncem trysky a povrchem podlozky." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Tryska" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "" +msgstr "Trysk. vent." # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "Pozastavit tisk" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "PID kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "PID kal. ukoncena" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "PID kalibrace" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Nahrivani PINDA" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Umistete list papiru na podlozku a udrzujte jej pod tryskou behem mereni prvnich 4 bodu. Pokud tryska zachyti papir, okamzite vypnete tiskarnu." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistete podlozku a stisknete tlacitko." @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pro uspesnou kalibraci ocistete prosim tiskovou trysku. Potvrdte tlacitkem." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Zkontrolujte :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Prosim nahlednete do prirucky 3D tiskare a opravte problem. Pote obnovte Pruvodce restartovanim tiskarny." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Prosim vlozte PLA filament do extruderu, pote stisknete tlacitko pro zavedeni filamentu." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Nejdrive prosim zavedte PLA filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "Prosim otevrete idler a manualne odstrante filament." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Umistete prosim tiskovy plat na podlozku" # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Pro vysunuti filamentu stisknete prosim tlacitko" # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Prosim vlozte PLA filament do trubicky MMU, pote stisknete tlacitko pro zavedeni filamentu." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Prosim vyjmete urychlene filament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Prosim vyjmete filament a pote stisknete tlacitko." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim tiskovy plat z podlozky." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Prosim aktualizujte firmware ve vasi MMU2 jednotce. Cekam na reset." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Prosim cekejte" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Nejprve prosim sundejte transportni soucastky." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Predehrev" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Predehrivam trysku. Prosim cekejte." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Prosim aktualizujte." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "" +msgstr "Vypadky proudu" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Tisk prerusen" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Predehrivam k zavedeni" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Predehrivam k vyjmuti" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Tiskovy vent.:" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "Tisk z SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "Stisknete hl. tlacitko" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Tisk pozastaven" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." @@ -1186,37 +1071,27 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "Tiskarna nebyla jeste zkalibrovana. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Postup kalibrace." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "Prusa i3 MK2.5 ok." - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 ok." +msgstr "Tiskovy vent." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Vzadu [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Obnovovani tisku " # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." @@ -1225,63 +1100,58 @@ msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 ok." - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Pokracovat" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Obnoveni tisku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "Vpravo [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "RPi port [zap]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "RPi port [vyp]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Spusteni Pruvodce vymaze ulozene vysledky vsech kalibraci a spusti kalibracni proces od zacatku. Pokracovat?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" -msgstr "SD card [normal]" +msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "SD card [FlshAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Vpravo" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Vyber jazyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Self test start " # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Chyba Selftestu!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Selftest selhal " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "Vyberte PLA filament:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Nastavte teplotu:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Nastaveni" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Stav konc. spin." # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Zobrazit stav PINDA" +msgstr "Stav senzoru" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" msgstr "Trideni [Zadne]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Trideni: [cas]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Trideni [cas]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Tezke zkoseni" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" msgstr "Trideni [Abeceda]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Trideni souboru" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Zvuk [hlasity]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Lehke zkoseni" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Zvuk [vypnuto]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Zvuk [jednou]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Zvuk [tichy]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Rychlost" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Toci se" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Je vyzadovana stabilni pokojova teplota 21-26C a pevna podlozka." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistika " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Zastavit tisk" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ZASTAVENO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Podpora" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Prohozene" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Tepl. kal. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Tepl. kal. [zap]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Tepl. kal. [vyp]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Teplot. kalibrace" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "Teplotni kalibrace selhala" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Teplotni kalibrace dokoncena a je nyni aktivni. Teplotni kalibraci je mozno deaktivovat v menu Nastaveni->Tepl. kal." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "Teplota" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "Teploty" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Filament celkem" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "Celkovy cas tisku" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Ladit" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Vysunout" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Vyjmout vse" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "" +msgstr "Celkem selhani" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "k zavedeni filamentu" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "k vyjmuti filamentu" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Vyjmout filament" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Vysouvam filament" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" -msgstr "" +msgstr "Celkem" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Pouzite behem tisku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Napeti" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "neznamy" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Ceka se na uzivatele..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Pouzijte vyjmout pro odstraneni filamentu 1 pokud presahuje z PTFE trubicky za tiskarnou. Pouzijte vysunout, pokud neni videt." # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 msgid "Warning: both printer type and motherboard type changed." msgstr "Varovani: doslo ke zmene typu tiskarny a motherboardu." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Varovani: doslo ke zmene typu motherboardu." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Chyba zapojeni" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "Pruvodce" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Ano" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Pruvodce muzete kdykoliv znovu spustit z menu Kalibrace -> Pruvodce" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Kalibrace XYZ v poradku. Zkoseni bude automaticky vyrovnano pri tisku." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibrace XYZ v poradku. X/Y osy mirne zkosene. Dobra prace!" # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Korekce X" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "Korekce X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibrace XYZ v poradku. X/Y osy jsou kolme. Gratuluji!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibrace XYZ nepresna. Predni kalibracni body moc vpredu." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "Kalibrace XYZ nepresna. Levy predni bod moc vpredu." - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Zavest vse" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Zavest filament 1" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Kalibrace XYZ selhala. Levy predni bod moc vpredu. Srovnejte tiskarnu." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Zavest filament 2" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Zavest filament 3" - # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Y vzdalenost od min" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Korekce Y" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Korekce Y:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Zavest filament 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Zavest filament 5" +# +#: messages.c:57 +msgid "Back" +msgstr "Zpet" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "Kontrola" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falesne spusteni" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "Firmware [Zadne]" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "Firmware [Prisne]" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "Firmware[Varovat]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "HW nastaveni" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Komp. magnetu[N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Komp. magnetu[Vyp]" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Komp. magnetu[Zap]" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Mesh [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Mesh [7x7]" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "Mesh Bed Leveling" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "MMU mod [Normal]" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "MMU Mod [Tichy]" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "Probiha zmena modu..." + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "Model [Zadne]" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "Model [Prisne]" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "Model [Varovat]" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "Tryska [0.25]" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "Tryska [0.40]" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "Tryska [0.60]" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "Tryska [Zadne]" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "Tryska [Prisne]" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "Tryska [Varovat]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "Predehrivam k ustrizeni" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "Predehrivam k vysunuti" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "Prejmenovat" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "Vybrat" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "Senzor info" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plech" + +# +#: +msgid "Sound [assist]" +msgstr "Zvuk [asistence]" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Tiskove plechy" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "Korekce Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Pocet mereni Z [1]" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 77166d49..6107cef8 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:44:19\n" -"PO-Revision-Date: Ät 7. úno 2019 14:44:19\n" +"POT-Creation-Date: Wed Sep 4 16:13:46 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:13:46 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,72 +21,72 @@ msgid " of 4" msgstr " von 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " von 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JCrash Erkennung kann\x1b[1;0Hnur im Modus Normal\x1b[2;0Hgenutzt werden" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Crash Erkennung kann\x0anur im Modus Normal\x0agenutzt werden" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JWARNUNG:\x1b[1;0HCrash Erkennung\x1b[2;0Hdeaktiviert im\x1b[3;0HStealth Modus" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Abbruch" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Z wurde eingestellt" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Z Anpassen:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Alles richtig " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spass beim Drucken!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" -msgstr "" +msgstr "Raumtemp." # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "und Knopf druecken" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" msgstr "SpoolJoin [an]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/V]" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" msgstr "SpoolJoin [aus]" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Startposition" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "Auto-Laden Filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automatisches Laden Filament nur bei einge schaltetem Filament- sensor verfuegbar..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Automatisches Laden Filament ist aktiv, Knopf druecken und Filament einlegen..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Achsenlaenge" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Achse" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Bett / Heizung" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Bett aufwaermen" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "Ausgleich Bett ok" @@ -145,38 +145,28 @@ msgstr "Ausgleich Bett ok" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "Z-Kal. fehlgeschlg. Sensor nicht ausgeloest. Schmutzige Duese? Warte auf Reset." -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Z-Kalibrierung fehl- geschlagen. Sensor getrennt/Kabelbruch? Warte auf Reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Z-Kalibrierung fehl- geschlagen. Sensor zu hoch ausgeloest. Warte auf Reset." - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Bett" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Gurtstatus" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Kalibriere Start" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Kalibrierung Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Kalibrieren" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "XYZ Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. Anschliessend den Knopf druecken." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Kalibrierung Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Z Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. Anschliessend den Knopf druecken." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Kalibrierung OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibrierung" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Abbruch" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "SD Karte eingesetzt" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "SD Karte entfernt" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Falsche Farbe" @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "Abkuehlen" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "Gewaehlte Sprache kopieren?" @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "Crash erkannt." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Crash erkannt. Druck fortfuehren?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Aktuelles" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Motoren aus" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Der Abstand zwischen der Spitze der Duese und dem Bett ist noch nicht eingestellt. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, Abschnitt Erste Schicht Kalibrierung." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Moechten Sie den letzten Schritt wiederholen, um den Abstand zwischen Duese und Druckbett neu einzustellen?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "E-Korrektur" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "E-Korrektur:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Filamentauswurf" -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Filamentauswurf 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Fil.2 auswerfen" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Fil.3 auswerfen" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Fil.4 auswerfen" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Fil.5 auswerfen" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Auswurf" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "werfe Filament aus" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Ende nicht getroffen" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Endanschlag" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Endschalter" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Fehler - statischer Speicher wurde ueberschrieben" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." @@ -375,38 +335,13 @@ msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." msgid "ERROR:" msgstr "FEHLER:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Der externe SPI Flash W25X20CL antwortet nicht." - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Extruder Luefter:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "Extruder Info" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "MMU-Fehler" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "F.Autoladen [an]" @@ -431,14 +366,14 @@ msgid "F. autoload [N/A]" msgstr "F. Autoload [nv]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "F. Autoload [aus]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" -msgstr "" +msgstr "Fehlerstatistik" # MSG_FAN_SPEED c=14 #: messages.c:31 @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Luefter-Tempo" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Lueftertest" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "Luefter Chk. [an]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Luefter Chk.[aus]" @@ -465,13 +400,8 @@ msgstr "Luefter Chk.[aus]" msgid "Fil. sensor [on]" msgstr "Fil. Sensor [an]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "Fil. Sensorsignal ist schlecht, ausschalten?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "Fil. Sensor [nv]" @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Fil. Sensor [aus]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "" +msgstr "Filam. Maengel" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrudiert + richtige Farbe?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Fil. nicht geladen" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Filamentsensor" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Filamentsensor:" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Filament benutzt" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Druckzeit" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollstaendig Trotzdem fortfahren?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Bewegung beenden" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Erste-Schicht Kal." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Zunaechst fuehre ich den Selbsttest durch, um die haeufigsten Probleme beim Zusammenbau zu ueberpruefen." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Beseitigen Sie das Problem und druecken Sie dann den Knopf am MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Durchfluss" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Vorderer Luefter?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Vorne [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Vorderer/linke Luefter" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Aufwaermen" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Hallo, ich bin Ihr Original Prusa i3 Drucker. Moechten Sie, dass ich Sie durch den Einrich- tungsablauf fuehre?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Wechsel Extruder" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Filament-Wechsel" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Wechsel erfolgr.!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Wechsel ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Pruefe Bett " # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Pruefe Endschalter" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Pruefe Duese " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Pruefe Sensoren " # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Pruefe X Achse " # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Pruefe Y Achse " # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Pruefe Z Achse " @@ -666,112 +586,82 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Ich werde jetzt die XYZ-Kalibrierung durchfuehren. Es wird ca. 12 Minuten dauern." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchfuehren." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Ich werde jetzt eine Linie drucken. Waehrend des Druckes koennen Sie die Duese allmaehlich senken, indem Sie den Knopf drehen, bis Sie die optimale Hoehe erreichen. Sehen Sie sich die Bilder in unserem Handbuch im Kapitel Kalibrierung an." -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Verbessere Bett Kalibrierpunkt" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Infoanzeige" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Filament in Extruder 1 einlegen. Klicken wenn fertig." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Filament in Extruder 2 einlegen. Klicken wenn fertig." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Filament in Extruder 3 einlegen. Klicken wenn fertig." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Filament in Extruder 4 einlegen. Klicken wenn fertig." - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "Wurde Filament 1 geladen?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Filament einlegen" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "Ist es wirklich PLA Filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "Ist PLA Filament geladen?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Liegt das Stahlblech auf dem Heizbett?" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "" - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "" +msgstr "Letzte Druckfehler" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "" +msgstr "Letzter Druck" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Linker Luefter?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Links" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Links [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Lineare Korrektur" @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Filament laden" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Lade Farbe" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "Filament laedt" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Lose Riemenscheibe" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "In Druckduese laden" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Erste-Schicht Kal." # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Hauptmenue" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhoehe des Kalibrierpunktes" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "Mesh Bett Ausgleich" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Position wiederherstellen... " # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Temperatur wiederherstellen..." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Schraeglauf" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "MMU Fehler" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "MMU Ladefehler" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "MMU Ladefehler" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Weiterdrucken..." # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modus [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modus [leise]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU erfordert Benutzereingriff." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "MMU Netzfehler" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modus [Stealth]" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "Modus[Auto Power]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Modus[Hohe Leist]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "" +msgstr "MMU2 verbunden" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Achse bewegen" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Bewege X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Bewege Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Bewege Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Keine Bewegung." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "Keine SD Karte" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" -msgstr "" +msgstr "N.V." # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Nein" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nicht angeschlossen" @@ -955,78 +845,73 @@ msgstr "Nicht angeschlossen" msgid "New firmware version available:" msgstr "Neue Firmware- Version verfuegbar:" -# -#: -msgid "No " -msgstr "Nein" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Dreht sich nicht" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Jetzt werde ich den Abstand zwischen Duesenspitze und Druckbett kalibrieren." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Duese" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "" +msgstr "Duesen Luefter" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "Druck pausieren" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "PID Kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "PID Kalib. fertig" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "PID Kalibrierung" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "PINDA erwaermen" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Legen Sie ein Blatt Papier unter die Duese waehrend der Kalibrierung der ersten 4 Punkte. Wenn die Duese das Papier erfasst, den Drucker sofort ausschalten." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Bitte entfernen Sie ueberstehendes Filament von der Duese. Klicken wenn sauber." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Bitte pruefe:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Bitte lesen Sie unser Handbuch und beheben Sie das Problem. Fahren Sie dann mit dem Assistenten fort, indem Sie den Drucker neu starten." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Legen Sie bitte PLA Filament in den Extruder und druecken Sie den Knopf, um es zu laden." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Bitte laden Sie zuerst PLA Filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen" # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Bitte legen Sie das Stahlblech auf das Heizbett." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Bitte druecken Sie den Knopf um das Filament zu entladen." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Legen Sie bitte PLA Filament in den ersten Schlauch der MMU und druecken Sie den Knopf, um es zu laden." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Bitte ziehen Sie das Filament sofort heraus" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Bitte Filament entfernen und dann den Knopf druecken" # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Bitte entfernen Sie das Stahlblech vom Heizbett." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Bitte aktualisieren Sie die Firmware in der MMU2. Warte auf Reset." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Bitte warten" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Bitte zuerst Transportsicherungen entfernen." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Duese vorheizen!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Vorheizen" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Vorheizen der Duese. Bitte warten." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Bitte aktualisieren." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "" +msgstr "Netzfehler" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Druck abgebrochen" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Heizen zum Laden" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Heizen zum Entladen" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Druckvent.:" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "Drucken von SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "Knopf druecken" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Druck pausiert" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" @@ -1186,37 +1071,27 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "Drucker wurde noch nicht kalibriert. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrie- rungsablauf." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "Prusa i3 MK2.5 bereit." - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 bereit." +msgstr "Druckluefter" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Hinten [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Druck wiederherst " # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Entfernen Sie das alte Filament und druecken Sie den Knopf, um das neue zu laden." @@ -1225,63 +1100,58 @@ msgstr "Entfernen Sie das alte Filament und druecken Sie den Knopf, um das neue msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 bereit." - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "XYZ Kalibr. zuruecksetzen." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "Ruecksetzen" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Druck fortsetzen" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Druck fortgesetzt" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" -msgstr "Rechts [um]" +msgstr "Rechts [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "RPi Port [an]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "RPi Port [aus]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Der Assistent wird die aktuellen Kalibrierungsdaten loeschen und von vorne beginnen. Weiterfahren?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "SD Karte [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "SD Karte[flshAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Rechts" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Waehle Sprache" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Selbsttest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Selbsttest start " # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " -msgstr "Selbsttest " +msgstr "Selbsttest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Selbsttest Fehler!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " -msgstr "Selbsttest misslung " +msgstr "Selbsttest misslang" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Selbsttest im Gang, um die genaue Rueck- kehr zum Nullpunkt ohne Sensor zu kalibrieren" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "PLA Filament auswaehlen:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Temp. einstellen:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Einstellungen" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Endschalter Status" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Pinda-Status anzeigen" +msgstr "Sensorstatus" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Sort.: [Keine]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" +msgstr "Sort. [Keine]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Sort.: [Zeit]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Sort. [Zeit]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Schwerer Schraeglauf" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Sort.: [Alphabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" +msgstr "Sort. [Alphabet]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Sortiere Dateien" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Sound [laut]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Leichter Schraeglauf" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Sound [stumm]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Sound [einmal]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Sound [leise]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Geschwindigkeit" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Dreht sich" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Stabile Umgebungs- temperatur 21-26C und feste Stand- flaeche erforderlich" # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiken " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Druck abbrechen" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " -msgstr "GESTOPPT. " +msgstr "GESTOPPT." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Ausgetauscht" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " -msgstr "Temp Kalib. " +msgstr "Temp Kalib. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Temp. Kal. [AN]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Temp. Kal. [AUS]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Temp. kalibrieren" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "Temperaturkalibrierung fehlgeschlagen" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Temp.kalibrierung ist fertig + aktiv. Temp.kalibrierung kann ausgeschaltet werden im Menu Einstellungen -> Temp.kal." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "Temperatur" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "Temperaturen" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Es ist noch notwendig die Z-Kalibrierung auszufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Gesamtes Filament" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "Gesamte Druckzeit" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Feineinstellung" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Entladen" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Alles entladen" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "" +msgstr "Gesamte Fehler" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "zum Filament laden" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "zum Filament entladen" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Filament entladen" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Filament auswerfen" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" -msgstr "" +msgstr "Gesamt" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Beim Druck benutzt" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Spannungen" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "unbekannt" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Warte auf Benutzer.." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "Warten bis Heizung und Bett abgekuehlt sind" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Entladen Sie das Filament 1, wenn er aus dem hinteren MMU-Rohr herausragt. Verwenden Sie den Auswurf, wenn er im Rohr versteckt ist." # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 msgid "Warning: both printer type and motherboard type changed." msgstr "Warnung: Druckertyp und Platinentyp wurden beide geaendert." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Warnung: Platinentyp wurde geaendert." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geaendert." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Verdrahtungsfehler" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "Assistent" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" @@ -1641,107 +1496,317 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Ja" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Sie koennen den Assistenten immer im Menu neu starten: Kalibrierung -> Assistent" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ Kalibrierung in Ordnung. Schraeglauf wird automatisch korrigiert." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schraeg." # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "X-Korrektur" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "X-Korrektur:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ-Kalibrierung ok. X/Y-Achsen sind senkrecht zueinander Glueckwunsch!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Vordere Kalibrierpunkte nicht erreichbar." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "XYZ-Kalibrierung beeintraechtigt. Linker vorderer Kalibrierpunkt nicht erreichbar." - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Alle laden" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Filament 1 laden" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "XYZ-Kalibrierung fehlgeschlagen. Linker vorderer Kalibrierpunkt nicht erreichbar." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Filament 2 laden" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Filament 3 laden" +"XYZ calibration failed. Right front calibration point not reachable." +#: +msgid "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." +msgstr # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Y Entfernung vom Min" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Y-Korrektur" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Y-Korrektur:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Filament 4 laden" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Filament 5 laden" +# +#: messages.c:57 +msgid "Back" +msgstr "Zurueck" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falschtriggerung" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "Firmware [ohne]" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "Firmware [streng]" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "HW Einstellungen" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Magnet Komp. [nv]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Magnet Komp. [Aus]" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Magnet Komp. [An]" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "Mesh Bett Ausgleich" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "MMU Modus[Normal]" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "MMU Mod.[Stealth]" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "Moduswechsel erfolgt..." + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "Modell [ohne]" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "Modell [streng]" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "Modell [warn]" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "Duese D. [0.25]" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "Duese D. [0.40]" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "Duese D. [0.60]" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "Duese [ohne]" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "Duese [streng]" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "Duese [warn]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "Heizen zum Schnitt" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "Heizen zum Auswurf" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "Umbenennen" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "Auswahl" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "Sensor Info" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Blech" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "Z-Korrektur:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-Probe Nr. [1]" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 1a5d09a1..9262867e 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:45:41\n" -"PO-Revision-Date: Ät 7. úno 2019 14:45:41\n" +"POT-Creation-Date: Wed Sep 4 16:13:52 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:13:52 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,74 +21,74 @@ msgid " of 4" msgstr " de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "[0;0] punto offset" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JDec. choque\x1b[1;0Hpuede ser activada solo en\x1b[2;0HModo normal" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Dec. choque puede\x0aser activada solo en\x0aModo normal" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JATENCION:\x1b[1;0HDec. choque\x1b[2;0Hdesactivada en\x1b[3;0HModo silencio" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Cancelar" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Ajustar Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Ajustar Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Todo bien" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Terminado! Feliz impresion!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" -msgstr "" +msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "Haz clic" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" -msgstr "SpoolJoin [on]" +msgstr "" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" +msgstr "" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" -msgstr "SpoolJoin [off]" +msgstr "" # MSG_AUTO_HOME #: messages.c:11 @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Llevar al origen" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "Carga automatica de filamento" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "La carga automatica de filamento solo funciona si el sensor de filamento esta activado..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "La carga automatica de filamento esta activada, pulse el dial e inserte el filamento..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Longitud del eje" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Eje" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Base / Calentador" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Calentando Base" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "Corr. de la cama" @@ -145,38 +145,28 @@ msgstr "Corr. de la cama" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset." -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Nivelacion fallada. Sensor desconectado o cables danados. Esperando reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Nivelacion fallada. Sensor funciona demasiado pronto. Esperando reset." - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Base calefactable " # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Estado de la correa" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. ?Reanudar la impresion?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Calibrando posicion inicial" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Calibrar Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Calibrar" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrando XYZ. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrando Z. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Calibracion OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Calibracion" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Cancelar" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Tarjeta insertada" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Tarjeta retirada" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Color no homogeneo" @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "Enfriar" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "Choque detectado." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Choque detectado. Continuar impresion?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" -msgstr "" +msgstr "Choque" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Actual" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Fecha:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Apagar motores" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Distancia entre la punta del boquilla y la superficie de la base aun no fijada. Por favor siga el manual, capitulo Primeros Pasos, Calibracion primera capa." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Quieres repetir el ultimo paso para reajustar la distancia boquilla-base?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "E-correcion" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "E-correcion:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Expulsar filamento" -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Expulsar filamento 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Expulsar filamento 2" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Expulsar filamento 3" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Expulsar filamento 4" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Expulsar filamento 5" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Expulsar" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Expulsando filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Endstop no alcanzado" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Error - se ha sobre-escrito la memoria estatica" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." @@ -375,38 +335,13 @@ msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexi msgid "ERROR:" msgstr "" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "No responde el flasheo externo SPI W25X20CL" - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "Extrusor 1" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "Extrusor 2" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "Extrusor 3" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "Extrusor 4" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventilador del extrusor:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "Informacion del extrusor" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "Extruir" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "Estadistica de fallos MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "Autocarg.Fil[act]" @@ -431,14 +366,14 @@ msgid "F. autoload [N/A]" msgstr "Autocarg.Fil[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "Autocarg.Fil[ina]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" -msgstr "" +msgstr "Estadistica de fallos" # MSG_FAN_SPEED c=14 #: messages.c:31 @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Velocidad Vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventiladores" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "Comprob.vent[act]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Comprob.vent[ina]" @@ -465,13 +400,8 @@ msgstr "Comprob.vent[ina]" msgid "Fil. sensor [on]" msgstr "Sensor Fil. [act]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "La respuesta del sensor de fil es deficiente, ?desactivarlo?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "Sensor Fil. [N/D]" @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Sensor Fil. [ina]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "" +msgstr "Filam. acabado" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Fil. no introducido" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Sensor de filamento" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Sensor de filamento:" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Filamento usado" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Tiempo de imp.:" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. ?Continuar de todos modos?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Term. movimientos" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Cal. primera cap." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Primero, hare el Selftest para comprobar los problemas de montaje mas comunes." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Corrige el problema y pulsa el boton en la unidad MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flujo" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Vent. frontal?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Frontal [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventiladores frontal/izquierdo" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Calentando..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Hola, soy tu impresora Original Prusa i3. Quieres que te guie a traves de la configuracion?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Cambiar extrusor." - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Cambiar filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Cambio correcto" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Cambio correcto?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Control base cal." # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Control endstops" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Control fusor" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Comprobando los sensores" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Control sensor X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Control sensor Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Control sensor Z" @@ -666,112 +586,82 @@ msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Hare la calibracion XYZ. Tardara 12 min. aproximadamente." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Voy a comenzar a imprimir la linea y tu bajaras el nozzle gradualmente al rotar el dial, hasta que llegues a la altura optima. Mira las imagenes del capitulo Calibracion en el manual." -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Mejorando punto de calibracion base" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Monitorizar" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Insertar filamento en el extrusor 1. Haz clic una vez terminado." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Insertar filamento en el extrusor 2. Haz clic una vez terminado." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Insertar filamento en el extrusor 3. Haz clic una vez terminado." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Insertar filamento en el extrusor 4. Haz clic una vez terminado." - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "?Esta cargado el filamento 1?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Introducir filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "Es el filamento PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "Esta el filamento PLA cargado?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "?Esta colocada la lamina de acero sobre la base?" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "Reiteracion " - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "" +msgstr "Ultimas impresiones fallidas" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "" +msgstr "Ultima impresion" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Vent. izquierdo?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Izquierda" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Izquierda [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Correccion de Linealidad" @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Introducir filam." # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Cambiando color" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "Introduciendo filam." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Polea suelta" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "Cargar a la boquilla" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Cal. primera cap." # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu principal" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "Nivelacion Mesh Level" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Restaurando posicion..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Restaurando temperatura..." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Desviacion medida:" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "Fallos MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "Carga MMU fallida" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "Carga MMU falla" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Resumiendo..." # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modo [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modo [silencio]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU necesita atencion del usuario." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "Fallo de energia en MMU" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modo [Silencio]" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "Modo[fuerza auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Modo [rend.pleno]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "" +msgstr "MMU2 conectado" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Mover ejes" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Mover X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Mover Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Mover Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Sin movimiento" # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "No hay tarjeta SD" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" -msgstr "" +msgstr "No disponible" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "No hay conexion " @@ -955,78 +845,73 @@ msgstr "No hay conexion " msgid "New firmware version available:" msgstr "Nuevo firmware disponible:" -# -#: -msgid "No " -msgstr "No" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Ventilador no gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Voy a calibrar la distancia entre la punta de la boquilla y la superficie de la base." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Voy a precalentar la boquilla para PLA ahora." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Boquilla" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc" # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "" +msgstr "Ventilador de capa" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "Pausar impresion" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "Cal. PID " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "Cal. PID terminada" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "Calibracion PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Calentando PINDA" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Colocar una hoja de papel sobre la superficie de impresion durante la calibracion de los primeros 4 puntos. Si la boquilla mueve el papel, apagar impresora inmediatamente." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, por favor, y haz clic" @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Click cuando acabes." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Controla :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Lee el manual y resuelve el problema. Despues, reinicia la impresora y continua con el Wizard" # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Inserta, por favor, filamento PLA en el extrusor. Despues haz clic para cargarlo." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Carga el filamento PLA primero por favor." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Por favor coloca la chapa de acero en la base calefactable." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Por favor, pulsa el dial para descargar el filamento" # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Por favor introduce el filamento al primer tubo MMU, despues presiona el dial para imprimirlo." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Por favor retire el filamento de inmediato" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Por favor quite el filamento y luego presione el dial." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Por favor retire la chapa de acero de la base calefactable." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Por favor realiza la calibracion XYZ primero." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Por favor actualice el firmware en tu MMU2. Esperando el reseteo." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Por Favor Espere" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Por favor retira los soportes de envio primero." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Precalienta extrusor!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Precalentar" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Precalentando nozzle. Espera por favor." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Actualize por favor" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "" +msgstr "Cortes de energia" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Impresion cancelada" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Precalentar para cargar" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Precalentar para descargar" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Ventilador del fusor:" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "Menu tarjeta SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "Pulsa el dial" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Impresion en pausa" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Presiona el dial para continuar con la temperatura de la boquilla." @@ -1186,37 +1071,27 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "Impresora no esta calibrada todavia. Por favor usa el manual capitulo Primeros pasos Calibracion flujo." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "Preparado para Prusa i3 MK2.5." - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 prep." +msgstr "Ventilador del extrusor" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "prusa3d.es" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Trasera [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Recuperando impresion" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Retire el filamento viejo y presione el dial para comenzar a cargar el nuevo filamento." @@ -1225,63 +1100,58 @@ msgstr "Retire el filamento viejo y presione el dial para comenzar a cargar el n msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Preparado para i3 MK2." - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Reanudar impres." # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Resumiendo impresion" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "Derecha [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "Puerto RPi [act]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "Puerto RPi [ina]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Ejecutar el Wizard borrara los valores de calibracion actuales y comenzara de nuevo. Continuar?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "Tarj. SD [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "Tarj. SD[FlshAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Derecha" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Cambiar el idioma" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Iniciar Selftest" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "Selftest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Error Selftest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Fallo Selftest" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Se realizara el auto-test para calibrar con precision la vuelta a la posicion inicial sin sensores." # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "Seleccionar filamento PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Establecer temp.:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Configuracion" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Mostrar endstops" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Mostrar estado pinda" +msgstr "Estado del sensor" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Ordenar: [nada]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" +msgstr "Ordenar [nada]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Orden: [Fecha]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Ordenar [Fecha]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Inclinacion severa" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Ordenar:[alfabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" +msgstr "Ordenar [alfabet]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Ordenando archivos" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Sonido [alto]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Ligeramente inclinado" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Sonido[silenciad]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Sonido [una vez]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Sonido[silencios]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Velocidad" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Ventilador girando" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Se necesita una temperatura ambiente ente 21 y 26C y un soporte rigido." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Estadisticas " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Detener impresion" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "PARADA" # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Soporte" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Intercambiado" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Cal. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Cal. temp. [ON]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Cal. temp. [OFF]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Calibracion temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "Fallo de la calibracion de temperatura" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Calibracion temperatura terminada. Haz clic para continuar." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "Temperaturas" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Filamento total:" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "Tiempo total :" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Ajustar" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Descargar" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Soltar todos fil." - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "" +msgstr "Fallos totales" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "para cargar el filamento" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "para descargar el filamento" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Soltar filamento" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Soltando filamento" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Usado en impresion" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Voltajes" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "desconocido" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Esperando ordenes" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "Esperando enfriamiento de la base y extrusor." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Usa unload para retirar el filamento 1 si sobresale por fuera de la parte trasera del tubo MMU. Usa Expulsar si esta escondido dentro del tubo" # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 msgid "Warning: both printer type and motherboard type changed." msgstr "Aviso: tanto el tipo de impresora como el tipo de la placa han cambiado." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Cuidado: el tipo de placa ha cambiado." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Cuidado: Ha cambiado el tipo de impresora." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "?Se cargocon exito el filamento?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Error de conexion" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "Detalles de calibracion XYZ" @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibracion XYZ fallada. Consulta el manual por favor." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Si" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Siempre puedes acceder al asistente desde Calibracion -> Wizard" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibracion XYZ correcta. La inclinacion se corregira automaticamente." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibracion XYZ correcta. Los ejes X / Y estan ligeramente inclinados. Buen trabajo!" # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "X-correcion" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "X-correcion:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibracion XYZ ok. Ejes X/Y perpendiculares. Enhorabuena!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazion XYZ comprometida. Puntos frontales no alcanzables." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "Calibrazion XYZ comprometida. Punto frontal izquierdo no alcanzable." - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Intr. todos fil." -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Introducir fil. 1" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Calibracion XYZ fallada. Punto frontal izquierdo no alcanzable." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Introducir fil. 2" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Introducir fil. 3" - # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Distancia en Y desde el min" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Y-correcion" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Y-correcion:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Introducir fil. 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Cargar filamento 5" +# +#: messages.c:57 +msgid "Back" +msgstr "atras" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "Comprobaciones" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falsa activacion" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "Firmware[ninguno]" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "Firmware[estrict]" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "Firmware [aviso]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Configuracion HW" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Comp. imanes [N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Comp. imanes [Off]" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Comp. imanes [On]" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Malla [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Malla [7x7]" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "Nivelacion Malla Base" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "Modo MMU [Normal]" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "Modo MMU[Silenci]" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "Cambio de modo progresando ..." + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "Modelo [ninguno]" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "Modelo [estricto]" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "Modelo [aviso]" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "Diam. nozzl[0.25]" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "Diam. nozzl[0.40]" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "Diam. nozzl[0.60]" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "Nozzle [ninguno]" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "Nozzle [estricto]" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "Nozzle [aviso]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "Precalentando para laminar" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "Precalentar para expulsar" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametro nozzle impresora difiere de cod.G. ?Continuar?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada." + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "Renombrar" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "Seleccionar" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "Info sensor" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Lamina" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "Correccion-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-sensor nr. [1]" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index a11e2e73..dea1b4c2 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:47:01\n" -"PO-Revision-Date: Ät 7. úno 2019 14:47:01\n" +"POT-Creation-Date: Wed Sep 4 16:13:59 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:13:59 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,74 +21,74 @@ msgid " of 4" msgstr "de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr "de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "Offset point [0;0]" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JLa detection de crash\x1b[1;0Hpeut etre active\x1b[2;0Hqu'en mode Normal" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "La detection de\x0acrash peut etre\x0aactive seulement en\x0amode Normal" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JATTENTION :\x1b[1;0H Detection de crash\x1b[2;0H desactivee en mode\x1b[3;0H Furtif" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode Furtif" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Annuler" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Ajustement de Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Ajust. de Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Tout est correct" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" -msgstr "Tout est termine. Bonne impression !" +msgstr "Tout est pret. Bonne impression !" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" msgstr "Ambiant" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "et pressez le bouton" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" -msgstr "Chariots Z gauche et droite tout en haut?" +msgstr "Z~carriages gauche + droite tout en haut?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" -msgstr "SpoolJoin [on]" +msgstr "" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" +msgstr "" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" -msgstr "SpoolJoin [off]" +msgstr "" # MSG_AUTO_HOME #: messages.c:11 @@ -96,39 +96,39 @@ msgid "Auto home" msgstr "Mise a 0 des axes" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "AutoCharge du filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." -msgstr "AutoCharge du filament uniquement si le capteur de filament est active." +msgstr "Chargement auto du filament uniquement si le capteur de filament est active." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." -msgstr "AutoCharge actif, appuyez sur le bouton et inserez le filament." +msgstr "Chargement auto du filament actif, appuyez sur le btn et inserez le fil." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Longueur de l'axe" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Axe" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Lit / Chauffage" # MSG_BED_DONE #: messages.c:16 msgid "Bed done" -msgstr "Lit termine" +msgstr "Plateau termine" # MSG_BED_HEATING #: messages.c:17 @@ -136,24 +136,14 @@ msgid "Bed Heating" msgstr "Chauffe du lit" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" -msgstr "Cor courbure du lit" +msgstr "Corr. niveau plateau" # MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 #: messages.c:18 msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." -msgstr "Echec du nivellement. Capt. non declenche. Debris sur buse ? En attente d'un reset." - -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Echec du nivellement. Capteur deconnecte ou cable casse. En attente d'un reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Echec du nivellement. Capt. declenche trop trop haut. En attente d'un reset." +msgstr "Echec bed leveling. Capt. non declenche. Debris sur buse ? En attente d'un reset." # MSG_BED #: messages.c:15 @@ -161,22 +151,22 @@ msgid "Bed" msgstr "Lit" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Statut courroie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee. Recup. impression ?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Calib. mise a 0" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Calibrer Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Calibrer" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibration de XYZ. Tournez le bouton pour monter le chariot de l'axe Z jusqu'aux butees. Cliquez une fois fait." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Calibration de Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibration de Z. Tournez le bouton pour monter le chariot de l'axe Z jusqu'aux butees. Cliquez une fois fait." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Calibration terminee" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" -msgstr "Calibration" +msgstr "" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Annuler" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Carte inseree" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Carte retiree" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Couleur incorrecte" @@ -241,9 +226,9 @@ msgid "Cooldown" msgstr "Refroidissement" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" -msgstr "Copier la langue selectionne?" +msgstr "Copier la langue selectionne ?" # MSG_CRASHDETECT_ON #: messages.c:27 @@ -253,12 +238,12 @@ msgstr "Detect. crash[on]" # MSG_CRASHDETECT_NA #: messages.c:25 msgid "Crash det. [N/A]" -msgstr "Detect.crash[N/A]" +msgstr "Detect. crash [N/A]" # MSG_CRASHDETECT_OFF #: messages.c:26 msgid "Crash det. [off]" -msgstr "Detect.crash[off]" +msgstr "Detect. crash[off]" # MSG_CRASH_DETECTED c=20 r=1 #: messages.c:24 @@ -266,147 +251,97 @@ msgid "Crash detected." msgstr "Crash detecte." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Crash detecte. Poursuivre l'impression ?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" -msgstr "Colision" +msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Actuel" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Date :" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Desactiver moteurs" # MSG_BABYSTEP_Z_NOT_SET c=20 r=12 #: messages.c:14 msgid "Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration." -msgstr "La distance entre la pointe de la buse et la surface du lit n'a pas encore ete reglee. Suivez le manuel, chapitre Premiers pas, section Calibration de la premiere couche." +msgstr "La distance entre la pointe de la buse et la surface du plateau n'a pas encore ete reglee. Suivez le manuel, chapitre Premiers pas, section Calibration de la premiere couche." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" -msgstr "Voulez-vous repeter la derniere etape pour reajuster la distance entre la buse et le lit chauffant ?" +msgstr "Voulez-vous repeter la derniere etape pour reajuster la distance entre la buse et le plateau chauffant ?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Correct-E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "Correct-E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" -msgstr "Ejecter le fil" - -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Ejecter fil. 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Ejecter fil. 2" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Ejecter fil. 3" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Ejecter fil. 4" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Ejecter fil. 5" +msgstr "Ejecter le fil." # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Ejecter" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" -msgstr "Filament en cours d'ejection" +msgstr "Ejection filament" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Butee non atteinte" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Butee" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Butees" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Erreur - la memoire statique a ete ecrasee" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "ERREUR : Le capteur de filament ne repond pas, verifiez la connexion." +msgstr "ERREUR : Le capteur de filament ne repond pas, verifiez le branchement." # MSG_ERROR #: messages.c:28 msgid "ERROR:" msgstr "ERREUR :" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "La Flash SPI externe W25X20CL ne repond pas." - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "Extrudeur 1" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "Extrudeur 2" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "Extrudeur 3" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "Extrudeur 4" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventilo extrudeur:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "Infos extrudeur" @@ -416,14 +351,14 @@ msgid "Extruder" msgstr "Extrudeur" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "Stat. echecs MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" -msgstr "AutoCharg F [on]" +msgstr "ChargAuto f. [on]" # MSG_FSENS_AUTOLOAD_NA c=17 r=1 #: messages.c:43 @@ -431,12 +366,12 @@ msgid "F. autoload [N/A]" msgstr "AutoCharg F [N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "AutoCharg F [off]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Statist. d'echec" @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Vitesse ventil" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventilateur" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" -msgstr "Verif venti [on]" +msgstr "Verif ventilo[on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Verif venti [off]" @@ -465,15 +400,10 @@ msgstr "Verif venti [off]" msgid "Fil. sensor [on]" msgstr "Capteur Fil. [on]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "La reponse du capteur de fil. est pauvre, le desactiver ?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" -msgstr "Capteur Fil.[N/A]" +msgstr "Capteur Fil. [N/A]" # MSG_FSENSOR_OFF #: messages.c:44 @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Capteur Fil.[off]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "Manque de flm" +msgstr "Fins de filament" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrude et avec bonne couleur ?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Filament non charge" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Capteur de filament" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Capteur filament :" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Filament utilise" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Temps d'impression" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet. Continuer qd meme ?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Mouvements de fin" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Cal. 1ere couche" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." -msgstr "D'abord, je vais lancer l'autotest pour verifier les problemes d'assemblage les plus communs." +msgstr "D'abord, je vais lancer le Selftest pour verifier les problemes d'assemblage les plus communs." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Corrigez le probleme et appuyez sur le bouton de l'unite MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flux" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Ventilo impr avant ?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Avant [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventilos avt/gauche" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Chauffe desactivee par le compteur de securite." @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Chauffe" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Bonjour, je suis votre imprimante Original Prusa i3. Voulez-vous que je vous guide a travers le processus d'installation ?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Changer extrudeur" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Changer filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Changement reussi!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Change correctement?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Verification du lit" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Verifications butees" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Verif. tete impr." # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Verif. des capteurs" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Verification axe X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Verification axe Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Verification axe Z" @@ -666,119 +586,89 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Je vais maintenant lancer la calibration xyz. Cela prendra 12 min environ." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Je vais maintenant lancer la calibration z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." -msgstr "Je vais commencer a imprimer une ligne et vous baisserez au fur et a mesure la buse en tournant le bouton jusqu'a atteindre la hauteur optimale. Regardez les photos dans notre manuel au chapitre Calibration." - -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Amelioration du point de calibration du lit" +msgstr "Je vais commencer a imprimer une ligne et vous baisserez au fur et a mesure la buse en tournant le bouton jusqu'a atteindre la hauteur optimale. Regardez les photos dans notre manuel au chapitre Calibration" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Ecran d'info" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Inserez le filament dans l'extrudeur 1. Cliquez une fois fait." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Inserez le filament dans l'extrudeur 2. Cliquez une fois fait." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Inserez le filament dans l'extrudeur 3. Cliquez une fois fait." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Inserez le filament dans l'extrudeur 4. Cliquez une fois fait." - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "Le filament 1 est-il charge ?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Inserez le filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Le filament est-il charge ?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "Est-ce du filament PLA ?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "Le filament PLA est-il charge ?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" -msgstr "Feuille d'acier sur le lit chauffant ?" - -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "" +msgstr "Feuille d'acier sur plateau chauffant ?" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "Echecs d'impr. dern." +msgstr "Echecs derniere impr" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "Derniere impress." +msgstr "Derniere impression" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Ventilo tete gauche?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Gauche" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Gauche [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Correction lin." # MSG_BABYSTEP_Z #: messages.c:13 msgid "Live adjust Z" -msgstr "Ajuster Z en dir" +msgstr "Ajuster Z en direct" # MSG_LOAD_FILAMENT c=17 #: messages.c:51 @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Charger filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Chargement couleur" @@ -796,239 +686,234 @@ msgid "Loading filament" msgstr "Chargement filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Poulie lache" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" -msgstr "Charger le fil" +msgstr "Charger dans la buse" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Cal. 1ere couche" # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Principal" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Mesure de la hauteur de reference du point de calibration" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" -msgstr "Nivelage du lit" +msgstr "" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Reprise de la position ..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Reprise de la temperature ..." +msgstr "MMU OK. Remontee en temperature..." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Deviation mesuree" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "Echec MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "Echec chargement MMU" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "Echecs charg. MMU" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Reprise ..." # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" -msgstr "Mode [Normal]" +msgstr "" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Mode [silencieux]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "Le MMU necessite l'attention de l'utilisateur." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "Echecs alim. MMU" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" -msgstr "Mode [Furtif]" +msgstr "Mode [Furtif]" # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" -msgstr "Mode[puissan.aut]" +msgstr "Mode [puiss.auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" -msgstr "Mode[haute puiss]" +msgstr "Mode [haute puiss]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "MMU2 connectée" +msgstr "MMU2 connecte" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Moteur" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Deplacer l'axe" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Deplacer X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Deplacer Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Deplacer Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Pas de mouvement." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "Pas de carte SD" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Non" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Non connecte" # #: util.cpp:293 msgid "New firmware version available:" -msgstr "Nouvelle version de firmware disponible :" - -# -#: -msgid "No " -msgstr "Non" +msgstr "Nouvelle version de firmware disponible:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Ne tourne pas" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." -msgstr "Maintenant je vais calibrer la distance entre la pointe de la buse et le surface du lit chauffant." +msgstr "Maintenant je vais calibrer la distance entre la pointe de la buse et la surface du plateau chauffant." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais prechauffer la buse pour du PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Buse" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris." +msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la feuille d'acier." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "Vent buse" +msgstr "Ventilateur buse" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" -msgstr "Pause de l'impres" +msgstr "Pause de l'impr." # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "Calib. PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "Calib. PID terminee" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "Calibration PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." -msgstr "Placez une feuille de papier sous la buse pendant la calibration des 4 premiers points. Si la buse accroche le papier, eteignez de suite l'imprimante." +msgstr "Placez une feuille de papier sous la buse pendant la calibration des 4 premiers points. Si la buse accroche le papier, eteignez vite l'imprimante." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." -msgstr "Nettoyez le lit chauffant et appuyez sur le bouton." +msgstr "Nettoyez le plateau chauffant et appuyez sur le bouton." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 #: messages.c:22 @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Nettoyez la buse pour la calibration. Cliquez une fois fait." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Verifiez :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Merci de verifier notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." -msgstr "Inserez du filament PLA dans l'extrudeur, puis appuyez sur le bouton pour le charger." +msgstr "Inserez du filament PLA dans l'extrudeur puis appuyez sur le bouton pour le charger." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Chargez d'abord le filament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." -msgstr "Ouvrez le support de poulie et retirez le filament manuellement." +msgstr "Ouvrez l'idler et retirez le filament manuellement." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." -msgstr "Placez la feuille d'acier sur le lit chauffant." +msgstr "Placez la feuille d'acier sur le plateau chauffant." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Appuyez sur le bouton pour decharger le filament" # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Veuillez inserer du filament PLA dans le premier tube du MMU, et pressez sur le bouton pour le charger." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Retirez immediatement le filament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Veuillez retirer le filament puis appuyez sur le bouton." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." -msgstr "Retirez la feuille d'acier du lit chauffant" +msgstr "Retirez la feuille d'acier du plateau chauffant." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Veuillez mettre a jour le firmware de votre MMU2. En attente d'un reset." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Merci de patienter" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Veuillez retirer d'abord les protections d'envoi." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Prechauffage" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Prechauffage de la buse. Merci de patienter." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Mettez a jour le FW." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "Coupures" +msgstr "Coupures de courant" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Impression annulee" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Chauffe pour charger" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Chauffe pr decharger" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Ventilo impr. :" @@ -1166,57 +1051,47 @@ msgid "Print from SD" msgstr "Impr depuis la SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "App. sur sur bouton" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Impression en pause" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Appuyez sur le bouton pour poursuivre la mise en temperature de la buse." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 #: messages.c:41 msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." -msgstr "L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre Premiers pas, section Processus de calibration" +msgstr "L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "Vent extru" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "Prusa i3 MK2.5 prete." - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 prete." +msgstr "Ventilo impression" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Arriere [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Recup. impression" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Retirez l'ancien filament puis appuyez sur le bouton pour charger le nouveau." @@ -1225,63 +1100,58 @@ msgstr "Retirez l'ancien filament puis appuyez sur le bouton pour charger le nou msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 prete." - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "Reinit. calibr. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "Reinitialiser" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Reprendre impression" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Reprise de l'impr." # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "Droite [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" -msgstr "Port RPi [on]" +msgstr "Port RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" -msgstr "Port RPi [off]" +msgstr "Port RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Lancer l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer ?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "Carte SD [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" -msgstr "Carte SD[flshAir]" +msgstr "Carte SD [flashAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Droite" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Recherche du point de calibration du lit" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Choisir langue" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Auto-test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Debut auto-test" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "Auto-test" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Erreur auto-test !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Echec de l'auto-test" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." -msgstr "L'auto-test sera lance pour calibrer la remise a zero precise sans capteur." +msgstr "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "Selectionnez le filament PLA :" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Regler temp. :" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Reglages" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Afficher butees" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Etat de la PINDA" +msgstr "Etat capteur" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" msgstr "Tri : [aucun]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Tri : [heure]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Tri [heure]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Deviation severe" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Tri : [alphabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" +msgstr "Tri [alphabet]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Tri des fichiers" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" -msgstr "Son [fort]" +msgstr "Son [fort]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Deviation legere" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" -msgstr "Son [muet]" +msgstr "Son [muet]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problemes rencontres, nivellement de l'axe Z applique..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" -msgstr "Son [une fois]" +msgstr "Son [une fois]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" -msgstr "Son [silencieux]" +msgstr "Son [silencieux]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Vitesse" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Tourne" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." -msgstr "Une temperature ambiante stable de 21-26C et une base stable sont requis." +msgstr "Une temperature ambiante stable de 21-26C et un support stable sont requis." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiques" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Arreter impression" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ARRETE." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Echange" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Calib. Temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Calib. Temp. [on]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Calib. Temp.[off]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Calibration temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" -msgstr "Echec calibration en temperature" +msgstr "Echec de la calibration en temperature" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." -msgstr "La calibration en temperature est terminee et active. La calibration en temperature peut etre desactivee dans le menu Reglages->Cal. Temp." +msgstr "La calibration en temperature est terminee et activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Il y a encore besoin d'effectuer la calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Filament total" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" -msgstr "Temps total" +msgstr "Temps total impr." # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Regler" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Decharger" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Decharger tout" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "Echecs au total" +msgstr "Total des echecs" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "pour charger le fil." # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "pour decharger fil." # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Decharger fil." # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Dechargement fil." # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" -msgstr "Total" +msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Utilise pdt impr." # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Tensions" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "inconnu" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Attente utilisateur..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" -msgstr "Attente du refroidissement de la buse et du lit" +msgstr "Attente du refroidissement des buse et plateau" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "Attente du refroidissement de la sonde PINDA" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Utilisez decharger pour retirer le filament 1 s'il depasse du tube arriere du MMU. Utilisez ejecter s'il est cache dans le tube." # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 msgid "Warning: both printer type and motherboard type changed." msgstr "Attention : Types d'imprimante et de carte mere modifies" # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Attention : Type de carte mere modifie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Attention : Type d'imprimante modifie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "Dechargement du filament reussi ?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Erreur de cablage" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "Assistant" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "Details calib. XYZ" @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Echec calibration XYZ. Consultez le manuel." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Oui" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "Vous pouvez toujours poursuivre l'assistant dans Calibration-> Assistant." +msgstr "Vous pouvez toujours relancer l'assistant dans Calibration-> Assistant." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibration XYZ OK. L'ecart sera corrige automatiquement." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibration XYZ OK. Les axes X/Y sont legerement non perpendiculaires. Bon boulot !" # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Correction-X" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "Correct-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibration XYZ OK. Les axes X/Y sont perpendiculaires. Felicitations !" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibration XYZ compromise. Les points de calibration avant ne sont pas atteignables." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." -msgstr "Calibration XYZ compromise. Le point de calibration avant droite n'est pas atteignable." - -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "Calibration XYZ compromise. Le point de calibration avant gauche n'est pas atteignable." +msgstr "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Tout charger" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Charger fil. 1" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." -msgstr "Echec calibration XYZ. Le point de calibration du lit n'a pas ete trouve." +msgstr "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Echec calibration XYZ. Les points de calibration avant ne sont pas atteignables." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Echec calibration XYZ. Le point de calibration avant gauche n'est pas atteignable." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Charger fil. 2" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." -msgstr "Echec calibration XYZ. Le point de calibration avant droite n'est pas atteignable." - -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Charger fil. 3" +msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Distance Y du min" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Correction-Y" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Correct-Y:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Charger fil. 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Charger fil. 5" +# +#: messages.c:57 +msgid "Back" +msgstr "" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "" + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index b2b78e7f..852e024a 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:48:23\n" -"PO-Revision-Date: Ät 7. úno 2019 14:48:23\n" +"POT-Creation-Date: Wed Sep 4 16:14:05 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:14:05 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,74 +21,74 @@ msgid " of 4" msgstr " su 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr "su 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "[0;0] punto offset" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JRilev. impatto\x1b[1;0Hattivabile solo\x1b[2;0Hin Modalita normale" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Rilev. impatto\x0aattivabile solo\x0ain Modalita normale" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JATTENZIONE:\x1b[1;0HRilev. impatto\x1b[2;0Hdisattivato in\x1b[3;0HModalita silenziosa" +#: +msgid "WARNING:\x0aCrash detection disabled in Stealth mode" +msgstr "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Annulla" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Compensazione Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Compensaz. Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Nessun errore" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" -msgstr "" +msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "e cliccare manopola" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" -msgstr "SpoolJoin [on]" +msgstr "" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" +msgstr "" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" -msgstr "SpoolJoin [off]" +msgstr "" # MSG_AUTO_HOME #: messages.c:11 @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Trova origine" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "Autocaric. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Caricamento auto. filam. disp. solo con il sensore attivo..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Il caricamento automatico e attivo, premete la manopola e inserite il filamento..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Lunghezza dell'asse" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Assi" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Letto/Riscald." @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Riscald. letto" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "Correz. liv.letto" @@ -145,38 +145,28 @@ msgstr "Correz. liv.letto" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "Livellamento letto fallito.NoRispSensore.Residui su ugello? In attesa di reset." -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Livellamento piano fallito. Sensore disconnesso o Cavo Danneggiato. In attesa di reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Livellamento piano fallito. Risposta sensore troppo presto. In attesa di reset." - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Letto" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Stato delle cinghie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "C'e stato un Blackout. Recuperare la stampa?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Calibrazione Home" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Calibra XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Calibra Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Calibra" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrazione XYZ. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrazione Z. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Calibrazione completa" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Calibrazione" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Annulla" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "SD inserita" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "SD rimossa" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Colore non puro" @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "Raffredda" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "Rilevato impatto." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Scontro rilevato. Riprendere la stampa?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" -msgstr "" +msgstr "Impatto" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Attuale" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Disabilita motori" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Distanza tra la punta dell'ugello e la superficie del letto non ancora imposta. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calibrazione primo layer." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Desideri ripetere l'ultimo passaggio per migliorare la distanza fra ugello e piatto?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Correzione-E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "Correzione-E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Espelli filamento " -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Espelli filamento 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Espellere filamento 2" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Espelli filamento 3" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Espellere filamento 4" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Espelli filamento 5" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Espellere" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Espellendo filamento " # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Finecorsa fuori portata" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Finecorsa" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Finecorsa" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Errore - la memoria statica e stata sovrascritta" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." @@ -375,38 +335,13 @@ msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." msgid "ERROR:" msgstr "ERRORE:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Flash SPI W25X20CL esterno non risponde." - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "Estrusore 1" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "Estrusore 2" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "Estrusore 3" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "Estrusore 4" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventola estrusore:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "Info estrusore" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "Estrusore" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "Statistiche fallimenti MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "Autocar.filam[on]" @@ -431,14 +366,14 @@ msgid "F. autoload [N/A]" msgstr "Autocar.fil.[N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "Autocar.fil.[off]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" -msgstr "" +msgstr "Statistiche fallimenti" # MSG_FAN_SPEED c=14 #: messages.c:31 @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Velocita ventola" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventola" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "Controllo ventole [on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Control.vent[off]" @@ -465,13 +400,8 @@ msgstr "Control.vent[off]" msgid "Fil. sensor [on]" msgstr "Sensor filam.[On]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "Risposta Sens. Fil. debole, disattivare? " - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "Sensor filam[N/A]" @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Sensor filam[off]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "" +msgstr "Filam. esauriti" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Filamento estruso & con il giusto colore?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Fil. non caricato" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Sensore filam." -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Sensore filam.:" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Filamento utilizzato" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Tempo di stampa" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Finalizzando gli spostamenti" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Calibrazione primo layer." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Per primo avviero l'autotest per controllare gli errori di assemblaggio piu comuni." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Risolvi il problema e quindi premi il bottone sull'unita MMU. " # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flusso" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Ventola frontale?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Fronte [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventola frontale/sinistra" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Riscald./Termist." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Riscaldamento..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Ciao, sono la tua stampante Original Prusa i3. Gradiresti un aiuto nel processo di configurazione?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Cambio estrusore" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Cambia filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Cambio riuscito!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Cambiato correttamente?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Verifica piano" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Verifica finecorsa" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Verifica ugello" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Controllo sensori" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Verifica asse X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Verifica asse Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Verifica asse Z" @@ -666,112 +586,82 @@ msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Adesso avviero una Calibrazione XYZ. Puo durare circa 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Adesso iniziero a stampare una linea e tu dovrai abbassare l'ugello poco per volta ruotando la manopola sino a raggiungere una altezza ottimale. Per favore dai uno sguardo all'immagine del nostro manuale, cap.Calibrazione." -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Perfezion. punto di calibraz. letto" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Schermata info" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Inserire filamento nell'estrusore 1. Click per continuare" - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Inserire filamento nell'estrusore 2. Click per continuare" - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Inserire filamento nell'estrusore 3. Click per continuare" - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Inserire filamento nell'estrusore 4. Click per continuare" - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "Il filamento 1 e caricato?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Inserire filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Il filamento e stato caricato?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "E' un filamento di PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "E' stato caricato il filamento di PLA?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "La piastra d'acciaio e sul piano riscaldato?" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "Iterazione" - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "" +msgstr "Fallimenti ultima stampa" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "" +msgstr "Ultima stampa" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Vent SX hotend?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Sinistra" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Lato sinistro [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Correzione lin." @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Carica filamento" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Caricando colore" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "Caricando filamento" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Puleggia lenta" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "Carica ugello" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Calibrazione primo layer." # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu principale" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "Mesh livel. letto" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. riprendendo la posizione... " # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Ripristino temperatura... " # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Disassamento misurato" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "Fallimenti MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "Caricamento MMU fallito" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "Caricamenti MMU falliti" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Riprendendo... " # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modo [normale]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modo [silenzioso]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "Il MMU richiede attenzione dall'utente." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "Mancanza corrente MMU" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modo [Silenziosa]" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "Modo [auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Mode [forte]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "" +msgstr "MMU2 connessa" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Motore" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Muovi asse" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Muovi X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Muovi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Muovi Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Nessun movimento." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "Nessuna SD" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Non connesso" @@ -955,78 +845,73 @@ msgstr "Non connesso" msgid "New firmware version available:" msgstr "Nuova versione firmware disponibile:" -# -#: -msgid "No " -msgstr "No" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Non gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Adesso calibro la distanza fra ugello e superfice del piatto." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Ugello" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati" # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "" +msgstr "Ventola estrusore" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "Metti in pausa" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "Calibrazione PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "Calib. PID completa" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "Calibrazione PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Posizionare un foglio sotto l'ugello durante la calibrazione dei primi 4 punti. In caso l'ugello muova il foglio spegnere subito la stampante." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "Per favore pulisci il piatto, poi premi la manopola." @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pulire l'ugello per la calibrazione, poi fare click." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Verifica:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Per favore consulta il nostro manuale per risolvere il problema. Poi riprendi il Wizard dopo aver riavviato la stampante." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Per favore inserisci il filamento di PLA nell'estrusore, poi premi la manopola per caricare." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Per favore prima carica il filamento di PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "Aprire la guida filam. e rimuovere il filam. a mano" # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Per favore posizionate la piastra d'acciaio sul piano riscaldato." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Premete la manopola per scaricare il filamento " # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Per favore inserite del filamento PLA nel primo tubo del MMU, poi premete la manopola per caricarlo." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Estrarre il filamento immediatamente" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Rimuovi il filamento e quindi premi la manopola. " # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Rimuovete la piastra di acciaio dal piano riscaldato" # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima. " # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Aggiorna il firmware sul tuo MMU2. In attesa di reset. " # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Attendere" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Per favore rimuovete i materiali da spedizione" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Preriscalda" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Preriscaldando l'ugello. Attendere prego." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Prego aggiornare." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "" +msgstr "Mancanza corrente" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Stampa interrotta" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Preriscaldamento per caricare" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Preriscaldamento per scaricare" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Ventola di stampa:" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "Stampa da SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "Premere la manopola" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Stampa in pausa" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Premete la manopola per recuperare la temperatura dell'ugello." @@ -1186,37 +1071,27 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "Stampante non ancora calibrata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 pronta." +msgstr "Ventola di stampa" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Retro [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Recupero stampa" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Rimuovi il filamento precedente e premi la manopola per caricare il nuovo filamento. " @@ -1225,63 +1100,58 @@ msgstr "Rimuovi il filamento precedente e premi la manopola per caricare il nuov msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 pronta." - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "Reset calibrazione XYZ." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Riprendi stampa" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Riprendi stampa" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "Destra [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "Porta RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "Porta RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Se avvi il Wizard perderai la calibrazione preesistente e dovrai ricominciare dall'inizio. Continuare?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "Mem. SD [normale]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "Mem. SD [flshAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Destra" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Ricerca dei punti di calibrazione del piano" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Seleziona lingua" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Autotest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Avvia autotest" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "Autotest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Errore Autotest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Autotest fallito" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "Selezionate filamento PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Imposta temperatura:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Impostazioni" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Stato finecorsa" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Mostra stato pinda" +msgstr "Stato sensore" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Ordina: [none]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" +msgstr "Ordina [none]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Ordina: [time]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Ordina [time]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Disassamento grave" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Ordine: [alfabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" +msgstr "Ordine [alfabet]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Ordinando i file" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Suono [forte]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Disassamento lieve" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Suono [mute]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Suono [singolo]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Suono[silenzioso]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Velocita" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Gira" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Sono necessari una temperatura ambiente di 21-26C e una superficie rigida " # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiche" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Arresta stampa" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ARRESTATO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Supporto" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Scambiato" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Calib. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Calib. temp. [ON]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Calib. temp.[OFF]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Calib. Temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "Calibrazione temperatura fallita" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "Temperature" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. " # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Filamento totale" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "Tempo di stampa totale" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Regola" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Scarica" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Rilasciare tutti" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "" +msgstr "Totale fallimenti" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "per caricare il filamento" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "per scaricare il filamento" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Scarica filam." # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Scaricando filamento" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" -msgstr "" +msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Usati nella stampa" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Voltaggi" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "sconosciuto" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Attendendo utente..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "In attesa del raffreddamento dell'ugello e del piano" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Usate lo scaricamento per rimuovere il filamento 1 se protrude dal retro del tubo posteriore del MMu. Utilizzate l'espulsione se e nascosto nel tubo." # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 msgid "Warning: both printer type and motherboard type changed." msgstr "Attenzione: tipo di stampante e di scheda madre cambiati." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Avviso: tipo di scheda madre cambiato" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Errore cablaggio" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Si" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "E possibile riprendere il Wizard in qualsiasi momento attraverso Calibrazione -> Wizard." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibrazione XYZ corretta. La distorsione verra compensata automaticamente." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!" # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Correzione-X" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "Correzione-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibrazione XYZ OK. Gli assi X/Y sono perpendicolari. Complimenti!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazione XYZ compromessa. Punti anteriori non raggiungibili." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "Calibrazione XYZ compromessa. Punto anteriore sinistro non raggiungibile." - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Caricare tutti" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Caricare fil. 1" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibrazione XYZ fallita. Il punto di calibrazione sul letto non e' stato trovato." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Calibrazione XYZ fallita. Punto anteriore sinistro non raggiungibile." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Caricare fil. 2" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Carica fil. 3" - # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Distanza Y dal min" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Correzione-Y" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Correzione-Y:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Caricare fil. 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Caricare fil. 5" +# +#: messages.c:57 +msgid "Back" +msgstr "Indietro" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "Controlli" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falso innesco" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "Firmware[nessuno]" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "Firmware [esatto]" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "Firmware [avviso]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Installazione HW" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Comp. Magneti[N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Comp. Magneti[off]" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Comp. Magneti [on]" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Griglia [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Griglia [7x7]" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "Mesh livel. letto" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "Modalita MMU [Normale]" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "Modalita MMU [Silenziosa]" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "Cambio modalita in corso ..." + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "Modello [nessuno]" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "Modello [esatto]" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "Modello [avviso]" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "Diam. Ugell[0.25]" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "Diam. Ugell[0.40]" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "Diam. Ugell[0.60]" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "Ugello [nessuno]" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "Ugello [esatto]" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "Ugello [avviso]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "Preriscaldamento per taglio" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "Preriscaldamento per espulsione" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametro ugello diverso da G-Code. Continuare?" + +# +#: util.cpp:397 +msgid "Printer 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." + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "Rinomina" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "Seleziona" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "Info Sensore" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Piano" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "Correzione-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-probe nr. [1]" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 540adfbf..d5a67949 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:49:46\n" -"PO-Revision-Date: Ät 7. úno 2019 14:49:46\n" +"POT-Creation-Date: Wed Sep 4 16:14:12 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:14:12 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,72 +21,72 @@ msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "[0;0] przesuniecie punktu" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JWykrywanie zderzen moze\x1b[1;0Hbyc wlaczone tylko w\x1b[2;0Htrybie Normalnym" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Wykrywanie zderzen\x0amoze byc wlaczone\x0atylko w\x0atrybie Normalnym" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JUWAGA:\x1b[1;0HWykrywanie zderzen\x1b[2;0Hwylaczone w\x1b[3;0Htrybie Stealth" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Anuluj" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Dostrajanie Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Dostrajanie Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Wszystko OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" -msgstr "" +msgstr "Otoczenie" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "i nacisnij pokretlo" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi dojechaly do gornych ogranicznikow?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" msgstr "SpoolJoin [wl]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [nd]" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" msgstr "SpoolJoin [wyl]" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Auto zerowanie" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "AutoLadowanie fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Autoladowanie filamentu dostepne tylko gdy czujnik filamentu jest wlaczony..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Autoladowanie filamentu wlaczone, nacisnij pokretlo i wsun filament..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Dlugosc osi" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Os" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Stol / Grzanie" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Grzanie stolu.." # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "Korekta poziomowania stolu" @@ -145,38 +145,28 @@ msgstr "Korekta poziomowania stolu" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "Kalibracja nieudana. Sensor nie aktywowal sie. Zanieczysz. dysza? Czekam na reset." -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Poziomowanie stolu nieudane. Sensor odlacz. lub uszkodz. przewod. Czekam na reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Kalibracja Z nieudana. Sensor aktywowal za wysoko. Czekam na reset." - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Stol" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Stan paskow" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia. Kontynowac?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Zerowanie osi" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Kalibruj Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Kalibruj" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Kalibracja XYZ. Przekrec pokretlo, aby przesunac os Z do gornych ogranicznikow. Nacisnij, by potwierdzic." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Kalibruje Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Kalibracja XYZ. Przekrec pokretlo, aby przesunac os Z do gornych ogranicznikow. Nacisnij, by potwierdzic." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Kalibracja OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibracja" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Anuluj" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Karta wlozona" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Karta wyjeta" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Kolor zanieczysz." @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "Chlodzenie" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "Zderzenie wykryte" # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Wykryto zderzenie. Wznowic druk?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" -msgstr "" +msgstr "Zderzenie" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Aktualne" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Wylaczenie silnikow" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie z instrukcja: rozdzial Wprowadzenie - Kalibracja pierwszej warstwy." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Chcesz powtorzyc ostatni krok i ponownie ustawic odleglosc miedzy dysza a stolikiem?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Korekcja E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "Korekcja E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Wysun filament" -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Wysun filament 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Wysun filament 2" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Wysun filament 3" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Wysun filament 4" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Wysun filament 5" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Wysun" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Wysuwanie filamentu" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Krancowka" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Krancowki" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Blad - pamiec statyczna zostala nadpisana" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." @@ -375,38 +335,13 @@ msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." msgid "ERROR:" msgstr "BLAD:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Zewnetrzna pamiec flash SPI W25X20CL nie odpowiada." - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "Ekstruder 1" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "Ekstruder 2" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "Ekstruder 3" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "Ekstruder 4" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Went. ekstrudera:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "Informacje o ekstruderze" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "Ekstruder" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "Bledy MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "Autolad. fil [wl]" @@ -431,14 +366,14 @@ msgid "F. autoload [N/A]" msgstr "Autolad.fil.[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "Autolad.fil.[wyl]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" -msgstr "" +msgstr "Statystyki bledow" # MSG_FAN_SPEED c=14 #: messages.c:31 @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Predkosc went." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test wentylatora" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "Sprawd.went. [wl]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Sprawd.went.[wyl]" @@ -465,13 +400,8 @@ msgstr "Sprawd.went.[wyl]" msgid "Fil. sensor [on]" msgstr "Czuj. filam. [wl]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "Reakcja czujnika slaba, wylaczyc?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "Czuj. filam.[N/D]" @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Czuj. filam.[wyl]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "" +msgstr "Konc. filamentu" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Filament wychodzi z dyszy a kolor jest czysty?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Czujnik filamentu" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Czujnik filamentu:" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Uzyty filament" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Czas druku" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Konczenie druku" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Kal. 1. warstwy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Rozwiaz problem i wcisnij przycisk na MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Przeplyw" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Przedni went. druku?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Przod [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Przedni/lewy wentylator" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Grzanie..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Czesc, jestem Twoja drukarka Original Prusa i3. Czy potrzebujesz pomocy z ustawieniem?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Zmiana ekstrudera" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Wymiana filamentu" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Wymiana ok!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Wymiana ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Kontrola stolu" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Kontrola krancowek" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Kontrola hotendu" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Sprawdzanie czujnikow" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Kontrola osi X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Kontrola osi Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Kontrola osi Z" @@ -666,112 +586,82 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Przeprowadze teraz kalibracje XYZ. Zajmie ok. 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Zaczne drukowac linie. Stopniowo opuszczaj dysze przekrecajac pokretlo, poki nie uzyskasz optymalnej wysokosci. Sprawdz obrazki w naszym Podreczniku w rozdz. Kalibracja" -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Poprawiam precyzje punktu kalibracyjnego" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Ekran informacyjny" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Wloz filament do ekstrudera 1. Potwierdz naciskajac pokretlo." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Wloz filament do ekstrudera 2. Potwierdz naciskajac pokretlo." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Wloz filament do ekstrudera 3. Potwierdz naciskajac pokretlo." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Wloz filament do ekstrudera 4. Potwierdz naciskajac pokretlo." - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "Filament 1 zaladowany?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Wprowadz filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "Czy to filament PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "Fialment PLA jest zaladowany?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Czy plyta stal. jest na podgrzew. stole?" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "Iteracja " - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "" +msgstr "Ostatnie bledy druku" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "" +msgstr "Ost. wydruk" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Lewy went hotendu?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Lewa" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Lewo [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Korekcja lin." @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Ladowanie fil." # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Czyszcz. koloru" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "Laduje filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Luzne kolo pasowe" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Kal. 1. warstwy" # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu glowne" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu wg siatki" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Wznawianie pozycji." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Wznawiam nagrzewanie..." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Zmierzony skos" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "Bledy MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "Blad ladowania MMU" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "Bledy ladow. MMU" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Wznawianie..." # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Tryb [normalny]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Tryb [cichy]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU wymaga uwagi uzytkownika." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "Zaniki zasil. MMU" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Tryb [Stealth]" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "Tryb [automatycz]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Tryb[wysoka wyd.]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "" +msgstr "MMU podlaczone" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Silnik" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Ruch osi" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Ruch osi X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Ruch osi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Ruch osi Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Brak ruchu." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "Brak karty SD" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" -msgstr "" +msgstr "N/D" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Nie" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nie podlaczono " @@ -955,78 +845,73 @@ msgstr "Nie podlaczono " msgid "New firmware version available:" msgstr "Dostepna nowa wersja firmware:" -# -#: -msgid "No " -msgstr "Nie" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Nie kreci sie" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Kalibruje odleglosc miedzy koncowka dyszy a powierzchnia druku." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Dysza" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "" +msgstr "Went. hotendu" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "Wstrzymanie wydruku" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "Kalibracja PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "Kalibracja PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Umiesc kartke papieru na stole roboczym i podczas pomiaru pierwszych 4 punktow. Jesli dysza zahaczy o papier, natychmiast wylacz drukarke." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidl. kalibracji nalezy oczyscic dysze. Potw. guzikiem." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Sprawdz :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Przeczytaj nasz Podrecznik druku 3D aby naprawic problem. Potem wznow Asystenta przez restart drukarki." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Umiesc filament PLA w ekstruderze i nacisnij pokretlo, aby zaladowac." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Najpierw zaladuj filament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Prosze umiescic plyte stalowa na stole podgrzewanym." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Wsun filament PLA do pierwszej rurki MMU i nacisnij pokretlo aby go zaladowac." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Wyciagnij filament teraz" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Wyciagnij filament i wcisnij pokretlo." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Prosze zdjac plyte stalowa z podgrzewanego stolu." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Prosze najpierw uruchomic kalibracje XYZ" # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Prosze zaktualizowac Firmware MMU2. Czekam na reset." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Prosze czekac" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Grzanie" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Nagrzewanie dyszy. Prosze czekac." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Prosze zaktualizowac." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "" +msgstr "Zaniki zasilania" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Druk przerwany" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Nagrzew. do ladowania" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Nagrzew. do rozlad." # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Went. wydruku:" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "Druk z karty SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "Wcisnij pokretlo" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Druk wstrzymany" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." @@ -1186,102 +1071,87 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "Drukarka nie zostala jeszcze skalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "Prusa i3 MK2.5 gotowa" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 gotowa" +msgstr "Went. wydruku" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Tyl [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Wznawianie wydruku" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." # #: msgid "Prusa i3 MK3S OK." -msgstr "" - -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 gotowa" +msgstr "Prusa i3 MK3S OK" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Wznowic wydruk" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Wznawianie druku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "Prawo [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "Port RPi [wl]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "Port RPi [wyl]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Wlaczenie Asystenta usunie obecne dane kalibracyjne i zacznie od poczatku. Kontynuowac?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "Karta SD [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "Karta SD[FlshAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Prawa" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Szukam punktu kalibracyjnego na stole" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Wybor jezyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Selftest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Rozpoczynanie Selftestu" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Blad selftest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Selftest nieudany" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "Wybierz filament PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Ustaw. temperatury:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Ustawienia" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Pokaz krancowki" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Stan sondy PINDA" +msgstr "Stan czujnikow" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Sortuj: [brak]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" +msgstr "Sortuj [brak]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Sortuj: [czas]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Sortuj [czas]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Znaczny skos" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Sortuj: [alfabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" +msgstr "Sortuj [alfabet]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Sortowanie plikow" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Dzwiek [Glosny]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Lekki skos" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Dzwiek[Wylaczony]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z ..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Dzwiek [1-raz]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Dzwiek [Cichy]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Predkosc" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Kreci sie" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statystyki" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Zatrzymac druk" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ZATRZYMANO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Wsparcie" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Zamieniono" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Kalibracja temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Kalibr. temp.[wl]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Kalibr.temp.[wyl]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Kalibracja temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "Kalibracja temperaturowa nieudana" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Kalibracja temperaturowa zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -> Kalibracja temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "Temperatury" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Calkowita dlugosc filamentu" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "Calkowity czas druku" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Strojenie" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Rozladuj" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Rozladuj wszystkie" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "" +msgstr "Suma bledow" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "aby zaladow. fil." # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "aby rozlad. filament" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Rozladowanie fil." # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Rozladowuje filament" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" -msgstr "" +msgstr "Suma" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Uzyte podczas druku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Napiecia" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "nieznane" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Czekam na uzytkownika..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Uzyj opcji Rozladuj jesli filament wystaje z tylnej rurki MMU. Uzyj opcji Wysun jesli wciaz jest w srodku." # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 msgid "Warning: both printer type and motherboard type changed." msgstr "Ostrzezenie: typ drukarki i plyta glowna ulegly zmianie." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Ostrzezenie: plyta glowna ulegla zmianie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Blad polaczenia" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "Asystent" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Tak" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Kalibracja XYZ pomyslna. Skos bedzie automatycznie korygowany." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!" # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Korekcja X" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "Korekcja X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibracja XYZ ok. Osie X/Y sa prostopadle. Gratulacje!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibr. XYZ niedokladna. Przednie punkty kalibr. nieosiagalne." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "Kalibracja XYZ niedokladna. Lewy przedni punkt nieosiagalny." - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Zalad. wszystkie" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Zaladuj fil. 1" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Kalibr. XYZ nieudana. Lewy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Zaladuj fil. 2" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Zaladuj fil. 3" - # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Korekcja Y" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Korekcja Y:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Zaladuj fil. 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Laduj filament 5" +# +#: messages.c:57 +msgid "Back" +msgstr "Wstecz" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "Testy" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falszywy alarm" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "Firmware [brak]" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "Firmware [restr.]" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "Firmware[ostrzez]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Ustawienia HW" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Kor. magnesow [nd]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Kor. magnesow[wyl]" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Kor. magnesow [wl]" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Siatka [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Siatka [7x7]" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "Poziomowanie wg siatki" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "Tryb MMU[Normaln]" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "Tryb MMU [Stealth]" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "Trwa zmiana trybu..." + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "Model [brak]" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "Model [restrykc.]" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "Model [ostrzez.]" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "Sr. dyszy [0,25]" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "Sr. dyszy [0,40]" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "Sr. dyszy [0,60]" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "Dysza [brak]" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "Dysza [restrykc.]" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "Dysza [ostrzez.]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "Nagrzewanie do obciecia" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "Nagrzewanie do wysuniecia" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "Zmien nazwe" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "Wybierz" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "Info o sensorach" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plyta" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "Korekcja-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Pomiar-Z [1]" diff --git a/lang/po/new/cs.po b/lang/po/new/cs.po index 8547b265..79a932ba 100644 --- a/lang/po/new/cs.po +++ b/lang/po/new/cs.po @@ -15,7 +15,12 @@ msgstr "\e[2JCrash detekce muze\e[1;0Hbyt zapnuta pouze v\e[2;0HNormal modu" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #: ultralcd.cpp:4231 msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" -msgstr "\e[2JPOZOR:\e[1;0HCrash detekce\e[2;0Hdeaktivovana ve\e[3;0HStealth modu" +msgstr "\e[2JPOZOR:\e[1;0HCrash detekce\e[2;0Hdeaktivovana ve\e[3;0Htichem modu" + +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr "1" # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 @@ -48,10 +53,15 @@ msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " z 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "[vyp]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,14 +78,19 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Zrusit" # MSG_BABYSTEPPING_Z c=20 #: ultralcd.cpp:3043 msgid "Adjusting Z" -msgstr "Dostavovani Z" +msgstr "Doladeni Z" + +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Doladeni Z:" # MSG_ALL c=19 r=1 #: messages.c:11 @@ -83,27 +98,27 @@ msgid "All" msgstr "Vse" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Vse OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Vse je hotovo." # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Okoli" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "a stisknete tlacitko" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Auto home" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automaticke zavadeni filamentu je dostupne pouze pri zapnutem filament senzoru..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte filament..." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Osa" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Delka osy" @@ -167,13 +182,18 @@ msgstr "Babystepping X" msgid "Babystepping Y" msgstr "Babystepping Y" +# +#: messages.c:57 +msgid "Back" +msgstr "Zpet" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Podlozka" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Podlozka / Topeni" @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Zahrivani bed" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Korekce podlozky" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Pocatek seznamu souboru" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Stav remenu" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu.Obnovit tisk?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Zkalibrovat" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Kalibrovat E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Kalibrovat Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Kalibruji vychozi poz." # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Kalibrace XYZ. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte tlacitkem." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Kalibruji Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Kalibrace Z. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte tlacitkem." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibrace" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Kalibrace OK" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Zrusit" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "Karta vlozena" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Karta vyjmuta" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Vymenit SD" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Zmena uspesna!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Vymena ok?" @@ -328,40 +348,45 @@ msgid "Changing filament!" msgstr "Vymena filamentu!" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Kontrola podlozky" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Kontrola endstopu" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Kontrola hotend " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Kontrola senzoru" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Kontrola osy X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Kontrola osy Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Kontrola osy Z" +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Kontrola" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Vyber filament:" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Barva neni cista" @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Kopirovat vybrany jazyk do XFLASH?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Naraz" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Detekovan naraz." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Detekovan naraz. Obnovit tisk?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "Crash detekce muze byt zapnuta pouze v Normal modu" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Pouze aktualni" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Vypnout motory" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Neni zkalibrovana vzdalenost trysky od tiskove podlozky. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Nastaveni prvni vrstvy." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Chcete opakovat posledni krok a pozmenit vzdalenost mezi tryskou a podlozkou?" @@ -462,13 +492,18 @@ msgstr "E kalibrace ukoncena. Prosim ocistete trysku. Pote potvrdte tlacitkem." msgid "E-correct" msgstr "Korekce E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "Korekce E:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Vysunout" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Vysunout filament" @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Vysunout filament 5" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "Vysouvam filament" @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Konec sezn. souboru" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Koncovy spinac" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Konc. spinace" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "zarazovani \"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Chyba - Doslo k prepisu staticke pameti!" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "CHYBA:" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Extruder 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Levy vent.:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Extruder info" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "F. autozav. [zap]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "F. autozav. [N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "F. autozav. [vyp]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Selhani" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "Selhani MMU" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falesne spusteni" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Rychlost vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventilatoru" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" msgstr "Kontr. vent.[zap]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Kontr. vent.[vyp]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "Senzor nerozpoznal filament, vypnout?" # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Fil. senzor [N/A]" @@ -663,9 +703,9 @@ msgid "Fil. sensor [off]" msgstr "Fil. senzor [vyp]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" -msgstr "Vypadky filamentu" +msgstr "Vypadky filam." # MSG_FILAMENT c=17 r=1 #: messages.c:30 @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Filament nezaveden" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Senzor filamentu" @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Senzor filamentu:" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Spotrebovano filamentu" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Filament : " # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" @@ -717,53 +757,93 @@ msgstr "Soubor otevren:" msgid "File selected" msgstr "Soubor vybran" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA:" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Dokoncovani pohybu" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [Zadne]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [Varovat]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware [Prisne]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Kal. prvni vrstvy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Opravte chybu a pote stisknete tlacitko na jednotce MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Prutok" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Predni tiskovy vent?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Vpredu [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Predni/levy vent." +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-code je pripraven pro jiny typ tiskarny. Pokracovat?" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "G-code je pripraven pro jiny typ tiskarny. Prosim preslicujte model znovu. Tisk zrusen." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-code je pripraven pro novejsi firmware. Pokracovat?" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" @@ -773,7 +853,7 @@ msgid "Heating" msgstr "Zahrivani" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." @@ -783,27 +863,32 @@ msgid "Heating done." msgstr "Zahrivani OK." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Dobry den, jsem vase tiskarna Original Prusa i3. Chcete abych Vas provedla kalibracnim procesem?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "HW nastaveni" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Nyni provedu xyz kalibraci. Zabere to priblizne 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Zacnu tisknout linku a Vy budete postupne snizovat trysku otacenim tlacitka dokud nedosahnete optimalni vysky. Prohlednete si obrazky v nasi prirucce v kapitole Kalibrace." @@ -813,7 +898,7 @@ msgid "Improving bed calibration point" msgstr "Zlepsuji presnost kalibracniho bodu" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Informace" @@ -823,7 +908,7 @@ msgid "Init. SD card" msgstr "Inic. SD" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Vlozte filament" @@ -848,27 +933,32 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Vlozte filament do extruderu 4. Potvrdte tlacitkem." # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "Je filament 1 zaveden?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Je filament zaveden?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "Je to PLA filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "Je PLA filament zaveden?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Je tiskovy plat na podlozce?" @@ -883,27 +973,27 @@ msgid "KILLED. " msgstr "ZRUSENO." # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Posledni tisk" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Selhani posl. tisku" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Vlevo:" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Levy vent na trysce?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" msgstr "Vlevo [um]" @@ -913,7 +1003,7 @@ msgid "Left:" msgstr "Vlevo:" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Korekce lin." @@ -923,7 +1013,7 @@ msgid "Live adjust Z" msgstr "Doladeni osy Z" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Zavest vse" @@ -958,12 +1048,12 @@ msgid "Load filament 5" msgstr "Zavest filament 5" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "Zavest do trysky" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Cisteni barvy" @@ -973,7 +1063,7 @@ msgid "Loading filament" msgstr "Zavadeni filamentu" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Uvolnena remenicka" @@ -993,7 +1083,7 @@ msgid "M109 Invalid extruder " msgstr "M109 Neplatny extruder " # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Kal. prvni vrstvy" @@ -1012,8 +1102,23 @@ msgstr "M218 Neplatny extruder " msgid "M221 Invalid extruder " msgstr "M221 Neplatny extruder " +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Komp. magnetu[Zap]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Komp. magnetu[N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Komp. magnetu[Vyp]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Hlavni nabidka" @@ -1023,42 +1128,77 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Oznacte filament 100 mm od tela extruderu a pote potvrdte tlacitkem." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" msgstr "Merene zkoseni" # MSG_MEASURED_SKEW c=15 r=1 #: ultralcd.cpp:2335 msgid "Measured skew:" -msgstr "Merene zkoseni:" +msgstr "Merene zkos.:" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Mesh [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Mesh [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Mesh Bed Leveling" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Mesh Bed Leveling" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3 firmware detekovan na tiskarne MK3S" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S firmware detekovan na tiskarne MK3" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "Selhani MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "Zavedeni MMU selhalo" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "MMU selhani zavadeni" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "MMU mod [Normal]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "MMU Mod [Tichy]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU potrebuje zasah uzivatele." @@ -1068,44 +1208,49 @@ msgid "MMU needs user attention. Fix the issue and then press button on MMU unit msgstr "MMU potrebuje zasah uzivatele. Opravte chybu a pote stisknete tlacitko na jednotce MMU." # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Pokracuji v tisku..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Pokracuji v nahrivani..." # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Pokracuji..." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "MMU vypadky proudu" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU2 pripojeno" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Mod [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Mod [tichy]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" -msgstr "Mod [tichy]" +msgstr "Mod [Tichy]" + +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Probiha zmena modu..." # MSG_AUTO_MODE_ON #: messages.c:12 @@ -1113,37 +1258,52 @@ msgid "Mode [auto power]" msgstr "Mod [automaticky]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Mod [vys. vykon]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Trideni [Zadne]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Model [Varovat]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Model [Prisne]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Motor" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Posunout osu" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" msgstr "Posunout X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" msgstr "Posunout Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" msgstr "Posunout Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "N/A" @@ -1153,7 +1313,7 @@ msgid "New firmware version available:" msgstr "Vysla nova verze firmware:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Ne" @@ -1168,12 +1328,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Zadny kontrolni soucet s cislem radku, Posl. radek:" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Bez pohybu." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "Zadna SD karta" @@ -1183,37 +1343,67 @@ msgid "No thermistors - no temperature" msgstr "Bez termistoru - bez odectu teploty" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nezapojeno " # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Netoci se" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Nyni zkalibruji vzdalenost mezi koncem trysky a povrchem podlozky." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Tryska" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Tryska [Zadne]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Tryska [Varovat]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Tryska [Prisne]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Tryska [0.25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Tryska [0.40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Tryska [0.60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Trysk. vent." @@ -1238,7 +1428,7 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." @@ -1258,7 +1448,7 @@ msgid "openRoot failed" msgstr "openRoot selhal" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Pozastavit tisk" @@ -1268,42 +1458,47 @@ msgid "Pick print" msgstr "Vyberte vytisk" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "PID kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "PID kal. ukoncena" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "PID kalibrace" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "Nahrivani PINDA" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA:" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Umistete list papiru na podlozku a udrzujte jej pod tryskou behem mereni prvnich 4 bodu. Pokud tryska zachyti papir, okamzite vypnete tiskarnu." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Zkontrolujte :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Prosim nahlednete do prirucky 3D tiskare a opravte problem. Pote obnovte Pruvodce restartovanim tiskarny." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistete podlozku a stisknete tlacitko." @@ -1313,12 +1508,12 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pro uspesnou kalibraci ocistete prosim tiskovou trysku. Potvrdte tlacitkem." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Prosim vlozte PLA filament do extruderu, pote stisknete tlacitko pro zavedeni filamentu." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Prosim vlozte PLA filament do trubicky MMU, pote stisknete tlacitko pro zavedeni filamentu." @@ -1328,52 +1523,52 @@ msgid "Please load PLA filament and then resume Wizard by rebooting the printer. msgstr "Prosim zavedte PLA filament a po te obnovte Pruvodce stisknutim reset tlacitka." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Nejdrive prosim zavedte PLA filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Prosim otevrete idler a manualne odstrante filament." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Umistete prosim tiskovy plat na podlozku" # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Pro vysunuti filamentu stisknete prosim tlacitko" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Prosim vyjmete urychlene filament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Prosim vyjmete filament a pote stisknete tlacitko." # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Nejprve prosim sundejte transportni soucastky." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim tiskovy plat z podlozky." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Prosim aktualizujte firmware ve vasi MMU2 jednotce. Cekam na reset." @@ -1383,12 +1578,12 @@ msgid "Please upgrade." msgstr "Prosim aktualizujte." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Prosim cekejte" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Vypadky proudu" @@ -1398,29 +1593,39 @@ msgid "PowerUp" msgstr "Zapnuti" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Predehrev" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." -msgstr "Predehrivam trysku. Prosim cekejte." +msgstr "Predehrev trysky. Prosim cekejte." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Predehrev k ustrizeni" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Predehrev k vysunuti" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" -msgstr "Predehrivam k zavedeni" +msgstr "Predehrev k zavedeni" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" -msgstr "Predehrivam k vyjmuti" +msgstr "Predehrev k vyjmuti" # MSG_PREPARE_FILAMENT c=20 r=1 #: ultralcd.cpp:1911 @@ -1428,27 +1633,27 @@ msgid "Prepare new filament" msgstr "Pripravte filament" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "Stisknete hl. tlacitko" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Tisk prerusen" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Tiskovy vent." @@ -1458,7 +1663,7 @@ msgid "Print FAN: " msgstr "Tisk. vent:" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Tiskovy vent.:" @@ -1468,12 +1673,12 @@ msgid "Print from SD" msgstr "Tisk z SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Tisk pozastaven" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Cas tisku" @@ -1487,6 +1692,16 @@ msgstr "Cas tisku: " msgid "Printer disconnected" msgstr "Tiskarna odpojena" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "Firmware tiskarny se lisi od G-code. Pokracovat?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Firmware tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1712,26 @@ msgstr "Tiskarna zastavena. Volano kill()!" msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Tiskarna nebyla jeste zkalibrovana. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Postup kalibrace." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Model tiskarny se lisi od G-code. Pokracovat?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Model tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." + # MSG_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1747,11 @@ msgstr "Prusa i3 MK2 ok." msgid "Prusa i3 MK2.5 ready." msgstr "Prusa i3 MK2.5 ok." +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK." + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1763,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.com" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Vzadu [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Obnovovani tisku " @@ -1543,10 +1783,15 @@ msgid "Refresh" msgstr "Obnovit" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Prejmenovat" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1808,32 @@ msgid "Resend: " msgstr "Poslat znovu: " # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Reset" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Pokracovat" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Obnoveni tisku" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Vpravo" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Vpravo [um]" @@ -1603,22 +1848,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Otacejte tlacitkem dokud znacka nedosahne tela extruderu. Potvrdte tlacitkem." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "RPi port [zap]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "RPi port [vyp]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Spusteni Pruvodce vymaze ulozene vysledky vsech kalibraci a spusti kalibracni proces od zacatku. Pokracovat?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "SD card [normal]" @@ -1633,7 +1878,7 @@ msgid "SD card [FlshAir]" msgstr "SD card [FlshAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "SD card [FlshAir]" @@ -1652,53 +1897,63 @@ msgstr "SD printing byte " msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Vybrat" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Vyber jazyka" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "Vyberte PLA filament:" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Self test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Self test start " # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Chyba Selftestu!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Selftest selhal " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Senzor info" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Stav senzoru" @@ -1708,17 +1963,17 @@ msgid "Sensors info" msgstr "Senzor info" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Nastavte teplotu:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Nastaveni" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" msgstr "Tezke zkoseni" @@ -1727,8 +1982,13 @@ msgstr "Tezke zkoseni" msgid "Severe skew:" msgstr "Tezke zkoseni:" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plech" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Stav konc. spin." @@ -1743,7 +2003,7 @@ msgid "Sleep..." msgstr "Spankovy rezim..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" msgstr "Lehke zkoseni" @@ -1753,15 +2013,30 @@ msgid "Slight skew:" msgstr "Lehke zkoseni:" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Trideni [Zadne]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Trideni [cas]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Trideni [Abeceda]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2078,127 @@ msgid "Sort: [time]" msgstr "Trideni [Cas]\n" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Trideni souboru" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Zvuk [hlasity]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Zvuk [vypnuto]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Zvuk [jednou]" +# +#: +msgid "Sound [assist]" +msgstr "Zvuk [Asist.]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Zvuk [tichy]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Rychlost" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Toci se" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [zap]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [vyp]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Je vyzadovana stabilni pokojova teplota 21-26C a pevna podlozka." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistika " +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Tiskove platy" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Krokovani prilis vysoko:" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Zastavit tisk" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ZASTAVENO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Podpora" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Prohozene" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Tepl. kal. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Tepl. kal. [zap]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Tepl. kal. [vyp]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Teplot. kalibrace" # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Teplota" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Teplotni kalibrace selhala" @@ -1923,12 +2208,12 @@ msgid "Temperature calibration has not been run yet" msgstr "Tiskarna nebyla teplotne zkalibrovana" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Teplotni kalibrace dokoncena a je nyni aktivni. Teplotni kalibraci je mozno deaktivovat v menu Nastaveni->Tepl. kal." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Teploty" @@ -1938,27 +2223,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "k zavedeni filamentu" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "k vyjmuti filamentu" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Celkem" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Celkem selhani" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Filament celkem" @@ -1968,7 +2253,7 @@ msgid "Total filament :" msgstr "Filament celkem :" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Celkovy cas tisku" @@ -1983,17 +2268,17 @@ msgid "TRIGGERED" msgstr "AKTIVNI" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Ladit" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "neznamy" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Vysunout" @@ -2003,7 +2288,7 @@ msgid "Unload all" msgstr "Vyjmout vse" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Vyjmout filament" @@ -2028,22 +2313,22 @@ msgid "Unload filament 4" msgstr "Vyjmout filam. 4" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Vysouvam filament" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Pouzijte vyjmout pro odstraneni filamentu 1 pokud presahuje z PTFE trubicky za tiskarnou. Pouzijte vysunout, pokud neni videt." # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Pouzite behem tisku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Napeti" @@ -2053,32 +2338,37 @@ msgid "volume.init failed" msgstr "volume.init selhalo" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Ceka se na uzivatele..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "VAROVANI: Crash detekce je zakazana v Tichem rezimu" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 msgid "Warning: both printer type and motherboard type changed." msgstr "Varovani: doslo ke zmene typu tiskarny a motherboardu." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Varovani: doslo ke zmene typu motherboardu." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." @@ -2088,17 +2378,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "VAROVANI: Neznama, nepodporovana verze firmware. Pouziti na vlastni nebezpeci!" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Chyba zapojeni" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Pruvodce" @@ -2117,23 +2407,28 @@ msgstr "Zapis do souboru:" msgid "X-correct" msgstr "Korekce X" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "Korekce X" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Kalibrace XYZ v poradku. Zkoseni bude automaticky vyrovnano pri tisku." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibrace XYZ v poradku. X/Y osy mirne zkosene. Dobra prace!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibrace XYZ nepresna. Predni kalibracni body moc vpredu." @@ -2143,17 +2438,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Levy predni bod moc vpredu." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." @@ -2168,17 +2463,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibrace XYZ v poradku. X/Y osy jsou kolme. Gratuluji!" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Y vzdalenost od min" @@ -2192,8 +2487,13 @@ msgstr "Y vzdalenost od min:" msgid "Y-correct" msgstr "Korekce Y" +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Korekce Y:" + # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Ano" @@ -2208,11 +2508,26 @@ msgid "You are using firmware beta version. This is development version. Using t msgstr "Pouzivate beta verzi firmwaru. Jedna se o vyvojovou verzi. Pouzivani teto verze firmware neni doporuceno a muze zpusobit poskozeni tiskarny." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Pruvodce muzete kdykoliv znovu spustit z menu Kalibrace -> Pruvodce" +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Korekce Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Pocet mereni Z [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Pocet mereni Z [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" diff --git a/lang/po/new/de.po b/lang/po/new/de.po index c5288b83..110aea5e 100644 --- a/lang/po/new/de.po +++ b/lang/po/new/de.po @@ -17,6 +17,11 @@ msgstr "\e[2JCrash Erkennung kann\e[1;0Hnur im Modus Normal\e[2;0Hgenutzt werden msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" msgstr "\e[2JWARNUNG:\e[1;0HCrash Erkennung\e[2;0Hdeaktiviert im\e[3;0HStealth Modus" +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr " 1" + # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 msgid " PlannerBufferBytes: " @@ -48,10 +53,15 @@ msgid " of 4" msgstr " von 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " von 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "[aus]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,7 +78,7 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Abbruch" @@ -77,33 +87,38 @@ msgstr ">Abbruch" msgid "Adjusting Z" msgstr "Z wurde eingestellt" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Z Anpassen:" + # MSG_ALL c=19 r=1 #: messages.c:11 msgid "All" msgstr "Alle" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Alles richtig " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spass beim Drucken!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Raumtemp." # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "und Knopf druecken" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Startposition" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "Auto-Laden Filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automatisches Laden Filament nur bei einge schaltetem Filament- sensor verfuegbar..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Automatisches Laden Filament ist aktiv, Knopf druecken und Filament einlegen..." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Achse" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Achsenlaenge" @@ -167,13 +182,18 @@ msgstr "Babystepping X" msgid "Babystepping Y" msgstr "Babystepping Y" +# +#: messages.c:57 +msgid "Back" +msgstr "Zurueck" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Bett" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Bett / Heizung" @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Bett aufwaermen" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Ausgleich Bett ok" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Beginn Dateiliste" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Gurtstatus" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Kalibrieren" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Kalibrierung E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Kalibrierung Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Kalibriere Start" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "XYZ Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. Anschliessend den Knopf druecken." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Kalibrierung Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Z Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. Anschliessend den Knopf druecken." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibrierung" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Kalibrierung OK" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Abbruch" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "SD Karte eingesetzt" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "SD Karte entfernt" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Wechsel SD Karte" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Wechsel erfolgr.!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Wechsel ok?" @@ -328,40 +348,45 @@ msgid "Changing filament!" msgstr "Filament-Wechsel!" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Pruefe Bett " # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Pruefe Endschalter" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Pruefe Duese " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Pruefe Sensoren " # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Pruefe X Achse " # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Pruefe Y Achse " # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Pruefe Z Achse " +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Checks" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Waehle Filament:" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Falsche Farbe" @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Gewaehlte Sprache vom Xflash kopieren?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Gewaehlte Sprache kopieren?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Crash" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Crash erkannt." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Crash erkannt. Druck fortfuehren?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "Crash-Erkennung\nkann nur im Normal\nModus erfolgen" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Aktuelles" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Motoren aus" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Der Abstand zwischen der Spitze der Duese und dem Bett ist noch nicht eingestellt. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, Abschnitt Erste Schicht Kalibrierung." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Moechten Sie den letzten Schritt wiederholen, um den Abstand zwischen Duese und Druckbett neu einzustellen?" @@ -462,13 +492,18 @@ msgstr "E-Kalibrierung beendet. Bitte reinigen Sie die Duese. Klicken wenn ferti msgid "E-correct" msgstr "E-Korrektur" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "E-Korrektur:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Auswurf" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Filamentauswurf" @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Fil.5 auswerfen" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "werfe Filament aus" @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Ende Dateiliste" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Endanschlag" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Ende nicht getroffen" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Endschalter" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "In Warteschlange \"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Fehler - statischer Speicher wurde ueberschrieben" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "FEHLER:" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Extruder 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Extruder Luefter:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Extruder Info" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "F.Autoladen [an]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "F. Autoload [nv]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "F. Autoload [aus]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Fehlerstatistik" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "MMU-Fehler" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falschtriggerung" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Luefter-Tempo" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Lueftertest" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" msgstr "Luefter Chk. [an]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Luefter Chk.[aus]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "Fil. Sensorsignal ist schlecht, ausschalten?" # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Fil. Sensor [nv]" @@ -663,7 +703,7 @@ msgid "Fil. sensor [off]" msgstr "Fil. Sensor [aus]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" msgstr "Filam. Maengel" @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrudiert + richtige Farbe?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Fil. nicht geladen" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Filamentsensor" @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Filamentsensor:" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Filament benutzt" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Filamentverbrauch: " # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollstaendig Trotzdem fortfahren?" @@ -717,53 +757,103 @@ msgstr "Datei geoeffnet: " msgid "File selected" msgstr "Datei ausgewaehlt" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA:" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Bewegung beenden" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [ohne]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [warn]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware [streng]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Erste-Schicht Kal." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Zunaechst fuehre ich den Selbsttest durch, um die haeufigsten Probleme beim Zusammenbau zu ueberpruefen." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Beseitigen Sie das Problem und druecken Sie dann den Knopf am MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Durchfluss" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Vorderer Luefter?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Vorne [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Vorderer/linke Luefter" +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "G-Code ist für einen anderen Level geslict. Fortfahren?" + +# +#: util.cpp:516 +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. Bitte slicen Sie das Modell erneut. Druck abgebrochen." + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-Code ist für einen anderen Drucker geslict. Fortfahren?" + +# +#: util.cpp:433 +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. Bitte slicen Sie das Modell erneut. Druck abgebrochen." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-Code ist für eine neuere Firmware geslict. Fortfahren?" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "G-Code ist für eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" @@ -773,7 +863,7 @@ msgid "Heating" msgstr "Aufwaermen" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." @@ -783,27 +873,32 @@ msgid "Heating done." msgstr "Aufwaermen OK." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Hallo, ich bin Ihr Original Prusa i3 Drucker. Moechten Sie, dass ich Sie durch den Einrich- tungsablauf fuehre?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "HW Einstellungen" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Ich werde jetzt die XYZ-Kalibrierung durchfuehren. Es wird ca. 12 Minuten dauern." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchfuehren." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Ich werde jetzt eine Linie drucken. Waehrend des Druckes koennen Sie die Duese allmaehlich senken, indem Sie den Knopf drehen, bis Sie die optimale Hoehe erreichen. Sehen Sie sich die Bilder in unserem Handbuch im Kapitel Kalibrierung an." @@ -813,7 +908,7 @@ msgid "Improving bed calibration point" msgstr "Verbessere Bett Kalibrierpunkt" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Infoanzeige" @@ -823,7 +918,7 @@ msgid "Init. SD card" msgstr "Init. SD Karte" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Filament einlegen" @@ -848,27 +943,32 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Filament in Extruder 4 einlegen. Klicken wenn fertig." # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "Wurde Filament 1 geladen?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "Ist es wirklich PLA Filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "Ist PLA Filament geladen?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Liegt das Stahlblech auf dem Heizbett?" @@ -883,27 +983,27 @@ msgid "KILLED. " msgstr "ABGEBROCHEN. " # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Letzter Druck" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Letzte Druckfehler" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Links" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Linker Luefter?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" msgstr "Links [um]" @@ -913,7 +1013,7 @@ msgid "Left:" msgstr "Links:" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Lineare Korrektur" @@ -923,7 +1023,7 @@ msgid "Live adjust Z" msgstr "Z einstellen" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Alle laden" @@ -958,12 +1058,12 @@ msgid "Load filament 5" msgstr "Filament 5 laden" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "In Druckduese laden" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Lade Farbe" @@ -973,7 +1073,7 @@ msgid "Loading filament" msgstr "Filament laedt" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Lose Riemenscheibe" @@ -993,7 +1093,7 @@ msgid "M109 Invalid extruder " msgstr "M109 Falscher Extruder " # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Erste-Schicht Kal." @@ -1012,8 +1112,23 @@ msgstr "M218 Falscher Extruder " msgid "M221 Invalid extruder " msgstr "M221 Falscher Extruder " +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Magnet Komp. [An]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Magnet Komp. [nv]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Magnet Komp.[Aus]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Hauptmenue" @@ -1023,7 +1138,7 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Filament 100mm vom Extrudergehaeuse markieren. Klicken wenn Fertig." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" msgstr "Schraeglauf" @@ -1033,117 +1148,172 @@ msgid "Measured skew:" msgstr "Schraeglauf:" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhoehe des Kalibrierpunktes" +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Mesh [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Mesh [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Mesh Bett Ausgleich" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Mesh Bett Ausgleich" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3-Firmware auf MK3S-Drucker erkannt" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S-Firmware auf MK3-Drucker erkannt" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "MMU Fehler" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "MMU Ladefehler" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "MMU Ladefehler" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "MMU Modus[Normal]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "MMU Modus[Stealth]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU erfordert Benutzereingriff." # MSG_MMU_NEEDS_ATTENTION c=20 r=4 #: mmu.cpp:359 msgid "MMU needs user attention. Fix the issue and then press button on MMU unit." -msgstr "MMU hat eine Störung. Beseitigen Sie das Problem und drücken Sie den Knopf an der MMU." +msgstr "MMU hat eine Stoerung. Beseitigen Sie das Problem und druecken Sie den Knopf an der MMU." # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Position wiederherstellen... " # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Temperatur wiederherstellen..." # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Weiterdrucken..." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "MMU Netzfehler" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU2 verbunden" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modus [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modus [leise]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modus [Stealth]" +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Moduswechsel erfolgt..." + # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" msgstr "Modus[Auto Power]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Modus[Hohe Leist]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Modell [ohne]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Modell [warn]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Modell [streng]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Motor" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Achse bewegen" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" msgstr "Bewege X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" msgstr "Bewege Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" msgstr "Bewege Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "N.V." @@ -1153,7 +1323,7 @@ msgid "New firmware version available:" msgstr "Neue Firmware- Version verfuegbar:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Nein" @@ -1168,12 +1338,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Keine Pruefsumme mit Zeilennummer, Letzte Zeile: " # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Keine Bewegung." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "Keine SD Karte" @@ -1183,37 +1353,67 @@ msgid "No thermistors - no temperature" msgstr "Keine Thermistoren - keine Temperatur" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nicht angeschlossen" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Dreht sich nicht" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Jetzt werde ich den Abstand zwischen Duesenspitze und Druckbett kalibrieren." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Duese" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Duese [ohne]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Duese [warn]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Duese [streng]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Duese D. [0.25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Duese D. [0.40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Duese D. [0.60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Duesen Luefter" @@ -1238,7 +1438,7 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." @@ -1258,7 +1458,7 @@ msgid "openRoot failed" msgstr "Zugriff auf Hauptverzeichnis misslungen" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Druck pausieren" @@ -1268,42 +1468,47 @@ msgid "Pick print" msgstr "Druck auswaehlen" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "PID Kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "PID Kalib. fertig" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "PID Kalibrierung" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "PINDA erwaermen" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA:" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Legen Sie ein Blatt Papier unter die Duese waehrend der Kalibrierung der ersten 4 Punkte. Wenn die Duese das Papier erfasst, den Drucker sofort ausschalten." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Bitte pruefe:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Bitte lesen Sie unser Handbuch und beheben Sie das Problem. Fahren Sie dann mit dem Assistenten fort, indem Sie den Drucker neu starten." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." @@ -1313,12 +1518,12 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Bitte entfernen Sie ueberstehendes Filament von der Duese. Klicken wenn sauber." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Legen Sie bitte PLA Filament in den Extruder und druecken Sie den Knopf, um es zu laden." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Legen Sie bitte PLA Filament in den ersten Schlauch der MMU und druecken Sie den Knopf, um es zu laden." @@ -1328,52 +1533,52 @@ msgid "Please load PLA filament and then resume Wizard by rebooting the printer. msgstr "Bitte PLA-Filament\nladen und Assistent\nfortsetzen, indem\nSie den Drucker neu\nstarten." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Bitte laden Sie zuerst PLA Filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen" # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Bitte legen Sie das Stahlblech auf das Heizbett." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Bitte druecken Sie den Knopf um das Filament zu entladen." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Bitte ziehen Sie das Filament sofort heraus" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Bitte Filament entfernen und dann den Knopf druecken" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Bitte zuerst Transportsicherungen entfernen." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Bitte entfernen Sie das Stahlblech vom Heizbett." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Bitte aktualisieren Sie die Firmware in der MMU2. Warte auf Reset." @@ -1383,12 +1588,12 @@ msgid "Please upgrade." msgstr "Bitte aktualisieren." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Bitte warten" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Netzfehler" @@ -1398,27 +1603,37 @@ msgid "PowerUp" msgstr "Einschalten" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Vorheizen" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Duese vorheizen!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Vorheizen der Duese. Bitte warten." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Heizen zum Schnitt" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Heizen zum Auswurf" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" msgstr "Heizen zum Laden" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" msgstr "Heizen zum Entladen" @@ -1428,27 +1643,27 @@ msgid "Prepare new filament" msgstr "Filam. bereithalten" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "Knopf druecken" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Druck abgebrochen" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Druckluefter" @@ -1458,7 +1673,7 @@ msgid "Print FAN: " msgstr "Druckvent.: " # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Druckvent.:" @@ -1468,12 +1683,12 @@ msgid "Print from SD" msgstr "Drucken von SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Druck pausiert" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Druckzeit" @@ -1487,6 +1702,26 @@ msgstr "Druckzeit: " msgid "Printer disconnected" msgstr "Drucker getrennt" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "Drucker FW-Version weicht vom G-Code ab. Fortfahren?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Drucker FW-Version weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + +# +#: util.cpp:506 +msgid "Printer G-code level differs from the G-code. Continue?" +msgstr "Drucker G-Code Level unterscheidet sich vom G-Code. Fortfahren?" + +# +#: util.cpp:513 +msgid "Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Der Drucker-G-Code Level unterscheidet sich vom G-Code. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1732,26 @@ msgstr "Printer gestoppt. kill() aufgerufen!" msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Drucker wurde noch nicht kalibriert. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrie- rungsablauf." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Druckermodell unterscheidet sich vom G-Code. Fortfahren?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Das Druckermodell unterscheidet sich vom G-Code. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + # MSG_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1767,11 @@ msgstr "Prusa i3 MK2 bereit." msgid "Prusa i3 MK2.5 ready." msgstr "Prusa i3 MK2.5 bereit." +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK." + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1783,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.com" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Hinten [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Druck wiederherst " @@ -1543,10 +1803,15 @@ msgid "Refresh" msgstr "Erneuern" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Entfernen Sie das alte Filament und druecken Sie den Knopf, um das neue zu laden." +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Umbenennen" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1828,32 @@ msgid "Resend: " msgstr "Wiederholen: " # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Ruecksetzen" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "XYZ Kalibr. zuruecksetzen." # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Druck fortsetzen" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Druck fortgesetzt" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Rechts" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Rechts [um]" @@ -1603,22 +1868,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Knopf drehen bis die Markierung das Extrudergehaeuse erreicht. Klicken wenn fertig." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "RPi Port [an]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "RPi Port [aus]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Der Assistent wird die aktuellen Kalibrierungsdaten loeschen und von vorne beginnen. Weiterfahren?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "SD Karte [normal]" @@ -1633,7 +1898,7 @@ msgid "SD card [FlshAir]" msgstr "SD Karte [FlashAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "SD Karte[flshAir]" @@ -1652,53 +1917,63 @@ msgstr "SD drucke Byte " msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Auswahl" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Waehle Sprache" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "PLA Filament auswaehlen:" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Selbsttest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Selbsttest start " # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Selbsttest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Selbsttest Fehler!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Selbsttest misslung " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Selbsttest im Gang, um die genaue Rueck- kehr zum Nullpunkt ohne Sensor zu kalibrieren" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Sensor Info" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Sensorstatus" @@ -1708,17 +1983,17 @@ msgid "Sensors info" msgstr "Sensoren Info" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Temp. einstellen:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Einstellungen" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" msgstr "Schwerer Schraeglauf" @@ -1727,8 +2002,13 @@ msgstr "Schwerer Schraeglauf" msgid "Severe skew:" msgstr "Schwerer Verzug:" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Blech" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Endschalter Status" @@ -1743,7 +2023,7 @@ msgid "Sleep..." msgstr "Schlafzustand..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" msgstr "Leichter Schraeglauf" @@ -1753,15 +2033,30 @@ msgid "Slight skew:" msgstr "Etwas verzogen:" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Sort. [ohne]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Sort. [Zeit]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Sort. [Alphabetisch]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2098,132 @@ msgid "Sort: [time]" msgstr "Sort.: [Zeit]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Sortiere Dateien" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Sound [laut]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Sound [stumm]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Sound [einmal]" +# +#: +msgid "Sound [assist]" +msgstr "Sound [assist]" + +# +#: sound.h:9 +msgid "Sound [blind]" +msgstr "Sound [blind]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Sound [leise]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Geschwindigkeit" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Dreht sich" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [an]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/V]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [aus]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Stabile Umgebungs- temperatur 21-26C und feste Stand- flaeche erforderlich" # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiken " +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Stahlbleche" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Schrittrate zu hoch: " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Druck abbrechen" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "GESTOPPT. " # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Support" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Ausgetauscht" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Temp Kalib. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Temp. Kal. [AN]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Temp. Kal. [AUS]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Temp. kalibrieren" # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Temperatur" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Temperaturkalibrierung fehlgeschlagen" @@ -1923,12 +2233,12 @@ msgid "Temperature calibration has not been run yet" msgstr "Temperatur wurde\nnoch nicht\nkalibriert" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Temp.kalibrierung ist fertig + aktiv. Temp.kalibrierung kann ausgeschaltet werden im Menu Einstellungen -> Temp.kal." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Temperaturen" @@ -1938,27 +2248,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Es ist noch notwendig die Z-Kalibrierung auszufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "zum Filament laden" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "zum Filament entladen" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Gesamt" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Gesamte Fehler" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Gesamtes Filament" @@ -1968,7 +2278,7 @@ msgid "Total filament :" msgstr "Gesamtes Filament:" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Gesamte Druckzeit" @@ -1983,17 +2293,17 @@ msgid "TRIGGERED" msgstr "AUSGELOEST" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Feineinstellung" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "unbekannt" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Entladen" @@ -2003,7 +2313,7 @@ msgid "Unload all" msgstr "Alles entladen" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Filament entladen" @@ -2028,22 +2338,22 @@ msgid "Unload filament 4" msgstr "Filam. 4 entladen" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Filament auswerfen" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Entladen Sie das Filament 1, wenn er aus dem hinteren MMU-Rohr herausragt. Verwenden Sie den Auswurf, wenn er im Rohr versteckt ist." # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Beim Druck benutzt" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Spannungen" @@ -2053,32 +2363,37 @@ msgid "volume.init failed" msgstr "Dateisystem Init fehlerhaft" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Warte auf Benutzer.." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "Warten bis Heizung und Bett abgekuehlt sind" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "WARNUNG:\nCrash-Erkennung\nim Stealth Modus\nausgeschaltet" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 msgid "Warning: both printer type and motherboard type changed." msgstr "Warnung: Druckertyp und Platinentyp wurden beide geaendert." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Warnung: Platinentyp wurde geaendert." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geaendert." @@ -2088,17 +2403,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "WARNUNG: Dies ist\neine inoffizielle,\nnicht unterstuetzte\nVersion. Benutzung\nauf eigene Gefahr!" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Verdrahtungsfehler" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Assistent" @@ -2117,23 +2432,28 @@ msgstr "Schreibe in Datei: " msgid "X-correct" msgstr "X-Korrektur" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "X-Korrektur:" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ Kalibrierung in Ordnung. Schraeglauf wird automatisch korrigiert." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schraeg." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Vordere Kalibrierpunkte nicht erreichbar." @@ -2143,17 +2463,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Linker vorderer Kalibrierpunkt nicht erreichbar." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." @@ -2168,17 +2488,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ-Kalibrierung ok. X/Y-Achsen sind senkrecht zueinander Glueckwunsch!" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Y Entfernung vom Min" @@ -2192,8 +2512,13 @@ msgstr "Y Entfernung vom Min:" msgid "Y-correct" msgstr "Y-Korrektur" +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Y-Korrektur:" + # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Ja" @@ -2208,11 +2533,26 @@ msgid "You are using firmware beta version. This is development version. Using t msgstr "Sie benutzen eine\nBeta Firmware\nVersion. Dies ist\neine Entwicklungs-\nversion. Die Ver-\nwendung ist nicht\nempfohlen und kann\nzu Schaeden fuehren." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Sie koennen den Assistenten immer im Menu neu starten: Kalibrierung -> Assistent" +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Z-Korrektur:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-Probe Nr. [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Z-Probe Nr. [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" diff --git a/lang/po/new/es.po b/lang/po/new/es.po index 9ceb0eef..8f4d21b5 100644 --- a/lang/po/new/es.po +++ b/lang/po/new/es.po @@ -17,6 +17,11 @@ msgstr "\e[2JDec. choque\e[1;0Hpuede ser activada solo en\e[2;0HModo normal" msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" msgstr "\e[2JATENCION:\e[1;0HDec. choque\e[2;0Hdesactivada en\e[3;0HModo silencio" +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr " 1" + # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 msgid " PlannerBufferBytes: " @@ -48,10 +53,15 @@ msgid " of 4" msgstr " de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " de 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr " [apagado]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,7 +78,7 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Cancelar" @@ -77,33 +87,38 @@ msgstr ">Cancelar" msgid "Adjusting Z" msgstr "Ajustar Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Ajustando Z:" + # MSG_ALL c=19 r=1 #: messages.c:11 msgid "All" msgstr "Todos" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Todo bien" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Terminado! Feliz impresion!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "Haz clic" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" @@ -115,17 +130,17 @@ msgstr "Ajustar Eje Z" # MSG_AUTO_DEPLETE_ON c=17 r=1 #: ultralcd.cpp:4706 msgid "Auto deplete [on]" -msgstr "Auto desplegar[on]" +msgstr "Auto agotar[on]" # #: ultralcd.cpp:4702 msgid "Auto deplete[N/A]" -msgstr "Auto desplegar[N/A]" +msgstr "Auto agotar[N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 #: ultralcd.cpp:4710 msgid "Auto deplete[off]" -msgstr "Auto desplegar[off]" +msgstr "Auto agotar[off]" # MSG_AUTO_HOME #: messages.c:11 @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Llevar al origen" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "Carga automatica de filamento" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "La carga automatica de filamento solo funciona si el sensor de filamento esta activado..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "La carga automatica de filamento esta activada, pulse el dial e inserte el filamento..." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Eje" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Longitud del eje" @@ -167,13 +182,18 @@ msgstr "Micropasos X" msgid "Babystepping Y" msgstr "Micropasos Y" +# +#: messages.c:57 +msgid "Back" +msgstr "atras" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Base calefactable " # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Base / Calentador" @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Calentando Base" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Corr. de la cama" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Comienzo lista arch. " # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Estado de la correa" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. ?Reanudar la impresion?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Calibrar" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Calibrar E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Calibrar Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Calibrando posicion inicial" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrando XYZ. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrando Z. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Calibracion" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Calibracion OK" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Cancelar" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "Tarjeta insertada" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Tarjeta retirada" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Cambiar tarjeta SD" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Cambio correcto" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Cambio correcto?" @@ -328,44 +348,49 @@ msgid "Changing filament!" msgstr "Cambiando filamento" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Control base cal." # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Control endstops" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Control fusor" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Comprobando los sensores" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Control sensor X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Control sensor Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Control sensor Z" +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Comprobaciones" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " -msgstr "inconcluencia checksum, Ult. Linea: " +msgstr "error de checksum, Ult. Linea: " # MSG_CHOOSE_EXTRUDER c=20 r=1 #: messages.c:49 @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Elije filamento:" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Color no homogeneo" @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Copiar idioma seleccionado desde XFLASH?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Choque" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Choque detectado." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Choque detectado. Continuar impresion?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "Detect. choque solo\npuede activarse en\nmodo Normal" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Actual" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Fecha:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Apagar motores" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Distancia entre la punta del boquilla y la superficie de la base aun no fijada. Por favor siga el manual, capitulo Primeros Pasos, Calibracion primera capa." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Quieres repetir el ultimo paso para reajustar la distancia boquilla-base?" @@ -462,13 +492,18 @@ msgstr "E calibrado. Limpia nozzle. Haz clic una vez terminado." msgid "E-correct" msgstr "E-correcion" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "Correccion-E:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Expulsar" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Expulsar filamento" @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Expulsar filamento 5" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "Expulsando filamento" @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Fin lista arch. " # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Endstop" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Endstop no alcanzado" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Endstops" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "en cola \"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Error - se ha sobre-escrito la memoria estatica" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "ERROR:" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Extrusor 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventilador del extrusor:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Informacion del extrusor" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "Autocarg.Fil[act]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "Autocarg.Fil[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "Autocarg.Fil[ina]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Estadistica de fallos" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "Estadistica de fallos MMU" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falsa activación" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Velocidad Vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventiladores" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" msgstr "Comprob.vent[act]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Comprob.vent[ina]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "La respuesta del sensor de fil es deficiente, ?desactivarlo?" # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Sensor Fil. [N/D]" @@ -663,7 +703,7 @@ msgid "Fil. sensor [off]" msgstr "Sensor Fil. [ina]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" msgstr "Filam. acabado" @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Fil. no introducido" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Sensor de filamento" @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Sensor de filamento:" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Filamento usado" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Filamento usado: " # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. ?Continuar de todos modos?" @@ -717,53 +757,103 @@ msgstr "Arch. abierto: " msgid "File selected" msgstr "Arch. elegido" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA:" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Term. movimientos" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [ninguno]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [aviso]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware [estricto]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Cal. primera cap." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Primero, hare el Selftest para comprobar los problemas de montaje mas comunes." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Corrige el problema y pulsa el boton en la unidad MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flujo" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Vent. frontal?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Frontal [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventiladores frontal/izquierdo" +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "Código G laminado para un nivel diferente. ¿Continuar?" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "Código G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresión cancelada." + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "Código G laminado para un tipo de impresora diferente. ¿Continuar?" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "Código G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresión cancelada." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "Código G laminado para nuevo firmware. ¿Continuar?" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "Código G laminado para nuevo firmware. Por favor actualiza el firmware. Impresión cancelada." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" @@ -773,7 +863,7 @@ msgid "Heating" msgstr "Calentando..." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." @@ -783,27 +873,32 @@ msgid "Heating done." msgstr "Calentamiento acabado." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Hola, soy tu impresora Original Prusa i3. Quieres que te guie a traves de la configuracion?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Configuracion HW" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Hare la calibracion XYZ. Tardara 12 min. aproximadamente." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Voy a comenzar a imprimir la linea y tu bajaras el nozzle gradualmente al rotar el dial, hasta que llegues a la altura optima. Mira las imagenes del capitulo Calibracion en el manual." @@ -813,7 +908,7 @@ msgid "Improving bed calibration point" msgstr "Mejorando punto de calibracion base" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Monitorizar" @@ -823,7 +918,7 @@ msgid "Init. SD card" msgstr "Iniciar tarj. SD" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Introducir filamento" @@ -848,29 +943,34 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Insertar filamento en el extrusor 4. Haz clic una vez terminado." # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "?Esta cargado el filamento 1?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "Es el filamento PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "Esta el filamento PLA cargado?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" -msgstr "?Esta colocada la lamina de acero sobre la base?" +msgstr "¿Esta colocada la lamina de acero sobre la base?" # MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 #: mesh_bed_calibration.cpp:2223 @@ -883,27 +983,27 @@ msgid "KILLED. " msgstr "PARADA DE EMERGENCIA" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Ultima impresion" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Ultimas impresiones fallidas" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Izquierda" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Vent. izquierdo?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" msgstr "Izquierda [um]" @@ -913,7 +1013,7 @@ msgid "Left:" msgstr "Izda:" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Correccion de Linealidad" @@ -923,7 +1023,7 @@ msgid "Live adjust Z" msgstr "Micropaso Eje Z" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Intr. todos fil." @@ -955,15 +1055,15 @@ msgstr "Introducir fil. 4" # MSG_LOAD_FILAMENT_5 c=17 #: ultralcd.cpp:5582 msgid "Load filament 5" -msgstr "Cargar filamento 5" +msgstr "Introducir fil. 5" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "Cargar a la boquilla" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Cambiando color" @@ -973,7 +1073,7 @@ msgid "Loading filament" msgstr "Introduciendo filam." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Polea suelta" @@ -993,7 +1093,7 @@ msgid "M109 Invalid extruder " msgstr "M109 Extrusor invalido" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Cal. primera cap." @@ -1012,8 +1112,23 @@ msgstr "M218 Extrusor invalido" msgid "M221 Invalid extruder " msgstr "M221 Extrusor invalido" +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Comp. imanes [On]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Comp. imanes [N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Comp. imanes [Off]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu principal" @@ -1023,7 +1138,7 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Marque el filamento 100 mm por encima del final del extrusor. Haz clic una vez terminado." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" msgstr "Desviacion medida:" @@ -1033,32 +1148,67 @@ msgid "Measured skew:" msgstr "Desviación medida:" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Malla [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Malla [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Nivelacion Mesh Level" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Nivelacion Malla Base" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 detectado en impresora MK3S" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detectado en impresora MK3" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "Fallos MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "Carga MMU fallida" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "Carga MMU falla" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "Modo MMU [Normal]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "Modo MMU [Silencioso]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU necesita atencion del usuario." @@ -1068,82 +1218,102 @@ msgid "MMU needs user attention. Fix the issue and then press button on MMU unit msgstr "MMU necesita atencion del usuario. Corrija el problema y luego presione el boton en la unidad MMU." # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Restaurando posicion..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Restaurando temperatura..." # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Resumiendo..." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "Fallo de energia en MMU" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU2 conectado" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modo [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modo [silencio]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modo [Silencio]" +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Cambio de modo progresando ..." + # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" msgstr "Modo[fuerza auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Modo [rend.pleno]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Modelo [ninguno]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Modelo [aviso]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Modelo [estricto]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Motor" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Mover ejes" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" msgstr "Mover X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" msgstr "Mover Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" msgstr "Mover Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "No disponible" @@ -1153,7 +1323,7 @@ msgid "New firmware version available:" msgstr "Nuevo firmware disponible:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "No" @@ -1168,12 +1338,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Sin Checksum con linea numero, Ult. Linea: " # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Sin movimiento" # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "No hay tarjeta SD" @@ -1183,37 +1353,67 @@ msgid "No thermistors - no temperature" msgstr "Sin termistores - sin temperatura" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "No hay conexion " # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Ventilador no gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Voy a calibrar la distancia entre la punta de la boquilla y la superficie de la base." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." -msgstr "Voy a precalentar la boquilla para PLA ahora." +msgstr "Ahora precalentare la boquilla para PLA ." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Boquilla" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Nozzle [ninguno]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Nozzle [aviso]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Nozzle [estricto]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Diam. nozzle [0.25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Diam. nozzle [0.40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Diam. nozzle [0.60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Ventilador de capa" @@ -1238,7 +1438,7 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc" @@ -1258,7 +1458,7 @@ msgid "openRoot failed" msgstr "fallo openRoot " # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Pausar impresion" @@ -1268,42 +1468,47 @@ msgid "Pick print" msgstr "Esc. Modelo Adecuado" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "Cal. PID " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "Cal. PID terminada" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "Calibracion PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "Calentando PINDA" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA:" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Colocar una hoja de papel sobre la superficie de impresion durante la calibracion de los primeros 4 puntos. Si la boquilla mueve el papel, apagar impresora inmediatamente." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Controla :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Lee el manual y resuelve el problema. Despues, reinicia la impresora y continua con el Wizard" # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, por favor, y haz clic" @@ -1313,67 +1518,67 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Click cuando acabes." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Inserta, por favor, filamento PLA en el extrusor. Despues haz clic para cargarlo." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Por favor introduce el filamento al primer tubo MMU, despues presiona el dial para imprimirlo." # MSG_WIZARD_INSERT_CORRECT_FILAMENT c=20 r=8 #: ultralcd.cpp:4109 msgid "Please load PLA filament and then resume Wizard by rebooting the printer." -msgstr "Carga filamento PLA, por favor, y reinicia la impresora para continuar con el Wizard" +msgstr "Carga filamento PLA y reinicia la impresora para continuar con el asistente" # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Carga el filamento PLA primero por favor." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Por favor coloca la chapa de acero en la base calefactable." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Por favor, pulsa el dial para descargar el filamento" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Por favor retire el filamento de inmediato" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Por favor quite el filamento y luego presione el dial." # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Por favor retira los soportes de envio primero." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Por favor retire la chapa de acero de la base calefactable." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Por favor realiza la calibracion XYZ primero." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Por favor actualice el firmware en tu MMU2. Esperando el reseteo." @@ -1383,12 +1588,12 @@ msgid "Please upgrade." msgstr "Actualize por favor" # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Por Favor Espere" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Cortes de energia" @@ -1398,27 +1603,37 @@ msgid "PowerUp" msgstr "Encendido" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Precalentar" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Precalienta extrusor!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Precalentando nozzle. Espera por favor." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Precalentando para laminar" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Precalentar para expulsar" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" msgstr "Precalentar para cargar" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" msgstr "Precalentar para descargar" @@ -1428,52 +1643,52 @@ msgid "Prepare new filament" msgstr "Preparar filamento" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "Pulsa el dial" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Presiona el dial para continuar con la temperatura de la boquilla." # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Impresion cancelada" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Ventilador del extrusor" -# MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 -msgid "Print fan:" -msgstr "Ventilador del fusor:" - # MSG_INFO_PRINT_FAN c=11 r=1 #: ultralcd.cpp:1549 msgid "Print FAN: " msgstr "Ventilador del fusor:" +# MSG_SELFTEST_PRINT_FAN_SPEED c=18 +#: ultralcd.cpp:8221 +msgid "Print fan:" +msgstr "Ventilador del fusor:" + # MSG_CARD_MENU #: messages.c:21 msgid "Print from SD" msgstr "Menu tarjeta SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Impresion en pausa" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Tiempo de imp.:" @@ -1487,6 +1702,26 @@ msgstr "Tiempo de imp.:" msgid "Printer disconnected" msgstr "Impresora desconectada" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "FW Impresora difiere de cod.G. ¿Continuar?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "FW Impresora difiere de cod. G. Comprueba los valores en ajustes. Impresion cancelada." + +# +#: util.cpp:506 +msgid "Printer G-code level differs from the G-code. Continue?" +msgstr "Nivel cod.G Impresora difiere de cod.G. ¿Continuar?" + +# +#: util.cpp:513 +msgid "Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Nivel cod.G Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresión cancelada." + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1732,26 @@ msgstr "Impresora detenida. kill() activado!" msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Impresora no esta calibrada todavia. Por favor usa el manual capitulo Primeros pasos Calibracion flujo." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Modelo Impresora difiere de cod.G. ¿Continuar?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Modelo Impresora difiere de cod. G. Comprueba los valores en ajustes. Impresión cancelada." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametro nozzle impresora difiere de cod.G. ¿Continuar?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada." + # MSG_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1767,11 @@ msgstr "Preparado para i3 MK2." msgid "Prusa i3 MK2.5 ready." msgstr "Preparado para Prusa i3 MK2.5." +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK." + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1783,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.es" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Trasera [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Recuperando impresion" @@ -1543,10 +1803,15 @@ msgid "Refresh" msgstr "Refrescar" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Retire el filamento viejo y presione el dial para comenzar a cargar el nuevo filamento." +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Renombrar" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1828,32 @@ msgid "Resend: " msgstr "Reenviar: " # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Reset" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "Reset XYZ calibr." # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Reanudar impres." # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" -msgstr "Resumiendo impresion" +msgstr "Continuando impresion" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Derecha" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Derecha [um]" @@ -1603,22 +1868,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Rotar el dial hasta que la marca llegue al cuerpo del extrusor. Haz clic una vez terminado." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "Puerto RPi [act]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "Puerto RPi [ina]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Ejecutar el Wizard borrara los valores de calibracion actuales y comenzara de nuevo. Continuar?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "Tarj. SD [normal]" @@ -1633,7 +1898,7 @@ msgid "SD card [FlshAir]" msgstr "Tarj. SD [FlshAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "Tarj. SD[FlshAir]" @@ -1652,53 +1917,63 @@ msgstr "SD byte impresion" msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Seleccionar" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Cambiar el idioma" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "Seleccionar filamento PLA:" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Self test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Iniciar Selftest" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Selftest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Error Selftest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Fallo Selftest" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Se realizara el auto-test para calibrar con precision la vuelta a la posicion inicial sin sensores." # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Info sensor" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Estado del sensor" @@ -1708,17 +1983,17 @@ msgid "Sensors info" msgstr "Informacion sensores" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Establecer temp.:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Configuracion" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" msgstr "Inclinacion severa" @@ -1727,8 +2002,13 @@ msgstr "Inclinacion severa" msgid "Severe skew:" msgstr "Inclinación severa:" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Lamina" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Mostrar endstops" @@ -1743,7 +2023,7 @@ msgid "Sleep..." msgstr "En reposo..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" msgstr "Ligeramente inclinado" @@ -1753,15 +2033,30 @@ msgid "Slight skew:" msgstr "Ligeramente inclinado:" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Ordenar [ninguno]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Ordenar [tiempo]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Ordenar [Alfabetico]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2098,132 @@ msgid "Sort: [time]" msgstr "Ordenar: [tiempo]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Ordenando archivos" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Sonido [alto]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Sonido[silenciad]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Sonido [una vez]" +# +#: +msgid "Sound [assist]" +msgstr "Sonido [asistido]" + +# +#: sound.h:9 +msgid "Sound [blind]" +msgstr "Sonido [ciego]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Sonido[silencios]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Velocidad" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Ventilador girando" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [on]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [off]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Se necesita una temperatura ambiente ente 21 y 26C y un soporte rigido." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Estadisticas " +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Lámina de acero" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Pasos muy altos: " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Detener impresion" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "PARADA" # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Soporte" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Intercambiado" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Cal. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Cal. temp. [ON]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Cal. temp. [OFF]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Calibracion temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Temperatura" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Fallo de la calibracion de temperatura" @@ -1923,12 +2233,12 @@ msgid "Temperature calibration has not been run yet" msgstr "La temperatura de calibracion no ha sido ajustada" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Calibracion temperatura terminada. Haz clic para continuar." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Temperaturas" @@ -1938,27 +2248,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "para cargar el filamento" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "para descargar el filamento" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Total" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Fallos totales" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Filamento total:" @@ -1968,7 +2278,7 @@ msgid "Total filament :" msgstr "Filamento total:" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Tiempo total :" @@ -1983,17 +2293,17 @@ msgid "TRIGGERED" msgstr "ACTIVADO" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Ajustar" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "desconocido" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Descargar" @@ -2003,7 +2313,7 @@ msgid "Unload all" msgstr "Soltar todos fil." # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Soltar filamento" @@ -2028,22 +2338,22 @@ msgid "Unload filament 4" msgstr "Soltar fil. 4" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Soltando filamento" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Usa unload para retirar el filamento 1 si sobresale por fuera de la parte trasera del tubo MMU. Usa Expulsar si esta escondido dentro del tubo" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Usado en impresion" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Voltajes" @@ -2053,32 +2363,37 @@ msgid "volume.init failed" msgstr "fallo volume.init \n" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Esperando ordenes" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "Esperando enfriamiento de la base y extrusor." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "ATENCION:\nDetect. choque \ndesactivada en\nmodo Silencioso" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 msgid "Warning: both printer type and motherboard type changed." msgstr "Aviso: tanto el tipo de impresora como el tipo de la placa han cambiado." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Cuidado: el tipo de placa ha cambiado." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Cuidado: Ha cambiado el tipo de impresora." @@ -2088,17 +2403,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "CUIDADO: Esta es una version no-oficial y sin soporte. ¡Usala bajo tu responsabilidad!" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" -msgstr "?Se cargocon exito el filamento?" +msgstr "?Se cargo con exito el filamento?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Error de conexion" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Wizard" @@ -2117,23 +2432,28 @@ msgstr "Escribiendo al arch.: " msgid "X-correct" msgstr "X-correcion" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "Correccion-X:" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "Detalles de calibracion XYZ" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibracion XYZ correcta. La inclinacion se corregira automaticamente." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibracion XYZ correcta. Los ejes X / Y estan ligeramente inclinados. Buen trabajo!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazion XYZ comprometida. Puntos frontales no alcanzables." @@ -2143,17 +2463,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal izquierdo no alcanzable." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." @@ -2168,17 +2488,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibracion XYZ fallada. Consulta el manual por favor." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibracion XYZ ok. Ejes X/Y perpendiculares. Enhorabuena!" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Distancia en Y desde el min" @@ -2190,10 +2510,15 @@ msgstr "Distancia en Y desde el min:" # #: ultralcd.cpp:4886 msgid "Y-correct" -msgstr "Y-correcion" +msgstr "Y-correccion" + +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Correccion-Y:" # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Si" @@ -2205,14 +2530,29 @@ msgstr "Estas usando una version alpha de firmware. Esta es una version de desar # MSG_FW_VERSION_BETA c=20 r=8 #: Marlin_main.cpp:931 msgid "You are using firmware beta version. This is development version. Using this version is not recommended and may cause printer damage." -msgstr "Estás usando una versión beta de firmware. Es una versión en desarrollo. No recomendamos que la uses y podría causar daños a la impresora." +msgstr "Estas usando una version beta de firmware. Es una version en desarrollo. No recomendamos que la uses y podria causar daños a la impresora." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Siempre puedes acceder al asistente desde Calibracion -> Wizard" +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Correccion-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-sensor nr. [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Z-sensor nr. [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "[0;0] punto offset" diff --git a/lang/po/new/fr.po b/lang/po/new/fr.po index 38ff850d..cd2975bc 100644 --- a/lang/po/new/fr.po +++ b/lang/po/new/fr.po @@ -17,6 +17,11 @@ msgstr "\e[2JLa detection de crash peut etre\e[1;0Hactive seulement\e[2;0Hen mod msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" msgstr "\e[2JATTENTION :\e[1;0HDetection de crash\e[2;0H desactivee en\e[3;0Hmode Furtif" +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr " 1" + # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 msgid " PlannerBufferBytes: " @@ -48,10 +53,15 @@ msgid " of 4" msgstr "de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr "de 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "[off]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,7 +78,7 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Annuler" @@ -77,33 +87,38 @@ msgstr ">Annuler" msgid "Adjusting Z" msgstr "Ajustement de Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Ajuster Z :" + # MSG_ALL c=19 r=1 #: messages.c:11 msgid "All" msgstr "Tous" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Tout est correct" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Tout est pret. Bonne\nimpression !" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Ambiant" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "et pressez le bouton" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche +\ndroite tout en haut?" @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Mise a 0 des axes" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "AutoCharge du filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Chargement auto du\nfilament uniquement\nsi le capteur de\nfilament est active." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Chargement auto du\nfilament actif,\nappuyez sur le btn\net inserez le fil." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Axe" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Longueur de l'axe" @@ -167,13 +182,18 @@ msgstr "Babystepping X" msgid "Babystepping Y" msgstr "Babystepping Y" +# +#: messages.c:57 +msgid "Back" +msgstr "Retour" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Lit" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Lit / Chauffage" @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Chauffe du lit" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Corr. niveau plateau" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Debut liste fichiers" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Statut courroie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee.\nRecup. impression ?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Calibrer" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Calibrer E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Calibrer Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Calib. mise a 0" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibration de XYZ.\nTournez le bouton\npour monter le\nchariot de l'axe Z\njusqu'aux butees.\nCliquez une fois\nfait." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Calibration de Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibration de Z.\nTournez le bouton\npour monter le\nchariot de l'axe Z\njusqu'aux butees.\nCliquez une fois\nfait." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Calibration" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Calibration terminee" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Annuler" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "Carte inseree" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Carte retiree" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Changer carte SD" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Changement reussi!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Change correctement?" @@ -328,40 +348,45 @@ msgid "Changing filament!" msgstr "Changement filament!" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Verification du lit" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Verifications butees" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Verif. tete impr." # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Verif. des capteurs" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Verification axe X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Verification axe Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Verification axe Z" +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Verifications" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Choix du filament :" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Couleur incorrecte" @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Copier la langue selectionne depuis la XFLASH ?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Copier la langue\nselectionne ?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Crash" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Crash detecte." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Crash detecte. Poursuivre l'impression ?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "La detection de\ncrash ne peut etre\nactive en mode\nNormal" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Actuel" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Date :" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Desactiver moteurs" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "La distance entre la\npointe de la buse et\nla surface du\nplateau n'a pas\nencore ete reglee.\nSuivez le manuel,\nchapitre Premiers\npas, section\nCalibration de la\npremiere couche." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Voulez-vous repeter\nla derniere etape\npour reajuster la\ndistance entre la\nbuse et le plateau\nchauffant ?" @@ -462,13 +492,18 @@ msgstr "Calibration de E\nterminee. Nettoyez\nla buse. Cliquez une\nfois fait." msgid "E-correct" msgstr "Correct-E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "Correct-E:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Ejecter" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Ejecter le fil." @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Ejecter fil. 5" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "Ejection filament" @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Fin liste fichiers" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Butee" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Butee non atteinte" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Butees" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "mise en file \"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Erreur - la memoire\nstatique a ete\necrasee" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "ERREUR :" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERREUR : Le capteur\nde filament ne\nrepond pas, verifiez\nle branchement." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Extrudeur 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventilo extrudeur:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Infos extrudeur" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "ChargAuto f. [on]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "AutoCharg F [N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "AutoCharg F [off]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Statist. d'echec" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "Stat. echecs MMU" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Faux declenchement" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Vitesse ventil" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventilateur" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" msgstr "Verif ventilo[on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Verif venti [off]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "Capteur de fil. non\nprecis, desactiver ?" # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Capteur Fil. [N/A]" @@ -663,7 +703,7 @@ msgid "Fil. sensor [off]" msgstr "Capteur Fil.[off]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" msgstr "Fins de filament" @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrude et\navec bonne couleur ?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Filament non charge" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Capteur de filament" @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Capteur filament :" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Filament utilise" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Filament utilise :" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet.\nContinuer qd meme ?" @@ -717,53 +757,93 @@ msgstr "Fichier ouvert :" msgid "File selected" msgstr "Fichier selectionne" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA :" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Mouvements de fin" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [aucune]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [avert]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware[stricte]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Cal. 1ere couche" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 msgid "First, I will run the selftest to check most common assembly problems." msgstr "D'abord, je vais\nlancer le Selftest\npour verifier les\nproblemes\nd'assemblage les\nplus communs." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Corrigez le probleme et appuyez sur le bouton de l'unite MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flux" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Ventilo impr avant ?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Avant [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventilos avt/gauche" +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "Le G-code a ete prepare pour une autre version de l'imprimante. Continuer?" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "Le G-code a ete prepare pour une autre version de l'imprimante. Veuillez decouper le modele a nouveau. L'impression a ete annulee. " + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "Le G-code a ete prepare pour une version plus recente du firmware. Continuer?" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" @@ -773,7 +853,7 @@ msgid "Heating" msgstr "Chauffe" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Chauffe desactivee\npar le compteur de\nsecurite." @@ -783,27 +863,32 @@ msgid "Heating done." msgstr "Chauffe terminee." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Bonjour, je suis\nvotre imprimante\nOriginal Prusa i3.\nVoulez-vous que je\nvous guide a travers\nle processus\nd'installation ?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Config HW" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Je vais maintenant\nlancer la\ncalibration xyz.\nCela prendra 12 min\nenviron." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Je vais maintenant\nlancer la\ncalibration z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Je vais commencer a \nimprimer une ligne\net vous baisserez au\nfur et a mesure la\nbuse en tournant le\nbouton jusqu'a\natteindre la hauteur\noptimale. Regardez\nles photos dans\nnotre manuel au\nchapitre Calibration" @@ -813,7 +898,7 @@ msgid "Improving bed calibration point" msgstr "Amelioration du point de calibration du lit" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Ecran d'info" @@ -823,7 +908,7 @@ msgid "Init. SD card" msgstr "Init. carte SD" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Inserez le filament" @@ -848,27 +933,32 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Inserez le filament\ndans l'extrudeur 4.\nCliquez une fois\npret." # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR :" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "Le filament 1 est-il charge ?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Le filament est-il\ncharge ?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "Est-ce du filament\nPLA ?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "Le filament PLA\nest-il charge ?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Feuille d'acier sur\nplateau chauffant ?" @@ -883,27 +973,27 @@ msgid "KILLED. " msgstr "TUE." # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Derniere impression" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Echecs derniere impr" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Gauche" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Ventilo tete gauche?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" msgstr "Gauche [um]" @@ -913,7 +1003,7 @@ msgid "Left:" msgstr "Gauche :" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Correction lin." @@ -923,7 +1013,7 @@ msgid "Live adjust Z" msgstr "Ajuster Z en direct" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Tout charger" @@ -958,12 +1048,12 @@ msgid "Load filament 5" msgstr "Charger fil. 5" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "Charger dans la buse" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Chargement couleur" @@ -973,7 +1063,7 @@ msgid "Loading filament" msgstr "Chargement filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Poulie lache" @@ -993,7 +1083,7 @@ msgid "M109 Invalid extruder " msgstr "M109 extrudeur invalide" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Cal. 1ere couche" @@ -1012,8 +1102,23 @@ msgstr "M218 extrudeur invalide" msgid "M221 Invalid extruder " msgstr "M221 extrudeur invalide" +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Comp. aimants [On]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Comp. aimants[N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Comp. aimants[Off]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Principal" @@ -1023,7 +1128,7 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Marquez le filament\na 100 mm du corps de\nl'extrudeur. Cliquez\nune fois fait." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" msgstr "Deviation mesuree" @@ -1033,32 +1138,67 @@ msgid "Measured skew:" msgstr "Ecart mesure :" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Mesure de la hauteur de reference du point de calibration" +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Mesh [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Mesh [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Mesh Bed Leveling" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Mesh bed leveling" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 detecte sur imprimante MK3S" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detecte sur imprimante MK3" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "Echec MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "Echec chargement MMU" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "Echecs charg. MMU" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "Mode MMU [Normal]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "Mode MMU [Furtif]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "Le MMU necessite l'attention de l'utilisateur." @@ -1068,82 +1208,102 @@ msgid "MMU needs user attention. Fix the issue and then press button on MMU unit msgstr "La MMU requiert votre attention. Réglez le problème puis appuyez sur le bouton on sur l'unité MMU." # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Reprise de la position ..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Remontee en\ntemperature..." # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Reprise ..." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "Echecs alim. MMU" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU2 connecte" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Mode [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Mode [silencieux]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Mode [Furtif]" +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Changement de mode en cours..." + # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" msgstr "Mode [puiss.auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Mode [haute puiss]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Modele [aucune]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Modele [avert]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Modele [stricte]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Moteur" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Deplacer l'axe" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" msgstr "Deplacer X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" msgstr "Deplacer Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" msgstr "Deplacer Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "N/A" @@ -1153,7 +1313,7 @@ msgid "New firmware version available:" msgstr "Nouvelle version de\nfirmware disponible:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Non" @@ -1168,12 +1328,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Pas de checksum avec\nnumero de ligne, \nDerniere ligne :" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Pas de mouvement." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "Pas de carte SD" @@ -1183,37 +1343,67 @@ msgid "No thermistors - no temperature" msgstr "Pas de thermistors\n- pas de temperature" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Non connecte" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Ne tourne pas" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Maintenant je vais\ncalibrer la distance \nentre la pointe de\nla buse et la\nsurface du plateau\nchauffant." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais\nprechauffer la buse\npour du PLA." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la feuille d'acier." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Buse" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Buse [aucune]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Buse [avert]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Buse [stricte]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Diam. buse [0.25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Diam. buse [0.40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Diam. buse [0.60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Ventilateur buse" @@ -1238,7 +1428,7 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Anciens reglages\ntrouves. Le PID, les\nEsteps etc. par\ndefaut seront regles" @@ -1258,7 +1448,7 @@ msgid "openRoot failed" msgstr "Echec openRoot" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Pause de l'impr." @@ -1268,42 +1458,47 @@ msgid "Pick print" msgstr "Choisir impression" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "Calib. PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "Calib. PID terminee" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "Calibration PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA :" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Placez une feuille\nde papier sous la\nbuse pendant la\ncalibration des 4\npremiers points.\nSi la buse accroche\nle papier, eteignez\nvite l'imprimante." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Verifiez :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Merci de verifier\nnotre manuel et de\ncorriger le\nprobleme. Poursuivez\nalors l'assistant en\nredemarrant\nl'imprimante." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Nettoyez le plateau\nchauffant et appuyez\nsur le bouton." @@ -1313,12 +1508,12 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Nettoyez la buse\npour la calibration.\nCliquez une fois\nfait." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Inserez du filament\nPLA dans l'extrudeur\npuis appuyez sur le\nbouton pour le\ncharger." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Veuillez inserer du filament PLA dans le premier tube du MMU, et pressez sur le bouton pour le charger." @@ -1328,52 +1523,52 @@ msgid "Please load PLA filament and then resume Wizard by rebooting the printer. msgstr "Chargez le filament\nPLA et poursuivez\nl'assistant en\nredemarrant\nl'imprimante." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Chargez d'abord le\nfilament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Ouvrez l'idler et\nretirez le filament\nmanuellement." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Placez la feuille\nd'acier sur le\nplateau chauffant." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Appuyez sur le\nbouton pour \ndecharger le \nfilament" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Retirez\nimmediatement le\nfilament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Veuillez retirer le filament puis appuyez sur le bouton." # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Veuillez retirer d'abord les protections d'envoi." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Retirez la feuille\nd'acier du plateau\nchauffant." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Veuillez mettre a\njour le firmware de\nvotre MMU2. En\nattente d'un reset." @@ -1383,12 +1578,12 @@ msgid "Please upgrade." msgstr "Mettez a jour le FW." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Merci de patienter" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Coupures de courant" @@ -1398,27 +1593,37 @@ msgid "PowerUp" msgstr "Demarrage" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Prechauffage" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Prechauffage de la\nbuse. Merci de\npatienter." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Prechauffage pour couper" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Prechauffage pour ejecter" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" msgstr "Chauffe pour charger" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" msgstr "Chauffe pr decharger" @@ -1428,27 +1633,27 @@ msgid "Prepare new filament" msgstr "Preparez le filament" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Appuyez sur le\nbouton pour\nprechauffer la buse\net continuer." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "App. sur sur bouton" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Appuyez sur le bouton pour poursuivre la mise en temperature de la buse." # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Impression annulee" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Ventilo impression" @@ -1458,7 +1663,7 @@ msgid "Print FAN: " msgstr "Vent impr :" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Ventilo impr. :" @@ -1468,12 +1673,12 @@ msgid "Print from SD" msgstr "Impr depuis la SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Impression en pause" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Temps d'impression" @@ -1487,6 +1692,26 @@ msgstr "Temps d'impression :" msgid "Printer disconnected" msgstr "Impri. deconnectee" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "Version FW de l'imprimante differente du G-Code. Continuer ?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Version FW de l'imprimante differente du G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." + +# +#: util.cpp:506 +msgid "Printer G-code level differs from the G-code. Continue?" +msgstr "Niveau de G-Code de l'imprimante different du G-Code. Continuer ?" + +# +#: util.cpp:513 +msgid "Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Merci de verifier le parametre dans les reglages. Impression annulee." + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1722,26 @@ msgstr "Imprimante stoppee.\nkill() appelee !" msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "L'imprimante n'a pas\nencore ete calibree.\nSuivez le manuel,\nchapitre Premiers\npas, section\nProcessus de\ncalibration." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Modele d'imprimante different du G-Code. Continuer ?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Modele d'imprimante diffent du G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametre de la buse de l'imprimante different du G-Code. Continuer ?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Diametre de la buse de l'imprimante different du G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." + # MSG_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1757,11 @@ msgstr "Prusa i3 MK2 prete." msgid "Prusa i3 MK2.5 ready." msgstr "Prusa i3 MK2.5 prete." +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK." + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1773,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.com" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Arriere [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Recup. impression" @@ -1543,10 +1793,15 @@ msgid "Refresh" msgstr "Rafraichir" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Retirez l'ancien filament puis appuyez sur le bouton pour charger le nouveau." +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Renommer" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1818,32 @@ msgid "Resend: " msgstr "Renvoi :" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Reinitialiser" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "Reinit. calibr. XYZ" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Reprendre impression" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Reprise de l'impr." # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Droite" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Droite [um]" @@ -1603,22 +1858,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Tournez le bouton\njusqu'a ce que la\nmarque atteigne le\ncorps de\nl'extrudeur. Cliquez\nune fois fait." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "Port RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "Port RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Lancer l'Assistant\nsupprimera les\nresultats actuels de\ncalibration et\ncommencera du debut.\nContinuer ?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "Carte SD [normal]" @@ -1633,7 +1888,7 @@ msgid "SD card [FlshAir]" msgstr "Carte SD [FlashAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "Carte SD [flashAir]" @@ -1652,53 +1907,63 @@ msgstr "Octet d'impression de la SD" msgid "Searching bed calibration point" msgstr "Recherche du point de calibration du lit" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Selectionner" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Choisir langue" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "Selectionnez le filament PLA :" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Auto-test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Debut auto-test" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Auto-test" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Erreur auto-test !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Echec de l'auto-test" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Le Selftest sera\nlance pour calibrer\nla remise a zero\nprecise sans capteur" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Info capteur" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Etat capteur" @@ -1708,17 +1973,17 @@ msgid "Sensors info" msgstr "Infos capteurs" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Regler temp. :" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Reglages" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" msgstr "Deviation severe" @@ -1727,8 +1992,13 @@ msgstr "Deviation severe" msgid "Severe skew:" msgstr "Ecart severe :" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Feuille" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Afficher butees" @@ -1743,7 +2013,7 @@ msgid "Sleep..." msgstr "Repos..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" msgstr "Deviation legere" @@ -1753,15 +2023,30 @@ msgid "Slight skew:" msgstr "Leger ecart :" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Certains fichiers ne\nseront pas tries.\nMax 100 fichiers\ntries par dossier." # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problemes rencontres, nivellement de l'axe Z applique..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Tri [aucun]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Tri [date]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Tri [alphabet]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2088,132 @@ msgid "Sort: [time]" msgstr "Tri : [heure]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Tri des fichiers" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Son [fort]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Son [muet]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Son [une fois]" +# +#: +msgid "Sound [assist]" +msgstr "Son [Assist]" + +# +#: sound.h:9 +msgid "Sound [blind]" +msgstr "Son [aveugle]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Son [silencieux]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Vitesse" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Tourne" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [on]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [off]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Une temperature\nambiante stable de\n21-26C et un support\nstable sont requis." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiques" +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Plaques en acier" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Nombre de pas trop eleve :" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Arreter impression" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ARRETE." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Support" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Echange" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Calib. Temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Calib. Temp. [on]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Calib. Temp.[off]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Calibration temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Temperature" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Echec de la\ncalibration en\ntemperature" @@ -1923,12 +2223,12 @@ msgid "Temperature calibration has not been run yet" msgstr "La calibration en\ntemperature n'a pas\nencore ete lancee" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "La calibration en\ntemperature est\nterminee et activee.\nLa calibration en\ntemperature peut\netre desactivee dans\nle menu Reglages->\nCal. Temp." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Temperatures" @@ -1938,27 +2238,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Il y a encore besoin d'effectuer la calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "pour charger le fil." # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "pour decharger fil." # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Total" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Total des echecs" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Filament total" @@ -1968,7 +2268,7 @@ msgid "Total filament :" msgstr "Total filament :" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Temps total impr." @@ -1983,17 +2283,17 @@ msgid "TRIGGERED" msgstr "ACTIVE" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Regler" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "inconnu" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Decharger" @@ -2003,7 +2303,7 @@ msgid "Unload all" msgstr "Decharger tout" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Decharger fil." @@ -2028,22 +2328,22 @@ msgid "Unload filament 4" msgstr "Decharger fil. 4" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Dechargement fil." # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Utilisez decharger pour retirer le filament 1 s'il depasse du tube arriere du MMU. Utilisez ejecter s'il est cache dans le tube." # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Utilise pdt impr." # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Tensions" @@ -2053,32 +2353,37 @@ msgid "volume.init failed" msgstr "Echec volume.init" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Attente utilisateur..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "Attente du\nrefroidissement des\nbuse et plateau" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "Attente du\nrefroidissement de\nla sonde PINDA" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "ATTENTION :\nDetection de crash\ndesactivee en mode\nFurtif" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 msgid "Warning: both printer type and motherboard type changed." msgstr "Attention : Types\nd'imprimante et de\ncarte mere modifies" # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Attention : Type de\ncarte mere modifie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Attention : Type\nd'imprimante modifie" @@ -2088,17 +2393,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "ATTENTION : ceci est\nune build non\nofficielle et non\nsupportee. Utilisez\nla a votre propre\nrisque !" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" msgstr "Dechargement du\nfilament reussi ?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Erreur de cablage" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Assistant" @@ -2117,23 +2422,28 @@ msgstr "Ecriture dans le fichier :" msgid "X-correct" msgstr "Correction-X" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "Correct-X:" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "Details calib. XYZ" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibration XYZ OK.\nL'ecart sera corrige\nautomatiquement." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibration XYZ OK.\nLes axes X/Y sont\nlegerement non\nperpendiculaires.\nBon boulot !" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibration XYZ\ncompromise. Les\npoints de\ncalibration avant ne\nsont pas\natteignables." @@ -2143,17 +2453,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "Calibration XYZ\ncompromise. Le point\n de calibration\n avant gauche n'est\n pas atteignable." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibration XYZ\ncompromise. Le point\nde calibration avant\ndroit n'est pas\natteignable." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Echec calibration\nXYZ. Le point de\ncalibration du\nplateau n'a pas ete\ntrouve." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Echec calibration\nXYZ. Les points de\ncalibration avant ne\nsont pas\natteignables." @@ -2168,17 +2478,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Echec calibration\nXYZ. Consultez le\nmanuel." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Echec calibration\nXYZ. Le point de\ncalibration avant\ndroit n'est pas\natteignable." # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibration XYZ OK.\nLes axes X/Y sont\nperpendiculaires.\nFelicitations !" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Distance Y du min" @@ -2192,8 +2502,13 @@ msgstr "Distance Y du mini :" msgid "Y-correct" msgstr "Correction-Y" +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Correct-Y:" + # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Oui" @@ -2208,11 +2523,26 @@ msgid "You are using firmware beta version. This is development version. Using t msgstr "Vous utilisez un\nfirmware en version\nbeta. C'est une\nversion de dev.\nCeci n'est pas\nrecommande et peut\nendommager\nl'imprimante." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Vous pouvez toujours\nrelancer l'assistant\ndans Calibration->\nAssistant." +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Correct-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Sonde-Z num. [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Sonde-Z num. [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "Offset point [0;0]" diff --git a/lang/po/new/it.po b/lang/po/new/it.po index 17a88248..c226463b 100644 --- a/lang/po/new/it.po +++ b/lang/po/new/it.po @@ -17,6 +17,11 @@ msgstr "\e[2JRilev. impatto\e[1;0Hattivabile solo\e[2;0Hin Modalita normale" msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" msgstr "\e[2JATTENZIONE:\e[1;0HRilev. impatto\e[2;0Hdisattivato in\e[3;0HModalita silenziosa" +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr " 1" + # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 msgid " PlannerBufferBytes: " @@ -48,10 +53,15 @@ msgid " of 4" msgstr " su 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr "su 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr " [off]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,7 +78,7 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Annulla" @@ -77,33 +87,38 @@ msgstr ">Annulla" msgid "Adjusting Z" msgstr "Compensazione Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Compensazione Z:" + # MSG_ALL c=19 r=1 #: messages.c:11 msgid "All" msgstr "Tutti" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Nessun errore" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "e cliccare manopola" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Trova origine" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "Autocaric. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Caricamento auto. filam. disp. solo con il sensore attivo..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Il caricamento automatico e attivo, premete la manopola e inserite il filamento..." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Assi" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Lunghezza dell'asse" @@ -167,13 +182,18 @@ msgstr "Babystepping X" msgid "Babystepping Y" msgstr "Babystepping Y" +# +#: messages.c:57 +msgid "Back" +msgstr "Indietro" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Letto" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Letto/Riscald." @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Riscald. letto" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Correz. liv.letto" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Inizio lista file" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Stato delle cinghie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "C'e stato un Blackout. Recuperare la stampa?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Calibra" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Calibra E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Calibra XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Calibra Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Calibrazione Home" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrazione XYZ. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrazione Z. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Calibrazione" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Calibrazione completa" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Annulla" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "SD inserita" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "SD rimossa" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Cambia memoria SD" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Cambio riuscito!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Cambiato correttamente?" @@ -328,40 +348,45 @@ msgid "Changing filament!" msgstr "Cambiando filam." # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Verifica piano" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Verifica finecorsa" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Verifica ugello" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Controllo sensori" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Verifica asse X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Verifica asse Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Verifica asse Z" +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Controlli" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Scegliere filamento:" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Colore non puro" @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Copiare la lingua selezionata da XFLASH?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Impatto" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Rilevato impatto." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Scontro rilevato. Riprendere la stampa?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "Rilevamento impatto può\nessere attivato in\nModalità Normale" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Attuale" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Disabilita motori" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Distanza tra la punta dell'ugello e la superficie del letto non ancora imposta. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calibrazione primo layer." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Desideri ripetere l'ultimo passaggio per migliorare la distanza fra ugello e piatto?" @@ -462,13 +492,18 @@ msgstr "Calibrazione E terminata. Si prega di pulire l'ugello. Click per continu msgid "E-correct" msgstr "Correzione-E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "Correzione-E:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Espellere" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Espelli filamento " @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Espelli filamento 5" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "Espellendo filamento " @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Fine lista file" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Finecorsa" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Finecorsa fuori portata" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Finecorsa" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "accodamento\"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Errore - la memoria statica e stata sovrascritta" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "ERRORE:" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Estrusore 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventola estrusore:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Info estrusore" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "Autocar.filam[on]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "Autocar.fil.[N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "Autocar.fil.[off]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Statistiche fallimenti" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "Statistiche fallimenti MMU" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falso innesco" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Velocita ventola" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventola" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" -msgstr "Controllo ventole [on]" +msgstr "Control.vent[on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Control.vent[off]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "Risposta Sens. Fil. debole, disattivare? " # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Sensor filam[N/A]" @@ -663,7 +703,7 @@ msgid "Fil. sensor [off]" msgstr "Sensor filam[off]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" msgstr "Filam. esauriti" @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Filamento estruso & con il giusto colore?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Fil. non caricato" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Sensore filam." @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Sensore filam.:" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Filamento utilizzato" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Filamento usato:" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" @@ -717,53 +757,103 @@ msgstr "File aperto: " msgid "File selected" msgstr "File selezionato" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA:" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Finalizzando gli spostamenti" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [nessuno]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [avviso]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware [esatto]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Calibrazione primo layer." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Per primo avviero l'autotest per controllare gli errori di assemblaggio piu comuni." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Risolvi il problema e quindi premi il bottone sull'unita MMU. " # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flusso" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Ventola frontale?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Fronte [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventola frontale/sinistra" +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "G-code processato per un livello diverso. Continuare?" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata." + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-code processato per una stampante diversa. Continuare?" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "G-code processato per una stampante diversa. Per favore esegui nuovamente lo slice del modello. Stampa annullata." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-code processato per un firmware più recente. Continuare?" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "G-code processato per un firmware più recente. Per favore aggiorna il firmware. Stampa annullata." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Riscald./Termist." @@ -773,7 +863,7 @@ msgid "Heating" msgstr "Riscaldamento..." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." @@ -783,27 +873,32 @@ msgid "Heating done." msgstr "Riscald. completo" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Ciao, sono la tua stampante Original Prusa i3. Gradiresti un aiuto nel processo di configurazione?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Installazione HW" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Adesso avviero una Calibrazione XYZ. Puo durare circa 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Adesso iniziero a stampare una linea e tu dovrai abbassare l'ugello poco per volta ruotando la manopola sino a raggiungere una altezza ottimale. Per favore dai uno sguardo all'immagine del nostro manuale, cap.Calibrazione." @@ -813,7 +908,7 @@ msgid "Improving bed calibration point" msgstr "Perfezion. punto di calibraz. letto" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Schermata info" @@ -823,7 +918,7 @@ msgid "Init. SD card" msgstr "Inizializza scheda SD" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Inserire filamento" @@ -848,27 +943,32 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Inserire filamento nell'estrusore 4. Click per continuare" # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "Il filamento 1 e caricato?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Il filamento e stato caricato?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "E' un filamento di PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "E' stato caricato il filamento di PLA?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "La piastra d'acciaio e sul piano riscaldato?" @@ -883,29 +983,29 @@ msgid "KILLED. " msgstr "IN TILT." # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Ultima stampa" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Fallimenti ultima stampa" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Sinistra" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Vent SX hotend?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" -msgstr "Lato sinistro [um]" +msgstr "Sinistra [um]" # MSG_LEFT c=12 r=1 #: ultralcd.cpp:2308 @@ -913,7 +1013,7 @@ msgid "Left:" msgstr "Sinistra:" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Correzione lin." @@ -923,7 +1023,7 @@ msgid "Live adjust Z" msgstr "Compensazione Z" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Caricare tutti" @@ -958,12 +1058,12 @@ msgid "Load filament 5" msgstr "Caricare fil. 5" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "Carica ugello" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Caricando colore" @@ -973,7 +1073,7 @@ msgid "Loading filament" msgstr "Caricando filamento" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Puleggia lenta" @@ -993,7 +1093,7 @@ msgid "M109 Invalid extruder " msgstr "M109 Estrusore non valido" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Calibrazione primo layer." @@ -1012,8 +1112,23 @@ msgstr "M218 Estrusore non valido" msgid "M221 Invalid extruder " msgstr "M221 Estrusore non valido" +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Comp. Magneti [on]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Comp. Magneti [N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Comp. Magneti [off]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu principale" @@ -1023,9 +1138,9 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Segnare il filamento a 100 mm di distanza dal corpo dell'estrusore. Click per continuare." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" -msgstr "Disassamento misurato" +msgstr "Deviazione misurata" # MSG_MEASURED_SKEW c=15 r=1 #: ultralcd.cpp:2335 @@ -1033,32 +1148,67 @@ msgid "Measured skew:" msgstr "Distorsione misurata:" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Griglia [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Griglia [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Mesh livel. letto" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Mesh livel. letto" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Rilevato firmware MK3 su stampante MK3S" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S rilevato su stampante MK3" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "Fallimenti MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "Caricamento MMU fallito" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "Caricamenti MMU falliti" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "Modalità MMU [Normale]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "Modalità MMU [Silenziosa]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "Il MMU richiede attenzione dall'utente." @@ -1068,82 +1218,102 @@ msgid "MMU needs user attention. Fix the issue and then press button on MMU unit msgstr "MMU richiede l'attenzione dell'utente. Risolvi il problema e quindi premi il bottone sull'unità MMU. " # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. riprendendo la posizione... " # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Ripristino temperatura... " # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Riprendendo... " # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "Mancanza corrente MMU" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU2 connessa" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modo [normale]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modo [silenzioso]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modo [Silenziosa]" +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Cambio modalità in corso ..." + # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" msgstr "Modo [auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Mode [forte]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Modello [nessuno]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Modello [avviso]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Modello [esatto]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Motore" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Muovi asse" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" -msgstr "Muovi X" +msgstr "Sposta X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" -msgstr "Muovi Y" +msgstr "Sposta Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" -msgstr "Muovi Z" +msgstr "Sposta Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "N/A" @@ -1153,7 +1323,7 @@ msgid "New firmware version available:" msgstr "Nuova versione firmware disponibile:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "No" @@ -1168,12 +1338,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Nessun checksum con numero di riga, ultima riga:" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Nessun movimento." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "Nessuna SD" @@ -1183,37 +1353,67 @@ msgid "No thermistors - no temperature" msgstr "No termistore - no temperatura" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Non connesso" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Non gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Adesso calibro la distanza fra ugello e superfice del piatto." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Ugello" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Ugello [nessuno]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Ugello [avviso]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Ugello [esatto]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Diam. Ugello [0.25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Diam. Ugello [0.40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Diam. Ugello [0.60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Ventola estrusore" @@ -1238,9 +1438,9 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati" +msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." # MSG_ENDSTOP_OPEN #: messages.c:29 @@ -1258,7 +1458,7 @@ msgid "openRoot failed" msgstr "openRoot fallito" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Metti in pausa" @@ -1268,42 +1468,47 @@ msgid "Pick print" msgstr "Scegli stampa" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "Calibrazione PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "Calib. PID completa" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "Calibrazione PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA:" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Posizionare un foglio sotto l'ugello durante la calibrazione dei primi 4 punti. In caso l'ugello muova il foglio spegnere subito la stampante." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Verifica:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Per favore consulta il nostro manuale per risolvere il problema. Poi riprendi il Wizard dopo aver riavviato la stampante." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Per favore pulisci il piatto, poi premi la manopola." @@ -1313,12 +1518,12 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pulire l'ugello per la calibrazione, poi fare click." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Per favore inserisci il filamento di PLA nell'estrusore, poi premi la manopola per caricare." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Per favore inserite del filamento PLA nel primo tubo del MMU, poi premete la manopola per caricarlo." @@ -1328,52 +1533,52 @@ msgid "Please load PLA filament and then resume Wizard by rebooting the printer. msgstr "Per favore carica filamento di PLA e riprendi il Wizard dopo aver riavviato la stampante." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Per favore prima carica il filamento di PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Aprire la guida filam. e rimuovere il filam. a mano" # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Per favore posizionate la piastra d'acciaio sul piano riscaldato." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Premete la manopola per scaricare il filamento " # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Estrarre il filamento immediatamente" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Rimuovi il filamento e quindi premi la manopola. " # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Per favore rimuovete i materiali da spedizione" # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Rimuovete la piastra di acciaio dal piano riscaldato" # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima. " # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Aggiorna il firmware sul tuo MMU2. In attesa di reset. " @@ -1383,12 +1588,12 @@ msgid "Please upgrade." msgstr "Prego aggiornare." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Attendere" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Mancanza corrente" @@ -1398,27 +1603,37 @@ msgid "PowerUp" msgstr "Accendi" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Preriscalda" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Preriscaldando l'ugello. Attendere prego." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Preriscaldamento per taglio" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Preriscaldamento per espulsione" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" msgstr "Preriscaldamento per caricare" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" msgstr "Preriscaldamento per scaricare" @@ -1428,27 +1643,27 @@ msgid "Prepare new filament" msgstr "Preparare il nuovo filamento" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "Premere la manopola" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Premete la manopola per recuperare la temperatura dell'ugello." # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Stampa interrotta" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Ventola di stampa" @@ -1458,7 +1673,7 @@ msgid "Print FAN: " msgstr "Ventola di stampa:" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Ventola di stampa:" @@ -1468,12 +1683,12 @@ msgid "Print from SD" msgstr "Stampa da SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Stampa in pausa" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Tempo di stampa" @@ -1487,6 +1702,26 @@ msgstr "Tempo di stampa:" msgid "Printer disconnected" msgstr "Stampante sconnessa" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "Versione FW stampante diversa dal G-Code. Continuare?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Versione FW stampante diversa dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." + +# +#: util.cpp:506 +msgid "Printer G-code level differs from the G-code. Continue?" +msgstr "Il livello G-code della stampante è diverso dal G-Code. Continuare?" + +# +#: util.cpp:513 +msgid "Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Il livello G-code della stampante è diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1732,26 @@ msgstr "Stampante ferma. kill () chiamato!" msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Stampante non ancora calibrata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Modello stampante diversa dal G-Code. Continuare?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Il modello stampante è diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametro ugello diverso da G-Code. Continuare?" + +# +#: util.cpp:397 +msgid "Printer 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." + # MSG_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1767,11 @@ msgstr "Prusa i3 MK2 pronta." msgid "Prusa i3 MK2.5 ready." msgstr "Prusa i3 MK2.5 ready." +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK." + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1783,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.com" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Retro [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Recupero stampa" @@ -1543,10 +1803,15 @@ msgid "Refresh" msgstr "Refresh" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Rimuovi il filamento precedente e premi la manopola per caricare il nuovo filamento. " +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Rinomina" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1828,32 @@ msgid "Resend: " msgstr "Invia di nuovo: " # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Reset" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "Reset calibrazione XYZ." # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Riprendi stampa" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Riprendi stampa" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Destra" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Destra [um]" @@ -1603,22 +1868,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Ruota la manopola finchè il segno raggiunga il corpo dell'estrusore. Clicca per continuare." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "Porta RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "Porta RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Se avvi il Wizard perderai la calibrazione preesistente e dovrai ricominciare dall'inizio. Continuare?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "Mem. SD [normale]" @@ -1633,7 +1898,7 @@ msgid "SD card [FlshAir]" msgstr "Mem. SD [FlashAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "Mem. SD [flshAir]" @@ -1652,53 +1917,63 @@ msgstr "SD stampa byte " msgid "Searching bed calibration point" msgstr "Ricerca dei punti di calibrazione del piano" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Seleziona" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Seleziona lingua" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "Selezionate filamento PLA:" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Autotest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Avvia autotest" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Autotest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Errore Autotest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Autotest fallito" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Info Sensore" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Stato sensore" @@ -1708,27 +1983,32 @@ msgid "Sensors info" msgstr "Info Sensori" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Imposta temperatura:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Impostazioni" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" -msgstr "Disassamento grave" +msgstr "Deviazione grave" # MSG_SEVERE_SKEW c=15 r=1 #: ultralcd.cpp:2346 msgid "Severe skew:" msgstr "Distorsione grave:" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Piano" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Stato finecorsa" @@ -1743,9 +2023,9 @@ msgid "Sleep..." msgstr "Sospensione..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" -msgstr "Disassamento lieve" +msgstr "Deviazione lieve" # MSG_SLIGHT_SKEW c=15 r=1 #: ultralcd.cpp:2342 @@ -1753,15 +2033,30 @@ msgid "Slight skew:" msgstr "Distorsione leggera:" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati." # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Ordina [nessuno]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Ordina [tempo]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Ordine [alfabetico]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2098,132 @@ msgid "Sort: [time]" msgstr "Ordina: [time]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Ordinando i file" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Suono [forte]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Suono [mute]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Suono [singolo]" +# +#: +msgid "Sound [assist]" +msgstr "Suono [assistito]" + +# +#: sound.h:9 +msgid "Sound [blind]" +msgstr "Suono [cieco]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Suono[silenzioso]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Velocita" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Gira" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [on]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [off]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Sono necessari una temperatura ambiente di 21-26C e una superficie rigida " # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiche" +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Piani d'acciaio" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Velocità passo troppo alta: " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Arresta stampa" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ARRESTATO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Supporto" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Scambiato" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Calib. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Calib. temp. [ON]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Calib. temp.[OFF]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Calib. Temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Temperatura" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Calibrazione temperatura fallita" @@ -1923,12 +2233,12 @@ msgid "Temperature calibration has not been run yet" msgstr "Calibrazione della temperatura non ancora eseguita" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Temperature" @@ -1938,27 +2248,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. " # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "per caricare il filamento" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "per scaricare il filamento" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Totale" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Totale fallimenti" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Filamento totale" @@ -1968,7 +2278,7 @@ msgid "Total filament :" msgstr "Filamento tot:" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Tempo di stampa totale" @@ -1983,17 +2293,17 @@ msgid "TRIGGERED" msgstr "ATTIVATO" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Regola" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "sconosciuto" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Scarica" @@ -2003,9 +2313,9 @@ msgid "Unload all" msgstr "Rilasciare tutti" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" -msgstr "Scarica filam." +msgstr "Scarica filamento" # MSG_UNLOAD_FILAMENT_1 c=17 #: ultralcd.cpp:5406 @@ -2028,22 +2338,22 @@ msgid "Unload filament 4" msgstr "Scarica filam. 4" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Scaricando filamento" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Usate lo scaricamento per rimuovere il filamento 1 se protrude dal retro del tubo posteriore del MMu. Utilizzate l'espulsione se e nascosto nel tubo." # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Usati nella stampa" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Voltaggi" @@ -2053,32 +2363,37 @@ msgid "volume.init failed" msgstr "volume.init fallito" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Attendendo utente..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "In attesa del raffreddamento dell'ugello e del piano" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "ATTENZIONE:\nRilevamento impatto\ndisattivato in\nModalità Silenziosa" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 msgid "Warning: both printer type and motherboard type changed." msgstr "Attenzione: tipo di stampante e di scheda madre cambiati." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Avviso: tipo di scheda madre cambiato" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." @@ -2088,17 +2403,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "ATTENZIONE: Questo è un build non ufficiale, non supportato. Utilizzatelo a vostro rischio!" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Errore cablaggio" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Wizard" @@ -2117,23 +2432,28 @@ msgstr "Scrittura su file: " msgid "X-correct" msgstr "Correzione-X" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "Correzione-X:" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibrazione XYZ corretta. La distorsione verra compensata automaticamente." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazione XYZ compromessa. Punti anteriori non raggiungibili." @@ -2143,17 +2463,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore sinistro non raggiungibile." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibrazione XYZ fallita. Il punto di calibrazione sul letto non e' stato trovato." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." @@ -2168,17 +2488,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibrazione XYZ OK. Gli assi X/Y sono perpendicolari. Complimenti!" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Distanza Y dal min" @@ -2192,8 +2512,13 @@ msgstr "Distanza Y da min:" msgid "Y-correct" msgstr "Correzione-Y" +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Correzione-Y:" + # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Si" @@ -2208,11 +2533,26 @@ msgid "You are using firmware beta version. This is development version. Using t msgstr "State utilizzando una versione beta del firmware. Questa versione è in via di sviluppo. L'utilizzo non è raccomandato e potrebbe causare danni alla stampante." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "E possibile riprendere il Wizard in qualsiasi momento attraverso Calibrazione -> Wizard." +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Correzione-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-probe nr. [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Z-probe nr. [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "[0;0] punto offset" diff --git a/lang/po/new/pl.po b/lang/po/new/pl.po index 5596bc2c..e30df0e0 100644 --- a/lang/po/new/pl.po +++ b/lang/po/new/pl.po @@ -17,6 +17,11 @@ msgstr "\e[2JWykrywanie zderzen moze\e[1;0Hbyc wlaczone tylko w\e[2;0Htrybie Nor msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" msgstr "\e[2JUWAGA:\e[1;0HWykrywanie zderzen\e[2;0Hwylaczone w\e[3;0Htrybie Stealth" +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr "1" + # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 msgid " PlannerBufferBytes: " @@ -48,10 +53,15 @@ msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " z 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "[wyl]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,7 +78,7 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Anuluj" @@ -77,35 +87,40 @@ msgstr ">Anuluj" msgid "Adjusting Z" msgstr "Dostrajanie Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Ustawianie Z:" + # MSG_ALL c=19 r=1 #: messages.c:11 msgid "All" msgstr "Wszystko" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Wszystko OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Otoczenie" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "i nacisnij pokretlo" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" -msgstr "Obydwa konce osi dojechaly do gornych ogranicznikow?" +msgstr "Obydwa konce osi sa na szczycie?" # MSG_ADJUSTZ #: ultralcd.cpp:2600 @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Auto zerowanie" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "AutoLadowanie fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Autoladowanie filamentu dostepne tylko gdy czujnik filamentu jest wlaczony..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Autoladowanie filamentu wlaczone, nacisnij pokretlo i wsun filament..." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Os" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Dlugosc osi" @@ -167,13 +182,18 @@ msgstr "Babystepping X" msgid "Babystepping Y" msgstr "Babystepping Y" +# +#: messages.c:57 +msgid "Back" +msgstr "Wstecz" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Stol" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Stol / Grzanie" @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Grzanie stolu.." # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Korekta poziomowania stolu" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Poczatek listy plikowogranicznikow" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Stan paskow" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia. Kontynowac?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Kalibruj" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Kalibruj E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Kalibruj Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Zerowanie osi" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Kalibracja XYZ. Przekrec pokretlo, aby przesunac os Z do gornych ogranicznikow. Nacisnij, by potwierdzic." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Kalibruje Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Kalibracja XYZ. Przekrec pokretlo, aby przesunac os Z do gornych ogranicznikow. Nacisnij, by potwierdzic." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibracja" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Kalibracja OK" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Anuluj" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "Karta wlozona" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Karta wyjeta" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Wymien karte SD" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Wymiana ok!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Wymiana ok?" @@ -328,40 +348,45 @@ msgid "Changing filament!" msgstr "Wymiana filamentu!" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Kontrola stolu" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Kontrola krancowek" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Kontrola hotendu" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Sprawdzanie czujnikow" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Kontrola osi X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Kontrola osi Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Kontrola osi Z" +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Testy" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Wybierz filament:" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Kolor zanieczysz." @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Skopiowac wybrany jezyk z XFLASH?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Zderzenie" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Zderzenie wykryte" # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Wykryto zderzenie. Wznowic druk?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "Wykrywanie zderzen\nmoze byc wlaczone tylko\nw trybie Normalnym" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Aktualne" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Wylaczenie silnikow" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie z instrukcja: rozdzial Wprowadzenie - Kalibracja pierwszej warstwy." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Chcesz powtorzyc ostatni krok i ponownie ustawic odleglosc miedzy dysza a stolikiem?" @@ -462,13 +492,18 @@ msgstr "Kalibracja E zakonczona. Oczysc dysze i potwierdz naciskajac pokretlo. " msgid "E-correct" msgstr "Korekcja E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "Korekcja-E:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Wysun" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Wysun filament" @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Wysun filament 5" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "Wysuwanie filamentu" @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Koniec listy plikow" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Krancowka" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Krancowki" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "kolejkowanie \"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Blad - pamiec statyczna zostala nadpisana" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "BLAD:" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Ekstruder 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Went. ekstrudera:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Informacje o ekstruderze" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "Autolad. fil [wl]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "Autolad.fil.[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "Autolad.fil.[wyl]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Statystyki bledow" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "Bledy MMU" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falszywy alarm" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Predkosc went." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test wentylatora" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" msgstr "Sprawd.went. [wl]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Sprawd.went.[wyl]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "Reakcja czujnika slaba, wylaczyc?" # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Czuj. filam.[N/D]" @@ -663,7 +703,7 @@ msgid "Fil. sensor [off]" msgstr "Czuj. filam.[wyl]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" msgstr "Konc. filamentu" @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Filament wychodzi z dyszy a kolor jest czysty?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Czujnik filamentu" @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Czujnik filamentu:" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Uzyty filament" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Uzywany filament:" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" @@ -717,53 +757,103 @@ msgstr "Otwarty plik:" msgid "File selected" msgstr "Wybrano plik" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA:" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Konczenie druku" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [brak]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [ostrzez.]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware [restr.]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Kal. 1. warstwy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Rozwiaz problem i wcisnij przycisk na MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Przeplyw" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Przedni went. druku?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Przod [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Przedni/lewy wentylator" +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "G-code pociety na innym poziomie. Kontynuowac?" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany." + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-code pociety dla innej drukarki. Kontynuowac?" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-code pociety dla nowszego firmware. Kontynuowac?" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" @@ -773,7 +863,7 @@ msgid "Heating" msgstr "Grzanie..." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" @@ -783,27 +873,32 @@ msgid "Heating done." msgstr "Grzanie zakonczone" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Czesc, jestem Twoja drukarka Original Prusa i3. Czy potrzebujesz pomocy z ustawieniem?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Ustawienia HW" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Przeprowadze teraz kalibracje XYZ. Zajmie ok. 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Zaczne drukowac linie. Stopniowo opuszczaj dysze przekrecajac pokretlo, poki nie uzyskasz optymalnej wysokosci. Sprawdz obrazki w naszym Podreczniku w rozdz. Kalibracja" @@ -813,7 +908,7 @@ msgid "Improving bed calibration point" msgstr "Poprawiam precyzje punktu kalibracyjnego" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Ekran informacyjny" @@ -823,7 +918,7 @@ msgid "Init. SD card" msgstr "Inicjalizacja karty SD" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Wprowadz filament" @@ -848,27 +943,32 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Wloz filament do ekstrudera 4. Potwierdz naciskajac pokretlo." # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "Filament 1 zaladowany?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "Czy to filament PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "Fialment PLA jest zaladowany?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Czy plyta stal. jest na podgrzew. stole?" @@ -883,27 +983,27 @@ msgid "KILLED. " msgstr "PRZERWANE." # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Ost. wydruk" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Ostatnie bledy druku" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Lewa" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Lewy went hotendu?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" msgstr "Lewo [um]" @@ -913,7 +1013,7 @@ msgid "Left:" msgstr "Lewo:" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Korekcja lin." @@ -923,7 +1023,7 @@ msgid "Live adjust Z" msgstr "Ustaw. Live Z" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Zalad. wszystkie" @@ -958,12 +1058,12 @@ msgid "Load filament 5" msgstr "Laduj filament 5" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Czyszcz. koloru" @@ -973,7 +1073,7 @@ msgid "Loading filament" msgstr "Laduje filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Luzne kolo pasowe" @@ -993,7 +1093,7 @@ msgid "M109 Invalid extruder " msgstr "M109 Nieprawidlowy ekstruder" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Kal. 1. warstwy" @@ -1012,8 +1112,23 @@ msgstr "M218 Nieprawidlowy ekstruder" msgid "M221 Invalid extruder " msgstr "M221 Nieprawidlowy ekstruder" +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Kor. magnesow[wl]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Kor. magnesow[nd]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Kor. magnesow[wyl]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu glowne" @@ -1023,7 +1138,7 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Zaznacz filament na wysokosci 100 mm od korpusu ekstrudera i potwierdz naciskajac pokretlo." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" msgstr "Zmierzony skos" @@ -1033,32 +1148,67 @@ msgid "Measured skew:" msgstr "Zmierzony skos:" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Siatka [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Siatka [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu wg siatki" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Poziomowanie wg siatki" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Wykryto firmware MK3 w drukarce MK3S" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Wykryto firmware MK3S w drukarce MK3" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "Bledy MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "Blad ladowania MMU" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "Bledy ladow. MMU" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "Tryb MMU [Normalny]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "Tryb MMU [Stealth]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU wymaga uwagi uzytkownika." @@ -1068,82 +1218,102 @@ msgid "MMU needs user attention. Fix the issue and then press button on MMU unit msgstr "MMU wymaga uwagi. Napraw usterke i wcisnij przycisk na korpusie MMU." # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Wznawianie pozycji." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Wznawiam nagrzewanie..." # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Wznawianie..." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "Zaniki zasil. MMU" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU podlaczone" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Tryb [normalny]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Tryb [cichy]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Tryb [Stealth]" +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Trwa zmiana trybu..." + # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" msgstr "Tryb [automatycz]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Tryb[wysoka wyd.]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Model [brak]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Model [ostrzez.]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Model [restrykc.]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Silnik" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Ruch osi" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" msgstr "Ruch osi X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" msgstr "Ruch osi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" msgstr "Ruch osi Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "N/D" @@ -1153,7 +1323,7 @@ msgid "New firmware version available:" msgstr "Dostepna nowa wersja firmware:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Nie" @@ -1168,12 +1338,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Brak sumy kontrolnej z numerem linii, ostatnia linia:" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Brak ruchu." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "Brak karty SD" @@ -1183,37 +1353,67 @@ msgid "No thermistors - no temperature" msgstr "Brak termistorow - brak odczytu temperatury" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nie podlaczono " # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Nie kreci sie" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Kalibruje odleglosc miedzy koncowka dyszy a powierzchnia druku." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Dysza" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Dysza [brak]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Dysza [ostrzez.]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Dysza [restrykc.]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Sr. dyszy [0,25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Sr. dyszy [0,40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Sr. dyszy [0,60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Went. hotendu" @@ -1238,7 +1438,7 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." @@ -1258,7 +1458,7 @@ msgid "openRoot failed" msgstr "niepowodzenie openRoot " # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Wstrzymanie wydruku" @@ -1268,42 +1468,47 @@ msgid "Pick print" msgstr "Wybierz wydruk" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "Kalibracja PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "Kalibracja PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA:" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 msgid "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." msgstr "Umiesc kartke papieru na stole roboczym i podczas pomiaru pierwszych 4 punktow. Jesli dysza zahaczy o papier, natychmiast wylacz drukarke." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Sprawdz :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Przeczytaj nasz Podrecznik druku 3D aby naprawic problem. Potem wznow Asystenta przez restart drukarki." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." @@ -1313,12 +1518,12 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidl. kalibracji nalezy oczyscic dysze. Potw. guzikiem." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Umiesc filament PLA w ekstruderze i nacisnij pokretlo, aby zaladowac." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Wsun filament PLA do pierwszej rurki MMU i nacisnij pokretlo aby go zaladowac." @@ -1328,52 +1533,52 @@ msgid "Please load PLA filament and then resume Wizard by rebooting the printer. msgstr "Zaladuj filament PLA i przywroc Asystenta przez restart drukarki." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Najpierw zaladuj filament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Prosze umiescic plyte stalowa na stole podgrzewanym." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Wyciagnij filament teraz" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Wyciagnij filament i wcisnij pokretlo." # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Prosze zdjac plyte stalowa z podgrzewanego stolu." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Prosze najpierw uruchomic kalibracje XYZ" # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Prosze zaktualizowac Firmware MMU2. Czekam na reset." @@ -1383,12 +1588,12 @@ msgid "Please upgrade." msgstr "Prosze zaktualizowac." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Prosze czekac" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Zaniki zasilania" @@ -1398,27 +1603,37 @@ msgid "PowerUp" msgstr "Uruchamianie" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Grzanie" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Nagrzewanie dyszy. Prosze czekac." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Nagrzewanie do obciecia" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Nagrzewanie do wysuniecia" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" msgstr "Nagrzew. do ladowania" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" msgstr "Nagrzew. do rozlad." @@ -1428,27 +1643,27 @@ msgid "Prepare new filament" msgstr "Przygotuj filament" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "Wcisnij pokretlo" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Druk przerwany" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Went. wydruku" @@ -1458,7 +1673,7 @@ msgid "Print FAN: " msgstr "Went. wydr:" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Went. wydruku:" @@ -1468,12 +1683,12 @@ msgid "Print from SD" msgstr "Druk z karty SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Druk wstrzymany" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Czas druku" @@ -1487,6 +1702,26 @@ msgstr "Czas druku: " msgid "Printer disconnected" msgstr "Drukarka rozlaczona" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "Wersja FW drukarki rozni sie w G-code. Kontynuowac?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "FW drukarki rozni sie od tego w G-code. Sprawdz ustawienia. Druk anulowany." + +# +#: util.cpp:506 +msgid "Printer G-code level differs from the G-code. Continue?" +msgstr "Poziom G-code drukarki rozni sie od pliku G-code. Kontynuowac?" + +# +#: util.cpp:513 +msgid "Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Poziom G-code drukarki rozni sie od pliku G-code. Sprawdz ustawienia. Druk anulowany" + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1732,26 @@ msgstr "Drukarka zatrzymana. Wywolano komende kill()!" msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Drukarka nie zostala jeszcze skalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Model drukarki rozni sie od tego w G-code. Kontynuowac?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Model drukarki rozni sie od tego w G-code. Sprawdz ustawienia. Druk anulowany." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." + # MSG_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1767,11 @@ msgstr "Prusa i3 MK2 gotowa" msgid "Prusa i3 MK2.5 ready." msgstr "Prusa i3 MK2.5 gotowa" +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK" + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1783,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.com" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Tyl [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Wznawianie wydruku" @@ -1543,10 +1803,15 @@ msgid "Refresh" msgstr "Odswiez" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Zmien nazwe" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1828,32 @@ msgid "Resend: " msgstr "Wyslij ponownie:" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Reset" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Wznowic wydruk" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Wznawianie druku" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Prawa" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Prawo [um]" @@ -1603,22 +1868,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Obracaj pokretlo az znacznik zrowna sie z korpusem ekstrudera i potwierdz naciskajac pokretlo." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "Port RPi [wl]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "Port RPi [wyl]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Wlaczenie Asystenta usunie obecne dane kalibracyjne i zacznie od poczatku. Kontynuowac?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "Karta SD [normal]" @@ -1633,7 +1898,7 @@ msgid "SD card [FlshAir]" msgstr "Karta SD [FlashAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "Karta SD[FlshAir]" @@ -1652,53 +1917,63 @@ msgstr "SD printing byte " msgid "Searching bed calibration point" msgstr "Szukam punktu kalibracyjnego na stole" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Wybierz" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Wybor jezyka" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "Wybierz filament PLA:" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Selftest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Rozpoczynanie Selftestu" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Blad selftest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Selftest nieudany" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Info o sensorach" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Stan czujnikow" @@ -1708,17 +1983,17 @@ msgid "Sensors info" msgstr "Info o czujnikach" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Ustaw. temperatury:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Ustawienia" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" msgstr "Znaczny skos" @@ -1727,8 +2002,13 @@ msgstr "Znaczny skos" msgid "Severe skew:" msgstr "Powazny skos:" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plyta" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Pokaz krancowki" @@ -1743,7 +2023,7 @@ msgid "Sleep..." msgstr "Czuwanie..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" msgstr "Lekki skos" @@ -1753,15 +2033,30 @@ msgid "Slight skew:" msgstr "Lekki skos:" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z ..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Sortowanie [brak]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Sortowanie [czas]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Sort. [alfabet]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2098,132 @@ msgid "Sort: [time]" msgstr "Sortuj: [czas]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Sortowanie plikow" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Dzwiek [Glosny]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Dzwiek[Wylaczony]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Dzwiek [1-raz]" +# +#: +msgid "Sound [assist]" +msgstr "Dzwiek [asyst.]" + +# +#: sound.h:9 +msgid "Sound [blind]" +msgstr "Dzwiek[niewidomy]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Dzwiek [Cichy]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Predkosc" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Kreci sie" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [wl]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [nd]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [wyl]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statystyki" +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Plyty stalowe" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Liczba krokow zbyt wysoka:" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" -msgstr "Zatrzymac druk" +msgstr "Przerwanie druku" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ZATRZYMANO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Wsparcie" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Zamieniono" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Kalibracja temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Kalibr. temp.[wl]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Kalibr.temp.[wyl]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Kalibracja temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Temperatura" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Kalibracja temperaturowa nieudana" @@ -1923,12 +2233,12 @@ msgid "Temperature calibration has not been run yet" msgstr "Kalibracja temperaturowa nie zostala jeszcze przeprowadzona" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Kalibracja temperaturowa zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -> Kalibracja temp." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Temperatury" @@ -1938,27 +2248,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "aby zaladow. fil." # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "aby rozlad. filament" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Suma" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Suma bledow" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Calkowita dlugosc filamentu" @@ -1968,7 +2278,7 @@ msgid "Total filament :" msgstr "Filament lacznie :" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Calkowity czas druku" @@ -1983,17 +2293,17 @@ msgid "TRIGGERED" msgstr "AKTYWOWANO" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Strojenie" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "nieznane" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Rozladuj" @@ -2003,7 +2313,7 @@ msgid "Unload all" msgstr "Rozladuj wszystkie" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Rozladowanie fil." @@ -2028,22 +2338,22 @@ msgid "Unload filament 4" msgstr "Rozladuj fil. 4" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Rozladowuje filament" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Uzyj opcji Rozladuj jesli filament wystaje z tylnej rurki MMU. Uzyj opcji Wysun jesli wciaz jest w srodku." # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Uzyte podczas druku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Napiecia" @@ -2053,32 +2363,37 @@ msgid "volume.init failed" msgstr "niepowodzenie volume.init " # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Czekam na uzytkownika..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "UWAGA:\nWykrywanie zderzen\nwylaczone\nw trybie Stealth" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 msgid "Warning: both printer type and motherboard type changed." msgstr "Ostrzezenie: typ drukarki i plyta glowna ulegly zmianie." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Ostrzezenie: plyta glowna ulegla zmianie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" @@ -2088,17 +2403,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "OSTRZEZENIE: To jest nieoficjalna, niewspierana wersja firmware. Uzywasz na wlasna odpowiedzialnosc!" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Blad polaczenia" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Asystent" @@ -2117,23 +2432,28 @@ msgstr "Zapis do pliku:" msgid "X-correct" msgstr "Korekcja X" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "Korekcja-X:" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Kalibracja XYZ pomyslna. Skos bedzie automatycznie korygowany." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibr. XYZ niedokladna. Przednie punkty kalibr. nieosiagalne." @@ -2143,17 +2463,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Lewy przedni punkt nieosiagalny." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." @@ -2168,17 +2488,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibracja XYZ ok. Osie X/Y sa prostopadle. Gratulacje!" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" @@ -2192,8 +2512,13 @@ msgstr "Min. odleglosc od Y:" msgid "Y-correct" msgstr "Korekcja Y" +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Korekcja-Y:" + # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Tak" @@ -2208,11 +2533,26 @@ msgid "You are using firmware beta version. This is development version. Using t msgstr "Uzywasz firmware w wersji beta. Ta wersja jest rozwojowa. Uzywanie jej nie jest zalecane i moze spowodowac uszkodzenie drukarki." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Korekcja-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Pomiar-Z [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Pomiar-Z [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "[0;0] przesuniecie punktu" From e82879820942b3f2f727a7526a921ec345097a20 Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 13 Sep 2019 21:21:42 +0300 Subject: [PATCH 037/110] Fixes after merge and line buffer General fixes to the lcd_edit_off item and improved way to generate the toggles. The old process is this: Write '>' if required -> print base -> pad everything before the last character with spaces -> write the eol character -> jump back and print the toggle over the blank characters. This resulted in noticeable flickering when the toggle was redrawn and was showing the same thing. Now the process is similar, except that everything happens in a "line buffer" (a char buffer that holds an entire line) and gets printed in one go, avoiding jump instructions for the lcd and prevents flickering since it doesn't write ' ' and the letters afterwards. This should get even better when the lcd_buffer gets implemented since the line_buffer will get compared to the existing data on the screen and avoid overwriting what is on the lcd with the same thing. --- Firmware/menu.cpp | 33 ++++++++++++++++++--------------- Firmware/menu.h | 6 +++--- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index d516be37..c0a897ca 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -184,11 +184,20 @@ static void menu_draw_item_puts_P(char type_char, const char* str) lcd_printf_P(PSTR("%c%-18.18S%c"), menu_selection_mark(), str, type_char); } -static void menu_draw_toggle_puts_P(const char* str, const char* toggle, const bool fromProgmem) +static void menu_draw_toggle_puts_P(const char* str, char* toggle, const uint8_t settings) { - menu_draw_item_puts_P((toggle == NULL)?LCD_STR_ARROW_RIGHT[0]:LCD_STR_REFRESH[0], str); - lcd_set_cursor(LCD_WIDTH - 3 - (fromProgmem?(strlen_P((toggle == NULL)?_T(MSG_NA):toggle)):(strlen(toggle))), menu_row); - lcd_printf_P(fromProgmem?PSTR("[%S]"):PSTR("[%s]"), (toggle == NULL)?_T(MSG_NA):toggle); + //settings: + //xxxxxcba + //a = selection mark. If it's set(1), then '>' will be used as the first character on the line. Else leave blank + //b = toggle string is from progmem + //c = do not set cursor at all. Must be handled externally. + char lineStr[LCD_WIDTH + 1]; + const char eol = (toggle == NULL)?LCD_STR_ARROW_RIGHT[0]:' '; + if (toggle == NULL) toggle = _T(MSG_NA); + sprintf_P(lineStr, PSTR("%c%-18.18S"), (settings & 0x01)?'>':' ', str); + sprintf_P(lineStr + LCD_WIDTH - ((settings & 0x02)?strlen_P(toggle):strlen(toggle)) - 3, (settings & 0x02)?PSTR("[%S]%c"):PSTR("[%s]%c"), toggle, eol); + if (!(settings & 0x04)) lcd_set_cursor(0, menu_row); + fputs(lineStr, lcdout); } //! @brief Format sheet name @@ -382,11 +391,11 @@ uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t) return 0; } -uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const bool fromProgmem) +uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const uint8_t settings) { if (menu_item == menu_line) { - if (lcd_draw_update) menu_draw_toggle_puts_P(str, toggle, fromProgmem); + if (lcd_draw_update) menu_draw_toggle_puts_P(str, toggle, settings | (menu_selection_mark()=='>')); if (menu_clicked && (lcd_encoder == menu_item)) { if (toggle == NULL) // print N/A warning message @@ -424,17 +433,12 @@ uint8_t menu_item_gcode_P(const char* str, const char* str_gcode) return 0; } - -const char menu_20x_space[] PROGMEM = " "; - const char menu_fmt_int3[] PROGMEM = "%c%.15S:%s%3d"; const char menu_fmt_float31[] PROGMEM = "%-12.12S%+8.1f"; const char menu_fmt_float13[] PROGMEM = "%c%-13.13S%+5.3f"; -const char menu_fmt_float13off[] PROGMEM = "%c%-13.13S%6.6s"; - template static void menu_draw_P(char chr, const char* str, int16_t val); @@ -443,8 +447,8 @@ void menu_draw_P(char chr, const char* str, int16_t val) { int text_len = strlen_P(str); if (text_len > 15) text_len = 15; - char spaces[21]; - strcpy_P(spaces, menu_20x_space); + char spaces[LCD_WIDTH + 1] = {0}; + memset(spaces,' ', LCD_WIDTH); if (val <= -100) spaces[15 - text_len - 1] = 0; else spaces[15 - text_len] = 0; lcd_printf_P(menu_fmt_int3, chr, str, spaces, val); @@ -457,8 +461,7 @@ void menu_draw_P(char chr, const char* str, int16_t val) float factor = 1.0f + static_cast(val) / 1000.0f; if (val <= _md->minEditValue) { - // lcd_printf_P(menu_fmt_float13off, chr, str, " [off]"); - menu_draw_toggle_puts_P(str, _T(MSG_OFF), true); + menu_draw_toggle_puts_P(str, _T(MSG_OFF), 0x04 | 0x02 | (chr=='>')); } else { diff --git a/Firmware/menu.h b/Firmware/menu.h index 2a274815..a9526c31 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -118,9 +118,9 @@ extern uint8_t menu_item_function_P(const char* str, menu_func_t func); #define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0) extern uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t), uint8_t fn_par); -#define MENU_ITEM_TOGGLE_P(str, toggle, func) do { if (menu_item_toggle_P(str, toggle, func, true)) return; } while (0) -#define MENU_ITEM_TOGGLE(str, toggle, func) do { if (menu_item_toggle_P(str, toggle, func, false)) return; } while (0) -extern uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const bool fromProgmem); +#define MENU_ITEM_TOGGLE_P(str, toggle, func) do { if (menu_item_toggle_P(str, toggle, func, 0x02)) return; } while (0) +#define MENU_ITEM_TOGGLE(str, toggle, func) do { if (menu_item_toggle_P(str, toggle, func, 0x00)) return; } while (0) +extern uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const uint8_t settings); #define MENU_ITEM_GCODE_P(str, str_gcode) do { if (menu_item_gcode_P(str, str_gcode)) return; } while (0) extern uint8_t menu_item_gcode_P(const char* str, const char* str_gcode); From 35b93d17dc7d91f3cd473e9758d94fe64a8be0ff Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 14 Sep 2019 08:58:45 +0300 Subject: [PATCH 038/110] Remove merge errors --- lang/lang_en_it.txt | 140 -------------------------------------------- lang/lang_en_pl.txt | 1 - 2 files changed, 141 deletions(-) diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 60316e48..c5479d31 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1350,146 +1350,6 @@ "PINDA:" "\x00" -# -"Back" -"Indietro" - -# -"Checks" -"Controlli" - -# -"False triggering" -"Falso innesco" - -# -"FINDA:" -"\x00" - -# -"Firmware [none]" -"Firmware[nessuno]" - -# -"Firmware [strict]" -"Firmware [esatto]" - -# -"Firmware [warn]" -"Firmware [avviso]" - -# -"HW Setup" -"Installazione HW" - -# -"IR:" -"\x00" - -# -"Magnets comp.[N/A]" -"Comp. Magneti[N/A]" - -# -"Magnets comp.[Off]" -"Comp. Magneti[off]" - -# -"Magnets comp. [On]" -"Comp. Magneti [on]" - -# -"Mesh [3x3]" -"Griglia [3x3]" - -# -"Mesh [7x7]" -"Griglia [7x7]" - -# -"Mesh bed leveling" -"Mesh livel. letto" - -# -"MK3S firmware detected on MK3 printer" -"Firmware MK3S rilevato su stampante MK3" - -# -"MMU Mode [Normal]" -"Modalita MMU [Normale]" - -# -"MMU Mode[Stealth]" -"Modalita MMU [Silenziosa]" - -# -"Mode change in progress ..." -"Cambio modalita in corso ..." - -# -"Model [none]" -"Modello [nessuno]" - -# -"Model [strict]" -"Modello [esatto]" - -# -"Model [warn]" -"Modello [avviso]" - -# -"Nozzle d. [0.25]" -"Diam.Ugello[0.25]" - -# -"Nozzle d. [0.40]" -"Diam.Ugello[0.40]" - -# -"Nozzle d. [0.60]" -"Diam.Ugello[0.60]" - -# -"Nozzle [none]" -"Ugello [nessuno]" - -# -"Nozzle [strict]" -"Ugello [esatto]" - -# -"Nozzle [warn]" -"Ugello [avviso]" - -# -"G-code sliced for a different level. Continue?" -"G-code processato per un livello diverso. Continuare?" - -# -"G-code sliced for a different level. Please re-slice the model again. Print cancelled." -"G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata." - -# -"G-code sliced for a different printer type. Continue?" -"G-code processato per una stampante diversa. Continuare?" - -# -"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." -"G-code processato per una stampante diversa. Per favore esegui nuovamente lo slice del modello. Stampa annullata." - -# -"G-code sliced for a newer firmware. Continue?" -"G-code processato per un firmware piu recente. Continuare?" - -# -"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." -"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." - -# -"PINDA:" -"\x00" - # "Preheating to cut" "Preriscaldamento per taglio" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index ddac2321..dcc923bb 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1327,7 +1327,6 @@ "\x00" # - "G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany." From 695f938348e0d20af2d05ac88863deae463900cf Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 14 Sep 2019 12:24:45 +0300 Subject: [PATCH 039/110] Fix conversion warnings --- Firmware/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index c0a897ca..cb773d15 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -184,7 +184,7 @@ static void menu_draw_item_puts_P(char type_char, const char* str) lcd_printf_P(PSTR("%c%-18.18S%c"), menu_selection_mark(), str, type_char); } -static void menu_draw_toggle_puts_P(const char* str, char* toggle, const uint8_t settings) +static void menu_draw_toggle_puts_P(const char* str, const char* toggle, const uint8_t settings) { //settings: //xxxxxcba From 011468598e2dc10c898e28ee48e6fdf53d2bbf45 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Mon, 16 Sep 2019 00:43:37 +0200 Subject: [PATCH 040/110] IR sensor gen. II disconnected PCB detection --- Firmware/adc.c | 5 +- Firmware/config.h | 17 ++++- Firmware/eeprom.h | 3 + Firmware/fsensor.cpp | 138 +++++++++++++++++++++++++++++----- Firmware/fsensor.h | 29 +++++++- Firmware/pins_Einsy_1_0.h | 3 +- Firmware/temperature.cpp | 11 ++- Firmware/temperature.h | 6 ++ Firmware/ultralcd.cpp | 152 ++++++++++++++++++++++++++++++++++---- Firmware/ultralcd.h | 10 +++ 10 files changed, 330 insertions(+), 44 deletions(-) diff --git a/Firmware/adc.c b/Firmware/adc.c index 26728cef..3144990d 100644 --- a/Firmware/adc.c +++ b/Firmware/adc.c @@ -4,6 +4,7 @@ #include #include #include +#include "pins.h" uint8_t adc_state; uint8_t adc_count; @@ -24,8 +25,8 @@ void adc_init(void) ADMUX |= (1 << REFS0); ADCSRA |= (1 << ADEN); // ADCSRA |= (1 << ADIF) | (1 << ADSC); - DIDR0 = (ADC_CHAN_MSK & 0xff); - DIDR2 = (ADC_CHAN_MSK >> 8); + DIDR0 = ((ADC_CHAN_MSK & ADC_DIDR_MSK) & 0xff); + DIDR2 = ((ADC_CHAN_MSK & ADC_DIDR_MSK) >> 8); adc_reset(); // adc_sim_mask = 0b0101; // adc_sim_mask = 0b100101; diff --git a/Firmware/config.h b/Firmware/config.h index a712839b..3242e47c 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -2,9 +2,21 @@ #define _CONFIG_H +#include "Configuration_prusa.h" +#include "pins.h" + +#define IR_SENSOR_ANALOG (defined(VOLT_IR_PIN) && defined(IR_SENSOR)) + //ADC configuration +#if !IR_SENSOR_ANALOG #define ADC_CHAN_MSK 0b0000001001011111 //used AD channels bit mask (0,1,2,3,4,6,9) +#define ADC_DIDR_MSK 0b0000001001011111 //AD channels DIDR mask (1 ~ disabled digital input) #define ADC_CHAN_CNT 7 //number of used channels) +#else //!IR_SENSOR_ANALOG +#define ADC_CHAN_MSK 0b0000001101011111 //used AD channels bit mask (0,1,2,3,4,6,8,9) +#define ADC_DIDR_MSK 0b0000001001011111 //AD channels DIDR mask (1 ~ disabled digital input) +#define ADC_CHAN_CNT 8 //number of used channels) +#endif //!IR_SENSOR_ANALOG #define ADC_OVRSAMPL 16 //oversampling multiplier #define ADC_CALLBACK adc_ready //callback function () @@ -42,11 +54,8 @@ #define W25X20CL_SPCR SPI_SPCR(W25X20CL_SPI_RATE, 1, 1, 1, 0) #define W25X20CL_SPSR SPI_SPSR(W25X20CL_SPI_RATE) -#include "boards.h" -#include "Configuration_prusa.h" - //LANG - Multi-language support -//#define LANG_MODE 0 // primary language only +//define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support #define LANG_SIZE_RESERVED 0x2800 // reserved space for secondary language (10240 bytes) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index c41fb9ff..83fdfe39 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -203,6 +203,9 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP #define EEPROM_SHEETS_BASE (EEPROM_CHECK_GCODE - EEPROM_SHEETS_SIZEOF) // Sheets static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); +#define EEPROM_FSENSOR_PCB (EEPROM_SHEETS_BASE-1) // uint8 +#define EEPROM_FSENSOR_ACTION_NA (EEPROM_FSENSOR_PCB-1) // uint8 + //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. #define EEPROM_LAST_ITEM EEPROM_SHEETS_BASE diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index f20f647d..c01274fb 100755 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -15,6 +15,10 @@ #include "mmu.h" #include "cardreader.h" +#include "adc.h" +#include "temperature.h" +#include "config.h" + //! @name Basic parameters //! @{ #define FSENSOR_CHUNK_LEN 0.64F //!< filament sensor chunk length 0.64mm @@ -117,6 +121,13 @@ int16_t fsensor_oq_yd_max; uint16_t fsensor_oq_sh_sum; //! @} +#if IR_SENSOR_ANALOG +ClFsensorPCB oFsensorPCB; +ClFsensorActionNA oFsensorActionNA; +bool bIRsensorStateFlag=false; +unsigned long nIRsensorLastTime; +#endif //IR_SENSOR_ANALOG + void fsensor_stop_and_save_print(void) { printf_P(PSTR("fsensor_stop_and_save_print\n")); @@ -136,10 +147,11 @@ void fsensor_init(void) { #ifdef PAT9125 uint8_t pat9125 = pat9125_init(); - printf_P(PSTR("PAT9125_init:%hhu\n"), pat9125); + printf_P(PSTR("PAT9125_init:%hhu\n"), pat9125); #endif //PAT9125 uint8_t fsensor = eeprom_read_byte((uint8_t*)EEPROM_FSENSOR); fsensor_autoload_enabled=eeprom_read_byte((uint8_t*)EEPROM_FSENS_AUTOLOAD_ENABLED); + fsensor_not_responding = false; #ifdef PAT9125 uint8_t oq_meassure_enabled = eeprom_read_byte((uint8_t*)EEPROM_FSENS_OQ_MEASS_ENABLED); fsensor_oq_meassure_enabled = (oq_meassure_enabled == 1)?true:false; @@ -150,19 +162,27 @@ void fsensor_init(void) fsensor = 0; //disable sensor fsensor_not_responding = true; } - else - fsensor_not_responding = false; #endif //PAT9125 +#if IR_SENSOR_ANALOG + bIRsensorStateFlag=false; + oFsensorPCB=(ClFsensorPCB)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_PCB); + oFsensorActionNA=(ClFsensorActionNA)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_ACTION_NA); +#endif //IR_SENSOR_ANALOG if (fsensor) - fsensor_enable(); + fsensor_enable(false); // (in this case) EEPROM update is not necessary else - fsensor_disable(); - printf_P(PSTR("FSensor %S\n"), (fsensor_enabled?PSTR("ENABLED"):PSTR("DISABLED\n"))); + fsensor_disable(false); // (in this case) EEPROM update is not necessary + printf_P(PSTR("FSensor %S"), (fsensor_enabled?PSTR("ENABLED"):PSTR("DISABLED"))); +#if IR_SENSOR_ANALOG + printf_P(PSTR(" (sensor board revision: %S)\n"),(oFsensorPCB==ClFsensorPCB::_Rev03b)?PSTR("03b or newer"):PSTR("03 or older")); +#else //IR_SENSOR_ANALOG + printf_P(PSTR("\n")); +#endif //IR_SENSOR_ANALOG if (check_for_ir_sensor()) ir_sensor_detected = true; } -bool fsensor_enable(void) +bool fsensor_enable(bool bUpdateEEPROM) { #ifdef PAT9125 if (mmu_enabled == false) { //filament sensor is pat9125, enable only if it is working @@ -187,18 +207,34 @@ bool fsensor_enable(void) FSensorStateMenu = 1; } #else // PAT9125 - fsensor_enabled = true; - eeprom_update_byte((uint8_t*)EEPROM_FSENSOR, 0x01); - FSensorStateMenu = 1; -#endif // PAT9125 +#if IR_SENSOR_ANALOG + if(!fsensor_IR_check()) + { + bUpdateEEPROM=true; + fsensor_enabled=false; + fsensor_not_responding=true; + FSensorStateMenu=0; + } + else { +#endif //IR_SENSOR_ANALOG + fsensor_enabled=true; + fsensor_not_responding=false; + FSensorStateMenu=1; +#if IR_SENSOR_ANALOG + } +#endif //IR_SENSOR_ANALOG + if(bUpdateEEPROM) + eeprom_update_byte((uint8_t*)EEPROM_FSENSOR, FSensorStateMenu); +#endif //PAT9125 return fsensor_enabled; } -void fsensor_disable(void) -{ +void fsensor_disable(bool bUpdateEEPROM) +{ fsensor_enabled = false; - eeprom_update_byte((uint8_t*)EEPROM_FSENSOR, 0x00); FSensorStateMenu = 0; + if(bUpdateEEPROM) + eeprom_update_byte((uint8_t*)EEPROM_FSENSOR, 0x00); } void fsensor_autoload_set(bool State) @@ -589,10 +625,76 @@ void fsensor_update(void) fsensor_oq_meassure_enabled = oq_meassure_enabled_tmp; } #else //PAT9125 - if ((digitalRead(IR_SENSOR_PIN) == 1) && CHECK_FSENSOR && fsensor_enabled && ir_sensor_detected && ( ! fsensor_m600_enqueued) ) - { - fsensor_stop_and_save_print(); - fsensor_enque_M600(); + if (CHECK_FSENSOR && fsensor_enabled && ir_sensor_detected && ( ! fsensor_m600_enqueued) ) + { + if(digitalRead(IR_SENSOR_PIN)) + { // IR_SENSOR_PIN ~ H +#if IR_SENSOR_ANALOG + if(!bIRsensorStateFlag) + { + bIRsensorStateFlag=true; + nIRsensorLastTime=_millis(); + } + else + { + if((_millis()-nIRsensorLastTime)>IR_SENSOR_STEADY) + { + uint8_t nMUX1,nMUX2; + uint16_t nADC; + bIRsensorStateFlag=false; + // sequence for direct data reading from AD converter + DISABLE_TEMPERATURE_INTERRUPT(); + nMUX1=ADMUX; // ADMUX saving + nMUX2=ADCSRB; + adc_setmux(VOLT_IR_PIN); + ADCSRA|=(1<((int)IRsensor_Hopen_TRESHOLD))) + { + fsensor_disable(); + fsensor_not_responding = true; + printf_P(PSTR("IR sensor not responding (%d)!\n"),1); + if((ClFsensorActionNA)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_ACTION_NA)==ClFsensorActionNA::_Pause) + if(oFsensorActionNA==ClFsensorActionNA::_Pause) + lcd_pause_print(); + } + else + { +#endif //IR_SENSOR_ANALOG + fsensor_stop_and_save_print(); + fsensor_enque_M600(); +#if IR_SENSOR_ANALOG + } + } + } + } + else + { // IR_SENSOR_PIN ~ L + bIRsensorStateFlag=false; +#endif //IR_SENSOR_ANALOG + } } #endif //PAT9125 } + +#if IR_SENSOR_ANALOG +bool fsensor_IR_check() +{ +uint16_t volt_IR_int; +bool bCheckResult; + +volt_IR_int=current_voltage_raw_IR; +bCheckResult=(volt_IR_int<((int)IRsensor_Lmax_TRESHOLD))||(volt_IR_int>((int)IRsensor_Hmin_TRESHOLD)); +bCheckResult=bCheckResult&&(!((oFsensorPCB==ClFsensorPCB::_Rev03b)&&(volt_IR_int>((int)IRsensor_Hopen_TRESHOLD)))); +return(bCheckResult); +} +#endif //IR_SENSOR_ANALOG diff --git a/Firmware/fsensor.h b/Firmware/fsensor.h index fa7ab585..48ad5fba 100755 --- a/Firmware/fsensor.h +++ b/Firmware/fsensor.h @@ -3,6 +3,7 @@ #define FSENSOR_H #include +#include "config.h" //! minimum meassured chunk length in steps @@ -27,8 +28,8 @@ extern void fsensor_init(void); //! @name enable/disable //! @{ -extern bool fsensor_enable(void); -extern void fsensor_disable(void); +extern bool fsensor_enable(bool bUpdateEEPROM=true); +extern void fsensor_disable(bool bUpdateEEPROM=true); //! @} //autoload feature enabled @@ -65,4 +66,28 @@ extern void fsensor_st_block_begin(block_t* bl); extern void fsensor_st_block_chunk(block_t* bl, int cnt); //! @} + +#if IR_SENSOR_ANALOG +#define IR_SENSOR_STEADY 10 // [ms] + +enum class ClFsensorPCB:uint_least8_t +{ + _Old=0, + _Rev03b=1, + _Undef=EEPROM_EMPTY_VALUE +}; + +enum class ClFsensorActionNA:uint_least8_t +{ + _Continue=0, + _Pause=1, + _Undef=EEPROM_EMPTY_VALUE +}; + +extern ClFsensorPCB oFsensorPCB; +extern ClFsensorActionNA oFsensorActionNA; + +extern bool fsensor_IR_check(); +#endif //IR_SENSOR_ANALOG + #endif //FSENSOR_H diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h index 33363388..1ea69a40 100755 --- a/Firmware/pins_Einsy_1_0.h +++ b/Firmware/pins_Einsy_1_0.h @@ -71,12 +71,13 @@ #define HEATER_2_PIN -1 #define TEMP_2_PIN -1 -#define TEMP_AMBIENT_PIN 5 //A5 +#define TEMP_AMBIENT_PIN 6 //A6 #define TEMP_PINDA_PIN 3 //A3 #define VOLT_PWR_PIN 4 //A4 #define VOLT_BED_PIN 9 //A9 +#define VOLT_IR_PIN 8 //A8 #define E0_TMC2130_CS 66 diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 391607e8..80497480 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -44,6 +44,8 @@ #include "Timer.h" #include "Configuration_prusa.h" +#include "config.h" + //=========================================================================== //=============================public variables============================ //=========================================================================== @@ -71,6 +73,10 @@ int current_voltage_raw_pwr = 0; int current_voltage_raw_bed = 0; #endif +#if IR_SENSOR_ANALOG +int current_voltage_raw_IR = 0; +#endif //IR_SENSOR_ANALOG + int current_temperature_bed_raw = 0; float current_temperature_bed = 0.0; #ifdef TEMP_SENSOR_1_AS_REDUNDANT @@ -1635,11 +1641,14 @@ void adc_ready(void) //callback from adc when sampling finished current_voltage_raw_pwr = adc_values[ADC_PIN_IDX(VOLT_PWR_PIN)]; #endif #ifdef AMBIENT_THERMISTOR - current_temperature_raw_ambient = adc_values[ADC_PIN_IDX(TEMP_AMBIENT_PIN)]; + current_temperature_raw_ambient = adc_values[ADC_PIN_IDX(TEMP_AMBIENT_PIN)]; // 5->6 #endif //AMBIENT_THERMISTOR #ifdef VOLT_BED_PIN current_voltage_raw_bed = adc_values[ADC_PIN_IDX(VOLT_BED_PIN)]; // 6->9 #endif +#if IR_SENSOR_ANALOG + current_voltage_raw_IR = adc_values[ADC_PIN_IDX(VOLT_IR_PIN)]; +#endif //IR_SENSOR_ANALOG temp_meas_ready = true; } diff --git a/Firmware/temperature.h b/Firmware/temperature.h index e9ba11b4..7ece8927 100755 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -27,6 +27,8 @@ #include "stepper.h" #endif +#include "config.h" + #ifdef SYSTEM_TIMER_2 @@ -74,6 +76,10 @@ extern int current_voltage_raw_pwr; extern int current_voltage_raw_bed; #endif +#if IR_SENSOR_ANALOG +extern int current_voltage_raw_IR; +#endif //IR_SENSOR_ANALOG + #ifdef TEMP_SENSOR_1_AS_REDUNDANT extern float redundant_temperature; #endif diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0d726769..ffc12c26 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -42,6 +42,10 @@ #include "io_atmega2560.h" #include "first_lay_cal.h" +#include "fsensor.h" +#include "adc.h" +#include "config.h" + int scrollstuff = 0; char longFilenameOLD[LONG_FILENAME_LENGTH]; @@ -61,9 +65,6 @@ int8_t FSensorStateMenu = 1; int8_t CrashDetectMenu = 1; -extern bool fsensor_enable(); -extern void fsensor_disable(); - #ifdef TMC2130 extern void crashdet_enable(); extern void crashdet_disable(); @@ -200,6 +201,7 @@ enum class TestError : uint_least8_t SwappedFan, WiringFsensor, TriggeringFsensor, + FsensorLevel }; static int lcd_selftest_screen(TestScreen screen, int _progress, int _progress_scale, bool _clear, int _delay); @@ -231,6 +233,9 @@ static FanCheck lcd_selftest_fan_auto(int _fan); static bool lcd_selftest_fsensor(); #endif //PAT9125 static bool selftest_irsensor(); +#if IR_SENSOR_ANALOG +static bool lcd_selftest_IRsensor(); +#endif //IR_SENSOR_ANALOG static void lcd_selftest_error(TestError error, const char *_error_1, const char *_error_2); static void lcd_colorprint_change(); #ifdef SNMM @@ -1984,21 +1989,28 @@ static void lcd_menu_temperatures() menu_back_if_clicked(); } -#if defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN) +#if defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN) || IR_SENSOR_ANALOG #define VOLT_DIV_R1 10000 #define VOLT_DIV_R2 2370 #define VOLT_DIV_FAC ((float)VOLT_DIV_R2 / (VOLT_DIV_R2 + VOLT_DIV_R1)) -#define VOLT_DIV_REF 5 + static void lcd_menu_voltages() { lcd_timeoutToStatus.stop(); //infinite timeout float volt_pwr = VOLT_DIV_REF * ((float)current_voltage_raw_pwr / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC; float volt_bed = VOLT_DIV_REF * ((float)current_voltage_raw_bed / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC; lcd_home(); - lcd_printf_P(PSTR(" PWR: %d.%01dV\n" " BED: %d.%01dV"), (int)volt_pwr, (int)(10*fabs(volt_pwr - (int)volt_pwr)), (int)volt_bed, (int)(10*fabs(volt_bed - (int)volt_bed))); - menu_back_if_clicked(); +#if !IR_SENSOR_ANALOG + lcd_printf_P(PSTR("\n")); +#endif //!IR_SENSOR_ANALOG + lcd_printf_P(PSTR(" PWR: %4.1fV\n" " BED: %4.1fV"), volt_pwr, volt_bed); +#if IR_SENSOR_ANALOG + float volt_IR = VOLT_DIV_REF * ((float)current_voltage_raw_IR / (1023 * OVERSAMPLENR)); + lcd_printf_P(PSTR("\n IR : %3.1fV"),volt_IR); +#endif //IR_SENSOR_ANALOG + menu_back_if_clicked(); } -#endif //defined VOLT_BED_PIN || defined VOLT_PWR_PIN +#endif //defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN) || IR_SENSOR_ANALOG #ifdef TMC2130 static void lcd_menu_belt_status() @@ -5505,6 +5517,41 @@ SETTINGS_VERSION; MENU_END(); } +#if IR_SENSOR_ANALOG +static void lcd_fsensor_actionNA_set(void) +{ +switch(oFsensorActionNA) + { + case ClFsensorActionNA::_Continue: + oFsensorActionNA=ClFsensorActionNA::_Pause; + break; + case ClFsensorActionNA::_Pause: + oFsensorActionNA=ClFsensorActionNA::_Continue; + break; + default: + oFsensorActionNA=ClFsensorActionNA::_Continue; + } +eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_ACTION_NA,(uint8_t)oFsensorActionNA); +} + +#define FSENSOR_ACTION_NA \ +do\ +{\ + switch(oFsensorActionNA)\ + {\ + case ClFsensorActionNA::_Continue:\ + MENU_ITEM_FUNCTION_P(_i("FS Action [cont.]"),lcd_fsensor_actionNA_set);\ + break;\ + case ClFsensorActionNA::_Pause:\ + MENU_ITEM_FUNCTION_P(_i("FS Action [pause]"),lcd_fsensor_actionNA_set);\ + break;\ + default:\ + oFsensorActionNA=ClFsensorActionNA::_Continue;\ + }\ +}\ +while (0) +#endif //IR_SENSOR_ANALOG + void lcd_hw_setup_menu(void) // can not be "static" { MENU_BEGIN(); @@ -5536,6 +5583,11 @@ if(!farm_mode){ SETTINGS_NOZZLE; MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); } + +#if IR_SENSOR_ANALOG +FSENSOR_ACTION_NA; +#endif //IR_SENSOR_ANALOG + MENU_END(); } @@ -6850,11 +6902,21 @@ static void lcd_tune_menu() #ifdef FILAMENT_SENSOR if (FSensorStateMenu == 0) { - MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_OFF), lcd_fsensor_state_set); + if (fsensor_not_responding && (mmu_enabled == false)) { + /* Filament sensor not working*/ + MENU_ITEM_FUNCTION_P(_i("Fil. sensor [N/A]"), lcd_fsensor_state_set); + } + else { + /* Filament sensor turned off, working, no problems*/ + MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_OFF), lcd_fsensor_state_set); + } } else { MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_ON), lcd_fsensor_state_set); } +#if IR_SENSOR_ANALOG + FSENSOR_ACTION_NA; +#endif //IR_SENSOR_ANALOG #endif //FILAMENT_SENSOR SETTINGS_AUTO_DEPLETE; @@ -7137,6 +7199,42 @@ void lcd_sdcard_menu() MENU_END(); } +#if IR_SENSOR_ANALOG +static bool lcd_selftest_IRsensor() +{ +bool bAction; +bool bPCBrev03b; +uint16_t volt_IR_int; +float volt_IR; + +volt_IR_int=current_voltage_raw_IR; +bPCBrev03b=(volt_IR_int<((int)IRsensor_Hopen_TRESHOLD)); +volt_IR=VOLT_DIV_REF*((float)volt_IR_int/(1023*OVERSAMPLENR)); +printf_P(PSTR("Measured filament sensor high level: %4.2fV\n"),volt_IR); +if(volt_IR_int<((int)IRsensor_Hmin_TRESHOLD)) + { + lcd_selftest_error(TestError::FsensorLevel,"HIGH",""); + return(false); + } +lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament (but not load them!) into extruder and then press the knob.")); +volt_IR_int=current_voltage_raw_IR; +volt_IR=VOLT_DIV_REF*((float)volt_IR_int/(1023*OVERSAMPLENR)); +printf_P(PSTR("Measured filament sensor low level: %4.2fV\n"),volt_IR); +if(volt_IR_int>((int)IRsensor_Lmax_TRESHOLD)) + { + lcd_selftest_error(TestError::FsensorLevel,"LOW",""); + return(false); + } +if((bPCBrev03b?1:0)!=(uint8_t)oFsensorPCB) // safer then "(uint8_t)bPCBrev03b" + { + printf_P(PSTR("Filament sensor board change detected: revision %S\n"),bPCBrev03b?PSTR("03b or newer"):PSTR("03 or older")); + oFsensorPCB=bPCBrev03b?ClFsensorPCB::_Rev03b:ClFsensorPCB::_Old; + eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_PCB,(uint8_t)oFsensorPCB); + } +return(true); +} +#endif //IR_SENSOR_ANALOG + static void lcd_selftest_v() { (void)lcd_selftest(); @@ -7153,8 +7251,16 @@ bool lcd_selftest() #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif // TMC2130 - _delay(2000); +#if !IR_SENSOR_ANALOG + _delay(2000); +#endif //!IR_SENSOR_ANALOG KEEPALIVE_STATE(IN_HANDLER); +#if IR_SENSOR_ANALOG + bool bAction; + bAction=lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament unloaded?"),false,true); + if(!bAction) + return(false); +#endif //IR_SENSOR_ANALOG _progress = lcd_selftest_screen(TestScreen::ExtruderFan, _progress, 3, true, 2000); #if (defined(FANCHECK) && defined(TACH_0)) @@ -7340,12 +7446,20 @@ bool lcd_selftest() { #ifdef PAT9125 _progress = lcd_selftest_screen(TestScreen::Fsensor, _progress, 3, true, 2000); //check filaments sensor - _result = lcd_selftest_fsensor(); + _result = lcd_selftest_fsensor(); if (_result) { _progress = lcd_selftest_screen(TestScreen::FsensorOk, _progress, 3, true, 2000); //fil sensor OK } #endif //PAT9125 +#if IR_SENSOR_ANALOG + _progress = lcd_selftest_screen(TestScreen::Fsensor, _progress, 3, true, 2000); //check filament sensor + _result = lcd_selftest_IRsensor(); + if (_result) + { + _progress = lcd_selftest_screen(TestScreen::FsensorOk, _progress, 3, true, 2000); //filament sensor OK + } +#endif //IR_SENSOR_ANALOG } } #endif //FILAMENT_SENSOR @@ -7881,11 +7995,17 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const lcd_puts_P(_T(MSG_SELFTEST_WIRINGERROR)); break; case TestError::TriggeringFsensor: - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_SELFTEST_FILAMENT_SENSOR)); - lcd_set_cursor(0, 3); - lcd_puts_P(_i("False triggering"));////c=20 - break; + lcd_set_cursor(0, 2); + lcd_puts_P(_T(MSG_SELFTEST_FILAMENT_SENSOR)); + lcd_set_cursor(0, 3); + lcd_puts_P(_i("False triggering"));////c=20 + break; + case TestError::FsensorLevel: + lcd_set_cursor(0, 2); + lcd_puts_P(_T(MSG_SELFTEST_FILAMENT_SENSOR)); + lcd_set_cursor(0, 3); + lcd_printf_P(_i("%s level expected"),_error_1);////c=20 + break; } _delay(1000); diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 2c57c944..65e886c6 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -7,6 +7,8 @@ #include "menu.h" #include "mesh_bed_calibration.h" +#include "config.h" + extern void menu_lcd_longpress_func(void); extern void menu_lcd_charsetup_func(void); extern void menu_lcd_lcdupdate_func(void); @@ -234,4 +236,12 @@ enum class WizState : uint8_t void lcd_wizard(WizState state); +#define VOLT_DIV_REF 5 +#if IR_SENSOR_ANALOG +#define IRsensor_Hmin_TRESHOLD (3.0*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~3.0V (0.6*Vcc) +#define IRsensor_Lmax_TRESHOLD (1.5*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~1.5V (0.3*Vcc) +#define IRsensor_Hopen_TRESHOLD (4.6*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~4.6V (N.C. @ Ru~20-50k, Rd'=56k, Ru'=10k) +#define IRsensor_Ldiode_TRESHOLD (0.3*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~0.3V +#endif //IR_SENSOR_ANALOG + #endif //ULTRALCD_H From d491a9801d2f5a6869db658283f380f7ca145ef3 Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 16 Sep 2019 16:04:45 +0200 Subject: [PATCH 041/110] Update ultralcd.cpp --- Firmware/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5fe2e976..5a710ba3 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5392,7 +5392,6 @@ do\ while (0) #endif //IR_SENSOR_ANALOG -void lcd_hw_setup_menu(void) // can not be "static" template static void select_sheet_menu() { From 28edd5a80beed6740ab365b71b5232c290bd688a Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 23 Sep 2019 19:22:45 +0200 Subject: [PATCH 042/110] Prepare PF-build.sh for Prusa Arduino_Boards V1.0.2 As I am planning to add new Prusa Arduino_Boards definition version 1.0.2 which contains few changes which interfere withthe existing PF-build.sh using Arduino_Boards v1.0.1, i had to add an additional variable. I have tested PF-build.sh with Arduino_Boards v1.0.1 and v1.0.2 It creates identical firmware hex files, if I manage it to run in the same minute. If one of the runs is off by a minute compared to the other there is just one line in the hex code different, which is showing the compiling date, time and firmware version. --- PF-build.sh | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index fb3b51a1..9bafed34 100755 --- a/PF-build.sh +++ b/PF-build.sh @@ -56,7 +56,7 @@ # Some may argue that this is only used by a script, BUT as soon someone accidentally or on purpose starts Arduino IDE # it will use the default Arduino IDE folders and so can corrupt the build environment. # -# Version: 1.0.6-Build_9 +# Version: 1.0.6-Build_10 # Change log: # 12 Jan 2019, 3d-gussner, Fixed "compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections" in 'platform.txt' # 16 Jan 2019, 3d-gussner, Build_2, Added development check to modify 'Configuration.h' to prevent unwanted LCD messages that Firmware is unknown @@ -112,7 +112,7 @@ # Changed Hex-files folder to PF-build-hex as requested in PR # 23 Jul 2019, 3d-gussner, Added Finding OS version routine so supporting new OS should get easier # 26 Jul 2019, 3d-gussner, Change JSON repository to prusa3d after PR https://github.com/prusa3d/Arduino_Boards/pull/1 was merged - +# 23 Sep 2019, 3d-gussner, Prepare PF-build.sh for comming Prusa3d/Arduino_Boards version 1.0.2 Pull Request #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -211,7 +211,8 @@ fi #### Set build environment ARDUINO_ENV="1.8.5" BUILD_ENV="1.0.6" -BOARD="PrusaResearchRambo" +BOARD="rambo" +BOARD_PACKAGE_NAME="PrusaResearchRambo" BOARD_VERSION="1.0.1" BOARD_URL="https://raw.githubusercontent.com/prusa3d/Arduino_Boards/master/IDE_Board_Manager/package_prusa3d_index.json" BOARD_FILENAME="prusa3drambo" @@ -229,6 +230,7 @@ echo "" echo "Ardunio IDE :" $ARDUINO_ENV echo "Build env :" $BUILD_ENV echo "Board :" $BOARD +echo "Package name:" $BOARD_PACKAGE_NAME echo "Specific Lib:" $LIB echo "" @@ -317,7 +319,7 @@ if [ ! -e ../PF-build-env-$BUILD_ENV/Preferences-$TARGET_OS-$Processor.txt ]; th echo "update.check" sed -i 's/update.check = true/update.check = false/g' ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt echo "board" - sed -i 's/board = uno/board = rambo/g' ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt + sed -i 's/board = uno/board = $BOARD/g' ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt echo "editor.linenumbers" sed -i 's/editor.linenumbers = false/editor.linenumbers = true/g' ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt echo "boardsmanager.additional.urls" @@ -336,24 +338,24 @@ if [ ! -f "$BOARD_FILENAME-$BOARD_VERSION.tar.bz2" ]; then sleep 2 wget $BOARD_FILE_URL || exit 9 fi -if [[ ! -d "../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD/hardware/avr/$BOARD_VERSION" || ! -e "../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$BOARD_VERSION-$TARGET_OS-$Processor.txt" ]]; then - echo "$(tput setaf 6)Unzipping $BOARD Arduino IDE portable...$(tput setaf 2)" +if [[ ! -d "../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr/$BOARD_VERSION" || ! -e "../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$BOARD_VERSION-$TARGET_OS-$Processor.txt" ]]; then + echo "$(tput setaf 6)Unzipping $BOARD_PACKAGE_NAME Arduino IDE portable...$(tput setaf 2)" sleep 2 tar -xvf $BOARD_FILENAME-$BOARD_VERSION.tar.bz2 -C ../PF-build-env-$BUILD_ENV/ || exit 10 - if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD + if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME ]; then + mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME fi - if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD + if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME ]; then + mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME fi - if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD/hardware ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD/hardware + if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware ]; then + mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware fi - if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD/hardware/avr ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD/hardware/avr + if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr ]; then + mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr fi - mv ../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$BOARD_VERSION ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD/hardware/avr/$BOARD_VERSION + mv ../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$BOARD_VERSION ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr/$BOARD_VERSION echo "# $BOARD_FILENAME-$BOARD_VERSION" >> ../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$BOARD_VERSION-$TARGET_OS-$Processor.txt echo "$(tput sgr 0)" fi @@ -634,8 +636,8 @@ do echo "Start to build Prusa Firmware ..." echo "Using variant $VARIANT$(tput setaf 3)" sleep 2 - #$BUILD_ENV_PATH/arduino-builder -dump-prefs -debug-level 10 -compile -hardware $ARDUINO/hardware -hardware $ARDUINO/portable/packages -tools $ARDUINO/tools-builder -tools $ARDUINO/hardware/tools/avr -tools $ARDUINO/portable/packages -built-in-libraries $ARDUINO/libraries -libraries $ARDUINO/portable/sketchbook/libraries -fqbn=$BOARD:avr:rambo -ide-version=10805 -build-path=$BUILD_PATH -warnings=all $SCRIPT_PATH/Firmware/Firmware.ino || exit 14 - $BUILD_ENV_PATH/arduino-builder -compile -hardware $ARDUINO/hardware -hardware $ARDUINO/portable/packages -tools $ARDUINO/tools-builder -tools $ARDUINO/hardware/tools/avr -tools $ARDUINO/portable/packages -built-in-libraries $ARDUINO/libraries -libraries $ARDUINO/portable/sketchbook/libraries -fqbn=$BOARD:avr:rambo -ide-version=10805 -build-path=$BUILD_PATH -warnings=all $SCRIPT_PATH/Firmware/Firmware.ino || exit 14 + #$BUILD_ENV_PATH/arduino-builder -dump-prefs -debug-level 10 -compile -hardware $ARDUINO/hardware -hardware $ARDUINO/portable/packages -tools $ARDUINO/tools-builder -tools $ARDUINO/hardware/tools/avr -tools $ARDUINO/portable/packages -built-in-libraries $ARDUINO/libraries -libraries $ARDUINO/portable/sketchbook/libraries -fqbn=$BOARD_PACKAGE_NAME:avr:$BOARD -ide-version=10805 -build-path=$BUILD_PATH -warnings=all $SCRIPT_PATH/Firmware/Firmware.ino || exit 14 + $BUILD_ENV_PATH/arduino-builder -compile -hardware $ARDUINO/hardware -hardware $ARDUINO/portable/packages -tools $ARDUINO/tools-builder -tools $ARDUINO/hardware/tools/avr -tools $ARDUINO/portable/packages -built-in-libraries $ARDUINO/libraries -libraries $ARDUINO/portable/sketchbook/libraries -fqbn=$BOARD_PACKAGE_NAME:avr:$BOARD -ide-version=10805 -build-path=$BUILD_PATH -warnings=all $SCRIPT_PATH/Firmware/Firmware.ino || exit 14 echo "$(tput sgr 0)" if [ $LANGUAGES == "ALL" ]; then From 74a1c9341b5a3b38ede42667b68e7f93c15d0204 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 1 Oct 2019 22:57:59 +0200 Subject: [PATCH 043/110] Revert "Use content supplied strings for lcd_first_layer_calibration_reset(), as we have translations prepared for release. It will be reverted later to show current Z offset." This reverts commit ca9ef3aba123e45b792bddc4eace803ffedfd455. --- Firmware/ultralcd.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 9f498e01..0630eb7c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4777,10 +4777,10 @@ void lcd_toshiba_flash_air_compatibility_toggle() //! //! @code{.unparsed} //! |01234567890123456789| -//! |[Smooth1]Live adj. Z| c=11 -//! |value set, continue | c=20 -//! |or start from zero? | c=20 -//! |>Continue Reset | c=a, c=b, a+b = 18 +//! |Sheet Smooth1 actual| c=a, c=b, a+b = 13 +//! |Z offset: -1.480 mm | c=a, c=b, a+b = 14 +//! |>Continue | c=19 +//! | Start from zero | c=19 //! ---------------------- //! @endcode void lcd_first_layer_calibration_reset() @@ -4818,8 +4818,9 @@ void lcd_first_layer_calibration_reset() char sheet_name[sizeof(Sheet::name)]; eeprom_read_block(sheet_name, &EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].name, sizeof(Sheet::name)); lcd_set_cursor(0, 0); - lcd_printf_P(_i("[%.7s]Live adj. Z\nvalue set, continue\nor start from zero?\n%cContinue%cReset"), //// \n denotes line break, %.7s is replaced by 7 character long sheet name, %+1.3f is replaced by 6 character long floating point number, %c is replaced by > or white space (one character) based on whether first or second option is selected. % denoted place holders can not be reordered. r=4 - sheet_name, menuData->reset ? ' ' : '>', menuData->reset ? '>' : ' '); + float offset = static_cast(eeprom_read_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)))/cs.axis_steps_per_unit[Z_AXIS]; + lcd_printf_P(_i("Sheet %.7s actual\nZ offset: %+1.3f mm\n%cContinue\n%cStart from zero"), //// \n denotes line break, %.7s is replaced by 7 character long sheet name, %+1.3f is replaced by 6 character long floating point number, %c is replaced by > or white space (one character) based on whether first or second option is selected. % denoted place holders can not be reordered. r=4 + sheet_name, offset, menuData->reset ? ' ' : '>', menuData->reset ? '>' : ' '); } From 68491c9d4dd195b0764ae47ad12b043003904d33 Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 11 Oct 2019 19:06:37 +0300 Subject: [PATCH 044/110] First implementation --- Firmware/Marlin_main.cpp | 4 ---- Firmware/backlight.cpp | 33 +++++++++++++++++++++++++++++++++ Firmware/backlight.h | 13 +++++++++++++ Firmware/eeprom.h | 3 ++- Firmware/pins_Einsy_1_0.h | 2 +- Firmware/ultralcd.cpp | 5 +++++ 6 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 Firmware/backlight.cpp create mode 100644 Firmware/backlight.h diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 45dd118c..c076c8a0 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -989,10 +989,6 @@ void setup() ultralcd_init(); -#if (LCD_BL_PIN != -1) && defined (LCD_BL_PIN) - analogWrite(LCD_BL_PIN, 255); //set full brightnes -#endif //(LCD_BL_PIN != -1) && defined (LCD_BL_PIN) - spi_init(); lcd_splash(); diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp new file mode 100644 index 00000000..d63104b5 --- /dev/null +++ b/Firmware/backlight.cpp @@ -0,0 +1,33 @@ +//backlight.cpp + +#include "backlight.h" +#include +#include +#include "eeprom.h" +#include "Marlin.h" +#include "pins.h" +#include "fastio.h" +// #include "Timer.h" +// #include "Configuration.h" + +int16_t backlightLevel = 0; +int16_t backlightLevel_old = 0; +// uint16_t backlightCounter = 0; + +void backlight_update() +{ + if (backlightLevel != backlightLevel_old) //update level + { + analogWrite(LCD_BL_PIN, backlightLevel); + backlightLevel_old = backlightLevel; + eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL, backlightLevel); + } +} + +void backlight_init() +{ + SET_OUTPUT(LCD_BL_PIN); + WRITE(LCD_BL_PIN,0); + backlightLevel = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL); + backlight_update(); +} diff --git a/Firmware/backlight.h b/Firmware/backlight.h new file mode 100644 index 00000000..d31a997e --- /dev/null +++ b/Firmware/backlight.h @@ -0,0 +1,13 @@ +//backlight.h +#ifndef _BACKLIGHT_H +#define _BACKLIGHT_H + +#include + +extern int16_t backlightLevel; + +extern void backlight_update(); +extern void backlight_init(); + + +#endif //_BACKLIGHT_H diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 197c18c2..a8bab523 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -201,9 +201,10 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP #define EEPROM_SHEETS_BASE (EEPROM_CHECK_GCODE - EEPROM_SHEETS_SIZEOF) // Sheets static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); +#define EEPROM_BACKLIGHT_LEVEL (EEPROM_SHEETS_BASE-1) // uint8 //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. -#define EEPROM_LAST_ITEM EEPROM_SHEETS_BASE +#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_LEVEL // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h index 33363388..005683c0 100755 --- a/Firmware/pins_Einsy_1_0.h +++ b/Firmware/pins_Einsy_1_0.h @@ -99,7 +99,7 @@ //#define KILL_PIN 32 -//#define LCD_BL_PIN 5 //backlight control pin +#define LCD_BL_PIN 5 //backlight control pin #define BEEPER 84 // Beeper on AUX-4 #define LCD_PINS_RS 82 #define LCD_PINS_ENABLE 61 // !!! changed from 18 (EINY03) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f4952802..bfd7f9b5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -18,6 +18,7 @@ #include "lcd.h" #include "menu.h" +#include "backlight.h" #include "util.h" #include "mesh_bed_leveling.h" @@ -5768,6 +5769,8 @@ static void lcd_settings_menu() SETTINGS_SD; SETTINGS_SOUND; + + MENU_ITEM_EDIT_int3_P(_i("Backlight"), &backlightLevel, 0, 255); if (farm_mode) { @@ -8567,6 +8570,7 @@ void ultralcd_init() else lcd_autoDeplete = autoDepleteRaw; } + backlight_init(); lcd_init(); lcd_refresh(); lcd_longpress_func = menu_lcd_longpress_func; @@ -8813,6 +8817,7 @@ void menu_lcd_lcdupdate_func(void) } } #endif//CARDINSERTED + backlight_update(); if (lcd_next_update_millis < _millis()) { if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) From b2a1dc67869baa20ad840291078af6ec0112d1d1 Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 11 Oct 2019 19:23:38 +0300 Subject: [PATCH 045/110] Compile fix for firmware without LCD_BL_PIN --- Firmware/backlight.cpp | 4 ++++ Firmware/ultralcd.cpp | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index d63104b5..067fc133 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -10,6 +10,8 @@ // #include "Timer.h" // #include "Configuration.h" +#ifdef LCD_BL_PIN + int16_t backlightLevel = 0; int16_t backlightLevel_old = 0; // uint16_t backlightCounter = 0; @@ -31,3 +33,5 @@ void backlight_init() backlightLevel = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL); backlight_update(); } + +#endif //LCD_BL_PIN \ No newline at end of file diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index bfd7f9b5..e58663ae 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -18,7 +18,10 @@ #include "lcd.h" #include "menu.h" + +#ifdef LCD_BL_PIN #include "backlight.h" +#endif //LCD_BL_PIN #include "util.h" #include "mesh_bed_leveling.h" @@ -5769,8 +5772,10 @@ static void lcd_settings_menu() SETTINGS_SD; SETTINGS_SOUND; - + +#ifdef LCD_BL_PIN MENU_ITEM_EDIT_int3_P(_i("Backlight"), &backlightLevel, 0, 255); +#endif //LCD_BL_PIN if (farm_mode) { @@ -8570,7 +8575,9 @@ void ultralcd_init() else lcd_autoDeplete = autoDepleteRaw; } +#ifdef LCD_BL_PIN backlight_init(); +#endif //LCD_BL_PIN lcd_init(); lcd_refresh(); lcd_longpress_func = menu_lcd_longpress_func; @@ -8817,7 +8824,9 @@ void menu_lcd_lcdupdate_func(void) } } #endif//CARDINSERTED +#ifdef LCD_BL_PIN backlight_update(); +#endif //LCD_BL_PIN if (lcd_next_update_millis < _millis()) { if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) From 75f389a71d00a5c83cd10779c4312a9c2735d88d Mon Sep 17 00:00:00 2001 From: leptun Date: Sun, 13 Oct 2019 14:31:43 +0300 Subject: [PATCH 046/110] Auto-Dimming initial --- Firmware/backlight.cpp | 37 +++++++++++++++++++++++++++++++------ Firmware/backlight.h | 1 + Firmware/ultralcd.cpp | 8 +++++++- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index 067fc133..64a0e0c1 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -7,22 +7,47 @@ #include "Marlin.h" #include "pins.h" #include "fastio.h" -// #include "Timer.h" +#include "Timer.h" // #include "Configuration.h" #ifdef LCD_BL_PIN int16_t backlightLevel = 0; int16_t backlightLevel_old = 0; -// uint16_t backlightCounter = 0; +unsigned long backlightTimer_period = 10000ul; +bool backlightIsDimmed = true; +LongTimer backlightTimer; + +static void backlightDim() +{ + // if (backlightIsDimmed) return; + backlightLevel /= 4; //make the display half as bright. + backlightIsDimmed = true; +} + +static void backlightWake() +{ + // if (!backlightIsDimmed) return; + backlightLevel = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL); + backlightIsDimmed = false; +} + +void backlightTimer_reset() //used for resetting the timer and waking the display +{ + backlightTimer.start(); + if (backlightIsDimmed) backlightWake(); +} void backlight_update() { - if (backlightLevel != backlightLevel_old) //update level + if (backlightTimer.expired(backlightTimer_period)) backlightDim(); + + if (backlightLevel != backlightLevel_old) //update pwm duty cycle { analogWrite(LCD_BL_PIN, backlightLevel); backlightLevel_old = backlightLevel; - eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL, backlightLevel); + + if (!backlightIsDimmed) eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL, backlightLevel); //update eeprom value } } @@ -30,8 +55,8 @@ void backlight_init() { SET_OUTPUT(LCD_BL_PIN); WRITE(LCD_BL_PIN,0); - backlightLevel = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL); - backlight_update(); + backlightTimer_reset(); //initializes eeprom data and starts backlightTimer + backlight_update(); //actually sets the backlight to the correct level } #endif //LCD_BL_PIN \ No newline at end of file diff --git a/Firmware/backlight.h b/Firmware/backlight.h index d31a997e..ee656f88 100644 --- a/Firmware/backlight.h +++ b/Firmware/backlight.h @@ -8,6 +8,7 @@ extern int16_t backlightLevel; extern void backlight_update(); extern void backlight_init(); +extern void backlightTimer_reset(); #endif //_BACKLIGHT_H diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e58663ae..825ccade 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8726,6 +8726,7 @@ uint8_t get_message_level() void menu_lcd_longpress_func(void) { + backlightTimer_reset(); if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z) { // disable longpress during re-entry, while homing or calibration @@ -8837,9 +8838,14 @@ void menu_lcd_lcdupdate_func(void) Sound_MakeSound(e_SOUND_TYPE_EncoderMove); lcd_encoder_diff = 0; lcd_timeoutToStatus.start(); + backlightTimer_reset(); } - if (LCD_CLICKED) lcd_timeoutToStatus.start(); + if (LCD_CLICKED) + { + lcd_timeoutToStatus.start(); + backlightTimer_reset(); + } (*menu_menu)(); From 5a662413e6f7d64acca603ac9fbe4e0aa1bf3045 Mon Sep 17 00:00:00 2001 From: leptun Date: Sun, 13 Oct 2019 14:34:04 +0300 Subject: [PATCH 047/110] Fix compile for printer without backlight support --- Firmware/ultralcd.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 825ccade..6fa63c7c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8726,7 +8726,9 @@ uint8_t get_message_level() void menu_lcd_longpress_func(void) { +#ifdef LCD_BL_PIN backlightTimer_reset(); +#endif //LCD_BL_PIN if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z) { // disable longpress during re-entry, while homing or calibration @@ -8838,13 +8840,17 @@ void menu_lcd_lcdupdate_func(void) Sound_MakeSound(e_SOUND_TYPE_EncoderMove); lcd_encoder_diff = 0; lcd_timeoutToStatus.start(); +#ifdef LCD_BL_PIN backlightTimer_reset(); +#endif //LCD_BL_PIN } if (LCD_CLICKED) { lcd_timeoutToStatus.start(); +#ifdef LCD_BL_PIN backlightTimer_reset(); +#endif //LCD_BL_PIN } (*menu_menu)(); From 7f3ba499a0a3074f0913e95aa1f77dbbf6a224ab Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 15 Oct 2019 20:54:00 +0200 Subject: [PATCH 048/110] Do not wait forever if the heater on the extruder is disabled --- Firmware/Marlin_main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 45dd118c..8ba8be52 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8864,6 +8864,8 @@ void delay_keep_alive(unsigned int ms) } static void wait_for_heater(long codenum, uint8_t extruder) { + if (!degTargetHotend(extruder)) + return; #ifdef TEMP_RESIDENCY_TIME long residencyStart; From 3b005ae38f424a30965e8ed9dee2e79939607b4c Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 16 Oct 2019 14:40:45 +0300 Subject: [PATCH 049/110] Backlight detection --- Firmware/backlight.cpp | 12 +++++++++++- Firmware/backlight.h | 1 + Firmware/ultralcd.cpp | 5 ++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index 64a0e0c1..72850d2c 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -12,6 +12,7 @@ #ifdef LCD_BL_PIN +bool backlightSupport = 0; int16_t backlightLevel = 0; int16_t backlightLevel_old = 0; unsigned long backlightTimer_period = 10000ul; @@ -21,7 +22,7 @@ LongTimer backlightTimer; static void backlightDim() { // if (backlightIsDimmed) return; - backlightLevel /= 4; //make the display half as bright. + backlightLevel /= 4; //make the display dimmer. backlightIsDimmed = true; } @@ -40,6 +41,7 @@ void backlightTimer_reset() //used for resetting the timer and waking the displa void backlight_update() { + if (!backlightSupport) return; if (backlightTimer.expired(backlightTimer_period)) backlightDim(); if (backlightLevel != backlightLevel_old) //update pwm duty cycle @@ -53,6 +55,14 @@ void backlight_update() void backlight_init() { +//check for backlight support on lcd + SET_INPUT(LCD_BL_PIN); + WRITE(LCD_BL_PIN,HIGH); + _delay(10); + backlightSupport = !READ(LCD_BL_PIN); + if (backlightSupport == 0) return; + +//initialize backlight pin SET_OUTPUT(LCD_BL_PIN); WRITE(LCD_BL_PIN,0); backlightTimer_reset(); //initializes eeprom data and starts backlightTimer diff --git a/Firmware/backlight.h b/Firmware/backlight.h index ee656f88..84a2a17e 100644 --- a/Firmware/backlight.h +++ b/Firmware/backlight.h @@ -5,6 +5,7 @@ #include extern int16_t backlightLevel; +extern bool backlightSupport; extern void backlight_update(); extern void backlight_init(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6fa63c7c..715719ca 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5774,7 +5774,10 @@ static void lcd_settings_menu() SETTINGS_SOUND; #ifdef LCD_BL_PIN - MENU_ITEM_EDIT_int3_P(_i("Backlight"), &backlightLevel, 0, 255); + if (backlightSupport) + { + MENU_ITEM_EDIT_int3_P(_i("Backlight"), &backlightLevel, 0, 255); + } #endif //LCD_BL_PIN if (farm_mode) From 25e0d23efe56ea7de0039e32e0c64434d158a98b Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 17 Oct 2019 13:11:32 +0300 Subject: [PATCH 050/110] Backlight overhaul and UI changes --- Firmware/backlight.cpp | 60 ++++++++++++++++++++++-------------------- Firmware/backlight.h | 12 ++++++++- Firmware/eeprom.h | 6 +++-- Firmware/ultralcd.cpp | 35 +++++++++++++++++++++++- 4 files changed, 80 insertions(+), 33 deletions(-) diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index 72850d2c..59f08b6f 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -8,49 +8,41 @@ #include "pins.h" #include "fastio.h" #include "Timer.h" -// #include "Configuration.h" #ifdef LCD_BL_PIN -bool backlightSupport = 0; -int16_t backlightLevel = 0; -int16_t backlightLevel_old = 0; +bool backlightSupport = 0; //only if it's true will any of the settings be visible to the user +int16_t backlightLevel_HIGH = 0; +int16_t backlightLevel_LOW = 0; +uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT; unsigned long backlightTimer_period = 10000ul; -bool backlightIsDimmed = true; LongTimer backlightTimer; -static void backlightDim() +void backlight_save() //saves all backlight data to eeprom. { - // if (backlightIsDimmed) return; - backlightLevel /= 4; //make the display dimmer. - backlightIsDimmed = true; + eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, (uint8_t)backlightLevel_HIGH); + eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW, (uint8_t)backlightLevel_LOW); + eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_MODE, backlightMode); } -static void backlightWake() -{ - // if (!backlightIsDimmed) return; - backlightLevel = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL); - backlightIsDimmed = false; -} - -void backlightTimer_reset() //used for resetting the timer and waking the display +void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on events such as knob click, rotate and on full screen notifications. { + if (!backlightSupport) return; backlightTimer.start(); - if (backlightIsDimmed) backlightWake(); } void backlight_update() { if (!backlightSupport) return; - if (backlightTimer.expired(backlightTimer_period)) backlightDim(); - if (backlightLevel != backlightLevel_old) //update pwm duty cycle + if (backlightMode == BACKLIGHT_MODE_AUTO) { - analogWrite(LCD_BL_PIN, backlightLevel); - backlightLevel_old = backlightLevel; - - if (!backlightIsDimmed) eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL, backlightLevel); //update eeprom value + if (backlightTimer.expired(backlightTimer_period)) analogWrite(LCD_BL_PIN, backlightLevel_LOW); + else if (backlightTimer.running()) analogWrite(LCD_BL_PIN, backlightLevel_HIGH); + else {/*do nothing*/;} //display is dimmed. } + else if (backlightMode == BACKLIGHT_MODE_DIM) analogWrite(LCD_BL_PIN, backlightLevel_LOW); + else analogWrite(LCD_BL_PIN, backlightLevel_HIGH); } void backlight_init() @@ -60,13 +52,23 @@ void backlight_init() WRITE(LCD_BL_PIN,HIGH); _delay(10); backlightSupport = !READ(LCD_BL_PIN); - if (backlightSupport == 0) return; + if (!backlightSupport) return; -//initialize backlight pin +//initialize backlight + backlightMode = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_MODE); + if (backlightMode == 0xFF) //set default values + { + backlightMode = BACKLIGHT_MODE_AUTO; + backlightLevel_HIGH = 130; + backlightLevel_LOW = 50; + backlight_save(); + } + backlightLevel_HIGH = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH); + backlightLevel_LOW = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW); + SET_OUTPUT(LCD_BL_PIN); - WRITE(LCD_BL_PIN,0); - backlightTimer_reset(); //initializes eeprom data and starts backlightTimer - backlight_update(); //actually sets the backlight to the correct level + backlightTimer_reset(); + backlight_update(); //sets brightness } #endif //LCD_BL_PIN \ No newline at end of file diff --git a/Firmware/backlight.h b/Firmware/backlight.h index 84a2a17e..f3e2ee60 100644 --- a/Firmware/backlight.h +++ b/Firmware/backlight.h @@ -4,12 +4,22 @@ #include -extern int16_t backlightLevel; +enum Backlight_Mode +{ + BACKLIGHT_MODE_BRIGHT = 0, + BACKLIGHT_MODE_DIM = 1, + BACKLIGHT_MODE_AUTO = 2, +}; + +extern int16_t backlightLevel_HIGH; +extern int16_t backlightLevel_LOW; +extern uint8_t backlightMode; extern bool backlightSupport; extern void backlight_update(); extern void backlight_init(); extern void backlightTimer_reset(); +extern void backlight_save(); #endif //_BACKLIGHT_H diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index a8bab523..f47a2333 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -201,10 +201,12 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP #define EEPROM_SHEETS_BASE (EEPROM_CHECK_GCODE - EEPROM_SHEETS_SIZEOF) // Sheets static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); -#define EEPROM_BACKLIGHT_LEVEL (EEPROM_SHEETS_BASE-1) // uint8 +#define EEPROM_BACKLIGHT_LEVEL_HIGH (EEPROM_SHEETS_BASE-1) // uint8 +#define EEPROM_BACKLIGHT_LEVEL_LOW (EEPROM_BACKLIGHT_LEVEL_HIGH-1) // uint8 +#define EEPROM_BACKLIGHT_MODE (EEPROM_BACKLIGHT_LEVEL_LOW-1) // uint8 //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. -#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_LEVEL +#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_MODE // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 715719ca..04718cf6 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -56,6 +56,7 @@ char longFilenameOLD[LONG_FILENAME_LENGTH]; static void lcd_sd_updir(); static void lcd_mesh_bed_leveling_settings(); +static void lcd_backlight_menu(); int8_t ReInitLCD = 0; @@ -5776,7 +5777,7 @@ static void lcd_settings_menu() #ifdef LCD_BL_PIN if (backlightSupport) { - MENU_ITEM_EDIT_int3_P(_i("Backlight"), &backlightLevel, 0, 255); + MENU_ITEM_SUBMENU_P(_i("Brightness"), lcd_backlight_menu); } #endif //LCD_BL_PIN @@ -7165,6 +7166,38 @@ static void lcd_mesh_bed_leveling_settings() //SETTINGS_MBL_MODE; } +static void backlight_mode_toggle() +{ + switch (backlightMode) + { + case BACKLIGHT_MODE_BRIGHT: backlightMode = BACKLIGHT_MODE_DIM; break; + case BACKLIGHT_MODE_DIM: backlightMode = BACKLIGHT_MODE_AUTO; break; + case BACKLIGHT_MODE_AUTO: backlightMode = BACKLIGHT_MODE_BRIGHT; break; + default: backlightMode = BACKLIGHT_MODE_BRIGHT; break; + } + backlight_save(); +} + +static void lcd_backlight_menu() +{ + MENU_BEGIN(); + ON_MENU_LEAVE( + backlight_save(); + ); + + MENU_ITEM_BACK_P(_T(MSG_BACK)); + MENU_ITEM_EDIT_int3_P(_i("Level Bright"), &backlightLevel_HIGH, 0, 255); + MENU_ITEM_EDIT_int3_P(_i("Level Dimmed"), &backlightLevel_LOW, 0, 255); + switch (backlightMode) + { + case BACKLIGHT_MODE_BRIGHT: MENU_ITEM_FUNCTION_P(_i("Mode [Always on]"), backlight_mode_toggle); break; + case BACKLIGHT_MODE_DIM: MENU_ITEM_FUNCTION_P(_i("Mode [Always off]"), backlight_mode_toggle); break; + default: MENU_ITEM_FUNCTION_P(_i("Mode [Auto]"), backlight_mode_toggle); break; + } + + MENU_END(); +} + static void lcd_control_temperature_menu() { #ifdef PIDTEMP From 812eafd09c43554617c4748c88e43ffedbc6dea3 Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 17 Oct 2019 13:14:32 +0300 Subject: [PATCH 051/110] Fix compile for miniRambo --- Firmware/ultralcd.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 04718cf6..f4a60f7d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7166,6 +7166,7 @@ static void lcd_mesh_bed_leveling_settings() //SETTINGS_MBL_MODE; } +#ifdef LCD_BL_PIN static void backlight_mode_toggle() { switch (backlightMode) @@ -7197,6 +7198,7 @@ static void lcd_backlight_menu() MENU_END(); } +#endif //LCD_BL_PIN static void lcd_control_temperature_menu() { From 2af43667c81fdde913bc8193e134b55021acf8a9 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 17 Oct 2019 14:05:51 +0200 Subject: [PATCH 052/110] Changed folder and check file names... to have seperated build enviroments depening on Arduino IDE versions and board-versions. Successfully tested with: - Arduino IDE 1.8.5 and board version 1.0.1 - Arduino IDE 1.8.5 and board version 1.0.2 - These two above generate identical hex files - Arduino IDE 1.8.7 and board version 1.0.2 - Arduino IDE 1.8.8 and board version 1.0.2 - Arduino IDE 1.8.9 and board version 1.0.2 - These three above generate identical hex files - Compared to the 1.8.5 hex files the code uses less resources (Multi language/EN_ONLY): ``` Sketch uses 240082 bytes (94%) of program storage space. Maximum is 253952 bytes. Global variables use 6002 bytes of dynamic memory. Sketch uses 222344 bytes (87%) of program storage space. Maximum is 253952 bytes. Global variables use 6019 bytes of dynamic memory. ``` vs. ``` Sketch uses 241526 bytes (95%) of program storage space. Maximum is 253952 bytes. Global variables use 6046 bytes of dynamic memory. Sketch uses 223828 bytes (88%) of program storage space. Maximum is 253952 bytes. Global variables use 6065 bytes of dynamic memory. ``` Failed tests: - Arduino IDE 1.8.6 and board version 1.0.2 - Arduino IDE 1.8.10 and board version 1.0.2 --- PF-build.sh | 107 +++++++++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 52 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index 9bafed34..7f538ea0 100755 --- a/PF-build.sh +++ b/PF-build.sh @@ -113,6 +113,8 @@ # 23 Jul 2019, 3d-gussner, Added Finding OS version routine so supporting new OS should get easier # 26 Jul 2019, 3d-gussner, Change JSON repository to prusa3d after PR https://github.com/prusa3d/Arduino_Boards/pull/1 was merged # 23 Sep 2019, 3d-gussner, Prepare PF-build.sh for comming Prusa3d/Arduino_Boards version 1.0.2 Pull Request +# 17 Oct 2019, 3d-gussner, Changed folder and check file names to have seperated build enviroments depening on Arduino IDE version and +# board-versions. #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -261,12 +263,12 @@ if [ $TARGET_OS == "windows" ]; then wget https://downloads.arduino.cc/arduino-$ARDUINO_ENV-windows.zip || exit 7 echo "$(tput sgr 0)" fi - if [ ! -d "../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor" ]; then + if [[ ! -d "../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor" && ! -e "../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt" ]]; then echo "$(tput setaf 6)Unzipping Windows 32/64-bit Arduino IDE portable...$(tput setaf 2)" sleep 2 unzip arduino-$ARDUINO_ENV-windows.zip -d ../PF-build-env-$BUILD_ENV || exit 7 - mv ../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor - echo "# arduino-$ARDUINO_ENV-$TARGET_OS-$Processor" >> ../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV-$TARGET_OS-$Processor + mv ../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor + echo "# arduino-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor" >> ../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt echo "$(tput sgr0)" fi fi @@ -279,55 +281,55 @@ if [ $TARGET_OS == "linux" ]; then wget --no-check-certificate https://downloads.arduino.cc/arduino-$ARDUINO_ENV-linux$Processor.tar.xz || exit 8 echo "$(tput sgr 0)" fi - if [[ ! -d "../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor" && ! -e "../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV-$TARGET_OS-$Processor.txt" ]]; then + if [[ ! -d "../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor" && ! -e "../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt" ]]; then echo "$(tput setaf 6)Unzipping Linux $Processor Arduino IDE portable...$(tput setaf 2)" sleep 2 tar -xvf arduino-$ARDUINO_ENV-linux$Processor.tar.xz -C ../PF-build-env-$BUILD_ENV/ || exit 8 - mv ../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor - echo "# arduino-$ARDUINO_ENV-$TARGET_OS-$Processor" >> ../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV-$TARGET_OS-$Processor.txt + mv ../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor + echo "# arduino-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor" >> ../PF-build-env-$BUILD_ENV/arduino-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt echo "$(tput sgr0)" fi fi # Make Arduino IDE portable -if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/ ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/ +if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/ ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/ fi -if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/ ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable +if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/ ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable fi -if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/output/ ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/output +if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/output/ ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/output fi -if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/ ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages +if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/ ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages fi -if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/sketchbook/ ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/sketchbook +if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/sketchbook/ ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/sketchbook fi -if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/sketchbook/libraries/ ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/sketchbook/libraries +if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/sketchbook/libraries/ ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/sketchbook/libraries fi -if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/staging/ ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/staging +if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/staging/ ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/staging fi # Change Arduino IDE preferences -if [ ! -e ../PF-build-env-$BUILD_ENV/Preferences-$TARGET_OS-$Processor.txt ]; then - echo "$(tput setaf 6)Setting $TARGET_OS-$Processor Arduino IDE preferences for portable GUI usage...$(tput setaf 2)" +if [ ! -e ../PF-build-env-$BUILD_ENV/Preferences-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt ]; then + echo "$(tput setaf 6)Setting $ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor Arduino IDE preferences for portable GUI usage...$(tput setaf 2)" sleep 2 echo "update.check" - sed -i 's/update.check = true/update.check = false/g' ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt + sed -i 's/update.check = true/update.check = false/g' ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt echo "board" - sed -i 's/board = uno/board = $BOARD/g' ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt + sed -i 's/board = uno/board = $BOARD/g' ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt echo "editor.linenumbers" - sed -i 's/editor.linenumbers = false/editor.linenumbers = true/g' ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt + sed -i 's/editor.linenumbers = false/editor.linenumbers = true/g' ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt echo "boardsmanager.additional.urls" - echo "boardsmanager.additional.urls=$BOARD_URL" >>../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt - echo "build.verbose=true" >>../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt - echo "compiler.cache_core=false" >>../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt - echo "compiler.warning_level=all" >>../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/lib/preferences.txt - echo "# Preferences-$TARGET_OS-$Processor" >> ../PF-build-env-$BUILD_ENV/Preferences-$TARGET_OS-$Processor.txt + echo "boardsmanager.additional.urls=$BOARD_URL" >>../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt + echo "build.verbose=true" >>../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt + echo "compiler.cache_core=false" >>../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt + echo "compiler.warning_level=all" >>../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt + echo "# Preferences-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor" >> ../PF-build-env-$BUILD_ENV/Preferences-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt echo "$(tput sgr0)" fi @@ -338,25 +340,26 @@ if [ ! -f "$BOARD_FILENAME-$BOARD_VERSION.tar.bz2" ]; then sleep 2 wget $BOARD_FILE_URL || exit 9 fi -if [[ ! -d "../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr/$BOARD_VERSION" || ! -e "../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$BOARD_VERSION-$TARGET_OS-$Processor.txt" ]]; then +if [[ ! -d "../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr/$BOARD_VERSION" || ! -e "../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt" ]]; then echo "$(tput setaf 6)Unzipping $BOARD_PACKAGE_NAME Arduino IDE portable...$(tput setaf 2)" sleep 2 tar -xvf $BOARD_FILENAME-$BOARD_VERSION.tar.bz2 -C ../PF-build-env-$BUILD_ENV/ || exit 10 - if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME + if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME fi - if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME + if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME fi - if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware + if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware fi - if [ ! -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr ]; then - mkdir ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr + if [ ! -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr ]; then + mkdir ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr fi - mv ../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$BOARD_VERSION ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr/$BOARD_VERSION - echo "# $BOARD_FILENAME-$BOARD_VERSION" >> ../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$BOARD_VERSION-$TARGET_OS-$Processor.txt + mv ../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$BOARD_VERSION ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/$BOARD_PACKAGE_NAME/hardware/avr/$BOARD_VERSION + echo "# $BOARD_FILENAME-$BOARD_VERSION" >> ../PF-build-env-$BUILD_ENV/$BOARD_FILENAME-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt + echo "$(tput sgr 0)" fi @@ -367,30 +370,30 @@ if [ ! -f "PF-build-env-$BUILD_ENV.zip" ]; then wget $PF_BUILD_FILE_URL || exit 11 echo "$(tput sgr 0)" fi -if [ ! -e "../PF-build-env-$BUILD_ENV/PF-build-env-$BUILD_ENV-$TARGET_OS-$Processor.txt" ]; then +if [ ! -e "../PF-build-env-$BUILD_ENV/PF-build-env-$BUILD_ENV-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt" ]; then echo "$(tput setaf 6)Unzipping Prusa Firmware build environment...$(tput setaf 2)" sleep 2 - unzip -o PF-build-env-$BUILD_ENV.zip -d ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor || exit 12 - echo "# PF-build-env-$TARGET_OS-$Processor-$BUILD_ENV" >> ../PF-build-env-$BUILD_ENV/PF-build-env-$BUILD_ENV-$TARGET_OS-$Processor.txt + unzip -o PF-build-env-$BUILD_ENV.zip -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor || exit 12 + echo "# PF-build-env-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor-$BUILD_ENV" >> ../PF-build-env-$BUILD_ENV/PF-build-env-$BUILD_ENV-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt echo "$(tput sgr0)" fi # Check if User updated Arduino IDE 1.8.5 boardsmanager and tools -if [ -d "../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/arduino/tools" ]; then +if [ -d "../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/arduino/tools" ]; then echo "$(tput setaf 6)Arduino IDE boards / tools have been manually updated...$" echo "Please don't update the 'Arduino AVR boards' as this will prevent running this script (tput setaf 2)" sleep 2 fi -if [ -d "../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/arduino/tools/avr-gcc/4.9.2-atmel3.5.4-arduino2" ]; then +if [ -d "../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/arduino/tools/avr-gcc/4.9.2-atmel3.5.4-arduino2" ]; then echo "$(tput setaf 6)PrusaReasearch compatible tools have been manually updated...$(tput setaf 2)" sleep 2 echo "$(tput setaf 6)Copying Prusa Firmware build environment to manually updated boards / tools...$(tput setaf 2)" sleep 2 - cp -f ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/hardware/tools/avr/avr/lib/ldscripts/avr6.xn ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/arduino/tools/avr-gcc/4.9.2-atmel3.5.4-arduino2/avr/lib/ldscripts/avr6.xn - echo "# PF-build-env-portable-$TARGET_OS-$Processor-$BUILD_ENV" >> ../PF-build-env-$BUILD_ENV/PF-build-env-portable-$BUILD_ENV-$TARGET_OS-$Processor.txt + cp -f ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/hardware/tools/avr/avr/lib/ldscripts/avr6.xn ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/arduino/tools/avr-gcc/4.9.2-atmel3.5.4-arduino2/avr/lib/ldscripts/avr6.xn + echo "# PF-build-env-portable-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor-$BUILD_ENV" >> ../PF-build-env-$BUILD_ENV/PF-build-env-portable-$BUILD_ENV-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt echo "$(tput sgr0)" fi -if [ -d "../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor/portable/packages/arduino/tools/avr-gcc/5.4.0-atmel3.6.1-arduino2" ]; then +if [ -d "../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/portable/packages/arduino/tools/avr-gcc/5.4.0-atmel3.6.1-arduino2" ]; then echo "$(tput setaf 1)Arduino IDE tools have been updated manually to a non supported version!!!" echo "Delete ../PF-build-env-$BUILD_ENV and start the script again" echo "Script will not continue until this have been fixed $(tput setaf 2)" @@ -491,7 +494,7 @@ if [ ! -z "$3" ] ; then fi #Set BUILD_ENV_PATH -cd ../PF-build-env-$BUILD_ENV/$TARGET_OS-$Processor || exit 24 +cd ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor || exit 24 BUILD_ENV_PATH="$( pwd -P )" cd ../.. @@ -636,8 +639,8 @@ do echo "Start to build Prusa Firmware ..." echo "Using variant $VARIANT$(tput setaf 3)" sleep 2 - #$BUILD_ENV_PATH/arduino-builder -dump-prefs -debug-level 10 -compile -hardware $ARDUINO/hardware -hardware $ARDUINO/portable/packages -tools $ARDUINO/tools-builder -tools $ARDUINO/hardware/tools/avr -tools $ARDUINO/portable/packages -built-in-libraries $ARDUINO/libraries -libraries $ARDUINO/portable/sketchbook/libraries -fqbn=$BOARD_PACKAGE_NAME:avr:$BOARD -ide-version=10805 -build-path=$BUILD_PATH -warnings=all $SCRIPT_PATH/Firmware/Firmware.ino || exit 14 - $BUILD_ENV_PATH/arduino-builder -compile -hardware $ARDUINO/hardware -hardware $ARDUINO/portable/packages -tools $ARDUINO/tools-builder -tools $ARDUINO/hardware/tools/avr -tools $ARDUINO/portable/packages -built-in-libraries $ARDUINO/libraries -libraries $ARDUINO/portable/sketchbook/libraries -fqbn=$BOARD_PACKAGE_NAME:avr:$BOARD -ide-version=10805 -build-path=$BUILD_PATH -warnings=all $SCRIPT_PATH/Firmware/Firmware.ino || exit 14 + #$BUILD_ENV_PATH/arduino-builder -dump-prefs -debug-level 10 -compile -hardware $ARDUINO/hardware -hardware $ARDUINO/portable/packages -tools $ARDUINO/tools-builder -tools $ARDUINO/hardware/tools/avr -tools $ARDUINO/portable/packages -built-in-libraries $ARDUINO/libraries -libraries $ARDUINO/portable/sketchbook/libraries -fqbn=$BOARD_PACKAGE_NAME:avr:$BOARD -build-path=$BUILD_PATH -warnings=all $SCRIPT_PATH/Firmware/Firmware.ino || exit 14 + $BUILD_ENV_PATH/arduino-builder -compile -hardware $ARDUINO/hardware -hardware $ARDUINO/portable/packages -tools $ARDUINO/tools-builder -tools $ARDUINO/hardware/tools/avr -tools $ARDUINO/portable/packages -built-in-libraries $ARDUINO/libraries -libraries $ARDUINO/portable/sketchbook/libraries -fqbn=$BOARD_PACKAGE_NAME:avr:$BOARD -build-path=$BUILD_PATH -warnings=all $SCRIPT_PATH/Firmware/Firmware.ino || exit 14 echo "$(tput sgr 0)" if [ $LANGUAGES == "ALL" ]; then From 91e94aa0e894be8b9cf2734c72ae9357c92cea10 Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 18 Oct 2019 10:32:41 +0300 Subject: [PATCH 053/110] Adjustable timeout --- Firmware/backlight.cpp | 7 +++++-- Firmware/backlight.h | 1 + Firmware/eeprom.h | 3 ++- Firmware/ultralcd.cpp | 9 +++++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index 59f08b6f..5ceef595 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -15,7 +15,7 @@ bool backlightSupport = 0; //only if it's true will any of the settings be visib int16_t backlightLevel_HIGH = 0; int16_t backlightLevel_LOW = 0; uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT; -unsigned long backlightTimer_period = 10000ul; +int16_t backlightTimer_period = 10; LongTimer backlightTimer; void backlight_save() //saves all backlight data to eeprom. @@ -23,6 +23,7 @@ void backlight_save() //saves all backlight data to eeprom. eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, (uint8_t)backlightLevel_HIGH); eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW, (uint8_t)backlightLevel_LOW); eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_MODE, backlightMode); + eeprom_update_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, backlightTimer_period); } void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on events such as knob click, rotate and on full screen notifications. @@ -37,7 +38,7 @@ void backlight_update() if (backlightMode == BACKLIGHT_MODE_AUTO) { - if (backlightTimer.expired(backlightTimer_period)) analogWrite(LCD_BL_PIN, backlightLevel_LOW); + if (backlightTimer.expired((uint32_t)backlightTimer_period * 1000ul)) analogWrite(LCD_BL_PIN, backlightLevel_LOW); else if (backlightTimer.running()) analogWrite(LCD_BL_PIN, backlightLevel_HIGH); else {/*do nothing*/;} //display is dimmed. } @@ -61,10 +62,12 @@ void backlight_init() backlightMode = BACKLIGHT_MODE_AUTO; backlightLevel_HIGH = 130; backlightLevel_LOW = 50; + backlightTimer_period = 10; //in seconds backlight_save(); } backlightLevel_HIGH = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH); backlightLevel_LOW = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW); + backlightTimer_period = eeprom_read_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT); SET_OUTPUT(LCD_BL_PIN); backlightTimer_reset(); diff --git a/Firmware/backlight.h b/Firmware/backlight.h index f3e2ee60..fc18dd5e 100644 --- a/Firmware/backlight.h +++ b/Firmware/backlight.h @@ -15,6 +15,7 @@ extern int16_t backlightLevel_HIGH; extern int16_t backlightLevel_LOW; extern uint8_t backlightMode; extern bool backlightSupport; +extern int16_t backlightTimer_period; extern void backlight_update(); extern void backlight_init(); diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index f47a2333..b869ac1c 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -204,9 +204,10 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); #define EEPROM_BACKLIGHT_LEVEL_HIGH (EEPROM_SHEETS_BASE-1) // uint8 #define EEPROM_BACKLIGHT_LEVEL_LOW (EEPROM_BACKLIGHT_LEVEL_HIGH-1) // uint8 #define EEPROM_BACKLIGHT_MODE (EEPROM_BACKLIGHT_LEVEL_LOW-1) // uint8 +#define EEPROM_BACKLIGHT_TIMEOUT (EEPROM_BACKLIGHT_MODE-2) // uint16 //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. -#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_MODE +#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_TIMEOUT // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f4a60f7d..305ba7cb 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7187,14 +7187,15 @@ static void lcd_backlight_menu() ); MENU_ITEM_BACK_P(_T(MSG_BACK)); - MENU_ITEM_EDIT_int3_P(_i("Level Bright"), &backlightLevel_HIGH, 0, 255); - MENU_ITEM_EDIT_int3_P(_i("Level Dimmed"), &backlightLevel_LOW, 0, 255); + MENU_ITEM_EDIT_int3_P(_i("Level Bright"), &backlightLevel_HIGH, backlightLevel_LOW, 255); + MENU_ITEM_EDIT_int3_P(_i("Level Dimmed"), &backlightLevel_LOW, 0, backlightLevel_HIGH); switch (backlightMode) { - case BACKLIGHT_MODE_BRIGHT: MENU_ITEM_FUNCTION_P(_i("Mode [Always on]"), backlight_mode_toggle); break; - case BACKLIGHT_MODE_DIM: MENU_ITEM_FUNCTION_P(_i("Mode [Always off]"), backlight_mode_toggle); break; + case BACKLIGHT_MODE_BRIGHT: MENU_ITEM_FUNCTION_P(_i("Mode [Bright]"), backlight_mode_toggle); break; + case BACKLIGHT_MODE_DIM: MENU_ITEM_FUNCTION_P(_i("Mode [Dim]"), backlight_mode_toggle); break; default: MENU_ITEM_FUNCTION_P(_i("Mode [Auto]"), backlight_mode_toggle); break; } + MENU_ITEM_EDIT_int3_P(_i("Timeout"), &backlightTimer_period, 1, 999); MENU_END(); } From 9fc42526e71c09415d15472df4acaf5f6bec6372 Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 18 Oct 2019 12:18:43 +0300 Subject: [PATCH 054/110] Backlight always on during calibration --- Firmware/Marlin_main.cpp | 3 +++ Firmware/backlight.cpp | 15 +++++++++++++++ Firmware/backlight.h | 10 ++++++++++ Firmware/ultralcd.cpp | 6 +++++- 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c076c8a0..ff580eeb 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -63,6 +63,7 @@ #include "menu.h" #include "ultralcd.h" +#include "backlight.h" #include "planner.h" #include "stepper.h" @@ -2768,6 +2769,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif // TMC2130 + FORCE_BL_ON_START; // Only Z calibration? if (!onlyZ) { @@ -2956,6 +2958,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) #ifdef TMC2130 FORCE_HIGH_POWER_END; #endif // TMC2130 + FORCE_BL_ON_END; return final_result; } diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index 5ceef595..054c510f 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -18,6 +18,21 @@ uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT; int16_t backlightTimer_period = 10; LongTimer backlightTimer; +void force_bl_on(bool section_start) +{ + if (section_start) + { + backlightMode = BACKLIGHT_MODE_BRIGHT; + if (backlightLevel_HIGH < 30) backlightLevel_HIGH = 30; + } + else + { + backlightMode = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_MODE); + backlightLevel_HIGH = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH); + } + backlight_update(); +} + void backlight_save() //saves all backlight data to eeprom. { eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, (uint8_t)backlightLevel_HIGH); diff --git a/Firmware/backlight.h b/Firmware/backlight.h index fc18dd5e..99d777d9 100644 --- a/Firmware/backlight.h +++ b/Firmware/backlight.h @@ -3,6 +3,8 @@ #define _BACKLIGHT_H #include +#include "Marlin.h" +#include "pins.h" enum Backlight_Mode { @@ -17,6 +19,14 @@ extern uint8_t backlightMode; extern bool backlightSupport; extern int16_t backlightTimer_period; +#ifdef LCD_BL_PIN + #define FORCE_BL_ON_START force_bl_on(true) + #define FORCE_BL_ON_END force_bl_on(false) +#else + #define FORCE_BL_ON_START + #define FORCE_BL_ON_END +#endif +extern void force_bl_on(bool section_start); extern void backlight_update(); extern void backlight_init(); extern void backlightTimer_reset(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 305ba7cb..9d5776c7 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5019,7 +5019,7 @@ void lcd_wizard(WizState state) // Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point // other than WizState::Run - it is useful for debugging wizard. if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); - + FORCE_BL_ON_START; while (!end) { printf_P(PSTR("Wizard state: %d\n"), state); switch (state) { @@ -5157,6 +5157,7 @@ void lcd_wizard(WizState state) } } + FORCE_BL_ON_END; printf_P(_N("Wizard end state: %d\n"), state); switch (state) { //final message case S::Restore: //printer was already calibrated @@ -7393,6 +7394,7 @@ bool lcd_selftest() #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif // TMC2130 + FORCE_BL_ON_START; _delay(2000); KEEPALIVE_STATE(IN_HANDLER); @@ -7612,6 +7614,7 @@ bool lcd_selftest() #ifdef TMC2130 FORCE_HIGH_POWER_END; #endif // TMC2130 + FORCE_BL_ON_END; KEEPALIVE_STATE(NOT_BUSY); return(_result); } @@ -8021,6 +8024,7 @@ static bool lcd_selfcheck_check_heater(bool _isbed) static void lcd_selftest_error(TestError testError, const char *_error_1, const char *_error_2) { lcd_beeper_quick_feedback(); + FORCE_BL_ON_END; target_temperature[0] = 0; target_temperature_bed = 0; From 0ed4a23ae724f6758b6d9701b718fc12e46e880b Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 18 Oct 2019 12:42:55 +0300 Subject: [PATCH 055/110] And another compile fix... --- Firmware/Marlin_main.cpp | 8 ++++++-- Firmware/backlight.h | 10 +++------- Firmware/ultralcd.cpp | 20 +++++++++++++++----- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ff580eeb..76dca134 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2769,7 +2769,9 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif // TMC2130 - FORCE_BL_ON_START; + #ifdef LCD_BL_PIN + FORCE_BL_ON_START; + #endif // LCD_BL_PIN // Only Z calibration? if (!onlyZ) { @@ -2958,7 +2960,9 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) #ifdef TMC2130 FORCE_HIGH_POWER_END; #endif // TMC2130 - FORCE_BL_ON_END; + #ifdef LCD_BL_PIN + FORCE_BL_ON_END; + #endif // LCD_BL_PIN return final_result; } diff --git a/Firmware/backlight.h b/Firmware/backlight.h index 99d777d9..ef005adf 100644 --- a/Firmware/backlight.h +++ b/Firmware/backlight.h @@ -19,13 +19,9 @@ extern uint8_t backlightMode; extern bool backlightSupport; extern int16_t backlightTimer_period; -#ifdef LCD_BL_PIN - #define FORCE_BL_ON_START force_bl_on(true) - #define FORCE_BL_ON_END force_bl_on(false) -#else - #define FORCE_BL_ON_START - #define FORCE_BL_ON_END -#endif +#define FORCE_BL_ON_START force_bl_on(true) +#define FORCE_BL_ON_END force_bl_on(false) + extern void force_bl_on(bool section_start); extern void backlight_update(); extern void backlight_init(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 9d5776c7..acaab10c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5019,7 +5019,9 @@ void lcd_wizard(WizState state) // Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point // other than WizState::Run - it is useful for debugging wizard. if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); - FORCE_BL_ON_START; + #ifdef LCD_BL_PIN + FORCE_BL_ON_START; + #endif // LCD_BL_PIN while (!end) { printf_P(PSTR("Wizard state: %d\n"), state); switch (state) { @@ -5157,7 +5159,9 @@ void lcd_wizard(WizState state) } } - FORCE_BL_ON_END; + #ifdef LCD_BL_PIN + FORCE_BL_ON_END; + #endif // LCD_BL_PIN printf_P(_N("Wizard end state: %d\n"), state); switch (state) { //final message case S::Restore: //printer was already calibrated @@ -7394,7 +7398,9 @@ bool lcd_selftest() #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif // TMC2130 - FORCE_BL_ON_START; + #ifdef LCD_BL_PIN + FORCE_BL_ON_START; + #endif // LCD_BL_PIN _delay(2000); KEEPALIVE_STATE(IN_HANDLER); @@ -7614,7 +7620,9 @@ bool lcd_selftest() #ifdef TMC2130 FORCE_HIGH_POWER_END; #endif // TMC2130 - FORCE_BL_ON_END; + #ifdef LCD_BL_PIN + FORCE_BL_ON_END; + #endif // LCD_BL_PIN KEEPALIVE_STATE(NOT_BUSY); return(_result); } @@ -8024,7 +8032,9 @@ static bool lcd_selfcheck_check_heater(bool _isbed) static void lcd_selftest_error(TestError testError, const char *_error_1, const char *_error_2) { lcd_beeper_quick_feedback(); - FORCE_BL_ON_END; + #ifdef LCD_BL_PIN + FORCE_BL_ON_END; + #endif // LCD_BL_PIN target_temperature[0] = 0; target_temperature_bed = 0; From d7b12faa95d038ac41f24f2b2ba9521891c21409 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 19 Oct 2019 18:45:04 +0300 Subject: [PATCH 056/110] Add "Brightness" to Tune menu --- Firmware/ultralcd.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index acaab10c..f89cac58 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7119,7 +7119,12 @@ static void lcd_tune_menu() default: MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set); } - +#ifdef LCD_BL_PIN + if (backlightSupport) + { + MENU_ITEM_SUBMENU_P(_i("Brightness"), lcd_backlight_menu); + } +#endif //LCD_BL_PIN MENU_END(); } From 4943e17bda06bf269a74af5a9d34357c3112f308 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 19 Oct 2019 18:45:31 +0300 Subject: [PATCH 057/110] Preserve power during PP by turning off backlight --- Firmware/Marlin_main.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 76dca134..ac3d7d8b 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9534,6 +9534,11 @@ void uvlo_() unsigned long time_start = _millis(); bool sd_print = card.sdprinting; // Conserve power as soon as possible. +#ifdef LCD_BL_PIN + backlightMode = BACKLIGHT_MODE_DIM; + backlightLevel_LOW = 0; + backlight_update(); +#endif //LCD_BL_PIN disable_x(); disable_y(); From 50231b76da86e666b48554242818e9589ec3a202 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Wed, 5 Jun 2019 18:12:46 +0200 Subject: [PATCH 058/110] Improved handling of unknown Z position - Introduce raise_z_above to move Z carefully when the current position is potentially unknown, using stallguard - Use raise_z_above for: * filament loading/unloading clearance * extruder spacing when preheating (to avoid buildplate marks on PEI) * before homing to avoid damaging the build plate and to avoid repeated Z moves as well Since raise_z_above is conditional, it will only raise when needed. Calling raise_z_above when the extruder position is unknown and already at maximum travel is safe and will prevent further vertical moves. --- Firmware/Configuration.h | 8 ++++- Firmware/Marlin.h | 2 +- Firmware/Marlin_main.cpp | 78 +++++++++++++++++++++++++++------------- Firmware/mmu.cpp | 2 +- Firmware/ultralcd.cpp | 8 +++-- 5 files changed, 69 insertions(+), 29 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 87b5023f..f9f272d5 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -345,7 +345,7 @@ your extruder heater takes 2 minutes to hit the target on heating. #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 - #define Z_RAISE_BEFORE_HOMING 4 // (in mm) Raise Z before homing (G28) for Probe Clearance. + #define Z_RAISE_BEFORE_HOMING 5 // (in mm) Raise Z before homing (G28) for Probe Clearance. // Be sure you have this distance over your Z_MAX_POS in case #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min @@ -549,6 +549,12 @@ enum CalibrationStatus CALIBRATION_STATUS_UNKNOWN = 0, }; +// 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 +#define MIN_Z_FOR_UNLOAD 20 +#define MIN_Z_FOR_PREHEAT 10 + #include "Configuration_adv.h" #include "thermistortables.h" diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index c1a7b562..ee99490e 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -513,4 +513,4 @@ void M600_wait_for_user(float HotendTempBckp); void M600_check_state(float nozzle_temp); void load_filament_final_feed(); void marlin_wait_for_click(); -void marlin_rise_z(void); +void raise_z_above(float target, bool plan=true); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a2cbece5..58233e33 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2104,6 +2104,52 @@ bool check_commands() { } + +// raise_z_above: slowly raise Z to the requested height +// +// contrarily to a simple move, this function will carefully plan a move +// when the current Z position is unknown. In such cases, stallguard is +// enabled and will prevent prolonged pushing against the Z tops +void raise_z_above(float target, bool plan) +{ + if (current_position[Z_AXIS] >= target) + return; + + // Z needs raising + current_position[Z_AXIS] = target; + + if (axis_known_position[Z_AXIS]) + { + // current position is known, it's safe to raise Z + if(plan) plan_buffer_line_curposXYZE(max_feedrate[Z_AXIS], active_extruder); + return; + } + + // ensure Z is powered in normal mode to overcome initial load + enable_z(); + st_synchronize(); + + // rely on crashguard to limit damage + bool z_endstop_enabled = enable_z_endstop(true); +#ifdef TMC2130 + tmc2130_home_enter(Z_AXIS_MASK); +#endif //TMC2130 + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 60, active_extruder); + st_synchronize(); +#ifdef TMC2130 + if (endstop_z_hit_on_purpose()) + { + // not necessarily exact, but will avoid further vertical moves + current_position[Z_AXIS] = max_pos[Z_AXIS]; + plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], + current_position[Z_AXIS], current_position[E_AXIS]); + } + tmc2130_home_exit(); +#endif //TMC2130 + enable_z_endstop(z_endstop_enabled); +} + + #ifdef TMC2130 bool calibrate_z_auto() { @@ -2484,9 +2530,7 @@ static void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, lon //if we are homing all axes, first move z higher to protect heatbed/steel sheet if (home_all_axes) { - current_position[Z_AXIS] += MESH_HOME_Z_SEARCH; - feedrate = homing_feedrate[Z_AXIS]; - plan_buffer_line_curposXYZE(feedrate / 60, active_extruder); + raise_z_above(MESH_HOME_Z_SEARCH); st_synchronize(); } #ifdef ENABLE_AUTO_BED_LEVELING @@ -2597,26 +2641,21 @@ static void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, lon #ifndef Z_SAFE_HOMING if(home_z) { #if defined (Z_RAISE_BEFORE_HOMING) && (Z_RAISE_BEFORE_HOMING > 0) - destination[Z_AXIS] = Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS) * (-1); // Set destination away from bed - feedrate = max_feedrate[Z_AXIS]; - plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate, active_extruder); + raise_z_above(Z_RAISE_BEFORE_HOMING); st_synchronize(); #endif // defined (Z_RAISE_BEFORE_HOMING) && (Z_RAISE_BEFORE_HOMING > 0) #if (defined(MESH_BED_LEVELING) && !defined(MK1BP)) // If Mesh bed leveling, move X&Y to safe position for home - if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] )) - { - homeaxis(X_AXIS); - homeaxis(Y_AXIS); - } + raise_z_above(MESH_HOME_Z_SEARCH); + st_synchronize(); + if (!axis_known_position[X_AXIS]) homeaxis(X_AXIS); + if (!axis_known_position[Y_AXIS]) homeaxis(Y_AXIS); // 1st mesh bed leveling measurement point, corrected. world2machine_initialize(); world2machine(pgm_read_float(bed_ref_points_4), pgm_read_float(bed_ref_points_4+1), destination[X_AXIS], destination[Y_AXIS]); world2machine_reset(); if (destination[Y_AXIS] < Y_MIN_POS) destination[Y_AXIS] = Y_MIN_POS; - destination[Z_AXIS] = MESH_HOME_Z_SEARCH; // Set destination away from bed - feedrate = homing_feedrate[Z_AXIS]/10; - current_position[Z_AXIS] = 0; + feedrate = homing_feedrate[X_AXIS] / 20; enable_endstops(false); #ifdef DEBUG_BUILD SERIAL_ECHOLNPGM("plan_set_position()"); @@ -3143,15 +3182,6 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float custom_message_type = CustomMsg::Status; } -//! @brief Rise Z if too low to avoid blob/jam before filament loading -//! -//! It doesn't plan_buffer_line(), as it expects plan_buffer_line() to be called after -//! during extruding (loading) filament. -void marlin_rise_z(void) -{ - if (current_position[Z_AXIS] < 20) current_position[Z_AXIS] += 30; -} - void gcode_M701() { printf_P(PSTR("gcode_M701 begin\n")); @@ -3180,7 +3210,7 @@ void gcode_M701() plan_buffer_line_curposXYZE(400 / 60, active_extruder); //fast sequence st_synchronize(); - marlin_rise_z(); + raise_z_above(MIN_Z_FOR_LOAD, false); current_position[E_AXIS] += 30; plan_buffer_line_curposXYZE(400 / 60, active_extruder); //fast sequence diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index d8ae497b..224ffc8a 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1355,7 +1355,7 @@ void lcd_mmu_load_to_nozzle(uint8_t filament_nr) manage_response(true, true, MMU_TCODE_MOVE); mmu_continue_loading(false); mmu_extruder = tmp_extruder; //filament change is finished - marlin_rise_z(); + raise_z_above(MIN_Z_FOR_LOAD, false); mmu_load_to_nozzle(); load_filament_final_feed(); st_synchronize(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d1114897..03faf2ac 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2374,9 +2374,11 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) { lcd_commands_type = LcdCommands::Layer1Cal; } - else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) + else { - lcd_wizard(WizState::LoadFilHot); + raise_z_above(MIN_Z_FOR_PREHEAT); + if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) + lcd_wizard(WizState::LoadFilHot); } return; } @@ -6360,6 +6362,8 @@ void unload_filament() custom_message_type = CustomMsg::FilamentLoading; lcd_setstatuspgm(_T(MSG_UNLOADING_FILAMENT)); + raise_z_above(MIN_Z_FOR_UNLOAD); + // extr_unload2(); current_position[E_AXIS] -= 45; From e25befa1759fd5d27b388fef3f132f0af00a83b9 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 31 Aug 2019 16:09:53 +0200 Subject: [PATCH 059/110] Fix include guard to silence duplicate declaration warnings --- Firmware/Marlin.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index ee99490e..8a396dac 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -358,9 +358,6 @@ extern int fan_speed[2]; // Handling multiple extruders pins extern uint8_t active_extruder; - -#endif - //Long pause extern unsigned long pause_time; extern unsigned long start_pause_print; @@ -514,3 +511,5 @@ void M600_check_state(float nozzle_temp); void load_filament_final_feed(); void marlin_wait_for_click(); void raise_z_above(float target, bool plan=true); + +#endif From 1e09f8c003a2623bd632dc4026bd7e9759598119 Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 30 Oct 2019 21:11:19 +0200 Subject: [PATCH 060/110] Wake on certain events EEPROM DIM and BRIGHT values swapped!!! --- Firmware/backlight.cpp | 24 ++++++++++++++++++++++-- Firmware/backlight.h | 5 +++-- Firmware/sound.cpp | 7 +++++++ Firmware/ultralcd.cpp | 1 + 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index 054c510f..c57995cc 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -11,6 +11,8 @@ #ifdef LCD_BL_PIN +#define BL_FLASH_DELAY_MS 25 + bool backlightSupport = 0; //only if it's true will any of the settings be visible to the user int16_t backlightLevel_HIGH = 0; int16_t backlightLevel_LOW = 0; @@ -33,6 +35,24 @@ void force_bl_on(bool section_start) backlight_update(); } +void backlight_wake(const uint8_t flashNo) +{ + if (!backlightSupport) return; + + if (flashNo) + { + uint8_t backlightMode_bck = backlightMode; + for (uint8_t i = 0; i < (((backlightMode_bck == BACKLIGHT_MODE_AUTO) && !backlightTimer.running()) + (flashNo * 2)); i++) + { + backlightMode = !backlightMode; //toggles between BACKLIGHT_MODE_BRIGHT and BACKLIGHT_MODE_DIM + backlight_update(); + _delay(BL_FLASH_DELAY_MS); + } + backlightMode = backlightMode_bck; + } + backlightTimer_reset(); +} + void backlight_save() //saves all backlight data to eeprom. { eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, (uint8_t)backlightLevel_HIGH); @@ -41,10 +61,11 @@ void backlight_save() //saves all backlight data to eeprom. eeprom_update_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, backlightTimer_period); } -void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on events such as knob click, rotate and on full screen notifications. +void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on user interactions. { if (!backlightSupport) return; backlightTimer.start(); + backlight_update(); } void backlight_update() @@ -86,7 +107,6 @@ void backlight_init() SET_OUTPUT(LCD_BL_PIN); backlightTimer_reset(); - backlight_update(); //sets brightness } #endif //LCD_BL_PIN \ No newline at end of file diff --git a/Firmware/backlight.h b/Firmware/backlight.h index ef005adf..fce908a3 100644 --- a/Firmware/backlight.h +++ b/Firmware/backlight.h @@ -8,8 +8,8 @@ enum Backlight_Mode { - BACKLIGHT_MODE_BRIGHT = 0, - BACKLIGHT_MODE_DIM = 1, + BACKLIGHT_MODE_DIM = 0, + BACKLIGHT_MODE_BRIGHT = 1, BACKLIGHT_MODE_AUTO = 2, }; @@ -27,6 +27,7 @@ extern void backlight_update(); extern void backlight_init(); extern void backlightTimer_reset(); extern void backlight_save(); +extern void backlight_wake(const uint8_t flashNo = 0); #endif //_BACKLIGHT_H diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp index 52d880a0..39d513de 100644 --- a/Firmware/sound.cpp +++ b/Firmware/sound.cpp @@ -5,6 +5,7 @@ //#include //#include //#include "eeprom.h" +#include "backlight.h" //eSOUND_MODE eSoundMode=e_SOUND_MODE_LOUD; @@ -63,6 +64,7 @@ Sound_SaveMode(); //if critical is true then silend and once mode is ignored void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){ + backlight_wake(1); if (!critical){ if (eSoundMode != e_SOUND_MODE_SILENT){ if(!tone_){ @@ -135,6 +137,7 @@ switch(eSoundMode) static void Sound_DoSound_Blind_Alert(void) { + backlight_wake(1); uint8_t nI; for(nI=0; nI<20; nI++) @@ -148,6 +151,7 @@ static void Sound_DoSound_Blind_Alert(void) static void Sound_DoSound_Encoder_Move(void) { + backlight_wake(); uint8_t nI; for(nI=0;nI<5;nI++) @@ -161,6 +165,7 @@ uint8_t nI; static void Sound_DoSound_Echo(void) { + backlight_wake(); uint8_t nI; for(nI=0;nI<10;nI++) @@ -174,6 +179,7 @@ for(nI=0;nI<10;nI++) static void Sound_DoSound_Prompt(void) { + backlight_wake(2); WRITE(BEEPER,HIGH); _delay_ms(500); WRITE(BEEPER,LOW); @@ -181,6 +187,7 @@ WRITE(BEEPER,LOW); static void Sound_DoSound_Alert(bool bOnce) { + backlight_wake(); uint8_t nI,nMax; nMax=bOnce?1:3; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f89cac58..0cf8667f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8868,6 +8868,7 @@ void menu_lcd_lcdupdate_func(void) lcd_draw_update = 2; lcd_oldcardstatus = IS_SD_INSERTED; lcd_refresh(); // to maybe revive the LCD if static electricity killed it. + backlight_wake(); if (lcd_oldcardstatus) { card.initsd(); From c899320590b5b9e41181026076697747ad898a5a Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 31 Oct 2019 15:08:07 +0100 Subject: [PATCH 061/110] Fix M81 Turn off Power Supply... ... as it should be active if PS_ON_PIN is defined and assinged to an actual pin. --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a2cbece5..1cd6d997 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6165,7 +6165,6 @@ Sigma_Exit: LCD_MESSAGERPGM(_T(WELCOME_MSG)); lcd_update(0); break; - #endif //! ### M81 - Turn off Power Supply // -------------------------------------- @@ -6189,6 +6188,7 @@ Sigma_Exit: LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),MSG_OFF,PSTR("."))); lcd_update(0); break; + #endif //! ### M82 - Set E axis to absolute mode // --------------------------------------- From 76c39ce68929037c40fcdd7fe60f4abd07666f20 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 31 Oct 2019 17:45:22 +0100 Subject: [PATCH 062/110] Show FINDA state as N/A if last received response is older than 1s. --- Firmware/mmu.cpp | 3 +++ Firmware/mmu.h | 1 + Firmware/ultralcd.cpp | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index d8ae497b..edc9a30f 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -70,6 +70,7 @@ uint8_t mmu_extruder = MMU_FILAMENT_UNKNOWN; uint8_t tmp_extruder = MMU_FILAMENT_UNKNOWN; int8_t mmu_finda = -1; +uint32_t mmu_last_finda_response = 0; int16_t mmu_version = -1; @@ -264,6 +265,7 @@ void mmu_loop(void) if (mmu_rx_ok() > 0) { fscanf_P(uart2io, PSTR("%hhu"), &mmu_finda); //scan finda from buffer + mmu_last_finda_response = _millis(); FDEBUG_PRINTF_P(PSTR("MMU => '%dok'\n"), mmu_finda); puts_P(PSTR("MMU - ENABLED")); mmu_enabled = true; @@ -376,6 +378,7 @@ void mmu_loop(void) if (mmu_rx_ok() > 0) { fscanf_P(uart2io, PSTR("%hhu"), &mmu_finda); //scan finda from buffer + mmu_last_finda_response = _millis(); FDEBUG_PRINTF_P(PSTR("MMU => '%dok'\n"), mmu_finda); //printf_P(PSTR("Eact: %d\n"), int(e_active())); if (!mmu_finda && CHECK_FSENSOR && fsensor_enabled) { diff --git a/Firmware/mmu.h b/Firmware/mmu.h index ad508c2a..30b8e1af 100644 --- a/Firmware/mmu.h +++ b/Firmware/mmu.h @@ -14,6 +14,7 @@ extern uint8_t mmu_extruder; extern uint8_t tmp_extruder; extern int8_t mmu_finda; +extern uint32_t mmu_last_finda_response; extern bool ir_sensor_detected; extern int16_t mmu_version; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d08f536c..2bfe2b5c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4016,7 +4016,8 @@ static void lcd_show_sensors_state() uint8_t idler_state = STATE_NA; pinda_state = READ(Z_MIN_PIN); - if (mmu_enabled) { + if (mmu_enabled && ((_millis() - mmu_last_finda_response) < 1000ul) ) + { finda_state = mmu_finda; } if (ir_sensor_detected) { From cd5ff783cfef9f74665c70c2da02d7427985d670 Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 31 Oct 2019 19:07:20 +0200 Subject: [PATCH 063/110] General fixes and improvements to code --- Firmware/Marlin_main.cpp | 14 +++++------ Firmware/backlight.cpp | 22 ++++++++++------ Firmware/backlight.h | 1 - Firmware/sound.cpp | 2 +- Firmware/ultralcd.cpp | 54 +++++++++++++++------------------------- 5 files changed, 43 insertions(+), 50 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ac3d7d8b..ea6c9aa2 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2769,10 +2769,10 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif // TMC2130 - #ifdef LCD_BL_PIN - FORCE_BL_ON_START; - #endif // LCD_BL_PIN - // Only Z calibration? + + FORCE_BL_ON_START; + + // Only Z calibration? if (!onlyZ) { setTargetBed(0); @@ -2960,9 +2960,9 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) #ifdef TMC2130 FORCE_HIGH_POWER_END; #endif // TMC2130 - #ifdef LCD_BL_PIN - FORCE_BL_ON_END; - #endif // LCD_BL_PIN + + FORCE_BL_ON_END; + return final_result; } diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index c57995cc..6500837e 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -20,6 +20,13 @@ uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT; int16_t backlightTimer_period = 10; LongTimer backlightTimer; +static void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on user interactions. +{ + if (!backlightSupport) return; + backlightTimer.start(); + backlight_update(); +} + void force_bl_on(bool section_start) { if (section_start) @@ -61,13 +68,6 @@ void backlight_save() //saves all backlight data to eeprom. eeprom_update_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, backlightTimer_period); } -void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on user interactions. -{ - if (!backlightSupport) return; - backlightTimer.start(); - backlight_update(); -} - void backlight_update() { if (!backlightSupport) return; @@ -109,4 +109,12 @@ void backlight_init() backlightTimer_reset(); } +#else //LCD_BL_PIN + +void force_bl_on(__attribute__((unused)) bool section_start) {} +void backlight_update() {} +void backlight_init() {} +void backlight_save() {} +void backlight_wake(__attribute__((unused)) const uint8_t flashNo) {} + #endif //LCD_BL_PIN \ No newline at end of file diff --git a/Firmware/backlight.h b/Firmware/backlight.h index fce908a3..d9fdd0ad 100644 --- a/Firmware/backlight.h +++ b/Firmware/backlight.h @@ -25,7 +25,6 @@ extern int16_t backlightTimer_period; extern void force_bl_on(bool section_start); extern void backlight_update(); extern void backlight_init(); -extern void backlightTimer_reset(); extern void backlight_save(); extern void backlight_wake(const uint8_t flashNo = 0); diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp index 39d513de..bf10271e 100644 --- a/Firmware/sound.cpp +++ b/Firmware/sound.cpp @@ -64,7 +64,7 @@ Sound_SaveMode(); //if critical is true then silend and once mode is ignored void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){ - backlight_wake(1); + backlight_wake(); if (!critical){ if (eSoundMode != e_SOUND_MODE_SILENT){ if(!tone_){ diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0cf8667f..b9b03f68 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -19,9 +19,7 @@ #include "lcd.h" #include "menu.h" -#ifdef LCD_BL_PIN #include "backlight.h" -#endif //LCD_BL_PIN #include "util.h" #include "mesh_bed_leveling.h" @@ -5019,10 +5017,10 @@ void lcd_wizard(WizState state) // Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point // other than WizState::Run - it is useful for debugging wizard. if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); - #ifdef LCD_BL_PIN - FORCE_BL_ON_START; - #endif // LCD_BL_PIN - while (!end) { + + FORCE_BL_ON_START; + + while (!end) { printf_P(PSTR("Wizard state: %d\n"), state); switch (state) { case S::Run: //Run wizard? @@ -5158,10 +5156,9 @@ void lcd_wizard(WizState state) default: break; } } - - #ifdef LCD_BL_PIN - FORCE_BL_ON_END; - #endif // LCD_BL_PIN + + FORCE_BL_ON_END; + printf_P(_N("Wizard end state: %d\n"), state); switch (state) { //final message case S::Restore: //printer was already calibrated @@ -7403,9 +7400,9 @@ bool lcd_selftest() #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif // TMC2130 - #ifdef LCD_BL_PIN - FORCE_BL_ON_START; - #endif // LCD_BL_PIN + + FORCE_BL_ON_START; + _delay(2000); KEEPALIVE_STATE(IN_HANDLER); @@ -7625,10 +7622,10 @@ bool lcd_selftest() #ifdef TMC2130 FORCE_HIGH_POWER_END; #endif // TMC2130 - #ifdef LCD_BL_PIN - FORCE_BL_ON_END; - #endif // LCD_BL_PIN - KEEPALIVE_STATE(NOT_BUSY); + + FORCE_BL_ON_END; + + KEEPALIVE_STATE(NOT_BUSY); return(_result); } @@ -8037,10 +8034,9 @@ static bool lcd_selfcheck_check_heater(bool _isbed) static void lcd_selftest_error(TestError testError, const char *_error_1, const char *_error_2) { lcd_beeper_quick_feedback(); - #ifdef LCD_BL_PIN - FORCE_BL_ON_END; - #endif // LCD_BL_PIN - + + FORCE_BL_ON_END; + target_temperature[0] = 0; target_temperature_bed = 0; manage_heater(); @@ -8633,9 +8629,7 @@ void ultralcd_init() else lcd_autoDeplete = autoDepleteRaw; } -#ifdef LCD_BL_PIN backlight_init(); -#endif //LCD_BL_PIN lcd_init(); lcd_refresh(); lcd_longpress_func = menu_lcd_longpress_func; @@ -8784,9 +8778,7 @@ uint8_t get_message_level() void menu_lcd_longpress_func(void) { -#ifdef LCD_BL_PIN - backlightTimer_reset(); -#endif //LCD_BL_PIN + backlight_wake(); if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z) { // disable longpress during re-entry, while homing or calibration @@ -8886,9 +8878,7 @@ void menu_lcd_lcdupdate_func(void) } } #endif//CARDINSERTED -#ifdef LCD_BL_PIN backlight_update(); -#endif //LCD_BL_PIN if (lcd_next_update_millis < _millis()) { if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) @@ -8899,17 +8889,13 @@ void menu_lcd_lcdupdate_func(void) Sound_MakeSound(e_SOUND_TYPE_EncoderMove); lcd_encoder_diff = 0; lcd_timeoutToStatus.start(); -#ifdef LCD_BL_PIN - backlightTimer_reset(); -#endif //LCD_BL_PIN + backlight_wake(); } if (LCD_CLICKED) { lcd_timeoutToStatus.start(); -#ifdef LCD_BL_PIN - backlightTimer_reset(); -#endif //LCD_BL_PIN + backlight_wake(); } (*menu_menu)(); From 459385708ebbb93206d0335451e8eb5acdca8484 Mon Sep 17 00:00:00 2001 From: leptun Date: Sat, 2 Nov 2019 13:15:13 +0200 Subject: [PATCH 064/110] Fix MMU needs user attention Statistics error --- Firmware/mmu.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index d8ae497b..89c43645 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1572,18 +1572,7 @@ void mmu_continue_loading(bool blocking) break; case Ls::Unload: stop_and_save_print_to_ram(0, 0); - - //lift z - current_position[Z_AXIS] += Z_PAUSE_LIFT; - if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS; - plan_buffer_line_curposXYZE(15, active_extruder); - st_synchronize(); - - //Move XY to side - current_position[X_AXIS] = X_PAUSE_POS; - current_position[Y_AXIS] = Y_PAUSE_POS; - plan_buffer_line_curposXYZE(50, active_extruder); - st_synchronize(); + long_pause(); mmu_command(MmuCmd::U0); manage_response(false, true, MMU_UNLOAD_MOVE); From a14d7545a5ec362fa82df4ce68e7209395774d35 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 8 Nov 2019 16:06:42 +0100 Subject: [PATCH 065/110] Update Marlin_main.cpp --- Firmware/Marlin_main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d987fad9..36be553c 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7553,16 +7553,15 @@ Sigma_Exit: uint16_t res = tmc2130_get_res(i); tmc2130_set_res(i, res_new); cs.axis_ustep_resolution[i] = res_new; - uint16_t fac; if (res_new > res) { - fac = (res_new / res); + uint16_t fac = (res_new / res); cs.axis_steps_per_unit[i] *= fac; position[i] *= fac; } else { - fac = (res / res_new); + uint16_t fac = (res / res_new); cs.axis_steps_per_unit[i] /= fac; position[i] /= fac; } From 0de47bf0fd3b518e7dc97705b8bdd03b9e283cca Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 8 Nov 2019 18:19:15 +0200 Subject: [PATCH 066/110] Fix "On" for all languages --- lang/lang_en_cz.txt | 8 ++++---- lang/lang_en_de.txt | 8 ++++---- lang/lang_en_es.txt | 8 ++++---- lang/lang_en_fr.txt | 8 ++++---- lang/lang_en_pl.txt | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 8ab05fa4..a5c5b825 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1206,6 +1206,10 @@ "Off" "Vyp" +#MSG_ON +"On" +"Zap" + # "Back" "Zpet" @@ -1222,10 +1226,6 @@ "FINDA:" "\x00" -#MSG_ON -"On" -"Zap" - # "Firmware [none]" "Firmware [Zadne]" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 8c18d189..2da2b7a8 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1206,6 +1206,10 @@ "Off" "Aus" +#MSG_ON +"On" +"An" + # "Back" "Zurueck" @@ -1214,10 +1218,6 @@ "Checks" "Kontrolle" -#MSG_ON -"On" -"An" - # "False triggering" "Falschtriggerung" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index f3f72143..796fc47e 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1206,6 +1206,10 @@ "Off" "Ina" +#MSG_ON +"On" +"Act" + # "Back" "atras" @@ -1242,10 +1246,6 @@ "IR:" "\x00" -#MSG_ON -"On" -"Act" - # "Magnets comp.[N/A]" "Comp. imanes [N/A]" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index c787a416..0b7ccebe 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1203,6 +1203,10 @@ "Off" "\x00" +#MSG_ON +"On" +"\x00" + # "Back" "Retour" @@ -1251,10 +1255,6 @@ "Magnets comp. [On]" "Compens. aim. [on]" -#MSG_ON -"On" -"\x00" - # "Mesh [3x3]" "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 525f41b9..e816bbf8 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1204,6 +1204,10 @@ "Off" "Wyl" +#MSG_ON +"On" +"Wl" + # "Back" "Wstecz" @@ -1220,10 +1224,6 @@ "FINDA:" "\x00" -#MSG_ON -"On" -"Wl" - # "Firmware [none]" "Firmware [brak]" From 20a59f5f40577a57a56058b434519d25f2bbd04a Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 8 Nov 2019 19:44:48 +0200 Subject: [PATCH 067/110] Temp cal. --- Firmware/messages.c | 2 +- Firmware/ultralcd.cpp | 14 ++++++-------- lang/lang_en.txt | 10 ++-------- lang/lang_en_cz.txt | 14 +++----------- lang/lang_en_de.txt | 14 +++----------- lang/lang_en_es.txt | 14 +++----------- lang/lang_en_fr.txt | 12 ++---------- lang/lang_en_it.txt | 14 +++----------- lang/lang_en_pl.txt | 12 ++---------- 9 files changed, 25 insertions(+), 81 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 73bcf13a..1ad5fe33 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -90,7 +90,7 @@ const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); //// const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2 const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); //// const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); //// -const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal. "); ////c=20 r=1 +const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=12 r=1 const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12 const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17 const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20 r=1 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ddb83e40..13c48325 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -838,12 +838,13 @@ void lcdui_print_status_line(void) break; case CustomMsg::TempCal: // PINDA temp calibration in progress { + char statusLine[LCD_WIDTH + 1]; + sprintf_P(statusLine, PSTR("%-20S"), _T(MSG_TEMP_CALIBRATION)); char progress[4]; + sprintf_P(progress, PSTR("%d/6"), custom_message_state); + memcpy(statusLine + 12, progress, sizeof(progress) - 1); lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_TEMP_CALIBRATION)); - lcd_set_cursor(12, 3); - sprintf(progress, "%d/6", custom_message_state); - lcd_print(progress); + lcd_print(statusLine); } break; case CustomMsg::TempCompPreheat: // temp compensation preheat @@ -5742,10 +5743,7 @@ static void lcd_settings_menu() MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu); #endif //LINEARITY_CORRECTION && TMC2130 - if (temp_cal_active == false) - MENU_ITEM_FUNCTION_P(_i("Temp. cal. [off]"), lcd_temp_calibration_set);////MSG_TEMP_CALIBRATION_OFF c=20 r=1 - else - MENU_ITEM_FUNCTION_P(_i("Temp. cal. [on]"), lcd_temp_calibration_set);////MSG_TEMP_CALIBRATION_ON c=20 r=1 + MENU_ITEM_TOGGLE_P(_T(MSG_TEMP_CALIBRATION), temp_cal_active ? _T(MSG_ON) : _T(MSG_OFF), lcd_temp_calibration_set); #ifdef HAS_SECOND_SERIAL_PORT MENU_ITEM_TOGGLE_P(_T(MSG_RPI_PORT), (selectedSerialPort == 0) ? _T(MSG_OFF) : _T(MSG_ON), lcd_second_serial_set); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index b6861f96..2f3bbfc8 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -750,18 +750,12 @@ # "Select filament:" -#MSG_TEMP_CALIBRATION c=20 r=1 -"Temp. cal. " - -#MSG_TEMP_CALIBRATION_ON c=20 r=1 -"Temp. cal. [on]" +#MSG_TEMP_CALIBRATION c=12 r=1 +"Temp. cal." # "Select temperature which matches your material." -#MSG_TEMP_CALIBRATION_OFF c=20 r=1 -"Temp. cal. [off]" - #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index a5c5b825..aed952ba 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1002,22 +1002,14 @@ "Select filament:" "Zvolte filament:" -#MSG_TEMP_CALIBRATION c=20 r=1 -"Temp. cal. " -"Tepl. kal. " - -#MSG_TEMP_CALIBRATION_ON c=20 r=1 -"Temp. cal. [on]" -"Tepl. kal. [zap]" +#MSG_TEMP_CALIBRATION c=12 r=1 +"Temp. cal." +"Tepl. kal." # "Select temperature which matches your material." "Zvolte teplotu, ktera odpovida vasemu materialu." -#MSG_TEMP_CALIBRATION_OFF c=20 r=1 -"Temp. cal. [off]" -"Tepl. kal. [vyp]" - #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" "Teplot. kalibrace" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 2da2b7a8..bf850c6a 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1002,22 +1002,14 @@ "Select filament:" "Filament auswaehlen:" -#MSG_TEMP_CALIBRATION c=20 r=1 -"Temp. cal. " -"Temp Kalib. " - -#MSG_TEMP_CALIBRATION_ON c=20 r=1 -"Temp. cal. [on]" -"Temp. Kal. [an]" +#MSG_TEMP_CALIBRATION c=12 r=1 +"Temp. cal." +"Temp Kalib." # "Select temperature which matches your material." "Waehlen Sie die Temperatur, die zu Ihrem Material passt." -#MSG_TEMP_CALIBRATION_OFF c=20 r=1 -"Temp. cal. [off]" -"Temp. Kal. [aus]" - #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" "Temp. kalibrieren" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 796fc47e..0b29393a 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1002,22 +1002,14 @@ "Select filament:" "Selecciona filamento:" -#MSG_TEMP_CALIBRATION c=20 r=1 -"Temp. cal. " -"Cal. temp. " - -#MSG_TEMP_CALIBRATION_ON c=20 r=1 -"Temp. cal. [on]" -"Cal. temp. [on]" +#MSG_TEMP_CALIBRATION c=12 r=1 +"Temp. cal." +"Cal. temp." # "Select temperature which matches your material." "Selecciona la temperatura adecuada a tu material." -#MSG_TEMP_CALIBRATION_OFF c=20 r=1 -"Temp. cal. [off]" -"Cal. temp. [off]" - #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" "Calibracion temp." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 0b7ccebe..9f29192a 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -999,22 +999,14 @@ "Select filament:" "Selectionnez le filament:" -#MSG_TEMP_CALIBRATION c=20 r=1 -"Temp. cal. " +#MSG_TEMP_CALIBRATION c=12 r=1 +"Temp. cal." "Calib. Temp." -#MSG_TEMP_CALIBRATION_ON c=20 r=1 -"Temp. cal. [on]" -"Calib. Temp. [on]" - # "Select temperature which matches your material." "Selectionnez la temperature qui correspond a votre materiau." -#MSG_TEMP_CALIBRATION_OFF c=20 r=1 -"Temp. cal. [off]" -"Calib. Temp.[off]" - #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" "Calibration temp." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index dac04865..c3304400 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1001,22 +1001,14 @@ "Select filament:" "Seleziona il filamento:" -#MSG_TEMP_CALIBRATION c=20 r=1 -"Temp. cal. " -"Calib. temp. " - -#MSG_TEMP_CALIBRATION_ON c=20 r=1 -"Temp. cal. [on]" -"Calib. temp. [on]" +#MSG_TEMP_CALIBRATION c=12 r=1 +"Temp. cal." +"Calib. temp." # "Select temperature which matches your material." "Seleziona la temperatura appropriata per il tuo materiale." -#MSG_TEMP_CALIBRATION_OFF c=20 r=1 -"Temp. cal. [off]" -"Calib. temp.[off]" - #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" "Calib. Temp." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index e816bbf8..6e86ff0c 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1000,22 +1000,14 @@ "Select filament:" "Wybierz filament:" -#MSG_TEMP_CALIBRATION c=20 r=1 -"Temp. cal. " +#MSG_TEMP_CALIBRATION c=12 r=1 +"Temp. cal." "Kalibracja temp." -#MSG_TEMP_CALIBRATION_ON c=20 r=1 -"Temp. cal. [on]" -"Kalibr.temp. [wl]" - # "Select temperature which matches your material." "Wybierz temperature, ktora odpowiada Twojemu filamentowi." -#MSG_TEMP_CALIBRATION_OFF c=20 r=1 -"Temp. cal. [off]" -"Kalibr.temp.[wyl]" - #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" "Kalibracja temp." From 11428388c607c3e8e228b3074d0b4d18cb5478bb Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sat, 9 Nov 2019 20:58:56 +0200 Subject: [PATCH 068/110] MBL toggle and cleanup --- Firmware/messages.c | 3 ++ Firmware/messages.h | 3 ++ Firmware/ultralcd.cpp | 28 +++++------ lang/lang_en.txt | 79 ++++++++--------------------- lang/lang_en_cz.txt | 112 +++++++++++------------------------------ lang/lang_en_de.txt | 112 +++++++++++------------------------------ lang/lang_en_es.txt | 112 +++++++++++------------------------------ lang/lang_en_fr.txt | 111 +++++++++++------------------------------ lang/lang_en_it.txt | 112 +++++++++++------------------------------ lang/lang_en_pl.txt | 113 ++++++++++++------------------------------ 10 files changed, 218 insertions(+), 567 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 1ad5fe33..f38c2939 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -125,6 +125,9 @@ const char MSG_SOUND[] PROGMEM_I1 = ISTR("Sound"); //// const char MSG_SOUND_LOUD[] PROGMEM_I1 = ISTR("Loud"); //// const char MSG_SOUND_ONCE[] PROGMEM_I1 = ISTR("Once"); //// const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); //// +const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); //// +const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); //// +const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index fbbd8a3f..30671533 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -125,6 +125,9 @@ extern const char MSG_SOUND[]; extern const char MSG_SOUND_LOUD[]; extern const char MSG_SOUND_ONCE[]; extern const char MSG_SOUND_BLIND[]; +extern const char MSG_MESH[]; +extern const char MSG_Z_PROBE_NR[]; +extern const char MSG_MAGNETS_COMP[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 13c48325..96fddeb9 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5530,7 +5530,6 @@ eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,nDiameter); #define SETTINGS_NOZZLE \ do\ {\ - char sNozzleDiam[5];/*enough for two decimals*/\ float fNozzleDiam;\ switch(oNozzleDiameter)\ {\ @@ -5539,8 +5538,7 @@ do\ case ClNozzleDiameter::_Diameter_600: fNozzleDiam = 0.6f; break;\ default: fNozzleDiam = 0.4f; break;\ }\ - sprintf_P(sNozzleDiam, PSTR("%.2f"), fNozzleDiam);\ - MENU_ITEM_TOGGLE(_T(MSG_NOZZLE_DIAMETER), sNozzleDiam, lcd_nozzle_diameter_set);\ + MENU_ITEM_TOGGLE(_T(MSG_NOZZLE_DIAMETER), ftostr12ns(fNozzleDiam), lcd_nozzle_diameter_set);\ }\ while (0) @@ -7105,21 +7103,19 @@ static void lcd_mesh_bed_leveling_settings() bool magnet_elimination = (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) > 0); uint8_t points_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR); + char sToggle[4]; //enough for nxn format MENU_BEGIN(); - MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); - if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_toggle); ////MSG_MESH_3x3 c=18 - else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_toggle); ////MSG_MESH_7x7 c=18 - switch (mbl_z_probe_nr) { - case 1: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [1]"), mbl_probe_nr_toggle); break; ////MSG_Z_PROBE_NR_1 c=18 - case 5: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [5]"), mbl_probe_nr_toggle); break; ////MSG_Z_PROBE_NR_1 c=18 - default: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [3]"), mbl_probe_nr_toggle); break; ////MSG_Z_PROBE_NR_1 c=18 - } - if (points_nr == 7) { - if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets comp. [On]"), mbl_magnets_elimination_toggle); ////MSG_MAGNETS_COMP_ON c=18 - else MENU_ITEM_FUNCTION_P(_i("Magnets comp.[Off]"), mbl_magnets_elimination_toggle); ////MSG_MAGNETS_COMP_OFF c=18 - } - else menu_item_text_P(_i("Magnets comp.[N/A]")); ////MSG_MAGNETS_COMP_NA c=18 + MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); + sToggle[0] = points_nr + '0'; + sToggle[1] = 'x'; + sToggle[2] = points_nr + '0'; + sToggle[3] = 0; + MENU_ITEM_TOGGLE(_T(MSG_MESH), sToggle, mbl_mesh_toggle); + sToggle[0] = mbl_z_probe_nr + '0'; + sToggle[1] = 0; + MENU_ITEM_TOGGLE(_T(MSG_Z_PROBE_NR), sToggle, mbl_probe_nr_toggle); + MENU_ITEM_TOGGLE_P(_T(MSG_MAGNETS_COMP), (points_nr == 7) ? (magnet_elimination ? _T(MSG_ON): _T(MSG_OFF)) : _T(MSG_NA), mbl_magnets_elimination_toggle); MENU_END(); //SETTINGS_MBL_MODE; } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 2f3bbfc8..73c1e9c2 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -912,14 +912,14 @@ # "FINDA:" -# -"Firmware [none]" +#MSG_FIRMWARE +"Firmware" -# -"Firmware [strict]" +#MSG_STRICT +"Strict" -# -"Firmware [warn]" +#MSG_WARN +"Warn" # "HW Setup" @@ -927,20 +927,11 @@ # "IR:" -# -"Magnets comp.[N/A]" +#MSG_MAGNETS_COMP +"Magnets comp." -# -"Magnets comp.[Off]" - -# -"Magnets comp. [On]" - -# -"Mesh [3x3]" - -# -"Mesh [7x7]" +#MSG_MESH +"Mesh" # "Mesh bed leveling" @@ -948,41 +939,17 @@ # "MK3S firmware detected on MK3 printer" -# -"MMU Mode [Normal]" - -# -"MMU Mode[Stealth]" +#MSG_MMU_MODE +"MMU Mode" # "Mode change in progress ..." -# -"Model [none]" +#MSG_MODEL +"Model" -# -"Model [strict]" - -# -"Model [warn]" - -# -"Nozzle d. [0.25]" - -# -"Nozzle d. [0.40]" - -# -"Nozzle d. [0.60]" - -# -"Nozzle [none]" - -# -"Nozzle [strict]" - -# -"Nozzle [warn]" +#MSG_NOZZLE_DIAMETER +"Nozzle d." # "G-code sliced for a different level. Continue?" @@ -1029,8 +996,8 @@ # "Sheet" -# -"Sound [assist]" +#MSG_SOUND_BLIND +"Assist" # "Steel sheets" @@ -1038,11 +1005,5 @@ # "Z-correct:" -# -"Z-probe nr. [1]" - -# -"Z-probe nr. [3]" - -# -"Z-probe nr. [5]" +#MSG_Z_PROBE_NR +"Z-probe nr." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index aed952ba..0fc920ad 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1218,17 +1218,17 @@ "FINDA:" "\x00" -# -"Firmware [none]" -"Firmware [Zadne]" +#MSG_FIRMWARE +"Firmware" +"\x00" -# -"Firmware [strict]" -"Firmware [Prisne]" +#MSG_STRICT +"Strict" +"Prisne" -# -"Firmware [warn]" -"Firmware[Varovat]" +#MSG_WARN +"Warn" +"Varovat" # "HW Setup" @@ -1238,25 +1238,13 @@ "IR:" "\x00" -# -"Magnets comp.[N/A]" -"Komp. magnetu[N/A]" +#MSG_MAGNETS_COMP +"Magnets comp." +"Komp. magnetu" -# -"Magnets comp.[Off]" -"Komp. magnetu[Vyp]" - -# -"Magnets comp. [On]" -"Komp. magnetu[Zap]" - -# -"Mesh [3x3]" -"Mesh [3x3]" - -# -"Mesh [7x7]" -"Mesh [7x7]" +#MSG_MESH +"Mesh" +"\x00" # "Mesh bed leveling" @@ -1266,53 +1254,21 @@ "MK3S firmware detected on MK3 printer" "MK3S firmware detekovan na tiskarne MK3" -# -"MMU Mode [Normal]" -"MMU mod [Normal]" - -# -"MMU Mode[Stealth]" -"MMU Mod [Tichy]" +#MSG_MMU_MODE +"MMU Mode" +"MMU mod" # "Mode change in progress ..." "Probiha zmena modu..." -# -"Model [none]" -"Model [Zadne]" +#MSG_MODEL +"Model" +"\x00" -# -"Model [strict]" -"Model [Prisne]" - -# -"Model [warn]" -"Model [Varovat]" - -# -"Nozzle d. [0.25]" -"Tryska [0.25]" - -# -"Nozzle d. [0.40]" -"Tryska [0.40]" - -# -"Nozzle d. [0.60]" -"Tryska [0.60]" - -# -"Nozzle [none]" -"Tryska [Zadne]" - -# -"Nozzle [strict]" -"Tryska [Prisne]" - -# -"Nozzle [warn]" -"Tryska [Varovat]" +#MSG_NOZZLE_DIAMETER +"Nozzle d." +"Tryska" # "G-code sliced for a different level. Continue?" @@ -1374,9 +1330,9 @@ "Sheet" "Plat" -# -"Sound [assist]" -"Zvuk [Asist.]" +#MSG_SOUND_BLIND +"Assist" +"Asist." # "Steel sheets" @@ -1386,14 +1342,6 @@ "Z-correct:" "Korekce Z:" -# -"Z-probe nr. [1]" -"Pocet mereni Z [1]" - -# -"Z-probe nr. [3]" -"Pocet mereni Z [3]" - -# -"Z-probe nr. [5]" -"Pocet mereni Z [5]" +#MSG_Z_PROBE_NR +"Z-probe nr." +"Pocet mereni Z" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index bf850c6a..91107d8e 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1218,17 +1218,17 @@ "FINDA:" "\x00" -# -"Firmware [none]" -"Firmware [ohne]" +#MSG_FIRMWARE +"Firmware" +"\x00" -# -"Firmware [strict]" -"Firmware [strikt]" +#MSG_STRICT +"Strict" +"Strikt" -# -"Firmware [warn]" -"Firmware [warnen]" +#MSG_WARN +"Warn" +"Warnen" # "HW Setup" @@ -1238,25 +1238,13 @@ "IR:" "\x00" -# -"Magnets comp.[N/A]" -"Magnet Komp. [nv]" +#MSG_MAGNETS_COMP +"Magnets comp." +"Magnet Komp." -# -"Magnets comp.[Off]" -"Magnet Komp. [Aus]" - -# -"Magnets comp. [On]" -"Magnet Komp. [An]" - -# -"Mesh [3x3]" -"Gitter [3x3]" - -# -"Mesh [7x7]" -"Gitter [7x7]" +#MSG_MESH +"Mesh" +"Gitter" # "Mesh bed leveling" @@ -1266,53 +1254,21 @@ "MK3S firmware detected on MK3 printer" "MK3S-Firmware auf MK3-Drucker erkannt" -# -"MMU Mode [Normal]" -"MMU Modus[Normal]" - -# -"MMU Mode[Stealth]" -"MMU Mod.[Stealth]" +#MSG_MMU_MODE +"MMU Mode" +"MMU Modus" # "Mode change in progress ..." "Moduswechsel erfolgt..." -# -"Model [none]" -"Modell [ohne]" +#MSG_MODEL +"Model" +"Modell" -# -"Model [strict]" -"Modell [strikt]" - -# -"Model [warn]" -"Modell [warnen]" - -# -"Nozzle d. [0.25]" -"Duese D. [0.25]" - -# -"Nozzle d. [0.40]" -"Duese D. [0.40]" - -# -"Nozzle d. [0.60]" -"Duese D. [0.60]" - -# -"Nozzle [none]" -"Duese [ohne]" - -# -"Nozzle [strict]" -"Duese [strikt]" - -# -"Nozzle [warn]" -"Duese [warnen]" +#MSG_NOZZLE_DIAMETER +"Nozzle d." +"Duese D." # "G-code sliced for a different level. Continue?" @@ -1374,9 +1330,9 @@ "Sheet" "Blech" -# -"Sound [assist]" -"Sound [Assist]" +#MSG_SOUND_BLIND +"Assist" +"\x00" # "Steel sheets" @@ -1386,14 +1342,6 @@ "Z-correct:" "Z-Korrektur:" -# -"Z-probe nr. [1]" -"Z-Probe Nr. [1]" - -# -"Z-probe nr. [3]" -"Z-Probe Nr. [3]" - -# -"Z-probe nr. [5]" -"Z-Probe Nr. [5]" +#MSG_Z_PROBE_NR +"Z-probe nr." +"\x00" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 0b29393a..56539966 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1218,17 +1218,17 @@ "FINDA:" "FINDA:" -# -"Firmware [none]" -"Firmware[ninguno]" +#MSG_FIRMWARE +"Firmware" +"\x00" -# -"Firmware [strict]" -"Firmware[estrict]" +#MSG_STRICT +"Strict" +"Estrict" -# -"Firmware [warn]" -"Firmware [aviso]" +#MSG_WARN +"Warn" +"Aviso" # "HW Setup" @@ -1238,25 +1238,13 @@ "IR:" "\x00" -# -"Magnets comp.[N/A]" -"Comp. imanes [N/A]" +#MSG_MAGNETS_COMP +"Magnets comp." +"Comp. imanes" -# -"Magnets comp.[Off]" -"Comp. imanes [Off]" - -# -"Magnets comp. [On]" -"Comp. imanes [On]" - -# -"Mesh [3x3]" -"Malla [3x3]" - -# -"Mesh [7x7]" -"Malla [7x7]" +#MSG_MESH +"Mesh" +"Malla" # "Mesh bed leveling" @@ -1266,53 +1254,21 @@ "MK3S firmware detected on MK3 printer" "Firmware MK3S detectado en impresora MK3" -# -"MMU Mode [Normal]" -"Modo MMU [Normal]" - -# -"MMU Mode[Stealth]" -"Modo MMU[Silenci]" +#MSG_MMU_MODE +"MMU Mode" +"Modo MMU" # "Mode change in progress ..." "Cambio de modo progresando ..." -# -"Model [none]" -"Modelo [ninguno]" +#MSG_MODEL +"Model" +"Modelo" -# -"Model [strict]" -"Modelo [estricto]" - -# -"Model [warn]" -"Modelo [aviso]" - -# -"Nozzle d. [0.25]" -"Diam. nozzl[0.25]" - -# -"Nozzle d. [0.40]" -"Diam. nozzl[0.40]" - -# -"Nozzle d. [0.60]" -"Diam. nozzl[0.60]" - -# -"Nozzle [none]" -"Nozzle [ninguno]" - -# -"Nozzle [strict]" -"Nozzle [estricto]" - -# -"Nozzle [warn]" -"Nozzle [aviso]" +#MSG_NOZZLE_DIAMETER +"Nozzle d." +"Diam. nozzl" # "G-code sliced for a different level. Continue?" @@ -1374,9 +1330,9 @@ "Sheet" "Lamina" -# -"Sound [assist]" -"Sonido [asistido]" +#MSG_SOUND_BLIND +"Assist" +"Asistido" # "Steel sheets" @@ -1386,14 +1342,6 @@ "Z-correct:" "Corregir-Z:" -# -"Z-probe nr. [1]" -"Z-sensor nr. [1]" - -# -"Z-probe nr. [3]" -"Z-sensor nr. [3]" - -# -"Z-probe nr. [5]" -"Z-sensor nr. [5]" +#MSG_Z_PROBE_NR +"Z-probe nr." +"Z-sensor nr." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 9f29192a..b0b62e9d 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1215,17 +1215,17 @@ "FINDA:" "FINDA:" -# -"Firmware [none]" -"Firmware [aucune]" +#MSG_FIRMWARE +"Firmware" +"\x00" -# -"Firmware [strict]" -"Firmware[stricte]" +#MSG_STRICT +"Strict" +"Stricte" -# -"Firmware [warn]" -"Firmware [avert]" +#MSG_WARN +"Warn" +"Avert" # "HW Setup" @@ -1235,24 +1235,12 @@ "IR:" "IR:" -# -"Magnets comp.[N/A]" -"Compens. aim.[N/A]" +#MSG_MAGNETS_COMP +"Magnets comp." +"Compens. aim." -# -"Magnets comp.[Off]" -"Compens. aim.[off]" - -# -"Magnets comp. [On]" -"Compens. aim. [on]" - -# -"Mesh [3x3]" -"\x00" - -# -"Mesh [7x7]" +#MSG_MESH +"Mesh" "\x00" # @@ -1263,53 +1251,21 @@ "MK3S firmware detected on MK3 printer" "Firmware MK3S detecte sur imprimante MK3" -# -"MMU Mode [Normal]" -"Mode MMU [normal]" - -# -"MMU Mode[Stealth]" -"Mode MMU [feutre]" +#MSG_MMU_MODE +"MMU Mode" +"Mode MMU" # "Mode change in progress ..." "Changement de mode en cours..." -# -"Model [none]" -"Modele [aucune]" +#MSG_MODEL +"Model" +"Modele" -# -"Model [strict]" -"Modele [stricte]" - -# -"Model [warn]" -"Modele [avert]" - -# -"Nozzle d. [0.25]" -"Diam. buse [0.25]" - -# -"Nozzle d. [0.40]" -"Diam. buse [0.40]" - -# -"Nozzle d. [0.60]" -"Diam. buse [0.60]" - -# -"Nozzle [none]" -"Buse [aucune]" - -# -"Nozzle [strict]" -"Buse [stricte]" - -# -"Nozzle [warn]" -"Buse [avert]" +#MSG_NOZZLE_DIAMETER +"Nozzle d." +"Diam. buse" # "G-code sliced for a different level. Continue?" @@ -1371,9 +1327,9 @@ "Sheet" "Plaque" -# -"Sound [assist]" -"Son [assist]" +#MSG_SOUND_BLIND +"Assist" +"\x00" # "Steel sheets" @@ -1383,15 +1339,6 @@ "Z-correct:" "Correct-Z:" -# -"Z-probe nr. [1]" -"Mesurer x-fois [1]" - -# -"Z-probe nr. [3]" -"Mesurer x-fois [3]" - -# -"Z-probe nr. [5]" -"Mesurer x-fois [5]" - +#MSG_Z_PROBE_NR +"Z-probe nr." +"Mesurer x-fois" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index c3304400..44285a43 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1217,17 +1217,17 @@ "FINDA:" "\x00" -# -"Firmware [none]" -"Firmware[nessuno]" +#MSG_FIRMWARE +"Firmware" +"\x00" -# -"Firmware [strict]" -"Firmware [esatto]" +#MSG_STRICT +"Strict" +"Esatto" -# -"Firmware [warn]" -"Firmware [avviso]" +#MSG_WARN +"Warn" +"Avviso" # "HW Setup" @@ -1237,25 +1237,13 @@ "IR:" "\x00" -# -"Magnets comp.[N/A]" -"Comp. Magneti[N/A]" +#MSG_MAGNETS_COMP +"Magnets comp." +"Comp. Magneti" -# -"Magnets comp.[Off]" -"Comp. Magneti[off]" - -# -"Magnets comp. [On]" -"Comp. Magneti [on]" - -# -"Mesh [3x3]" -"Griglia [3x3]" - -# -"Mesh [7x7]" -"Griglia [7x7]" +#MSG_MESH +"Mesh" +"Griglia" # "Mesh bed leveling" @@ -1265,53 +1253,21 @@ "MK3S firmware detected on MK3 printer" "Firmware MK3S rilevato su stampante MK3" -# -"MMU Mode [Normal]" -"Modalita MMU [Normale]" - -# -"MMU Mode[Stealth]" -"Modalita MMU [Silenziosa]" +#MSG_MMU_MODE +"MMU Mode" +"Mod. MMU" # "Mode change in progress ..." "Cambio modalita in corso ..." -# -"Model [none]" -"Modello [nessuno]" +#MSG_MODEL +"Model" +"Modello" -# -"Model [strict]" -"Modello [esatto]" - -# -"Model [warn]" -"Modello [avviso]" - -# -"Nozzle d. [0.25]" -"Diam.Ugello[0.25]" - -# -"Nozzle d. [0.40]" -"Diam.Ugello[0.40]" - -# -"Nozzle d. [0.60]" -"Diam.Ugello[0.60]" - -# -"Nozzle [none]" -"Ugello [nessuno]" - -# -"Nozzle [strict]" -"Ugello [esatto]" - -# -"Nozzle [warn]" -"Ugello [avviso]" +#MSG_NOZZLE_DIAMETER +"Nozzle d." +"Diam.Ugello" # "G-code sliced for a different level. Continue?" @@ -1373,9 +1329,9 @@ "Sheet" "Piano" -# -"Sound [assist]" -"Suono [assist.]" +#MSG_SOUND_BLIND +"Assist" +"Assist." # "Steel sheets" @@ -1385,14 +1341,6 @@ "Z-correct:" "Correzione-Z:" -# -"Z-probe nr. [1]" -"Z-probe nr. [1]" - -# -"Z-probe nr. [3]" -"Z-probe nr. [3]" - -# -"Z-probe nr. [5]" -"Z-probe nr. [5]" +#MSG_Z_PROBE_NR +"Z-probe nr." +"\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 6e86ff0c..25c4d14f 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -53,6 +53,7 @@ #MSG_AUTO_DEPLETE c=17 r=1 "SpoolJoin" "\x00" + #MSG_AUTO_HOME "Auto home" "Auto zerowanie" @@ -1216,17 +1217,17 @@ "FINDA:" "\x00" -# -"Firmware [none]" -"Firmware [brak]" +#MSG_FIRMWARE +"Firmware" +"\x00" -# -"Firmware [strict]" -"Firmware [restr.]" +#MSG_STRICT +"Strict" +"Restr." -# -"Firmware [warn]" -"Firmware[ostrzez]" +#MSG_WARN +"Warn" +"Ostrzez" # "HW Setup" @@ -1236,25 +1237,13 @@ "IR:" "\x00" -# -"Magnets comp.[N/A]" -"Kor. magnesow[N/D]" +#MSG_MAGNETS_COMP +"Magnets comp." +"Kor. magnesow" -# -"Magnets comp.[Off]" -"Kor. magnesow[wyl]" - -# -"Magnets comp. [On]" -"Kor. magnesow [wl]" - -# -"Mesh [3x3]" -"Siatka [3x3]" - -# -"Mesh [7x7]" -"Siatka [7x7]" +#MSG_MESH +"Mesh" +"Siatka" # "Mesh bed leveling" @@ -1264,53 +1253,21 @@ "MK3S firmware detected on MK3 printer" "Wykryto firmware MK3S w drukarce MK3" -# -"MMU Mode [Normal]" -"Tryb MMU[Normaln]" - -# -"MMU Mode[Stealth]" -"Tryb MMU[Stealth]" +#MSG_MMU_MODE +"MMU Mode" +"Tryb MMU" # "Mode change in progress ..." "Trwa zmiana trybu..." -# -"Model [none]" -"Model [brak]" +#MSG_MODEL +"Model" +"\x00" -# -"Model [strict]" -"Model [restrykc.]" - -# -"Model [warn]" -"Model [ostrzez.]" - -# -"Nozzle d. [0.25]" -"Sr. dyszy [0,25]" - -# -"Nozzle d. [0.40]" -"Sr. dyszy [0,40]" - -# -"Nozzle d. [0.60]" -"Sr. dyszy [0,60]" - -# -"Nozzle [none]" -"Dysza [brak]" - -# -"Nozzle [strict]" -"Dysza [restrykc.]" - -# -"Nozzle [warn]" -"Dysza [ostrzez.]" +#MSG_NOZZLE_DIAMETER +"Nozzle d." +"Sr. dyszy" # "G-code sliced for a different level. Continue?" @@ -1372,9 +1329,9 @@ "Sheet" "Plyta" -# -"Sound [assist]" -"Dzwiek [asyst.]" +#MSG_SOUND_BLIND +"Assist" +"Asyst." # "Steel sheets" @@ -1384,14 +1341,6 @@ "Z-correct:" "Korekcja-Z:" -# -"Z-probe nr. [1]" -"Ilosc Pomiarow [1]" - -# -"Z-probe nr. [3]" -"Ilosc Pomiarow [3]" - -# -"Z-probe nr. [5]" -"Ilosc Pomiarow [5]" +#MSG_Z_PROBE_NR +"Z-probe nr." +"Ilosc Pomiarow" From 23cf076242a7fdf5c43beb6a1684bff189761844 Mon Sep 17 00:00:00 2001 From: Panayiotis-git <32783577+Panayiotis-git@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:32:39 +0200 Subject: [PATCH 069/110] =?UTF-8?q?Add=20oversighted=20=E2=80=98break?= =?UTF-8?q?=E2=80=99=20statement=20at=20the=20M603=20command's=20source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Firmware/Marlin_main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d6bb77ef..aecb7e39 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7250,9 +7250,10 @@ Sigma_Exit: //! ### M603 - Stop print // ------------------------------- - case 603: { + case 603: { lcd_print_stop(); } + break; #ifdef PINDA_THERMISTOR //! ### M860 - Wait for extruder temperature (PINDA) From 9e780f0b2b40a19a776bd218d891e99dbc80c39e Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 15 Nov 2019 09:26:56 +0100 Subject: [PATCH 070/110] remove ESC sequence --- Firmware/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7dd8b027..d2cb51a1 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6959,7 +6959,6 @@ void lcd_belttest_print(const char* msg, uint16_t X, uint16_t Y) lcd_clear(); lcd_printf_P( _N( - ESC_H(0,0) "%S:\n" "%S\n" "X:%d\n" From f6c35c5d5f1e292716a456ca09e43f55c2a4dd34 Mon Sep 17 00:00:00 2001 From: vintagepc <53943260+vintagepc@users.noreply.github.com> Date: Fri, 15 Nov 2019 08:58:58 -0500 Subject: [PATCH 071/110] Removed separate fix for #2089 Per PR fix request --- Firmware/ultralcd.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 66e08143..2235c7af 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6552,15 +6552,6 @@ static void lcd_rename_sheet_menu() lcd_putc(menuData->name[i]); } lcd_set_cursor(menuData->selected, 1); - if (menuData->selected>0) - { - lcd_set_cursor(menuData->selected-1, 1); - lcd_putc(' '); - } - else - { - lcd_set_cursor(menuData->selected, 1); - } lcd_putc('^'); if (lcd_clicked()) { From 460f6c3b5e8ac41da50cb00562e84e1074dcc133 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 15 Nov 2019 17:47:39 +0100 Subject: [PATCH 072/110] update message --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0630eb7c..1088770d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4819,7 +4819,7 @@ void lcd_first_layer_calibration_reset() eeprom_read_block(sheet_name, &EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].name, sizeof(Sheet::name)); lcd_set_cursor(0, 0); float offset = static_cast(eeprom_read_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)))/cs.axis_steps_per_unit[Z_AXIS]; - lcd_printf_P(_i("Sheet %.7s actual\nZ offset: %+1.3f mm\n%cContinue\n%cStart from zero"), //// \n denotes line break, %.7s is replaced by 7 character long sheet name, %+1.3f is replaced by 6 character long floating point number, %c is replaced by > or white space (one character) based on whether first or second option is selected. % denoted place holders can not be reordered. r=4 + lcd_printf_P(_i("Sheet %.7s\nZ offset: %+1.3f mm\n%cContinue\n%cStart from zero"), //// \n denotes line break, %.7s is replaced by 7 character long sheet name, %+1.3f is replaced by 6 character long floating point number, %c is replaced by > or white space (one character) based on whether first or second option is selected. % denoted place holders can not be reordered. r=4 sheet_name, offset, menuData->reset ? ' ' : '>', menuData->reset ? '>' : ' '); } From 359c44712718b506166f159d9ec6a3c769180a9d Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sat, 16 Nov 2019 22:44:34 +0200 Subject: [PATCH 073/110] Do not check for fanError if it is not enabled on resume Fix typos --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2ed8d5de..a6f92f47 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6652,6 +6652,7 @@ static void lcd_test_menu() static bool fan_error_selftest() { #ifdef FANCHECK + if (!fans_check_enabled) return 0; fanSpeed = 255; #ifdef FAN_SOFT_PWM @@ -6682,9 +6683,8 @@ static bool fan_error_selftest() return 1; } #endif +#endif //FANCHECK return 0; - -#endif //FANCHECK } //! @brief Resume paused print From 2e0034d915b073d11807eb815e63a7c4374cd9c7 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 17 Nov 2019 09:53:14 +0200 Subject: [PATCH 074/110] Update Toggles and Translations --- Firmware/messages.c | 7 +++++++ Firmware/messages.h | 7 +++++++ Firmware/ultralcd.cpp | 17 ++++++----------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index f38c2939..9d878f6e 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -128,6 +128,13 @@ const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); //// const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); //// const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); //// const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); //// +const char MSG_BRIGHTNESS[] PROGMEM_I1 = ISTR("Brightness"); //// +const char MSG_BL_HIGH[] PROGMEM_I1 = ISTR("Level Bright"); //// +const char MSG_BL_LOW[] PROGMEM_I1 = ISTR("Level Dimmed"); //// +const char MSG_TIMEOUT[] PROGMEM_I1 = ISTR("Timeout"); //// +const char MSG_BRIGHT[] PROGMEM_I1 = ISTR("Bright"); //// +const char MSG_DIM[] PROGMEM_I1 = ISTR("Dim"); //// +const char MSG_AUTO[] PROGMEM_I1 = ISTR("Auto"); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 30671533..4de5c7cf 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -128,6 +128,13 @@ extern const char MSG_SOUND_BLIND[]; extern const char MSG_MESH[]; extern const char MSG_Z_PROBE_NR[]; extern const char MSG_MAGNETS_COMP[]; +extern const char MSG_BRIGHTNESS[]; +extern const char MSG_BL_HIGH[]; +extern const char MSG_BL_LOW[]; +extern const char MSG_TIMEOUT[]; +extern const char MSG_BRIGHT[]; +extern const char MSG_DIM[]; +extern const char MSG_AUTO[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1c2be1ac..0a721cfd 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5787,7 +5787,7 @@ static void lcd_settings_menu() #ifdef LCD_BL_PIN if (backlightSupport) { - MENU_ITEM_SUBMENU_P(_i("Brightness"), lcd_backlight_menu); + MENU_ITEM_SUBMENU_P(_T(MSG_BRIGHTNESS), lcd_backlight_menu); } #endif //LCD_BL_PIN @@ -7113,7 +7113,7 @@ static void lcd_tune_menu() #ifdef LCD_BL_PIN if (backlightSupport) { - MENU_ITEM_SUBMENU_P(_i("Brightness"), lcd_backlight_menu); + MENU_ITEM_SUBMENU_P(_T(MSG_BRIGHTNESS), lcd_backlight_menu); } #endif //LCD_BL_PIN MENU_END(); @@ -7186,15 +7186,10 @@ static void lcd_backlight_menu() ); MENU_ITEM_BACK_P(_T(MSG_BACK)); - MENU_ITEM_EDIT_int3_P(_i("Level Bright"), &backlightLevel_HIGH, backlightLevel_LOW, 255); - MENU_ITEM_EDIT_int3_P(_i("Level Dimmed"), &backlightLevel_LOW, 0, backlightLevel_HIGH); - switch (backlightMode) - { - case BACKLIGHT_MODE_BRIGHT: MENU_ITEM_FUNCTION_P(_i("Mode [Bright]"), backlight_mode_toggle); break; - case BACKLIGHT_MODE_DIM: MENU_ITEM_FUNCTION_P(_i("Mode [Dim]"), backlight_mode_toggle); break; - default: MENU_ITEM_FUNCTION_P(_i("Mode [Auto]"), backlight_mode_toggle); break; - } - MENU_ITEM_EDIT_int3_P(_i("Timeout"), &backlightTimer_period, 1, 999); + 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_END(); } From 14104e7bf98b5bf28d6db64585a65bf40b55196a Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 17 Nov 2019 10:44:11 +0200 Subject: [PATCH 075/110] Clear error flag when fanError is disabled --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a6f92f47..fdb1e954 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2270,6 +2270,7 @@ static void lcd_support_menu() void lcd_set_fan_check() { fans_check_enabled = !fans_check_enabled; eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled); + if (fans_check_enabled == false) fan_check_error = EFCE_OK; //reset error if fanCheck is disabled during error. Allows resuming print. } #ifdef MMU_HAS_CUTTER From b077303156aec0a5a775654334aa405ba36aacc2 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 17 Nov 2019 11:10:13 +0200 Subject: [PATCH 076/110] Fix compile error --- Firmware/ultralcd.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index fdb1e954..3bc94b81 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2270,7 +2270,9 @@ static void lcd_support_menu() void lcd_set_fan_check() { fans_check_enabled = !fans_check_enabled; eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled); +#ifdef FANCHECK if (fans_check_enabled == false) fan_check_error = EFCE_OK; //reset error if fanCheck is disabled during error. Allows resuming print. +#endif //FANCHECK } #ifdef MMU_HAS_CUTTER From e66574ac5f547c766bb04a0c8bd9b4a8c28d7a2e Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Tue, 19 Nov 2019 13:51:10 +0200 Subject: [PATCH 077/110] Updated branch to use TOGGLE --- Firmware/messages.c | 3 +++ Firmware/messages.h | 3 +++ Firmware/ultralcd.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index f38c2939..bb2e9510 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -128,6 +128,9 @@ const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); //// const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); //// const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); //// const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); //// +const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); //// +const char MSG_FS_CONTINUE[] PROGMEM_I1 = ISTR("Cont."); //// +const char MSG_FS_PAUSE[] PROGMEM_I1 = ISTR("Pause"); //// //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 30671533..60a4cc1c 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -128,6 +128,9 @@ extern const char MSG_SOUND_BLIND[]; extern const char MSG_MESH[]; extern const char MSG_Z_PROBE_NR[]; extern const char MSG_MAGNETS_COMP[]; +extern const char MSG_FS_ACTION[]; +extern const char MSG_FS_CONTINUE[]; +extern const char MSG_FS_PAUSE[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e2c82c03..68710ec3 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5726,10 +5726,10 @@ do\ switch(oFsensorActionNA)\ {\ case ClFsensorActionNA::_Continue:\ - MENU_ITEM_FUNCTION_P(_i("FS Action [cont.]"),lcd_fsensor_actionNA_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_FS_ACTION), _T(MSG_FS_CONTINUE), lcd_fsensor_actionNA_set);\ break;\ case ClFsensorActionNA::_Pause:\ - MENU_ITEM_FUNCTION_P(_i("FS Action [pause]"),lcd_fsensor_actionNA_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_FS_ACTION), _T(MSG_FS_PAUSE), lcd_fsensor_actionNA_set);\ break;\ default:\ oFsensorActionNA=ClFsensorActionNA::_Continue;\ @@ -7107,11 +7107,11 @@ static void lcd_tune_menu() if (FSensorStateMenu == 0) { if (fsensor_not_responding && (mmu_enabled == false)) { /* Filament sensor not working*/ - MENU_ITEM_FUNCTION_P(_i("Fil. sensor [N/A]"), lcd_fsensor_state_set); + MENU_ITEM_TOGGLE_P(_T(MSG_MSG_FSENSOR), _T(MSG_NA), lcd_fsensor_state_set); } else { /* Filament sensor turned off, working, no problems*/ - MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_OFF), lcd_fsensor_state_set); + MENU_ITEM_TOGGLE_P(_T(MSG_MSG_FSENSOR), _T(MSG_OFF), lcd_fsensor_state_set); } } else { From 45b89c5728f487a3c3a408f52b86aa31d2b04ae7 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Tue, 19 Nov 2019 13:55:37 +0200 Subject: [PATCH 078/110] Fix typo --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 68710ec3..465fde2b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7107,11 +7107,11 @@ static void lcd_tune_menu() if (FSensorStateMenu == 0) { if (fsensor_not_responding && (mmu_enabled == false)) { /* Filament sensor not working*/ - MENU_ITEM_TOGGLE_P(_T(MSG_MSG_FSENSOR), _T(MSG_NA), lcd_fsensor_state_set); + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_NA), lcd_fsensor_state_set); } else { /* Filament sensor turned off, working, no problems*/ - MENU_ITEM_TOGGLE_P(_T(MSG_MSG_FSENSOR), _T(MSG_OFF), lcd_fsensor_state_set); + MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_OFF), lcd_fsensor_state_set); } } else { From 982c4cbf7b3b27ccabf181d07c30e62d944b113e Mon Sep 17 00:00:00 2001 From: vintagepc <53943260+vintagepc@users.noreply.github.com> Date: Thu, 21 Nov 2019 18:51:02 -0500 Subject: [PATCH 079/110] Candidate fix for homing fail hard reset --- Firmware/tmc2130.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 42359ba8..f64457b5 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -807,15 +807,15 @@ void tmc2130_goto_step(uint8_t axis, uint8_t step, uint8_t dir, uint16_t delay_u { dir = tmc2130_get_inv(axis)?0:1; int steps = (int)step - (int)(mscnt >> shift); - if (steps < 0) - { - dir ^= 1; - steps = -steps; - } if (steps > static_cast(cnt / 2)) { dir ^= 1; - steps = cnt - steps; + steps = cnt - steps; // This can create a negative step value + } + if (steps < 0) + { + dir ^= 1; + steps = -steps; } cnt = steps; } From 92482f03abde99bb7634a507fee60b0f0d1b7771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20B=C4=9Bl?= <35807926+mkbel@users.noreply.github.com> Date: Wed, 27 Nov 2019 17:23:16 +0100 Subject: [PATCH 080/110] Update README.md Add link for doxygen generated documentation. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 782ed6f7..6b0edf0a 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ Example: # 4. Documentation run [doxygen](http://www.doxygen.nl/) in Firmware folder +or visit https://prusa3d.github.io/Prusa-Firmware-Doc/index.html for doxygen generated output # 5. FAQ Q:I built firmware using Arduino and I see "?" instead of numbers in printer user interface. From 05a1debf3d9a89043b0c0a941cdab9dd204aaa97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20B=C4=9Bl?= <35807926+mkbel@users.noreply.github.com> Date: Wed, 27 Nov 2019 17:27:11 +0100 Subject: [PATCH 081/110] Update README.md /index.html becomes unnecessary after several seconds online. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b0edf0a..9c50509a 100644 --- a/README.md +++ b/README.md @@ -178,7 +178,7 @@ Example: # 4. Documentation run [doxygen](http://www.doxygen.nl/) in Firmware folder -or visit https://prusa3d.github.io/Prusa-Firmware-Doc/index.html for doxygen generated output +or visit https://prusa3d.github.io/Prusa-Firmware-Doc for doxygen generated output # 5. FAQ Q:I built firmware using Arduino and I see "?" instead of numbers in printer user interface. From 404802b5e6e3ebd3a21f936691b7885f11966c26 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 13 Oct 2019 18:49:32 +0200 Subject: [PATCH 082/110] Clear "sdprinting" state only when all SD moves are complete Ensure card.printingHasFinished sees all the planned moves before clearing sdprinting. To do that, we need to ensure all SD commands exited the command queue. --- Firmware/cmdqueue.cpp | 55 +++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 74a8b90a..e17db42a 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -582,30 +582,8 @@ void get_command() ((serial_char == '#' || serial_char == ':') && comment_mode == false) || serial_count >= (MAX_CMD_SIZE - 1) || n==-1) { - if(card.eof()){ - SERIAL_PROTOCOLLNRPGM(_n("Done printing file"));////MSG_FILE_PRINTED - stoptime=_millis(); - char time[30]; - unsigned long t=(stoptime-starttime-pause_time)/1000; - pause_time = 0; - int hours, minutes; - minutes=(t/60)%60; - hours=t/60/60; - save_statistics(total_filament_used, t); - sprintf_P(time, PSTR("%i hours %i minutes"),hours, minutes); - SERIAL_ECHO_START; - SERIAL_ECHOLN(time); - lcd_setstatus(time); - card.printingHasFinished(); - card.checkautostart(true); + if(card.eof()) break; - if (farm_mode) - { - prusa_statistics(6); - lcd_commands_type = LcdCommands::FarmModeConfirm; - } - - } if(serial_char=='#') stop_buffering=true; @@ -663,6 +641,37 @@ void get_command() else if(!comment_mode) cmdbuffer[bufindw+CMDHDRSIZE+serial_count++] = serial_char; } } + if(card.eof()) + { + // file was fully buffered, but commands might still need to be planned! + // do *not* clear sdprinting until all SD commands are consumed to ensure + // SD state can be resumed from a saved printing state. sdprinting is only + // cleared by printingHasFinished after peforming all remaining moves. + if(!cmdqueue_calc_sd_length()) + { + SERIAL_PROTOCOLLNRPGM(_n("Done printing file"));////MSG_FILE_PRINTED + stoptime=_millis(); + char time[30]; + unsigned long t=(stoptime-starttime-pause_time)/1000; + pause_time = 0; + int hours, minutes; + minutes=(t/60)%60; + hours=t/60/60; + save_statistics(total_filament_used, t); + sprintf_P(time, PSTR("%i hours %i minutes"),hours, minutes); + SERIAL_ECHO_START; + SERIAL_ECHOLN(time); + lcd_setstatus(time); + card.printingHasFinished(); + card.checkautostart(true); + + if (farm_mode) + { + prusa_statistics(6); + lcd_commands_type = LcdCommands::FarmModeConfirm; + } + } + } #endif //SDSUPPORT } From 0f6b9b40512eca03abbc930ae337a87ddf9323d6 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 15 Oct 2019 21:09:28 +0200 Subject: [PATCH 083/110] Unroll the stack in restore_print_from_ram_and_continue While handling moves in a recursive plan, such a filament check, ensure restore_print_from_ram_and_continue unwinds the stack by aborting early from any call that waits on the planner. This currently only handles G1 moves, but hard-coded behavior that can trigger recursive behavior (such as filament change) will probably have to be checked too. --- Firmware/Marlin_main.cpp | 6 ++++++ Firmware/planner.cpp | 2 +- Firmware/planner.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 19d79953..46fef27a 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8363,6 +8363,8 @@ void clamp_to_software_endstops(float target[3]) current_position[Z_AXIS] + t * dz, current_position[E_AXIS] + t * de, feed_rate, extruder); + if (waiting_inside_plan_buffer_line_print_aborted) + return; } } // The rest of the path. @@ -8390,6 +8392,8 @@ void prepare_move() plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate*feedmultiply*(1./(60.f*100.f)), active_extruder); #endif } + if (waiting_inside_plan_buffer_line_print_aborted) + return; for(int8_t i=0; i < NUM_AXIS; i++) { current_position[i] = destination[i]; @@ -10264,10 +10268,12 @@ void restore_print_from_ram_and_continue(float e_move) else { //not sd printing nor usb printing } + SERIAL_PROTOCOLLNRPGM(MSG_OK); //dummy response because of octoprint is waiting for this lcd_setstatuspgm(_T(WELCOME_MSG)); saved_printing_type = PRINTING_TYPE_NONE; saved_printing = false; + waiting_inside_plan_buffer_line_print_aborted = true; //unroll the stack } void print_world_coordinates() diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 752d0725..63058d2c 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -666,8 +666,8 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate // If the buffer is full: good! That means we are well ahead of the robot. // Rest here until there is room in the buffer. + waiting_inside_plan_buffer_line_print_aborted = false; if (block_buffer_tail == next_buffer_head) { - waiting_inside_plan_buffer_line_print_aborted = false; do { manage_heater(); // Vojtech: Don't disable motors inside the planner! diff --git a/Firmware/planner.h b/Firmware/planner.h index 7904c45a..4977265b 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -238,6 +238,7 @@ FORCE_INLINE bool planner_queue_full() { // wait for the steppers to stop, // update planner's current position and the current_position of the front end. extern void planner_abort_hard(); +extern bool waiting_inside_plan_buffer_line_print_aborted; #ifdef PREVENT_DANGEROUS_EXTRUDE void set_extrude_min_temp(float temp); From 5fa7c178b5fa2232c9c2f3e1939611e9ad453f1b Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 15 Oct 2019 21:14:28 +0200 Subject: [PATCH 084/110] Do not set current_position in mesh_plan_buffer_line This is a task which _has_ to be performed by the caller, such as prepare_move(). --- Firmware/Marlin_main.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 46fef27a..6686fba0 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8369,10 +8369,6 @@ void clamp_to_software_endstops(float target[3]) } // The rest of the path. plan_buffer_line(x, y, z, e, feed_rate, extruder); - current_position[X_AXIS] = x; - current_position[Y_AXIS] = y; - current_position[Z_AXIS] = z; - current_position[E_AXIS] = e; } #endif // MESH_BED_LEVELING From faa9e925fe38acfc3de13aae35e6227c68fedc1e Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 15 Oct 2019 21:20:18 +0200 Subject: [PATCH 085/110] Replace a few loops with set_current_to_destination() --- Firmware/Marlin_main.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6686fba0..3d1945ef 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8391,9 +8391,7 @@ void prepare_move() if (waiting_inside_plan_buffer_line_print_aborted) return; - for(int8_t i=0; i < NUM_AXIS; i++) { - current_position[i] = destination[i]; - } + set_current_to_destination(); } void prepare_arc_move(char isclockwise) { @@ -9114,10 +9112,8 @@ void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_poi destination[X_AXIS] = ix * (x_dimension / (x_points_num - 1)) + shift_x; destination[Y_AXIS] = iy * (y_dimension / (y_points_num - 1)) + shift_y; - mesh_plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], XY_AXIS_FEEDRATE/6, active_extruder); - for(int8_t i=0; i < NUM_AXIS; i++) { - current_position[i] = destination[i]; - } + mesh_plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], XY_AXIS_FEEDRATE/6, active_extruder); + set_current_to_destination(); st_synchronize(); // printf_P(PSTR("X = %f; Y= %f \n"), current_position[X_AXIS], current_position[Y_AXIS]); From 4268c2fdae35c97d732fa4318a60c342e5547065 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 15 Oct 2019 21:23:50 +0200 Subject: [PATCH 086/110] Fix recovery from relative/chunked moves When starting to replay existing USB/SD commands from a recovery state, an immediate relative move needs to compensate for a previously interrupted move. This is almost the norm for the E axis. Instead of saving the relative status of the move (which needs to account for the world2machine conversion and is not always available on a chunked move split by MBL) save directly the calculated target position for the move in the original plan, which is easy to replay. --- Firmware/Marlin_main.cpp | 61 ++++++++++++++++++++++++++++++++++------ Firmware/eeprom.h | 3 +- Firmware/planner.cpp | 31 +++++++++++++------- Firmware/planner.h | 5 ++-- 4 files changed, 78 insertions(+), 22 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3d1945ef..4877f7a8 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -309,6 +309,8 @@ bool no_response = false; uint8_t important_status; uint8_t saved_filament_type; +#define SAVED_TARGET_UNSET (X_MIN_POS-1) +float saved_target[NUM_AXIS] = {SAVED_TARGET_UNSET, 0, 0, 0}; // save/restore printing in case that mmu was not responding bool mmu_print_saved = false; @@ -4043,8 +4045,19 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) #endif + get_coordinates(); // For X Y Z E F + + // When recovering from a previous print move, restore the originally + // calculated target position on the first USB/SD command. This accounts + // properly for relative moves + if ((saved_target[0] != SAVED_TARGET_UNSET) && + ((CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_SDCARD) || + (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR))) + { + memcpy(destination, saved_target, sizeof(destination)); + saved_target[0] = SAVED_TARGET_UNSET; + } - get_coordinates(); // For X Y Z E F if (total_filament_used > ((current_position[E_AXIS] - destination[E_AXIS]) * 100)) { //protection against total_filament_used overflow total_filament_used = total_filament_used + ((destination[E_AXIS] - current_position[E_AXIS]) * 100); } @@ -8339,30 +8352,37 @@ void clamp_to_software_endstops(float target[3]) } #ifdef MESH_BED_LEVELING - void mesh_plan_buffer_line(const float &x, const float &y, const float &z, const float &e, const float &feed_rate, const uint8_t extruder) { +void mesh_plan_buffer_line(const float &x, const float &y, const float &z, const float &e, const float &feed_rate, const uint8_t extruder) { float dx = x - current_position[X_AXIS]; float dy = y - current_position[Y_AXIS]; - float dz = z - current_position[Z_AXIS]; int n_segments = 0; - + if (mbl.active) { float len = abs(dx) + abs(dy); if (len > 0) // Split to 3cm segments or shorter. n_segments = int(ceil(len / 30.f)); } - + if (n_segments > 1) { + // In a multi-segment move explicitly set the final target in the plan + // as the move will be recalculated in it's entirety + float gcode_target[NUM_AXIS]; + gcode_target[X_AXIS] = x; + gcode_target[Y_AXIS] = y; + gcode_target[Z_AXIS] = z; + gcode_target[E_AXIS] = e; + + float dz = z - current_position[Z_AXIS]; float de = e - current_position[E_AXIS]; + for (int i = 1; i < n_segments; ++ i) { float t = float(i) / float(n_segments); - if (saved_printing || (mbl.active == false)) return; - plan_buffer_line( - current_position[X_AXIS] + t * dx, + plan_buffer_line(current_position[X_AXIS] + t * dx, current_position[Y_AXIS] + t * dy, current_position[Z_AXIS] + t * dz, current_position[E_AXIS] + t * de, - feed_rate, extruder); + feed_rate, extruder, gcode_target); if (waiting_inside_plan_buffer_line_print_aborted) return; } @@ -9602,6 +9622,12 @@ void uvlo_() // Backup the feedrate in mm/min. int feedrate_bckp = blocks_queued() ? (block_buffer[block_buffer_tail].nominal_speed * 60.f) : feedrate; + // save the original target position of the current move + if (blocks_queued()) + memcpy(saved_target, current_block->gcode_target, sizeof(saved_target)); + else + saved_target[0] = SAVED_TARGET_UNSET; + // After this call, the planner queue is emptied and the current_position is set to a current logical coordinate. // The logical coordinate will likely differ from the machine coordinate if the skew calibration and mesh bed leveling // are in action. @@ -9679,6 +9705,11 @@ void uvlo_() #endif #endif eeprom_update_word((uint16_t*)(EEPROM_EXTRUDEMULTIPLY), (uint16_t)extrudemultiply); + // Store the saved target + eeprom_update_float((float*)(EEPROM_UVLO_SAVED_TARGET+0*4), saved_target[X_AXIS]); + eeprom_update_float((float*)(EEPROM_UVLO_SAVED_TARGET+1*4), saved_target[Y_AXIS]); + eeprom_update_float((float*)(EEPROM_UVLO_SAVED_TARGET+2*4), saved_target[Z_AXIS]); + eeprom_update_float((float*)(EEPROM_UVLO_SAVED_TARGET+3*4), saved_target[E_AXIS]); // Finaly store the "power outage" flag. if(sd_print) eeprom_update_byte((uint8_t*)EEPROM_UVLO, 1); @@ -9927,6 +9958,12 @@ void recover_machine_state_after_power_panic(bool bTiny) #endif #endif extrudemultiply = (int)eeprom_read_word((uint16_t*)(EEPROM_EXTRUDEMULTIPLY)); + + // 9) Recover the saved target + saved_target[X_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_TARGET+0*4)); + saved_target[Y_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_TARGET+1*4)); + saved_target[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_TARGET+2*4)); + saved_target[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_TARGET+3*4)); } void restore_print_from_eeprom() { @@ -10143,6 +10180,12 @@ void stop_and_save_print_to_ram(float z_move, float e_move) saved_feedrate2 = blocks_queued() ? (block_buffer[block_buffer_tail].nominal_speed * 60.f) : feedrate; #endif + // save the original target position of the current move + if (blocks_queued()) + memcpy(saved_target, current_block->gcode_target, sizeof(saved_target)); + else + saved_target[0] = SAVED_TARGET_UNSET; + planner_abort_hard(); //abort printing memcpy(saved_pos, current_position, sizeof(saved_pos)); saved_active_extruder = active_extruder; //save active_extruder diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 0949e411..82852220 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -204,9 +204,10 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); #define EEPROM_FSENSOR_PCB (EEPROM_SHEETS_BASE-1) // uint8 #define EEPROM_FSENSOR_ACTION_NA (EEPROM_FSENSOR_PCB-1) // uint8 +#define EEPROM_UVLO_SAVED_TARGET (EEPROM_FSENSOR_ACTION_NA - 4*4) // 4 x float for saved target for all axes //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. -#define EEPROM_LAST_ITEM EEPROM_SHEETS_BASE +#define EEPROM_LAST_ITEM EEPROM_UVLO_SAVED_TARGET // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 63058d2c..c1285aed 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -659,7 +659,7 @@ float junction_deviation = 0.1; // Add a new linear movement to the buffer. steps_x, _y and _z is the absolute position in // mm. Microseconds specify how many microseconds the move should take to perform. To aid acceleration // calculation the caller must also provide the physical length of the line in millimeters. -void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, uint8_t extruder) +void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, uint8_t extruder, const float* gcode_target) { // Calculate the buffer head after we push this byte int next_buffer_head = next_block_index(block_buffer_head); @@ -687,6 +687,26 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate planner_update_queue_min_counter(); #endif /* PLANNER_DIAGNOSTICS */ + // Prepare to set up new block + block_t *block = &block_buffer[block_buffer_head]; + + // Set sdlen for calculating sd position + block->sdlen = 0; + + // Mark block as not busy (Not executed by the stepper interrupt, could be still tinkered with.) + block->busy = false; + + // Save original destination of the move + if (gcode_target) + memcpy(block->gcode_target, gcode_target, sizeof(block_t::gcode_target)); + else + { + block->gcode_target[X_AXIS] = x; + block->gcode_target[Y_AXIS] = y; + block->gcode_target[Z_AXIS] = z; + block->gcode_target[E_AXIS] = e; + } + #ifdef ENABLE_AUTO_BED_LEVELING apply_rotation_xyz(plan_bed_level_matrix, x, y, z); #endif // ENABLE_AUTO_BED_LEVELING @@ -786,15 +806,6 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate } #endif - // Prepare to set up new block - block_t *block = &block_buffer[block_buffer_head]; - - // Set sdlen for calculating sd position - block->sdlen = 0; - - // Mark block as not busy (Not executed by the stepper interrupt, could be still tinkered with.) - block->busy = false; - // Number of steps for each axis #ifndef COREXY // default non-h-bot planning diff --git a/Firmware/planner.h b/Firmware/planner.h index 4977265b..d4c6bc2b 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -116,7 +116,8 @@ typedef struct { unsigned long abs_adv_steps_multiplier8; // Factorised by 2^8 to avoid float #endif - uint16_t sdlen; + float gcode_target[NUM_AXIS]; // Target (abs mm) of the original Gcode instruction + uint16_t sdlen; // Length of the Gcode instruction } block_t; #ifdef LIN_ADVANCE @@ -147,7 +148,7 @@ vector_3 plan_get_position(); /// The performance penalty is negligible, since these planned lines are usually maintenance moves with the extruder. void plan_buffer_line_curposXYZE(float feed_rate, uint8_t extruder); -void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, uint8_t extruder); +void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, uint8_t extruder, const float* gcode_target = NULL); //void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate, const uint8_t &extruder); #endif // ENABLE_AUTO_BED_LEVELING From 6ecff003b78e276ae775e47279559b45b8584d75 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Wed, 16 Oct 2019 18:47:18 +0200 Subject: [PATCH 087/110] Fix M600 insertion by the filament sensor Remove incorrect usage of stop_and_save_print combined with the fsensor_recovert internal instruction which would result in a broken sequence of events and/or broken stack. Re-use the now safe stop/recover functions in the same spot (fsensor_checkpoint_stream) to effectively cut a hole in the current gcode stream to insert an M600 instruction, which removes all recursive behavior without the need of extra state variables. --- Firmware/Marlin_main.cpp | 9 +------- Firmware/fsensor.cpp | 46 +++++++++++++++++----------------------- Firmware/fsensor.h | 2 ++ Firmware/mmu.cpp | 3 +-- 4 files changed, 24 insertions(+), 36 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4877f7a8..5afeb525 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3657,7 +3657,7 @@ void process_commands() Set of internal PRUSA commands - PRUSA [ Ping | PRN | FAN | fn | thx | uvlo | fsensor_recover | MMURES | RESET | fv | M28 | SN | Fir | Rev | Lang | Lz | Beat | FR ] + PRUSA [ Ping | PRN | FAN | fn | thx | uvlo | MMURES | RESET | fv | M28 | SN | Fir | Rev | Lang | Lz | Beat | FR ] - `Ping` - `PRN` - Prints revision of the printer @@ -3665,7 +3665,6 @@ void process_commands() - `fn` - Prints farm no. - `thx` - `uvlo` - - `fsensor_recover` - Filament sensor recover - restore print and continue - `MMURES` - Reset MMU - `RESET` - (Careful!) - `fv` - ? @@ -3715,12 +3714,6 @@ void process_commands() eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); enquecommand_P(PSTR("M24")); } -#ifdef FILAMENT_SENSOR - else if (code_seen("fsensor_recover")) // PRUSA fsensor_recover - { - fsensor_restore_print_and_continue(); - } -#endif //FILAMENT_SENSOR else if (code_seen("MMURES")) // PRUSA MMURES { mmu_reset(); diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index c01274fb..1c28d025 100755 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -57,15 +57,8 @@ bool fsensor_enabled = true; bool fsensor_watch_runout = true; //! not responding - is set if any communication error occurred during initialization or readout bool fsensor_not_responding = false; -//! printing saved -bool fsensor_printing_saved = false; //! enable/disable quality meassurement bool fsensor_oq_meassure_enabled = false; -//! as explained in the CHECK_FSENSOR macro: this flag is set to true when fsensor posts -//! the M600 into the command queue, which elliminates the hazard of having posted multiple M600's -//! before the first one gets read and started processing. -//! Btw., the IR fsensor could do up to 6 posts before the command queue managed to start processing the first M600 ;) -static bool fsensor_m600_enqueued = false; //! number of errors, updated in ISR uint8_t fsensor_err_cnt = 0; @@ -137,12 +130,19 @@ void fsensor_stop_and_save_print(void) void fsensor_restore_print_and_continue(void) { printf_P(PSTR("fsensor_restore_print_and_continue\n")); - fsensor_watch_runout = true; fsensor_err_cnt = 0; - fsensor_m600_enqueued = false; restore_print_from_ram_and_continue(0); //XYZ = orig, E - no change } +// fsensor_checkpoint_print cuts the current print job at the current position, +// allowing new instructions to be inserted in the middle +void fsensor_checkpoint_print(void) +{ + printf_P(PSTR("fsensor_checkpoint_print\n")); + stop_and_save_print_to_ram(0, 0); + restore_print_from_ram_and_continue(0); +} + void fsensor_init(void) { #ifdef PAT9125 @@ -565,8 +565,6 @@ void fsensor_enque_M600(){ printf_P(PSTR("fsensor_update - M600\n")); eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); - enquecommand_front_P(PSTR("PRUSA fsensor_recover")); - fsensor_m600_enqueued = true; enquecommand_front_P((PSTR("M600"))); } @@ -578,7 +576,7 @@ void fsensor_enque_M600(){ void fsensor_update(void) { #ifdef PAT9125 - if (fsensor_enabled && fsensor_watch_runout && (fsensor_err_cnt > FSENSOR_ERR_MAX) && ( ! fsensor_m600_enqueued) ) + if (fsensor_enabled && fsensor_watch_runout && (fsensor_err_cnt > FSENSOR_ERR_MAX)) { bool autoload_enabled_tmp = fsensor_autoload_enabled; fsensor_autoload_enabled = false; @@ -611,22 +609,18 @@ void fsensor_update(void) err |= (fsensor_oq_er_sum > 2); err |= (fsensor_oq_yd_sum < (4 * FSENSOR_OQ_MIN_YD)); - if (!err) - { - printf_P(PSTR("fsensor_err_cnt = 0\n")); - fsensor_restore_print_and_continue(); - } - else - { - fsensor_enque_M600(); - fsensor_watch_runout = false; - } + fsensor_restore_print_and_continue(); fsensor_autoload_enabled = autoload_enabled_tmp; fsensor_oq_meassure_enabled = oq_meassure_enabled_tmp; + + if (!err) + printf_P(PSTR("fsensor_err_cnt = 0\n")); + else + fsensor_enque_M600(); } #else //PAT9125 - if (CHECK_FSENSOR && fsensor_enabled && ir_sensor_detected && ( ! fsensor_m600_enqueued) ) - { + if (CHECK_FSENSOR && fsensor_enabled && ir_sensor_detected) + { if(digitalRead(IR_SENSOR_PIN)) { // IR_SENSOR_PIN ~ H #if IR_SENSOR_ANALOG @@ -670,8 +664,8 @@ void fsensor_update(void) else { #endif //IR_SENSOR_ANALOG - fsensor_stop_and_save_print(); - fsensor_enque_M600(); + fsensor_checkpoint_print(); + fsensor_enque_M600(); #if IR_SENSOR_ANALOG } } diff --git a/Firmware/fsensor.h b/Firmware/fsensor.h index 48ad5fba..aa4963af 100755 --- a/Firmware/fsensor.h +++ b/Firmware/fsensor.h @@ -21,6 +21,8 @@ extern bool fsensor_oq_meassure_enabled; extern void fsensor_stop_and_save_print(void); //! restore print - restore position and heatup to original temperature extern void fsensor_restore_print_and_continue(void); +//! split the current gcode stream to insert new instructions +extern void fsensor_checkpoint_print(void); //! @} //! initialize diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index c9ca9cb6..f1515d98 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -382,8 +382,7 @@ void mmu_loop(void) FDEBUG_PRINTF_P(PSTR("MMU => '%dok'\n"), mmu_finda); //printf_P(PSTR("Eact: %d\n"), int(e_active())); if (!mmu_finda && CHECK_FSENSOR && fsensor_enabled) { - fsensor_stop_and_save_print(); - enquecommand_front_P(PSTR("PRUSA fsensor_recover")); //then recover + fsensor_checkpoint_print(); ad_markDepleted(mmu_extruder); if (lcd_autoDepleteEnabled() && !ad_allDepleted()) { From 4f0af648fb95903942d0ebf1cad9d1d214048084 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 19 Oct 2019 18:48:02 +0200 Subject: [PATCH 088/110] Save/restore feedmultiply independently of the feedrate --- Firmware/Marlin_main.cpp | 34 ++++++++++++++++++---------------- Firmware/eeprom.h | 3 ++- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5afeb525..00e0ae99 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -375,8 +375,8 @@ bool saved_printing = false; //!< Print is paused and saved in RAM static uint32_t saved_sdpos = 0; //!< SD card position, or line number in case of USB printing uint8_t saved_printing_type = PRINTING_TYPE_SD; static float saved_pos[4] = { 0, 0, 0, 0 }; -//! Feedrate hopefully derived from an active block of the planner at the time the print has been canceled, in mm/min. static float saved_feedrate2 = 0; +static int saved_feedmultiply2 = 0; static uint8_t saved_active_extruder = 0; static float saved_extruder_temperature = 0.0; //!< Active extruder temperature static bool saved_extruder_under_pressure = false; @@ -9612,9 +9612,6 @@ void uvlo_() if (sd_position < 0) sd_position = 0; } - // Backup the feedrate in mm/min. - int feedrate_bckp = blocks_queued() ? (block_buffer[block_buffer_tail].nominal_speed * 60.f) : feedrate; - // save the original target position of the current move if (blocks_queued()) memcpy(saved_target, current_block->gcode_target, sizeof(saved_target)); @@ -9686,7 +9683,9 @@ void uvlo_() eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), current_position[Y_AXIS]); eeprom_update_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z , current_position[Z_AXIS]); // Store the current feed rate, temperatures, fan speed and extruder multipliers (flow rates) - EEPROM_save_B(EEPROM_UVLO_FEEDRATE, &feedrate_bckp); + int i_feedrate = feedrate; + EEPROM_save_B(EEPROM_UVLO_FEEDRATE, &i_feedrate); + EEPROM_save_B(EEPROM_UVLO_FEEDMULTIPLY, &feedmultiply); eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_HOTEND, target_temperature[active_extruder]); eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_BED, target_temperature_bed); eeprom_update_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED, fanSpeed); @@ -9961,6 +9960,7 @@ void recover_machine_state_after_power_panic(bool bTiny) void restore_print_from_eeprom() { int feedrate_rec; + int feedmultiply_rec; uint8_t fan_speed_rec; char cmd[30]; char filename[13]; @@ -9969,8 +9969,11 @@ void restore_print_from_eeprom() { fan_speed_rec = eeprom_read_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED); EEPROM_read_B(EEPROM_UVLO_FEEDRATE, &feedrate_rec); + EEPROM_read_B(EEPROM_UVLO_FEEDMULTIPLY, &feedmultiply_rec); SERIAL_ECHOPGM("Feedrate:"); - MYSERIAL.println(feedrate_rec); + MYSERIAL.print(feedrate_rec); + SERIAL_ECHOPGM(", feedmultiply:"); + MYSERIAL.println(feedmultiply_rec); depth = eeprom_read_byte((uint8_t*)EEPROM_DIR_DEPTH); @@ -10011,9 +10014,11 @@ void restore_print_from_eeprom() { enquecommand(cmd); // Unretract. enquecommand_P(PSTR("G1 E" STRINGIFY(2*default_retraction)" F480")); - // Set the feedrate saved at the power panic. + // Set the feedrates saved at the power panic. sprintf_P(cmd, PSTR("G1 F%d"), feedrate_rec); enquecommand(cmd); + sprintf_P(cmd, PSTR("M220 S%d"), feedmultiply_rec); + enquecommand(cmd); if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) { enquecommand_P(PSTR("M82")); //E axis abslute mode @@ -10165,14 +10170,6 @@ void stop_and_save_print_to_ram(float z_move, float e_move) } #endif -#if 0 - saved_feedrate2 = feedrate; //save feedrate -#else - // Try to deduce the feedrate from the first block of the planner. - // Speed is in mm/min. - saved_feedrate2 = blocks_queued() ? (block_buffer[block_buffer_tail].nominal_speed * 60.f) : feedrate; -#endif - // save the original target position of the current move if (blocks_queued()) memcpy(saved_target, current_block->gcode_target, sizeof(saved_target)); @@ -10181,6 +10178,8 @@ void stop_and_save_print_to_ram(float z_move, float e_move) planner_abort_hard(); //abort printing memcpy(saved_pos, current_position, sizeof(saved_pos)); + saved_feedrate2 = feedrate; //save feedrate + saved_feedmultiply2 = feedmultiply; //save feedmultiply saved_active_extruder = active_extruder; //save active_extruder saved_extruder_temperature = degTargetHotend(active_extruder); @@ -10258,7 +10257,6 @@ void restore_print_from_ram_and_continue(float e_move) wait_for_heater(_millis(), saved_active_extruder); heating_status = 2; } - feedrate = saved_feedrate2; //restore feedrate axis_relative_modes[E_AXIS] = saved_extruder_relative_mode; float e = saved_pos[E_AXIS] - e_move; plan_set_e_position(e); @@ -10281,6 +10279,10 @@ void restore_print_from_ram_and_continue(float e_move) fans_check_enabled = true; #endif + // restore original feedrate/feedmultiply _after_ restoring the extruder position + feedrate = saved_feedrate2; + feedmultiply = saved_feedmultiply2; + memcpy(current_position, saved_pos, sizeof(saved_pos)); memcpy(destination, current_position, sizeof(destination)); if (saved_printing_type == PRINTING_TYPE_SD) { //was sd printing diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 82852220..3f1e6141 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -205,9 +205,10 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); #define EEPROM_FSENSOR_ACTION_NA (EEPROM_FSENSOR_PCB-1) // uint8 #define EEPROM_UVLO_SAVED_TARGET (EEPROM_FSENSOR_ACTION_NA - 4*4) // 4 x float for saved target for all axes +#define EEPROM_UVLO_FEEDMULTIPLY (EEPROM_UVLO_SAVED_TARGET - 2) // uint16_t for feedmultiply //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. -#define EEPROM_LAST_ITEM EEPROM_UVLO_SAVED_TARGET +#define EEPROM_LAST_ITEM EEPROM_UVLO_FEEDMULTIPLY // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! From 17176c1df21574c53c2fefc0b1455f9eb3f5e625 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 19 Oct 2019 21:20:38 +0200 Subject: [PATCH 089/110] Save/restore the default feedrate correctly Since the global feedrate can be similarly modified for moves ahead of time, save the original feedrate in the planner as we do for gcode_target. This avoids having to undo feedmultiply (and machine limits!) from "nominal_speed" as previously done. Thanks @leptun --- Firmware/Marlin.h | 1 + Firmware/Marlin_main.cpp | 31 +++++++++++++++++++++++++------ Firmware/planner.cpp | 9 ++++++--- Firmware/planner.h | 2 ++ 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 8a396dac..d9078ada 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -296,6 +296,7 @@ void setPwmFrequency(uint8_t pin, int val); extern bool fans_check_enabled; extern float homing_feedrate[]; extern bool axis_relative_modes[]; +extern float feedrate; extern int feedmultiply; extern int extrudemultiply; // Sets extrude multiply factor (in percent) for all extruders extern int extruder_multiply[EXTRUDERS]; // sets extrude multiply factor (in percent) for each extruder individually diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 00e0ae99..6e33a397 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -331,7 +331,15 @@ float destination[NUM_AXIS] = { 0.0, 0.0, 0.0, 0.0}; // For tracing an arc static float offset[3] = {0.0, 0.0, 0.0}; -static float feedrate = 1500.0, next_feedrate, saved_feedrate; + +// Current feedrate +float feedrate = 1500.0; + +// Feedrate for the next move +static float next_feedrate; + +// Original feedrate saved during homing moves +static float saved_feedrate; // Determines Absolute or Relative Coordinates. // Also there is bool axis_relative_modes[] per axis flag. @@ -9612,11 +9620,18 @@ void uvlo_() if (sd_position < 0) sd_position = 0; } - // save the original target position of the current move + // save the global state at planning time + int feedrate_bckp; if (blocks_queued()) + { memcpy(saved_target, current_block->gcode_target, sizeof(saved_target)); + feedrate_bckp = current_block->gcode_feedrate; + } else + { saved_target[0] = SAVED_TARGET_UNSET; + feedrate_bckp = feedrate; + } // After this call, the planner queue is emptied and the current_position is set to a current logical coordinate. // The logical coordinate will likely differ from the machine coordinate if the skew calibration and mesh bed leveling @@ -9683,8 +9698,7 @@ void uvlo_() eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), current_position[Y_AXIS]); eeprom_update_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z , current_position[Z_AXIS]); // Store the current feed rate, temperatures, fan speed and extruder multipliers (flow rates) - int i_feedrate = feedrate; - EEPROM_save_B(EEPROM_UVLO_FEEDRATE, &i_feedrate); + EEPROM_save_B(EEPROM_UVLO_FEEDRATE, &feedrate_bckp); EEPROM_save_B(EEPROM_UVLO_FEEDMULTIPLY, &feedmultiply); eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_HOTEND, target_temperature[active_extruder]); eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_BED, target_temperature_bed); @@ -10170,15 +10184,20 @@ void stop_and_save_print_to_ram(float z_move, float e_move) } #endif - // save the original target position of the current move + // save the global state at planning time if (blocks_queued()) + { memcpy(saved_target, current_block->gcode_target, sizeof(saved_target)); + saved_feedrate2 = current_block->gcode_feedrate; + } else + { saved_target[0] = SAVED_TARGET_UNSET; + saved_feedrate2 = feedrate; + } planner_abort_hard(); //abort printing memcpy(saved_pos, current_position, sizeof(saved_pos)); - saved_feedrate2 = feedrate; //save feedrate saved_feedmultiply2 = feedmultiply; //save feedmultiply saved_active_extruder = active_extruder; //save active_extruder saved_extruder_temperature = degTargetHotend(active_extruder); diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index c1285aed..0ccf54f8 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -690,12 +690,12 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate // Prepare to set up new block block_t *block = &block_buffer[block_buffer_head]; - // Set sdlen for calculating sd position - block->sdlen = 0; - // Mark block as not busy (Not executed by the stepper interrupt, could be still tinkered with.) block->busy = false; + // Set sdlen for calculating sd position + block->sdlen = 0; + // Save original destination of the move if (gcode_target) memcpy(block->gcode_target, gcode_target, sizeof(block_t::gcode_target)); @@ -707,6 +707,9 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate block->gcode_target[E_AXIS] = e; } + // Save the global feedrate at scheduling time + block->gcode_feedrate = feedrate; + #ifdef ENABLE_AUTO_BED_LEVELING apply_rotation_xyz(plan_bed_level_matrix, x, y, z); #endif // ENABLE_AUTO_BED_LEVELING diff --git a/Firmware/planner.h b/Firmware/planner.h index d4c6bc2b..27541e5f 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -116,7 +116,9 @@ typedef struct { unsigned long abs_adv_steps_multiplier8; // Factorised by 2^8 to avoid float #endif + // Save/recovery state data float gcode_target[NUM_AXIS]; // Target (abs mm) of the original Gcode instruction + float gcode_feedrate; // Original feedrate uint16_t sdlen; // Length of the Gcode instruction } block_t; From 18eaf21baf38ec6bff47882af4b1c664f4b9e935 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 19 Oct 2019 21:45:50 +0200 Subject: [PATCH 090/110] Halve memory usage of saved feedrate Truncate the saved feedrate to an uint16_t. This is more than sufficient for recovery. --- Firmware/Marlin_main.cpp | 8 ++++---- Firmware/eeprom.h | 2 +- Firmware/planner.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6e33a397..a312f3e5 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -383,7 +383,7 @@ bool saved_printing = false; //!< Print is paused and saved in RAM static uint32_t saved_sdpos = 0; //!< SD card position, or line number in case of USB printing uint8_t saved_printing_type = PRINTING_TYPE_SD; static float saved_pos[4] = { 0, 0, 0, 0 }; -static float saved_feedrate2 = 0; +static uint16_t saved_feedrate2 = 0; //!< Default feedrate (truncated from float) static int saved_feedmultiply2 = 0; static uint8_t saved_active_extruder = 0; static float saved_extruder_temperature = 0.0; //!< Active extruder temperature @@ -9621,7 +9621,7 @@ void uvlo_() } // save the global state at planning time - int feedrate_bckp; + uint16_t feedrate_bckp; if (blocks_queued()) { memcpy(saved_target, current_block->gcode_target, sizeof(saved_target)); @@ -9698,7 +9698,7 @@ void uvlo_() eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), current_position[Y_AXIS]); eeprom_update_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z , current_position[Z_AXIS]); // Store the current feed rate, temperatures, fan speed and extruder multipliers (flow rates) - EEPROM_save_B(EEPROM_UVLO_FEEDRATE, &feedrate_bckp); + eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDRATE, feedrate_bckp); EEPROM_save_B(EEPROM_UVLO_FEEDMULTIPLY, &feedmultiply); eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_HOTEND, target_temperature[active_extruder]); eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_BED, target_temperature_bed); @@ -9982,7 +9982,7 @@ void restore_print_from_eeprom() { char dir_name[9]; fan_speed_rec = eeprom_read_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED); - EEPROM_read_B(EEPROM_UVLO_FEEDRATE, &feedrate_rec); + feedrate_rec = eeprom_read_word((uint16_t*)EEPROM_UVLO_FEEDRATE); EEPROM_read_B(EEPROM_UVLO_FEEDMULTIPLY, &feedmultiply_rec); SERIAL_ECHOPGM("Feedrate:"); MYSERIAL.print(feedrate_rec); diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 3f1e6141..12a31d3c 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -74,7 +74,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP #define EEPROM_UVLO_CURRENT_POSITION_Z (EEPROM_FILE_POSITION - 4) //float for current position in Z #define EEPROM_UVLO_TARGET_HOTEND (EEPROM_UVLO_CURRENT_POSITION_Z - 1) #define EEPROM_UVLO_TARGET_BED (EEPROM_UVLO_TARGET_HOTEND - 1) -#define EEPROM_UVLO_FEEDRATE (EEPROM_UVLO_TARGET_BED - 2) +#define EEPROM_UVLO_FEEDRATE (EEPROM_UVLO_TARGET_BED - 2) //uint16_t #define EEPROM_UVLO_FAN_SPEED (EEPROM_UVLO_FEEDRATE - 1) #define EEPROM_FAN_CHECK_ENABLED (EEPROM_UVLO_FAN_SPEED - 1) #define EEPROM_UVLO_MESH_BED_LEVELING (EEPROM_FAN_CHECK_ENABLED - 9*2) diff --git a/Firmware/planner.h b/Firmware/planner.h index 27541e5f..0d0cb41a 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -118,7 +118,7 @@ typedef struct { // Save/recovery state data float gcode_target[NUM_AXIS]; // Target (abs mm) of the original Gcode instruction - float gcode_feedrate; // Original feedrate + uint16_t gcode_feedrate; // Default and/or move feedrate uint16_t sdlen; // Length of the Gcode instruction } block_t; From dbe2ed41500863b6948f5a0154700feb76dafdb7 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 20 Oct 2019 17:34:54 +0200 Subject: [PATCH 091/110] Fix pause/resume when using M25/M601 Remove the conflicting and mostly useless card.paused flag (the printing is either paused, or not) and switch to isPrintPaused only which accounts for both cases (SD/USB) correctly. Fix M27/getStatus to show the current real status of the SD print. Synchronize the queue on M601, as required to precisely pause the print at the correct instruction. Alias M25 to M601, which when combined with PR #1899 fixes issue #1614. Guard against incorrect usage in M601, M602 and M603. --- Firmware/Marlin.h | 2 +- Firmware/Marlin_main.cpp | 36 ++++++++++++--------- Firmware/cardreader.cpp | 57 ++++++++++++++-------------------- Firmware/cardreader.h | 2 -- Firmware/ultralcd.cpp | 2 +- Tests/PrusaStatistics_test.cpp | 5 ++- 6 files changed, 48 insertions(+), 56 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index d9078ada..7dedc8a4 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -396,7 +396,7 @@ extern uint16_t gcode_in_progress; extern LongTimer safetyTimer; #define PRINT_PERCENT_DONE_INIT 0xff -#define PRINTER_ACTIVE (IS_SD_PRINTING || is_usb_printing || isPrintPaused || (custom_message_type == CustomMsg::TempCal) || saved_printing || (lcd_commands_type == LcdCommands::Layer1Cal) || card.paused || mmu_print_saved) +#define PRINTER_ACTIVE (IS_SD_PRINTING || is_usb_printing || isPrintPaused || (custom_message_type == CustomMsg::TempCal) || saved_printing || (lcd_commands_type == LcdCommands::Layer1Cal) || mmu_print_saved) //! Beware - mcode_in_progress is set as soon as the command gets really processed, //! which is not the same as posting the M600 command into the command queue diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a312f3e5..fe94fab5 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5377,21 +5377,19 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) card.openFile(strchr_pointer + 4,true); break; - //! ### M24 - Start SD print + //! ### M24 - Start/resume SD print // ---------------------------------- case 24: - if (!card.paused) - failstats_reset_print(); - card.startFileprint(); - starttime=_millis(); + if (isPrintPaused) + lcd_resume_print(); + else + { + failstats_reset_print(); + card.startFileprint(); + starttime=_millis(); + } break; - //! ### M25 - Pause SD print - // ---------------------------------- - case 25: - card.pauseSDPrint(); - break; - //! ### M26 S\ - Set SD index //! Set position in SD card file to index in bytes. //! This command is expected to be called after M23 and before M24. @@ -7246,26 +7244,34 @@ Sigma_Exit: break; #endif //FILAMENTCHANGEENABLE + //! ### M25 - Pause SD print //! ### M601 - Pause print + //! ### M125 - Pause print (TODO: not implemented) // ------------------------------- + case 25: case 601: { - cmdqueue_pop_front(); //trick because we want skip this command (M601) after restore - lcd_pause_print(); + if (!isPrintPaused) + { + st_synchronize(); + cmdqueue_pop_front(); //trick because we want skip this command (M601) after restore + lcd_pause_print(); + } } break; //! ### M602 - Resume print // ------------------------------- case 602: { - lcd_resume_print(); + if (isPrintPaused) + lcd_resume_print(); } break; //! ### M603 - Stop print // ------------------------------- case 603: { - lcd_print_stop(); + Stop(); } break; diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 3c01bf84..047a2c76 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -25,7 +25,6 @@ CardReader::CardReader() sdpos = 0; sdprinting = false; cardOK = false; - paused = false; saving = false; logging = false; autostart_atmillis=0; @@ -242,24 +241,13 @@ void CardReader::startFileprint() if(cardOK) { sdprinting = true; - paused = false; - Stopped = false; + Stopped = false; #ifdef SDCARD_SORT_ALPHA //flush_presort(); #endif } } -void CardReader::pauseSDPrint() -{ - if(sdprinting) - { - sdprinting = false; - paused = true; - } -} - - void CardReader::openLogFile(const char* name) { logging = true; @@ -408,9 +396,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru SERIAL_ECHOLN(name); } sdprinting = false; - paused = false; - - + SdFile myDir; const char *fname=name; diveSubfolder(fname,myDir); @@ -492,24 +478,27 @@ uint32_t CardReader::getFileSize() void CardReader::getStatus() { - if(sdprinting){ - SERIAL_PROTOCOL(longFilename); - SERIAL_PROTOCOLPGM("\n"); - SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE - SERIAL_PROTOCOL(sdpos); - SERIAL_PROTOCOLPGM("/"); - SERIAL_PROTOCOLLN(filesize); - uint16_t time = _millis()/60000 - starttime/60000; - SERIAL_PROTOCOL(itostr2(time/60)); - SERIAL_PROTOCOL(':'); - SERIAL_PROTOCOL(itostr2(time%60)); - SERIAL_PROTOCOLPGM("\n"); - } - else if (paused) { - SERIAL_PROTOCOLLNPGM("SD print paused"); - } - else if (saved_printing) { - SERIAL_PROTOCOLLNPGM("Print saved"); + if(sdprinting) + { + if (isPrintPaused) { + SERIAL_PROTOCOLLNPGM("SD print paused"); + } + else if (saved_printing) { + SERIAL_PROTOCOLLNPGM("Print saved"); + } + else { + SERIAL_PROTOCOL(longFilename); + SERIAL_PROTOCOLPGM("\n"); + SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE + SERIAL_PROTOCOL(sdpos); + SERIAL_PROTOCOLPGM("/"); + SERIAL_PROTOCOLLN(filesize); + uint16_t time = _millis()/60000 - starttime/60000; + SERIAL_PROTOCOL(itostr2(time/60)); + SERIAL_PROTOCOL(':'); + SERIAL_PROTOCOL(itostr2(time%60)); + SERIAL_PROTOCOLPGM("\n"); + } } else { SERIAL_PROTOCOLLNPGM("Not SD printing"); diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index b7df8ff4..9a7d0f69 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -25,7 +25,6 @@ public: void closefile(bool store_location=false); void release(); void startFileprint(); - void pauseSDPrint(); uint32_t getFileSize(); void getStatus(); void printingHasFinished(); @@ -75,7 +74,6 @@ public: bool logging; bool sdprinting ; bool cardOK ; - bool paused ; char filename[13]; uint16_t modificationTime, modificationDate; uint32_t cluster, position; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 465fde2b..cbfe017f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4108,7 +4108,7 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { { prusa_statistics_case0(15); } - else if (isPrintPaused || card.paused) + else if (isPrintPaused) { prusa_statistics_case0(14); } diff --git a/Tests/PrusaStatistics_test.cpp b/Tests/PrusaStatistics_test.cpp index 3c15899a..261a4dc6 100644 --- a/Tests/PrusaStatistics_test.cpp +++ b/Tests/PrusaStatistics_test.cpp @@ -198,7 +198,7 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { SERIAL_ECHOLN("}"); status_number = 15; } - else if (isPrintPaused || card.paused) + else if (isPrintPaused) { SERIAL_ECHO("{"); prusa_stat_printerstatus(14); @@ -490,7 +490,7 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { { prusa_statistics_case0(15); } - else if (isPrintPaused || card.paused) + else if (isPrintPaused) { prusa_statistics_case0(14); } @@ -753,7 +753,6 @@ TEST_CASE("Prusa_statistics test", "[prusa_stats]") SERIALS_RESET(); isPrintPaused = 0; - card.paused = 0; IS_SD_PRINTING = 1; old_code::prusa_statistics(test_codes[i],0); new_code::prusa_statistics(test_codes[i],0); From 779423f0e71b700f941d1c5e6b8ac1114f05adc5 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 29 Nov 2019 15:06:54 +0200 Subject: [PATCH 092/110] Move hardcoded values to variants --- Firmware/tmc2130.cpp | 4 ++-- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 4 +++- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 6a79f51a..dca50ac7 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -24,7 +24,7 @@ uint8_t tmc2130_current_h[4] = TMC2130_CURRENTS_H; uint8_t tmc2130_current_r[4] = TMC2130_CURRENTS_R; //running currents for homing -uint8_t tmc2130_current_r_home[4] = {8, 10, 20, 18}; +uint8_t tmc2130_current_r_home[4] = TMC2130_CURRENTS_R_HOME; //pwm_ampl @@ -40,7 +40,7 @@ uint8_t tmc2130_mres[4] = {0, 0, 0, 0}; //will be filed at begin of init uint8_t tmc2130_sg_thr[4] = {TMC2130_SG_THRS_X, TMC2130_SG_THRS_Y, TMC2130_SG_THRS_Z, TMC2130_SG_THRS_E}; -uint8_t tmc2130_sg_thr_home[4] = {3, 3, TMC2130_SG_THRS_Z, TMC2130_SG_THRS_E}; +uint8_t tmc2130_sg_thr_home[4] = TMC2130_SG_THRS_HOME; uint8_t tmc2130_sg_homing_axes_mask = 0x00; diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 54f0c469..685d77c6 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -260,11 +260,13 @@ #define TMC2130_SG_THRS_Y 3 // stallguard sensitivity for Y axis #define TMC2130_SG_THRS_Z 4 // stallguard sensitivity for Z axis #define TMC2130_SG_THRS_E 3 // stallguard sensitivity for E axis +#define TMC2130_SG_THRS_HOME {3, 3, TMC2130_SG_THRS_Z, TMC2130_SG_THRS_E} //new settings is possible for vsense = 1, running current value > 31 set vsense to zero and shift both currents by 1 bit right (Z axis only) #define TMC2130_CURRENTS_H {16, 20, 35, 30} // default holding currents for all axes #define TMC2130_CURRENTS_R {16, 20, 35, 30} // default running currents for all axes -#define TMC2130_UNLOAD_CURRENT_R 12 // lowe current for M600 to protect filament sensor +#define TMC2130_CURRENTS_R_HOME {8, 10, 20, 18} // homing running currents for all axes +// #define TMC2130_UNLOAD_CURRENT_R 12 // lower current for M600 to protect filament sensor - Unused #define TMC2130_STEALTH_Z diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 62dae6ac..5ee149e7 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -262,11 +262,13 @@ #define TMC2130_SG_THRS_Y 3 // stallguard sensitivity for Y axis #define TMC2130_SG_THRS_Z 4 // stallguard sensitivity for Z axis #define TMC2130_SG_THRS_E 3 // stallguard sensitivity for E axis +#define TMC2130_SG_THRS_HOME {3, 3, TMC2130_SG_THRS_Z, TMC2130_SG_THRS_E} //new settings is possible for vsense = 1, running current value > 31 set vsense to zero and shift both currents by 1 bit right (Z axis only) #define TMC2130_CURRENTS_H {16, 20, 35, 30} // default holding currents for all axes #define TMC2130_CURRENTS_R {16, 20, 35, 30} // default running currents for all axes -#define TMC2130_UNLOAD_CURRENT_R 12 // lowe current for M600 to protect filament sensor +#define TMC2130_CURRENTS_R_HOME {8, 10, 20, 18} // homing running currents for all axes +// #define TMC2130_UNLOAD_CURRENT_R 12 // lower current for M600 to protect filament sensor - Unused #define TMC2130_STEALTH_Z From e7f2577233100a32abf050d1ba77492e9b3a1a91 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 29 Nov 2019 22:49:22 +0200 Subject: [PATCH 093/110] Fix kill messages --- Firmware/Marlin_main.cpp | 6 +++--- Firmware/cardreader.cpp | 8 ++++---- Firmware/cmdqueue.cpp | 2 +- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/temperature.cpp | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index fe94fab5..5788e0dd 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5944,7 +5944,7 @@ Sigma_Exit: //! ### M112 - Emergency stop // ----------------------------------------- case 112: - kill(_n(""), 3); + kill(MSG_M112_KILL, 3); break; //! ### M140 - Set bed temperature @@ -8626,7 +8626,7 @@ if(0) if( (_millis() - previous_millis_cmd) > max_inactive_time ) if(max_inactive_time) - kill(_n(""), 4); + kill(_n("Inactivity Shutdown"), 4); if(stepper_inactive_time) { if( (_millis() - previous_millis_cmd) > stepper_inactive_time ) { @@ -8667,7 +8667,7 @@ if(0) // ---------------------------------------------------------------- if ( killCount >= KILL_DELAY) { - kill("", 5); + kill(NULL, 5); } #endif diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 047a2c76..545316d3 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -359,10 +359,10 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru { if((int)file_subcall_ctr>(int)SD_PROCEDURE_DEPTH-1) { - SERIAL_ERROR_START; - SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:"); - SERIAL_ERRORLN(SD_PROCEDURE_DEPTH); - kill("", 1); + // SERIAL_ERROR_START; + // SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:"); + // SERIAL_ERRORLN(SD_PROCEDURE_DEPTH); + kill(_n("trying to call sub-gcode files with too many levels."), 1); return; } diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index e17db42a..c8693552 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -500,7 +500,7 @@ void get_command() //If command was e-stop process now if(strcmp(cmdbuffer+bufindw+CMDHDRSIZE, "M112") == 0) - kill("", 2); + kill(MSG_M112_KILL, 2); // Store the current line into buffer, move to the next line. // Store type of entry diff --git a/Firmware/messages.c b/Firmware/messages.c index bb2e9510..1d8847e1 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -160,3 +160,4 @@ const char MSG_OCTOPRINT_RESUMED[] PROGMEM_N1 = "// action:resumed"; //// const char MSG_OCTOPRINT_CANCEL[] PROGMEM_N1 = "// action:cancel"; //// const char MSG_FANCHECK_EXTRUDER[] PROGMEM_N1 = "Err: EXTR. FAN ERROR"; ////c=20 const char MSG_FANCHECK_PRINT[] PROGMEM_N1 = "Err: PRINT FAN ERROR"; ////c=20 +const char MSG_M112_KILL[] PROGMEM_N1 = "M112 called. Emergency Stop."; ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index 60a4cc1c..1dfbfa50 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -161,6 +161,7 @@ extern const char MSG_OCTOPRINT_RESUMED[]; extern const char MSG_OCTOPRINT_CANCEL[]; extern const char MSG_FANCHECK_EXTRUDER[]; extern const char MSG_FANCHECK_PRINT[]; +extern const char MSG_M112_KILL[]; #if defined(__cplusplus) } diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index a9373a54..88674cf9 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -879,7 +879,7 @@ static float analog2temp(int raw, uint8_t e) { SERIAL_ERROR_START; SERIAL_ERROR((int)e); SERIAL_ERRORLNPGM(" - Invalid extruder number !"); - kill(PSTR(""), 6); + kill(NULL, 6); return 0.0; } #ifdef HEATER_0_USES_MAX6675 From 454e99dbb54086e2ce4a1ea7c1cb9317671c4668 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 3 Dec 2019 15:50:21 +0100 Subject: [PATCH 094/110] Use lcd_print_stop() in M603, fix octoprint regression M603 shouldn't report a fatal error state. Use lcd_print_stop(). Regression introduced in PR #2274 --- Firmware/Marlin_main.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index fe94fab5..4dc5e2d3 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7271,7 +7271,7 @@ Sigma_Exit: //! ### M603 - Stop print // ------------------------------- case 603: { - Stop(); + lcd_print_stop(); } break; @@ -8745,6 +8745,16 @@ void kill(const char *full_screen_message, unsigned char id) } // Wait for reset } +// Stop: Emergency stop used by overtemp functions which allows recovery +// +// In addition to stopping the print, this prevents subsequent G[0-3] commands to be +// processed via USB (using "Stopped") until the print is resumed via M999 or +// manually started from scratch with the LCD. +// +// Note that the current instruction is completely discarded, so resuming from Stop() +// will introduce either over/under extrusion on the current segment, and will not +// survive a power panic. Switching Stop() to use the pause machinery instead (with +// the addition of disabling the headers) could allow true recovery in the future. void Stop() { disable_heater(); From 4fce74140a55679318b09027d0e42ec7c0aa0cf6 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 3 Dec 2019 19:35:29 +0100 Subject: [PATCH 095/110] Also abort planning in stop_and_save_print_to_ram Similarly to resume_print_from_ram_and_continue, abort any planning in mesh_plan_buffer_line already in stop_and_save_print_to_ram in case it is called for pausing only. --- Firmware/Marlin_main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index fe94fab5..33f67684 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -10249,6 +10249,7 @@ void stop_and_save_print_to_ram(float z_move, float e_move) memcpy(current_position, saved_pos, sizeof(saved_pos)); memcpy(destination, current_position, sizeof(destination)); #endif + waiting_inside_plan_buffer_line_print_aborted = true; //unroll the stack } } From 792d7ca6dc2029e7c6d81c6609eb89c06bb29ba7 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 3 Dec 2019 19:54:06 +0100 Subject: [PATCH 096/110] Turn off heaters just prior to retraction to limit oozing --- Firmware/Marlin_main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 33f67684..c8596bad 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9555,9 +9555,11 @@ float temp_compensation_pinda_thermistor_offset(float temperature_pinda) void long_pause() //long pause print { st_synchronize(); - start_pause_print = _millis(); + // Stop heaters + setAllTargetHotends(0); + //retract current_position[E_AXIS] -= default_retraction; plan_buffer_line_curposXYZE(400, active_extruder); @@ -9572,8 +9574,7 @@ void long_pause() //long pause print current_position[Y_AXIS] = Y_PAUSE_POS; plan_buffer_line_curposXYZE(50, active_extruder); - // Turn off the hotends and print fan - setAllTargetHotends(0); + // Turn off the print fan fanSpeed = 0; } From d60230e494e6e4a60387b7fceab8e8be24648b70 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 3 Dec 2019 19:55:33 +0100 Subject: [PATCH 097/110] Add some documentation --- Firmware/Marlin_main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c8596bad..9924b61c 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -10221,7 +10221,9 @@ void stop_and_save_print_to_ram(float z_move, float e_move) sei(); if ((z_move != 0) || (e_move != 0)) { // extruder or z move #if 1 - // Rather than calling plan_buffer_line directly, push the move into the command queue, + // Rather than calling plan_buffer_line directly, push the move into the command queue so that + // the caller can continue processing. This is used during powerpanic to save the state as we + // move away from the print. char buf[48]; // First unretract (relative extrusion) From 063d0421ac71801bf0d8eb31ca9e51ef3950737f Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 3 Dec 2019 19:56:05 +0100 Subject: [PATCH 098/110] Call long_pause from the main loop (again) After calling stop_and_save_print_to_ram, perform the parking moves within the main loop as done before PR#1899 to avoid planning within an interrupted move (which would clear the abort flag too soon). --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cbfe017f..b9e86fc4 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1100,6 +1100,7 @@ void lcd_commands() lcd_setstatuspgm(_i("Print paused"));////MSG_PRINT_PAUSED c=20 r=1 lcd_commands_type = LcdCommands::Idle; lcd_commands_step = 0; + long_pause(); } } @@ -1656,9 +1657,8 @@ void lcd_return_to_status() //! @brief Pause print, disable nozzle heater, move to park position void lcd_pause_print() { - lcd_return_to_status(); stop_and_save_print_to_ram(0.0,0.0); - long_pause(); + lcd_return_to_status(); isPrintPaused = true; if (LcdCommands::Idle == lcd_commands_type) { From 8448b8d41390301a6cd3a5e4b31260d52bfff896 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 3 Dec 2019 20:17:08 +0100 Subject: [PATCH 099/110] Keep destination updated in an aborted plan as well When aborting the plan destination is updated anyway to reflect the latest position. There's no use in this additional check. --- Firmware/Marlin_main.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 9924b61c..5bdae1bb 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8415,8 +8415,6 @@ void prepare_move() plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate*feedmultiply*(1./(60.f*100.f)), active_extruder); #endif } - if (waiting_inside_plan_buffer_line_print_aborted) - return; set_current_to_destination(); } From 564bab7308f69bbe2857b806ecdd63e96a75067d Mon Sep 17 00:00:00 2001 From: Michal Fanta <45625875+michalxfanta@users.noreply.github.com> Date: Thu, 5 Dec 2019 11:42:42 +0100 Subject: [PATCH 100/110] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 31 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/enhancement.md | 20 +++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++++++ .github/ISSUE_TEMPLATE/question.md | 12 +++++++++ 4 files changed, 83 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/enhancement.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/question.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..196d5756 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,31 @@ +--- +name: Bug report +about: Create a report to help us improve +title: "[BUG]" +labels: bug +assignees: '' + +--- + +Please, before you create a new bug report, please make sure you searched in open and closed issues and couldn't find anything that matches. + +**Printer type** - [e.g. MK3S, MK3, MK2.5S, MK2.5, MK2S, MK2] +**Printer firmware version**- [e.g. 3.8.1, 3.8.1-RC1, ...] + +**MMU Upgrade** - [e.g. MMU2S, MMU2, MMU1] +**MMU upgrade firmware version [e.g. 1.0.6, 1.0.6-RC2, ...] + +**Describe the bug** + A clear and concise description of what the bug is. + +**To Reproduce** + Please describe steps to reproduce the behavior. + +**Expected behavior** + A clear and concise description of what you expected to happen. + +**G-code** + Please attach a G-code. This will make it easier for us to replicate the error. + +**Video** + Please attach a video. It usually helps to solve the problem. diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md new file mode 100644 index 00000000..1592c6fc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/enhancement.md @@ -0,0 +1,20 @@ +--- +name: Enhancement +about: Suggest an idea for this project +title: " [ENHANCEMENT]" +labels: enhancement +assignees: '' + +--- + +Please, before you create a new feature request, please make sure you searched in open and closed issues and couldn't find anything that matches. + +Enter what type of printer or upgrade the enhancement applies to. +**Printer type** - [e.g. MK3S, MK3, MK2.5S, MK2.5, MK2S, MK2] +**MMU Upgrade** - [e.g. MMU2S, MMU2, MMU1] + +**Is your enhancement related to a problem? Please describe.** + A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** + A clear and concise description of what you want to happen. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..abc71cbb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: "[FEATURE REQUEST]" +labels: feature request +assignees: '' + +--- + +Please, before you create a new feature request, please make sure you searched in open and closed issues and couldn't find anything that matches. + +If it makes sense, enter what type of printer or upgrade the feature request applies to. +**Printer type** - [e.g. MK3S, MK3, MK2.5S, MK2.5, MK2S, MK2] +**MMU Upgrade** - [e.g. MMU2S, MMU2, MMU1] + +**Is your feature request related to a problem? Please describe.** + A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** + A clear and concise description of what you want to happen. diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 00000000..14ce734f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,12 @@ +--- +name: Question +about: What do you want to know? +title: "[QUESTION]" +labels: question +assignees: '' + +--- + +Please, before you create a new question, please make sure you searched in open and closed issues and couldn't find anything that matches. + +**What is your question?** From 89dfb00b04bff7fd1f8656744ef8d74bd79a9a6a Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 8 Dec 2019 08:43:43 +0200 Subject: [PATCH 101/110] Fix optiboot erase function after address 0xFFFF --- Firmware/optiboot_w25x20cl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/optiboot_w25x20cl.cpp b/Firmware/optiboot_w25x20cl.cpp index e84bf639..584c32fe 100644 --- a/Firmware/optiboot_w25x20cl.cpp +++ b/Firmware/optiboot_w25x20cl.cpp @@ -258,11 +258,11 @@ void optiboot_w25x20cl_enter() uint32_t addr = (((uint32_t)rampz) << 16) | address; // During a single bootloader run, only erase a 64kB block once. // An 8bit bitmask 'pages_erased' covers 512kB of FLASH memory. - if (address == 0 && (pages_erased & (1 << addr)) == 0) { + if ((address == 0) && (pages_erased & (1 << (addr >> 16))) == 0) { w25x20cl_wait_busy(); w25x20cl_enable_wr(); w25x20cl_block64_erase(addr); - pages_erased |= (1 << addr); + pages_erased |= (1 << (addr >> 16)); } w25x20cl_wait_busy(); w25x20cl_enable_wr(); From ed3a459090ccc4322dc0ba8dbe85064572b78884 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 23 Oct 2019 13:54:15 +0200 Subject: [PATCH 102/110] Revert "Skipped one translated sentence, because total translation size was >" This reverts commit 5c2b573415a19d57353463856017919e7376ffac. --- lang/lang_en_cz.txt | 2 +- lang/lang_en_de.txt | 2 +- lang/lang_en_es.txt | 2 +- lang/lang_en_fr.txt | 2 +- lang/lang_en_it.txt | 2 +- lang/lang_en_pl.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 0fc920ad..230055b1 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1188,7 +1188,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"\x00" +"Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." # "Y-correct:" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 91107d8e..11c36b40 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1188,7 +1188,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"\x00" +"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den Knopf, bis Sie die optimale Hoehe erreicht haben. Ueberpruefen Sie die Bilder im Handbuch (Kapitel Kalibrierung)." # "Y-correct:" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 56539966..8255bd79 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1188,7 +1188,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"\x00" +"La impresora comenzara a imprimir una linea en zig-zag. Gira el dial hasta que la linea alcance la altura optima. Mira las fotos del manual (Capitulo de calibracion)." # "Y-correct:" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index b0b62e9d..f6add948 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1185,7 +1185,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"\x00" +"L'imprimante commencera a imprimer une ligne en zig-zag. Tournez le bouton jusqu'a atteindre la hauteur optimale. Consultez les photos dans le manuel (chapitre Calibration)." # "Y-correct:" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 44285a43..672859a0 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1187,7 +1187,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"\x00" +"La stampante iniziera a stampare una linea a zig-zag. Gira la manopola fino a che non hai raggiungo l'altezza ottimale. Verifica con le immagini nel manuale (capitolo sulla calibrazione):" # "Y-correct:" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 25c4d14f..aa07cd75 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1187,7 +1187,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"\x00" +"Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)." # "Y-correct:" From 348bbbffb01fcdfe37602dd0fd0fd852fea66a68 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 15 Dec 2019 22:22:44 +0100 Subject: [PATCH 103/110] Do not allow to resume a print twice while waiting for the hotend Clear isPrintPaused just prior to restore_print_from_ram_and_continue. --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b23cc223..e517b326 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6752,10 +6752,10 @@ void lcd_resume_print() if (fan_error_selftest()) return; //abort if error persists + isPrintPaused = false; restore_print_from_ram_and_continue(0.0); pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation refresh_cmd_timeout(); - isPrintPaused = false; SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_RESUMED); //resume octoprint } @@ -6907,7 +6907,7 @@ static void lcd_main_menu() { MENU_ITEM_FUNCTION_P(_i("Pause print"), lcd_pause_print);////MSG_PAUSE_PRINT } - else + else if(isPrintPaused) { #ifdef FANCHECK if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK)) From faa76df2fe989dee140ffd69fb5ca36c31afe3c4 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 16 Dec 2019 15:52:37 +0100 Subject: [PATCH 104/110] Fix the "Stop print" behavior from the LCD Correctly cleanup the printer state when stopping the current print: - Disable interrupts while aborting the planner/queue to ensure new serial commands are not inserted while aborting - _Always_ call planner_abort_hard() to interrupt any pending move! - Clear the saved_target, which might be set when calling stop from within a paused state. Create a new function to clear the paused state for future use. - Do not disable/reset the MBL: doing so will destroy the ability to restart correctly using M999. --- Firmware/Marlin.h | 1 + Firmware/Marlin_main.cpp | 8 ++++++++ Firmware/ultralcd.cpp | 35 +++++++++++++++-------------------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 7dedc8a4..a162d5c8 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -455,6 +455,7 @@ extern void print_mesh_bed_leveling_table(); extern void stop_and_save_print_to_ram(float z_move, float e_move); extern void restore_print_from_ram_and_continue(float e_move); +extern void cancel_saved_printing(); //estimated time to end of the print diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index edefa072..8e4f7ddc 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -10343,6 +10343,14 @@ void restore_print_from_ram_and_continue(float e_move) waiting_inside_plan_buffer_line_print_aborted = true; //unroll the stack } +// Cancel the state related to a currently saved print +void cancel_saved_printing() +{ + saved_target[0] = SAVED_TARGET_UNSET; + saved_printing_type = PRINTING_TYPE_NONE; + saved_printing = false; +} + void print_world_coordinates() { printf_P(_N("world coordinates: (%.3f, %.3f, %.3f)\n"), current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS]); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b23cc223..90beb3a9 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7258,30 +7258,25 @@ static void lcd_sd_updir() void lcd_print_stop() { -//-// - if(!card.sdprinting) - { - SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); // for Octoprint - } - saved_printing = false; - saved_printing_type = PRINTING_TYPE_NONE; + if (!card.sdprinting) { + SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); // for Octoprint + } + + cli(); + + // Clear any saved printing state + cancel_saved_printing(); cancel_heatup = true; -#ifdef MESH_BED_LEVELING - mbl.active = false; -#endif - // Stop the stoppers, update the position from the stoppers. - if (mesh_bed_leveling_flag == false && homing_flag == false) - { - planner_abort_hard(); - // Because the planner_abort_hard() initialized current_position[Z] from the stepper, - // Z baystep is no more applied. Reset it. - babystep_reset(); - } - // Clean the input command queue. + + // Abort the planner/queue/sd + planner_abort_hard(); cmdqueue_reset(); - lcd_setstatuspgm(_T(MSG_PRINT_ABORTED)); card.sdprinting = false; card.closefile(); + st_reset_timer(); + sei(); + + lcd_setstatuspgm(_T(MSG_PRINT_ABORTED)); stoptime = _millis(); unsigned long t = (stoptime - starttime - pause_time) / 1000; //time in s pause_time = 0; From 8d490f941a7e9409bc175a186334e4b40319a2d0 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 16 Dec 2019 16:39:20 +0100 Subject: [PATCH 105/110] Make use of the CRITICAL_SECTION macros in lcd_print_stop --- Firmware/ultralcd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 90beb3a9..969ca2a5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7262,7 +7262,7 @@ void lcd_print_stop() SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); // for Octoprint } - cli(); + CRITICAL_SECTION_START; // Clear any saved printing state cancel_saved_printing(); @@ -7274,7 +7274,8 @@ void lcd_print_stop() card.sdprinting = false; card.closefile(); st_reset_timer(); - sei(); + + CRITICAL_SECTION_END; lcd_setstatuspgm(_T(MSG_PRINT_ABORTED)); stoptime = _millis(); From f071aec74775c9f8b568f053a5dc6d4b9078e757 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 18 Dec 2019 08:52:25 +0300 Subject: [PATCH 106/110] Fix sheet minimum width on the status screen --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5d0abeac..a4019f49 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -630,7 +630,7 @@ void lcdui_print_percent_done(void) { eeprom_read_block(sheet, EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))].name, 7); sheet[7] = '\0'; - lcd_printf_P(PSTR("%s"),sheet); + lcd_printf_P(PSTR("%-7s"),sheet); } else { From c0ae92cd2a2864d9b760e0325d93942cf7421f88 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 20 Dec 2019 18:28:44 +0100 Subject: [PATCH 107/110] Remove "relative_mode", only use "axis_relative_modes" axis_relative_modes can cleanly handle G90/G91 and M82/M83 without the need of "relative_mode" entirely. Change G90/G91 to simply reset all axes according to the requested state, which avoids to check two variables in get_coordinates(), fixing the following incorrect handling: G91 ; all axis relative M83 ; set extruder absolute G1 E1 ; should be an absolute move, but still relative --- Firmware/Marlin_main.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4970091e..b29be9ef 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -342,10 +342,6 @@ static float next_feedrate; // Original feedrate saved during homing moves static float saved_feedrate; -// Determines Absolute or Relative Coordinates. -// Also there is bool axis_relative_modes[] per axis flag. -static bool relative_mode = false; - const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42 //static float tt = 0; @@ -5208,15 +5204,19 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) //! ### G90 - Switch off relative mode // ------------------------------- - case 90: - relative_mode = false; - break; + case 90: { + for(uint8_t i = 0; i != NUM_AXIS; ++i) + axis_relative_modes[i] = false; + } + break; //! ### G91 - Switch on relative mode // ------------------------------- - case 91: - relative_mode = true; - break; + case 91: { + for(uint8_t i = 0; i != NUM_AXIS; ++i) + axis_relative_modes[i] = true; + } + break; //! ### G92 - Set position // ----------------------------- @@ -6238,13 +6238,13 @@ Sigma_Exit: //! ### M82 - Set E axis to absolute mode // --------------------------------------- case 82: - axis_relative_modes[3] = false; + axis_relative_modes[E_AXIS] = false; break; //! ### M83 - Set E axis to relative mode // --------------------------------------- case 83: - axis_relative_modes[3] = true; + axis_relative_modes[E_AXIS] = true; break; //! ### M84, M18 - Disable steppers @@ -8279,7 +8279,7 @@ void get_coordinates() for(int8_t i=0; i < NUM_AXIS; i++) { if(code_seen(axis_codes[i])) { - bool relative = axis_relative_modes[i] || relative_mode; + bool relative = axis_relative_modes[i]; destination[i] = (float)code_value(); if (i == E_AXIS) { float emult = extruder_multiplier[active_extruder]; From 853991865c3d983cc6ed927f9de784001c4974d7 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Thu, 2 Jan 2020 18:07:30 +0100 Subject: [PATCH 108/110] Improve raise_z_above to always raise when at Z_MIN When check_z_endstop is set, Z_MIN_PIN is checkend regardless of the moving direction to support Z calibration. This prevents the ability to use _just_ SG when moving upwards. But since we know the extruder is at Z_MIN, it's always safe to raise irregardless, so we can dodge the issue. --- Firmware/Marlin_main.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4970091e..7d8d9454 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2125,9 +2125,15 @@ void raise_z_above(float target, bool plan) // Z needs raising current_position[Z_AXIS] = target; - if (axis_known_position[Z_AXIS]) +#if defined(Z_MIN_PIN) && (Z_MIN_PIN > -1) && !defined(DEBUG_DISABLE_ZMINLIMIT) + bool z_min_endstop = (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING); +#else + bool z_min_endstop = false; +#endif + + if (axis_known_position[Z_AXIS] || z_min_endstop) { - // current position is known, it's safe to raise Z + // current position is known or very low, it's safe to raise Z if(plan) plan_buffer_line_curposXYZE(max_feedrate[Z_AXIS], active_extruder); return; } From c5324291ada0bf14906f688f04760bfe8352000f Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 8 Jan 2020 12:48:41 +0200 Subject: [PATCH 109/110] Do not show sheet on status screen if less than 2 are initialized --- Firmware/ultralcd.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5d0abeac..ed9c403b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -622,21 +622,24 @@ void lcdui_print_feedrate(void) // Print percent done in form "USB---%", " SD---%", " ---%" (7 chars total) void lcdui_print_percent_done(void) { - char sheet[8]; const char* src = is_usb_printing?_N("USB"):(IS_SD_PRINTING?_N(" SD"):_N(" ")); char per[4]; bool num = IS_SD_PRINTING || (PRINTER_ACTIVE && (print_percent_done_normal != PRINT_PERCENT_DONE_INIT)); if (!num || heating_status) // either not printing or heating { - eeprom_read_block(sheet, EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))].name, 7); - sheet[7] = '\0'; - lcd_printf_P(PSTR("%s"),sheet); - } - else - { - sprintf_P(per, num?_N("%3hhd"):_N("---"), calc_percent_done()); - lcd_printf_P(_N("%3S%3s%%"), src, per); + const int8_t sheetNR = eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)); + const int8_t nextSheet = eeprom_next_initialized_sheet(sheetNR); + if ((nextSheet >= 0) && (sheetNR != nextSheet)) + { + char sheet[8]; + eeprom_read_block(sheet, EEPROM_Sheets_base->s[sheetNR].name, 7); + sheet[7] = '\0'; + lcd_printf_P(PSTR("%s"),sheet); + return; //do not also print the percentage + } } + sprintf_P(per, num?_N("%3hhd"):_N("---"), calc_percent_done()); + lcd_printf_P(_N("%3S%3s%%"), src, per); } // Print extruder status (5 chars total) From 9abdf4e5359a15c5d78b8c735c8864b20dbdef09 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 8 Jan 2020 13:46:51 +0200 Subject: [PATCH 110/110] Show ? near Z value if the position is unknown --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5d0abeac..6bacd632 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -586,7 +586,7 @@ void lcdui_print_Z_coord(void) if (custom_message_type == CustomMsg::MeshBedLeveling) lcd_puts_P(_N("Z --- ")); else - lcd_printf_P(_N("Z%6.2f "), current_position[Z_AXIS]); + lcd_printf_P(_N("Z%6.2f%c"), current_position[Z_AXIS], axis_known_position[Z_AXIS]?' ':'?'); } #ifdef PLANNER_DIAGNOSTICS